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 0b75d14..0d199fc 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 @@ -555,11 +555,10 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getDeptName()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData()); if (dValue <= 20.0) { deviceDataExcelDto.setData(dValue + "%LEL"); } else { 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 0b75d14..0d199fc 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 @@ -555,11 +555,10 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getDeptName()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData()); if (dValue <= 20.0) { deviceDataExcelDto.setData(dValue + "%LEL"); } else { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 4925084..b7b1f71 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -225,7 +225,7 @@ @RequestMapping(value = "/add") @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class) @ResponseBody - public Object add(@Valid Device device, BindingResult result) { + public Object add(@RequestBody Device device, BindingResult result) { if (result.hasErrors()) { return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage()); } 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 0b75d14..0d199fc 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 @@ -555,11 +555,10 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getDeptName()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData()); if (dValue <= 20.0) { deviceDataExcelDto.setData(dValue + "%LEL"); } else { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 4925084..b7b1f71 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -225,7 +225,7 @@ @RequestMapping(value = "/add") @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class) @ResponseBody - public Object add(@Valid Device device, BindingResult result) { + public Object add(@RequestBody Device device, BindingResult result) { if (result.hasErrors()) { return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage()); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 2f2f701..8157266 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -136,7 +136,7 @@ responseData.setCode(200); } catch (DataAccessException dax) { log.error("主题：设备信息新增异常，设备编号:{}，异常信息:{}", entity.getDevcode(), dax); - responseData.setMessage("新增异常"); + responseData.setMessage(dax.getMessage().contains("Duplicate")&&dax.getMessage().contains("DEVCODE")?"设备编号重复":"新增异常"); } return responseData; } 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 0b75d14..0d199fc 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 @@ -555,11 +555,10 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getDeptName()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData()); if (dValue <= 20.0) { deviceDataExcelDto.setData(dValue + "%LEL"); } else { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 4925084..b7b1f71 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -225,7 +225,7 @@ @RequestMapping(value = "/add") @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class) @ResponseBody - public Object add(@Valid Device device, BindingResult result) { + public Object add(@RequestBody Device device, BindingResult result) { if (result.hasErrors()) { return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage()); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 2f2f701..8157266 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -136,7 +136,7 @@ responseData.setCode(200); } catch (DataAccessException dax) { log.error("主题：设备信息新增异常，设备编号:{}，异常信息:{}", entity.getDevcode(), dax); - responseData.setMessage("新增异常"); + responseData.setMessage(dax.getMessage().contains("Duplicate")&&dax.getMessage().contains("DEVCODE")?"设备编号重复":"新增异常"); } return responseData; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java index 2764d4a..50bf88e 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java @@ -38,7 +38,7 @@ @ExcelProperty("设备编号") private String devcode; private Long deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private Long deptid; @ExcelProperty("部门名称") @@ -48,9 +48,9 @@ private String descn; @ExcelProperty("采集时间") private String uptime; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("设备数据值") + @ExcelProperty("气体浓度（%VOL）") private String strength; private String logtime; } 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 0b75d14..0d199fc 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 @@ -555,11 +555,10 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getDeptName()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData()); if (dValue <= 20.0) { deviceDataExcelDto.setData(dValue + "%LEL"); } else { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 4925084..b7b1f71 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -225,7 +225,7 @@ @RequestMapping(value = "/add") @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class) @ResponseBody - public Object add(@Valid Device device, BindingResult result) { + public Object add(@RequestBody Device device, BindingResult result) { if (result.hasErrors()) { return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage()); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 2f2f701..8157266 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -136,7 +136,7 @@ responseData.setCode(200); } catch (DataAccessException dax) { log.error("主题：设备信息新增异常，设备编号:{}，异常信息:{}", entity.getDevcode(), dax); - responseData.setMessage("新增异常"); + responseData.setMessage(dax.getMessage().contains("Duplicate")&&dax.getMessage().contains("DEVCODE")?"设备编号重复":"新增异常"); } return responseData; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java index 2764d4a..50bf88e 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java @@ -38,7 +38,7 @@ @ExcelProperty("设备编号") private String devcode; private Long deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private Long deptid; @ExcelProperty("部门名称") @@ -48,9 +48,9 @@ private String descn; @ExcelProperty("采集时间") private String uptime; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("设备数据值") + @ExcelProperty("气体浓度（%VOL）") private String strength; private String logtime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java index 5527f15..d363fcb 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java @@ -29,9 +29,8 @@ public class DigNoiseDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; @ExcelProperty("部门名称") @@ -41,7 +40,7 @@ @ExcelProperty("状态描述") private String descn; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; @ExcelProperty("噪声值") private String ddata; 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 0b75d14..0d199fc 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 @@ -555,11 +555,10 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getDeptName()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData()); if (dValue <= 20.0) { deviceDataExcelDto.setData(dValue + "%LEL"); } else { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 4925084..b7b1f71 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -225,7 +225,7 @@ @RequestMapping(value = "/add") @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class) @ResponseBody - public Object add(@Valid Device device, BindingResult result) { + public Object add(@RequestBody Device device, BindingResult result) { if (result.hasErrors()) { return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage()); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 2f2f701..8157266 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -136,7 +136,7 @@ responseData.setCode(200); } catch (DataAccessException dax) { log.error("主题：设备信息新增异常，设备编号:{}，异常信息:{}", entity.getDevcode(), dax); - responseData.setMessage("新增异常"); + responseData.setMessage(dax.getMessage().contains("Duplicate")&&dax.getMessage().contains("DEVCODE")?"设备编号重复":"新增异常"); } return responseData; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java index 2764d4a..50bf88e 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java @@ -38,7 +38,7 @@ @ExcelProperty("设备编号") private String devcode; private Long deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private Long deptid; @ExcelProperty("部门名称") @@ -48,9 +48,9 @@ private String descn; @ExcelProperty("采集时间") private String uptime; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("设备数据值") + @ExcelProperty("气体浓度（%VOL）") private String strength; private String logtime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java index 5527f15..d363fcb 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java @@ -29,9 +29,8 @@ public class DigNoiseDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; @ExcelProperty("部门名称") @@ -41,7 +40,7 @@ @ExcelProperty("状态描述") private String descn; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; @ExcelProperty("噪声值") private String ddata; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java index 664f695..78ac53e 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java @@ -24,7 +24,7 @@ @ExcelProperty("设备编号") private String devcode; private Long deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private Long deptid; @ExcelProperty("部门名称") @@ -34,9 +34,10 @@ private String descn; @ExcelProperty("采集时间") private String uptime; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("设备数据值") + @ExcelProperty("燃气/液位值") private String data; + @ExcelProperty("记录时间") private String logtime; } 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 0b75d14..0d199fc 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 @@ -555,11 +555,10 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getDeptName()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData()); if (dValue <= 20.0) { deviceDataExcelDto.setData(dValue + "%LEL"); } else { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 4925084..b7b1f71 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -225,7 +225,7 @@ @RequestMapping(value = "/add") @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class) @ResponseBody - public Object add(@Valid Device device, BindingResult result) { + public Object add(@RequestBody Device device, BindingResult result) { if (result.hasErrors()) { return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage()); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 2f2f701..8157266 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -136,7 +136,7 @@ responseData.setCode(200); } catch (DataAccessException dax) { log.error("主题：设备信息新增异常，设备编号:{}，异常信息:{}", entity.getDevcode(), dax); - responseData.setMessage("新增异常"); + responseData.setMessage(dax.getMessage().contains("Duplicate")&&dax.getMessage().contains("DEVCODE")?"设备编号重复":"新增异常"); } return responseData; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java index 2764d4a..50bf88e 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java @@ -38,7 +38,7 @@ @ExcelProperty("设备编号") private String devcode; private Long deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private Long deptid; @ExcelProperty("部门名称") @@ -48,9 +48,9 @@ private String descn; @ExcelProperty("采集时间") private String uptime; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("设备数据值") + @ExcelProperty("气体浓度（%VOL）") private String strength; private String logtime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java index 5527f15..d363fcb 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java @@ -29,9 +29,8 @@ public class DigNoiseDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; @ExcelProperty("部门名称") @@ -41,7 +40,7 @@ @ExcelProperty("状态描述") private String descn; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; @ExcelProperty("噪声值") private String ddata; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java index 664f695..78ac53e 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java @@ -24,7 +24,7 @@ @ExcelProperty("设备编号") private String devcode; private Long deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private Long deptid; @ExcelProperty("部门名称") @@ -34,9 +34,10 @@ private String descn; @ExcelProperty("采集时间") private String uptime; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("设备数据值") + @ExcelProperty("燃气/液位值") private String data; + @ExcelProperty("记录时间") private String logtime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java index 575792c..9fbd104 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java @@ -29,8 +29,6 @@ @ExcelProperty("点位编号") private String wellCode; - - @ExcelProperty("设备类型") private String deviceType; @ExcelProperty("设备类型") @@ -41,10 +39,10 @@ @ExcelProperty("权属部门") private String deptName; - @ExcelProperty("硫化氢浓度") + @ExcelProperty("气体浓度（%VOL）") private String strength; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; @ExcelProperty("采集时间") 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 0b75d14..0d199fc 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 @@ -555,11 +555,10 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getDeptName()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData()); if (dValue <= 20.0) { deviceDataExcelDto.setData(dValue + "%LEL"); } else { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 4925084..b7b1f71 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -225,7 +225,7 @@ @RequestMapping(value = "/add") @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class) @ResponseBody - public Object add(@Valid Device device, BindingResult result) { + public Object add(@RequestBody Device device, BindingResult result) { if (result.hasErrors()) { return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage()); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 2f2f701..8157266 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -136,7 +136,7 @@ responseData.setCode(200); } catch (DataAccessException dax) { log.error("主题：设备信息新增异常，设备编号:{}，异常信息:{}", entity.getDevcode(), dax); - responseData.setMessage("新增异常"); + responseData.setMessage(dax.getMessage().contains("Duplicate")&&dax.getMessage().contains("DEVCODE")?"设备编号重复":"新增异常"); } return responseData; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java index 2764d4a..50bf88e 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java @@ -38,7 +38,7 @@ @ExcelProperty("设备编号") private String devcode; private Long deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private Long deptid; @ExcelProperty("部门名称") @@ -48,9 +48,9 @@ private String descn; @ExcelProperty("采集时间") private String uptime; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("设备数据值") + @ExcelProperty("气体浓度（%VOL）") private String strength; private String logtime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java index 5527f15..d363fcb 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java @@ -29,9 +29,8 @@ public class DigNoiseDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; @ExcelProperty("部门名称") @@ -41,7 +40,7 @@ @ExcelProperty("状态描述") private String descn; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; @ExcelProperty("噪声值") private String ddata; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java index 664f695..78ac53e 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java @@ -24,7 +24,7 @@ @ExcelProperty("设备编号") private String devcode; private Long deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private Long deptid; @ExcelProperty("部门名称") @@ -34,9 +34,10 @@ private String descn; @ExcelProperty("采集时间") private String uptime; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("设备数据值") + @ExcelProperty("燃气/液位值") private String data; + @ExcelProperty("记录时间") private String logtime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java index 575792c..9fbd104 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java @@ -29,8 +29,6 @@ @ExcelProperty("点位编号") private String wellCode; - - @ExcelProperty("设备类型") private String deviceType; @ExcelProperty("设备类型") @@ -41,10 +39,10 @@ @ExcelProperty("权属部门") private String deptName; - @ExcelProperty("硫化氢浓度") + @ExcelProperty("气体浓度（%VOL）") private String strength; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; @ExcelProperty("采集时间") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java index 6a2b3a0..7598ab2 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java @@ -37,17 +37,17 @@ private String wellCode; @ExcelProperty("状态描述") private String descn; - @ExcelProperty("甲烷/CH4(%VOL)") - @JSONField(name="CH4") + @ExcelProperty("甲烷/CH₄(%VOL)") + @JSONField(name="CH₄") private String CH4; @ExcelProperty("氧气(ppm)") - @JSONField(name="O2") + @JSONField(name="O₂") private String O2; @ExcelProperty("一氧化氮(ppm)") @JSONField(name="CO") private String CO; @ExcelProperty("硫化氢(ppm)") - @JSONField(name="H2S") + @JSONField(name="H₂S") private String H2S; @ExcelProperty("液位开关") private String liquidSwitch; 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 0b75d14..0d199fc 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 @@ -555,11 +555,10 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getDeptName()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData()); if (dValue <= 20.0) { deviceDataExcelDto.setData(dValue + "%LEL"); } else { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 4925084..b7b1f71 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -225,7 +225,7 @@ @RequestMapping(value = "/add") @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class) @ResponseBody - public Object add(@Valid Device device, BindingResult result) { + public Object add(@RequestBody Device device, BindingResult result) { if (result.hasErrors()) { return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage()); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 2f2f701..8157266 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -136,7 +136,7 @@ responseData.setCode(200); } catch (DataAccessException dax) { log.error("主题：设备信息新增异常，设备编号:{}，异常信息:{}", entity.getDevcode(), dax); - responseData.setMessage("新增异常"); + responseData.setMessage(dax.getMessage().contains("Duplicate")&&dax.getMessage().contains("DEVCODE")?"设备编号重复":"新增异常"); } return responseData; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java index 2764d4a..50bf88e 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java @@ -38,7 +38,7 @@ @ExcelProperty("设备编号") private String devcode; private Long deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private Long deptid; @ExcelProperty("部门名称") @@ -48,9 +48,9 @@ private String descn; @ExcelProperty("采集时间") private String uptime; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("设备数据值") + @ExcelProperty("气体浓度（%VOL）") private String strength; private String logtime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java index 5527f15..d363fcb 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java @@ -29,9 +29,8 @@ public class DigNoiseDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; @ExcelProperty("部门名称") @@ -41,7 +40,7 @@ @ExcelProperty("状态描述") private String descn; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; @ExcelProperty("噪声值") private String ddata; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java index 664f695..78ac53e 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java @@ -24,7 +24,7 @@ @ExcelProperty("设备编号") private String devcode; private Long deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private Long deptid; @ExcelProperty("部门名称") @@ -34,9 +34,10 @@ private String descn; @ExcelProperty("采集时间") private String uptime; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("设备数据值") + @ExcelProperty("燃气/液位值") private String data; + @ExcelProperty("记录时间") private String logtime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java index 575792c..9fbd104 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java @@ -29,8 +29,6 @@ @ExcelProperty("点位编号") private String wellCode; - - @ExcelProperty("设备类型") private String deviceType; @ExcelProperty("设备类型") @@ -41,10 +39,10 @@ @ExcelProperty("权属部门") private String deptName; - @ExcelProperty("硫化氢浓度") + @ExcelProperty("气体浓度（%VOL）") private String strength; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; @ExcelProperty("采集时间") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java index 6a2b3a0..7598ab2 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java @@ -37,17 +37,17 @@ private String wellCode; @ExcelProperty("状态描述") private String descn; - @ExcelProperty("甲烷/CH4(%VOL)") - @JSONField(name="CH4") + @ExcelProperty("甲烷/CH₄(%VOL)") + @JSONField(name="CH₄") private String CH4; @ExcelProperty("氧气(ppm)") - @JSONField(name="O2") + @JSONField(name="O₂") private String O2; @ExcelProperty("一氧化氮(ppm)") @JSONField(name="CO") private String CO; @ExcelProperty("硫化氢(ppm)") - @JSONField(name="H2S") + @JSONField(name="H₂S") private String H2S; @ExcelProperty("液位开关") private String liquidSwitch; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java index 37473f8..9faff40 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java @@ -25,16 +25,14 @@ public class HydrantDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; - @ExcelProperty("部门名称") + @ExcelProperty("所属部门") private String deptName; @ExcelProperty("点位编号") private String wellCode; - @ExcelProperty("状态") private String status; @ExcelProperty("记录时间") private String logtime; 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 0b75d14..0d199fc 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 @@ -555,11 +555,10 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getDeptName()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData()); if (dValue <= 20.0) { deviceDataExcelDto.setData(dValue + "%LEL"); } else { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 4925084..b7b1f71 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -225,7 +225,7 @@ @RequestMapping(value = "/add") @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class) @ResponseBody - public Object add(@Valid Device device, BindingResult result) { + public Object add(@RequestBody Device device, BindingResult result) { if (result.hasErrors()) { return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage()); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 2f2f701..8157266 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -136,7 +136,7 @@ responseData.setCode(200); } catch (DataAccessException dax) { log.error("主题：设备信息新增异常，设备编号:{}，异常信息:{}", entity.getDevcode(), dax); - responseData.setMessage("新增异常"); + responseData.setMessage(dax.getMessage().contains("Duplicate")&&dax.getMessage().contains("DEVCODE")?"设备编号重复":"新增异常"); } return responseData; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java index 2764d4a..50bf88e 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java @@ -38,7 +38,7 @@ @ExcelProperty("设备编号") private String devcode; private Long deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private Long deptid; @ExcelProperty("部门名称") @@ -48,9 +48,9 @@ private String descn; @ExcelProperty("采集时间") private String uptime; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("设备数据值") + @ExcelProperty("气体浓度（%VOL）") private String strength; private String logtime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java index 5527f15..d363fcb 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java @@ -29,9 +29,8 @@ public class DigNoiseDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; @ExcelProperty("部门名称") @@ -41,7 +40,7 @@ @ExcelProperty("状态描述") private String descn; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; @ExcelProperty("噪声值") private String ddata; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java index 664f695..78ac53e 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java @@ -24,7 +24,7 @@ @ExcelProperty("设备编号") private String devcode; private Long deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private Long deptid; @ExcelProperty("部门名称") @@ -34,9 +34,10 @@ private String descn; @ExcelProperty("采集时间") private String uptime; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("设备数据值") + @ExcelProperty("燃气/液位值") private String data; + @ExcelProperty("记录时间") private String logtime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java index 575792c..9fbd104 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java @@ -29,8 +29,6 @@ @ExcelProperty("点位编号") private String wellCode; - - @ExcelProperty("设备类型") private String deviceType; @ExcelProperty("设备类型") @@ -41,10 +39,10 @@ @ExcelProperty("权属部门") private String deptName; - @ExcelProperty("硫化氢浓度") + @ExcelProperty("气体浓度（%VOL）") private String strength; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; @ExcelProperty("采集时间") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java index 6a2b3a0..7598ab2 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java @@ -37,17 +37,17 @@ private String wellCode; @ExcelProperty("状态描述") private String descn; - @ExcelProperty("甲烷/CH4(%VOL)") - @JSONField(name="CH4") + @ExcelProperty("甲烷/CH₄(%VOL)") + @JSONField(name="CH₄") private String CH4; @ExcelProperty("氧气(ppm)") - @JSONField(name="O2") + @JSONField(name="O₂") private String O2; @ExcelProperty("一氧化氮(ppm)") @JSONField(name="CO") private String CO; @ExcelProperty("硫化氢(ppm)") - @JSONField(name="H2S") + @JSONField(name="H₂S") private String H2S; @ExcelProperty("液位开关") private String liquidSwitch; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java index 37473f8..9faff40 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java @@ -25,16 +25,14 @@ public class HydrantDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; - @ExcelProperty("部门名称") + @ExcelProperty("所属部门") private String deptName; @ExcelProperty("点位编号") private String wellCode; - @ExcelProperty("状态") private String status; @ExcelProperty("记录时间") private String logtime; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java index df48c25..eb93ee6 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java @@ -22,7 +22,7 @@ @ExcelProperty("设备编号") private String devcode; private Long deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private Long deptid; @ExcelProperty("部门名称") @@ -32,9 +32,10 @@ private String descn; @ExcelProperty("采集时间") private String uptime; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("设备数据值") + @ExcelProperty("液位值（m）") private String liquiddata; + @ExcelProperty("记录时间") private String logtime; } 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 0b75d14..0d199fc 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 @@ -555,11 +555,10 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getDeptName()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData()); if (dValue <= 20.0) { deviceDataExcelDto.setData(dValue + "%LEL"); } else { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 4925084..b7b1f71 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -225,7 +225,7 @@ @RequestMapping(value = "/add") @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class) @ResponseBody - public Object add(@Valid Device device, BindingResult result) { + public Object add(@RequestBody Device device, BindingResult result) { if (result.hasErrors()) { return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage()); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 2f2f701..8157266 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -136,7 +136,7 @@ responseData.setCode(200); } catch (DataAccessException dax) { log.error("主题：设备信息新增异常，设备编号:{}，异常信息:{}", entity.getDevcode(), dax); - responseData.setMessage("新增异常"); + responseData.setMessage(dax.getMessage().contains("Duplicate")&&dax.getMessage().contains("DEVCODE")?"设备编号重复":"新增异常"); } return responseData; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java index 2764d4a..50bf88e 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java @@ -38,7 +38,7 @@ @ExcelProperty("设备编号") private String devcode; private Long deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private Long deptid; @ExcelProperty("部门名称") @@ -48,9 +48,9 @@ private String descn; @ExcelProperty("采集时间") private String uptime; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("设备数据值") + @ExcelProperty("气体浓度（%VOL）") private String strength; private String logtime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java index 5527f15..d363fcb 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java @@ -29,9 +29,8 @@ public class DigNoiseDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; @ExcelProperty("部门名称") @@ -41,7 +40,7 @@ @ExcelProperty("状态描述") private String descn; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; @ExcelProperty("噪声值") private String ddata; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java index 664f695..78ac53e 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java @@ -24,7 +24,7 @@ @ExcelProperty("设备编号") private String devcode; private Long deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private Long deptid; @ExcelProperty("部门名称") @@ -34,9 +34,10 @@ private String descn; @ExcelProperty("采集时间") private String uptime; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("设备数据值") + @ExcelProperty("燃气/液位值") private String data; + @ExcelProperty("记录时间") private String logtime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java index 575792c..9fbd104 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java @@ -29,8 +29,6 @@ @ExcelProperty("点位编号") private String wellCode; - - @ExcelProperty("设备类型") private String deviceType; @ExcelProperty("设备类型") @@ -41,10 +39,10 @@ @ExcelProperty("权属部门") private String deptName; - @ExcelProperty("硫化氢浓度") + @ExcelProperty("气体浓度（%VOL）") private String strength; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; @ExcelProperty("采集时间") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java index 6a2b3a0..7598ab2 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java @@ -37,17 +37,17 @@ private String wellCode; @ExcelProperty("状态描述") private String descn; - @ExcelProperty("甲烷/CH4(%VOL)") - @JSONField(name="CH4") + @ExcelProperty("甲烷/CH₄(%VOL)") + @JSONField(name="CH₄") private String CH4; @ExcelProperty("氧气(ppm)") - @JSONField(name="O2") + @JSONField(name="O₂") private String O2; @ExcelProperty("一氧化氮(ppm)") @JSONField(name="CO") private String CO; @ExcelProperty("硫化氢(ppm)") - @JSONField(name="H2S") + @JSONField(name="H₂S") private String H2S; @ExcelProperty("液位开关") private String liquidSwitch; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java index 37473f8..9faff40 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java @@ -25,16 +25,14 @@ public class HydrantDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; - @ExcelProperty("部门名称") + @ExcelProperty("所属部门") private String deptName; @ExcelProperty("点位编号") private String wellCode; - @ExcelProperty("状态") private String status; @ExcelProperty("记录时间") private String logtime; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java index df48c25..eb93ee6 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java @@ -22,7 +22,7 @@ @ExcelProperty("设备编号") private String devcode; private Long deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private Long deptid; @ExcelProperty("部门名称") @@ -32,9 +32,10 @@ private String descn; @ExcelProperty("采集时间") private String uptime; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("设备数据值") + @ExcelProperty("液位值（m）") private String liquiddata; + @ExcelProperty("记录时间") private String logtime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java index 66fcc8e..f86b173 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java @@ -26,9 +26,8 @@ public class TemhumDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; @ExcelProperty("部门名称") @@ -37,12 +36,11 @@ private String wellCode; @ExcelProperty("状态描述") private String descn; - - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("温度") + @ExcelProperty("温度（℃）") private String temperature; - @ExcelProperty("湿度") + @ExcelProperty("湿度（%RH）") private String humidity; @ExcelProperty("采集时间") private String uptime; 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 0b75d14..0d199fc 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 @@ -555,11 +555,10 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getDeptName()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData()); if (dValue <= 20.0) { deviceDataExcelDto.setData(dValue + "%LEL"); } else { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 4925084..b7b1f71 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -225,7 +225,7 @@ @RequestMapping(value = "/add") @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class) @ResponseBody - public Object add(@Valid Device device, BindingResult result) { + public Object add(@RequestBody Device device, BindingResult result) { if (result.hasErrors()) { return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage()); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 2f2f701..8157266 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -136,7 +136,7 @@ responseData.setCode(200); } catch (DataAccessException dax) { log.error("主题：设备信息新增异常，设备编号:{}，异常信息:{}", entity.getDevcode(), dax); - responseData.setMessage("新增异常"); + responseData.setMessage(dax.getMessage().contains("Duplicate")&&dax.getMessage().contains("DEVCODE")?"设备编号重复":"新增异常"); } return responseData; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java index 2764d4a..50bf88e 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java @@ -38,7 +38,7 @@ @ExcelProperty("设备编号") private String devcode; private Long deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private Long deptid; @ExcelProperty("部门名称") @@ -48,9 +48,9 @@ private String descn; @ExcelProperty("采集时间") private String uptime; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("设备数据值") + @ExcelProperty("气体浓度（%VOL）") private String strength; private String logtime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java index 5527f15..d363fcb 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java @@ -29,9 +29,8 @@ public class DigNoiseDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; @ExcelProperty("部门名称") @@ -41,7 +40,7 @@ @ExcelProperty("状态描述") private String descn; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; @ExcelProperty("噪声值") private String ddata; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java index 664f695..78ac53e 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java @@ -24,7 +24,7 @@ @ExcelProperty("设备编号") private String devcode; private Long deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private Long deptid; @ExcelProperty("部门名称") @@ -34,9 +34,10 @@ private String descn; @ExcelProperty("采集时间") private String uptime; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("设备数据值") + @ExcelProperty("燃气/液位值") private String data; + @ExcelProperty("记录时间") private String logtime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java index 575792c..9fbd104 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java @@ -29,8 +29,6 @@ @ExcelProperty("点位编号") private String wellCode; - - @ExcelProperty("设备类型") private String deviceType; @ExcelProperty("设备类型") @@ -41,10 +39,10 @@ @ExcelProperty("权属部门") private String deptName; - @ExcelProperty("硫化氢浓度") + @ExcelProperty("气体浓度（%VOL）") private String strength; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; @ExcelProperty("采集时间") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java index 6a2b3a0..7598ab2 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java @@ -37,17 +37,17 @@ private String wellCode; @ExcelProperty("状态描述") private String descn; - @ExcelProperty("甲烷/CH4(%VOL)") - @JSONField(name="CH4") + @ExcelProperty("甲烷/CH₄(%VOL)") + @JSONField(name="CH₄") private String CH4; @ExcelProperty("氧气(ppm)") - @JSONField(name="O2") + @JSONField(name="O₂") private String O2; @ExcelProperty("一氧化氮(ppm)") @JSONField(name="CO") private String CO; @ExcelProperty("硫化氢(ppm)") - @JSONField(name="H2S") + @JSONField(name="H₂S") private String H2S; @ExcelProperty("液位开关") private String liquidSwitch; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java index 37473f8..9faff40 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java @@ -25,16 +25,14 @@ public class HydrantDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; - @ExcelProperty("部门名称") + @ExcelProperty("所属部门") private String deptName; @ExcelProperty("点位编号") private String wellCode; - @ExcelProperty("状态") private String status; @ExcelProperty("记录时间") private String logtime; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java index df48c25..eb93ee6 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java @@ -22,7 +22,7 @@ @ExcelProperty("设备编号") private String devcode; private Long deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private Long deptid; @ExcelProperty("部门名称") @@ -32,9 +32,10 @@ private String descn; @ExcelProperty("采集时间") private String uptime; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("设备数据值") + @ExcelProperty("液位值（m）") private String liquiddata; + @ExcelProperty("记录时间") private String logtime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java index 66fcc8e..f86b173 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java @@ -26,9 +26,8 @@ public class TemhumDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; @ExcelProperty("部门名称") @@ -37,12 +36,11 @@ private String wellCode; @ExcelProperty("状态描述") private String descn; - - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("温度") + @ExcelProperty("温度（℃）") private String temperature; - @ExcelProperty("湿度") + @ExcelProperty("湿度（%RH）") private String humidity; @ExcelProperty("采集时间") private String uptime; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java index ec1ab22..c226606 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java @@ -25,9 +25,8 @@ public class TemppressDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; @ExcelProperty("部门名称") @@ -36,11 +35,11 @@ private String wellCode; @ExcelProperty("状态描述") private String descn; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("温度") + @ExcelProperty("温度（℃）") private String temperature; - @ExcelProperty("压力") + @ExcelProperty("压力（Pa）") private String press; @ExcelProperty("采集时间") private String uptime; 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 0b75d14..0d199fc 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 @@ -555,11 +555,10 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getDeptName()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData()); if (dValue <= 20.0) { deviceDataExcelDto.setData(dValue + "%LEL"); } else { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 4925084..b7b1f71 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -225,7 +225,7 @@ @RequestMapping(value = "/add") @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class) @ResponseBody - public Object add(@Valid Device device, BindingResult result) { + public Object add(@RequestBody Device device, BindingResult result) { if (result.hasErrors()) { return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage()); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 2f2f701..8157266 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -136,7 +136,7 @@ responseData.setCode(200); } catch (DataAccessException dax) { log.error("主题：设备信息新增异常，设备编号:{}，异常信息:{}", entity.getDevcode(), dax); - responseData.setMessage("新增异常"); + responseData.setMessage(dax.getMessage().contains("Duplicate")&&dax.getMessage().contains("DEVCODE")?"设备编号重复":"新增异常"); } return responseData; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java index 2764d4a..50bf88e 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java @@ -38,7 +38,7 @@ @ExcelProperty("设备编号") private String devcode; private Long deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private Long deptid; @ExcelProperty("部门名称") @@ -48,9 +48,9 @@ private String descn; @ExcelProperty("采集时间") private String uptime; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("设备数据值") + @ExcelProperty("气体浓度（%VOL）") private String strength; private String logtime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java index 5527f15..d363fcb 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java @@ -29,9 +29,8 @@ public class DigNoiseDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; @ExcelProperty("部门名称") @@ -41,7 +40,7 @@ @ExcelProperty("状态描述") private String descn; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; @ExcelProperty("噪声值") private String ddata; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java index 664f695..78ac53e 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java @@ -24,7 +24,7 @@ @ExcelProperty("设备编号") private String devcode; private Long deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private Long deptid; @ExcelProperty("部门名称") @@ -34,9 +34,10 @@ private String descn; @ExcelProperty("采集时间") private String uptime; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("设备数据值") + @ExcelProperty("燃气/液位值") private String data; + @ExcelProperty("记录时间") private String logtime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java index 575792c..9fbd104 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java @@ -29,8 +29,6 @@ @ExcelProperty("点位编号") private String wellCode; - - @ExcelProperty("设备类型") private String deviceType; @ExcelProperty("设备类型") @@ -41,10 +39,10 @@ @ExcelProperty("权属部门") private String deptName; - @ExcelProperty("硫化氢浓度") + @ExcelProperty("气体浓度（%VOL）") private String strength; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; @ExcelProperty("采集时间") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java index 6a2b3a0..7598ab2 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java @@ -37,17 +37,17 @@ private String wellCode; @ExcelProperty("状态描述") private String descn; - @ExcelProperty("甲烷/CH4(%VOL)") - @JSONField(name="CH4") + @ExcelProperty("甲烷/CH₄(%VOL)") + @JSONField(name="CH₄") private String CH4; @ExcelProperty("氧气(ppm)") - @JSONField(name="O2") + @JSONField(name="O₂") private String O2; @ExcelProperty("一氧化氮(ppm)") @JSONField(name="CO") private String CO; @ExcelProperty("硫化氢(ppm)") - @JSONField(name="H2S") + @JSONField(name="H₂S") private String H2S; @ExcelProperty("液位开关") private String liquidSwitch; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java index 37473f8..9faff40 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java @@ -25,16 +25,14 @@ public class HydrantDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; - @ExcelProperty("部门名称") + @ExcelProperty("所属部门") private String deptName; @ExcelProperty("点位编号") private String wellCode; - @ExcelProperty("状态") private String status; @ExcelProperty("记录时间") private String logtime; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java index df48c25..eb93ee6 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java @@ -22,7 +22,7 @@ @ExcelProperty("设备编号") private String devcode; private Long deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private Long deptid; @ExcelProperty("部门名称") @@ -32,9 +32,10 @@ private String descn; @ExcelProperty("采集时间") private String uptime; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("设备数据值") + @ExcelProperty("液位值（m）") private String liquiddata; + @ExcelProperty("记录时间") private String logtime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java index 66fcc8e..f86b173 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java @@ -26,9 +26,8 @@ public class TemhumDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; @ExcelProperty("部门名称") @@ -37,12 +36,11 @@ private String wellCode; @ExcelProperty("状态描述") private String descn; - - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("温度") + @ExcelProperty("温度（℃）") private String temperature; - @ExcelProperty("湿度") + @ExcelProperty("湿度（%RH）") private String humidity; @ExcelProperty("采集时间") private String uptime; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java index ec1ab22..c226606 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java @@ -25,9 +25,8 @@ public class TemppressDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; @ExcelProperty("部门名称") @@ -36,11 +35,11 @@ private String wellCode; @ExcelProperty("状态描述") private String descn; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("温度") + @ExcelProperty("温度（℃）") private String temperature; - @ExcelProperty("压力") + @ExcelProperty("压力（Pa）") private String press; @ExcelProperty("采集时间") private String uptime; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java index 28e17c6..37d2ae7 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java @@ -25,9 +25,8 @@ public class WellAppointDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; @ExcelProperty("部门名称") @@ -37,7 +36,7 @@ @ExcelProperty("状态描述") private String descn; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; @ExcelProperty("纬度") private String lat; 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 0b75d14..0d199fc 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 @@ -555,11 +555,10 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getDeptName()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData()); if (dValue <= 20.0) { deviceDataExcelDto.setData(dValue + "%LEL"); } else { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 4925084..b7b1f71 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -225,7 +225,7 @@ @RequestMapping(value = "/add") @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class) @ResponseBody - public Object add(@Valid Device device, BindingResult result) { + public Object add(@RequestBody Device device, BindingResult result) { if (result.hasErrors()) { return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage()); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 2f2f701..8157266 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -136,7 +136,7 @@ responseData.setCode(200); } catch (DataAccessException dax) { log.error("主题：设备信息新增异常，设备编号:{}，异常信息:{}", entity.getDevcode(), dax); - responseData.setMessage("新增异常"); + responseData.setMessage(dax.getMessage().contains("Duplicate")&&dax.getMessage().contains("DEVCODE")?"设备编号重复":"新增异常"); } return responseData; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java index 2764d4a..50bf88e 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java @@ -38,7 +38,7 @@ @ExcelProperty("设备编号") private String devcode; private Long deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private Long deptid; @ExcelProperty("部门名称") @@ -48,9 +48,9 @@ private String descn; @ExcelProperty("采集时间") private String uptime; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("设备数据值") + @ExcelProperty("气体浓度（%VOL）") private String strength; private String logtime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java index 5527f15..d363fcb 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java @@ -29,9 +29,8 @@ public class DigNoiseDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; @ExcelProperty("部门名称") @@ -41,7 +40,7 @@ @ExcelProperty("状态描述") private String descn; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; @ExcelProperty("噪声值") private String ddata; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java index 664f695..78ac53e 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java @@ -24,7 +24,7 @@ @ExcelProperty("设备编号") private String devcode; private Long deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private Long deptid; @ExcelProperty("部门名称") @@ -34,9 +34,10 @@ private String descn; @ExcelProperty("采集时间") private String uptime; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("设备数据值") + @ExcelProperty("燃气/液位值") private String data; + @ExcelProperty("记录时间") private String logtime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java index 575792c..9fbd104 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java @@ -29,8 +29,6 @@ @ExcelProperty("点位编号") private String wellCode; - - @ExcelProperty("设备类型") private String deviceType; @ExcelProperty("设备类型") @@ -41,10 +39,10 @@ @ExcelProperty("权属部门") private String deptName; - @ExcelProperty("硫化氢浓度") + @ExcelProperty("气体浓度（%VOL）") private String strength; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; @ExcelProperty("采集时间") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java index 6a2b3a0..7598ab2 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java @@ -37,17 +37,17 @@ private String wellCode; @ExcelProperty("状态描述") private String descn; - @ExcelProperty("甲烷/CH4(%VOL)") - @JSONField(name="CH4") + @ExcelProperty("甲烷/CH₄(%VOL)") + @JSONField(name="CH₄") private String CH4; @ExcelProperty("氧气(ppm)") - @JSONField(name="O2") + @JSONField(name="O₂") private String O2; @ExcelProperty("一氧化氮(ppm)") @JSONField(name="CO") private String CO; @ExcelProperty("硫化氢(ppm)") - @JSONField(name="H2S") + @JSONField(name="H₂S") private String H2S; @ExcelProperty("液位开关") private String liquidSwitch; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java index 37473f8..9faff40 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java @@ -25,16 +25,14 @@ public class HydrantDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; - @ExcelProperty("部门名称") + @ExcelProperty("所属部门") private String deptName; @ExcelProperty("点位编号") private String wellCode; - @ExcelProperty("状态") private String status; @ExcelProperty("记录时间") private String logtime; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java index df48c25..eb93ee6 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java @@ -22,7 +22,7 @@ @ExcelProperty("设备编号") private String devcode; private Long deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private Long deptid; @ExcelProperty("部门名称") @@ -32,9 +32,10 @@ private String descn; @ExcelProperty("采集时间") private String uptime; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("设备数据值") + @ExcelProperty("液位值（m）") private String liquiddata; + @ExcelProperty("记录时间") private String logtime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java index 66fcc8e..f86b173 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java @@ -26,9 +26,8 @@ public class TemhumDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; @ExcelProperty("部门名称") @@ -37,12 +36,11 @@ private String wellCode; @ExcelProperty("状态描述") private String descn; - - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("温度") + @ExcelProperty("温度（℃）") private String temperature; - @ExcelProperty("湿度") + @ExcelProperty("湿度（%RH）") private String humidity; @ExcelProperty("采集时间") private String uptime; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java index ec1ab22..c226606 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java @@ -25,9 +25,8 @@ public class TemppressDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; @ExcelProperty("部门名称") @@ -36,11 +35,11 @@ private String wellCode; @ExcelProperty("状态描述") private String descn; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("温度") + @ExcelProperty("温度（℃）") private String temperature; - @ExcelProperty("压力") + @ExcelProperty("压力（Pa）") private String press; @ExcelProperty("采集时间") private String uptime; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java index 28e17c6..37d2ae7 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java @@ -25,9 +25,8 @@ public class WellAppointDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; @ExcelProperty("部门名称") @@ -37,7 +36,7 @@ @ExcelProperty("状态描述") private String descn; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; @ExcelProperty("纬度") private String lat; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java index 8e2a11a..ea36bf5 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java @@ -30,11 +30,10 @@ private String devcode; @ExcelProperty("点位编号") private String wellCode; -// @ExcelProperty("设备类型") private Long deviceType; @ExcelProperty("状态描述") private String descn; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private Long deptid; @ExcelProperty("权属单位") 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 0b75d14..0d199fc 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 @@ -555,11 +555,10 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getDeptName()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData()); if (dValue <= 20.0) { deviceDataExcelDto.setData(dValue + "%LEL"); } else { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 4925084..b7b1f71 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -225,7 +225,7 @@ @RequestMapping(value = "/add") @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class) @ResponseBody - public Object add(@Valid Device device, BindingResult result) { + public Object add(@RequestBody Device device, BindingResult result) { if (result.hasErrors()) { return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage()); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 2f2f701..8157266 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -136,7 +136,7 @@ responseData.setCode(200); } catch (DataAccessException dax) { log.error("主题：设备信息新增异常，设备编号:{}，异常信息:{}", entity.getDevcode(), dax); - responseData.setMessage("新增异常"); + responseData.setMessage(dax.getMessage().contains("Duplicate")&&dax.getMessage().contains("DEVCODE")?"设备编号重复":"新增异常"); } return responseData; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java index 2764d4a..50bf88e 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java @@ -38,7 +38,7 @@ @ExcelProperty("设备编号") private String devcode; private Long deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private Long deptid; @ExcelProperty("部门名称") @@ -48,9 +48,9 @@ private String descn; @ExcelProperty("采集时间") private String uptime; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("设备数据值") + @ExcelProperty("气体浓度（%VOL）") private String strength; private String logtime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java index 5527f15..d363fcb 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java @@ -29,9 +29,8 @@ public class DigNoiseDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; @ExcelProperty("部门名称") @@ -41,7 +40,7 @@ @ExcelProperty("状态描述") private String descn; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; @ExcelProperty("噪声值") private String ddata; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java index 664f695..78ac53e 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java @@ -24,7 +24,7 @@ @ExcelProperty("设备编号") private String devcode; private Long deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private Long deptid; @ExcelProperty("部门名称") @@ -34,9 +34,10 @@ private String descn; @ExcelProperty("采集时间") private String uptime; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("设备数据值") + @ExcelProperty("燃气/液位值") private String data; + @ExcelProperty("记录时间") private String logtime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java index 575792c..9fbd104 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java @@ -29,8 +29,6 @@ @ExcelProperty("点位编号") private String wellCode; - - @ExcelProperty("设备类型") private String deviceType; @ExcelProperty("设备类型") @@ -41,10 +39,10 @@ @ExcelProperty("权属部门") private String deptName; - @ExcelProperty("硫化氢浓度") + @ExcelProperty("气体浓度（%VOL）") private String strength; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; @ExcelProperty("采集时间") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java index 6a2b3a0..7598ab2 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java @@ -37,17 +37,17 @@ private String wellCode; @ExcelProperty("状态描述") private String descn; - @ExcelProperty("甲烷/CH4(%VOL)") - @JSONField(name="CH4") + @ExcelProperty("甲烷/CH₄(%VOL)") + @JSONField(name="CH₄") private String CH4; @ExcelProperty("氧气(ppm)") - @JSONField(name="O2") + @JSONField(name="O₂") private String O2; @ExcelProperty("一氧化氮(ppm)") @JSONField(name="CO") private String CO; @ExcelProperty("硫化氢(ppm)") - @JSONField(name="H2S") + @JSONField(name="H₂S") private String H2S; @ExcelProperty("液位开关") private String liquidSwitch; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java index 37473f8..9faff40 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java @@ -25,16 +25,14 @@ public class HydrantDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; - @ExcelProperty("部门名称") + @ExcelProperty("所属部门") private String deptName; @ExcelProperty("点位编号") private String wellCode; - @ExcelProperty("状态") private String status; @ExcelProperty("记录时间") private String logtime; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java index df48c25..eb93ee6 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java @@ -22,7 +22,7 @@ @ExcelProperty("设备编号") private String devcode; private Long deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private Long deptid; @ExcelProperty("部门名称") @@ -32,9 +32,10 @@ private String descn; @ExcelProperty("采集时间") private String uptime; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("设备数据值") + @ExcelProperty("液位值（m）") private String liquiddata; + @ExcelProperty("记录时间") private String logtime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java index 66fcc8e..f86b173 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java @@ -26,9 +26,8 @@ public class TemhumDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; @ExcelProperty("部门名称") @@ -37,12 +36,11 @@ private String wellCode; @ExcelProperty("状态描述") private String descn; - - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("温度") + @ExcelProperty("温度（℃）") private String temperature; - @ExcelProperty("湿度") + @ExcelProperty("湿度（%RH）") private String humidity; @ExcelProperty("采集时间") private String uptime; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java index ec1ab22..c226606 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java @@ -25,9 +25,8 @@ public class TemppressDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; @ExcelProperty("部门名称") @@ -36,11 +35,11 @@ private String wellCode; @ExcelProperty("状态描述") private String descn; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("温度") + @ExcelProperty("温度（℃）") private String temperature; - @ExcelProperty("压力") + @ExcelProperty("压力（Pa）") private String press; @ExcelProperty("采集时间") private String uptime; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java index 28e17c6..37d2ae7 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java @@ -25,9 +25,8 @@ public class WellAppointDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; @ExcelProperty("部门名称") @@ -37,7 +36,7 @@ @ExcelProperty("状态描述") private String descn; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; @ExcelProperty("纬度") private String lat; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java index 8e2a11a..ea36bf5 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java @@ -30,11 +30,10 @@ private String devcode; @ExcelProperty("点位编号") private String wellCode; -// @ExcelProperty("设备类型") private Long deviceType; @ExcelProperty("状态描述") private String descn; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private Long deptid; @ExcelProperty("权属单位") 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 5e0e1fb..fe10182 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 @@ -90,6 +90,7 @@ ) + ORDER BY "deviceCount" DESC 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 0b75d14..0d199fc 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 @@ -555,11 +555,10 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords); deviceDataExcelDtoList.forEach(deviceDataExcelDto -> { if ("gas".equals(sensorType)) { - Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getDeptName()); + Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData()); if (dValue <= 20.0) { deviceDataExcelDto.setData(dValue + "%LEL"); } else { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 4925084..b7b1f71 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -225,7 +225,7 @@ @RequestMapping(value = "/add") @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class) @ResponseBody - public Object add(@Valid Device device, BindingResult result) { + public Object add(@RequestBody Device device, BindingResult result) { if (result.hasErrors()) { return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage()); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 2f2f701..8157266 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -136,7 +136,7 @@ responseData.setCode(200); } catch (DataAccessException dax) { log.error("主题：设备信息新增异常，设备编号:{}，异常信息:{}", entity.getDevcode(), dax); - responseData.setMessage("新增异常"); + responseData.setMessage(dax.getMessage().contains("Duplicate")&&dax.getMessage().contains("DEVCODE")?"设备编号重复":"新增异常"); } return responseData; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java index 2764d4a..50bf88e 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java @@ -38,7 +38,7 @@ @ExcelProperty("设备编号") private String devcode; private Long deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private Long deptid; @ExcelProperty("部门名称") @@ -48,9 +48,9 @@ private String descn; @ExcelProperty("采集时间") private String uptime; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("设备数据值") + @ExcelProperty("气体浓度（%VOL）") private String strength; private String logtime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java index 5527f15..d363fcb 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java @@ -29,9 +29,8 @@ public class DigNoiseDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; @ExcelProperty("部门名称") @@ -41,7 +40,7 @@ @ExcelProperty("状态描述") private String descn; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; @ExcelProperty("噪声值") private String ddata; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java index 664f695..78ac53e 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java @@ -24,7 +24,7 @@ @ExcelProperty("设备编号") private String devcode; private Long deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private Long deptid; @ExcelProperty("部门名称") @@ -34,9 +34,10 @@ private String descn; @ExcelProperty("采集时间") private String uptime; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("设备数据值") + @ExcelProperty("燃气/液位值") private String data; + @ExcelProperty("记录时间") private String logtime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java index 575792c..9fbd104 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java @@ -29,8 +29,6 @@ @ExcelProperty("点位编号") private String wellCode; - - @ExcelProperty("设备类型") private String deviceType; @ExcelProperty("设备类型") @@ -41,10 +39,10 @@ @ExcelProperty("权属部门") private String deptName; - @ExcelProperty("硫化氢浓度") + @ExcelProperty("气体浓度（%VOL）") private String strength; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; @ExcelProperty("采集时间") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java index 6a2b3a0..7598ab2 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java @@ -37,17 +37,17 @@ private String wellCode; @ExcelProperty("状态描述") private String descn; - @ExcelProperty("甲烷/CH4(%VOL)") - @JSONField(name="CH4") + @ExcelProperty("甲烷/CH₄(%VOL)") + @JSONField(name="CH₄") private String CH4; @ExcelProperty("氧气(ppm)") - @JSONField(name="O2") + @JSONField(name="O₂") private String O2; @ExcelProperty("一氧化氮(ppm)") @JSONField(name="CO") private String CO; @ExcelProperty("硫化氢(ppm)") - @JSONField(name="H2S") + @JSONField(name="H₂S") private String H2S; @ExcelProperty("液位开关") private String liquidSwitch; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java index 37473f8..9faff40 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java @@ -25,16 +25,14 @@ public class HydrantDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; - @ExcelProperty("部门名称") + @ExcelProperty("所属部门") private String deptName; @ExcelProperty("点位编号") private String wellCode; - @ExcelProperty("状态") private String status; @ExcelProperty("记录时间") private String logtime; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java index df48c25..eb93ee6 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java @@ -22,7 +22,7 @@ @ExcelProperty("设备编号") private String devcode; private Long deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private Long deptid; @ExcelProperty("部门名称") @@ -32,9 +32,10 @@ private String descn; @ExcelProperty("采集时间") private String uptime; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("设备数据值") + @ExcelProperty("液位值（m）") private String liquiddata; + @ExcelProperty("记录时间") private String logtime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java index 66fcc8e..f86b173 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java @@ -26,9 +26,8 @@ public class TemhumDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; @ExcelProperty("部门名称") @@ -37,12 +36,11 @@ private String wellCode; @ExcelProperty("状态描述") private String descn; - - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("温度") + @ExcelProperty("温度（℃）") private String temperature; - @ExcelProperty("湿度") + @ExcelProperty("湿度（%RH）") private String humidity; @ExcelProperty("采集时间") private String uptime; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java index ec1ab22..c226606 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java @@ -25,9 +25,8 @@ public class TemppressDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; @ExcelProperty("部门名称") @@ -36,11 +35,11 @@ private String wellCode; @ExcelProperty("状态描述") private String descn; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; - @ExcelProperty("温度") + @ExcelProperty("温度（℃）") private String temperature; - @ExcelProperty("压力") + @ExcelProperty("压力（Pa）") private String press; @ExcelProperty("采集时间") private String uptime; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java index 28e17c6..37d2ae7 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java @@ -25,9 +25,8 @@ public class WellAppointDataDto { @ExcelProperty("设备编号") private String devcode; - @ExcelProperty("设备类型") private String deviceType; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private String deptid; @ExcelProperty("部门名称") @@ -37,7 +36,7 @@ @ExcelProperty("状态描述") private String descn; - @ExcelProperty("电量") + @ExcelProperty("电量（%）") private String cell; @ExcelProperty("纬度") private String lat; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java index 8e2a11a..ea36bf5 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java @@ -30,11 +30,10 @@ private String devcode; @ExcelProperty("点位编号") private String wellCode; -// @ExcelProperty("设备类型") private Long deviceType; @ExcelProperty("状态描述") private String descn; - @ExcelProperty("设备类型名称") + @ExcelProperty("设备类型") private String deviceTypeName; private Long deptid; @ExcelProperty("权属单位") 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 5e0e1fb..fe10182 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 @@ -90,6 +90,7 @@ ) + ORDER BY "deviceCount" DESC diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index 8abae38..509b0e8 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -3,7 +3,7 @@ ########################################################## spring: profiles: - active: postgre + active: dev servlet: multipart: max-file-size: 50MB