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 | 130 ++++++++++++++++++++++++++++++++++--------
1 files changed, 104 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/StaDescController.java b/src/main/java/com/zy/asrs/controller/StaDescController.java
index 7e7d659..333b6f7 100644
--- a/src/main/java/com/zy/asrs/controller/StaDescController.java
+++ b/src/main/java/com/zy/asrs/controller/StaDescController.java
@@ -5,14 +5,17 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.zy.asrs.entity.StaDesc;
-import com.zy.asrs.service.StaDescService;
-import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.StaDesc;
+import com.zy.asrs.entity.param.StaDescInitParam;
+import com.zy.asrs.service.StaDescService;
+import com.zy.common.web.BaseController;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -21,8 +24,72 @@
@RestController
public class StaDescController extends BaseController {
+ private static final Logger log = LoggerFactory.getLogger(StaDescController.class);
@Autowired
private StaDescService staDescService;
+
+ @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<StaDesc>()
+ .eq("crn_no", param.getCrnNo())
+ );
+ }
+ String[] startStaList = param.getStartStaList().split(";");
+ String[] endStaList = param.getEndStaList().split(";");
+ 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))
+ .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(userId);
+ staDesc.setModiTime(currentTime);
+ staDesc.setAppeUser(userId);
+ staDesc.setAppeTime(currentTime);
+
+ // 鍗曚釜鎻掑叆锛岀‘淇濊兘姝ｇ‘鑾峰彇鑷涓婚敭
+ if (staDescService.insert(staDesc)) {
+ insertCount++;
+ }
+ }
+ }
+ }
+
+ log.info("鍒濆鍖栫珯鐐硅矾寰勫畬鎴愶紝鍏辨彃鍏� {} 鏉¤褰�", insertCount);
+ } catch (Exception e) {
+ log.error("鍒濆鍖栫珯鐐硅矾寰勫紓甯革細{}", e.getMessage());
+ return R.error("鍒濆鍖栫珯鐐硅矾寰勫紓甯革細" + e.getMessage());
+ }
+
+ return R.ok("ok1").add("ok2");
+ }
@RequestMapping(value = "/staDesc/{id}/auth")
@ManagerAuth
@@ -32,26 +99,29 @@
@RequestMapping(value = "/staDesc/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(staDescService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
- if (entry.getKey().endsWith(">")) {
- wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
- } else if (entry.getKey().endsWith("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)) {
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- wrapper.eq(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(entry.getKey(), val);
}
}
}
@@ -59,6 +129,14 @@
@RequestMapping(value = "/staDesc/add/auth")
@ManagerAuth(memo = "绔欑偣璺緞娣诲姞")
public R add(StaDesc staDesc) {
+ int sameRes = staDescService.selectCount(new EntityWrapper<StaDesc>()
+ .eq("type_no", staDesc.getTypeNo())
+ .eq("stn_no", staDesc.getStnNo())
+ .eq("crn_no", staDesc.getCrnNo())
+ .eq("crn_stn", staDesc.getCrnStn()));
+ if (sameRes > 0) {
+ return R.error("璺緞宸插瓨鍦�");
+ }
staDesc.setModiUser(getUserId());
staDesc.setModiTime(new Date());
staDesc.setAppeUser(getUserId());
@@ -67,10 +145,10 @@
return R.ok();
}
- @RequestMapping(value = "/staDesc/update/auth")
- @ManagerAuth(memo = "绔欑偣璺緞淇敼")
- public R update(StaDesc staDesc){
- if (Cools.isEmpty(staDesc) || null==staDesc.getCrnNo()){
+ @RequestMapping(value = "/staDesc/update/auth")
+ @ManagerAuth(memo = "绔欑偣璺緞淇敼")
+ public R update(StaDesc staDesc) {
+ if (Cools.isEmpty(staDesc) || null == staDesc.getTypeId()) {
return R.error();
}
staDesc.setModiUser(getUserId());
@@ -81,12 +159,12 @@
@RequestMapping(value = "/staDesc/delete/auth")
@ManagerAuth(memo = "绔欑偣璺緞鍒犻櫎")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<StaDesc> list = JSONArray.parseArray(param, StaDesc.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (StaDesc entity : list){
+ for (StaDesc entity : list) {
staDescService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -94,7 +172,7 @@
@RequestMapping(value = "/staDesc/export/auth")
@ManagerAuth(memo = "绔欑偣璺緞瀵煎嚭")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("staDesc"));
@@ -110,7 +188,7 @@
wrapper.like("crn_no", condition);
Page<StaDesc> page = staDescService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (StaDesc staDesc : page.getRecords()){
+ for (StaDesc staDesc : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", staDesc.getCrnNo());
map.put("value", staDesc.getCrnNo());
@@ -123,7 +201,7 @@
@ManagerAuth
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)){
+ if (null != staDescService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(StaDesc.class, String.valueOf(param.get("key"))));
}
return R.ok();
--
Gitblit v1.9.1