fix联锁历史数据查询

jeecg-module-interlock/src/main/java/org/jeecg/modules/detail/vo/InterlockDetailQueryVO.java

@@ -50,10 +50,16 @@ public class InterlockDetailQueryVO {
     @Excel(name = "当前值", width = 15)
     @ApiModelProperty(value = "当前值")
     private java.lang.String currentValue;
-    /**是否旁路*/
-    @Excel(name = "是否旁路", width = 15)
-    @ApiModelProperty(value = "是否旁路")
+    /**是否旁路（0否1是）*/
+    @Excel(name = "是否旁路（0否1是）", width = 15, dicCode = "if_bypass")
+    @Dict(dicCode = "if_bypass")
+    @ApiModelProperty(value = "是否旁路（0否1是）")
     private java.lang.String ifBypass;
+    /**旁路状态（0否1是）*/
+    @Excel(name = "旁路状态（0否1是）", width = 15, dicCode = "bypass")
+    @Dict(dicCode = "bypass")
+    @ApiModelProperty(value = "旁路状态（0否1是）")
+    private java.lang.String bypass;
     /**输入卡件状态*/
     @Excel(name = "输入卡件状态", width = 15)
     @ApiModelProperty(value = "输入卡件状态")

jeecg-module-interlock/src/main/java/org/jeecg/modules/history/controller/InterlockDetailHistoryController.java

@@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.detail.dto.InterlockDetailQueryDTO;
 import org.jeecg.modules.history.entity.InterlockDetailHistory;
 import org.jeecg.modules.history.service.IInterlockDetailHistoryService;
 
@@ -20,6 +21,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.history.vo.InterlockDetailHistoryQueryVO;
+import org.jeecg.modules.history.vo.InterlockSummaryHistoryVO;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -42,14 +45,42 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  * @Date:   2024-05-30
  * @Version: V1.0
  */
-@Api(tags="联锁详细信息历史数据表")
+@Api(tags=".联锁详细信息历史数据表")
 @RestController
 @RequestMapping("/history/interlockDetailHistory")
 @Slf4j
 public class InterlockDetailHistoryController extends JeecgController<InterlockDetailHistory, IInterlockDetailHistoryService> {
 	@Autowired
 	private IInterlockDetailHistoryService interlockDetailHistoryService;
-	
+
+	/**
+	 * 联锁历史数据——各种逻辑状态分页查询
+	 */
+	@ApiOperation(".联锁历史数据——各种逻辑状态分页查询")
+	@GetMapping("/list1")
+	public Result<IPage<InterlockSummaryHistoryVO>> list(InterlockSummaryHistoryVO vo,
+														 @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+														 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+														 HttpServletRequest req){
+		Page<InterlockSummaryHistoryVO> page = new Page<>(pageNo,pageSize);
+		IPage<InterlockSummaryHistoryVO> pageList = interlockDetailHistoryService.getPage(page, vo);
+		return Result.OK(pageList);
+	}
+
+	 /**
+	  * 联锁历史数据详细信息-分页查询
+	  */
+	 @ApiOperation(value=".联锁历史数据详细信息-分页查询", notes="联锁历史数据详细信息-分页查询")
+	 @GetMapping(value = "/list2")
+	 public Result<IPage<InterlockDetailHistoryQueryVO>> list2(InterlockDetailQueryDTO dto,
+															   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+															   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+															   HttpServletRequest req) {
+		 Page<InterlockDetailHistoryQueryVO> page = new Page<InterlockDetailHistoryQueryVO>(pageNo, pageSize);
+		 IPage<InterlockDetailHistoryQueryVO> pageList = interlockDetailHistoryService.getPage2(page, dto);
+		 return Result.OK(pageList);
+	 }
+
 	/**
 	 * 分页列表查询
 	 *
@@ -71,7 +102,7 @@ public class InterlockDetailHistoryController extends JeecgController<InterlockD
 		IPage<InterlockDetailHistory> pageList = interlockDetailHistoryService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -86,7 +117,7 @@ public class InterlockDetailHistoryController extends JeecgController<InterlockD
 		interlockDetailHistoryService.save(interlockDetailHistory);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -101,7 +132,7 @@ public class InterlockDetailHistoryController extends JeecgController<InterlockD
 		interlockDetailHistoryService.updateById(interlockDetailHistory);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -116,7 +147,7 @@ public class InterlockDetailHistoryController extends JeecgController<InterlockD
 		interlockDetailHistoryService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -131,7 +162,7 @@ public class InterlockDetailHistoryController extends JeecgController<InterlockD
 		this.interlockDetailHistoryService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

jeecg-module-interlock/src/main/java/org/jeecg/modules/history/mapper/InterlockDetailHistoryMapper.java

@@ -2,9 +2,14 @@ package org.jeecg.modules.history.mapper;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.detail.dto.InterlockDetailQueryDTO;
 import org.jeecg.modules.history.entity.InterlockDetailHistory;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.history.vo.InterlockDetailHistoryQueryVO;
+import org.jeecg.modules.history.vo.InterlockSummaryHistoryVO;
 
 /**
  * @Description: 联锁详细信息历史数据表
@@ -14,4 +19,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface InterlockDetailHistoryMapper extends BaseMapper<InterlockDetailHistory> {
 
+    /**
+     * 联锁历史数据详细信息-分页查询
+     */
+    IPage<InterlockDetailHistoryQueryVO> getPage2(Page<InterlockDetailHistoryQueryVO> page, InterlockDetailQueryDTO dto);
+
+    /**
+     * 联锁历史数据——各种逻辑状态分页查询
+     */
+    IPage<InterlockSummaryHistoryVO> getPage(Page<InterlockSummaryHistoryVO> page, InterlockSummaryHistoryVO vo);
+
 }

jeecg-module-interlock/src/main/java/org/jeecg/modules/history/mapper/xml/InterlockDetailHistoryMapper.xml

@@ -2,4 +2,34 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.history.mapper.InterlockDetailHistoryMapper">
 
-</mapper>
+    <!--联锁历史数据详细信息-分页查询-->
+    <select id="getPage2" parameterType="org.jeecg.modules.detail.dto.InterlockDetailQueryDTO" resultType="org.jeecg.modules.history.vo.InterlockDetailHistoryQueryVO">
+        select d.id, d.summaryid, d.interlockname, d.interlock_condition, d.interlock_condition_tag, d.description,
+        d.instrument_status, d.interlock_set_value, d.current_value, d.if_bypass, d.input_status, d.output_status,
+        d.mp_status, s.ljgx, s.interlock_out_value
+        from interlock_detail_history d left join interlock_summary_history s on d.summaryid = s.id
+        <where>
+            <if test="dto.summaryid != null and dto.summaryid != ''"> and d.summaryid = #{dto.summaryid}</if>
+            <if test="dto.interlockConditionTag != null and dto.interlockConditionTag != ''"> and d.interlock_condition_tag like concat('%',#{dto.interlockConditionTag},'%')</if>
+        </where>
+        order by d.create_time desc
+    </select>
+
+    <!-- 联锁总历史数据表-分页列表查询（各种逻辑状态）-->
+    <select id="getPage" parameterType="org.jeecg.modules.history.vo.InterlockSummaryHistoryVO" resultType="org.jeecg.modules.history.vo.InterlockSummaryHistoryVO">
+        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
+        from interlock_detail_history d left join interlock_summary_history s on d.summaryid = s.id
+        <where>
+            <if test="vo.interlockname != null and vo.interlockname != ''"> and d.interlockname like concat('%', #{vo.interlockname}, '%')</if>
+            <if test="vo.interlockCondition != null and vo.interlockCondition != ''"> and d.interlock_condition = #{vo.interlockCondition}</if>
+            <if test="vo.interlockConditionTag != null and vo.interlockConditionTag != ''"> and d.interlock_condition_tag like concat('%',#{vo.interlockConditionTag},'%')</if>
+            <if test="vo.instrumentStatus != null and vo.instrumentStatus != ''"> and d.instrument_status = #{vo.instrumentStatus}</if>
+            <if test="vo.controlSystemStatus != null and vo.controlSystemStatus != ''"> and d.control_system_status = #{vo.controlSystemStatus}</if>
+            <if test="vo.interlockStatus != null and vo.interlockStatus != ''"> and s.interlock_status = #{vo.interlockStatus}</if>
+            <if test="vo.loopHealthLevel != null and vo.loopHealthLevel != ''"> and s.loop_health_level = #{vo.loopHealthLevel}</if>
+        </where>
+        order by s.create_time desc
+    </select>
+
+</mapper>

jeecg-module-interlock/src/main/java/org/jeecg/modules/history/service/IInterlockDetailHistoryService.java

@@ -1,7 +1,12 @@
 package org.jeecg.modules.history.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.detail.dto.InterlockDetailQueryDTO;
 import org.jeecg.modules.history.entity.InterlockDetailHistory;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.history.vo.InterlockDetailHistoryQueryVO;
+import org.jeecg.modules.history.vo.InterlockSummaryHistoryVO;
 
 /**
  * @Description: 联锁详细信息历史数据表
@@ -11,4 +16,14 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IInterlockDetailHistoryService extends IService<InterlockDetailHistory> {
 
+    /**
+     * 联锁历史数据详细信息-分页查询
+     */
+    IPage<InterlockDetailHistoryQueryVO> getPage2(Page<InterlockDetailHistoryQueryVO> page, InterlockDetailQueryDTO dto);
+
+    /**
+     * 联锁历史数据——各种逻辑状态分页查询
+     */
+    IPage<InterlockSummaryHistoryVO> getPage(Page<InterlockSummaryHistoryVO> page, InterlockSummaryHistoryVO vo);
+
 }

jeecg-module-interlock/src/main/java/org/jeecg/modules/history/service/impl/InterlockDetailHistoryServiceImpl.java

@@ -1,8 +1,15 @@
 package org.jeecg.modules.history.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.detail.dto.InterlockDetailQueryDTO;
 import org.jeecg.modules.history.entity.InterlockDetailHistory;
 import org.jeecg.modules.history.mapper.InterlockDetailHistoryMapper;
+import org.jeecg.modules.history.mapper.InterlockSummaryHistoryMapper;
 import org.jeecg.modules.history.service.IInterlockDetailHistoryService;
+import org.jeecg.modules.history.vo.InterlockDetailHistoryQueryVO;
+import org.jeecg.modules.history.vo.InterlockSummaryHistoryVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -16,4 +23,22 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class InterlockDetailHistoryServiceImpl extends ServiceImpl<InterlockDetailHistoryMapper, InterlockDetailHistory> implements IInterlockDetailHistoryService {
 
+    @Autowired
+    @SuppressWarnings("all")
+    private InterlockDetailHistoryMapper interlockDetailHistoryMapper;
+
+    /**
+     * 联锁历史数据详细信息-分页查询
+     */
+    public IPage<InterlockDetailHistoryQueryVO> getPage2(Page<InterlockDetailHistoryQueryVO> page, InterlockDetailQueryDTO dto){
+        return interlockDetailHistoryMapper.getPage2(page, dto);
+    }
+
+    /**
+     * 联锁历史数据——各种逻辑状态分页查询
+     */
+    public IPage<InterlockSummaryHistoryVO> getPage(Page<InterlockSummaryHistoryVO> page, InterlockSummaryHistoryVO vo){
+        return interlockDetailHistoryMapper.getPage(page, vo);
+    }
+
 }

jeecg-module-interlock/src/main/java/org/jeecg/modules/history/vo/InterlockDetailHistoryQueryVO.java

@@ -0,0 +1,83 @@
+package org.jeecg.modules.history.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * 功能描述
+ *
+ * @author: nn
+ * @date: 2024年06月04日 16:40
+ */
+@Data
+public class InterlockDetailHistoryQueryVO {
+
+    /**id*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private java.lang.String id;
+    /**联锁总表id*/
+    @Excel(name = "联锁总表id", width = 15)
+    @ApiModelProperty(value = "联锁总表id")
+    private java.lang.String summaryid;
+    /**联锁名称*/
+    @Excel(name = "联锁名称", width = 15)
+    @ApiModelProperty(value = "联锁名称")
+    private java.lang.String interlockname;
+    /**联锁条件值*/
+    @Excel(name = "联锁条件值", width = 15)
+    @ApiModelProperty(value = "联锁条件值")
+    private java.lang.String interlockCondition;
+    /**联锁条件点位*/
+    @Excel(name = "联锁条件点位", width = 15)
+    @ApiModelProperty(value = "联锁条件点位")
+    private java.lang.String interlockConditionTag;
+    /**描述*/
+    @Excel(name = "描述", width = 15)
+    @ApiModelProperty(value = "描述")
+    private java.lang.String description;
+    /**联锁设定值*/
+    @Excel(name = "联锁设定值", width = 15)
+    @ApiModelProperty(value = "联锁设定值")
+    private java.lang.String interlockSetValue;
+    /**当前值*/
+    @Excel(name = "当前值", width = 15)
+    @ApiModelProperty(value = "当前值")
+    private java.lang.String currentValue;
+    /**是否旁路（0否1是）*/
+    @Excel(name = "是否旁路（0否1是）", width = 15, dicCode = "if_bypass")
+    @Dict(dicCode = "if_bypass")
+    @ApiModelProperty(value = "是否旁路（0否1是）")
+    private java.lang.String ifBypass;
+    /**旁路状态（0否1是）*/
+    @Excel(name = "旁路状态（0否1是）", width = 15, dicCode = "bypass")
+    @Dict(dicCode = "bypass")
+    @ApiModelProperty(value = "旁路状态（0否1是）")
+    private java.lang.String bypass;
+    /**输入卡件状态*/
+    @Excel(name = "输入卡件状态", width = 15)
+    @ApiModelProperty(value = "输入卡件状态")
+    private java.lang.String inputStatus;
+    /**输出卡件状态*/
+    @Excel(name = "输出卡件状态", width = 15)
+    @ApiModelProperty(value = "输出卡件状态")
+    private java.lang.String outputStatus;
+    /**MP状态*/
+    @Excel(name = "MP状态", width = 15)
+    @ApiModelProperty(value = "MP状态")
+    private java.lang.String mpStatus;
+
+    /**逻辑关系*/
+    @Excel(name = "逻辑关系", width = 15)
+    @ApiModelProperty(value = "逻辑关系")
+    private java.lang.String ljgx;
+    /**联锁输出值*/
+    @Excel(name = "联锁输出值", width = 15)
+    @ApiModelProperty(value = "联锁输出值")
+    private java.lang.String interlockOutValue;
+
+}

jeecg-module-interlock/src/main/java/org/jeecg/modules/history/vo/InterlockSummaryHistoryVO.java

@@ -0,0 +1,63 @@
+package org.jeecg.modules.history.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * 功能描述
+ *
+ * @author: nn
+ * @date: 2024年06月04日 15:51
+ */
+@Data
+public class InterlockSummaryHistoryVO {
+
+    /**id*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private java.lang.String id;
+    /**联锁总表id*/
+    @Excel(name = "联锁总表id", width = 15)
+    @ApiModelProperty(value = "联锁总表id")
+    private java.lang.String summaryid;
+    /**联锁名称*/
+    @Excel(name = "联锁名称", width = 15)
+    @ApiModelProperty(value = "联锁名称")
+    private java.lang.String interlockname;
+    /**联锁条件值*/
+    @Excel(name = "联锁条件值", width = 15)
+    @ApiModelProperty(value = "联锁条件值")
+    private java.lang.String interlockCondition;
+    /**联锁条件点位*/
+    @Excel(name = "联锁条件点位", width = 15)
+    @ApiModelProperty(value = "联锁条件点位")
+    private java.lang.String interlockConditionTag;
+    /**仪表状态*/
+    @Excel(name = "仪表状态", width = 15)
+    @ApiModelProperty(value = "仪表状态")
+    @Dict(dicCode = "instrument_status")
+    private java.lang.String instrumentStatus;
+    /**控制系统状态*/
+    @Excel(name = "控制系统状态", width = 15)
+    @ApiModelProperty(value = "控制系统状态")
+    @Dict(dicCode = "control_system_status")
+    private java.lang.String controlSystemStatus;
+    /**联锁状态*/
+    @Excel(name = "联锁状态", width = 15)
+    @ApiModelProperty(value = "联锁状态")
+    @Dict(dicCode = "interlock_status")
+    private java.lang.String interlockStatus;
+    /**回路健康级别*/
+    @Excel(name = "回路健康级别", width = 15)
+    @ApiModelProperty(value = "回路健康级别")
+    private java.lang.String loopHealthLevel;
+    /**旁路状态*/
+    @Dict(dicCode = "bypass")
+    @ApiModelProperty(value = "旁路状态")
+    private java.lang.String bypass;
+
+}