查询维保计划详情列表

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/controller/MaintenanceController.java

@@ -1,9 +1,9 @@
 package cn.com.ty.lift.business.maintenance.controller;
 
 import cn.com.ty.lift.business.framework.util.MessageUtils;
-import cn.com.ty.lift.business.maintenance.dao.entity.model.MaintenancePlanRequest;
-import cn.com.ty.lift.business.maintenance.dao.entity.model.MaintenancePlanResponse;
-import cn.com.ty.lift.business.maintenance.dao.entity.model.UpdateMaintenancePlanReq;
+import cn.com.ty.lift.business.maintenance.dao.entity.MaintenancePlan;
+import cn.com.ty.lift.business.maintenance.dao.entity.model.request.*;
+import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MaintenancePlanResponse;
 import cn.com.ty.lift.business.maintenance.service.MaintenancePlanService;
 import cn.com.ty.lift.common.base.ExportRequest;
 import cn.com.ty.lift.common.constants.ApiConstants;
@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -45,6 +46,21 @@ public class MaintenanceController {
         return RestResponse.success(page, MessageUtils.get("msg.query.success"));
     }
 
+    /**
+     * @param request 公司id，项目id，电梯id
+     * @return 1.成功, 0.失败, 消息描述
+     * @description 查询维保计划详情列表
+     * @date 2020/1/2 9:36 上午
+     */
+    @PostMapping("plan/detail")
+    public RestResponse detailList(@Valid @RequestBody MaintenanceDetailRequest request) {
+        List<MaintenancePlan> detailList = maintenancePlanService.detailList(request);
+        if (ObjectUtil.isEmpty(detailList)) {
+            return RestResponse.success();
+        }
+        return RestResponse.success(detailList, MessageUtils.get("msg.query.success"));
+    }
+
     /**
      * @param request 电梯列表
      * @return 1.成功, 0.失败, 消息描述
@@ -52,7 +68,7 @@ public class MaintenanceController {
      * @date 2019/12/16 2:36 PM
      */
     @PostMapping("generate/plan")
-    public RestResponse generatePlan(@RequestBody MaintenancePlanRequest request) {
+    public RestResponse generatePlan(@Valid @RequestBody MaintenanceGenerateRequest request) {
         boolean result = maintenancePlanService.insertBatch(request);
         if (result) {
             return RestResponse.success(null, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.add.success"));
@@ -68,7 +84,7 @@ public class MaintenanceController {
      * @date 2019/12/16 2:36 PM
      */
     @PostMapping("modify/plan")
-    public RestResponse modifyPlan(@RequestBody UpdateMaintenancePlanReq request) {
+    public RestResponse modifyPlan(@Valid @RequestBody MaintenanceModifyRequest request) {
         boolean result = maintenancePlanService.modifyPlan(request);
         if (result) {
             return RestResponse.success(null, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.modify.success"));
@@ -84,12 +100,8 @@ public class MaintenanceController {
      * @date 2019/12/17 3:14 PM
      */
     @PostMapping("batch/clean")
-    public RestResponse batchCleanPlan(@RequestBody MaintenancePlanRequest request) {
-        List<Long> idList = request.getIdList();
-        if (ObjectUtil.isEmpty(idList)) {
-            return RestResponse.failParam();
-        }
-        boolean result = maintenancePlanService.batchCleanPlan(idList);
+    public RestResponse batchCleanPlan(@Valid @RequestBody MaintenanceCleanRequest request) {
+        boolean result = maintenancePlanService.batchCleanPlan(request.getIdList());
         if (result) {
             return RestResponse.success(null, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.modify.success"));
         } else {

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/model/BatchMaintenancePlanRequest.java

@@ -1,19 +0,0 @@
-package cn.com.ty.lift.business.maintenance.dao.entity.model;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author bieao
- * @date 2019/12/17
- * @description 维保计划请求
- */
-@Data
-public class BatchMaintenancePlanRequest {
-
-    /**
-     * 维保计划id列表
-     */
-    private List<Long> ids;
-}

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/model/request/MaintenanceCleanRequest.java

@@ -0,0 +1,21 @@
+package cn.com.ty.lift.business.maintenance.dao.entity.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+/**
+ * @author bieao
+ * @date 2020/1/2
+ * @description 清除维保计划请求
+ */
+@Data
+public class MaintenanceCleanRequest {
+
+    /**
+     * 维保计划主键id列表
+     */
+    @NotEmpty(message = "notEmpty")
+    private List<Long> idList;
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/model/request/MaintenanceDetailRequest.java

@@ -0,0 +1,30 @@
+package cn.com.ty.lift.business.maintenance.dao.entity.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author bieao
+ * @date 2020/1/2
+ * @description 维保计划详情请求
+ */
+@Data
+public class MaintenanceDetailRequest {
+
+    /**
+     * 维保公司id
+     */
+    @NotNull(message = "notEmpty")
+    private Long mtCompanyId;
+    /**
+     * 项目id
+     */
+    @NotNull(message = "notEmpty")
+    private Long projectId;
+    /**
+     * 电梯id
+     */
+    @NotNull(message = "notEmpty")
+    private Long liftId;
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/model/request/MaintenanceGenerateRequest.java

@@ -0,0 +1,51 @@
+package cn.com.ty.lift.business.maintenance.dao.entity.model.request;
+
+import cn.com.ty.lift.business.maintenance.dao.entity.MaintenancePlan;
+import cn.com.ty.lift.business.project.dao.entity.ProjectLiftRelevance;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author bieao
+ * @date 2020/1/2
+ * @description 维保计划生成请求
+ */
+@Data
+public class MaintenanceGenerateRequest {
+
+    /**
+     * 电梯列表
+     */
+    @NotEmpty(message = "notEmpty")
+    private List<MaintenancePlan> planList;
+
+    /**
+     * 项目电梯关联id列表
+     */
+    @NotEmpty(message = "notEmpty")
+    private List<ProjectLiftRelevance> relevanceList;
+
+    /**
+     * 首保时间
+     */
+    @NotNull(message = "notEmpty")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date firstTime;
+
+    /**
+     * 期数 1-24
+     */
+    @NotNull(message = "notEmpty")
+    private Integer periods;
+
+    /**
+     * 间隔 1-15
+     */
+    @NotNull(message = "notEmpty")
+    private Integer interval;
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/model/UpdateMaintenancePlanReq.java

@@ -1,8 +1,9 @@
-package cn.com.ty.lift.business.maintenance.dao.entity.model;
+package cn.com.ty.lift.business.maintenance.dao.entity.model.request;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 /**
@@ -11,31 +12,36 @@ import java.util.Date;
  * @description 修改维保计划请求
  */
 @Data
-public class UpdateMaintenancePlanReq {
+public class MaintenanceModifyRequest {
 
     /**
      * 电梯ID
      */
+    @NotNull(message = "notEmpty")
     private Long liftId;
 
     /**
      * 维保公司ID
      */
+    @NotNull(message = "notEmpty")
     private Long mtCompanyId;
     /**
      * 项目id
      */
+    @NotNull(message = "notEmpty")
     private Long projectId;
 
     /**
      * 当前时间
      */
+    @NotNull(message = "notEmpty")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date currentTime;
 
     /**
      * 修改时间
      */
+    @NotNull(message = "notEmpty")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date updateTime;
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/model/MaintenancePlanRequest.java

@@ -1,15 +1,9 @@
-package cn.com.ty.lift.business.maintenance.dao.entity.model;
+package cn.com.ty.lift.business.maintenance.dao.entity.model.request;
 
-import cn.com.ty.lift.business.project.dao.entity.ProjectLiftRelevance;
-import cn.com.ty.lift.business.maintenance.dao.entity.MaintenancePlan;
 import cn.com.xwy.boot.controller.BaseRequestModel;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-import java.util.List;
-
 /**
  * @author bieao
  * @date 2019/12/16
@@ -18,19 +12,6 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class MaintenancePlanRequest extends BaseRequestModel {
-    /**
-     * 维保计划主键id列表
-     */
-    private List<Long> idList;
-    /**
-     * 电梯列表
-     */
-    private List<MaintenancePlan> planList;
-
-    /**
-     * 项目电梯关联id列表
-     */
-    private List<ProjectLiftRelevance> relevanceList;
     /**
      * 项目id
      */
@@ -67,18 +48,4 @@ public class MaintenancePlanRequest extends BaseRequestModel {
      * 电梯注册代码
      */
     private String registrationCode;
-
-    /**
-     * 首保时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date firstTime;
-    /**
-     * 期数 1-24
-     */
-    private Integer periods;
-    /**
-     * 间隔 1-15
-     */
-    private Integer interval;
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/model/MaintenancePlanResponse.java

@@ -1,4 +1,4 @@
-package cn.com.ty.lift.business.maintenance.dao.entity.model;
+package cn.com.ty.lift.business.maintenance.dao.entity.model.response;
 
 import lombok.Data;
 

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/mapper/MaintenancePlanMapper.java

@@ -1,9 +1,9 @@
 package cn.com.ty.lift.business.maintenance.dao.mapper;
 
 import cn.com.ty.lift.business.maintenance.dao.entity.MaintenancePlan;
-import cn.com.ty.lift.business.maintenance.dao.entity.model.MaintenancePlanRequest;
-import cn.com.ty.lift.business.maintenance.dao.entity.model.MaintenancePlanResponse;
-import cn.com.ty.lift.business.maintenance.dao.entity.model.UpdateMaintenancePlanReq;
+import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenancePlanRequest;
+import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MaintenancePlanResponse;
+import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenanceModifyRequest;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
@@ -17,7 +17,7 @@ import java.util.List;
  */
 public interface MaintenancePlanMapper extends BaseMapper<MaintenancePlan> {
 
-    List<MaintenancePlan> findIdList(@Param("request") UpdateMaintenancePlanReq request);
+    List<MaintenancePlan> findIdList(@Param("request") MaintenanceModifyRequest request);
 
-    IPage<MaintenancePlanResponse> findByCondition(IPage page, @Param("request") MaintenancePlanRequest request);
+    IPage<MaintenancePlanResponse> findByCondition(IPage<MaintenancePlanResponse> page, @Param("request") MaintenancePlanRequest request);
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/service/MaintenancePlanService.java

@@ -1,11 +1,13 @@
 package cn.com.ty.lift.business.maintenance.service;
 
+import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenanceDetailRequest;
+import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenanceGenerateRequest;
 import cn.com.ty.lift.business.project.dao.entity.ProjectLiftRelevance;
 import cn.com.ty.lift.business.project.service.ProjectLiftRelevanceService;
 import cn.com.ty.lift.business.maintenance.dao.entity.MaintenancePlan;
-import cn.com.ty.lift.business.maintenance.dao.entity.model.MaintenancePlanRequest;
-import cn.com.ty.lift.business.maintenance.dao.entity.model.MaintenancePlanResponse;
-import cn.com.ty.lift.business.maintenance.dao.entity.model.UpdateMaintenancePlanReq;
+import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenancePlanRequest;
+import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MaintenancePlanResponse;
+import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenanceModifyRequest;
 import cn.com.ty.lift.business.maintenance.dao.mapper.MaintenancePlanMapper;
 import cn.com.ty.lift.business.project.dao.entity.Project;
 import cn.com.ty.lift.business.project.service.ProjectService;
@@ -64,13 +66,27 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
         return planMapper.findByCondition(page, request);
     }
 
+    /**
+     * @param request 公司id，项目id，电梯id
+     * @return 1.成功, 0.失败, 消息描述
+     * @description 查询维保计划详情列表
+     * @date 2020/1/2 9:43 上午
+     */
+    public List<MaintenancePlan> detailList(MaintenanceDetailRequest request) {
+        Map<String, Object> paramMap = new HashMap<>(3);
+        paramMap.put("mt_company_id", request.getMtCompanyId());
+        paramMap.put("project_id", request.getProjectId());
+        paramMap.put("lift_id", request.getLiftId());
+        return planMapper.selectByMap(paramMap);
+    }
+
     /**
      * @param request 电梯列表
      * @return 是否成功
      * @description 批量生成维保计划
      * @date 2019/12/16 2:14 PM
      */
-    public boolean insertBatch(MaintenancePlanRequest request) {
+    public boolean insertBatch(MaintenanceGenerateRequest request) {
         List<MaintenancePlan> resultList = generatePlan(request);
         return saveBatch(resultList, resultList.size());
     }
@@ -85,8 +101,8 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
      */
     public int calculatePeriods(Date beginTime, Date endTime, int interval) {
         long result = DateUtil.betweenDay(beginTime, endTime, false);
-        Double num = Math.floor(Double.valueOf(String.valueOf((result / interval))));
-        return num.intValue();
+        double num = Math.floor(Double.parseDouble(String.valueOf((result / interval))));
+        return (int) num;
     }
 
     /**
@@ -95,7 +111,7 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
      * @description 生成维保计划
      * @date 2019/12/16 1:21 PM
      */
-    public List<MaintenancePlan> generatePlan(MaintenancePlanRequest request) {
+    public List<MaintenancePlan> generatePlan(MaintenanceGenerateRequest request) {
         List<MaintenancePlan> plans = request.getPlanList();
         //返回维保计划列表
         List<MaintenancePlan> planList = new ArrayList<>();
@@ -158,7 +174,7 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
      * @description 修改维保计划
      * @date 2019/12/16 5:25 PM
      */
-    public boolean modifyPlan(UpdateMaintenancePlanReq request) {
+    public boolean modifyPlan(MaintenanceModifyRequest request) {
         List<MaintenancePlan> resultList = new ArrayList<>();
         //获取当前保养时间
         Date currentTime = request.getCurrentTime();
@@ -167,8 +183,8 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
         //获取偏移量
         int result = DateUtil.compare(currentTime, updateTime);
         //获取时间间隔
-        Long interval = DateUtil.betweenDay(currentTime, updateTime, false);
-        int offset = interval.intValue();
+        long interval = DateUtil.betweenDay(currentTime, updateTime, false);
+        int offset = (int) interval;
         //获取当前时间后的维保计划id列表
         List<MaintenancePlan> idList = planMapper.findIdList(request);
         for (MaintenancePlan entry : idList) {
@@ -190,19 +206,19 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
      * @description 批量清除维保计划
      * @date 2019/12/28 2:00 PM
      */
-    public boolean batchCleanPlan(List<Long> idList){
-       return removeByIds(idList);
+    public boolean batchCleanPlan(List<Long> idList) {
+        return removeByIds(idList);
     }
 
 
     /**
      * @param companyId 公司id
-     * @param idList 电梯id列表
+     * @param idList    电梯id列表
      * @return 是否成功
      * @description 批量清除维保计划
      * @date 2019/12/28 2:00 PM
      */
-    public boolean removeMaintenancePlan(String companyId,List<Long> idList){
+    public boolean removeMaintenancePlan(String companyId, List<Long> idList) {
         QueryWrapper<MaintenancePlan> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("mt_company_id", companyId);
         queryWrapper.in("lift_id", idList);
@@ -211,7 +227,7 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
 
     /**
      * @param mtCompanyId 公司id
-     * @param liftId 电梯id
+     * @param liftId      电梯id
      * @return 是否成功
      * @description 清空维保计划
      * @date 2019/12/21 3:39 PM

lift-business-service/src/main/resources/mapper/maintenance/MaintenancePlanMapper.xml

@@ -19,7 +19,7 @@
 		status
 	</sql>
 
-	<select id="findByCondition" resultType="cn.com.ty.lift.business.maintenance.dao.entity.model.MaintenancePlanResponse" parameterType="cn.com.ty.lift.business.maintenance.dao.entity.model.MaintenancePlanRequest">
+	<select id="findByCondition" resultType="cn.com.ty.lift.business.maintenance.dao.entity.model.response.MaintenancePlanResponse" parameterType="cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenancePlanRequest">
 		SELECT
 		mp.id                       AS id,
 		if(isnull(mp.id), '0', '1') AS status,
@@ -71,7 +71,7 @@
 		</if>
 	</select>
 
-	<select id="findIdList" resultMap="BaseResultMap" parameterType="cn.com.ty.lift.business.maintenance.dao.entity.model.UpdateMaintenancePlanReq">
+	<select id="findIdList" resultMap="BaseResultMap" parameterType="cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenanceModifyRequest">
 		SELECT
 		id,
         lift_id,