From 5aa131514f386088d1b42bcb4a8eb61f239ffc28 Mon Sep 17 00:00:00 2001
From: kale <seg_yinzy@seginfo.com>
Date: Tue, 6 Jun 2023 11:42:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=8F=98=E6=9B=B4service/iot/task=5Frecord?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/IotTaskRecordController.java          |  6 ++---
 .../controller/iot/IotWebViewController.java  | 25 ++++++++++++++++++-
 .../webapp/WEB-INF/oss/iot/task_record.jsp    |  2 +-
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/lp/controller/iot/IotTaskRecordController.java b/src/main/java/com/lp/controller/iot/IotTaskRecordController.java
index 5d157be..496fcdd 100644
--- a/src/main/java/com/lp/controller/iot/IotTaskRecordController.java
+++ b/src/main/java/com/lp/controller/iot/IotTaskRecordController.java
@@ -31,7 +31,7 @@ public class IotTaskRecordController extends BaseController {
      * @param response
      * @param
      * @return
-     */
+
     @RequestMapping(method = RequestMethod.GET, value = RequestURLIOT.TaskRecord.TASK_RECORD_PAGE)
     public ModelAndView selectPage(HttpServletRequest req, HttpServletResponse resp) {
         Map<String, Object> resultMap = getResultMap();
@@ -41,14 +41,14 @@ public class IotTaskRecordController extends BaseController {
             IotSceneInfoBO obj = new IotSceneInfoBO();
             obj.setUser_id(user.getId());
 
-            resultMap.put("projectList", service.selectPageList("IotSceneInfo.select", getPageBean(1, 200), obj));
+            resultMap.put("projectList", service.selectList("IotSceneInfo.select", obj));
 
         } catch (Exception e) {
             exception(e, resultMap);
         }
         return getModelAndView(resp, resultMap, "/oss/iot/task_record", "info");
     }
-
+     */
     /**
      * 执行记录 -> 表格加载
      *
diff --git a/src/main/java/com/lp/controller/iot/IotWebViewController.java b/src/main/java/com/lp/controller/iot/IotWebViewController.java
index 1eae80e..7a550a1 100644
--- a/src/main/java/com/lp/controller/iot/IotWebViewController.java
+++ b/src/main/java/com/lp/controller/iot/IotWebViewController.java
@@ -8,6 +8,7 @@ import com.lp.cache.CacheName;
 import com.lp.cache.ProCacheUtil;
 import com.lp.common.Code;
 import com.lp.common.CodeIot;
+import com.lp.common.RequestURLIOT;
 import com.lp.controller.BaseController;
 import com.lp.service.IotOtherInfoService;
 import com.lp.util.CommonUtil;
@@ -248,7 +249,29 @@ public class IotWebViewController extends BaseController {
 		}
 		return getModelAndView(resp, resultData,VIEW_PATH+"alarm_all","info");
 	}
-	
+
+	/**
+	 * 全部报警
+	 * @param req
+	 * @param resp
+	 * @return
+	 */
+	@RequestMapping(method = RequestMethod.GET, value = RequestURLIOT.TaskRecord.TASK_RECORD_PAGE)
+	public ModelAndView taskRecord(HttpServletRequest req, HttpServletResponse resp){
+		Map<String,Object> resultData = getResultMap();
+		try{
+			UserInfoBO user =  getUserInfoBySession(req);
+			IotSceneInfoBO obj = new IotSceneInfoBO();
+			if(user.getType() != Code.UserType.SUPER) {
+				obj.setUser_id(user.getId());
+			}
+			resultData = service.selectList("IotSceneInfo.select", obj);
+		}catch (Exception e) {
+			exception(e, resultData);
+		}
+		return getModelAndView(resp, resultData,VIEW_PATH+"task_record","info");
+	}
+
 	/**
 	 * 历史数据
 	 * @param req
diff --git a/src/main/webapp/WEB-INF/oss/iot/task_record.jsp b/src/main/webapp/WEB-INF/oss/iot/task_record.jsp
index 1b8623f..0feb30a 100644
--- a/src/main/webapp/WEB-INF/oss/iot/task_record.jsp
+++ b/src/main/webapp/WEB-INF/oss/iot/task_record.jsp
@@ -31,7 +31,7 @@
                                         <span>项目名称：</span>
                                         <select type-name="scene_id" class="input input-select input-self">
                                             <option value="">选择项目</option>
-                                            <c:forEach items="${info.projectList.data.data}" varStatus="index" var="obj">
+                                            <c:forEach items="${info.data}" varStatus="status" var="obj">
                                                 <option value="${obj.id}">${obj.name }</option>
                                             </c:forEach>
                                         </select>