Merge remote-tracking branch 'origin/master'

hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/ThreadConfig.java

@@ -0,0 +1,36 @@
+package com.hnac.hzims.operational.config;
+
+import com.hnac.hzims.operational.propperties.ThreadPoolConfigProperties;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/5/10 12:49
+ */
+@Configuration
+public class ThreadConfig {
+
+    @Autowired
+    private ThreadPoolConfigProperties threadPoolConfigProperties;
+
+    @Bean
+    public ThreadPoolExecutor threadPoolExecutor() {
+        return new ThreadPoolExecutor(threadPoolConfigProperties.getCorePoolSize(),
+                threadPoolConfigProperties.getMaxSize(),
+                threadPoolConfigProperties.getKeepAliveTime(),
+                TimeUnit.SECONDS,
+                new LinkedBlockingDeque<>(threadPoolConfigProperties.getCapacity()),
+                Executors.defaultThreadFactory(),
+                new ThreadPoolExecutor.AbortPolicy());
+    }
+
+}

hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceServiceImpl.java

@@ -37,8 +37,12 @@ import org.springblade.system.feign.ISysClient;
 import org.springblade.system.user.cache.UserCache;
 import org.springblade.system.user.entity.User;
 import org.springframework.beans.BeanUtils;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
 
 import java.time.Instant;
 import java.time.LocalDate;
@@ -46,6 +50,9 @@ import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ThreadPoolExecutor;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -71,6 +78,11 @@ public class MaintenanceServiceImpl implements MaintenanceService {
     private final IFlowClient flowClient;
     private final ISysClient sysClient;
 
+    private final ThreadPoolExecutor executor;
+
+
+    private final DataSourceTransactionManager dataSourceTransactionManager;
+
     /**
      * 日常维护生成任务
      *
@@ -79,17 +91,13 @@ public class MaintenanceServiceImpl implements MaintenanceService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void createTask(List<String> ids) {
+        try {
             //获取日常维护计划
             LambdaQueryWrapper<OperMaintenancePlanEntity> planEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
             planEntityLambdaQueryWrapper.in(BaseEntity::getId, ids);
-        List<OperMaintenancePlanEntity> planEntities = maintenancePlanService
+            List<OperMaintenancePlanEntity> planEntities = maintenancePlanService.list(planEntityLambdaQueryWrapper);
-                .list(planEntityLambdaQueryWrapper);
             //筛选当月没生成任务的计划
-        List<OperMaintenancePlanEntity> finalPlanEntities = planEntities.stream().filter(planEntity ->
+            List<OperMaintenancePlanEntity> finalPlanEntities = planEntities.stream().filter(planEntity -> ObjectUtil.isEmpty(planEntity.getCreateTaskTime()) || !DateUtil.judgeSameDay(DateUtil.DateToLocalDateTime(planEntity.getCreateTaskTime()), LocalDate.now())).collect(Collectors.toList());
-                ObjectUtil.isEmpty(planEntity.getCreateTaskTime())
-                        || !DateUtil.judgeSameDay(
-                        DateUtil.DateToLocalDateTime(planEntity.getCreateTaskTime()), LocalDate.now())
-        ).collect(Collectors.toList());
             if (CollectionUtil.isEmpty(finalPlanEntities)) {
                 throw new ServiceException("所选计划当天已生成任务");
             }
@@ -97,8 +105,7 @@ public class MaintenanceServiceImpl implements MaintenanceService {
                 // 通过计划生成任务
                 this.createTaskByPlan(finalPlanEntity);
                 //更新任务派发时间
-            LambdaUpdateWrapper<OperMaintenancePlanEntity> planEntityLambdaUpdateWrapper =
+                LambdaUpdateWrapper<OperMaintenancePlanEntity> planEntityLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
-                    new LambdaUpdateWrapper<>();
                 planEntityLambdaUpdateWrapper.set(OperMaintenancePlanEntity::getCreateTaskTime, new Date());
                 planEntityLambdaUpdateWrapper.eq(OperMaintenancePlanEntity::getId, finalPlanEntity.getId());
                 boolean update = maintenancePlanService.update(planEntityLambdaUpdateWrapper);
@@ -107,6 +114,9 @@ public class MaintenanceServiceImpl implements MaintenanceService {
                     throw new ServiceException("更新任务派发失败");
                 }
             }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     /**
@@ -117,6 +127,7 @@ public class MaintenanceServiceImpl implements MaintenanceService {
     @Override
     @Transactional(rollbackFor = RuntimeException.class)
     public void findPending(ProcessWorkFlowResponse response) {
+        try {
             log.info("获取businessKey: {}", response.getBusinessKey());
             log.info("获取taskId: {} ", response.getTaskId());
             log.info("获取下一个审批人是: {} ", response.getNextStepOperator());
@@ -129,8 +140,8 @@ public class MaintenanceServiceImpl implements MaintenanceService {
             OperMaintenanceTaskEntityVo standardTicketInfoVo = null;
             try {
                 JSONObject jsonObject = JSONObject.parseObject(formData);
-            standardTicketInfoVo = JSONObject.parseObject(jsonObject.getString("operMaintenanceTaskEntityVo"),
+                standardTicketInfoVo = JSONObject.parseObject(jsonObject.getString("operMaintenanceTaskEntityVo"), new TypeReference<OperMaintenanceTaskEntityVo>() {
-                    new TypeReference<OperMaintenanceTaskEntityVo>(){});
+                });
                 // standardTicketInfoVo = (OperMaintenanceTaskEntityVo) jsonObject.get("operMaintenanceTaskEntityVo");
                 // standardTicketInfoVo = JSONObject.toJavaObject(jsonObject, OperMaintenanceTaskEntityVo.class);
             } catch (Exception e) {
@@ -196,10 +207,7 @@ public class MaintenanceServiceImpl implements MaintenanceService {
                 businessMessageDTO.setTaskId(dbOperMaintenanceTaskEntity.getId());
                 businessMessageDTO.setTenantId("200000");
                 //您有一张工作票待审批，工作内容：*****，审批环节：*****；
-            String countent =
+                String countent = "您有一条日常维护任务待审批,工作内容：".concat(dbOperMaintenanceTaskEntity.getTitle()).concat("，审批环节：").concat(response.getTaskName());
-                    "您有一条日常维护任务待审批,工作内容：".concat(dbOperMaintenanceTaskEntity.getTitle())
-                            .concat("，审批环节：")
-                            .concat(response.getTaskName());
                 businessMessageDTO.setContent(countent);
                 businessMessageDTO.setDeptId(dbOperMaintenanceTaskEntity.getCreateDept());
                 R<String> deptName = sysClient.getDeptName(dbOperMaintenanceTaskEntity.getCreateDept());
@@ -219,6 +227,9 @@ public class MaintenanceServiceImpl implements MaintenanceService {
                 }
                 log.info("推送成功~");
             }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
 
@@ -281,6 +292,9 @@ public class MaintenanceServiceImpl implements MaintenanceService {
      * @param finalPlanEntity
      */
     private void fillTask(OperMaintenanceTaskEntity taskEntity, OperMaintenancePlanEntity finalPlanEntity) {
+        DefaultTransactionDefinition defaultTransactionDefinition = new DefaultTransactionDefinition();
+        defaultTransactionDefinition.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
+        TransactionStatus transaction = dataSourceTransactionManager.getTransaction(defaultTransactionDefinition);
         taskEntity.setId(null);
         taskEntity.setCreateTime(new Date());
         taskEntity.setUpdateTime(new Date());
@@ -299,8 +313,7 @@ public class MaintenanceServiceImpl implements MaintenanceService {
         if (ObjectUtil.isNotEmpty(finalPlanEntity.getMaintenanceModel()) && finalPlanEntity.getMaintenanceModel() == 2) {
             //查询值班信息
             LambdaQueryWrapper<ImsDutyMainEntity> entityLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            entityLambdaQueryWrapper.eq(ImsDutyMainEntity::getDutyDate,
+            entityLambdaQueryWrapper.eq(ImsDutyMainEntity::getDutyDate, DateTimeFormatter.ofPattern(PATTERN_DATE).format(disposeTime));
-                    DateTimeFormatter.ofPattern(PATTERN_DATE).format(disposeTime));
             entityLambdaQueryWrapper.eq(ImsDutyMainEntity::getClassId, finalPlanEntity.getImsDutyClassId());
             ImsDutyMainEntity entity = mainService.getOne(entityLambdaQueryWrapper);
             if (ObjectUtil.isNotEmpty(entity) && StringUtils.isNotEmpty(entity.getDutyPersonIds())) {
@@ -312,16 +325,26 @@ public class MaintenanceServiceImpl implements MaintenanceService {
             }
         }
         taskService.save(taskEntity);
-        //生成工作流实例
+        dataSourceTransactionManager.commit(transaction);
+        //启动流程
         String processInstanceId = this.startProcess(finalPlanEntity.getProcDefId(), taskEntity);
+        //推送消息
+        CompletableFuture<Void> operMaintenanceTaskEntityCompletableFuture =
+                CompletableFuture.runAsync(() -> {
                     taskEntity.setProcessInstanceId(processInstanceId);
                     taskService.updateById(taskEntity);
                     finalPlanEntity.setCreateTaskTime(new Date());
                     maintenancePlanService.updateById(finalPlanEntity);
-
+                    OperMaintenanceTaskEntity maintenanceTask = taskService.getById(taskEntity.getId());
-        taskEntity = taskService.getById(taskEntity.getId());
                     //推送消息
-        this.pushTaskMessage(taskEntity);
+                    this.pushTaskMessage(maintenanceTask);
+                }, executor);
+        //启动队列
+        try {
+            CompletableFuture.allOf(operMaintenanceTaskEntityCompletableFuture).get();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
     }
 
@@ -343,10 +366,7 @@ public class MaintenanceServiceImpl implements MaintenanceService {
         params.put("initUserIds", taskUsers);
         params.put("operMaintenanceTaskEntityVo", operMaintenanceTaskEntityVo);
 
-        return flowClient.startProcessInstanceContainNameByKey(processDefinitionKey,
+        return flowClient.startProcessInstanceContainNameByKey(processDefinitionKey, String.valueOf(taskEntity.getId()), taskEntity.getTitle(), params).getData().getProcessInstanceId();
-                        String.valueOf(taskEntity.getId()), taskEntity.getTitle(), params)
-                .getData()
-                .getProcessInstanceId();
     }
 
 

hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceMonitorServiceImpl.java

@@ -21,6 +21,8 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.YearMonth;
+import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -46,7 +48,7 @@ public class OperMaintenanceMonitorServiceImpl implements IOperMaintenanceMonito
 			// Date startTime = DateUtil.parse(DateUtil.format(DateUtil.now(), "yyyy-MM") + "-01", DateUtil.PATTERN_DATE);
 			eq(OperMaintenancePlanEntity::getIsDeleted, 0L);
 			ge(OperMaintenancePlanEntity::getDisposeTime, startDate);
-			lt(OperMaintenancePlanEntity::getDisposeTime, startDate.withDayOfMonth(startDate.getMonth().maxLength()));
+			lt(OperMaintenancePlanEntity::getDisposeTime, startDate.with(TemporalAdjusters.lastDayOfMonth()));
 		}});
 
 		//获取列表班次ID集合

hzims-service/operational/src/main/java/com/hnac/hzims/operational/propperties/ThreadPoolConfigProperties.java

@@ -0,0 +1,32 @@
+package com.hnac.hzims.operational.propperties;
+
+import lombok.Data;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ *
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/5/10 12:51
+ */
+@Configuration
+@Data
+public class ThreadPoolConfigProperties {
+    /**
+     * 核心数
+     */
+    private Integer corePoolSize = 20;
+    /**
+     * 最大数
+     */
+    private Integer maxSize =  200;
+    /**
+     * 存活时间
+     */
+    private Integer keepAliveTime = 20;
+    /**
+     * 容量
+     */
+    private Integer capacity = 10000;
+}

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java

@@ -249,6 +249,8 @@ public class TicketProcessServiceImpl implements TicketProcessService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void findPending(ProcessWorkFlowResponse response) {
+
+        try {
             log.info("获取待处理的数据 {}", response);
             log.info("获取businessKey: {}", response.getBusinessKey());
             log.info("获取taskId: {}", response.getTaskId());
@@ -478,6 +480,9 @@ public class TicketProcessServiceImpl implements TicketProcessService {
                 }
                 log.info("推送成功~");
             }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
     }