diff --git a/pom.xml b/pom.xml index 8a67ed1d..e10c5f69 100644 --- a/pom.xml +++ b/pom.xml @@ -152,6 +152,12 @@ + + org.springframework + spring-context-indexer + true + + org.projectlombok lombok diff --git a/src/main/java/com/qs/serve/Application.java b/src/main/java/com/qs/serve/Application.java index f8608638..5a2539ce 100644 --- a/src/main/java/com/qs/serve/Application.java +++ b/src/main/java/com/qs/serve/Application.java @@ -14,6 +14,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.core.env.Environment; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.stereotype.Indexed; import org.springframework.transaction.annotation.EnableTransactionManagement; import javax.annotation.PostConstruct; @@ -25,6 +26,7 @@ import java.util.TimeZone; * @author YenHex * @since 2022/2/24 */ +@Indexed @EnableAsync @EnableScheduling @EnableTransactionManagement @@ -36,7 +38,11 @@ public class Application extends SpringBootServletInitializer { String dev; public static void main(String[] args) { + long start = System.currentTimeMillis(); SpringApplication.run(Application.class,args); + long end = System.currentTimeMillis(); + double diff = (end-start)/1000.0; + System.out.println("启动时间:"+diff); } @Override diff --git a/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelPointMyController.java b/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelPointMyController.java index 60d7ea07..4f0b9a9e 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelPointMyController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelPointMyController.java @@ -67,8 +67,11 @@ public class BmsChannelPointMyController { */ @GetMapping("/page") public R> getPage(BmsChannelPoint param){ - List list = bmsChannelPointService.selectChannelPointMyList(param, Arrays.asList(AuthContextUtils.getSysUserId())); Long count = bmsChannelPointService.selectCountChannelPointMyList(param, Arrays.asList(AuthContextUtils.getSysUserId())); + if(count<1L){ + return R.byEmptyList(); + } + List list = bmsChannelPointService.selectChannelPointMyList(param, Arrays.asList(AuthContextUtils.getSysUserId())); return R.byPageList(count,list); } @@ -84,8 +87,11 @@ public class BmsChannelPointMyController { String loginUserId = AuthContextUtils.getSysUserId(); List userIds = postUserService.listByChildIds(loginUserId); if(userIds.size() == 0){return R.byEmptyList();} - List pageList = bmsChannelPointService.selectChannelPointMyList(param, userIds); Long count = bmsChannelPointService.selectCountChannelPointMyList(param, userIds); + if(count < 1L){ + return R.byEmptyList(); + } + List pageList = bmsChannelPointService.selectChannelPointMyList(param, userIds); for (BmsChannelPoint channelPoint : pageList) { if(StringUtils.hasText(channelPoint.getBizRegionPath())){ String[] bizRegions = channelPoint.getBizRegionPath().split("_"); @@ -113,8 +119,11 @@ public class BmsChannelPointMyController { String loginUserId = AuthContextUtils.getSysUserId(); List userIds = postUserService.listByChildIds(loginUserId); userIds.add(loginUserId); - List pageList = bmsChannelPointService.selectChannelPointMyList(param, userIds); Long count = bmsChannelPointService.selectCountChannelPointMyList(param, userIds); + if(count < 1L){ + return R.byEmptyList(); + } + List pageList = bmsChannelPointService.selectChannelPointMyList(param, userIds); for (BmsChannelPoint channelPoint : pageList) { if(StringUtils.hasText(channelPoint.getBizRegionPath())){ String[] bizRegions = channelPoint.getBizRegionPath().split("_"); diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegion2ServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegion2ServiceImpl.java index aa07b0b2..6f212b31 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegion2ServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegion2ServiceImpl.java @@ -7,9 +7,11 @@ import com.qs.serve.common.util.*; import com.qs.serve.modules.bms.entity.BmsRegion; import com.qs.serve.modules.bms.entity.BmsRegion2; import com.qs.serve.modules.bms.entity.BmsRegionUser; +import com.qs.serve.modules.bms.entity.BmsSupplier; import com.qs.serve.modules.bms.entity.vo.BmsRegionTreeVo; import com.qs.serve.modules.bms.mapper.BmsChannelPointMapper; import com.qs.serve.modules.bms.mapper.BmsRegion2Mapper; +import com.qs.serve.modules.bms.mapper.BmsSupplierMapper; import com.qs.serve.modules.bms.service.BmsRegion2Service; import com.qs.serve.modules.bms.service.BmsRegionUserService; import com.qs.serve.modules.his.service.HisUserChannelPointService; @@ -21,6 +23,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -38,6 +41,8 @@ public class BmsRegion2ServiceImpl extends ServiceImpl regionSupplierList = bmsSupplierApplicationService.listByRegionIds(Arrays.asList(ori.getId()),ori.getLevel()); + for (BmsSupplier supplier : regionSupplierList) { + String[] ids = currentRegion.getPathIds().split("_"); + String region1 = "0"; + String region2 = "0"; + String region3 = "0"; + String region4 = "0"; + String regionLast = "0"; + if(ids.length>1){ + region1 = ids[0]; + regionLast = region1; + } + if(ids.length>2){ + region2 = ids[1]; + regionLast = region2; + } + if(ids.length>3){ + region3 = ids[2]; + regionLast = region3; + } + if(ids.length>4){ + region4 = ids[3]; + regionLast = region4; + } + supplier.setRegion2First(region1); + supplier.setRegion2Second(region2); + supplier.setRegion2Third(region3); + supplier.setRegion2First(region4); + supplier.setRegion2Last(regionLast); + bmsSupplierMapper.updateById(supplier); + } + } } return b; diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java index 4d590959..929748fa 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java @@ -9,6 +9,7 @@ import com.qs.serve.modules.bms.entity.*; import com.qs.serve.modules.bms.entity.vo.BmsRegionTreeVo; import com.qs.serve.modules.bms.mapper.BmsChannelPointMapper; import com.qs.serve.modules.bms.mapper.BmsFactoryMapper; +import com.qs.serve.modules.bms.mapper.BmsSupplierMapper; import com.qs.serve.modules.bms.service.BmsFactoryService; import com.qs.serve.modules.bms.service.BmsRegionUserService; import com.qs.serve.modules.his.service.HisUserChannelPointService; @@ -40,6 +41,7 @@ public class BmsRegionServiceImpl extends ServiceImpl private BmsChannelPointMapper bmsChannelPointMapper; private BmsFactoryService bmsFactoryService; private BmsSupplierApplicationService bmsSupplierApplicationService; + private BmsSupplierMapper bmsSupplierMapper; @Override public boolean saveBmsRegion(BmsRegion param){ @@ -63,10 +65,40 @@ public class BmsRegionServiceImpl extends ServiceImpl /*停用的逻辑 hisUserChannelPointService.removeRegion(2,ori.getPathIds()); hisUserChannelPointService.flushRegion(2,parentRegion.getPathIds());*/ - //todo 更新客户 - if(!ori.getPid().equals("0")){ - bmsSupplierApplicationService.listByRegionIds(Arrays.asList(ori.getPid()),ori.getLevel()); + //更新客户 + BmsRegion currentRegion = this.getById(param.getId()); + List regionSupplierList = bmsSupplierApplicationService.listByRegionIds(Arrays.asList(ori.getId()),ori.getLevel()); + for (BmsSupplier supplier : regionSupplierList) { + String[] ids = currentRegion.getPathIds().split("_"); + String region1 = "0"; + String region2 = "0"; + String region3 = "0"; + String region4 = "0"; + String regionLast = "0"; + if(ids.length>1){ + region1 = ids[0]; + regionLast = region1; + } + if(ids.length>2){ + region2 = ids[1]; + regionLast = region2; + } + if(ids.length>3){ + region3 = ids[2]; + regionLast = region3; + } + if(ids.length>4){ + region4 = ids[3]; + regionLast = region4; + } + supplier.setRegionFirst(region1); + supplier.setRegionSecond(region2); + supplier.setRegionThird(region3); + supplier.setRegionFirst(region4); + supplier.setRegionLast(regionLast); + bmsSupplierMapper.updateById(supplier); } + } } return b; diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierApplicationService.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierApplicationService.java index b8e5bc2b..051ecdb2 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierApplicationService.java +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierApplicationService.java @@ -8,6 +8,7 @@ import com.qs.serve.common.util.CopierUtil; import com.qs.serve.modules.bms.entity.BmsRegion; import com.qs.serve.modules.bms.entity.BmsRegion2; import com.qs.serve.modules.bms.entity.BmsSupplier; +import com.qs.serve.modules.bms.mapper.BmsRegion2Mapper; import com.qs.serve.modules.bms.mapper.BmsRegionMapper; import com.qs.serve.modules.bms.mapper.BmsSupplierMapper; import com.qs.serve.modules.bms.service.BmsRegion2Service; @@ -43,7 +44,7 @@ import java.util.stream.Collectors; public class BmsSupplierApplicationService { private BmsRegionMapper regionMapper; - private BmsRegion2Service region2Service; + private BmsRegion2Mapper bmsRegion2Mapper; private TbsBudgetLogService budgetLogService; private TbsCostUnItemService costUnItemService; private TbsBudgetMapper budgetMapper; @@ -79,7 +80,7 @@ public class BmsSupplierApplicationService { newRegionCode = bmsRegion.getCode(); newRegionName = bmsRegion.getName(); }else { - BmsRegion2 bmsRegion2 = region2Service.getById(newRegionId); + BmsRegion2 bmsRegion2 = bmsRegion2Mapper.selectById(newRegionId); newRegionCode = bmsRegion2.getCode(); newRegionName = bmsRegion2.getName(); } diff --git a/src/main/java/com/qs/serve/modules/his/service/impl/HisUserChannelPointServiceImpl.java b/src/main/java/com/qs/serve/modules/his/service/impl/HisUserChannelPointServiceImpl.java index 81b23bf7..148e70b2 100644 --- a/src/main/java/com/qs/serve/modules/his/service/impl/HisUserChannelPointServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/his/service/impl/HisUserChannelPointServiceImpl.java @@ -39,6 +39,10 @@ public class HisUserChannelPointServiceImpl extends ServiceImpl lqwPoint = new LambdaQueryWrapper<>(); lqwPoint.eq(HisUserChannelPoint::getSourceType,3); lqwPoint.eq(HisUserChannelPoint::getSourceIds,channelId); @@ -47,6 +51,10 @@ public class HisUserChannelPointServiceImpl extends ServiceImpl mgrLqw = new LambdaQueryWrapper<>(); mgrLqw.eq(BmsMasterUser::getType, MasterUserType.Channel); @@ -76,6 +84,10 @@ public class HisUserChannelPointServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); lqw.eq(HisUserChannelPoint::getPointId,pointId); this.remove(lqw); @@ -83,6 +95,10 @@ public class HisUserChannelPointServiceImpl extends ServiceImpl channelPointList = new ArrayList<>(); if(StringUtils.hasText(saleRegionIds)){ @@ -128,6 +144,10 @@ public class HisUserChannelPointServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); lqw.eq(HisUserChannelPoint::getUserId,userId); @@ -151,6 +171,10 @@ public class HisUserChannelPointServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); lqw.likeRight(HisUserChannelPoint::getSourceIds,regionIds); lqw.eq(HisUserChannelPoint::getSourceType,sourceType); @@ -159,6 +183,10 @@ public class HisUserChannelPointServiceImpl extends ServiceImpl userIds = this.getUserIdByRegionIds(regionIds,sourceType.equals(2)); List pointIds = this.getPointIdsByRegionIds(regionIds,sourceType.equals(2)); @@ -167,6 +195,10 @@ public class HisUserChannelPointServiceImpl extends ServiceImpl masterUserLqw = new LambdaQueryWrapper<>(); @@ -194,6 +226,10 @@ public class HisUserChannelPointServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); lqw.isNotNull(BmsChannelPoint::getSaleRegionId).or().isNotNull(BmsChannelPoint::getBizRegionId); lqw.ge(BmsChannelPoint::getId,pointId); @@ -214,6 +250,10 @@ public class HisUserChannelPointServiceImpl extends ServiceImpl userIds, List pointIds,boolean delHisUserRegion) { + if(1==1){ + log.debug("停用的逻辑"); + return; + } List hisUserChannelPointList = new ArrayList<>(); for (String userId : userIds) { if(sourceType.equals(2)){ @@ -243,6 +283,10 @@ public class HisUserChannelPointServiceImpl extends ServiceImpl getUserIdByRegionIds(String regionIds,boolean isSaleRegion){ + if(1==1){ + log.debug("停用的逻辑"); + return null; + } List regionArr = Arrays.asList(regionIds.split("_")); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.in(BmsRegionUser::getRegionId,regionArr); @@ -261,6 +305,10 @@ public class HisUserChannelPointServiceImpl extends ServiceImpl getPointIdsByRegionIds(String regionIds,boolean isSaleRegion){ + if(1==1){ + log.debug("停用的逻辑"); + return null; + } LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.select(BmsChannelPoint::getId); if(isSaleRegion){ diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java index eaf18960..21ea4c5d 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java @@ -236,6 +236,7 @@ public class TbsCostApplyController { @PreAuthorize("hasRole('tbs:costApply:insert')") public R save(@RequestBody @Valid TbsCostApplyBo param){ TbsCostApply entity = CopierUtil.copy(param,new TbsCostApply()); + entity.setId(IdUtil.getSnowFlakeId()); BmsSupplier supplier = bmsSupplierService.getById(entity.getSupplierId()); entity.setCode("CA"+IdUtil.timeStampId()); entity.setSupplierCode(supplier.getCode()); @@ -266,6 +267,7 @@ public class TbsCostApplyController { ValidateTools.valid(costApplyBo); TbsCostApply entity = CopierUtil.copy(costApplyBo,new TbsCostApply()); BmsSupplier supplier = bmsSupplierService.getById(entity.getSupplierId()); + entity.setId(IdUtil.getSnowFlakeId()); entity.setCode("CA"+IdUtil.timeStampId()); entity.setTemplateId(param.getTemplateId()); entity.setSupplierCode(supplier.getCode()); diff --git a/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyServiceImpl.java b/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyServiceImpl.java index 9adc6a50..689339dd 100644 --- a/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyServiceImpl.java @@ -56,6 +56,7 @@ public class TzcPolicyServiceImpl extends ServiceImpl } }else { tzcPolicy = new TzcPolicy(); + tzcPolicy.setId(IdUtil.getSnowFlakeId()); tzcPolicy.setPolicyCode(StringUtils.genShortId()+""); SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId()); tzcPolicy.setUserId(sysUser.getId()); diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java index 26572ba9..857d51b1 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java @@ -221,7 +221,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl