[chg]增加项目、电梯详情接口，项目、电梯锁定

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

@@ -12,10 +12,7 @@ import cn.com.ty.lift.business.library.service.ProjectLiftRelevanceService;
 import cn.com.ty.lift.common.base.ExportRequest;
 import cn.com.xwy.boot.web.dto.RestResponse;
 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 org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
@@ -32,10 +29,10 @@ public class LibraryController {
     private LibraryService libraryService;
 
     @Resource
-    private ProjectLiftRelevanceService projectLiftRelevanceService;
+    private ProjectLiftRelevanceService projectRelevanceService;
 
     @Resource
-    private PlatformCompanyLiftRelevanceService platformCompanyLiftRelevanceService;
+    private PlatformCompanyLiftRelevanceService platformService;
 
     /**
      * @param request 电梯列表查询条件
@@ -48,6 +45,17 @@ public class LibraryController {
         return libraryService.list(request);
     }
 
+    /**
+     * @param id 电梯id
+     * @return RestResponse<Lift>
+     * @description 查询电梯详情
+     * @date 2019/12/6 10:51 AM
+     */
+    @PostMapping("detail/{id}")
+    public RestResponse<Lift> detail(@PathVariable(name = "id") Long id) {
+        return libraryService.detail(id);
+    }
+
     /**
      * @param lift 新增电梯数据项
      * @return 1.成功, 0.失败, 消息描述
@@ -78,7 +86,7 @@ public class LibraryController {
      */
     @PostMapping("lockOrUnlock")
     public RestResponse lockOrUnlock(@RequestBody BatchUpdateLiftRequest request) {
-        return projectLiftRelevanceService.lockOrUnlock(request);
+        return projectRelevanceService.lockOrUnlock(request);
     }
 
     /**
@@ -89,7 +97,7 @@ public class LibraryController {
      */
     @PostMapping("logicDelete")
     public RestResponse logicDelete(@RequestBody ProjectLiftRelevance projectLiftRelevance) {
-        return projectLiftRelevanceService.logicDelete(projectLiftRelevance.getId());
+        return projectRelevanceService.logicDelete(projectLiftRelevance.getId());
     }
 
     /**
@@ -100,18 +108,18 @@ public class LibraryController {
      */
     @PostMapping("selectBatchByIds")
     public RestResponse selectBatchByIds(@RequestBody SelectBatchPlatformCompanyRequest request) {
-        return platformCompanyLiftRelevanceService.selectBatch(request);
+        return platformService.selectBatch(request);
     }
 
     /**
      * @param request companyLiftRelevanceList 公司电梯更新列表
      * @return 1.成功, 0.失败, 消息描述
-     * @description 批量更新电梯状态
+     * @description 批量更新电梯状态为停保
      * @date 2019/12/5 5:24 PM
      */
     @PostMapping("updateBatchByIds")
     public RestResponse updateBatchByIds(@RequestBody UpdateBatchPlatformCompanyRequest request) {
-        return platformCompanyLiftRelevanceService.updateBatch(request);
+        return platformService.updateBatch(request);
     }
 
     /**

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

@@ -13,8 +13,13 @@ import java.util.List;
 @Data
 public class BatchUpdateLiftRequest {
     /**
-     * 项目id列表
+     * 电梯id列表
      */
     private List<ProjectLiftRelevance> updateLiftList;
 
+    /**
+     * 来源：0：锁定电梯 1：锁定项目
+     */
+    private String operate;
+
 }

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

@@ -7,7 +7,6 @@ import cn.com.ty.lift.business.library.dao.entity.PlatformCompanyLiftRelevance;
 import cn.com.ty.lift.business.library.dao.entity.model.LiftRequest;
 import cn.com.ty.lift.business.library.dao.mapper.LiftExtensionMapper;
 import cn.com.ty.lift.business.library.dao.mapper.LiftMapper;
-import cn.com.ty.lift.business.library.dao.mapper.PlatformCompanyLiftRelevanceMapper;
 import cn.com.ty.lift.common.base.ExportRequest;
 import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.ty.lift.common.export.ExportUtils;
@@ -38,13 +37,10 @@ public class LibraryService {
     private LiftExtensionMapper liftExtensionMapper;
 
     @Resource
-    private PlatformCompanyLiftRelevanceMapper platformCompanyLiftRelevanceMapper;
+    private PlatformCompanyLiftRelevanceService platformService;
 
     @Resource
-    private PlatformCompanyLiftRelevanceService platformCompanyLiftRelevanceService;
-
-    @Resource
-    private ProjectLiftRelevanceService projectLiftRelevanceService;
+    private ProjectLiftRelevanceService projectRelevanceService;
 
     private Map<String, String> paramMap = new HashMap<String, String>() {{
         put("liftCode", "电梯号");
@@ -71,6 +67,20 @@ public class LibraryService {
         return RestResponse.ok(page, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.query.success"));
     }
 
+    /**
+     * @param id 电梯id
+     * @return RestResponse<Lift>
+     * @description 查询电梯详情
+     * @date 2019/12/6 10:51 AM
+     */
+    public RestResponse<Lift> detail(Long id) {
+        Lift lift = liftMapper.selectById(id);
+        if (lift == null) {
+            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, MessageUtils.get("msg.data.empty"));
+        }
+        return RestResponse.ok(lift, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.query.success"));
+    }
+
     /**
      * @param lift 电梯
      * @return 电梯扩展实体
@@ -111,7 +121,7 @@ public class LibraryService {
             //电梯管理入口
             case "0":
                 //新增平台企业电梯关联表
-                PlatformCompanyLiftRelevance ret = platformCompanyLiftRelevanceService.save(extension);
+                PlatformCompanyLiftRelevance ret = platformService.save(extension);
                 if (ret == null) {
                     return RestResponse.error(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.add.fail"));
                 }
@@ -119,15 +129,12 @@ public class LibraryService {
             //项目管理入口
             case "1":
                 //新增平台企业电梯关联表
-                PlatformCompanyLiftRelevance companyLiftEntry = platformCompanyLiftRelevanceService.save(extension);
+                PlatformCompanyLiftRelevance companyLiftEntry = platformService.save(extension);
                 if (companyLiftEntry == null) {
                     return RestResponse.error(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.add.fail"));
                 }
-                if (platformCompanyLiftRelevanceMapper.insert(companyLiftEntry) == 0) {
-                    return RestResponse.error(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.add.fail"));
-                }
                 //新增项目电梯关联表
-                boolean result = projectLiftRelevanceService.save(extension, companyLiftEntry.getId(), lift.getWorkerId());
+                boolean result = projectRelevanceService.save(extension, companyLiftEntry.getId(), lift.getWorkerId());
                 if (!result) {
                     return RestResponse.error(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.add.fail"));
                 }

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

@@ -58,7 +58,7 @@ public class PlatformCompanyLiftRelevanceService extends ServiceImpl<PlatformCom
     /**
      * @param request companyLiftRelevanceList 公司电梯更新列表
      * @return 1.成功, 0.失败, 消息描述
-     * @description 批量更新电梯状态
+     * @description 批量更新电梯状态为停保 TODO 清除维保计划
      * @date 2019/12/5 5:24 PM
      */
     public RestResponse updateBatch(UpdateBatchPlatformCompanyRequest request) {

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

@@ -9,6 +9,7 @@ import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @author bieao
@@ -18,20 +19,6 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanceMapper, ProjectLiftRelevance> {
 
-    /**
-     * @param request updateLiftList 批量更新列表
-     * @return RestResponse 状态码和返回消息
-     * @description 电梯批量锁定、解锁
-     * @date 2019/12/5 11:00 AM
-     */
-    public RestResponse lockOrUnlock(BatchUpdateLiftRequest request) {
-        boolean result = updateBatchById(request.getUpdateLiftList());
-        if (!result) {
-            return RestResponse.error(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.modify.batch.fail"));
-        }
-        return RestResponse.ok(ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.modify.batch.success"));
-    }
-
     /**
      * @param id 主键id
      * @return RestResponse 状态码和返回消息
@@ -65,15 +52,35 @@ public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanc
     }
 
     /**
-     * @param relevance
+     * @param request
      * @return RestResponse 状态码和返回消息
-     * @description 项目锁定、解锁
+     * @description 项目锁定、解锁,锁定该项目下的电梯
      * @date 2019/12/5 11:00 AM
      */
-    public RestResponse lockOrUnlock(ProjectLiftRelevance relevance) {
-        boolean result = updateById(relevance);
-        if (!result) {
-            return RestResponse.error(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.modify.fail"));
+    @Transactional
+    public RestResponse lockOrUnlock(BatchUpdateLiftRequest request) {
+        String source = request.getOperate();
+        switch (source) {
+            //锁定电梯
+            case "0":
+                boolean result = updateBatchById(request.getUpdateLiftList());
+                if (!result) {
+                    return RestResponse.error(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.modify.fail"));
+                }
+                break;
+            //锁定项目
+            case "1":
+                boolean ret = updateById(request.getUpdateLiftList().get(0));
+                if (!ret){
+                    return RestResponse.error(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.modify.fail"));
+                }
+                boolean response = updateBatchById(request.getUpdateLiftList());
+                if (!response){
+                    return RestResponse.error(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.modify.fail"));
+                }
+                break;
+            default:
+                break;
         }
         return RestResponse.ok(ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.modify.success"));
     }

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

@@ -1,6 +1,6 @@
 package cn.com.ty.lift.business.project.controller;
 
-import cn.com.ty.lift.business.library.dao.entity.ProjectLiftRelevance;
+import cn.com.ty.lift.business.library.dao.entity.model.BatchUpdateLiftRequest;
 import cn.com.ty.lift.business.library.service.ProjectLiftRelevanceService;
 import cn.com.ty.lift.business.project.dao.entity.Project;
 import cn.com.ty.lift.business.project.dao.entity.ProjectHistory;
@@ -11,10 +11,7 @@ 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 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 org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
@@ -55,6 +52,17 @@ public class ProjectController {
         return projectService.list(request);
     }
 
+    /**
+     * @param id 项目id
+     * @return RestResponse<Lift>
+     * @description 查询项目详情
+     * @date 2019/12/6 10:51 AM
+     */
+    @PostMapping("detail/{id}")
+    public RestResponse<Project> detail(@PathVariable(name = "id") Long id){
+        return projectService.detail(id);
+    }
+
     /**
      * @return RestResponse 省、市、区树形结构列表
      * @description 查询省、市、区树形结构列表
@@ -99,14 +107,14 @@ public class ProjectController {
     }
 
     /**
-     * @param relevance
+     * @param request
      * @return 1.成功, 0.失败, 消息描述
      * @description 项目锁定、解锁
      * @date 2019/12/5 4:16 PM
      */
     @PostMapping("lockOrUnlock")
-    public RestResponse lockOrUnlock(@RequestBody ProjectLiftRelevance relevance) {
-        return projectLiftRelevanceService.lockOrUnlock(relevance);
+    public RestResponse lockOrUnlock(@RequestBody BatchUpdateLiftRequest request) {
+        return projectLiftRelevanceService.lockOrUnlock(request);
     }
 
     /**

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

@@ -91,6 +91,20 @@ public class ProjectService {
         return RestResponse.ok(page, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.query.success"));
     }
 
+    /**
+     * @param id 项目id
+     * @return RestResponse<Lift>
+     * @description 查询项目详情
+     * @date 2019/12/6 10:51 AM
+     */
+    public RestResponse<Project> detail(Long id) {
+        Project project = projectMapper.selectById(id);
+        if (project == null) {
+            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, MessageUtils.get("msg.data.empty"));
+        }
+        return RestResponse.ok(project, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.query.detail.success"));
+    }
+
     /**
      * @return RestResponse 省、市、区树形结构列表
      * @description 查询省、市、区树形结构列表

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

@@ -1,5 +1,6 @@
 msg.data.empty=\u6682\u65E0\u6570\u636E
 msg.query.success=\u67E5\u8BE2\u5217\u8868\u6210\u529F
+msg.query.detail.success=\u67E5\u8BE2\u8BE6\u60C5\u6210\u529F
 msg.add.success=\u65B0\u589E\u6210\u529F
 msg.add.fail=\u65B0\u589E\u5931\u8D25
 msg.modify.success=\u4FEE\u6539\u6210\u529F