feat(能源管理系统): 修改架构

1.修改架构添加cse;
2.修改各微服务服务名,启动验证,完成cse注册;
3.修改各模块pom及配置文件,解决服务间无法调用问题;
4.修改各服务配置,解决gateway模块跨域问题;
5.暂时删除部分编译错误代码,完成本地登录流程等基础功能测试,验证改造后链路是否正常;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseLineService.java

 package pps.core.base.service;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -173,9 +174,7 @@ public class BaseLineService {
         outputXListResult.throwIfFail();
         List<GetOuListTreeOutput> ouList = outputXListResult.getResult();
         List<String> ouIdList = new ArrayList<>();
-        if (CollectionUtils.isEmpty(ouList)) {
-            ouIdList.add(input.getOuId());
-        } else {
+        if (CollUtil.isNotEmpty(ouList)) {
             ouIdList = ouList.stream().map(GetOuListTreeOutput::getOuId).collect(Collectors.toList());
         }
         BaseLineViewMapper viewMapper = context.getBean(BaseLineViewMapper.class);

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_line/QueryBaseLineOutput.java

 package pps.core.base.service.data.base_line;
 
+import lombok.Data;
 import xstartup.annotation.XText;
 import xstartup.base.data.XPageInput;
 
 import java.math.BigDecimal;
 import java.util.Date;
+
+@Data
 public class QueryBaseLineOutput extends XPageInput {
 
-    private Integer id;
+    private String id;
 
     @XText("上级线路")
 
@@ -77,197 +80,4 @@ public class QueryBaseLineOutput extends XPageInput {
     private String productionYear;
 
     private String serviceLength;
-
-    public String getServiceLength() {
-        return serviceLength;
-    }
-
-    public void setServiceLength(String serviceLength) {
-        this.serviceLength = serviceLength;
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Integer pId) {
-        this.parentId = pId;
-    }
-
-    public String getLineName() {
-        return lineName;
-    }
-
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
-    }
-
-    public String getLineType() {
-        return lineType;
-    }
-
-    public void setLineType(String lineType) {
-        this.lineType = lineType;
-    }
-
-    public String getGridType() {
-        return gridType;
-    }
-
-    public void setGridType(String gridType) {
-        this.gridType = gridType;
-    }
-
-    public BigDecimal getInstallCapacity() {
-        return installCapacity;
-    }
-
-    public void setInstallCapacity(BigDecimal installCapacity) {
-        this.installCapacity = installCapacity;
-    }
-
-    public BigDecimal getArrayIncidence() {
-        return arrayIncidence;
-    }
-
-    public void setArrayIncidence(BigDecimal arrayIncidence) {
-        this.arrayIncidence = arrayIncidence;
-    }
-
-    public BigDecimal getArrayToward() {
-        return arrayToward;
-    }
-
-    public void setArrayToward(BigDecimal arrayToward) {
-        this.arrayToward = arrayToward;
-    }
-
-
-    public String getOilOuId() {
-        return oilOuId;
-    }
-
-    public void setOilOuId(String oilOuId) {
-        this.oilOuId = oilOuId;
-    }
-
-    public String getOilOuName() {
-        return oilOuName;
-    }
-
-    public void setOilOuName(String oilOuName) {
-        this.oilOuName = oilOuName;
-    }
-
-    public String getWellOuId() {
-        return wellOuId;
-    }
-
-    public void setWellOuId(String wellOuId) {
-        this.wellOuId = wellOuId;
-    }
-
-    public String getWellOuName() {
-        return wellOuName;
-    }
-
-    public void setWellOuName(String wellOuName) {
-        this.wellOuName = wellOuName;
-    }
-
-    public String getPLineName() {
-        return pLineName;
-    }
-
-    public void setPLineName(String pLineName) {
-        this.pLineName = pLineName;
-    }
-
-    public String getCreateById() {
-        return createById;
-    }
-
-    public void setCreateById(String createById) {
-        this.createById = createById;
-    }
-
-    public String getCreateByName() {
-        return createByName;
-    }
-
-    public void setCreateByName(String createByName) {
-        this.createByName = createByName;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getModifyById() {
-        return modifyById;
-    }
-
-    public void setModifyById(String modifyById) {
-        this.modifyById = modifyById;
-    }
-
-    public String getModifyByName() {
-        return modifyByName;
-    }
-
-    public void setModifyByName(String modifyByName) {
-        this.modifyByName = modifyByName;
-    }
-
-    public Date getModifyTime() {
-        return modifyTime;
-    }
-
-    public void setModifyTime(Date modifyTime) {
-        this.modifyTime = modifyTime;
-    }
-
-    public String getLineTypeName() {
-        return lineTypeName;
-    }
-
-    public void setLineTypeName(String lineTypeName) {
-        this.lineTypeName = lineTypeName;
-    }
-
-    public String getGridTypeName() {
-        return gridTypeName;
-    }
-
-    public void setGridTypeName(String gridTypeName) {
-        this.gridTypeName = gridTypeName;
-    }
-
-    public String getpLineName() {
-        return pLineName;
-    }
-
-    public void setpLineName(String pLineName) {
-        this.pLineName = pLineName;
-    }
-
-    public String getProductionYear() {
-        return productionYear;
-    }
-
-    public void setProductionYear(String productionYear) {
-        this.productionYear = productionYear;
-    }
 }

C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/BaseLineViewMapper.xml

@@ -193,7 +193,7 @@
         <if test="lineName!=null and lineName !=''">
             and line_name like CONCAT( '%', #{lineName}, '%' )
         </if>
-        <if test="ouIdList != null and ouIdList.size()>0">
+        <if test="ouIdList != null and ouIdList.size() > 0 ">
             and ou_id in
             <foreach collection="ouIdList" open="(" close=")" item="item" separator=",">
                 #{item}