操作记录代码修改

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/controller/CapitalRepairController.java

@@ -118,11 +118,7 @@ public class CapitalRepairController {
     @PostMapping("modify")
     @Validation(fields = {"id"})
     public RestResponse modify(@Val @RequestBody CapitalRepairRequest request) {
-        boolean result = capitalRepairService.modify(request);
-        if (result) {
-            return RestResponse.success(null, MessageUtils.get("msg.modify.success"));
-        }
-        return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+        return capitalRepairService.modify(request);
     }
 
     /**

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/service/CapitalRepairHistoryService.java

@@ -5,13 +5,16 @@ import cn.com.ty.lift.business.capital.dao.entity.CapitalRepairHistory;
 import cn.com.ty.lift.business.capital.dao.entity.model.request.CapitalRepairRequest;
 import cn.com.ty.lift.business.capital.dao.mapper.CapitalRepairHistoryMapper;
 import cn.com.ty.lift.business.common.BeanUtils;
+import cn.hutool.core.map.MapUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.Map;
 
 
@@ -21,6 +24,7 @@ import java.util.Map;
  * @description 大修项目操作记录业务层
  */
 @Service
+@Slf4j
 public class CapitalRepairHistoryService extends ServiceImpl<CapitalRepairHistoryMapper, CapitalRepairHistory> {
 
     @Resource
@@ -46,8 +50,14 @@ public class CapitalRepairHistoryService extends ServiceImpl<CapitalRepairHistor
      * @description 保存大修项目操作记录
      * @date 2020/4/28 9:52 上午
      */
-    public void saveOperaHistory(CapitalRepair oldEntry, CapitalRepair newEntry, Long mtCompanyId) throws NoSuchFieldException {
-        Map<String, String> resultMap = utils.compareAttribute(oldEntry, newEntry);
+    public boolean saveOperaHistory(CapitalRepair oldEntry, CapitalRepair newEntry, Long mtCompanyId) {
+        Map<String, String> resultMap = new HashMap<>();
+        try {
+            resultMap = utils.compareAttribute(oldEntry, newEntry);
+            if (MapUtil.isEmpty(resultMap)) return false;
+        } catch (NoSuchFieldException e) {
+            log.error("大修项目操作记录保存异常", e);
+        }
         CapitalRepairHistory capitalRepairHistory = new CapitalRepairHistory();
         capitalRepairHistory.setProjectId(oldEntry.getId());
         capitalRepairHistory.setCode(oldEntry.getProjectCode());
@@ -57,7 +67,7 @@ public class CapitalRepairHistoryService extends ServiceImpl<CapitalRepairHistor
         capitalRepairHistory.setAfterContent(resultMap.get("after"));
         capitalRepairHistory.setOperatorId(10000L);
         capitalRepairHistory.setOperateDate(LocalDateTime.now());
-        save(capitalRepairHistory);
+        return save(capitalRepairHistory);
     }
 
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/service/CapitalRepairService.java

@@ -165,16 +165,21 @@ public class CapitalRepairService extends ServiceImpl<CapitalRepairMapper, Capit
      * @description 修改大修项目
      * @date 2020/2/3 11:36 上午
      */
-    public boolean modify(CapitalRepairRequest request) {
+    public RestResponse modify(CapitalRepairRequest request) {
         CapitalRepair capitalRepair = request.getCapitalRepair();
-        CapitalRepair entry = getOne(request.getId());
-        try {
-            //保存电梯操作记录
-            capitalRepairHistoryService.saveOperaHistory(entry, capitalRepair, request.getMtCompanyId());
-        } catch (NoSuchFieldException e) {
-            log.error("电梯操作记录保存异常", e);
+        CapitalRepair oldCapital = getOne(request.getId());
+        if (ObjectUtil.isEmpty(oldCapital))
+            return RestResponse.fail(MessageUtils.get("msg.project.not.exist"));
+        boolean result = updateById(capitalRepair);
+        if (!result)
+            return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+        //保存大修项目操作记录
+        boolean projectResult = capitalRepairHistoryService.saveOperaHistory(oldCapital, capitalRepair, request.getMtCompanyId());
+        if (!projectResult) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
         }
-        return updateById(capitalRepair);
+        return RestResponse.success(null, MessageUtils.get("msg.modify.success"));
     }
 
     /**

lift-business-service/src/main/java/cn/com/ty/lift/business/contract/service/ContractHistoryService.java

@@ -5,14 +5,17 @@ import cn.com.ty.lift.business.contract.dao.entity.Contracts;
 import cn.com.ty.lift.business.contract.dao.entity.ContractsHistory;
 import cn.com.ty.lift.business.contract.dao.entity.model.request.ContractRequest;
 import cn.com.ty.lift.business.contract.dao.mapper.ContractsHistoryMapper;
+import cn.hutool.core.map.MapUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -21,6 +24,7 @@ import java.util.Map;
  * @description 合同历史记录业务层
  */
 @Service
+@Slf4j
 public class ContractHistoryService extends ServiceImpl<ContractsHistoryMapper, ContractsHistory> {
 
     @Resource
@@ -40,14 +44,20 @@ public class ContractHistoryService extends ServiceImpl<ContractsHistoryMapper,
     }
 
     /**
-     * @param oldEntry 原有大修项目
-     * @param newEntry 修改后的大修项目
+     * @param oldEntry 原有合同
+     * @param newEntry 修改后的合同
      * @return
-     * @description 保存大修项目操作记录
+     * @description 保存合同操作记录
      * @date 2020/4/28 9:52 上午
      */
-    public void saveOperaHistory(Contracts oldEntry, Contracts newEntry) throws NoSuchFieldException {
-        Map<String, String> resultMap = utils.compareAttribute(oldEntry, newEntry);
+    public boolean saveOperaHistory(Contracts oldEntry, Contracts newEntry){
+        Map<String, String> resultMap = new HashMap<>();
+        try {
+            resultMap = utils.compareAttribute(oldEntry, newEntry);
+            if (MapUtil.isEmpty(resultMap)) return false;
+        } catch (NoSuchFieldException e) {
+            log.error("合同操作记录保存异常", e);
+        }
         ContractsHistory contractsHistory = new ContractsHistory();
         contractsHistory.setContractsId(oldEntry.getId());
         contractsHistory.setCode(oldEntry.getCode());
@@ -56,6 +66,6 @@ public class ContractHistoryService extends ServiceImpl<ContractsHistoryMapper,
         contractsHistory.setAfterContent(resultMap.get("after"));
         contractsHistory.setOperatorId(10000L);
         contractsHistory.setOperateDate(LocalDateTime.now());
-        save(contractsHistory);
+        return save(contractsHistory);
     }
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/contract/service/ContractService.java

@@ -154,6 +154,8 @@ public class ContractService extends ServiceImpl<ContractsMapper, Contracts> {
     public RestResponse modify(ContractRequest request) {
         Contracts contracts = request.getContracts();
         Optional<Contracts> oldContract = getOne(contracts.getId());
+        if (!oldContract.isPresent())
+            return RestResponse.fail(MessageUtils.get("msg.contract.not.exist"));
         //修改合同信息
         contracts.setIsCheck(0);
         List<Payment> paymentList = request.getPaymentList();
@@ -170,14 +172,15 @@ public class ContractService extends ServiceImpl<ContractsMapper, Contracts> {
         boolean contractResult = updateById(contracts);
         if (!contractResult)
             return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
-        //修改电梯保存操作记录
-        oldContract.ifPresent(entry -> {
-            try {
-                contractHistoryService.saveOperaHistory(entry, contracts);
-            } catch (NoSuchFieldException e) {
-                log.error("合同操作记录保存异常", e);
-            }
-        });
+
+        Contracts entry = oldContract.get();
+        //保存合同操作记录
+        boolean historyResult = contractHistoryService.saveOperaHistory(entry, contracts);
+        if (!historyResult) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+        }
+
         if (CollUtil.isNotEmpty(paymentList)) {
             //修改付款信息
             boolean paymentResult = paymentService.modifyBatchById(paymentList);

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

@@ -5,13 +5,16 @@ import cn.com.ty.lift.business.library.dao.entity.Lift;
 import cn.com.ty.lift.business.library.dao.entity.LiftHistory;
 import cn.com.ty.lift.business.library.dao.entity.model.request.LiftRequest;
 import cn.com.ty.lift.business.library.dao.mapper.LiftHistoryMapper;
+import cn.hutool.core.map.MapUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -23,6 +26,7 @@ import java.util.Map;
  * @since 2020-01-07
  */
 @Service
+@Slf4j
 public class LiftHistoryService extends ServiceImpl<LiftHistoryMapper, LiftHistory> {
 
     @Resource
@@ -48,8 +52,14 @@ public class LiftHistoryService extends ServiceImpl<LiftHistoryMapper, LiftHisto
      * @description 保存电梯操作记录
      * @date 2020/4/28 9:52 上午
      */
-    public void saveOperaHistory(Lift oldEntry, Lift newEntry, Long mtCompanyId) throws NoSuchFieldException {
-        Map<String, String> resultMap = utils.compareAttribute(oldEntry, newEntry);
+    public boolean saveOperaHistory(Lift oldEntry, Lift newEntry, Long mtCompanyId) {
+        Map<String, String> resultMap = new HashMap<>();
+        try {
+            resultMap = utils.compareAttribute(oldEntry, newEntry);
+            if (MapUtil.isEmpty(resultMap)) return false;
+        } catch (NoSuchFieldException e) {
+            log.error("电梯操作记录保存异常", e);
+        }
         LiftHistory liftHistory = new LiftHistory();
         liftHistory.setLiftId(oldEntry.getId());
         liftHistory.setMtCompanyId(mtCompanyId);
@@ -59,6 +69,6 @@ public class LiftHistoryService extends ServiceImpl<LiftHistoryMapper, LiftHisto
         liftHistory.setAfterContent(resultMap.get("after"));
         liftHistory.setOperatorId(10000L);
         liftHistory.setOperateDate(LocalDateTime.now());
-        save(liftHistory);
+        return save(liftHistory);
     }
 }

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

@@ -275,16 +275,18 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
     public RestResponse modify(LiftRequest request) {
         Lift lift = request.getLift();
         Optional<Lift> oldLift = getOne(null, lift.getId());
+        if (!oldLift.isPresent())
+            return RestResponse.fail(MessageUtils.get("msg.lift.not.exist"));
         boolean result = updateById(lift);
-        if (!result) return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+        if (!result)
+            return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
         //修改电梯保存操作记录
-        oldLift.ifPresent(entry -> {
-            try {
-                liftHistoryService.saveOperaHistory(entry, lift, request.getMtCompanyId());
-            } catch (NoSuchFieldException e) {
-                log.error("电梯操作记录保存异常", e);
-            }
-        });
+        Lift entry = oldLift.get();
+        boolean historyResult = liftHistoryService.saveOperaHistory(entry, lift, request.getMtCompanyId());
+        if (!historyResult) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+        }
         ProjectLiftRelevance liftRelevance = new ProjectLiftRelevance();
         liftRelevance.setId(request.getRelevanceId());
         liftRelevance.setWorkerId(request.getWorkerId());

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

@@ -142,11 +142,7 @@ public class ProjectController {
     @PostMapping("modify")
     @Validation(fields = {"id"})
     public RestResponse modify(@Val @RequestBody Project project) {
-        boolean result = projectService.modify(project);
-        if (result) {
-            return RestResponse.success(null, MessageUtils.get("msg.modify.success"));
-        }
-        return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+       return projectService.modify(project);
     }
 
     /**

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

@@ -5,13 +5,16 @@ 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.ProjectRequest;
 import cn.com.ty.lift.business.project.dao.mapper.ProjectHistoryMapper;
+import cn.hutool.core.map.MapUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -20,6 +23,7 @@ import java.util.Map;
  * @description 项目操作记录
  */
 @Service
+@Slf4j
 public class ProjectHistoryService extends ServiceImpl<ProjectHistoryMapper, ProjectHistory> {
 
 
@@ -46,8 +50,14 @@ public class ProjectHistoryService extends ServiceImpl<ProjectHistoryMapper, Pro
      * @description 保存项目操作记录
      * @date 2020/4/28 9:52 上午
      */
-    public void saveOperaHistory(Project oldEntry, Project newEntry, Long mtCompanyId) throws NoSuchFieldException {
-        Map<String, String> resultMap = utils.compareAttribute(oldEntry, newEntry);
+    public boolean saveOperaHistory(Project oldEntry, Project newEntry, Long mtCompanyId) {
+        Map<String, String> resultMap = new HashMap<>();
+        try {
+            resultMap = utils.compareAttribute(oldEntry, newEntry);
+            if (MapUtil.isEmpty(resultMap)) return false;
+        } catch (NoSuchFieldException e) {
+            log.error("项目操作记录保存异常", e);
+        }
         ProjectHistory projectHistory = new ProjectHistory();
         projectHistory.setProjectId(oldEntry.getId());
         projectHistory.setMtCompanyId(mtCompanyId);
@@ -58,6 +68,6 @@ public class ProjectHistoryService extends ServiceImpl<ProjectHistoryMapper, Pro
         projectHistory.setAfterContent(resultMap.get("after"));
         projectHistory.setOperatorId(10000L);
         projectHistory.setOperateDate(LocalDateTime.now());
-        save(projectHistory);
+        return save(projectHistory);
     }
 }

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

@@ -33,7 +33,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import javax.annotation.Resource;
-import javax.validation.constraints.NotNull;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;
@@ -244,17 +243,21 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
      * @description 修改项目
      * @date 2019/11/27 2:22 PM
      */
-    public boolean modify(Project project) {
+    public RestResponse modify(Project project) {
         Optional<Project> oldProject = getOne(project.getId());
-        //修改项目保存操作记录
-        oldProject.ifPresent(entry -> {
-            try {
-                projectHistoryService.saveOperaHistory(entry, project, project.getMtCompanyId());
-            } catch (NoSuchFieldException e) {
-                log.error("项目操作记录保存异常", e);
-            }
-        });
-        return updateById(project);
+        if (!oldProject.isPresent())
+            return RestResponse.fail(MessageUtils.get("msg.project.not.exist"));
+        boolean result = updateById(project);
+        if (!result)
+            return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+        //保存项目操作记录
+        Project entry = oldProject.get();
+        boolean projectResult = projectHistoryService.saveOperaHistory(entry, project, project.getMtCompanyId());
+        if (!projectResult) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+        }
+        return RestResponse.success(null, MessageUtils.get("msg.modify.success"));
     }
 
     /**

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

@@ -29,4 +29,7 @@ msg.sign.limit=\u4ECA\u65E5\u5DF2\u7B7E\u5230
 msg.user.not.exist=\u7B26\u5408\u6761\u4EF6\u7684\u7EF4\u4FDD\u5DE5\u4E0D\u5B58\u5728\uFF0C\u8BF7\u6838\u5B9E\u6570\u636E
 msg.time.error=\u5F00\u59CB\u65F6\u95F4\u4E0D\u80FD\u665A\u4E8E\u7ED3\u675F\u65F6\u95F4
 msg.capital.not.exist=\u5927\u4FEE\u9879\u76EE\u4E0D\u5B58\u5728
+msg.lift.not.exist=\u7535\u68AF\u4E0D\u5B58\u5728
+msg.project.not.exist=\u9879\u76EE\u4E0D\u5B58\u5728
+msg.contract.not.exist=\u5408\u540C\u4E0D\u5B58\u5728
 msg.capital.not.sign.record=\u8BE5\u9879\u76EE\u8FD8\u6CA1\u6709\u7B7E\u5230\u8BB0\u5F55