From c0735957dcb6c1b6cbe9e285c6a20f87098a37e7 Mon Sep 17 00:00:00 2001 From: Yen Date: Mon, 17 Jul 2023 11:21:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E7=A0=81=E8=A1=A5=E9=9B=B6=EF=BC=9B?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=8C=BA=E5=9F=9F=E6=B7=BB=E5=8A=A0=E5=81=9C?= =?UTF-8?q?=E7=94=A8=E5=8F=8A=E5=88=AB=E5=90=8D=EF=BC=9B=E6=88=90=E6=9C=AC?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=80=BB=E8=BE=91=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/qs/serve/common/util/CodeGenUtil.java | 10 +- .../controller/BmsCenterExtendController.java | 15 +- .../bms/controller/BmsRegionController.java | 25 +- .../bms/controller/api/BmsRegionApi.java | 2 +- .../serve/modules/bms/entity/BmsRegion.java | 6 + .../bms/entity/bo/BmsRegionBatchBo.java | 6 + .../bms/entity/vo/BmsRegionTreeVo.java | 2 + .../bms/service/BmsCenterExtendService.java | 1 - .../modules/bms/service/BmsRegionService.java | 2 +- .../impl/BmsCenterExtendServiceImpl.java | 226 +++--------------- .../service/impl/BmsRegionServiceImpl.java | 7 +- .../service/impl/TzcPolicyServiceImpl.java | 3 +- src/main/resources/application.yml | 6 + 13 files changed, 93 insertions(+), 218 deletions(-) diff --git a/src/main/java/com/qs/serve/common/util/CodeGenUtil.java b/src/main/java/com/qs/serve/common/util/CodeGenUtil.java index 68ae32f7..0e7748e8 100644 --- a/src/main/java/com/qs/serve/common/util/CodeGenUtil.java +++ b/src/main/java/com/qs/serve/common/util/CodeGenUtil.java @@ -48,7 +48,15 @@ public class CodeGenUtil { DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyyMMdd"); String localTime = df.format(localDateTime); String appendStr = digits32(value); - return localTime.substring(2) + appendStr; + //防止溢出 + if(appendStr.length()<4){ + redisService.set(key,1); + } + StringBuilder appendZeros = new StringBuilder(); + for (int i = appendStr.length(); i < 4; i++) { + appendZeros.append("0"); + } + return localTime.substring(2) + appendZeros + appendStr; } catch (BeansException e) { e.printStackTrace(); } diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsCenterExtendController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsCenterExtendController.java index 306dc5c9..0265560a 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsCenterExtendController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsCenterExtendController.java @@ -14,6 +14,7 @@ import com.qs.serve.modules.bms.entity.bo.BmsCenterExtendBo; import com.qs.serve.modules.bms.service.BmsCenterExtendUserService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.omg.CORBA.DynAnyPackage.Invalid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -68,12 +69,6 @@ public class BmsCenterExtendController { LambdaQueryWrapper childLqw = new LambdaQueryWrapper<>(); childLqw.eq(BmsCenterExtend::getSourceId,centerExtend.getId()); List childList = bmsCenterExtendService.list(childLqw); - /*for (BmsCenterExtend childExt : childList) { - LambdaQueryWrapper userLqw = new LambdaQueryWrapper<>(); - userLqw.eq(BmsCenterExtendUser::getChildExtId,childExt.getId()); - List userList = bmsCenterExtendUserService.list(userLqw); - childExt.setUserList(userList); - }*/ centerExtend.setChildList(childList); } return R.byPageHelperList(list); @@ -110,6 +105,9 @@ public class BmsCenterExtendController { @PostMapping("/allocation4Save") @SysLog(module = SystemModule.BASE, title = "后继成本中心", biz = BizType.INSERT) public R allocation(@RequestBody BmsCenterExtendBo param){ + if(param.getId()!=null){ + return R.error("Invalid"); + } BmsCenterExtend detail = bmsCenterExtendService.allocation(param); return R.ok(detail); } @@ -122,7 +120,10 @@ public class BmsCenterExtendController { @PostMapping("/allocation4Update") @SysLog(module = SystemModule.BASE, title = "后继成本中心", biz = BizType.UPDATE) public R allocation4Update(@RequestBody BmsCenterExtendBo param){ - bmsCenterExtendService.allocation4Update(param); + if(param.getId()==null){ + return R.error("Invalid"); + } + bmsCenterExtendService.allocation(param); return R.ok(); } diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java index 863db8bf..ddb1cb57 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java @@ -81,19 +81,24 @@ public class BmsRegionController { * 树查询 * @param listUserFlag 加载我负责的用户所属的区域 * @param loadByCurrent 值=1，过滤当前用户负责数据(优先级最高) + * @param supplierId + * @param stopFlag （0，1）是否停用，2->加载所有 * @return */ @GetMapping("/tree") @PreAuthorize("hasRole('bms:region:query')") - public R> getTree(Integer listUserFlag,Integer loadByCurrent,String supplierId){ + public R> getTree(Integer listUserFlag,Integer loadByCurrent,String supplierId,Integer stopFlag){ + if(stopFlag==null){ + stopFlag = 0; + } if(loadByCurrent!=null&&loadByCurrent.equals(1)){ - return R.ok(treeByCurrentUser(supplierId)); + return R.ok(treeByCurrentUser(supplierId,stopFlag)); } - return R.ok(bmsRegionService.getTree(listUserFlag!=null&&listUserFlag.equals(1))); + return R.ok(bmsRegionService.getTree(listUserFlag!=null&&listUserFlag.equals(1), stopFlag)); } - public List treeByCurrentUser(String supplierId){ + public List treeByCurrentUser(String supplierId,Integer stopFlag){ String userId = AuthContextUtils.getSysUserId(); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.eq(BmsRegionUser::getType,0); @@ -123,7 +128,7 @@ public class BmsRegionController { List regionList = bmsRegionService.listByIds(regionIds); if(regionList.size()==0){ - return toTreeNodeList2(allSelectList); + return toTreeNodeList2(allSelectList,stopFlag); } List pathIds = regionList.stream().map(a->a.getPathIds()).collect(Collectors.toList()); @@ -131,7 +136,7 @@ public class BmsRegionController { .flatMap(pathId -> Arrays.stream(pathId.split("_"))) .collect(Collectors.toList()); regionList = bmsRegionService.listByIds(idList); - return toTreeNodeList2(regionList); + return toTreeNodeList2(regionList,stopFlag); // // Map> listMap = regionList.stream().collect(Collectors.groupingBy(BmsRegion::getLevel)); // List list1 = listMap.get(1)==null?new ArrayList<>():listMap.get(1); @@ -218,9 +223,13 @@ public class BmsRegionController { } - private List toTreeNodeList2(List list){ + private List toTreeNodeList2(List list,Integer stopFlag){ List treeVoList = new ArrayList<>(); for (BmsRegion region2 : list) { + //跳过停用的或未停用的 + if(stopFlag!=2&&!region2.getStopFlag().equals(stopFlag)){ + continue; + } BmsRegionTreeVo treeNode = CopierUtil.copy(region2,new BmsRegionTreeVo()); treeNode.setId(region2.getId()); treeNode.setParentId(region2.getPid()); @@ -278,6 +287,8 @@ public class BmsRegionController { param.setId(regionBo.getId()); param.setName(regionBo.getName()); param.setPid(regionBo.getPid()); + param.setAliasRegion(regionBo.getAliasRegion()); + param.setStopFlag(regionBo.getStopFlag()); boolean result = bmsRegionService.updateBmsRegionById(param); hisUserSupplierService.cleanTable(); return R.isTrue(result); diff --git a/src/main/java/com/qs/serve/modules/bms/controller/api/BmsRegionApi.java b/src/main/java/com/qs/serve/modules/bms/controller/api/BmsRegionApi.java index 7691631d..c836ec98 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/api/BmsRegionApi.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/api/BmsRegionApi.java @@ -29,7 +29,7 @@ public class BmsRegionApi { */ @GetMapping("/tree") public R> getTree(){ - return R.ok(bmsRegionService.getTree(false)); + return R.ok(bmsRegionService.getTree(false,0)); } /** diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsRegion.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsRegion.java index 9d22b805..c6973c06 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsRegion.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsRegion.java @@ -36,6 +36,9 @@ public class BmsRegion implements Serializable { @Length(max = 20,message = "名称长度不能超过20字") private String name; + /** 别名 */ + private String aliasRegion; + /** 编码 */ @Length(max = 20,message = "编码长度不能超过20字") private String code; @@ -53,6 +56,9 @@ public class BmsRegion implements Serializable { /** 祖级id */ private String pathNames; + /** 是否停用 */ + private Integer stopFlag; + /** 工厂产地ID */ @TableField(typeHandler = SplitStringTypeHandler.class,jdbcType= JdbcType.VARCHAR) private String[] factoryIds; diff --git a/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsRegionBatchBo.java b/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsRegionBatchBo.java index 697fff40..1af74f8e 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsRegionBatchBo.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsRegionBatchBo.java @@ -31,6 +31,12 @@ public class BmsRegionBatchBo { /** 父级ID */ @Length(max = 32,message = "父级ID长度不能超过32字") private String pid; + + /** 别名 */ + private String aliasRegion; + + private Integer stopFlag; + } } diff --git a/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsRegionTreeVo.java b/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsRegionTreeVo.java index e2953bc7..bb7d9b33 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsRegionTreeVo.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsRegionTreeVo.java @@ -29,6 +29,8 @@ public class BmsRegionTreeVo extends TreeNode { @Length(max = 32,message = "父级ID长度不能超过32字") private String pid; + private String aliasRegion; + /** 层级 */ private Integer level; diff --git a/src/main/java/com/qs/serve/modules/bms/service/BmsCenterExtendService.java b/src/main/java/com/qs/serve/modules/bms/service/BmsCenterExtendService.java index d3fc7196..499dd735 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/BmsCenterExtendService.java +++ b/src/main/java/com/qs/serve/modules/bms/service/BmsCenterExtendService.java @@ -15,7 +15,6 @@ public interface BmsCenterExtendService extends IService { BmsCenterExtend allocation(BmsCenterExtendBo param); - void allocation4Update(BmsCenterExtendBo param); /** * 删除所有均摊节点 diff --git a/src/main/java/com/qs/serve/modules/bms/service/BmsRegionService.java b/src/main/java/com/qs/serve/modules/bms/service/BmsRegionService.java index 6a6d95d3..8759a034 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/BmsRegionService.java +++ b/src/main/java/com/qs/serve/modules/bms/service/BmsRegionService.java @@ -14,7 +14,7 @@ import java.util.List; */ public interface BmsRegionService extends IService { - List getTree(boolean listUserFlag); + List getTree(boolean listUserFlag,Integer stopFlag); List listChild(String pid); diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsCenterExtendServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsCenterExtendServiceImpl.java index ab7dc5e0..2aba0422 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsCenterExtendServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsCenterExtendServiceImpl.java @@ -72,44 +72,40 @@ public class BmsCenterExtendServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); - lqw.eq(BmsCenterExtend::getCenterType,param.getType()); - lqw.eq(BmsCenterExtend::getCenterId,param.getSourceCenterId()); - lqw.eq(BmsCenterExtend::getStopFlag,0); - List sourcesCenterList = this.list(lqw); - List updList = this.list(lqw); - for (BmsCenterExtend sourceCenter : sourcesCenterList) { - if(sourceCenter.getStopFlag()==0){ - BmsCenterExtend centerExtend = new BmsCenterExtend(); - centerExtend.setId(sourceCenter.getId()); - centerExtend.setStopFlag(1); - centerExtend.setStopTime(nowTime); - updList.add(centerExtend); - } + + + BmsCenterExtend currentCenter; + if(param.getId()!=null){ + //代办更新，删除历史数据 + LambdaQueryWrapper rmLqw1 = new LambdaQueryWrapper<>(); + rmLqw1.eq(BmsCenterExtend::getSourceId,param.getId()); + this.remove(rmLqw1); + + currentCenter = this.getById(param.getId()); + currentCenter.setStopTime(nowTime); + this.updateById(currentCenter); + }else { + //代办新增 + currentCenter = new BmsCenterExtend(); + currentCenter.setSourceId(0L); + currentCenter.setCenterType(type); + currentCenter.setPathIds("0"); + currentCenter.setCenterId(centerId); + currentCenter.setCenterCode(centerDto.getCenterCode()); + currentCenter.setCenterName(centerDto.getCenterName()); + currentCenter.setStartTime(centerDto.getCreateTime()); + currentCenter.setStopTime(nowTime); + currentCenter.setStopFlag(1); + currentCenter.setWeightRate(n100); + this.save(currentCenter); } + //新的继承节点 for (BmsCenterExtendBo.Item targetCenter : targetCenters) { TbsCenterDto centerDto2 = centerDtoService.getCenterDto(currentCenter.getCenterType(),targetCenter.getTargetCenterId()); @@ -127,68 +123,10 @@ public class BmsCenterExtendServiceImpl extends ServiceImpl targetCenters = param.getTargetCenters(); - BigDecimal totalRate = BigDecimal.ZERO; - for (BmsCenterExtendBo.Item center : targetCenters) { - totalRate=totalRate.add(center.getWeightRate()); - } - if(totalRate.compareTo(n100)!=0){ - Assert.throwEx("权重合计必须百分百"); - } - if (this.checkIsStop(type,centerId)){ - Assert.throwEx("当前成本中心已分配"); - } - TbsCenterDto centerDto = centerDtoService.getCenterDto(type,centerId); - //停止时间 - LocalDateTime nowTime = LocalDateTime.now(); - //当前节点 - BmsCenterExtend currentCenter = new BmsCenterExtend(); - currentCenter.setSourceId(0L); - currentCenter.setCenterType(type); - currentCenter.setPathIds("0"); - currentCenter.setCenterId(centerId); - currentCenter.setCenterCode(centerDto.getCenterCode()); - currentCenter.setCenterName(centerDto.getCenterName()); - currentCenter.setStartTime(centerDto.getCreateTime()); - currentCenter.setStopTime(nowTime); - currentCenter.setStopFlag(1); - currentCenter.setWeightRate(n100); - this.save(currentCenter); - //历史分摊节点 - LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); - lqw.eq(BmsCenterExtend::getCenterType,param.getType()); - lqw.eq(BmsCenterExtend::getCenterId,param.getSourceCenterId()); - lqw.eq(BmsCenterExtend::getStopFlag,0); - List sourcesCenterList = this.list(lqw); - - sourcesCenterList.add(currentCenter); - - List newList = new ArrayList<>(); - List updList = new ArrayList<>(); - for (BmsCenterExtend sourceCenter : sourcesCenterList) { - newList.addAll(buildCenterExtend(sourceCenter,targetCenters,nowTime)); - if(sourceCenter.getStopFlag()==0){ - BmsCenterExtend centerExtend = new BmsCenterExtend(); - centerExtend.setId(sourceCenter.getId()); - centerExtend.setStopFlag(1); - centerExtend.setStopTime(nowTime); - updList.add(centerExtend); - } - } - if(CollectionUtil.isNotEmpty(updList)){ - this.updateBatchById(updList); - } - this.saveBatch(newList);*/ } private void toSaveExtendUser(BmsCenterExtend currentCenter, List userList, TbsCenterDto centerDto2, Long childExtendId) { @@ -218,110 +156,6 @@ public class BmsCenterExtendServiceImpl extends ServiceImpl buildCenterExtend(BmsCenterExtend sourceCenter,List targetCenters,LocalDateTime nowTime) { - BigDecimal n100 = new BigDecimal("100"); - List newList = new ArrayList<>(); - for (BmsCenterExtendBo.Item targetCenter : targetCenters) { - TbsCenterDto centerDto = centerDtoService.getCenterDto(sourceCenter.getCenterType(),targetCenter.getTargetCenterId()); - BigDecimal weightRate = sourceCenter.getWeightRate() - .multiply(sourceCenter.getWeightRate()) - .divide(n100); - BmsCenterExtend currentCenter = new BmsCenterExtend(); - currentCenter.setSourceId(sourceCenter.getId()); - currentCenter.setCenterType(sourceCenter.getCenterType()); - currentCenter.setPathIds(sourceCenter.getPathIds()+"_"+sourceCenter.getId()); - currentCenter.setCenterId(centerDto.getId()); - currentCenter.setCenterCode(centerDto.getCenterCode()); - currentCenter.setCenterName(centerDto.getCenterName()); - currentCenter.setStartTime(nowTime); - currentCenter.setStopFlag(0); - currentCenter.setWeightRate(weightRate); - newList.add(currentCenter); - } - return newList; - } - - - @Override - @Transactional(rollbackFor = Exception.class) - public void allocation4Update(BmsCenterExtendBo param) { - String type = param.getType(); - String centerId = param.getSourceCenterId(); - BigDecimal n100 = new BigDecimal("100"); - List targetCenters = param.getTargetCenters(); - BigDecimal totalRate = BigDecimal.ZERO; - for (BmsCenterExtendBo.Item center : targetCenters) { - totalRate=totalRate.add(center.getWeightRate()); - } - if(totalRate.compareTo(n100)!=0){ - Assert.throwEx("权重合计必须百分百"); - } - for (BmsCenterExtendBo.Item targetCenter : targetCenters) { - if(targetCenter.getTargetCenterId().equals(param.getSourceCenterId())){ - Assert.throwEx("后继成本中心与当前成本中心相同"); - } - boolean b = this.checkIsStop(type,targetCenter.getTargetCenterId()); - if(b){ - Assert.throwEx("部分后继成本中心已分配"); - } - } - List saveExtendBo = targetCenters.stream().filter(a->a.getId()==null).collect(Collectors.toList()); - List updExtendBo = targetCenters.stream().filter(a->a.getId()!=null).collect(Collectors.toList()); - List updateIds = targetCenters.stream().filter(a->a.getId()!=null).map(BmsCenterExtendBo.Item::getId).collect(Collectors.toList()); - - LocalDateTime nowTime = param.getExtendDate().atStartOfDay(); - //更新被继承成本 - BmsCenterExtend currentCenter = this.getById(param.getId()); - currentCenter.setStopTime(nowTime); - this.updateById(currentCenter); - //移除 - LambdaQueryWrapper dellqw = new LambdaQueryWrapper<>(); - dellqw.eq(BmsCenterExtend::getCenterType,param.getType()); - dellqw.eq(BmsCenterExtend::getSourceId,param.getId()); - dellqw.notIn(BmsCenterExtend::getId,updateIds); - this.remove(dellqw); - //新增 - for (BmsCenterExtendBo.Item item : saveExtendBo) { - //校验是否可添加 - if (this.checkIsStop(currentCenter.getCenterType(),item.getTargetCenterId())){ - Assert.throwEx("新增的后继成本中心已被停用，请重新选择"); - } - TbsCenterDto centerDto2 = centerDtoService.getCenterDto(type,centerId); - BmsCenterExtend currentChildCenter = new BmsCenterExtend(); - currentChildCenter.setSourceId(currentCenter.getId()); - currentChildCenter.setCenterType(currentCenter.getCenterType()); - currentChildCenter.setPathIds(currentCenter.getPathIds()+"_"+currentCenter.getId()); - currentChildCenter.setCenterId(centerDto2.getId()); - currentChildCenter.setCenterCode(centerDto2.getCenterCode()); - currentChildCenter.setCenterName(centerDto2.getCenterName()); - currentChildCenter.setStartTime(currentCenter.getStopTime()); - currentChildCenter.setStopFlag(0); - currentChildCenter.setWeightRate(item.getWeightRate()); - this.save(currentChildCenter); - this.toSaveExtendUser( currentCenter, item.getUserList(), centerDto2, currentChildCenter.getId()); - } - //更新 - LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); - lqw.eq(BmsCenterExtend::getCenterType,param.getType()); - lqw.in(BmsCenterExtend::getId,updateIds); - List sourcesCenterList = this.list(lqw); - for (BmsCenterExtend centerExtend : sourcesCenterList) { - for (BmsCenterExtendBo.Item item : updExtendBo) { - if(centerExtend.getId().equals(item.getId())){ - //匹配更新 - centerExtend.setWeightRate(item.getWeightRate()); - centerExtend.setStartTime(nowTime); - this.updateById(centerExtend); - LambdaQueryWrapper delUsrLqw = new LambdaQueryWrapper<>(); - delUsrLqw.eq(BmsCenterExtendUser::getChildExtId,centerExtend.getId()); - centerExtendUserService.remove(delUsrLqw); - //重新保存 - TbsCenterDto centerDto2 = centerDtoService.getCenterDto(type,item.getTargetCenterId()); - this.toSaveExtendUser( currentCenter, item.getUserList(), centerDto2, centerExtend.getId()); - } - } - } - } @Override @Transactional(rollbackFor = Exception.class) 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 227f95ec..f599ef93 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 @@ -111,8 +111,11 @@ public class BmsRegionServiceImpl extends ServiceImpl } @Override - public List getTree(boolean listUserFlag) { + public List getTree(boolean listUserFlag,Integer stopFlag) { LambdaQueryWrapper regionWrapper = new LambdaQueryWrapper<>(); + if(stopFlag!=2){ + regionWrapper.eq(BmsRegion::getStopFlag,stopFlag); + } List list = this.list(regionWrapper); if(listUserFlag){ LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); @@ -219,7 +222,7 @@ public class BmsRegionServiceImpl extends ServiceImpl @Override public void flushAllLevel(boolean batchUpdate) { this.baseMapper.updateSetPathNull(); - List treeVoList = this.getTree(false); + List treeVoList = this.getTree(false,2); for (BmsRegionTreeVo firstTree : treeVoList) { if(firstTree.getLevel()==null||firstTree.getLevel()!=1||batchUpdate){ String pathIds = firstTree.getId(); 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 7e1cb4e3..20759ada 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 @@ -53,8 +53,7 @@ public class TzcPolicyServiceImpl extends ServiceImpl } }else { tzcPolicy = new TzcPolicy(); - //tzcPolicy.setId(IdUtil.getSnowFlakeId()); - tzcPolicy.setPolicyCode(CodeGenUtil.generate(CodeGenUtil.SourceKey.Policy)); + tzcPolicy.setPolicyCode("P"+CodeGenUtil.generate(CodeGenUtil.SourceKey.Policy)); SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId()); tzcPolicy.setUserId(sysUser.getId()); tzcPolicy.setUserCode(sysUser.getCode()); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 33e47879..50633017 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -22,11 +22,15 @@ project: - /error - /portal/syKeyLogin - /bir/roiRate/test + - /static/* + - /web/* permits: #忽略登录 - /thirty/** #第三方接口 - /common/upload #支持API上传调整 - /common/validToken #验证token - /api/** + - /static/** + - /web/** - /portal/** - /favicon.ico - /error @@ -52,6 +56,8 @@ logging: level: ROOT: info com.qs.serve: debug + #com.qs.serve.modules.his: info + com.qs.serve.modules.sys: info org.xnio.nio: info org.springframework: info com.baomidou: info