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

修改bug

This commit is contained in:
yangjun 2025-07-31 16:21:53 +08:00
parent f0a4561ed1
commit a4161b39bb
5 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/ApiRequestLogController.java
View File

@ -63,8 +63,14 @@ public class ApiRequestLogController extends JeecgController<ApiRequestLog, IApi
// 自定义多选的查询规则为：LIKE_WITH_OR
customeRuleMap.put("type", QueryRuleEnum.LIKE_WITH_OR);
customeRuleMap.put("requestStatus", QueryRuleEnum.LIKE_WITH_OR);
customeRuleMap.put("resolveStatus", QueryRuleEnum.LIKE_WITH_OR);
QueryWrapper<ApiRequestLog> queryWrapper = QueryGenerator.initQueryWrapper(nuIotTqApiRequestLog, req.getParameterMap(),customeRuleMap);
if(StringUtils.equals("0", nuIotTqApiRequestLog.getParamStatus())){
queryWrapper.like("resolve_status","成功");
}else if(StringUtils.equals("1", nuIotTqApiRequestLog.getParamStatus())){
queryWrapper.apply(" (resolve_status like '%失败%' or resolve_status like '%中%' or resolve_status is null)");
}
queryWrapper.like(StringUtils.isNotBlank(nuIotTqApiRequestLog.getParamsRequestTime()),"request_time",nuIotTqApiRequestLog.getParamsRequestTime());
Page<ApiRequestLog> page = new Page<ApiRequestLog>(pageNo, pageSize);
IPage<ApiRequestLog> pageList = nuIotTqApiRequestLogService.page(page, queryWrapper);
// 获取当前时间

9
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/entity/ApiRequestLog.java
View File

@ -4,6 +4,7 @@ import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@ -95,4 +96,12 @@ public class ApiRequestLog implements Serializable {
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新时间")
private Date updateTime;
@TableField(exist = false)
private String paramStatus;
/**请求时间*/
@TableField(exist = false)
private String paramsRequestTime;
}

12
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/entity/WaterMeter.java
View File

@ -77,6 +77,7 @@ public class WaterMeter implements Serializable {
private String departId;//机构ID
private String departName;//机构名称
private String departServerUrl;//机构服务地址
@TableField(exist = false)
private String orgCode;//机构编码
private String oldServerUrl;//原机构服务地址
private String syncType;//是否同步 0 未同步 1已同步
@ -84,18 +85,29 @@ public class WaterMeter implements Serializable {
private String oldDepartName;//原机构名称
@TableField(exist = false)
private String checkType;
@TableField(exist = false)
private String oldOrgCode;//原机构编码
@Dict(dicCode = "nu_type")
@TableField(exist = false)
private String areaFlag;//区域标签
@TableField(exist = false)
private String viewType;//选择，未选择 用于设备同步功能
@TableField(exist = false)
private String dataType;//数据类型
@TableField(exist = false)
private String sn;//设备号
@TableField(exist = false)
private String deviceName;//设备名称
@TableField(exist = false)
private String status;//状态
@TableField(exist = false)
private String serverType;//服务类型
@TableField(exist = false)
private String oldNuId;//原护理单元ID
@TableField(exist = false)
private String createTime;//时间
@TableField(exist = false)
private List<WaterMeter> seedList;//子列表

2
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/entity/HumidDevice.java
View File

@ -119,5 +119,7 @@ public class HumidDevice implements Serializable {
@TableField(exist = false)
private String checkType;
@TableField(exist = false)
private String paramsRequestTime;
}

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

@ -344,6 +344,9 @@
AND opt_type != 'read'
AND opt_type = #{params.optType}
</if>
<if test="params.paramsRequestTime != null and params.paramsRequestTime != ''">
AND opt_time like concat('%', #{params.paramsRequestTime},'%')
</if>
</where>
order by id desc
</select>