blame | history | patch | commit | commitdiff | ignore whitespace
kaiyu
2021-05-24 52f100ec7860c781c1b44259c6c54b221a30c100 
 screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java


@@ -5,8 +5,10 @@


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import com.moral.api.entity.ManageRole;


import com.moral.api.entity.Sensor;


import com.moral.api.entity.SysDictData;


import com.moral.api.entity.VersionSensorUnit;


import com.moral.api.mapper.SensorMapper;


import com.moral.api.mapper.SysDictDataMapper;


import com.moral.api.mapper.VersionSensorUnitMapper;


import com.moral.api.service.SensorService;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


@@ -47,6 +49,9 @@




    @Autowired(required = false)


    private VersionSensorUnitMapper versionSensorUnitMapper;




    @Autowired(required = false)


    private SysDictDataMapper sysDictDataMapper;




    @Autowired


    LogUtils logUtils;


@@ -188,6 +193,13 @@


            sensorMap.put("createTime",createTime);


            sensorMap.put("updateTime",updateTime);


            sensorMap.put("key",sensor.getId());


            if (sensor.getDefaultUnitKey()!=null&&sensor.getDefaultUnitKey()!=""){


                QueryWrapper<SysDictData> wrapper_VSU = new QueryWrapper();


                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());


            }


            sensorList.add(sensorMap);


        }


        resultMap.put("sensors",sensorList);


@@ -263,6 +275,13 @@


            sensorMap.put("createTime",createTime);


            sensorMap.put("updateTime",updateTime);


            sensorMap.put("key",sensor.getId());


            if (sensor.getDefaultUnitKey()!=null&&sensor.getDefaultUnitKey()!=""){


                QueryWrapper<SysDictData> wrapper_VSU = new QueryWrapper();


                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());


            }


            sensorList.add(sensorMap);


        }


        resultMap.put("sensors",sensorList);