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

修改文字及判断类型

This commit is contained in:
yangjun 2025-06-27 10:28:08 +08:00
parent 229218cc0d
commit 5bb85f603e
2 changed files with 34 additions and 16 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/tq/apiRequestLog/controller/NuIotTqApiRequestLogController.java
View File

@ -84,7 +84,25 @@ public class NuIotTqApiRequestLogController extends JeecgController<NuIotTqApiRe
} }
//如果返回状态为空并且超过了5分钟则返回抄表失败 //如果返回状态为空并且超过了5分钟则返回抄表失败
if(StringUtils.isBlank(par.getResolveStatus()) && fiveMinutesAgo.getTime() > date.getTime()){ if(StringUtils.isBlank(par.getResolveStatus()) && fiveMinutesAgo.getTime() > date.getTime()){
//9清零 3抄表 10电表拉闸 11电表合闸 49水表清零 42水表抄表 43水表开闸 53水表关闸
if(StringUtils.equals("9",par.getType())){
par.setResolveStatus("清零失败");
}else if (StringUtils.equals("3",par.getType())){
par.setResolveStatus("抄表失败"); par.setResolveStatus("抄表失败");
}else if(StringUtils.equals("10",par.getType())){
par.setResolveStatus("拉闸失败");
}else if (StringUtils.equals("11",par.getType())){
par.setResolveStatus("合闸失败");
}else if(StringUtils.equals("49",par.getType())){
par.setResolveStatus("清零失败");
}else if (StringUtils.equals("42",par.getType())){
par.setResolveStatus("抄表失败");
}else if (StringUtils.equals("43",par.getType())){
par.setResolveStatus("开阀失败");
}else if (StringUtils.equals("53",par.getType())){
par.setResolveStatus("关阀失败");
}
//判断返回状态为空并且没有超过了5分钟则返回抄表中 //判断返回状态为空并且没有超过了5分钟则返回抄表中
}else if(StringUtils.isBlank(par.getResolveStatus())){ }else if(StringUtils.isBlank(par.getResolveStatus())){
par.setResolveStatus(par.getRequestStatus()); par.setResolveStatus(par.getRequestStatus());

28
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java
View File

@ -139,7 +139,7 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
} }
/** /**
* 开关闸 * 开关阀
*/ */
@Override @Override
public Result<String> waterControl(WaterMeter waterMeter){ public Result<String> waterControl(WaterMeter waterMeter){
@ -147,9 +147,9 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
WaterMeter entity = baseMapper.getWaterMeter(waterMeter); WaterMeter entity = baseMapper.getWaterMeter(waterMeter);
if(entity == null){ if(entity == null){
if(type.equals(43)){ if(type.equals(43)){
return Result.error("请先同步水表设备信息后再进行开闸"); return Result.error("请先同步水表设备信息后再进行开阀");
}else{ }else{
return Result.error("请先同步水表设备信息后再进行关闸"); return Result.error("请先同步水表设备信息后再进行关阀");
} }
} }
List<Map<String, Object>> req = new ArrayList<>(); List<Map<String, Object>> req = new ArrayList<>();
@ -181,9 +181,9 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
tqApiLog.setRequestTime(DateUtil.now()); tqApiLog.setRequestTime(DateUtil.now());
tqApiLog.setRequestStatus(status); tqApiLog.setRequestStatus(status);
if(type.equals(43)){ if(type.equals(43)){
tqApiLog.setRequestStatus("开闸中"); tqApiLog.setRequestStatus("开阀中");
}else{ }else{
tqApiLog.setRequestStatus("关闸中"); tqApiLog.setRequestStatus("关阀中");
} }
logService.insert(tqApiLog); logService.insert(tqApiLog);
}else{ }else{
@ -195,9 +195,9 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
tqApiLog.setType(waterMeter.getType()); tqApiLog.setType(waterMeter.getType());
tqApiLog.setRequestTime(DateUtil.now()); tqApiLog.setRequestTime(DateUtil.now());
if(type.equals(43)){ if(type.equals(43)){
tqApiLog.setRequestStatus("开闸失败"); tqApiLog.setRequestStatus("开阀失败");
}else{ }else{
tqApiLog.setRequestStatus("关闸失败"); tqApiLog.setRequestStatus("关阀失败");
} }
tqApiLog.setRequestRemark(errorMsg); tqApiLog.setRequestRemark(errorMsg);
logService.insert(tqApiLog); logService.insert(tqApiLog);
@ -212,18 +212,18 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
tqApiLog.setType(waterMeter.getType()); tqApiLog.setType(waterMeter.getType());
tqApiLog.setRequestTime(DateUtil.now()); tqApiLog.setRequestTime(DateUtil.now());
if(type.equals(43)){ if(type.equals(43)){
tqApiLog.setRequestStatus("开闸失败"); tqApiLog.setRequestStatus("开阀失败");
}else{ }else{
tqApiLog.setRequestStatus("关闸失败"); tqApiLog.setRequestStatus("关阀失败");
} }
tqApiLog.setRequestRemark(errorMsg); tqApiLog.setRequestRemark(errorMsg);
logService.insert(tqApiLog); logService.insert(tqApiLog);
return Result.error(errorMsg); return Result.error(errorMsg);
} }
if(type.equals(43)){ if(type.equals(43)){
return Result.OK("开闸成功"); return Result.OK("开阀成功");
}else{ }else{
return Result.OK("关闸成功"); return Result.OK("关阀成功");
} }
} }
@ -349,7 +349,7 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
} }
/** /**
* 开关闸回调通知 * 开关阀回调通知
*/ */
@Override @Override
public String waterControlNotify(String response_content, String timestamp, String sign){ public String waterControlNotify(String response_content, String timestamp, String sign){
@ -373,9 +373,9 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
Integer type = logEntity.getType(); Integer type = logEntity.getType();
String typeStr = ""; String typeStr = "";
if(type.equals(43)){ if(type.equals(43)){
typeStr = "开闸"; typeStr = "开阀";
}else { }else {
typeStr = "关闸"; typeStr = "关阀";
} }
if(status.equals("SUCCESS")){ if(status.equals("SUCCESS")){
tqApiLog.setResolveStatus(typeStr+"成功"); tqApiLog.setResolveStatus(typeStr+"成功");