refactor: 优化代码

approve-api/src/main/java/com/dragonsoft/dcuc/approve/enumresources/FlowTypeEnum.java

@@ -1,6 +1,7 @@
 package com.dragonsoft.dcuc.approve.enumresources;
 
 import com.dragonsoft.duceap.base.enums.ICodeEnum;
+import lombok.Getter;
 
 /**
  * 权限申请类型枚举
@@ -44,6 +45,7 @@ public enum FlowTypeEnum implements ICodeEnum {
 
     private final String label;
 
+    @Getter
     private final String resourceName;
 
     FlowTypeEnum(String value, String label, String resourceName) {
@@ -63,10 +65,6 @@ public enum FlowTypeEnum implements ICodeEnum {
         return label;
     }
 
-    public String getResourceName() {
-        return resourceName;
-    }
-
     public ListResourceTypeEnum toListResourceTypeEnum() {
         switch (this) {
             case DATA_AUTH:

approve-api/src/main/java/com/dragonsoft/dcuc/approve/model/req/v3/ZeroTrustApproveTaskInfoVO.java

@@ -1,6 +1,5 @@
 package com.dragonsoft.dcuc.approve.model.req.v3;
 
-import com.dragonsoft.dcuc.approve.model.req.ResourceInfoReqVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/ApproveApplication.java

@@ -4,7 +4,6 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.scheduling.annotation.EnableScheduling;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/external/impl/BimBusinessImpl.java

@@ -172,6 +172,7 @@ public class BimBusinessImpl implements IBimBusiness {
                     if (checkTokenSign) {
                         boolean b = checkAppTokenSign(responseEntityJsonBody);
                         if (!b) {
+                            log.error("校验应用令牌前面失败");
                             return null;
                         }
                     }

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/impl/ApproveCommonBusinessImpl.java

@@ -887,7 +887,7 @@ public class ApproveCommonBusinessImpl implements IApproveCommonBusiness {
 
     @Override
     public ResponseDTO<List<ApproveCommentVo>> approveComments(String processInstanceId) {
-        if (StringUtils.isEmpty(processInstanceId) || "undefined".equalsIgnoreCase(processInstanceId)) {
+        if (StrUtil.isEmptyOrUndefined(processInstanceId)) {
             return ResponseUtil.newInstance(Collections.emptyList());
         }
 

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/impl/ApproveLogBusinessImpl.java

@@ -39,6 +39,7 @@ import com.dragonsoft.duceap.commons.util.json.JsonUtils;
 import com.dragonsoft.duceap.duwf.api.model.OutgoingVo;
 import com.dragonsoft.duceap.duwf.api.model.ProcessInstanceVO;
 import com.dragonsoft.duceap.duwf.api.model.TaskDefinitionVo;
+import com.dragonsoft.duceap.duwf.api.model.TaskHistoryDetailVo;
 import com.dragonsoft.duceap.workflow.client.WorkflowClientFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -685,8 +686,11 @@ public class ApproveLogBusinessImpl implements IApproveLogBusiness {
         String pocessDefinitionId = "";
         String taskDefinitionKey = "";
         if (processInstanceVO != null) {
-            pocessDefinitionId = processInstanceVO.getTaskHistoryDetailVo().getProcessDefinitionId();
-            taskDefinitionKey = processInstanceVO.getTaskHistoryDetailVo().getTaskDefinitionKey();
+            TaskHistoryDetailVo taskHistoryDetailVo = processInstanceVO.getTaskHistoryDetailVo();
+            if (ObjectUtil.isNotNull(taskHistoryDetailVo)) {
+                pocessDefinitionId = taskHistoryDetailVo.getProcessDefinitionId();
+                taskDefinitionKey = taskHistoryDetailVo.getTaskDefinitionKey();
+            }
         }
 
         ApprovalInfoDTO approvalInfoDTO = logDto.getApprovalInfoDTO();
@@ -705,7 +709,8 @@ public class ApproveLogBusinessImpl implements IApproveLogBusiness {
         flowManageLog.setApproveNo(approvalInfoDTO.getApproveNo());
         flowManageLog.setProcessInstanceId(processInstanceId);
         //发送审批流程管理日志到消息中心
-        logger.info("=====发送审批流程管理日志消息,消息体为：{}====", JSON.toJSONString(flowManageLog));
+        String flowManageLogJsonString = JSON.toJSONString(flowManageLog);
+        logger.info("=====发送审批流程管理日志消息,消息体为：{}====", flowManageLogJsonString);
         //审批流程管理日志类型不会涉及到审批风险，故taskKey/flowKey可以为空
         LogInfoMetaDTO logInfoMetaDTO = new LogInfoMetaDTO();
         logInfoMetaDTO.setLogType(LogTypeEnum.MANAGE_LOG.getValue());
@@ -714,7 +719,7 @@ public class ApproveLogBusinessImpl implements IApproveLogBusiness {
         logInfoMetaDTO.setProcessInstanceId(processInstanceId);
         logInfoMetaDTO.setTerminalIp(logDto.getCreateIp());
         logInfoMetaDTO.setBusinessType(manageDisposeTypeEnum.auditCode);
-        sendInfo(JSON.toJSONString(flowManageLog), "审批流程管理日志", logInfoMetaDTO);
+        sendInfo(flowManageLogJsonString, "审批流程管理日志", logInfoMetaDTO);
     }
 
 
@@ -748,7 +753,7 @@ public class ApproveLogBusinessImpl implements IApproveLogBusiness {
     /**
      * 构建日志Dto
      *
-     * @param approvalInfoDTO      审批信息
+     * @param approvalInfoDTO   审批信息
      * @param vo                实例信息
      * @param approveResultEnum 返回信息
      * @param failMsg           错误消息

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/mapper/resource/JqInfoMapper.java

@@ -1,6 +1,5 @@
 package com.dragonsoft.dcuc.approve.mapper.resource;
 
-import com.dragonsoft.dcuc.approve.model.ApproveActRunTask;
 import com.dragonsoft.dcuc.approve.model.resource.JqInfo;
 import com.dragonsoft.duceap.mybaitsplus.core.BaseMybatisMapper;
 

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/service/resource/impl/JqInfoServiceImpl.java

@@ -4,7 +4,6 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dragonsoft.dcuc.approve.mapper.resource.JqInfoMapper;
-import com.dragonsoft.dcuc.approve.model.resource.AjInfo;
 import com.dragonsoft.dcuc.approve.model.resource.JqInfo;
 import com.dragonsoft.dcuc.approve.service.resource.IJqInfoService;
 import org.springframework.beans.factory.annotation.Autowired;