fix:job尘负荷排名修改提交

swb

2024-09-10 9367b86590a9774cd1e4f5d02d9f394605fe6a7f

fix:job尘负荷排名修改提交

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

@@ -13,7 +13,10 @@

    <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
        where mac =#{mac}
        AND `time` <![CDATA[>]]> #{startTime}
        AND `time` <![CDATA[<=]]> #{endTime}
        GROUP BY road ORDER BY avg DESC

    </select>


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

@@ -53,11 +53,10 @@
    public void sort(String startTime, String endTime) {

        if (ObjectUtils.isEmpty(startTime)&&ObjectUtils.isEmpty(endTime)){
            //当前时间的前一个小时
            startTime = DateUtils.getDateStringOfHour(-2, "yyyy-MM-dd HH:00:00");

            //当前时间的前一天
            startTime = DateUtils.getDateStringOfDay(-1, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
            //获取当前时间
            endTime = DateUtils.getCurDate("yyyy-MM-dd HH:00:00");
            endTime = DateUtils.getCurDate(DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
        }
        List<HistorySecondCruiser> result = historySecondCruiserMapper.getResult(startTime, endTime);

@@ -116,7 +115,7 @@
                    secondCruiserSort.setValue(rsAvg);
                    secondCruiserSort.setMac(mac);
                    secondCruiserSort.setOrganizationId(organizationId);
                    secondCruiserSort.setTime(endTime);
                    secondCruiserSort.setTime(startTime);
                    list1.add(secondCruiserSort);
                }
            }