From cd301e0d8f2ea3adc3d50ff3fc9b19a34b539f79 Mon Sep 17 00:00:00 2001
From: huangzhen <867217663@qq.com>
Date: 星期一, 19 二月 2024 09:10:25 +0800
Subject: [PATCH] 解决日报在linux上无法生成的问题

---
 src/main/java/com/gkhy/fourierSpecialGasMonitor/service/impl/DataReceiveServiceImpl.java |  281 ++++++++++++++++++++++++++++++-------------------------
 1 files changed, 152 insertions(+), 129 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 e7b2837..5ed0334 100644
--- a/src/main/java/com/gkhy/fourierSpecialGasMonitor/service/impl/DataReceiveServiceImpl.java
+++ b/src/main/java/com/gkhy/fourierSpecialGasMonitor/service/impl/DataReceiveServiceImpl.java
@@ -115,6 +115,10 @@
 
     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");
 
 
@@ -127,7 +131,7 @@
                 return gasCategory;
             }).collect(Collectors.toList());
         }
-        logger.info("【气体异常map】init完成");
+        logger.info("[GasExcMap] init complete");
     }
 
     @PostConstruct
@@ -143,7 +147,7 @@
                 }
             }
         }
-        logger.info("【预警阈值】init完成");
+        logger.info("[WarningThreshold] init complete");
     }
 
     @Override
@@ -157,13 +161,14 @@
 
     @Override
     public ForeignResult uploadGasFlux(UploadGasFluxReqDTO reqDto) {
-        gasFluxParameterVerification(reqDto);
+        //gasFluxParameterVerification(reqDto);
         GasFlux gasFlux = new GasFlux();
         BeanUtils.copyProperties(reqDto,gasFlux);
         gasFlux.setDataReceivingTime(LocalDateTime.now());
         GasFlux save = gasFluxService.save(gasFlux);
         if (save == null)
             throw new DataReceiveException(this.getClass(), ForeignResultCode.SYSTEM_ERROR_DATABASE_FAIL.getCode(),"气体通量数据保存失败");
+        gasFluxDataCacheAndPush();
         return ForeignResult.success();
     }
 
@@ -179,7 +184,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)));
@@ -193,17 +198,28 @@
             push = true;
             descs.add(GasFluxStateEnum.INVERSION_FAILED_10_MINUTES_NO_DATA.getDesc());
         }
-        if (push == true){
-            String message = JSON.toJSONString(reqDTO);
-            try {
-                GasDeviceExcWebsocketServer.sendInfo(message,null);
-            } catch (IOException e) {
-                logger.info("【警告】设备异常提醒推送>>>>>>>>>>>>>>>>>>失败");
-            }
+        String message = JSON.toJSONString(reqDTO);
+        //todo 暂时改为实时推送给前端
+        try {
+            GasDeviceExcWebsocketServer.sendInfo(message,null);
+        } catch (IOException e) {
+            logger.info("【警告】设备异常提醒推送>>>>>>>>>>>>>>>>>>失败");
+        }
+        if (push){
+            //todo 线上环境还是异常才向前端推送
+            //String message = JSON.toJSONString(reqDTO);
+            //try {
+            //    GasDeviceExcWebsocketServer.sendInfo(message,null);
+            //} catch (IOException e) {
+            //    logger.info("【警告】设备异常提醒推送>>>>>>>>>>>>>>>>>>失败");
+            //}
             String execInfo = JSON.toJSONString(descs);
             logger.info("【警告】设备异常,异常原因: "+ execInfo);
             DeviceExceptionLog log = new DeviceExceptionLog();
-            log.setTime(LocalDateTime.now());
+            LocalDateTime now = 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)
@@ -212,7 +228,7 @@
         return ForeignResult.success();
     }
 
-    private void gasFluxDataCacheAndPush(GasFlux save){
+    private void gasFluxDataCacheAndPush(){
         LocalDateTime time = LocalDateTime.now();
         LocalDateTime startTime = LocalDateTime.now().withHour(0).withMinute(0).withSecond(0).withNano(0);
         List<GasFlux> gasFluxes =  gasFluxService.listTodayGasFluxData(startTime,time);
@@ -274,21 +290,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)) {
-                                System.out.println("超过次数: "+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);
+                                }
                             }
                         }
                     }
@@ -356,13 +373,19 @@
     }
 
     private void dataCacheAndPush(GasConcentration save){
+        LocalDateTime startTime = LocalDateTime.now().withHour(0).withMinute(0).withSecond(0).withNano(0);
         LocalDateTime time = LocalDateTime.now();
         String cacheName = time.format(formatter);
         RBucket<String> bucket = redissonClient.getBucket(gasConcentrationCachePrefix+cacheName);
         String cache = bucket.get();
         List<GasConcentration> gasConcentrations = JSON.parseArray(cache,GasConcentration.class);
         if (CollectionUtils.isEmpty(gasConcentrations)){
-            gasConcentrations = new ArrayList<>();
+            List<GasConcentration> concentrations = gasConcentrationService.listDatabyTimeSlot(startTime, time);
+            if (CollectionUtils.isEmpty(concentrations)){
+                gasConcentrations = new ArrayList<>();
+            }else {
+                gasConcentrations = concentrations;
+            }
             gasConcentrations.add(save);
         }else {
             gasConcentrations.add(save);
@@ -401,66 +424,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){
@@ -478,46 +501,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