From 9ba1061f62fa81f4b78e1d15984db7174d148406 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 02 三月 2026 17:07:41 +0800
Subject: [PATCH] APP电子巡逻列表
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotConfService.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 7 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotConfService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotConfService.java
index 6cb5550..23840a7 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotConfService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotConfService.java
@@ -2,15 +2,17 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.constant.RedisConst;
-import com.fzzy.igds.domain.Depot;
import com.fzzy.igds.domain.DepotConf;
import com.fzzy.igds.mapper.DepotConfMapper;
import com.fzzy.igds.utils.ContextUtil;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Collection;
@@ -30,8 +32,6 @@
@Resource
private DepotConfMapper depotConfMapper;
@Resource
- private DepotService depotService;
- @Resource
private RedisCache redisCache;
/**
@@ -49,9 +49,50 @@
QueryWrapper<DepotConf> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("company_id", companyId);
- if(StringUtils.isNotBlank(deptId)){
+ if (StringUtils.isNotBlank(deptId)) {
queryWrapper.eq("dept_id", deptId);
}
+ return depotConfMapper.selectList(queryWrapper);
+ }
+
+ /**
+ * 鏍规嵁鐢ㄦ埛绫诲瀷鏌ヨ閰嶇疆淇℃伅
+ * @return
+ */
+ public List<DepotConf> getConfListByUserType() {
+ //鑾峰彇褰撳墠鐧诲綍浜�
+ SysUser user = ContextUtil.getLoginUser();
+
+ QueryWrapper<DepotConf> queryWrapper = new QueryWrapper<>();
+
+
+ //鐩戠鐢ㄦ埛-榛樿鏌ョ湅鎵�鏈変俊鎭笉澧炲姞鏉′欢
+ if (Constant.USER_TYPE_10.equals(user.getUserType())) {
+ queryWrapper.eq("company_id", user.getCompanyId());
+ //涓嶅鍔犳潯浠�
+ }
+
+ //搴撳尯鐢ㄦ埛锛屽鏋滄槸鍏徃鐢ㄦ埛鍙互鏌ョ湅鍏徃涓嬪睘鎵�鏈夊簱鍖猴紝濡傛灉涓哄綋鍓嶅簱鍖哄彧鏌ヨ褰撳墠搴撳尯
+ if (Constant.USER_TYPE_30.equals(user.getUserType())) {
+ queryWrapper.eq("company_id", user.getCompanyId());
+
+ if (ContextUtil.isDepotUser(user.getDeptId() + "")) {
+ queryWrapper.eq("dept_id", user.getDeptId() + "");
+ } else {
+ queryWrapper.likeRight("dept_id", user.getDeptId() + "");
+ }
+ }
+
+ //閾惰鐢ㄦ埛锛屾牴鎹悎鍚屾煡璇㈤摱琛屼笅鎵�鏈夊簱鍖�
+ if (Constant.USER_TYPE_20.equals(user.getUserType())) {
+
+ if(StringUtils.isBlank(user.getUserData())) return null;
+
+ queryWrapper.eq("d.company_id", user.getCompanyId());
+ queryWrapper.eq("c.pledge_bank", user.getUserData());
+ return depotConfMapper.selectByBank(queryWrapper);
+ }
+
return depotConfMapper.selectList(queryWrapper);
}
@@ -75,7 +116,7 @@
conf.setUpdateBy(ContextUtil.getLoginUserName());
conf.setUpdateTime(new Date());
depotConfMapper.insert(conf);
- }else {
+ } else {
conf.setUpdateBy(ContextUtil.getLoginUserName());
conf.setUpdateTime(new Date());
depotConfMapper.update(conf, new UpdateWrapper<DepotConf>().eq("depot_id", conf.getDepotId()));
@@ -90,7 +131,7 @@
* @return
*/
public void deleteDepotConf(DepotConf conf) {
- depotConfMapper.deleteById( conf);
+ depotConfMapper.deleteById(conf);
//鍒犻櫎閰嶇疆缂撳瓨
this.delCacheDepotConf(conf, conf.getCompanyId());
@@ -233,7 +274,9 @@
*/
public void updateFreq(String freq) {
UpdateWrapper<DepotConf> updateWrapper = new UpdateWrapper<>();
- updateWrapper.eq("dept_id", ContextUtil.subDeptId(null)).set("pos_x", freq);
+ updateWrapper.eq("dept_id", ContextUtil.subDeptId(null)).set("grain_freq", freq);
depotConfMapper.update(null, updateWrapper);
}
+
+
}
--
Gitblit v1.9.3