得到的

C00-common/pps-common/src/main/java/pps/core/common/utils/BaseUtils.java

@@ -102,7 +102,7 @@ public class BaseUtils {
      */
     public static void setBaseModelDefaultForJob(BaseModel model) {
         DateTime beginOfDay = DateUtil.beginOfDay(DateTime.now());
-        model.setId(BaseUtils.getUUID());
+        model.setId(BaseUtils.randomUUIDString());
         model.setCreateById("Task");
         model.setCreateByName("Task");
         model.setCreateTime(beginOfDay);
@@ -111,15 +111,6 @@ public class BaseUtils {
         model.setModifyTime(beginOfDay);
     }
 
-    /**
-     * 获取uuid
-     *
-     * @return {@link String}
-     */
-    public static String getUUID() {
-        return CharSequenceUtil.replace(UUID.randomUUID().toString(), "-", "");
-    }
-
     /**
      * 获取周执行周期
      *

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

@@ -436,7 +436,7 @@ public class BasePowerLineService {
                 wellhead.setOuId(ouId);
                 wellhead.setLineId(lineId);
                 BaseUtils.setBaseModelDefault(wellhead, session);
-                wellhead.setId(BaseUtils.getUUID());
+                wellhead.setId(BaseUtils.randomUUIDString());
                 wellheads.add(wellhead);
             }
             wellheadMapper.batchInsertList(wellheads);

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

@@ -337,7 +337,7 @@ public class BasePriceStrategyService {
         for (BasePriceStrategyMonthView monthView : monthList) {
             monthView.setStrategyId(strategyId);
             BaseUtils.setBaseModelDefault(monthView, session);
-            monthView.setId(BaseUtils.getUUID());
+            monthView.setId(BaseUtils.randomUUIDString());
             monthViewList.add(monthView);
             details = monthView.getDetails();
             if (CollUtil.isNotEmpty(details)) {
@@ -345,7 +345,7 @@ public class BasePriceStrategyService {
                     d.setStrategyId(strategyId);
                     d.setStrategyMonth(monthView.getStrategyMonth());
                     BaseUtils.setBaseModelDefault(d, session);
-                    d.setId(BaseUtils.getUUID());
+                    d.setId(BaseUtils.randomUUIDString());
                     detailViewList.add(d);
                 });
             }

C11-space/pps-core-space/src/main/java/pps/core/space/entity/LineDailyElectricityTrendEnt.java

@@ -22,8 +22,8 @@ import java.util.Date;
 public class LineDailyElectricityTrendEnt implements Serializable {
 
     @XText("ID")
-    @TableId(type = IdType.AUTO)
-    private Long id;
+    @TableId(type = IdType.ASSIGN_UUID)
+    private String id;
 
     @XText("井组名称(线路/光伏电站)")
     @TableField

C11-space/pps-core-space/src/main/java/pps/core/space/entity/LineDailyElectricityTrendView.java

@@ -25,7 +25,7 @@ import java.util.Date;
 public class LineDailyElectricityTrendView implements Serializable {
     @XText("ID")
     @TableField
-    private Long id;
+    private String id;
 
     @XText("井组名称(线路/光伏电站)")
     @TableField

C11-space/pps-core-space/src/main/java/pps/core/space/service/DailyElectricityTrendCloudServiceImpl.java

@@ -581,6 +581,7 @@ public class DailyElectricityTrendCloudServiceImpl implements IDailyElectricityT
         }
         if (ObjectUtil.isNotNull(ent)) {
             view = LineDailyElectricityTrendView.builder()
+                    .id(BaseUtils.randomUUIDString())
                     .stationName(stationName)
                     .totalPower(dailyElectricityConsumption)
                     .photovoltaicPower(photovoltaicPower)
@@ -602,6 +603,7 @@ public class DailyElectricityTrendCloudServiceImpl implements IDailyElectricityT
                     .build();
         } else {
             view = LineDailyElectricityTrendView.builder()
+                    .id(BaseUtils.randomUUIDString())
                     .stationName(stationName)
                     .totalPower(dailyElectricityConsumption)
                     .photovoltaicPower(photovoltaicPower)

C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceInstitutionDetailService.java

@@ -712,7 +712,7 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
         for (SpaceInstitutionWellheadView wellhead : list) {
             wellhead.setInstitutionId(institutionId);
             BaseUtils.setBaseModelDefault(wellhead, session);
-            wellhead.setId(BaseUtils.getUUID());
+            wellhead.setId(BaseUtils.randomUUIDString());
             wellheadViewList.add(wellhead);
             durationList = wellhead.getDurationList();
             if (CollUtil.isNotEmpty(durationList)) {
@@ -721,7 +721,7 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
                     d.setConfigId(wellhead.getId());
                     d.setInstitutionId(institutionId);
                     BaseUtils.setBaseModelDefault(d, session);
-                    d.setId(BaseUtils.getUUID());
+                    d.setId(BaseUtils.randomUUIDString());
                     durationViewList.add(d);
                 });
             }

C11-space/pps-core-space/src/main/resources/mybatis/mapper/pps/core/space/LineDailyElectricityTrendViewMapper.xml

@@ -59,12 +59,13 @@
     </select>
 
     <insert id="batchInsert" parameterType="list">
-        INSERT INTO LINE_DAILY_ELECTRICITY_TREND (STATION_NAME, TOTAL_POWER, PHOTOVOLTAIC_POWER, MUNICIPAL_POWER,
+        INSERT INTO LINE_DAILY_ELECTRICITY_TREND (ID, STATION_NAME, TOTAL_POWER, PHOTOVOLTAIC_POWER, MUNICIPAL_POWER,
         LAST_TOTAL_POWER, LAST_PHOTOVOLTAIC_POWER, LAST_MUNICIPAL_POWER, TOTAL_RATIO, PHOTOVOLTAIC_RATIO,
         MUNICIPAL_RATIO, VALLEY_ELECTRIC_OPEN_HOUR, VALLEY_ELECTRIC_RATE, SUM_RUN_DURATION, CREATE_DATE, SYSTEM_SOURCE)
         VALUES
         <foreach collection="list" item="item" separator=",">
             (
+            #{item.id},
             #{item.stationName},
             #{item.totalPower},
             #{item.photovoltaicPower},

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/entity/EnergyConsumptionAnalysisEnt.java

@@ -28,7 +28,7 @@ import java.util.Date;
 public class EnergyConsumptionAnalysisEnt implements Serializable {
     @XText("ID")
     @TableId(type = IdType.AUTO)
-    private Long id;
+    private String id;
 
     @XText("井组名称(线路/光伏电站)")
     @TableField

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/entity/EnergyConsumptionAnalysisView.java

@@ -24,7 +24,7 @@ import java.util.Date;
 public class EnergyConsumptionAnalysisView implements Serializable {
     @XText("ID")
     @TableField
-    private Long id;
+    private String id;
 
     @XText("线路ID")
     @TableField

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/ThirdDataAccessCloudServiceImpl.java

@@ -472,6 +472,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
         for (ThirdPhotovoltaicPowerEnt power : powerList) {
             String lineId = lineMap.get(power.getStationName());
             analysisList.add(EnergyConsumptionAnalysisView.builder()
+                            .id(BaseUtils.randomUUIDString())
                     .lineId(lineId)
                     .stationName(power.getStationName())
                     .powerGeneration(power.getPhotovoltaicPower())

C12-prediction/pps-core-prediction/src/main/resources/mybatis/mapper/pps/core/prediction/EnergyConsumptionAnalysisViewMapper.xml

@@ -41,11 +41,12 @@
     </select>
 
     <insert id="batchInsertList" parameterType="list">
-        INSERT INTO ENERGY_CONSUMPTION_ANALYSIS ( LINE_ID, STATION_NAME, POWER_GENERATION, POWER_CONSUMPTION,
+        INSERT INTO ENERGY_CONSUMPTION_ANALYSIS ( ID, LINE_ID, STATION_NAME, POWER_GENERATION, POWER_CONSUMPTION,
         DATA_DATE, SYSTEM_SOURCE )
         VALUES
         <foreach collection="list" item="item" separator=",">
             (
+            #{item.id},
             #{item.lineId},
             #{item.stationName},
             #{item.powerGeneration},