From d56d664164ef76010dfc0eddfc99cded3716e06c Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Thu, 19 Oct 2023 22:43: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=95=99=E5=AE=A4=E5=90=8D=E7=A7=B0=E8=81=94=E5=8A=A8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/KcZhihuijiaoshiController.java | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 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 6888db58..b57c10e5 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
@@ -35,6 +35,7 @@ import org.jeecg.modules.kc.ktgl.entity.KcKetangbiao;
 import org.jeecg.modules.kc.ktgl.service.IKcKetangbiaoService;
 import org.jeecg.modules.quartz.entity.QuartzJob;
 import org.jeecg.modules.quartz.service.IQuartzJobService;
+import org.jeecg.modules.tools.DictUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -75,6 +76,9 @@ public class KcZhihuijiaoshiController extends JeecgController<KcZhihuijiaoshi,
 	 @Autowired
 	 private IQuartzJobService quartzJobService;
 
+	 @Autowired
+	 private DictUtils dictUtils;
+
 	 @Data
 	 public class JieciIntTime {
 		 private Integer ksTime;
@@ -212,9 +216,16 @@ public class KcZhihuijiaoshiController extends JeecgController<KcZhihuijiaoshi,
 	 */
 	@AutoLog(value = "智慧教室-添加")
 	@ApiOperation(value="智慧教室-添加", notes="智慧教室-添加")
-	@RequiresPermissions("jiaoshi:kc_zhihuijiaoshi:add")
+//	@RequiresPermissions("jiaoshi:kc_zhihuijiaoshi:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody KcZhihuijiaoshi kcZhihuijiaoshi) {
+		//补充教学楼名称和教室名称
+		if(StringUtils.isNotBlank(kcZhihuijiaoshi.getJxlId())){
+			kcZhihuijiaoshi.setJxlName(dictUtils.translateDictValue("id","jxlh_name","kc_jiaoxuelou_info",kcZhihuijiaoshi.getJxlId()));
+		}
+		if(StringUtils.isNotBlank(kcZhihuijiaoshi.getJsbh())){
+			kcZhihuijiaoshi.setJsmc(dictUtils.translateDictValue("jsh","jsmc","xxhbjsjbxx",kcZhihuijiaoshi.getJsbh()));
+		}
 		kcZhihuijiaoshiService.save(kcZhihuijiaoshi);
 		return Result.OK("添加成功！");
 	}
@@ -227,9 +238,15 @@ public class KcZhihuijiaoshiController extends JeecgController<KcZhihuijiaoshi,
 	 */
 	@AutoLog(value = "智慧教室-编辑")
 	@ApiOperation(value="智慧教室-编辑", notes="智慧教室-编辑")
-	@RequiresPermissions("jiaoshi:kc_zhihuijiaoshi:edit")
+//	@RequiresPermissions("jiaoshi:kc_zhihuijiaoshi:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody KcZhihuijiaoshi kcZhihuijiaoshi) {
+		if(StringUtils.isNotBlank(kcZhihuijiaoshi.getJxlId())){
+			kcZhihuijiaoshi.setJxlName(dictUtils.translateDictValue("id","jxlh_name","kc_jiaoxuelou_info",kcZhihuijiaoshi.getJxlId()));
+		}
+		if(StringUtils.isNotBlank(kcZhihuijiaoshi.getJsbh())){
+			kcZhihuijiaoshi.setJsmc(dictUtils.translateDictValue("jsh","jsmc","xxhbjsjbxx",kcZhihuijiaoshi.getJsbh()));
+		}
 		kcZhihuijiaoshiService.updateById(kcZhihuijiaoshi);
 		return Result.OK("编辑成功!");
 	}
@@ -242,7 +259,7 @@ public class KcZhihuijiaoshiController extends JeecgController<KcZhihuijiaoshi,
 	 */
 	@AutoLog(value = "智慧教室-通过id删除")
 	@ApiOperation(value="智慧教室-通过id删除", notes="智慧教室-通过id删除")
-	@RequiresPermissions("jiaoshi:kc_zhihuijiaoshi:delete")
+//	@RequiresPermissions("jiaoshi:kc_zhihuijiaoshi:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		kcZhihuijiaoshiService.removeById(id);
@@ -257,7 +274,7 @@ public class KcZhihuijiaoshiController extends JeecgController<KcZhihuijiaoshi,
 	 */
 	@AutoLog(value = "智慧教室-批量删除")
 	@ApiOperation(value="智慧教室-批量删除", notes="智慧教室-批量删除")
-	@RequiresPermissions("jiaoshi:kc_zhihuijiaoshi:deleteBatch")
+//	@RequiresPermissions("jiaoshi:kc_zhihuijiaoshi:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.kcZhihuijiaoshiService.removeByIds(Arrays.asList(ids.split(",")));