From 5790d7573a83278667878e0f73104f8fc8ec5cf3 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期二, 10 三月 2026 11:03:51 +0800
Subject: [PATCH] 巡检统计信息纠正
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java | 208 +++++++++++++++++++++++++++++----------------------
1 files changed, 118 insertions(+), 90 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java
index 3981b31..86a1468 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java
@@ -2,18 +2,24 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fzzy.igds.data.BaseResp;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.domain.Patrol;
+import com.fzzy.igds.domain.PatrolConf;
+import com.fzzy.igds.domain.PatrolRecord;
+import com.fzzy.igds.mapper.PatrolConfMapper;
import com.fzzy.igds.mapper.PatrolMapper;
+import com.fzzy.igds.mapper.PatrolRecordMapper;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.igds.utils.DateUtil;
-import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
+import java.util.Map;
@Slf4j
@Service
@@ -21,89 +27,13 @@
@Resource
private PatrolMapper patrolMapper;
+ @Resource
+ private PatrolRecordMapper patrolRecordMapper;
+ @Resource
+ private PatrolConfMapper patrolConfMapper;
- public List<Patrol> selectList(Patrol param) {
- QueryWrapper<Patrol> queryWrapper = getQueryWrapper(param);
- return patrolMapper.selectList(queryWrapper);
- }
- /**
- * 灏佽鏌ヨ鏉′欢
- *
- * @param param
- */
- public QueryWrapper<Patrol> getQueryWrapper(Patrol param) {
- QueryWrapper<Patrol> queryWrapper = new QueryWrapper<>();
-
- param.setCompanyId(ContextUtil.getCompanyId());
- queryWrapper.eq("company_id", param.getCompanyId());
-
- if (StringUtils.isNotBlank(param.getDeptId())) {
- queryWrapper.eq("dept_id", param.getDeptId());
- }
-
- if (StringUtils.isNotBlank(param.getUserName())) {
- queryWrapper.like("user_name", param.getUserName());
- }
- if (StringUtils.isNotBlank(param.getConfName())) {
- queryWrapper.like("conf_name", param.getConfName());
- }
-
- queryWrapper.orderByDesc("create_time");
-
- return queryWrapper;
- }
-
- /**
- * 閫氳繃id鏌ヨ鍗曟潯鏁版嵁
- *
- * @param id
- * @author sgj
- * @date 2025/12/10
- */
- public Patrol selectById(String id) {
- return patrolMapper.selectById(id);
- }
-
- /**
- * 鏂板鏁版嵁
- *
- * @param param
- * @author sgj
- * @date 2025/12/10
- */
- public int insertData(Patrol param) {
- if (StringUtils.isEmpty(param.getId())) {
- param.setId(ContextUtil.generateId());
- }
- return patrolMapper.insert(param);
- }
-
- /**
- * 鏇存柊鏁版嵁
- *
- * @param param
- * @author sgj
- * @date 2025/12/10
- */
- public int updateData(Patrol param) {
- return patrolMapper.updateById(param);
- }
-
- /**
- * 閫氳繃id鍒犻櫎涓�鏉℃暟鎹�
- *
- * @param ids
- * @author sgj
- * @date 2025/12/10
- */
- public void deleteDataById(String ids) {
- String[] recordIds = Convert.toStrArray(ids);
- for (String recordId : recordIds) {
- patrolMapper.deleteById(recordId);
- }
- }
-
+ /*--------------------宸℃洿涓昏〃绠＄悊------------------*/
/**
* 鏌ヨ7澶╁唴鐨勬墍鏈夊贰鏇磋褰曚俊鎭�
*
@@ -125,11 +55,93 @@
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鏁版嵁
+ *
* @param page
* @param param
*/
public void pagePatrolData(Page<Patrol> page, IgdsBaseParam param) {
QueryWrapper<Patrol> queryWrapper = new QueryWrapper<>();
+ if (StringUtils.isNotBlank(param.getDeptId())) {
+ queryWrapper.like("dept_id", param.getDeptId());
+ } else {
+ if (StringUtils.isNotBlank(param.getCompanyId())) {
+ queryWrapper.likeRight("dept_id", param.getCompanyId());
+ }
+ }
+ if (null != param.getStart()) {
+ queryWrapper.ge("create_time", DateUtil.getCurZero(param.getStart()));
+ }
+ if (null != param.getEnd()) {
+ queryWrapper.le("create_time", DateUtil.getCurZero(param.getEnd()));
+ }
+ queryWrapper.orderByDesc("create_time");
+
+ patrolMapper.selectPage(page, queryWrapper);
+ }
+
+ /*--------------------宸℃洿杞ㄨ抗琛ㄧ鐞�------------------*/
+ /**
+ * 鏍规嵁宸℃洿ID鏌ヨ鍏蜂綋鐐逛綅淇℃伅
+ *
+ * @param
+ * @return
+ */
+ public List<PatrolRecord> getRecordByPatrolId(String patrolId,String userId,String confId) {
+
+ if(StringUtils.isBlank(patrolId)){
+ return null;
+ }
+
+ QueryWrapper<PatrolRecord> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("patrol_id", patrolId);
+ queryWrapper.eq("user_id", userId);
+ queryWrapper.eq("conf_id", confId);
+ queryWrapper.orderByDesc("id");
+
+ return patrolRecordMapper.selectList(queryWrapper);
+ }
+ /*--------------------宸℃洿杞ㄨ抗琛ㄧ鐞�------------------*/
+
+ /**
+ * 鏍规嵁宸℃洿ID鏌ヨ鍏蜂綋鐐逛綅淇℃伅
+ *
+ * @param
+ * @return
+ */
+ public List<PatrolRecord> getRecordByPatrolId(Map<String, String> param) {
+ String patrolId = param.get("patrolId");
+
+ if (StringUtils.isBlank(patrolId)) {
+ return null;
+ }
+ String userName = param.get("name");
+
+ QueryWrapper<PatrolRecord> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("patrol_id", patrolId);
+
+ if (userName != null) {
+ queryWrapper.eq("user_id", userName);
+ }
+ queryWrapper.orderByDesc("id");
+ return patrolRecordMapper.selectList(queryWrapper);
+ }
+
+
+ /*--------------------宸℃洿閰嶇疆琛ㄧ鐞�------------------*/
+ /**
+ * 鏌ヨ搴撳尯涓嬫墍鏈夐厤缃俊鎭�
+ * @param param
+ * @return
+ */
+ public List<PatrolConf> listPatrolConf(IgdsBaseParam param) {
+
+ if(null == param){
+ param = new IgdsBaseParam();
+ }
+ QueryWrapper<PatrolConf> queryWrapper = new QueryWrapper<>();
+ if(StringUtils.isNotEmpty(param.getName())){
+ queryWrapper.like("name", param.getName());
+ }
if(StringUtils.isNotBlank(param.getDeptId())){
queryWrapper.like("dept_id", param.getDeptId());
}else {
@@ -137,13 +149,29 @@
queryWrapper.likeRight("dept_id", param.getCompanyId());
}
}
- if(null != param.getStart()){
- queryWrapper.ge("create_time", DateUtil.getCurZero(param.getStart()));
- }
- if(null != param.getEnd()){
- queryWrapper.le("create_time", DateUtil.getCurZero(param.getEnd()));
- }
-
- patrolMapper.selectPage(page, queryWrapper);
+ return patrolConfMapper.selectList(queryWrapper);
}
+
+ public BaseResp addPatrolConf(PatrolConf conf) {
+ conf.setId(ContextUtil.generateId());
+ conf.setCompanyId(ContextUtil.getCompanyId());
+ conf.setUpdateBy(ContextUtil.getLoginUserName());
+ conf.setUpdateTime(new Date());
+ conf.setCreateBy(ContextUtil.getLoginUserName());
+ conf.setCreateTime(new Date());
+
+ return patrolConfMapper.insert(conf) > 0 ? BaseResp.success() : BaseResp.error("娣诲姞澶辫触");
+ }
+
+ public BaseResp updatePatrolConf(PatrolConf conf) {
+ conf.setUpdateBy(ContextUtil.getLoginUserName());
+ conf.setUpdateTime(new Date());
+ return patrolConfMapper.updateById(conf) > 0 ? BaseResp.success() : BaseResp.error("鏇存柊澶辫触");
+ }
+
+ public BaseResp deletePatrolConf(PatrolConf conf) {
+ return patrolConfMapper.deleteById(conf) > 0 ? BaseResp.success() : BaseResp.error("鍒犻櫎澶辫触");
+ }
+
+
}
--
Gitblit v1.9.3