diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 4c9ee46..738629e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -412,7 +412,7 @@ */ @RequestMapping(value = "/getJob") @ResponseBody - public Object getJob(int id) { + public Object getJob(Long id) { AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -428,7 +428,7 @@ */ @RequestMapping(value = "/confirmJob") @ResponseBody - public Object confirmJob(@RequestParam(value = "id", required = true) int id, + public Object confirmJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "firstState", required = true) String firstState, @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, @RequestParam(value = "needHandle", required = true) String needHandle) { @@ -445,7 +445,7 @@ */ @RequestMapping(value = "/transferJob") @ResponseBody - public Object transferJob(@RequestParam(value = "id", required = true) int id, + public Object transferJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "transferPerson", required = true) String transferPerson) { AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -470,7 +470,7 @@ */ @RequestMapping(value = "/saveJob") @ResponseBody - public Object saveJob(@RequestParam(value = "id", required = true) int id, + public Object saveJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "handleMessage", required = true) String handleMessage, @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { @@ -486,7 +486,7 @@ */ @RequestMapping(value = "/overJob") @ResponseBody - public Object overJob(@RequestParam(value = "id", required = true) int id, + public Object overJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "handleMessage", required = true) String handleMessage, @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 4c9ee46..738629e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -412,7 +412,7 @@ */ @RequestMapping(value = "/getJob") @ResponseBody - public Object getJob(int id) { + public Object getJob(Long id) { AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -428,7 +428,7 @@ */ @RequestMapping(value = "/confirmJob") @ResponseBody - public Object confirmJob(@RequestParam(value = "id", required = true) int id, + public Object confirmJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "firstState", required = true) String firstState, @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, @RequestParam(value = "needHandle", required = true) String needHandle) { @@ -445,7 +445,7 @@ */ @RequestMapping(value = "/transferJob") @ResponseBody - public Object transferJob(@RequestParam(value = "id", required = true) int id, + public Object transferJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "transferPerson", required = true) String transferPerson) { AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -470,7 +470,7 @@ */ @RequestMapping(value = "/saveJob") @ResponseBody - public Object saveJob(@RequestParam(value = "id", required = true) int id, + public Object saveJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "handleMessage", required = true) String handleMessage, @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { @@ -486,7 +486,7 @@ */ @RequestMapping(value = "/overJob") @ResponseBody - public Object overJob(@RequestParam(value = "id", required = true) int id, + public Object overJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "handleMessage", required = true) String handleMessage, @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index 1f65166..e07d4b2 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -160,4 +160,8 @@ } return ResponseData.success(); } + + + + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 4c9ee46..738629e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -412,7 +412,7 @@ */ @RequestMapping(value = "/getJob") @ResponseBody - public Object getJob(int id) { + public Object getJob(Long id) { AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -428,7 +428,7 @@ */ @RequestMapping(value = "/confirmJob") @ResponseBody - public Object confirmJob(@RequestParam(value = "id", required = true) int id, + public Object confirmJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "firstState", required = true) String firstState, @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, @RequestParam(value = "needHandle", required = true) String needHandle) { @@ -445,7 +445,7 @@ */ @RequestMapping(value = "/transferJob") @ResponseBody - public Object transferJob(@RequestParam(value = "id", required = true) int id, + public Object transferJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "transferPerson", required = true) String transferPerson) { AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -470,7 +470,7 @@ */ @RequestMapping(value = "/saveJob") @ResponseBody - public Object saveJob(@RequestParam(value = "id", required = true) int id, + public Object saveJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "handleMessage", required = true) String handleMessage, @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { @@ -486,7 +486,7 @@ */ @RequestMapping(value = "/overJob") @ResponseBody - public Object overJob(@RequestParam(value = "id", required = true) int id, + public Object overJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "handleMessage", required = true) String handleMessage, @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index 1f65166..e07d4b2 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -160,4 +160,8 @@ } return ResponseData.success(); } + + + + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index d49386c..8b3f54a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -39,17 +39,17 @@ List> jobInfo(Long id, DataScope dataScope, Long personId); - boolean getJob(int id, long personId); + boolean getJob(Long id, long personId); - boolean confirmJob(int id, long personId, String firstState, String firstStatePhotos, String needHandle); + boolean confirmJob(Long id, long personId, String firstState, String firstStatePhotos, String needHandle); - boolean transferJob(int id, long transferPerson, String flowRec); + boolean transferJob(Long id, long transferPerson, String flowRec); - boolean saveJob(int id, String handleMessage, String handlePhotos); + boolean saveJob(Long id, String handleMessage, String handlePhotos); - boolean overJob(int id, long personId, String handleMessage, String handlePhotos); + boolean overJob(Long id, long personId, String handleMessage, String handlePhotos); - boolean overAlarm(int id); + boolean overAlarm(Long id); boolean handleJob(Long id, long personId); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 4c9ee46..738629e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -412,7 +412,7 @@ */ @RequestMapping(value = "/getJob") @ResponseBody - public Object getJob(int id) { + public Object getJob(Long id) { AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -428,7 +428,7 @@ */ @RequestMapping(value = "/confirmJob") @ResponseBody - public Object confirmJob(@RequestParam(value = "id", required = true) int id, + public Object confirmJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "firstState", required = true) String firstState, @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, @RequestParam(value = "needHandle", required = true) String needHandle) { @@ -445,7 +445,7 @@ */ @RequestMapping(value = "/transferJob") @ResponseBody - public Object transferJob(@RequestParam(value = "id", required = true) int id, + public Object transferJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "transferPerson", required = true) String transferPerson) { AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -470,7 +470,7 @@ */ @RequestMapping(value = "/saveJob") @ResponseBody - public Object saveJob(@RequestParam(value = "id", required = true) int id, + public Object saveJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "handleMessage", required = true) String handleMessage, @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { @@ -486,7 +486,7 @@ */ @RequestMapping(value = "/overJob") @ResponseBody - public Object overJob(@RequestParam(value = "id", required = true) int id, + public Object overJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "handleMessage", required = true) String handleMessage, @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index 1f65166..e07d4b2 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -160,4 +160,8 @@ } return ResponseData.success(); } + + + + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index d49386c..8b3f54a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -39,17 +39,17 @@ List> jobInfo(Long id, DataScope dataScope, Long personId); - boolean getJob(int id, long personId); + boolean getJob(Long id, long personId); - boolean confirmJob(int id, long personId, String firstState, String firstStatePhotos, String needHandle); + boolean confirmJob(Long id, long personId, String firstState, String firstStatePhotos, String needHandle); - boolean transferJob(int id, long transferPerson, String flowRec); + boolean transferJob(Long id, long transferPerson, String flowRec); - boolean saveJob(int id, String handleMessage, String handlePhotos); + boolean saveJob(Long id, String handleMessage, String handlePhotos); - boolean overJob(int id, long personId, String handleMessage, String handlePhotos); + boolean overJob(Long id, long personId, String handleMessage, String handlePhotos); - boolean overAlarm(int id); + boolean overAlarm(Long id); boolean handleJob(Long id, long personId); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index 8117a93..e4888e4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -162,7 +162,7 @@ } @Override - public boolean getJob(int id, long personId) { + public boolean getJob(Long id, long personId) { Calendar now = Calendar.getInstance(); Date getTime = now.getTime(); @@ -203,7 +203,7 @@ } @Override - public boolean confirmJob(int id, long personId, String firstState, String firstStatePhotos, String needHandle) { + public boolean confirmJob(Long id, long personId, String firstState, String firstStatePhotos, String needHandle) { if ("1".equals(needHandle)) { return this.baseMapper.confirmJob(id, personId, firstState, firstStatePhotos, needHandle); } else { @@ -212,23 +212,23 @@ } @Override - public boolean transferJob(int id, long transferPerson, String flowRec) { + public boolean transferJob(Long id, long transferPerson, String flowRec) { return this.baseMapper.transferJob(id, transferPerson, flowRec); } @Override - public boolean saveJob(int id, String handleMessage, String handlePhotos) { + public boolean saveJob(Long id, String handleMessage, String handlePhotos) { return this.baseMapper.saveJob(id, handleMessage, handlePhotos); } @Override - public boolean overJob(int id, long personId, String handleMessage, String handlePhotos) { + public boolean overJob(Long id, long personId, String handleMessage, String handlePhotos) { return this.baseMapper.overJobAndAlarm(id, personId, handleMessage, handlePhotos) && this.baseMapper.overJobAlarmRecrds(id); // return this.baseMapper.overJob(id, personId,handleMessage, handlePhotos); } @Override - public boolean overAlarm(int jobId) { + public boolean overAlarm(Long jobId) { return this.baseMapper.overAlarm(jobId); // return this.baseMapper.overJob(id, personId,handleMessage, handlePhotos); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 4c9ee46..738629e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -412,7 +412,7 @@ */ @RequestMapping(value = "/getJob") @ResponseBody - public Object getJob(int id) { + public Object getJob(Long id) { AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -428,7 +428,7 @@ */ @RequestMapping(value = "/confirmJob") @ResponseBody - public Object confirmJob(@RequestParam(value = "id", required = true) int id, + public Object confirmJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "firstState", required = true) String firstState, @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, @RequestParam(value = "needHandle", required = true) String needHandle) { @@ -445,7 +445,7 @@ */ @RequestMapping(value = "/transferJob") @ResponseBody - public Object transferJob(@RequestParam(value = "id", required = true) int id, + public Object transferJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "transferPerson", required = true) String transferPerson) { AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -470,7 +470,7 @@ */ @RequestMapping(value = "/saveJob") @ResponseBody - public Object saveJob(@RequestParam(value = "id", required = true) int id, + public Object saveJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "handleMessage", required = true) String handleMessage, @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { @@ -486,7 +486,7 @@ */ @RequestMapping(value = "/overJob") @ResponseBody - public Object overJob(@RequestParam(value = "id", required = true) int id, + public Object overJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "handleMessage", required = true) String handleMessage, @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index 1f65166..e07d4b2 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -160,4 +160,8 @@ } return ResponseData.success(); } + + + + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index d49386c..8b3f54a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -39,17 +39,17 @@ List> jobInfo(Long id, DataScope dataScope, Long personId); - boolean getJob(int id, long personId); + boolean getJob(Long id, long personId); - boolean confirmJob(int id, long personId, String firstState, String firstStatePhotos, String needHandle); + boolean confirmJob(Long id, long personId, String firstState, String firstStatePhotos, String needHandle); - boolean transferJob(int id, long transferPerson, String flowRec); + boolean transferJob(Long id, long transferPerson, String flowRec); - boolean saveJob(int id, String handleMessage, String handlePhotos); + boolean saveJob(Long id, String handleMessage, String handlePhotos); - boolean overJob(int id, long personId, String handleMessage, String handlePhotos); + boolean overJob(Long id, long personId, String handleMessage, String handlePhotos); - boolean overAlarm(int id); + boolean overAlarm(Long id); boolean handleJob(Long id, long personId); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index 8117a93..e4888e4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -162,7 +162,7 @@ } @Override - public boolean getJob(int id, long personId) { + public boolean getJob(Long id, long personId) { Calendar now = Calendar.getInstance(); Date getTime = now.getTime(); @@ -203,7 +203,7 @@ } @Override - public boolean confirmJob(int id, long personId, String firstState, String firstStatePhotos, String needHandle) { + public boolean confirmJob(Long id, long personId, String firstState, String firstStatePhotos, String needHandle) { if ("1".equals(needHandle)) { return this.baseMapper.confirmJob(id, personId, firstState, firstStatePhotos, needHandle); } else { @@ -212,23 +212,23 @@ } @Override - public boolean transferJob(int id, long transferPerson, String flowRec) { + public boolean transferJob(Long id, long transferPerson, String flowRec) { return this.baseMapper.transferJob(id, transferPerson, flowRec); } @Override - public boolean saveJob(int id, String handleMessage, String handlePhotos) { + public boolean saveJob(Long id, String handleMessage, String handlePhotos) { return this.baseMapper.saveJob(id, handleMessage, handlePhotos); } @Override - public boolean overJob(int id, long personId, String handleMessage, String handlePhotos) { + public boolean overJob(Long id, long personId, String handleMessage, String handlePhotos) { return this.baseMapper.overJobAndAlarm(id, personId, handleMessage, handlePhotos) && this.baseMapper.overJobAlarmRecrds(id); // return this.baseMapper.overJob(id, personId,handleMessage, handlePhotos); } @Override - public boolean overAlarm(int jobId) { + public boolean overAlarm(Long jobId) { return this.baseMapper.overAlarm(jobId); // return this.baseMapper.overJob(id, personId,handleMessage, handlePhotos); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java index 57d3173..8a57cae 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java @@ -51,25 +51,25 @@ List> jobInfo(@Param("id") Long id, @Param("dataScope") DataScope dataScope, @Param("personId") Long personId); // boolean getJob(@Param("id") int id,@Param("personId") long personId); - boolean getJob(@Param("id") int id, @Param("personId") long personId, @Param("getTime") Date getTime, @Param("shouldHandleTime") Date shouldHandleTime); + boolean getJob(@Param("id") Long id, @Param("personId") long personId, @Param("getTime") Date getTime, @Param("shouldHandleTime") Date shouldHandleTime); - boolean confirmJob(@Param("id") int id, @Param("personId") long personId, @Param("firstState") String firstState, @Param("firstStatePhotos") String firstStatePhotos, @Param("needHandle") String needHandle); + boolean confirmJob(@Param("id") Long id, @Param("personId") long personId, @Param("firstState") String firstState, @Param("firstStatePhotos") String firstStatePhotos, @Param("needHandle") String needHandle); - boolean confirmOverJobAndAlarm(@Param("id") int id, @Param("personId") long personId, @Param("firstState") String firstState, @Param("firstStatePhotos") String firstStatePhotos); + boolean confirmOverJobAndAlarm(@Param("id") Long id, @Param("personId") long personId, @Param("firstState") String firstState, @Param("firstStatePhotos") String firstStatePhotos); - boolean confirmOverAlarmRecords(@Param("id") int id); + boolean confirmOverAlarmRecords(@Param("id") Long id); - boolean transferJob(@Param("id") int id, @Param("transferPerson") long transferPerson, @Param("flowRec") String flowRec); + boolean transferJob(@Param("id") Long id, @Param("transferPerson") long transferPerson, @Param("flowRec") String flowRec); - boolean saveJob(@Param("id") int id, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); + boolean saveJob(@Param("id") Long id, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); - boolean overJob(@Param("id") int id, @Param("personId") long personId, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); + boolean overJob(@Param("id") Long id, @Param("personId") long personId, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); - boolean overAlarm(@Param("jobId") int id); + boolean overAlarm(@Param("jobId") Long id); - boolean overJobAndAlarm(@Param("id") int id, @Param("personId") long personId, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); + boolean overJobAndAlarm(@Param("id") Long id, @Param("personId") long personId, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); - boolean overJobAlarmRecrds(@Param("id") int id); + boolean overJobAlarmRecrds(@Param("id") Long id); boolean handleJob(@Param("id") Long id, @Param("personId") long personId); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 4c9ee46..738629e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -412,7 +412,7 @@ */ @RequestMapping(value = "/getJob") @ResponseBody - public Object getJob(int id) { + public Object getJob(Long id) { AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -428,7 +428,7 @@ */ @RequestMapping(value = "/confirmJob") @ResponseBody - public Object confirmJob(@RequestParam(value = "id", required = true) int id, + public Object confirmJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "firstState", required = true) String firstState, @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, @RequestParam(value = "needHandle", required = true) String needHandle) { @@ -445,7 +445,7 @@ */ @RequestMapping(value = "/transferJob") @ResponseBody - public Object transferJob(@RequestParam(value = "id", required = true) int id, + public Object transferJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "transferPerson", required = true) String transferPerson) { AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -470,7 +470,7 @@ */ @RequestMapping(value = "/saveJob") @ResponseBody - public Object saveJob(@RequestParam(value = "id", required = true) int id, + public Object saveJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "handleMessage", required = true) String handleMessage, @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { @@ -486,7 +486,7 @@ */ @RequestMapping(value = "/overJob") @ResponseBody - public Object overJob(@RequestParam(value = "id", required = true) int id, + public Object overJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "handleMessage", required = true) String handleMessage, @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index 1f65166..e07d4b2 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -160,4 +160,8 @@ } return ResponseData.success(); } + + + + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index d49386c..8b3f54a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -39,17 +39,17 @@ List> jobInfo(Long id, DataScope dataScope, Long personId); - boolean getJob(int id, long personId); + boolean getJob(Long id, long personId); - boolean confirmJob(int id, long personId, String firstState, String firstStatePhotos, String needHandle); + boolean confirmJob(Long id, long personId, String firstState, String firstStatePhotos, String needHandle); - boolean transferJob(int id, long transferPerson, String flowRec); + boolean transferJob(Long id, long transferPerson, String flowRec); - boolean saveJob(int id, String handleMessage, String handlePhotos); + boolean saveJob(Long id, String handleMessage, String handlePhotos); - boolean overJob(int id, long personId, String handleMessage, String handlePhotos); + boolean overJob(Long id, long personId, String handleMessage, String handlePhotos); - boolean overAlarm(int id); + boolean overAlarm(Long id); boolean handleJob(Long id, long personId); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index 8117a93..e4888e4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -162,7 +162,7 @@ } @Override - public boolean getJob(int id, long personId) { + public boolean getJob(Long id, long personId) { Calendar now = Calendar.getInstance(); Date getTime = now.getTime(); @@ -203,7 +203,7 @@ } @Override - public boolean confirmJob(int id, long personId, String firstState, String firstStatePhotos, String needHandle) { + public boolean confirmJob(Long id, long personId, String firstState, String firstStatePhotos, String needHandle) { if ("1".equals(needHandle)) { return this.baseMapper.confirmJob(id, personId, firstState, firstStatePhotos, needHandle); } else { @@ -212,23 +212,23 @@ } @Override - public boolean transferJob(int id, long transferPerson, String flowRec) { + public boolean transferJob(Long id, long transferPerson, String flowRec) { return this.baseMapper.transferJob(id, transferPerson, flowRec); } @Override - public boolean saveJob(int id, String handleMessage, String handlePhotos) { + public boolean saveJob(Long id, String handleMessage, String handlePhotos) { return this.baseMapper.saveJob(id, handleMessage, handlePhotos); } @Override - public boolean overJob(int id, long personId, String handleMessage, String handlePhotos) { + public boolean overJob(Long id, long personId, String handleMessage, String handlePhotos) { return this.baseMapper.overJobAndAlarm(id, personId, handleMessage, handlePhotos) && this.baseMapper.overJobAlarmRecrds(id); // return this.baseMapper.overJob(id, personId,handleMessage, handlePhotos); } @Override - public boolean overAlarm(int jobId) { + public boolean overAlarm(Long jobId) { return this.baseMapper.overAlarm(jobId); // return this.baseMapper.overJob(id, personId,handleMessage, handlePhotos); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java index 57d3173..8a57cae 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java @@ -51,25 +51,25 @@ List> jobInfo(@Param("id") Long id, @Param("dataScope") DataScope dataScope, @Param("personId") Long personId); // boolean getJob(@Param("id") int id,@Param("personId") long personId); - boolean getJob(@Param("id") int id, @Param("personId") long personId, @Param("getTime") Date getTime, @Param("shouldHandleTime") Date shouldHandleTime); + boolean getJob(@Param("id") Long id, @Param("personId") long personId, @Param("getTime") Date getTime, @Param("shouldHandleTime") Date shouldHandleTime); - boolean confirmJob(@Param("id") int id, @Param("personId") long personId, @Param("firstState") String firstState, @Param("firstStatePhotos") String firstStatePhotos, @Param("needHandle") String needHandle); + boolean confirmJob(@Param("id") Long id, @Param("personId") long personId, @Param("firstState") String firstState, @Param("firstStatePhotos") String firstStatePhotos, @Param("needHandle") String needHandle); - boolean confirmOverJobAndAlarm(@Param("id") int id, @Param("personId") long personId, @Param("firstState") String firstState, @Param("firstStatePhotos") String firstStatePhotos); + boolean confirmOverJobAndAlarm(@Param("id") Long id, @Param("personId") long personId, @Param("firstState") String firstState, @Param("firstStatePhotos") String firstStatePhotos); - boolean confirmOverAlarmRecords(@Param("id") int id); + boolean confirmOverAlarmRecords(@Param("id") Long id); - boolean transferJob(@Param("id") int id, @Param("transferPerson") long transferPerson, @Param("flowRec") String flowRec); + boolean transferJob(@Param("id") Long id, @Param("transferPerson") long transferPerson, @Param("flowRec") String flowRec); - boolean saveJob(@Param("id") int id, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); + boolean saveJob(@Param("id") Long id, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); - boolean overJob(@Param("id") int id, @Param("personId") long personId, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); + boolean overJob(@Param("id") Long id, @Param("personId") long personId, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); - boolean overAlarm(@Param("jobId") int id); + boolean overAlarm(@Param("jobId") Long id); - boolean overJobAndAlarm(@Param("id") int id, @Param("personId") long personId, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); + boolean overJobAndAlarm(@Param("id") Long id, @Param("personId") long personId, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); - boolean overJobAlarmRecrds(@Param("id") int id); + boolean overJobAlarmRecrds(@Param("id") Long id); boolean handleJob(@Param("id") Long id, @Param("personId") long personId); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java index 974e3f6..5f9764f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java @@ -11,34 +11,10 @@ @Mapper public interface DeviceTubeMapper { - @Select("SELECT * " + - "FROM bus_well_info bwi, " + - "bus_device_well bdw, " + - "bus_device bd " + - "WHERE bd.DEVICE_TYPE='16' " + - "AND bwi.WELL_FLAG_1='1' " + - "AND bdw.WELL_ID=bwi.ID " + - "AND bd.ID=bdw.DEVICE_ID ") List> deviceList(@Param("scope") DataScope dataScope); - @Select("SELECT * " + - "FROM bus_well_info bwi, " + - "bus_device_well bdw, " + - "bus_device bd " + - "LEFT JOIN (SELECT DEVCODE,STRENGTH,id as data_tube_id,UPTIME " + - "FROM data_tube " + - "WHERE datediff(now(),UPTIME) <3" + - "AND datediff(now(),UPTIME) >0 " + - "GROUP BY DEVCODE, STRENGTH,id,UPTIME) dzt ON dzt.DEVCODE=bd.DEVCODE " + - "WHERE bd.DEVICE_TYPE='16' " + - "AND bwi.WELL_FLAG_1=#{wellGroupId}" + - "AND bdw.WELL_ID=bwi.ID " + - "AND bd.ID=bdw.DEVICE_ID") List> deviceGroupList(@Param("wellGroupId") String wellGroupId, @Param("scope") DataScope dataScope); - @Select("SELECT * " + - "FROM data_tube " + - "WHERE id=#{id} ") - Map deviceDetail(@Param("id") String id); + Map deviceDetail(@Param("id") Long id); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 4c9ee46..738629e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -412,7 +412,7 @@ */ @RequestMapping(value = "/getJob") @ResponseBody - public Object getJob(int id) { + public Object getJob(Long id) { AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -428,7 +428,7 @@ */ @RequestMapping(value = "/confirmJob") @ResponseBody - public Object confirmJob(@RequestParam(value = "id", required = true) int id, + public Object confirmJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "firstState", required = true) String firstState, @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, @RequestParam(value = "needHandle", required = true) String needHandle) { @@ -445,7 +445,7 @@ */ @RequestMapping(value = "/transferJob") @ResponseBody - public Object transferJob(@RequestParam(value = "id", required = true) int id, + public Object transferJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "transferPerson", required = true) String transferPerson) { AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -470,7 +470,7 @@ */ @RequestMapping(value = "/saveJob") @ResponseBody - public Object saveJob(@RequestParam(value = "id", required = true) int id, + public Object saveJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "handleMessage", required = true) String handleMessage, @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { @@ -486,7 +486,7 @@ */ @RequestMapping(value = "/overJob") @ResponseBody - public Object overJob(@RequestParam(value = "id", required = true) int id, + public Object overJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "handleMessage", required = true) String handleMessage, @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index 1f65166..e07d4b2 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -160,4 +160,8 @@ } return ResponseData.success(); } + + + + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index d49386c..8b3f54a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -39,17 +39,17 @@ List> jobInfo(Long id, DataScope dataScope, Long personId); - boolean getJob(int id, long personId); + boolean getJob(Long id, long personId); - boolean confirmJob(int id, long personId, String firstState, String firstStatePhotos, String needHandle); + boolean confirmJob(Long id, long personId, String firstState, String firstStatePhotos, String needHandle); - boolean transferJob(int id, long transferPerson, String flowRec); + boolean transferJob(Long id, long transferPerson, String flowRec); - boolean saveJob(int id, String handleMessage, String handlePhotos); + boolean saveJob(Long id, String handleMessage, String handlePhotos); - boolean overJob(int id, long personId, String handleMessage, String handlePhotos); + boolean overJob(Long id, long personId, String handleMessage, String handlePhotos); - boolean overAlarm(int id); + boolean overAlarm(Long id); boolean handleJob(Long id, long personId); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index 8117a93..e4888e4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -162,7 +162,7 @@ } @Override - public boolean getJob(int id, long personId) { + public boolean getJob(Long id, long personId) { Calendar now = Calendar.getInstance(); Date getTime = now.getTime(); @@ -203,7 +203,7 @@ } @Override - public boolean confirmJob(int id, long personId, String firstState, String firstStatePhotos, String needHandle) { + public boolean confirmJob(Long id, long personId, String firstState, String firstStatePhotos, String needHandle) { if ("1".equals(needHandle)) { return this.baseMapper.confirmJob(id, personId, firstState, firstStatePhotos, needHandle); } else { @@ -212,23 +212,23 @@ } @Override - public boolean transferJob(int id, long transferPerson, String flowRec) { + public boolean transferJob(Long id, long transferPerson, String flowRec) { return this.baseMapper.transferJob(id, transferPerson, flowRec); } @Override - public boolean saveJob(int id, String handleMessage, String handlePhotos) { + public boolean saveJob(Long id, String handleMessage, String handlePhotos) { return this.baseMapper.saveJob(id, handleMessage, handlePhotos); } @Override - public boolean overJob(int id, long personId, String handleMessage, String handlePhotos) { + public boolean overJob(Long id, long personId, String handleMessage, String handlePhotos) { return this.baseMapper.overJobAndAlarm(id, personId, handleMessage, handlePhotos) && this.baseMapper.overJobAlarmRecrds(id); // return this.baseMapper.overJob(id, personId,handleMessage, handlePhotos); } @Override - public boolean overAlarm(int jobId) { + public boolean overAlarm(Long jobId) { return this.baseMapper.overAlarm(jobId); // return this.baseMapper.overJob(id, personId,handleMessage, handlePhotos); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java index 57d3173..8a57cae 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java @@ -51,25 +51,25 @@ List> jobInfo(@Param("id") Long id, @Param("dataScope") DataScope dataScope, @Param("personId") Long personId); // boolean getJob(@Param("id") int id,@Param("personId") long personId); - boolean getJob(@Param("id") int id, @Param("personId") long personId, @Param("getTime") Date getTime, @Param("shouldHandleTime") Date shouldHandleTime); + boolean getJob(@Param("id") Long id, @Param("personId") long personId, @Param("getTime") Date getTime, @Param("shouldHandleTime") Date shouldHandleTime); - boolean confirmJob(@Param("id") int id, @Param("personId") long personId, @Param("firstState") String firstState, @Param("firstStatePhotos") String firstStatePhotos, @Param("needHandle") String needHandle); + boolean confirmJob(@Param("id") Long id, @Param("personId") long personId, @Param("firstState") String firstState, @Param("firstStatePhotos") String firstStatePhotos, @Param("needHandle") String needHandle); - boolean confirmOverJobAndAlarm(@Param("id") int id, @Param("personId") long personId, @Param("firstState") String firstState, @Param("firstStatePhotos") String firstStatePhotos); + boolean confirmOverJobAndAlarm(@Param("id") Long id, @Param("personId") long personId, @Param("firstState") String firstState, @Param("firstStatePhotos") String firstStatePhotos); - boolean confirmOverAlarmRecords(@Param("id") int id); + boolean confirmOverAlarmRecords(@Param("id") Long id); - boolean transferJob(@Param("id") int id, @Param("transferPerson") long transferPerson, @Param("flowRec") String flowRec); + boolean transferJob(@Param("id") Long id, @Param("transferPerson") long transferPerson, @Param("flowRec") String flowRec); - boolean saveJob(@Param("id") int id, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); + boolean saveJob(@Param("id") Long id, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); - boolean overJob(@Param("id") int id, @Param("personId") long personId, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); + boolean overJob(@Param("id") Long id, @Param("personId") long personId, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); - boolean overAlarm(@Param("jobId") int id); + boolean overAlarm(@Param("jobId") Long id); - boolean overJobAndAlarm(@Param("id") int id, @Param("personId") long personId, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); + boolean overJobAndAlarm(@Param("id") Long id, @Param("personId") long personId, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); - boolean overJobAlarmRecrds(@Param("id") int id); + boolean overJobAlarmRecrds(@Param("id") Long id); boolean handleJob(@Param("id") Long id, @Param("personId") long personId); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java index 974e3f6..5f9764f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java @@ -11,34 +11,10 @@ @Mapper public interface DeviceTubeMapper { - @Select("SELECT * " + - "FROM bus_well_info bwi, " + - "bus_device_well bdw, " + - "bus_device bd " + - "WHERE bd.DEVICE_TYPE='16' " + - "AND bwi.WELL_FLAG_1='1' " + - "AND bdw.WELL_ID=bwi.ID " + - "AND bd.ID=bdw.DEVICE_ID ") List> deviceList(@Param("scope") DataScope dataScope); - @Select("SELECT * " + - "FROM bus_well_info bwi, " + - "bus_device_well bdw, " + - "bus_device bd " + - "LEFT JOIN (SELECT DEVCODE,STRENGTH,id as data_tube_id,UPTIME " + - "FROM data_tube " + - "WHERE datediff(now(),UPTIME) <3" + - "AND datediff(now(),UPTIME) >0 " + - "GROUP BY DEVCODE, STRENGTH,id,UPTIME) dzt ON dzt.DEVCODE=bd.DEVCODE " + - "WHERE bd.DEVICE_TYPE='16' " + - "AND bwi.WELL_FLAG_1=#{wellGroupId}" + - "AND bdw.WELL_ID=bwi.ID " + - "AND bd.ID=bdw.DEVICE_ID") List> deviceGroupList(@Param("wellGroupId") String wellGroupId, @Param("scope") DataScope dataScope); - @Select("SELECT * " + - "FROM data_tube " + - "WHERE id=#{id} ") - Map deviceDetail(@Param("id") String id); + Map deviceDetail(@Param("id") Long id); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml new file mode 100644 index 0000000..a8e0b37 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml @@ -0,0 +1,51 @@ + + + + + + and datediff(now(),UPTIME) 3 + + + + AND date_part('day',now(),UPTIME) 3 + + + + and date_part(now(),UPTIME) 3 + + + + + + + + + + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 4c9ee46..738629e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -412,7 +412,7 @@ */ @RequestMapping(value = "/getJob") @ResponseBody - public Object getJob(int id) { + public Object getJob(Long id) { AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -428,7 +428,7 @@ */ @RequestMapping(value = "/confirmJob") @ResponseBody - public Object confirmJob(@RequestParam(value = "id", required = true) int id, + public Object confirmJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "firstState", required = true) String firstState, @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, @RequestParam(value = "needHandle", required = true) String needHandle) { @@ -445,7 +445,7 @@ */ @RequestMapping(value = "/transferJob") @ResponseBody - public Object transferJob(@RequestParam(value = "id", required = true) int id, + public Object transferJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "transferPerson", required = true) String transferPerson) { AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -470,7 +470,7 @@ */ @RequestMapping(value = "/saveJob") @ResponseBody - public Object saveJob(@RequestParam(value = "id", required = true) int id, + public Object saveJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "handleMessage", required = true) String handleMessage, @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { @@ -486,7 +486,7 @@ */ @RequestMapping(value = "/overJob") @ResponseBody - public Object overJob(@RequestParam(value = "id", required = true) int id, + public Object overJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "handleMessage", required = true) String handleMessage, @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index 1f65166..e07d4b2 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -160,4 +160,8 @@ } return ResponseData.success(); } + + + + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index d49386c..8b3f54a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -39,17 +39,17 @@ List> jobInfo(Long id, DataScope dataScope, Long personId); - boolean getJob(int id, long personId); + boolean getJob(Long id, long personId); - boolean confirmJob(int id, long personId, String firstState, String firstStatePhotos, String needHandle); + boolean confirmJob(Long id, long personId, String firstState, String firstStatePhotos, String needHandle); - boolean transferJob(int id, long transferPerson, String flowRec); + boolean transferJob(Long id, long transferPerson, String flowRec); - boolean saveJob(int id, String handleMessage, String handlePhotos); + boolean saveJob(Long id, String handleMessage, String handlePhotos); - boolean overJob(int id, long personId, String handleMessage, String handlePhotos); + boolean overJob(Long id, long personId, String handleMessage, String handlePhotos); - boolean overAlarm(int id); + boolean overAlarm(Long id); boolean handleJob(Long id, long personId); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index 8117a93..e4888e4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -162,7 +162,7 @@ } @Override - public boolean getJob(int id, long personId) { + public boolean getJob(Long id, long personId) { Calendar now = Calendar.getInstance(); Date getTime = now.getTime(); @@ -203,7 +203,7 @@ } @Override - public boolean confirmJob(int id, long personId, String firstState, String firstStatePhotos, String needHandle) { + public boolean confirmJob(Long id, long personId, String firstState, String firstStatePhotos, String needHandle) { if ("1".equals(needHandle)) { return this.baseMapper.confirmJob(id, personId, firstState, firstStatePhotos, needHandle); } else { @@ -212,23 +212,23 @@ } @Override - public boolean transferJob(int id, long transferPerson, String flowRec) { + public boolean transferJob(Long id, long transferPerson, String flowRec) { return this.baseMapper.transferJob(id, transferPerson, flowRec); } @Override - public boolean saveJob(int id, String handleMessage, String handlePhotos) { + public boolean saveJob(Long id, String handleMessage, String handlePhotos) { return this.baseMapper.saveJob(id, handleMessage, handlePhotos); } @Override - public boolean overJob(int id, long personId, String handleMessage, String handlePhotos) { + public boolean overJob(Long id, long personId, String handleMessage, String handlePhotos) { return this.baseMapper.overJobAndAlarm(id, personId, handleMessage, handlePhotos) && this.baseMapper.overJobAlarmRecrds(id); // return this.baseMapper.overJob(id, personId,handleMessage, handlePhotos); } @Override - public boolean overAlarm(int jobId) { + public boolean overAlarm(Long jobId) { return this.baseMapper.overAlarm(jobId); // return this.baseMapper.overJob(id, personId,handleMessage, handlePhotos); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java index 57d3173..8a57cae 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java @@ -51,25 +51,25 @@ List> jobInfo(@Param("id") Long id, @Param("dataScope") DataScope dataScope, @Param("personId") Long personId); // boolean getJob(@Param("id") int id,@Param("personId") long personId); - boolean getJob(@Param("id") int id, @Param("personId") long personId, @Param("getTime") Date getTime, @Param("shouldHandleTime") Date shouldHandleTime); + boolean getJob(@Param("id") Long id, @Param("personId") long personId, @Param("getTime") Date getTime, @Param("shouldHandleTime") Date shouldHandleTime); - boolean confirmJob(@Param("id") int id, @Param("personId") long personId, @Param("firstState") String firstState, @Param("firstStatePhotos") String firstStatePhotos, @Param("needHandle") String needHandle); + boolean confirmJob(@Param("id") Long id, @Param("personId") long personId, @Param("firstState") String firstState, @Param("firstStatePhotos") String firstStatePhotos, @Param("needHandle") String needHandle); - boolean confirmOverJobAndAlarm(@Param("id") int id, @Param("personId") long personId, @Param("firstState") String firstState, @Param("firstStatePhotos") String firstStatePhotos); + boolean confirmOverJobAndAlarm(@Param("id") Long id, @Param("personId") long personId, @Param("firstState") String firstState, @Param("firstStatePhotos") String firstStatePhotos); - boolean confirmOverAlarmRecords(@Param("id") int id); + boolean confirmOverAlarmRecords(@Param("id") Long id); - boolean transferJob(@Param("id") int id, @Param("transferPerson") long transferPerson, @Param("flowRec") String flowRec); + boolean transferJob(@Param("id") Long id, @Param("transferPerson") long transferPerson, @Param("flowRec") String flowRec); - boolean saveJob(@Param("id") int id, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); + boolean saveJob(@Param("id") Long id, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); - boolean overJob(@Param("id") int id, @Param("personId") long personId, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); + boolean overJob(@Param("id") Long id, @Param("personId") long personId, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); - boolean overAlarm(@Param("jobId") int id); + boolean overAlarm(@Param("jobId") Long id); - boolean overJobAndAlarm(@Param("id") int id, @Param("personId") long personId, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); + boolean overJobAndAlarm(@Param("id") Long id, @Param("personId") long personId, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); - boolean overJobAlarmRecrds(@Param("id") int id); + boolean overJobAlarmRecrds(@Param("id") Long id); boolean handleJob(@Param("id") Long id, @Param("personId") long personId); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java index 974e3f6..5f9764f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java @@ -11,34 +11,10 @@ @Mapper public interface DeviceTubeMapper { - @Select("SELECT * " + - "FROM bus_well_info bwi, " + - "bus_device_well bdw, " + - "bus_device bd " + - "WHERE bd.DEVICE_TYPE='16' " + - "AND bwi.WELL_FLAG_1='1' " + - "AND bdw.WELL_ID=bwi.ID " + - "AND bd.ID=bdw.DEVICE_ID ") List> deviceList(@Param("scope") DataScope dataScope); - @Select("SELECT * " + - "FROM bus_well_info bwi, " + - "bus_device_well bdw, " + - "bus_device bd " + - "LEFT JOIN (SELECT DEVCODE,STRENGTH,id as data_tube_id,UPTIME " + - "FROM data_tube " + - "WHERE datediff(now(),UPTIME) <3" + - "AND datediff(now(),UPTIME) >0 " + - "GROUP BY DEVCODE, STRENGTH,id,UPTIME) dzt ON dzt.DEVCODE=bd.DEVCODE " + - "WHERE bd.DEVICE_TYPE='16' " + - "AND bwi.WELL_FLAG_1=#{wellGroupId}" + - "AND bdw.WELL_ID=bwi.ID " + - "AND bd.ID=bdw.DEVICE_ID") List> deviceGroupList(@Param("wellGroupId") String wellGroupId, @Param("scope") DataScope dataScope); - @Select("SELECT * " + - "FROM data_tube " + - "WHERE id=#{id} ") - Map deviceDetail(@Param("id") String id); + Map deviceDetail(@Param("id") Long id); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml new file mode 100644 index 0000000..a8e0b37 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml @@ -0,0 +1,51 @@ + + + + + + and datediff(now(),UPTIME) 3 + + + + AND date_part('day',now(),UPTIME) 3 + + + + and date_part(now(),UPTIME) 3 + + + + + + + + + + + \ No newline at end of file diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTubeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTubeServiceImpl.java index 7b0309d..8ddf8ff 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTubeServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTubeServiceImpl.java @@ -70,7 +70,7 @@ public Object deviceDetail(String id) { ResponseData responseData = new ResponseData(); try { - Map tubeDeviceData = deviceTubeMapper.deviceDetail(id); + Map tubeDeviceData = deviceTubeMapper.deviceDetail(Long.valueOf(id)); responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); responseData.setData(tubeDeviceData); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 4c9ee46..738629e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -412,7 +412,7 @@ */ @RequestMapping(value = "/getJob") @ResponseBody - public Object getJob(int id) { + public Object getJob(Long id) { AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -428,7 +428,7 @@ */ @RequestMapping(value = "/confirmJob") @ResponseBody - public Object confirmJob(@RequestParam(value = "id", required = true) int id, + public Object confirmJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "firstState", required = true) String firstState, @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, @RequestParam(value = "needHandle", required = true) String needHandle) { @@ -445,7 +445,7 @@ */ @RequestMapping(value = "/transferJob") @ResponseBody - public Object transferJob(@RequestParam(value = "id", required = true) int id, + public Object transferJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "transferPerson", required = true) String transferPerson) { AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -470,7 +470,7 @@ */ @RequestMapping(value = "/saveJob") @ResponseBody - public Object saveJob(@RequestParam(value = "id", required = true) int id, + public Object saveJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "handleMessage", required = true) String handleMessage, @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { @@ -486,7 +486,7 @@ */ @RequestMapping(value = "/overJob") @ResponseBody - public Object overJob(@RequestParam(value = "id", required = true) int id, + public Object overJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "handleMessage", required = true) String handleMessage, @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index 1f65166..e07d4b2 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -160,4 +160,8 @@ } return ResponseData.success(); } + + + + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index d49386c..8b3f54a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -39,17 +39,17 @@ List> jobInfo(Long id, DataScope dataScope, Long personId); - boolean getJob(int id, long personId); + boolean getJob(Long id, long personId); - boolean confirmJob(int id, long personId, String firstState, String firstStatePhotos, String needHandle); + boolean confirmJob(Long id, long personId, String firstState, String firstStatePhotos, String needHandle); - boolean transferJob(int id, long transferPerson, String flowRec); + boolean transferJob(Long id, long transferPerson, String flowRec); - boolean saveJob(int id, String handleMessage, String handlePhotos); + boolean saveJob(Long id, String handleMessage, String handlePhotos); - boolean overJob(int id, long personId, String handleMessage, String handlePhotos); + boolean overJob(Long id, long personId, String handleMessage, String handlePhotos); - boolean overAlarm(int id); + boolean overAlarm(Long id); boolean handleJob(Long id, long personId); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index 8117a93..e4888e4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -162,7 +162,7 @@ } @Override - public boolean getJob(int id, long personId) { + public boolean getJob(Long id, long personId) { Calendar now = Calendar.getInstance(); Date getTime = now.getTime(); @@ -203,7 +203,7 @@ } @Override - public boolean confirmJob(int id, long personId, String firstState, String firstStatePhotos, String needHandle) { + public boolean confirmJob(Long id, long personId, String firstState, String firstStatePhotos, String needHandle) { if ("1".equals(needHandle)) { return this.baseMapper.confirmJob(id, personId, firstState, firstStatePhotos, needHandle); } else { @@ -212,23 +212,23 @@ } @Override - public boolean transferJob(int id, long transferPerson, String flowRec) { + public boolean transferJob(Long id, long transferPerson, String flowRec) { return this.baseMapper.transferJob(id, transferPerson, flowRec); } @Override - public boolean saveJob(int id, String handleMessage, String handlePhotos) { + public boolean saveJob(Long id, String handleMessage, String handlePhotos) { return this.baseMapper.saveJob(id, handleMessage, handlePhotos); } @Override - public boolean overJob(int id, long personId, String handleMessage, String handlePhotos) { + public boolean overJob(Long id, long personId, String handleMessage, String handlePhotos) { return this.baseMapper.overJobAndAlarm(id, personId, handleMessage, handlePhotos) && this.baseMapper.overJobAlarmRecrds(id); // return this.baseMapper.overJob(id, personId,handleMessage, handlePhotos); } @Override - public boolean overAlarm(int jobId) { + public boolean overAlarm(Long jobId) { return this.baseMapper.overAlarm(jobId); // return this.baseMapper.overJob(id, personId,handleMessage, handlePhotos); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java index 57d3173..8a57cae 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java @@ -51,25 +51,25 @@ List> jobInfo(@Param("id") Long id, @Param("dataScope") DataScope dataScope, @Param("personId") Long personId); // boolean getJob(@Param("id") int id,@Param("personId") long personId); - boolean getJob(@Param("id") int id, @Param("personId") long personId, @Param("getTime") Date getTime, @Param("shouldHandleTime") Date shouldHandleTime); + boolean getJob(@Param("id") Long id, @Param("personId") long personId, @Param("getTime") Date getTime, @Param("shouldHandleTime") Date shouldHandleTime); - boolean confirmJob(@Param("id") int id, @Param("personId") long personId, @Param("firstState") String firstState, @Param("firstStatePhotos") String firstStatePhotos, @Param("needHandle") String needHandle); + boolean confirmJob(@Param("id") Long id, @Param("personId") long personId, @Param("firstState") String firstState, @Param("firstStatePhotos") String firstStatePhotos, @Param("needHandle") String needHandle); - boolean confirmOverJobAndAlarm(@Param("id") int id, @Param("personId") long personId, @Param("firstState") String firstState, @Param("firstStatePhotos") String firstStatePhotos); + boolean confirmOverJobAndAlarm(@Param("id") Long id, @Param("personId") long personId, @Param("firstState") String firstState, @Param("firstStatePhotos") String firstStatePhotos); - boolean confirmOverAlarmRecords(@Param("id") int id); + boolean confirmOverAlarmRecords(@Param("id") Long id); - boolean transferJob(@Param("id") int id, @Param("transferPerson") long transferPerson, @Param("flowRec") String flowRec); + boolean transferJob(@Param("id") Long id, @Param("transferPerson") long transferPerson, @Param("flowRec") String flowRec); - boolean saveJob(@Param("id") int id, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); + boolean saveJob(@Param("id") Long id, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); - boolean overJob(@Param("id") int id, @Param("personId") long personId, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); + boolean overJob(@Param("id") Long id, @Param("personId") long personId, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); - boolean overAlarm(@Param("jobId") int id); + boolean overAlarm(@Param("jobId") Long id); - boolean overJobAndAlarm(@Param("id") int id, @Param("personId") long personId, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); + boolean overJobAndAlarm(@Param("id") Long id, @Param("personId") long personId, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); - boolean overJobAlarmRecrds(@Param("id") int id); + boolean overJobAlarmRecrds(@Param("id") Long id); boolean handleJob(@Param("id") Long id, @Param("personId") long personId); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java index 974e3f6..5f9764f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java @@ -11,34 +11,10 @@ @Mapper public interface DeviceTubeMapper { - @Select("SELECT * " + - "FROM bus_well_info bwi, " + - "bus_device_well bdw, " + - "bus_device bd " + - "WHERE bd.DEVICE_TYPE='16' " + - "AND bwi.WELL_FLAG_1='1' " + - "AND bdw.WELL_ID=bwi.ID " + - "AND bd.ID=bdw.DEVICE_ID ") List> deviceList(@Param("scope") DataScope dataScope); - @Select("SELECT * " + - "FROM bus_well_info bwi, " + - "bus_device_well bdw, " + - "bus_device bd " + - "LEFT JOIN (SELECT DEVCODE,STRENGTH,id as data_tube_id,UPTIME " + - "FROM data_tube " + - "WHERE datediff(now(),UPTIME) <3" + - "AND datediff(now(),UPTIME) >0 " + - "GROUP BY DEVCODE, STRENGTH,id,UPTIME) dzt ON dzt.DEVCODE=bd.DEVCODE " + - "WHERE bd.DEVICE_TYPE='16' " + - "AND bwi.WELL_FLAG_1=#{wellGroupId}" + - "AND bdw.WELL_ID=bwi.ID " + - "AND bd.ID=bdw.DEVICE_ID") List> deviceGroupList(@Param("wellGroupId") String wellGroupId, @Param("scope") DataScope dataScope); - @Select("SELECT * " + - "FROM data_tube " + - "WHERE id=#{id} ") - Map deviceDetail(@Param("id") String id); + Map deviceDetail(@Param("id") Long id); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml new file mode 100644 index 0000000..a8e0b37 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml @@ -0,0 +1,51 @@ + + + + + + and datediff(now(),UPTIME) 3 + + + + AND date_part('day',now(),UPTIME) 3 + + + + and date_part(now(),UPTIME) 3 + + + + + + + + + + + \ No newline at end of file diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTubeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTubeServiceImpl.java index 7b0309d..8ddf8ff 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTubeServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTubeServiceImpl.java @@ -70,7 +70,7 @@ public Object deviceDetail(String id) { ResponseData responseData = new ResponseData(); try { - Map tubeDeviceData = deviceTubeMapper.deviceDetail(id); + Map tubeDeviceData = deviceTubeMapper.deviceDetail(Long.valueOf(id)); responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); responseData.setData(tubeDeviceData); diff --git a/casic-web/src/main/resources/config/application-postgre.yml b/casic-web/src/main/resources/config/application-postgre.yml index 6275316..70a88a1 100644 --- a/casic-web/src/main/resources/config/application-postgre.yml +++ b/casic-web/src/main/resources/config/application-postgre.yml @@ -4,9 +4,9 @@ spring: datasource: driver-class-name: org.postgresql.Driver - url: jdbc:postgresql://localhost:11332/smartwell + url: jdbc:postgresql://111.198.10.15:11209/smartwell username: postgres - password: casic203 + password: Casic203 session: store-type: redis redis: diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 4c9ee46..738629e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -412,7 +412,7 @@ */ @RequestMapping(value = "/getJob") @ResponseBody - public Object getJob(int id) { + public Object getJob(Long id) { AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -428,7 +428,7 @@ */ @RequestMapping(value = "/confirmJob") @ResponseBody - public Object confirmJob(@RequestParam(value = "id", required = true) int id, + public Object confirmJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "firstState", required = true) String firstState, @RequestParam(value = "firstStatePhotos", required = true) String firstStatePhotos, @RequestParam(value = "needHandle", required = true) String needHandle) { @@ -445,7 +445,7 @@ */ @RequestMapping(value = "/transferJob") @ResponseBody - public Object transferJob(@RequestParam(value = "id", required = true) int id, + public Object transferJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "transferPerson", required = true) String transferPerson) { AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -470,7 +470,7 @@ */ @RequestMapping(value = "/saveJob") @ResponseBody - public Object saveJob(@RequestParam(value = "id", required = true) int id, + public Object saveJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "handleMessage", required = true) String handleMessage, @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { @@ -486,7 +486,7 @@ */ @RequestMapping(value = "/overJob") @ResponseBody - public Object overJob(@RequestParam(value = "id", required = true) int id, + public Object overJob(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "handleMessage", required = true) String handleMessage, @RequestParam(value = "handlePhotos", required = true) String handlePhotos) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index 1f65166..e07d4b2 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -160,4 +160,8 @@ } return ResponseData.success(); } + + + + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index d49386c..8b3f54a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -39,17 +39,17 @@ List> jobInfo(Long id, DataScope dataScope, Long personId); - boolean getJob(int id, long personId); + boolean getJob(Long id, long personId); - boolean confirmJob(int id, long personId, String firstState, String firstStatePhotos, String needHandle); + boolean confirmJob(Long id, long personId, String firstState, String firstStatePhotos, String needHandle); - boolean transferJob(int id, long transferPerson, String flowRec); + boolean transferJob(Long id, long transferPerson, String flowRec); - boolean saveJob(int id, String handleMessage, String handlePhotos); + boolean saveJob(Long id, String handleMessage, String handlePhotos); - boolean overJob(int id, long personId, String handleMessage, String handlePhotos); + boolean overJob(Long id, long personId, String handleMessage, String handlePhotos); - boolean overAlarm(int id); + boolean overAlarm(Long id); boolean handleJob(Long id, long personId); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index 8117a93..e4888e4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -162,7 +162,7 @@ } @Override - public boolean getJob(int id, long personId) { + public boolean getJob(Long id, long personId) { Calendar now = Calendar.getInstance(); Date getTime = now.getTime(); @@ -203,7 +203,7 @@ } @Override - public boolean confirmJob(int id, long personId, String firstState, String firstStatePhotos, String needHandle) { + public boolean confirmJob(Long id, long personId, String firstState, String firstStatePhotos, String needHandle) { if ("1".equals(needHandle)) { return this.baseMapper.confirmJob(id, personId, firstState, firstStatePhotos, needHandle); } else { @@ -212,23 +212,23 @@ } @Override - public boolean transferJob(int id, long transferPerson, String flowRec) { + public boolean transferJob(Long id, long transferPerson, String flowRec) { return this.baseMapper.transferJob(id, transferPerson, flowRec); } @Override - public boolean saveJob(int id, String handleMessage, String handlePhotos) { + public boolean saveJob(Long id, String handleMessage, String handlePhotos) { return this.baseMapper.saveJob(id, handleMessage, handlePhotos); } @Override - public boolean overJob(int id, long personId, String handleMessage, String handlePhotos) { + public boolean overJob(Long id, long personId, String handleMessage, String handlePhotos) { return this.baseMapper.overJobAndAlarm(id, personId, handleMessage, handlePhotos) && this.baseMapper.overJobAlarmRecrds(id); // return this.baseMapper.overJob(id, personId,handleMessage, handlePhotos); } @Override - public boolean overAlarm(int jobId) { + public boolean overAlarm(Long jobId) { return this.baseMapper.overAlarm(jobId); // return this.baseMapper.overJob(id, personId,handleMessage, handlePhotos); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java index 57d3173..8a57cae 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java @@ -51,25 +51,25 @@ List> jobInfo(@Param("id") Long id, @Param("dataScope") DataScope dataScope, @Param("personId") Long personId); // boolean getJob(@Param("id") int id,@Param("personId") long personId); - boolean getJob(@Param("id") int id, @Param("personId") long personId, @Param("getTime") Date getTime, @Param("shouldHandleTime") Date shouldHandleTime); + boolean getJob(@Param("id") Long id, @Param("personId") long personId, @Param("getTime") Date getTime, @Param("shouldHandleTime") Date shouldHandleTime); - boolean confirmJob(@Param("id") int id, @Param("personId") long personId, @Param("firstState") String firstState, @Param("firstStatePhotos") String firstStatePhotos, @Param("needHandle") String needHandle); + boolean confirmJob(@Param("id") Long id, @Param("personId") long personId, @Param("firstState") String firstState, @Param("firstStatePhotos") String firstStatePhotos, @Param("needHandle") String needHandle); - boolean confirmOverJobAndAlarm(@Param("id") int id, @Param("personId") long personId, @Param("firstState") String firstState, @Param("firstStatePhotos") String firstStatePhotos); + boolean confirmOverJobAndAlarm(@Param("id") Long id, @Param("personId") long personId, @Param("firstState") String firstState, @Param("firstStatePhotos") String firstStatePhotos); - boolean confirmOverAlarmRecords(@Param("id") int id); + boolean confirmOverAlarmRecords(@Param("id") Long id); - boolean transferJob(@Param("id") int id, @Param("transferPerson") long transferPerson, @Param("flowRec") String flowRec); + boolean transferJob(@Param("id") Long id, @Param("transferPerson") long transferPerson, @Param("flowRec") String flowRec); - boolean saveJob(@Param("id") int id, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); + boolean saveJob(@Param("id") Long id, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); - boolean overJob(@Param("id") int id, @Param("personId") long personId, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); + boolean overJob(@Param("id") Long id, @Param("personId") long personId, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); - boolean overAlarm(@Param("jobId") int id); + boolean overAlarm(@Param("jobId") Long id); - boolean overJobAndAlarm(@Param("id") int id, @Param("personId") long personId, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); + boolean overJobAndAlarm(@Param("id") Long id, @Param("personId") long personId, @Param("handleMessage") String handleMessage, @Param("handlePhotos") String handlePhotos); - boolean overJobAlarmRecrds(@Param("id") int id); + boolean overJobAlarmRecrds(@Param("id") Long id); boolean handleJob(@Param("id") Long id, @Param("personId") long personId); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java index 974e3f6..5f9764f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java @@ -11,34 +11,10 @@ @Mapper public interface DeviceTubeMapper { - @Select("SELECT * " + - "FROM bus_well_info bwi, " + - "bus_device_well bdw, " + - "bus_device bd " + - "WHERE bd.DEVICE_TYPE='16' " + - "AND bwi.WELL_FLAG_1='1' " + - "AND bdw.WELL_ID=bwi.ID " + - "AND bd.ID=bdw.DEVICE_ID ") List> deviceList(@Param("scope") DataScope dataScope); - @Select("SELECT * " + - "FROM bus_well_info bwi, " + - "bus_device_well bdw, " + - "bus_device bd " + - "LEFT JOIN (SELECT DEVCODE,STRENGTH,id as data_tube_id,UPTIME " + - "FROM data_tube " + - "WHERE datediff(now(),UPTIME) <3" + - "AND datediff(now(),UPTIME) >0 " + - "GROUP BY DEVCODE, STRENGTH,id,UPTIME) dzt ON dzt.DEVCODE=bd.DEVCODE " + - "WHERE bd.DEVICE_TYPE='16' " + - "AND bwi.WELL_FLAG_1=#{wellGroupId}" + - "AND bdw.WELL_ID=bwi.ID " + - "AND bd.ID=bdw.DEVICE_ID") List> deviceGroupList(@Param("wellGroupId") String wellGroupId, @Param("scope") DataScope dataScope); - @Select("SELECT * " + - "FROM data_tube " + - "WHERE id=#{id} ") - Map deviceDetail(@Param("id") String id); + Map deviceDetail(@Param("id") Long id); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml new file mode 100644 index 0000000..a8e0b37 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml @@ -0,0 +1,51 @@ + + + + + + and datediff(now(),UPTIME) 3 + + + + AND date_part('day',now(),UPTIME) 3 + + + + and date_part(now(),UPTIME) 3 + + + + + + + + + + + \ No newline at end of file diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTubeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTubeServiceImpl.java index 7b0309d..8ddf8ff 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTubeServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTubeServiceImpl.java @@ -70,7 +70,7 @@ public Object deviceDetail(String id) { ResponseData responseData = new ResponseData(); try { - Map tubeDeviceData = deviceTubeMapper.deviceDetail(id); + Map tubeDeviceData = deviceTubeMapper.deviceDetail(Long.valueOf(id)); responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); responseData.setData(tubeDeviceData); diff --git a/casic-web/src/main/resources/config/application-postgre.yml b/casic-web/src/main/resources/config/application-postgre.yml index 6275316..70a88a1 100644 --- a/casic-web/src/main/resources/config/application-postgre.yml +++ b/casic-web/src/main/resources/config/application-postgre.yml @@ -4,9 +4,9 @@ spring: datasource: driver-class-name: org.postgresql.Driver - url: jdbc:postgresql://localhost:11332/smartwell + url: jdbc:postgresql://111.198.10.15:11209/smartwell username: postgres - password: casic203 + password: Casic203 session: store-type: redis redis: diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index aab0124..de05d41 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -3,7 +3,7 @@ ########################################################## spring: profiles: - active: dev + active: postgre servlet: multipart: max-file-size: 50MB