去除数据后多余0

ZhuDongming

2019-08-16 0eed861612485a8559379811c0eedf12ad6542a6

去除数据后多余0

 src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java

@@ -546,23 +546,23 @@
     */

    @Override

    public List<Map<String, Object>> getSensorData(Map<String, Object> parameters) {

        String startTime=parameters.get("startTime").toString();

        Boolean flag=null;

        String startTime = parameters.get("startTime").toString();

        Boolean flag = null;

        try {

            flag = DateUtils.isSameDay(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(startTime), new Date());

        }catch (ParseException e) {

        } catch (ParseException e) {

            e.printStackTrace();

        }

        List<Sensor> sensors=sensorMapper.getSensorsByMac(parameters);

        List<String> sensorKeys=new ArrayList<>();

        for(Sensor sensor:sensors){

        List<Sensor> sensors = sensorMapper.getSensorsByMac(parameters);

        List<String> sensorKeys = new ArrayList<>();

        for (Sensor sensor : sensors) {

            sensorKeys.add(sensor.getSensorKey());

        }

        parameters.put("sensorKeys", sensorKeys);

        List<Map<String, Object>> listMap=null;

        if(flag){

        List<Map<String, Object>> listMap = null;

        if (flag) {

            listMap = historyMapper.getSensorDataToday(parameters);

        }else{

        } else {

            listMap = historyMinutelyMapper.getSensorData(parameters);

        }

        List<Map<String, Object>> listMapNew = new ArrayList<>();

@@ -573,11 +573,7 @@
                for (String key : map.keySet()) {

                    for (Sensor sensor : sensors) {

                        if (sensor.getSensorKey().equals(key)) {

                            if("e79".equals(key)||"e80".equals(key)||"e81".equals(key)){

                                new_map.put(sensor.getDescription(), StringUtils.scientificCountingConversion(map.get(key).toString())+sensor.getUnit());

                            }else{

                                new_map.put(sensor.getDescription(), map.get(key)+sensor.getUnit());

                            }

                            new_map.put(sensor.getDescription(), new BigDecimal(map.get(key).toString()).stripTrailingZeros().toPlainString() + sensor.getUnit());

                        }

                    }

                }

@@ -590,23 +586,23 @@


    @Override

    public List<Map<String, Object>> getSensorDataMin(Map<String, Object> parameters) {

        String startTime=parameters.get("startTime").toString();

        Boolean flag=null;

        String startTime = parameters.get("startTime").toString();

        Boolean flag = null;

        try {

            flag = DateUtils.isSameDay(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(startTime), new Date());

        }catch (ParseException e) {

        } catch (ParseException e) {

            e.printStackTrace();

        }

        List<Sensor> sensors=sensorMapper.getSensorsByMac(parameters);

        List<String> sensorKeys=new ArrayList<>();

        for(Sensor sensor:sensors){

        List<Sensor> sensors = sensorMapper.getSensorsByMac(parameters);

        List<String> sensorKeys = new ArrayList<>();

        for (Sensor sensor : sensors) {

            sensorKeys.add(sensor.getSensorKey());

        }

        parameters.put("sensorKeys", sensorKeys);

        List<Map<String, Object>> listMap=null;

        if(flag){

        List<Map<String, Object>> listMap = null;

        if (flag) {

            listMap = historyMapper.getSensorDataTodayMin(parameters);

        }else{

        } else {

            listMap = historyMinutelyMapper.getSensorDataMin(parameters);

        }

        List<Map<String, Object>> listMapNew = new ArrayList<>();

@@ -617,11 +613,7 @@
                for (String key : map.keySet()) {

                    for (Sensor sensor : sensors) {

                        if (sensor.getSensorKey().equals(key)) {

                            if("e79".equals(key)||"e80".equals(key)||"e81".equals(key)){

                                new_map.put(sensor.getDescription(), StringUtils.scientificCountingConversion(map.get(key).toString().replace("\"", "")));

                            }else{

                                new_map.put(sensor.getDescription(), map.get(key).toString().replace("\"", ""));

                            }

                            new_map.put(sensor.getDescription(), new BigDecimal(map.get(key).toString().replace("\"", "")).stripTrailingZeros().toPlainString());

                        }

                    }

                }

@@ -634,23 +626,23 @@


    @Override

    public List<Map<String, Object>> getSensorDataMax(Map<String, Object> parameters) {

        String startTime=parameters.get("startTime").toString();

        Boolean flag=null;

        String startTime = parameters.get("startTime").toString();

        Boolean flag = null;

        try {

            flag = DateUtils.isSameDay(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(startTime), new Date());

        }catch (ParseException e) {

        } catch (ParseException e) {

            e.printStackTrace();

        }

        List<Sensor> sensors=sensorMapper.getSensorsByMac(parameters);

        List<String> sensorKeys=new ArrayList<>();

        for(Sensor sensor:sensors){

        List<Sensor> sensors = sensorMapper.getSensorsByMac(parameters);

        List<String> sensorKeys = new ArrayList<>();

        for (Sensor sensor : sensors) {

            sensorKeys.add(sensor.getSensorKey());

        }

        parameters.put("sensorKeys", sensorKeys);

        List<Map<String, Object>> listMap=null;

        if(flag){

        List<Map<String, Object>> listMap = null;

        if (flag) {

            listMap = historyMapper.getSensorDataTodayMax(parameters);

        }else{

        } else {

            listMap = historyMinutelyMapper.getSensorDataMax(parameters);

        }

        List<Map<String, Object>> listMapNew = new ArrayList<>();

@@ -661,11 +653,7 @@
                for (String key : map.keySet()) {

                    for (Sensor sensor : sensors) {

                        if (sensor.getSensorKey().equals(key)) {

                            if("e79".equals(key)||"e80".equals(key)||"e81".equals(key)){

                                new_map.put(sensor.getDescription(), StringUtils.scientificCountingConversion(map.get(key).toString().replace("\"", "")));

                            }else{

                                new_map.put(sensor.getDescription(), map.get(key).toString().replace("\"", ""));

                            }

                            new_map.put(sensor.getDescription(), new BigDecimal(map.get(key).toString().replace("\"", "")).stripTrailingZeros().toPlainString());

                        }

                    }

                }