物联设备电表增加日志
This commit is contained in:
parent
82bd9917e6
commit
1dd46d55ed
|
|
@ -19,6 +19,9 @@ import com.nu.modules.syncLog.entity.SyncBizLog;
|
||||||
import com.nu.modules.syncLog.entity.SyncLog;
|
import com.nu.modules.syncLog.entity.SyncLog;
|
||||||
import com.nu.modules.syncLog.service.ISyncBizLogService;
|
import com.nu.modules.syncLog.service.ISyncBizLogService;
|
||||||
import com.nu.modules.syncLog.service.ISyncLogService;
|
import com.nu.modules.syncLog.service.ISyncLogService;
|
||||||
|
import com.nu.modules.tq.common.entity.TqApiLog;
|
||||||
|
import com.nu.modules.tq.common.service.ITqApiLogService;
|
||||||
|
import com.nu.modules.tq.electricity.entity.ElectricityMeter;
|
||||||
import com.nu.modules.tq.water.entity.WaterMeter;
|
import com.nu.modules.tq.water.entity.WaterMeter;
|
||||||
import com.nu.utils.RabbitMQUtil;
|
import com.nu.utils.RabbitMQUtil;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
|
@ -57,6 +60,9 @@ public class DsElectricityMeterServiceImpl extends ServiceImpl<DsElectricityMete
|
||||||
@Autowired
|
@Autowired
|
||||||
private MqttPublisherParams mqttPublisherParams;
|
private MqttPublisherParams mqttPublisherParams;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private ITqApiLogService logService;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IPage<DsElectricityMeter> findPage(Page<DsElectricityMeter> page, DsElectricityMeter dsElectricityMeter){
|
public IPage<DsElectricityMeter> findPage(Page<DsElectricityMeter> page, DsElectricityMeter dsElectricityMeter){
|
||||||
return baseMapper.findPage(page,dsElectricityMeter);
|
return baseMapper.findPage(page,dsElectricityMeter);
|
||||||
|
|
@ -126,10 +132,18 @@ public class DsElectricityMeterServiceImpl extends ServiceImpl<DsElectricityMete
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void eleReset(DsElectricityMeter dsElectricityMeter){
|
public void eleReset(DsElectricityMeter dsElectricityMeter){
|
||||||
|
DsElectricityMeter entity = baseMapper.getElectricityMeter(dsElectricityMeter);
|
||||||
String deviceId = dsElectricityMeter.getSn();
|
String deviceId = dsElectricityMeter.getSn();
|
||||||
MqttMessageHandler.DownlinkMessage message = mqttPublisherParams.getResetParams(deviceId);
|
MqttMessageHandler.DownlinkMessage message = mqttPublisherParams.getResetParams(deviceId);
|
||||||
try {
|
try {
|
||||||
mqttMessageHandler.publishDownlinkMessage(deviceId,message);
|
mqttMessageHandler.publishDownlinkMessage(deviceId,message);
|
||||||
|
TqApiLog tqApiLog = new TqApiLog();
|
||||||
|
tqApiLog.setCid(deviceId);
|
||||||
|
tqApiLog.setType(9);
|
||||||
|
tqApiLog.setRequestValue(entity.getEleValue());
|
||||||
|
tqApiLog.setRequestTime(DateUtil.now());
|
||||||
|
tqApiLog.setRequestStatus("清零中");
|
||||||
|
logService.insert(tqApiLog);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|
@ -141,6 +155,12 @@ public class DsElectricityMeterServiceImpl extends ServiceImpl<DsElectricityMete
|
||||||
MqttMessageHandler.DownlinkMessage message = mqttPublisherParams.getCutOffParams(deviceId);
|
MqttMessageHandler.DownlinkMessage message = mqttPublisherParams.getCutOffParams(deviceId);
|
||||||
try {
|
try {
|
||||||
mqttMessageHandler.publishDownlinkMessage(deviceId,message);
|
mqttMessageHandler.publishDownlinkMessage(deviceId,message);
|
||||||
|
TqApiLog tqApiLog = new TqApiLog();
|
||||||
|
tqApiLog.setCid(deviceId);
|
||||||
|
tqApiLog.setType(10);
|
||||||
|
tqApiLog.setRequestTime(DateUtil.now());
|
||||||
|
tqApiLog.setRequestStatus("拉闸中");
|
||||||
|
logService.insert(tqApiLog);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|
@ -152,6 +172,12 @@ public class DsElectricityMeterServiceImpl extends ServiceImpl<DsElectricityMete
|
||||||
MqttMessageHandler.DownlinkMessage message = mqttPublisherParams.getConnectedParams(deviceId);
|
MqttMessageHandler.DownlinkMessage message = mqttPublisherParams.getConnectedParams(deviceId);
|
||||||
try {
|
try {
|
||||||
mqttMessageHandler.publishDownlinkMessage(deviceId,message);
|
mqttMessageHandler.publishDownlinkMessage(deviceId,message);
|
||||||
|
TqApiLog tqApiLog = new TqApiLog();
|
||||||
|
tqApiLog.setCid(deviceId);
|
||||||
|
tqApiLog.setType(11);
|
||||||
|
tqApiLog.setRequestTime(DateUtil.now());
|
||||||
|
tqApiLog.setRequestStatus("合闸中");
|
||||||
|
logService.insert(tqApiLog);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|
@ -159,10 +185,18 @@ public class DsElectricityMeterServiceImpl extends ServiceImpl<DsElectricityMete
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void eleRead(DsElectricityMeter dsElectricityMeter){
|
public void eleRead(DsElectricityMeter dsElectricityMeter){
|
||||||
|
DsElectricityMeter entity = baseMapper.getElectricityMeter(dsElectricityMeter);
|
||||||
String deviceId = dsElectricityMeter.getSn();
|
String deviceId = dsElectricityMeter.getSn();
|
||||||
MqttMessageHandler.DownlinkMessage message = mqttPublisherParams.getReadingParams(deviceId);
|
MqttMessageHandler.DownlinkMessage message = mqttPublisherParams.getReadingParams(deviceId);
|
||||||
try {
|
try {
|
||||||
mqttMessageHandler.publishDownlinkMessage(deviceId,message);
|
mqttMessageHandler.publishDownlinkMessage(deviceId,message);
|
||||||
|
TqApiLog tqApiLog = new TqApiLog();
|
||||||
|
tqApiLog.setCid(deviceId);
|
||||||
|
tqApiLog.setType(3);
|
||||||
|
tqApiLog.setRequestValue(entity.getEleValue());
|
||||||
|
tqApiLog.setRequestTime(DateUtil.now());
|
||||||
|
tqApiLog.setRequestStatus("抄表中");
|
||||||
|
logService.insert(tqApiLog);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|
@ -197,6 +231,19 @@ public class DsElectricityMeterServiceImpl extends ServiceImpl<DsElectricityMete
|
||||||
entity901.setRelayState(relayState901);
|
entity901.setRelayState(relayState901);
|
||||||
entity901.setReadTime(DateUtil.now());
|
entity901.setReadTime(DateUtil.now());
|
||||||
baseMapper.updateElectricty(entity901);
|
baseMapper.updateElectricty(entity901);
|
||||||
|
|
||||||
|
TqApiLog tqApiLog901 = new TqApiLog();
|
||||||
|
tqApiLog901.setCid(sn);
|
||||||
|
tqApiLog901.setType(3);
|
||||||
|
tqApiLog901.setResolveValue(eleValue901);
|
||||||
|
tqApiLog901.setResolveTime(DateUtil.now());
|
||||||
|
tqApiLog901.setResolveStatus("抄表成功");
|
||||||
|
TqApiLog logEntity901 = logService.getApiLog(tqApiLog901);
|
||||||
|
if (logEntity901 != null) {
|
||||||
|
tqApiLog901.setId(logEntity901.getId());
|
||||||
|
logService.update(tqApiLog901);
|
||||||
|
}
|
||||||
|
|
||||||
syncValueMq(entity901);//抄表同步到业务系统
|
syncValueMq(entity901);//抄表同步到业务系统
|
||||||
break;
|
break;
|
||||||
case "902":
|
case "902":
|
||||||
|
|
@ -209,12 +256,24 @@ public class DsElectricityMeterServiceImpl extends ServiceImpl<DsElectricityMete
|
||||||
// eleRead(dme902);
|
// eleRead(dme902);
|
||||||
DsElectricityMeter entity902 = baseMapper.getElectricityMeter(dme902);
|
DsElectricityMeter entity902 = baseMapper.getElectricityMeter(dme902);
|
||||||
if(entity902!=null){
|
if(entity902!=null){
|
||||||
|
TqApiLog tqApiLog902 = new TqApiLog();
|
||||||
if(entity902.getRelayState().equals("0")){
|
if(entity902.getRelayState().equals("0")){
|
||||||
entity902.setRelayState("1");
|
entity902.setRelayState("1");
|
||||||
|
tqApiLog902.setType(11);
|
||||||
|
tqApiLog902.setResolveStatus("合闸成功");
|
||||||
}else{
|
}else{
|
||||||
entity902.setRelayState("0");
|
entity902.setRelayState("0");
|
||||||
|
tqApiLog902.setType(10);
|
||||||
|
tqApiLog902.setResolveStatus("拉闸成功");
|
||||||
}
|
}
|
||||||
baseMapper.updateRelayState(entity902);
|
baseMapper.updateRelayState(entity902);
|
||||||
|
tqApiLog902.setCid(sn);
|
||||||
|
tqApiLog902.setResolveTime(DateUtil.now());
|
||||||
|
TqApiLog logEntity902 = logService.getApiLog(tqApiLog902);
|
||||||
|
if (logEntity902 != null) {
|
||||||
|
tqApiLog902.setId(logEntity902.getId());
|
||||||
|
logService.update(tqApiLog902);
|
||||||
|
}
|
||||||
syncControlMq(entity902);//开关阀同步到业务系统
|
syncControlMq(entity902);//开关阀同步到业务系统
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -230,6 +289,19 @@ public class DsElectricityMeterServiceImpl extends ServiceImpl<DsElectricityMete
|
||||||
entity904.setEleValue("0");
|
entity904.setEleValue("0");
|
||||||
entity904.setReadTime(DateUtil.now());
|
entity904.setReadTime(DateUtil.now());
|
||||||
baseMapper.updateValue(entity904);
|
baseMapper.updateValue(entity904);
|
||||||
|
|
||||||
|
TqApiLog tqApiLog208 = new TqApiLog();
|
||||||
|
tqApiLog208.setCid(sn);
|
||||||
|
tqApiLog208.setType(9);
|
||||||
|
tqApiLog208.setResolveValue("0");
|
||||||
|
tqApiLog208.setResolveTime(DateUtil.now());
|
||||||
|
tqApiLog208.setResolveStatus("清零成功");
|
||||||
|
TqApiLog logEntity208 = logService.getApiLog(tqApiLog208);
|
||||||
|
if (logEntity208 != null) {
|
||||||
|
tqApiLog208.setId(logEntity208.getId());
|
||||||
|
logService.update(tqApiLog208);
|
||||||
|
}
|
||||||
|
|
||||||
syncCleanMq(entity904);//清零同步到业务系统
|
syncCleanMq(entity904);//清零同步到业务系统
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue