事前标记

src/main/java/com/cn/esermis/EsermisApplication.java

@@ -25,7 +25,7 @@ public class EsermisApplication  implements CommandLineRunner {
         /**
          * 使用异步注解方式启动netty服务端服务
          */
-        new BootNettyServer().bind(19900);
+        new BootNettyServer().bind(8088);
     }
 
 }

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

@@ -1,5 +1,6 @@
 package com.cn.esermis.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -19,9 +20,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import static com.cn.esermis.dpld.model.AjaxResult.success;
 
@@ -36,7 +35,7 @@ public class DataAcquisitionInstrumentController {
     private IDataAcquisitionInstrumentService dataAcquisitionInstrumentService;
 
     /**
-     * 获取菜单列表
+     * 获取数采仪信息表
      */
     @GetMapping("/list")
     public AjaxResult list(DataAcquisitionInstrumentVo vo)
@@ -177,7 +176,7 @@ public class DataAcquisitionInstrumentController {
                 BeanUtils.copyProperties(x, analyticalInstruments);
                 analyticalInstruments.setDataAcquisitionInstrumentId(dataAcquisitionInstrument.getId());
                 boolean save1 = analyticalInstrumentsService.save(analyticalInstruments);
-                if (save1){
+                if (x.getDetectMonitoringFactors()!=null && save1){
                     List<DetectMonitoringFactor> detectMonitoringFactors = x.getDetectMonitoringFactors();
                     detectMonitoringFactors.forEach(y->{
                         y.setAnalyticalInstrumentId(analyticalInstruments.getId());
@@ -212,4 +211,19 @@ public class DataAcquisitionInstrumentController {
     }
 
 
+
+    /**
+     * 获取数采仪信息表
+     */
+    @GetMapping("/listByCode")
+    public AjaxResult listByCode(DataAcquisitionInstrumentVo vo)
+    {
+        QueryWrapper<DataAcquisitionInstrument> wrapper = new QueryWrapper<>();
+        wrapper.eq(vo.getDepartmentCode()!=null,"department_code", vo.getDepartmentCode());
+//        wrapper.eq(vo.getCompanyCode()!=null,"company_code", vo.getCompanyCode());
+//        List<DataAcquisitionInstrument> dataAcquisitionInstruments = dataAcquisitionInstrumentService.listByCode(vo);
+        List<DataAcquisitionInstrument> dataAcquisitionInstruments = dataAcquisitionInstrumentService.list(wrapper);
+        return success(dataAcquisitionInstruments);
+    }
+
 }

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

@@ -1,5 +1,6 @@
 package com.cn.esermis.controller;
 
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,32 +8,41 @@ import com.cn.esermis.dpld.entity.PreMarking;
 import com.cn.esermis.dpld.model.AjaxResult;
 import com.cn.esermis.dpld.model.PreMarkingVo;
 import com.cn.esermis.dpld.service.IPreMarkingService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @RestController
 @RequestMapping("/pre_marking")
 public class PreMarkingController {
 
+    @Autowired
+    private RedisTemplate<String, Object> redisTemplate;
+
     @Resource
     private IPreMarkingService preMarkingService;
 
     @PostMapping("/add")
     public Object add(@RequestBody PreMarking preMarking) {
         preMarkingService.save(preMarking);
+        sendMessage();
         return AjaxResult.success("success");
     }
 
     @GetMapping("/del")
     public Object del(String id) {
         preMarkingService.removeById(id);
+        sendMessage();
         return AjaxResult.success("success");
     }
 
     @PostMapping("/edit")
     public Object edit(@RequestBody PreMarking preMarking) {
         preMarkingService.updateById(preMarking);
+        sendMessage();
         return AjaxResult.success("success");
     }
 
@@ -44,7 +54,18 @@ public class PreMarkingController {
     @GetMapping("/list")
     public Object list(PreMarkingVo vo) {
         IPage<PreMarking> page = new Page<>(vo.getPageNum(), vo.getPageSize());
+        sendMessage();
         return AjaxResult.success(preMarkingService.page(page,new QueryWrapper<>(vo)));
     }
 
+
+    public void sendMessage() {
+        List<PreMarking> preMarking = preMarkingService.getNewMarking();
+        if (preMarking != null){
+            preMarking.forEach(x->{
+                redisTemplate.opsForValue().set(x.getMnCode(), JSON.toJSONString(x));
+            });
+        }
+    }
+
 }

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

@@ -1,5 +1,6 @@
 package com.cn.esermis.dpld.business;
 
+import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.cn.esermis.constant.Constant;
 import com.cn.esermis.datawarn.common.ExceptionDataDispose;
@@ -10,10 +11,13 @@ import com.cn.esermis.model.CP;
 import com.cn.esermis.model.FactorModel;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -37,7 +41,8 @@ public class MonitorBusiness {
     private IExcepLogService excepLogService;
     @Resource
     private IAirMonitorHourRecordService airMonitorHourRecordService;
-
+    @Autowired
+    private RedisTemplate<String, Object> redisTemplate;
 
     private List<OutletAndFactorVo>  dataAcquisitionInstruments =  new ArrayList<>();
 
@@ -91,6 +96,11 @@ public class MonitorBusiness {
                         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,
@@ -129,6 +139,11 @@ public class MonitorBusiness {
                         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,
@@ -209,6 +224,11 @@ public class MonitorBusiness {
                         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,
@@ -244,6 +264,11 @@ public class MonitorBusiness {
                         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,
@@ -366,5 +391,16 @@ public class MonitorBusiness {
         }
     }
 
-
+    public Integer sendMessage(String time,String mn) throws ParseException {
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMddHHmmss");
+        Object o = redisTemplate.opsForValue().get(mn);
+        if (o != null){
+            PreMarking preMarking = JSON.parseObject(o.toString(), PreMarking.class);
+            Date date = formatter.parse(time);
+            if (preMarking.getStartTime().getTime() >= date.getTime()){
+                return preMarking.getWorkingCondition();
+            }
+        }
+        return 1;
+    }
 }

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

@@ -126,4 +126,10 @@ public class AirMonitorHourRecord {
 
     @TableField(value = "is_exceed")
     private String isExceed;
+
+    /**
+     * 工况
+     */
+    @TableField(value = "work_condition")
+    private Integer workCondition;
 }

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

@@ -128,5 +128,10 @@ public class AirMonitorMinuteRecord {
 
     @TableField(value = "is_exceed")
     private String isExceed;
+    /**
+     * 工况
+     */
+    @TableField(value = "work_condition")
+    private Integer workCondition;
 
 }

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

@@ -4,7 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonAppend;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -23,10 +26,21 @@ public class PreMarking {
     @TableId(value = "id", type = IdType.UUID)
     private String id;
     /**
-     * 点位名称
+     * 排污口名称
      */
-    @TableField(value = "point_name")
-    private String pointName;
+    @TableField(value = "outlet_name")
+    private String outletName;
+    /**
+     * 排污口编号
+     */
+    @TableField(value = "outlet_code")
+    private String outletCode;
+
+    /**
+     * 数采仪MN号
+     */
+    @TableField(value = "mn_code")
+    private String mnCode;
     /**
      * 工况类型
      * 1正常运行、2停运、3启炉、4焖炉、5烘炉、6停炉、7生产设施故障、8自动监控设施故障、9其他
@@ -37,6 +51,8 @@ public class PreMarking {
      * 开始时间
      */
     @TableField(value = "start_time")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date startTime;
     /**
      * 原因
@@ -55,5 +71,13 @@ public class PreMarking {
     @TableField(value = "user_name")
     private String userName;
 
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date createTime;
+
 
 }

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

@@ -114,5 +114,10 @@ public class WaterMonitorHourRecord {
 
     @TableField(value = "is_exceed")
     private String isExceed;
+    /**
+     * 工况
+     */
+    @TableField(value = "work_condition")
+    private Integer workCondition;
 
 }

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

@@ -115,5 +115,9 @@ public class WaterMonitorMinuteRecord {
     @TableField(value = "is_exceed")
     private String isExceed;
 
-
+    /**
+     * 工况
+     */
+    @TableField(value = "work_condition")
+    private Integer workCondition;
 }

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

@@ -2,6 +2,7 @@ package com.cn.esermis.dpld.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cn.esermis.dpld.entity.DataAcquisitionInstrument;
+import com.cn.esermis.dpld.model.DataAcquisitionInstrumentVo;
 import com.cn.esermis.dpld.model.OutletAndFactorVo;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
@@ -23,4 +24,6 @@ public interface DataAcquisitionInstrumentMapper extends BaseMapper<DataAcquisit
 
     @MapKey("departmentid")
     Map<String, Object> getDepartmentMap();
+
+    List<DataAcquisitionInstrument> listByCode(DataAcquisitionInstrumentVo vo);
 }

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

@@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cn.esermis.dpld.entity.PreMarking;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface PreMarkingMapper extends BaseMapper<PreMarking> {
 
 
+    List<PreMarking> getNewMarking();
 }

src/main/java/com/cn/esermis/dpld/service/IDataAcquisitionInstrumentService.java

@@ -2,9 +2,11 @@ package com.cn.esermis.dpld.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.cn.esermis.dpld.entity.DataAcquisitionInstrument;
+import com.cn.esermis.dpld.model.DataAcquisitionInstrumentVo;
 import com.cn.esermis.dpld.model.OutletAndFactorVo;
 import org.springframework.stereotype.Service;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -21,4 +23,6 @@ public interface IDataAcquisitionInstrumentService extends IService<DataAcquisit
     Map<String, Object> getComponyMap();
 
     Map<String, Object> getDepartmentMap();
+
+    List<DataAcquisitionInstrument> listByCode(DataAcquisitionInstrumentVo vo);
 }

src/main/java/com/cn/esermis/dpld/service/IPreMarkingService.java

@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.cn.esermis.dpld.entity.PreMarking;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public interface IPreMarkingService extends IService<PreMarking> {
+    List<PreMarking> getNewMarking();
 }

src/main/java/com/cn/esermis/dpld/service/impl/DataAcquisitionInstrumentServiceImpl.java

@@ -1,13 +1,16 @@
 package com.cn.esermis.dpld.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cn.esermis.dpld.entity.DataAcquisitionInstrument;
 import com.cn.esermis.dpld.mapper.DataAcquisitionInstrumentMapper;
+import com.cn.esermis.dpld.model.DataAcquisitionInstrumentVo;
 import com.cn.esermis.dpld.model.OutletAndFactorVo;
 import com.cn.esermis.dpld.service.IDataAcquisitionInstrumentService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -43,4 +46,10 @@ public class DataAcquisitionInstrumentServiceImpl extends ServiceImpl<DataAcquis
     public Map<String, Object> getDepartmentMap() {
         return mapper.getDepartmentMap();
     }
+
+    @Override
+    public List<DataAcquisitionInstrument> listByCode(DataAcquisitionInstrumentVo vo) {
+        List<DataAcquisitionInstrument> dataAcquisitionInstruments = mapper.listByCode(vo);
+        return dataAcquisitionInstruments;
+    }
 }

src/main/java/com/cn/esermis/dpld/service/impl/PreMarkingImpl.java

@@ -6,6 +6,18 @@ import com.cn.esermis.dpld.mapper.PreMarkingMapper;
 import com.cn.esermis.dpld.service.IPreMarkingService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 @Service
 public class PreMarkingImpl extends ServiceImpl<PreMarkingMapper, PreMarking> implements IPreMarkingService {
+
+    @Resource
+    private PreMarkingMapper preMarkingMapper;
+
+
+    @Override
+    public List<PreMarking> getNewMarking() {
+        return preMarkingMapper.getNewMarking();
+    }
 }

src/main/resources/application.yml

@@ -46,10 +46,10 @@ mybatis-plus:
   mapper-locations: classpath:static/**/*.xml
   configuration:
     log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl # 指定 MyBatis 使用 SLF4J 日志实现
-logging:
-  level:
-    cnooc.esermis: DEBUG
-    com.baomidou.mybatisplus.core.mapper: debug # 设置 Mapper 接口的日志级别为 DEBUG
+#logging:
+#  level:
+#    cnooc.esermis: DEBUG
+#    com.baomidou.mybatisplus.core.mapper: debug # 设置 Mapper 接口的日志级别为 DEBUG
   ## 工程设置
 #project:
 #  debug: false

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

@@ -27,5 +27,19 @@
         SELECT t.departmentid,t.departmentname
         FROM department t
     </select>
+    <select id="listByCode" resultType="com.cn.esermis.dpld.entity.DataAcquisitionInstrument"
+            parameterType="com.cn.esermis.dpld.model.DataAcquisitionInstrumentVo">
+        SELECT t.id,t.outlet_name `outletName`,t.outlet_code `outletCode`,t.type,t.use_data `useData`,t.complete_filings `completeFilings`,t.complete_filings_time `completeFilingsTime`,t.collection_name `collectionName`,t.collection_brand `collectionBrand`,t.collection_model `collectionModel`,t.mn_code `mnCode`,t.collection_ip `collectionIp`,t.company_code `companyCode`,t.department_code `departmentCode`,t.have_exhaust
+        `haveExhaust`,t.exhaust_temperature `exhaustTemperature`,t.exhaust_height `exhaustHeight`,t.exhaust_diameter `exhaustDiameter`
+        FROM data_acquisition_instrument t
+        <where>
+            <if test="companyCode != null and companyCode != ''">
+                AND t.company_code = #{companyCode}
+            </if>
+            <if test="departmentCode != null and departmentCode != ''">
+                AND t.department_code = #{departmentCode}
+            </if>
+        </where>
+    </select>
 </mapper>
 

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cn.esermis.dpld.mapper.PreMarkingMapper">
+
+    <select id="getNewMarking" resultType="com.cn.esermis.dpld.entity.PreMarking">
+        SELECT a.*
+        FROM pre_marking a
+                 JOIN (
+            SELECT mn_code, MAX(start_time) as max_date
+            FROM pre_marking
+            GROUP BY mn_code
+        ) b ON a.mn_code = b.mn_code AND a.start_time = b.max_date
+    </select>
+</mapper>
+