From ca0720d39d9b6697cd70c14bd0f9ef3f2778382c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 20 五月 2024 21:33:05 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pms-SV
---
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proUR/ProURSv.java | 1 +
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationSv.java | 1 +
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserSv.java | 1 +
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleSv.java | 1 +
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/aop/LogService.java | 8 ++++++--
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsSv.java | 1 +
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proSR/ProSRSv.java | 1 +
7 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/aop/LogService.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/aop/LogService.java
index 3465a1d..71da53c 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/aop/LogService.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/aop/LogService.java
@@ -4,15 +4,19 @@
import com.dy.pmsGlobal.pojoBa.BaLog;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
@Service
public class LogService {
- @Autowired
private BaLogMapper dao;
-
+ @Autowired
+ public void setDao(BaLogMapper dao) {
+ this.dao = dao;
+ }
+ @Transactional
public void save(long operator,String operatorName, String operation,String ip,String code,String msg) {
BaLog log = new BaLog();
log.userId=operator;
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleSv.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleSv.java
index eec6e82..ad67043 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleSv.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleSv.java
@@ -55,6 +55,7 @@
* @param disabled
* @return
*/
+ @Transactional
public int disabled(Long id,Boolean disabled) {
BaRole role=new BaRole();
role.id=id;
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 a0ca41c..2d23b28 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
@@ -105,6 +105,7 @@
* @param disabled
* @return
*/
+ @Transactional
public int disabled(Long id,Boolean disabled) {
BaUser user=new BaUser();
user.id=id;
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsSv.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsSv.java
index 943077d..d6a56cd 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsSv.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsSv.java
@@ -67,6 +67,7 @@
return rsVo ;
}
+ @Transactional
public int disabled(Long id, Boolean disabled) {
PltProductQualityInspectionItems item = new PltProductQualityInspectionItems();
item.setId(id);
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proSR/ProSRSv.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proSR/ProSRSv.java
index c4e4cd2..aacab9a 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proSR/ProSRSv.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proSR/ProSRSv.java
@@ -70,6 +70,7 @@
return rsVo ;
}
+ @Transactional
public int disabled(Long id, Boolean disabled) {
PltProductScrappingReason reason = new PltProductScrappingReason();
reason.setId(id);
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proUR/ProURSv.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proUR/ProURSv.java
index 65db33c..3cd3e14 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proUR/ProURSv.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proUR/ProURSv.java
@@ -70,6 +70,7 @@
return rsVo ;
}
+ @Transactional
public int disabled(Long id, Boolean disabled) {
PltProductUnqualifiedReason reason = new PltProductUnqualifiedReason();
reason.setId(id);
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 bcf3c05..0389ee9 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
@@ -76,6 +76,7 @@
return rsVo ;
}
+ @Transactional
public int disabled(Long id, Boolean disabled) {
PltStation station = new PltStation();
station.setId(id);
--
Gitblit v1.8.0