From 67622e2d5b6c1e8c0bd39e53fd24b20ba1fcf6c3 Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Thu, 19 Oct 2023 01:03:07 +0800 Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B410=E6=9C=8819=E6=97=A5=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/httpController.java | 21 ++++++++++- .../RefreshLiveServer.java | 37 ++++++++++++++----- .../KcZhihuijiaoshiAccessLogController.java | 33 ++++++++++++++++- .../entity/KcZhihuijiaoshiAccessLog.java | 8 ++++ .../entity/KcZhihuijiaoshiOperateLog.java | 14 +++++-- 5 files changed, 98 insertions(+), 15 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/httpinterface/controller/httpController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/httpinterface/controller/httpController.java index a3665884..080ba7c7 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/httpinterface/controller/httpController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/httpinterface/controller/httpController.java @@ -18,6 +18,8 @@ import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.modules.kc.grab.exports.entity.TBks; import org.jeecg.modules.kc.grab.exports.service.ITBksService; import org.jeecg.modules.kc.jiaoshi.entity.KcZhihuijiaoshi; +import org.jeecg.modules.kc.jiaoshi.entity.KcZhihuijiaoshiOperateLog; +import org.jeecg.modules.kc.jiaoshi.service.IKcZhihuijiaoshiOperateLogService; import org.jeecg.modules.kc.jiaoshi.service.IKcZhihuijiaoshiService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -43,11 +45,14 @@ public class httpController extends JeecgController { @Autowired private IKcZhihuijiaoshiService kcZhihuijiaoshiService; + @Autowired + private IKcZhihuijiaoshiOperateLogService kcZhihuijiaoshiOperateLogService; + @AutoLog(value = "对外部访问接口-通过IDS访问奥威亚接口") @ApiOperation(value="T_BKS-抓取-通过id查询", notes="T_BKS-抓取-通过id查询") @GetMapping(value = "/runAvyApiByIds") public Result runAvyApiByIds(String ids,String type){ - Result res = Result.OK("操作成功"); + Result>> res = Result.OK("操作成功"); List> resultList = Lists.newArrayList(); res.setResult(resultList); if(StringUtils.isNotBlank(ids)){ @@ -57,6 +62,7 @@ public class httpController extends JeecgController { List list = kcZhihuijiaoshiService.list(qw); list.forEach(x -> { + KcZhihuijiaoshiOperateLog operateLog = new KcZhihuijiaoshiOperateLog(); //访问。汇总结果 //http://${ip}/cgi-bin/plat.cgi?action=9&user=${user}&pwsd=${getMd5Str(pwd)}&command=1 String hex = Convert.toHex("live_setParam_enable=" + type, CharsetUtil.CHARSET_UTF_8); @@ -77,15 +83,28 @@ public class httpController extends JeecgController { rm.put("xm",x.getXm()); rm.put("jsmc",x.getJsmc()); rm.put("url",buildUrl); + operateLog.setOperateUrl(buildUrl);//操作URL + operateLog.setJxlId(x.getJxlId());//教学楼ID + operateLog.setJxlName(x.getJxlName());//教学楼名称 + operateLog.setJsbh(x.getJsbh());//教室编号 + operateLog.setJsmc(x.getJsmc());//教室名称 + operateLog.setOperateType(type);//操作类型（打开还是关闭） + operateLog.setLogType(2);//日志类型 + operateLog.setOperateResultType("0");//调用成功还是失败 try{ String resText = HttpUtil.get(buildUrl); log.info("奥威亚返回接口内容：" + resText);//live_setParam_ret=ok rm.put("resText",resText); + operateLog.setOperateResult(resText); // res.setResult(rm); } catch (Exception e){ log.error(e.getMessage(),e); rm.put("resText",e.getMessage()); + operateLog.setOperateResultType("1"); + operateLog.setOperateResult(e.getMessage()); // res.setResult(rm); + }finally { + kcZhihuijiaoshiOperateLogService.save(operateLog); } //解析，决定最后返回结果 }); 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 2b22686d..1e626b97 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 @@ -6,11 +6,12 @@ import cn.hutool.core.util.CharsetUtil; import cn.hutool.crypto.SecureUtil; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.beust.jcommander.internal.Sets; -import com.google.common.collect.Maps; import com.xkcoding.http.HttpUtil; import lombok.extern.slf4j.Slf4j; import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync; import org.jeecg.modules.kc.jiaoshi.entity.KcZhihuijiaoshi; +import org.jeecg.modules.kc.jiaoshi.entity.KcZhihuijiaoshiOperateLog; +import org.jeecg.modules.kc.jiaoshi.service.IKcZhihuijiaoshiOperateLogService; import org.jeecg.modules.kc.jiaoshi.service.IKcZhihuijiaoshiService; import org.quartz.JobExecutionContext; import org.springframework.beans.factory.annotation.Autowired; @@ -25,6 +26,8 @@ public class RefreshLiveServer extends BaseSync { @Autowired private IKcZhihuijiaoshiService kcZhihuijiaoshiService; + @Autowired + private IKcZhihuijiaoshiOperateLogService kcZhihuijiaoshiOperateLogService; /** * 若参数变量名修改 QuartzJobController中也需对应修改 @@ -40,7 +43,7 @@ public class RefreshLiveServer extends BaseSync { /** * 有参定时任务实现 - * @param param + * @param param 执行参数 */ public void run(Map param){ List list = kcZhihuijiaoshiService.list(); @@ -54,6 +57,7 @@ public class RefreshLiveServer extends BaseSync { onList.add(x.getId()); log.info("返回内容：" + res);//live_setParam_ret=ok } catch (Exception e){ + KcZhihuijiaoshiOperateLog operateLog = new KcZhihuijiaoshiOperateLog(); // liveOnMap.put(x.getId(),false); outList.add(x.getId()); log.error(e.getMessage(),e); @@ -73,32 +77,45 @@ public class RefreshLiveServer extends BaseSync { .addQuery("data", hex) .build(); log.info("访问奥威亚接口地址"+buildUrl); - Map rm = Maps.newHashMap(); - rm.put("xm",x.getXm()); - rm.put("jsmc",x.getJsmc()); - rm.put("url",buildUrl); +// Map rm = Maps.newHashMap(); +// rm.put("xm",x.getXm()); +// rm.put("jsmc",x.getJsmc()); +// rm.put("url",buildUrl); + operateLog.setOperateUrl(buildUrl);//操作URL + operateLog.setJxlId(x.getJxlId());//教学楼ID + operateLog.setJxlName(x.getJxlName());//教学楼名称 + operateLog.setJsbh(x.getJsbh());//教室编号 + operateLog.setJsmc(x.getJsmc());//教室名称 + operateLog.setOperateType("1");//操作类型（打开还是关闭） + operateLog.setLogType(2);//日志类型 + operateLog.setOperateResultType("0");//调用成功还是失败 try{ String resText = HttpUtil.get(buildUrl); log.info("奥威亚返回接口内容：" + resText);//live_setParam_ret=ok - rm.put("resText",resText); +// rm.put("resText",resText); + operateLog.setOperateResult(resText); // res.setResult(rm); } catch (Exception e2){ log.error(e2.getMessage(),e2); - rm.put("resText",e2.getMessage()); +// rm.put("resText",e2.getMessage()); + operateLog.setOperateResultType("1"); + operateLog.setOperateResult(e2.getMessage()); // res.setResult(rm); + }finally { + kcZhihuijiaoshiOperateLogService.save(operateLog); } } }); if(!onList.isEmpty()){ - UpdateWrapper onUw = new UpdateWrapper(); + UpdateWrapper onUw = new UpdateWrapper<>(); onUw.set("sfyx",0); onUw.in("id",onList); kcZhihuijiaoshiService.update(onUw); } if(!outList.isEmpty()) { - UpdateWrapper outUw = new UpdateWrapper(); + UpdateWrapper outUw = new UpdateWrapper<>(); outUw.set("sfyx", 1); outUw.in("id", outList); kcZhihuijiaoshiService.update(outUw); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiAccessLogController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiAccessLogController.java index 9171fdb0..d1f4ec00 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiAccessLogController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiAccessLogController.java @@ -8,6 +8,9 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import com.xkcoding.http.HttpUtil; +import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.aspect.annotation.AutoLog; @@ -84,7 +87,35 @@ public class KcZhihuijiaoshiAccessLogController extends JeecgController savePlayLog(@RequestBody KcZhihuijiaoshiAccessLog kcZhihuijiaoshiAccessLog) { + //查询是不是通的， + String playUrl = kcZhihuijiaoshiAccessLog.getPlayUrl(); + kcZhihuijiaoshiAccessLog.setLogType(2);//播放失败 + if(StringUtils.isNotBlank(playUrl)){ + try { + HttpUtil.get(playUrl); + kcZhihuijiaoshiAccessLog.setLogType(1);//成功 + }catch (Exception e){ + kcZhihuijiaoshiAccessLog.setLogType(2);//播放失败 + }finally { + kcZhihuijiaoshiAccessLogService.save(kcZhihuijiaoshiAccessLog); + } + }else{ + kcZhihuijiaoshiAccessLogService.save(kcZhihuijiaoshiAccessLog); + } + return Result.OK("添加成功！"); + } + /** * 编辑 * diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcZhihuijiaoshiAccessLog.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcZhihuijiaoshiAccessLog.java index 5a3e5b0f..3b985046 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcZhihuijiaoshiAccessLog.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcZhihuijiaoshiAccessLog.java @@ -36,6 +36,10 @@ public class KcZhihuijiaoshiAccessLog { @Excel(name = "日志类型（1播放成功，2播放失败）", width = 15) @ApiModelProperty(value = "日志类型（1播放成功，2播放失败）") private java.lang.Integer logType; + /**播放地址*/ + @Excel(name = "播放地址", width = 15) + @ApiModelProperty(value = "播放地址") + private java.lang.String playUrl; /**教学楼编号*/ @Excel(name = "教学楼编号", width = 15) @ApiModelProperty(value = "教学楼编号") @@ -60,6 +64,10 @@ public class KcZhihuijiaoshiAccessLog { @Excel(name = "课堂名称", width = 15) @ApiModelProperty(value = "课堂名称") private java.lang.String ketangbiaoName; + /**创建人*/ + @ApiModelProperty(value = "创建人") + @Excel(name = "创建人", width = 15) + private java.lang.String createBy; /**创建时间*/ @Excel(name = "创建时间", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcZhihuijiaoshiOperateLog.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcZhihuijiaoshiOperateLog.java index 5aae821e..706055c2 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcZhihuijiaoshiOperateLog.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcZhihuijiaoshiOperateLog.java @@ -56,14 +56,22 @@ public class KcZhihuijiaoshiOperateLog { @Excel(name = "操作类型(1开启，0关闭)", width = 15) @ApiModelProperty(value = "操作类型(1开启，0关闭)") private java.lang.String operateType; - /**操作结果*/ - @Excel(name = "操作结果", width = 15) - @ApiModelProperty(value = "操作结果") + /**操作URl*/ + @Excel(name = "操作URl", width = 15) + @ApiModelProperty(value = "操作URl") private java.lang.Object operateUrl; /**操作结果*/ @Excel(name = "操作结果", width = 15) @ApiModelProperty(value = "操作结果") private java.lang.Object operateResult; + /**操作返回类型(0:调用成功，1:调用失败)*/ + @Excel(name = "操作返回类型(0:调用成功，1:调用失败)", width = 15) + @ApiModelProperty(value = "操作返回类型(0:调用成功，1:调用失败)") + private java.lang.String operateResultType; + /**创建人*/ + @ApiModelProperty(value = "创建人") + @Excel(name = "创建人", width = 15) + private java.lang.String createBy; /**创建时间*/ @Excel(name = "创建时间", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")