From a928eac9193b5ef2498777b5fbfee6fad06534e3 Mon Sep 17 00:00:00 2001
From: huangzhen <867217663@qq.com>
Date: 星期四, 22 二月 2024 17:02:59 +0800
Subject: [PATCH] 修复

---
 src/main/java/com/gkhy/fourierSpecialGasMonitor/service/impl/DataReceiveServiceImpl.java |  280 +++++++++++++++++++++++++++++--------------------------
 1 files changed, 149 insertions(+), 131 deletions(-)

diff --git a/src/main/java/com/gkhy/fourierSpecialGasMonitor/service/impl/DataReceiveServiceImpl.java b/src/main/java/com/gkhy/fourierSpecialGasMonitor/service/impl/DataReceiveServiceImpl.java
index 2cc0b35..b0ce10c 100644
--- a/src/main/java/com/gkhy/fourierSpecialGasMonitor/service/impl/DataReceiveServiceImpl.java
+++ b/src/main/java/com/gkhy/fourierSpecialGasMonitor/service/impl/DataReceiveServiceImpl.java
@@ -40,10 +40,7 @@
 import java.text.MessageFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Collectors;
 
@@ -115,8 +112,13 @@
 
     private static final String warnContentFormat = "【气体监测预警提示】{0} {1}气体浓度连续超标系统判断为{2},请相关负责人及时检查处置。";
 
+    private static final String deviceExcLogFormat = "【设备预警提示】{0} 硬件设备离线。";
+
+    private static final DateTimeFormatter deviceExcLogFormatter = DateTimeFormatter.ofPattern("yyyy年MM月dd日 HH:mm:ss");
+
     private static final DateTimeFormatter warnLogFormatter = DateTimeFormatter.ofPattern("yyyy年MM月dd日 HH:mm:ss");
 
+    private static final String[] DEVICE_EXC_RECEIVER = {"17625323889","18019908965"};
 
     @PostConstruct
     public void init() {
@@ -157,7 +159,7 @@
 
     @Override
     public ForeignResult uploadGasFlux(UploadGasFluxReqDTO reqDto) {
-        gasFluxParameterVerification(reqDto);
+        //gasFluxParameterVerification(reqDto);
         GasFlux gasFlux = new GasFlux();
         BeanUtils.copyProperties(reqDto,gasFlux);
         gasFlux.setDataReceivingTime(LocalDateTime.now());
@@ -180,7 +182,7 @@
             throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"通量数据状态不能为空");
         Boolean push = false;
         List<String> descs = new ArrayList<>();
-        if (reqDTO.getHardwareState().size() > 1){
+        if (!(reqDTO.getHardwareState().size() == 1 && reqDTO.getHardwareState().get(0) == 0)){
             push = true;
             for (int i = 0; i < reqDTO.getHardwareState().size(); i++) {
                 descs.add(HardwareStateEnum.getValue(reqDTO.getHardwareState().get(i)));
@@ -202,21 +204,35 @@
             logger.info("【警告】设备异常提醒推送>>>>>>>>>>>>>>>>>>失败");
         }
         if (push){
-            //todo 线上环境还是异常才向前端推送
-            //String message = JSON.toJSONString(reqDTO);
-            //try {
-            //    GasDeviceExcWebsocketServer.sendInfo(message,null);
-            //} catch (IOException e) {
-            //    logger.info("【警告】设备异常提醒推送>>>>>>>>>>>>>>>>>>失败");
-            //}
+            DeviceExceptionLog lastLog = deviceExceptionLogService.getLastLog();
+            LocalDateTime now = LocalDateTime.now();
+            if (lastLog == null || now.compareTo(lastLog.getTime().plusHours(1)) >= 0) {
+                Map<String, String> mesMap = new HashMap<>();
+                mesMap.put("message","数据异常,无法进行监测");
+                mesMap.put(" level","设备离线");
+                //// TODO: 2024/2/22
+                List<String> deviceExcReceiver = Arrays.asList(DEVICE_EXC_RECEIVER);
+                if (!CollectionUtils.isEmpty(deviceExcReceiver)) {
+                    List<String> distinctPhone = deviceExcReceiver.stream().distinct().collect(Collectors.toList());
+                    logger.info("【气体浓度异常短信发送】-----发送内容:" + "数据异常,无法进行监测 气体浓度连续超标,系统判断为设备离线,请相关负责人及时检查处置。"
+                            + " 发送时间: " + LocalDateTime.now()+ " 接收人手机号:" + distinctPhone);
+                    if (!org.springframework.util.StringUtils.isEmpty(smsSendEnabledStatus) && "true".equals(smsSendEnabledStatus)) {
+                        sendMessageUtil.sendMessageCheck(deviceExcReceiver.toArray(new String[deviceExcReceiver.size()]), mesMap);
+                    }
+                }
+            }
             String execInfo = JSON.toJSONString(descs);
             logger.info("【警告】设备异常,异常原因: "+ execInfo);
             DeviceExceptionLog log = new DeviceExceptionLog();
-            log.setTime(LocalDateTime.now());
+            String content  = MessageFormat.format(deviceExcLogFormat,deviceExcLogFormatter.format(now));
+            log.setContent(content);
+            log.setTime(now);
             log.setExecDesc(execInfo);
             DeviceExceptionLog save =  deviceExceptionLogService.save(log);
-            if (save == null)
+            if (save == null) {
                 logger.info("【警告】设备异常日志保存>>>>>>>>>>>>>>>>>>失败");
+            }
+
         }
         return ForeignResult.success();
     }
@@ -240,7 +256,7 @@
     @Override
     @Transactional
     public ForeignResult uploadGasConcentration(UploadGasConcentrationReqDTO reqDto) {
-        gasConcentrationParameterVerification(reqDto);
+        //gasConcentrationParameterVerification(reqDto);
         GasConcentration gasConcentration = new GasConcentration();
         BeanUtils.copyProperties(reqDto,gasConcentration);
         gasConcentration.setDataReceivingTime(LocalDateTime.now());
@@ -283,20 +299,22 @@
                         } catch (IllegalAccessException e) {
                             logger.info("【警告】反射获取气体浓度失败");
                         }
-                        if (value > threshold.get(i)) {
-                            Integer integer = gasExcCountMap.get(i);
-                            Integer count= integer + 1;
-                            gasExcCountMap.put(i,count);
-                            if (yellowWarningThreshold.equals(count)) {
-                                warnLogGenerateAndExecPush(WarningThresholdEnum.YELLOW.getCode(), gasCategory.get(i),value);
-                            }
-                            if (redWarningThreshold.equals(count)) {
-                                warnLogGenerateAndExecPush(WarningThresholdEnum.RED.getCode(), gasCategory.get(i),value);
-                            }
-                        } else {
-                            Integer integer = gasExcCountMap.get(i);
-                            if (integer != null) {
-                                gasExcCountMap.put(i,0);
+                        if (value != null) {
+                            if (value > threshold.get(i)) {
+                                Integer integer = gasExcCountMap.get(i);
+                                Integer count = integer + 1;
+                                gasExcCountMap.put(i, count);
+                                if (yellowWarningThreshold.equals(count)) {
+                                    warnLogGenerateAndExecPush(WarningThresholdEnum.YELLOW.getCode(), gasCategory.get(i), value);
+                                }
+                                if (redWarningThreshold.equals(count)) {
+                                    warnLogGenerateAndExecPush(WarningThresholdEnum.RED.getCode(), gasCategory.get(i), value);
+                                }
+                            } else {
+                                Integer integer = gasExcCountMap.get(i);
+                                if (integer != null) {
+                                    gasExcCountMap.put(i, 0);
+                                }
                             }
                         }
                     }
@@ -351,7 +369,7 @@
                 throw new DataReceiveException(this.getClass(), ForeignResultCode.SYSTEM_ERROR_DATABASE_FAIL.getCode(),"预警异常短信接收人保存失败");
             Map<String, String> mesMap = new HashMap<>();
             mesMap.put("message",warnTime+" "+gasCategory.getName());
-            mesMap.put("level",warnThresholdName);
+            mesMap.put(" level",warnThresholdName);
             //todo
             if (!CollectionUtils.isEmpty(phone)) {
                 List<String> distinctPhone = phone.stream().distinct().collect(Collectors.toList());
@@ -415,66 +433,66 @@
             throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"实时风向数据为空");
         if (reqDto.getPressure() == null)
             throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"实时气压数据为空");
-        if (reqDto.getGasName01() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类01编号异常");
-        if (reqDto.getGasName02() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类02编号异常");
-        if (reqDto.getGasName03() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类03编号异常");
-        if (reqDto.getGasName04() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类04编号异常");
-        if (reqDto.getGasName05() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类05编号异常");
-        if (reqDto.getGasName06() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类06编号异常");
-        if (reqDto.getGasName07() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类07编号异常");
-        if (reqDto.getGasName08() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类08编号异常");
-        if (reqDto.getGasName09() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类09编号异常");
-        if (reqDto.getGasName10() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类10编号异常");
-        if (reqDto.getGasName11() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类11编号异常");
-        if (reqDto.getGasName12() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类12编号异常");
-        if (reqDto.getGasName13() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类13编号异常");
-        if (reqDto.getGasName14() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类14编号异常");
-        if (reqDto.getGasName15() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类15编号异常");
-        if (reqDto.getGasName16() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类16编号异常");
-        if (reqDto.getGasName17() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类17编号异常");
-        if (reqDto.getGasName18() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类18编号异常");
-        if (reqDto.getGasName19() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类19编号异常");
-        if (reqDto.getGasName20() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类20编号异常");
-        if (reqDto.getGasName21() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类21编号异常");
-        if (reqDto.getGasName22() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类22编号异常");
-        if (reqDto.getGasName23() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类23编号异常");
-        if (reqDto.getGasName24() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类24编号异常");
-        if (reqDto.getGasName25() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类25编号异常");
-        if (reqDto.getGasName26() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类26编号异常");
-        if (reqDto.getGasName27() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类27编号异常");
-        if (reqDto.getGasName28() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类28编号异常");
-        if (reqDto.getGasName29() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类29编号异常");
-        if (reqDto.getGasName30() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类30编号异常");
+        //if (reqDto.getGasName01() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类01编号异常");
+        //if (reqDto.getGasName02() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类02编号异常");
+        //if (reqDto.getGasName03() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类03编号异常");
+        //if (reqDto.getGasName04() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类04编号异常");
+        //if (reqDto.getGasName05() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类05编号异常");
+        //if (reqDto.getGasName06() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类06编号异常");
+        //if (reqDto.getGasName07() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类07编号异常");
+        //if (reqDto.getGasName08() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类08编号异常");
+        //if (reqDto.getGasName09() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类09编号异常");
+        //if (reqDto.getGasName10() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类10编号异常");
+        //if (reqDto.getGasName11() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类11编号异常");
+        //if (reqDto.getGasName12() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类12编号异常");
+        //if (reqDto.getGasName13() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类13编号异常");
+        //if (reqDto.getGasName14() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类14编号异常");
+        //if (reqDto.getGasName15() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类15编号异常");
+        //if (reqDto.getGasName16() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类16编号异常");
+        //if (reqDto.getGasName17() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类17编号异常");
+        //if (reqDto.getGasName18() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类18编号异常");
+        //if (reqDto.getGasName19() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类19编号异常");
+        //if (reqDto.getGasName20() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类20编号异常");
+        //if (reqDto.getGasName21() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类21编号异常");
+        //if (reqDto.getGasName22() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类22编号异常");
+        //if (reqDto.getGasName23() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类23编号异常");
+        //if (reqDto.getGasName24() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类24编号异常");
+        //if (reqDto.getGasName25() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类25编号异常");
+        //if (reqDto.getGasName26() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类26编号异常");
+        //if (reqDto.getGasName27() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类27编号异常");
+        //if (reqDto.getGasName28() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类28编号异常");
+        //if (reqDto.getGasName29() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类29编号异常");
+        //if (reqDto.getGasName30() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类30编号异常");
     }
 
     private void gasFluxParameterVerification(UploadGasFluxReqDTO reqDto){
@@ -492,46 +510,46 @@
             throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"实时风速数据为空");
         if (reqDto.getWindDirection() <= 0)
             throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"实时风向数据为空");
-        if (reqDto.getGasName01() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类01编号异常");
-        if (reqDto.getGasName02() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类02编号异常");
-        if (reqDto.getGasName03() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类03编号异常");
-        if (reqDto.getGasName04() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类04编号异常");
-        if (reqDto.getGasName05() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类05编号异常");
-        if (reqDto.getGasName06() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类06编号异常");
-        if (reqDto.getGasName07() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类07编号异常");
-        if (reqDto.getGasName08() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类08编号异常");
-        if (reqDto.getGasName09() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类09编号异常");
-        if (reqDto.getGasName10() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类10编号异常");
-        if (reqDto.getGasName11() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类11编号异常");
-        if (reqDto.getGasName12() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类12编号异常");
-        if (reqDto.getGasName13() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类13编号异常");
-        if (reqDto.getGasName14() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类14编号异常");
-        if (reqDto.getGasName15() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类15编号异常");
-        if (reqDto.getGasName16() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类16编号异常");
-        if (reqDto.getGasName17() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类17编号异常");
-        if (reqDto.getGasName18() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类18编号异常");
-        if (reqDto.getGasName19() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类19编号异常");
-        if (reqDto.getGasName20() <= 0)
-            throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类20编号异常");
+        //if (reqDto.getGasName01() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类01编号异常");
+        //if (reqDto.getGasName02() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类02编号异常");
+        //if (reqDto.getGasName03() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类03编号异常");
+        //if (reqDto.getGasName04() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类04编号异常");
+        //if (reqDto.getGasName05() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类05编号异常");
+        //if (reqDto.getGasName06() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类06编号异常");
+        //if (reqDto.getGasName07() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类07编号异常");
+        //if (reqDto.getGasName08() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类08编号异常");
+        //if (reqDto.getGasName09() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类09编号异常");
+        //if (reqDto.getGasName10() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类10编号异常");
+        //if (reqDto.getGasName11() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类11编号异常");
+        //if (reqDto.getGasName12() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类12编号异常");
+        //if (reqDto.getGasName13() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类13编号异常");
+        //if (reqDto.getGasName14() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类14编号异常");
+        //if (reqDto.getGasName15() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类15编号异常");
+        //if (reqDto.getGasName16() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类16编号异常");
+        //if (reqDto.getGasName17() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类17编号异常");
+        //if (reqDto.getGasName18() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类18编号异常");
+        //if (reqDto.getGasName19() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类19编号异常");
+        //if (reqDto.getGasName20() <= 0)
+        //    throw new DataReceiveException(this.getClass(), ForeignResultCode.PARAM_ERROR_NULL.getCode(),"气体种类20编号异常");
     }
 
 

--
Gitblit v1.9.2