事前标记

src/main/java/com/cn/esermis/config/JwtInterceptor.java

@@ -0,0 +1,55 @@
+package com.cn.esermis.config;
+
+import com.alibaba.fastjson.JSON;
+import com.cn.esermis.dpld.mapper.DataAcquisitionInstrumentMapper;
+import com.cn.esermis.model.BaseUser;
+import com.cn.esermis.utils.TokenUtils;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@Component
+public class JwtInterceptor implements HandlerInterceptor {
+
+    private static final String AUTH_HEADER = "Authorization";
+    private static final String TOKEN_PREFIX = "Bearer ";
+
+    @Resource
+    DataAcquisitionInstrumentMapper dataAcquisitionInstrumentMapper;
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
+        String token = extractToken(request);
+        if (token != null) {
+            BaseUser userInfo = TokenUtils.getUserInfo(token);
+            if (userInfo != null){
+                // 查询数据库是否有 公司和工厂信息
+                Boolean verifyCompany = dataAcquisitionInstrumentMapper.verifyCompany(userInfo.getCompanyId());
+                Boolean verifydepartmen = dataAcquisitionInstrumentMapper.verifydepartmen(userInfo.getFactoryId());
+                if (verifyCompany&&verifydepartmen){
+                    // 将用户信息设置到请求属性中，便于后续使用
+                    request.setAttribute("userInfo", JSON.toJSONString(userInfo));
+                    return true;
+                }else {
+                    throw new RuntimeException("用户无权限！");
+                }
+            }else{
+                throw new RuntimeException("token解析失败！");
+            }
+        }else {
+            throw new RuntimeException("token为空！");
+        }
+
+    }
+
+    private String extractToken(HttpServletRequest request) {
+        String bearerToken = request.getHeader(AUTH_HEADER);
+        if (bearerToken != null && bearerToken.startsWith(TOKEN_PREFIX)) {
+            return bearerToken.substring(TOKEN_PREFIX.length());
+        }
+        return null;
+    }
+}

src/main/java/com/cn/esermis/config/WebConfig.java

@@ -0,0 +1,18 @@
+package com.cn.esermis.config;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class WebConfig implements WebMvcConfigurer {
+
+    @Autowired
+    private JwtInterceptor jwtInterceptor;
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(jwtInterceptor)
+                .addPathPatterns("/**"); // 拦截所有路径
+    }
+}

src/main/java/com/cn/esermis/constant/Constant.java

@@ -17,6 +17,6 @@ public class Constant {
         public static final  String CN = "CN"; //大气环境污染源
         public static final  String SERVER = "server"; //大气环境污染源
 
-        public static final List<String> COMMAND = new ArrayList<>(Arrays.asList(HOUR, MINUTE, REAL)); // 解析数据编码
+        public static final List<String> COMMAND = new ArrayList<>(Arrays.asList(HOUR, MINUTE)); // 解析数据编码
 
 }

src/main/java/com/cn/esermis/controller/DataAcquisitionInstrumentController.java

@@ -1,5 +1,6 @@
 package com.cn.esermis.controller;
 
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -10,10 +11,13 @@ import com.cn.esermis.dpld.entity.DetectMonitoringFactor;
 import com.cn.esermis.dpld.model.AjaxResult;
 import com.cn.esermis.dpld.model.AnalyticalInstrumentsVo;
 import com.cn.esermis.dpld.model.DataAcquisitionInstrumentVo;
+import com.cn.esermis.dpld.model.OutletAndFactorVo;
 import com.cn.esermis.dpld.service.IAnalyticalInstrumentsService;
 import com.cn.esermis.dpld.service.IDataAcquisitionInstrumentService;
 import com.cn.esermis.dpld.service.IDetectMonitoringFactorService;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -33,7 +37,8 @@ public class DataAcquisitionInstrumentController {
     private IDetectMonitoringFactorService detectMonitoringFactorService;
     @Resource
     private IDataAcquisitionInstrumentService dataAcquisitionInstrumentService;
-
+    @Autowired
+    private RedisTemplate<String, Object> redisTemplate;
     /**
      * 获取数采仪信息表
      */
@@ -85,6 +90,8 @@ public class DataAcquisitionInstrumentController {
             });
             volits.setRecords(revoList);
         }
+        List<OutletAndFactorVo> selectlist = dataAcquisitionInstrumentService.selectlist();
+        redisTemplate.opsForValue().set("dataAcquisitionInstruments", JSON.toJSONString(selectlist));
         return success(volits);
     }
 
@@ -111,6 +118,8 @@ public class DataAcquisitionInstrumentController {
             }
         }
         dataAcquisitionInstrumentService.remove(new QueryWrapper<DataAcquisitionInstrument>().eq("id", id));
+        List<OutletAndFactorVo> selectlist = dataAcquisitionInstrumentService.selectlist();
+        redisTemplate.opsForValue().set("dataAcquisitionInstruments", JSON.toJSONString(selectlist));
         return success();
     }
 
@@ -142,12 +151,14 @@ public class DataAcquisitionInstrumentController {
                 instrumentVo.setAnalyticalInstruments(analyticalInstrumentList);
             }
         }
+        List<OutletAndFactorVo> selectlist = dataAcquisitionInstrumentService.selectlist();
+        redisTemplate.opsForValue().set("dataAcquisitionInstruments", JSON.toJSONString(selectlist));
         return success(instrumentVo);
     }
 
 
     /**
-     * 新增菜单
+     * 新增数采仪信息
      */
     @PostMapping("/save")
     @Transactional
@@ -180,6 +191,7 @@ public class DataAcquisitionInstrumentController {
                     List<DetectMonitoringFactor> detectMonitoringFactors = x.getDetectMonitoringFactors();
                     detectMonitoringFactors.forEach(y->{
                         y.setAnalyticalInstrumentId(analyticalInstruments.getId());
+
                         boolean save2 = detectMonitoringFactorService.save(y);
                         if (!save2){
                             throw new RuntimeException("添加失败");
@@ -188,6 +200,8 @@ public class DataAcquisitionInstrumentController {
                }
             });
         }
+        List<OutletAndFactorVo> selectlist = dataAcquisitionInstrumentService.selectlist();
+        redisTemplate.opsForValue().set("dataAcquisitionInstruments", JSON.toJSONString(selectlist));
         return success();
     }
 

src/main/java/com/cn/esermis/datawarn/common/ExceptionDataDispose.java

@@ -1,5 +1,6 @@
 package com.cn.esermis.datawarn.common;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.cn.esermis.datawarn.mapper.CountAirChargeMapper;
 import com.cn.esermis.datawarn.mapper.CountWaterChargeMapper;
 import com.cn.esermis.datawarn.mapper.ExceedDataMapper;
@@ -14,29 +15,30 @@ import java.util.ArrayList;
  * @ClassName: exceptionDataDispose
  * @author: Mr.Chen
  * @date: 2024/9/13 9:51
- * 超标A  负值异常B  6小时恒值C  正常数据为Y
+ * 正常"0" 异常"1"
  */
+@DS("slave_1")
 @Component
+//@EnableScheduling
 public class ExceptionDataDispose {
 
     @Autowired
-    private CountAirChargeMapper countAirChargeMapper;
+    CountAirChargeMapper countAirChargeMapper;
     @Autowired
-    private ExceedDataMapper exceedDataMapper;
+    ExceedDataMapper exceedDataMapper;
     @Autowired
-    private MonitorFactorMapper monitorFactorMapper;
+    MonitorFactorMapper monitorFactorMapper;
     @Autowired
-    private CountWaterChargeMapper countWaterChargeMapper;
+    CountWaterChargeMapper countWaterChargeMapper;
 
 
     public String LoseData(Double max, Double min, Double avg) {
 
         //判断是否为负值数据
         if (max < 0 || min < 0 || avg < 0) {
-            return "B";
+            return "1";
         }
-        return "Y";
-
+        return "0";
     }
 
     public String SixData(String mn, String factor, Double avg, String dataTime) {
@@ -69,12 +71,15 @@ public class ExceptionDataDispose {
             }
         }
         if (count == 6) {
-            return "C";
+            return "1";
         }
-        return "Y";
+        return "0";
 
     }
-
+//    @Scheduled(cron = "0/10 * * * *  ?")
+//    public void test(){
+//        System.out.println(SixData("120119ZHSYQ081", "a00000", 18.75, "20241023220000"));
+//    }
 
     public String ExceedData(String mn, String factor, Double avg) {
         //获取到小时均值限值
@@ -84,9 +89,9 @@ public class ExceptionDataDispose {
         int flag = hoursLimit.compareTo(BigDecimal.valueOf(avg));
         //compareTo会判断两个BigDecimal对象的大小 如果是负值那么avg > HOURSLimit 如果是0那么avg = HOURSLimit 如果是正数那么avg < HOURSLimit
         if (flag < 0) {
-            return "A";
+            return "1";
         }
-        return "Y";
+        return "0";
     }
 
     public BigDecimal ExceedData(String mn, String factor) {

src/main/java/com/cn/esermis/datawarn/mapper/CountWaterChargeMapper.java

@@ -2,11 +2,12 @@ package com.cn.esermis.datawarn.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cn.esermis.datawarn.entity.WaterHourRecord;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
-
+@Mapper
 public interface CountWaterChargeMapper extends BaseMapper<WaterHourRecord> {
     @Select(value = "select avg from water_monitor_hour_record where mn = #{mn} and factor = #{factor} and data_time in (#{time1},#{time2},#{time3},#{time4},#{time5}) ")
     List<Double> airSixHour(@Param("mn") String mn ,@Param("factor") String factor, @Param("time1") String time1, @Param("time2") String time2, @Param("time3") String time3, @Param("time4") String time4, @Param("time5") String time5);

src/main/java/com/cn/esermis/datawarn/mapper/ExceedDataMapper.java

@@ -5,16 +5,11 @@ import com.cn.esermis.datawarn.entity.MonitoringFactor;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.SelectProvider;
 
 import java.math.BigDecimal;
 
 @Mapper
 public interface ExceedDataMapper extends BaseMapper<MonitoringFactor> {
-//    @SelectProvider(type = ExceedDataSQL.class, method = "hoursAvg")
-    @Select("select hours_avg from monitoring_factor where analytical_instrument_id in \n" +
-            "        (select id from analytical_instruments where data_acquisition_instrument_id in\n" +
-            "        (select id from data_acquisition_instrument where mn_code = #{mn})\n" +
-            "        ) and factor = #{factor}")
+    @Select("select hours_avg from monitoring_factor m left join data_acquisition_instrument d on m.data_acquisition_instrument_id = d.id where d.mn_code = #{mn} and m.factor = #{factor}")
     BigDecimal hoursAvg(@Param("mn") String mn, @Param("factor") String factor);
 }

src/main/java/com/cn/esermis/datawarn/mapper/MonitorFactorMapper.java

@@ -2,9 +2,11 @@ package com.cn.esermis.datawarn.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cn.esermis.datawarn.entity.MonitorFactor;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+@Mapper
 public interface MonitorFactorMapper extends BaseMapper<MonitorFactor> {
     @Select(value = "select factor_type from monitor_factor where code = #{factor}")
     Integer waterOrAir(@Param("factor") String factor);

src/main/java/com/cn/esermis/dpld/business/MonitorBusiness.java

@@ -44,14 +44,13 @@ public class MonitorBusiness {
     @Autowired
     private RedisTemplate<String, Object> redisTemplate;
 
-    private List<OutletAndFactorVo>  dataAcquisitionInstruments =  new ArrayList<>();
 
 
     @PostConstruct
     public void loadData() {
-        dataAcquisitionInstruments =
-                dataAcquisitionInstrumentService.selectlist();
-        System.out.println(dataAcquisitionInstruments);
+
+        List<OutletAndFactorVo> selectlist = dataAcquisitionInstrumentService.selectlist();
+        redisTemplate.opsForValue().set("dataAcquisitionInstruments", JSON.toJSONString(selectlist));
         // 处理读取到的数据
     }
 
@@ -116,52 +115,54 @@ public class MonitorBusiness {
                         listData.add(airMonitorMinuteRecord);
                     });
                     airMonitorMinuteRecordService.saveBatch(listData);
-                } else if (factorModel.getCN().equals(Constant.REAL)) {
-                    // 分钟数据入库
-                    List<AirMonitorMinuteRecord> listData = new ArrayList<>();
-                    cp.forEach(x -> {
-                        AirMonitorMinuteRecord airMonitorMinuteRecord = new AirMonitorMinuteRecord();
-                        airMonitorMinuteRecord.setQn(factorModel.getQN());
-                        airMonitorMinuteRecord.setSt(factorModel.getST());
-                        airMonitorMinuteRecord.setCn(factorModel.getCN());
-                        airMonitorMinuteRecord.setPw(factorModel.getPW());
-                        airMonitorMinuteRecord.setMn(factorModel.getMN());
-                        airMonitorMinuteRecord.setFlag(factorModel.getFlag());
-                        airMonitorMinuteRecord.setDataTime(factorModel.getDataTime());
-                        airMonitorMinuteRecord.setFactor(x.getFactor());
-                        airMonitorMinuteRecord.setMin(x.getMin());
-                        airMonitorMinuteRecord.setMax(x.getMax());
-                        airMonitorMinuteRecord.setAvg(x.getAvg());
-                        airMonitorMinuteRecord.setCou(x.getCou());
-                        airMonitorMinuteRecord.setFactorFlag(x.getFlag());
-                        airMonitorMinuteRecord.setZsAvg(x.getZsAvg());
-                        airMonitorMinuteRecord.setZsMax(x.getZsMax());
-                        airMonitorMinuteRecord.setZsMin(x.getZsMin());
-                        airMonitorMinuteRecord.setRtd(x.getRtd());
-                        try {
-                            airMonitorMinuteRecord.setWorkCondition(sendMessage(factorModel.getDataTime(),factorModel.getMN()));
-                        } catch (ParseException e) {
-                            throw new RuntimeException(e);
-                        }
-                        try {
-                            airMonitorMinuteRecord.setIsExceed(exceptionDataDispose.ExceedData(factorModel.getMN(), x.getFactor(), x.getAvg()!=null?x.getAvg().doubleValue():x.getRtd().doubleValue()));
-                            airMonitorMinuteRecord.setIsLose(exceptionDataDispose.LoseData(x.getMax()!=null?x.getMax().doubleValue():0,
-                                    x.getMin()!=null?x.getMin().doubleValue():0,
-                                    x.getAvg()!=null?x.getAvg().doubleValue():0));
-                            if ((airMonitorMinuteRecord.getIsExceed()!=null && !airMonitorMinuteRecord.getIsExceed().equals("Y") )||
-                                    (airMonitorMinuteRecord.getIsLose()!=null && !airMonitorMinuteRecord.getIsLose().equals("Y") )||
-                                    (airMonitorMinuteRecord.getIsSix()!=null && !airMonitorMinuteRecord.getIsSix().equals("Y"))){
-                                saveExcepLog(x, airMonitorMinuteRecord);
-                            }
-                        } catch (Exception e) {
-                            log.error("调用 ExceptionDataDispose2 方法异常{} 当前参数为:{}",e,airMonitorMinuteRecord);
-                        }
-                        listData.add(airMonitorMinuteRecord);
-                    });
-                    if (!listData.isEmpty()) {
-                        airMonitorMinuteRecordService.saveBatch(listData);
-                    }
-                } else if (factorModel.getCN().equals(Constant.HOUR)) {
+                }
+//                else if (factorModel.getCN().equals(Constant.REAL)) {
+//                    // 分钟数据入库
+//                    List<AirMonitorMinuteRecord> listData = new ArrayList<>();
+//                    cp.forEach(x -> {
+//                        AirMonitorMinuteRecord airMonitorMinuteRecord = new AirMonitorMinuteRecord();
+//                        airMonitorMinuteRecord.setQn(factorModel.getQN());
+//                        airMonitorMinuteRecord.setSt(factorModel.getST());
+//                        airMonitorMinuteRecord.setCn(factorModel.getCN());
+//                        airMonitorMinuteRecord.setPw(factorModel.getPW());
+//                        airMonitorMinuteRecord.setMn(factorModel.getMN());
+//                        airMonitorMinuteRecord.setFlag(factorModel.getFlag());
+//                        airMonitorMinuteRecord.setDataTime(factorModel.getDataTime());
+//                        airMonitorMinuteRecord.setFactor(x.getFactor());
+//                        airMonitorMinuteRecord.setMin(x.getMin());
+//                        airMonitorMinuteRecord.setMax(x.getMax());
+//                        airMonitorMinuteRecord.setAvg(x.getAvg());
+//                        airMonitorMinuteRecord.setCou(x.getCou());
+//                        airMonitorMinuteRecord.setFactorFlag(x.getFlag());
+//                        airMonitorMinuteRecord.setZsAvg(x.getZsAvg());
+//                        airMonitorMinuteRecord.setZsMax(x.getZsMax());
+//                        airMonitorMinuteRecord.setZsMin(x.getZsMin());
+//                        airMonitorMinuteRecord.setRtd(x.getRtd());
+//                        try {
+//                            airMonitorMinuteRecord.setWorkCondition(sendMessage(factorModel.getDataTime(),factorModel.getMN()));
+//                        } catch (ParseException e) {
+//                            throw new RuntimeException(e);
+//                        }
+//                        try {
+//                            airMonitorMinuteRecord.setIsExceed(exceptionDataDispose.ExceedData(factorModel.getMN(), x.getFactor(), x.getAvg()!=null?x.getAvg().doubleValue():x.getRtd().doubleValue()));
+//                            airMonitorMinuteRecord.setIsLose(exceptionDataDispose.LoseData(x.getMax()!=null?x.getMax().doubleValue():0,
+//                                    x.getMin()!=null?x.getMin().doubleValue():0,
+//                                    x.getAvg()!=null?x.getAvg().doubleValue():0));
+//                            if ((airMonitorMinuteRecord.getIsExceed()!=null && !airMonitorMinuteRecord.getIsExceed().equals("Y") )||
+//                                    (airMonitorMinuteRecord.getIsLose()!=null && !airMonitorMinuteRecord.getIsLose().equals("Y") )||
+//                                    (airMonitorMinuteRecord.getIsSix()!=null && !airMonitorMinuteRecord.getIsSix().equals("Y"))){
+//                                saveExcepLog(x, airMonitorMinuteRecord);
+//                            }
+//                        } catch (Exception e) {
+//                            log.error("调用 ExceptionDataDispose2 方法异常{} 当前参数为:{}",e,airMonitorMinuteRecord);
+//                        }
+//                        listData.add(airMonitorMinuteRecord);
+//                    });
+//                    if (!listData.isEmpty()) {
+//                        airMonitorMinuteRecordService.saveBatch(listData);
+//                    }
+//                }
+                else if (factorModel.getCN().equals(Constant.HOUR)) {
                     // 小时数据入库
                     List<AirMonitorHourRecord> listData = new ArrayList<>();
                     cp.forEach(x -> {
@@ -244,50 +245,52 @@ public class MonitorBusiness {
                         listData.add(waterMonitorMinuteRecord);
                     });
                     waterMonitorMinuteRecordService.saveBatch(listData);
-                } else if (factorModel.getCN().equals(Constant.REAL)) {
-                    // 分钟数据入库
-                    List<WaterMonitorMinuteRecord> listData = new ArrayList<>();
-                    cp.forEach(x -> {
-                        WaterMonitorMinuteRecord waterMonitorMinuteRecord = new WaterMonitorMinuteRecord();
-                        waterMonitorMinuteRecord.setQn(factorModel.getQN());
-                        waterMonitorMinuteRecord.setSt(factorModel.getST());
-                        waterMonitorMinuteRecord.setCn(factorModel.getCN());
-                        waterMonitorMinuteRecord.setPw(factorModel.getPW());
-                        waterMonitorMinuteRecord.setMn(factorModel.getMN());
-                        waterMonitorMinuteRecord.setFlag(factorModel.getFlag());
-                        waterMonitorMinuteRecord.setDataTime(factorModel.getDataTime());
-                        waterMonitorMinuteRecord.setFactor(x.getFactor());
-                        waterMonitorMinuteRecord.setMin(x.getMin());
-                        waterMonitorMinuteRecord.setMax(x.getMax());
-                        waterMonitorMinuteRecord.setAvg(x.getAvg());
-                        waterMonitorMinuteRecord.setCou(x.getCou());
-                        waterMonitorMinuteRecord.setFactorFlag(x.getFlag());
-                        waterMonitorMinuteRecord.setRtd(x.getRtd());
-                        try {
-                            waterMonitorMinuteRecord.setWorkCondition(sendMessage(factorModel.getDataTime(),factorModel.getMN()));
-                        } catch (ParseException e) {
-                            throw new RuntimeException(e);
-                        }
-                        try {
-                            waterMonitorMinuteRecord.setIsExceed(exceptionDataDispose.ExceedData(factorModel.getMN(), x.getFactor(), x.getAvg()!=null?x.getAvg().doubleValue():x.getRtd().doubleValue()));
-                            waterMonitorMinuteRecord.setIsLose(exceptionDataDispose.LoseData(x.getMax()!=null?x.getMax().doubleValue():0,
-                                    x.getMin()!=null?x.getMin().doubleValue():0,
-                                    x.getAvg()!=null?x.getAvg().doubleValue():0));
-                            if ((waterMonitorMinuteRecord.getIsExceed()!=null && !waterMonitorMinuteRecord.getIsExceed().equals("Y") )||
-                                    (waterMonitorMinuteRecord.getIsLose()!=null && !waterMonitorMinuteRecord.getIsLose().equals("Y") )||
-                                    (waterMonitorMinuteRecord.getIsSix()!=null && !waterMonitorMinuteRecord.getIsSix().equals("Y"))){
-                                saveExcepLog(x, waterMonitorMinuteRecord);
-                            }
-                        } catch (Exception e) {
-                            log.error("调用 ExceptionDataDispose5 方法异常{} 当前参数为:{}",e,waterMonitorMinuteRecord);
-                        }
-
-                        listData.add(waterMonitorMinuteRecord);
-                    });
-                    if (!listData.isEmpty()) {
-                        waterMonitorMinuteRecordService.saveBatch(listData);
-                    }
-                } else if
+                }
+//                else if (factorModel.getCN().equals(Constant.REAL)) {
+//                    // 分钟数据入库
+//                    List<WaterMonitorMinuteRecord> listData = new ArrayList<>();
+//                    cp.forEach(x -> {
+//                        WaterMonitorMinuteRecord waterMonitorMinuteRecord = new WaterMonitorMinuteRecord();
+//                        waterMonitorMinuteRecord.setQn(factorModel.getQN());
+//                        waterMonitorMinuteRecord.setSt(factorModel.getST());
+//                        waterMonitorMinuteRecord.setCn(factorModel.getCN());
+//                        waterMonitorMinuteRecord.setPw(factorModel.getPW());
+//                        waterMonitorMinuteRecord.setMn(factorModel.getMN());
+//                        waterMonitorMinuteRecord.setFlag(factorModel.getFlag());
+//                        waterMonitorMinuteRecord.setDataTime(factorModel.getDataTime());
+//                        waterMonitorMinuteRecord.setFactor(x.getFactor());
+//                        waterMonitorMinuteRecord.setMin(x.getMin());
+//                        waterMonitorMinuteRecord.setMax(x.getMax());
+//                        waterMonitorMinuteRecord.setAvg(x.getAvg());
+//                        waterMonitorMinuteRecord.setCou(x.getCou());
+//                        waterMonitorMinuteRecord.setFactorFlag(x.getFlag());
+//                        waterMonitorMinuteRecord.setRtd(x.getRtd());
+//                        try {
+//                            waterMonitorMinuteRecord.setWorkCondition(sendMessage(factorModel.getDataTime(),factorModel.getMN()));
+//                        } catch (ParseException e) {
+//                            throw new RuntimeException(e);
+//                        }
+//                        try {
+//                            waterMonitorMinuteRecord.setIsExceed(exceptionDataDispose.ExceedData(factorModel.getMN(), x.getFactor(), x.getAvg()!=null?x.getAvg().doubleValue():x.getRtd().doubleValue()));
+//                            waterMonitorMinuteRecord.setIsLose(exceptionDataDispose.LoseData(x.getMax()!=null?x.getMax().doubleValue():0,
+//                                    x.getMin()!=null?x.getMin().doubleValue():0,
+//                                    x.getAvg()!=null?x.getAvg().doubleValue():0));
+//                            if ((waterMonitorMinuteRecord.getIsExceed()!=null && !waterMonitorMinuteRecord.getIsExceed().equals("Y") )||
+//                                    (waterMonitorMinuteRecord.getIsLose()!=null && !waterMonitorMinuteRecord.getIsLose().equals("Y") )||
+//                                    (waterMonitorMinuteRecord.getIsSix()!=null && !waterMonitorMinuteRecord.getIsSix().equals("Y"))){
+//                                saveExcepLog(x, waterMonitorMinuteRecord);
+//                            }
+//                        } catch (Exception e) {
+//                            log.error("调用 ExceptionDataDispose5 方法异常{} 当前参数为:{}",e,waterMonitorMinuteRecord);
+//                        }
+//
+//                        listData.add(waterMonitorMinuteRecord);
+//                    });
+//                    if (!listData.isEmpty()) {
+//                        waterMonitorMinuteRecordService.saveBatch(listData);
+//                    }
+//                }
+                else if
                 (factorModel.getCN().equals(Constant.HOUR)) {
                     // 小时数据入库
                     List<WaterMonitorHourRecord> listData = new ArrayList<>();
@@ -333,7 +336,7 @@ public class MonitorBusiness {
 
     private void saveExcepLog(CP x, AirMonitorMinuteRecord record) {
         ExcepLog excepLog = new ExcepLog();
-        Optional<OutletAndFactorVo> first = dataAcquisitionInstruments.stream().filter(d ->d.getFactor()!=null && d.getFactor().equals(x.getFactor())).findFirst();
+        Optional<OutletAndFactorVo> first = getloadData().stream().filter(d ->d.getFactor()!=null && d.getFactor().equals(x.getFactor())).findFirst();
         if (first.isPresent()) {
             excepLog.setOutletName(first.get().getOutletName());
             excepLog.setOutletCode(first.get().getOutletCode());
@@ -349,7 +352,7 @@ public class MonitorBusiness {
 
     private void saveExcepLog(CP x, AirMonitorHourRecord record) {
         ExcepLog excepLog = new ExcepLog();
-        Optional<OutletAndFactorVo> first = dataAcquisitionInstruments.stream().filter(d -> d.getFactor()!=null && d.getFactor().equals(x.getFactor())).findFirst();
+        Optional<OutletAndFactorVo> first = getloadData().stream().filter(d -> d.getFactor()!=null && d.getFactor().equals(x.getFactor())).findFirst();
         if (first.isPresent()) {
             excepLog.setOutletName(first.get().getOutletName());
             excepLog.setOutletCode(first.get().getOutletCode());
@@ -364,7 +367,7 @@ public class MonitorBusiness {
 
     private void saveExcepLog(CP x, WaterMonitorMinuteRecord record) {
         ExcepLog excepLog = new ExcepLog();
-        Optional<OutletAndFactorVo> first = dataAcquisitionInstruments.stream().filter(d ->d.getFactor()!=null &&  d.getFactor().equals(x.getFactor())).findFirst();
+        Optional<OutletAndFactorVo> first = getloadData().stream().filter(d ->d.getFactor()!=null &&  d.getFactor().equals(x.getFactor())).findFirst();
         if (first.isPresent()) {
             excepLog.setOutletName(first.get().getOutletName());
             excepLog.setOutletCode(first.get().getOutletCode());
@@ -378,7 +381,7 @@ public class MonitorBusiness {
     }
     private void saveExcepLog(CP x, WaterMonitorHourRecord record) {
         ExcepLog excepLog = new ExcepLog();
-        Optional<OutletAndFactorVo> first = dataAcquisitionInstruments.stream().filter(d -> d.getFactor()!=null && d.getFactor().equals(x.getFactor())).findFirst();
+        Optional<OutletAndFactorVo> first = getloadData().stream().filter(d -> d.getFactor()!=null && d.getFactor().equals(x.getFactor())).findFirst();
         if (first.isPresent()) {
             excepLog.setOutletName(first.get().getOutletName());
             excepLog.setOutletCode(first.get().getOutletCode());
@@ -403,4 +406,19 @@ public class MonitorBusiness {
         }
         return 1;
     }
+    /**
+     * 获取工厂排口信息
+     */
+    private List<OutletAndFactorVo> getloadData() {
+        List<OutletAndFactorVo>  dataAcquisitionInstruments = new ArrayList<>();
+        Object o = redisTemplate.opsForValue().get("dataAcquisitionInstruments");
+        if (o != null){
+            dataAcquisitionInstruments = JSON.parseArray(o.toString(), OutletAndFactorVo.class);
+        }else {
+            dataAcquisitionInstruments = dataAcquisitionInstrumentService.selectlist();
+            redisTemplate.opsForValue().set("dataAcquisitionInstruments", JSON.toJSONString(dataAcquisitionInstruments));
+        }
+        return dataAcquisitionInstruments;
+    }
+
 }

src/main/java/com/cn/esermis/dpld/entity/DetectMonitoringFactor.java

@@ -75,5 +75,9 @@ public class DetectMonitoringFactor {
      */
     @TableField(value = "rangeUnit")
     private String rangeUnit;
-
+    /**
+     * 数据采集仪主键ID
+     */
+    @TableField(value = "data_acquisition_instrument_id")
+    private String dataAcquisitionInstrumentId;
 }

src/main/java/com/cn/esermis/dpld/mapper/DataAcquisitionInstrumentMapper.java

@@ -26,4 +26,8 @@ public interface DataAcquisitionInstrumentMapper extends BaseMapper<DataAcquisit
     Map<String, Object> getDepartmentMap();
 
     List<DataAcquisitionInstrument> listByCode(DataAcquisitionInstrumentVo vo);
+
+    Boolean verifydepartmen(String factoryId);
+
+    Boolean verifyCompany(String companyId);
 }

src/main/resources/static/mybatis/DataAcquisitionInstrumentMapper.xml

@@ -41,5 +41,11 @@
             </if>
         </where>
     </select>
+    <select id="verifydepartmen" resultType="java.lang.Boolean">
+        select count(0)>0 from department where departmentid = #{factoryId}
+    </select>
+    <select id="verifyCompany" resultType="java.lang.Boolean" parameterType="java.lang.String">
+        select count(0)>0 from company where companyid =  #{companyId}
+    </select>
 </mapper>