From 92efd8906a1af014079e9a11b45d99df91ffd72d Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 17 四月 2025 11:15:37 +0800
Subject: [PATCH] 修改添加锁时加入到当前人所在的包机组
---
src/main/java/com/whyc/service/LockInfService.java | 64 ++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/whyc/service/LockInfService.java b/src/main/java/com/whyc/service/LockInfService.java
index 22106ee..16ad820 100644
--- a/src/main/java/com/whyc/service/LockInfService.java
+++ b/src/main/java/com/whyc/service/LockInfService.java
@@ -13,6 +13,7 @@
import com.whyc.pojo.plus_inf.LockInf;
import com.whyc.pojo.plus_inf.StationInf;
import com.whyc.pojo.plus_lock_ram.LockIdcard;
+import com.whyc.pojo.plus_user.Baojigroup;
import com.whyc.pojo.plus_user.BaojigroupLock;
import com.whyc.pojo.plus_user.BaojigroupUsr;
import com.whyc.pojo.plus_user.UserInf;
@@ -39,6 +40,9 @@
@Autowired(required = false)
private BaojigroupUsrMapper bjUserMapper;
+
+ @Autowired(required = false)
+ private BaojigroupMapper bjMapper;
@Autowired(required = false)
private LockIdcardMapper idcardMapper;
@@ -111,25 +115,53 @@
linf.setModel(0);
linf.setLockOpenCount(0);
int flag=mapper.insert(linf);
- if(flag==1){//娣诲姞鎴愬姛
- //閲嶅惎绾跨▼骞跺皢閿佸姞鍒板綋鍓嶄汉鐨勫寘鏈虹粍
- UserInf uinf= ActionUtil.getUser();
- QueryWrapper wrapper1=new QueryWrapper();
- wrapper1.eq("uid",uinf.getUid());
- List<BaojigroupUsr> groupIdList=bjUserMapper.selectList(wrapper1);
- List<BaojigroupLock> baojigroupList=new ArrayList();
- if(groupIdList!=null&&groupIdList.size()>0){
- BaojigroupLock bjLock=new BaojigroupLock();
- bjLock.setStationId(stationId);
- bjLock.setLockId(lockId);
- bjLock.setBaojiId(groupIdList.get(0).getBaojiId());
- baojigroupList.add(bjLock);
- }
- bjLockMapper.insertBatchSomeColumn(baojigroupList);
- processSurveyService.setUpThreadRestart();
+ if(flag==1){//娣诲姞鎴愬姛(鍖呮満缁勬搷浣�)
+ insertInbaoji(stationId,lockId);
}
return new Response().set(1,true);
}
+ //鍖呮満缁勬搷浣�
+ private void insertInbaoji(Integer stationId,Integer lockId){
+ //閲嶅惎绾跨▼骞跺皢閿佸姞鍒板綋鍓嶄汉鐨勫寘鏈虹粍
+ UserInf uinf= ActionUtil.getUser();
+ QueryWrapper wrapper1=new QueryWrapper();
+ wrapper1.eq("uid",uinf.getUid());
+ List<BaojigroupUsr> groupIdList=bjUserMapper.selectList(wrapper1);
+ List<BaojigroupLock> baojigroupList=new ArrayList();
+ if(groupIdList!=null&&groupIdList.size()>0){
+ BaojigroupLock bjLock=new BaojigroupLock();
+ bjLock.setStationId(stationId);
+ bjLock.setLockId(lockId);
+ bjLock.setBaojiId(groupIdList.get(0).getBaojiId());
+ baojigroupList.add(bjLock);
+ }else{//浜哄搴旀病鏈夊寘鏈虹粍鍏堝垱寤鸿嚜宸辩殑榛樿鍖呮満缁�
+ QueryWrapper wrapper3=new QueryWrapper();
+ wrapper3.eq("baoji_name","榛樿鍖呮満缁�");
+ wrapper3.last("limit 1");
+ Baojigroup group=bjMapper.selectOne(wrapper3);
+ if(group==null){
+ Baojigroup bj=new Baojigroup();
+ bj.setBaojiName("榛樿鍖呮満缁�");
+ bjMapper.insert(bj);
+ QueryWrapper wrapper4=new QueryWrapper();
+ wrapper4.eq("baoji_name","榛樿鍖呮満缁�");
+ wrapper4.last("limit 1");
+ group=bjMapper.selectOne(wrapper4);
+ }
+ BaojigroupUsr bjUsr=new BaojigroupUsr();
+ bjUsr.setUid(uinf.getUid());
+ bjUsr.setBaojiId(group.getId());
+ bjUserMapper.insert(bjUsr);
+
+ BaojigroupLock bjLock=new BaojigroupLock();
+ bjLock.setStationId(stationId);
+ bjLock.setLockId(lockId);
+ bjLock.setBaojiId(group.getId());
+ baojigroupList.add(bjLock);
+ }
+ bjLockMapper.insertBatchSomeColumn(baojigroupList);
+ processSurveyService.setUpThreadRestart();
+ }
//鑾峰彇褰撳墠鍙婃斁涓嬫渶澶х殑閿乮d
private int getMaxLockId(Integer stationId) {
int lockId=mapper.getMaxLockId(stationId);
--
Gitblit v1.9.1