diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java index 7510132..d552f68 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java @@ -11,7 +11,7 @@ */ public static final String CONFIG_EXPORT_TEMP = "configTemp.xlsx"; public static final String METHANE_CONFIG_EXPORT_TEMP = "methaneconfigTemp.xlsx"; - public static final String H2S_CONFIG_EXPORT_TEMP = "H2s.xlsx"; + public static final String H2S_CONFIG_EXPORT_TEMP = "H2SconfigTemp.xlsx"; public static final String WELL_CONFIG_EXPORT_TEMP = "wellCoverconfigTemp.xlsx"; public static final String LG_CONFIG_EXPORT_TEMP = "LGCoverconfigTemp.xlsx"; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java index 7510132..d552f68 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java @@ -11,7 +11,7 @@ */ public static final String CONFIG_EXPORT_TEMP = "configTemp.xlsx"; public static final String METHANE_CONFIG_EXPORT_TEMP = "methaneconfigTemp.xlsx"; - public static final String H2S_CONFIG_EXPORT_TEMP = "H2s.xlsx"; + public static final String H2S_CONFIG_EXPORT_TEMP = "H2SconfigTemp.xlsx"; public static final String WELL_CONFIG_EXPORT_TEMP = "wellCoverconfigTemp.xlsx"; public static final String LG_CONFIG_EXPORT_TEMP = "LGCoverconfigTemp.xlsx"; 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..3a1b275 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 @@ -216,7 +216,6 @@ }); //获取导出文件header super.exportExcel(DeviceDto.class, list, DeviceExportHeadersEnum.DEVICE_EXPORT.getFileName()); - } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java index 7510132..d552f68 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java @@ -11,7 +11,7 @@ */ public static final String CONFIG_EXPORT_TEMP = "configTemp.xlsx"; public static final String METHANE_CONFIG_EXPORT_TEMP = "methaneconfigTemp.xlsx"; - public static final String H2S_CONFIG_EXPORT_TEMP = "H2s.xlsx"; + public static final String H2S_CONFIG_EXPORT_TEMP = "H2SconfigTemp.xlsx"; public static final String WELL_CONFIG_EXPORT_TEMP = "wellCoverconfigTemp.xlsx"; public static final String LG_CONFIG_EXPORT_TEMP = "LGCoverconfigTemp.xlsx"; 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..3a1b275 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 @@ -216,7 +216,6 @@ }); //获取导出文件header super.exportExcel(DeviceDto.class, list, DeviceExportHeadersEnum.DEVICE_EXPORT.getFileName()); - } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java index 55d5f3d..bf60532 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java @@ -5,6 +5,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; @@ -36,35 +37,26 @@ */ @RequestMapping(value = "/H2sConfig/config") @ResponseBody - public Object H2sConfigCommand(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { + public Object H2sConfigCommand(BusConfigDTO busConfigDTO) { SuccessResponseData successResult = new SuccessResponseData(); try { - //page使用 - Page page = PageFactory.defaultPage(); - DataScope dataScope = service.getAuthService().getLoginUserDataScope(); - List busConfigDTOList = busH2sConfigServiceImpl.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.H2s.getIndex()), dataScope); - page.setRecords(busConfigDTOList); - successResult.setData(super.packForBT(page)); - successResult.setMessage("success"); + busH2sConfigServiceImpl.addConfig(busConfigDTO); } catch (Exception e) { e.printStackTrace(); - successResult.setCode(500); - successResult.setMessage("false"); + return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "配置失败"); } - return successResult; + return ResponseData.success(); } + /** * 硫化氢配置列表 */ @RequestMapping(value = "/H2sConfig/batchExport") @ResponseBody - public Object H2sConfigBatchExport(@RequestParam(required = false) String keywords, + public void H2sConfigBatchExport(@RequestParam(required = false) String keywords, @RequestParam(required = false) String deptid, HttpServletResponse response) { - SuccessResponseData successResult = new SuccessResponseData(); try { //page使用 Page page = PageFactory.defaultPage(); @@ -72,15 +64,9 @@ List busConfigDTOList = busH2sConfigServiceImpl.getConfigList(page, keywords, deptid, Long.valueOf(DeviceTypeEnum.H2s.getIndex()), dataScope); busH2sConfigServiceImpl.exp(busConfigDTOList, response); - page.setRecords(busConfigDTOList); - successResult.setData(super.packForBT(page)); - successResult.setMessage("success"); } catch (Exception e) { e.printStackTrace(); - successResult.setCode(500); - successResult.setMessage("false"); } - return successResult; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java index 7510132..d552f68 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java @@ -11,7 +11,7 @@ */ public static final String CONFIG_EXPORT_TEMP = "configTemp.xlsx"; public static final String METHANE_CONFIG_EXPORT_TEMP = "methaneconfigTemp.xlsx"; - public static final String H2S_CONFIG_EXPORT_TEMP = "H2s.xlsx"; + public static final String H2S_CONFIG_EXPORT_TEMP = "H2SconfigTemp.xlsx"; public static final String WELL_CONFIG_EXPORT_TEMP = "wellCoverconfigTemp.xlsx"; public static final String LG_CONFIG_EXPORT_TEMP = "LGCoverconfigTemp.xlsx"; 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..3a1b275 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 @@ -216,7 +216,6 @@ }); //获取导出文件header super.exportExcel(DeviceDto.class, list, DeviceExportHeadersEnum.DEVICE_EXPORT.getFileName()); - } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java index 55d5f3d..bf60532 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java @@ -5,6 +5,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; @@ -36,35 +37,26 @@ */ @RequestMapping(value = "/H2sConfig/config") @ResponseBody - public Object H2sConfigCommand(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { + public Object H2sConfigCommand(BusConfigDTO busConfigDTO) { SuccessResponseData successResult = new SuccessResponseData(); try { - //page使用 - Page page = PageFactory.defaultPage(); - DataScope dataScope = service.getAuthService().getLoginUserDataScope(); - List busConfigDTOList = busH2sConfigServiceImpl.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.H2s.getIndex()), dataScope); - page.setRecords(busConfigDTOList); - successResult.setData(super.packForBT(page)); - successResult.setMessage("success"); + busH2sConfigServiceImpl.addConfig(busConfigDTO); } catch (Exception e) { e.printStackTrace(); - successResult.setCode(500); - successResult.setMessage("false"); + return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "配置失败"); } - return successResult; + return ResponseData.success(); } + /** * 硫化氢配置列表 */ @RequestMapping(value = "/H2sConfig/batchExport") @ResponseBody - public Object H2sConfigBatchExport(@RequestParam(required = false) String keywords, + public void H2sConfigBatchExport(@RequestParam(required = false) String keywords, @RequestParam(required = false) String deptid, HttpServletResponse response) { - SuccessResponseData successResult = new SuccessResponseData(); try { //page使用 Page page = PageFactory.defaultPage(); @@ -72,15 +64,9 @@ List busConfigDTOList = busH2sConfigServiceImpl.getConfigList(page, keywords, deptid, Long.valueOf(DeviceTypeEnum.H2s.getIndex()), dataScope); busH2sConfigServiceImpl.exp(busConfigDTOList, response); - page.setRecords(busConfigDTOList); - successResult.setData(super.packForBT(page)); - successResult.setMessage("success"); } catch (Exception e) { e.printStackTrace(); - successResult.setCode(500); - successResult.setMessage("false"); } - return successResult; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java index b0338f5..af4d0d9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java @@ -29,7 +29,7 @@ // abstractRequestHashMap.put(DeviceTypeEnum.CorrRate.toString(), new CorrRateRequest()); // abstractRequestHashMap.put(DeviceTypeEnum.MultiLeak.toString(), new MultiLeakRequest()); // abstractRequestHashMap.put(DeviceTypeEnum.CorrRate.toString(), new CorrRateRequest()); -// abstractRequestHashMap.put(DeviceTypeEnum.CorrRate.toString(), new CorrRateRequest()); + abstractRequestHashMap.put(DeviceTypeEnum.H2s.toString(), new H2SRequest()); abstractRequestHashMap.put(DeviceTypeEnum.Dig.toString(), new NoiseDigRequest()); abstractRequestHashMap.put(DeviceTypeEnum.LG.toString(), new LGRequest()); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java index 7510132..d552f68 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java @@ -11,7 +11,7 @@ */ public static final String CONFIG_EXPORT_TEMP = "configTemp.xlsx"; public static final String METHANE_CONFIG_EXPORT_TEMP = "methaneconfigTemp.xlsx"; - public static final String H2S_CONFIG_EXPORT_TEMP = "H2s.xlsx"; + public static final String H2S_CONFIG_EXPORT_TEMP = "H2SconfigTemp.xlsx"; public static final String WELL_CONFIG_EXPORT_TEMP = "wellCoverconfigTemp.xlsx"; public static final String LG_CONFIG_EXPORT_TEMP = "LGCoverconfigTemp.xlsx"; 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..3a1b275 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 @@ -216,7 +216,6 @@ }); //获取导出文件header super.exportExcel(DeviceDto.class, list, DeviceExportHeadersEnum.DEVICE_EXPORT.getFileName()); - } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java index 55d5f3d..bf60532 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java @@ -5,6 +5,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; @@ -36,35 +37,26 @@ */ @RequestMapping(value = "/H2sConfig/config") @ResponseBody - public Object H2sConfigCommand(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { + public Object H2sConfigCommand(BusConfigDTO busConfigDTO) { SuccessResponseData successResult = new SuccessResponseData(); try { - //page使用 - Page page = PageFactory.defaultPage(); - DataScope dataScope = service.getAuthService().getLoginUserDataScope(); - List busConfigDTOList = busH2sConfigServiceImpl.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.H2s.getIndex()), dataScope); - page.setRecords(busConfigDTOList); - successResult.setData(super.packForBT(page)); - successResult.setMessage("success"); + busH2sConfigServiceImpl.addConfig(busConfigDTO); } catch (Exception e) { e.printStackTrace(); - successResult.setCode(500); - successResult.setMessage("false"); + return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "配置失败"); } - return successResult; + return ResponseData.success(); } + /** * 硫化氢配置列表 */ @RequestMapping(value = "/H2sConfig/batchExport") @ResponseBody - public Object H2sConfigBatchExport(@RequestParam(required = false) String keywords, + public void H2sConfigBatchExport(@RequestParam(required = false) String keywords, @RequestParam(required = false) String deptid, HttpServletResponse response) { - SuccessResponseData successResult = new SuccessResponseData(); try { //page使用 Page page = PageFactory.defaultPage(); @@ -72,15 +64,9 @@ List busConfigDTOList = busH2sConfigServiceImpl.getConfigList(page, keywords, deptid, Long.valueOf(DeviceTypeEnum.H2s.getIndex()), dataScope); busH2sConfigServiceImpl.exp(busConfigDTOList, response); - page.setRecords(busConfigDTOList); - successResult.setData(super.packForBT(page)); - successResult.setMessage("success"); } catch (Exception e) { e.printStackTrace(); - successResult.setCode(500); - successResult.setMessage("false"); } - return successResult; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java index b0338f5..af4d0d9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java @@ -29,7 +29,7 @@ // abstractRequestHashMap.put(DeviceTypeEnum.CorrRate.toString(), new CorrRateRequest()); // abstractRequestHashMap.put(DeviceTypeEnum.MultiLeak.toString(), new MultiLeakRequest()); // abstractRequestHashMap.put(DeviceTypeEnum.CorrRate.toString(), new CorrRateRequest()); -// abstractRequestHashMap.put(DeviceTypeEnum.CorrRate.toString(), new CorrRateRequest()); + abstractRequestHashMap.put(DeviceTypeEnum.H2s.toString(), new H2SRequest()); abstractRequestHashMap.put(DeviceTypeEnum.Dig.toString(), new NoiseDigRequest()); abstractRequestHashMap.put(DeviceTypeEnum.LG.toString(), new LGRequest()); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java new file mode 100644 index 0000000..2273504 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.modular.system.rs; + +import com.casic.missiles.core.util.SpringContextHolder; +import com.casic.missiles.modular.system.dto.CommConfigDTO; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class H2SRequest extends AbstractRequest { + private final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); + + @Override + public void send(String devCode, String content, String attemptsMax) { + RedisCommon redisCommon = SpringContextHolder.getBean("redisCommon"); + CommConfigDTO commConfigDTO = new CommConfigDTO(); + commConfigDTO.setRepeat(Long.valueOf(content.split(",")[0])); + commConfigDTO.setInterval(Long.valueOf(content.split(",")[1])); + commConfigDTO.setPeriod(Long.valueOf(content.split(",")[2])); + if(StringUtils.isNotBlank(content.split(",",5)[3])){ + commConfigDTO.setIp(content.split(",", 5)[3]); + commConfigDTO.setPort(Long.valueOf(content.split(",", 5)[4])); + } + redisCommon.setRedisConfig(devCode, commConfigDTO); + if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) + redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax); + } + +} \ No newline at end of file diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java index 7510132..d552f68 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java @@ -11,7 +11,7 @@ */ public static final String CONFIG_EXPORT_TEMP = "configTemp.xlsx"; public static final String METHANE_CONFIG_EXPORT_TEMP = "methaneconfigTemp.xlsx"; - public static final String H2S_CONFIG_EXPORT_TEMP = "H2s.xlsx"; + public static final String H2S_CONFIG_EXPORT_TEMP = "H2SconfigTemp.xlsx"; public static final String WELL_CONFIG_EXPORT_TEMP = "wellCoverconfigTemp.xlsx"; public static final String LG_CONFIG_EXPORT_TEMP = "LGCoverconfigTemp.xlsx"; 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..3a1b275 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 @@ -216,7 +216,6 @@ }); //获取导出文件header super.exportExcel(DeviceDto.class, list, DeviceExportHeadersEnum.DEVICE_EXPORT.getFileName()); - } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java index 55d5f3d..bf60532 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java @@ -5,6 +5,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; @@ -36,35 +37,26 @@ */ @RequestMapping(value = "/H2sConfig/config") @ResponseBody - public Object H2sConfigCommand(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { + public Object H2sConfigCommand(BusConfigDTO busConfigDTO) { SuccessResponseData successResult = new SuccessResponseData(); try { - //page使用 - Page page = PageFactory.defaultPage(); - DataScope dataScope = service.getAuthService().getLoginUserDataScope(); - List busConfigDTOList = busH2sConfigServiceImpl.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.H2s.getIndex()), dataScope); - page.setRecords(busConfigDTOList); - successResult.setData(super.packForBT(page)); - successResult.setMessage("success"); + busH2sConfigServiceImpl.addConfig(busConfigDTO); } catch (Exception e) { e.printStackTrace(); - successResult.setCode(500); - successResult.setMessage("false"); + return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "配置失败"); } - return successResult; + return ResponseData.success(); } + /** * 硫化氢配置列表 */ @RequestMapping(value = "/H2sConfig/batchExport") @ResponseBody - public Object H2sConfigBatchExport(@RequestParam(required = false) String keywords, + public void H2sConfigBatchExport(@RequestParam(required = false) String keywords, @RequestParam(required = false) String deptid, HttpServletResponse response) { - SuccessResponseData successResult = new SuccessResponseData(); try { //page使用 Page page = PageFactory.defaultPage(); @@ -72,15 +64,9 @@ List busConfigDTOList = busH2sConfigServiceImpl.getConfigList(page, keywords, deptid, Long.valueOf(DeviceTypeEnum.H2s.getIndex()), dataScope); busH2sConfigServiceImpl.exp(busConfigDTOList, response); - page.setRecords(busConfigDTOList); - successResult.setData(super.packForBT(page)); - successResult.setMessage("success"); } catch (Exception e) { e.printStackTrace(); - successResult.setCode(500); - successResult.setMessage("false"); } - return successResult; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java index b0338f5..af4d0d9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java @@ -29,7 +29,7 @@ // abstractRequestHashMap.put(DeviceTypeEnum.CorrRate.toString(), new CorrRateRequest()); // abstractRequestHashMap.put(DeviceTypeEnum.MultiLeak.toString(), new MultiLeakRequest()); // abstractRequestHashMap.put(DeviceTypeEnum.CorrRate.toString(), new CorrRateRequest()); -// abstractRequestHashMap.put(DeviceTypeEnum.CorrRate.toString(), new CorrRateRequest()); + abstractRequestHashMap.put(DeviceTypeEnum.H2s.toString(), new H2SRequest()); abstractRequestHashMap.put(DeviceTypeEnum.Dig.toString(), new NoiseDigRequest()); abstractRequestHashMap.put(DeviceTypeEnum.LG.toString(), new LGRequest()); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java new file mode 100644 index 0000000..2273504 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.modular.system.rs; + +import com.casic.missiles.core.util.SpringContextHolder; +import com.casic.missiles.modular.system.dto.CommConfigDTO; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class H2SRequest extends AbstractRequest { + private final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); + + @Override + public void send(String devCode, String content, String attemptsMax) { + RedisCommon redisCommon = SpringContextHolder.getBean("redisCommon"); + CommConfigDTO commConfigDTO = new CommConfigDTO(); + commConfigDTO.setRepeat(Long.valueOf(content.split(",")[0])); + commConfigDTO.setInterval(Long.valueOf(content.split(",")[1])); + commConfigDTO.setPeriod(Long.valueOf(content.split(",")[2])); + if(StringUtils.isNotBlank(content.split(",",5)[3])){ + commConfigDTO.setIp(content.split(",", 5)[3]); + commConfigDTO.setPort(Long.valueOf(content.split(",", 5)[4])); + } + redisCommon.setRedisConfig(devCode, commConfigDTO); + if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) + redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax); + } + +} \ No newline at end of file diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java index c95cdca..6391fd7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java @@ -88,7 +88,6 @@ busConfigDTOList.add(dto); } return busConfigDTOList; - } @@ -120,8 +119,7 @@ busConfig.getDeviceId(), busConfig.getFramecontent(), busConfigDTO.getAttemptsMax()); //发布消息订阅 if (StrUtil.isNotBlank(concentratorCode)) { - RedisPublisherUtil.getInstance(). - publishMessage(concentratorCode); + RedisPublisherUtil.getInstance().publishMessage(concentratorCode); } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java index 7510132..d552f68 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java @@ -11,7 +11,7 @@ */ public static final String CONFIG_EXPORT_TEMP = "configTemp.xlsx"; public static final String METHANE_CONFIG_EXPORT_TEMP = "methaneconfigTemp.xlsx"; - public static final String H2S_CONFIG_EXPORT_TEMP = "H2s.xlsx"; + public static final String H2S_CONFIG_EXPORT_TEMP = "H2SconfigTemp.xlsx"; public static final String WELL_CONFIG_EXPORT_TEMP = "wellCoverconfigTemp.xlsx"; public static final String LG_CONFIG_EXPORT_TEMP = "LGCoverconfigTemp.xlsx"; 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..3a1b275 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 @@ -216,7 +216,6 @@ }); //获取导出文件header super.exportExcel(DeviceDto.class, list, DeviceExportHeadersEnum.DEVICE_EXPORT.getFileName()); - } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java index 55d5f3d..bf60532 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java @@ -5,6 +5,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; @@ -36,35 +37,26 @@ */ @RequestMapping(value = "/H2sConfig/config") @ResponseBody - public Object H2sConfigCommand(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { + public Object H2sConfigCommand(BusConfigDTO busConfigDTO) { SuccessResponseData successResult = new SuccessResponseData(); try { - //page使用 - Page page = PageFactory.defaultPage(); - DataScope dataScope = service.getAuthService().getLoginUserDataScope(); - List busConfigDTOList = busH2sConfigServiceImpl.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.H2s.getIndex()), dataScope); - page.setRecords(busConfigDTOList); - successResult.setData(super.packForBT(page)); - successResult.setMessage("success"); + busH2sConfigServiceImpl.addConfig(busConfigDTO); } catch (Exception e) { e.printStackTrace(); - successResult.setCode(500); - successResult.setMessage("false"); + return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "配置失败"); } - return successResult; + return ResponseData.success(); } + /** * 硫化氢配置列表 */ @RequestMapping(value = "/H2sConfig/batchExport") @ResponseBody - public Object H2sConfigBatchExport(@RequestParam(required = false) String keywords, + public void H2sConfigBatchExport(@RequestParam(required = false) String keywords, @RequestParam(required = false) String deptid, HttpServletResponse response) { - SuccessResponseData successResult = new SuccessResponseData(); try { //page使用 Page page = PageFactory.defaultPage(); @@ -72,15 +64,9 @@ List busConfigDTOList = busH2sConfigServiceImpl.getConfigList(page, keywords, deptid, Long.valueOf(DeviceTypeEnum.H2s.getIndex()), dataScope); busH2sConfigServiceImpl.exp(busConfigDTOList, response); - page.setRecords(busConfigDTOList); - successResult.setData(super.packForBT(page)); - successResult.setMessage("success"); } catch (Exception e) { e.printStackTrace(); - successResult.setCode(500); - successResult.setMessage("false"); } - return successResult; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java index b0338f5..af4d0d9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java @@ -29,7 +29,7 @@ // abstractRequestHashMap.put(DeviceTypeEnum.CorrRate.toString(), new CorrRateRequest()); // abstractRequestHashMap.put(DeviceTypeEnum.MultiLeak.toString(), new MultiLeakRequest()); // abstractRequestHashMap.put(DeviceTypeEnum.CorrRate.toString(), new CorrRateRequest()); -// abstractRequestHashMap.put(DeviceTypeEnum.CorrRate.toString(), new CorrRateRequest()); + abstractRequestHashMap.put(DeviceTypeEnum.H2s.toString(), new H2SRequest()); abstractRequestHashMap.put(DeviceTypeEnum.Dig.toString(), new NoiseDigRequest()); abstractRequestHashMap.put(DeviceTypeEnum.LG.toString(), new LGRequest()); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java new file mode 100644 index 0000000..2273504 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.modular.system.rs; + +import com.casic.missiles.core.util.SpringContextHolder; +import com.casic.missiles.modular.system.dto.CommConfigDTO; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class H2SRequest extends AbstractRequest { + private final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); + + @Override + public void send(String devCode, String content, String attemptsMax) { + RedisCommon redisCommon = SpringContextHolder.getBean("redisCommon"); + CommConfigDTO commConfigDTO = new CommConfigDTO(); + commConfigDTO.setRepeat(Long.valueOf(content.split(",")[0])); + commConfigDTO.setInterval(Long.valueOf(content.split(",")[1])); + commConfigDTO.setPeriod(Long.valueOf(content.split(",")[2])); + if(StringUtils.isNotBlank(content.split(",",5)[3])){ + commConfigDTO.setIp(content.split(",", 5)[3]); + commConfigDTO.setPort(Long.valueOf(content.split(",", 5)[4])); + } + redisCommon.setRedisConfig(devCode, commConfigDTO); + if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) + redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax); + } + +} \ No newline at end of file diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java index c95cdca..6391fd7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java @@ -88,7 +88,6 @@ busConfigDTOList.add(dto); } return busConfigDTOList; - } @@ -120,8 +119,7 @@ busConfig.getDeviceId(), busConfig.getFramecontent(), busConfigDTO.getAttemptsMax()); //发布消息订阅 if (StrUtil.isNotBlank(concentratorCode)) { - RedisPublisherUtil.getInstance(). - publishMessage(concentratorCode); + RedisPublisherUtil.getInstance().publishMessage(concentratorCode); } } diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index a48f6f1..ad9beb0 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -40,7 +40,7 @@ spring-session-open: false #开启spring session smartcity: config: - export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\ + export-path: D:\cz\203\管网\升级\2.0\casic-smartcity\casic-web\src\main\resources\config\export\ #export-path: D:\export\ image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\ config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java index 7510132..d552f68 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConfigConst.java @@ -11,7 +11,7 @@ */ public static final String CONFIG_EXPORT_TEMP = "configTemp.xlsx"; public static final String METHANE_CONFIG_EXPORT_TEMP = "methaneconfigTemp.xlsx"; - public static final String H2S_CONFIG_EXPORT_TEMP = "H2s.xlsx"; + public static final String H2S_CONFIG_EXPORT_TEMP = "H2SconfigTemp.xlsx"; public static final String WELL_CONFIG_EXPORT_TEMP = "wellCoverconfigTemp.xlsx"; public static final String LG_CONFIG_EXPORT_TEMP = "LGCoverconfigTemp.xlsx"; 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..3a1b275 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 @@ -216,7 +216,6 @@ }); //获取导出文件header super.exportExcel(DeviceDto.class, list, DeviceExportHeadersEnum.DEVICE_EXPORT.getFileName()); - } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java index 55d5f3d..bf60532 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/busconfig/H2sController.java @@ -5,6 +5,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; @@ -36,35 +37,26 @@ */ @RequestMapping(value = "/H2sConfig/config") @ResponseBody - public Object H2sConfigCommand(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { + public Object H2sConfigCommand(BusConfigDTO busConfigDTO) { SuccessResponseData successResult = new SuccessResponseData(); try { - //page使用 - Page page = PageFactory.defaultPage(); - DataScope dataScope = service.getAuthService().getLoginUserDataScope(); - List busConfigDTOList = busH2sConfigServiceImpl.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.H2s.getIndex()), dataScope); - page.setRecords(busConfigDTOList); - successResult.setData(super.packForBT(page)); - successResult.setMessage("success"); + busH2sConfigServiceImpl.addConfig(busConfigDTO); } catch (Exception e) { e.printStackTrace(); - successResult.setCode(500); - successResult.setMessage("false"); + return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "配置失败"); } - return successResult; + return ResponseData.success(); } + /** * 硫化氢配置列表 */ @RequestMapping(value = "/H2sConfig/batchExport") @ResponseBody - public Object H2sConfigBatchExport(@RequestParam(required = false) String keywords, + public void H2sConfigBatchExport(@RequestParam(required = false) String keywords, @RequestParam(required = false) String deptid, HttpServletResponse response) { - SuccessResponseData successResult = new SuccessResponseData(); try { //page使用 Page page = PageFactory.defaultPage(); @@ -72,15 +64,9 @@ List busConfigDTOList = busH2sConfigServiceImpl.getConfigList(page, keywords, deptid, Long.valueOf(DeviceTypeEnum.H2s.getIndex()), dataScope); busH2sConfigServiceImpl.exp(busConfigDTOList, response); - page.setRecords(busConfigDTOList); - successResult.setData(super.packForBT(page)); - successResult.setMessage("success"); } catch (Exception e) { e.printStackTrace(); - successResult.setCode(500); - successResult.setMessage("false"); } - return successResult; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java index b0338f5..af4d0d9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java @@ -29,7 +29,7 @@ // abstractRequestHashMap.put(DeviceTypeEnum.CorrRate.toString(), new CorrRateRequest()); // abstractRequestHashMap.put(DeviceTypeEnum.MultiLeak.toString(), new MultiLeakRequest()); // abstractRequestHashMap.put(DeviceTypeEnum.CorrRate.toString(), new CorrRateRequest()); -// abstractRequestHashMap.put(DeviceTypeEnum.CorrRate.toString(), new CorrRateRequest()); + abstractRequestHashMap.put(DeviceTypeEnum.H2s.toString(), new H2SRequest()); abstractRequestHashMap.put(DeviceTypeEnum.Dig.toString(), new NoiseDigRequest()); abstractRequestHashMap.put(DeviceTypeEnum.LG.toString(), new LGRequest()); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java new file mode 100644 index 0000000..2273504 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java @@ -0,0 +1,28 @@ +package com.casic.missiles.modular.system.rs; + +import com.casic.missiles.core.util.SpringContextHolder; +import com.casic.missiles.modular.system.dto.CommConfigDTO; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class H2SRequest extends AbstractRequest { + private final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); + + @Override + public void send(String devCode, String content, String attemptsMax) { + RedisCommon redisCommon = SpringContextHolder.getBean("redisCommon"); + CommConfigDTO commConfigDTO = new CommConfigDTO(); + commConfigDTO.setRepeat(Long.valueOf(content.split(",")[0])); + commConfigDTO.setInterval(Long.valueOf(content.split(",")[1])); + commConfigDTO.setPeriod(Long.valueOf(content.split(",")[2])); + if(StringUtils.isNotBlank(content.split(",",5)[3])){ + commConfigDTO.setIp(content.split(",", 5)[3]); + commConfigDTO.setPort(Long.valueOf(content.split(",", 5)[4])); + } + redisCommon.setRedisConfig(devCode, commConfigDTO); + if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode())) + redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax); + } + +} \ No newline at end of file diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java index c95cdca..6391fd7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java @@ -88,7 +88,6 @@ busConfigDTOList.add(dto); } return busConfigDTOList; - } @@ -120,8 +119,7 @@ busConfig.getDeviceId(), busConfig.getFramecontent(), busConfigDTO.getAttemptsMax()); //发布消息订阅 if (StrUtil.isNotBlank(concentratorCode)) { - RedisPublisherUtil.getInstance(). - publishMessage(concentratorCode); + RedisPublisherUtil.getInstance().publishMessage(concentratorCode); } } diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index a48f6f1..ad9beb0 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -40,7 +40,7 @@ spring-session-open: false #开启spring session smartcity: config: - export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\ + export-path: D:\cz\203\管网\升级\2.0\casic-smartcity\casic-web\src\main\resources\config\export\ #export-path: D:\export\ image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\ config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\ diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index 796fb67..0cf0abf 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -35,7 +35,7 @@ sysUrl: /sys urlExclusion: /well/update,/well/add config: - export-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\export\ + export-path: D:\cz\203\管网\升级\2.0\casic-smartcity\casic-web\src\main\resources\config\export config-path: E:\Develop\IdeaProject\smartcity\casic-smartcity-dcms\casic-web\src\main\resources\config\ smartcity: config: