riku
2022-07-19 30d46d06fb4153e48df281d3008ed90935b3c06d
1. 新增扬尘监测数据超标情况表
已修改2个文件
已添加4个文件
377 ■■■■■ 文件已修改
src/main/kotlin/cn/flightfeather/supervision/business/storage/StAutoScore.kt 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/kotlin/cn/flightfeather/supervision/business/storage/item/StScoreItem_2.kt 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/kotlin/cn/flightfeather/supervision/domain/ds1/entity/DustDataResult.java 265 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/kotlin/cn/flightfeather/supervision/domain/ds1/mapper/DustDataResultMapper.kt 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/generator/generatorConfig4ds1.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/ds1/DustDataResultMapper.xml 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/kotlin/cn/flightfeather/supervision/business/storage/StAutoScore.kt
@@ -2,6 +2,8 @@
import cn.flightfeather.supervision.business.Info
import cn.flightfeather.supervision.business.ScoreItem
import cn.flightfeather.supervision.business.storage.item.StScoreItem_1
import cn.flightfeather.supervision.business.storage.item.StScoreItem_2
import cn.flightfeather.supervision.common.utils.Constant
import cn.flightfeather.supervision.common.utils.DateUtil
import cn.flightfeather.supervision.common.utils.ExcelUtil
@@ -17,8 +19,6 @@
import tk.mybatis.mapper.entity.Example
import java.io.File
import java.io.FileOutputStream
import java.time.LocalDate
import java.time.LocalDateTime
import java.util.*
import javax.annotation.PostConstruct
import kotlin.math.abs
@@ -30,7 +30,8 @@
 */
@Component
class StAutoScore(
    stScoreItem_1: ScoreItem,
    stScoreItem_1: StScoreItem_1,
    stScoreItem_2: StScoreItem_2,
    var sceneType: Constant.ScenseType = Constant.ScenseType.TYPE1, )
{
    companion object {
@@ -93,6 +94,7 @@
    init {
        itemList.add(stScoreItem_1)
        itemList.add(stScoreItem_2)
    }
    @PostConstruct
src/main/kotlin/cn/flightfeather/supervision/business/storage/item/StScoreItem_2.kt
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,67 @@
package cn.flightfeather.supervision.business.storage.item
import cn.flightfeather.supervision.business.ScoreItem
import cn.flightfeather.supervision.domain.ds1.entity.DustDataResult
import cn.flightfeather.supervision.domain.ds1.entity.Problemlist
import cn.flightfeather.supervision.domain.ds1.mapper.DustDataResultMapper
import cn.flightfeather.supervision.domain.ds1.mapper.ProblemlistMapper
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.stereotype.Component
import tk.mybatis.mapper.entity.Example
import java.time.LocalDateTime
import java.time.ZoneId
import javax.annotation.PostConstruct
/**
 * Date 2022/1/20 16:14
 * Created by feiyu
 */
@Component
class StScoreItem_2:ScoreItem() {
    companion object {
        private lateinit var instance: StScoreItem_2
    }
    @PostConstruct
    fun init() {
        instance = this
    }
    override var id: String = "dCQbQ8ibc6nexiJo"
    override var name: String = "扬尘在线监测数据量级"
    @Autowired
    lateinit var dustDataResultMapper: DustDataResultMapper
    /**
     * æ‰¬å°˜åœ¨çº¿ç›‘测数据量级
     * é€‰é¡¹å¦‚下:
     *      1.监测数据出现单日及以上有效超标
     *      2.监测数据月均值超区域月均值20%以上或数据明显异常
     */
    override fun otherProblem(size: Int): Int? {
        val time = info.subTask?.planstarttime
        val lt = LocalDateTime.ofInstant(time?.toInstant(), ZoneId.systemDefault())
        val st = lt.withDayOfMonth(1).withHour(0).withMinute(0).withSecond(0)
        val et = st.plusMonths(1)
        val r = dustDataResultMapper.selectByExample(Example(DustDataResult::class.java).apply {
            createCriteria().andGreaterThanOrEqualTo("drTime", st)
                .andLessThan("drTime", et)
                .andEqualTo("drSceneId", info.sceneId)
        })
        var result: Int? = null
        r.forEach {
            if (it.drExceedTimes > 0) {
                result = 0
            }
            if (it.drOverAvgPer > 0) {
                result = 1
            }
        }
        return result
    }
}
src/main/kotlin/cn/flightfeather/supervision/domain/ds1/entity/DustDataResult.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,265 @@
package cn.flightfeather.supervision.domain.ds1.entity;
import java.util.Date;
import javax.persistence.*;
@Table(name = "ea_t_dust_data_result")
public class DustDataResult {
    @Id
    @Column(name = "DR_Id")
    private Integer drId;
    /**
     * åœºæ™¯id
     */
    @Column(name = "DR_Scene_Id")
    private String drSceneId;
    /**
     * åœºæ™¯åç§°
     */
    @Column(name = "DR_Scene_Name")
    private Integer drSceneName;
    /**
     * è®°å½•月份
     */
    @Column(name = "DR_Time")
    private Date drTime;
    /**
     * è¶…标次数
     */
    @Column(name = "DR_Exceed_Times")
    private Integer drExceedTimes;
    /**
     * å¹³å‡å€¼
     */
    @Column(name = "DR_Avg")
    private Double drAvg;
    /**
     * æœ€å¤§å€¼
     */
    @Column(name = "DR_Max")
    private Double drMax;
    /**
     * æœ€å°å€¼
     */
    @Column(name = "DR_Min")
    private Double drMin;
    /**
     * è¶…区县均值百分比
     */
    @Column(name = "DR_Over_Avg_Per")
    private Double drOverAvgPer;
    /**
     * æœ‰æ•ˆæ•°æ®æ¡æ•°
     */
    @Column(name = "DR_Data_Num")
    private Integer drDataNum;
    /**
     * æ•°æ®æœ‰æ•ˆçއ
     */
    @Column(name = "DR_Effective_Rate")
    private Double drEffectiveRate;
    /**
     * @return DR_Id
     */
    public Integer getDrId() {
        return drId;
    }
    /**
     * @param drId
     */
    public void setDrId(Integer drId) {
        this.drId = drId;
    }
    /**
     * èŽ·å–åœºæ™¯id
     *
     * @return DR_Scene_Id - åœºæ™¯id
     */
    public String getDrSceneId() {
        return drSceneId;
    }
    /**
     * è®¾ç½®åœºæ™¯id
     *
     * @param drSceneId åœºæ™¯id
     */
    public void setDrSceneId(String drSceneId) {
        this.drSceneId = drSceneId == null ? null : drSceneId.trim();
    }
    /**
     * èŽ·å–åœºæ™¯åç§°
     *
     * @return DR_Scene_Name - åœºæ™¯åç§°
     */
    public Integer getDrSceneName() {
        return drSceneName;
    }
    /**
     * è®¾ç½®åœºæ™¯åç§°
     *
     * @param drSceneName åœºæ™¯åç§°
     */
    public void setDrSceneName(Integer drSceneName) {
        this.drSceneName = drSceneName;
    }
    /**
     * èŽ·å–è®°å½•æœˆä»½
     *
     * @return DR_Time - è®°å½•月份
     */
    public Date getDrTime() {
        return drTime;
    }
    /**
     * è®¾ç½®è®°å½•月份
     *
     * @param drTime è®°å½•月份
     */
    public void setDrTime(Date drTime) {
        this.drTime = drTime;
    }
    /**
     * èŽ·å–è¶…æ ‡æ¬¡æ•°
     *
     * @return DR_Exceed_Times - è¶…标次数
     */
    public Integer getDrExceedTimes() {
        return drExceedTimes;
    }
    /**
     * è®¾ç½®è¶…标次数
     *
     * @param drExceedTimes è¶…标次数
     */
    public void setDrExceedTimes(Integer drExceedTimes) {
        this.drExceedTimes = drExceedTimes;
    }
    /**
     * èŽ·å–å¹³å‡å€¼
     *
     * @return DR_Avg - å¹³å‡å€¼
     */
    public Double getDrAvg() {
        return drAvg;
    }
    /**
     * è®¾ç½®å¹³å‡å€¼
     *
     * @param drAvg å¹³å‡å€¼
     */
    public void setDrAvg(Double drAvg) {
        this.drAvg = drAvg;
    }
    /**
     * èŽ·å–æœ€å¤§å€¼
     *
     * @return DR_Max - æœ€å¤§å€¼
     */
    public Double getDrMax() {
        return drMax;
    }
    /**
     * è®¾ç½®æœ€å¤§å€¼
     *
     * @param drMax æœ€å¤§å€¼
     */
    public void setDrMax(Double drMax) {
        this.drMax = drMax;
    }
    /**
     * èŽ·å–æœ€å°å€¼
     *
     * @return DR_Min - æœ€å°å€¼
     */
    public Double getDrMin() {
        return drMin;
    }
    /**
     * è®¾ç½®æœ€å°å€¼
     *
     * @param drMin æœ€å°å€¼
     */
    public void setDrMin(Double drMin) {
        this.drMin = drMin;
    }
    /**
     * èŽ·å–è¶…åŒºåŽ¿å‡å€¼ç™¾åˆ†æ¯”
     *
     * @return DR_Over_Avg_Per - è¶…区县均值百分比
     */
    public Double getDrOverAvgPer() {
        return drOverAvgPer;
    }
    /**
     * è®¾ç½®è¶…区县均值百分比
     *
     * @param drOverAvgPer è¶…区县均值百分比
     */
    public void setDrOverAvgPer(Double drOverAvgPer) {
        this.drOverAvgPer = drOverAvgPer;
    }
    /**
     * èŽ·å–æœ‰æ•ˆæ•°æ®æ¡æ•°
     *
     * @return DR_Data_Num - æœ‰æ•ˆæ•°æ®æ¡æ•°
     */
    public Integer getDrDataNum() {
        return drDataNum;
    }
    /**
     * è®¾ç½®æœ‰æ•ˆæ•°æ®æ¡æ•°
     *
     * @param drDataNum æœ‰æ•ˆæ•°æ®æ¡æ•°
     */
    public void setDrDataNum(Integer drDataNum) {
        this.drDataNum = drDataNum;
    }
    /**
     * èŽ·å–æ•°æ®æœ‰æ•ˆçŽ‡
     *
     * @return DR_Effective_Rate - æ•°æ®æœ‰æ•ˆçއ
     */
    public Double getDrEffectiveRate() {
        return drEffectiveRate;
    }
    /**
     * è®¾ç½®æ•°æ®æœ‰æ•ˆçއ
     *
     * @param drEffectiveRate æ•°æ®æœ‰æ•ˆçއ
     */
    public void setDrEffectiveRate(Double drEffectiveRate) {
        this.drEffectiveRate = drEffectiveRate;
    }
}
src/main/kotlin/cn/flightfeather/supervision/domain/ds1/mapper/DustDataResultMapper.kt
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
package cn.flightfeather.supervision.domain.ds1.mapper
import cn.flightfeather.supervision.domain.ds1.entity.DustDataResult
import cn.flightfeather.supervision.domain.util.MyMapper
import org.apache.ibatis.annotations.Mapper
@Mapper
interface DustDataResultMapper : MyMapper<DustDataResult>
src/main/resources/generator/generatorConfig4ds1.xml
@@ -4,7 +4,7 @@
        "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
<generatorConfiguration>
    <!-- æ•°æ®åº“驱动:选择你的本地硬盘上面的数据库驱动包-->
    <classPathEntry  location="C:\Users\UPC\.m2\repository\mysql\mysql-connector-java\8.0.21\mysql-connector-java-8.0.21.jar"/>
    <classPathEntry  location="C:\Users\feiyu\.m2\repository\mysql\mysql-connector-java\8.0.21\mysql-connector-java-8.0.21.jar"/>
    <context id="DB2Tables"  targetRuntime="MyBatis3" defaultModelType="flat">
        <!-- TKmybatis配置 -->
        <property name="javaFileEncoding" value="UTF-8"/>
src/main/resources/mapper/ds1/DustDataResultMapper.xml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,27 @@
<?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="cn.flightfeather.supervision.domain.ds1.mapper.DustDataResultMapper" >
  <resultMap id="BaseResultMap" type="cn.flightfeather.supervision.domain.ds1.entity.DustDataResult" >
    <!--
      WARNING - @mbg.generated
    -->
    <id column="DR_Id" property="drId" jdbcType="INTEGER" />
    <result column="DR_Scene_Id" property="drSceneId" jdbcType="VARCHAR" />
    <result column="DR_Scene_Name" property="drSceneName" jdbcType="INTEGER" />
    <result column="DR_Time" property="drTime" jdbcType="DATE" />
    <result column="DR_Exceed_Times" property="drExceedTimes" jdbcType="INTEGER" />
    <result column="DR_Avg" property="drAvg" jdbcType="DOUBLE" />
    <result column="DR_Max" property="drMax" jdbcType="DOUBLE" />
    <result column="DR_Min" property="drMin" jdbcType="DOUBLE" />
    <result column="DR_Over_Avg_Per" property="drOverAvgPer" jdbcType="DOUBLE" />
    <result column="DR_Data_Num" property="drDataNum" jdbcType="INTEGER" />
    <result column="DR_Effective_Rate" property="drEffectiveRate" jdbcType="DOUBLE" />
  </resultMap>
  <sql id="Base_Column_List" >
    <!--
      WARNING - @mbg.generated
    -->
    DR_Id, DR_Scene_Id, DR_Scene_Name, DR_Time, DR_Exceed_Times, DR_Avg, DR_Max, DR_Min,
    DR_Over_Avg_Per, DR_Data_Num, DR_Effective_Rate
  </sql>
</mapper>