From 3e6507ba2ff7074d20217fc566c670dee9d2b98e Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Wed, 28 Feb 2024 08:29:44 +0800 Subject: [PATCH] =?UTF-8?q?2024=E5=B9=B42=E6=9C=8828=E6=97=A5=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RefreshLiveServer.java | 15 ++++++++- .../controller/KcZhihuijiaoshiController.java | 12 ++++++- .../KcZhihuijiaoshiStateLogController.java | 32 +++++++++++++++++-- .../kc/jiaoshi/entity/KcZhihuijiaoshi.java | 5 +++ .../entity/KcZhihuijiaoshiStateLog.java | 9 ++++++ 5 files changed, 69 insertions(+), 4 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/RefreshLiveServer.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/RefreshLiveServer.java index ec5613c4..4d91e010 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/RefreshLiveServer.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/RefreshLiveServer.java @@ -171,7 +171,7 @@ public class RefreshLiveServer extends BaseSync { kcZhihuijiaoshiService.update(outUw); } //同步刷新智慧教室设备刷新时间 - refreshState(null); + //refreshState(null); } /** @@ -188,6 +188,14 @@ public class RefreshLiveServer extends BaseSync { qw.eq(StringUtils.isNotBlank(jxlName),"jxl_name",jxlName); List list = kcZhihuijiaoshiService.list(qw); + //查询旧数据（带标志位的） + QueryWrapper qrqw = new QueryWrapper<>(); + qrqw.isNotNull("force_state"); + List KcZhihuijiaoshiStateLogList = kcZhihuijiaoshiStateLogService.list(qrqw); + Map KcZhihuijiaoshiStateLogMap = Maps.newHashMap(); + KcZhihuijiaoshiStateLogList.forEach(x -> KcZhihuijiaoshiStateLogMap.put(x.getJsbh(),x)); + + //删除旧数据 QueryWrapper rqw = new QueryWrapper<>(); rqw.eq(StringUtils.isNotBlank(jxlName),"jxl_name",jxlName); @@ -207,6 +215,10 @@ public class RefreshLiveServer extends BaseSync { stateLogMap.put(x.getJsbh(),_stateLog); stateLog = _stateLog; } + if(KcZhihuijiaoshiStateLogMap.containsKey(x.getJsbh())){ + KcZhihuijiaoshiStateLog log = KcZhihuijiaoshiStateLogMap.get(x.getJsbh()); + stateLog.setForceState(log.getForceState()); + } try{ String res = com.xkcoding.http.HttpUtil.get(x.getPullUrl()); log.info("返回内容：" + res); @@ -227,6 +239,7 @@ public class RefreshLiveServer extends BaseSync { default: } } + }); //重新计算内容 stateLogMap.forEach((k,v) -> { diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiController.java index 758fc0d6..877bd7f6 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiController.java @@ -25,6 +25,7 @@ import org.jeecg.modules.kc.grab.imports.entity.Xxhbjsjbxx; import org.jeecg.modules.kc.grab.imports.service.IXxhbjsjbxxService; import org.jeecg.modules.kc.jiaoshi.entity.KcJiaoxuelouInfo; import org.jeecg.modules.kc.jiaoshi.entity.KcZhihuijiaoshi; +import org.jeecg.modules.kc.jiaoshi.entity.KcZhihuijiaoshiStateLog; import org.jeecg.modules.kc.jiaoshi.service.IKcJiaoxuelouInfoService; import org.jeecg.modules.kc.jiaoshi.service.IKcZhihuijiaoshiService; @@ -94,7 +95,6 @@ public class KcZhihuijiaoshiController extends JeecgController zhihuijiaoshiStateLogList = kcZhihuijiaoshiStateLogService.list(); + Map zhihuijiaoshiStateLogMap = Maps.newHashMap(); + zhihuijiaoshiStateLogList.forEach(x -> zhihuijiaoshiStateLogMap.put(x.getJsbh(),x)); + + //计算哪节在时间范围内 Map jxlMap = Maps.newHashMap(); @@ -251,6 +257,10 @@ public class KcZhihuijiaoshiController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(kcZhihuijiaoshiStateLog, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); + if(StringUtils.isNotBlank(kcZhihuijiaoshiStateLog.getTypeIsBad())){ + queryWrapper.ne("type","green"); + } + if(StringUtils.isNotBlank(kcZhihuijiaoshiStateLog.getForceStateIsBad())){ + queryWrapper.and(x -> x.ne("force_state","green").or().isNull("force_state")); + queryWrapper.apply("( if(force_state is not null,force_state,type) = '" + kcZhihuijiaoshiStateLog.getForceStateIsBad() + "' )"); + } + Page page = new Page<>(pageNo, pageSize); IPage pageList = kcZhihuijiaoshiStateLogService.page(page, queryWrapper); return Result.OK(pageList); } @@ -98,7 +109,24 @@ public class KcZhihuijiaoshiStateLogController extends JeecgController updateByJsId(@RequestBody KcZhihuijiaoshiStateLog kcZhihuijiaoshiStateLog) { + LambdaUpdateWrapper luw = new LambdaUpdateWrapper<>(); + luw.set(KcZhihuijiaoshiStateLog::getForceState, kcZhihuijiaoshiStateLog.getForceState()); + luw.eq(KcZhihuijiaoshiStateLog::getJsbh, kcZhihuijiaoshiStateLog.getJsbh()); + kcZhihuijiaoshiStateLogService.update(luw); + return Result.OK("编辑成功!"); + } + /** * 通过id删除 * diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcZhihuijiaoshi.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcZhihuijiaoshi.java index 6daaf67c..ee6d5ef5 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcZhihuijiaoshi.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcZhihuijiaoshi.java @@ -164,4 +164,9 @@ public class KcZhihuijiaoshi implements Serializable { @TableField(exist = false) private Boolean queryNoZhiHuiJiaoShi; + /**强制状态（green: 直播正常, yellow: 部分异常,red: 设备异常）*/ + @TableField(exist = false) + private java.lang.String forceState; + + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcZhihuijiaoshiStateLog.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcZhihuijiaoshiStateLog.java index 477c125b..4eab83cf 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcZhihuijiaoshiStateLog.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcZhihuijiaoshiStateLog.java @@ -73,6 +73,9 @@ public class KcZhihuijiaoshiStateLog { @Excel(name = "状态指示灯（green: 直播正常, yellow: 部分异常,red: 设备异常）", width = 15) @ApiModelProperty(value = "状态指示灯（green: 直播正常, yellow: 部分异常,red: 设备异常）") private java.lang.String type; + //查找失败的 + @TableField(exist = false) + private java.lang.String typeIsBad; /**创建人*/ @Excel(name = "创建人", width = 15) @ApiModelProperty(value = "创建人") @@ -95,4 +98,10 @@ public class KcZhihuijiaoshiStateLog { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新时间") private java.util.Date updateTime; + /**强制状态（green: 直播正常, yellow: 部分异常,red: 设备异常）*/ + private java.lang.String forceState; + //查找失败的 + @TableField(exist = false) + private java.lang.String forceStateIsBad; + }