From 6625b519858f9e92a2bd67d40b101b97869593a6 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期四, 22 五月 2025 12:07:39 +0800
Subject: [PATCH] 修改自增ID问题

---
 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipelineCapacityPlan.java                  |    5 +++++
 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineCapacityPlanServiceImpl.java |   15 ++++++++++-----
 aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipelineCapacityPlanMapper.java            |    3 ++-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipelineCapacityPlan.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipelineCapacityPlan.java
index 96f663f..3751687 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipelineCapacityPlan.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipelineCapacityPlan.java
@@ -2,11 +2,14 @@
 
 import com.aps.common.core.annotation.Excel;
 import com.aps.common.core.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.data.annotation.Id;
 
 import java.math.BigDecimal;
 
@@ -22,6 +25,8 @@
 {
     private static final long serialVersionUID = 1L;
 
+    @Id
+    @TableId(type = IdType.AUTO)
     /** 涓婚敭id */
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     @Schema(description = "涓婚敭id", type = "Long")
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipelineCapacityPlanMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipelineCapacityPlanMapper.java
index 29aa8fd..22ddc1c 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipelineCapacityPlanMapper.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipelineCapacityPlanMapper.java
@@ -1,6 +1,7 @@
 package com.aps.core.mapper;
 
 import com.aps.core.domain.ApsGasPipelineCapacityPlan;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -12,7 +13,7 @@
  * @date 2025-04-24
  */
 @Mapper
-public interface ApsGasPipelineCapacityPlanMapper 
+public interface ApsGasPipelineCapacityPlanMapper extends BaseMapper<ApsGasPipelineCapacityPlan>
 {
     /**
      * 鏌ヨ姘斾綋绠¤矾浜ц兘瑙勫垝
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineCapacityPlanServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineCapacityPlanServiceImpl.java
index 543cd6f..49a8da2 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineCapacityPlanServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineCapacityPlanServiceImpl.java
@@ -118,6 +118,14 @@
         plan.setOrgCode(factory);
         plan.setMajor(major);
         List<ApsGasPipelineCapacityPlan> templatePlans = apsGasPipelineCapacityPlanMapper.selectApsGasPipelineCapacityPlanList(plan);
+        templatePlans.forEach(p -> {
+            p.setCreateBy(SecurityUtils.getUsername());
+            p.setCreateTime(new Date());
+            p.setUpdateBy(null);
+            p.setUpdateTime(null);
+//                apsGasPipelineCapacityPlanMapper.insertApsGasPipelineCapacityPlan(p);
+        });
+
         while (dtStart.before(dtEnd)) {
             String year = dtStart.get(Calendar.YEAR) + "";
             String month = (dtStart.get(Calendar.MONTH) + 1) + "";
@@ -131,12 +139,9 @@
                 p.setId(null);
                 p.setYear(year);
                 p.setMonth(month);
-                p.setCreateBy(SecurityUtils.getUsername());
-                p.setCreateTime(new Date());
-                p.setUpdateBy(null);
-                p.setUpdateTime(null);
-                apsGasPipelineCapacityPlanMapper.insertApsGasPipelineCapacityPlan(p);
+//                apsGasPipelineCapacityPlanMapper.insertApsGasPipelineCapacityPlan(p);
             });
+            apsGasPipelineCapacityPlanMapper.insert(templatePlans);
 
             dtStart.add(Calendar.MONTH, 1);
         }

--
Gitblit v1.9.3