swb
2024-07-04 3faca3fc0bb178afd9cf17222bee14e1c8722f6b
fix:尘负荷排名补充提交
1 files added
5 files modified
66 ■■■■ changed files
screen-api/src/main/java/com/moral/api/entity/SecondCruiserSort.java 9 ●●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/mapper/SecondCruiserSortMapper.java 6 ●●●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java 14 ●●●●● patch | view | raw | blame | history
screen-api/src/main/resources/mapper/SecondCruiserSortMapper.xml 20 ●●●●● patch | view | raw | blame | history
screen-job/src/main/java/com/moral/api/entity/SecondCruiserSort.java 6 ●●●● patch | view | raw | blame | history
screen-job/src/main/java/com/moral/api/service/impl/HistorySecondCruiserServiceImpl.java 11 ●●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/entity/SecondCruiserSort.java
@@ -3,8 +3,9 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.moral.util.DateUtils;
/**
 * Description //todo
@@ -41,5 +42,11 @@
     */
    private String  time;
    /**
     * 平均值
     */
    @TableField(exist = false)
    private Double avg;
}
screen-api/src/main/java/com/moral/api/mapper/SecondCruiserSortMapper.java
@@ -1,7 +1,13 @@
package com.moral.api.mapper;
import io.lettuce.core.dynamic.annotation.Param;
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.moral.api.entity.SecondCruiserSort;
public interface SecondCruiserSortMapper extends BaseMapper<SecondCruiserSort> {
    List<SecondCruiserSort> getSort(@Param("mac") String mac, @Param("startTime") String startTime,@Param("endTime") String endTime);
}
screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java
@@ -474,23 +474,21 @@
    @Override
    public List<SecondCruiserSort> sort(String mac, String startTime, String endTime) {
        SysDictData list = sysDictTypeService.listOne(SysDictTypeEnum.SYS_SECOND_CRUISER.getValue(),"dustld");
        String s = DateUtils.stringToDateString(startTime, "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd 00:00:00");
        LambdaQueryWrapper<SecondCruiserSort> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(SecondCruiserSort::getMac,mac);
        wrapper.eq(SecondCruiserSort::getTime,s);
        wrapper.orderByDesc(SecondCruiserSort::getValue);
        List<SecondCruiserSort> secondCruiserSorts = secondCruiserSortMapper.selectList(wrapper);
        List<SecondCruiserSort> secondCruiserSorts = secondCruiserSortMapper.getSort(mac, startTime, endTime);
        //校准尘负荷
        if (!ObjectUtils.isEmpty(secondCruiserSorts)){
            for (SecondCruiserSort secondCruiserSort : secondCruiserSorts) {
                if(list.getDataValue().contains(",")){
                    List<String> resultStr = Arrays.asList(list.getDataValue().split(","));
                    if(resultStr.size() % 2 ==0){
                        secondCruiserSort.setValue(numAvg(resultStr,BigDecimal.valueOf(secondCruiserSort.getValue())).doubleValue());
//                        secondCruiserSort.setAvg(numAvg(resultStr,BigDecimal.valueOf(secondCruiserSort.getAvg())).doubleValue());
                        secondCruiserSort.setAvg((double) Math.round(numAvg(resultStr, BigDecimal.valueOf(secondCruiserSort.getAvg())).doubleValue()));
                    }
                }else {
                    BigDecimal dataValue = Objects.nonNull(list.getDataValue())?BigDecimal.valueOf(Double.parseDouble(list.getDataValue())):BigDecimal.ZERO;
                    secondCruiserSort.setValue(BigDecimal.valueOf(secondCruiserSort.getValue()).add(dataValue).doubleValue());
//                    secondCruiserSort.setAvg(BigDecimal.valueOf(secondCruiserSort.getAvg()).add(dataValue).doubleValue());
                    secondCruiserSort.setAvg((double) Math.round(BigDecimal.valueOf(secondCruiserSort.getAvg()).add(dataValue).doubleValue()));
                }
            }
        }
screen-api/src/main/resources/mapper/SecondCruiserSortMapper.xml
New file
@@ -0,0 +1,20 @@
<?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.moral.api.mapper.SecondCruiserSortMapper">
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.moral.api.entity.SecondCruiserSort">
        <result column="road" property="road"/>
        <result column="time" property="time"/>
        <result column="value" property="value"/>
        <result column="mac" property="mac"/>
        <result column="organization_id" property="organizationId"/>
    </resultMap>
    <select id="getSort" resultType="com.moral.api.entity.SecondCruiserSort">
        select road,avg(value) as "avg",time,mac from second_cruiser_sort
        where mac =#{mac} and time BETWEEN #{startTime} and #{endTime} GROUP BY road ORDER BY avg DESC
    </select>
</mapper>
screen-job/src/main/java/com/moral/api/entity/SecondCruiserSort.java
@@ -42,7 +42,7 @@
    private String  time;
    public SecondCruiserSort() {
        this.time =DateUtils.getDateStringOfDay(-1,"yyyy-MM-dd 00:00:00"); // 构造函数中设置默认值
    }
/*    public SecondCruiserSort() {
        this.time =DateUtils.getDateStringOfDay(-1,"yyyy-MM-dd HH:00:00"); // 构造函数中设置默认值
    }*/
}
screen-job/src/main/java/com/moral/api/service/impl/HistorySecondCruiserServiceImpl.java
@@ -9,7 +9,6 @@
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -21,13 +20,11 @@
import com.moral.api.entity.DustldDTO;
import com.moral.api.entity.HistorySecondCruiser;
import com.moral.api.entity.SecondCruiserSort;
import com.moral.api.entity.SysDictData;
import com.moral.api.mapper.HistorySecondCruiserMapper;
import com.moral.api.mapper.ManageCoordinateDetailMapper;
import com.moral.api.mapper.OrganizationMapper;
import com.moral.api.mapper.SecondCruiserSortMapper;
import com.moral.api.service.HistorySecondCruiserService;
import com.moral.api.service.SysDictTypeService;
import com.moral.util.DateUtils;
/**
@@ -56,10 +53,11 @@
    public void sort(String startTime, String endTime) {
        if (ObjectUtils.isEmpty(startTime)&&ObjectUtils.isEmpty(endTime)){
            //当前时间的前一天
            startTime = DateUtils.getDateStringOfDay(-1, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
            //当前时间的前一个小时
            startTime = DateUtils.getDateStringOfHour(-2, "yyyy-MM-dd HH:00:00");
            //获取当前时间
            endTime = DateUtils.getCurDate(DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
            endTime = DateUtils.getCurDate("yyyy-MM-dd HH:00:00");
        }
        List<HistorySecondCruiser> result = historySecondCruiserMapper.getResult(startTime, endTime);
@@ -118,6 +116,7 @@
                    secondCruiserSort.setValue(rsAvg);
                    secondCruiserSort.setMac(mac);
                    secondCruiserSort.setOrganizationId(organizationId);
                    secondCruiserSort.setTime(startTime);
                    list1.add(secondCruiserSort);
                }
            }