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

解决温湿度计抄表操作时间不正确问题（增加8小时）

This commit is contained in:
1378012178@qq.com 2025-10-22 11:14:13 +08:00
parent d91ac19910
commit 9bc06163d5
1 changed files with 171 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,6 +55,7 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
@Lazy @Lazy
@Autowired @Autowired
private HumidDeviceServiceImpl syncImpl; private HumidDeviceServiceImpl syncImpl;
public IPage<HumidDevice> findPage(Page<HumidDevice> page, HumidDevice humidDevice) { public IPage<HumidDevice> findPage(Page<HumidDevice> page, HumidDevice humidDevice) {
return baseMapper.findPage(page, humidDevice); return baseMapper.findPage(page, humidDevice);
} }
@ -98,6 +99,7 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
/** /**
* 更新设备配置参数 * 更新设备配置参数
*
* @param humidDevice * @param humidDevice
* @return * @return
*/ */
@ -109,6 +111,7 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
/** /**
* 获取接口请求参数 * 获取接口请求参数
*
* @param page * @param page
* @param limit * @param limit
* @param humidDevice * @param humidDevice
@ -126,6 +129,7 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
/** /**
* 调用接口更新设备配置参数 * 调用接口更新设备配置参数
*
* @param map * @param map
* @param humidDevice * @param humidDevice
* @return * @return
@ -199,6 +203,7 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
/** /**
* 更新设备实时数据（抄表） * 更新设备实时数据（抄表）
*
* @param humidDevice * @param humidDevice
* @return * @return
*/ */
@ -207,8 +212,10 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
Map<String, Object> params = getRealTimeParmas(0, 50, humidDevice); Map<String, Object> params = getRealTimeParmas(0, 50, humidDevice);
return updateDeviceRealTimeData(params, humidDevice); return updateDeviceRealTimeData(params, humidDevice);
} }
/** /**
* 获取实时数据接口请求参数 * 获取实时数据接口请求参数
*
* @param page * @param page
* @param limit * @param limit
* @param humidDevice * @param humidDevice
@ -228,6 +235,7 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
/** /**
* 调用接口更新设备实时数据（抄表） * 调用接口更新设备实时数据（抄表）
*
* @param map * @param map
* @param humidDevice * @param humidDevice
* @return * @return
@ -255,6 +263,11 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
String reportingTime = json.getStr("date"); String reportingTime = json.getStr("date");
dh.setStatus(status); dh.setStatus(status);
Date reportingDate = DateUtil.parse(reportingTime, "yyyy-MM-dd HH:mm:ss"); Date reportingDate = DateUtil.parse(reportingTime, "yyyy-MM-dd HH:mm:ss");
//需要增加8小时
reportingDate = DateUtil.offsetHour(reportingDate, 8);
reportingTime = DateUtil.format(reportingDate, "yyyy-MM-dd HH:mm:ss");
Calendar ca = Calendar.getInstance(); Calendar ca = Calendar.getInstance();
ca.add(Calendar.MINUTE, -5); ca.add(Calendar.MINUTE, -5);
Date currentDate = ca.getTime(); Date currentDate = ca.getTime();
@ -305,6 +318,7 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
/** /**
* 同步到业务系统 * 同步到业务系统
*
* @param humidDevice * @param humidDevice
*/ */
private void syncStatusMq(HumidDevice humidDevice) { private void syncStatusMq(HumidDevice humidDevice) {
@ -373,6 +387,7 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
/** /**
* 更新温湿度值 * 更新温湿度值
*
* @param humidDevice * @param humidDevice
*/ */
@Override @Override
@ -430,6 +445,7 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
/** /**
* 调用接口获取设备配置参数 * 调用接口获取设备配置参数
*
* @param map * @param map
* @return * @return
*/ */
@ -716,6 +732,7 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
/** /**
* 以设备维度同步温湿度到业务 * 以设备维度同步温湿度到业务
*
* @param list * @param list
* @return * @return
*/ */
@ -985,6 +1002,7 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
baseMapper.updateById(humidDevice); baseMapper.updateById(humidDevice);
syncImpl.syncWeixiu(humidDevice.getDepartServerUrl(), humidDevice); syncImpl.syncWeixiu(humidDevice.getDepartServerUrl(), humidDevice);
} }
@DS("#dataSourceCode") @DS("#dataSourceCode")
public void syncWeixiu(String dataSourceCode, HumidDevice humidDevice) { public void syncWeixiu(String dataSourceCode, HumidDevice humidDevice) {
baseMapper.updateById(humidDevice); baseMapper.updateById(humidDevice);