2/8

RMS/pom.xml

@@ -172,7 +172,7 @@
     </dependencies>
 
     <build>
-        <finalName>RMS_TEST</finalName>
+        <finalName>RMS_PROD</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

RMS/src/main/java/cn/cslg/report/common/config/InnerInterceptor/LizzMybatisIntercepts.java

@@ -76,7 +76,7 @@ public class LizzMybatisIntercepts implements InnerInterceptor {
                 //处理请求返回
                 JSONArray jsonArray = JSONArray.parseArray(resBody);
                 //当返回结果不为[0]或[-1]进行sql拦截操作
-                if (!(jsonArray.get(0).equals("0") || jsonArray.get(0).equals("-1"))) {
+                if (jsonArray.size()!=0&&!(jsonArray.get(0).equals("0") || jsonArray.get(0).equals("-1"))) {
                     StringBuilder sqls = new StringBuilder();
                     // 查询字典数据
                     //设定formdata类型参数

RMS/src/main/java/cn/cslg/report/entity/Report.java

@@ -4,8 +4,7 @@ import cn.cslg.report.common.model.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
 import lombok.experimental.Accessors;
 
 import java.util.Date;
@@ -16,6 +15,9 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 @TableName(value = "REPORT")
 @Schema(description="报告",required = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder(toBuilder = true)
 public class Report extends BaseEntity<Report> {
     /**
      * 标的专利/产品号

RMS/src/main/java/cn/cslg/report/service/business/CompareFilesService.java

@@ -14,6 +14,7 @@ import cn.cslg.report.entity.asso.AssoRecordsFeature;
 import cn.cslg.report.entity.asso.AssoTaskPersonel;
 import cn.cslg.report.mapper.CompareFilesMapper;
 import cn.cslg.report.service.OutInterfaceService;
+import cn.hutool.core.lang.func.Func;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -29,6 +30,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @SuppressWarnings({"all"})
@@ -239,18 +241,24 @@ else if(patentVO.getOrderItem()!=null&&patentVO.getOrderItem().equals("SysOrder"
         }
         List<String> allPatentsCopy = new ArrayList<>();
         if (patentVO.getNotAssignTypes() != null && patentVO.getNotAssignTypes().size() != 0) {
-            for(Integer types :patentVO.getNotAssignTypes())
-            {
-           List<String>  PatentsCopy = new ArrayList<>(AllpatentNos);
-                LambdaQueryWrapper<AssoTaskPersonel> assoWrapper = new LambdaQueryWrapper<>();
-                assoWrapper.eq(AssoTaskPersonel::getReportId, patentVO.getReportId())
-                        .eq(AssoTaskPersonel::getTaskType, types);
-                List<AssoTaskPersonel> assoTaskPersonels = assoTaskPersonelService.list(assoWrapper);
-                List<String> tem = assoTaskPersonels.stream().map(AssoTaskPersonel::getPatentNo).collect(Collectors.toList());
-                PatentsCopy.removeAll(tem);
+            for(Integer types :patentVO.getNotAssignTypes()) {
+                LambdaQueryWrapper<Task> wrapper = new LambdaQueryWrapper<>();
+                wrapper.select(Task::getId)
+                        .eq(Task::getType, types)
+                        .eq(Task::getReportId, patentVO.getReportId());
+
+                Function<Object, Integer> f = (o -> Integer.parseInt(o.toString()));
+                List<Integer> taskIds = taskService.listObjs(wrapper, f);
+                List<String> PatentsCopy = new ArrayList<>(AllpatentNos);
+                if (taskIds.size() != 0) {
+                    LambdaQueryWrapper<AssoTaskPersonel> assoWrapper = new LambdaQueryWrapper<>();
+                    assoWrapper.in(AssoTaskPersonel::getTaskId,taskIds);
+                    List<AssoTaskPersonel> assoTaskPersonels = assoTaskPersonelService.list(assoWrapper);
+                    List<String> tem = assoTaskPersonels.stream().map(AssoTaskPersonel::getPatentNo).collect(Collectors.toList());
+                    PatentsCopy.removeAll(tem);
+                }
                 allPatentsCopy.addAll(PatentsCopy);
             }
-
         }
         if ((patentVO.getTaskSources() != null && patentVO.getTaskSources().size() != 0) || (patentVO.getNotAssignTypes() != null && patentVO.getNotAssignTypes().size() != 0)) {
             patentNosTask.addAll(allPatentsCopy);

RMS/src/main/java/cn/cslg/report/service/business/ReportService.java

@@ -122,7 +122,6 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
         Integer id = loginUtils.getId();
         List<Integer> departIds = outInterfaceService.getDutyDepartsFromPCS(id);
         LambdaQueryWrapper<Report> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.ne(Report::getId, 0);
         if (reportVO.getName() != null) {
             queryWrapper.like(Report::getName, reportVO.getName());
         }
@@ -132,9 +131,6 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
         if (reportVO.getSignPatentNo() != null && reportVO.getSignPatentNo() != "") {
             queryWrapper.like(Report::getSignPatentNo, reportVO.getSignPatentNo());
         }
-//        String orderBy ="";
-//        String orderType="";
-//        queryWrapper.last(" order by "+orderBy+" "+orderType);
         queryWrapper.orderByDesc(Report::getCreateTime);
         //分页
         if (reportVO.getSize() != null && reportVO.getCurrent() != null) {
@@ -142,7 +138,7 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
             List<Report> reports = this.page(new Page<>(reportVO.getCurrent(), reportVO.getSize()), queryWrapper).getRecords();
             reports = this.reportData(reports);
             SecurityUtils.startDataScope("/pcs/report/query");
-            long count = this.count(queryWrapper);
+            Long  count = this.count(queryWrapper);
             return Response.success(reports, DataUtils.setPageColumn(reportVO.getSize(), reportVO.getCurrent(), Math.toIntExact(count)));
         } else {
             SecurityUtils.startDataScope("/pcs/report/query");

RMS/src/main/java/cn/cslg/report/service/business/TaskService.java

@@ -27,6 +27,7 @@ import io.swagger.v3.oas.models.security.SecurityScheme;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -59,7 +60,8 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
     public final CompareRecordsService compareRecordsService;
     public final CompareMessageService compareMessageService;
     public final SyneryCodeService syneryCodeService;
-
+    @Value("${PASUrl}")
+    private String url;
 
     /**
      * @param id(Task 任务id)
@@ -346,15 +348,15 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
                 .eq(CompareFiles::getState, 0);
         List<CompareFiles> compareFiles = compareFilesService.list(wrapper);
         List<String> AllpatentNos = compareFiles.stream().map(CompareFiles::getPatentNo).collect(Collectors.toList());
-        List<String> patentNos1 = new ArrayList<>();
+        List<String> patentNos1 =new ArrayList<>();
         //无查询条件
         if (patentVO == null || patentVO.getFiledOptions() == null || patentVO.getFiledOptions().size() == 0) {
-            patentNos1 = AllpatentNos;
+            patentNos1 =AllpatentNos;
         }
         //有查询条件时，自定义字段的专利号和任务的专利号取交集
         else {
             List<String> temPatentNos = reportFieldService.getPatentNo1(patentVO.getFiledOptions(), patentVO.getReportId(), patentVO.getTaskId(), patentVO.getTaskStatus());
-            patentNos1 = temPatentNos;
+            patentNos1=temPatentNos;
         }
         //如果有任务过滤条件
         List<String> patentNosTask = new ArrayList<>();
@@ -363,8 +365,9 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
         }
         List<String> allPatentsCopy = new ArrayList<>();
         if (patentVO.getNotAssignTypes() != null && patentVO.getNotAssignTypes().size() != 0) {
-            for (Integer types : patentVO.getNotAssignTypes()) {
-                List<String> PatentsCopy = new ArrayList<>(AllpatentNos);
+            for(Integer types :patentVO.getNotAssignTypes())
+            {
+                List<String>  PatentsCopy = new ArrayList<>(AllpatentNos);
                 LambdaQueryWrapper<AssoTaskPersonel> assoWrapper = new LambdaQueryWrapper<>();
                 assoWrapper.eq(AssoTaskPersonel::getReportId, patentVO.getReportId())
                         .eq(AssoTaskPersonel::getTaskType, types);
@@ -383,9 +386,6 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
         String res = outInterfaceService.getConPantentNos(patentVO, 1);
         JSONObject jsonObject1 = JSONObject.parseObject(res);
         List<String> patentNos = JSONArray.parseArray(jsonObject1.get("data").toString(), String.class);
-        if (patentNos.size() > num) {
-            return Response.error("分配数量超过未分配总数");
-        }
         //待分配的专利号列表剔除分配信息中已经存在的专利号
         patentNos.removeAll(selectedNos);
         List<AssoTaskPersonel> assoTaskPersonels = new ArrayList<>();
@@ -655,20 +655,21 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
 //        PersonnelVO personnelVO = cacheUtils.getLoginUser(StpUtil.getLoginIdAsInt());
         LambdaQueryWrapper<Task> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(Task::getReportId, taskVO.getReportId());
-        if (taskVO.getTaskName() != null) {
-            lambdaQueryWrapper.like(Task::getTaskName, taskVO.getTaskName());
+        if(taskVO.getTaskName()!=null){
+            lambdaQueryWrapper.like(Task::getTaskName,taskVO.getTaskName());
         }
-        if (taskVO.getType() != null) {
-            lambdaQueryWrapper.eq(Task::getType, taskVO.getType());
+        if(taskVO.getType()!=null){
+            lambdaQueryWrapper.eq(Task::getType,taskVO.getType());
         }//当查询使用处理人名称时
         if (taskVO.getHandlePersonName() != null && taskVO.getHandlePersonName() != "") {
             String res = outInterfaceService.getPersonIdByNamePCS(taskVO.getHandlePersonName());
             List<Integer> handleIds = JSONArray.parseArray(res, Integer.class);
             //当未查询到时直接返回空页
             if (handleIds != null && handleIds.size() != 0) {
-                lambdaQueryWrapper.in(Task::getHandlePersonId, handleIds);
-            } else {
-                lambdaQueryWrapper.in(Task::getHandlePersonId, Arrays.asList(-1));
+                lambdaQueryWrapper.in(Task::getHandlePersonId,handleIds);
+            }
+            else{
+                lambdaQueryWrapper.in(Task::getHandlePersonId,Arrays.asList(-1));
             }
 
         }
@@ -749,18 +750,13 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
 
     }
 
-    public String
-    look(Integer taskID, String patentNo, Integer reoportId) {
+    public String look(Integer taskID, String patentNo, Integer reoportId) {
         if (taskID != null) {
             LambdaQueryWrapper<AssoTaskPersonel> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(AssoTaskPersonel::getPatentNo, patentNo);
             queryWrapper.eq(AssoTaskPersonel::getTaskId, taskID);
-            List<AssoTaskPersonel> list = assoTaskPersonelService.list(queryWrapper);
-            if (list != null && list.size() != 0) {
-                AssoTaskPersonel assoTaskPersonel = assoTaskPersonelService.list(queryWrapper).get(0);
-                return Response.success(assoTaskPersonel.getState());
-            }
-            return Response.success();
+            AssoTaskPersonel assoTaskPersonel = assoTaskPersonelService.list(queryWrapper).get(0);
+            return Response.success(assoTaskPersonel.getState());
         } else {
             LambdaQueryWrapper<CompareFiles> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(CompareFiles::getPatentNo, patentNo).eq(CompareFiles::getReportId, reoportId);
@@ -793,6 +789,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
             task.setHandlePersonName(syneryVO.getPersonEmail());
         }
         task.setCreateID(loginUtils.getId());
+        PersonnelVO personnel =cacheUtils.getLoginUser(loginUtils.getId());
         task.insert();
 
 
@@ -801,8 +798,8 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
         queryCMVO.setCompareResult(syneryVO.getCompareResult());
         List<String> patentNos = new ArrayList<>();
         //无查询条件,单个专利
-        if (syneryVO.getPatentNos() != null && syneryVO.getPatentNos().size() != 0) {
-            patentNos = syneryVO.getPatentNos();
+        if (syneryVO.getPatentNos() != null&&syneryVO.getPatentNos().size()!=0) {
+            patentNos =syneryVO.getPatentNos();
         }
         //无查询条件并且是对比过的专利
         else if ((patentVO == null || patentVO.getFiledOptions() == null || patentVO.getFiledOptions().size() == 0) && syneryVO.getIsAll() == 0) {
@@ -852,12 +849,51 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
         });
         // 分配信息入库
         assoTaskPersonelService.saveBatch(assoTaskPersonels);
+        //发送邮件部分
+        String code = DataUtils.generateShortUuid();
+        SyneryCode syneryCode = new SyneryCode();
+        syneryCode.setCode(code);
+        syneryCode.setTaskId(task.getId());
+        syneryCode.insert();
         Map<String, Object> map = new LinkedHashMap<>();
         map.put("title", "任务通知");
-        map.put("template", "mail/Synery.html");
-
+        String name ="";
+        if (syneryVO.getHandlePersonId() != null) {
+            map.put("template", "mail/SyneryInside.html");
+            String resBody = outInterfaceService.getPersonnelByIdsFromPCS(Arrays.asList(task.getHandlePersonId()));
+            JSONObject jsonObject = JSONObject.parseObject(resBody);
+            //解析jason获得标的专利的权要
+            List<Personnel> personnels = JSON.parseArray(jsonObject.getString("data"), Personnel.class);
+            map.put("value1", personnels.get(0).getPersonnelName());
+            name=personnels.get(0).getPersonnelName();
+            map.put("email", personnels.get(0).getPersonnelEmail());
+            map.put("img", "\\src\\main\\resources\\mail\\logo.png");
+            map.put("value2", url+"/Incomplete?taskId=" + task.getId() + "&reportId=" + task.getReportId() + "&type=1" + "&reportType=" + report.getType());
+            mailUtils.sendEmailMessage(map);
+        } else {
+            map.put("template", "mail/Synery.html");
+            String orgin = syneryVO.getPersonEmail();
+            String parStr = "\\<([^}]*)\\>";
+            Pattern pattern = Pattern.compile(parStr);
+            Matcher matcher = pattern.matcher(orgin);
+            if (matcher.find()) {
+                String personName = orgin.substring(0, matcher.start());
+                String email = matcher.group(0);
+                email = email.replace("<", "");
+                email = email.replace(">", "");
+                map.put("value1", personName);
+                name=personName;
+                map.put("email", email);
+                map.put("img", "\\src\\main\\resources\\mail\\logo.png");
+                map.put("value2", syneryCode.getCode());
+                map.put("value3", url+"/identificationCode");
+                mailUtils.sendEmailMessage(map);
+            }
+        }
         if (synery_ccs != null && synery_ccs.size() != 0) {
-            synery_ccs.forEach(item -> {
+            map.put("template", "mail/SyneryTo.html");
+            for(Synery_CC item: synery_ccs)
+            {
                 item.setTaskId(task.getId());
                 if (item.getCcId() != null) {
                     String resBody = null;
@@ -869,11 +905,10 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
                     JSONObject jsonObject = JSONObject.parseObject(resBody);
                     //解析jason获得标的专利的权要
                     List<Personnel> personnels = JSON.parseArray(jsonObject.getString("data"), Personnel.class);
-                    map.put("value1", personnels.get(0).getPersonnelName());
+                    map.put("value1",personnel.getName());
                     map.put("email", personnels.get(0).getPersonnelEmail());
                     map.put("img", "\\src\\main\\resources\\mail\\logo.png");
-                    map.put("value2", "aaa");
-                    map.put("value3", "http://localhost:8086/Incomplete?taskId=" + task.getId() + "&reportId=" + task.getReportId() + "&type=1" + "&reportType=" + report.getType());
+                    map.put("value2",name);
                     mailUtils.sendEmailMessage(map);
                 } else {
                     String orgin = item.getCcEmail();
@@ -885,53 +920,16 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
                         String email = matcher.group(0);
                         email = email.replace("<", "");
                         email = email.replace(">", "");
-                        map.put("value1", personName);
+                        map.put("value1",personnel.getName());
                         map.put("email", email);
                         map.put("img", "\\src\\main\\resources\\mail\\logo.png");
-                        map.put("value2", "aaa");
-                        map.put("value3", "http://localhost:8086/identificationCode");
+                        map.put("value2",name);
                         mailUtils.sendEmailMessage(map);
                     }
                 }
-            });
-            syneryCCService.saveBatch(synery_ccs);
-        }
-        //发送邮件部分
-        String code = DataUtils.generateShortUuid();
-        SyneryCode syneryCode = new SyneryCode();
-        syneryCode.setCode(code);
-        syneryCode.setTaskId(task.getId());
-        syneryCode.insert();
-        if (syneryVO.getHandlePersonId() != null) {
-            String resBody = outInterfaceService.getPersonnelByIdsFromPCS(Arrays.asList(task.getHandlePersonId()));
-            JSONObject jsonObject = JSONObject.parseObject(resBody);
-            //解析jason获得标的专利的权要
-            List<Personnel> personnels = JSON.parseArray(jsonObject.getString("data"), Personnel.class);
-            map.put("value1", personnels.get(0).getPersonnelName());
-            map.put("email", personnels.get(0).getPersonnelEmail());
-            map.put("img", "\\src\\main\\resources\\mail\\logo.png");
-            map.put("value2", syneryCode.getCode());
-            map.put("value3", "http://localhost:8086/Incomplete?taskId=" + task.getId() + "&reportId=" + task.getReportId() + "&type=1" + "&reportType=" + report.getType());
-            mailUtils.sendEmailMessage(map);
-        } else {
-            String orgin = syneryVO.getPersonEmail();
-            String parStr = "\\<([^}]*)\\>";
-            Pattern pattern = Pattern.compile(parStr);
-            Matcher matcher = pattern.matcher(orgin);
-            if (matcher.find()) {
-                String personName = orgin.substring(0, matcher.start());
-                String email = matcher.group(0);
-                email = email.replace("<", "");
-                email = email.replace(">", "");
-                map.put("value1", personName);
-                map.put("email", email);
-                map.put("img", "\\src\\main\\resources\\mail\\logo.png");
-                map.put("value2", syneryCode.getCode());
-                map.put("value3", "http://localhost:8086/identificationCode");
-                mailUtils.sendEmailMessage(map);
             }
+            syneryCCService.saveBatch(synery_ccs);
         }
-
         return Response.success();
     }
 
@@ -1024,13 +1022,13 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
             JSONObject jsonObject1 = JSONObject.parseObject(res1);
             //解析jason获得标的专利的权要
             List<Personnel> personnels = JSON.parseArray(jsonObject1.getString("data"), Personnel.class);
-            for (Integer key : personMap.keySet()) {
-                TaskSourceVO.personDate tem = personMap.get(key);
+            for(Integer key: personMap.keySet()){
+                TaskSourceVO.personDate tem =personMap.get(key);
                 tem.setPersonId(key);
-                Personnel personnel = personnels.stream().
+               Personnel personnel = personnels.stream().
                         filter(te -> te.getId().equals(key)).findFirst().orElse(new Personnel());
-                tem.setPersonName(personnel.getPersonnelName());
-                lists.add(tem);
+               tem.setPersonName(personnel.getPersonnelName());
+               lists.add(tem);
             }
             vo.setNotAssignNum(comPatentNosCopy.size());
             vo.setPersonDates(lists);

RMS/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 server:
   servlet:
     context-path: /
-  port: 8885
+  port: 8872
 sa-token:
   activity-timeout: 18000
   token-name: token
@@ -43,7 +43,7 @@ spring:
       max-file-size: 1000MB
       max-request-size: 1000MB
   profiles:
-    active: dev
+    active: prod2.0
   jackson:
     default-property-inclusion: non_null
     serialization: