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 804d656..8f787d2 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 @@ -410,7 +410,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "-"); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "系统"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } 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 804d656..8f787d2 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 @@ -410,7 +410,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "-"); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "系统"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java index 8ab0809..9901dd1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java @@ -45,7 +45,7 @@ // @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("部门名称") + @ExcelProperty("权属单位") private String deptName; 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 804d656..8f787d2 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 @@ -410,7 +410,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "-"); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "系统"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java index 8ab0809..9901dd1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java @@ -45,7 +45,7 @@ // @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("部门名称") + @ExcelProperty("权属单位") private String deptName; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index fadf3bb..5dd483c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -729,7 +729,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - deviceService.getPresslist(dataScope, page, deptid, beginTime, endTime, keywords); + deviceService.getPresslist(dataScope, page, keywords, beginTime, endTime, deptid); super.exportExcel(DataPressDto.class, page.getRecords(), DeviceExportEnum.PRESS_EXPORT.getFileName()); } @@ -756,7 +756,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - deviceService.getKadlist(dataScope, page, deptid, beginTime, endTime, keywords); + deviceService.getKadlist(dataScope, page, keywords, beginTime, endTime, deptid); super.exportExcel(DataKadDto.class, page.getRecords(), DeviceExportEnum.PRESS_EXPORT.getFileName()); } 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 804d656..8f787d2 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 @@ -410,7 +410,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "-"); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "系统"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java index 8ab0809..9901dd1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java @@ -45,7 +45,7 @@ // @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("部门名称") + @ExcelProperty("权属单位") private String deptName; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index fadf3bb..5dd483c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -729,7 +729,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - deviceService.getPresslist(dataScope, page, deptid, beginTime, endTime, keywords); + deviceService.getPresslist(dataScope, page, keywords, beginTime, endTime, deptid); super.exportExcel(DataPressDto.class, page.getRecords(), DeviceExportEnum.PRESS_EXPORT.getFileName()); } @@ -756,7 +756,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - deviceService.getKadlist(dataScope, page, deptid, beginTime, endTime, keywords); + deviceService.getKadlist(dataScope, page, keywords, beginTime, endTime, deptid); super.exportExcel(DataKadDto.class, page.getRecords(), DeviceExportEnum.PRESS_EXPORT.getFileName()); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java index bf60532..89530fd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -74,24 +75,22 @@ */ @RequestMapping(value = "/H2sConfig/batchImport") @ResponseBody - public Object H2sConfigBatchImport(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { - SuccessResponseData successResult = new SuccessResponseData(); + public Object H2sConfigBatchImport(@RequestParam("file") MultipartFile uploadFile) { + SuccessResponseData resultData = new SuccessResponseData(); + if (null == uploadFile) { + resultData.setCode(400); + resultData.setMessage("上传失败，无法找到文件！"); + return resultData; + } try { - //page使用 - Page page = PageFactory.defaultPage(); - DataScope dataScope = service.getAuthService().getLoginUserDataScope(); - List busConfigDTOList = busH2sConfigServiceImpl.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.H2s.getIndex()), dataScope); - page.setRecords(busConfigDTOList); - successResult.setData(super.packForBT(page)); - successResult.setMessage("success"); + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busH2sConfigServiceImpl.imp(busConfigDTOList); } catch (Exception e) { e.printStackTrace(); - successResult.setCode(500); - successResult.setMessage("false"); + resultData.setCode(400); + resultData.setMessage("导入失败"); } - return successResult; + return resultData; } 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 804d656..8f787d2 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 @@ -410,7 +410,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "-"); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "系统"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java index 8ab0809..9901dd1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java @@ -45,7 +45,7 @@ // @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("部门名称") + @ExcelProperty("权属单位") private String deptName; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index fadf3bb..5dd483c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -729,7 +729,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - deviceService.getPresslist(dataScope, page, deptid, beginTime, endTime, keywords); + deviceService.getPresslist(dataScope, page, keywords, beginTime, endTime, deptid); super.exportExcel(DataPressDto.class, page.getRecords(), DeviceExportEnum.PRESS_EXPORT.getFileName()); } @@ -756,7 +756,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - deviceService.getKadlist(dataScope, page, deptid, beginTime, endTime, keywords); + deviceService.getKadlist(dataScope, page, keywords, beginTime, endTime, deptid); super.exportExcel(DataKadDto.class, page.getRecords(), DeviceExportEnum.PRESS_EXPORT.getFileName()); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java index bf60532..89530fd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -74,24 +75,22 @@ */ @RequestMapping(value = "/H2sConfig/batchImport") @ResponseBody - public Object H2sConfigBatchImport(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { - SuccessResponseData successResult = new SuccessResponseData(); + public Object H2sConfigBatchImport(@RequestParam("file") MultipartFile uploadFile) { + SuccessResponseData resultData = new SuccessResponseData(); + if (null == uploadFile) { + resultData.setCode(400); + resultData.setMessage("上传失败，无法找到文件！"); + return resultData; + } try { - //page使用 - Page page = PageFactory.defaultPage(); - DataScope dataScope = service.getAuthService().getLoginUserDataScope(); - List busConfigDTOList = busH2sConfigServiceImpl.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.H2s.getIndex()), dataScope); - page.setRecords(busConfigDTOList); - successResult.setData(super.packForBT(page)); - successResult.setMessage("success"); + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busH2sConfigServiceImpl.imp(busConfigDTOList); } catch (Exception e) { e.printStackTrace(); - successResult.setCode(500); - successResult.setMessage("false"); + resultData.setCode(400); + resultData.setMessage("导入失败"); } - return successResult; + return resultData; } 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 b2e590f..4d3478b 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 @@ -307,7 +307,7 @@ - timestampdiff(DAY,NOW(),Max(dt.logtime)) + timestampdiff(DAY,Max(dt.logtime),NOW()) @@ -332,7 +332,7 @@ update bus_device - set valid=#{currentTime} + set valid= 0 where id=#{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 804d656..8f787d2 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 @@ -410,7 +410,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "-"); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "系统"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java index 8ab0809..9901dd1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java @@ -45,7 +45,7 @@ // @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("部门名称") + @ExcelProperty("权属单位") private String deptName; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index fadf3bb..5dd483c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -729,7 +729,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - deviceService.getPresslist(dataScope, page, deptid, beginTime, endTime, keywords); + deviceService.getPresslist(dataScope, page, keywords, beginTime, endTime, deptid); super.exportExcel(DataPressDto.class, page.getRecords(), DeviceExportEnum.PRESS_EXPORT.getFileName()); } @@ -756,7 +756,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - deviceService.getKadlist(dataScope, page, deptid, beginTime, endTime, keywords); + deviceService.getKadlist(dataScope, page, keywords, beginTime, endTime, deptid); super.exportExcel(DataKadDto.class, page.getRecords(), DeviceExportEnum.PRESS_EXPORT.getFileName()); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java index bf60532..89530fd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -74,24 +75,22 @@ */ @RequestMapping(value = "/H2sConfig/batchImport") @ResponseBody - public Object H2sConfigBatchImport(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { - SuccessResponseData successResult = new SuccessResponseData(); + public Object H2sConfigBatchImport(@RequestParam("file") MultipartFile uploadFile) { + SuccessResponseData resultData = new SuccessResponseData(); + if (null == uploadFile) { + resultData.setCode(400); + resultData.setMessage("上传失败，无法找到文件！"); + return resultData; + } try { - //page使用 - Page page = PageFactory.defaultPage(); - DataScope dataScope = service.getAuthService().getLoginUserDataScope(); - List busConfigDTOList = busH2sConfigServiceImpl.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.H2s.getIndex()), dataScope); - page.setRecords(busConfigDTOList); - successResult.setData(super.packForBT(page)); - successResult.setMessage("success"); + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busH2sConfigServiceImpl.imp(busConfigDTOList); } catch (Exception e) { e.printStackTrace(); - successResult.setCode(500); - successResult.setMessage("false"); + resultData.setCode(400); + resultData.setMessage("导入失败"); } - return successResult; + return resultData; } 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 b2e590f..4d3478b 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 @@ -307,7 +307,7 @@ - timestampdiff(DAY,NOW(),Max(dt.logtime)) + timestampdiff(DAY,Max(dt.logtime),NOW()) @@ -332,7 +332,7 @@ update bus_device - set valid=#{currentTime} + set valid= 0 where id=#{id} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml index a0767b6..6e3209c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml @@ -21,7 +21,7 @@ update bus_device_well - set valid=#{currentTime} + set valid= 0 where device_id=#{deviceId} 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 804d656..8f787d2 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 @@ -410,7 +410,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "-"); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "系统"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java index 8ab0809..9901dd1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java @@ -45,7 +45,7 @@ // @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("部门名称") + @ExcelProperty("权属单位") private String deptName; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index fadf3bb..5dd483c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -729,7 +729,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - deviceService.getPresslist(dataScope, page, deptid, beginTime, endTime, keywords); + deviceService.getPresslist(dataScope, page, keywords, beginTime, endTime, deptid); super.exportExcel(DataPressDto.class, page.getRecords(), DeviceExportEnum.PRESS_EXPORT.getFileName()); } @@ -756,7 +756,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - deviceService.getKadlist(dataScope, page, deptid, beginTime, endTime, keywords); + deviceService.getKadlist(dataScope, page, keywords, beginTime, endTime, deptid); super.exportExcel(DataKadDto.class, page.getRecords(), DeviceExportEnum.PRESS_EXPORT.getFileName()); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java index bf60532..89530fd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -74,24 +75,22 @@ */ @RequestMapping(value = "/H2sConfig/batchImport") @ResponseBody - public Object H2sConfigBatchImport(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { - SuccessResponseData successResult = new SuccessResponseData(); + public Object H2sConfigBatchImport(@RequestParam("file") MultipartFile uploadFile) { + SuccessResponseData resultData = new SuccessResponseData(); + if (null == uploadFile) { + resultData.setCode(400); + resultData.setMessage("上传失败，无法找到文件！"); + return resultData; + } try { - //page使用 - Page page = PageFactory.defaultPage(); - DataScope dataScope = service.getAuthService().getLoginUserDataScope(); - List busConfigDTOList = busH2sConfigServiceImpl.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.H2s.getIndex()), dataScope); - page.setRecords(busConfigDTOList); - successResult.setData(super.packForBT(page)); - successResult.setMessage("success"); + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busH2sConfigServiceImpl.imp(busConfigDTOList); } catch (Exception e) { e.printStackTrace(); - successResult.setCode(500); - successResult.setMessage("false"); + resultData.setCode(400); + resultData.setMessage("导入失败"); } - return successResult; + return resultData; } 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 b2e590f..4d3478b 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 @@ -307,7 +307,7 @@ - timestampdiff(DAY,NOW(),Max(dt.logtime)) + timestampdiff(DAY,Max(dt.logtime),NOW()) @@ -332,7 +332,7 @@ update bus_device - set valid=#{currentTime} + set valid= 0 where id=#{id} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml index a0767b6..6e3209c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml @@ -21,7 +21,7 @@ update bus_device_well - set valid=#{currentTime} + set valid= 0 where device_id=#{deviceId} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index fd7fae0..3713c00 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -220,6 +220,12 @@ stringMap.put("success", false); stringMap.put("msg", "第" + (i + 2) + "行，采集间隔必填且为正整数"); return stringMap; + }else { + if(Integer.valueOf(busConfigDTOList.get(i).getCollectInterval())<5){ + stringMap.put("success", false); + stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不小于5"); + return stringMap; + } } if (!RegUtil.isIp(busConfigDTOList.get(i).getIp())) { 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 804d656..8f787d2 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 @@ -410,7 +410,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "-"); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "系统"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java index 8ab0809..9901dd1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java @@ -45,7 +45,7 @@ // @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("部门名称") + @ExcelProperty("权属单位") private String deptName; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index fadf3bb..5dd483c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -729,7 +729,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - deviceService.getPresslist(dataScope, page, deptid, beginTime, endTime, keywords); + deviceService.getPresslist(dataScope, page, keywords, beginTime, endTime, deptid); super.exportExcel(DataPressDto.class, page.getRecords(), DeviceExportEnum.PRESS_EXPORT.getFileName()); } @@ -756,7 +756,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - deviceService.getKadlist(dataScope, page, deptid, beginTime, endTime, keywords); + deviceService.getKadlist(dataScope, page, keywords, beginTime, endTime, deptid); super.exportExcel(DataKadDto.class, page.getRecords(), DeviceExportEnum.PRESS_EXPORT.getFileName()); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java index bf60532..89530fd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -74,24 +75,22 @@ */ @RequestMapping(value = "/H2sConfig/batchImport") @ResponseBody - public Object H2sConfigBatchImport(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { - SuccessResponseData successResult = new SuccessResponseData(); + public Object H2sConfigBatchImport(@RequestParam("file") MultipartFile uploadFile) { + SuccessResponseData resultData = new SuccessResponseData(); + if (null == uploadFile) { + resultData.setCode(400); + resultData.setMessage("上传失败，无法找到文件！"); + return resultData; + } try { - //page使用 - Page page = PageFactory.defaultPage(); - DataScope dataScope = service.getAuthService().getLoginUserDataScope(); - List busConfigDTOList = busH2sConfigServiceImpl.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.H2s.getIndex()), dataScope); - page.setRecords(busConfigDTOList); - successResult.setData(super.packForBT(page)); - successResult.setMessage("success"); + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busH2sConfigServiceImpl.imp(busConfigDTOList); } catch (Exception e) { e.printStackTrace(); - successResult.setCode(500); - successResult.setMessage("false"); + resultData.setCode(400); + resultData.setMessage("导入失败"); } - return successResult; + return resultData; } 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 b2e590f..4d3478b 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 @@ -307,7 +307,7 @@ - timestampdiff(DAY,NOW(),Max(dt.logtime)) + timestampdiff(DAY,Max(dt.logtime),NOW()) @@ -332,7 +332,7 @@ update bus_device - set valid=#{currentTime} + set valid= 0 where id=#{id} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml index a0767b6..6e3209c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml @@ -21,7 +21,7 @@ update bus_device_well - set valid=#{currentTime} + set valid= 0 where device_id=#{deviceId} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index fd7fae0..3713c00 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -220,6 +220,12 @@ stringMap.put("success", false); stringMap.put("msg", "第" + (i + 2) + "行，采集间隔必填且为正整数"); return stringMap; + }else { + if(Integer.valueOf(busConfigDTOList.get(i).getCollectInterval())<5){ + stringMap.put("success", false); + stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不小于5"); + return stringMap; + } } if (!RegUtil.isIp(busConfigDTOList.get(i).getIp())) { diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java index b0de1bb..0695eee 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java @@ -136,16 +136,16 @@ * sensorId */ private String sensorId; - /** - * 低报报警阈值 - */ - @ExcelProperty("低报报警阈值") - private String lowerThreshold; - /** - * 高报报警阈值 - */ - @ExcelProperty("高报报警阈值") - private String upperThreshold; +// /** +// * 低报报警阈值 +// */ +// @ExcelProperty("低报报警阈值") +// private String lowerThreshold; +// /** +// * 高报报警阈值 +// */ +// @ExcelProperty("高报报警阈值") +// private String upperThreshold; /** * 创建时间 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 804d656..8f787d2 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 @@ -410,7 +410,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "-"); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "系统"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java index 8ab0809..9901dd1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java @@ -45,7 +45,7 @@ // @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("部门名称") + @ExcelProperty("权属单位") private String deptName; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index fadf3bb..5dd483c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -729,7 +729,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - deviceService.getPresslist(dataScope, page, deptid, beginTime, endTime, keywords); + deviceService.getPresslist(dataScope, page, keywords, beginTime, endTime, deptid); super.exportExcel(DataPressDto.class, page.getRecords(), DeviceExportEnum.PRESS_EXPORT.getFileName()); } @@ -756,7 +756,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - deviceService.getKadlist(dataScope, page, deptid, beginTime, endTime, keywords); + deviceService.getKadlist(dataScope, page, keywords, beginTime, endTime, deptid); super.exportExcel(DataKadDto.class, page.getRecords(), DeviceExportEnum.PRESS_EXPORT.getFileName()); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java index bf60532..89530fd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -74,24 +75,22 @@ */ @RequestMapping(value = "/H2sConfig/batchImport") @ResponseBody - public Object H2sConfigBatchImport(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { - SuccessResponseData successResult = new SuccessResponseData(); + public Object H2sConfigBatchImport(@RequestParam("file") MultipartFile uploadFile) { + SuccessResponseData resultData = new SuccessResponseData(); + if (null == uploadFile) { + resultData.setCode(400); + resultData.setMessage("上传失败，无法找到文件！"); + return resultData; + } try { - //page使用 - Page page = PageFactory.defaultPage(); - DataScope dataScope = service.getAuthService().getLoginUserDataScope(); - List busConfigDTOList = busH2sConfigServiceImpl.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.H2s.getIndex()), dataScope); - page.setRecords(busConfigDTOList); - successResult.setData(super.packForBT(page)); - successResult.setMessage("success"); + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busH2sConfigServiceImpl.imp(busConfigDTOList); } catch (Exception e) { e.printStackTrace(); - successResult.setCode(500); - successResult.setMessage("false"); + resultData.setCode(400); + resultData.setMessage("导入失败"); } - return successResult; + return resultData; } 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 b2e590f..4d3478b 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 @@ -307,7 +307,7 @@ - timestampdiff(DAY,NOW(),Max(dt.logtime)) + timestampdiff(DAY,Max(dt.logtime),NOW()) @@ -332,7 +332,7 @@ update bus_device - set valid=#{currentTime} + set valid= 0 where id=#{id} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml index a0767b6..6e3209c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml @@ -21,7 +21,7 @@ update bus_device_well - set valid=#{currentTime} + set valid= 0 where device_id=#{deviceId} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index fd7fae0..3713c00 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -220,6 +220,12 @@ stringMap.put("success", false); stringMap.put("msg", "第" + (i + 2) + "行，采集间隔必填且为正整数"); return stringMap; + }else { + if(Integer.valueOf(busConfigDTOList.get(i).getCollectInterval())<5){ + stringMap.put("success", false); + stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不小于5"); + return stringMap; + } } if (!RegUtil.isIp(busConfigDTOList.get(i).getIp())) { diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java index b0de1bb..0695eee 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java @@ -136,16 +136,16 @@ * sensorId */ private String sensorId; - /** - * 低报报警阈值 - */ - @ExcelProperty("低报报警阈值") - private String lowerThreshold; - /** - * 高报报警阈值 - */ - @ExcelProperty("高报报警阈值") - private String upperThreshold; +// /** +// * 低报报警阈值 +// */ +// @ExcelProperty("低报报警阈值") +// private String lowerThreshold; +// /** +// * 高报报警阈值 +// */ +// @ExcelProperty("高报报警阈值") +// private String upperThreshold; /** * 创建时间 diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java new file mode 100644 index 0000000..72ca1de --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java @@ -0,0 +1,44 @@ +package com.casic.missiles.modular.system.dto.ExcelModel; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; +import org.springframework.stereotype.Component; + +/** + * @author test203 + * @date 2019/5/20 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@Component +@Data +public class KadConfigExportDTO { + + @ExcelProperty("设备编号") + private String devcode; + @ExcelProperty("IP地址") + private String ip; + @ExcelProperty("端口号") + private String port; + @ExcelProperty("最大尝试次数") + private String attemptsMax; + @ExcelProperty("采集间隔（分）") + private String collectInterval; + @ExcelProperty("上传周期（分）") + private String uploadPeriod; + + @ExcelProperty("低报报警阈值") + private String lowerThreshold; + @ExcelProperty("高报报警阈值") + private String upperThreshold; + +} 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 804d656..8f787d2 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 @@ -410,7 +410,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "-"); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "系统"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java index 8ab0809..9901dd1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java @@ -45,7 +45,7 @@ // @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("部门名称") + @ExcelProperty("权属单位") private String deptName; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index fadf3bb..5dd483c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -729,7 +729,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - deviceService.getPresslist(dataScope, page, deptid, beginTime, endTime, keywords); + deviceService.getPresslist(dataScope, page, keywords, beginTime, endTime, deptid); super.exportExcel(DataPressDto.class, page.getRecords(), DeviceExportEnum.PRESS_EXPORT.getFileName()); } @@ -756,7 +756,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - deviceService.getKadlist(dataScope, page, deptid, beginTime, endTime, keywords); + deviceService.getKadlist(dataScope, page, keywords, beginTime, endTime, deptid); super.exportExcel(DataKadDto.class, page.getRecords(), DeviceExportEnum.PRESS_EXPORT.getFileName()); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java index bf60532..89530fd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -74,24 +75,22 @@ */ @RequestMapping(value = "/H2sConfig/batchImport") @ResponseBody - public Object H2sConfigBatchImport(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { - SuccessResponseData successResult = new SuccessResponseData(); + public Object H2sConfigBatchImport(@RequestParam("file") MultipartFile uploadFile) { + SuccessResponseData resultData = new SuccessResponseData(); + if (null == uploadFile) { + resultData.setCode(400); + resultData.setMessage("上传失败，无法找到文件！"); + return resultData; + } try { - //page使用 - Page page = PageFactory.defaultPage(); - DataScope dataScope = service.getAuthService().getLoginUserDataScope(); - List busConfigDTOList = busH2sConfigServiceImpl.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.H2s.getIndex()), dataScope); - page.setRecords(busConfigDTOList); - successResult.setData(super.packForBT(page)); - successResult.setMessage("success"); + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busH2sConfigServiceImpl.imp(busConfigDTOList); } catch (Exception e) { e.printStackTrace(); - successResult.setCode(500); - successResult.setMessage("false"); + resultData.setCode(400); + resultData.setMessage("导入失败"); } - return successResult; + return resultData; } 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 b2e590f..4d3478b 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 @@ -307,7 +307,7 @@ - timestampdiff(DAY,NOW(),Max(dt.logtime)) + timestampdiff(DAY,Max(dt.logtime),NOW()) @@ -332,7 +332,7 @@ update bus_device - set valid=#{currentTime} + set valid= 0 where id=#{id} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml index a0767b6..6e3209c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml @@ -21,7 +21,7 @@ update bus_device_well - set valid=#{currentTime} + set valid= 0 where device_id=#{deviceId} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index fd7fae0..3713c00 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -220,6 +220,12 @@ stringMap.put("success", false); stringMap.put("msg", "第" + (i + 2) + "行，采集间隔必填且为正整数"); return stringMap; + }else { + if(Integer.valueOf(busConfigDTOList.get(i).getCollectInterval())<5){ + stringMap.put("success", false); + stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不小于5"); + return stringMap; + } } if (!RegUtil.isIp(busConfigDTOList.get(i).getIp())) { diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java index b0de1bb..0695eee 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java @@ -136,16 +136,16 @@ * sensorId */ private String sensorId; - /** - * 低报报警阈值 - */ - @ExcelProperty("低报报警阈值") - private String lowerThreshold; - /** - * 高报报警阈值 - */ - @ExcelProperty("高报报警阈值") - private String upperThreshold; +// /** +// * 低报报警阈值 +// */ +// @ExcelProperty("低报报警阈值") +// private String lowerThreshold; +// /** +// * 高报报警阈值 +// */ +// @ExcelProperty("高报报警阈值") +// private String upperThreshold; /** * 创建时间 diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java new file mode 100644 index 0000000..72ca1de --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java @@ -0,0 +1,44 @@ +package com.casic.missiles.modular.system.dto.ExcelModel; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; +import org.springframework.stereotype.Component; + +/** + * @author test203 + * @date 2019/5/20 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@Component +@Data +public class KadConfigExportDTO { + + @ExcelProperty("设备编号") + private String devcode; + @ExcelProperty("IP地址") + private String ip; + @ExcelProperty("端口号") + private String port; + @ExcelProperty("最大尝试次数") + private String attemptsMax; + @ExcelProperty("采集间隔（分）") + private String collectInterval; + @ExcelProperty("上传周期（分）") + private String uploadPeriod; + + @ExcelProperty("低报报警阈值") + private String lowerThreshold; + @ExcelProperty("高报报警阈值") + private String upperThreshold; + +} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java index e59be76..e777066 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java @@ -25,6 +25,8 @@ DATA_WELLCOVER_LOCA("data_wellcover_loca", "井盖位置"), DATA_WELLPLUS("data_wellplus", "井盖和液位"), DATA_H2S("data_h2s", "硫化氢"), + DATA_PRESSURE("data_pressure", "压力强度"), + DATA_KAD("data_kad", "燃气浓度"), DEVICE_TYPE_TABLE(new HashMap() {{ put(1, DATA_WELLCOVER); put(2, DATA_LIQUID); @@ -42,6 +44,8 @@ put(14, DATA_H2S); put(21, DATA_PANTILT); put(101, DATA_GAS_DECTOR); + put(31, DATA_PRESSURE); + put(32, DATA_KAD); } }); 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 804d656..8f787d2 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 @@ -410,7 +410,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "-"); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "系统"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java index 8ab0809..9901dd1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java @@ -45,7 +45,7 @@ // @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("部门名称") + @ExcelProperty("权属单位") private String deptName; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index fadf3bb..5dd483c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -729,7 +729,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - deviceService.getPresslist(dataScope, page, deptid, beginTime, endTime, keywords); + deviceService.getPresslist(dataScope, page, keywords, beginTime, endTime, deptid); super.exportExcel(DataPressDto.class, page.getRecords(), DeviceExportEnum.PRESS_EXPORT.getFileName()); } @@ -756,7 +756,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - deviceService.getKadlist(dataScope, page, deptid, beginTime, endTime, keywords); + deviceService.getKadlist(dataScope, page, keywords, beginTime, endTime, deptid); super.exportExcel(DataKadDto.class, page.getRecords(), DeviceExportEnum.PRESS_EXPORT.getFileName()); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java index bf60532..89530fd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -74,24 +75,22 @@ */ @RequestMapping(value = "/H2sConfig/batchImport") @ResponseBody - public Object H2sConfigBatchImport(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { - SuccessResponseData successResult = new SuccessResponseData(); + public Object H2sConfigBatchImport(@RequestParam("file") MultipartFile uploadFile) { + SuccessResponseData resultData = new SuccessResponseData(); + if (null == uploadFile) { + resultData.setCode(400); + resultData.setMessage("上传失败，无法找到文件！"); + return resultData; + } try { - //page使用 - Page page = PageFactory.defaultPage(); - DataScope dataScope = service.getAuthService().getLoginUserDataScope(); - List busConfigDTOList = busH2sConfigServiceImpl.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.H2s.getIndex()), dataScope); - page.setRecords(busConfigDTOList); - successResult.setData(super.packForBT(page)); - successResult.setMessage("success"); + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busH2sConfigServiceImpl.imp(busConfigDTOList); } catch (Exception e) { e.printStackTrace(); - successResult.setCode(500); - successResult.setMessage("false"); + resultData.setCode(400); + resultData.setMessage("导入失败"); } - return successResult; + return resultData; } 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 b2e590f..4d3478b 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 @@ -307,7 +307,7 @@ - timestampdiff(DAY,NOW(),Max(dt.logtime)) + timestampdiff(DAY,Max(dt.logtime),NOW()) @@ -332,7 +332,7 @@ update bus_device - set valid=#{currentTime} + set valid= 0 where id=#{id} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml index a0767b6..6e3209c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml @@ -21,7 +21,7 @@ update bus_device_well - set valid=#{currentTime} + set valid= 0 where device_id=#{deviceId} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index fd7fae0..3713c00 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -220,6 +220,12 @@ stringMap.put("success", false); stringMap.put("msg", "第" + (i + 2) + "行，采集间隔必填且为正整数"); return stringMap; + }else { + if(Integer.valueOf(busConfigDTOList.get(i).getCollectInterval())<5){ + stringMap.put("success", false); + stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不小于5"); + return stringMap; + } } if (!RegUtil.isIp(busConfigDTOList.get(i).getIp())) { diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java index b0de1bb..0695eee 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java @@ -136,16 +136,16 @@ * sensorId */ private String sensorId; - /** - * 低报报警阈值 - */ - @ExcelProperty("低报报警阈值") - private String lowerThreshold; - /** - * 高报报警阈值 - */ - @ExcelProperty("高报报警阈值") - private String upperThreshold; +// /** +// * 低报报警阈值 +// */ +// @ExcelProperty("低报报警阈值") +// private String lowerThreshold; +// /** +// * 高报报警阈值 +// */ +// @ExcelProperty("高报报警阈值") +// private String upperThreshold; /** * 创建时间 diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java new file mode 100644 index 0000000..72ca1de --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java @@ -0,0 +1,44 @@ +package com.casic.missiles.modular.system.dto.ExcelModel; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; +import org.springframework.stereotype.Component; + +/** + * @author test203 + * @date 2019/5/20 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@Component +@Data +public class KadConfigExportDTO { + + @ExcelProperty("设备编号") + private String devcode; + @ExcelProperty("IP地址") + private String ip; + @ExcelProperty("端口号") + private String port; + @ExcelProperty("最大尝试次数") + private String attemptsMax; + @ExcelProperty("采集间隔（分）") + private String collectInterval; + @ExcelProperty("上传周期（分）") + private String uploadPeriod; + + @ExcelProperty("低报报警阈值") + private String lowerThreshold; + @ExcelProperty("高报报警阈值") + private String upperThreshold; + +} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java index e59be76..e777066 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java @@ -25,6 +25,8 @@ DATA_WELLCOVER_LOCA("data_wellcover_loca", "井盖位置"), DATA_WELLPLUS("data_wellplus", "井盖和液位"), DATA_H2S("data_h2s", "硫化氢"), + DATA_PRESSURE("data_pressure", "压力强度"), + DATA_KAD("data_kad", "燃气浓度"), DEVICE_TYPE_TABLE(new HashMap() {{ put(1, DATA_WELLCOVER); put(2, DATA_LIQUID); @@ -42,6 +44,8 @@ put(14, DATA_H2S); put(21, DATA_PANTILT); put(101, DATA_GAS_DECTOR); + put(31, DATA_PRESSURE); + put(32, DATA_KAD); } }); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java index a265ad8..82213c0 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java @@ -98,6 +98,9 @@ @TableField("INSTALL_HEIGHT") private Double installHeight; + @TableField("LINE_LENGTH") + private Double lineLength; + @ExcelProperty("设备型号") @TableField(exist = false) private String modelName; 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 804d656..8f787d2 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 @@ -410,7 +410,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "-"); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "系统"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java index 8ab0809..9901dd1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java @@ -45,7 +45,7 @@ // @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("部门名称") + @ExcelProperty("权属单位") private String deptName; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index fadf3bb..5dd483c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -729,7 +729,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - deviceService.getPresslist(dataScope, page, deptid, beginTime, endTime, keywords); + deviceService.getPresslist(dataScope, page, keywords, beginTime, endTime, deptid); super.exportExcel(DataPressDto.class, page.getRecords(), DeviceExportEnum.PRESS_EXPORT.getFileName()); } @@ -756,7 +756,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - deviceService.getKadlist(dataScope, page, deptid, beginTime, endTime, keywords); + deviceService.getKadlist(dataScope, page, keywords, beginTime, endTime, deptid); super.exportExcel(DataKadDto.class, page.getRecords(), DeviceExportEnum.PRESS_EXPORT.getFileName()); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java index bf60532..89530fd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -74,24 +75,22 @@ */ @RequestMapping(value = "/H2sConfig/batchImport") @ResponseBody - public Object H2sConfigBatchImport(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { - SuccessResponseData successResult = new SuccessResponseData(); + public Object H2sConfigBatchImport(@RequestParam("file") MultipartFile uploadFile) { + SuccessResponseData resultData = new SuccessResponseData(); + if (null == uploadFile) { + resultData.setCode(400); + resultData.setMessage("上传失败，无法找到文件！"); + return resultData; + } try { - //page使用 - Page page = PageFactory.defaultPage(); - DataScope dataScope = service.getAuthService().getLoginUserDataScope(); - List busConfigDTOList = busH2sConfigServiceImpl.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.H2s.getIndex()), dataScope); - page.setRecords(busConfigDTOList); - successResult.setData(super.packForBT(page)); - successResult.setMessage("success"); + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busH2sConfigServiceImpl.imp(busConfigDTOList); } catch (Exception e) { e.printStackTrace(); - successResult.setCode(500); - successResult.setMessage("false"); + resultData.setCode(400); + resultData.setMessage("导入失败"); } - return successResult; + return resultData; } 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 b2e590f..4d3478b 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 @@ -307,7 +307,7 @@ - timestampdiff(DAY,NOW(),Max(dt.logtime)) + timestampdiff(DAY,Max(dt.logtime),NOW()) @@ -332,7 +332,7 @@ update bus_device - set valid=#{currentTime} + set valid= 0 where id=#{id} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml index a0767b6..6e3209c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml @@ -21,7 +21,7 @@ update bus_device_well - set valid=#{currentTime} + set valid= 0 where device_id=#{deviceId} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index fd7fae0..3713c00 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -220,6 +220,12 @@ stringMap.put("success", false); stringMap.put("msg", "第" + (i + 2) + "行，采集间隔必填且为正整数"); return stringMap; + }else { + if(Integer.valueOf(busConfigDTOList.get(i).getCollectInterval())<5){ + stringMap.put("success", false); + stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不小于5"); + return stringMap; + } } if (!RegUtil.isIp(busConfigDTOList.get(i).getIp())) { diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java index b0de1bb..0695eee 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java @@ -136,16 +136,16 @@ * sensorId */ private String sensorId; - /** - * 低报报警阈值 - */ - @ExcelProperty("低报报警阈值") - private String lowerThreshold; - /** - * 高报报警阈值 - */ - @ExcelProperty("高报报警阈值") - private String upperThreshold; +// /** +// * 低报报警阈值 +// */ +// @ExcelProperty("低报报警阈值") +// private String lowerThreshold; +// /** +// * 高报报警阈值 +// */ +// @ExcelProperty("高报报警阈值") +// private String upperThreshold; /** * 创建时间 diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java new file mode 100644 index 0000000..72ca1de --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java @@ -0,0 +1,44 @@ +package com.casic.missiles.modular.system.dto.ExcelModel; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; +import org.springframework.stereotype.Component; + +/** + * @author test203 + * @date 2019/5/20 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@Component +@Data +public class KadConfigExportDTO { + + @ExcelProperty("设备编号") + private String devcode; + @ExcelProperty("IP地址") + private String ip; + @ExcelProperty("端口号") + private String port; + @ExcelProperty("最大尝试次数") + private String attemptsMax; + @ExcelProperty("采集间隔（分）") + private String collectInterval; + @ExcelProperty("上传周期（分）") + private String uploadPeriod; + + @ExcelProperty("低报报警阈值") + private String lowerThreshold; + @ExcelProperty("高报报警阈值") + private String upperThreshold; + +} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java index e59be76..e777066 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java @@ -25,6 +25,8 @@ DATA_WELLCOVER_LOCA("data_wellcover_loca", "井盖位置"), DATA_WELLPLUS("data_wellplus", "井盖和液位"), DATA_H2S("data_h2s", "硫化氢"), + DATA_PRESSURE("data_pressure", "压力强度"), + DATA_KAD("data_kad", "燃气浓度"), DEVICE_TYPE_TABLE(new HashMap() {{ put(1, DATA_WELLCOVER); put(2, DATA_LIQUID); @@ -42,6 +44,8 @@ put(14, DATA_H2S); put(21, DATA_PANTILT); put(101, DATA_GAS_DECTOR); + put(31, DATA_PRESSURE); + put(32, DATA_KAD); } }); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java index a265ad8..82213c0 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java @@ -98,6 +98,9 @@ @TableField("INSTALL_HEIGHT") private Double installHeight; + @TableField("LINE_LENGTH") + private Double lineLength; + @ExcelProperty("设备型号") @TableField(exist = false) private String modelName; diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/ImageUploadController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/ImageUploadController.java index 23cbd32..bf45cc9 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/ImageUploadController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/ImageUploadController.java @@ -20,7 +20,7 @@ private static final Logger logger = LoggerFactory.getLogger(ImageUploadController.class); - @Value("${smartcity.config.image-path}") + @Value("${casic.file.uploadPath}") private String imagePath; /** 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 804d656..8f787d2 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 @@ -410,7 +410,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "-"); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "系统"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java index 8ab0809..9901dd1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java @@ -45,7 +45,7 @@ // @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("部门名称") + @ExcelProperty("权属单位") private String deptName; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index fadf3bb..5dd483c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -729,7 +729,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - deviceService.getPresslist(dataScope, page, deptid, beginTime, endTime, keywords); + deviceService.getPresslist(dataScope, page, keywords, beginTime, endTime, deptid); super.exportExcel(DataPressDto.class, page.getRecords(), DeviceExportEnum.PRESS_EXPORT.getFileName()); } @@ -756,7 +756,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - deviceService.getKadlist(dataScope, page, deptid, beginTime, endTime, keywords); + deviceService.getKadlist(dataScope, page, keywords, beginTime, endTime, deptid); super.exportExcel(DataKadDto.class, page.getRecords(), DeviceExportEnum.PRESS_EXPORT.getFileName()); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java index bf60532..89530fd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -74,24 +75,22 @@ */ @RequestMapping(value = "/H2sConfig/batchImport") @ResponseBody - public Object H2sConfigBatchImport(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { - SuccessResponseData successResult = new SuccessResponseData(); + public Object H2sConfigBatchImport(@RequestParam("file") MultipartFile uploadFile) { + SuccessResponseData resultData = new SuccessResponseData(); + if (null == uploadFile) { + resultData.setCode(400); + resultData.setMessage("上传失败，无法找到文件！"); + return resultData; + } try { - //page使用 - Page page = PageFactory.defaultPage(); - DataScope dataScope = service.getAuthService().getLoginUserDataScope(); - List busConfigDTOList = busH2sConfigServiceImpl.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.H2s.getIndex()), dataScope); - page.setRecords(busConfigDTOList); - successResult.setData(super.packForBT(page)); - successResult.setMessage("success"); + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busH2sConfigServiceImpl.imp(busConfigDTOList); } catch (Exception e) { e.printStackTrace(); - successResult.setCode(500); - successResult.setMessage("false"); + resultData.setCode(400); + resultData.setMessage("导入失败"); } - return successResult; + return resultData; } 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 b2e590f..4d3478b 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 @@ -307,7 +307,7 @@ - timestampdiff(DAY,NOW(),Max(dt.logtime)) + timestampdiff(DAY,Max(dt.logtime),NOW()) @@ -332,7 +332,7 @@ update bus_device - set valid=#{currentTime} + set valid= 0 where id=#{id} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml index a0767b6..6e3209c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml @@ -21,7 +21,7 @@ update bus_device_well - set valid=#{currentTime} + set valid= 0 where device_id=#{deviceId} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index fd7fae0..3713c00 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -220,6 +220,12 @@ stringMap.put("success", false); stringMap.put("msg", "第" + (i + 2) + "行，采集间隔必填且为正整数"); return stringMap; + }else { + if(Integer.valueOf(busConfigDTOList.get(i).getCollectInterval())<5){ + stringMap.put("success", false); + stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不小于5"); + return stringMap; + } } if (!RegUtil.isIp(busConfigDTOList.get(i).getIp())) { diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java index b0de1bb..0695eee 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java @@ -136,16 +136,16 @@ * sensorId */ private String sensorId; - /** - * 低报报警阈值 - */ - @ExcelProperty("低报报警阈值") - private String lowerThreshold; - /** - * 高报报警阈值 - */ - @ExcelProperty("高报报警阈值") - private String upperThreshold; +// /** +// * 低报报警阈值 +// */ +// @ExcelProperty("低报报警阈值") +// private String lowerThreshold; +// /** +// * 高报报警阈值 +// */ +// @ExcelProperty("高报报警阈值") +// private String upperThreshold; /** * 创建时间 diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java new file mode 100644 index 0000000..72ca1de --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java @@ -0,0 +1,44 @@ +package com.casic.missiles.modular.system.dto.ExcelModel; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; +import org.springframework.stereotype.Component; + +/** + * @author test203 + * @date 2019/5/20 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@Component +@Data +public class KadConfigExportDTO { + + @ExcelProperty("设备编号") + private String devcode; + @ExcelProperty("IP地址") + private String ip; + @ExcelProperty("端口号") + private String port; + @ExcelProperty("最大尝试次数") + private String attemptsMax; + @ExcelProperty("采集间隔（分）") + private String collectInterval; + @ExcelProperty("上传周期（分）") + private String uploadPeriod; + + @ExcelProperty("低报报警阈值") + private String lowerThreshold; + @ExcelProperty("高报报警阈值") + private String upperThreshold; + +} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java index e59be76..e777066 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java @@ -25,6 +25,8 @@ DATA_WELLCOVER_LOCA("data_wellcover_loca", "井盖位置"), DATA_WELLPLUS("data_wellplus", "井盖和液位"), DATA_H2S("data_h2s", "硫化氢"), + DATA_PRESSURE("data_pressure", "压力强度"), + DATA_KAD("data_kad", "燃气浓度"), DEVICE_TYPE_TABLE(new HashMap() {{ put(1, DATA_WELLCOVER); put(2, DATA_LIQUID); @@ -42,6 +44,8 @@ put(14, DATA_H2S); put(21, DATA_PANTILT); put(101, DATA_GAS_DECTOR); + put(31, DATA_PRESSURE); + put(32, DATA_KAD); } }); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java index a265ad8..82213c0 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java @@ -98,6 +98,9 @@ @TableField("INSTALL_HEIGHT") private Double installHeight; + @TableField("LINE_LENGTH") + private Double lineLength; + @ExcelProperty("设备型号") @TableField(exist = false) private String modelName; diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/ImageUploadController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/ImageUploadController.java index 23cbd32..bf45cc9 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/ImageUploadController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/ImageUploadController.java @@ -20,7 +20,7 @@ private static final Logger logger = LoggerFactory.getLogger(ImageUploadController.class); - @Value("${smartcity.config.image-path}") + @Value("${casic.file.uploadPath}") private String imagePath; /** diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index a512344..a9a12cf 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -68,7 +68,7 @@ ( SELECT COUNT(1) AS devicecount,well_id FROM bus_device_well d - JOIN bus_device bd ON bd.id=d.device_id + JOIN bus_device bd ON bd.id=d.device_id and d.VALID =1 WHERE bd.VALID = '1' GROUP BY well_id ) c 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 804d656..8f787d2 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 @@ -410,7 +410,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "-"); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "系统"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java index 8ab0809..9901dd1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java @@ -45,7 +45,7 @@ // @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("部门名称") + @ExcelProperty("权属单位") private String deptName; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index fadf3bb..5dd483c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -729,7 +729,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - deviceService.getPresslist(dataScope, page, deptid, beginTime, endTime, keywords); + deviceService.getPresslist(dataScope, page, keywords, beginTime, endTime, deptid); super.exportExcel(DataPressDto.class, page.getRecords(), DeviceExportEnum.PRESS_EXPORT.getFileName()); } @@ -756,7 +756,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - deviceService.getKadlist(dataScope, page, deptid, beginTime, endTime, keywords); + deviceService.getKadlist(dataScope, page, keywords, beginTime, endTime, deptid); super.exportExcel(DataKadDto.class, page.getRecords(), DeviceExportEnum.PRESS_EXPORT.getFileName()); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java index bf60532..89530fd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -74,24 +75,22 @@ */ @RequestMapping(value = "/H2sConfig/batchImport") @ResponseBody - public Object H2sConfigBatchImport(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { - SuccessResponseData successResult = new SuccessResponseData(); + public Object H2sConfigBatchImport(@RequestParam("file") MultipartFile uploadFile) { + SuccessResponseData resultData = new SuccessResponseData(); + if (null == uploadFile) { + resultData.setCode(400); + resultData.setMessage("上传失败，无法找到文件！"); + return resultData; + } try { - //page使用 - Page page = PageFactory.defaultPage(); - DataScope dataScope = service.getAuthService().getLoginUserDataScope(); - List busConfigDTOList = busH2sConfigServiceImpl.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.H2s.getIndex()), dataScope); - page.setRecords(busConfigDTOList); - successResult.setData(super.packForBT(page)); - successResult.setMessage("success"); + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busH2sConfigServiceImpl.imp(busConfigDTOList); } catch (Exception e) { e.printStackTrace(); - successResult.setCode(500); - successResult.setMessage("false"); + resultData.setCode(400); + resultData.setMessage("导入失败"); } - return successResult; + return resultData; } 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 b2e590f..4d3478b 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 @@ -307,7 +307,7 @@ - timestampdiff(DAY,NOW(),Max(dt.logtime)) + timestampdiff(DAY,Max(dt.logtime),NOW()) @@ -332,7 +332,7 @@ update bus_device - set valid=#{currentTime} + set valid= 0 where id=#{id} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml index a0767b6..6e3209c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml @@ -21,7 +21,7 @@ update bus_device_well - set valid=#{currentTime} + set valid= 0 where device_id=#{deviceId} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index fd7fae0..3713c00 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -220,6 +220,12 @@ stringMap.put("success", false); stringMap.put("msg", "第" + (i + 2) + "行，采集间隔必填且为正整数"); return stringMap; + }else { + if(Integer.valueOf(busConfigDTOList.get(i).getCollectInterval())<5){ + stringMap.put("success", false); + stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不小于5"); + return stringMap; + } } if (!RegUtil.isIp(busConfigDTOList.get(i).getIp())) { diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java index b0de1bb..0695eee 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java @@ -136,16 +136,16 @@ * sensorId */ private String sensorId; - /** - * 低报报警阈值 - */ - @ExcelProperty("低报报警阈值") - private String lowerThreshold; - /** - * 高报报警阈值 - */ - @ExcelProperty("高报报警阈值") - private String upperThreshold; +// /** +// * 低报报警阈值 +// */ +// @ExcelProperty("低报报警阈值") +// private String lowerThreshold; +// /** +// * 高报报警阈值 +// */ +// @ExcelProperty("高报报警阈值") +// private String upperThreshold; /** * 创建时间 diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java new file mode 100644 index 0000000..72ca1de --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java @@ -0,0 +1,44 @@ +package com.casic.missiles.modular.system.dto.ExcelModel; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; +import org.springframework.stereotype.Component; + +/** + * @author test203 + * @date 2019/5/20 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@Component +@Data +public class KadConfigExportDTO { + + @ExcelProperty("设备编号") + private String devcode; + @ExcelProperty("IP地址") + private String ip; + @ExcelProperty("端口号") + private String port; + @ExcelProperty("最大尝试次数") + private String attemptsMax; + @ExcelProperty("采集间隔（分）") + private String collectInterval; + @ExcelProperty("上传周期（分）") + private String uploadPeriod; + + @ExcelProperty("低报报警阈值") + private String lowerThreshold; + @ExcelProperty("高报报警阈值") + private String upperThreshold; + +} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java index e59be76..e777066 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java @@ -25,6 +25,8 @@ DATA_WELLCOVER_LOCA("data_wellcover_loca", "井盖位置"), DATA_WELLPLUS("data_wellplus", "井盖和液位"), DATA_H2S("data_h2s", "硫化氢"), + DATA_PRESSURE("data_pressure", "压力强度"), + DATA_KAD("data_kad", "燃气浓度"), DEVICE_TYPE_TABLE(new HashMap() {{ put(1, DATA_WELLCOVER); put(2, DATA_LIQUID); @@ -42,6 +44,8 @@ put(14, DATA_H2S); put(21, DATA_PANTILT); put(101, DATA_GAS_DECTOR); + put(31, DATA_PRESSURE); + put(32, DATA_KAD); } }); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java index a265ad8..82213c0 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java @@ -98,6 +98,9 @@ @TableField("INSTALL_HEIGHT") private Double installHeight; + @TableField("LINE_LENGTH") + private Double lineLength; + @ExcelProperty("设备型号") @TableField(exist = false) private String modelName; diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/ImageUploadController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/ImageUploadController.java index 23cbd32..bf45cc9 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/ImageUploadController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/ImageUploadController.java @@ -20,7 +20,7 @@ private static final Logger logger = LoggerFactory.getLogger(ImageUploadController.class); - @Value("${smartcity.config.image-path}") + @Value("${casic.file.uploadPath}") private String imagePath; /** diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index a512344..a9a12cf 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -68,7 +68,7 @@ ( SELECT COUNT(1) AS devicecount,well_id FROM bus_device_well d - JOIN bus_device bd ON bd.id=d.device_id + JOIN bus_device bd ON bd.id=d.device_id and d.VALID =1 WHERE bd.VALID = '1' GROUP BY well_id ) c diff --git a/casic-web/pom.xml b/casic-web/pom.xml index b3cce52..ab4c42c 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -186,6 +186,12 @@ 3.0.3 + + com.casic + casic-file + ${admin.version} + + @@ -230,6 +236,12 @@ + src/main/webapp + + + src/main/resources + + src/main/java **/*.xml 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 804d656..8f787d2 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 @@ -410,7 +410,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "-"); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "系统"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java index 8ab0809..9901dd1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java @@ -45,7 +45,7 @@ // @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("部门名称") + @ExcelProperty("权属单位") private String deptName; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index fadf3bb..5dd483c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -729,7 +729,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - deviceService.getPresslist(dataScope, page, deptid, beginTime, endTime, keywords); + deviceService.getPresslist(dataScope, page, keywords, beginTime, endTime, deptid); super.exportExcel(DataPressDto.class, page.getRecords(), DeviceExportEnum.PRESS_EXPORT.getFileName()); } @@ -756,7 +756,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - deviceService.getKadlist(dataScope, page, deptid, beginTime, endTime, keywords); + deviceService.getKadlist(dataScope, page, keywords, beginTime, endTime, deptid); super.exportExcel(DataKadDto.class, page.getRecords(), DeviceExportEnum.PRESS_EXPORT.getFileName()); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java index bf60532..89530fd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -74,24 +75,22 @@ */ @RequestMapping(value = "/H2sConfig/batchImport") @ResponseBody - public Object H2sConfigBatchImport(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { - SuccessResponseData successResult = new SuccessResponseData(); + public Object H2sConfigBatchImport(@RequestParam("file") MultipartFile uploadFile) { + SuccessResponseData resultData = new SuccessResponseData(); + if (null == uploadFile) { + resultData.setCode(400); + resultData.setMessage("上传失败，无法找到文件！"); + return resultData; + } try { - //page使用 - Page page = PageFactory.defaultPage(); - DataScope dataScope = service.getAuthService().getLoginUserDataScope(); - List busConfigDTOList = busH2sConfigServiceImpl.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.H2s.getIndex()), dataScope); - page.setRecords(busConfigDTOList); - successResult.setData(super.packForBT(page)); - successResult.setMessage("success"); + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busH2sConfigServiceImpl.imp(busConfigDTOList); } catch (Exception e) { e.printStackTrace(); - successResult.setCode(500); - successResult.setMessage("false"); + resultData.setCode(400); + resultData.setMessage("导入失败"); } - return successResult; + return resultData; } 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 b2e590f..4d3478b 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 @@ -307,7 +307,7 @@ - timestampdiff(DAY,NOW(),Max(dt.logtime)) + timestampdiff(DAY,Max(dt.logtime),NOW()) @@ -332,7 +332,7 @@ update bus_device - set valid=#{currentTime} + set valid= 0 where id=#{id} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml index a0767b6..6e3209c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml @@ -21,7 +21,7 @@ update bus_device_well - set valid=#{currentTime} + set valid= 0 where device_id=#{deviceId} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index fd7fae0..3713c00 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -220,6 +220,12 @@ stringMap.put("success", false); stringMap.put("msg", "第" + (i + 2) + "行，采集间隔必填且为正整数"); return stringMap; + }else { + if(Integer.valueOf(busConfigDTOList.get(i).getCollectInterval())<5){ + stringMap.put("success", false); + stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不小于5"); + return stringMap; + } } if (!RegUtil.isIp(busConfigDTOList.get(i).getIp())) { diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java index b0de1bb..0695eee 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java @@ -136,16 +136,16 @@ * sensorId */ private String sensorId; - /** - * 低报报警阈值 - */ - @ExcelProperty("低报报警阈值") - private String lowerThreshold; - /** - * 高报报警阈值 - */ - @ExcelProperty("高报报警阈值") - private String upperThreshold; +// /** +// * 低报报警阈值 +// */ +// @ExcelProperty("低报报警阈值") +// private String lowerThreshold; +// /** +// * 高报报警阈值 +// */ +// @ExcelProperty("高报报警阈值") +// private String upperThreshold; /** * 创建时间 diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java new file mode 100644 index 0000000..72ca1de --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java @@ -0,0 +1,44 @@ +package com.casic.missiles.modular.system.dto.ExcelModel; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; +import org.springframework.stereotype.Component; + +/** + * @author test203 + * @date 2019/5/20 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@Component +@Data +public class KadConfigExportDTO { + + @ExcelProperty("设备编号") + private String devcode; + @ExcelProperty("IP地址") + private String ip; + @ExcelProperty("端口号") + private String port; + @ExcelProperty("最大尝试次数") + private String attemptsMax; + @ExcelProperty("采集间隔（分）") + private String collectInterval; + @ExcelProperty("上传周期（分）") + private String uploadPeriod; + + @ExcelProperty("低报报警阈值") + private String lowerThreshold; + @ExcelProperty("高报报警阈值") + private String upperThreshold; + +} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java index e59be76..e777066 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java @@ -25,6 +25,8 @@ DATA_WELLCOVER_LOCA("data_wellcover_loca", "井盖位置"), DATA_WELLPLUS("data_wellplus", "井盖和液位"), DATA_H2S("data_h2s", "硫化氢"), + DATA_PRESSURE("data_pressure", "压力强度"), + DATA_KAD("data_kad", "燃气浓度"), DEVICE_TYPE_TABLE(new HashMap() {{ put(1, DATA_WELLCOVER); put(2, DATA_LIQUID); @@ -42,6 +44,8 @@ put(14, DATA_H2S); put(21, DATA_PANTILT); put(101, DATA_GAS_DECTOR); + put(31, DATA_PRESSURE); + put(32, DATA_KAD); } }); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java index a265ad8..82213c0 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java @@ -98,6 +98,9 @@ @TableField("INSTALL_HEIGHT") private Double installHeight; + @TableField("LINE_LENGTH") + private Double lineLength; + @ExcelProperty("设备型号") @TableField(exist = false) private String modelName; diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/ImageUploadController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/ImageUploadController.java index 23cbd32..bf45cc9 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/ImageUploadController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/ImageUploadController.java @@ -20,7 +20,7 @@ private static final Logger logger = LoggerFactory.getLogger(ImageUploadController.class); - @Value("${smartcity.config.image-path}") + @Value("${casic.file.uploadPath}") private String imagePath; /** diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index a512344..a9a12cf 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -68,7 +68,7 @@ ( SELECT COUNT(1) AS devicecount,well_id FROM bus_device_well d - JOIN bus_device bd ON bd.id=d.device_id + JOIN bus_device bd ON bd.id=d.device_id and d.VALID =1 WHERE bd.VALID = '1' GROUP BY well_id ) c diff --git a/casic-web/pom.xml b/casic-web/pom.xml index b3cce52..ab4c42c 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -186,6 +186,12 @@ 3.0.3 + + com.casic + casic-file + ${admin.version} + + @@ -230,6 +236,12 @@ + src/main/webapp + + + src/main/resources + + src/main/java **/*.xml diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 846492b..977448f 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -4,9 +4,9 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://111.198.10.15:11336/smartwell?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true + url: jdbc:mysql://139.198.29.133:3000/smartwell_pichan?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true username: root - password: Casic203 + password: Casic133@2023 redis: host: 111.198.10.15 port: 11412 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 804d656..8f787d2 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 @@ -410,7 +410,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "-"); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "系统"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java index 8ab0809..9901dd1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java @@ -45,7 +45,7 @@ // @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("部门名称") + @ExcelProperty("权属单位") private String deptName; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index fadf3bb..5dd483c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -729,7 +729,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - deviceService.getPresslist(dataScope, page, deptid, beginTime, endTime, keywords); + deviceService.getPresslist(dataScope, page, keywords, beginTime, endTime, deptid); super.exportExcel(DataPressDto.class, page.getRecords(), DeviceExportEnum.PRESS_EXPORT.getFileName()); } @@ -756,7 +756,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - deviceService.getKadlist(dataScope, page, deptid, beginTime, endTime, keywords); + deviceService.getKadlist(dataScope, page, keywords, beginTime, endTime, deptid); super.exportExcel(DataKadDto.class, page.getRecords(), DeviceExportEnum.PRESS_EXPORT.getFileName()); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java index bf60532..89530fd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -74,24 +75,22 @@ */ @RequestMapping(value = "/H2sConfig/batchImport") @ResponseBody - public Object H2sConfigBatchImport(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { - SuccessResponseData successResult = new SuccessResponseData(); + public Object H2sConfigBatchImport(@RequestParam("file") MultipartFile uploadFile) { + SuccessResponseData resultData = new SuccessResponseData(); + if (null == uploadFile) { + resultData.setCode(400); + resultData.setMessage("上传失败，无法找到文件！"); + return resultData; + } try { - //page使用 - Page page = PageFactory.defaultPage(); - DataScope dataScope = service.getAuthService().getLoginUserDataScope(); - List busConfigDTOList = busH2sConfigServiceImpl.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.H2s.getIndex()), dataScope); - page.setRecords(busConfigDTOList); - successResult.setData(super.packForBT(page)); - successResult.setMessage("success"); + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busH2sConfigServiceImpl.imp(busConfigDTOList); } catch (Exception e) { e.printStackTrace(); - successResult.setCode(500); - successResult.setMessage("false"); + resultData.setCode(400); + resultData.setMessage("导入失败"); } - return successResult; + return resultData; } 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 b2e590f..4d3478b 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 @@ -307,7 +307,7 @@ - timestampdiff(DAY,NOW(),Max(dt.logtime)) + timestampdiff(DAY,Max(dt.logtime),NOW()) @@ -332,7 +332,7 @@ update bus_device - set valid=#{currentTime} + set valid= 0 where id=#{id} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml index a0767b6..6e3209c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml @@ -21,7 +21,7 @@ update bus_device_well - set valid=#{currentTime} + set valid= 0 where device_id=#{deviceId} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index fd7fae0..3713c00 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -220,6 +220,12 @@ stringMap.put("success", false); stringMap.put("msg", "第" + (i + 2) + "行，采集间隔必填且为正整数"); return stringMap; + }else { + if(Integer.valueOf(busConfigDTOList.get(i).getCollectInterval())<5){ + stringMap.put("success", false); + stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不小于5"); + return stringMap; + } } if (!RegUtil.isIp(busConfigDTOList.get(i).getIp())) { diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java index b0de1bb..0695eee 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java @@ -136,16 +136,16 @@ * sensorId */ private String sensorId; - /** - * 低报报警阈值 - */ - @ExcelProperty("低报报警阈值") - private String lowerThreshold; - /** - * 高报报警阈值 - */ - @ExcelProperty("高报报警阈值") - private String upperThreshold; +// /** +// * 低报报警阈值 +// */ +// @ExcelProperty("低报报警阈值") +// private String lowerThreshold; +// /** +// * 高报报警阈值 +// */ +// @ExcelProperty("高报报警阈值") +// private String upperThreshold; /** * 创建时间 diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java new file mode 100644 index 0000000..72ca1de --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java @@ -0,0 +1,44 @@ +package com.casic.missiles.modular.system.dto.ExcelModel; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; +import org.springframework.stereotype.Component; + +/** + * @author test203 + * @date 2019/5/20 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@Component +@Data +public class KadConfigExportDTO { + + @ExcelProperty("设备编号") + private String devcode; + @ExcelProperty("IP地址") + private String ip; + @ExcelProperty("端口号") + private String port; + @ExcelProperty("最大尝试次数") + private String attemptsMax; + @ExcelProperty("采集间隔（分）") + private String collectInterval; + @ExcelProperty("上传周期（分）") + private String uploadPeriod; + + @ExcelProperty("低报报警阈值") + private String lowerThreshold; + @ExcelProperty("高报报警阈值") + private String upperThreshold; + +} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java index e59be76..e777066 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java @@ -25,6 +25,8 @@ DATA_WELLCOVER_LOCA("data_wellcover_loca", "井盖位置"), DATA_WELLPLUS("data_wellplus", "井盖和液位"), DATA_H2S("data_h2s", "硫化氢"), + DATA_PRESSURE("data_pressure", "压力强度"), + DATA_KAD("data_kad", "燃气浓度"), DEVICE_TYPE_TABLE(new HashMap() {{ put(1, DATA_WELLCOVER); put(2, DATA_LIQUID); @@ -42,6 +44,8 @@ put(14, DATA_H2S); put(21, DATA_PANTILT); put(101, DATA_GAS_DECTOR); + put(31, DATA_PRESSURE); + put(32, DATA_KAD); } }); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java index a265ad8..82213c0 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java @@ -98,6 +98,9 @@ @TableField("INSTALL_HEIGHT") private Double installHeight; + @TableField("LINE_LENGTH") + private Double lineLength; + @ExcelProperty("设备型号") @TableField(exist = false) private String modelName; diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/ImageUploadController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/ImageUploadController.java index 23cbd32..bf45cc9 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/ImageUploadController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/ImageUploadController.java @@ -20,7 +20,7 @@ private static final Logger logger = LoggerFactory.getLogger(ImageUploadController.class); - @Value("${smartcity.config.image-path}") + @Value("${casic.file.uploadPath}") private String imagePath; /** diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index a512344..a9a12cf 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -68,7 +68,7 @@ ( SELECT COUNT(1) AS devicecount,well_id FROM bus_device_well d - JOIN bus_device bd ON bd.id=d.device_id + JOIN bus_device bd ON bd.id=d.device_id and d.VALID =1 WHERE bd.VALID = '1' GROUP BY well_id ) c diff --git a/casic-web/pom.xml b/casic-web/pom.xml index b3cce52..ab4c42c 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -186,6 +186,12 @@ 3.0.3 + + com.casic + casic-file + ${admin.version} + + @@ -230,6 +236,12 @@ + src/main/webapp + + + src/main/resources + + src/main/java **/*.xml diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 846492b..977448f 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -4,9 +4,9 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://111.198.10.15:11336/smartwell?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true + url: jdbc:mysql://139.198.29.133:3000/smartwell_pichan?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true username: root - password: Casic203 + password: Casic133@2023 redis: host: 111.198.10.15 port: 11412 diff --git a/casic-web/src/main/resources/config/temp/device_template.xlsx b/casic-web/src/main/resources/config/temp/device_template.xlsx index 8140c63..259c9db 100644 --- a/casic-web/src/main/resources/config/temp/device_template.xlsx +++ b/casic-web/src/main/resources/config/temp/device_template.xlsx Binary files differ 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 804d656..8f787d2 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 @@ -410,7 +410,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "-"); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "系统"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java index 8ab0809..9901dd1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java @@ -45,7 +45,7 @@ // @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("部门名称") + @ExcelProperty("权属单位") private String deptName; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index fadf3bb..5dd483c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -729,7 +729,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - deviceService.getPresslist(dataScope, page, deptid, beginTime, endTime, keywords); + deviceService.getPresslist(dataScope, page, keywords, beginTime, endTime, deptid); super.exportExcel(DataPressDto.class, page.getRecords(), DeviceExportEnum.PRESS_EXPORT.getFileName()); } @@ -756,7 +756,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - deviceService.getKadlist(dataScope, page, deptid, beginTime, endTime, keywords); + deviceService.getKadlist(dataScope, page, keywords, beginTime, endTime, deptid); super.exportExcel(DataKadDto.class, page.getRecords(), DeviceExportEnum.PRESS_EXPORT.getFileName()); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java index bf60532..89530fd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -74,24 +75,22 @@ */ @RequestMapping(value = "/H2sConfig/batchImport") @ResponseBody - public Object H2sConfigBatchImport(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { - SuccessResponseData successResult = new SuccessResponseData(); + public Object H2sConfigBatchImport(@RequestParam("file") MultipartFile uploadFile) { + SuccessResponseData resultData = new SuccessResponseData(); + if (null == uploadFile) { + resultData.setCode(400); + resultData.setMessage("上传失败，无法找到文件！"); + return resultData; + } try { - //page使用 - Page page = PageFactory.defaultPage(); - DataScope dataScope = service.getAuthService().getLoginUserDataScope(); - List busConfigDTOList = busH2sConfigServiceImpl.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.H2s.getIndex()), dataScope); - page.setRecords(busConfigDTOList); - successResult.setData(super.packForBT(page)); - successResult.setMessage("success"); + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busH2sConfigServiceImpl.imp(busConfigDTOList); } catch (Exception e) { e.printStackTrace(); - successResult.setCode(500); - successResult.setMessage("false"); + resultData.setCode(400); + resultData.setMessage("导入失败"); } - return successResult; + return resultData; } 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 b2e590f..4d3478b 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 @@ -307,7 +307,7 @@ - timestampdiff(DAY,NOW(),Max(dt.logtime)) + timestampdiff(DAY,Max(dt.logtime),NOW()) @@ -332,7 +332,7 @@ update bus_device - set valid=#{currentTime} + set valid= 0 where id=#{id} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml index a0767b6..6e3209c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml @@ -21,7 +21,7 @@ update bus_device_well - set valid=#{currentTime} + set valid= 0 where device_id=#{deviceId} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index fd7fae0..3713c00 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -220,6 +220,12 @@ stringMap.put("success", false); stringMap.put("msg", "第" + (i + 2) + "行，采集间隔必填且为正整数"); return stringMap; + }else { + if(Integer.valueOf(busConfigDTOList.get(i).getCollectInterval())<5){ + stringMap.put("success", false); + stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不小于5"); + return stringMap; + } } if (!RegUtil.isIp(busConfigDTOList.get(i).getIp())) { diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java index b0de1bb..0695eee 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java @@ -136,16 +136,16 @@ * sensorId */ private String sensorId; - /** - * 低报报警阈值 - */ - @ExcelProperty("低报报警阈值") - private String lowerThreshold; - /** - * 高报报警阈值 - */ - @ExcelProperty("高报报警阈值") - private String upperThreshold; +// /** +// * 低报报警阈值 +// */ +// @ExcelProperty("低报报警阈值") +// private String lowerThreshold; +// /** +// * 高报报警阈值 +// */ +// @ExcelProperty("高报报警阈值") +// private String upperThreshold; /** * 创建时间 diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java new file mode 100644 index 0000000..72ca1de --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java @@ -0,0 +1,44 @@ +package com.casic.missiles.modular.system.dto.ExcelModel; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; +import org.springframework.stereotype.Component; + +/** + * @author test203 + * @date 2019/5/20 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@Component +@Data +public class KadConfigExportDTO { + + @ExcelProperty("设备编号") + private String devcode; + @ExcelProperty("IP地址") + private String ip; + @ExcelProperty("端口号") + private String port; + @ExcelProperty("最大尝试次数") + private String attemptsMax; + @ExcelProperty("采集间隔（分）") + private String collectInterval; + @ExcelProperty("上传周期（分）") + private String uploadPeriod; + + @ExcelProperty("低报报警阈值") + private String lowerThreshold; + @ExcelProperty("高报报警阈值") + private String upperThreshold; + +} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java index e59be76..e777066 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java @@ -25,6 +25,8 @@ DATA_WELLCOVER_LOCA("data_wellcover_loca", "井盖位置"), DATA_WELLPLUS("data_wellplus", "井盖和液位"), DATA_H2S("data_h2s", "硫化氢"), + DATA_PRESSURE("data_pressure", "压力强度"), + DATA_KAD("data_kad", "燃气浓度"), DEVICE_TYPE_TABLE(new HashMap() {{ put(1, DATA_WELLCOVER); put(2, DATA_LIQUID); @@ -42,6 +44,8 @@ put(14, DATA_H2S); put(21, DATA_PANTILT); put(101, DATA_GAS_DECTOR); + put(31, DATA_PRESSURE); + put(32, DATA_KAD); } }); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java index a265ad8..82213c0 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java @@ -98,6 +98,9 @@ @TableField("INSTALL_HEIGHT") private Double installHeight; + @TableField("LINE_LENGTH") + private Double lineLength; + @ExcelProperty("设备型号") @TableField(exist = false) private String modelName; diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/ImageUploadController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/ImageUploadController.java index 23cbd32..bf45cc9 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/ImageUploadController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/ImageUploadController.java @@ -20,7 +20,7 @@ private static final Logger logger = LoggerFactory.getLogger(ImageUploadController.class); - @Value("${smartcity.config.image-path}") + @Value("${casic.file.uploadPath}") private String imagePath; /** diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index a512344..a9a12cf 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -68,7 +68,7 @@ ( SELECT COUNT(1) AS devicecount,well_id FROM bus_device_well d - JOIN bus_device bd ON bd.id=d.device_id + JOIN bus_device bd ON bd.id=d.device_id and d.VALID =1 WHERE bd.VALID = '1' GROUP BY well_id ) c diff --git a/casic-web/pom.xml b/casic-web/pom.xml index b3cce52..ab4c42c 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -186,6 +186,12 @@ 3.0.3 + + com.casic + casic-file + ${admin.version} + + @@ -230,6 +236,12 @@ + src/main/webapp + + + src/main/resources + + src/main/java **/*.xml diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 846492b..977448f 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -4,9 +4,9 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://111.198.10.15:11336/smartwell?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true + url: jdbc:mysql://139.198.29.133:3000/smartwell_pichan?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true username: root - password: Casic203 + password: Casic133@2023 redis: host: 111.198.10.15 port: 11412 diff --git a/casic-web/src/main/resources/config/temp/device_template.xlsx b/casic-web/src/main/resources/config/temp/device_template.xlsx index 8140c63..259c9db 100644 --- a/casic-web/src/main/resources/config/temp/device_template.xlsx +++ b/casic-web/src/main/resources/config/temp/device_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/h2s_config_template.xlsx b/casic-web/src/main/resources/config/temp/h2s_config_template.xlsx new file mode 100644 index 0000000..830059b --- /dev/null +++ b/casic-web/src/main/resources/config/temp/h2s_config_template.xlsx Binary files differ 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 804d656..8f787d2 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 @@ -410,7 +410,7 @@ jobExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); jobExcelDto.setCreateTime(alarmExp.get("createTime").toString()); jobExcelDto.setJobStatusName(alarmExp.get("jobStatusName") == null ? "" : alarmExp.get("jobStatusName").toString()); - jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "-"); + jobExcelDto.setHandleJobPerson(alarmExp.containsKey("handleJobPerson") && alarmExp.get("handleJobPerson") != null ? alarmExp.get("handleJobPerson").toString() : "系统"); jobExcelDto.setGetJobTime(alarmExp.get("getJobTime") == null ? "-" : alarmExp.get("getJobTime").toString()); return jobExcelDto; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java index 8ab0809..9901dd1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java @@ -45,7 +45,7 @@ // @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("部门名称") + @ExcelProperty("权属单位") private String deptName; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index fadf3bb..5dd483c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -729,7 +729,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - deviceService.getPresslist(dataScope, page, deptid, beginTime, endTime, keywords); + deviceService.getPresslist(dataScope, page, keywords, beginTime, endTime, deptid); super.exportExcel(DataPressDto.class, page.getRecords(), DeviceExportEnum.PRESS_EXPORT.getFileName()); } @@ -756,7 +756,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - deviceService.getKadlist(dataScope, page, deptid, beginTime, endTime, keywords); + deviceService.getKadlist(dataScope, page, keywords, beginTime, endTime, deptid); super.exportExcel(DataKadDto.class, page.getRecords(), DeviceExportEnum.PRESS_EXPORT.getFileName()); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java index bf60532..89530fd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -74,24 +75,22 @@ */ @RequestMapping(value = "/H2sConfig/batchImport") @ResponseBody - public Object H2sConfigBatchImport(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { - SuccessResponseData successResult = new SuccessResponseData(); + public Object H2sConfigBatchImport(@RequestParam("file") MultipartFile uploadFile) { + SuccessResponseData resultData = new SuccessResponseData(); + if (null == uploadFile) { + resultData.setCode(400); + resultData.setMessage("上传失败，无法找到文件！"); + return resultData; + } try { - //page使用 - Page page = PageFactory.defaultPage(); - DataScope dataScope = service.getAuthService().getLoginUserDataScope(); - List busConfigDTOList = busH2sConfigServiceImpl.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.H2s.getIndex()), dataScope); - page.setRecords(busConfigDTOList); - successResult.setData(super.packForBT(page)); - successResult.setMessage("success"); + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busH2sConfigServiceImpl.imp(busConfigDTOList); } catch (Exception e) { e.printStackTrace(); - successResult.setCode(500); - successResult.setMessage("false"); + resultData.setCode(400); + resultData.setMessage("导入失败"); } - return successResult; + return resultData; } 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 b2e590f..4d3478b 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 @@ -307,7 +307,7 @@ - timestampdiff(DAY,NOW(),Max(dt.logtime)) + timestampdiff(DAY,Max(dt.logtime),NOW()) @@ -332,7 +332,7 @@ update bus_device - set valid=#{currentTime} + set valid= 0 where id=#{id} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml index a0767b6..6e3209c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceWellMapper.xml @@ -21,7 +21,7 @@ update bus_device_well - set valid=#{currentTime} + set valid= 0 where device_id=#{deviceId} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index fd7fae0..3713c00 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -220,6 +220,12 @@ stringMap.put("success", false); stringMap.put("msg", "第" + (i + 2) + "行，采集间隔必填且为正整数"); return stringMap; + }else { + if(Integer.valueOf(busConfigDTOList.get(i).getCollectInterval())<5){ + stringMap.put("success", false); + stringMap.put("msg", "第" + (i + 2) + "行，采集间隔不小于5"); + return stringMap; + } } if (!RegUtil.isIp(busConfigDTOList.get(i).getIp())) { diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java index b0de1bb..0695eee 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java @@ -136,16 +136,16 @@ * sensorId */ private String sensorId; - /** - * 低报报警阈值 - */ - @ExcelProperty("低报报警阈值") - private String lowerThreshold; - /** - * 高报报警阈值 - */ - @ExcelProperty("高报报警阈值") - private String upperThreshold; +// /** +// * 低报报警阈值 +// */ +// @ExcelProperty("低报报警阈值") +// private String lowerThreshold; +// /** +// * 高报报警阈值 +// */ +// @ExcelProperty("高报报警阈值") +// private String upperThreshold; /** * 创建时间 diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java new file mode 100644 index 0000000..72ca1de --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/KadConfigExportDTO.java @@ -0,0 +1,44 @@ +package com.casic.missiles.modular.system.dto.ExcelModel; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; +import org.springframework.stereotype.Component; + +/** + * @author test203 + * @date 2019/5/20 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@Component +@Data +public class KadConfigExportDTO { + + @ExcelProperty("设备编号") + private String devcode; + @ExcelProperty("IP地址") + private String ip; + @ExcelProperty("端口号") + private String port; + @ExcelProperty("最大尝试次数") + private String attemptsMax; + @ExcelProperty("采集间隔（分）") + private String collectInterval; + @ExcelProperty("上传周期（分）") + private String uploadPeriod; + + @ExcelProperty("低报报警阈值") + private String lowerThreshold; + @ExcelProperty("高报报警阈值") + private String upperThreshold; + +} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java index e59be76..e777066 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java @@ -25,6 +25,8 @@ DATA_WELLCOVER_LOCA("data_wellcover_loca", "井盖位置"), DATA_WELLPLUS("data_wellplus", "井盖和液位"), DATA_H2S("data_h2s", "硫化氢"), + DATA_PRESSURE("data_pressure", "压力强度"), + DATA_KAD("data_kad", "燃气浓度"), DEVICE_TYPE_TABLE(new HashMap() {{ put(1, DATA_WELLCOVER); put(2, DATA_LIQUID); @@ -42,6 +44,8 @@ put(14, DATA_H2S); put(21, DATA_PANTILT); put(101, DATA_GAS_DECTOR); + put(31, DATA_PRESSURE); + put(32, DATA_KAD); } }); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java index a265ad8..82213c0 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java @@ -98,6 +98,9 @@ @TableField("INSTALL_HEIGHT") private Double installHeight; + @TableField("LINE_LENGTH") + private Double lineLength; + @ExcelProperty("设备型号") @TableField(exist = false) private String modelName; diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/ImageUploadController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/ImageUploadController.java index 23cbd32..bf45cc9 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/ImageUploadController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/ImageUploadController.java @@ -20,7 +20,7 @@ private static final Logger logger = LoggerFactory.getLogger(ImageUploadController.class); - @Value("${smartcity.config.image-path}") + @Value("${casic.file.uploadPath}") private String imagePath; /** diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index a512344..a9a12cf 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -68,7 +68,7 @@ ( SELECT COUNT(1) AS devicecount,well_id FROM bus_device_well d - JOIN bus_device bd ON bd.id=d.device_id + JOIN bus_device bd ON bd.id=d.device_id and d.VALID =1 WHERE bd.VALID = '1' GROUP BY well_id ) c diff --git a/casic-web/pom.xml b/casic-web/pom.xml index b3cce52..ab4c42c 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -186,6 +186,12 @@ 3.0.3 + + com.casic + casic-file + ${admin.version} + + @@ -230,6 +236,12 @@ + src/main/webapp + + + src/main/resources + + src/main/java **/*.xml diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 846492b..977448f 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -4,9 +4,9 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://111.198.10.15:11336/smartwell?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true + url: jdbc:mysql://139.198.29.133:3000/smartwell_pichan?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true username: root - password: Casic203 + password: Casic133@2023 redis: host: 111.198.10.15 port: 11412 diff --git a/casic-web/src/main/resources/config/temp/device_template.xlsx b/casic-web/src/main/resources/config/temp/device_template.xlsx index 8140c63..259c9db 100644 --- a/casic-web/src/main/resources/config/temp/device_template.xlsx +++ b/casic-web/src/main/resources/config/temp/device_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/h2s_config_template.xlsx b/casic-web/src/main/resources/config/temp/h2s_config_template.xlsx new file mode 100644 index 0000000..830059b --- /dev/null +++ b/casic-web/src/main/resources/config/temp/h2s_config_template.xlsx Binary files differ diff --git a/missiles.log b/missiles.log new file mode 100644 index 0000000..1230643 --- /dev/null +++ b/missiles.log @@ -0,0 +1,64 @@ +2023-11-30 16:19:49.155 INFO 20268 --- [main] com.casic.missiles.CasicApplication : Starting CasicApplication using Java 1.8.0_111 on casic with PID 20268 (D:\code\zhajing\15gitproduct\casic_smartcity3.0\casic-smartcity\casic-web\target\classes started by casic_zt in D:\code\zhajing\15gitproduct\casic_smartcity3.0\casic-smartcity) +2023-11-30 16:19:49.157 DEBUG 20268 --- [main] com.casic.missiles.CasicApplication : Running with Spring Boot v2.4.5, Spring v5.3.6 +2023-11-30 16:19:49.157 INFO 20268 --- [main] com.casic.missiles.CasicApplication : The following profiles are active: dm +2023-11-30 16:19:50.000 INFO 20268 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Multiple Spring Data modules found, entering strict repository configuration mode! +2023-11-30 16:19:50.010 INFO 20268 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data Redis repositories in DEFAULT mode. +2023-11-30 16:19:50.077 INFO 20268 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 57 ms. Found 0 Redis repository interfaces. +2023-11-30 16:19:50.243 INFO 20268 --- [main] o.s.c.a.ConfigurationClassEnhancer : @Bean method UtilAutoConfiguration.springContextHolder is non-static and returns an object assignable to Spring's BeanFactoryPostProcessor interface. This will result in a failure to process annotations such as @Autowired, @Resource and @PostConstruct within the method's declaring @Configuration class. Add the 'static' modifier to this method to avoid these container lifecycle issues; see @Bean javadoc for complete details. +2023-11-30 16:19:50.253 INFO 20268 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'shiroConfig' of type [com.casic.missiles.config.web.ShiroConfig$$EnhancerBySpringCGLIB$$b6b1fda5] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2023-11-30 16:19:50.298 INFO 20268 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'shiroCacheConfig' of type [com.casic.missiles.config.web.ShiroCacheConfig$$EnhancerBySpringCGLIB$$49e0807] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2023-11-30 16:19:50.299 INFO 20268 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'ehCacheConfig' of type [com.casic.missiles.config.EhCacheConfig$$EnhancerBySpringCGLIB$$79cdf8ad] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2023-11-30 16:19:50.301 INFO 20268 --- [main] o.s.c.ehcache.EhCacheManagerFactoryBean : Initializing EhCache CacheManager +2023-11-30 16:19:50.325 WARN 20268 --- [main] n.sf.ehcache.config.CacheConfiguration : Cache 'CONSTANT' is set to eternal but also has TTI/TTL set. To avoid this warning, clean up the config removing conflicting values of eternal, TTI and TTL. Effective configuration for Cache 'CONSTANT' will be eternal='true', timeToIdleSeconds='0', timeToLiveSeconds='0'. +2023-11-30 16:19:50.401 INFO 20268 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'ehcache' of type [org.springframework.cache.ehcache.EhCacheManagerFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2023-11-30 16:19:50.404 INFO 20268 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'getCacheShiroManager' of type [org.apache.shiro.cache.ehcache.EhCacheManager] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2023-11-30 16:19:50.414 INFO 20268 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'casicProperties' of type [com.casic.missiles.config.properties.CasicProperties] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2023-11-30 16:19:50.415 INFO 20268 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'defaultSessionListener' of type [com.casic.missiles.core.listener.ShiroSessionListener] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2023-11-30 16:19:50.420 INFO 20268 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'defaultWebSessionManager' of type [com.casic.missiles.core.shiro.ShiroSessionManager] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2023-11-30 16:19:50.923 INFO 20268 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'loginCheckHandler' of type [com.casic.missiles.handler.LoginCheckHandler] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2023-11-30 16:19:50.925 INFO 20268 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'org.springframework.boot.autoconfigure.jdbc.JdbcTemplateConfiguration' of type [org.springframework.boot.autoconfigure.jdbc.JdbcTemplateConfiguration] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2023-11-30 16:19:50.926 INFO 20268 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure' of type [com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure$$EnhancerBySpringCGLIB$$5535f930] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2023-11-30 16:19:50.927 INFO 20268 --- [main] c.a.d.s.b.a.DruidDataSourceAutoConfigure : Init DruidDataSource +2023-11-30 16:19:50.961 INFO 20268 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'spring.datasource-org.springframework.boot.autoconfigure.jdbc.DataSourceProperties' of type [org.springframework.boot.autoconfigure.jdbc.DataSourceProperties] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2023-11-30 16:19:50.972 ERROR 20268 --- [main] com.alibaba.druid.pool.DruidDataSource : testWhileIdle is true, validationQuery not set +2023-11-30 16:19:50.976 INFO 20268 --- [main] com.alibaba.druid.pool.DruidDataSource : {dataSource-1} inited +2023-11-30 16:19:50.976 INFO 20268 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'dataSource' of type [com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceWrapper] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2023-11-30 16:19:50.977 INFO 20268 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'spring.jdbc-org.springframework.boot.autoconfigure.jdbc.JdbcProperties' of type [org.springframework.boot.autoconfigure.jdbc.JdbcProperties] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2023-11-30 16:19:50.981 INFO 20268 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'jdbcTemplate' of type [org.springframework.jdbc.core.JdbcTemplate] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2023-11-30 16:19:50.981 DEBUG 20268 --- [main] com.casic.missiles.config.DbSysConfig : loading database config +2023-11-30 16:19:51.451 INFO 20268 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'dbSysConfig' of type [com.casic.missiles.config.DbSysConfig$$EnhancerBySpringCGLIB$$63b45dbd] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2023-11-30 16:19:51.458 INFO 20268 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'loginIpHandler' of type [com.casic.missiles.modular.application.handler.LoginIpHandler] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2023-11-30 16:19:51.460 INFO 20268 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'shiroDbRealm' of type [com.casic.missiles.core.shiro.ShiroDbRealm] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2023-11-30 16:19:51.460 INFO 20268 --- [main] o.a.shiro.cache.ehcache.EhCacheManager : Cache with name 'com.casic.missiles.core.shiro.ShiroDbRealm.authorizationCache' does not yet exist. Creating now. +2023-11-30 16:19:51.464 INFO 20268 --- [main] o.a.shiro.cache.ehcache.EhCacheManager : Added EhCache named [com.casic.missiles.core.shiro.ShiroDbRealm.authorizationCache] +2023-11-30 16:19:51.465 INFO 20268 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'securityManager' of type [org.apache.shiro.web.mgt.DefaultWebSecurityManager] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2023-11-30 16:19:51.466 INFO 20268 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'methodInvokingFactoryBean' of type [org.springframework.beans.factory.config.MethodInvokingFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2023-11-30 16:19:51.499 INFO 20268 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'authorizationAttributeSourceAdvisor' of type [org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2023-11-30 16:19:51.884 INFO 20268 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer : Tomcat initialized with port(s): 11308 (http) +2023-11-30 16:19:51.892 INFO 20268 --- [main] o.apache.catalina.core.StandardService : Starting service [Tomcat] +2023-11-30 16:19:51.892 INFO 20268 --- [main] org.apache.catalina.core.StandardEngine : Starting Servlet engine: [Apache Tomcat/9.0.45] +2023-11-30 16:19:51.972 INFO 20268 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/] : Initializing Spring embedded WebApplicationContext +2023-11-30 16:19:51.972 INFO 20268 --- [main] w.s.c.ServletWebServerApplicationContext : Root WebApplicationContext: initialization completed in 2785 ms +2023-11-30 16:19:55.796 DEBUG 20268 --- [main] com.casic.missiles.config.EhCacheConfig : loading EhCacheConfig .. +2023-11-30 16:19:56.050 INFO 20268 --- [main] org.quartz.impl.StdSchedulerFactory : Using default implementation for ThreadExecutor +2023-11-30 16:19:56.057 INFO 20268 --- [main] org.quartz.core.SchedulerSignalerImpl : Initialized Scheduler Signaller of type: class org.quartz.core.SchedulerSignalerImpl +2023-11-30 16:19:56.057 INFO 20268 --- [main] org.quartz.core.QuartzScheduler : Quartz Scheduler v.2.3.2 created. +2023-11-30 16:19:56.058 INFO 20268 --- [main] org.quartz.simpl.RAMJobStore : RAMJobStore initialized. +2023-11-30 16:19:56.058 INFO 20268 --- [main] org.quartz.core.QuartzScheduler : Scheduler meta-data: Quartz Scheduler (v2.3.2) 'quartzScheduler' with instanceId 'NON_CLUSTERED' + Scheduler class: 'org.quartz.core.QuartzScheduler' - running locally. + NOT STARTED. + Currently in standby mode. + Number of jobs executed: 0 + Using thread pool 'org.quartz.simpl.SimpleThreadPool' - with 10 threads. + Using job-store 'org.quartz.simpl.RAMJobStore' - which does not support persistence. and is not clustered. + +2023-11-30 16:19:56.058 INFO 20268 --- [main] org.quartz.impl.StdSchedulerFactory : Quartz scheduler 'quartzScheduler' initialized from an externally provided properties instance. +2023-11-30 16:19:56.058 INFO 20268 --- [main] org.quartz.impl.StdSchedulerFactory : Quartz scheduler version: 2.3.2 +2023-11-30 16:19:56.058 INFO 20268 --- [main] org.quartz.core.QuartzScheduler : JobFactory set to: org.springframework.scheduling.quartz.SpringBeanJobFactory@19bad88 +2023-11-30 16:19:56.072 INFO 20268 --- [main] o.s.s.c.ThreadPoolTaskScheduler : Initializing ExecutorService 'taskScheduler' +2023-11-30 16:19:56.174 INFO 20268 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer : Tomcat started on port(s): 11308 (http) with context path '' +2023-11-30 16:19:56.975 INFO 20268 --- [main] o.s.s.quartz.SchedulerFactoryBean : Starting Quartz Scheduler now +2023-11-30 16:19:56.976 INFO 20268 --- [main] org.quartz.core.QuartzScheduler : Scheduler quartzScheduler_$_NON_CLUSTERED started. +2023-11-30 16:19:56.985 INFO 20268 --- [main] com.casic.missiles.CasicApplication : Started CasicApplication in 8.156 seconds (JVM running for 9.154) +2023-11-30 16:19:56.987 INFO 20268 --- [main] com.casic.missiles.CasicApplication : CasicApplication is success! +2023-11-30 16:23:29.991 INFO 20268 --- [SpringContextShutdownHook] org.quartz.core.QuartzScheduler : Scheduler quartzScheduler_$_NON_CLUSTERED paused.