修改任务不返回创建人

src/main/java/com/example/demo/controller/QuartzTaskController.java

@@ -17,6 +17,7 @@ import org.quartz.SchedulerException;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 
@@ -52,7 +53,7 @@ public class QuartzTaskController {
 
     @Operation(summary = "查询任务条件列表")
     @PostMapping("/getTasks")
-    public String getTasks(@RequestBody QueryPageDTO queryPageDTO) {
+    public String getTasks(@RequestBody QueryPageDTO queryPageDTO) throws IOException {
         return Response.success(qrTaskService.getTasks(queryPageDTO));
     }
 

src/main/java/com/example/demo/domain/entity/Personnel.java

@@ -0,0 +1,91 @@
+package com.example.demo.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @author 沈永艺
+ * @date 2022-8-2
+ * @description 人员类 数据库对应实体
+ */
+
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = "PERSONNEL")
+public class Personnel extends BaseEntity<Personnel> {
+    /**
+     * 人员账号
+     */
+    @TableField(value = "PERSONNEL_USERNAME")
+    private String personnelUserName;
+
+    /**
+     * 人员密码
+     */
+    @TableField(value = "PERSONNEL_PASSWORD")
+    private String personnelPassword;
+
+    /**
+     * 人员名称
+     */
+    @TableField(value = "PERSONNEL_NAME")
+    private String personnelName;
+
+    /**
+     * 人员性别(1男0女)
+     */
+    @TableField(value = "PERSONNEL_SEX")
+    private Integer personnelUserSex;
+
+    /**
+     * 人员联系电话
+     */
+    @TableField(value = "PERSONNEL_PHONE")
+    private String personnelPhone;
+
+    /**
+     * 人员邮箱
+     */
+    @TableField(value = "PERSONNEL_EMAIL")
+    private String personnelEmail;
+
+    /**
+     * 人员QQ号
+     */
+    @TableField(value = "PERSONNEL_QQ")
+    private String personnelQQ;
+
+    /**
+     * 人员微信号
+     */
+    @TableField(value = "PERSONNEL_WECHAT")
+    private String personnelWechat;
+
+    /**
+     * 人员钉钉号
+     */
+    @TableField(value = "PERSONNEL_DING")
+    private String personnelDing;
+
+    /**
+     * 人员描述
+     */
+    @TableField(value = "PERSONNEL_DESCRIPTION")
+    private String personnelDescription;
+
+    /**
+     * 人员账号状态(1启用0停用)
+     */
+    @TableField(value = "PERSONNEL_STATUS")
+    private Integer personnelStatus;
+
+    /**
+     * 租户ID
+     */
+    @TableField(value = "TENANT_ID")
+    private Integer tenantId;
+}

src/main/java/com/example/demo/domain/entity/QrtzTask.java

@@ -70,7 +70,7 @@ public class QrtzTask extends BaseEntity<QrtzTask>{
      * 创建人名称
      */
     @TableField(value = "create_person_name")
-    private String createPersonName;
+    private String createName;
     @TableField(value = "tenant_id")
     private Integer tenantId;
     /**

src/main/java/com/example/demo/service/OutInterfaceService.java

@@ -160,5 +160,23 @@ public class OutInterfaceService {
                 .build();
         return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
     }
+    /**
+     * @title 根据ID查询人员
+     * @description 接口来源:PCS
+     */
+    public String getPersonnelByIdsFromPCS(List<Integer> ids) throws IOException {
 
+        String param = new Gson().toJson(ids);
+        RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), param);
+        OkHttpClient okHttpClient = new OkHttpClient.Builder()
+                .connectTimeout(60, TimeUnit.SECONDS)
+                .writeTimeout(60, TimeUnit.SECONDS)
+                .readTimeout(60, TimeUnit.SECONDS)
+                .build();
+        Request request = new Request.Builder()
+                .url(PCSUrl + "/permission/api/system/getPersonnelByIds")
+                .post(requestBody)
+                .build();
+        return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
+    }
 }

src/main/java/com/example/demo/service/QrTaskService.java

@@ -1,5 +1,8 @@
 package com.example.demo.service;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -9,6 +12,7 @@ import com.example.demo.domain.dto.QrtzTaskAddNewDTO;
 import com.example.demo.domain.dto.QrtzTaskUpdateDTO;
 import com.example.demo.domain.dto.QueryPageDTO;
 import com.example.demo.domain.dto.QueryTaskDetailsDTO;
+import com.example.demo.domain.entity.Personnel;
 import com.example.demo.domain.entity.QrtzTask;
 import com.example.demo.domain.entity.QrtzTaskDetail;
 import com.example.demo.domain.entity.WebLoginConfig;
@@ -25,12 +29,14 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Stack;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /**
  * @author admin
@@ -46,6 +52,7 @@ public class QrTaskService extends ServiceImpl<QrtzTaskMapper, QrtzTask> {
     private final LoginUtils loginUtils;
     private final WebLoginConfigService webLoginConfigService;
     private  final CacheUtils cacheUtils;
+    private final OutInterfaceService outInterfaceService;
     /**
      * 新增任务
      *
@@ -148,7 +155,7 @@ public class QrTaskService extends ServiceImpl<QrtzTaskMapper, QrtzTask> {
         return reIds;
     }
 
-    public Page<QrtzTask> getTasks(QueryPageDTO queryPageDTO) {
+    public Page<QrtzTask> getTasks(QueryPageDTO queryPageDTO) throws IOException {
         log.info("开始处理【查询任务条件列表】的业务，参数为：{}", queryPageDTO);
 
         String orderBy = queryPageDTO.getOrderBy();
@@ -170,9 +177,29 @@ public class QrTaskService extends ServiceImpl<QrtzTaskMapper, QrtzTask> {
             queryWrapper.orderByDesc("modified_time");
         }
         Page<QrtzTask> page = this.page(new Page<>(queryPageDTO.getCurrent(), queryPageDTO.getSize()), queryWrapper.orderByDesc("modified_time"));
+       this.setDataList(page.getRecords()) ;
         return page;
     }
 
+
+    private void setDataList(List<QrtzTask> qrtzTasks) throws IOException {
+        //获得创建人的id集合
+        List<Integer> createIds =qrtzTasks.stream().map(QrtzTask::getCreatePersonId).collect(Collectors.toList());
+        //根据人员Id获得人员信息
+        String res1 = outInterfaceService.getPersonnelByIdsFromPCS(createIds);
+        JSONObject jsonObject1 = JSONObject.parseObject(res1);
+        //解析jason获得标的专利的权要
+        List<Personnel> personnels = JSON.parseArray(jsonObject1.getString("data"), Personnel.class);
+        for (QrtzTask project : qrtzTasks) {
+            //装载负责人名
+            List<Personnel> mapCre = personnels.stream().filter(tem -> tem.getId().equals(project.getCreatePersonId())).collect(Collectors.toList());
+                if(mapCre.size()>0){
+                    project.setCreateName(mapCre.get(0).getPersonnelName());
+                }
+        }
+
+    }
+
     public Page<QrtzTaskDetail> getTaskDetails(QueryTaskDetailsDTO queryTaskDetailsDTO) {
         log.info("开始处理【查询任务执行情况列表】的业务，参数为：{}", queryTaskDetailsDTO);
         LambdaQueryWrapper<QrtzTaskDetail> queryWrapper = new LambdaQueryWrapper<>();

src/main/java/com/example/demo/service/UploadFromWebService.java

@@ -871,7 +871,7 @@ public class UploadFromWebService {
         }
 
         if (FuJianSuffix.equals(".pdf")) {
-            //合并说明书多个pdf文件
+            //合并 说明书多个pdf文件
             PdfDocumentBase doc = PdfDocument.mergeFiles(streams);
             //保存结果文件
             doc.save("merge.pdf", FileFormat.PDF);

src/main/resources/application-dev.yml

@@ -56,7 +56,7 @@ spring:
     #初始化表结构
     jdbc:
       initialize-schema: always
-PCSUrl: http://localhost:8879
+PCSUrl: http://localhost:8871
 PASUrl: http://localhost:8877
 OPSUrl: http://192.168.1.24:5001
 mybatis-plus:

src/main/resources/application-prodNetIn.yml

@@ -58,7 +58,7 @@ spring:
       initialize-schema: never
 PCSUrl: http://localhost:8879
 PASUrl: http://localhost:8877
-OPSUrl: http://192.168.1.24:5001
+OPSUrl: http://139.224.24.90:5001
 mybatis-plus:
   mapper-locations: classpath:mapper/*.xml
 logging:

src/main/resources/application.yml

@@ -21,7 +21,7 @@ spring:
       max-file-size: 1000MB
       max-request-size: 1000MB
   profiles:
-    active: prodNetIn
+    active: dev
   jackson:
     default-property-inclusion: non_null
     serialization: