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

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

@@ -160,17 +160,6 @@ public class LiftController {
        return liftService.modify(lift);
     }
 
-    /**
-     * @param request liftIdList 电梯id列表
-     * @return 1.成功, 0.失败, 消息描述
-     * @description 批量查询电梯状态
-     * @date 2019/12/5 5:24 PM
-     */
-    @PostMapping("selectBatchByIds")
-    public RestResponse selectBatchByIds(@RequestBody SelectBatchPlatformCompanyRequest request) {
-        return platformService.selectBatch(request);
-    }
-
     /**
      * @param request updateLiftList 项目id列表
      * @return 1.成功, 0.失败, 消息描述

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

@@ -1,34 +0,0 @@
-package cn.com.ty.lift.business.library.dao.entity.model.request;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author bieao
- * @date 2019/12/5
- * @description
- */
-@Data
-public class SelectBatchPlatformCompanyRequest {
-    /**
-     * 电梯id列表
-     */
-    private List<Long> liftIdList;
-
-    /**
-     * 项目id
-     */
-    private Long projectId;
-
-    /**
-     * 1:恢复服务，2:停止服务，3:继续服务
-     */
-    private String operate;
-
-    /**
-     * 维保公司id
-     */
-    private Long mtCompanyId;
-
-}

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

@@ -275,7 +275,7 @@ public class LiftService extends ServiceImpl<LiftMapper,Lift> {
         //根据维保公司和项目id查询
         List<LiftProjectModel> liftProjectModelList = liftMapper.listByCompanyAndProject(mtCompanyId,projectId);
         //根据维保公司和项目查询
-        List<ProjectLiftRelevance> projectLiftRelevanceList = projectRelevanceService.listByCompanyProject(mtCompanyId,projectId);
+        List<ProjectLiftRelevance> projectLiftRelevanceList = projectRelevanceService.findLiftList(mtCompanyId,projectId);
         //根据维保公司
         List<PlatformCompanyLiftRelevance> platformCompanyLiftRelevanceList = platformService.listByCompany(mtCompanyId);
 

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

@@ -4,13 +4,15 @@ import cn.com.ty.lift.business.framework.util.MessageUtils;
 import cn.com.ty.lift.business.library.dao.entity.Lift;
 import cn.com.ty.lift.business.library.dao.entity.PlatformCompanyLiftRelevance;
 import cn.com.ty.lift.business.library.dao.entity.model.request.PlatformCompanyBatchRequest;
-import cn.com.ty.lift.business.library.dao.entity.model.request.SelectBatchPlatformCompanyRequest;
+import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectOperateServiceRequest;
 import cn.com.ty.lift.business.library.dao.entity.model.request.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.maintenance.service.MaintenanceService;
 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.business.project.dao.entity.ProjectLiftRelevance;
+import cn.com.ty.lift.business.project.service.ProjectLiftRelevanceService;
+import cn.com.ty.lift.business.project.service.ProjectService;
 import cn.com.ty.lift.common.constants.CommonEnum;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.collection.CollUtil;
@@ -21,9 +23,11 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  * @author bieao
@@ -37,7 +41,7 @@ public class PlatformCompanyLiftRelevanceService extends ServiceImpl<PlatformCom
     private PlatformCompanyLiftRelevanceMapper mapper;
 
     @Resource
-    private ProjectMapper projectMapper;
+    private ProjectService projectService;
 
     @Resource
     private LiftService liftService;
@@ -48,6 +52,10 @@ public class PlatformCompanyLiftRelevanceService extends ServiceImpl<PlatformCom
     @Resource
     private MaintenanceService maintenanceService;
 
+    @Resource
+    private ProjectLiftRelevanceService projectLiftRelevanceService;
+
+
     /**
      * @param id          电梯id
      * @param mtCompanyId 公司id
@@ -91,17 +99,43 @@ public class PlatformCompanyLiftRelevanceService extends ServiceImpl<PlatformCom
     }
 
     /**
-     * @param request liftIdList 电梯id列表
-     * @return 1.成功, 0.失败, 消息描述
-     * @description 批量查询电梯状态
-     * @date 2019/12/5 5:24 PM
+     * @param mtCompanyId 公司id
+     * @param projectId 项目id
+     * @return List<PlatformCompanyLiftRelevance> 公司电梯关联列表
+     * @description 获取公司电梯关联列表
+     * @date 2020/1/11 3:06 下午
      */
-    public RestResponse selectBatch(SelectBatchPlatformCompanyRequest request) {
-        List<PlatformCompanyLiftRelevance> list = mapper.selectBatchIds(request.getLiftIdList());
-        if (CollUtil.isEmpty(list)) {
-            return RestResponse.success();
-        }
-        return RestResponse.success(list, MessageUtils.get("msg.query.success"));
+    public List<PlatformCompanyLiftRelevance> getCompanyLiftList(Long mtCompanyId, Long projectId){
+        //根据项目id和公司id查询电梯列表
+        List<ProjectLiftRelevance> liftList = projectLiftRelevanceService.findLiftList(mtCompanyId, projectId);
+        Collection<Long> list = liftList.stream().map(ProjectLiftRelevance::getRelevanceId).collect(Collectors.toList());
+        return mapper.selectBatchIds(list);
+    }
+
+    /**
+     * @param mtCompanyId 公司id
+     * @param projectId 项目id
+     * @return RestResponse 操作是否成功
+     * @description 确认停止服务
+     * @date 2020/1/11 2:45 下午
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public RestResponse confirm(Long mtCompanyId, Long projectId) {
+        Project project = new Project();
+        project.setId(projectId);
+        //修改项目状态为停止
+        project.setProjectStatus(CommonEnum.ProjectStatus.STOP_SERVICE.getCode());
+        projectService.modify(project);
+        List<PlatformCompanyLiftRelevance> resultList = getCompanyLiftList(mtCompanyId,projectId);
+        resultList.forEach(entry -> entry.setLiftCompanyStatus(CommonEnum.LiftStatus.STOP_INSURANCE.getCode()));
+        //批量停保项目下的电梯
+        updateBatchById(resultList);
+        //根据项目id和公司id查询电梯列表
+        List<ProjectLiftRelevance> liftList = projectLiftRelevanceService.findLiftList(mtCompanyId, projectId);
+        Collection<Long> list = liftList.stream().map(ProjectLiftRelevance::getLiftId).collect(Collectors.toList());
+        //批量清除维保计划
+        maintenancePlanService.removeMaintenancePlan(mtCompanyId, list);
+        return RestResponse.success(null, MessageUtils.get("msg.project.operate.success"));
     }
 
     /**
@@ -110,43 +144,57 @@ public class PlatformCompanyLiftRelevanceService extends ServiceImpl<PlatformCom
      * @description 服务操作
      * @date 2019/12/10 5:42 PM
      */
-    public RestResponse serviceOperate(SelectBatchPlatformCompanyRequest request) {
+    @Transactional(rollbackFor = Exception.class)
+    public RestResponse serviceOperate(ProjectOperateServiceRequest request) {
         String operate = request.getOperate();
+        Long projectId = request.getProjectId();
+        Long mtCompanyId = request.getMtCompanyId();
+        Project project = new Project();
+        project.setId(projectId);
+        boolean exist = false;
+        List<PlatformCompanyLiftRelevance> resultList = getCompanyLiftList(mtCompanyId,projectId);
         switch (operate) {
             //恢复服务
             case "1":
-                boolean judgeResult = maintenanceService.judge(request.getMtCompanyId());
+                //判断当前公司台量是否大于企业设置的台量
+                boolean judgeResult = maintenanceService.judge(mtCompanyId);
                 if (!judgeResult) {
                     return RestResponse.fail(MessageUtils.get("msg.limit.num"));
                 }
+                project.setProjectStatus(CommonEnum.ProjectStatus.IN_SERVICE.getCode());
+                projectService.modify(project);
+                //电梯状态设置为正常
+                resultList.forEach(entry -> entry.setLiftCompanyStatus(CommonEnum.LiftStatus.NORMAL.getCode()));
+                boolean result = updateBatchById(resultList);
+                if (!result) {
+                    return RestResponse.fail(MessageUtils.get("msg.modify.batch.fail"));
+                }
                 break;
             //停止服务
             case "2":
-                //TODO 检查电梯是否有进行中的任务，并提醒，批量停保项目下的电梯，清除维保、年检、急修任务
-                List<PlatformCompanyLiftRelevance> resultList = mapper.selectBatchIds(request.getLiftIdList());
-                //项目下非停保状态的电梯状态修改为正常
                 for (PlatformCompanyLiftRelevance entry : resultList) {
-                    entry.setLiftCompanyStatus(CommonEnum.LiftStatus.STOP_INSURANCE.getCode());
-                }
-                boolean ret = updateBatchById(resultList);
-                if (!ret) {
-                    return RestResponse.fail(MessageUtils.get("msg.modify.batch.fail"));
+                    String liftStatus = entry.getLiftCompanyStatus();
+                    if (CommonEnum.LiftStatus.MAINTENANCE.getCode().equals(liftStatus)) {
+                        return RestResponse.fail(MessageUtils.get("msg.project.lift.maintenance.status.error"));
+                    } else if (CommonEnum.LiftStatus.EMERGENCY_REPAIR.getCode().equals(liftStatus)) {
+                        return RestResponse.fail(MessageUtils.get("msg.project.lift.emergency.status.error"));
+                    } else if (CommonEnum.LiftStatus.ANNUAL_INSPECTION.getCode().equals(liftStatus)) {
+                        return RestResponse.fail(MessageUtils.get("msg.project.lift.annualinspection.success.error"));
+                    }
+                    exist = true;
                 }
+                if (exist) confirm(projectId, mtCompanyId);
                 break;
             //继续服务
             case "3":
-                Project project = new Project();
-                project.setId(request.getProjectId());
                 project.setProjectStatus(CommonEnum.ProjectStatus.IN_SERVICE.getCode());
-                int result = projectMapper.updateById(project);
-                if (result < 0) {
-                    return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
-                }
+                int response = projectService.modify(project);
+                if (response < 0) return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
                 break;
             default:
                 break;
         }
-        return RestResponse.success(null, MessageUtils.get("msg.add.success"));
+        return RestResponse.success(null, MessageUtils.get("msg.project.operate.success"));
     }
 
     /**

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

@@ -4,7 +4,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
-import java.util.List;
+import java.util.Collection;
 
 /**
  * @author bieao
@@ -18,7 +18,7 @@ public class MaintenanceCleanRequest {
      * 电梯id列表
      */
     @NotEmpty(message = "notEmpty")
-    private List<Long> liftIdList;
+    private Collection<Long> liftIdList;
 
     /**
      * 公司id

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

@@ -331,7 +331,7 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
      * @description 批量清除维保计划
      * @date 2019/12/28 2:00 PM
      */
-    public boolean removeMaintenancePlan(Long mtCompanyId, List<Long> liftList) {
+    public boolean removeMaintenancePlan(Long mtCompanyId, Collection<Long> liftList) {
         QueryWrapper<MaintenancePlan> queryWrapper = new QueryWrapper<>();
         LambdaQueryWrapper<MaintenancePlan> lambdaQueryWrapper = queryWrapper.lambda();
         lambdaQueryWrapper.eq(MaintenancePlan::getMtCompanyId, mtCompanyId);

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

@@ -1,19 +1,16 @@
 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.request.SelectBatchPlatformCompanyRequest;
+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;
 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.request.*;
 import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectRelevanceResponse;
 import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectResponse;
 import cn.com.ty.lift.business.project.service.ProjectLiftRelevanceService;
 import cn.com.ty.lift.business.project.service.ProjectService;
-import cn.com.ty.lift.business.project.service.ProjectUserService;
 import cn.com.ty.lift.common.base.ExportRequest;
-import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -37,9 +34,6 @@ public class ProjectController {
     @Resource
     private ProjectService projectService;
 
-    @Resource
-    private ProjectUserService projectUserService;
-
     @Resource
     private PlatformCompanyLiftRelevanceService platformCompanyLiftRelevanceService;
 
@@ -58,7 +52,7 @@ public class ProjectController {
         if (CollUtil.isEmpty(page.getRecords())) {
             return RestResponse.success();
         }
-        return RestResponse.success(page, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.query.success"));
+        return RestResponse.success(page, MessageUtils.get("msg.query.success"));
     }
 
     /**
@@ -91,21 +85,6 @@ public class ProjectController {
         return RestResponse.success(page, MessageUtils.get("msg.query.success"));
     }
 
-    /**
-     * @param request projectId 项目ID
-     * @return RestResponse userList项目组成员列表
-     * @description 查询项目组成员
-     * @date 2019/12/13 2:40 PM
-     */
-    @PostMapping("userList")
-    public RestResponse userList(@Valid @RequestBody ProjectDetailRequest request) {
-        List<ProjectUser> userList = projectUserService.userList(request);
-        if (CollUtil.isEmpty(userList)) {
-            return RestResponse.success();
-        }
-        return RestResponse.success(userList, MessageUtils.get("msg.query.success"));
-    }
-
     /**
      * @param request regionId 区域id
      * @return RestResponse userList项目组成员列表
@@ -147,21 +126,6 @@ public class ProjectController {
         return projectService.add(request);
     }
 
-    /**
-     * @param projectUser 新增维保工数据项
-     * @return 1.成功, 0.失败, 消息描述
-     * @description 新增维保工
-     * @date 2019/12/4 4:44 PM
-     */
-    @PostMapping("worker/add")
-    public RestResponse add(@RequestBody ProjectUser projectUser) {
-        Integer result = projectUserService.add(projectUser);
-        if (result > 0) {
-            return RestResponse.success(ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.add.success"));
-        }
-        return RestResponse.fail(MessageUtils.get("msg.add.fail"));
-    }
-
     /**
      * @param project 修改项目数据项
      * @return 1.成功, 0.失败, 消息描述
@@ -172,7 +136,7 @@ public class ProjectController {
     public RestResponse modify(@RequestBody Project project) {
         Integer result = projectService.modify(project);
         if (result > 0) {
-            return RestResponse.success(result, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.modify.success"));
+            return RestResponse.success(result, MessageUtils.get("msg.modify.success"));
         }
         return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
     }
@@ -186,10 +150,21 @@ public class ProjectController {
      * @date 2019/12/10 5:42 PM
      */
     @PostMapping("service/operate")
-    public RestResponse serviceOperate(@RequestBody SelectBatchPlatformCompanyRequest request) {
+    public RestResponse serviceOperate(@Valid @RequestBody ProjectOperateServiceRequest request) {
         return platformCompanyLiftRelevanceService.serviceOperate(request);
     }
 
+    /**
+     * @param request 公司id和项目id
+     * @return 1.成功, 0.失败, 消息描述
+     * @description 确认停止服务
+     * @date 2020/1/11 2:59 下午
+     */
+    @PostMapping("confirm")
+    public RestResponse confirm(@Valid @RequestBody ProjectConfirmRequest request){
+        return platformCompanyLiftRelevanceService.confirm(request.getMtCompanyId(),request.getProjectId());
+    }
+
     /**
      * @param request projectId 项目id
      * @return 1.成功, 0.失败, 消息描述
@@ -213,7 +188,7 @@ public class ProjectController {
         if (CollUtil.isEmpty(page.getRecords())) {
             return RestResponse.success();
         }
-        return RestResponse.success(page, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.query.success"));
+        return RestResponse.success(page, MessageUtils.get("msg.query.success"));
     }
 
     /**

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

@@ -0,0 +1,90 @@
+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.ProjectUser;
+import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectDetailRequest;
+import cn.com.ty.lift.business.project.service.ProjectUserService;
+import cn.com.xwy.boot.web.dto.RestResponse;
+import cn.hutool.core.collection.CollUtil;
+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;
+import java.util.List;
+
+/**
+ * @author bieao
+ * @date 2020/1/11
+ * @description 项目组成员控制层
+ */
+@RestController
+@RequestMapping("project")
+public class ProjectUserController {
+
+    @Resource
+    private ProjectUserService projectUserService;
+
+    /**
+     * @param request projectId 项目ID
+     * @return RestResponse userList项目组成员列表
+     * @description 查询项目组成员
+     * @date 2019/12/13 2:40 PM
+     */
+    @PostMapping("user/list")
+    public RestResponse userList(@Valid @RequestBody ProjectDetailRequest request) {
+        List<ProjectUser> userList = projectUserService.userList(request);
+        if (CollUtil.isEmpty(userList)) {
+            return RestResponse.success();
+        }
+        return RestResponse.success(userList, MessageUtils.get("msg.query.success"));
+    }
+
+
+    /**
+     * @param projectUser 新增项目组成员
+     * @return 1.成功, 0.失败, 消息描述
+     * @description 新增项目组成员
+     * @date 2019/12/4 4:44 PM
+     */
+    @PostMapping("/user/add")
+    public RestResponse add(@RequestBody ProjectUser projectUser) {
+        boolean result = projectUserService.add(projectUser);
+        if (result) {
+            return RestResponse.success(null, MessageUtils.get("msg.add.success"));
+        }
+        return RestResponse.fail(MessageUtils.get("msg.add.fail"));
+    }
+
+    /**
+     * @param projectUser 修改项目组成员
+     * @return Integer 成功1或失败0
+     * @description 修改项目组成员
+     * @date 2020/1/11 10:43 上午
+     */
+    @PostMapping("/user/modify")
+    public RestResponse modify(@RequestBody ProjectUser projectUser) {
+        boolean result = projectUserService.modify(projectUser);
+        if (result) {
+            return RestResponse.success(null, MessageUtils.get("msg.modify.success"));
+        }
+        return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+    }
+
+    /**
+     * @param projectUser 修改项目组成员
+     * @return Integer 成功1或失败0
+     * @description 修改项目组成员
+     * @date 2020/1/11 10:43 上午
+     */
+    @PostMapping("/user/remove")
+    public RestResponse remove(@RequestBody ProjectUser projectUser) {
+        boolean result = projectUserService.remove(projectUser);
+        if (result) {
+            return RestResponse.success(null, MessageUtils.get("msg.delete.success"));
+        }
+        return RestResponse.fail(MessageUtils.get("msg.delete.fail"));
+    }
+}

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

@@ -0,0 +1,26 @@
+package cn.com.ty.lift.business.project.dao.entity.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author bieao
+ * @date 2020/1/11
+ * @description 确认停止服务请求
+ */
+@Data
+public class ProjectConfirmRequest {
+
+    /**
+     * 项目id
+     */
+    @NotNull(message = "notEmpty")
+    private Long projectId;
+
+    /**
+     * 维保公司id
+     */
+    @NotNull(message = "notEmpty")
+    private Long mtCompanyId;
+}

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

@@ -0,0 +1,34 @@
+package cn.com.ty.lift.business.project.dao.entity.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author bieao
+ * @date 2019/12/5
+ * @description 服务操作请求
+ */
+@Data
+public class ProjectOperateServiceRequest {
+
+    /**
+     * 项目id
+     */
+    @NotNull(message = "notEmpty")
+    private Long projectId;
+
+    /**
+     * 1:恢复服务，2:停止服务，3:继续服务
+     */
+    @NotEmpty(message = "notEmpty")
+    private String operate;
+
+    /**
+     * 维保公司id
+     */
+    @NotNull(message = "notEmpty")
+    private Long mtCompanyId;
+
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/project/dao/mapper/ProjectUserMapper.java

@@ -17,9 +17,6 @@ public interface ProjectUserMapper extends BaseMapper<ProjectUser> {
 
     List<ProjectUser> findUserListById(@Param("projectId") Long projectId);
 
-    @Override
-    int insert(ProjectUser entity);
-
     /**
      * @param request 项目id
      * @return List<ProjectAppUser> 项目成员名称和头像地址

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

@@ -47,9 +47,9 @@ public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanc
         entry.setDeleteFlag(1);
         boolean result = updateById(entry);
         if (!result) {
-            return RestResponse.fail(MessageUtils.get("msg.logic.delete.fail"));
+            return RestResponse.fail(MessageUtils.get("msg.delete.fail"));
         }
-        return RestResponse.success(null, MessageUtils.get("msg.logic.delete.success"));
+        return RestResponse.success(null, MessageUtils.get("msg.delete.success"));
     }
 
     /**
@@ -130,17 +130,17 @@ public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanc
     }
 
     /**
-     * @param request 项目id和公司id
-     * @return List<ProjectLiftRelevance> 项目下电梯状态列表
+     * @param mtCompanyId 公司id
+     * @param projectId 项目id
+     * @return List<ProjectLiftRelevance> 项目下电梯列表
      * @description 根据项目id和公司id查询项目下电梯
      * @date 2020/1/7 3:35 下午
      */
-    public List<ProjectLiftRelevance> findIdList(ProjectLockRequest request) {
+    public List<ProjectLiftRelevance> findLiftList(Long mtCompanyId, Long projectId) {
         QueryWrapper<ProjectLiftRelevance> queryWrapper = new QueryWrapper<>();
         LambdaQueryWrapper<ProjectLiftRelevance> lambdaQueryWrapper = queryWrapper.lambda();
-        lambdaQueryWrapper.eq(ProjectLiftRelevance::getMtCompanyId, request.getMtCompanyId());
-        lambdaQueryWrapper.eq(ProjectLiftRelevance::getProjectId, request.getProjectId());
-        lambdaQueryWrapper.select(ProjectLiftRelevance::getId, ProjectLiftRelevance::getLiftLocked);
+        lambdaQueryWrapper.eq(ProjectLiftRelevance::getMtCompanyId, mtCompanyId);
+        lambdaQueryWrapper.eq(ProjectLiftRelevance::getProjectId, projectId);
         return list(lambdaQueryWrapper);
     }
 
@@ -190,7 +190,7 @@ public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanc
             return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
         }
         //根据项目id和公司id查询项目下电梯
-        List<ProjectLiftRelevance> relevanceList = findIdList(request);
+        List<ProjectLiftRelevance> relevanceList = findLiftList(request.getMtCompanyId(), request.getProjectId());
         if (CollUtil.isEmpty(relevanceList)) {
             return RestResponse.success(null, MessageUtils.get("msg.project.status.update"));
         }
@@ -212,12 +212,4 @@ public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanc
         IPage<ProjectRelevanceResponse> page = new Page<>(request.getPageNum(), request.getPageSize());
         return baseMapper.selectListByUserId(page, request);
     }
-
-    public List<ProjectLiftRelevance> listByCompanyProject(Long companyId, Long projectId) {
-        QueryWrapper<ProjectLiftRelevance> queryWrapper = new QueryWrapper<>();
-        LambdaQueryWrapper<ProjectLiftRelevance> lambdaQueryWrapper = queryWrapper.lambda();
-        lambdaQueryWrapper.eq(ProjectLiftRelevance::getMtCompanyId, companyId);
-        lambdaQueryWrapper.eq(ProjectLiftRelevance::getProjectId, projectId);
-        return list(lambdaQueryWrapper);
-    }
 }

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

@@ -3,11 +3,14 @@ package cn.com.ty.lift.business.project.service;
 import cn.com.ty.lift.business.project.dao.entity.ProjectUser;
 import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectDetailRequest;
 import cn.com.ty.lift.business.project.dao.mapper.ProjectUserMapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author bieao
@@ -31,12 +34,40 @@ public class ProjectUserService extends ServiceImpl<ProjectUserMapper, ProjectUs
     }
 
     /**
-     * @param projectUser 新增维保工数据项
+     * @param projectUser 新增项目组成员
      * @return Integer 成功1或失败0
-     * @description 新增维保工
+     * @description 新增项目组成员
      * @date 2019/12/4 4:41 PM
      */
-    public Integer add(ProjectUser projectUser) {
-        return projectUserMapper.insert(projectUser);
+    public boolean add(ProjectUser projectUser) {
+        return save(projectUser);
+    }
+
+    /**
+     * @param projectUser 修改项目组成员
+     * @return Integer 成功1或失败0
+     * @description 修改项目组成员
+     * @date 2020/1/11 10:43 上午
+     */
+    public boolean modify(ProjectUser projectUser){
+        QueryWrapper<ProjectUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user_id", projectUser.getUserId());
+        queryWrapper.eq("project_id", projectUser.getProjectId());
+        queryWrapper.eq("user_role", projectUser.getUserRole());
+        return update(projectUser, queryWrapper);
+    }
+
+    /**
+     * @param projectUser 删除项目组成员
+     * @return Integer 成功1或失败0
+     * @description 删除项目组成员
+     * @date 2020/1/11 10:43 上午
+     */
+    public boolean remove(ProjectUser projectUser){
+        Map<String, Object> columnMap = new HashMap<>(3);
+        columnMap.put("project_id", projectUser.getProjectId());
+        columnMap.put("user_id", projectUser.getUserId());
+        columnMap.put("user_role", projectUser.getUserRole());
+        return removeByMap(columnMap);
     }
 }

lift-business-service/src/main/resources/locale/response.properties

@@ -5,8 +5,8 @@ msg.add.success=\u65B0\u589E\u6210\u529F
 msg.add.fail=\u65B0\u589E\u5931\u8D25
 msg.modify.success=\u4FEE\u6539\u6210\u529F
 msg.modify.fail=\u4FEE\u6539\u5931\u8D25
-msg.logic.delete.success=\u5220\u9664\u6210\u529F
-msg.logic.delete.fail=\u5220\u9664\u5931\u8D25
+msg.delete.success=\u5220\u9664\u6210\u529F
+msg.delete.fail=\u5220\u9664\u5931\u8D25
 msg.add.batch.success=\u6279\u91CF\u65B0\u589E\u6210\u529F
 msg.add.batch.fail=\u6279\u91CF\u65B0\u589E\u5931\u8D25
 msg.modify.batch.success=\u6279\u91CF\u4FEE\u6539\u6210\u529F
@@ -21,4 +21,8 @@ notEmpty={0}\u4E0D\u80FD\u4E3A\u7A7A
 msg.project.status.update=\u9879\u76EE\u9501\u5B9A\u72B6\u6001\u66F4\u65B0\u6210\u529F\uFF0C\u9879\u76EE\u4E0B\u6682\u65F6\u6CA1\u6709\u7535\u68AF
 msg.company.lift.empty=\u8BE5\u516C\u53F8\u4E0B\u6682\u65F6\u6CA1\u6709\u7535\u68AF
 msg.error.time=\u9996\u4FDD\u65F6\u95F4\u5E94\u5728\u9879\u76EE\u5F00\u59CB\u65F6\u95F4\u548C\u7ED3\u675F\u65F6\u95F4\u8303\u56F4\u5185
-msg.error.lift.status=\u8BE5\u7535\u68AF\u5DF2\u5F03\u7528
+msg.error.lift.status=\u8BE5\u7535\u68AF\u5DF2\u5F03\u7528
+msg.project.operate.success=\u670D\u52A1\u64CD\u4F5C\u6210\u529F
+msg.project.lift.maintenance.status.error=\u9879\u76EE\u4E0B\u8FD8\u6709\u7EF4\u4FDD\u4E2D\u7684\u4EFB\u52A1
+msg.project.lift.emergency.status.error=\u9879\u76EE\u4E0B\u8FD8\u6709\u6025\u4FEE\u4E2D\u7684\u4EFB\u52A1
+msg.project.lift.annualinspection.success.error=\u9879\u76EE\u4E0B\u8FD8\u6709\u5E74\u68C0\u4E2D\u7684\u4EFB\u52A1