From a3cfd941f3ccb05906ecbe99e6993f96770b51ed Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 10 七月 2025 10:43:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
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 e5b93ca..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
@@ -2,4 +2,40 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.mdc.mapper.MdcWorkshopInfoMapper">
+
+ <select id="getBigScreenInfo" resultType="org.jeecg.modules.mdc.dto.MdcBigScreenEquipmentDto">
+ SELECT
+ mew.id id,
+ a.EquipmentID equipmentId,
+ me.equipment_name equipmentName,
+ me.equipment_type equipmentType,
+ met.equipment_type_pictures equipmentImage,
+ a.Oporation equipmentStatus,
+ mew.coordinate_left coordinateLeft,
+ mew.coordinate_top coordinateTop,
+ mew.vw vw,
+ mew.vh vh,
+ me.id equId
+ FROM
+ EquipmentLog a
+ INNER JOIN ( SELECT EquipmentID, MAX ( CollectTime ) 'maxgdtime' FROM EquipmentLog GROUP BY EquipmentID ) b ON a.EquipmentID= b.EquipmentID
+ INNER JOIN mdc_workshop_equipment mew ON mew.equipment_id = a.EquipmentID
+ INNER JOIN mdc_equipment me ON me.equipment_id = a.EquipmentID
+ INNER JOIN mdc_equipment_type met ON me.equipment_type = met.equipment_type_name
+ 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
--
Gitblit v1.9.3