From 06f4d2f5cc46ffa9402dcb4e6bec08fbab2bcfa6 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期一, 02 三月 2026 15:51:29 +0800
Subject: [PATCH] 巡检轨迹查看修改
---
fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5105.java | 9 +--------
fzzy-igdss-view/src/main/java/com/fzzy/igds/Patrol.view.xml | 8 +++++---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java | 7 +++++--
fzzy-igdss-web/src/main/java/com/fzzy/security/manager/SecManager.java | 10 ++++++----
fzzy-igdss-web/src/main/java/com/fzzy/security/SecurityController.java | 17 +++++++++++------
5 files changed, 28 insertions(+), 23 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 b99a3f8..1c628d8 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,6 +15,7 @@
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;
@@ -81,14 +82,16 @@
* @param patrolId
* @return
*/
- public List<PatrolRecord> getRecordByPatrolId(String patrolId) {
+ public List<PatrolRecord> getRecordByPatrolId(String patrolId,String userId,String confId) {
- if(StringUtils.isBlank(patrolId)){
+ if(StringUtils.isBlank(patrolId) || StringUtils.isBlank(userId) || StringUtils.isBlank(confId)){
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);
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 f957e8a..f6f97b4 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,28 +1,21 @@
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.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.List;
/**
@@ -56,7 +49,7 @@
if (null == param.getDateTime()) {
return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
}
- List<PatrolRecord> list = patrolService.getRecordByPatrolId(DateFormatUtils.format(param.getDateTime(), "yyyyMMdd"));
+ List<PatrolRecord> list = patrolService.getRecordByPatrolId(DateFormatUtils.format(param.getDateTime(), "yyyyMMdd"),null,null);
return PhoneRespUtil.success(list, req);
}
}
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Patrol.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Patrol.view.xml
index f37b2ff..e2f54b5 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Patrol.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Patrol.view.xml
@@ -72,9 +72,11 @@
patrolMap = function(){
var select = view.get("#dataGridMain").get("selection");
if(select){
- var patrolId = select.get("id");
- 
- var url = "/security/patrol-record?patrolId="+patrolId+"&time="+ new Date().getTime();
+ var patrolId = select.get("id");
+ var userId = select.get("userId");
+ var confId = select.get("confId");
+ 
+ var url = "/security/patrol-record?patrolId="+patrolId+"&userId="+userId+"&confId="+confId;

view.get("#iFrameTrack").set("path",url);
view.get("#dialogTrack").show();
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/security/SecurityController.java b/fzzy-igdss-web/src/main/java/com/fzzy/security/SecurityController.java
index 7df183d..7950d2d 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/security/SecurityController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/security/SecurityController.java
@@ -1,5 +1,6 @@
package com.fzzy.security;
+import com.fzzy.common.manager.CommonManager;
import com.fzzy.igds.camera.data.ApiCameraData;
import com.fzzy.igds.camera.data.ApiCameraResp;
import com.fzzy.igds.constant.CameraPlayType;
@@ -12,15 +13,18 @@
import com.fzzy.igds.response.BaseResponse;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.igds.utils.SystemUtil;
-import com.fzzy.common.manager.CommonManager;
import com.fzzy.security.manager.SecManager;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
-import lombok.extern.slf4j.Slf4j;
import com.ruoyi.common.utils.StringUtils;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
@@ -346,10 +350,11 @@
*/
@RequestMapping("/patrol-record")
public String getPatrolRecordById(@RequestParam(value = "patrolId", required = true) String patrolId,
+ @RequestParam(value = "userId", required = true) String userId,
+ @RequestParam(value = "confId", required = true) String confId,
ModelMap view) {
- IgdsBaseParam param = new IgdsBaseParam();
- param.setKey(patrolId);
- List<PatrolRecord> trackPoints = secManager.getRecordByPatrolId(patrolId);
+
+ List<PatrolRecord> trackPoints = secManager.getRecordByPatrolId(patrolId, userId, confId);
view.put("patrolRecordList", trackPoints);
return prefix + "/patrol-record";
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/security/manager/SecManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/security/manager/SecManager.java
index b22225d..7433680 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/security/manager/SecManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/security/manager/SecManager.java
@@ -7,7 +7,10 @@
import com.fzzy.igds.constant.DepotType;
import com.fzzy.igds.constant.OrderRespEnum;
import com.fzzy.igds.constant.RespCodeEnum;
-import com.fzzy.igds.data.*;
+import com.fzzy.igds.data.GroupIndexData;
+import com.fzzy.igds.data.IgdsBaseParam;
+import com.fzzy.igds.data.PageResponse;
+import com.fzzy.igds.data.PatrolSuperData;
import com.fzzy.igds.domain.*;
import com.fzzy.igds.io.manager.QuantityRemoteManager;
import com.fzzy.igds.io.service.RemoteQuantityService;
@@ -20,7 +23,6 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@@ -227,9 +229,9 @@
* @param patrolId
* @return
*/
- public List<PatrolRecord> getRecordByPatrolId(String patrolId) {
+ public List<PatrolRecord> getRecordByPatrolId(String patrolId,String userId,String confId) {
- List<PatrolRecord> patrolRecords = patrolService.getRecordByPatrolId(patrolId);
+ List<PatrolRecord> patrolRecords = patrolService.getRecordByPatrolId(patrolId,userId,confId);
if (null != patrolRecords && !patrolRecords.isEmpty()) {
//鍒ゆ柇鏂囦欢鏄惁瀛樺湪
--
Gitblit v1.9.3