Merge remote-tracking branch 'origin/main'

# Conflicts:
#	1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/controller/SubController.java

1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/mapper/SubMapper.java

@@ -5,6 +5,7 @@ import net.xdclass.shopmanager.model.*;
 import org.apache.ibatis.annotations.Param;
 
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -100,4 +101,44 @@ public interface SubMapper extends BaseMapper<Map> {
     List<PmPdSlabInfoDO> getPmPdSlabInfo();
 
     List<QdToPoOrderDO> getQdToPoOrder();
+
+    BigDecimal getMaxPmPdSlabId();
+
+    void batchInsertPmPdSlab(@Param("list") List<PmPdSlabDO> pmPdSlabDOList);
+
+    void batchInsertPmCmdSlab(@Param("list") List<PmCmdSlabDO> pmCmdSlabDOList);
+
+    BigDecimal getMaxPmCmdSlabId();
+
+    void insertPmPdSlab(PmPdSlabDO p);
+
+    void insertPmCmdSlab(PmCmdSlabDO pmCmdSlabDO);
+
+    BigDecimal getMaxPmCmdLargePltId();
+
+    void insertPmCmdLargePlt(PmCmdLargePltDO pmCmdLargePltDO);
+
+    BigDecimal getMaxPmPdPlateCutId();
+
+    void insertPmPdPlateCut(PmPdPlateCutDO pmPdPlateCutDO);
+
+    BigDecimal getMaxPmPdBlockPosId();
+
+    void insertPmPdBlockPos(PmPdBlockPosDO pmPdBlockPosDO);
+
+    BigDecimal getMaxPmPdContSumId();
+
+    void insertPmPdContSum(PmPdContSumDO pmPdContSumDO);
+
+    BigDecimal getMaxPmSmallPltPosId();
+
+    void insertPmSmallPltPos(PmSmallPltPosDO pmSmallPltPosDO);
+
+    BigDecimal getMaxPmCmdSmallPltId();
+
+    void insertPmCmdSmallPlt(PmCmdSmallPltDO pmCmdSmallPltDO);
+
+    BigDecimal getMaxPmCmdContId();
+
+    void insertPmCmdCont(PmCmdContDO pmCmdContDO);
 }

1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/service/SubService.java

@@ -97,4 +97,26 @@ public interface SubService  {
     List<PmPdSlabInfoDO> getPmPdSlabInfo();
 
     List<QdToPoOrderDO> getQdToPoOrder();
+
+    void SaveData(List<PmPdSlabDO> pmPdSlabDOList, List<PmPdPlateCutDO> pmPdPlateCutDOList, List<PmPdBlockPosDO> pmPdBlockPosDOList, List<PmPdContSumDO> pmPdContSumDOList, List<PmSmallPltPosDO> pmSmallPltPosDOList, List<PmCmdSlabDO> pmCmdSlabDOList, List<PmCmdLargePltDO> pmCmdLargePltDOList, List<PmCmdContDO> pmCmdContDOList, List<PmCmdSmallPltDO> pmCmdSmallPltDOList);
+
+    void batchInsertPmPdSlab(List<PmPdSlabDO> pmPdSlabDOList);
+
+    void batchInsertPmCmdSlab(List<PmCmdSlabDO> pmCmdSlabDOList);
+
+    void insertPmPdSlab(PmPdSlabDO p);
+
+    void batchInsertPmCmdLargePlt(List<PmCmdLargePltDO> pmCmdLargePltDOList);
+
+    void batchInsertPmPdPlateCut(List<PmPdPlateCutDO> pmPdPlateCutDOList);
+
+    void batchInsertPmPdBlockPos(List<PmPdBlockPosDO> pmPdBlockPosDOList);
+
+    void batchInsertPmPdContSum(List<PmPdContSumDO> pmPdContSumDOList);
+
+    void batchInsertPmSmallPltPos(List<PmSmallPltPosDO> pmSmallPltPosDOList);
+
+    void batchInsertPmCmdSmallPlt(List<PmCmdSmallPltDO> pmCmdSmallPltDOList);
+
+    void batchInsertPmCmdCont(List<PmCmdContDO> pmCmdContDOList);
 }

1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/service/impl/SubServiceImpl.java

@@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Service
@@ -243,5 +244,116 @@ public class SubServiceImpl implements SubService {
         return  subMapper.getQdToPoOrder();
     }
 
+    @Override
+    public void SaveData(List<PmPdSlabDO> pmPdSlabDOList, List<PmPdPlateCutDO> pmPdPlateCutDOList, List<PmPdBlockPosDO> pmPdBlockPosDOList, List<PmPdContSumDO> pmPdContSumDOList, List<PmSmallPltPosDO> pmSmallPltPosDOList, List<PmCmdSlabDO> pmCmdSlabDOList, List<PmCmdLargePltDO> pmCmdLargePltDOList, List<PmCmdContDO> pmCmdContDOList, List<PmCmdSmallPltDO> pmCmdSmallPltDOList) {
+
+    }
+
+    @Override
+    public void batchInsertPmPdSlab(List<PmPdSlabDO> pmPdSlabDOList) {
+        BigDecimal id = subMapper.getMaxPmPdSlabId();
+        for (int i = 0 ; i < pmPdSlabDOList.size() ; i++){
+            pmPdSlabDOList.get(i).setPmPdSlabId(id.add(BigDecimal.valueOf(i+1)));
+            pmPdSlabDOList.get(i).setTenantId(BigDecimal.valueOf(1));
+            pmPdSlabDOList.get(i).setObjectVersionNumber(BigDecimal.valueOf(1));
+            subMapper.insertPmPdSlab(pmPdSlabDOList.get(i));
+        }
+//        subMapper.batchInsertPmPdSlab(pmPdSlabDOList);
+    }
+
+    @Override
+    public void batchInsertPmCmdSlab(List<PmCmdSlabDO> pmCmdSlabDOList) {
+        BigDecimal id = subMapper.getMaxPmCmdSlabId();
+        for (int i = 0 ; i < pmCmdSlabDOList.size() ; i++){
+            pmCmdSlabDOList.get(i).setPmCmdSlabId(id.add(BigDecimal.valueOf(i+1)));
+            pmCmdSlabDOList.get(i).setTenantId(BigDecimal.valueOf(1));
+            pmCmdSlabDOList.get(i).setObjectVersionNumber(BigDecimal.valueOf(1));
+            subMapper.insertPmCmdSlab(pmCmdSlabDOList.get(i));
+        }
+//        subMapper.batchInsertPmCmdSlab(pmCmdSlabDOList);
+    }
+
+    @Override
+    public void insertPmPdSlab(PmPdSlabDO p) {
+        subMapper.insertPmPdSlab(p);
+    }
+
+    @Override
+    public void batchInsertPmCmdLargePlt(List<PmCmdLargePltDO> pmCmdLargePltDOList) {
+        BigDecimal id = subMapper.getMaxPmCmdLargePltId();
+        for (int i = 0 ; i < pmCmdLargePltDOList.size() ; i++){
+            pmCmdLargePltDOList.get(i).setPmCmdLargePltId(id.add(BigDecimal.valueOf(i+1)));
+            pmCmdLargePltDOList.get(i).setTenantId(BigDecimal.valueOf(1));
+            pmCmdLargePltDOList.get(i).setObjectVersionNumber(BigDecimal.valueOf(1));
+            subMapper.insertPmCmdLargePlt(pmCmdLargePltDOList.get(i));
+        }
+    }
+
+    @Override
+    public void batchInsertPmPdPlateCut(List<PmPdPlateCutDO> pmPdPlateCutDOList) {
+        BigDecimal id = subMapper.getMaxPmPdPlateCutId();
+        for (int i = 0 ; i < pmPdPlateCutDOList.size() ; i++){
+            pmPdPlateCutDOList.get(i).setCutId(id.add(BigDecimal.valueOf(i+1)));
+            pmPdPlateCutDOList.get(i).setTenantId(BigDecimal.valueOf(1));
+            pmPdPlateCutDOList.get(i).setObjectVersionNumber(BigDecimal.valueOf(1));
+            subMapper.insertPmPdPlateCut(pmPdPlateCutDOList.get(i));
+        }
+    }
+
+    @Override
+    public void batchInsertPmPdBlockPos(List<PmPdBlockPosDO> pmPdBlockPosDOList) {
+        BigDecimal id = subMapper.getMaxPmPdBlockPosId();
+        for (int i = 0 ; i < pmPdBlockPosDOList.size() ; i++){
+            pmPdBlockPosDOList.get(i).setPdBlockPosId(id.add(BigDecimal.valueOf(i+1)));
+            pmPdBlockPosDOList.get(i).setTenantId(BigDecimal.valueOf(1));
+            pmPdBlockPosDOList.get(i).setObjectVersionNumber(BigDecimal.valueOf(1));
+            subMapper.insertPmPdBlockPos(pmPdBlockPosDOList.get(i));
+        }
+    }
+
+    @Override
+    public void batchInsertPmPdContSum(List<PmPdContSumDO> pmPdContSumDOList) {
+        BigDecimal id = subMapper.getMaxPmPdContSumId();
+        for (int i = 0 ; i < pmPdContSumDOList.size() ; i++){
+            pmPdContSumDOList.get(i).setPpcsId(id.add(BigDecimal.valueOf(i+1)));
+            pmPdContSumDOList.get(i).setTenantId(BigDecimal.valueOf(1));
+            pmPdContSumDOList.get(i).setObjectVersionNumber(BigDecimal.valueOf(1));
+            subMapper.insertPmPdContSum(pmPdContSumDOList.get(i));
+        }
+    }
+
+    @Override
+    public void batchInsertPmSmallPltPos(List<PmSmallPltPosDO> pmSmallPltPosDOList) {
+        BigDecimal id = subMapper.getMaxPmSmallPltPosId();
+        for (int i = 0 ; i < pmSmallPltPosDOList.size() ; i++){
+            pmSmallPltPosDOList.get(i).setPsppId(id.add(BigDecimal.valueOf(i+1)));
+            pmSmallPltPosDOList.get(i).setTenantId(BigDecimal.valueOf(1));
+            pmSmallPltPosDOList.get(i).setObjectVersionNumber(BigDecimal.valueOf(1));
+            subMapper.insertPmSmallPltPos(pmSmallPltPosDOList.get(i));
+        }
+    }
+
+    @Override
+    public void batchInsertPmCmdSmallPlt(List<PmCmdSmallPltDO> pmCmdSmallPltDOList) {
+        BigDecimal id = subMapper.getMaxPmCmdSmallPltId();
+        for (int i = 0 ; i < pmCmdSmallPltDOList.size() ; i++){
+            pmCmdSmallPltDOList.get(i).setPmCmdSmallPltId(id.add(BigDecimal.valueOf(i+1)));
+            pmCmdSmallPltDOList.get(i).setTenantId(BigDecimal.valueOf(1));
+            pmCmdSmallPltDOList.get(i).setObjectVersionNumber(BigDecimal.valueOf(1));
+            subMapper.insertPmCmdSmallPlt(pmCmdSmallPltDOList.get(i));
+        }
+    }
+
+    @Override
+    public void batchInsertPmCmdCont(List<PmCmdContDO> pmCmdContDOList) {
+        BigDecimal id = subMapper.getMaxPmCmdContId();
+        for (int i = 0 ; i < pmCmdContDOList.size() ; i++){
+            pmCmdContDOList.get(i).setPmCmdContId(id.add(BigDecimal.valueOf(i+1)));
+            pmCmdContDOList.get(i).setTenantId(BigDecimal.valueOf(1));
+            pmCmdContDOList.get(i).setObjectVersionNumber(BigDecimal.valueOf(1));
+            subMapper.insertPmCmdCont(pmCmdContDOList.get(i));
+        }
+    }
+
 
 }

1024shop-manager/1024shop-manager/src/main/java/net/xdclass/shopmanager/tool/service/TransactionService.java

@@ -0,0 +1,58 @@
+package net.xdclass.shopmanager.tool.service;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
+
+/**
+ * @author holly
+ * @date 2023/4/13
+ * @description 事务控制
+ */
+@Component
+public class TransactionService {
+    @Autowired
+    private DataSourceTransactionManager transactionManager;
+
+    /**
+     * 开启新事务
+     */
+    public TransactionStatus begin() {
+        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+        //事物隔离级别(读已提交)
+        def.setIsolationLevel(TransactionDefinition.ISOLATION_READ_COMMITTED);
+        //默认事务
+        return transactionManager.getTransaction(def);
+    }
+
+    /**
+     * 开启事务
+     */
+    public TransactionStatus begin(int isolationLevel, int propagationBehavior) {
+        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+        //事物隔离级别
+        def.setIsolationLevel(isolationLevel);
+        //事务传播行为
+        def.setPropagationBehavior(propagationBehavior);
+        //默认事务
+        return transactionManager.getTransaction(def);
+    }
+
+    /**
+     * 提交事务
+     */
+    public void commit(TransactionStatus transactionStatus) {
+        //提交事务
+        transactionManager.commit(transactionStatus);
+    }
+
+    /**
+     * 回滚事务
+     */
+    public void rollback(TransactionStatus transactionStatus) {
+        transactionManager.rollback(transactionStatus);
+    }
+}

1024shop-manager/1024shop-manager/src/main/resources/logback.xml

@@ -125,6 +125,11 @@
     <!-- Spring日志级别控制  -->
     <logger name="org.springframework" level="warn" />
 
+    <!-- MyBatis SQL 日志记录 -->
+    <logger name="net.xdclass.shopmanager.mapper" level="DEBUG" additivity="false">
+        <appender-ref ref="console"/>
+    </logger>
+
     <root level="info">
         <appender-ref ref="console" />
     </root>