seg_yinzy
/
iotadmin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix:变更service/iot/task_record接口位置

dev
kale 2023-06-06 11:42:12 +08:00
parent d1b635898a
commit 5aa131514f
3 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/lp/controller/iot/IotTaskRecordController.java
View File

@ -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");
}
*/
/**
* 执行记录 -> 表格加载
*

25
src/main/java/com/lp/controller/iot/IotWebViewController.java
View File

@ -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

2
src/main/webapp/WEB-INF/oss/iot/task_record.jsp
View File

@ -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>