因子模糊查询修改bug

lizijie

2021-06-17 3c5d56e7e0d210a3da957ada38ae35b44a4c9170

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

@@ -179,9 +179,9 @@
        if (!ObjectUtils.isEmpty(map.get("orderType"))){
            String orderType = map.get("orderType").toString();
            if (orderType.equals(Constants.ORDER_DESC)){
                wrapper.orderByDesc("create_time");
                wrapper.orderByDesc("update_time");
            }else {
                wrapper.orderByAsc("create_time");
                wrapper.orderByAsc("update_time");
            }
        }
        Page resultPage = sensorMapper.selectPage(page,wrapper);
@@ -264,9 +264,9 @@
        int totleNum = sensorMapper.selectCount(wrapper);
        String orderType = map.get("orderType").toString();
        if (orderType.equals(Constants.ORDER_ASC)){
            wrapper.orderByAsc("create_time");
            wrapper.orderByAsc("update_time");
        }else {
            wrapper.orderByDesc("create_time");
            wrapper.orderByDesc("update_time");
        }
        Page resultPage = sensorMapper.selectPage(page,wrapper);
        List<Sensor> sensors = resultPage.getRecords();
@@ -279,7 +279,7 @@
            sensorMap.put("createTime",createTime);
            sensorMap.put("updateTime",updateTime);
            sensorMap.put("key",sensor.getId());
            if (sensor.getDefaultUnitKey()!=null&&sensor.getDefaultUnitKey()!=""){
            if (sensor.getDefaultUnitKey()!=null&&!sensor.getDefaultUnitKey().equals("")){
                QueryWrapper<SysDictData> wrapper_VSU = new QueryWrapper();
                wrapper_VSU.eq("is_delete",0);
                wrapper_VSU.eq("dataKey",sensor.getDefaultUnitKey());