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/entity/BaseLineView.java

 package pps.core.base.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
 import xstartup.annotation.XText;
 
 import java.io.Serializable;
@@ -8,13 +9,14 @@ import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
+@Data
 public class BaseLineView implements Serializable {
     @TableField
-    private Integer id;
+    private String id;
 
     @XText("上级线路")
     @TableField
-    private Integer parentId;
+    private String parentId;
 
     @XText("线路名称")
     @TableField
@@ -22,7 +24,7 @@ public class BaseLineView implements Serializable {
 
     @XText("线路类型")
     @TableField
-    private String  lineType;
+    private String lineType;
 
     @XText("电网类型")
     @TableField
@@ -87,181 +89,4 @@ public class BaseLineView implements Serializable {
 
     @TableField
     private String serviceLength;
-
-    public String getServiceLength() {
-        return serviceLength;
-    }
-
-    public void setServiceLength(String serviceLength) {
-        this.serviceLength = serviceLength;
-    }
-
-    public Integer getId() {
-        return this.id;
-    }
-
-    public void setId(Integer value) {
-        this.id = value;
-    }
-
-
-    public String getLineName() {
-        return this.lineName;
-    }
-
-    public void setLineName(String value) {
-        this.lineName = value;
-    }
-
-    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 this.installCapacity;
-    }
-
-    public void setInstallCapacity(BigDecimal value) {
-        this.installCapacity = value;
-    }
-
-    public BigDecimal getArrayIncidence() {
-        return this.arrayIncidence;
-    }
-
-    public void setArrayIncidence(BigDecimal value) {
-        this.arrayIncidence = value;
-    }
-
-    public BigDecimal getArrayToward() {
-        return this.arrayToward;
-    }
-
-    public void setArrayToward(BigDecimal value) {
-        this.arrayToward = value;
-    }
-
-    public String getCreateById() {
-        return this.createById;
-    }
-
-    public void setCreateById(String value) {
-        this.createById = value;
-    }
-
-    public String getCreateByName() {
-        return this.createByName;
-    }
-
-    public void setCreateByName(String value) {
-        this.createByName = value;
-    }
-
-    public Date getCreateTime() {
-        return this.createTime;
-    }
-
-    public void setCreateTime(Date value) {
-        this.createTime = value;
-    }
-
-    public String getModifyById() {
-        return this.modifyById;
-    }
-
-    public void setModifyById(String value) {
-        this.modifyById = value;
-    }
-
-    public String getModifyByName() {
-        return this.modifyByName;
-    }
-
-    public void setModifyByName(String value) {
-        this.modifyByName = value;
-    }
-
-    public Date getModifyTime() {
-        return this.modifyTime;
-    }
-
-    public void setModifyTime(Date value) {
-        this.modifyTime = value;
-    }
-
-    public Integer getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Integer parentId) {
-        this.parentId = parentId;
-    }
-
-    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 List<String> getOuIdList() {
-        return ouIdList;
-    }
-
-    public void setOuIdList(List<String> ouIdList) {
-        this.ouIdList = ouIdList;
-    }
-
-    public String getProductionYear() {
-        return productionYear;
-    }
-
-    public void setProductionYear(String productionYear) {
-        this.productionYear = productionYear;
-    }
 }

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

@@ -136,7 +136,7 @@ public class BaseLineService {
     public XSingleResult<GetBaseLineOutput> getBaseLine(XContext context, GetBaseLineInput input) {
         BaseLineViewMapper mapper = context.getBean(BaseLineViewMapper.class);
         BaseLineView lineView = new BaseLineView();
-        lineView.setId(input.getId());
+        lineView.setId(String.valueOf(input.getId()));
         BaseLineView entity = mapper.selectOne(lineView);
         if (entity == null) {
             return XSingleResult.error(context, XError.NotFound);
@@ -164,10 +164,11 @@ public class BaseLineService {
         //获取组织机构下的子集
         SysOrganizationCloudService cloudService = context.getBean(SysOrganizationCloudService.class);
         GetAllOuListByOuIdInput ouIdInput = new GetAllOuListByOuIdInput();
-        if (XStringUtils.isNotEmpty(input.getOuId()))
+        if (XStringUtils.isNotEmpty(input.getOuId())) {
             ouIdInput.setOuId(input.getOuId());
-        else
+        } else {
             ouIdInput.setOuId("00000000-0000-0000-0000-000000000000");
+        }
         XListResult<GetOuListTreeOutput> outputXListResult = cloudService.getAllOuListByOuId(context, ouIdInput);
         outputXListResult.throwIfFail();
         List<GetOuListTreeOutput> ouList = outputXListResult.getResult();

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

@@ -22,8 +22,8 @@
     </resultMap>
 
     <resultMap id="AllResultMap" type="pps.core.base.entity.BaseLineView">
-        <id column="id" property="id" jdbcType="INTEGER"/>
-        <result column="parent_id" property="parentId" jdbcType="INTEGER"/>
+        <id column="id" property="id" jdbcType="VARCHAR"/>
+        <result column="parent_id" property="parentId" jdbcType="VARCHAR"/>
         <result column="line_name" property="lineName" jdbcType="VARCHAR"/>
         <result column="oil_ou_id" property="oilOuId" jdbcType="VARCHAR"/>
         <result column="oil_ou_name" property="oilOuName" jdbcType="VARCHAR"/>