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 0e7748e8..58a0ec14 100644 --- a/src/main/java/com/qs/serve/common/util/CodeGenUtil.java +++ b/src/main/java/com/qs/serve/common/util/CodeGenUtil.java @@ -39,7 +39,7 @@ public class CodeGenUtil { }else { value++; } - if(value>8000000){ + if(value>10000){ redisService.set(key,1); }else { redisService.set(key,value); @@ -48,12 +48,8 @@ public class CodeGenUtil { DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyyMMdd"); String localTime = df.format(localDateTime); String appendStr = digits32(value); - //防止溢出 - if(appendStr.length()<4){ - redisService.set(key,1); - } StringBuilder appendZeros = new StringBuilder(); - for (int i = appendStr.length(); i < 4; i++) { + for (int i = appendStr.length(); i < 3; i++) { appendZeros.append("0"); } return localTime.substring(2) + appendZeros + appendStr; diff --git a/src/main/java/com/qs/serve/modules/bms/common/CenterExtendBuildType.java b/src/main/java/com/qs/serve/modules/bms/common/CenterExtendBuildType.java new file mode 100644 index 00000000..0dfd41d4 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/common/CenterExtendBuildType.java @@ -0,0 +1,13 @@ +package com.qs.serve.modules.bms.common; + +/** + * @author YenHex + * @since 2023/7/17 + */ +public interface CenterExtendBuildType { + + String DATA = "data"; + String TREE = "tree"; + String ERROR = "err"; + +} diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsCostCenterController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsCostCenterController.java index ae151b2b..651f136f 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsCostCenterController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsCostCenterController.java @@ -9,11 +9,13 @@ import com.qs.serve.common.model.enums.SystemModule; import com.qs.serve.common.util.*; import com.qs.serve.modules.bms.common.MasterUserType; import com.qs.serve.modules.bms.entity.BmsMasterUser; +import com.qs.serve.modules.bms.entity.BmsRegion; import com.qs.serve.modules.bms.entity.bo.BmsCostCenterBo; import com.qs.serve.modules.bms.entity.vo.BmsCostCenterTreeVo; import com.qs.serve.modules.bms.entity.vo.BmsMasterUserCenterVo; import com.qs.serve.modules.bms.entity.vo.BmsSubjectTreeVo; import com.qs.serve.modules.bms.service.BmsMasterUserService; +import com.qs.serve.modules.bms.service.BmsRegionService; import com.qs.serve.modules.sys.entity.SysUser; import com.qs.serve.modules.tbs.common.TbsCenterType; import com.qs.serve.modules.tbs.entity.TbsActivityCenter; @@ -50,6 +52,7 @@ public class BmsCostCenterController { private BmsMasterUserService bmsMasterUserService; private TbsActivityCenterService activityCenterService; private TbsBudgetService tbsBudgetService; + private BmsRegionService regionService; /** * 树查询 @@ -156,6 +159,10 @@ public class BmsCostCenterController { BmsCostCenter parentCostCenter = bmsCostCenterService.getById(bmsCostCenter.getPid()); bmsCostCenter.setParentInfo(parentCostCenter); } + if(StringUtils.hasText(bmsCostCenter.getSaleRegionId())&&!bmsCostCenter.getSaleRegionId().equals("0")){ + BmsRegion region = regionService.getById(bmsCostCenter.getSaleRegionId()); + bmsCostCenter.setSaleRegionInfo(region); + } return R.ok(bmsCostCenter); } diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsCenterExtend.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsCenterExtend.java index 0b0d20bb..d9cef685 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsCenterExtend.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsCenterExtend.java @@ -40,9 +40,6 @@ public class BmsCenterExtend implements Serializable { @Length(max = 255,message = "成本中心类型长度不能超过255字") private String centerType; - /** 祖级id */ - private String pathIds; - /** 成本中心id */ @NotBlank(message = "成本中心id不能为空") @Length(max = 32,message = "成本中心id长度不能超过32字") diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsCenterExtendBuild.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsCenterExtendBuild.java new file mode 100644 index 00000000..5be73f11 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsCenterExtendBuild.java @@ -0,0 +1,145 @@ +package com.qs.serve.modules.bms.entity; + +import java.time.LocalDate; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotNull; +import javax.validation.constraints.NotBlank; + +/** + * 后继成本中心 实体类 + * @author YenHex + * @since 2023-07-17 + */ +@Data +@TableName("bms_center_extend_build") +public class BmsCenterExtendBuild implements Serializable { + + private static final long serialVersionUID = 1L; + + /** 编号 */ + @TableId(type = IdType.AUTO) + private Long id; + + /** 创建类型 data，tree */ + private String buildType; + + /** 来源id */ + @NotNull(message = "来源id不能为空") + private Long sourceId; + + /** 祖级id */ + @Length(max = 255,message = "祖级id长度不能超过255字") + private String pathIds; + + /** 成本中心类型 */ + @NotBlank(message = "成本中心类型不能为空") + @Length(max = 255,message = "成本中心类型长度不能超过255字") + private String centerType; + + /** 成本中心id */ + @NotBlank(message = "成本中心id不能为空") + @Length(max = 32,message = "成本中心id长度不能超过32字") + private String centerId; + + /** 成本中心编码 */ + @NotBlank(message = "成本中心编码不能为空") + @Length(max = 50,message = "成本中心编码长度不能超过50字") + private String centerCode; + + /** 成本中心名称 */ + @NotBlank(message = "成本中心名称不能为空") + @Length(max = 200,message = "成本中心名称长度不能超过200字") + private String centerName; + + /** 开始时间 */ + @NotNull(message = "开始时间不能为空") + @Length(max = 0,message = "开始时间长度不能超过0字") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime startTime; + + /** 结束时间 */ + @Length(max = 0,message = "结束时间长度不能超过0字") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime stopTime; + + /** 结束标识 */ + @NotNull(message = "结束标识不能为空") + private Integer stopFlag; + + /** 权重 */ + @NotNull(message = "权重不能为空") + private BigDecimal weightRate; + + /** 备注 */ + @Length(max = 600,message = "备注长度不能超过600字") + private String remark; + + /** 创建时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** 最后更新时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @TableField(fill = FieldFill.UPDATE) + private LocalDateTime updateTime; + + /** 所属租户 */ + @JsonIgnore + @JsonProperty + private String tenantId; + + /** 创建人 */ + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** 更新人 */ + @TableField(fill = FieldFill.UPDATE) + private String updateBy; + + /** 逻辑删除标记（0：显示；1：隐藏） */ + @JsonIgnore + @JsonProperty + private String delFlag; + + + public static BmsCenterExtendBuild toNewObject(BmsCenterExtendBuild source){ + BmsCenterExtendBuild centerExtendBuild = new BmsCenterExtendBuild(); + centerExtendBuild.setId(source.getId()); + centerExtendBuild.setSourceId(source.getSourceId()); + centerExtendBuild.setPathIds(source.getPathIds()); + centerExtendBuild.setCenterType(source.getCenterType()); + centerExtendBuild.setCenterId(source.getCenterId()); + centerExtendBuild.setCenterCode(source.getCenterCode()); + centerExtendBuild.setCenterName(source.getCenterName()); + centerExtendBuild.setStartTime(source.getStartTime()); + centerExtendBuild.setStopTime(source.getStopTime()); + centerExtendBuild.setStopFlag(source.getStopFlag()); + centerExtendBuild.setWeightRate(source.getWeightRate()); + centerExtendBuild.setRemark(source.getRemark()); + centerExtendBuild.setCreateTime(source.getCreateTime()); + centerExtendBuild.setUpdateTime(source.getUpdateTime()); + centerExtendBuild.setTenantId(source.getTenantId()); + centerExtendBuild.setCreateBy(source.getCreateBy()); + centerExtendBuild.setUpdateBy(source.getUpdateBy()); + centerExtendBuild.setDelFlag(source.getDelFlag()); + return centerExtendBuild; + } + +} + diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsCenterExtendUser.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsCenterExtendUser.java index 95f68701..39a7797e 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsCenterExtendUser.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsCenterExtendUser.java @@ -39,11 +39,6 @@ public class BmsCenterExtendUser implements Serializable { @NotNull(message = "来源id不能为空") private Long sourceId; - /** 祖级id */ - @NotBlank(message = "祖级id不能为空") - @Length(max = 2000,message = "祖级id长度不能超过2000字") - private String pathIds; - /** 成本中心类型 */ @NotBlank(message = "成本中心类型不能为空") @Length(max = 255,message = "成本中心类型长度不能超过255字") @@ -121,7 +116,6 @@ public class BmsCenterExtendUser implements Serializable { centerExtendUser.setId(source.getId()); centerExtendUser.setChildExtId(source.getChildExtId()); centerExtendUser.setSourceId(source.getSourceId()); - centerExtendUser.setPathIds(source.getPathIds()); centerExtendUser.setCenterType(source.getCenterType()); centerExtendUser.setCenterId(source.getCenterId()); centerExtendUser.setCenterCode(source.getCenterCode()); diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsCostCenter.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsCostCenter.java index 05e327a0..e1c3dc5b 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsCostCenter.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsCostCenter.java @@ -53,6 +53,8 @@ public class BmsCostCenter implements Serializable { @NotNull(message = "父级节点不能为空") private Long pid; + /** 销售区域id */ + private String saleRegionId; /** 备注 */ @Length(max = 255,message = "备注长度不能超过255字") @@ -96,5 +98,9 @@ public class BmsCostCenter implements Serializable { @TableField(exist = false) private Object parentInfo; + /** 成本中心信息 */ + @TableField(exist = false) + private Object saleRegionInfo; + } diff --git a/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsCostCenterBo.java b/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsCostCenterBo.java index 9c5ec056..cccdbe0a 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsCostCenterBo.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsCostCenterBo.java @@ -43,4 +43,9 @@ public class BmsCostCenterBo { /** 是否所有人可见 */ private Integer visibleFlag; + + + /** 销售区域id */ + private String saleRegionId; + } diff --git a/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsCenterExtendTreeVo.java b/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsCenterExtendTreeVo.java new file mode 100644 index 00000000..178780f8 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsCenterExtendTreeVo.java @@ -0,0 +1,72 @@ +package com.qs.serve.modules.bms.entity.vo; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.SqlCondition; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.qs.serve.common.model.dto.TreeNode; +import lombok.Data; +import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * @author YenHex + * @since 2023/7/17 + */ +@Data +public class BmsCenterExtendTreeVo extends TreeNode { + + /** 来源id */ + @NotNull(message = "来源id不能为空") + private Long sourceId; + + /** 成本中心类型 */ + @NotBlank(message = "成本中心类型不能为空") + @Length(max = 255,message = "成本中心类型长度不能超过255字") + private String centerType; + + /** 成本中心id */ + @NotBlank(message = "成本中心id不能为空") + @Length(max = 32,message = "成本中心id长度不能超过32字") + private String centerId; + + /** 成本中心编码 */ + @NotBlank(message = "成本中心编码不能为空") + @Length(max = 50,message = "成本中心编码长度不能超过50字") + @TableField(condition = SqlCondition.LIKE) + private String centerCode; + + /** 成本中心名称 */ + @NotBlank(message = "成本中心名称不能为空") + @Length(max = 200,message = "成本中心名称长度不能超过200字") + @TableField(condition = SqlCondition.LIKE) + private String centerName; + + /** 开始时间 */ + @NotNull(message = "开始时间不能为空") + @Length(max = 0,message = "开始时间长度不能超过0字") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime startTime; + + /** 结束时间 */ + @Length(max = 0,message = "结束时间长度不能超过0字") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime stopTime; + + /** 结束标识 */ + @NotNull(message = "结束标识不能为空") + private Integer stopFlag; + + /** 权重 */ + @NotNull(message = "权重不能为空") + private BigDecimal weightRate; + +} diff --git a/src/main/java/com/qs/serve/modules/bms/mapper/BmsCenterExtendBuildMapper.java b/src/main/java/com/qs/serve/modules/bms/mapper/BmsCenterExtendBuildMapper.java new file mode 100644 index 00000000..a0b7ef1d --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/mapper/BmsCenterExtendBuildMapper.java @@ -0,0 +1,14 @@ +package com.qs.serve.modules.bms.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.qs.serve.modules.bms.entity.BmsCenterExtendBuild; + +/** + * 后继成本中心 Mapper + * @author YenHex + * @date 2023-07-17 + */ +public interface BmsCenterExtendBuildMapper extends BaseMapper { + +} + diff --git a/src/main/java/com/qs/serve/modules/bms/service/BmsCenterExtendBuildService.java b/src/main/java/com/qs/serve/modules/bms/service/BmsCenterExtendBuildService.java new file mode 100644 index 00000000..1200df5c --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/service/BmsCenterExtendBuildService.java @@ -0,0 +1,19 @@ +package com.qs.serve.modules.bms.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.qs.serve.modules.bms.entity.BmsCenterExtendBuild; + +/** + * 后继成本中心 服务接口 + * @author YenHex + * @date 2023-07-17 + */ +public interface BmsCenterExtendBuildService extends IService { + + /** + * 初始化建数据，调用时，清空本`bms_center_extend_build`表 + */ + void initData(); + +} + 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 499dd735..f05ddd0a 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 @@ -3,6 +3,8 @@ package com.qs.serve.modules.bms.service; import com.baomidou.mybatisplus.extension.service.IService; import com.qs.serve.modules.bms.entity.BmsCenterExtend; import com.qs.serve.modules.bms.entity.bo.BmsCenterExtendBo; +import com.qs.serve.modules.bms.entity.vo.BmsCenterExtendTreeVo; +import java.util.List; /** * 后继成本中心 服务接口 @@ -11,6 +13,12 @@ import com.qs.serve.modules.bms.entity.bo.BmsCenterExtendBo; */ public interface BmsCenterExtendService extends IService { + /** + * 转换成树结构 + * @return + */ + List transferTree(); + boolean checkIsStop(String type, String centerId); BmsCenterExtend allocation(BmsCenterExtendBo param); diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsCenterExtendBuildServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsCenterExtendBuildServiceImpl.java new file mode 100644 index 00000000..952cffe8 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsCenterExtendBuildServiceImpl.java @@ -0,0 +1,93 @@ +package com.qs.serve.modules.bms.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.qs.serve.modules.bms.common.CenterExtendBuildType; +import com.qs.serve.modules.bms.entity.vo.BmsCenterExtendTreeVo; +import com.qs.serve.modules.bms.service.BmsCenterExtendService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import com.qs.serve.modules.bms.entity.BmsCenterExtendBuild; +import com.qs.serve.modules.bms.service.BmsCenterExtendBuildService; +import com.qs.serve.modules.bms.mapper.BmsCenterExtendBuildMapper; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +/** + * 后继成本中心 服务实现类 + * @author YenHex + * @since 2023-07-17 + */ +@Slf4j +@Service +@AllArgsConstructor +public class BmsCenterExtendBuildServiceImpl extends ServiceImpl implements BmsCenterExtendBuildService { + + private final BmsCenterExtendService centerExtendService; + + @Override + public void initData() { + List treeVoList = centerExtendService.transferTree(); + List buildList = new ArrayList<>(); + this.recursionBuildExtendCenter(treeVoList, buildList, null); + } + + private void recursionBuildExtendCenter(List treeVoList, List buildList, BmsCenterExtendBuild parent) { + //存放上级对象 + for (BmsCenterExtendTreeVo source : treeVoList) { + BmsCenterExtendBuild build = new BmsCenterExtendBuild(); + build.setBuildType(CenterExtendBuildType.TREE); + build.setSourceId(source.getSourceId()); + if(parent !=null){ + String[] pathIds = parent.getPathIds().split("_"); + for (String pathId : pathIds) { + if(pathId.equals(source.getId())){ + build.setBuildType(CenterExtendBuildType.ERROR); + break; + } + } + }else { + build.setPathIds("0_" + source.getId()); + } + build.setCenterType(source.getCenterType()); + build.setCenterId(source.getCenterId()); + build.setCenterCode(source.getCenterCode()); + build.setCenterName(source.getCenterName()); + build.setStartTime(source.getStartTime()); + build.setStopTime(source.getStopTime()); + build.setStopFlag(source.getStopFlag()); + build.setWeightRate(source.getWeightRate()); + buildList.add(build); + //判断是否最后一级 + if(source.getChildren()==null||source.getChildren().size()==0){ + //自下而上查询返回所有占比 + BmsCenterExtendBuild buildData = new BmsCenterExtendBuild(); + buildData.setBuildType(CenterExtendBuildType.DATA); + buildData.setSourceId(source.getSourceId()); + buildData.setCenterType(source.getCenterType()); + buildData.setCenterId(source.getCenterId()); + buildData.setCenterCode(source.getCenterCode()); + buildData.setCenterName(source.getCenterName()); + buildData.setStartTime(source.getStartTime()); + buildData.setStopTime(source.getStopTime()); + buildData.setStopFlag(source.getStopFlag()); + buildData.setWeightRate(source.getWeightRate()); + buildList.add(buildData); + //TODO + BigDecimal weightRate = source.getWeightRate(); + String pid = source.getParentId(); + for (BmsCenterExtendTreeVo treeVo : treeVoList) { + + } + + }else { + //递归调用 + this.recursionBuildExtendCenter(treeVoList, buildList, build); + } + } + } + +} + 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 2aba0422..af50abd3 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 @@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.qs.serve.common.util.Assert; import com.qs.serve.common.util.CollectionUtil; +import com.qs.serve.common.util.TreeUtil; import com.qs.serve.modules.bms.entity.BmsCenterExtendUser; import com.qs.serve.modules.bms.entity.BmsCostCenter; import com.qs.serve.modules.bms.entity.bo.BmsCenterExtendBo; +import com.qs.serve.modules.bms.entity.vo.BmsCenterExtendTreeVo; import com.qs.serve.modules.bms.mapper.*; import com.qs.serve.modules.bms.service.BmsCenterExtendUserService; import com.qs.serve.modules.goods.entity.dto.TbsCenterDto; @@ -26,7 +28,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; - +import java.util.List; /** * 后继成本中心 服务实现类 * @author YenHex @@ -41,6 +43,29 @@ public class BmsCenterExtendServiceImpl extends ServiceImpl transferTree() { + List listAll = this.list(); + List treeVoList = listAll.stream().map(exCenter->{ + BmsCenterExtendTreeVo treeNode = new BmsCenterExtendTreeVo(); + treeNode.setId(exCenter.getId()+""); + treeNode.setParentId(exCenter.getSourceId().toString()); + treeNode.setSort(0); + treeNode.setCenterType(exCenter.getCenterType()); + treeNode.setCenterId(exCenter.getCenterId()); + treeNode.setCenterCode(exCenter.getCenterCode()); + treeNode.setCenterName(exCenter.getCenterName()); + treeNode.setStartTime(exCenter.getStartTime()); + treeNode.setStopTime(exCenter.getStopTime()); + treeNode.setStopFlag(exCenter.getStopFlag()); + treeNode.setWeightRate(exCenter.getWeightRate()); + return treeNode; + }).collect(Collectors.toList()); + treeVoList.sort((o1,o2) -> (o2.getSort()-o1.getSort())); + treeVoList = TreeUtil.buildByRecursive(treeVoList,TreeUtil.DEFAULT_PID_STRING); + return treeVoList; + } + @Override public boolean checkIsStop(String type, String centerId) { LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); @@ -65,21 +90,16 @@ public class BmsCenterExtendServiceImpl extends ServiceImpl