From 17a71449244e966206e3f24102fd9e56fa3199e4 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期四, 01 一月 2026 15:19:49 +0800
Subject: [PATCH] 路径初始化异常修复

---
 src/main/java/com/zy/asrs/controller/StaDescController.java |   52 ++++++++++++++++++++++++++++------------------------
 1 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/StaDescController.java b/src/main/java/com/zy/asrs/controller/StaDescController.java
index ca8f537..333b6f7 100644
--- a/src/main/java/com/zy/asrs/controller/StaDescController.java
+++ b/src/main/java/com/zy/asrs/controller/StaDescController.java
@@ -12,12 +12,8 @@
 import com.core.common.R;
 import com.zy.asrs.entity.StaDesc;
 import com.zy.asrs.entity.param.StaDescInitParam;
-import com.zy.asrs.mapper.StaDescMapper;
 import com.zy.asrs.service.StaDescService;
 import com.zy.common.web.BaseController;
-import org.apache.ibatis.session.ExecutorType;
-import org.apache.ibatis.session.SqlSession;
-import org.apache.ibatis.session.SqlSessionFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,24 +27,33 @@
     private static final Logger log = LoggerFactory.getLogger(StaDescController.class);
     @Autowired
     private StaDescService staDescService;
-    @Autowired
-    private SqlSessionFactory sqlSessionFactory;
 
     @RequestMapping(value = "/staDesc/init/auth")
     @ManagerAuth(memo = "鍒濆鍖栫珯鐐硅矾寰�")
     public R init(StaDescInitParam param) {
         try {
+            // 鍙傛暟鏍¢獙锛氱‘淇濆爢鍨涙満鍙蜂笉涓虹┖
+            if (Cools.isEmpty(param.getCrnNo())) {
+                return R.error("鍫嗗灈鏈哄彿涓嶈兘涓虹┖");
+            }
+            
+            // 鏍煎紡鍖栧紑鍏筹細鍙垹闄ゅ綋鍓嶅爢鍨涙満鍙风殑鏁版嵁锛岃�屼笉鏄叏閮ㄦ暟鎹�
             if (param.getTypeDesc() == 1) {
-                staDescService.delete(new EntityWrapper<>());
+                staDescService.delete(new EntityWrapper<StaDesc>()
+                        .eq("crn_no", param.getCrnNo())
+                );
             }
             String[] startStaList = param.getStartStaList().split(";");
             String[] endStaList = param.getEndStaList().split(";");
-            List<StaDesc> staDescList = new ArrayList<>();
-            SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false);
-            StaDescMapper sqlSessionMapper = sqlSession.getMapper(StaDescMapper.class);
+            Date currentTime = new Date();
+            Long userId = getUserId();
+            int insertCount = 0;
+            
+            // SQL Server 鎵归噺鎻掑叆鏃舵棤娉曡幏鍙栬嚜澧炰富閿紝鏀逛负寰幆鍗曚釜鎻掑叆
             for (String startSta : startStaList) {
                 for (String endSta : endStaList) {
                     for (Integer type : param.getType()) {
+                        // 妫�鏌ユ槸鍚﹀凡瀛樺湪
                         int sameRes = staDescService.selectCount(new EntityWrapper<StaDesc>()
                                 .eq("type_no", type)
                                 .eq("stn_no", Integer.parseInt(startSta))
@@ -57,28 +62,27 @@
                         if (sameRes > 0) {
                             continue;
                         }
+                        
+                        // 鍒涘缓骞舵彃鍏ュ崟鏉¤褰�
                         StaDesc staDesc = new StaDesc();
                         staDesc.setCrnNo(param.getCrnNo());
                         staDesc.setTypeNo(type);
                         staDesc.setStnNo(Integer.parseInt(startSta));
                         staDesc.setCrnStn(Integer.parseInt(endSta));
-                        staDesc.setModiUser(getUserId());
-                        staDesc.setModiTime(new Date());
-                        staDesc.setAppeUser(getUserId());
-                        staDesc.setAppeTime(new Date());
-//                        staDescList.add(staDesc);
-                        sqlSessionMapper.insert(staDesc);
-
+                        staDesc.setModiUser(userId);
+                        staDesc.setModiTime(currentTime);
+                        staDesc.setAppeUser(userId);
+                        staDesc.setAppeTime(currentTime);
+                        
+                        // 鍗曚釜鎻掑叆锛岀‘淇濊兘姝g‘鑾峰彇鑷涓婚敭
+                        if (staDescService.insert(staDesc)) {
+                            insertCount++;
+                        }
                     }
                 }
             }
-            try {
-                sqlSession.commit();
-                sqlSession.close();
-            } catch (Exception e) {
-                log.error("鍒濆鍖栫珯鐐硅矾寰勫紓甯�===>sql寮傚父锛歿}", e.getMessage());
-            }
-//            staDescService.insertBatch(staDescList);
+            
+            log.info("鍒濆鍖栫珯鐐硅矾寰勫畬鎴愶紝鍏辨彃鍏� {} 鏉¤褰�", insertCount);
         } catch (Exception e) {
             log.error("鍒濆鍖栫珯鐐硅矾寰勫紓甯革細{}", e.getMessage());
             return R.error("鍒濆鍖栫珯鐐硅矾寰勫紓甯革細" + e.getMessage());

--
Gitblit v1.9.1