Merge branch 'V0.0.5' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.0.5

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/controller/CoreMonitoringTaskMonitorInfoController.java

@@ -8,13 +8,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.xunmei.common.log.annotation.Log;
 import com.xunmei.common.log.enums.BusinessType;
-import com.xunmei.common.security.annotation.RequiresPermissions;
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import io.swagger.annotations.Api;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/controller/CoreMonitoringTaskRegistrationController.java

@@ -17,13 +17,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.xunmei.common.log.annotation.Log;
 import com.xunmei.common.log.enums.BusinessType;
-import com.xunmei.common.security.annotation.RequiresPermissions;
-
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.context.annotation.Lazy;
 
 /**
  * 【请填写功能名称】Controller

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/controller/CoreMonitoringTaskRegistrationMonitorController.java

@@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.xunmei.common.log.annotation.Log;
 import com.xunmei.common.log.enums.BusinessType;
-import com.xunmei.common.security.annotation.RequiresPermissions;
 
 
 /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/controller/TMonitoringRetrievalPlanController.java

@@ -1,8 +1,6 @@
 package com.xunmei.core.access.controller;
 
 import com.xunmei.common.core.constant.SecurityConstants;
-import com.xunmei.common.core.domain.R;
-import com.xunmei.common.core.utils.StringUtils;
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
@@ -13,14 +11,12 @@ import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.access.domain.TMonitoringRetrievalPlan;
 import com.xunmei.core.access.service.ITMonitoringRetrievalPlanService;
 import com.xunmei.core.access.vo.TMonitoringRetrievalPlanVO;
-import com.xunmei.core.reportForms.monitor.dto.MonitoringAccessDTO;
 import com.xunmei.core.reportForms.monitor.service.MonitorAccessReportService;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.RemoteRoleService;
 import com.xunmei.system.api.domain.SysOrg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -56,27 +52,7 @@ public class TMonitoringRetrievalPlanController extends BaseController {
         AjaxResult ajax = AjaxResult.success();
         TableDataInfo<TMonitoringRetrievalPlanVO> tMonitoringRetrievalPlanTableDataInfo = tMonitoringRetrievalPlanService.selectPage(tMonitoringRetrievalPlan);
         ajax.put("data", tMonitoringRetrievalPlanTableDataInfo);
-        boolean admin = false;
-        R<String> r = remoteRoleService.selectRoleNameByUserId(SecurityUtils.getUserId(), SecurityConstants.INNER);
-        String s = r.getData();
         SysOrg sysOrg = remoteOrgService.selectSysOrgById(SecurityUtils.getLoginUser().getOrgId(), SecurityConstants.INNER);
-        if (StringUtils.isNotEmpty(s)) {
-            int i = s.indexOf(",");
-            if (i >= 0) {
-                String[] split = s.split(",");
-                for (int l = 0; l < split.length; l++) {
-                    if (split[l].equals("省联社安全保卫管理人员") || split[l].equals("超级管理员") || split[l].equals("行社安全保卫管理人员")) {
-                        admin = true;
-                        break;
-                    }
-                }
-            } else if (s.equals("省联社安全保卫管理人员") || s.equals("超级管理员") || s.equals("行社安全保卫管理人员")) {
-                admin = true;
-            }
-        } else if (SecurityUtils.getUserId() == 1) {
-            admin = true;
-        }
-        //   ajax.put("check", admin);
         ajax.put("isEdit", sysOrg.getId());
         return ajax;
     }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/domain/CoreMonitoringTaskRegistration.java

@@ -6,9 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import io.swagger.annotations.ApiModel;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/dto/CoreMonitoringTaskRegistrationDTO.java

@@ -3,7 +3,6 @@ package com.xunmei.core.access.dto;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
 import com.xunmei.common.core.web.domain.PageRequest;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/mapper/CoreMonitoringTaskRegistrationMapper.java

@@ -4,7 +4,6 @@ package com.xunmei.core.access.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.core.access.domain.CoreMonitoringTaskRegistration;
 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/access/mapper/TMonitoringRetrievalPlanMapper.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.core.access.domain.TMonitoringRetrievalPlan;
 import com.xunmei.core.access.vo.AccessPdfVO;
 import com.xunmei.core.access.vo.TMonitoringRetrievalPlanVO;
-import com.xunmei.core.evaluate.dto.EvaluateTaskDTO;
-import com.xunmei.core.evaluate.vo.CoreEvaluateTaskVO;
 import com.xunmei.system.api.domain.AccessDataVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/CoreMonitoringTaskMonitorInfoServiceImpl.java

@@ -90,7 +90,7 @@ private RemoteDeviceService remoteDeviceService;
         i = coreMonitoringTaskRegistrationMonitorMapper.insert(coreMonitoringTaskMonitorInfo);
         //新增项目
         List<CoreMonitoringTaskMonitorInfo> coreMonitoringTaskMonitorInfoList = coreMonitoringTaskRegistrationMonitorDTO.getCoreMonitoringTaskMonitorInfoList();
-        if (coreMonitoringTaskMonitorInfoList!=null&&coreMonitoringTaskMonitorInfoList.size()>0) {
+        if (CollectionUtils.isNotEmpty(coreMonitoringTaskMonitorInfoList)) {
             for (CoreMonitoringTaskMonitorInfo c : coreMonitoringTaskMonitorInfoList) {
                 c.setCreateTime(DateUtils.getNowDate());
                 c.setCreateBy(SecurityUtils.getUsername());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/CoreMonitoringTaskRegistrationMonitorServiceImpl.java

@@ -147,8 +147,7 @@ public class CoreMonitoringTaskRegistrationMonitorServiceImpl extends ServiceImp
         queryWrapper.eq("task_id", taskId);
         List<CoreMonitoringTaskRegistration> list = coreMonitoringTaskRegistrationMapper.selectList(queryWrapper);
         //查询视频
-        CoreMonitoringTaskRegistrationMonitorVO coreMonitoringTaskRegistrationMonitorVO = new CoreMonitoringTaskRegistrationMonitorVO();
-        coreMonitoringTaskRegistrationMonitorVO = baseMapper.selectMonitorByInfo(taskId, hostId, videoId);
+        CoreMonitoringTaskRegistrationMonitorVO coreMonitoringTaskRegistrationMonitorVO = baseMapper.selectMonitorByInfo(taskId, hostId, videoId);
         if (null != coreMonitoringTaskRegistrationMonitorVO) {
             List<CoreMonitoringTaskMonitorInfo> coreMonitoringTaskMonitorInfos = coreMonitoringTaskMonitorInfoMapper.selectCoreMonitoringTaskMonitorInfoByMonitorId(coreMonitoringTaskRegistrationMonitorVO.getId());
             coreMonitoringTaskRegistrationMonitorVO.setCoreMonitoringTaskMonitorInfoList(coreMonitoringTaskMonitorInfos);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/vo/AccessPdfVO.java

@@ -1,8 +1,5 @@
 package com.xunmei.core.access.vo;
-
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
 import java.util.Date;
 
 /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/vo/TMonitoringRetrievalPlanVO.java

@@ -4,8 +4,6 @@ import com.xunmei.core.access.domain.TMonitoringRetrievalPlan;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @author :LuoWei
  * @date : 2023/9/5

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 + "年)";
@@ -236,6 +239,7 @@ public class CoreEvaluateTaskController extends BaseController {
     public AjaxResult edit(@RequestBody EvaluateTaskContentDTO evaluateTaskContentDTO) {
         return toAjax(coreEvaluateTaskService.updateCoreEvaluateTask(evaluateTaskContentDTO));
     }
+
     @ApiOperation(value = "web评价")
     @RequiresPermissions("core:evaluateTask:edit")
     @Log(title = "外包评价任务", businessType = BusinessType.UPDATE)
@@ -243,6 +247,7 @@ public class CoreEvaluateTaskController extends BaseController {
     public AjaxResult webEdit(@RequestBody EvaluateTaskContentDTO evaluateTaskContentDTO) {
         return toAjax(coreEvaluateTaskService.updateCoreEvaluateTask(evaluateTaskContentDTO));
     }
+
     /**
      * 删除外包评价任务
      */

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;
@@ -16,13 +15,13 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("core_evaluate_role")
-@ApiModel(value = "CoreEvaluateRole对象" , description = "外包评价计划和角色绑定")
+@ApiModel(value = "CoreEvaluateRole对象", description = "外包评价计划和角色绑定")
 public class CoreEvaluateRole {
-    private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
     @ApiModelProperty(value = "id")
     private Long id;
     @ApiModelProperty(value = "评价计划Id")
     private Long evaluateId;
     @ApiModelProperty(value = "角色Id")
-    private Long  roleId;
+    private Long roleId;
 }

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;
 
 /**
@@ -21,8 +19,9 @@ public interface CoreEvaluateRoleMapper extends BaseMapper<CoreEvaluateRole> {
 
     /**
      * 通过评价id查询关联角色
+     *
      * @param evaluateId
      * @return
      */
-    List<Long>getRoleByEvaluateId(@Param("evaluateId") Long evaluateId);
+    List<Long> getRoleByEvaluateId(@Param("evaluateId") Long evaluateId);
 }

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;
@@ -35,10 +32,12 @@ public interface CoreEvaluateTaskMapper extends BaseMapper<CoreEvaluateTask> {
 
     /**
      * 根据计划id查询对应任务
+     *
      * @param
      * @return
      */
-    List<CoreEvaluateTask>selectTaskByPlanIdAndStatus(@Param("planId") Long planId,@Param("statusList") String[]statusList);
+    List<CoreEvaluateTask> selectTaskByPlanIdAndStatus(@Param("planId") Long planId, @Param("statusList") String[] statusList);
+
     /**
      * 查询外包评价任务列表
      *

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/service/ICoreEvaluateTaskService.java

@@ -31,6 +31,7 @@ public interface ICoreEvaluateTaskService extends IService<CoreEvaluateTask> {
      * @return 外包评价任务
      */
     CoreEvaluateTaskVO selectCoreEvaluateTaskById(Long id);
+
     /**
      * 查询外包评价任务评价按钮用
      *
@@ -38,6 +39,7 @@ public interface ICoreEvaluateTaskService extends IService<CoreEvaluateTask> {
      * @return 外包评价任务
      */
     CoreEvaluateTaskVO selectCoreEvaluateTaskContentById(Long id);
+
     /**
      * 查询外包评价任务列表
      *
@@ -87,6 +89,7 @@ public interface ICoreEvaluateTaskService extends IService<CoreEvaluateTask> {
      * @return Page
      */
     TableDataInfo<CoreEvaluateTaskVO> selectPage(EvaluateTaskDTO evaluateTaskDTO);
+
     /**
      * 查询外包评价任务分页数据
      *
@@ -94,14 +97,16 @@ public interface ICoreEvaluateTaskService extends IService<CoreEvaluateTask> {
      * @return Page
      */
     TableDataInfo<CoreEvaluateTaskVO> selectAPPPage(EvaluateTaskDTO evaluateTaskDTO);
+
     List<PanelListVo> selectCurUserTaskList(PanelListDto panelListDto);
+
     /**
      * 统计
      *
      * @param evaluateTaskDTO
      * @return
      */
-    Map  statistics(EvaluateTaskStatisticsDTO evaluateTaskDTO);
+    Map statistics(EvaluateTaskStatisticsDTO evaluateTaskDTO);
 
-    void export(EvaluateTaskStatisticsDTO evaluateTaskStatisticsDTO, HttpServletResponse response)throws IOException;
+    void export(EvaluateTaskStatisticsDTO evaluateTaskStatisticsDTO, HttpServletResponse response) throws IOException;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/impl/CoreEvaluateTaskServiceImpl.java

@@ -108,7 +108,7 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
         evaluateTaskDTO.setStartTime(DateUtils.parseDate(evaluateTaskDTO.getDate() + " 00:00:00"));
         evaluateTaskDTO.setEndTime(DateUtils.parseDate(evaluateTaskDTO.getDate() + " 23:59:59"));
         page = baseMapper.selectAppPageList(page, evaluateTaskDTO);
-        page.getRecords().forEach(p->{
+        page.getRecords().forEach(p -> {
             List<Long> roleByEvaluateId = coreEvaluateRoleMapper.getRoleByEvaluateId(p.getPlanId());
             Set<Long> rIds = new HashSet<>();
             if (ObjectUtil.isNotEmpty(roleByEvaluateId)) {
@@ -199,7 +199,7 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
 
     @Override
     public Map statistics(EvaluateTaskStatisticsDTO evaluateTaskStatisticsDTO) {
-        if (null==evaluateTaskStatisticsDTO.getPlanId()||null==evaluateTaskStatisticsDTO.getOrgId()){
+        if (null == evaluateTaskStatisticsDTO.getPlanId() || null == evaluateTaskStatisticsDTO.getOrgId()) {
             return null;
         }
         Map map = new HashMap();
@@ -230,7 +230,7 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
                 }
                 linkedHashMap.put("评价得分", total);
                 all += total;
-            }else {
+            } else {
                 linkedHashMap.put("评价得分", 0);
             }
             rows.add(linkedHashMap);

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/information/service/ICoreMessageCenterService.java

@@ -22,8 +22,9 @@ public interface ICoreMessageCenterService extends IService<CoreMessageCenter> {
      * @param id 消息中心主键
      * @return 消息中心
      */
-     CoreMessageCenter selectCoreMessageCenterById(Long id);
-     int isRead(Long id);
+    CoreMessageCenter selectCoreMessageCenterById(Long id);
+
+    int isRead(Long id);
 
     /**
      * 查询消息中心列表
@@ -35,7 +36,9 @@ public interface ICoreMessageCenterService extends IService<CoreMessageCenter> {
 
 
     TableDataInfo selectByPage(CoreMessageCenterDTO coreMessageCenterDTO);
+
     Integer isRead();
+
     /**
      * 新增消息中心
      *

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/information/service/impl/CoreMessageCenterServiceImpl.java

@@ -110,7 +110,7 @@ public class CoreMessageCenterServiceImpl extends ServiceImpl<CoreMessageCenterM
         List<Long> longs = coreAnnouncementNotificationMapper.selectReadByUser(loginUser.getUserid());
         List<Long> collect1 = messageAppPageVos.stream().map(MessageAppPageVo::getId).collect(Collectors.toList());
         Integer i = 0;
-        if (CollectionUtils.isNotEmpty(collect1) && null!=longs && longs.size() != collect1.size()) {
+        if (CollectionUtils.isNotEmpty(collect1) && null != longs && longs.size() != collect1.size()) {
             i = collect1.size() - longs.size();
         }
         if (i + integer1 <= 0) {

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;