Commit bb9084a4 authored by suhuiguang's avatar suhuiguang

style(jg):代码调整

1.代码整理
parent 7662ed8d
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
FROM tzs_jg_resume_info FROM tzs_jg_resume_info
WHERE is_delete = '0' and WHERE is_delete = '0' and
<foreach collection="equIds" item="id" open="(" separator="or" close=")"> <foreach collection="equIds" item="id" open="(" separator="or" close=")">
equ_id like concat('%',#{id}, '%') equ_id like concat('%', #{id}, '%')
</foreach> </foreach>
order by rec_date desc order by rec_date desc
</select> </select>
......
...@@ -16,7 +16,7 @@ import java.util.Optional; ...@@ -16,7 +16,7 @@ import java.util.Optional;
@Component @Component
public class EquipUsedCheckStrategyContext implements ApplicationContextAware { 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) { public static IEquipUsedCheck getUsedStrategy(String bizType) {
......
...@@ -298,7 +298,6 @@ public class PieLineDataChangeServiceImpl { ...@@ -298,7 +298,6 @@ public class PieLineDataChangeServiceImpl {
private void buildNewPieLineLog(ProjectContraptionChangeDataDto projectContraptionChangeDataDto, String record, List<FieldChangeMeta> allChangeColumns, PipelineChangeItemDto newPieLine) { private void buildNewPieLineLog(ProjectContraptionChangeDataDto projectContraptionChangeDataDto, String record, List<FieldChangeMeta> allChangeColumns, PipelineChangeItemDto newPieLine) {
FieldChangeMeta fieldChangeMeta = new FieldChangeMeta(); FieldChangeMeta fieldChangeMeta = new FieldChangeMeta();
fieldChangeMeta.setChangeId(projectContraptionChangeDataDto.getProjectContraptionId());
fieldChangeMeta.setColumnKey(PIE_LINE_KEY); fieldChangeMeta.setColumnKey(PIE_LINE_KEY);
fieldChangeMeta.setColumnLabel("管道新增"); fieldChangeMeta.setColumnLabel("管道新增");
fieldChangeMeta.setColumnType("String"); fieldChangeMeta.setColumnType("String");
......
...@@ -19,11 +19,11 @@ import java.util.stream.Collectors; ...@@ -19,11 +19,11 @@ import java.util.stream.Collectors;
@Slf4j @Slf4j
public class EquipTransferEquipUsedCheckImpl extends BaseEquipUsedCheckService { 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) { public EquipTransferEquipUsedCheckImpl(RedissonClient redissonClient, JgEquipTransferMapper equipTransferMapper) {
this.redissonClient = redissonClient; this.redissonClient = redissonClient;
......
...@@ -19,11 +19,11 @@ import java.util.stream.Collectors; ...@@ -19,11 +19,11 @@ import java.util.stream.Collectors;
@Slf4j @Slf4j
public class InstallNoticeEquipUsedCheckImpl extends BaseEquipUsedCheckService { 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) { public InstallNoticeEquipUsedCheckImpl(RedissonClient redissonClient, JgInstallationNoticeMapper installationNoticeMapper) {
this.redissonClient = redissonClient; this.redissonClient = redissonClient;
......
package com.yeejoin.amos.boot.module.jg.biz.service.impl; 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.JgCertificateReplenishMapper;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgScrapCancelMapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.redisson.api.RBucket;
import org.redisson.api.RedissonClient; import org.redisson.api.RedissonClient;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
/** /**
* @author Administrator * @author Administrator
*/ */
...@@ -21,11 +12,11 @@ import java.util.stream.Collectors; ...@@ -21,11 +12,11 @@ import java.util.stream.Collectors;
@Slf4j @Slf4j
public class JgCertificateReplenishEquipUsedCheckImpl extends BaseEquipUsedCheckService { 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) { public JgCertificateReplenishEquipUsedCheckImpl(RedissonClient redissonClient, JgCertificateReplenishMapper mapper) {
this.redissonClient = redissonClient; this.redissonClient = redissonClient;
......
...@@ -21,11 +21,11 @@ import java.util.stream.Collectors; ...@@ -21,11 +21,11 @@ import java.util.stream.Collectors;
@Slf4j @Slf4j
public class JgChangeRegistrationEquipUsedCheckImpl extends BaseEquipUsedCheckService { 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) { public JgChangeRegistrationEquipUsedCheckImpl(RedissonClient redissonClient, JgChangeRegistrationReformMapper mapper) {
this.redissonClient = redissonClient; this.redissonClient = redissonClient;
......
...@@ -20,11 +20,11 @@ import java.util.stream.Collectors; ...@@ -20,11 +20,11 @@ import java.util.stream.Collectors;
@Slf4j @Slf4j
public class JgChangeRegistrationNameRegistrationUsedCheckImpl extends BaseEquipUsedCheckService { 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) { public JgChangeRegistrationNameRegistrationUsedCheckImpl(RedissonClient redissonClient, JgChangeRegistrationNameMapper mapper) {
this.redissonClient = redissonClient; this.redissonClient = redissonClient;
......
...@@ -20,11 +20,11 @@ import java.util.stream.Collectors; ...@@ -20,11 +20,11 @@ import java.util.stream.Collectors;
@Slf4j @Slf4j
public class JgEnableDisableEquipUsedCheckImpl extends BaseEquipUsedCheckService { 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) { public JgEnableDisableEquipUsedCheckImpl(RedissonClient redissonClient, JgEnableDisableMapper mapper) {
this.redissonClient = redissonClient; this.redissonClient = redissonClient;
......
...@@ -18,11 +18,11 @@ import java.util.stream.Collectors; ...@@ -18,11 +18,11 @@ import java.util.stream.Collectors;
@Slf4j @Slf4j
public class JgOverDesignServiceLifeCheckImpl extends BaseEquipUsedCheckService { 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) { public JgOverDesignServiceLifeCheckImpl(RedissonClient redissonClient, JgOverDesignServiceLifeMapper overDesignServiceLifeMapper) {
this.redissonClient = redissonClient; this.redissonClient = redissonClient;
......
...@@ -19,11 +19,11 @@ import java.util.stream.Collectors; ...@@ -19,11 +19,11 @@ import java.util.stream.Collectors;
@Slf4j @Slf4j
public class JgScrapCancelEquipUsedCheckImpl extends BaseEquipUsedCheckService { 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) { public JgScrapCancelEquipUsedCheckImpl(RedissonClient redissonClient, JgScrapCancelMapper mapper) {
this.redissonClient = redissonClient; this.redissonClient = redissonClient;
......
...@@ -20,11 +20,11 @@ import java.util.stream.Collectors; ...@@ -20,11 +20,11 @@ import java.util.stream.Collectors;
@Slf4j @Slf4j
public class JgVehicleInformationEquipUsedCheckImpl extends BaseEquipUsedCheckService { 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) { public JgVehicleInformationEquipUsedCheckImpl(RedissonClient redissonClient, JgVehicleInformationMapper mapper) {
this.redissonClient = redissonClient; this.redissonClient = redissonClient;
......
...@@ -19,11 +19,11 @@ import java.util.stream.Collectors; ...@@ -19,11 +19,11 @@ import java.util.stream.Collectors;
@Slf4j @Slf4j
public class MaintainNoticeEquipUsedCheckImpl extends BaseEquipUsedCheckService { 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) { public MaintainNoticeEquipUsedCheckImpl(RedissonClient redissonClient, JgMaintainNoticeMapper maintainNoticeMapper) {
this.redissonClient = redissonClient; this.redissonClient = redissonClient;
......
...@@ -19,11 +19,11 @@ import java.util.stream.Collectors; ...@@ -19,11 +19,11 @@ import java.util.stream.Collectors;
@Slf4j @Slf4j
public class MaintenanceContractEquipUsedCheckImpl extends BaseEquipUsedCheckService { 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) { public MaintenanceContractEquipUsedCheckImpl(RedissonClient redissonClient, JgMaintenanceContractMapper maintenanceContractMapper) {
this.redissonClient = redissonClient; this.redissonClient = redissonClient;
......
...@@ -19,11 +19,11 @@ import java.util.stream.Collectors; ...@@ -19,11 +19,11 @@ import java.util.stream.Collectors;
@Slf4j @Slf4j
public class ReformNoticeEquipUsedCheckImpl extends BaseEquipUsedCheckService { 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) { public ReformNoticeEquipUsedCheckImpl(RedissonClient redissonClient, JgReformNoticeMapper reformNoticeMapper) {
this.redissonClient = redissonClient; this.redissonClient = redissonClient;
......
...@@ -20,11 +20,11 @@ import java.util.stream.Collectors; ...@@ -20,11 +20,11 @@ import java.util.stream.Collectors;
@Slf4j @Slf4j
public class TransferNoticeEquipUsedCheckImpl extends BaseEquipUsedCheckService { 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) { public TransferNoticeEquipUsedCheckImpl(RedissonClient redissonClient, JgTransferNoticeMapper noticeMapper) {
this.redissonClient = redissonClient; this.redissonClient = redissonClient;
......
...@@ -19,11 +19,11 @@ import java.util.stream.Collectors; ...@@ -19,11 +19,11 @@ import java.util.stream.Collectors;
@Slf4j @Slf4j
public class UseRegisterEquipUsedCheckImpl extends BaseEquipUsedCheckService { 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) { public UseRegisterEquipUsedCheckImpl(RedissonClient redissonClient, JgUseRegistrationMapper useRegistrationMapper) {
this.redissonClient = redissonClient; this.redissonClient = redissonClient;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment