联锁总表查询所有联锁添加系统权限字段

jeecg-module-interlock/src/main/java/org/jeecg/modules/detail/controller/InterlockDetailController.java

@@ -246,13 +246,13 @@ public class InterlockDetailController extends JeecgController<InterlockDetail,
 	 /**联锁逻辑状态-分页表查询联锁  添加权限*/
 	 @ApiOperation(value="联锁逻辑状态-分页表查询联锁  添加权限", notes="联锁逻辑状态-分页表查询联锁  添加权限")
 	 @GetMapping(value = "/listPageByUser")
-	 public Result<IPage<InterlockSummaryVO>> listPageByUser(InterlockSummaryVO vo,
+	 public Result<IPage<InterlockSummaryLimitVO>> listPageByUser(InterlockSummaryLimitVO vo,
 																  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
 																  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
 																  HttpServletRequest request) {
 		 long startTime = System.currentTimeMillis();
-		 Page<InterlockSummaryVO> page = new Page<InterlockSummaryVO>(pageNo, pageSize);
-		 IPage<InterlockSummaryVO> pageList = interlockDetailService.getPageByUser(page, vo, request);
+		 Page<InterlockSummaryLimitVO> page = new Page<InterlockSummaryLimitVO>(pageNo, pageSize);
+		 IPage<InterlockSummaryLimitVO> pageList = interlockDetailService.getPageByUser(page, vo, request);
 		 long endTime = System.currentTimeMillis();
 		 long duration = endTime - startTime;
 		 String log = "联锁逻辑状态-分页列表查询程序运行时间（毫秒）：" + duration;

jeecg-module-interlock/src/main/java/org/jeecg/modules/detail/mapper/InterlockDetailMapper.java

@@ -42,8 +42,8 @@ public interface InterlockDetailMapper extends BaseMapper<InterlockDetail> {
     @Insert("INSERT INTO time_test_log (type, cost_time) VALUES (#{type}, #{cost_time})")
     void insertIntoTimeTestLog(@Param("type") String type, @Param("cost_time") Long costTime);
 
-    /**联锁总表-分页列表查询（各种逻辑状态）*/
-    IPage<InterlockSummaryVO> getPageByUser(Page<InterlockSummaryVO> page, @Param("interlockSummaryVO") InterlockSummaryVO interlockSummaryVO, @Param("wiseUser") String wiseUser);
+    /**联锁总表-分页列表查询（各种逻辑状态） 添加权限*/
+    IPage<InterlockSummaryLimitVO> getPageByUser(Page<InterlockSummaryLimitVO> page, @Param("interlockSummaryLimitVO") InterlockSummaryLimitVO interlockSummaryLimitVO, @Param("wiseUser") String wiseUser);
 
 
 }

jeecg-module-interlock/src/main/java/org/jeecg/modules/detail/mapper/xml/InterlockDetailMapper.xml

@@ -103,12 +103,13 @@
 
 
     <!-- 联锁总表-分页列表查询（各种逻辑状态） 添加权限-->
-    <select id="getPageByUser" resultType="org.jeecg.modules.summary.vo.InterlockSummaryVO">
+    <select id="getPageByUser" resultType="org.jeecg.modules.summary.vo.InterlockSummaryLimitVO">
         select d.id, d.summaryid, d.interlockname, d.interlock_condition, d.interlock_condition_tag, d.instrument_status, d.control_system_status,
         s.interlock_status, s.loop_health_level, d.bypass, s.interlock_apparatus_id, s.interlock_system_id,
         h1.interlock_status_name , h2.bypass_name ,
         h3.instrument_status_name , h4.control_system_status_name,
-        h.instrument_status_normal, h.bypass_yes, h.interlock_status_ty, h.control_system_status_normal
+        h.instrument_status_normal, h.bypass_yes, h.interlock_status_ty, h.control_system_status_normal,
+        qxnr.limit_type
         from interlock_detail d
         left join interlock_summary s on d.summaryid = s.id
         left join interlock_base_hy h1 on h1.interlock_status = s.interlock_status and h1.interlock_system_id = s.interlock_system_id
@@ -117,18 +118,18 @@
         left join interlock_base_hy h4 on h4.control_system_status = d.control_system_status and h4.interlock_system_id = s.interlock_system_id
         left join interlock_base h on h.id = s.interlock_system_id
         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=#{wiseUser})) qxnr on qxnr.interlock_system_id = s.interlock_system_id
+        (select u.id from interlock_user u where u.username='iotedge@iotedge.sense')) qxnr on qxnr.interlock_system_id = s.interlock_system_id
         <where>
             and (qxnr.limit_type='0' or qxnr.limit_type='1')
-            <if test="interlockSummaryVO.interlockApparatusId != null and interlockSummaryVO.interlockApparatusId != ''"> and s.interlock_apparatus_id = #{interlockSummaryVO.interlockApparatusId}</if>
-            <if test="interlockSummaryVO.interlockSystemId != null and interlockSummaryVO.interlockSystemId != ''"> and s.interlock_system_id = #{interlockSummaryVO.interlockSystemId}</if>
-            <if test="interlockSummaryVO.interlockname != null and interlockSummaryVO.interlockname != ''"> and d.interlockname like concat('%', #{interlockSummaryVO.interlockname}, '%')</if>
-            <if test="interlockSummaryVO.interlockConditionTag != null and interlockSummaryVO.interlockConditionTag != ''"> and d.interlock_condition_tag like concat('%', #{interlockSummaryVO.interlockConditionTag}, '%')</if>
-            <if test="interlockSummaryVO.instrumentStatus != null and interlockSummaryVO.instrumentStatus != ''"> and d.instrument_status = #{interlockSummaryVO.instrumentStatus}</if>
-            <if test="interlockSummaryVO.controlSystemStatus != null and interlockSummaryVO.controlSystemStatus != ''"> and d.control_system_status = #{interlockSummaryVO.controlSystemStatus}</if>
-            <if test="interlockSummaryVO.interlockStatus != null and interlockSummaryVO.interlockStatus != ''"> and s.interlock_status = #{interlockSummaryVO.interlockStatus}</if>
-            <if test="interlockSummaryVO.loopHealthLevel != null and interlockSummaryVO.loopHealthLevel != ''"> and s.loop_health_level = #{interlockSummaryVO.loopHealthLevel}</if>
-            <if test="interlockSummaryVO.bypass != null and interlockSummaryVO.bypass != ''"> and d.bypass = #{interlockSummaryVO.bypass}</if>
+            <if test="interlockSummaryLimitVO.interlockApparatusId != null and interlockSummaryLimitVO.interlockApparatusId != ''"> and s.interlock_apparatus_id = #{interlockSummaryLimitVO.interlockApparatusId}</if>
+            <if test="interlockSummaryLimitVO.interlockSystemId != null and interlockSummaryLimitVO.interlockSystemId != ''"> and s.interlock_system_id = #{interlockSummaryLimitVO.interlockSystemId}</if>
+            <if test="interlockSummaryLimitVO.interlockname != null and interlockSummaryLimitVO.interlockname != ''"> and d.interlockname like concat('%', #{interlockSummaryLimitVO.interlockname}, '%')</if>
+            <if test="interlockSummaryLimitVO.interlockConditionTag != null and interlockSummaryLimitVO.interlockConditionTag != ''"> and d.interlock_condition_tag like concat('%', #{interlockSummaryLimitVO.interlockConditionTag}, '%')</if>
+            <if test="interlockSummaryLimitVO.instrumentStatus != null and interlockSummaryLimitVO.instrumentStatus != ''"> and d.instrument_status = #{interlockSummaryLimitVO.instrumentStatus}</if>
+            <if test="interlockSummaryLimitVO.controlSystemStatus != null and interlockSummaryLimitVO.controlSystemStatus != ''"> and d.control_system_status = #{interlockSummaryLimitVO.controlSystemStatus}</if>
+            <if test="interlockSummaryLimitVO.interlockStatus != null and interlockSummaryLimitVO.interlockStatus != ''"> and s.interlock_status = #{interlockSummaryLimitVO.interlockStatus}</if>
+            <if test="interlockSummaryLimitVO.loopHealthLevel != null and interlockSummaryLimitVO.loopHealthLevel != ''"> and s.loop_health_level = #{interlockSummaryLimitVO.loopHealthLevel}</if>
+            <if test="interlockSummaryLimitVO.bypass != null and interlockSummaryLimitVO.bypass != ''"> and d.bypass = #{interlockSummaryLimitVO.bypass}</if>
         </where>
         order by s.create_time desc
     </select>

jeecg-module-interlock/src/main/java/org/jeecg/modules/detail/service/IInterlockDetailService.java

@@ -39,5 +39,5 @@ public interface IInterlockDetailService extends IService<InterlockDetail> {
     List<InterlockDetail> selectListBySummaryId(String summaryId);
 
     /**联锁总表-分页列表查询（各种逻辑状态） 添加权限*/
-    public IPage<InterlockSummaryVO> getPageByUser(Page<InterlockSummaryVO> page, InterlockSummaryVO interlockSummaryVO, HttpServletRequest request);
+    public IPage<InterlockSummaryLimitVO> getPageByUser(Page<InterlockSummaryLimitVO> page, InterlockSummaryLimitVO interlockSummaryLimitVO, HttpServletRequest request);
 }

jeecg-module-interlock/src/main/java/org/jeecg/modules/detail/service/impl/InterlockDetailServiceImpl.java

@@ -120,7 +120,7 @@ public class InterlockDetailServiceImpl extends ServiceImpl<InterlockDetailMappe
     }
 
     /**联锁总表-分页列表查询（各种逻辑状态） 添加权限*/
-    public IPage<InterlockSummaryVO> getPageByUser(Page<InterlockSummaryVO> page, InterlockSummaryVO interlockSummaryVO, HttpServletRequest request) {
+    public IPage<InterlockSummaryLimitVO> getPageByUser(Page<InterlockSummaryLimitVO> page, InterlockSummaryLimitVO interlockSummaryLimitVO, HttpServletRequest request) {
         String wiseUser = "";
         //获取当前用户名
         Cookie[] cookies = request.getCookies();
@@ -131,7 +131,7 @@ public class InterlockDetailServiceImpl extends ServiceImpl<InterlockDetailMappe
                 }
             }
         }
-        return interlockDetailMapper.getPageByUser(page, interlockSummaryVO, wiseUser);
+        return interlockDetailMapper.getPageByUser(page, interlockSummaryLimitVO, wiseUser);
     }
 
 }