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

Compare commits

base: yangjun:91253e70ec9b024aa83947bddafa25d0a677e2eb
Branches Tags
yangjun:master
...
compare: yangjun:e2d4ed4771b8c4135153057bba4327c892b86324
Branches Tags
yangjun:master

2 Commits
91253e70ec ... e2d4ed4771

Author SHA1 Message Date
曹磊 e2d4ed4771 改正BUG 2025-11-18 14:16:55 +08:00
曹磊 e3f1005e9a 物联设备与护理单元同步状态值01改为YN 2025-11-14 15:54:01 +08:00
7 changed files with 30 additions and 29 deletions
Show Stats Expand all files Collapse all files

4
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/controller/NuBaseInfoController.java
View File

@ -147,9 +147,9 @@ public class NuBaseInfoController extends JeecgController<NuBaseInfo, INuBaseInf
}
/**
* 添加
* 同步
*
* @param nuBaseInfo
* @param bi
* @return
*/
@AutoLog(value = "护理单元-同步")

2
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/entity/NuBaseInfo.java
View File

@ -80,7 +80,7 @@ public class NuBaseInfo implements Serializable {
@ApiModelProperty(value = "所属部门")
private java.lang.String sysOrgCode;
/**是否已同步0已同步 1未同步*/
@ApiModelProperty(value = "是否已同步0已同步 1未同步")
@ApiModelProperty(value = "是否已同步Y已同步 N未同步")
@Dict(dicCode = "iz_sync")
private java.lang.String izSync;

2
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/service/impl/NuBaseInfoServiceImpl.java
View File

@ -98,7 +98,7 @@ public class NuBaseInfoServiceImpl extends ServiceImpl<NuBaseInfoMapper, NuBaseI
QueryWrapper<NuBaseInfo> qw = new QueryWrapper<>();
qw.in("id",ids.split(","));
NuBaseInfo nuBaseInfo = new NuBaseInfo();
nuBaseInfo.setIzSync("0");
nuBaseInfo.setIzSync("Y");
baseMapper.update(nuBaseInfo,qw);
}

14
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncbiz/service/impl/SyncBizServiceImpl.java
View File

@ -42,7 +42,7 @@ public class SyncBizServiceImpl extends ServiceImpl<SyncBizMapper, NuBaseInfo> i
String orgCode = nuBaseInfo.getOrgCode();
String orgName = nuBaseInfo.getOrgName();
String type = "更新";
if(nuBaseInfo.getIzSync().equals("0")){
if(nuBaseInfo.getIzSync().equals("N")){
type = "新增";
}
String logId = addLog(orgCode,orgName, JSON.toJSONString(nuBaseInfo),type,"区域");
@ -58,7 +58,7 @@ public class SyncBizServiceImpl extends ServiceImpl<SyncBizMapper, NuBaseInfo> i
for(int i=0;i<cameraList.size();i++){
CameraInfo entity = cameraList.get(i);
String actionType = "更新";
if(entity.getSyncType().equals("0")){
if(entity.getSyncType().equals("N")){
actionType = "新增";
}
String resId = addLog(orgCode,orgName, JSON.toJSONString(entity),actionType,"摄像头");
@ -75,7 +75,7 @@ public class SyncBizServiceImpl extends ServiceImpl<SyncBizMapper, NuBaseInfo> i
for(int i=0;i<capabilityList.size();i++){
CameraCapability entity = capabilityList.get(i);
String actionType = "更新";
if(entity.getSyncType().equals("0")){
if(entity.getSyncType().equals("N")){
actionType = "新增";
}
String resId = addLog(orgCode,orgName, JSON.toJSONString(entity),actionType,"摄像头能力集");
@ -92,7 +92,7 @@ public class SyncBizServiceImpl extends ServiceImpl<SyncBizMapper, NuBaseInfo> i
for(int i=0;i<electricityList.size();i++){
ElectricityMeter entity = electricityList.get(i);
String actionType = "更新";
if(entity.getSyncType().equals("0")){
if(entity.getSyncType().equals("N")){
actionType = "新增";
}
String resId = addLog(orgCode,orgName, JSON.toJSONString(entity),actionType,"电表");
@ -109,7 +109,7 @@ public class SyncBizServiceImpl extends ServiceImpl<SyncBizMapper, NuBaseInfo> i
for(int i=0;i<waterList.size();i++){
WaterMeter entity = waterList.get(i);
String actionType = "更新";
if(entity.getSyncType().equals("0")){
if(entity.getSyncType().equals("N")){
actionType = "新增";
}
String resId = addLog(orgCode,orgName, JSON.toJSONString(entity),actionType,"水表");
@ -126,7 +126,7 @@ public class SyncBizServiceImpl extends ServiceImpl<SyncBizMapper, NuBaseInfo> i
for(int i=0;i<collectorList.size();i++){
EleWaterCollector entity = collectorList.get(i);
String actionType = "更新";
if(entity.getSyncType().equals("0")){
if(entity.getSyncType().equals("N")){
actionType = "新增";
}
String resId = addLog(orgCode,orgName, JSON.toJSONString(entity),actionType,"电水表采集器");
@ -143,7 +143,7 @@ public class SyncBizServiceImpl extends ServiceImpl<SyncBizMapper, NuBaseInfo> i
for(int i=0;i<humidList.size();i++){
HumidDevice entity = humidList.get(i);
String actionType = "更新";
if(entity.getSyncType().equals("0")){
if(entity.getSyncType().equals("N")){
actionType = "新增";
}
String resId = addLog(orgCode,orgName, JSON.toJSONString(entity),actionType,"温湿度计");

1
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml
View File

@ -79,6 +79,7 @@
a.old_server_url ,
a.sync_type
from nu_iot_tq_electricity_meter a
left join nu_iot_tq_collector b on a.cid = b.cid
</select>
<select id="getElectricityMeter" parameterType="com.nu.modules.tq.electricity.entity.ElectricityMeter" resultType="com.nu.modules.tq.electricity.entity.ElectricityMeter">

22
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/weihu/service/impl/DeviceMaintainServiceImpl.java
View File

@ -65,19 +65,19 @@ public class DeviceMaintainServiceImpl extends ServiceImpl<DeviceMaintainMapper,
di.setRemark(remark);
di.setUpdateDate(updateDate);
updateDeviceByType(di);
QueryWrapper<DeviceMaintain> qw = new QueryWrapper<>();
qw.eq("device_id",di.getDeviceId());
DeviceMaintain entity = this.getOne(qw);
if(entity!=null){
entity.setReserveDepartId(reserveDepartId);
entity.setReserveDepartName(reserveDepartName);
entity.setRemark(remark);
entity.setUpdateDate(updateDate);
this.updateById(entity);
}else{
// QueryWrapper<DeviceMaintain> qw = new QueryWrapper<>();
// qw.eq("device_id",di.getDeviceId());
// DeviceMaintain entity = this.getOne(qw);
// if(entity!=null){
// entity.setReserveDepartId(reserveDepartId);
// entity.setReserveDepartName(reserveDepartName);
// entity.setRemark(remark);
// entity.setUpdateDate(updateDate);
// this.updateById(entity);
// }else{
di.setId(null);
this.save(di);
}
// }
}
}

14
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/mq/device/listener/IotDeviceMQListener.java
View File

@ -83,43 +83,43 @@ public class IotDeviceMQListener {
String note = sdto.getNote();
if(note.equals("区域")){
NuBaseInfo nuBaseInfo = new NuBaseInfo();
nuBaseInfo.setIzSync("1");
nuBaseInfo.setIzSync("Y");
nuBaseInfo.setId(bizId);
nuBaseInfoService.updateById(nuBaseInfo);
}
if(note.equals("摄像头")){
CameraInfo cameraInfo = new CameraInfo();
cameraInfo.setSyncType("1");
cameraInfo.setSyncType("Y");
cameraInfo.setId(Integer.valueOf(bizId));
cameraService.updateById(cameraInfo);
}
if(note.equals("摄像头能力集")){
CameraCapability cameraCapability = new CameraCapability();
cameraCapability.setSyncType("1");
cameraCapability.setSyncType("Y");
cameraCapability.setId(Integer.valueOf(bizId));
cameraCapabilityService.updateById(cameraCapability);
}
if(note.equals("电表")){
ElectricityMeter electricityMeter = new ElectricityMeter();
electricityMeter.setSyncType("1");
electricityMeter.setSyncType("Y");
electricityMeter.setId(Integer.valueOf(bizId));
electricityService.updateById(electricityMeter);
}
if(note.equals("水表")){
WaterMeter waterMeter = new WaterMeter();
waterMeter.setSyncType("1");
waterMeter.setSyncType("Y");
waterMeter.setId(Integer.valueOf(bizId));
waterService.updateById(waterMeter);
}
if(note.equals("电水表采集器")){
TqDeviceInfo tqDeviceInfo = new TqDeviceInfo();
tqDeviceInfo.setSyncType("1");
tqDeviceInfo.setSyncType("Y");
tqDeviceInfo.setId(Integer.valueOf(bizId));
collectorService.updateById(tqDeviceInfo);
}
if(note.equals("温湿度计")){
HumidDevice humidDevice = new HumidDevice();
humidDevice.setSyncType("1");
humidDevice.setSyncType("Y");
humidDevice.setId(Integer.valueOf(bizId));
humidDeviceService.updateById(humidDevice);
}