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-inte/src/main/java/com/fzzy/igds/app/v1/data/AuthUser.java | 1
fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5001.java | 4 +
fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5105.java | 18 ++++++++
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java | 43 +++++++++++++++++----
4 files changed, 56 insertions(+), 10 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 1c628d8..51ef2af 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
@@ -15,10 +15,10 @@
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
@@ -54,22 +54,23 @@
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鏁版嵁
+ *
* @param page
* @param param
*/
public void pagePatrolData(Page<Patrol> page, IgdsBaseParam param) {
QueryWrapper<Patrol> queryWrapper = new QueryWrapper<>();
- if(StringUtils.isNotBlank(param.getDeptId())){
+ if (StringUtils.isNotBlank(param.getDeptId())) {
queryWrapper.like("dept_id", param.getDeptId());
- }else {
- if(StringUtils.isNotBlank(param.getCompanyId())){
+ } else {
+ if (StringUtils.isNotBlank(param.getCompanyId())) {
queryWrapper.likeRight("dept_id", param.getCompanyId());
}
}
- if(null != param.getStart()){
+ if (null != param.getStart()) {
queryWrapper.ge("create_time", DateUtil.getCurZero(param.getStart()));
}
- if(null != param.getEnd()){
+ if (null != param.getEnd()) {
queryWrapper.le("create_time", DateUtil.getCurZero(param.getEnd()));
}
@@ -79,12 +80,13 @@
/*--------------------宸℃洿杞ㄨ抗琛ㄧ鐞�------------------*/
/**
* 鏍规嵁宸℃洿ID鏌ヨ鍏蜂綋鐐逛綅淇℃伅
- * @param patrolId
+ *
+ * @param
* @return
*/
public List<PatrolRecord> getRecordByPatrolId(String patrolId,String userId,String confId) {
- if(StringUtils.isBlank(patrolId) || StringUtils.isBlank(userId) || StringUtils.isBlank(confId)){
+ if(StringUtils.isBlank(patrolId)){
return null;
}
@@ -96,6 +98,31 @@
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);
+ }
/*--------------------宸℃洿閰嶇疆琛ㄧ鐞�------------------*/
diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/data/AuthUser.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/data/AuthUser.java
index ea4c57c..a0348a9 100644
--- a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/data/AuthUser.java
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/data/AuthUser.java
@@ -17,6 +17,7 @@
private String address;
private String email;
+ private String userType;
private String deptId;
private String deptName;
private HttpServletRequest request;
diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5001.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5001.java
index 4c050f1..7b47747 100644
--- a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5001.java
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5001.java
@@ -58,6 +58,7 @@
private SysDeptService deptService;
@Autowired
private RedisCache redisUtil;
+
@Override
public String getInterfaceId() {
return PhoneConstant.API_PHONE_5001;
@@ -138,8 +139,9 @@
authUser.setCname(user.getUserName());
authUser.setEmail(user.getEmail());
authUser.setMobile(user.getPhonenumber());
+ authUser.setUserType(user.getUserType());
//璁剧疆鐧诲綍鐢ㄦ埛鎵�灞炲垎搴撲俊鎭�
- SysDept dept = deptService.getCacheDept(user.getCompanyId(),user.getDeptId().toString());
+ SysDept dept = deptService.getCacheDept(user.getCompanyId(), user.getDeptId().toString());
phoneUserDto.setCompanyId(authUser.getCompanyId());
phoneUserDto.setDeptId(dept.getDeptId().toString());
diff --git a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5105.java b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5105.java
index f6f97b4..50229c7 100644
--- a/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5105.java
+++ b/fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5105.java
@@ -1,22 +1,32 @@
package com.fzzy.igds.app.v1.service.impl;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.fzzy.common.constant.RespCodeEnum;
+import com.fzzy.common.utils.DateUtil;
import com.fzzy.igds.app.v1.constant.PhoneConstant;
import com.fzzy.igds.app.v1.data.AuthUser;
import com.fzzy.igds.app.v1.data.ParamPatrol;
import com.fzzy.igds.app.v1.data.PhoneRequest;
import com.fzzy.igds.app.v1.data.PhoneResponse;
+import com.fzzy.igds.app.v1.dto.PPatrolDto;
import com.fzzy.igds.app.v1.service.PhoneService;
import com.fzzy.igds.app.v1.util.PhoneRespUtil;
+import com.fzzy.igds.constant.Constant;
+import com.fzzy.igds.domain.Patrol;
import com.fzzy.igds.domain.PatrolRecord;
+import com.fzzy.igds.mapper.PatrolMapper;
import com.fzzy.igds.service.PatrolService;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.commons.lang3.time.DateUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* @Author: YYC
@@ -49,7 +59,13 @@
if (null == param.getDateTime()) {
return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
}
- List<PatrolRecord> list = patrolService.getRecordByPatrolId(DateFormatUtils.format(param.getDateTime(), "yyyyMMdd"),null,null);
+ String userType = authUser.getUserType();
+ Map<String,String> paramMap = new HashMap<>();
+ if (Constant.USER_TYPE_30.equals(userType)){
+ paramMap.put("name",authUser.getUsername());
+ }
+ paramMap.put("patrolId",DateFormatUtils.format(param.getDateTime(), "yyyyMMdd"));
+ List<PatrolRecord> list = patrolService.getRecordByPatrolId(paramMap);
return PhoneRespUtil.success(list, req);
}
}
--
Gitblit v1.9.3