From 096296cd7485c5583c8194d88cca700e3c4d84a0 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 01 十二月 2025 16:50:42 +0800
Subject: [PATCH] 调整基础配置信息查询方式，取消jpa
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DeviceSerService.java | 99 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 72 insertions(+), 27 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DeviceSerService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DeviceSerService.java
index 034c6b7..e5611d5 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DeviceSerService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DeviceSerService.java
@@ -1,9 +1,11 @@
package com.fzzy.igds.service;
+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.DeviceSer;
-import com.fzzy.igds.repository.DeviceSerRepository;
+import com.fzzy.igds.mapper.DeviceSerMapper;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -26,21 +28,37 @@
@Resource
private ISysDeptService iSysDeptService;
@Resource
- private DeviceSerRepository deviceSerRepository;
+ private DeviceSerMapper deviceSerMapper;
@Resource
private RedisCache redisCache;
/**
- * JPA 鏌ヨ鍒嗘満鍒楄〃
+ * 鏍规嵁鏉′欢鏌ヨ鍒嗘満淇℃伅
*
+ * @param companyId
+ * @param deptId
+ * @param parentId
* @return
*/
- public List<DeviceSer> getAllSerByCompanyId(String companyId) {
- return deviceSerRepository.getAllSerByCompanyId(companyId);
+ public List<DeviceSer> listDeviceSer(String companyId, String deptId, String parentId) {
+
+ QueryWrapper<DeviceSer> queryWrapper = new QueryWrapper<>();
+
+ if (StringUtils.isNotBlank(companyId)) {
+ queryWrapper.eq("company_id", companyId);
+ }
+ if (StringUtils.isNotBlank(deptId)) {
+ queryWrapper.eq("dept_id", deptId);
+ }
+ if (StringUtils.isNotBlank(parentId)) {
+ queryWrapper.likeRight("dept_id", parentId);
+ }
+
+ return deviceSerMapper.selectList(queryWrapper);
}
/**
- * JPA 鏌ヨ鍒嗘満鍒楄〃
+ * 鏌ヨ鍒嗘満鍒楄〃
*
* @return
*/
@@ -48,14 +66,15 @@
SysUser user = ContextUtil.getLoginUser();
SysDept userDept = iSysDeptService.selectDeptById(user.getDeptId());
if (Constant.DEPT_TYPE_20.equals(userDept.getType())) {
- return deviceSerRepository.getDataByDeptId(user.getDeptId() + "");
- }else {
- return deviceSerRepository.getDataByParentId(user.getDeptId() + "%");
+ return this.listDeviceSer(null, user.getDeptId() + "", null);
+ } else {
+ return this.listDeviceSer(null, null, user.getDeptId() + "");
}
}
+
/**
- * JPA 鏌ヨ鍒嗘満
+ * 鏌ヨ鍒嗘満
*
* @param companyId
* @param id
@@ -69,11 +88,16 @@
if (StringUtils.isEmpty(companyId)) {
companyId = ContextUtil.getCompanyId();
}
- return deviceSerRepository.getDataById(companyId, id);
+
+ QueryWrapper<DeviceSer> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("company_id", companyId);
+ queryWrapper.eq("id", id);
+
+ return deviceSerMapper.selectOne(queryWrapper);
}
/**
- * JPA 鏇存柊淇濆瓨鍒嗘満
+ * 鏇存柊淇濆瓨鍒嗘満
*
* @param ser
*/
@@ -86,23 +110,32 @@
}
if (StringUtils.isEmpty(ser.getCompanyId())) {
ser.setCompanyId(ContextUtil.getCompanyId());
+ }
+ if (StringUtils.isEmpty(ser.getDeptId())) {
+ ser.setDeptId(ContextUtil.subDeptId(null));
+ }
+ if (StringUtils.isBlank(ser.getUpdateBy())) {
ser.setCreateBy(ContextUtil.getLoginUserName());
ser.setCreateTime(new Date());
+ ser.setUpdateBy(ContextUtil.getLoginUserName());
+ ser.setUpdateTime(new Date());
+ deviceSerMapper.insert(ser);
+ } else {
+ ser.setUpdateBy(ContextUtil.getLoginUserName());
+ ser.setUpdateTime(new Date());
+ deviceSerMapper.updateById(ser);
}
- ser.setUpdateBy(ContextUtil.getLoginUserName());
- ser.setUpdateTime(new Date());
- deviceSerRepository.save(ser);
refreshCache(ser.getCompanyId());
}
/**
- * JPA 鏇存柊淇濆瓨鍒嗘満
+ * 鏇存柊淇濆瓨鍒嗘満
*
* @param ser
*/
public void delSer(DeviceSer ser) {
- deviceSerRepository.delete(ser);
+ deviceSerMapper.deleteById(ser);
//鍒犻櫎缂撳瓨
delCache(ser.getCompanyId(), ser.getId());
@@ -111,6 +144,7 @@
/**
* 鏇存柊鍒嗘満淇℃伅
+ *
* @param status
* @param ip
* @param port
@@ -124,12 +158,13 @@
ser.setPort(port);
ser.setUpdateTime(new Date());
- deviceSerRepository.save(ser);
+ deviceSerMapper.updateById(ser);
setCacheSer(ser);
}
/**
* 鏇存柊鍒嗘満淇℃伅
+ *
* @param data
*/
public void updateByData(DeviceSer data) {
@@ -145,13 +180,14 @@
ser.setPort(data.getPort());
ser.setUpdateTime(new Date());
ser.setSn(data.getSn());
- deviceSerRepository.save(ser);
+ deviceSerMapper.updateById(ser);
setCacheSer(ser);
}
/**
* 鏇存柊鍒嗘満淇℃伅
+ *
* @param companyId
* @param serId
* @param controlModel
@@ -166,7 +202,7 @@
ser.setStatus(Constant.YN_Y);
ser.setControlModel(controlModel);
ser.setUpdateTime(new Date());
- deviceSerRepository.save(ser);
+ deviceSerMapper.updateById(ser);
setCacheSer(ser);
}
@@ -180,7 +216,7 @@
if (StringUtils.isEmpty(companyId)) {
companyId = ContextUtil.getCompanyId();
}
- List<DeviceSer> list = this.getAllSerByCompanyId(companyId);
+ List<DeviceSer> list = this.listDeviceSer(companyId, null, null);
this.setCacheSer(list, companyId);
}
@@ -270,16 +306,17 @@
/**
* 鏍规嵁绫诲瀷鑾峰彇鍒嗘満淇℃伅
+ *
* @param companyId
* @param type
* @return
*/
public List<DeviceSer> getSerCacheByType(String companyId, String type) {
List<DeviceSer> listAll = this.getCacheSerList(companyId);
- if (null == listAll || listAll.isEmpty()){
+ if (null == listAll || listAll.isEmpty()) {
return null;
}
- if (null == type){
+ if (null == type) {
return listAll;
}
List<DeviceSer> result = new ArrayList<DeviceSer>();
@@ -391,25 +428,33 @@
}
/**
- * JPA-鏇存柊璁惧鍏ㄩ儴绂荤嚎
+ * -鏇存柊璁惧鍏ㄩ儴绂荤嚎
+ *
* @param companyId
*/
public void allOffLine(String companyId) {
if (StringUtils.isEmpty(companyId)) {
companyId = ContextUtil.getCompanyId();
}
- deviceSerRepository.updateSerStatus(companyId, Constant.YN_N);
+
+ UpdateWrapper<DeviceSer> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("company_id", companyId).set("status", Constant.YN_N);
+ deviceSerMapper.update(null, updateWrapper);
}
/**
- * JPA-鏍规嵁SN鏇存柊鐘舵��
+ * -鏍规嵁SN鏇存柊鐘舵��
+ *
* @param ip
* @param port
* @param sn
* @param status
*/
public void onlineBySn(String ip, Integer port, String sn, String status) {
- deviceSerRepository.updateBySn(ip, port, status, sn, new Date());
+
+ UpdateWrapper<DeviceSer> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("sn", sn).set("ip", ip).set("port", port).set("update_time", new Date());
+ deviceSerMapper.update(null, updateWrapper);
}
}
--
Gitblit v1.9.3