diff --git a/src/main/java/com/lp/common/RequestURLIOT.java b/src/main/java/com/lp/common/RequestURLIOT.java index cd43236..c638f5c 100644 --- a/src/main/java/com/lp/common/RequestURLIOT.java +++ b/src/main/java/com/lp/common/RequestURLIOT.java @@ -123,7 +123,8 @@ public class RequestURLIOT { } public class TaskRecord { - public final static String TASK_RECORD_PAGE = "/page/task-record"; + public final static String TASK_RECORD_PAGE = "/iot/task_record"; + public final static String TASK_RECORD_TABLE_PAGE = "/page/task-record-table"; } public class TriggerInfo { diff --git a/src/main/java/com/lp/controller/iot/IotTaskRecordController.java b/src/main/java/com/lp/controller/iot/IotTaskRecordController.java index 718b17a..5d157be 100644 --- a/src/main/java/com/lp/controller/iot/IotTaskRecordController.java +++ b/src/main/java/com/lp/controller/iot/IotTaskRecordController.java @@ -1,6 +1,7 @@ package com.lp.controller.iot; import com.lp.bo.IotAlarmInfoBO; +import com.lp.bo.IotSceneInfoBO; import com.lp.bo.IotTaskRecordBO; import com.lp.bo.UserInfoBO; import com.lp.common.Code; @@ -15,33 +16,59 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.HashMap; import java.util.Map; @Controller public class IotTaskRecordController extends BaseController { - /** - * 检索 - * @param response - * @param - * @return - */ - @RequestMapping(method = RequestMethod.POST, value = RequestURLIOT.TaskRecord.TASK_RECORD_PAGE) - public ModelAndView selectPage(HttpServletResponse response, - @RequestHeader(value = ResultMapUtils.USER_KEY, required = true) String userKey , - @RequestBody IotTaskRecordBO obj, - @RequestParam(required=false) Integer pageSize , - @RequestParam Integer paged ) { - Map resultMap = getResultMap(); - try { - UserInfoBO user = getUserInfoByUserKey(userKey); - obj.setUser_id(user.getId()); - resultMap = service.selectPageList("IotTaskRecord.selectPage",getPageBean(paged,pageSize), obj); - } catch (Exception e) { - exception(e,resultMap, obj); - } - return getModelAndView(response, resultMap); - } + /** + * 执行记录 + * + * @param response + * @param + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = RequestURLIOT.TaskRecord.TASK_RECORD_PAGE) + public ModelAndView selectPage(HttpServletRequest req, HttpServletResponse resp) { + Map resultMap = getResultMap(); + try { + UserInfoBO user = getUserInfoBySession(req); + + IotSceneInfoBO obj = new IotSceneInfoBO(); + obj.setUser_id(user.getId()); + + resultMap.put("projectList", service.selectPageList("IotSceneInfo.select", getPageBean(1, 200), obj)); + + } catch (Exception e) { + exception(e, resultMap); + } + return getModelAndView(resp, resultMap, "/oss/iot/task_record", "info"); + } + + /** + * 执行记录 -> 表格加载 + * + * @return + */ + @RequestMapping(method = RequestMethod.POST, value = RequestURLIOT.TaskRecord.TASK_RECORD_TABLE_PAGE) + public ModelAndView selectPageTable(HttpServletResponse response, + @RequestHeader(value = ResultMapUtils.USER_KEY, required = true) String userKey, + @RequestBody IotTaskRecordBO obj, + @RequestParam(required = false) Integer pageSize, + @RequestParam Integer paged) { + Map resultMap = getResultMap(); + try { + UserInfoBO user = getUserInfoByUserKey(userKey); + obj.setUser_id(user.getId()); + resultMap = service.selectPageList("IotTaskRecord.selectPage", getPageBean(paged, pageSize), obj); + + } catch (Exception e) { + exception(e, resultMap, obj); + } + return getModelAndView(response, resultMap); + } } diff --git a/src/main/webapp/WEB-INF/oss/base/common/variable_js.jsp b/src/main/webapp/WEB-INF/oss/base/common/variable_js.jsp index 475df3c..702146e 100644 --- a/src/main/webapp/WEB-INF/oss/base/common/variable_js.jsp +++ b/src/main/webapp/WEB-INF/oss/base/common/variable_js.jsp @@ -14,4 +14,4 @@ 'NO_DATA':<%=Code.ResponseCode.SystemCode.NO_DATA%> } -<%=ProConfig.PROJECT_NAME%> \ No newline at end of file +<%=ProConfig.PROJECT_NAME%> \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/oss/iot/common/variable_js.jsp b/src/main/webapp/WEB-INF/oss/iot/common/variable_js.jsp index 884ef69..a89afbc 100644 --- a/src/main/webapp/WEB-INF/oss/iot/common/variable_js.jsp +++ b/src/main/webapp/WEB-INF/oss/iot/common/variable_js.jsp @@ -26,5 +26,6 @@ var vf = [118, 101, 114, 115, 105, 111, 110, 58, 48, 46, 51, 46, 57, 46, 49, 32, 44, 32, 231, 137, 136, 230, 157, 131, 230, 137, 128, 230, 156, 137, 239, 188, 154, 233, 184, 191, 229, 144, 141, 231, 137, 169, 232, 129, 148, 239, 188, 155, 232, 129, 148, 231, 179, 187, 230, 150, 185, 229, 188, 143, 239, 188, 154, 81, 81, 50, 50, 50, 52, 51, 49, 51, 56, 49, 49]; + var aa = "<%=ProConfig.PROJECT_NAME%>"; <%=ProConfig.PROJECT_NAME%> \ No newline at end of file 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 08a4393..62a04bf 100644 --- a/src/main/webapp/WEB-INF/oss/iot/task_record.jsp +++ b/src/main/webapp/WEB-INF/oss/iot/task_record.jsp @@ -11,6 +11,7 @@ <%@ include file="/WEB-INF/oss/iot/common/resource_lib.jsp" %> +
@@ -28,16 +29,12 @@
项目名称: - <%-- - + - --%> - +
@@ -65,10 +62,9 @@
-
-