装置系统查询接口修改 添加权限

jeecg-module-interlock/src/main/java/org/jeecg/modules/base/controller/InterlockBaseController.java

@@ -18,6 +18,7 @@ import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.system.vo.SelectTreeModel;
 import org.jeecg.modules.base.convert.InterlockBaseConvert;
 import org.jeecg.modules.base.entity.InterlockBase;
+import org.jeecg.modules.base.entity.InterlockBaseLimit;
 import org.jeecg.modules.base.service.IInterlockBaseService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -26,6 +27,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
 import org.jeecg.modules.base.vo.InterlockBaseTreeVO;
+import org.jeecg.modules.interlockSystemLimit.entity.InterlockSystemLimit;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -344,4 +346,14 @@ public class InterlockBaseController extends JeecgController<InterlockBase, IInt
 		return super.importExcel(request, response, InterlockBase.class);
     }
 
+	 /**
+	  * 联锁基础表-普通列表查询
+	  * 添加用户权限
+	  */
+	 @ApiOperation("联锁基础表-普通列表查询")
+	 @GetMapping(value = "/listByUser")
+	 public List<InterlockBaseLimit> listByUser(){
+		 return interlockBaseService.listByUser();
+	 }
+
 }

jeecg-module-interlock/src/main/java/org/jeecg/modules/base/entity/InterlockBaseLimit.java

@@ -0,0 +1,18 @@
+package org.jeecg.modules.base.entity;
+
+import lombok.Data;
+
+/**
+ * ClassName: interlockBasrLimit
+ * Package: org.jeecg.modules.base.entity
+ * Description:
+ *
+ * @Author sl
+ * @Create 2024/7/30 16:40
+ * @Version 1.0
+ */
+@Data
+public class InterlockBaseLimit extends InterlockBase{
+    //装置系统权限
+    private String limitType;
+}

jeecg-module-interlock/src/main/java/org/jeecg/modules/base/mapper/InterlockBaseMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.common.system.vo.SelectTreeModel;
 import org.jeecg.modules.base.entity.InterlockBase;
+import org.jeecg.modules.base.entity.InterlockBaseLimit;
 
 import java.util.List;
 import java.util.Map;
@@ -44,4 +45,12 @@ public interface InterlockBaseMapper extends BaseMapper<InterlockBase> {
 	List<InterlockBase> getAllDevice();
 
 	List<InterlockBase> getAllSystemByDeviceId(@Param("id") String id);
+
+	/**
+	 *   author: sl
+	 *   version: 1.0
+	 *   des: 联锁基础表-普通列表查询 添加用户权限
+	 *   date: 2024/7/30
+	 */
+	List<InterlockBaseLimit> listByUser();
 }

jeecg-module-interlock/src/main/java/org/jeecg/modules/base/mapper/xml/InterlockBaseMapper.xml

@@ -36,4 +36,11 @@
 		select * from interlock_base where interlock_type = '1' and pid = #{id}
 	</select>
 
+	<select id="listByUser" resultType="org.jeecg.modules.base.entity.InterlockBaseLimit">
+		select b.*,qxnr.limit_type from interlock_base b
+		left join (select l.* from interlock_system_limit l where l.interlock_user_id in
+		(select u.id from interlock_user u where u.username='测试用户1')) qxnr
+		on b.id=qxnr.interlock_system_id
+	</select>
+
 </mapper>

jeecg-module-interlock/src/main/java/org/jeecg/modules/base/service/IInterlockBaseService.java

@@ -1,10 +1,14 @@
 package org.jeecg.modules.base.service;
 
+import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.vo.SelectTreeModel;
 import org.jeecg.modules.base.entity.InterlockBase;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.common.exception.JeecgBootException;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.jeecg.modules.base.entity.InterlockBaseLimit;
+import org.jeecg.modules.interlockUser.entity.InterlockUserAdd;
+
 import java.util.List;
 
 /**
@@ -93,4 +97,12 @@ public interface IInterlockBaseService extends IService<InterlockBase> {
 	*   date: 2024/7/2
 	*/
 	List<InterlockBase> getAllSystemByDeviceId(String id);
+
+	/**
+	 *   author: sl
+	 *   version: 1.0
+	 *   des: 联锁基础表-普通列表查询 添加用户权限
+	 *   date: 2024/7/30
+	 */
+	List<InterlockBaseLimit> listByUser();
 }

jeecg-module-interlock/src/main/java/org/jeecg/modules/base/service/impl/InterlockBaseServiceImpl.java

@@ -7,6 +7,7 @@ import org.jeecg.common.system.vo.SelectTreeModel;
 import org.jeecg.modules.base.convert.InterlockBaseConvert;
 import org.jeecg.modules.base.entity.InterlockBase;
 import org.jeecg.modules.base.entity.InterlockBaseHy;
+import org.jeecg.modules.base.entity.InterlockBaseLimit;
 import org.jeecg.modules.base.mapper.InterlockBaseHyMapper;
 import org.jeecg.modules.base.mapper.InterlockBaseMapper;
 import org.jeecg.modules.base.service.IInterlockBaseHyService;
@@ -331,4 +332,15 @@ public class InterlockBaseServiceImpl extends ServiceImpl<InterlockBaseMapper, I
     public List<InterlockBase> getAllSystemByDeviceId(String id) {
         return baseMapper.getAllSystemByDeviceId(id);
     }
+
+
+    /**
+     *   author: sl
+     *   version: 1.0
+     *   des: 联锁基础表-普通列表查询 添加用户权限
+     *   date: 2024/7/30
+     */
+    public List<InterlockBaseLimit> listByUser(){
+        return interlockBaseMapper.listByUser();
+    }
 }