成员管理取消关联接口，查询项目组维保工接口

lift-business-service/src/main/java/cn/com/ty/lift/business/contract/dao/entity/ContractsExtend.java

@@ -2,8 +2,6 @@ package cn.com.ty.lift.business.contract.dao.entity;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**

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

@@ -1,22 +1,21 @@
 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;
 import cn.com.ty.lift.business.project.dao.entity.ProjectHistory;
 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.common.base.ExportRequest;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.map.MapUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.web.bind.annotation.*;
+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;
@@ -38,9 +37,6 @@ public class ProjectController {
     @Resource
     private PlatformCompanyLiftRelevanceService platformService;
 
-    @Resource
-    private ProjectLiftRelevanceService projectLiftRelevanceService;
-
     /**
      * @param request 项目列表查询条件
      * @return RestResponse 项目分页列表结果
@@ -157,21 +153,6 @@ 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
@@ -196,21 +177,6 @@ public class ProjectController {
         return projectService.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 (CollUtil.isEmpty(page.getRecords())) {
-            return RestResponse.success();
-        }
-        return RestResponse.success(page, 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

@@ -0,0 +1,94 @@
+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.ProjectDetailRequest;
+import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectLiftRelevanceRequest;
+import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectRelevanceResponse;
+import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectUserResponse;
+import cn.com.ty.lift.business.project.service.ProjectLiftRelevanceService;
+import cn.com.xwy.boot.web.dto.RestResponse;
+import cn.hutool.core.collection.CollUtil;
+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;
+import java.util.Calendar;
+import java.util.List;
+
+/**
+ * @author bieao
+ * @date 2020/2/12
+ * @description 项目电梯关联控制层
+ */
+@RestController
+@RequestMapping("project/relevance")
+public class ProjectRelevanceController {
+
+    @Resource
+    private ProjectLiftRelevanceService projectService;
+
+    /**
+     * @param request 用户id
+     * @return 1.成功, 0.失败, 消息描述
+     * @description 查询用户下的关联项目和电梯信息
+     * @date 2019/12/26 4:27 PM
+     */
+    @PostMapping("list")
+    public RestResponse relevanceList(@RequestBody ProjectLiftRelevanceRequest request) {
+        IPage<ProjectRelevanceResponse> page = projectService.relevanceList(request);
+        if (CollUtil.isEmpty(page.getRecords())) {
+            return RestResponse.success();
+        }
+        return RestResponse.success(page, MessageUtils.get("msg.query.success"));
+    }
+
+    /**
+     * @param request 项目ID
+     * @return List<ProjectUser> userList项目组维保工列表
+     * @description 查询项目组维保工
+     * @date 2020/2/12 5:01 下午
+     */
+    @PostMapping("user/list")
+    public RestResponse userList(@Valid @RequestBody ProjectDetailRequest request) {
+        List<ProjectUserResponse> userList = projectService.userList(request.getId());
+        if (CollUtil.isEmpty(userList)) {
+            return RestResponse.success();
+        }
+        return RestResponse.success(userList, MessageUtils.get("msg.query.success"));
+    }
+
+    /**
+     * @param entry 修改项目电梯关联数据项
+     * @return 1.成功, 0.失败, 消息描述
+     * @description 修改项目电梯关联
+     * @date 2020/2/3 1:29 下午
+     */
+    @PostMapping("modify")
+    public RestResponse modify(@RequestBody ProjectLiftRelevance entry) {
+        boolean result = projectService.modify(entry);
+        if (result) {
+            return RestResponse.success(null, MessageUtils.get("msg.modify.success"));
+        }
+        return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+    }
+
+    /**
+     * @param entry 项目关联主键id
+     * @return 1.成功, 0.失败, 消息描述
+     * @description 删除项目关联数据
+     * @date 2020/2/12 5:10 下午
+     */
+    @PostMapping("remove")
+    public RestResponse remove(@RequestBody ProjectLiftRelevance entry) {
+        boolean result = projectService.remove(entry.getId());
+        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/ProjectDetailRequest.java

@@ -24,7 +24,6 @@ public class ProjectDetailRequest extends BaseRequestModel {
     /**
      * 电梯注册代码
      */
-    @NotNull(message = "notEmpty")
     private String registrationCode;
 
 }

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

@@ -9,6 +9,14 @@ import lombok.Data;
  */
 @Data
 public class ProjectRelevanceResponse {
+    /**
+     * 主键id
+     */
+    private Long id;
+    /**
+     * 维保工id
+     */
+    private Long workerId;
     /**
      * 项目编号
      */

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

@@ -8,7 +8,9 @@ import cn.com.ty.lift.business.library.dao.entity.model.request.LiftLockRequest;
 import cn.com.ty.lift.business.project.dao.entity.ProjectLiftRelevance;
 import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectLiftRelevanceRequest;
 import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectRelevanceResponse;
+import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectUserResponse;
 import cn.com.ty.lift.business.project.dao.mapper.ProjectLiftRelevanceMapper;
+import cn.com.ty.lift.common.constants.CommonEnum;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -18,7 +20,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author bieao
@@ -28,6 +32,9 @@ import java.util.List;
 @Service
 public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanceMapper, ProjectLiftRelevance> {
 
+    @Resource
+    private ProjectUserService projectUserService;
+
     /**
      * @param entry 项目关联数据
      * @return RestResponse 状态码和返回消息
@@ -171,6 +178,29 @@ public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanc
         return updateById(entry);
     }
 
+    /**
+     * @param id 项目关联主键id
+     * @return 是否成功
+     * @description 删除项目关联数据
+     * @date 2020/2/12 5:10 下午
+     */
+    public boolean remove(Long id) {
+        return removeById(id);
+    }
+
+    /**
+     * @param projectId 项目ID
+     * @return List<ProjectUser> userList项目组维保工列表
+     * @description 查询项目组维保工
+     * @date 2020/2/12 5:01 下午
+     */
+    public List<ProjectUserResponse> userList(Long projectId) {
+        List<ProjectUserResponse> userList = projectUserService.getUserList(projectId);
+        return userList.stream().filter(user -> (
+                CommonEnum.DefaultRole.MTWORK.getCode().equals(user.getUserRole())
+        )).collect(Collectors.toList());
+    }
+
     /**
      * @param request 用户id
      * @return 1.成功, 0.失败, 消息描述

lift-business-service/src/main/resources/mapper/project/ProjectLiftRelevanceMapper.xml

@@ -29,6 +29,8 @@
 	<select id="selectListByUserId" resultType="cn.com.ty.lift.business.project.dao.entity.model.response.ProjectRelevanceResponse"
 			parameterType="cn.com.ty.lift.business.project.dao.entity.model.request.ProjectLiftRelevanceRequest" >
 		SELECT
+		   plr.id              AS id,
+		   plr.worker_id       AS workerId,
 		   p.project_code      AS projectCode,
   		   p.project_name      AS projectName,
            l.lift_code         AS liftCode,