diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java index a8a9b93..a12e693 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -129,11 +129,11 @@ map.put("success", "false"); return map; } - if (markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size() > 0) { - map.put("message", "已安装过该标识器[" + markerDto.getMarkerId() + "]"); - map.put("success", "false"); - return map; - } +// if (markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size() > 0) { +// map.put("message", "已安装过该标识器[" + markerDto.getMarkerId() + "]"); +// map.put("success", "false"); +// return map; +// } User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户 Long companyId = user.getCompany().getId(); try { diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java index a8a9b93..a12e693 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -129,11 +129,11 @@ map.put("success", "false"); return map; } - if (markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size() > 0) { - map.put("message", "已安装过该标识器[" + markerDto.getMarkerId() + "]"); - map.put("success", "false"); - return map; - } +// if (markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size() > 0) { +// map.put("message", "已安装过该标识器[" + markerDto.getMarkerId() + "]"); +// map.put("success", "false"); +// return map; +// } User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户 Long companyId = user.getCompany().getId(); try { diff --git a/src/main/java/com/casic/accessControl/task/manager/TaskManager.java b/src/main/java/com/casic/accessControl/task/manager/TaskManager.java index a9c1852..c7b5d81 100644 --- a/src/main/java/com/casic/accessControl/task/manager/TaskManager.java +++ b/src/main/java/com/casic/accessControl/task/manager/TaskManager.java @@ -23,6 +23,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** * Created by lenovo on 2016/4/22. @@ -91,7 +92,16 @@ public List getTasks(User user) { Criteria criteria = this.createCriteria(Task.class); criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.or(Restrictions.eq("creator.id", user.getId()),Restrictions.eq("patroler.id", user.getId()))); + String dataScope= user.getDatascope(); + if(StringUtils.isNotBlank(dataScope)){ + criteria.add(Restrictions.in("company.id", + Arrays.stream(dataScope.split(",")) + .map(Long::parseLong) + .collect(Collectors.toList()))); + } + + +// criteria.add(Restrictions.or(Restrictions.eq("creator.id", user.getId()),Restrictions.eq("patroler.id", user.getId()))); List result = TaskDto.Converts(criteria.list()); return result; } diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java index a8a9b93..a12e693 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -129,11 +129,11 @@ map.put("success", "false"); return map; } - if (markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size() > 0) { - map.put("message", "已安装过该标识器[" + markerDto.getMarkerId() + "]"); - map.put("success", "false"); - return map; - } +// if (markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size() > 0) { +// map.put("message", "已安装过该标识器[" + markerDto.getMarkerId() + "]"); +// map.put("success", "false"); +// return map; +// } User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户 Long companyId = user.getCompany().getId(); try { diff --git a/src/main/java/com/casic/accessControl/task/manager/TaskManager.java b/src/main/java/com/casic/accessControl/task/manager/TaskManager.java index a9c1852..c7b5d81 100644 --- a/src/main/java/com/casic/accessControl/task/manager/TaskManager.java +++ b/src/main/java/com/casic/accessControl/task/manager/TaskManager.java @@ -23,6 +23,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** * Created by lenovo on 2016/4/22. @@ -91,7 +92,16 @@ public List getTasks(User user) { Criteria criteria = this.createCriteria(Task.class); criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.or(Restrictions.eq("creator.id", user.getId()),Restrictions.eq("patroler.id", user.getId()))); + String dataScope= user.getDatascope(); + if(StringUtils.isNotBlank(dataScope)){ + criteria.add(Restrictions.in("company.id", + Arrays.stream(dataScope.split(",")) + .map(Long::parseLong) + .collect(Collectors.toList()))); + } + + +// criteria.add(Restrictions.or(Restrictions.eq("creator.id", user.getId()),Restrictions.eq("patroler.id", user.getId()))); List result = TaskDto.Converts(criteria.list()); return result; } diff --git a/src/main/java/com/casic/accessControl/task/web/TaskController.java b/src/main/java/com/casic/accessControl/task/web/TaskController.java index ff088c3..bc6cd09 100644 --- a/src/main/java/com/casic/accessControl/task/web/TaskController.java +++ b/src/main/java/com/casic/accessControl/task/web/TaskController.java @@ -250,6 +250,30 @@ return result; } + /** + * 删除任务 + * @param taskId + * @return + */ + + @RequestMapping("delete-task") + @ResponseBody + public Map deleteTask(@RequestParam(value = "taskId", required = true) String taskId) { + Map result = new HashMap(); + try { + Task task = taskManager.getTaskById(taskId); + List taskDetails = taskDetailManager.getTaskDetailByTask(task); + taskDetailManager.removeAll(taskDetails); + taskManager.remove(task); + result.put("message", "删除成功"); + result.put("success", true); + } catch (Exception e) { + result.put("message", "删除失败"); + result.put("success", false); + } + return result; + } + @RequestMapping("getTaskCount") @ResponseBody public Map getTaskCount(@RequestParam(required = false) String startDate, @RequestParam(required = false) String endDate, HttpSession session) { diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java index a8a9b93..a12e693 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -129,11 +129,11 @@ map.put("success", "false"); return map; } - if (markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size() > 0) { - map.put("message", "已安装过该标识器[" + markerDto.getMarkerId() + "]"); - map.put("success", "false"); - return map; - } +// if (markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size() > 0) { +// map.put("message", "已安装过该标识器[" + markerDto.getMarkerId() + "]"); +// map.put("success", "false"); +// return map; +// } User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户 Long companyId = user.getCompany().getId(); try { diff --git a/src/main/java/com/casic/accessControl/task/manager/TaskManager.java b/src/main/java/com/casic/accessControl/task/manager/TaskManager.java index a9c1852..c7b5d81 100644 --- a/src/main/java/com/casic/accessControl/task/manager/TaskManager.java +++ b/src/main/java/com/casic/accessControl/task/manager/TaskManager.java @@ -23,6 +23,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** * Created by lenovo on 2016/4/22. @@ -91,7 +92,16 @@ public List getTasks(User user) { Criteria criteria = this.createCriteria(Task.class); criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.or(Restrictions.eq("creator.id", user.getId()),Restrictions.eq("patroler.id", user.getId()))); + String dataScope= user.getDatascope(); + if(StringUtils.isNotBlank(dataScope)){ + criteria.add(Restrictions.in("company.id", + Arrays.stream(dataScope.split(",")) + .map(Long::parseLong) + .collect(Collectors.toList()))); + } + + +// criteria.add(Restrictions.or(Restrictions.eq("creator.id", user.getId()),Restrictions.eq("patroler.id", user.getId()))); List result = TaskDto.Converts(criteria.list()); return result; } diff --git a/src/main/java/com/casic/accessControl/task/web/TaskController.java b/src/main/java/com/casic/accessControl/task/web/TaskController.java index ff088c3..bc6cd09 100644 --- a/src/main/java/com/casic/accessControl/task/web/TaskController.java +++ b/src/main/java/com/casic/accessControl/task/web/TaskController.java @@ -250,6 +250,30 @@ return result; } + /** + * 删除任务 + * @param taskId + * @return + */ + + @RequestMapping("delete-task") + @ResponseBody + public Map deleteTask(@RequestParam(value = "taskId", required = true) String taskId) { + Map result = new HashMap(); + try { + Task task = taskManager.getTaskById(taskId); + List taskDetails = taskDetailManager.getTaskDetailByTask(task); + taskDetailManager.removeAll(taskDetails); + taskManager.remove(task); + result.put("message", "删除成功"); + result.put("success", true); + } catch (Exception e) { + result.put("message", "删除失败"); + result.put("success", false); + } + return result; + } + @RequestMapping("getTaskCount") @ResponseBody public Map getTaskCount(@RequestParam(required = false) String startDate, @RequestParam(required = false) String endDate, HttpSession session) { diff --git a/src/main/java/com/casic/accessControl/user/manager/UserManager.java b/src/main/java/com/casic/accessControl/user/manager/UserManager.java index bc6aaed..bf5772a 100644 --- a/src/main/java/com/casic/accessControl/user/manager/UserManager.java +++ b/src/main/java/com/casic/accessControl/user/manager/UserManager.java @@ -239,6 +239,20 @@ return users; } + + public List getPatrolers( Long usrId) { + Criteria criteria = this.createCriteria(User.class); + if(null!=usrId){ + criteria.add(Restrictions.eq("id", usrId)); + } + criteria.add(Restrictions.eq("isValid", 1)); + List users = criteria.list(); + if (CollectionUtils.isEmpty(users)) { + return null; + } + return users; + } + public void updateCurrentDataScope(Long companyId, HttpSession session){ User user = (User) session.getAttribute(com.casic.accessControl.util.StringUtils.SYS_USER); if(StringUtils.isEmpty(user.getDatascope())){ diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java index a8a9b93..a12e693 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -129,11 +129,11 @@ map.put("success", "false"); return map; } - if (markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size() > 0) { - map.put("message", "已安装过该标识器[" + markerDto.getMarkerId() + "]"); - map.put("success", "false"); - return map; - } +// if (markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size() > 0) { +// map.put("message", "已安装过该标识器[" + markerDto.getMarkerId() + "]"); +// map.put("success", "false"); +// return map; +// } User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户 Long companyId = user.getCompany().getId(); try { diff --git a/src/main/java/com/casic/accessControl/task/manager/TaskManager.java b/src/main/java/com/casic/accessControl/task/manager/TaskManager.java index a9c1852..c7b5d81 100644 --- a/src/main/java/com/casic/accessControl/task/manager/TaskManager.java +++ b/src/main/java/com/casic/accessControl/task/manager/TaskManager.java @@ -23,6 +23,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** * Created by lenovo on 2016/4/22. @@ -91,7 +92,16 @@ public List getTasks(User user) { Criteria criteria = this.createCriteria(Task.class); criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.or(Restrictions.eq("creator.id", user.getId()),Restrictions.eq("patroler.id", user.getId()))); + String dataScope= user.getDatascope(); + if(StringUtils.isNotBlank(dataScope)){ + criteria.add(Restrictions.in("company.id", + Arrays.stream(dataScope.split(",")) + .map(Long::parseLong) + .collect(Collectors.toList()))); + } + + +// criteria.add(Restrictions.or(Restrictions.eq("creator.id", user.getId()),Restrictions.eq("patroler.id", user.getId()))); List result = TaskDto.Converts(criteria.list()); return result; } diff --git a/src/main/java/com/casic/accessControl/task/web/TaskController.java b/src/main/java/com/casic/accessControl/task/web/TaskController.java index ff088c3..bc6cd09 100644 --- a/src/main/java/com/casic/accessControl/task/web/TaskController.java +++ b/src/main/java/com/casic/accessControl/task/web/TaskController.java @@ -250,6 +250,30 @@ return result; } + /** + * 删除任务 + * @param taskId + * @return + */ + + @RequestMapping("delete-task") + @ResponseBody + public Map deleteTask(@RequestParam(value = "taskId", required = true) String taskId) { + Map result = new HashMap(); + try { + Task task = taskManager.getTaskById(taskId); + List taskDetails = taskDetailManager.getTaskDetailByTask(task); + taskDetailManager.removeAll(taskDetails); + taskManager.remove(task); + result.put("message", "删除成功"); + result.put("success", true); + } catch (Exception e) { + result.put("message", "删除失败"); + result.put("success", false); + } + return result; + } + @RequestMapping("getTaskCount") @ResponseBody public Map getTaskCount(@RequestParam(required = false) String startDate, @RequestParam(required = false) String endDate, HttpSession session) { diff --git a/src/main/java/com/casic/accessControl/user/manager/UserManager.java b/src/main/java/com/casic/accessControl/user/manager/UserManager.java index bc6aaed..bf5772a 100644 --- a/src/main/java/com/casic/accessControl/user/manager/UserManager.java +++ b/src/main/java/com/casic/accessControl/user/manager/UserManager.java @@ -239,6 +239,20 @@ return users; } + + public List getPatrolers( Long usrId) { + Criteria criteria = this.createCriteria(User.class); + if(null!=usrId){ + criteria.add(Restrictions.eq("id", usrId)); + } + criteria.add(Restrictions.eq("isValid", 1)); + List users = criteria.list(); + if (CollectionUtils.isEmpty(users)) { + return null; + } + return users; + } + public void updateCurrentDataScope(Long companyId, HttpSession session){ User user = (User) session.getAttribute(com.casic.accessControl.util.StringUtils.SYS_USER); if(StringUtils.isEmpty(user.getDatascope())){ diff --git a/src/main/java/com/casic/accessControl/user/web/UserController.java b/src/main/java/com/casic/accessControl/user/web/UserController.java index 9dfeb78..0c2b74f 100644 --- a/src/main/java/com/casic/accessControl/user/web/UserController.java +++ b/src/main/java/com/casic/accessControl/user/web/UserController.java @@ -215,9 +215,15 @@ result.put("message", "用户未登录"); return result; } - Company company = currentUser.getCompany(); - Role role = roleManager.getRoleByType(5); - List users = userManager.getPatrolerByCompany(company,role); + Long userId = currentUser.getId(); + Role role = currentUser.getRole(); + if(role!=null){ + //若是管理员账户，则看到所有的用户 + if(role.getId()==1||role.getId()==7){ + userId = null; + } + } + List users = userManager.getPatrolers(userId); List userDtos = UserDto.Converts(users); if (userDtos == null) {//获取列表失败 diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java index a8a9b93..a12e693 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -129,11 +129,11 @@ map.put("success", "false"); return map; } - if (markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size() > 0) { - map.put("message", "已安装过该标识器[" + markerDto.getMarkerId() + "]"); - map.put("success", "false"); - return map; - } +// if (markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size() > 0) { +// map.put("message", "已安装过该标识器[" + markerDto.getMarkerId() + "]"); +// map.put("success", "false"); +// return map; +// } User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户 Long companyId = user.getCompany().getId(); try { diff --git a/src/main/java/com/casic/accessControl/task/manager/TaskManager.java b/src/main/java/com/casic/accessControl/task/manager/TaskManager.java index a9c1852..c7b5d81 100644 --- a/src/main/java/com/casic/accessControl/task/manager/TaskManager.java +++ b/src/main/java/com/casic/accessControl/task/manager/TaskManager.java @@ -23,6 +23,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** * Created by lenovo on 2016/4/22. @@ -91,7 +92,16 @@ public List getTasks(User user) { Criteria criteria = this.createCriteria(Task.class); criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.or(Restrictions.eq("creator.id", user.getId()),Restrictions.eq("patroler.id", user.getId()))); + String dataScope= user.getDatascope(); + if(StringUtils.isNotBlank(dataScope)){ + criteria.add(Restrictions.in("company.id", + Arrays.stream(dataScope.split(",")) + .map(Long::parseLong) + .collect(Collectors.toList()))); + } + + +// criteria.add(Restrictions.or(Restrictions.eq("creator.id", user.getId()),Restrictions.eq("patroler.id", user.getId()))); List result = TaskDto.Converts(criteria.list()); return result; } diff --git a/src/main/java/com/casic/accessControl/task/web/TaskController.java b/src/main/java/com/casic/accessControl/task/web/TaskController.java index ff088c3..bc6cd09 100644 --- a/src/main/java/com/casic/accessControl/task/web/TaskController.java +++ b/src/main/java/com/casic/accessControl/task/web/TaskController.java @@ -250,6 +250,30 @@ return result; } + /** + * 删除任务 + * @param taskId + * @return + */ + + @RequestMapping("delete-task") + @ResponseBody + public Map deleteTask(@RequestParam(value = "taskId", required = true) String taskId) { + Map result = new HashMap(); + try { + Task task = taskManager.getTaskById(taskId); + List taskDetails = taskDetailManager.getTaskDetailByTask(task); + taskDetailManager.removeAll(taskDetails); + taskManager.remove(task); + result.put("message", "删除成功"); + result.put("success", true); + } catch (Exception e) { + result.put("message", "删除失败"); + result.put("success", false); + } + return result; + } + @RequestMapping("getTaskCount") @ResponseBody public Map getTaskCount(@RequestParam(required = false) String startDate, @RequestParam(required = false) String endDate, HttpSession session) { diff --git a/src/main/java/com/casic/accessControl/user/manager/UserManager.java b/src/main/java/com/casic/accessControl/user/manager/UserManager.java index bc6aaed..bf5772a 100644 --- a/src/main/java/com/casic/accessControl/user/manager/UserManager.java +++ b/src/main/java/com/casic/accessControl/user/manager/UserManager.java @@ -239,6 +239,20 @@ return users; } + + public List getPatrolers( Long usrId) { + Criteria criteria = this.createCriteria(User.class); + if(null!=usrId){ + criteria.add(Restrictions.eq("id", usrId)); + } + criteria.add(Restrictions.eq("isValid", 1)); + List users = criteria.list(); + if (CollectionUtils.isEmpty(users)) { + return null; + } + return users; + } + public void updateCurrentDataScope(Long companyId, HttpSession session){ User user = (User) session.getAttribute(com.casic.accessControl.util.StringUtils.SYS_USER); if(StringUtils.isEmpty(user.getDatascope())){ diff --git a/src/main/java/com/casic/accessControl/user/web/UserController.java b/src/main/java/com/casic/accessControl/user/web/UserController.java index 9dfeb78..0c2b74f 100644 --- a/src/main/java/com/casic/accessControl/user/web/UserController.java +++ b/src/main/java/com/casic/accessControl/user/web/UserController.java @@ -215,9 +215,15 @@ result.put("message", "用户未登录"); return result; } - Company company = currentUser.getCompany(); - Role role = roleManager.getRoleByType(5); - List users = userManager.getPatrolerByCompany(company,role); + Long userId = currentUser.getId(); + Role role = currentUser.getRole(); + if(role!=null){ + //若是管理员账户，则看到所有的用户 + if(role.getId()==1||role.getId()==7){ + userId = null; + } + } + List users = userManager.getPatrolers(userId); List userDtos = UserDto.Converts(users); if (userDtos == null) {//获取列表失败 diff --git a/src/main/webapp/content/task/task-gd.jsp b/src/main/webapp/content/task/task-gd.jsp index f9a6aba..528e378 100644 --- a/src/main/webapp/content/task/task-gd.jsp +++ b/src/main/webapp/content/task/task-gd.jsp @@ -137,7 +137,7 @@ id="selectPatroler3"> - diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java index a8a9b93..a12e693 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -129,11 +129,11 @@ map.put("success", "false"); return map; } - if (markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size() > 0) { - map.put("message", "已安装过该标识器[" + markerDto.getMarkerId() + "]"); - map.put("success", "false"); - return map; - } +// if (markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size() > 0) { +// map.put("message", "已安装过该标识器[" + markerDto.getMarkerId() + "]"); +// map.put("success", "false"); +// return map; +// } User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户 Long companyId = user.getCompany().getId(); try { diff --git a/src/main/java/com/casic/accessControl/task/manager/TaskManager.java b/src/main/java/com/casic/accessControl/task/manager/TaskManager.java index a9c1852..c7b5d81 100644 --- a/src/main/java/com/casic/accessControl/task/manager/TaskManager.java +++ b/src/main/java/com/casic/accessControl/task/manager/TaskManager.java @@ -23,6 +23,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** * Created by lenovo on 2016/4/22. @@ -91,7 +92,16 @@ public List getTasks(User user) { Criteria criteria = this.createCriteria(Task.class); criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.or(Restrictions.eq("creator.id", user.getId()),Restrictions.eq("patroler.id", user.getId()))); + String dataScope= user.getDatascope(); + if(StringUtils.isNotBlank(dataScope)){ + criteria.add(Restrictions.in("company.id", + Arrays.stream(dataScope.split(",")) + .map(Long::parseLong) + .collect(Collectors.toList()))); + } + + +// criteria.add(Restrictions.or(Restrictions.eq("creator.id", user.getId()),Restrictions.eq("patroler.id", user.getId()))); List result = TaskDto.Converts(criteria.list()); return result; } diff --git a/src/main/java/com/casic/accessControl/task/web/TaskController.java b/src/main/java/com/casic/accessControl/task/web/TaskController.java index ff088c3..bc6cd09 100644 --- a/src/main/java/com/casic/accessControl/task/web/TaskController.java +++ b/src/main/java/com/casic/accessControl/task/web/TaskController.java @@ -250,6 +250,30 @@ return result; } + /** + * 删除任务 + * @param taskId + * @return + */ + + @RequestMapping("delete-task") + @ResponseBody + public Map deleteTask(@RequestParam(value = "taskId", required = true) String taskId) { + Map result = new HashMap(); + try { + Task task = taskManager.getTaskById(taskId); + List taskDetails = taskDetailManager.getTaskDetailByTask(task); + taskDetailManager.removeAll(taskDetails); + taskManager.remove(task); + result.put("message", "删除成功"); + result.put("success", true); + } catch (Exception e) { + result.put("message", "删除失败"); + result.put("success", false); + } + return result; + } + @RequestMapping("getTaskCount") @ResponseBody public Map getTaskCount(@RequestParam(required = false) String startDate, @RequestParam(required = false) String endDate, HttpSession session) { diff --git a/src/main/java/com/casic/accessControl/user/manager/UserManager.java b/src/main/java/com/casic/accessControl/user/manager/UserManager.java index bc6aaed..bf5772a 100644 --- a/src/main/java/com/casic/accessControl/user/manager/UserManager.java +++ b/src/main/java/com/casic/accessControl/user/manager/UserManager.java @@ -239,6 +239,20 @@ return users; } + + public List getPatrolers( Long usrId) { + Criteria criteria = this.createCriteria(User.class); + if(null!=usrId){ + criteria.add(Restrictions.eq("id", usrId)); + } + criteria.add(Restrictions.eq("isValid", 1)); + List users = criteria.list(); + if (CollectionUtils.isEmpty(users)) { + return null; + } + return users; + } + public void updateCurrentDataScope(Long companyId, HttpSession session){ User user = (User) session.getAttribute(com.casic.accessControl.util.StringUtils.SYS_USER); if(StringUtils.isEmpty(user.getDatascope())){ diff --git a/src/main/java/com/casic/accessControl/user/web/UserController.java b/src/main/java/com/casic/accessControl/user/web/UserController.java index 9dfeb78..0c2b74f 100644 --- a/src/main/java/com/casic/accessControl/user/web/UserController.java +++ b/src/main/java/com/casic/accessControl/user/web/UserController.java @@ -215,9 +215,15 @@ result.put("message", "用户未登录"); return result; } - Company company = currentUser.getCompany(); - Role role = roleManager.getRoleByType(5); - List users = userManager.getPatrolerByCompany(company,role); + Long userId = currentUser.getId(); + Role role = currentUser.getRole(); + if(role!=null){ + //若是管理员账户，则看到所有的用户 + if(role.getId()==1||role.getId()==7){ + userId = null; + } + } + List users = userManager.getPatrolers(userId); List userDtos = UserDto.Converts(users); if (userDtos == null) {//获取列表失败 diff --git a/src/main/webapp/content/task/task-gd.jsp b/src/main/webapp/content/task/task-gd.jsp index f9a6aba..528e378 100644 --- a/src/main/webapp/content/task/task-gd.jsp +++ b/src/main/webapp/content/task/task-gd.jsp @@ -137,7 +137,7 @@ id="selectPatroler3"> - diff --git a/src/main/webapp/content/task/task.jsp b/src/main/webapp/content/task/task.jsp index ffe72f1..2287f81 100644 --- a/src/main/webapp/content/task/task.jsp +++ b/src/main/webapp/content/task/task.jsp @@ -56,7 +56,7 @@ <%@include file="/common/layout/header.jsp" %> -
@@ -293,6 +293,7 @@ + diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java index a8a9b93..a12e693 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -129,11 +129,11 @@ map.put("success", "false"); return map; } - if (markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size() > 0) { - map.put("message", "已安装过该标识器[" + markerDto.getMarkerId() + "]"); - map.put("success", "false"); - return map; - } +// if (markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size() > 0) { +// map.put("message", "已安装过该标识器[" + markerDto.getMarkerId() + "]"); +// map.put("success", "false"); +// return map; +// } User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户 Long companyId = user.getCompany().getId(); try { diff --git a/src/main/java/com/casic/accessControl/task/manager/TaskManager.java b/src/main/java/com/casic/accessControl/task/manager/TaskManager.java index a9c1852..c7b5d81 100644 --- a/src/main/java/com/casic/accessControl/task/manager/TaskManager.java +++ b/src/main/java/com/casic/accessControl/task/manager/TaskManager.java @@ -23,6 +23,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** * Created by lenovo on 2016/4/22. @@ -91,7 +92,16 @@ public List getTasks(User user) { Criteria criteria = this.createCriteria(Task.class); criteria.addOrder(Order.desc("id")); - criteria.add(Restrictions.or(Restrictions.eq("creator.id", user.getId()),Restrictions.eq("patroler.id", user.getId()))); + String dataScope= user.getDatascope(); + if(StringUtils.isNotBlank(dataScope)){ + criteria.add(Restrictions.in("company.id", + Arrays.stream(dataScope.split(",")) + .map(Long::parseLong) + .collect(Collectors.toList()))); + } + + +// criteria.add(Restrictions.or(Restrictions.eq("creator.id", user.getId()),Restrictions.eq("patroler.id", user.getId()))); List result = TaskDto.Converts(criteria.list()); return result; } diff --git a/src/main/java/com/casic/accessControl/task/web/TaskController.java b/src/main/java/com/casic/accessControl/task/web/TaskController.java index ff088c3..bc6cd09 100644 --- a/src/main/java/com/casic/accessControl/task/web/TaskController.java +++ b/src/main/java/com/casic/accessControl/task/web/TaskController.java @@ -250,6 +250,30 @@ return result; } + /** + * 删除任务 + * @param taskId + * @return + */ + + @RequestMapping("delete-task") + @ResponseBody + public Map deleteTask(@RequestParam(value = "taskId", required = true) String taskId) { + Map result = new HashMap(); + try { + Task task = taskManager.getTaskById(taskId); + List taskDetails = taskDetailManager.getTaskDetailByTask(task); + taskDetailManager.removeAll(taskDetails); + taskManager.remove(task); + result.put("message", "删除成功"); + result.put("success", true); + } catch (Exception e) { + result.put("message", "删除失败"); + result.put("success", false); + } + return result; + } + @RequestMapping("getTaskCount") @ResponseBody public Map getTaskCount(@RequestParam(required = false) String startDate, @RequestParam(required = false) String endDate, HttpSession session) { diff --git a/src/main/java/com/casic/accessControl/user/manager/UserManager.java b/src/main/java/com/casic/accessControl/user/manager/UserManager.java index bc6aaed..bf5772a 100644 --- a/src/main/java/com/casic/accessControl/user/manager/UserManager.java +++ b/src/main/java/com/casic/accessControl/user/manager/UserManager.java @@ -239,6 +239,20 @@ return users; } + + public List getPatrolers( Long usrId) { + Criteria criteria = this.createCriteria(User.class); + if(null!=usrId){ + criteria.add(Restrictions.eq("id", usrId)); + } + criteria.add(Restrictions.eq("isValid", 1)); + List users = criteria.list(); + if (CollectionUtils.isEmpty(users)) { + return null; + } + return users; + } + public void updateCurrentDataScope(Long companyId, HttpSession session){ User user = (User) session.getAttribute(com.casic.accessControl.util.StringUtils.SYS_USER); if(StringUtils.isEmpty(user.getDatascope())){ diff --git a/src/main/java/com/casic/accessControl/user/web/UserController.java b/src/main/java/com/casic/accessControl/user/web/UserController.java index 9dfeb78..0c2b74f 100644 --- a/src/main/java/com/casic/accessControl/user/web/UserController.java +++ b/src/main/java/com/casic/accessControl/user/web/UserController.java @@ -215,9 +215,15 @@ result.put("message", "用户未登录"); return result; } - Company company = currentUser.getCompany(); - Role role = roleManager.getRoleByType(5); - List users = userManager.getPatrolerByCompany(company,role); + Long userId = currentUser.getId(); + Role role = currentUser.getRole(); + if(role!=null){ + //若是管理员账户，则看到所有的用户 + if(role.getId()==1||role.getId()==7){ + userId = null; + } + } + List users = userManager.getPatrolers(userId); List userDtos = UserDto.Converts(users); if (userDtos == null) {//获取列表失败 diff --git a/src/main/webapp/content/task/task-gd.jsp b/src/main/webapp/content/task/task-gd.jsp index f9a6aba..528e378 100644 --- a/src/main/webapp/content/task/task-gd.jsp +++ b/src/main/webapp/content/task/task-gd.jsp @@ -137,7 +137,7 @@ id="selectPatroler3"> -
diff --git a/src/main/webapp/content/task/task.jsp b/src/main/webapp/content/task/task.jsp index ffe72f1..2287f81 100644 --- a/src/main/webapp/content/task/task.jsp +++ b/src/main/webapp/content/task/task.jsp @@ -56,7 +56,7 @@ <%@include file="/common/layout/header.jsp" %> -
@@ -293,6 +293,7 @@ + diff --git a/src/main/webapp/s/app/task/task-gd.js b/src/main/webapp/s/app/task/task-gd.js index 30753e8..c60c0a7 100644 --- a/src/main/webapp/s/app/task/task-gd.js +++ b/src/main/webapp/s/app/task/task-gd.js @@ -52,8 +52,11 @@ // 历史工单列表属性 var options = { - valueNames: [ 'id', 'patrolerName', 'status', 'deployDate', 'beginDate', 'endDate', 'description', {attr: 'src', name: 'image'} ], - item: '
  • ' + + valueNames: ['id', 'patrolerName', 'status', 'deployDate', 'beginDate', 'endDate', 'description', 'deleteBtn', { + attr: 'src', + name: 'image' + }], + item: '
  • ' + '

    ' + '

    ' + '

    ' + @@ -61,11 +64,12 @@ '

    ' + '

    ' + '' + + '

    ' + '    ' + '
    ' + '
    • ', page: 3, - plugins: [ ListPagination({}) ] + plugins: [ListPagination({})] }; // 清除所有绘制的区域图层 @@ -107,9 +111,7 @@ url: $('#context').val() + "/task/get-task.do", dataType: "json", cache: false, - data: { - - }, + data: {}, success: function (r) { if (r.success) {//请求成功 for (var data in r.data) { @@ -152,32 +154,32 @@ var images = imgName.split(",");//图片路径数组 // alert(images[0]); var msg2 = "事件描述:" + p.Tag.description + "
    " + - "上传时间:" + p.Tag.createTime + "
    "; + "上传时间:" + p.Tag.createTime + "
    "; $("#eventImg").children().remove();//avatar1.jpg - var imageDivs="
    "; + var imageDivs = "
    "; // var imageDivs =""; - var width = 100/images.length;//动态展示 + var width = 100 / images.length;//动态展示 $("#viewHelper").children().remove(); - for(var i =0;i" + - "
    " + - "
    " + -// "
    "+ -// ""+ -// ""+ -// " "+ -// ""+ -// "
    " + + imageDivs += "
    " + + "
    " + + "
    " + + // "
    "+ + // ""+ + // ""+ + // " "+ + // ""+ + // "
    " + "
    " // imageDivs +=""; } - imageDivs+="
    " - $(".fancybox-close").die().live("click",function(){ + imageDivs += "
    " + $(".fancybox-close").die().live("click", function () { $('#eventModal').modal('show').css({width: "300px"}); }); - $(".zoom-icon").die().live("click",function(){ + $(".zoom-icon").die().live("click", function () { $('#eventModal').modal('hide'); }); // alert(eval(imageDivs)) @@ -191,7 +193,7 @@ // 获取标识器点 function requestMarkers() { - if (markerData.length == 0&&!hadRequest) { + if (markerData.length == 0 && !hadRequest) { hadRequest = true; $.ajax({ type: "get", @@ -209,7 +211,7 @@ markerDto.belowMaterial, markerDto.road, markerDto.constructTime, markerDto.ownerComp, markerDto.markerObjectId, markerDto.markerId, markerDto.markerType, markerDto.markerDepth, markerDto.creator, markerDto.createTime, markerDto.memo, markerDto.latitude, markerDto.longitude, - markerDto.recordType, markerDto.id,markerDto.line,markerDto.area, markerDto.colorType); + markerDto.recordType, markerDto.id, markerDto.line, markerDto.area, markerDto.colorType); markerData[t] = emsBean; } //2.增加marker @@ -224,7 +226,7 @@ map.off("complete", requestMarkers()); } }); - } else if(!hadRequest){ + } else if (!hadRequest) { TaskGd.addMarker(markerData); } @@ -232,7 +234,7 @@ // 处理鼠标单击事件 - function processClickInfo(emsBean){ + function processClickInfo(emsBean) { var msg = ""; if (emsBean.recordType == 1) { msg = msg + "管线种类：" + emsBean.markerObjectType + "
    " + @@ -252,9 +254,9 @@ "上层管直径（mm）：" + emsBean.pipeDiameter + "
    " + "上层管材料：" + emsBean.pipeMaterial + "
    " + "下层管种类：" + emsBean.belowType + "
    " + - "下层管埋深（mm）：" + emsBean.belowDepth + "
    "+ + "下层管埋深（mm）：" + emsBean.belowDepth + "
    " + "下层管直径（mm）：" + emsBean.belowDiameter + "
    " + - "下层管材料：" + emsBean.belowMaterial + "
    " ; + "下层管材料：" + emsBean.belowMaterial + "
    "; } msg = msg + "所属区域：" + emsBean.area + "
    " + "所属线路：" + emsBean.line + "
    " + @@ -265,11 +267,12 @@ "标识器类型：" + emsBean.markerType + "
    " + "标识器埋深（mm）：" + emsBean.markerDepth + "
    " + "安装部门：" + emsBean.creator + "
    " + - "最后修改时间："+emsBean.createTime + "
    " + + "最后修改时间：" + emsBean.createTime + "
    " + "备注：" + emsBean.memo + "
    "; return msg; } + return { //添加工单 @@ -330,7 +333,7 @@ text: r.message, type: "success", confirmButtonText: "确认" - }, function() { + }, function () { TaskGd.updateList(); }); } else { @@ -349,7 +352,7 @@ map = new AMap.Map("container", { zoom: 13, resizeEnable: true, - zooms: [4,18],//设置地图级别范围 + zooms: [4, 18],//设置地图级别范围 }); //声明全局变量 @@ -359,7 +362,7 @@ // 鼠标操作工具栏 mouseTool = new AMap.MouseTool(map); - mouseTool.on('draw',function(e){ + mouseTool.on('draw', function (e) { drawOverlays.push(e.obj); path.push(e.obj.getPath()); }); @@ -373,7 +376,7 @@ TaskGd.updateList(); //$('.sort').click(); $('#btnSort').trigger("click"); - // $('#btnSort').trigger("click"); + $('#btnSort').trigger("click"); // $('#btnSort').css("padding", 0); // $('#btnSort').css("padding-left", 10); @@ -403,7 +406,7 @@ type: "get", url: $('#context').val() + "/task/get-task-markers.do", dataType: "json", - async:false, + async: false, cache: false, data: { taskId: taskId @@ -423,8 +426,7 @@ if (status == 0) { icon = $('#context').val() + "/images/point-task.png"; isChecked = "未巡检"; - } - else { + } else { icon = $('#context').val() + "/images/point.png"; isChecked = "已巡检"; } @@ -434,11 +436,10 @@ } TaskGd.addTaskDetailMarker(taskDetailLists); - if(taskDetailLists.length==0){ + if (taskDetailLists.length == 0) { alert("未探测到标识器！"); } - } - else { + } else { alert(r.message); } }, @@ -453,7 +454,7 @@ url: $('#context').val() + "/event/get-event-list.do", dataType: "json", cache: false, - async:false, + async: false, data: { taskId: taskId }, @@ -473,8 +474,7 @@ } TaskGd.addEventMarker(eventBeanList); - } - else { + } else { alert(r.message); } }, @@ -588,7 +588,7 @@ map.setFitView(viewMarkers); - mass.on("click", function(e) { + mass.on("click", function (e) { var index = parseInt(e.data.id); var emsBean = viewMarkers[index].Tag; @@ -639,7 +639,7 @@ }); var msg = "事件描述:" + eventBeanList[i].description + "\r\n" + - "上传时间:" + eventBeanList[i].createTime + "\r\n"; + "上传时间:" + eventBeanList[i].createTime + "\r\n"; eventMarker.setTitle(msg); eventMarker.Tag = eventBeanList[i]; viewPoints.push(eventMarker); @@ -653,9 +653,9 @@ addTaskDetailMarker: function (data) { for (var i = 0; i < data.length; i++) { var msg = "标识器名称:" + data[i].markerName + "\r\n" + - "巡检状态:" + data[i].isChecked + "\r\n" + - "巡检时间:" + data[i].finishTime + "\r\n" + - "描述:" + data[i].description + "\r\n"; + "巡检状态:" + data[i].isChecked + "\r\n" + + "巡检时间:" + data[i].finishTime + "\r\n" + + "描述:" + data[i].description + "\r\n"; var marker = new AMap.Marker({ position: [data[i].longitude, data[i].latitude], @@ -670,6 +670,35 @@ drawTaskOverlays.push(marker); map.add(marker); // 将标注添加到地图中 } + }, + delete: function () { + $('#worksheets ul li').live('click', function (e) { + + if (null == this.getElementsByClassName("id")[0]) { + return; + } + var taskId = this.getElementsByClassName("id")[0].innerHTML; + + $.ajax({ + type: "get", + url: $('#context').val() + "/task/delete-task.do", + dataType: "json", + async: false, + cache: false, + data: { + taskId: taskId + }, + success: function (r) { + alert(r.message); + location.href = $("#context").val() + "/content/task/task-gd.jsp"; + }, + error: function (d) {//请求出错 + alert(d.message); + } + }); + + }); + } }; }(); @@ -684,6 +713,7 @@ this.endDate = endDate; this.status = status; this.creatorName = creatorName; + this.deleteBtn = "删除"; }; TaskDetailBean = function (id, icon, markerName, latitude, longitude, isChecked, finishTime, description) {