Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into feature-wcz

.gitignore

@@ -60,4 +60,5 @@ yarn-error.log*
 package-lock.json
 */node_modules/
 */dist/
-*.log
+*.log
+/log.path_IS_UNDEFINED/2019-11/debug.2019-11-29.0.log.gz

lift-batch-service/src/main/resources/mapper/EmergencyRepairData.xml

@@ -23,7 +23,7 @@
         where
             er.caller_date <![CDATA[ >= ]]> #{startTimeStr}
         and
-            er.caller_date <![CDATA[ >= ]]> #{endTimeStr}
+            er.caller_date <![CDATA[ <= ]]> #{endTimeStr}
     </select>
 
 </mapper>

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/controller/CapitalController.java

@@ -1,7 +0,0 @@
-package cn.com.ty.lift.business.capital.controller;
-
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class CapitalController {
-}

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/controller/CapitalRepairController.java

@@ -0,0 +1,91 @@
+package cn.com.ty.lift.business.capital.controller;
+
+import cn.com.ty.lift.business.capital.dao.entity.CapitalRepair;
+import cn.com.ty.lift.business.capital.dao.entity.model.CapitalRepairRequest;
+import cn.com.ty.lift.business.capital.service.CapitalRepairService;
+import cn.com.ty.lift.business.framework.util.MessageUtils;
+import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectResponse;
+import cn.com.xwy.boot.web.dto.RestResponse;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+/**
+ * @author bieao
+ * @date 2020/2/3 12:21 下午
+ * @description 大修项目控制层
+ */
+@RestController
+@RequestMapping("capital/repair")
+public class CapitalRepairController {
+
+    @Resource
+    private CapitalRepairService capitalRepairService;
+
+    /**
+     * @param request 大修项目列表查询条件
+     * @return RestResponse 结果集
+     * @description 条件查询大修项目列表
+     * @date 2020/2/3 11:38 上午
+     */
+    @PostMapping("list")
+    public RestResponse list(@Valid @RequestBody CapitalRepairRequest request) {
+        IPage<ProjectResponse> page = capitalRepairService.list(request);
+        if (CollUtil.isEmpty(page.getRecords())) {
+            return RestResponse.success();
+        }
+        return RestResponse.success(page, MessageUtils.get("msg.query.success"));
+    }
+
+    /**
+     * @param request 大修项目id
+     * @return CapitalRepair 大修项目详情
+     * @description 查询大修项目详情
+     * @date 2020/2/3 11:31 上午
+     */
+    @PostMapping("detail")
+    public RestResponse detail(@Valid @RequestBody CapitalRepairRequest request) {
+        CapitalRepair capitalRepair = capitalRepairService.detail(request.getId());
+        if (ObjectUtil.isEmpty(capitalRepair)) {
+            return RestResponse.success();
+        }
+        return RestResponse.success(capitalRepair, MessageUtils.get("msg.query.detail.success"));
+    }
+
+    /**
+     * @param capitalRepair 新增大修项目数据项
+     * @return Integer 成功1或失败0
+     * @description 新增大修项目
+     * @date 2020/2/3 11:31 上午
+     */
+    @PostMapping("add")
+    public RestResponse add(@RequestBody CapitalRepair capitalRepair) {
+        boolean result= capitalRepairService.add(capitalRepair);
+        if (result) {
+            return RestResponse.success(null, MessageUtils.get("msg.add.success"));
+        }
+        return RestResponse.fail(MessageUtils.get("msg.add.fail"));
+    }
+
+    /**
+     * @param capitalRepair 修改大修项目数据项
+     * @return Integer 成功1或失败0
+     * @description 修改大修项目
+     * @date 2020/2/3 11:36 上午
+     */
+    @PostMapping("modify")
+    public RestResponse modify(@RequestBody CapitalRepair capitalRepair) {
+        boolean result = capitalRepairService.modify(capitalRepair);
+        if (result) {
+            return RestResponse.success(null, MessageUtils.get("msg.modify.success"));
+        }
+        return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+    }
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/dao/entity/CapitalRepair.java

@@ -0,0 +1,116 @@
+package cn.com.ty.lift.business.capital.dao.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.time.LocalDate;
+
+/**
+ * @author bieao
+ * @date 2020/2/3
+ * @description 大修
+ */
+@Data
+public class CapitalRepair {
+    /**
+     * 项目ID
+     */
+    @TableId(value = "id",type = IdType.ID_WORKER)
+    private Long id;
+
+    /**
+     * 维保公司ID
+     */
+    private Long mtCompanyId;
+
+    /**
+     * 甲方公司ID
+     */
+    private Long ppCompanyId;
+
+    /**
+     * 甲方联系人ID
+     */
+    private Long ppContactId;
+
+    /**
+     * 项目编号
+     */
+    private String projectCode;
+
+    /**
+     * 项目名称
+     */
+    private String projectName;
+
+    /**
+     * 省编码
+     */
+    private String provinceCode;
+
+    /**
+     * 省
+     */
+    private String province;
+
+    /**
+     * 市编码
+     */
+    private String cityCode;
+
+    /**
+     * 市
+     */
+    private String city;
+
+    /**
+     * 区编码
+     */
+    private String districtCode;
+
+    /**
+     * 区
+     */
+    private String district;
+
+    /**
+     * 项目地址
+     */
+    private String address;
+
+    /**
+     * 台量
+     */
+    private Integer num;
+
+    /**
+     * 实际台量
+     */
+    private Integer actualNum;
+
+    /**
+     * 开始时间
+     */
+    private LocalDate startDate;
+
+    /**
+     * 结束时间
+     */
+    private LocalDate endDate;
+
+    /**
+     * 状态 1:尚未开始;2:施工中;3:完成
+     */
+    private String projectStatus;
+
+    /**
+     * 是否开启消息推送 0否 1是
+     */
+    private Integer pushFlag;
+
+    /**
+     * 区域ID
+     */
+    private Long regionId;
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/dao/entity/model/CapitalDetailRequest.java

@@ -0,0 +1,24 @@
+package cn.com.ty.lift.business.capital.dao.entity.model;
+
+import cn.com.xwy.boot.controller.BaseRequestModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author bieao
+ * @date 2020/2/3 11:53 上午
+ * @description 大修详情请求
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class CapitalDetailRequest extends BaseRequestModel {
+
+    /**
+     * 项目ID
+     */
+    @NotNull(message = "notEmpty")
+    private Long id;
+
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/dao/entity/model/CapitalRepairRequest.java

@@ -0,0 +1,22 @@
+package cn.com.ty.lift.business.capital.dao.entity.model;
+
+import cn.com.xwy.boot.controller.BaseRequestModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author bieao
+ * @date 2020/2/3
+ * @description 大修项目列表请求体
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class CapitalRepairRequest extends BaseRequestModel {
+    /**
+     * 项目ID
+     */
+    @NotNull(message = "notEmpty")
+    private Long id;
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/dao/mapper/CapitalRepairMapper.java

@@ -0,0 +1,19 @@
+package cn.com.ty.lift.business.capital.dao.mapper;
+
+import cn.com.ty.lift.business.capital.dao.entity.CapitalRepair;
+import cn.com.ty.lift.business.capital.dao.entity.model.CapitalRepairRequest;
+import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectResponse;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @author bieao
+ * @date 2020/2/3
+ * @description 大修数据层
+ */
+public interface CapitalRepairMapper extends BaseMapper<CapitalRepair> {
+
+    IPage<ProjectResponse> findByCondition(IPage<ProjectResponse> page, @Param("request") CapitalRepairRequest request);
+
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/service/CapitalRepairService.java

@@ -0,0 +1,66 @@
+package cn.com.ty.lift.business.capital.service;
+
+import cn.com.ty.lift.business.capital.dao.entity.CapitalRepair;
+import cn.com.ty.lift.business.capital.dao.entity.model.CapitalRepairRequest;
+import cn.com.ty.lift.business.capital.dao.mapper.CapitalRepairMapper;
+import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectResponse;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author bieao
+ * @date 2020/2/3 11:38 上午
+ * @description 大修项目业务层
+ */
+@Service
+public class CapitalRepairService extends ServiceImpl<CapitalRepairMapper, CapitalRepair> {
+
+    /**
+     * @param request 大修项目列表查询条件
+     * @return RestResponse 结果集
+     * @description 条件查询大修项目列表
+     * @date 2020/2/3 11:38 上午
+     */
+    public IPage<ProjectResponse> list(CapitalRepairRequest request) {
+        IPage<ProjectResponse> page = new Page<>(request.getPageNum(), request.getPageSize());
+        return baseMapper.findByCondition(page, request);
+    }
+
+    /**
+     * @param id 大修项目id
+     * @return CapitalRepair 大修项目详情
+     * @description 查询大修项目详情
+     * @date 2020/2/3 11:31 上午
+     */
+    public CapitalRepair detail(Long id) {
+        QueryWrapper<CapitalRepair> queryWrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<CapitalRepair> lambdaQueryWrapper = queryWrapper.lambda();
+        lambdaQueryWrapper.eq(CapitalRepair::getId, id);
+        return getOne(lambdaQueryWrapper);
+    }
+
+    /**
+     * @param capitalRepair 新增大修项目数据项
+     * @return Integer 成功1或失败0
+     * @description 新增大修项目
+     * @date 2020/2/3 11:31 上午
+     */
+    public boolean add(CapitalRepair capitalRepair) {
+       return save(capitalRepair);
+    }
+
+    /**
+     * @param capitalRepair 修改大修项目数据项
+     * @return 是否成功
+     * @description 修改大修项目
+     * @date 2020/2/3 11:36 上午
+     */
+    public boolean modify(CapitalRepair capitalRepair) {
+        return updateById(capitalRepair);
+    }
+
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/service/CapitalService.java

@@ -1,7 +0,0 @@
-package cn.com.ty.lift.business.capital.service;
-
-import org.springframework.stereotype.Service;
-
-@Service
-public class CapitalService {
-}

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

@@ -289,6 +289,9 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
         Integer updateInterval = request.getInterval();
         //获取当前期数
         Integer periods = request.getPeriods();
+        ProjectLiftRelevance relevance = new ProjectLiftRelevance();
+        relevance.setId(request.getRelevanceId());
+        relevance.setPlanInterval(updateInterval);
         //获取当前电梯的保养间隔
         ProjectLiftRelevance entry = projectLiftRelevanceService.getOne(mtCompanyId, liftId);
         if (ObjectUtil.isEmpty(entry)) return false;
@@ -315,14 +318,14 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
             } else return false;
             removeByIds(planList.stream().map(MaintenancePlan::getId).collect(Collectors.toList()));
             //更新项目电梯关联表保养间隔
-            projectLiftRelevanceService.modifyPlanInterval(request.getRelevanceId(), updateInterval);
+            projectLiftRelevanceService.modify(relevance);
             plans = generatePlan(plan, periods, updateInterval, planDate, endDate);
         } else if (isNotNull && ObjectUtil.isNotEmpty(updateInterval)) {
             //获取当前期数后的维保计划列表，并清除计划
             planList = findPlanList(mtCompanyId, liftId, periods);
             removeByIds(planList.stream().map(MaintenancePlan::getId).collect(Collectors.toList()));
             //更新项目电梯关联表保养间隔
-            projectLiftRelevanceService.modifyPlanInterval(request.getRelevanceId(), updateInterval);
+            projectLiftRelevanceService.modify(relevance);
             //按照修改时间重新生成计划
             plans = generatePlan(plan, periods, updateInterval, updateTime, endDate);
         }

lift-business-service/src/main/java/cn/com/ty/lift/business/project/controller/ProjectController.java

@@ -1,6 +1,7 @@
 package cn.com.ty.lift.business.project.controller;
 
 import cn.com.ty.lift.business.framework.util.MessageUtils;
+import cn.com.ty.lift.business.project.dao.entity.ProjectLiftRelevance;
 import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectOperateServiceRequest;
 import cn.com.ty.lift.business.library.service.PlatformCompanyLiftRelevanceService;
 import cn.com.ty.lift.business.project.dao.entity.Project;
@@ -156,6 +157,21 @@ public class ProjectController {
         return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
     }
 
+    /**
+     * @param entry 修改项目电梯关联数据项
+     * @return 1.成功, 0.失败, 消息描述
+     * @description 修改项目电梯关联
+     * @date 2020/2/3 1:29 下午
+     */
+    @PostMapping("relevance/modify")
+    public RestResponse modify(@RequestBody ProjectLiftRelevance entry) {
+        boolean result = projectLiftRelevanceService.modify(entry);
+        if (result) {
+            return RestResponse.success(null, MessageUtils.get("msg.modify.success"));
+        }
+        return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+    }
+
     /**
      * @param request liftIdList 电梯id列表
      * @param request projectId 项目id

lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectLiftRelevanceService.java

@@ -172,17 +172,12 @@ public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanc
     }
 
     /**
-     * @param relevanceId 项目电梯关联id
-     * @param interval    保养间隔
-     * @description 根据项目电梯关联id和保养间隔修改项目电梯关联保养间隔
+     * @param entry 项目电梯关联实体
+     * @description 修改项目电梯关联信息
      * @date 2020/1/8 9:59 上午
      */
-    public void modifyPlanInterval(Long relevanceId, int interval) {
-        //更新项目电梯关联表保养间隔
-        ProjectLiftRelevance entry = new ProjectLiftRelevance();
-        entry.setId(relevanceId);
-        entry.setPlanInterval(interval);
-        updateById(entry);
+    public boolean modify(ProjectLiftRelevance entry) {
+        return updateById(entry);
     }
 
     /**