From 0bd3125739c0d8bded4f7bd405fd99f1723df964 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 30 五月 2025 15:51:49 +0800
Subject: [PATCH] 不同服务器配置文件备份
---
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationSv.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationSv.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationSv.java
index c0858da..66591c9 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationSv.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationSv.java
@@ -6,8 +6,10 @@
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pmsGlobal.daoPlt.PltProductionLineMapper;
import com.dy.pmsGlobal.daoPlt.PltStationMapper;
+import com.dy.pmsGlobal.daoSta.StaAssemblyWorkLastMapper;
import com.dy.pmsGlobal.pojoPlt.PltProductionLine;
import com.dy.pmsGlobal.pojoPlt.PltStation;
+import com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast;
import com.dy.pmsGlobal.util.QrCodeConstant;
import com.dy.pmsGlobal.util.QrCodeUtil;
import lombok.extern.slf4j.Slf4j;
@@ -17,6 +19,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -26,6 +29,7 @@
private PltStationMapper dao;
private PltProductionLineMapper lineDao;
+ private StaAssemblyWorkLastMapper assemblyWorkLastDao;
// private static final String stationPrefix = "103" ;
private static final String DEFAULT_CODE = "0001";
private static final String CODE_FORMAT = "%04d";
@@ -37,6 +41,10 @@
@Autowired
public void setLineDao(PltProductionLineMapper lineDao) {
this.lineDao = lineDao;
+ }
+ @Autowired
+ public void setAssemblyWorkLastDao(StaAssemblyWorkLastMapper assemblyWorkLastDao) {
+ this.assemblyWorkLastDao = assemblyWorkLastDao;
}
@Transactional
@@ -63,7 +71,6 @@
}
private String getNextCode(){
- log.info("鑾峰彇宸ョ珯缂栧彿");
String maxCode = dao.selectMaxCode();
if (StringUtils.isBlank(maxCode)) {
return DEFAULT_CODE;
@@ -84,6 +91,7 @@
*/
@Transactional
public int delete(Long id) {
+ checkStationLogin(id);
return this.dao.deleteLogicById(id);
}
@@ -142,6 +150,7 @@
throw new RuntimeException("璇ュ伐绔欐墍灞炵敓浜х嚎宸茬鐢�,璇峰厛鍚敤璇ョ敓浜х嚎");
}
}
+ checkStationLogin(id);
PltStation station = new PltStation();
station.setId(id);
station.setDisabled(disabled);
@@ -160,5 +169,18 @@
});
return child;
}
+ public void checkStationLogin(Long id){
+ //濡傛灉鏈夊伐绔欑櫥褰曚俊鎭�,鍒欐彁绀哄厛鍒拌Е灞忕鐧诲綍椤甸潰logout
+ Map<String, Object> params = new HashMap<>();
+ params.put("stationId", id);
+ List<StaAssemblyWorkLast> workLasts = assemblyWorkLastDao.selectSome(params);
+ if (workLasts.size() > 0) {
+ String stationStr = "(";
+ for (StaAssemblyWorkLast workLast:workLasts) {
+ stationStr += workLast.getStationName() +",";
+ }
+ throw new RuntimeException("璇�"+ stationStr +")宸ョ珯瀛樺湪鐧诲綍淇℃伅,璇峰厛鍒拌Е灞忕鐧诲綍椤甸潰logout,鎴栬仈绯荤鐞嗗憳鍒犻櫎");
+ }
+ }
}
--
Gitblit v1.8.0