Merge remote-tracking branch 'origin/cjl' into dev

cjl

2023-07-27 7e5452d35bb30dad5bc9e37360047b5a43732dcd

Merge remote-tracking branch 'origin/cjl' into dev

 screen-api/src/main/java/com/moral/api/entity/Device.java

@@ -146,7 +146,10 @@
    @TableField(exist = false)
    private Version version;


    /*
     * 序号
     * */
    private Integer devNum;


}

 screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java

@@ -62,6 +62,7 @@
        QueryWrapper<Device> wrapper = new QueryWrapper();
        wrapper.eq("monitor_point_id", monitorPointId);
        wrapper.eq("is_delete", Constants.NOT_DELETE);
        wrapper.orderByAsc("dev_num");
        return deviceMapper.selectList(wrapper);
    }


 screen-api/src/main/resources/mapper/DeviceMapper.xml

@@ -26,6 +26,7 @@
        <result column="is_delete" property="isDelete"/>
        <result column="extend" property="extend"/>
        <result column="town_code" property="townCode"/>
        <result column="dev_num" property="devNum"/>
    </resultMap>

    <!--监测因子趋势图数据-->

 screen-common/src/main/java/com/moral/constant/RedisConstants.java

@@ -104,4 +104,5 @@
    public static final String AQI_ANNOUNCEMENT = "aqi_announcement";


    public static final String DATE_CHANG_SHU = "date_changshu";
}

 screen-job/pom.xml

@@ -19,6 +19,11 @@
            <optional>true</optional>
        </dependency>
        <dependency>
            <groupId>commons-httpclient</groupId>
            <artifactId>commons-httpclient</artifactId>
            <version>3.1</version>
        </dependency>
        <dependency>
            <groupId>org.moral</groupId>
            <artifactId>screen-common</artifactId>
            <version>1.0-SNAPSHOT</version>

 screen-job/src/main/java/com/moral/api/config/rest/Crc16Utils.java

New file
@@ -0,0 +1,41 @@
package com.moral.api.config.rest;

public class Crc16Utils {

    public static String crc16_2017(String pushMsg, int usDataLen) {
        int crc_reg=0xFFFF;
        int check;
        for(int i =0; i<usDataLen;i++){
            crc_reg = (crc_reg>>8) ^ pushMsg.charAt(i);
            for(int j =0; j<8; j++){
                check = crc_reg & 0x0001;
                crc_reg >>= 1;
                if(check == 0x0001){
                    crc_reg ^= 0xA001;
                }
            }
        }
        return padLeft(Integer.toHexString(crc_reg).toUpperCase(), 4, "0");
    }

    public static String padLeft(String s, int w, String pc) {
        if (pc == null) {
            pc = "0";
        }
        for (int i = 0, c = w - s.length(); i < c; i++) {
            s = pc + s;
        }
        return s;
    }


    public static String padLeftTest(String s, int w, String pc) {
        if (pc == null) {
            pc = "0";
        }
        for (int i = 0, c = w - s.length(); i < c; i++) {
            s = pc + s;
        }
        return s;
    }
}

 screen-job/src/main/java/com/moral/api/controller/PubController.java

@@ -3,6 +3,7 @@
import com.moral.api.service.HistoryAqiService;
import com.moral.api.service.HistoryDailyService;
import com.moral.api.service.HistoryFiveMinutelyService;
import com.moral.api.service.HistoryHourlyService;
import com.moral.constant.ResultMessage;
import com.moral.util.DateUtils;
import io.swagger.annotations.Api;
@@ -36,6 +37,8 @@

    @Autowired
    private HistoryAqiService historyAqiService;
    @Autowired
    private HistoryHourlyService historyHourlyService;

    @GetMapping("insertHistoryDaily")
    @ApiOperation(value = "天数据补录", notes = "天数据补录")
@@ -67,6 +70,13 @@
        return new ResultMessage();
    }

    @GetMapping("dateToChangShu")
    @ApiOperation(value = "常熟小时数据", notes = "常熟小时数据")
    public ResultMessage dateToChangShu() {
        historyHourlyService.dateToChangShu(null);
        return new ResultMessage();
    }


    public static void main(String[] args) {
        String s = "2023-9-01";

 screen-job/src/main/java/com/moral/api/service/HistoryHourlyService.java

@@ -40,4 +40,8 @@
    //设备小时数据，最大值，最小值，均值统计入表
    void insertHistoryHourlyComplete();


    void dateToChangShu(String time);


}

 screen-job/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java

@@ -1,8 +1,10 @@
package com.moral.api.service.impl;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.config.mybatis.MybatisPlusConfig;
import com.moral.api.config.rest.Crc16Utils;
import com.moral.api.entity.HistoryHourly;
import com.moral.api.entity.Sensor;
import com.moral.api.mapper.HistoryHourlyMapper;
@@ -17,18 +19,23 @@

import com.moral.util.MybatisPLUSUtils;

import lombok.extern.slf4j.Slf4j;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.methods.PostMethod;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;

import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.OptionalDouble;
import java.util.Set;
import java.io.*;
import java.math.BigDecimal;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.SocketAddress;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Supplier;
import java.util.stream.Collectors;
@@ -44,8 +51,11 @@
 * @since 2021-06-28
 */
@Service
@Slf4j
public class HistoryHourlyServiceImpl implements HistoryHourlyService {

    @Value("${result.date.changshu}")
    private String dateChangShu;
    @Autowired
    private HistoryHourlyMapper historyHourlyMapper;

@@ -422,4 +432,117 @@
        }
        return null;
    }

    @Override
    public void dateToChangShu(String time) {
        //获取所有设备小时数据
        Date end = new Date();
        List<String> stringList = Arrays.asList(dateChangShu.split(","));
        String startTime = DateUtils.dateToDateString(DateUtils.addHours(end,-1),DateUtils.yyyy_MM_dd_HH_EN)+":00:00";
        Map<String, Object> prop = new HashMap<>();
        String timeUnits = DateUtils.dateToDateString(end, DateUtils.yyyyMM_EN);
        prop.put("timeUnits", timeUnits);
        prop.put("start", startTime);
        prop.put("end", DateUtils.dateToDateString(end,DateUtils.yyyy_MM_dd_HH_EN)+":00:00");
        prop.put("list", stringList);
        List<Map<String, Object>> dailyData = this.selectDailyData(prop);
        String startTimeStr = DateUtils.dateToDateString(DateUtils.addHours(end,-1),"yyyyMMddHH")+"0000";
        List<String> list = new ArrayList<>();

        for(Map<String, Object> m : dailyData){
            String result = strList(startTimeStr,m.get("mac").toString(),m.get("value").toString());
            list.add(result);
            redisTemplate.opsForHash().delete(RedisConstants.DATE_CHANG_SHU,m.get("mac").toString());
            redisTemplate.opsForHash().put(RedisConstants.DATE_CHANG_SHU,m.get("mac").toString(),result);
        }
        for(String s : list){
            sendSocket("222.92.166.238",15031,s);
        }
        log.info("发送完成");
    }

    private String strList(String startTime,String mn,String msg){
        String qn = "QN="+ startTime + "001;ST=22;CN=2061;PW=123456;MN="+mn.toUpperCase()+";CP=&&DataTime="+startTime+";";
        Map<String, Object> data = JSON.parseObject(msg, Map.class);
        StringBuffer stringBuffer = new StringBuffer();
        if(data.size()>0){
            data.remove("mac");
            data.remove("time");
            for(Map.Entry<String, Object> entry : data.entrySet()){
                String mapKey = entry.getKey();
                Object mapValue = entry.getValue();
                if(mapKey.contains("e")){
                    if(mapKey.contains("a00e12")||mapKey.contains("a00e13")){

                    }else {
                        continue;
                    }

                }
                if(!mapKey.contains("-Flag")){
                    if(mapKey.contains("a34002")||mapKey.contains("a34004")||mapKey.contains("a21026")||mapKey.contains("a21004")||mapKey.contains("a05024")){
                        BigDecimal d = Objects.nonNull(mapValue)? BigDecimal.valueOf(Double.valueOf(mapValue.toString())).divide(BigDecimal.valueOf(1000)):BigDecimal.ZERO;
                       mapValue = d.toString();
                    }
                    if(mapKey.contains("a00e13")){
                        mapKey = "a90085";
                    }
                    stringBuffer.append(mapKey+"-Avg=").append(mapValue+",").append(mapKey+"-Flag=N;");
                }

            }
        }
        stringBuffer.deleteCharAt(stringBuffer.length()-1);
        stringBuffer.append("&&");
        //String result = "QN=20230726160000001;ST=22;CN=2061;PW=123456;MN=P5DND7A0391978;CP=&&DataTime=20230726160000;a21005-Avg=0.03072,a21005-Flag=N;a21004-Avg=20.6,a21004-Flag=N;a21026-Avg=140.43,a21026-Flag=N;a21028-Avg=0.00778,a21028-Flag=N;a21001-Avg=0.13132,a21001-Flag=N;a01001-Avg=38.68,a01001-Flag=N;a05024-Avg=116.27,a05024-Flag=N;a01002-Avg=57.47,a01002-Flag=N;a01007-Avg=0.864,a01007-Flag=N;a01006-Avg=811.918,a01006-Flag=N;a01008-Avg=156.66,a01008-Flag=N;a34002-Avg=9.18,a34002-Flag=N;a34004-Avg=8.1,a34004-Flag=N;a99054-Avg=0.02283,a99054-Flag=N;a31001-Avg=0,a31001-Flag=N&&";

        String result = qn+stringBuffer.toString();

        String s = Crc16Utils.padLeftTest(String.valueOf(result.length()),4,null);
        String s1 = Crc16Utils.crc16_2017(result, result.length());
        return  "##"+s+result+s1+"\r\n";
    }

    private static String sendSocket(String host, Integer port, String message) {
        log.debug("请求地址：{}，端口：{}，报文：{}", host, port, message);
        Socket socket = null;
        OutputStream outputStream = null;
        InputStream inputStream = null;
        BufferedReader bufferedReader = null;
        try {
            socket = new Socket(host, port);
            socket.setSoTimeout(3000);
            // 建立连接后获得输出流
            outputStream = socket.getOutputStream();
            outputStream.write(message.getBytes());
            outputStream.flush();
            socket.shutdownOutput();
            inputStream = socket.getInputStream();
            bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
            String readLen=bufferedReader.readLine();
            log.debug("响应报文：{}", readLen);
            return readLen;
        } catch (IOException e) {
            log.error("socket发送异常：{}", e.toString());
        } finally {
            try {
                    if(bufferedReader != null){
                    bufferedReader.close();
                }
                if (inputStream != null) {
                    inputStream.close();
                }
                if (outputStream != null) {
                    outputStream.close();
                }
                if (socket != null) {
                    socket.close();
                }
            } catch (IOException e) {
                log.error("socket关闭异常：{}", e.toString());
            }
        }
        return null;
    }

}

 screen-job/src/main/java/com/moral/api/task/HistoryTableInsertTask.java

@@ -105,4 +105,15 @@
        }
        return ReturnT.SUCCESS;
    }

    @XxlJob("dateToChangShu")
    public ReturnT dateToChangShu(){
        try {
            historyHourlyService.dateToChangShu(null);
        } catch (Exception e) {
            e.printStackTrace();
            return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
        }
        return ReturnT.SUCCESS;
    }
}

 screen-job/src/main/resources/application-cjl.yml

@@ -106,4 +106,6 @@
      logretentiondays: -1



result:
  date:
    changshu: P5DND7A0245358,P5DND7A0245364,P5DND7A0245413,P5DND7A0245355,P5DND7A0245416,P5DND7A0245426,P5DND7A0245398,P5DND7A0245441,P5DND7A0245429,P5DND7A0245435,P5DND7A0245372,P5DND7A0245397,P5DND7A0245415,P5DND7A0245411,P5DND7A0245407,P5DND7A0245418,P5DND7A0245430,P5DND7A0245493,P5DND7A0245414,P5DND7A0245366,P5DND7A0245442,P5DND7A0245386,P5DND7A0245431,P5DND7A0245394,P5DND7A0245380,P5DND7A0245420,P5DND7A0245440,P5DND7A0245432,P5DND7A0391974,P5DND7A0391989,P5DND7A0245481,P5DND7A0392001,P5DND7A0391991,P5DND7A0391978,P5DND7A0245499

 screen-job/src/main/resources/application-dev.yml

@@ -106,4 +106,7 @@
      logretentiondays: -1


result:
  date:
    changshu: P5DND7A0245358,P5DND7A0245364,P5DND7A0245413,P5DND7A0245355,P5DND7A0245416,P5DND7A0245426,P5DND7A0245398,P5DND7A0245441,P5DND7A0245429,P5DND7A0245435,P5DND7A0245372,P5DND7A0245397,P5DND7A0245415,P5DND7A0245411,P5DND7A0245407,P5DND7A0245418,P5DND7A0245430,P5DND7A0245493,P5DND7A0245414,P5DND7A0245366,P5DND7A0245442,P5DND7A0245386,P5DND7A0245431,P5DND7A0245394,P5DND7A0245380,P5DND7A0245420,P5DND7A0245440,P5DND7A0245432,P5DND7A0391974,P5DND7A0391989,P5DND7A0245481,P5DND7A0392001,P5DND7A0391991,P5DND7A0391978,P5DND7A0245499


 screen-job/src/main/resources/application-qa.yml

@@ -106,5 +106,8 @@
      #执行器日志文件定期清理功能，指定日志保存天数，过期自动删除，最少保存3天否则不生效，-1则不启动。
      logretentiondays: -1

result:
  date:
    changshu: P5DND7A0245358,P5DND7A0245364,P5DND7A0245413,P5DND7A0245355,P5DND7A0245416,P5DND7A0245426,P5DND7A0245398,P5DND7A0245441,P5DND7A0245429,P5DND7A0245435,P5DND7A0245372,P5DND7A0245397,P5DND7A0245415,P5DND7A0245411,P5DND7A0245407,P5DND7A0245418,P5DND7A0245430,P5DND7A0245493,P5DND7A0245414,P5DND7A0245366,P5DND7A0245442,P5DND7A0245386,P5DND7A0245431,P5DND7A0245394,P5DND7A0245380,P5DND7A0245420,P5DND7A0245440,P5DND7A0245432,P5DND7A0391974,P5DND7A0391989,P5DND7A0245481,P5DND7A0392001,P5DND7A0391991,P5DND7A0391978,P5DND7A0245499



 screen-job/src/main/resources/mapper/HistoryHourlyMapper.xml

@@ -40,6 +40,12 @@
        FROM history_hourly_${timeUnits}
        WHERE `time` <![CDATA[>=]]> #{start}
        AND `time` <![CDATA[<]]> #{end}
        <if test="list != null and list.size()!=0">
                and mac in
            <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
    </select>

    <insert id="insertHistoryHourlyComplete">