From d29ac80ff9cc861a61bfad83e1985c90706eff2c Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期五, 26 一月 2024 13:47:06 +0800
Subject: [PATCH] 大屏车间管理
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcWorkshopInfoService.java | 7 +++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcWorkshopInfoServiceImpl.java | 10 ++++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcWorkshopInfo.java | 6 ++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcWorkshopInfoMapper.java | 9 +++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java | 6 +++++-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml | 13 +++++++++++++
6 files changed, 50 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java
index d62cdb5..7d2a24c 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java
@@ -8,10 +8,12 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.dto.MdcBigScreenEquipmentDto;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcWorkshopEquipment;
@@ -258,7 +260,9 @@
@ApiOperation(value = "澶у睆杞﹂棿淇℃伅-棣栭〉鑾峰彇澶у睆鍏ュ彛鍒楄〃", notes = "澶у睆杞﹂棿淇℃伅-棣栭〉鑾峰彇澶у睆鍏ュ彛鍒楄〃")
@GetMapping(value = "/getWorkshopList")
public Result<List<MdcWorkshopInfo>> getWorkshopList() {
- List<MdcWorkshopInfo> list = mdcWorkshopInfoService.list();
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ List<MdcWorkshopInfo> list = mdcWorkshopInfoService.listByUser(userId);
return Result.OK(list);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcWorkshopInfo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcWorkshopInfo.java
index 870b590..e9621f3 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcWorkshopInfo.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcWorkshopInfo.java
@@ -45,5 +45,11 @@
@ApiModelProperty(value = "璁惧缂栧彿棰滆壊")
private String equipmentIdColor;
+ /**
+ * 鑿滃崟鏉冮檺缂栫爜锛屼緥濡傦細鈥渟ys:schedule:list,sys:schedule:info鈥�,澶氫釜閫楀彿闅斿紑
+ */
+ @ApiModelProperty(value = "鑿滃崟鏉冮檺缂栫爜")
+ private String perms;
+
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcWorkshopInfoMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcWorkshopInfoMapper.java
index ba8cada..70fbff3 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcWorkshopInfoMapper.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcWorkshopInfoMapper.java
@@ -18,8 +18,17 @@
/**
* 澶у睆淇℃伅
+ *
* @param workshopId
* @return
*/
List<MdcBigScreenEquipmentDto> getBigScreenInfo(@Param("workshopId") String workshopId);
+
+ /**
+ * 澶у睆杞﹂棿鍒楄〃
+ *
+ * @param userId
+ * @return
+ */
+ List<MdcWorkshopInfo> listByUser(@Param("userId") String userId);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml
index f0f340f..e286929 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml
@@ -25,4 +25,17 @@
AND a.CollectTime= b.maxgdtime
AND mew.workshop_id = #{ workshopId }
</select>
+
+ <select id="listByUser" resultType="org.jeecg.modules.mdc.entity.MdcWorkshopInfo">
+ SELECT
+ DISTINCT t1.*
+ FROM
+ mdc_workshop_info t1
+ LEFT JOIN sys_permission t2 ON t1.perms = t2.perms
+ LEFT JOIN sys_role_permission t3 ON t2.id = t3.permission_id
+ LEFT JOIN sys_role t4 ON t4.id = t3.role_id
+ LEFT JOIN sys_user_role t5 ON t5.role_id = t4.id
+ WHERE
+ t5.user_id = #{ userId }
+ </select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcWorkshopInfoService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcWorkshopInfoService.java
index ce53b6c..5bfd91e 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcWorkshopInfoService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcWorkshopInfoService.java
@@ -19,4 +19,11 @@
* 澶у睆淇℃伅
*/
List<MdcBigScreenEquipmentDto> getBigScreenInfo(String workshopId);
+
+ /**
+ * 杞﹂棿澶у睆鍒楄〃
+ * @param userId
+ * @return
+ */
+ List<MdcWorkshopInfo> listByUser(String userId);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcWorkshopInfoServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcWorkshopInfoServiceImpl.java
index c3b18d37..6e7b036 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcWorkshopInfoServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcWorkshopInfoServiceImpl.java
@@ -28,4 +28,14 @@
public List<MdcBigScreenEquipmentDto> getBigScreenInfo(String workshopId) {
return this.baseMapper.getBigScreenInfo(workshopId);
}
+
+ /**
+ * 澶у睆杞﹂棿鍒楄〃
+ * @param userId
+ * @return
+ */
+ @Override
+ public List<MdcWorkshopInfo> listByUser(String userId) {
+ return this.baseMapper.listByUser(userId);
+ }
}
--
Gitblit v1.9.3