删除无用代码 增添注释

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FailureDetailsMapper.java

@@ -26,11 +26,10 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
      * @param current 当前页
      * @return
      */
-   // IPage<FailureDetails> selectAllPage(Page page);
+
     List<FailureDetails> selectAllPage(Long current,Long size, Long currentStatus,
                                         String startTime,String endTime, Integer submissionPid);
-    /*IPage<FailureDetails> selectAllPage(int current,int size, Long currentStatus,
-                                        String startTime,String endTime, Integer submissionPid);*/
+
     /**
      * 查询我发起的 分页
      * current 当前页
@@ -40,7 +39,6 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
      */
     List<FailureDetails> selectISubPage(Long current,Long size, Long currentStatus,
                                          String startTime,String endTime, Integer submissionPid);
-  //  IPage<FailureDetails> selectISubPage(int current,int size, String submissionPid);
 
     /**
      * 查询待处理 分页
@@ -50,23 +48,80 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
      */
     List<FailureDetails> selectInProcessing(Long current,Long size,Long currentStatus,
                                              String startTime,String endTime, Integer submissionPid);
-
+    /**
+     * 查询待处理  应急指挥科人员分页
+     *
+     * @param
+     * @return
+     */
     List<FailureDetails> selectStatusWaitTj(Long current,Long size,Long currentStatus,
                                              String startTime,String endTime, Integer submissionPid);
-
+    /**
+     * 查询待处理  维修人员分页
+     *
+     * @param
+     * @return
+     */
     List<FailureDetails> selectStatusWaitWx(Long current,Long size,Long currentStatus,
                                              String startTime,String endTime, Integer submissionPid);
 
 
-
+    /**
+     * 统计  全部
+     *
+     * @param currentStatus 状态
+     * @param   startTime 起始时间
+     * @param   endTime 结束时间
+     * @param   submissionPid 报送人
+     *
+     * @return
+     */
     List<StatusDto> selectStatusCount(Long currentStatus,String startTime,String endTime, Integer submissionPid);
 
-    List<StatusDto> selectStatusWx(Long currentStatus,String startTime,String endTime, Integer submissionPid);
 
+    /**
+     * 统计  维修人员
+     *
+     * @param currentStatus 状态
+     * @param   startTime 起始时间
+     * @param   endTime 结束时间
+     * @param   submissionPid 报送人
+     *
+     * @return
+     */
+    List<StatusDto> selectStatusWx(Long currentStatus,String startTime,String endTime, Integer submissionPid);
+    /**
+     * 统计  应急指挥科人员
+     *
+     * @param currentStatus 状态
+     * @param   startTime 起始时间
+     * @param   endTime 结束时间
+     * @param   submissionPid 报送人
+     *
+     * @return
+     */
     List<StatusDto> selectStatusFq(Long currentStatus,String startTime,String endTime, Integer submissionPid);
-
+    /**
+     * 统计  我发起
+     *
+     * @param currentStatus 状态
+     * @param   startTime 起始时间
+     * @param   endTime 结束时间
+     * @param   submissionPid 报送人
+     *
+     * @return
+     */
     List<StatusDto> selectStatusFqp(Long currentStatus,String startTime,String endTime, Integer submissionPid);
-
+    /**
+     * 统计  领导
+     *
+     * @param currentStatus 状态
+     * @param   startTime 起始时间
+     * @param   endTime 结束时间
+     * @param   submissionPid 报送人
+     *
+     * @return
+     */
     List<StatusDto> selectStatusLeader(Long currentStatus,String startTime,String endTime, Integer submissionPid);
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FailureDetailsController.java

@@ -13,8 +13,6 @@ import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
 import com.yeejoin.amos.boot.module.common.api.dto.CurrentStatusDto;
 import com.yeejoin.amos.boot.module.common.api.enums.FailureStatuEnum;
 import feign.Response;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
@@ -52,7 +50,6 @@ import io.swagger.annotations.ApiOperation;
 @RequestMapping(value = "/common/failure-details")
 public class FailureDetailsController extends BaseController {
 
-    private final Logger logger = LoggerFactory.getLogger(FailureDetailsServiceImpl.class);
 
     @Autowired
     FailureDetailsServiceImpl failureDetailsServiceImpl;
@@ -113,7 +110,7 @@ public class FailureDetailsController extends BaseController {
      * 列表分页查询
      *
      * @param current 当前页
-     * @param size 每页大小
+     * @param size    每页大小
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -124,9 +121,9 @@ public class FailureDetailsController extends BaseController {
                                                                 Integer userId,
                                                                 String startTime, String endTime) {
         Page<FailureDetails> page = new Page<FailureDetails>();
-        if (current > 0){
-            page.setCurrent((current-1)*size);
-        }else {
+        if (current > 0) {
+            page.setCurrent((current - 1) * size);
+        } else {
             page.setCurrent(current);
         }
 
@@ -134,7 +131,6 @@ public class FailureDetailsController extends BaseController {
         ReginParams userInfo = getSelectedOrgInfo();
         IPage<FailureDetailsDto> failureDetailDTOsIPage = new Page<>();
 
-        //IPage<FailureDetails> failureDetailsIPage = failureDetailsServiceImpl.queryForFailureDetailsPage((current - 1) * size,size,userInfo,currentStatus, startTime,endTime,submissionPid,type);
         IPage<FailureDetails> failureDetailsIPage = failureDetailsServiceImpl.queryForFailureDetailsPage(page, userInfo, currentStatus, startTime, endTime, userId, type);
 
         BeanUtils.copyProperties(failureDetailsIPage, FailureDetailsDto.class);
@@ -153,18 +149,7 @@ public class FailureDetailsController extends BaseController {
         return ResponseHelper.buildResponse(failureDetailDTOsIPage);
     }
 
- /*   *//**
-     * 列表全部数据查询
-     *
-     * @return
-     *//*
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
-    @GetMapping(value = "/list")
-    public ResponseModel<List<FailureDetailsDto>> selectForList() {
-        return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryForFailureDetailsList());
-    }
-*/
+
     /**
      * 根据状态查询当前下全部数据
      *
@@ -186,8 +171,8 @@ public class FailureDetailsController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "查询当前状态任务数量", notes = "查询当前状态任务数量")
     @GetMapping(value = "/list/count")
-    public ResponseModel<List<CurrentStatusDto>> selectStatusCount(Integer type,Long currentStatus,String startTime,String endTime, Integer userId) {
-        return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryStatusCount(getSelectedOrgInfo(), type,currentStatus,startTime,endTime, userId));
+    public ResponseModel<List<CurrentStatusDto>> selectStatusCount(Integer type, Long currentStatus, String startTime, String endTime, Integer userId) {
+        return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryStatusCount(getSelectedOrgInfo(), type, currentStatus, startTime, endTime, userId));
     }
 
 
@@ -220,13 +205,6 @@ public class FailureDetailsController extends BaseController {
         return ResponseHelper.buildResponse(workflowFeignService.thighLine(instanceId));
     }
 
-//    @TycloudOperation(ApiLevel = UserType.AGENCY)
-//
-//    @GetMapping(value = "/activityHistory/gettingLineImg/{sequenceNbr}")
-//    public ResponseModel<Object> gothLineImg(@PathVariable Long sequenceNbr, HttpServletResponse resp) {
-//        String processId = failureDetailsServiceImpl.queryBySeq(sequenceNbr).getProcessId();
-//        return ResponseHelper.buildResponse(workflowFeignService.thighLineImg(processId, resp));
-//    }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "查询状态枚举", notes = "查询状态枚举")
@@ -236,7 +214,7 @@ public class FailureDetailsController extends BaseController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping (value = "/downloadFile/{sequenceNbr}")
+    @GetMapping(value = "/downloadFile/{sequenceNbr}")
     @ApiOperation(httpMethod = "GET", value = "流程图高亮图片", notes = "流程图高亮图片")
     public void downloadFile(@PathVariable Long sequenceNbr, HttpServletRequest request, HttpServletResponse response) throws Exception {
         String processId = failureDetailsServiceImpl.queryBySeq(sequenceNbr).getProcessId();

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureDetailsServiceImpl.java

@@ -73,7 +73,14 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
     public static Integer SELECY_ISUBMIT = 8;
     public String[] roleName = {"maintenance_department_maintenance_personnel", "emergency_command_staff"};
 
-    //分页查询
+    /**
+     * 分页查询接口
+     * @param  type  查询类型
+     * @param  currentStatus  状态
+     * @param  startTime  起始时间
+     * @param  startTime  结束时间
+     * @param  userId  用户id
+     */
     public IPage<FailureDetails> queryForFailureDetailsPage(Page<FailureDetails> page, ReginParams userInfo, Long currentStatus,
                                                             String startTime, String endTime, Integer userId, Integer type) {
         //当传递类型参数为全部查询时
@@ -96,19 +103,6 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
     }
 
 
-   /* public IPage<FailureDetails> queryForFailureDetailsPage(int current,int size, ReginParams userInfo,Long currentStatus,
-                                                            String startTime,String endTime,Integer submissionPid,Integer type) {
-        if (type.equals(SELECY_ALL)) {
-            return this.baseMapper.selectAllPage(current,size,currentStatus,startTime ,endTime,submissionPid);
-        }
-      *//*  if (type.equals(SELECY_ISUBMIT)) {
-            return baseMapper.selectISubPage(current,size, userInfo.getUserModel().getUserId());
-        }
-        return this.queryForWaitManage(current,size, userInfo);*//*
-
-    }*/
-
-
     /**
      * 待处理分页查询
      */
@@ -518,16 +512,6 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
                 }
                 list.add(detail);
             }
-//			datArray.stream().forEach(i -> {
-//				JSONObject detail = JSONObject.parseObject(JSONObject.toJSONString(i));
-//				if (detail.containsKey("operator") && !detail.getString("name").equals("维修中")) {
-//					// 从流程记录表中拿到处理人的名称
-//					FailureRepairlog failureRepairlog = failureRepairlogService
-//							.findByprocessAuditor(detail.getString("operator"));
-//					detail.replace("operator", failureRepairlog.getProcessAuditorName());
-//					list.add(detail);
-//				}
-//			});
         }
         return list;
     }
@@ -620,7 +604,5 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
             }
         }
         return list;
-
     }
-
 }
\ No newline at end of file