Merge branch 'feature-bieao' of lift-manager/lift-server into develop

lift-business-service/src/main/java/cn/com/ty/lift/business/library/controller/LiftController.java

@@ -5,6 +5,8 @@ import cn.com.ty.lift.business.library.dao.entity.Lift;
 import cn.com.ty.lift.business.library.dao.entity.model.*;
 import cn.com.ty.lift.business.library.service.LiftService;
 import cn.com.ty.lift.business.library.service.PlatformCompanyLiftRelevanceService;
+import cn.com.ty.lift.business.project.dao.entity.ProjectLiftRelevance;
+import cn.com.ty.lift.business.project.service.ProjectLiftRelevanceService;
 import cn.com.ty.lift.common.base.ExportRequest;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.util.ObjectUtil;
@@ -28,6 +30,9 @@ public class LiftController {
     @Resource
     private PlatformCompanyLiftRelevanceService platformService;
 
+    @Resource
+    private ProjectLiftRelevanceService projectLiftRelevanceService;
+
     /**
      * @param request 电梯列表查询条件
      * @return RestResponse 电梯分页列表结果
@@ -118,14 +123,48 @@ public class LiftController {
     }
 
     /**
-     * @param request companyLiftRelevanceList 公司电梯更新列表
+     * @param request updateLiftList 项目id列表
+     * @return 1.成功, 0.失败, 消息描述
+     * @description 电梯批量锁定、解锁
+     * @date 2019/11/27 10:03 AM
+     */
+    @PostMapping("lockOrUnlock")
+    public RestResponse lockOrUnlock(@RequestBody BatchUpdateLiftRequest request) {
+        return projectLiftRelevanceService.liftLockOrUnLock(request);
+    }
+
+
+    /**
+     * @param projectLiftRelevance 关联表主键id
+     * @return 1.成功, 0.失败, 消息描述
+     * @description 逻辑删除电梯
+     * @date 2019/11/27 10:03 AM
+     */
+    @PostMapping("logicDelete")
+    public RestResponse logicDelete(@RequestBody ProjectLiftRelevance projectLiftRelevance) {
+        return projectLiftRelevanceService.logicDelete(projectLiftRelevance);
+    }
+
+    /**
+     * @param request idList 电梯id列表
+     * @return 1.成功, 0.失败, 消息描述
+     * @description 更新电梯状态为停保
+     * @date 2019/12/5 5:24 PM
+     */
+    @PostMapping("stop/insurance")
+    public RestResponse stopInsurance(@RequestBody PlatformCompanyRequest request) {
+        return platformService.stopInsurance(request);
+    }
+
+    /**
+     * @param request idList 电梯id列表
      * @return 1.成功, 0.失败, 消息描述
-     * @description 批量更新电梯状态为停保
+     * @description 更新电梯状态为停保
      * @date 2019/12/5 5:24 PM
      */
-    @PostMapping("updateBatchByIds")
-    public RestResponse updateBatchByIds(@RequestBody UpdateBatchPlatformCompanyRequest request) {
-        return platformService.updateBatch(request);
+    @PostMapping("batch/stop/insurance")
+    public RestResponse batchStopInsurance(@RequestBody PlatformCompanyRequest request) {
+        return platformService.batchStopInsurance(request);
     }
 
     /**

lift-business-service/src/main/java/cn/com/ty/lift/business/library/dao/entity/PlatformCompanyLiftRelevance.java

@@ -34,5 +34,5 @@ public class PlatformCompanyLiftRelevance extends BaseEntity {
     /**
      * 电梯公司状态 1：停保，2：正常，3：保养中 4：维修中，5：年检中，6：大修中
      */
-    private Byte liftCompanyStatus;
+    private String liftCompanyStatus;
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/library/dao/entity/model/BatchUpdateLiftRequest.java

@@ -1,6 +1,5 @@
 package cn.com.ty.lift.business.library.dao.entity.model;
 
-import cn.com.ty.lift.business.project.dao.entity.ProjectLiftRelevance;
 import lombok.Data;
 
 import java.util.List;
@@ -15,12 +14,12 @@ public class BatchUpdateLiftRequest {
     /**
      * 电梯id列表
      */
-    private List<ProjectLiftRelevance> updateLiftList;
+    private List<Long> liftList;
 
     /**
-     * 来源：0：锁定电梯 1：锁定项目
+     * 操作：0：解锁 1：锁定
      */
-    private String source;
+    private Integer lock;
 
     /**
      * 公司id
@@ -30,6 +29,6 @@ public class BatchUpdateLiftRequest {
     /**
      * 项目id
      */
-    private String projectId;
+    private Long projectId;
 
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/library/dao/entity/model/LiftResponse.java

@@ -15,6 +15,11 @@ public class LiftResponse {
      */
     private String id;
 
+    /**
+     * 平台公司主键id
+     */
+    private String platformCompanyId;
+
     /**
      * 电梯编号
      */

lift-business-service/src/main/java/cn/com/ty/lift/business/library/dao/entity/model/PlatformCompanyRequest.java

@@ -0,0 +1,38 @@
+package cn.com.ty.lift.business.library.dao.entity.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author bieao
+ * @date 2019/12/5
+ * @description
+ */
+@Data
+public class PlatformCompanyRequest {
+    /**
+     * 电梯id列表
+     */
+    private List<Long> idList;
+
+    /**
+     * 公司电梯关联表主键id列表
+     */
+    private List<Long> platformCompanyIdList;
+
+    /**
+     * 公司电梯关联表主键id
+     */
+    private Long platformCompanyId;
+
+    /**
+     * 公司id
+     */
+    private String companyId;
+
+    /**
+     * 电梯id
+     */
+    private String liftId;
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/library/dao/entity/model/UpdateBatchPlatformCompanyRequest.java

@@ -1,19 +0,0 @@
-package cn.com.ty.lift.business.library.dao.entity.model;
-
-import cn.com.ty.lift.business.library.dao.entity.PlatformCompanyLiftRelevance;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author bieao
- * @date 2019/12/5
- * @description
- */
-@Data
-public class UpdateBatchPlatformCompanyRequest {
-    /**
-     * 公司电梯更新列表
-     */
-    private List<PlatformCompanyLiftRelevance> companyLiftRelevanceList;
-}

lift-business-service/src/main/java/cn/com/ty/lift/business/library/service/PlatformCompanyLiftRelevanceService.java

@@ -3,8 +3,9 @@ package cn.com.ty.lift.business.library.service;
 import cn.com.ty.lift.business.framework.util.MessageUtils;
 import cn.com.ty.lift.business.library.dao.entity.PlatformCompanyLiftRelevance;
 import cn.com.ty.lift.business.library.dao.entity.model.SelectBatchPlatformCompanyRequest;
-import cn.com.ty.lift.business.library.dao.entity.model.UpdateBatchPlatformCompanyRequest;
+import cn.com.ty.lift.business.library.dao.entity.model.PlatformCompanyRequest;
 import cn.com.ty.lift.business.library.dao.mapper.PlatformCompanyLiftRelevanceMapper;
+import cn.com.ty.lift.business.maintenance.service.MaintenancePlanService;
 import cn.com.ty.lift.business.project.dao.entity.Project;
 import cn.com.ty.lift.business.project.dao.mapper.ProjectMapper;
 import cn.com.ty.lift.common.constants.ApiConstants;
@@ -13,6 +14,7 @@ import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -35,6 +37,9 @@ public class PlatformCompanyLiftRelevanceService extends ServiceImpl<PlatformCom
     @Resource
     private LiftService liftService;
 
+    @Resource
+    private MaintenancePlanService maintenancePlanService;
+
     /**
      * @param id 电梯id
      * @param mtCompanyId 公司id
@@ -109,7 +114,7 @@ public class PlatformCompanyLiftRelevanceService extends ServiceImpl<PlatformCom
                 List<PlatformCompanyLiftRelevance> resultList = mapper.selectBatchIds(request.getLiftIdList());
                 //项目下非停保状态的电梯状态修改为正常
                 for (PlatformCompanyLiftRelevance entry : resultList) {
-                    entry.setLiftCompanyStatus(new Byte(CommonEnum.LiftStatus.STOP_INSURANCE.getCode()));
+                    entry.setLiftCompanyStatus(CommonEnum.LiftStatus.STOP_INSURANCE.getCode());
                 }
                 boolean ret = updateBatchById(resultList);
                 if (!ret) {
@@ -133,16 +138,49 @@ public class PlatformCompanyLiftRelevanceService extends ServiceImpl<PlatformCom
     }
 
     /**
-     * @param request companyLiftRelevanceList 公司电梯更新列表
+     * @param request platformCompanyId 公司电梯关联表主键id
+     * @param request companyId 公司id
+     * @param request liftId 电梯id
      * @return 1.成功, 0.失败, 消息描述
-     * @description 批量更新电梯状态为停保 TODO 清除维保计划
+     * @description 更新电梯状态为停保,并清除维保计划
      * @date 2019/12/5 5:24 PM
      */
-    public RestResponse updateBatch(UpdateBatchPlatformCompanyRequest request) {
-        boolean result = updateBatchById(request.getCompanyLiftRelevanceList());
+    @Transactional
+    public RestResponse stopInsurance(PlatformCompanyRequest request) {
+        PlatformCompanyLiftRelevance entry = new PlatformCompanyLiftRelevance();
+        entry.setId(request.getPlatformCompanyId());
+        entry.setLiftCompanyStatus(CommonEnum.LiftStatus.STOP_INSURANCE.getCode());
+        boolean result = updateById(entry);
+        if (!result) {
+            return RestResponse.fail(MessageUtils.get("msg.modify.batch.fail"));
+        }
+        //清除维保计划
+        boolean ret = maintenancePlanService.cleanPlan(request.getCompanyId(), request.getLiftId());
+        if (!ret) {
+            return RestResponse.fail(MessageUtils.get("msg.modify.batch.fail"));
+        }
+        return RestResponse.success(null, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.modify.batch.success"));
+    }
+
+    @Transactional
+    public RestResponse batchStopInsurance(PlatformCompanyRequest request){
+        //公司电梯关联表主键id列表
+        List<Long> companyIdList = request.getPlatformCompanyIdList();
+        //批量查询公司下电梯数据
+        List<PlatformCompanyLiftRelevance> list = mapper.selectBatchIds(companyIdList);
+        for (PlatformCompanyLiftRelevance entry : list) {
+            entry.setLiftCompanyStatus(CommonEnum.LiftStatus.STOP_INSURANCE.getCode());
+        }
+        //批量更新公司下电梯信息为停保
+        boolean result = updateBatchById(list);
         if (!result) {
             return RestResponse.fail(MessageUtils.get("msg.modify.batch.fail"));
         }
-        return RestResponse.success(ApiConstants.RESULT_SUCCESS, "msg.modify.batch.success");
+        //批量清除维保计划
+        boolean ret = maintenancePlanService.removeMaintenancePlan(request.getCompanyId(),request.getIdList());
+        if (!ret) {
+            return RestResponse.fail(MessageUtils.get("msg.modify.batch.fail"));
+        }
+        return RestResponse.success(null, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.modify.batch.success"));
     }
 }

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

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * @author bieao
@@ -77,20 +78,18 @@ public class MaintenanceController {
     }
 
     /**
-     * @param request mtCompanyId 公司id
-     * @param request liftId 电梯id
+     * @param request idList 维保计划表主键id列表
      * @return 是否成功
      * @description 清空维保计划
      * @date 2019/12/17 3:14 PM
      */
     @PostMapping("batch/clean")
-    public RestResponse cleanPlan(@RequestBody MaintenancePlanRequest request) {
-        String mtCompanyId = request.getMtCompanyId();
-        String liftId = request.getLiftId();
-        if (ObjectUtil.isEmpty(mtCompanyId) || ObjectUtil.isEmpty(liftId)) {
+    public RestResponse batchCleanPlan(@RequestBody MaintenancePlanRequest request) {
+        List<Long> idList = request.getIdList();
+        if (ObjectUtil.isEmpty(idList)) {
             return RestResponse.failParam();
         }
-        boolean result = maintenancePlanService.cleanPlan(mtCompanyId, liftId);
+        boolean result = maintenancePlanService.batchCleanPlan(idList);
         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/MaintenancePlanRequest.java

@@ -18,6 +18,10 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class MaintenancePlanRequest extends BaseRequestModel {
+    /**
+     * 维保计划主键id列表
+     */
+    private List<Long> idList;
     /**
      * 电梯列表
      */

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

@@ -12,6 +12,7 @@ import cn.com.ty.lift.business.project.service.ProjectService;
 import cn.com.ty.lift.common.base.ExportRequest;
 import cn.com.ty.lift.common.export.ExportUtils;
 import cn.hutool.core.date.DateUtil;
+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;
@@ -183,6 +184,31 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
         return updateBatchById(resultList, resultList.size());
     }
 
+    /**
+     * @param idList 维保计划主键id列表
+     * @return 是否成功
+     * @description 批量清除维保计划
+     * @date 2019/12/28 2:00 PM
+     */
+    public boolean batchCleanPlan(List<Long> idList){
+       return removeByIds(idList);
+    }
+
+
+    /**
+     * @param companyId 公司id
+     * @param idList 电梯id列表
+     * @return 是否成功
+     * @description 批量清除维保计划
+     * @date 2019/12/28 2:00 PM
+     */
+    public boolean removeMaintenancePlan(String companyId,List<Long> idList){
+        QueryWrapper<MaintenancePlan> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("mt_company_id", companyId);
+        queryWrapper.in("lift_id", idList);
+        return remove(queryWrapper);
+    }
+
     /**
      * @param mtCompanyId 公司id
      * @param liftId 电梯id

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

@@ -1,14 +1,14 @@
 package cn.com.ty.lift.business.project.controller;
 
 import cn.com.ty.lift.business.framework.util.MessageUtils;
+import cn.com.ty.lift.business.library.dao.entity.model.BatchUpdateLiftRequest;
 import cn.com.ty.lift.business.library.dao.entity.model.SelectBatchPlatformCompanyRequest;
 import cn.com.ty.lift.business.library.service.PlatformCompanyLiftRelevanceService;
 import cn.com.ty.lift.business.project.dao.entity.Project;
 import cn.com.ty.lift.business.project.dao.entity.ProjectHistory;
 import cn.com.ty.lift.business.project.dao.entity.ProjectUser;
-import cn.com.ty.lift.business.project.dao.entity.model.ProjectIDResponse;
-import cn.com.ty.lift.business.project.dao.entity.model.ProjectRequest;
-import cn.com.ty.lift.business.project.dao.entity.model.ProjectResponse;
+import cn.com.ty.lift.business.project.dao.entity.model.*;
+import cn.com.ty.lift.business.project.service.ProjectLiftRelevanceService;
 import cn.com.ty.lift.business.project.service.ProjectService;
 import cn.com.ty.lift.common.base.ExportRequest;
 import cn.com.ty.lift.common.constants.ApiConstants;
@@ -35,6 +35,9 @@ public class ProjectController {
     @Resource
     private PlatformCompanyLiftRelevanceService platformCompanyLiftRelevanceService;
 
+    @Resource
+    private ProjectLiftRelevanceService projectLiftRelevanceService;
+
     /**
      * @param request 项目列表查询条件
      * @return RestResponse 项目分页列表结果
@@ -186,6 +189,32 @@ public class ProjectController {
         return platformCompanyLiftRelevanceService.serviceOperate(request);
     }
 
+    /**
+     * @param request projectId 项目id
+     * @return 1.成功, 0.失败, 消息描述
+     * @description 项目锁定、解锁
+     * @date 2019/11/27 10:03 AM
+     */
+    @PostMapping("lockOrUnlock")
+    public RestResponse lockOrUnlock(@RequestBody BatchUpdateLiftRequest request) {
+        return projectLiftRelevanceService.projectLockOrUnLock(request);
+    }
+
+    /**
+     * @param request 用户id
+     * @return 1.成功, 0.失败, 消息描述
+     * @description 查询用户下的关联项目和电梯信息
+     * @date 2019/12/26 4:27 PM
+     */
+    @PostMapping("relevance/list")
+    public RestResponse relevanceList(@RequestBody ProjectLiftRelevanceRequest request) {
+        IPage<ProjectRelevanceResponse> page = projectLiftRelevanceService.relevanceList(request);
+        if (ObjectUtil.isEmpty(page.getRecords())) {
+            return RestResponse.success();
+        }
+        return RestResponse.success(page, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.query.success"));
+    }
+
     /**
      * @param request 导出项目数据列表
      * @return 1.成功, 0.失败, 消息描述

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

@@ -1,69 +0,0 @@
-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.library.dao.entity.model.BatchUpdateLiftRequest;
-import cn.com.ty.lift.business.project.service.ProjectLiftRelevanceService;
-import cn.com.ty.lift.business.project.dao.entity.model.ProjectLiftRelevanceRequest;
-import cn.com.ty.lift.business.project.dao.entity.model.ProjectRelevanceResponse;
-import cn.com.ty.lift.common.constants.ApiConstants;
-import cn.com.xwy.boot.web.dto.RestResponse;
-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;
-
-/**
- * @author bieao
- * @date 2019/12/26
- * @description 项目电梯关联控制层
- */
-@RestController
-@RequestMapping("project/relevance")
-public class ProjectRelevanceController {
-
-    @Resource
-    private ProjectLiftRelevanceService projectRelevanceService;
-
-    /**
-     * @param request updateLiftList 项目id列表
-     * @return 1.成功, 0.失败, 消息描述
-     * @description 电梯批量锁定、解锁
-     * @date 2019/11/27 10:03 AM
-     */
-    @PostMapping("lockOrUnlock")
-    public RestResponse lockOrUnlock(@RequestBody BatchUpdateLiftRequest request) {
-        return projectRelevanceService.lockOrUnlock(request);
-    }
-
-    /**
-     * @param projectLiftRelevance 关联表主键id
-     * @return 1.成功, 0.失败, 消息描述
-     * @description 逻辑删除电梯
-     * @date 2019/11/27 10:03 AM
-     */
-    @PostMapping("logicDelete")
-    public RestResponse logicDelete(@RequestBody ProjectLiftRelevance projectLiftRelevance) {
-        return projectRelevanceService.logicDelete(projectLiftRelevance);
-    }
-
-
-    /**
-     * @param request 用户id
-     * @return 1.成功, 0.失败, 消息描述
-     * @description 查询用户下的关联项目和电梯信息
-     * @date 2019/12/26 4:27 PM
-     */
-    @PostMapping("list")
-    public RestResponse list(@RequestBody ProjectLiftRelevanceRequest request) {
-        IPage<ProjectRelevanceResponse> page = projectRelevanceService.list(request);
-        if (ObjectUtil.isEmpty(page.getRecords())) {
-            return RestResponse.success();
-        }
-        return RestResponse.success(page, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.query.success"));
-    }
-}

lift-business-service/src/main/java/cn/com/ty/lift/business/project/dao/entity/Project.java

@@ -124,7 +124,7 @@ public class Project extends BaseEntity {
     /**
      * 是否锁定 0否 1是
      */
-    private boolean locked;
+    private Integer locked;
 
     /**
      * 评价方式 0是默认 24  1天后自动评价 48  48小时候默认好评

lift-business-service/src/main/java/cn/com/ty/lift/business/project/dao/entity/ProjectLiftRelevance.java

@@ -51,7 +51,12 @@ public class ProjectLiftRelevance extends BaseEntity {
     /**
      * 是否锁定 0否 1是
      */
-    private boolean liftLocked;
+    private Integer liftLocked;
+
+    /**
+     * 是否删除 0否 1是
+     */
+    private Integer deleteFlag;
 
     /**
      * 首保时间

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

@@ -13,6 +13,7 @@ import cn.com.ty.lift.business.project.dao.mapper.ProjectMapper;
 import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.util.ObjectUtil;
+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;
@@ -69,45 +70,60 @@ public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanc
         return save(projectLiftEntry);
     }
 
+
+    /**
+     * @param companyId 公司id
+     * @param idList 电梯id列表
+     * @return 项目电梯关联列表
+     * @description 根据公司id和电梯id列表查询项目电梯关联列表
+     * @date 2019/12/28 1:55 PM
+     */
+    public List<ProjectLiftRelevance> list(String companyId, List<Long> idList){
+        QueryWrapper<ProjectLiftRelevance> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("mt_company_id", companyId);
+        queryWrapper.in("lift_id", idList);
+        return list();
+    }
+
     /**
-     * @param request
+     * @param request 电梯id列表
      * @return RestResponse 状态码和返回消息
-     * @description 项目锁定、解锁,锁定该项目下的电梯
+     * @description 电梯锁定、解锁
      * @date 2019/12/5 11:00 AM
      */
+    public RestResponse liftLockOrUnLock(BatchUpdateLiftRequest request) {
+        List<Long> list = request.getLiftList();
+        List<ProjectLiftRelevance> projectLiftList = list(request.getMtCompanyId(), list);
+        if (ObjectUtil.isNotEmpty(projectLiftList))
+            projectLiftList.forEach(entry -> entry.setLiftLocked(request.getLock()));
+        boolean result = updateBatchById(projectLiftList);
+        if (!result) {
+            return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+        }
+        return RestResponse.success(null, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.modify.success"));
+    }
+
+    /**
+     * @param request projectId 项目id
+     * @return RestResponse 状态码和返回消息
+     * @description 项目锁定、解锁,锁定该项目下的电梯
+     * @date 2019/12/27 5:04 PM
+     */
     @Transactional
-    public RestResponse lockOrUnlock(BatchUpdateLiftRequest request) {
-        String source = request.getSource();
-        String projectId = request.getProjectId();
-        switch (source) {
-            //锁定电梯
-            case "0":
-                List<ProjectLiftRelevance> list = request.getUpdateLiftList();
-                if (ObjectUtil.isNotEmpty(list)) list.forEach(entry -> entry.setLiftLocked(true));
-                boolean result = updateBatchById(list);
-                if (!result) {
-                    return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
-                }
-                break;
-            //锁定项目
-            case "1":
-                Project project = new Project();
-                project.setId(Long.parseLong(projectId));
-                project.setLocked(true);
-                int ret = projectMapper.updateById(project);
-                if (ret < 0){
-                    return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
-                }
-                //根据项目id和公司id查询项目下电梯
-                List<ProjectLiftRelevance> relevanceList = projectLiftRelevanceMapper.findIdList(request);
-                relevanceList.forEach(relevance -> relevance.setLiftLocked(true));
-                boolean response = updateBatchById(relevanceList);
-                if (!response){
-                    return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
-                }
-                break;
-            default:
-                break;
+    public RestResponse projectLockOrUnLock (BatchUpdateLiftRequest request){
+        Project project = new Project();
+        project.setId(request.getProjectId());
+        project.setLocked(request.getLock());
+        int ret = projectMapper.updateById(project);
+        if (ret < 0){
+            return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+        }
+        //根据项目id和公司id查询项目下电梯
+        List<ProjectLiftRelevance> relevanceList = projectLiftRelevanceMapper.findIdList(request);
+        relevanceList.forEach(relevance -> relevance.setLiftLocked(request.getLock()));
+        boolean response = updateBatchById(relevanceList);
+        if (!response){
+            return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
         }
         return RestResponse.success(null, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.modify.success"));
     }
@@ -118,7 +134,7 @@ public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanc
      * @description 查询用户下的关联项目和电梯信息
      * @date 2019/12/26 4:27 PM
      */
-    public IPage<ProjectRelevanceResponse> list(ProjectLiftRelevanceRequest request){
+    public IPage<ProjectRelevanceResponse> relevanceList(ProjectLiftRelevanceRequest request){
         IPage<ProjectRelevanceResponse> page = new Page<>(request.getPageNum(), request.getPageSize());
         return projectLiftRelevanceMapper.selectListByUserId(page, request);
     }

lift-business-service/src/main/resources/mapper/lift/LiftMapper.xml

@@ -110,6 +110,7 @@
           l.device_position         AS devicePosition,
           lb.name                   AS liftBrand,
           l.annual_inspection_date  AS annualInspectionDate,
+		  pclr.id                   AS platformCompanyId,
           pclr.lift_company_status  AS liftStatus,
 		  ui.name                   AS workerName
         FROM project_lift_relevance plr