急修完成,状态值bug

lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/controller/EmergencyRepairController.java

@@ -71,15 +71,15 @@ import java.util.stream.Collectors;
 @RequestMapping("/emergency/emergency-repair")
 public class EmergencyRepairController {
 
-    private EmergencyRepairService              emergencyRepairService;
-    private ErRecordCostService                 erRecordCostService;
-    private ErRecordImgService                  erRecordImgService;
-    private LiftFaultService                    liftFaultService;
-    private EvaluationService                   evaluationService;
+    private EmergencyRepairService emergencyRepairService;
+    private ErRecordCostService erRecordCostService;
+    private ErRecordImgService erRecordImgService;
+    private LiftFaultService liftFaultService;
+    private EvaluationService evaluationService;
     private PlatformCompanyLiftRelevanceService platformCompanyLiftRelevanceService;
-    private EmergencyHistoryService             emergencyHistoryService;
-    private JmsMessagingTemplate                jmsMessagingTemplate;
-    private PushUserService                     pushUserService;
+    private EmergencyHistoryService emergencyHistoryService;
+    private JmsMessagingTemplate jmsMessagingTemplate;
+    private PushUserService pushUserService;
 
     private static final Map<String, String> headerAlias = new LinkedHashMap<>();
 
@@ -197,16 +197,16 @@ public class EmergencyRepairController {
             }
             List<PushUserInfo> director = pushUserService.listHighDirector(mtCompanyId);
             List<PushUserInfo> pushUserInfos = new ArrayList<>(director);
-            if(!userIds.isEmpty()){
+            if (!userIds.isEmpty()) {
                 List<PushUserInfo> userInfos = pushUserService.listByUserIds(mtCompanyId, userIds);
                 pushUserInfos.addAll(userInfos);
             }
-            if(!pushUserInfos.isEmpty()){
+            if (!pushUserInfos.isEmpty()) {
                 RepairResponse info = emergencyRepairService.infoById(id);
                 PushMessage pushMessage = PushMessage.emergencyAssign(info.getAreaName(), info.getProjectName(), info.getDevicePosition(),
                         info.getRegistrationCode(), info.getCallerDate(), info.getIsTrapped(),
                         info.getCallerFaultDescription(), info.getWorkerName());
-                if(ApiConstants.ACCESS_TYPE_PUBLIC == entity.getMobileType()) {
+                if (ApiConstants.ACCESS_TYPE_PUBLIC == entity.getMobileType()) {
                     pushMessage = PushMessage.emergencyAssignByProperty(info.getAreaName(), info.getProjectName(), info.getDevicePosition(),
                             info.getRegistrationCode(), info.getCallerDate(), info.getIsTrapped(),
                             info.getCallerFaultDescription(), info.getWorkerName());
@@ -255,7 +255,7 @@ public class EmergencyRepairController {
 //        }
         LocalDate repairBegin = request.getRepairBegin();
         LocalDate repairEnd = request.getRepairEnd();
-        if(Objects.nonNull(repairBegin) && Objects.nonNull(repairEnd)){
+        if (Objects.nonNull(repairBegin) && Objects.nonNull(repairEnd)) {
             Validate.isTrue(repairBegin.isBefore(repairEnd), ValuePool.beginTimeToEndTimeIllegal(repairBegin, repairEnd));
         }
         IPage<RepairResponse> pages = emergencyRepairService.pageByCondition(request);
@@ -283,6 +283,7 @@ public class EmergencyRepairController {
 
     /**
      * 急修收款中急修列表，不检查status
+     *
      * @param request RepairRequest
      * @return RestResponse
      */
@@ -305,7 +306,7 @@ public class EmergencyRepairController {
     public RestResponse pageWorker(@Val @RequestBody RepairRequest request) {
         if (Objects.equals(ValuePool.EMERGENCY_STATE_COMPLETE, request.getStatus())) {
             request.addDesc("recovery_date");
-        }else{
+        } else {
             request.addDesc("assign_time");
         }
         IPage<RepairResponse> pages = emergencyRepairService.pageByCondition(request);
@@ -356,16 +357,16 @@ public class EmergencyRepairController {
             }
             List<PushUserInfo> director = pushUserService.listHighDirector(mtCompanyId);
             List<PushUserInfo> pushUserInfos = new ArrayList<>(director);
-            if(!userIds.isEmpty()){
+            if (!userIds.isEmpty()) {
                 List<PushUserInfo> userInfos = pushUserService.listByUserIds(mtCompanyId, userIds);
                 pushUserInfos.addAll(userInfos);
             }
             RepairResponse info = emergencyRepairService.infoById(id);
-            if(!pushUserInfos.isEmpty()){
+            if (!pushUserInfos.isEmpty()) {
                 PushMessage.emergencyTransfer(info.getAreaName(), info.getProjectName(), info.getDevicePosition(), info.getRegistrationCode(), info.getCallerDate(), info.getIsTrapped(), info.getCallerFaultDescription(), info.getWorkerName()).sendTokenOnPlatform(jmsMessagingTemplate, pushUserInfos);
             }
             //【原被派单人】收到消息：
-            if(Objects.nonNull(originId)){
+            if (Objects.nonNull(originId)) {
                 PushUserInfo originWorker = pushUserService.listByUserId(mtCompanyId, originId);
                 PushMessage.emergencyTransferForOriginal(info.getAreaName(), info.getProjectName(), info.getDevicePosition(), info.getRegistrationCode(), info.getWorkerName()).sendTokenOnPlatform(jmsMessagingTemplate, originWorker);
             }
@@ -403,7 +404,7 @@ public class EmergencyRepairController {
     public RestResponse pageByUser(@Val @RequestBody RepairRequest request) {
         if (Objects.equals(ValuePool.EMERGENCY_STATE_COMPLETE, request.getStatus())) {
             request.addDesc("recovery_date");
-        }else{
+        } else {
             request.addDesc("assign_time");
         }
         IPage<RepairResponse> pages = emergencyRepairService.pageByUser(request);
@@ -433,7 +434,7 @@ public class EmergencyRepairController {
         Validate.equals(entity.getStatus(), ValuePool.EMERGENCY_STATE_TO_DO, ValuePool.EMERGENCY_MUST_TO_DO);
         LocalDateTime assignTime = entity.getAssignTime();
         LocalDateTime takingTime = request.getTakingTime();
-        if(Objects.nonNull(assignTime)){
+        if (Objects.nonNull(assignTime)) {
             Validate.isTrue(assignTime.isBefore(takingTime), ValuePool.emergencyProcessTimeIllegal("派单时间", assignTime));
         }
         entity.setTakingTime(takingTime);
@@ -450,11 +451,11 @@ public class EmergencyRepairController {
             }
             List<PushUserInfo> director = pushUserService.listHighDirector(mtCompanyId);
             List<PushUserInfo> pushUserInfos = new ArrayList<>(director);
-            if(!userIds.isEmpty()){
+            if (!userIds.isEmpty()) {
                 List<PushUserInfo> userInfos = pushUserService.listByUserIds(mtCompanyId, userIds);
                 pushUserInfos.addAll(userInfos);
             }
-            if(!pushUserInfos.isEmpty()){
+            if (!pushUserInfos.isEmpty()) {
                 RepairResponse info = emergencyRepairService.infoById(id);
                 PushMessage pushMessage = PushMessage.emergencyTaking(info.getAreaName(), info.getProjectName(),
                         info.getDevicePosition(), info.getRegistrationCode(), info.getCallerDate());
@@ -483,7 +484,7 @@ public class EmergencyRepairController {
         Validate.equals(entity.getStatus(), ValuePool.EMERGENCY_STATE_DOING, ValuePool.EMERGENCY_MUST_IN_DOING);
         LocalDateTime takingTime = entity.getTakingTime();
         LocalDateTime arriveTime = request.getArriveTime();
-        if(Objects.nonNull(takingTime)){
+        if (Objects.nonNull(takingTime)) {
             Validate.isTrue(takingTime.isBefore(arriveTime), ValuePool.emergencyProcessTimeIllegal("接单时间", takingTime));
         }
         entity.setArriveTime(arriveTime);
@@ -500,11 +501,11 @@ public class EmergencyRepairController {
             }
             List<PushUserInfo> director = pushUserService.listHighDirector(mtCompanyId);
             List<PushUserInfo> pushUserInfos = new ArrayList<>(director);
-            if(!userIds.isEmpty()){
+            if (!userIds.isEmpty()) {
                 List<PushUserInfo> userInfos = pushUserService.listByUserIds(mtCompanyId, userIds);
                 pushUserInfos.addAll(userInfos);
             }
-            if(!pushUserInfos.isEmpty()){
+            if (!pushUserInfos.isEmpty()) {
                 RepairResponse info = emergencyRepairService.infoById(id);
                 PushMessage pushMessage = PushMessage.emergencyArrive(info.getAreaName(), info.getProjectName(),
                         info.getDevicePosition(), info.getRegistrationCode(), info.getCallerDate(), info.getArriveTime());
@@ -533,7 +534,7 @@ public class EmergencyRepairController {
         Validate.equals(entity.getStatus(), ValuePool.EMERGENCY_STATE_DOING, ValuePool.EMERGENCY_MUST_IN_DOING);
         LocalDateTime arriveTime = entity.getArriveTime();
         LocalDateTime stopDate = request.getStopDate();
-        if(Objects.nonNull(arriveTime)){
+        if (Objects.nonNull(arriveTime)) {
             Validate.isTrue(arriveTime.isBefore(stopDate), ValuePool.emergencyProcessTimeIllegal("到达时间", arriveTime));
         }
         entity.setStopDate(stopDate);
@@ -557,7 +558,7 @@ public class EmergencyRepairController {
 
         List<ErRecordCost> costs = erRecordCostService.listByErRecordId(repair.getId());
         List<ErRecordCost> erRecordCosts = request.getErRecordCosts();
-        if(Objects.isNull(costs)){
+        if (Objects.isNull(costs)) {
             costs = new ArrayList<>();
         }
         costs.addAll(erRecordCosts);
@@ -718,6 +719,7 @@ public class EmergencyRepairController {
     @PostMapping("repairOrder")
     @Validation(fields = {"id", "recoveryDate", "mainSign", "erRecordImg", "fieldDescription",
             "faultPart", "faultReason", "faultHandle", "faultNature", "faultDuty"})
+    @SuppressWarnings("all")
     public RestResponse repairOrder(@Val @RequestBody RepairRequest request) {
         Long id = request.getId();
         EmergencyRepair entity = emergencyRepairService.getById(id);
@@ -725,7 +727,7 @@ public class EmergencyRepairController {
         Validate.equals(entity.getStatus(), ValuePool.EMERGENCY_STATE_DOING, ValuePool.EMERGENCY_MUST_IN_DOING);
         LocalDateTime stopDate = entity.getStopDate();
         LocalDateTime recoveryDate = request.getRecoveryDate();
-        if(Objects.nonNull(stopDate)){
+        if (Objects.nonNull(stopDate)) {
             Validate.isTrue(stopDate.isBefore(recoveryDate), ValuePool.emergencyProcessTimeIllegal("停梯时间", stopDate));
         }
         List<ErRecordImg> erRecordImgs = new ArrayList<>();
@@ -750,10 +752,20 @@ public class EmergencyRepairController {
         entity.setStatus(ValuePool.EMERGENCY_STATE_COMPLETE);
         RestResponse result = emergencyRepairService.repairOrder(entity, erRecordImgs);
         log.debug("急修完成后，修改platform_company_lift_relevance，电梯状态到正常(状态值2)");
-        platformCompanyLiftRelevanceService.update(Wrappers.<PlatformCompanyLiftRelevance>update().
-                eq("mt_company_id", request.getMtCompanyId()).
-                eq("lift_id", request.getLiftId()).
-                set("lift_company_status", CommonEnum.LiftStatus.NORMAL.getCode()));
+
+        //更新平台电梯关联表
+        boolean flag = platformCompanyLiftRelevanceService.update(
+                Wrappers.<PlatformCompanyLiftRelevance>update()
+                        .in("mt_company_id", new ArrayList<Long>() {{
+                            add(entity.getMtCompanyId());
+                            add(ApiConstants.PLATFORM_COMPANY_ID);
+                        }})
+                        .eq("lift_id", entity.getLiftId())
+                        .set("lift_company_status", CommonEnum.LiftStatus.NORMAL.getCode())
+        );
+        if (!flag) {
+            throw new RuntimeException("急修更改平台电梯关联表数据失败!");
+        }
 
         if (Objects.equals("1", result.getStatusCode())) {
             Long mtCompanyId = entity.getMtCompanyId();
@@ -764,11 +776,11 @@ public class EmergencyRepairController {
             }
             List<PushUserInfo> director = pushUserService.listHighDirector(mtCompanyId);
             List<PushUserInfo> pushUserInfos = new ArrayList<>(director);
-            if(!userIds.isEmpty()){
+            if (!userIds.isEmpty()) {
                 List<PushUserInfo> userInfos = pushUserService.listByUserIds(mtCompanyId, userIds);
                 pushUserInfos.addAll(userInfos);
             }
-            if(!pushUserInfos.isEmpty()){
+            if (!pushUserInfos.isEmpty()) {
                 RepairResponse info = emergencyRepairService.infoById(id);
                 PushMessage pushMessage = PushMessage.emergencyOrder(info.getAreaName(), info.getProjectName(),
                         info.getDevicePosition(), info.getRegistrationCode(), info.getCallerDate(), info.getRecoveryDate());

lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/service/EmergencyRepairService.java

@@ -13,11 +13,13 @@ import cn.com.ty.lift.business.evaluation.dao.entity.Evaluation;
 import cn.com.ty.lift.business.evaluation.service.EvaluationService;
 import cn.com.ty.lift.business.library.dao.entity.PlatformCompanyLiftRelevance;
 import cn.com.ty.lift.business.library.service.PlatformCompanyLiftRelevanceService;
+import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.ty.lift.common.constants.CommonEnum;
 import cn.com.ty.lift.common.utils.ValuePool;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.collection.IterUtil;
 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.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -43,10 +45,10 @@ import java.util.stream.Collectors;
 public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, EmergencyRepair> {
 
     private PlatformCompanyLiftRelevanceService platformCompanyLiftRelevanceService;
-    private ErRecordImgService                  erRecordImgService;
-    private ErRecordCostService                 erRecordCostService;
-    private EvaluationService                   evaluationService;
-    private EmergencyHistoryService             emergencyHistoryService;
+    private ErRecordImgService erRecordImgService;
+    private ErRecordCostService erRecordCostService;
+    private EvaluationService evaluationService;
+    private EmergencyHistoryService emergencyHistoryService;
 
     /**
      * 分页查询急修中的急修记录
@@ -113,18 +115,28 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
      * @return boolean
      */
     @Transactional(rollbackFor = Exception.class)
+    @SuppressWarnings("all")
     public RestResponse taking(EmergencyRepair entity) {
         boolean er = updateById(entity);
         if (!er) {
             return RestResponse.fail("修改急修失败，请稍后重试");
         }
-        PlatformCompanyLiftRelevance relevance = platformCompanyLiftRelevanceService.findByMtCompanyAndLift(entity.getMtCompanyId(), entity.getLiftId());
-        if (Objects.isNull(relevance)) {
+        List<PlatformCompanyLiftRelevance> platformCompanyLiftRelevanceList = platformCompanyLiftRelevanceService.getBaseMapper().selectList(
+                new QueryWrapper<PlatformCompanyLiftRelevance>()
+                        .lambda()
+                        .eq(PlatformCompanyLiftRelevance::getLiftId, entity.getLiftId())
+                        .in(PlatformCompanyLiftRelevance::getMtCompanyId, new ArrayList<Long>() {{
+                            add(ApiConstants.PLATFORM_COMPANY_ID);
+                            add(entity.getMtCompanyId());
+                        }})
+        );
+        if (Objects.isNull(platformCompanyLiftRelevanceList) || platformCompanyLiftRelevanceList.size() != 2) {
             return RestResponse.fail("平台公司电梯关联信息不存在，请核查");
         }
         //电梯业务状态改成急修中
-        relevance.setLiftCompanyStatus(CommonEnum.LiftStatus.EMERGENCY_REPAIR.getCode());
-        boolean re = platformCompanyLiftRelevanceService.updateById(relevance);
+        platformCompanyLiftRelevanceList.forEach(n -> n.setLiftCompanyStatus(CommonEnum.LiftStatus.EMERGENCY_REPAIR.getCode()));
+
+        boolean re = platformCompanyLiftRelevanceService.updateBatchById(platformCompanyLiftRelevanceList,platformCompanyLiftRelevanceList.size());
         if (re) {
             return RestResponse.success(true);
         } else {
@@ -138,7 +150,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
      * 根据维保公司和电梯id查找急修
      *
      * @param mtCompanyId 维保公司id
-     * @param liftId 电梯id
+     * @param liftId      电梯id
      * @return EmergencyRepair
      */
     public EmergencyRepair findByMtCompanyAndLift(Long mtCompanyId, Long liftId) {
@@ -169,7 +181,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
      * 统计维保公司和电梯下是否存在待急修和急修中的急修单
      *
      * @param mtCompanyId 维保公司id
-     * @param liftId 电梯id
+     * @param liftId      电梯id
      * @return int
      */
     public int countRepairing(Long mtCompanyId, Long liftId) {
@@ -191,7 +203,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
 
     }
 
-    private void rollback(){
+    private void rollback() {
         //强制手动事务回滚
         TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
     }
@@ -200,7 +212,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
      * 开启维保，暂停急修，修改电梯业务状态为维保中
      *
      * @param mtCompanyId 维保公司id
-     * @param liftId 电梯id
+     * @param liftId      电梯id
      * @return boolean
      */
     @Transactional(rollbackFor = Exception.class)
@@ -241,7 +253,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
      * 停止维保，恢复急修，修改电梯业务状态为急修中
      *
      * @param mtCompanyId 维保公司id
-     * @param liftId 电梯id
+     * @param liftId      电梯id
      * @return boolean
      */
     public RestResponse stopMaintenance(Long mtCompanyId, Long liftId) {
@@ -280,7 +292,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
     /**
      * 生成急修单，同时插入急修图片记录
      *
-     * @param repair EmergencyRepair
+     * @param repair       EmergencyRepair
      * @param erRecordImgs List<ErRecordImg>
      * @return boolean
      */
@@ -300,7 +312,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
         }
     }
 
-    private String formatCostContent(ErRecordCost erRecordCost){
+    private String formatCostContent(ErRecordCost erRecordCost) {
         return String.format("费用项：%s, 应收：%.2f, 实收：%.2f, 开票：%.2f", erRecordCost.getCostName(), erRecordCost.getCostMoney(), erRecordCost.getPayMoney(), erRecordCost.getInvoiceMoney());
     }
 
@@ -332,9 +344,9 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
                 histories.add(history);
             }
             boolean his = emergencyHistoryService.saveOrUpdateBatch(histories, histories.size());
-            if(his){
+            if (his) {
                 return RestResponse.success(true);
-            }else{
+            } else {
                 rollback();
                 return RestResponse.fail("插入急修操作记录失败，请稍后重试");
             }
@@ -348,12 +360,12 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
     /**
      * 修改收费项，更新急修总金额
      *
-     * @param repair EmergencyRepair
+     * @param repair        EmergencyRepair
      * @param erRecordCosts List<ErRecordCost>
      * @return boolean
      */
     @Transactional(rollbackFor = Exception.class)
-    public RestResponse modifyCost(EmergencyRepair repair,List<ErRecordCost> oldRecordCosts, List<ErRecordCost> erRecordCosts) {
+    public RestResponse modifyCost(EmergencyRepair repair, List<ErRecordCost> oldRecordCosts, List<ErRecordCost> erRecordCosts) {
         boolean re = saveOrUpdate(repair);
         if (!re) {
             return RestResponse.fail("修改急修失败，请稍后重试");
@@ -402,31 +414,31 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
                 deleteList.add(oldRecordCost);
             }
         }
-        if(IterUtil.isNotEmpty(deleteList)){
+        if (IterUtil.isNotEmpty(deleteList)) {
             boolean delete = erRecordCostService.removeByIds(deleteList.stream().map(ErRecordCost::getId).collect(Collectors.toList()));
-            if(!delete){
+            if (!delete) {
                 rollback();
                 return RestResponse.fail("删除急修收费项失败，请稍后重试");
             }
         }
-        if(IterUtil.isNotEmpty(updateList)){
+        if (IterUtil.isNotEmpty(updateList)) {
             boolean update = erRecordCostService.updateBatchById(updateList, updateList.size());
-            if(!update){
+            if (!update) {
                 rollback();
                 return RestResponse.fail("修改急修收费项失败，请稍后重试");
             }
         }
-        if(IterUtil.isNotEmpty(insertList)){
+        if (IterUtil.isNotEmpty(insertList)) {
             boolean save = erRecordCostService.saveBatch(insertList, insertList.size());
-            if(!save){
+            if (!save) {
                 rollback();
                 return RestResponse.fail("新增急修收费项失败，请稍后重试");
             }
         }
         boolean his = emergencyHistoryService.saveBatch(histories, histories.size());
-        if(his){
+        if (his) {
             return RestResponse.success(true);
-        }else{
+        } else {
             rollback();
             return RestResponse.fail("插入急修操作记录失败，请稍后重试");
         }
@@ -435,7 +447,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
     /**
      * 删除收费项，修改急修中的总金额
      *
-     * @param repair EmergencyRepair
+     * @param repair       EmergencyRepair
      * @param erRecordCost ErRecordCost
      * @return boolean
      */
@@ -456,9 +468,9 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
             history.setOperatorId(repair.getUpdateId());
             history.setOperateDate(LocalDateTime.now());
             boolean his = emergencyHistoryService.save(history);
-            if(his){
+            if (his) {
                 return RestResponse.success(true);
-            }else{
+            } else {
                 rollback();
                 return RestResponse.fail("插入急修操作记录失败，请稍后重试");
             }
@@ -493,9 +505,9 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public RestResponse close(EmergencyRepair repair){
+    public RestResponse close(EmergencyRepair repair) {
         boolean er = updateById(repair);
-        if(!er){
+        if (!er) {
             return RestResponse.fail("修改急修失败，请稍后重试");
         }
         PlatformCompanyLiftRelevance relevance = platformCompanyLiftRelevanceService.findByMtCompanyAndLift(repair.getMtCompanyId(), repair.getLiftId());
@@ -503,7 +515,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
             return RestResponse.fail("平台公司电梯关联信息不存在，请核查");
         }
         //电梯业务状态如果在急修中 改成正常
-        if(relevance.getLiftCompanyStatus().equals(CommonEnum.LiftStatus.EMERGENCY_REPAIR.getCode())){
+        if (relevance.getLiftCompanyStatus().equals(CommonEnum.LiftStatus.EMERGENCY_REPAIR.getCode())) {
             relevance.setLiftCompanyStatus(CommonEnum.LiftStatus.NORMAL.getCode());
             boolean re = platformCompanyLiftRelevanceService.updateById(relevance);
             if (!re) {
@@ -515,7 +527,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
         return RestResponse.success(true);
     }
 
-    public long countDoingByUser(CommonRequest request){
+    public long countDoingByUser(CommonRequest request) {
         return baseMapper.countDoingByUser(request);
     }
 }

lift-ud-service/src/main/java/cn/com/ty/lift/ud/utils/WaterMarkUtils.java

@@ -1,20 +1,14 @@
 package cn.com.ty.lift.ud.utils;
 
-import java.awt.AlphaComposite;
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.Graphics2D;
-import java.awt.Image;
-import java.awt.RenderingHints;
+import javax.imageio.ImageIO;
+import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.FileOutputStream;
 
-import javax.imageio.ImageIO;
-
 /**
  * 給图片添加文字水印
- * 
+ *
  * @author liqiang
  *
  */