style(jg):代码调整

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgResumeInfoMapper.xml

@@ -15,7 +15,7 @@
         FROM tzs_jg_resume_info
         WHERE is_delete = '0' and
         <foreach collection="equIds" item="id" open="(" separator="or" close=")">
-            equ_id  like  concat('%',#{id}, '%')
+            equ_id like concat('%', #{id}, '%')
         </foreach>
         order by rec_date desc
     </select>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgScrapCancelMapper.xml

@@ -307,6 +307,6 @@
              tzs_jg_scrap_cancel_eq b
         where a.sequence_nbr = b.equip_transfer_id
           and a.audit_status  in ('三级待受理', '二级待受理', '一级待受理')
-        GROUP BY a.use_unit_code
+          GROUP BY a.use_unit_code
     </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/context/EquipUsedCheckStrategyContext.java

@@ -16,7 +16,7 @@ import java.util.Optional;
 @Component
 public class EquipUsedCheckStrategyContext implements ApplicationContextAware {
 
-    private static Map<String, IEquipUsedCheck> iActionExecuteStrategyHashMap = new HashMap<>();
+    private static final Map<String, IEquipUsedCheck> iActionExecuteStrategyHashMap = new HashMap<>();
 
 
     public static IEquipUsedCheck getUsedStrategy(String bizType) {

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/PieLineDataChangeServiceImpl.java

@@ -298,7 +298,6 @@ public class PieLineDataChangeServiceImpl {
 
     private void buildNewPieLineLog(ProjectContraptionChangeDataDto projectContraptionChangeDataDto, String record, List<FieldChangeMeta> allChangeColumns, PipelineChangeItemDto newPieLine) {
         FieldChangeMeta fieldChangeMeta = new FieldChangeMeta();
-        fieldChangeMeta.setChangeId(projectContraptionChangeDataDto.getProjectContraptionId());
         fieldChangeMeta.setColumnKey(PIE_LINE_KEY);
         fieldChangeMeta.setColumnLabel("管道新增");
         fieldChangeMeta.setColumnType("String");

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/EquipTransferEquipUsedCheckImpl.java

@@ -19,11 +19,11 @@ import java.util.stream.Collectors;
 @Slf4j
 public class EquipTransferEquipUsedCheckImpl extends BaseEquipUsedCheckService {
 
-    private RedissonClient redissonClient;
+    private final RedissonClient redissonClient;
 
-    private String bizType = "equipmentHandover";
+    private final String bizType = "equipmentHandover";
 
-    private JgEquipTransferMapper equipTransferMapper;
+    private final JgEquipTransferMapper equipTransferMapper;
 
     public EquipTransferEquipUsedCheckImpl(RedissonClient redissonClient, JgEquipTransferMapper equipTransferMapper) {
         this.redissonClient = redissonClient;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/InstallNoticeEquipUsedCheckImpl.java

@@ -19,11 +19,11 @@ import java.util.stream.Collectors;
 @Slf4j
 public class InstallNoticeEquipUsedCheckImpl extends BaseEquipUsedCheckService {
 
-    private RedissonClient redissonClient;
+    private final RedissonClient redissonClient;
 
-    private String bizType = "installNotice";
+    private final String bizType = "installNotice";
 
-    private JgInstallationNoticeMapper installationNoticeMapper;
+    private final JgInstallationNoticeMapper installationNoticeMapper;
 
     public InstallNoticeEquipUsedCheckImpl(RedissonClient redissonClient, JgInstallationNoticeMapper installationNoticeMapper) {
         this.redissonClient = redissonClient;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgCertificateReplenishEquipUsedCheckImpl.java

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
-import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgCertificateReplenishMapper;
-import com.yeejoin.amos.boot.module.jg.api.mapper.JgScrapCancelMapper;
-import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.redisson.api.RBucket;
 import org.redisson.api.RedissonClient;
 import org.springframework.stereotype.Component;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 /**
  * @author Administrator
  */
@@ -21,11 +12,11 @@ import java.util.stream.Collectors;
 @Slf4j
 public class JgCertificateReplenishEquipUsedCheckImpl extends BaseEquipUsedCheckService {
 
-    private RedissonClient redissonClient;
+    private final RedissonClient redissonClient;
 
-    private String bizType = "certReplenish";
+    private final String bizType = "certReplenish";
 
-    private JgCertificateReplenishMapper mapper;
+    private final JgCertificateReplenishMapper mapper;
 
     public JgCertificateReplenishEquipUsedCheckImpl(RedissonClient redissonClient, JgCertificateReplenishMapper mapper) {
         this.redissonClient = redissonClient;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationEquipUsedCheckImpl.java

@@ -21,11 +21,11 @@ import java.util.stream.Collectors;
 @Slf4j
 public class JgChangeRegistrationEquipUsedCheckImpl extends BaseEquipUsedCheckService {
 
-    private RedissonClient redissonClient;
+    private final RedissonClient redissonClient;
 
-    private String bizType = "changeRegistration";
+    private final String bizType = "changeRegistration";
 
-    private JgChangeRegistrationReformMapper mapper;
+    private final JgChangeRegistrationReformMapper mapper;
 
     public JgChangeRegistrationEquipUsedCheckImpl(RedissonClient redissonClient, JgChangeRegistrationReformMapper mapper) {
         this.redissonClient = redissonClient;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationNameRegistrationUsedCheckImpl.java

@@ -20,11 +20,11 @@ import java.util.stream.Collectors;
 @Slf4j
 public class JgChangeRegistrationNameRegistrationUsedCheckImpl extends BaseEquipUsedCheckService {
 
-    private RedissonClient redissonClient;
+    private final RedissonClient redissonClient;
 
-    private String bizType = "changeName";
+    private final String bizType = "changeName";
 
-    private JgChangeRegistrationNameMapper mapper;
+    private final JgChangeRegistrationNameMapper mapper;
 
     public JgChangeRegistrationNameRegistrationUsedCheckImpl(RedissonClient redissonClient, JgChangeRegistrationNameMapper mapper) {
         this.redissonClient = redissonClient;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgEnableDisableEquipUsedCheckImpl.java

@@ -20,11 +20,11 @@ import java.util.stream.Collectors;
 @Slf4j
 public class JgEnableDisableEquipUsedCheckImpl extends BaseEquipUsedCheckService {
 
-    private RedissonClient redissonClient;
+    private final RedissonClient redissonClient;
 
-    private String bizType = "deactivateEnable";
+    private final String bizType = "deactivateEnable";
 
-    private JgEnableDisableMapper mapper;
+    private final JgEnableDisableMapper mapper;
 
     public JgEnableDisableEquipUsedCheckImpl(RedissonClient redissonClient, JgEnableDisableMapper mapper) {
         this.redissonClient = redissonClient;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgOverDesignServiceLifeCheckImpl.java

@@ -18,11 +18,11 @@ import java.util.stream.Collectors;
 @Slf4j
 public class JgOverDesignServiceLifeCheckImpl extends BaseEquipUsedCheckService {
 
-    private RedissonClient redissonClient;
+    private final RedissonClient redissonClient;
 
-    private String bizType = "overDesignServiceLife";
+    private final String bizType = "overDesignServiceLife";
 
-    private JgOverDesignServiceLifeMapper overDesignServiceLifeMapper;
+    private final JgOverDesignServiceLifeMapper overDesignServiceLifeMapper;
 
     public JgOverDesignServiceLifeCheckImpl(RedissonClient redissonClient, JgOverDesignServiceLifeMapper overDesignServiceLifeMapper) {
         this.redissonClient = redissonClient;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgScrapCancelEquipUsedCheckImpl.java

@@ -19,11 +19,11 @@ import java.util.stream.Collectors;
 @Slf4j
 public class JgScrapCancelEquipUsedCheckImpl extends BaseEquipUsedCheckService {
 
-    private RedissonClient redissonClient;
+    private final RedissonClient redissonClient;
 
-    private String bizType = "jgScrapCancelAdd";
+    private final String bizType = "jgScrapCancelAdd";
 
-    private JgScrapCancelMapper mapper;
+    private final JgScrapCancelMapper mapper;
 
     public JgScrapCancelEquipUsedCheckImpl(RedissonClient redissonClient, JgScrapCancelMapper mapper) {
         this.redissonClient = redissonClient;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgVehicleInformationEquipUsedCheckImpl.java

@@ -20,11 +20,11 @@ import java.util.stream.Collectors;
 @Slf4j
 public class JgVehicleInformationEquipUsedCheckImpl extends BaseEquipUsedCheckService {
 
-    private RedissonClient redissonClient;
+    private final RedissonClient redissonClient;
 
-    private String bizType = "vehicleInformation";
+    private final String bizType = "vehicleInformation";
 
-    private JgVehicleInformationMapper mapper;
+    private final JgVehicleInformationMapper mapper;
 
     public JgVehicleInformationEquipUsedCheckImpl(RedissonClient redissonClient, JgVehicleInformationMapper mapper) {
         this.redissonClient = redissonClient;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/MaintainNoticeEquipUsedCheckImpl.java

@@ -19,11 +19,11 @@ import java.util.stream.Collectors;
 @Slf4j
 public class MaintainNoticeEquipUsedCheckImpl extends BaseEquipUsedCheckService {
 
-    private RedissonClient redissonClient;
+    private final RedissonClient redissonClient;
 
-    private String bizType = "maintainNotice";
+    private final String bizType = "maintainNotice";
 
-    private JgMaintainNoticeMapper maintainNoticeMapper;
+    private final JgMaintainNoticeMapper maintainNoticeMapper;
 
     public MaintainNoticeEquipUsedCheckImpl(RedissonClient redissonClient, JgMaintainNoticeMapper maintainNoticeMapper) {
         this.redissonClient = redissonClient;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/MaintenanceContractEquipUsedCheckImpl.java

@@ -19,11 +19,11 @@ import java.util.stream.Collectors;
 @Slf4j
 public class MaintenanceContractEquipUsedCheckImpl extends BaseEquipUsedCheckService {
 
-    private RedissonClient redissonClient;
+    private final RedissonClient redissonClient;
 
-    private String bizType = "maintenanceFiling";
+    private final String bizType = "maintenanceFiling";
 
-    private JgMaintenanceContractMapper maintenanceContractMapper;
+    private final JgMaintenanceContractMapper maintenanceContractMapper;
 
     public MaintenanceContractEquipUsedCheckImpl(RedissonClient redissonClient, JgMaintenanceContractMapper maintenanceContractMapper) {
         this.redissonClient = redissonClient;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/ReformNoticeEquipUsedCheckImpl.java

@@ -19,11 +19,11 @@ import java.util.stream.Collectors;
 @Slf4j
 public class ReformNoticeEquipUsedCheckImpl extends BaseEquipUsedCheckService {
 
-    private RedissonClient redissonClient;
+    private final RedissonClient redissonClient;
 
-    private String bizType = "renovationNoticeNew";
+    private final String bizType = "renovationNoticeNew";
 
-    private JgReformNoticeMapper reformNoticeMapper;
+    private final JgReformNoticeMapper reformNoticeMapper;
 
     public ReformNoticeEquipUsedCheckImpl(RedissonClient redissonClient, JgReformNoticeMapper reformNoticeMapper) {
         this.redissonClient = redissonClient;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/TransferNoticeEquipUsedCheckImpl.java

@@ -20,11 +20,11 @@ import java.util.stream.Collectors;
 @Slf4j
 public class TransferNoticeEquipUsedCheckImpl extends BaseEquipUsedCheckService {
 
-    private RedissonClient redissonClient;
+    private final RedissonClient redissonClient;
 
-    private String bizType = "transferNotice";
+    private final String bizType = "transferNotice";
 
-    private JgTransferNoticeMapper noticeMapper;
+    private final JgTransferNoticeMapper noticeMapper;
 
     public TransferNoticeEquipUsedCheckImpl(RedissonClient redissonClient, JgTransferNoticeMapper noticeMapper) {
         this.redissonClient = redissonClient;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/UseRegisterEquipUsedCheckImpl.java

@@ -19,11 +19,11 @@ import java.util.stream.Collectors;
 @Slf4j
 public class UseRegisterEquipUsedCheckImpl extends BaseEquipUsedCheckService {
 
-    private RedissonClient redissonClient;
+    private final RedissonClient redissonClient;
 
-    private String bizType = "useRegistration";
+    private final String bizType = "useRegistration";
 
-    private JgUseRegistrationMapper useRegistrationMapper;
+    private final JgUseRegistrationMapper useRegistrationMapper;
 
     public UseRegisterEquipUsedCheckImpl(RedissonClient redissonClient, JgUseRegistrationMapper useRegistrationMapper) {
         this.redissonClient = redissonClient;