优化

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/controller/CoreEvaluatePlanController.java

@@ -21,8 +21,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
-import java.time.LocalDate;
 import java.util.List;
 
 /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/controller/CoreEvaluateTaskController.java

@@ -20,7 +20,6 @@ import com.xunmei.core.evaluate.service.ICoreEvaluatePlanService;
 import com.xunmei.core.evaluate.service.ICoreEvaluateTaskService;
 import com.xunmei.core.evaluate.vo.CoreEvaluatePlanVO;
 import com.xunmei.core.evaluate.vo.CoreEvaluateTaskVO;
-import com.xunmei.core.reportForms.monitor.dto.MonitoringAccessDTO;
 import com.xunmei.core.reportForms.resumption.service.impl.ResumptionReportServiceImpl;
 import com.xunmei.core.retrieval.service.impl.CoreMonitoringRetrievalTaskServiceImpl;
 import com.xunmei.system.api.RemoteOrgService;
@@ -36,8 +35,6 @@ import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.util.Date;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 外包评价任务Controller
@@ -59,7 +56,13 @@ public class CoreEvaluateTaskController extends BaseController {
     private RemoteOrgService remoteOrgService;
     @Autowired
     private ResumptionReportServiceImpl resumptionReportService;
-
+    private static String FORMAT_SECOND = "yyyy-MM-dd HH:mm:ss";
+    private static String FORMAT_MILLISECOND = "yyyy-MM-dd HH:mm:ss.SSS";
+    private static String FORMAT_FIRST = "-01 00:00:00";
+    private static String FORMAT_DAY="yyyy-MM-dd";
+    private static String FORMAT_LAST=  " 23:59:59";
+    private static String FORMAT_DAY_FIRST="-01-01 00:00:00";
+    private static String FORMAT_DAY_LAST="-12-31 23:59:59";
     /**
      * 查询外包评价任务列表
      */
@@ -91,9 +94,9 @@ public class CoreEvaluateTaskController extends BaseController {
             try {
                 switch (coreEvaluatePlanVO.getEvaluateCycle()) {
                     case "0":
-                        evaluateTaskStatisticsDTO.setStartTime(DateUtils.parseDate(localDate.getYear() + "-" + localDate.getMonthValue() + "-01 00:00:00", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm:ss.SSS"));
-                        String lastDay = coreMonitoringRetrievalTaskService.getLastDay(localDate.getYear(), localDate.getMonthValue(), "yyyy-MM-dd");
-                        evaluateTaskStatisticsDTO.setEndTime(DateUtils.parseDate(lastDay + " 23:59:59", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm:ss.SSS"));
+                        evaluateTaskStatisticsDTO.setStartTime(DateUtils.parseDate(localDate.getYear() + "-" + localDate.getMonthValue() + FORMAT_FIRST, FORMAT_SECOND, FORMAT_MILLISECOND));
+                        String lastDay = coreMonitoringRetrievalTaskService.getLastDay(localDate.getYear(), localDate.getMonthValue(), FORMAT_DAY);
+                        evaluateTaskStatisticsDTO.setEndTime(DateUtils.parseDate(lastDay + FORMAT_LAST, FORMAT_SECOND, FORMAT_MILLISECOND));
                         break;
                     case "1":
                         DateTime beginOfQuarter = DateUtil.beginOfQuarter(new java.util.Date());
@@ -102,8 +105,8 @@ public class CoreEvaluateTaskController extends BaseController {
                         evaluateTaskStatisticsDTO.setEndTime(endOfQuarter);
                         break;
                     default:
-                        evaluateTaskStatisticsDTO.setStartTime(DateUtils.parseDate(localDate.getYear() + "-01-01 00:00:00", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm:ss.SSS"));
-                        evaluateTaskStatisticsDTO.setEndTime(DateUtils.parseDate(localDate.getYear() + "-12-31 23:59:59", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm:ss.SSS"));
+                        evaluateTaskStatisticsDTO.setStartTime(DateUtils.parseDate(localDate.getYear() + FORMAT_DAY_FIRST, FORMAT_SECOND, FORMAT_MILLISECOND));
+                        evaluateTaskStatisticsDTO.setEndTime(DateUtils.parseDate(localDate.getYear() + FORMAT_DAY_LAST, FORMAT_SECOND, FORMAT_MILLISECOND));
                         break;
                 }
             } catch (Exception e) {
@@ -131,16 +134,16 @@ public class CoreEvaluateTaskController extends BaseController {
                 switch (coreEvaluatePlanVO.getEvaluateCycle()) {
                     case "0":
                         if (StringUtils.isEmpty(evaluateTaskStatisticsDTO.getSearchTime())) {
-                            evaluateTaskStatisticsDTO.setStartTime(DateUtils.parseDate(localDate.getYear() + "-" + localDate.getMonthValue() + "-01 00:00:00", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm:ss.SSS"));
-                            String lastDay = coreMonitoringRetrievalTaskService.getLastDay(localDate.getYear(), localDate.getMonthValue(), "yyyy-MM-dd");
-                            evaluateTaskStatisticsDTO.setEndTime(DateUtils.parseDate(lastDay + " 23:59:59", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm:ss.SSS"));
+                            evaluateTaskStatisticsDTO.setStartTime(DateUtils.parseDate(localDate.getYear() + "-" + localDate.getMonthValue() + FORMAT_FIRST, FORMAT_SECOND, FORMAT_MILLISECOND));
+                            String lastDay = coreMonitoringRetrievalTaskService.getLastDay(localDate.getYear(), localDate.getMonthValue(), FORMAT_DAY);
+                            evaluateTaskStatisticsDTO.setEndTime(DateUtils.parseDate(lastDay + FORMAT_LAST, FORMAT_SECOND, FORMAT_MILLISECOND));
                             year = String.valueOf(localDate.getYear());
                             month = String.valueOf(localDate.getMonthValue());
                         } else {
-                            evaluateTaskStatisticsDTO.setStartTime(DateUtils.parseDate(evaluateTaskStatisticsDTO.getSearchTime() + "-01 00:00:00", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm:ss.SSS"));
+                            evaluateTaskStatisticsDTO.setStartTime(DateUtils.parseDate(evaluateTaskStatisticsDTO.getSearchTime() + FORMAT_FIRST, FORMAT_SECOND, FORMAT_MILLISECOND));
                             String[] split = evaluateTaskStatisticsDTO.getSearchTime().split("-");
-                            String lastDay = coreMonitoringRetrievalTaskService.getLastDay(Integer.parseInt(split[0]), Integer.parseInt(split[1]), "yyyy-MM-dd");
-                            evaluateTaskStatisticsDTO.setEndTime(DateUtils.parseDate(lastDay + " 23:59:59", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm:ss.SSS"));
+                            String lastDay = coreMonitoringRetrievalTaskService.getLastDay(Integer.parseInt(split[0]), Integer.parseInt(split[1]), FORMAT_DAY);
+                            evaluateTaskStatisticsDTO.setEndTime(DateUtils.parseDate(lastDay + FORMAT_LAST, FORMAT_SECOND, FORMAT_MILLISECOND));
                             year = split[0];
                             month = split[1];
                         }
@@ -162,9 +165,9 @@ public class CoreEvaluateTaskController extends BaseController {
                             Date startTime = new Date();
                             Date endTime = new Date();
                             try {
-                                startTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(evaluateTaskStatisticsDTO.getSearchTime() + "-01 00:00:00");
+                                startTime = new SimpleDateFormat(FORMAT_SECOND).parse(evaluateTaskStatisticsDTO.getSearchTime() + FORMAT_FIRST);
                                 String lastDay = resumptionReportService.getLastDay(end);
-                                endTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(lastDay + " 23:59:59");
+                                endTime = new SimpleDateFormat(FORMAT_SECOND).parse(lastDay + FORMAT_LAST);
                             } catch (Exception e) {
                                 e.printStackTrace();
                             }
@@ -176,12 +179,12 @@ public class CoreEvaluateTaskController extends BaseController {
                         break;
                     default:
                         if (StringUtils.isEmpty(evaluateTaskStatisticsDTO.getSearchTime())) {
-                            evaluateTaskStatisticsDTO.setStartTime(DateUtils.parseDate(localDate.getYear() + "-01-01 00:00:00", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm:ss.SSS"));
-                            evaluateTaskStatisticsDTO.setEndTime(DateUtils.parseDate(localDate.getYear() + "-12-31 23:59:59", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm:ss.SSS"));
+                            evaluateTaskStatisticsDTO.setStartTime(DateUtils.parseDate(localDate.getYear() + FORMAT_DAY_FIRST, FORMAT_SECOND, FORMAT_MILLISECOND));
+                            evaluateTaskStatisticsDTO.setEndTime(DateUtils.parseDate(localDate.getYear() + FORMAT_DAY_LAST, FORMAT_SECOND, FORMAT_MILLISECOND));
                             year = String.valueOf(localDate.getYear());
                         } else {
-                            evaluateTaskStatisticsDTO.setStartTime(DateUtils.parseDate(evaluateTaskStatisticsDTO.getSearchTime() + "-01-01 00:00:00", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm:ss.SSS"));
-                            evaluateTaskStatisticsDTO.setEndTime(DateUtils.parseDate(evaluateTaskStatisticsDTO.getSearchTime() + "-12-31 23:59:59", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm:ss.SSS"));
+                            evaluateTaskStatisticsDTO.setStartTime(DateUtils.parseDate(evaluateTaskStatisticsDTO.getSearchTime() + FORMAT_DAY_FIRST, FORMAT_SECOND, FORMAT_MILLISECOND));
+                            evaluateTaskStatisticsDTO.setEndTime(DateUtils.parseDate(evaluateTaskStatisticsDTO.getSearchTime() + FORMAT_DAY_LAST, FORMAT_SECOND, FORMAT_MILLISECOND));
                             year = evaluateTaskStatisticsDTO.getSearchTime();
                         }
                         dateTitle = year + "年)";

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/domain/CoreEvaluateRole.java

@@ -1,7 +1,6 @@
 package com.xunmei.core.evaluate.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.xunmei.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/dto/EvaluateQueryDTO.java

@@ -1,12 +1,9 @@
 package com.xunmei.core.evaluate.dto;
 
 import com.xunmei.common.core.web.domain.BaseEntity;
-import com.xunmei.common.core.web.domain.PageRequest;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @author :LuoWei
  * @date : 2023/10/10

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/mapper/CoreEvaluateContentMapper.java

@@ -2,7 +2,6 @@ package com.xunmei.core.evaluate.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.core.evaluate.domain.CoreEvaluateContent;
-import com.xunmei.core.evaluate.domain.CoreEvaluatePlanContent;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/mapper/CoreEvaluatePlanContentMapper.java

@@ -1,17 +1,10 @@
 package com.xunmei.core.evaluate.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.xunmei.common.core.domain.retrieval.dto.RetrievalTaskPageDto;
-import com.xunmei.common.core.domain.retrieval.vo.CoreMonitoringRetrievalTaskVo;
 import com.xunmei.core.evaluate.domain.CoreEvaluatePlanContent;
-import com.xunmei.core.evaluate.dto.EvaluateQueryDTO;
-import com.xunmei.core.evaluate.vo.CoreEvaluatePlanListVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 /**
  * @author :LuoWei
  * @date : 2023/10/10

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/mapper/CoreEvaluatePlanMapper.java

@@ -6,11 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.core.evaluate.domain.CoreEvaluatePlan;
 import com.xunmei.core.evaluate.dto.EvaluateQueryDTO;
 import com.xunmei.core.evaluate.vo.CoreEvaluatePlanListVO;
-import com.xunmei.core.information.domain.CoreMessageCenter;
-import com.xunmei.core.information.dto.CoreMessageCenterDTO;
-import com.xunmei.core.information.vo.CoreMessageCenterVO;
 import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
 
 /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/mapper/CoreEvaluateRoleMapper.java

@@ -1,11 +1,9 @@
 package com.xunmei.core.evaluate.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xunmei.core.evaluate.domain.CoreEvaluatePlan;
 import com.xunmei.core.evaluate.domain.CoreEvaluateRole;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
 
 /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/mapper/CoreEvaluateTaskMapper.java

@@ -6,13 +6,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.domain.panel.dto.PanelListDto;
 import com.xunmei.common.core.domain.panel.vo.PanelListVo;
 import com.xunmei.core.evaluate.domain.CoreEvaluateTask;
-import com.xunmei.core.evaluate.dto.EvaluateQueryDTO;
 import com.xunmei.core.evaluate.dto.EvaluateTaskDTO;
 import com.xunmei.core.evaluate.dto.EvaluateTaskStatisticsDTO;
-import com.xunmei.core.evaluate.vo.CoreEvaluatePlanListVO;
 import com.xunmei.core.evaluate.vo.CoreEvaluateTaskVO;
 import org.apache.ibatis.annotations.Param;
-
 import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/mapper/CoreEvaluateTaskUserMapper.java

@@ -1,10 +1,8 @@
 package com.xunmei.core.evaluate.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xunmei.core.evaluate.domain.CoreEvaluateTaskContent;
 import com.xunmei.core.evaluate.domain.CoreEvaluateTaskUser;
 import org.apache.ibatis.annotations.Mapper;
-
 import java.util.List;
 
 /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/vo/CoreEvaluatePlanListVO.java

@@ -1,10 +1,8 @@
 package com.xunmei.core.evaluate.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
 import java.util.Date;
 
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/vo/CoreEvaluateTaskVO.java

@@ -1,12 +1,9 @@
 package com.xunmei.core.evaluate.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.xunmei.core.evaluate.domain.CoreEvaluateContent;
-import com.xunmei.core.evaluate.domain.CoreEvaluateTask;
 import com.xunmei.core.evaluate.domain.CoreEvaluateTaskContent;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
 import java.util.Date;
 import java.util.List;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/monitor/controller/MonitorAccessReportController.java

@@ -6,12 +6,9 @@ import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.log.annotation.Log;
 import com.xunmei.common.log.enums.BusinessType;
 import com.xunmei.common.security.annotation.RequiresPermissions;
-
 import com.xunmei.core.reportForms.monitor.dto.MonitoringAccessDTO;
 import com.xunmei.core.reportForms.monitor.service.MonitorAccessReportService;
-import com.xunmei.core.reportForms.monitor.service.impl.MonitorAccessReportServiceImpl;
 import com.xunmei.core.reportForms.monitor.vo.MonitoringAccessVO;
-
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.domain.SysOrg;
 import io.swagger.annotations.Api;
@@ -21,7 +18,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;