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 53ce7b4..967b0f9 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 @@ -1,6 +1,5 @@ package com.casic.missiles.modular.alarm.controller; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; @@ -31,7 +30,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.FileInputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -413,7 +411,7 @@ */ @RequestMapping(value = "/getJob") @ResponseBody - public Object getJob(int id) { + public Object getJob(Long id) { AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -429,7 +427,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) { @@ -446,7 +444,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(); @@ -471,7 +469,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) { @@ -487,7 +485,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 53ce7b4..967b0f9 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 @@ -1,6 +1,5 @@ package com.casic.missiles.modular.alarm.controller; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; @@ -31,7 +30,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.FileInputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -413,7 +411,7 @@ */ @RequestMapping(value = "/getJob") @ResponseBody - public Object getJob(int id) { + public Object getJob(Long id) { AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -429,7 +427,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) { @@ -446,7 +444,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(); @@ -471,7 +469,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) { @@ -487,7 +485,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/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index 3ab4185..ecbac82 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -3,7 +3,6 @@ ; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.ExportController; @@ -12,10 +11,8 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.alarm.model.JobExcelDto; import com.casic.missiles.modular.alarm.model.RecordExcelDto; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; -import com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto; import com.casic.missiles.modular.system.enmus.DeviceExportEnum; import com.casic.missiles.modular.system.model.AlarmRecords; import org.springframework.beans.factory.annotation.Autowired; @@ -29,7 +26,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.FileInputStream; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; 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 53ce7b4..967b0f9 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 @@ -1,6 +1,5 @@ package com.casic.missiles.modular.alarm.controller; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; @@ -31,7 +30,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.FileInputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -413,7 +411,7 @@ */ @RequestMapping(value = "/getJob") @ResponseBody - public Object getJob(int id) { + public Object getJob(Long id) { AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -429,7 +427,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) { @@ -446,7 +444,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(); @@ -471,7 +469,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) { @@ -487,7 +485,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/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index 3ab4185..ecbac82 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -3,7 +3,6 @@ ; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.ExportController; @@ -12,10 +11,8 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.alarm.model.JobExcelDto; import com.casic.missiles.modular.alarm.model.RecordExcelDto; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; -import com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto; import com.casic.missiles.modular.system.enmus.DeviceExportEnum; import com.casic.missiles.modular.system.model.AlarmRecords; import org.springframework.beans.factory.annotation.Autowired; @@ -29,7 +26,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.FileInputStream; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; 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 53ce7b4..967b0f9 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 @@ -1,6 +1,5 @@ package com.casic.missiles.modular.alarm.controller; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; @@ -31,7 +30,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.FileInputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -413,7 +411,7 @@ */ @RequestMapping(value = "/getJob") @ResponseBody - public Object getJob(int id) { + public Object getJob(Long id) { AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -429,7 +427,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) { @@ -446,7 +444,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(); @@ -471,7 +469,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) { @@ -487,7 +485,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/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index 3ab4185..ecbac82 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -3,7 +3,6 @@ ; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.ExportController; @@ -12,10 +11,8 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.alarm.model.JobExcelDto; import com.casic.missiles.modular.alarm.model.RecordExcelDto; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; -import com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto; import com.casic.missiles.modular.system.enmus.DeviceExportEnum; import com.casic.missiles.modular.system.model.AlarmRecords; import org.springframework.beans.factory.annotation.Autowired; @@ -29,7 +26,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.FileInputStream; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; 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 53ce7b4..967b0f9 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 @@ -1,6 +1,5 @@ package com.casic.missiles.modular.alarm.controller; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; @@ -31,7 +30,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.FileInputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -413,7 +411,7 @@ */ @RequestMapping(value = "/getJob") @ResponseBody - public Object getJob(int id) { + public Object getJob(Long id) { AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -429,7 +427,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) { @@ -446,7 +444,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(); @@ -471,7 +469,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) { @@ -487,7 +485,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/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index 3ab4185..ecbac82 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -3,7 +3,6 @@ ; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.ExportController; @@ -12,10 +11,8 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.alarm.model.JobExcelDto; import com.casic.missiles.modular.alarm.model.RecordExcelDto; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; -import com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto; import com.casic.missiles.modular.system.enmus.DeviceExportEnum; import com.casic.missiles.modular.system.model.AlarmRecords; import org.springframework.beans.factory.annotation.Autowired; @@ -29,7 +26,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.FileInputStream; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; 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 53ce7b4..967b0f9 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 @@ -1,6 +1,5 @@ package com.casic.missiles.modular.alarm.controller; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; @@ -31,7 +30,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.FileInputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -413,7 +411,7 @@ */ @RequestMapping(value = "/getJob") @ResponseBody - public Object getJob(int id) { + public Object getJob(Long id) { AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -429,7 +427,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) { @@ -446,7 +444,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(); @@ -471,7 +469,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) { @@ -487,7 +485,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/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index 3ab4185..ecbac82 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -3,7 +3,6 @@ ; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.ExportController; @@ -12,10 +11,8 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.alarm.model.JobExcelDto; import com.casic.missiles.modular.alarm.model.RecordExcelDto; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; -import com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto; import com.casic.missiles.modular.system.enmus.DeviceExportEnum; import com.casic.missiles.modular.system.model.AlarmRecords; import org.springframework.beans.factory.annotation.Autowired; @@ -29,7 +26,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.FileInputStream; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; 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/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index ac95276..bb9abb6 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -52,12 +52,12 @@ /** * 获取分页列表 */ - @RequestMapping(value = "/list") + @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String deviceType, String communication) { + public Object listPage(String modelName, String communication) { Page page = PageFactory.defaultPage(); QueryWrapper query = new QueryWrapper() - .like("DEVICE_TYPE", deviceType == null ? "" : deviceType) + .like("MODEL_NAME", modelName == null ? "" : modelName) .like("COMMUNICATION", communication == null ? "" : communication); page = deviceModelsService.page(page, query); Map dictMap = deviceModelsService.getDictNameByCode(); 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 53ce7b4..967b0f9 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 @@ -1,6 +1,5 @@ package com.casic.missiles.modular.alarm.controller; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; @@ -31,7 +30,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.FileInputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -413,7 +411,7 @@ */ @RequestMapping(value = "/getJob") @ResponseBody - public Object getJob(int id) { + public Object getJob(Long id) { AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -429,7 +427,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) { @@ -446,7 +444,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(); @@ -471,7 +469,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) { @@ -487,7 +485,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/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index 3ab4185..ecbac82 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -3,7 +3,6 @@ ; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.ExportController; @@ -12,10 +11,8 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.alarm.model.JobExcelDto; import com.casic.missiles.modular.alarm.model.RecordExcelDto; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; -import com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto; import com.casic.missiles.modular.system.enmus.DeviceExportEnum; import com.casic.missiles.modular.system.model.AlarmRecords; import org.springframework.beans.factory.annotation.Autowired; @@ -29,7 +26,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.FileInputStream; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; 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/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index ac95276..bb9abb6 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -52,12 +52,12 @@ /** * 获取分页列表 */ - @RequestMapping(value = "/list") + @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String deviceType, String communication) { + public Object listPage(String modelName, String communication) { Page page = PageFactory.defaultPage(); QueryWrapper query = new QueryWrapper() - .like("DEVICE_TYPE", deviceType == null ? "" : deviceType) + .like("MODEL_NAME", modelName == null ? "" : modelName) .like("COMMUNICATION", communication == null ? "" : communication); page = deviceModelsService.page(page, query); Map dictMap = deviceModelsService.getDictNameByCode(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java new file mode 100644 index 0000000..d5ee329 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.service.DeviceTubeService; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/tube") +public class DeviceTubeController { + + private final DeviceTubeService tubeService; + private AbstractPermissionContext permissionService; + + public DeviceTubeController(DeviceTubeService tubeService,AbstractPermissionContext permissionService) { + this.tubeService = tubeService; + this.permissionService=permissionService; + } + + /** + * 获取列表 + */ + @RequestMapping(value = "/well/list") + @ResponseBody + public Object tubeDeviceList() { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return tubeService.deviceList(dataScope); + } + + /** + * 获取列表 + */ + @RequestMapping(value = "/group/list") + @ResponseBody + public Object DeviceGroupList(String wellGroupId) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return tubeService.deviceGroupList(wellGroupId,dataScope); + } + + + /** + * 获取详情信息 + */ + @RequestMapping(value = "/detail/{detailId}") + @ResponseBody + public Object list(@PathVariable(name = "detailId") String tubeId) { ; + return tubeService.deviceDetail(tubeId); + } +} 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 53ce7b4..967b0f9 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 @@ -1,6 +1,5 @@ package com.casic.missiles.modular.alarm.controller; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; @@ -31,7 +30,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.FileInputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -413,7 +411,7 @@ */ @RequestMapping(value = "/getJob") @ResponseBody - public Object getJob(int id) { + public Object getJob(Long id) { AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -429,7 +427,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) { @@ -446,7 +444,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(); @@ -471,7 +469,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) { @@ -487,7 +485,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/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index 3ab4185..ecbac82 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -3,7 +3,6 @@ ; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.ExportController; @@ -12,10 +11,8 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.alarm.model.JobExcelDto; import com.casic.missiles.modular.alarm.model.RecordExcelDto; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; -import com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto; import com.casic.missiles.modular.system.enmus.DeviceExportEnum; import com.casic.missiles.modular.system.model.AlarmRecords; import org.springframework.beans.factory.annotation.Autowired; @@ -29,7 +26,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.FileInputStream; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; 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/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index ac95276..bb9abb6 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -52,12 +52,12 @@ /** * 获取分页列表 */ - @RequestMapping(value = "/list") + @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String deviceType, String communication) { + public Object listPage(String modelName, String communication) { Page page = PageFactory.defaultPage(); QueryWrapper query = new QueryWrapper() - .like("DEVICE_TYPE", deviceType == null ? "" : deviceType) + .like("MODEL_NAME", modelName == null ? "" : modelName) .like("COMMUNICATION", communication == null ? "" : communication); page = deviceModelsService.page(page, query); Map dictMap = deviceModelsService.getDictNameByCode(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java new file mode 100644 index 0000000..d5ee329 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.service.DeviceTubeService; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/tube") +public class DeviceTubeController { + + private final DeviceTubeService tubeService; + private AbstractPermissionContext permissionService; + + public DeviceTubeController(DeviceTubeService tubeService,AbstractPermissionContext permissionService) { + this.tubeService = tubeService; + this.permissionService=permissionService; + } + + /** + * 获取列表 + */ + @RequestMapping(value = "/well/list") + @ResponseBody + public Object tubeDeviceList() { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return tubeService.deviceList(dataScope); + } + + /** + * 获取列表 + */ + @RequestMapping(value = "/group/list") + @ResponseBody + public Object DeviceGroupList(String wellGroupId) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return tubeService.deviceGroupList(wellGroupId,dataScope); + } + + + /** + * 获取详情信息 + */ + @RequestMapping(value = "/detail/{detailId}") + @ResponseBody + public Object list(@PathVariable(name = "detailId") String tubeId) { ; + return tubeService.deviceDetail(tubeId); + } +} 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 new file mode 100644 index 0000000..5f9764f --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.core.datascope.DataScope; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface DeviceTubeMapper { + + List> deviceList(@Param("scope") DataScope dataScope); + + List> deviceGroupList(@Param("wellGroupId") String wellGroupId, @Param("scope") DataScope dataScope); + + 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 53ce7b4..967b0f9 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 @@ -1,6 +1,5 @@ package com.casic.missiles.modular.alarm.controller; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; @@ -31,7 +30,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.FileInputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -413,7 +411,7 @@ */ @RequestMapping(value = "/getJob") @ResponseBody - public Object getJob(int id) { + public Object getJob(Long id) { AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -429,7 +427,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) { @@ -446,7 +444,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(); @@ -471,7 +469,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) { @@ -487,7 +485,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/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index 3ab4185..ecbac82 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -3,7 +3,6 @@ ; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.ExportController; @@ -12,10 +11,8 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.alarm.model.JobExcelDto; import com.casic.missiles.modular.alarm.model.RecordExcelDto; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; -import com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto; import com.casic.missiles.modular.system.enmus.DeviceExportEnum; import com.casic.missiles.modular.system.model.AlarmRecords; import org.springframework.beans.factory.annotation.Autowired; @@ -29,7 +26,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.FileInputStream; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; 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/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index ac95276..bb9abb6 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -52,12 +52,12 @@ /** * 获取分页列表 */ - @RequestMapping(value = "/list") + @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String deviceType, String communication) { + public Object listPage(String modelName, String communication) { Page page = PageFactory.defaultPage(); QueryWrapper query = new QueryWrapper() - .like("DEVICE_TYPE", deviceType == null ? "" : deviceType) + .like("MODEL_NAME", modelName == null ? "" : modelName) .like("COMMUNICATION", communication == null ? "" : communication); page = deviceModelsService.page(page, query); Map dictMap = deviceModelsService.getDictNameByCode(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java new file mode 100644 index 0000000..d5ee329 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.service.DeviceTubeService; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/tube") +public class DeviceTubeController { + + private final DeviceTubeService tubeService; + private AbstractPermissionContext permissionService; + + public DeviceTubeController(DeviceTubeService tubeService,AbstractPermissionContext permissionService) { + this.tubeService = tubeService; + this.permissionService=permissionService; + } + + /** + * 获取列表 + */ + @RequestMapping(value = "/well/list") + @ResponseBody + public Object tubeDeviceList() { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return tubeService.deviceList(dataScope); + } + + /** + * 获取列表 + */ + @RequestMapping(value = "/group/list") + @ResponseBody + public Object DeviceGroupList(String wellGroupId) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return tubeService.deviceGroupList(wellGroupId,dataScope); + } + + + /** + * 获取详情信息 + */ + @RequestMapping(value = "/detail/{detailId}") + @ResponseBody + public Object list(@PathVariable(name = "detailId") String tubeId) { ; + return tubeService.deviceDetail(tubeId); + } +} 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 new file mode 100644 index 0000000..5f9764f --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.core.datascope.DataScope; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface DeviceTubeMapper { + + List> deviceList(@Param("scope") DataScope dataScope); + + List> deviceGroupList(@Param("wellGroupId") String wellGroupId, @Param("scope") DataScope dataScope); + + Map deviceDetail(@Param("id") Long id); + +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 5918e6c..c729a75 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -60,7 +60,7 @@ b.WELL_ID=a.ID LEFT JOIN sys_dept s ON a.DEPTID=s.ID LEFT JOIN bus_device d ON d.ID=c.DEVICE_ID LEFT JOIN base_device_type t ON - d.DEVICE_TYPE=t.ID where d.VALID=1 AND b.VALID=1 AND a.VALID=1 + d.DEVICE_TYPE=t.ID where d.VALID='1' AND b.VALID='1' AND a.VALID='1' AND c.sensorid = @@ -82,7 +82,7 @@ select b.CONCENCODE as "concenCode" FROM bus_concentrator b RIGHT JOIN bus_device_concentrator c ON b.id=c.CONCEN_ID - where c.ACTIVE=1 and b.VALID=1 + where c.ACTIVE='1' and b.VALID='1' and c.DEVICE_ID = @@ -94,7 +94,7 @@ select w.DEEP as "depth" FROM bus_well_info w RIGHT JOIN bus_device_well c ON w.id=c.WELL_ID - WHERE c.VALID=1 AND w.VALID=1 + WHERE c.VALID='1' AND w.VALID='1' and c.DEVICE_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 53ce7b4..967b0f9 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 @@ -1,6 +1,5 @@ package com.casic.missiles.modular.alarm.controller; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; @@ -31,7 +30,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.FileInputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -413,7 +411,7 @@ */ @RequestMapping(value = "/getJob") @ResponseBody - public Object getJob(int id) { + public Object getJob(Long id) { AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -429,7 +427,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) { @@ -446,7 +444,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(); @@ -471,7 +469,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) { @@ -487,7 +485,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/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index 3ab4185..ecbac82 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -3,7 +3,6 @@ ; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.ExportController; @@ -12,10 +11,8 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.alarm.model.JobExcelDto; import com.casic.missiles.modular.alarm.model.RecordExcelDto; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; -import com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto; import com.casic.missiles.modular.system.enmus.DeviceExportEnum; import com.casic.missiles.modular.system.model.AlarmRecords; import org.springframework.beans.factory.annotation.Autowired; @@ -29,7 +26,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.FileInputStream; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; 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/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index ac95276..bb9abb6 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -52,12 +52,12 @@ /** * 获取分页列表 */ - @RequestMapping(value = "/list") + @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String deviceType, String communication) { + public Object listPage(String modelName, String communication) { Page page = PageFactory.defaultPage(); QueryWrapper query = new QueryWrapper() - .like("DEVICE_TYPE", deviceType == null ? "" : deviceType) + .like("MODEL_NAME", modelName == null ? "" : modelName) .like("COMMUNICATION", communication == null ? "" : communication); page = deviceModelsService.page(page, query); Map dictMap = deviceModelsService.getDictNameByCode(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java new file mode 100644 index 0000000..d5ee329 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.service.DeviceTubeService; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/tube") +public class DeviceTubeController { + + private final DeviceTubeService tubeService; + private AbstractPermissionContext permissionService; + + public DeviceTubeController(DeviceTubeService tubeService,AbstractPermissionContext permissionService) { + this.tubeService = tubeService; + this.permissionService=permissionService; + } + + /** + * 获取列表 + */ + @RequestMapping(value = "/well/list") + @ResponseBody + public Object tubeDeviceList() { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return tubeService.deviceList(dataScope); + } + + /** + * 获取列表 + */ + @RequestMapping(value = "/group/list") + @ResponseBody + public Object DeviceGroupList(String wellGroupId) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return tubeService.deviceGroupList(wellGroupId,dataScope); + } + + + /** + * 获取详情信息 + */ + @RequestMapping(value = "/detail/{detailId}") + @ResponseBody + public Object list(@PathVariable(name = "detailId") String tubeId) { ; + return tubeService.deviceDetail(tubeId); + } +} 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 new file mode 100644 index 0000000..5f9764f --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.core.datascope.DataScope; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface DeviceTubeMapper { + + List> deviceList(@Param("scope") DataScope dataScope); + + List> deviceGroupList(@Param("wellGroupId") String wellGroupId, @Param("scope") DataScope dataScope); + + Map deviceDetail(@Param("id") Long id); + +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 5918e6c..c729a75 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -60,7 +60,7 @@ b.WELL_ID=a.ID LEFT JOIN sys_dept s ON a.DEPTID=s.ID LEFT JOIN bus_device d ON d.ID=c.DEVICE_ID LEFT JOIN base_device_type t ON - d.DEVICE_TYPE=t.ID where d.VALID=1 AND b.VALID=1 AND a.VALID=1 + d.DEVICE_TYPE=t.ID where d.VALID='1' AND b.VALID='1' AND a.VALID='1' AND c.sensorid = @@ -82,7 +82,7 @@ select b.CONCENCODE as "concenCode" FROM bus_concentrator b RIGHT JOIN bus_device_concentrator c ON b.id=c.CONCEN_ID - where c.ACTIVE=1 and b.VALID=1 + where c.ACTIVE='1' and b.VALID='1' and c.DEVICE_ID = @@ -94,7 +94,7 @@ select w.DEEP as "depth" FROM bus_well_info w RIGHT JOIN bus_device_well c ON w.id=c.WELL_ID - WHERE c.VALID=1 AND w.VALID=1 + WHERE c.VALID='1' AND w.VALID='1' and c.DEVICE_ID = diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index b8bb239..dd22d3a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -164,7 +164,7 @@ latGaode, lngGaode FROM device_overview_view - WHERE valid = 1 + WHERE valid = '1' 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 53ce7b4..967b0f9 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 @@ -1,6 +1,5 @@ package com.casic.missiles.modular.alarm.controller; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; @@ -31,7 +30,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.FileInputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -413,7 +411,7 @@ */ @RequestMapping(value = "/getJob") @ResponseBody - public Object getJob(int id) { + public Object getJob(Long id) { AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -429,7 +427,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) { @@ -446,7 +444,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(); @@ -471,7 +469,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) { @@ -487,7 +485,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/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index 3ab4185..ecbac82 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -3,7 +3,6 @@ ; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.ExportController; @@ -12,10 +11,8 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.alarm.model.JobExcelDto; import com.casic.missiles.modular.alarm.model.RecordExcelDto; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; -import com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto; import com.casic.missiles.modular.system.enmus.DeviceExportEnum; import com.casic.missiles.modular.system.model.AlarmRecords; import org.springframework.beans.factory.annotation.Autowired; @@ -29,7 +26,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.FileInputStream; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; 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/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index ac95276..bb9abb6 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -52,12 +52,12 @@ /** * 获取分页列表 */ - @RequestMapping(value = "/list") + @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String deviceType, String communication) { + public Object listPage(String modelName, String communication) { Page page = PageFactory.defaultPage(); QueryWrapper query = new QueryWrapper() - .like("DEVICE_TYPE", deviceType == null ? "" : deviceType) + .like("MODEL_NAME", modelName == null ? "" : modelName) .like("COMMUNICATION", communication == null ? "" : communication); page = deviceModelsService.page(page, query); Map dictMap = deviceModelsService.getDictNameByCode(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java new file mode 100644 index 0000000..d5ee329 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.service.DeviceTubeService; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/tube") +public class DeviceTubeController { + + private final DeviceTubeService tubeService; + private AbstractPermissionContext permissionService; + + public DeviceTubeController(DeviceTubeService tubeService,AbstractPermissionContext permissionService) { + this.tubeService = tubeService; + this.permissionService=permissionService; + } + + /** + * 获取列表 + */ + @RequestMapping(value = "/well/list") + @ResponseBody + public Object tubeDeviceList() { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return tubeService.deviceList(dataScope); + } + + /** + * 获取列表 + */ + @RequestMapping(value = "/group/list") + @ResponseBody + public Object DeviceGroupList(String wellGroupId) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return tubeService.deviceGroupList(wellGroupId,dataScope); + } + + + /** + * 获取详情信息 + */ + @RequestMapping(value = "/detail/{detailId}") + @ResponseBody + public Object list(@PathVariable(name = "detailId") String tubeId) { ; + return tubeService.deviceDetail(tubeId); + } +} 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 new file mode 100644 index 0000000..5f9764f --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.core.datascope.DataScope; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface DeviceTubeMapper { + + List> deviceList(@Param("scope") DataScope dataScope); + + List> deviceGroupList(@Param("wellGroupId") String wellGroupId, @Param("scope") DataScope dataScope); + + Map deviceDetail(@Param("id") Long id); + +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 5918e6c..c729a75 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -60,7 +60,7 @@ b.WELL_ID=a.ID LEFT JOIN sys_dept s ON a.DEPTID=s.ID LEFT JOIN bus_device d ON d.ID=c.DEVICE_ID LEFT JOIN base_device_type t ON - d.DEVICE_TYPE=t.ID where d.VALID=1 AND b.VALID=1 AND a.VALID=1 + d.DEVICE_TYPE=t.ID where d.VALID='1' AND b.VALID='1' AND a.VALID='1' AND c.sensorid = @@ -82,7 +82,7 @@ select b.CONCENCODE as "concenCode" FROM bus_concentrator b RIGHT JOIN bus_device_concentrator c ON b.id=c.CONCEN_ID - where c.ACTIVE=1 and b.VALID=1 + where c.ACTIVE='1' and b.VALID='1' and c.DEVICE_ID = @@ -94,7 +94,7 @@ select w.DEEP as "depth" FROM bus_well_info w RIGHT JOIN bus_device_well c ON w.id=c.WELL_ID - WHERE c.VALID=1 AND w.VALID=1 + WHERE c.VALID='1' AND w.VALID='1' and c.DEVICE_ID = diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index b8bb239..dd22d3a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -164,7 +164,7 @@ latGaode, lngGaode FROM device_overview_view - WHERE valid = 1 + WHERE valid = '1' 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 53ce7b4..967b0f9 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 @@ -1,6 +1,5 @@ package com.casic.missiles.modular.alarm.controller; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; @@ -31,7 +30,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.FileInputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -413,7 +411,7 @@ */ @RequestMapping(value = "/getJob") @ResponseBody - public Object getJob(int id) { + public Object getJob(Long id) { AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -429,7 +427,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) { @@ -446,7 +444,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(); @@ -471,7 +469,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) { @@ -487,7 +485,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/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index 3ab4185..ecbac82 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -3,7 +3,6 @@ ; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.ExportController; @@ -12,10 +11,8 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.alarm.model.JobExcelDto; import com.casic.missiles.modular.alarm.model.RecordExcelDto; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; -import com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto; import com.casic.missiles.modular.system.enmus.DeviceExportEnum; import com.casic.missiles.modular.system.model.AlarmRecords; import org.springframework.beans.factory.annotation.Autowired; @@ -29,7 +26,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.FileInputStream; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; 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/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index ac95276..bb9abb6 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -52,12 +52,12 @@ /** * 获取分页列表 */ - @RequestMapping(value = "/list") + @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String deviceType, String communication) { + public Object listPage(String modelName, String communication) { Page page = PageFactory.defaultPage(); QueryWrapper query = new QueryWrapper() - .like("DEVICE_TYPE", deviceType == null ? "" : deviceType) + .like("MODEL_NAME", modelName == null ? "" : modelName) .like("COMMUNICATION", communication == null ? "" : communication); page = deviceModelsService.page(page, query); Map dictMap = deviceModelsService.getDictNameByCode(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java new file mode 100644 index 0000000..d5ee329 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.service.DeviceTubeService; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/tube") +public class DeviceTubeController { + + private final DeviceTubeService tubeService; + private AbstractPermissionContext permissionService; + + public DeviceTubeController(DeviceTubeService tubeService,AbstractPermissionContext permissionService) { + this.tubeService = tubeService; + this.permissionService=permissionService; + } + + /** + * 获取列表 + */ + @RequestMapping(value = "/well/list") + @ResponseBody + public Object tubeDeviceList() { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return tubeService.deviceList(dataScope); + } + + /** + * 获取列表 + */ + @RequestMapping(value = "/group/list") + @ResponseBody + public Object DeviceGroupList(String wellGroupId) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return tubeService.deviceGroupList(wellGroupId,dataScope); + } + + + /** + * 获取详情信息 + */ + @RequestMapping(value = "/detail/{detailId}") + @ResponseBody + public Object list(@PathVariable(name = "detailId") String tubeId) { ; + return tubeService.deviceDetail(tubeId); + } +} 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 new file mode 100644 index 0000000..5f9764f --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.core.datascope.DataScope; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface DeviceTubeMapper { + + List> deviceList(@Param("scope") DataScope dataScope); + + List> deviceGroupList(@Param("wellGroupId") String wellGroupId, @Param("scope") DataScope dataScope); + + Map deviceDetail(@Param("id") Long id); + +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 5918e6c..c729a75 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -60,7 +60,7 @@ b.WELL_ID=a.ID LEFT JOIN sys_dept s ON a.DEPTID=s.ID LEFT JOIN bus_device d ON d.ID=c.DEVICE_ID LEFT JOIN base_device_type t ON - d.DEVICE_TYPE=t.ID where d.VALID=1 AND b.VALID=1 AND a.VALID=1 + d.DEVICE_TYPE=t.ID where d.VALID='1' AND b.VALID='1' AND a.VALID='1' AND c.sensorid = @@ -82,7 +82,7 @@ select b.CONCENCODE as "concenCode" FROM bus_concentrator b RIGHT JOIN bus_device_concentrator c ON b.id=c.CONCEN_ID - where c.ACTIVE=1 and b.VALID=1 + where c.ACTIVE='1' and b.VALID='1' and c.DEVICE_ID = @@ -94,7 +94,7 @@ select w.DEEP as "depth" FROM bus_well_info w RIGHT JOIN bus_device_well c ON w.id=c.WELL_ID - WHERE c.VALID=1 AND w.VALID=1 + WHERE c.VALID='1' AND w.VALID='1' and c.DEVICE_ID = diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index b8bb239..dd22d3a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -164,7 +164,7 @@ latGaode, lngGaode FROM device_overview_view - WHERE valid = 1 + WHERE valid = '1' 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/DeviceTubeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/DeviceTubeService.java new file mode 100644 index 0000000..92b3d95 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/DeviceTubeService.java @@ -0,0 +1,27 @@ +package com.casic.missiles.modular.system.service; + +import com.casic.missiles.core.datascope.DataScope; + +public interface DeviceTubeService { + + /** + * 获取点位信息 + * + * @return + */ + Object deviceList(DataScope dataScope); + + /** + * 获取设备点位的信息 + * + * @param wellGroupId + * @return + */ + Object deviceGroupList(String wellGroupId, DataScope dataScope); + + /** + * 获取详情信息 + */ + Object deviceDetail(String 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 53ce7b4..967b0f9 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 @@ -1,6 +1,5 @@ package com.casic.missiles.modular.alarm.controller; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; @@ -31,7 +30,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.FileInputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -413,7 +411,7 @@ */ @RequestMapping(value = "/getJob") @ResponseBody - public Object getJob(int id) { + public Object getJob(Long id) { AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -429,7 +427,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) { @@ -446,7 +444,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(); @@ -471,7 +469,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) { @@ -487,7 +485,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/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index 3ab4185..ecbac82 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -3,7 +3,6 @@ ; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.ExportController; @@ -12,10 +11,8 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.alarm.model.JobExcelDto; import com.casic.missiles.modular.alarm.model.RecordExcelDto; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; -import com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto; import com.casic.missiles.modular.system.enmus.DeviceExportEnum; import com.casic.missiles.modular.system.model.AlarmRecords; import org.springframework.beans.factory.annotation.Autowired; @@ -29,7 +26,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.FileInputStream; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; 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/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index ac95276..bb9abb6 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -52,12 +52,12 @@ /** * 获取分页列表 */ - @RequestMapping(value = "/list") + @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String deviceType, String communication) { + public Object listPage(String modelName, String communication) { Page page = PageFactory.defaultPage(); QueryWrapper query = new QueryWrapper() - .like("DEVICE_TYPE", deviceType == null ? "" : deviceType) + .like("MODEL_NAME", modelName == null ? "" : modelName) .like("COMMUNICATION", communication == null ? "" : communication); page = deviceModelsService.page(page, query); Map dictMap = deviceModelsService.getDictNameByCode(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java new file mode 100644 index 0000000..d5ee329 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.service.DeviceTubeService; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/tube") +public class DeviceTubeController { + + private final DeviceTubeService tubeService; + private AbstractPermissionContext permissionService; + + public DeviceTubeController(DeviceTubeService tubeService,AbstractPermissionContext permissionService) { + this.tubeService = tubeService; + this.permissionService=permissionService; + } + + /** + * 获取列表 + */ + @RequestMapping(value = "/well/list") + @ResponseBody + public Object tubeDeviceList() { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return tubeService.deviceList(dataScope); + } + + /** + * 获取列表 + */ + @RequestMapping(value = "/group/list") + @ResponseBody + public Object DeviceGroupList(String wellGroupId) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return tubeService.deviceGroupList(wellGroupId,dataScope); + } + + + /** + * 获取详情信息 + */ + @RequestMapping(value = "/detail/{detailId}") + @ResponseBody + public Object list(@PathVariable(name = "detailId") String tubeId) { ; + return tubeService.deviceDetail(tubeId); + } +} 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 new file mode 100644 index 0000000..5f9764f --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.core.datascope.DataScope; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface DeviceTubeMapper { + + List> deviceList(@Param("scope") DataScope dataScope); + + List> deviceGroupList(@Param("wellGroupId") String wellGroupId, @Param("scope") DataScope dataScope); + + Map deviceDetail(@Param("id") Long id); + +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 5918e6c..c729a75 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -60,7 +60,7 @@ b.WELL_ID=a.ID LEFT JOIN sys_dept s ON a.DEPTID=s.ID LEFT JOIN bus_device d ON d.ID=c.DEVICE_ID LEFT JOIN base_device_type t ON - d.DEVICE_TYPE=t.ID where d.VALID=1 AND b.VALID=1 AND a.VALID=1 + d.DEVICE_TYPE=t.ID where d.VALID='1' AND b.VALID='1' AND a.VALID='1' AND c.sensorid = @@ -82,7 +82,7 @@ select b.CONCENCODE as "concenCode" FROM bus_concentrator b RIGHT JOIN bus_device_concentrator c ON b.id=c.CONCEN_ID - where c.ACTIVE=1 and b.VALID=1 + where c.ACTIVE='1' and b.VALID='1' and c.DEVICE_ID = @@ -94,7 +94,7 @@ select w.DEEP as "depth" FROM bus_well_info w RIGHT JOIN bus_device_well c ON w.id=c.WELL_ID - WHERE c.VALID=1 AND w.VALID=1 + WHERE c.VALID='1' AND w.VALID='1' and c.DEVICE_ID = diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index b8bb239..dd22d3a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -164,7 +164,7 @@ latGaode, lngGaode FROM device_overview_view - WHERE valid = 1 + WHERE valid = '1' 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/DeviceTubeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/DeviceTubeService.java new file mode 100644 index 0000000..92b3d95 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/DeviceTubeService.java @@ -0,0 +1,27 @@ +package com.casic.missiles.modular.system.service; + +import com.casic.missiles.core.datascope.DataScope; + +public interface DeviceTubeService { + + /** + * 获取点位信息 + * + * @return + */ + Object deviceList(DataScope dataScope); + + /** + * 获取设备点位的信息 + * + * @param wellGroupId + * @return + */ + Object deviceGroupList(String wellGroupId, DataScope dataScope); + + /** + * 获取详情信息 + */ + Object deviceDetail(String id); + +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java index ede40c5..cbe9526 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import com.casic.missiles.core.application.context.AbstractPermissionContext; @@ -33,7 +34,8 @@ wrapper.eq("DEPTID", deptId); DeptPermission deptPermission = this.getOne(wrapper); if (deptPermission == null) { - List deptIds = service.getDeptService().getParentListById(deptId); + AbstractDeptService deptService = service.getDeptService(); + List deptIds = deptService.getParentListById(deptId); for (int i = deptIds.size() - 1; i > -1; i--) { Long depId = deptIds.get(i); QueryWrapper query = new QueryWrapper(); 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 53ce7b4..967b0f9 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 @@ -1,6 +1,5 @@ package com.casic.missiles.modular.alarm.controller; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; @@ -31,7 +30,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.FileInputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -413,7 +411,7 @@ */ @RequestMapping(value = "/getJob") @ResponseBody - public Object getJob(int id) { + public Object getJob(Long id) { AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -429,7 +427,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) { @@ -446,7 +444,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(); @@ -471,7 +469,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) { @@ -487,7 +485,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/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index 3ab4185..ecbac82 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -3,7 +3,6 @@ ; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.ExportController; @@ -12,10 +11,8 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.alarm.model.JobExcelDto; import com.casic.missiles.modular.alarm.model.RecordExcelDto; import com.casic.missiles.modular.alarm.service.IAlarmRecordsService; -import com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto; import com.casic.missiles.modular.system.enmus.DeviceExportEnum; import com.casic.missiles.modular.system.model.AlarmRecords; import org.springframework.beans.factory.annotation.Autowired; @@ -29,7 +26,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.FileInputStream; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; 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/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index ac95276..bb9abb6 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -52,12 +52,12 @@ /** * 获取分页列表 */ - @RequestMapping(value = "/list") + @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String deviceType, String communication) { + public Object listPage(String modelName, String communication) { Page page = PageFactory.defaultPage(); QueryWrapper query = new QueryWrapper() - .like("DEVICE_TYPE", deviceType == null ? "" : deviceType) + .like("MODEL_NAME", modelName == null ? "" : modelName) .like("COMMUNICATION", communication == null ? "" : communication); page = deviceModelsService.page(page, query); Map dictMap = deviceModelsService.getDictNameByCode(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java new file mode 100644 index 0000000..d5ee329 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.system.controller; + + +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.service.DeviceTubeService; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/tube") +public class DeviceTubeController { + + private final DeviceTubeService tubeService; + private AbstractPermissionContext permissionService; + + public DeviceTubeController(DeviceTubeService tubeService,AbstractPermissionContext permissionService) { + this.tubeService = tubeService; + this.permissionService=permissionService; + } + + /** + * 获取列表 + */ + @RequestMapping(value = "/well/list") + @ResponseBody + public Object tubeDeviceList() { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return tubeService.deviceList(dataScope); + } + + /** + * 获取列表 + */ + @RequestMapping(value = "/group/list") + @ResponseBody + public Object DeviceGroupList(String wellGroupId) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return tubeService.deviceGroupList(wellGroupId,dataScope); + } + + + /** + * 获取详情信息 + */ + @RequestMapping(value = "/detail/{detailId}") + @ResponseBody + public Object list(@PathVariable(name = "detailId") String tubeId) { ; + return tubeService.deviceDetail(tubeId); + } +} 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 new file mode 100644 index 0000000..5f9764f --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.core.datascope.DataScope; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface DeviceTubeMapper { + + List> deviceList(@Param("scope") DataScope dataScope); + + List> deviceGroupList(@Param("wellGroupId") String wellGroupId, @Param("scope") DataScope dataScope); + + Map deviceDetail(@Param("id") Long id); + +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 5918e6c..c729a75 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -60,7 +60,7 @@ b.WELL_ID=a.ID LEFT JOIN sys_dept s ON a.DEPTID=s.ID LEFT JOIN bus_device d ON d.ID=c.DEVICE_ID LEFT JOIN base_device_type t ON - d.DEVICE_TYPE=t.ID where d.VALID=1 AND b.VALID=1 AND a.VALID=1 + d.DEVICE_TYPE=t.ID where d.VALID='1' AND b.VALID='1' AND a.VALID='1' AND c.sensorid = @@ -82,7 +82,7 @@ select b.CONCENCODE as "concenCode" FROM bus_concentrator b RIGHT JOIN bus_device_concentrator c ON b.id=c.CONCEN_ID - where c.ACTIVE=1 and b.VALID=1 + where c.ACTIVE='1' and b.VALID='1' and c.DEVICE_ID = @@ -94,7 +94,7 @@ select w.DEEP as "depth" FROM bus_well_info w RIGHT JOIN bus_device_well c ON w.id=c.WELL_ID - WHERE c.VALID=1 AND w.VALID=1 + WHERE c.VALID='1' AND w.VALID='1' and c.DEVICE_ID = diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index b8bb239..dd22d3a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -164,7 +164,7 @@ latGaode, lngGaode FROM device_overview_view - WHERE valid = 1 + WHERE valid = '1' 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/DeviceTubeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/DeviceTubeService.java new file mode 100644 index 0000000..92b3d95 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/DeviceTubeService.java @@ -0,0 +1,27 @@ +package com.casic.missiles.modular.system.service; + +import com.casic.missiles.core.datascope.DataScope; + +public interface DeviceTubeService { + + /** + * 获取点位信息 + * + * @return + */ + Object deviceList(DataScope dataScope); + + /** + * 获取设备点位的信息 + * + * @param wellGroupId + * @return + */ + Object deviceGroupList(String wellGroupId, DataScope dataScope); + + /** + * 获取详情信息 + */ + Object deviceDetail(String id); + +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java index ede40c5..cbe9526 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import com.casic.missiles.core.application.context.AbstractPermissionContext; @@ -33,7 +34,8 @@ wrapper.eq("DEPTID", deptId); DeptPermission deptPermission = this.getOne(wrapper); if (deptPermission == null) { - List deptIds = service.getDeptService().getParentListById(deptId); + AbstractDeptService deptService = service.getDeptService(); + List deptIds = deptService.getParentListById(deptId); for (int i = deptIds.size() - 1; i > -1; i--) { Long depId = deptIds.get(i); QueryWrapper query = new QueryWrapper(); 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 new file mode 100644 index 0000000..8ddf8ff --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTubeServiceImpl.java @@ -0,0 +1,86 @@ +package com.casic.missiles.modular.system.service.impl; + +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dao.DeviceTubeMapper; +import com.casic.missiles.modular.system.service.DeviceTubeService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.dao.DataAccessException; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +@Service +@Slf4j +public class DeviceTubeServiceImpl implements DeviceTubeService { + + private final DeviceTubeMapper deviceTubeMapper; + + public DeviceTubeServiceImpl(DeviceTubeMapper deviceTubeMapper) { + this.deviceTubeMapper = deviceTubeMapper; + } + + /** + * 获取点位信息 + * + * @return + */ + public Object deviceList(DataScope dataScope) { + ResponseData responseData = new ResponseData(); + try { + List> tubeWellList = deviceTubeMapper.deviceList(dataScope); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + responseData.setData(tubeWellList); + } catch (DataAccessException sqlex) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("请求数据异常"); + responseData.setSuccess(true); + log.error("主题:获取点位信息列表出现异常,异常信息为{}", sqlex); + } + return responseData; + } + + /** + * 获取设备点位的信息 + * + * @param wellGroupId + * @return + */ + public Object deviceGroupList(String wellGroupId, DataScope dataScope) { + ResponseData responseData = new ResponseData(); + try { + List> tubeDeviceList = deviceTubeMapper.deviceGroupList(wellGroupId, dataScope); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + responseData.setData(tubeDeviceList); + } catch (DataAccessException sqlex) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("请求数据异常"); + responseData.setSuccess(true); + log.error("主题:数据上报保存出现错误,异常信息为{}", sqlex); + } + return responseData; + } + + /** + * 获取详情信息 + */ + public Object deviceDetail(String id) { + ResponseData responseData = new ResponseData(); + try { + Map tubeDeviceData = deviceTubeMapper.deviceDetail(Long.valueOf(id)); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + responseData.setData(tubeDeviceData); + } catch (DataAccessException sqlex) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("请求数据异常"); + responseData.setSuccess(true); + log.error("主题:数据上报保存出现错误,异常信息为{}", sqlex); + } + return responseData; + } + +}