电梯删除入参修改

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

@@ -189,14 +189,14 @@ public class LiftController {
 
 
     /**
-     * @param projectLiftRelevance 关联表主键id
+     * @param request 关联表主键id
      * @return 1.成功, 0.失败, 消息描述
      * @description 删除电梯
      * @date 2019/11/27 10:03 AM
      */
     @PostMapping("delete")
-    public RestResponse delete(@RequestBody ProjectLiftRelevance projectLiftRelevance) {
-        return projectLiftRelevanceService.delete(projectLiftRelevance);
+    public RestResponse delete(@Valid @RequestBody LiftDeleteRequest request) {
+        return projectLiftRelevanceService.delete(request);
     }
 
     /**

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

@@ -0,0 +1,24 @@
+package cn.com.ty.lift.business.library.dao.entity.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author bieao
+ * @date 2020/2/25
+ * @description 电梯删除
+ */
+@Data
+public class LiftDeleteRequest {
+    /**
+     * 项目电梯关联主键id
+     */
+    @NotNull(message = "notEmpty")
+    private Long id;
+    /**
+     * 公司电梯关联主键id
+     */
+    @NotNull(message = "notEmpty")
+    private Long relevanceId;
+}

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

@@ -3,6 +3,7 @@ package cn.com.ty.lift.business.project.service;
 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.model.request.LiftBatchMoveRequest;
+import cn.com.ty.lift.business.library.dao.entity.model.request.LiftDeleteRequest;
 import cn.com.ty.lift.business.library.dao.entity.model.request.LiftExtensionRequest;
 import cn.com.ty.lift.business.library.dao.entity.model.request.LiftLockRequest;
 import cn.com.ty.lift.business.library.service.PlatformCompanyLiftRelevanceService;
@@ -42,19 +43,19 @@ public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanc
     private PlatformCompanyLiftRelevanceService platformService;
 
     /**
-     * @param entry 项目关联数据
+     * @param request 项目关联数据
      * @return RestResponse 状态码和返回消息
      * @description 删除电梯
      * @date 2019/12/5 2:16 PM
      */
     @Transactional(rollbackFor = Exception.class)
-    public RestResponse delete(ProjectLiftRelevance entry) {
-        boolean result = remove(entry.getId());
+    public RestResponse delete(LiftDeleteRequest request) {
+        boolean result = remove(request.getId());
         if (!result) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return RestResponse.fail(MessageUtils.get("msg.delete.fail"));
         }
-        boolean ret = platformService.remove(entry.getRelevanceId());
+        boolean ret = platformService.remove(request.getRelevanceId());
         if (!ret) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return RestResponse.fail(MessageUtils.get("msg.delete.fail"));