1. 新增风险值的查询逻辑；

feiyu02

2023-11-14 8f069a80ed15dd431450f58304513aa3985e62ba

1. 新增风险值的查询逻辑；

 src/main/java/com/flightfeather/monitor/MonitorApplication.java

@@ -18,7 +18,7 @@
        return new ApplicationRunner() {
            @Override
            public void run(ApplicationArguments args) throws Exception {
//                taskController.run();
                taskController.run();
            }
        };
    }

 src/main/java/com/flightfeather/monitor/analysis/dust/RiskAnalysisController.java

ÎļþÒÑɾ³ý

 src/main/java/com/flightfeather/monitor/analysis/dust/RiskAnalysisController.kt

@@ -96,7 +96,7 @@
        dustSiteStatusRep.select(listOf(DeviceStatus.ONLINE, DeviceStatus.STOP)).forEach { s ->
            s?.let {
                taskMonthly?.roundInit(s.mnCode, date)
                val riskValueList = riskValueRep.select(s.mnCode, date)
                val riskValueList = riskValueRep.select(s.mnCode, date, "day")
                taskMonthly?.roundCal(riskValueList)
            }
        }

 src/main/java/com/flightfeather/monitor/controller/dust/RiskValueController.java

@@ -2,16 +2,11 @@


import com.flightfeather.monitor.domain.ds1.entity.RiskValue;
import com.flightfeather.monitor.pojo.AnalysisData;
import com.flightfeather.monitor.pojo.Result;
import com.flightfeather.monitor.service.AnalysisDataService;
import com.flightfeather.monitor.service.RiskAnalysisService;
import com.flightfeather.monitor.service.RiskValueService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@@ -21,13 +16,24 @@
@CrossOrigin
public class RiskValueController {
    @Autowired
    private RiskAnalysisService riskAnalysisService;
    private RiskValueService riskValueService;


    /*根据站点名字（可选值），月份，类型来返回风险值*/
    /**
     * æ ¹æ®ç«™ç‚¹åå­—（可选值），月份，类型来返回风险值
     *
     * @param mnCode
     * @param month
     * @param type
     * @return
     */
    @GetMapping("/month")
    public Result queryRiskDataByMonth(String siteName,String month,String type){
        List<RiskValue> list =riskAnalysisService.queryRiskDataByMonth(siteName,month,type);
    public Result queryRiskDataByMonth(
            @RequestParam String mnCode,
            @RequestParam String month,
            @RequestParam String type
    ) {
        List<RiskValue> list = riskValueService.queryRiskDataByMonth(mnCode, month, type);
        return Result.success(list);
    }
}

 src/main/java/com/flightfeather/monitor/domain/ds1/repository/RiskValueRep.kt

@@ -26,16 +26,27 @@
        }
    }

    /**
     * æ’入列表
     * @param list
     */
    fun insert(list: List<RiskValue>): Int {
        return riskValueMapper.insertList(list)
    }

    fun select(mnCode: String, date: LocalDate): List<RiskValue?> {
    /**
     * æŸ¥è¯¢
     * @param mnCode
     * @param date
     * @param type
     */
    fun select(mnCode: String, date: LocalDate, type: String): List<RiskValue?> {
        val s = date.withDayOfMonth(1).atStartOfDay()
        val e = s.plusMonths(1).minusSeconds(1)
        return riskValueMapper.selectByExample(Example(RiskValue::class.java).apply {
            createCriteria().andEqualTo("mnCode", mnCode)
                .andBetween("lst", s, e)
                .andEqualTo("type", type)
        })
    }
}

 src/main/java/com/flightfeather/monitor/pojo/Result.java

@@ -17,10 +17,12 @@
    public static Result success(){
        return new Result(1,"success",null);
    }

    //查询 æˆåŠŸå“åº”
    public static Result success(Object data){
        return new Result(1,"success",data);
    }

    //失败响应
    public static Result error(String msg){
        return new Result(0,msg,null);

 src/main/java/com/flightfeather/monitor/scheduledtasks/dust/RiskDailyAnalysisTask.kt

@@ -29,6 +29,7 @@
            taskDelay = isTaskDelay(localtime)
            if (!taskDelay) {
                log.info("日风险分析执行")
                riskAnalysisController.init()
                riskAnalysisController.autoRunDaily()
            }
        }

 src/main/java/com/flightfeather/monitor/scheduledtasks/dust/RiskMonthlyAnalysisTask.kt

@@ -23,6 +23,7 @@
            taskDelay = isTaskDelay(localtime)
            if (!taskDelay) {
                log.info("月风险分析执行")
                riskAnalysisController.init()
                riskAnalysisController.autoRunMonthly()
            }
        }

 src/main/java/com/flightfeather/monitor/service/RiskAnalysisService.java

ÎļþÒÑɾ³ý

 src/main/java/com/flightfeather/monitor/service/RiskValueService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
package com.flightfeather.monitor.service;

import com.flightfeather.monitor.domain.ds1.entity.RiskValue;

import java.util.List;

public interface RiskValueService {
    /**
     * æ ¹æ®ç«™ç‚¹åå­—（可选值），月份，类型来返回风险值
     * @param mnCode
     * @param month
     * @param type
     * @return
     */
    List<RiskValue> queryRiskDataByMonth(String mnCode, String month, String type);
}

 src/main/java/com/flightfeather/monitor/service/impl/RiskAnalysisServiceImpl.java

ÎļþÒÑɾ³ý

 src/main/java/com/flightfeather/monitor/service/impl/RiskValueServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,31 @@
package com.flightfeather.monitor.service.impl;

import com.flightfeather.monitor.domain.ds1.entity.RiskValue;
import com.flightfeather.monitor.domain.ds1.mapper.RiskValueMapper;
import com.flightfeather.monitor.domain.ds1.repository.RiskValueRep;
import com.flightfeather.monitor.mapper.RiskAnalysisMapper;
import com.flightfeather.monitor.service.RiskValueService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.time.LocalDate;
import java.util.ArrayList;
import java.util.List;

@Service
public class RiskValueServiceImpl implements RiskValueService {
    @Autowired
    private RiskValueMapper riskValueMapper;
    @Autowired
    private RiskValueRep riskValueRep;

    @Override
    public List<RiskValue> queryRiskDataByMonth(String mnCode, String month, String type) {
        LocalDate date = LocalDate.parse(month);
        if (date != null) {
            return riskValueRep.select(mnCode, date, type);
        } else {
            return new ArrayList<>();
        }
    }
}

 src/main/java/com/flightfeather/monitor/utils/UUIDGenerator.kt

@@ -74,8 +74,8 @@
            return uid.toString()
        }

        private fun toHex(value: Int, length: Int): String {
            var value = value
        private fun toHex(v: Int, length: Int): String {
            var value = v
            val hexDigits = charArrayOf('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F')
            val buffer = StringBuffer(length)
            val shift = length - 1 shl 2

 src/main/resources/application.yml

@@ -2,13 +2,14 @@
  datasource:
    ds1:
      driver-class-name: com.mysql.cj.jdbc.Driver
#      url: jdbc:mysql://localhost:3306/fume
#      username: fume
#      password: fume_feiyu2023
#      ç”Ÿäº§çŽ¯å¢ƒ
      url: jdbc:mysql://localhost:3306/fume
      username: fume
      password: fume_feiyu2023

      url: jdbc:mysql://localhost:3306/qianduan_sql
      username: root
      password: 1234
#      url: jdbc:mysql://localhost:3306/qianduan_sql
#      username: root
#      password: 1234

#      url: jdbc:mysql://localhost:3306/fume
#      username: root

 src/test/java/com/flightfeather/monitor/analysis/dust/RiskAnalysisControllerTest.kt

@@ -1,6 +1,5 @@
package com.flightfeather.monitor.analysis.dust

import com.flightfeather.monitor.utils.DateUtil
import org.junit.Test
import org.junit.jupiter.api.extension.ExtendWith
import org.junit.runner.RunWith
@@ -8,7 +7,6 @@
import org.springframework.boot.test.context.SpringBootTest
import org.springframework.test.context.junit.jupiter.SpringExtension
import org.springframework.test.context.junit4.SpringRunner
import java.time.LocalDate

@RunWith(SpringRunner::class)
@ExtendWith(SpringExtension::class)