From d907a822a940c7ec0fb7de0ca845472bda52229b Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 03 二月 2026 14:33:12 +0800
Subject: [PATCH] #pda料箱组托和换码
---
src/main/java/com/zy/asrs/controller/StaDescController.java | 77 +++++++++++++++++++++++++++++++++++---
1 files changed, 71 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/StaDescController.java b/src/main/java/com/zy/asrs/controller/StaDescController.java
index 8d85caf..ecf2ed6 100644
--- a/src/main/java/com/zy/asrs/controller/StaDescController.java
+++ b/src/main/java/com/zy/asrs/controller/StaDescController.java
@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
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 com.core.annotations.ManagerAuth;
@@ -13,6 +15,11 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+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;
import org.springframework.web.bind.annotation.*;
@@ -21,8 +28,64 @@
@RestController
public class StaDescController extends BaseController {
+ private static final Logger log = LoggerFactory.getLogger(StaDescController.class);
@Autowired
private StaDescService staDescService;
+ @Autowired
+ private SqlSessionFactory sqlSessionFactory;
+
+ @RequestMapping(value = "/staDesc/init/auth")
+ @ManagerAuth(memo = "response.station_path_init")
+ public R init(StaDescInitParam param) {
+ try{
+ if (param.getTypeDesc()==1){
+ staDescService.delete(new EntityWrapper<>());
+ }
+ 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);
+ 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))
+ .eq("crn_no", param.getCrnNo())
+ .eq("crn_stn", Integer.parseInt(endSta)));
+ 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);
+
+ }
+ }
+ }
+ try{
+ sqlSession.commit();
+ sqlSession.close();
+ }catch (Exception e){
+ log.error("鍒濆鍖栫珯鐐硅矾寰勫紓甯�===>sql寮傚父锛歿}",e.getMessage());
+ }
+// staDescService.insertBatch(staDescList);
+ }catch (Exception e){
+ log.error("鍒濆鍖栫珯鐐硅矾寰勫紓甯革細{}",e.getMessage());
+ return R.error("response.station_path_init_exception");
+ }
+
+ return R.ok("response.init_success");
+ }
@RequestMapping(value = "/staDesc/{id}/auth")
@ManagerAuth
@@ -58,7 +121,7 @@
}
@RequestMapping(value = "/staDesc/add/auth")
- @ManagerAuth(memo = "绔欑偣璺緞娣诲姞")
+ @ManagerAuth(memo = "response.station_path_add")
public R add(StaDesc staDesc) {
int sameRes = staDescService.selectCount(new EntityWrapper<StaDesc>()
.eq("type_no", staDesc.getTypeNo())
@@ -66,7 +129,7 @@
.eq("crn_no", staDesc.getCrnNo())
.eq("crn_stn", staDesc.getCrnStn()));
if (sameRes > 0) {
- return R.error("璺緞宸插瓨鍦�");
+ return R.error("response.path_exists");
}
staDesc.setModiUser(getUserId());
staDesc.setModiTime(new Date());
@@ -77,7 +140,7 @@
}
@RequestMapping(value = "/staDesc/update/auth")
- @ManagerAuth(memo = "绔欑偣璺緞淇敼")
+ @ManagerAuth(memo = "response.station_path_update")
public R update(StaDesc staDesc){
if (Cools.isEmpty(staDesc) || null==staDesc.getTypeId()){
return R.error();
@@ -89,7 +152,7 @@
}
@RequestMapping(value = "/staDesc/delete/auth")
- @ManagerAuth(memo = "绔欑偣璺緞鍒犻櫎")
+ @ManagerAuth(memo = "response.station_path_delete")
public R delete(@RequestParam String param){
List<StaDesc> list = JSONArray.parseArray(param, StaDesc.class);
if (Cools.isEmpty(list)){
@@ -102,7 +165,7 @@
}
@RequestMapping(value = "/staDesc/export/auth")
- @ManagerAuth(memo = "绔欑偣璺緞瀵煎嚭")
+ @ManagerAuth(memo = "response.station_path_export")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
@@ -133,7 +196,9 @@
public R query(@RequestBody JSONObject param) {
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
if (null != staDescService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(StaDesc.class, String.valueOf(param.get("key"))));
+ R r = R.parse(BaseRes.REPEAT);
+ r.put("data",getComment(StaDesc.class, String.valueOf(param.get("key"))));
+ return r;
}
return R.ok();
}
--
Gitblit v1.9.1