Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-05-27 2613aafec8343016a565c5e3e9e6b1ad5e6c6bab

 screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java

@@ -142,7 +142,7 @@
                wrapper_Version.eq("sensor_code",oldSensor.getCode());
                wrapper_Version.eq("is_delete","0");
                VersionSensorUnit versionSensorUnit = new VersionSensorUnit();
                versionSensorUnit.setSensorCode(updateSensorMap.get(key).toString());
               // versionSensorUnit.setSensorCode(updateSensorMap.get(key).toString());
                versionSensorUnitMapper.update(versionSensorUnit,wrapper_Version);
                content = content+"编号:"+oldSensor.getCode()+"->"+updateSensorMap.get(key)+";";
            }
@@ -176,11 +176,13 @@
        QueryWrapper<Sensor> wrapper = new QueryWrapper();
        wrapper.eq("is_delete",0);
        int totleNum = sensorMapper.selectCount(wrapper);
        String orderType = map.get("orderType").toString();
        if (orderType.equals(Constants.ORDER_ASC)){
            wrapper.orderByAsc("create_time");
        }else {
            wrapper.orderByDesc("create_time");
        if (!ObjectUtils.isEmpty(map.get("orderType"))){
            String orderType = map.get("orderType").toString();
            if (orderType.equals(Constants.ORDER_DESC)){
                wrapper.orderByDesc("create_time");
            }else {
                wrapper.orderByAsc("create_time");
            }
        }
        Page resultPage = sensorMapper.selectPage(page,wrapper);
        List<Sensor> sensors = resultPage.getRecords();
@@ -198,7 +200,9 @@
                wrapper_VSU.eq("is_delete",0);
                wrapper_VSU.eq("dataKey",sensor.getDefaultUnitKey());
                wrapper_VSU.eq("dict_type_id",14);
                sensorMap.put("default_unit_key",sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
                if (!ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU))&&!ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU).getDataValue())){
                    sensorMap.put("default_unit_key",sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
                }
            }
            sensorList.add(sensorMap);
        }