From 947002d9b66b0a57e25f1043340f3c4d9f002f23 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Fri, 14 Jun 2024 16:39:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AiAnalyseHardWareAlarmRecordController.java | 4 ++-- .../xz/entity/EducationConfigWeekVideo.java | 16 +++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareAlarmRecordController.java b/src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareAlarmRecordController.java index 511f3e507..3985a994f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareAlarmRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareAlarmRecordController.java @@ -73,8 +73,8 @@ public class AiAnalyseHardWareAlarmRecordController { @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "body", required = true, dataType = "Integer"), @ApiImplicitParam(name = "qualityRegionId", value = "区域id", paramType = "body", required = false, dataType = "String"), @ApiImplicitParam(name = "enterpriseId", value = "合作单位id", paramType = "body", required = false, dataType = "String"), - @ApiImplicitParam(name = "handleDone", value = "是否处置过", paramType = "body", required = false, dataType = "Boolean"), - @ApiImplicitParam(name = "isPushed", value = "是否推送给承包商", paramType = "body", required = false, dataType = "Integer"), + @ApiImplicitParam(name = "handleDone", value = "1处置过", paramType = "body", required = false, dataType = "Boolean"), + @ApiImplicitParam(name = "isPushed", value = "1推送给承包商", paramType = "body", required = false, dataType = "Integer"), }) @PostMapping(value = "/selectPageList") public Result> queryPageList(@RequestBody Map map) { diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/entity/EducationConfigWeekVideo.java b/src/main/java/com/zhgd/xmgl/modules/xz/entity/EducationConfigWeekVideo.java index a0d65c7df..4c6c204ae 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/entity/EducationConfigWeekVideo.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/entity/EducationConfigWeekVideo.java @@ -42,43 +42,43 @@ public class EducationConfigWeekVideo implements Serializable { */ @Excel(name = "周一配置视频", width = 15) @ApiModelProperty(value = "周一配置视频") - private java.lang.Object mon; + private String mon; /** * 周二配置视频 */ @Excel(name = "周二配置视频", width = 15) @ApiModelProperty(value = "周二配置视频") - private java.lang.Object tues; + private String tues; /** * 周三配置视频 */ @Excel(name = "周三配置视频", width = 15) @ApiModelProperty(value = "周三配置视频") - private java.lang.Object wed; + private String wed; /** * 周四配置视频 */ @Excel(name = "周四配置视频", width = 15) @ApiModelProperty(value = "周四配置视频") - private java.lang.Object thur; + private String thur; /** * 周五配置视频 */ @Excel(name = "周五配置视频", width = 15) @ApiModelProperty(value = "周五配置视频") - private java.lang.Object fri; + private String fri; /** * 周六配置视频 */ @Excel(name = "周六配置视频", width = 15) @ApiModelProperty(value = "周六配置视频") - private java.lang.Object sat; + private String sat; /** * 周日配置视频 */ @Excel(name = "周日配置视频", width = 15) @ApiModelProperty(value = "周日配置视频") - private java.lang.Object sun; + private String sun; /** * 创建时间 */ @@ -95,4 +95,6 @@ public class EducationConfigWeekVideo implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新时间") private java.util.Date updateDate; + @ApiModelProperty(value = "1项目看板2总览大屏3现场大屏") + private Integer type; }