yangjun
/
hldy_yunwei_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

物联设备设备维度字段从字典表获取

This commit is contained in:
曹磊 2026-03-17 14:03:55 +08:00
parent 0affb1a233
commit 459176f20a
12 changed files with 77 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/dingshuo/electricity/mapper/DsElectricityMeterMapper.java
View File

@ -25,4 +25,5 @@ public interface DsElectricityMeterMapper extends BaseMapper<DsElectricityMeter>
IPage<DsElectricityMeter> findSyncLogMainPage(Page<DsElectricityMeter> page, @Param("params") DsElectricityMeter DsElectricityMeter);
List<DsElectricityMeter> findSyncLogSeedList(DsElectricityMeter DsElectricityMeter);
IPage<DsElectricityMeter> findNuSyncPage(Page<DsElectricityMeter> page, @Param("params") DsElectricityMeter DsElectricityMeter);
DsElectricityMeter getDimension(DsElectricityMeter dsElectricityMeter);
}

12
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/dingshuo/electricity/mapper/xml/DsElectricityMeterMapper.xml
View File

@ -108,7 +108,7 @@
#{sn},
#{remark},
'N',
'区域维度',
#{dimension},
now(),
'0'
)
@ -345,4 +345,14 @@
order by a.nu_id
</select>
<select id="getDimension" parameterType="com.nu.modules.dingshuo.electricity.entity.DsElectricityMeter" resultType="com.nu.modules.dingshuo.electricity.entity.DsElectricityMeter">
select
b.description as dimension
from sys_dict a
inner join sys_dict_item b on a.id = b.dict_id
where a.dict_code = 'tplink_device_type'
and b.item_value = 'db'
limit 1
</select>
</mapper>

2
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/dingshuo/electricity/service/impl/DsElectricityMeterServiceImpl.java
View File

@ -71,6 +71,8 @@ public class DsElectricityMeterServiceImpl extends ServiceImpl<DsElectricityMete
@Override
public Result<?> add(DsElectricityMeter dsElectricityMeter){
DsElectricityMeter entity = baseMapper.getElectricityMeter(dsElectricityMeter);
DsElectricityMeter dict = baseMapper.getDimension(null);
dsElectricityMeter.setDimension(dict.getDimension());
if(entity!=null){
if(entity.getDelFlag().equals("0")){
return Result.error("添加失败，设备已存在！");

1
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/CameraInfoMapper.java
View File

@ -46,4 +46,5 @@ public interface CameraInfoMapper extends BaseMapper<CameraInfo> {
IPage<CameraInfo> findSyncLogMainPage(Page<CameraInfo> page,@Param("params") CameraInfo cameraInfo);
List<CameraInfo> findSyncLogSeedList(CameraInfo cameraInfo);
IPage<CameraInfo> findNuSyncPage(Page<CameraInfo> page,@Param("params") CameraInfo cameraInfo);
CameraInfo getDimension(CameraInfo cameraInfo);
}

11
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml
View File

@ -632,4 +632,15 @@
order by a.nu_id
</select>
<select id="getDimension" parameterType="com.nu.modules.tplink.camera.entity.CameraInfo" resultType="com.nu.modules.tplink.camera.entity.CameraInfo">
select
b.item_value as deviceType,
b.description as dimension
from sys_dict a
inner join sys_dict_item b on a.id = b.dict_id
where a.dict_code = 'tplink_device_type'
and b.item_value = #{deviceType}
limit 1
</select>
</mapper>

35
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java
View File

@ -198,11 +198,13 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
String channel = extend.getStr("channel");
cameraInfo.setChannel(channel);
}
CameraInfo dict = baseMapper.getDimension(cameraInfo);
cameraInfo.setDimension(dict.getDimension());
CameraInfo entity = baseMapper.getByDeviceId(cameraInfo);
if(entity==null){
//新增
cameraInfo.setIzAllocate("N");
cameraInfo.setDimension("机构维度");
if(cameraInfo.getDeviceType().equals("SURVEILLANCECAMERA")) {
TumsConfig tumsConfig = tumsConfigMapper.getByCode();
cameraInfo.setFtpIp(tumsConfig.getFtpIp());
@ -210,7 +212,6 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
cameraInfo.setFtpUsername(tumsConfig.getFtpUsername());
cameraInfo.setFtpPassword(tumsConfig.getFtpPassword());
cameraInfo.setFtpUploadpath(tumsConfig.getFtpUploadpath());
cameraInfo.setDimension("区域维度");
}
baseMapper.insert(cameraInfo);
}else{
@ -434,11 +435,12 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
String channel = extend.getStr("channel");
cameraInfo.setChannel(channel);
}
CameraInfo dict = baseMapper.getDimension(cameraInfo);
cameraInfo.setDimension(dict.getDimension());
CameraInfo entity = baseMapper.getByDeviceId(cameraInfo);
if(entity==null){
//新增
cameraInfo.setIzAllocate("N");
cameraInfo.setDimension("机构维度");
if(cameraInfo.getDeviceType().equals("SURVEILLANCECAMERA")){
TumsConfig tumsConfig = tumsConfigMapper.getByCode();
cameraInfo.setFtpIp(tumsConfig.getFtpIp());
@ -446,7 +448,6 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
cameraInfo.setFtpUsername(tumsConfig.getFtpUsername());
cameraInfo.setFtpPassword(tumsConfig.getFtpPassword());
cameraInfo.setFtpUploadpath(tumsConfig.getFtpUploadpath());
cameraInfo.setDimension("区域维度");
}
baseMapper.insert(cameraInfo);
}else{
@ -3437,22 +3438,22 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
map.put("error", "0");
map.put("error", "0");
String id = cameraInfo.getVideoDevId();
cameraInfo.setDeviceIndex(id);
CameraInfo entity = baseMapper.getByDeviceId(cameraInfo);
String parentId = entity.getParentId();
String channelId = "0";
if(!parentId.equals("0")){
channelId = entity.getChannel();
}
// cameraInfo.setDeviceIndex(id);
// CameraInfo entity = baseMapper.getByDeviceId(cameraInfo);
// String parentId = entity.getParentId();
// String channelId = "0";
// if(!parentId.equals("0")){
// channelId = entity.getChannel();
// }
StringBuffer sb = new StringBuffer();
sb.append("{");
if(!parentId.equals("0")){
// if(!parentId.equals("0")){
// sb.append("\"devId\"").append(":").append("\"").append(parentId).append("\",");
// sb.append("\"videoDeviceIndex\"").append(":").append("\"").append(id).append("\",");
// sb.append("\"channelId\"").append(":").append(channelId);
// }else{
sb.append("\"devId\"").append(":").append("\"").append(id).append("\"");
}else{
sb.append("\"devId\"").append(":").append("\"").append(parentId).append("\",");
sb.append("\"videoDeviceIndex\"").append(":").append("\"").append(id).append("\",");
sb.append("\"channelId\"").append(":").append(channelId);
}
// }
sb.append("}");
String res = tumsApi.getMultitransUrl(sb.toString());
JSONObject jsonObject = new JSONObject(res);

2
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/service/impl/TqDeviceInfoServiceImpl.java
View File

@ -68,6 +68,8 @@ public class TqDeviceInfoServiceImpl extends ServiceImpl<TqDeviceInfoMapper, TqD
waterMeter.setRelayState(relayState);
waterMeter.setBatteryState(batteryState);
waterMeter.setRemark(remark);
WaterMeter dict = waterMeterMapper.getDimension(null);
waterMeter.setDimension(dict.getDimension());
WaterMeter entity = waterMeterMapper.getWaterMeter(waterMeter);
if(entity == null){
if(!isJob){

2
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/WaterMeterMapper.java
View File

@ -32,4 +32,6 @@ public interface WaterMeterMapper extends BaseMapper<WaterMeter> {
List<WaterMeter> findSyncLogSeedList(WaterMeter waterMeter);
IPage<WaterMeter> findNuSyncPage(Page<WaterMeter> page, @Param("params") WaterMeter waterMeter);
WaterMeter getDimension(WaterMeter waterMeter);
}

13
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml
View File

@ -129,7 +129,7 @@
#{batteryState},
#{remark},
'N',
'区域维度',
#{dimension},
now()
)
</insert>
@ -140,6 +140,7 @@
relay_state = #{relayState},
battery_state = #{batteryState},
remark = #{remark},
dimension = #{dimension},
update_time = now()
<where>
<if test="address != null and address != ''">
@ -385,4 +386,14 @@
order by a.nu_id
</select>
<select id="getDimension" parameterType="com.nu.modules.tq.water.entity.WaterMeter" resultType="com.nu.modules.tq.water.entity.WaterMeter">
select
b.description as dimension
from sys_dict a
inner join sys_dict_item b on a.id = b.dict_id
where a.dict_code = 'tplink_device_type'
and b.item_value = 'sb'
limit 1
</select>
</mapper>

1
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/mapper/HumidDeviceMapper.java
View File

@ -32,4 +32,5 @@ public interface HumidDeviceMapper extends BaseMapper<HumidDevice> {
List<HumidDevice> findSyncLogSeedList(HumidDevice humidDevice);
IPage<HumidDevice> findNuSyncPage(Page<HumidDevice> page, @Param("params") HumidDevice humidDevice);
HumidDevice getDimension(HumidDevice humidDevice);
}

13
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/mapper/xml/HumidDeviceMapper.xml
View File

@ -133,7 +133,7 @@
#{sn},
#{timeCode},
#{deviceName},
'区域维度',
#{dimension},
'0',
now()
)
@ -158,6 +158,7 @@
iz_low_battery = #{izLowBattery},
iz_online = #{izOnline},
time_code = #{timeCode},
dimension = #{dimension},
update_time = now()
where sn = #{sn}
</update>
@ -638,5 +639,15 @@
</if>
order by a.nu_id
</select>
<select id="getDimension" parameterType="com.nu.modules.yiweilian.humid.entity.HumidDevice" resultType="com.nu.modules.yiweilian.humid.entity.HumidDevice">
select
b.description as dimension
from sys_dict a
inner join sys_dict_item b on a.id = b.dict_id
where a.dict_code = 'tplink_device_type'
and b.item_value = 'wsdj'
limit 1
</select>
</mapper>

4
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java
View File

@ -74,6 +74,8 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
JSONObject jsonObject = new JSONObject(responseStr);
Integer responseCode = jsonObject.getInt("code");
if (responseCode.equals(10003)) {
HumidDevice dict = baseMapper.getDimension(null);
humidDevice.setDimension(dict.getDimension());
baseMapper.insertDevice(humidDevice);
humidDevice.setOptType("insert");
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@ -468,6 +470,8 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
JSONObject jsonObject = new JSONObject(responseStr);
Integer responseCode = jsonObject.getInt("code");
if (responseCode.equals(0)) {
HumidDevice dict = baseMapper.getDimension(null);
humidDevice.setDimension(dict.getDimension());
baseMapper.updateDevice(humidDevice);
humidDevice.setOptType("update");
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();