From e54a03e1c3fefef7ec84df6168ff5cf26e53f8cb Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期四, 09 一月 2025 15:47:07 +0800
Subject: [PATCH] station and user disable check Stationlogin first
---
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationSv.java | 23 +++++++++++++++++++++++
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserSv.java | 24 +++++++++++++++++++++---
2 files changed, 44 insertions(+), 3 deletions(-)
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserSv.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserSv.java
index 630f72e..4dd42d7 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserSv.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserSv.java
@@ -4,8 +4,10 @@
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pmsGlobal.daoBa.BaUserMapper;
import com.dy.pmsGlobal.daoBa.BaUserRoleMapper;
+import com.dy.pmsGlobal.daoSta.StaAssemblyWorkLastMapper;
import com.dy.pmsGlobal.pojoBa.BaUser;
import com.dy.pmsGlobal.pojoBa.BaUserRole;
+import com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast;
import com.dy.pmsGlobal.util.QrCodeConstant;
import com.dy.pmsGlobal.util.QrCodeUtil;
import com.google.zxing.WriterException;
@@ -17,6 +19,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.io.IOException;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
@@ -28,7 +31,8 @@
private BaUserMapper dao;
@Autowired
private BaUserRoleMapper urDao;
-
+ @Autowired
+ private StaAssemblyWorkLastMapper assemblyWorkLastDao;
/**
* 鐢熸垚鎸囧畾浣嶆暟闅忔満鏁板瓧瀵嗙爜
*
@@ -134,6 +138,7 @@
*/
@Transactional
public int disabled(Long id,Boolean disabled) {
+ checkStationLogin(id);
BaUser user=new BaUser();
user.id=id;
user.disabled=disabled;
@@ -178,8 +183,21 @@
*/
@Transactional
public int delete(Long id) {
+ checkStationLogin(id);
return this.dao.deleteLogicById(id);
}
-
-}
+ public void checkStationLogin(Long id){
+ //濡傛灉鏈夊伐绔欑櫥褰曚俊鎭�,鍒欐彁绀哄厛鍒拌Е灞忕鐧诲綍椤甸潰logout
+ Map<String, Object> params = new HashMap<>();
+ params.put("userId", 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,鎴栬仈绯荤鐞嗗憳鍒犻櫎");
+ }
+ }
+}
\ No newline at end of file
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..202121f 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
@@ -84,6 +92,7 @@
*/
@Transactional
public int delete(Long id) {
+ checkStationLogin(id);
return this.dao.deleteLogicById(id);
}
@@ -142,6 +151,7 @@
throw new RuntimeException("璇ュ伐绔欐墍灞炵敓浜х嚎宸茬鐢�,璇峰厛鍚敤璇ョ敓浜х嚎");
}
}
+ checkStationLogin(id);
PltStation station = new PltStation();
station.setId(id);
station.setDisabled(disabled);
@@ -160,5 +170,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