From deb8a2c32ba0cb7a88819b54d720418cdc2f7ebb Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期二, 24 三月 2026 16:58:53 +0800
Subject: [PATCH] 粮情报表，数量监测报表，库区回显错误纠正
---
fzzy-igdss-web/src/main/java/com/fzzy/security/SecurityController.java | 138 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 120 insertions(+), 18 deletions(-)
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 7c56232..d33af21 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,25 +1,30 @@
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;
import com.fzzy.igds.constant.Constant;
+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.Camera;
-import com.fzzy.igds.domain.PatrolRecord;
+import com.fzzy.igds.domain.*;
+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;
@@ -54,10 +59,16 @@
@RequestMapping("/video-dept")
public String videoDept(@RequestParam(value = "type", required = false) String type,
@RequestParam(value = "deptId", required = false) String deptId,
+ @RequestParam(value = "lan", required = false) String lan,
ModelMap view) {
if (StringUtils.isBlank(type)) {
type = "2";
+ }
+
+ if (StringUtils.isBlank(lan)) {
+ //鍐呯綉鎾斁
+ lan = "1";
}
SysUser user = ContextUtil.getLoginUser();
@@ -74,6 +85,7 @@
SysDept sysDept = commonManager.getDeptById(deptId);
view.put("dept", sysDept);
view.put("type", type);
+ view.put("lan", lan);
//鍒ゆ柇鏄惁鏄剧ず搴撳尯閫夋嫨寮圭獥
String showDeptList = "Y";
@@ -81,6 +93,10 @@
showDeptList = "N";
}
view.put("showDeptList", showDeptList);
+
+ //搴撳尯缃戝叧淇℃伅
+ GatewaySer gatewaySer = commonManager.getGatewaySerByDeptId(deptId);
+ view.put("gatewaySer", gatewaySer);
//榛樿鐩戞帶鍒楄〃椤甸潰
String viewUrl = prefix + "/video-list-dept";
@@ -221,27 +237,112 @@
* @return
*/
@RequestMapping("/quantity")
- public String infrared(
- @RequestParam(value = "type", required = false) String type,
- ModelMap view) {
+ public String infrared(@RequestParam(value = "type", required = false) String type,
+ ModelMap view) {
SysUser user = ContextUtil.getLoginUser();
view.put(Constant.MODEL_KEY_LOGIN_USER, user);
String deptId = ContextUtil.subDeptId(user);
view.put("deptId", deptId);
-// List<InfraredCamera> listCamera = infraredManager.listCamera(deptId, user.getCompanyId());
-//
-// if(null == listCamera){
-// listCamera = new ArrayList<>();
-// listCamera.add(new InfraredCamera());
-// }
-// view.put("listCamera", listCamera);
+
+ //鏌ヨ搴撳尯涓嬫暟閲忔娴嬭澶�
+ List<QuantityConf> listCamera = secManager.getQuantityConfByDeptId(deptId);
+ view.put("listCamera", listCamera);
+
+ //搴撳尯缃戝叧淇℃伅
+ GatewaySer gatewaySer = commonManager.getGatewaySerByDeptId(deptId);
+ view.put("gatewaySer", gatewaySer);
return prefix + "/quantity";
}
+ /**
+ * 鏌ヨ璁板綍淇℃伅
+ * @param param
+ * @return
+ */
+ @RequestMapping("/quantity-list")
+ @ResponseBody
+ public PageResponse<List<Quantity>> quantityList(@RequestBody IgdsBaseParam param) {
+ return secManager.quantityList(param);
+ }
+ /**
+ * 鏌ヨ鏇茬嚎鍥句俊鎭�
+ * @param param
+ * @return
+ */
+ @RequestMapping("/quantity-chart")
+ @ResponseBody
+ public PageResponse<GroupIndexData> getQuantityChart(@RequestBody IgdsBaseParam param) {
+ return secManager.getQuantityChart(param);
+ }
+
+ /**
+ * 鏌ヨ鏇茬嚎鍥句俊鎭�
+ * @param param
+ * @return
+ */
+ @RequestMapping("/quantity-files")
+ @ResponseBody
+ public PageResponse<List<FileInfo>> getQuantityFiles(@RequestBody IgdsBaseParam param) {
+ return secManager.getQuantityFiles(param);
+ }
+
+ /**
+ * 鏁伴噺鐩戞祴-寮�濮嬫娴�
+ *
+ * @param param
+ * @return
+ */
+ @RequestMapping("/check-single")
+ @ResponseBody
+ public BaseResponse checkSingle(@RequestBody IgdsBaseParam param) {
+
+ return secManager.checkSingle(param);
+ }
+
+ /**
+ * 鏁伴噺鐩戞祴-鍋滄妫�娴�
+ *
+ * @param param
+ * @return
+ */
+ @RequestMapping("/check-stop")
+ @ResponseBody
+ public BaseResponse checkStop(@RequestBody IgdsBaseParam param) {
+ return secManager.checkStop(param);
+ }
+
+ /*------------------鏂欎綅璁￠〉闈�------------------*/
+ /**
+ * 鏂欎綅鎬昏
+ *
+ * @param deptId
+ * @return
+ */
+ @RequestMapping("/height-all")
+ public String oilAll(@RequestParam(value = "deptId", required = false) String deptId,
+ ModelMap view) {
+
+ SysUser user = ContextUtil.getLoginUser();
+ view.put(Constant.MODEL_KEY_LOGIN_USER, user);
+
+ // 鑾峰彇褰撳墠鐢ㄦ埛鎵�鍦ㄧ殑鍒嗗簱鍚嶇О
+ if(StringUtils.isBlank(deptId)){
+ deptId = ContextUtil.subDeptId(user);
+ }
+ view.put("deptId", deptId);
+
+ // 鑾峰彇褰撳墠閮ㄩ棬涓嬫墍鏈夋补缃愬垪琛ㄤ俊鎭�
+ List<Quantity> heightList = secManager.getHeightList(ContextUtil.subDeptId(user));
+ view.put(Constant.MODEL_KEY_DEPOT_LIST, heightList);
+
+ view.put("bizType", "quantity");
+
+ return prefix + "/height-all";
+ }
/*------------------宸℃洿杞ㄨ抗椤甸潰------------------*/
/**
@@ -253,10 +354,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";
--
Gitblit v1.9.3