Administrator
/
FenXiNspJavaMain
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

告警列表增加查询字段

This commit is contained in:
wgx 2026-03-23 17:08:46 +08:00
parent 17d431f6d1
commit c51ed2deb9
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvStationInfoController.java
View File

@ -181,7 +181,8 @@ public class SurvStationInfoController extends JeecgController<SurvStationInfo,
* @return * @return
*/ */
@GetMapping(value = "/getStationList") @GetMapping(value = "/getStationList")
public Result<List<SurvStationInfo>> getStationList(@RequestParam(name = "stationName", required = false) String stationName,@RequestParam(name = "stationType", required = false) String stationType) { public Result<List<SurvStationInfo>> getStationList(@RequestParam(name = "stationName", required = false) String stationName,
@RequestParam(name = "stationType", required = false) String stationType) {
Result<List<SurvStationInfo>> result = new Result<>(); Result<List<SurvStationInfo>> result = new Result<>();
try { try {
Wrapper wraps = Wrappers.<SurvStationInfo>lambdaQuery(); Wrapper wraps = Wrappers.<SurvStationInfo>lambdaQuery();

30
zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvAlertRecord.java
View File

@ -39,15 +39,15 @@ public class SurvAlertRecord implements Serializable {
@ApiModelProperty(value = "主键") @ApiModelProperty(value = "主键")
private String id; private String id;
/**租户号*/ /**租户号*/
@Excel(name = "租户号", width = 15) // @Excel(name = "租户号", width = 15)
@ApiModelProperty(value = "租户号") @ApiModelProperty(value = "租户号")
private String tenantId; private String tenantId;
/**乐观锁*/ /**乐观锁*/
@Excel(name = "乐观锁", width = 15) // @Excel(name = "乐观锁", width = 15)
@ApiModelProperty(value = "乐观锁") @ApiModelProperty(value = "乐观锁")
private Integer reVision; private Integer reVision;
/**创建人*/ /**创建人*/
@Excel(name = "创建人", width = 15) // @Excel(name = "创建人", width = 15)
@ApiModelProperty(value = "创建人") @ApiModelProperty(value = "创建人")
private String createdBy; private String createdBy;
/**创建时间*/ /**创建时间*/
@ -56,38 +56,38 @@ public class SurvAlertRecord implements Serializable {
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
private Date createTime; private Date createTime;
/**更新人*/ /**更新人*/
@Excel(name = "更新人", width = 15) // @Excel(name = "更新人", width = 15)
@ApiModelProperty(value = "更新人") @ApiModelProperty(value = "更新人")
private String updatedBy; private String updatedBy;
/**逻辑删除*/ /**逻辑删除*/
@Excel(name = "逻辑删除", width = 15) // @Excel(name = "逻辑删除", width = 15)
@ApiModelProperty(value = "逻辑删除") @ApiModelProperty(value = "逻辑删除")
private Integer isDel; private Integer isDel;
/**更新时间*/ /**更新时间*/
@Excel(name = "更新时间", width = 15, format = "yyyy-MM-dd") // @Excel(name = "更新时间", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "更新时间") @ApiModelProperty(value = "更新时间")
private Date updatedTime; private Date updatedTime;
/**预警内容*/ /**预警内容*/
@Excel(name = "预警内容", width = 15) // @Excel(name = "预警内容", width = 15)
@ApiModelProperty(value = "预警内容") @ApiModelProperty(value = "预警内容")
@TableField(typeHandler= JsonArrayTypeHandler.class, jdbcType= JdbcType.VARCHAR) @TableField(typeHandler= JsonArrayTypeHandler.class, jdbcType= JdbcType.VARCHAR)
private JSONArray alertContent; private JSONArray alertContent;
/**预警所属单位*/ /**预警所属单位*/
@Excel(name = "预警所属单位", width = 15) // @Excel(name = "预警所属单位", width = 15)
@ApiModelProperty(value = "预警所属单位") @ApiModelProperty(value = "预警所属单位")
private String corpId; private String corpId;
/**预警数据类型;字典值，trans_data_type*/ /**预警数据类型;字典值，trans_data_type*/
@Excel(name = "预警数据类型;字典值，trans_data_type", width = 15) // @Excel(name = "预警数据类型;字典值，trans_data_type", width = 15)
@ApiModelProperty(value = "预警数据类型;字典值，trans_data_type") @ApiModelProperty(value = "预警数据类型;字典值，trans_data_type")
private String alertDtataType; private String alertDtataType;
/**触发预警数据ID*/ /**触发预警数据ID*/
@Excel(name = "触发预警数据ID", width = 15) // @Excel(name = "触发预警数据ID", width = 15)
@ApiModelProperty(value = "触发预警数据ID") @ApiModelProperty(value = "触发预警数据ID")
private String alertDataId; private String alertDataId;
/**推送状态;0=未推送，1=已推送，2=推送失败*/ /**推送状态;0=未推送，1=已推送，2=推送失败*/
@Excel(name = "推送状态;0=未推送，1=已推送，2=推送失败", width = 15) // @Excel(name = "推送状态;0=未推送，1=已推送，2=推送失败", width = 15)
@ApiModelProperty(value = "推送状态;0=未推送，1=已推送，2=推送失败") @ApiModelProperty(value = "推送状态;0=未推送，1=已推送，2=推送失败")
private String pushStatus; private String pushStatus;
/**设备编号*/ /**设备编号*/
@ -129,7 +129,7 @@ public class SurvAlertRecord implements Serializable {
@ApiModelProperty(value = "设备名称") @ApiModelProperty(value = "设备名称")
private String deviceName; private String deviceName;
/**机构名称*/ /**机构名称*/
@Excel(name = "机构名称", width = 15) // @Excel(name = "机构名称", width = 15)
@ApiModelProperty(value = "机构名称") @ApiModelProperty(value = "机构名称")
private String corpName; private String corpName;
/**原始报文*/ /**原始报文*/
@ -147,7 +147,7 @@ public class SurvAlertRecord implements Serializable {
/** /**
* 监测值 * 监测值
*/ */
@Excel(name = "检测值", width = 15) @Excel(name = "监测值", width = 15)
@TableField("SURV_VALUE") @TableField("SURV_VALUE")
private String survValue; private String survValue;
@ -155,14 +155,14 @@ public class SurvAlertRecord implements Serializable {
/** /**
* 监测情况 * 监测情况
*/ */
@Excel(name = "检测情况", width = 15) @Excel(name = "监测情况", width = 15)
@TableField("READ_STATUS") @TableField("READ_STATUS")
private String readStatus; private String readStatus;
/** /**
* 监测单位 * 监测单位
*/ */
@Excel(name = "检测单位", width = 15) @Excel(name = "监测单位", width = 15)
@TableField("SURV_UNIT") @TableField("SURV_UNIT")
private String survUnit; private String survUnit;