燕山石化溯源三维电子沙盘-【后端】-服务
1
13693261870
2023-05-16 0e8c298a310465190cdbcda830f95a51f09ca0b3
1
已修改2个文件
53 ■■■■ 文件已修改
src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/yssh/utils/CalculateUtils.java 48 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
@@ -330,6 +330,9 @@
        List<MonitorPointPosition> checkPoints = commonService.getCheckPoints3d();
        Long startTime = Long.parseLong(DateUtils.parseDateToStr(DateUtils.YYYYMMDDHH, DateUtils.getMonthStart()));
        Long endTime = Long.parseLong(DateUtils.parseDateToStr(DateUtils.YYYYMMDDHH, DateUtils.getMonthEnd()));
        //startTime = 2023040100L;
        //endTime = 2023043023L;
        List<DictRecord> recordList = dictRecordMapper.selectByTimeDictRecordList(startTime, endTime);
        List<String> tableNames = new ArrayList<>();
@@ -355,8 +358,8 @@
                //map.put("name", commonService.select3dCheckPointById(suYuanId).getName());
                //map.remove("id");
                map.put("name", c.getName());
                result.add(map);
            }
            result.add(map);
        }
        return CalculateUtils.sort(result, "value", true).subList(0, 10);
src/main/java/com/yssh/utils/CalculateUtils.java
@@ -1,10 +1,6 @@
package com.yssh.utils;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.*;
import com.yssh.entity.MonitorPointPosition;
@@ -143,26 +139,30 @@
        Collections.sort(list, new Comparator<Map<String, Object>>(){
            @Override
            public int compare(Map<String, Object> o1, Map<String, Object> o2) {
                Object oo1 = o1.get(property);
                Object oo2 = o2.get(property);
                if(oo1 == null || "null".equals(oo1.toString()) || "".equals(oo1.toString()) || oo1.toString().endsWith("999") ){
                    oo1 = 0;
                try {
                    Object oo1 = o1.get(property);
                    Object oo2 = o2.get(property);
                    if (oo1 == null || "null".equals(oo1.toString()) || "".equals(oo1.toString()) || oo1.toString().endsWith("999")) {
                        oo1 = 0;
                    }
                    if (oo2 == null || "null".equals(oo2.toString()) || "".equals(oo2.toString()) || oo2.toString().endsWith("999")) {
                        oo2 = 0;
                    }
                    if (order) {
                        if (Double.parseDouble(oo1.toString()) < Double.parseDouble(oo2.toString())) {
                            return 1;
                        }
                    } else {
                        if (Double.parseDouble(oo1.toString()) > Double.parseDouble(oo2.toString())) {
                            return 1;
                        }
                    }
                    if (Double.parseDouble(oo1.toString()) == Double.parseDouble(oo2.toString())) {
                        return 0;
                    }
                }catch (Exception ex){
                    System.out.println(ex.getMessage());
                }
                if(oo2 == null || "null".equals(oo2.toString()) || "".equals(oo2.toString()) || oo2.toString().endsWith("999") ){
                    oo2 = 0;
                }
                if(order){
                    if(Double.parseDouble(oo1.toString()) < Double.parseDouble(oo2.toString()) ){
                        return 1;
                    }
                }else{
                    if(Double.parseDouble(oo1.toString()) > Double.parseDouble(oo2.toString()) ){
                        return 1;
                    }
                }
                if(Double.parseDouble(oo1.toString()) == Double.parseDouble(oo2.toString())){
                    return 0;
                }
                return -1;
            }
         });