From 2a3b269eb026c87a171a002b4a6116593aa0754b Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Sun, 22 Oct 2023 01:58:12 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B410=E6=9C=8822=E6=97=A5=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=83=A8=E5=88=86=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/KcZhihuijiaoshiController.java | 15 +++++++++++++++
 .../kc/jiaoshi/entity/KcJiaoxuelouInfo.java   |  4 ++++
 .../kc/jiaoshi/entity/KcZhihuijiaoshi.java    |  3 +++
 .../entity/KcZhihuijiaoshiAccessLog.java      | 11 +++++++----
 .../entity/KcZhihuijiaoshiOperateLog.java     | 11 +++++++----
 .../kc/kcSysConfig/entity/KcSysConfig.java    | 19 +++++++++++++++++++
 6 files changed, 55 insertions(+), 8 deletions(-)

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 b57c10e5..5b20fbf3 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
@@ -21,7 +21,9 @@ import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.kc.jiaoshi.entity.KcJiaoxuelouInfo;
 import org.jeecg.modules.kc.jiaoshi.entity.KcZhihuijiaoshi;
+import org.jeecg.modules.kc.jiaoshi.service.IKcJiaoxuelouInfoService;
 import org.jeecg.modules.kc.jiaoshi.service.IKcZhihuijiaoshiService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -76,6 +78,9 @@ public class KcZhihuijiaoshiController extends JeecgController<KcZhihuijiaoshi,
 	 @Autowired
 	 private IQuartzJobService quartzJobService;
 
+	 @Autowired
+	 private IKcJiaoxuelouInfoService kcJiaoxuelouInfoService;
+
 	 @Autowired
 	 private DictUtils dictUtils;
 
@@ -116,6 +121,12 @@ public class KcZhihuijiaoshiController extends JeecgController<KcZhihuijiaoshi,
 		ktqw.apply("skrq < DATE_ADD(STR_TO_DATE('"+nowStr+"','%Y-%m-%d'),INTERVAL 1 DAY)");
 		List<KcKetangbiao> kcKetangbiaoList = kcKetangbiaoService.list(ktqw);
 
+		//查询全部的教学楼
+		//QueryWrapper<KcKetangbiao> jxlqw = new QueryWrapper<>();
+		List<KcJiaoxuelouInfo> jiaoxuelouInfoList = kcJiaoxuelouInfoService.list();
+
+		Map<String, KcJiaoxuelouInfo> jiaoxuelouInfoMap = jiaoxuelouInfoList.stream().collect(Collectors.toMap(KcJiaoxuelouInfo::getId,a -> a, (a,b) -> a));
+
 		//下一节次映射表
 		Map<String,String> nextJcMap = Maps.newHashMap();
 		nextJcMap.put("01、02","03、04");
@@ -184,6 +195,10 @@ public class KcZhihuijiaoshiController extends JeecgController<KcZhihuijiaoshi,
 			if(kcKetangbiaoNextSet.contains(x.getJsbh())){
 				x.setNextIsClass(true);
 			}
+			if(jiaoxuelouInfoMap.containsKey(x.getJxlId())){
+				KcJiaoxuelouInfo info = jiaoxuelouInfoMap.get(x.getJxlId());
+				x.setJsNum(StringUtils.defaultString(info.getJsNum(),"0"));
+			}
 		});
 		return Result.OK(pageList);
 	}
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcJiaoxuelouInfo.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcJiaoxuelouInfo.java
index 03950f51..1d41e641 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcJiaoxuelouInfo.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcJiaoxuelouInfo.java
@@ -60,4 +60,8 @@ public class KcJiaoxuelouInfo {
 	@Excel(name = "教学楼名称", width = 15)
     @ApiModelProperty(value = "教学楼名称")
 	private java.lang.String jxlhName;
+	/**教室总数*/
+	@Excel(name = "教室总数", width = 15)
+	@ApiModelProperty(value = "教室总数")
+	private java.lang.String jsNum;
 }
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 6dd4b92f..abe55a59 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
@@ -141,4 +141,7 @@ public class KcZhihuijiaoshi implements Serializable {
     @TableField(exist = false)
     private java.lang.Boolean nextIsClass;
 
+    @TableField(exist = false)
+    private java.lang.String jsNum;
+
 }
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 3b985046..47e422e6 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
@@ -12,6 +12,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
@@ -67,20 +68,22 @@ public class KcZhihuijiaoshiAccessLog {
 	/**创建人*/
 	@ApiModelProperty(value = "创建人")
 	@Excel(name = "创建人", width = 15)
+	@Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
 	private java.lang.String createBy;
 	/**创建时间*/
-	@Excel(name = "创建时间", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+	@Excel(name = "创建时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "创建时间")
 	private java.util.Date createTime;
 	/**更新人*/
 	@Excel(name = "更新人", width = 15)
     @ApiModelProperty(value = "更新人")
+	@Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
 	private java.lang.String updateBy;
 	/**更新时间*/
-	@Excel(name = "更新时间", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+	@Excel(name = "更新时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "更新时间")
 	private java.util.Date updateTime;
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 706055c2..3b670a4c 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
@@ -12,6 +12,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
@@ -71,20 +72,22 @@ public class KcZhihuijiaoshiOperateLog {
 	/**创建人*/
 	@ApiModelProperty(value = "创建人")
 	@Excel(name = "创建人", width = 15)
+	@Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
 	private java.lang.String createBy;
 	/**创建时间*/
-	@Excel(name = "创建时间", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+	@Excel(name = "创建时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "创建时间")
 	private java.util.Date createTime;
 	/**更新人*/
 	@Excel(name = "更新人", width = 15)
     @ApiModelProperty(value = "更新人")
+	@Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
 	private java.lang.String updateBy;
 	/**更新时间*/
-	@Excel(name = "更新时间", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+	@Excel(name = "更新时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "更新时间")
 	private java.util.Date updateTime;
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcSysConfig/entity/KcSysConfig.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcSysConfig/entity/KcSysConfig.java
index 7e48b502..bc75b10e 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcSysConfig/entity/KcSysConfig.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcSysConfig/entity/KcSysConfig.java
@@ -83,9 +83,28 @@ public class KcSysConfig implements Serializable {
 	@Excel(name = "预留字段5", width = 15)
     @ApiModelProperty(value = "预留字段5")
     private java.lang.String flag5;
+	/**预留字段6*/
+	@Excel(name = "预留字段6", width = 15)
+	@ApiModelProperty(value = "预留字段6")
     private java.lang.String flag6;
+	/**预留字段7*/
+	@Excel(name = "预留字段7", width = 15)
+	@ApiModelProperty(value = "预留字段7")
     private java.lang.String flag7;
+	/**预留字段8*/
+	@Excel(name = "预留字段8", width = 15)
+	@ApiModelProperty(value = "预留字段8")
     private java.lang.String flag8;
+	/**线上课堂-说明文字*/
+	@Excel(name = "线上课堂-说明文字", width = 15)
+	@ApiModelProperty(value = "线上课堂-说明文字")
     private java.lang.String xsktTitle;
+	/**今日课堂-说明文字*/
+	@Excel(name = "今日课堂-说明文字", width = 15)
+	@ApiModelProperty(value = "今日课堂-说明文字")
     private java.lang.String jrktTitle;
+	/**智慧教室播放错误提示文字*/
+	@Excel(name = "智慧教室播放错误提示文字", width = 15)
+	@ApiModelProperty(value = "智慧教室播放错误提示文字")
+    private java.lang.String videoPlayErrTitle;
 }