Merge remote-tracking branch 'origin/master' into prod_test

src/main/java/cn/cslg/pas/controller/CommonController.java

@@ -158,7 +158,7 @@ public class CommonController {
         qrtzTaskDTO.setQuartzVO(quartzVO);
         qrtzTaskDTO.setJobClass("cn.cslg.pas.service.quartzService.SysImportPatentJobService");
         qrtzTaskDTO.setCron("0 0 0 * * ? *");
-        //qrtzTaskDTO.setCron("0/10 * * * * ?");
+//     qrtzTaskDTO.setCron("0/10 * * * * ?");
         jobService.addJob(qrtzTaskDTO);
         return Response.success("");
     }

src/main/java/cn/cslg/pas/service/MailSendService.java

@@ -7,6 +7,7 @@ import cn.cslg.pas.domain.business.ImportTask;
 import cn.cslg.pas.domain.business.ImportTaskCondition;
 import cn.cslg.pas.domain.business.Project;
 import cn.cslg.pas.domain.business.SystemDict;
+import cn.cslg.pas.service.business.AssoProjectPersonService;
 import cn.cslg.pas.service.business.ImportTaskConditionService;
 import cn.cslg.pas.service.business.ProjectService;
 import cn.cslg.pas.service.business.SystemDictService;
@@ -36,7 +37,8 @@ public class MailSendService {
     private ProjectService projectService;
     @Autowired
     private SystemDictService systemDictService;
-
+    @Autowired
+    private AssoProjectPersonService assoProjectPersonService;
     //发送协同邮件
     public String sendSynery(String personId, Boolean ifInner, Integer projectId, Integer taskId, Integer reportType, String code) {
         Map<String, Object> map = new LinkedHashMap<>();
@@ -164,16 +166,33 @@ public class MailSendService {
         ImportTaskCondition importTaskCondition = importTaskConditionService.getById(importTask.getImportTaskConditionId());
         Integer projectId = importTaskCondition.getProjectId();
         Project project = projectService.getById(projectId);
-        String personId = importTask.getCreateId();
+      List<String> personIds=  assoProjectPersonService.getProjectShareIds(projectId);
+           String createId=  project.getCreateId();
+           String handlerId =project.getHeadId();
+          if(createId!=null&&!createId.trim().equals("")){
+              personIds.add(createId);
+          }
+          if(handlerId!=null&&!handlerId.trim().equals("")){
+              personIds.add(handlerId);
+          }
+          if(personIds.size()==0){
+              return;
+          }
         String res = "";
         try {
-            res = permissionService.getPersonnelByIdsFromPCS(Arrays.asList(personId));
+            res = permissionService.getPersonnelByIdsFromPCS(personIds);
         } catch (Exception e) {
+            e.printStackTrace();
         }
         if (!res.equals("")) {
             JSONObject jsonObject = JSONObject.parseObject(res);
             List<Personnel> personnels = JSON.parseArray(jsonObject.getString("data"), Personnel.class);
-            Personnel personnel = personnels.get(0);
+            LambdaQueryWrapper<SystemDict> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.in(SystemDict::getType, "CYCLE_IMPORT_BCC");
+            List<SystemDict> systemDictList = systemDictService.list(queryWrapper);
+
+
+            for (Personnel personnel:personnels){
             Map<String, Object> map = new LinkedHashMap<>();
             map.put("title", "监控通知");
             map.put("template", "mail/cycleTaskDone.html");
@@ -181,6 +200,14 @@ public class MailSendService {
             map.put("img", "/logo.png");
             map.put("email", personnel.getPersonnelEmail());
             map.put("value2", project.getName());
+
+                if (systemDictList.size() > 0&&personnel.getId().equals(createId)) {
+                    String[] bcs = new String[systemDictList.size()];
+                    for (int i = 0; i <= systemDictList.size()-1; i++) {
+                        bcs[i] = systemDictList.get(i).getValue();
+                    }
+                    map.put("bcc", bcs);
+                }
             String dateRange = "";
             if (importTask != null) {
                 if (importTask.getLastUpdateToDate() != null) {
@@ -200,19 +227,9 @@ public class MailSendService {
             map.put("value3", dateRange);
             map.put("value4", importTask.getAllNum());
 
-            LambdaQueryWrapper<SystemDict> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.in(SystemDict::getType, "CYCLE_IMPORT_BCC");
-            List<SystemDict> systemDictList = systemDictService.list(queryWrapper);
-
-            if (systemDictList.size() > 0) {
-                String[] bcs = new String[systemDictList.size()];
-                for (int i = 0; i < systemDictList.size(); i++) {
-                    bcs[i] = systemDictList.get(i).getValue();
-                }
-                map.put("bcc", bcs);
-            }
             rabbitMQUtils.sendEmailMessage(map);
         }
+        }
     }
 
     public void sendSysCycleStartEmail() {
@@ -231,7 +248,7 @@ public class MailSendService {
             map.put("email", systemDict.getValue());
             if (systemDictList.size() > 0) {
                 String[] ccs = new String[systemDictList.size()];
-                for (int i = 0; i < systemDictList.size(); i++) {
+                for (int i = 0; i <= systemDictList.size()-1; i++) {
                     ccs[i] = systemDictList.get(i).getValue();
                 }
                 map.put("cc", ccs);

src/main/java/cn/cslg/pas/service/business/AssoProjectPersonService.java

@@ -175,38 +175,48 @@ public class AssoProjectPersonService extends ServiceImpl<AssoProjectPersonMappe
         PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
 
         Integer roleType = personnelVO.getRoleType();
-        Integer tenantId =personnelVO.getTenantId();
-        if(roleType!=null&&roleType.equals(1))
-        {
-       return  null;
+        Integer tenantId = personnelVO.getTenantId();
+        if (roleType != null && roleType.equals(1)) {
+            return null;
         }
 
         String createId = personnelVO.getId();
         List<Integer> ids = new ArrayList<>();
         LambdaQueryWrapper<Project> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.select(Project::getId);
-        if(roleType!=null&&roleType.equals(2)){
+        if (roleType != null && roleType.equals(2)) {
             queryWrapper.eq(Project::getTenantId, tenantId);
-        }
-        else {
+        } else {
             queryWrapper.eq(Project::getCreateId, createId);
         }
         queryWrapper.eq(Project::getCreateId, createId)
                 .or().eq(Project::getHeadId, createId);
-        List<Project> projects =projectService.list(queryWrapper);
+        List<Project> projects = projectService.list(queryWrapper);
 
-        if(projects!=null&&projects.size()>0){
-            List<Integer> temIds =projects.stream().map(Project::getId).collect(Collectors.toList());
+        if (projects != null && projects.size() > 0) {
+            List<Integer> temIds = projects.stream().map(Project::getId).collect(Collectors.toList());
             ids.addAll(temIds);
         }
-        LambdaQueryWrapper<AssoProjectPerson> queryWrapper1 =new LambdaQueryWrapper<>();
+        LambdaQueryWrapper<AssoProjectPerson> queryWrapper1 = new LambdaQueryWrapper<>();
         queryWrapper1.select(AssoProjectPerson::getProjectId);
-        queryWrapper1.eq(AssoProjectPerson::getPersonId,createId);
-        List<AssoProjectPerson> assoProjectPersonList =this.list(queryWrapper1);
-        if(assoProjectPersonList!=null&&assoProjectPersonList.size()>0){
-            List<Integer> temIds =assoProjectPersonList.stream().map(AssoProjectPerson::getProjectId).collect(Collectors.toList());
+        queryWrapper1.eq(AssoProjectPerson::getPersonId, createId);
+        List<AssoProjectPerson> assoProjectPersonList = this.list(queryWrapper1);
+        if (assoProjectPersonList != null && assoProjectPersonList.size() > 0) {
+            List<Integer> temIds = assoProjectPersonList.stream().map(AssoProjectPerson::getProjectId).collect(Collectors.toList());
             ids.addAll(temIds);
         }
-         return  ids;
+        return ids;
+    }
+
+
+    public List<String> getProjectShareIds(Integer projectId) {
+        List<String> personIds = new ArrayList<>();
+        LambdaQueryWrapper<AssoProjectPerson> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AssoProjectPerson::getProjectId, projectId);
+        List<AssoProjectPerson> assoProjectPersonList = this.list(queryWrapper);
+        if (assoProjectPersonList != null && assoProjectPersonList.size() > 0) {
+            personIds = assoProjectPersonList.stream().map(AssoProjectPerson::getPersonId).collect(Collectors.toList());
+        }
+        return personIds;
     }
 }

src/main/java/cn/cslg/pas/service/business/ImportTaskService.java

@@ -570,9 +570,9 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
             case Cycle.WEEK:
                 LocalDate localDateWeek = null;
                 if (dbType != null && dbType.equals("CN")) {
-                    localDateWeek = localDate.minusMonths(1).minusWeeks(1);
-                } else {
                     localDateWeek = localDate.minusWeeks(1);
+                } else {
+                    localDateWeek = localDate.minusMonths(1).minusWeeks(1);
 
                 }
                 dateRange = DateUtils2.getWeekRange(localDateWeek);

src/main/java/cn/cslg/pas/service/business/InvalidRecordService.java

@@ -238,7 +238,7 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
             //先删除附件
             LambdaQueryWrapper<AssoOtherPatentInfoFile> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.in(AssoOtherPatentInfoFile::getOtherPatentInfoId, ids)
-                    .eq(AssoOtherPatentInfoFile::getType, 5);
+                    .eq(AssoOtherPatentInfoFile::getType, 6);
             assoOtherPatentInfoFileService.remove(queryWrapper);
             this.removeBatchByIds(ids);
         }

src/main/java/cn/cslg/pas/service/business/SystemDictService.java

@@ -27,22 +27,16 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class SystemDictService extends ServiceImpl<SystemDictMapper, SystemDict> {
 
-    public Map<String, List<SystemDict>> getOsSystemDict(List<String> types){
+    public Map<String, List<SystemDict>> getOsSystemDict(List<String> types) {
         Map<String, List<SystemDict>> systemDictMap = new HashMap<>();
-        if (types != null && types.size() != 0) {
-            types.forEach(item -> {
-                LambdaQueryWrapper<SystemDict> queryWrapper = new LambdaQueryWrapper<>();
-                queryWrapper.eq(SystemDict::getType, item);
-                systemDictMap.put(item,this.list(queryWrapper));
-            });
-        } else {
-            types = this.list().stream().map(SystemDict::getType).collect(Collectors.toList());
-            types.forEach(item -> {
-                LambdaQueryWrapper<SystemDict> queryWrapper = new LambdaQueryWrapper<>();
-                queryWrapper.eq(SystemDict::getType, item);
-                systemDictMap.put(item,this.list(queryWrapper));
-            });
-        }
+        LambdaQueryWrapper<SystemDict> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.in(SystemDict::getType, types);
+        List<SystemDict> systemDictList = this.list(queryWrapper);
+        types.forEach(item -> {
+            List<SystemDict> systemDictList1 = systemDictList.stream().filter(t -> t.getType().equals(item)).collect(Collectors.toList());
+            systemDictMap.put(item, systemDictList1);
+
+        });
         return systemDictMap;
     }
 
@@ -71,10 +65,9 @@ public class SystemDictService extends ServiceImpl<SystemDictMapper, SystemDict>
         LambdaQueryWrapper<SystemDict> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.select(SystemDict::getValue);
         queryWrapper.eq(SystemDict::getType, "ENTERPRISE_APPLICATION_SCENARIO");
-        if(orderType!=null&&orderType.equals(0)){
+        if (orderType != null && orderType.equals(0)) {
             queryWrapper.orderByAsc(SystemDict::getLabel);
-        }
-        else{
+        } else {
             queryWrapper.orderByDesc(SystemDict::getLabel);
         }
         java.util.function.Function<Object, String> f = (o -> o.toString());
@@ -86,10 +79,9 @@ public class SystemDictService extends ServiceImpl<SystemDictMapper, SystemDict>
         LambdaQueryWrapper<SystemDict> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.select(SystemDict::getValue);
         queryWrapper.eq(SystemDict::getGroupType, "ASSESS");
-        if(orderType.equals(0)){
+        if (orderType.equals(0)) {
             queryWrapper.orderByAsc(SystemDict::getLabel);
-        }
-        else{
+        } else {
             queryWrapper.orderByDesc(SystemDict::getLabel);
         }
         java.util.function.Function<Object, String> f = (o -> o.toString());
@@ -99,22 +91,21 @@ public class SystemDictService extends ServiceImpl<SystemDictMapper, SystemDict>
 
 
     public List<SystemDict> getCrons(Integer reportType) {
-        String type ="";
-        if(reportType==null){
-            type="";
-            reportType=-1;
+        String type = "";
+        if (reportType == null) {
+            type = "";
+            reportType = -1;
         }
 
-        switch (reportType){
+        switch (reportType) {
             case 0:
-                type="INVALID_ASSESS";
+                type = "INVALID_ASSESS";
                 break;
         }
         LambdaQueryWrapper<SystemDict> queryWrapper = new LambdaQueryWrapper<>();
-        if(type.equals("")){
+        if (type.equals("")) {
             queryWrapper.eq(SystemDict::getGroupType, "ASSESS");
-        }
-        else {
+        } else {
             queryWrapper.eq(SystemDict::getType, type);
         }
         List<SystemDict> systemDictList = this.list(queryWrapper);

src/main/java/cn/cslg/pas/service/quartzService/SysImportPatentJobService.java

@@ -34,7 +34,9 @@ public class SysImportPatentJobService extends QuartzJobBean {
 
     @Override
     public void executeInternal(JobExecutionContext context) throws JobExecutionException {
+
         mailSendService.sendSysCycleStartEmail();
+        System.out.println("task start");
         this.addChinesePatent();
 
     }

src/main/resources/application-dev.yml

@@ -31,38 +31,37 @@ spring:
         exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
   quartz:
     #相关属性配置
-    properties:
-      org:
-        quartz:
-          scheduler:
-            instanceName: DefaultQuartzScheduler
-            instanceId: AUTO
-          jobStore:
-            class: org.springframework.scheduling.quartz.LocalDataSourceJobStore
-            driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
-            tablePrefix: QRTZ_
-            isClustered: false
-            clusterCheckinInterval: 10000
-            useProperties: false
-          threadPool:
-            class: org.quartz.simpl.SimpleThreadPool
-            threadCount: 10
-            threadPriority: 5
-            threadsInheritContextClassLoaderOfInitializingThread: true
-          dataSource:
-            default:
-              URL: jdbc:mysql://192.168.2.24:3306/pas_prod2?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
-              user: root
-              password: rrzTwWAYX8Gxh5JH
-              driver: com.mysql.jdbc.Driver
+#    properties:
+#      org:
+#        quartz:
+#          scheduler:
+#            instanceName: DefaultQuartzScheduler
+#            instanceId: AUTO
+#          jobStore:
+#            class: org.springframework.scheduling.quartz.LocalDataSourceJobStore
+#            driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
+#            tablePrefix: QRTZ_
+#            isClustered: false
+#            clusterCheckinInterval: 10000
+#            useProperties: false
+#          threadPool:
+#            class: org.quartz.simpl.SimpleThreadPool
+#            threadCount: 10
+#            threadPriority: 5
+#            threadsInheritContextClassLoaderOfInitializingThread: true
+#          dataSource:
+#            default:
+#              URL: jdbc:mysql://192.168.2.24:3306/pas_prod2?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+#              user: root
+#              password: rrzTwWAYX8Gxh5JH
+#              driver: com.mysql.jdbc.Driver
 
     #数据库方式
-    job-store-type: jdbc
+    job-store-type: memory
     #初始化表结构
-    jdbc:
-      initialize-schema:  never
-authorUrl: http://localhost:8885
-PCSUrl: http://localhost:8885
+
+authorUrl: http://localhost:8880
+PCSUrl: http://localhost:8880
 #OPSUrl: http://192.168.2.24:5001
 OPSUrl: http://139.224.24.90:5001
 PASUrl: http://localhost:8879