diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java index 771c6a1..fc5722a 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java @@ -118,8 +118,8 @@ @RequestMapping(value = "/add",method = RequestMethod.POST) @ResponseBody public Object add(@RequestParam("doorCode")String doorCode, - @RequestParam("personList")List personList, - @RequestParam("strategyId")Integer strategyId){ + @RequestParam("strategyId")Integer strategyId, + @RequestBody List personList){ try{ acsPermissionService.addPermission(doorCode, personList, strategyId); }catch (Exception e){ diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java index 771c6a1..fc5722a 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java @@ -118,8 +118,8 @@ @RequestMapping(value = "/add",method = RequestMethod.POST) @ResponseBody public Object add(@RequestParam("doorCode")String doorCode, - @RequestParam("personList")List personList, - @RequestParam("strategyId")Integer strategyId){ + @RequestParam("strategyId")Integer strategyId, + @RequestBody List personList){ try{ acsPermissionService.addPermission(doorCode, personList, strategyId); }catch (Exception e){ diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java index b6f1b12..ed4608a 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java @@ -62,9 +62,14 @@ public List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime) { List> list = this.baseMapper.selectStaffDataScopePage(dataScope, page, keyword, personDeptId, doorCode, devCode, isAbnormal, beginTime, endTime); for (Map res : list) { - Long deptid = Long.valueOf(String.valueOf(res.get("personDeptId"))); - String deptName = permissionService.getDeptName(deptid); - res.put("personDeptName",deptName); + if(ToolUtil.isNotEmpty(res.get("personDeptId"))) { + Long deptid = Long.valueOf(String.valueOf(res.get("personDeptId"))); + String deptName = permissionService.getDeptName(deptid); + res.put("personDeptName",deptName); + } + if(ToolUtil.isEmpty(res.get("temperature"))) { + res.put("temperature","-"); + } } return list; } @@ -73,9 +78,14 @@ public List> selectRecordScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime) { List> list = this.baseMapper.selectRecordScopePage(dataScope, page, keyword, personDeptId, doorCode, devCode, isAbnormal, beginTime, endTime); for (Map res : list) { - Long deptid = Long.valueOf(String.valueOf(res.get("personDeptId"))); - String deptName = permissionService.getDeptName(deptid); - res.put("personDeptName",deptName); + if(ToolUtil.isNotEmpty(res.get("personDeptId"))) { + Long deptid = Long.valueOf(String.valueOf(res.get("personDeptId"))); + String deptName = permissionService.getDeptName(deptid); + res.put("personDeptName",deptName); + } + if(ToolUtil.isEmpty(res.get("temperature"))) { + res.put("temperature","-"); + } } return list; } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java index 771c6a1..fc5722a 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java @@ -118,8 +118,8 @@ @RequestMapping(value = "/add",method = RequestMethod.POST) @ResponseBody public Object add(@RequestParam("doorCode")String doorCode, - @RequestParam("personList")List personList, - @RequestParam("strategyId")Integer strategyId){ + @RequestParam("strategyId")Integer strategyId, + @RequestBody List personList){ try{ acsPermissionService.addPermission(doorCode, personList, strategyId); }catch (Exception e){ diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java index b6f1b12..ed4608a 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java @@ -62,9 +62,14 @@ public List> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime) { List> list = this.baseMapper.selectStaffDataScopePage(dataScope, page, keyword, personDeptId, doorCode, devCode, isAbnormal, beginTime, endTime); for (Map res : list) { - Long deptid = Long.valueOf(String.valueOf(res.get("personDeptId"))); - String deptName = permissionService.getDeptName(deptid); - res.put("personDeptName",deptName); + if(ToolUtil.isNotEmpty(res.get("personDeptId"))) { + Long deptid = Long.valueOf(String.valueOf(res.get("personDeptId"))); + String deptName = permissionService.getDeptName(deptid); + res.put("personDeptName",deptName); + } + if(ToolUtil.isEmpty(res.get("temperature"))) { + res.put("temperature","-"); + } } return list; } @@ -73,9 +78,14 @@ public List> selectRecordScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime) { List> list = this.baseMapper.selectRecordScopePage(dataScope, page, keyword, personDeptId, doorCode, devCode, isAbnormal, beginTime, endTime); for (Map res : list) { - Long deptid = Long.valueOf(String.valueOf(res.get("personDeptId"))); - String deptName = permissionService.getDeptName(deptid); - res.put("personDeptName",deptName); + if(ToolUtil.isNotEmpty(res.get("personDeptId"))) { + Long deptid = Long.valueOf(String.valueOf(res.get("personDeptId"))); + String deptName = permissionService.getDeptName(deptid); + res.put("personDeptName",deptName); + } + if(ToolUtil.isEmpty(res.get("temperature"))) { + res.put("temperature","-"); + } } return list; } diff --git a/casic-web/src/main/resources/ehcache.xml b/casic-web/src/main/resources/ehcache.xml index 78c82d8..6a2c583 100644 --- a/casic-web/src/main/resources/ehcache.xml +++ b/casic-web/src/main/resources/ehcache.xml @@ -53,6 +53,19 @@ memoryStoreEvictionPolicy="LFU" transactionalMode="off"> + +