LLL преди 9 месеца
родител
ревизия
7011524742
променени са 12 файла, в които са добавени 740 реда и са изтрити 0 реда
  1. 177 0
      jeecg-module-interlock/src/main/java/org/jeecg/modules/history/controller/InterlockDetailHistoryController.java
  2. 177 0
      jeecg-module-interlock/src/main/java/org/jeecg/modules/history/controller/InterlockSummaryHistoryController.java
  3. 182 0
      jeecg-module-interlock/src/main/java/org/jeecg/modules/history/entity/InterlockDetailHistory.java
  4. 94 0
      jeecg-module-interlock/src/main/java/org/jeecg/modules/history/entity/InterlockSummaryHistory.java
  5. 17 0
      jeecg-module-interlock/src/main/java/org/jeecg/modules/history/mapper/InterlockDetailHistoryMapper.java
  6. 17 0
      jeecg-module-interlock/src/main/java/org/jeecg/modules/history/mapper/InterlockSummaryHistoryMapper.java
  7. 5 0
      jeecg-module-interlock/src/main/java/org/jeecg/modules/history/mapper/xml/InterlockDetailHistoryMapper.xml
  8. 5 0
      jeecg-module-interlock/src/main/java/org/jeecg/modules/history/mapper/xml/InterlockSummaryHistoryMapper.xml
  9. 14 0
      jeecg-module-interlock/src/main/java/org/jeecg/modules/history/service/IInterlockDetailHistoryService.java
  10. 14 0
      jeecg-module-interlock/src/main/java/org/jeecg/modules/history/service/IInterlockSummaryHistoryService.java
  11. 19 0
      jeecg-module-interlock/src/main/java/org/jeecg/modules/history/service/impl/InterlockDetailHistoryServiceImpl.java
  12. 19 0
      jeecg-module-interlock/src/main/java/org/jeecg/modules/history/service/impl/InterlockSummaryHistoryServiceImpl.java

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

@@ -0,0 +1,177 @@
+package org.jeecg.modules.history.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+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.history.entity.InterlockDetailHistory;
+import org.jeecg.modules.history.service.IInterlockDetailHistoryService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 联锁详细信息历史数据表
+ * @Author: jeecg-boot
+ * @Date:   2024-05-30
+ * @Version: V1.0
+ */
+@Api(tags="联锁详细信息历史数据表")
+@RestController
+@RequestMapping("/history/interlockDetailHistory")
+@Slf4j
+public class InterlockDetailHistoryController extends JeecgController<InterlockDetailHistory, IInterlockDetailHistoryService> {
+	@Autowired
+	private IInterlockDetailHistoryService interlockDetailHistoryService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param interlockDetailHistory
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "联锁详细信息历史数据表-分页列表查询")
+	@ApiOperation(value="联锁详细信息历史数据表-分页列表查询", notes="联锁详细信息历史数据表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<InterlockDetailHistory>> queryPageList(InterlockDetailHistory interlockDetailHistory,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<InterlockDetailHistory> queryWrapper = QueryGenerator.initQueryWrapper(interlockDetailHistory, req.getParameterMap());
+		Page<InterlockDetailHistory> page = new Page<InterlockDetailHistory>(pageNo, pageSize);
+		IPage<InterlockDetailHistory> pageList = interlockDetailHistoryService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param interlockDetailHistory
+	 * @return
+	 */
+	@AutoLog(value = "联锁详细信息历史数据表-添加")
+	@ApiOperation(value="联锁详细信息历史数据表-添加", notes="联锁详细信息历史数据表-添加")
+	//@RequiresPermissions("org.jeecg.modules:interlock_detail_history:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody InterlockDetailHistory interlockDetailHistory) {
+		interlockDetailHistoryService.save(interlockDetailHistory);
+		return Result.OK("添加成功!");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param interlockDetailHistory
+	 * @return
+	 */
+	@AutoLog(value = "联锁详细信息历史数据表-编辑")
+	@ApiOperation(value="联锁详细信息历史数据表-编辑", notes="联锁详细信息历史数据表-编辑")
+	//@RequiresPermissions("org.jeecg.modules:interlock_detail_history:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody InterlockDetailHistory interlockDetailHistory) {
+		interlockDetailHistoryService.updateById(interlockDetailHistory);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "联锁详细信息历史数据表-通过id删除")
+	@ApiOperation(value="联锁详细信息历史数据表-通过id删除", notes="联锁详细信息历史数据表-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:interlock_detail_history:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		interlockDetailHistoryService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "联锁详细信息历史数据表-批量删除")
+	@ApiOperation(value="联锁详细信息历史数据表-批量删除", notes="联锁详细信息历史数据表-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:interlock_detail_history:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.interlockDetailHistoryService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "联锁详细信息历史数据表-通过id查询")
+	@ApiOperation(value="联锁详细信息历史数据表-通过id查询", notes="联锁详细信息历史数据表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<InterlockDetailHistory> queryById(@RequestParam(name="id",required=true) String id) {
+		InterlockDetailHistory interlockDetailHistory = interlockDetailHistoryService.getById(id);
+		if(interlockDetailHistory==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(interlockDetailHistory);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param interlockDetailHistory
+    */
+    //@RequiresPermissions("org.jeecg.modules:interlock_detail_history:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, InterlockDetailHistory interlockDetailHistory) {
+        return super.exportXls(request, interlockDetailHistory, InterlockDetailHistory.class, "联锁详细信息历史数据表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("interlock_detail_history:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, InterlockDetailHistory.class);
+    }
+
+}

+ 177 - 0
jeecg-module-interlock/src/main/java/org/jeecg/modules/history/controller/InterlockSummaryHistoryController.java

@@ -0,0 +1,177 @@
+package org.jeecg.modules.history.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+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.history.entity.InterlockSummaryHistory;
+import org.jeecg.modules.history.service.IInterlockSummaryHistoryService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 联锁总历史数据表
+ * @Author: jeecg-boot
+ * @Date:   2024-05-30
+ * @Version: V1.0
+ */
+@Api(tags="联锁总历史数据表")
+@RestController
+@RequestMapping("/history/interlockSummaryHistory")
+@Slf4j
+public class InterlockSummaryHistoryController extends JeecgController<InterlockSummaryHistory, IInterlockSummaryHistoryService> {
+	@Autowired
+	private IInterlockSummaryHistoryService interlockSummaryHistoryService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param interlockSummaryHistory
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "联锁总历史数据表-分页列表查询")
+	@ApiOperation(value="联锁总历史数据表-分页列表查询", notes="联锁总历史数据表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<InterlockSummaryHistory>> queryPageList(InterlockSummaryHistory interlockSummaryHistory,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<InterlockSummaryHistory> queryWrapper = QueryGenerator.initQueryWrapper(interlockSummaryHistory, req.getParameterMap());
+		Page<InterlockSummaryHistory> page = new Page<InterlockSummaryHistory>(pageNo, pageSize);
+		IPage<InterlockSummaryHistory> pageList = interlockSummaryHistoryService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param interlockSummaryHistory
+	 * @return
+	 */
+	@AutoLog(value = "联锁总历史数据表-添加")
+	@ApiOperation(value="联锁总历史数据表-添加", notes="联锁总历史数据表-添加")
+	//@RequiresPermissions("org.jeecg.modules:interlock_summary_history:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody InterlockSummaryHistory interlockSummaryHistory) {
+		interlockSummaryHistoryService.save(interlockSummaryHistory);
+		return Result.OK("添加成功!");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param interlockSummaryHistory
+	 * @return
+	 */
+	@AutoLog(value = "联锁总历史数据表-编辑")
+	@ApiOperation(value="联锁总历史数据表-编辑", notes="联锁总历史数据表-编辑")
+	//@RequiresPermissions("org.jeecg.modules:interlock_summary_history:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody InterlockSummaryHistory interlockSummaryHistory) {
+		interlockSummaryHistoryService.updateById(interlockSummaryHistory);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "联锁总历史数据表-通过id删除")
+	@ApiOperation(value="联锁总历史数据表-通过id删除", notes="联锁总历史数据表-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:interlock_summary_history:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		interlockSummaryHistoryService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "联锁总历史数据表-批量删除")
+	@ApiOperation(value="联锁总历史数据表-批量删除", notes="联锁总历史数据表-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:interlock_summary_history:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.interlockSummaryHistoryService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "联锁总历史数据表-通过id查询")
+	@ApiOperation(value="联锁总历史数据表-通过id查询", notes="联锁总历史数据表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<InterlockSummaryHistory> queryById(@RequestParam(name="id",required=true) String id) {
+		InterlockSummaryHistory interlockSummaryHistory = interlockSummaryHistoryService.getById(id);
+		if(interlockSummaryHistory==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(interlockSummaryHistory);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param interlockSummaryHistory
+    */
+    //@RequiresPermissions("org.jeecg.modules:interlock_summary_history:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, InterlockSummaryHistory interlockSummaryHistory) {
+        return super.exportXls(request, interlockSummaryHistory, InterlockSummaryHistory.class, "联锁总历史数据表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("interlock_summary_history:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, InterlockSummaryHistory.class);
+    }
+
+}

+ 182 - 0
jeecg-module-interlock/src/main/java/org/jeecg/modules/history/entity/InterlockDetailHistory.java

@@ -0,0 +1,182 @@
+package org.jeecg.modules.history.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 联锁详细信息历史数据表
+ * @Author: jeecg-boot
+ * @Date:   2024-05-30
+ * @Version: V1.0
+ */
+@Data
+@TableName("interlock_detail_history")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="interlock_detail_history对象", description="联锁详细信息历史数据表")
+public class InterlockDetailHistory implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**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;
+	/**仪表状态(0正常1故障)*/
+	@Excel(name = "仪表状态(0正常1故障)", width = 15)
+    @ApiModelProperty(value = "仪表状态(0正常1故障)")
+    private java.lang.String instrumentStatus;
+	/**仪表状态判断方式*/
+	@Excel(name = "仪表状态判断方式", width = 15)
+    @ApiModelProperty(value = "仪表状态判断方式")
+    private java.lang.String instrumentStatusJuge;
+	/**仪表状态点位*/
+	@Excel(name = "仪表状态点位", width = 15)
+    @ApiModelProperty(value = "仪表状态点位")
+    private java.lang.String instrumentStatusTag;
+	/**仪表状态值*/
+	@Excel(name = "仪表状态值", width = 15)
+    @ApiModelProperty(value = "仪表状态值")
+    private java.lang.String instrumentStatusValue;
+	/**原始模拟量位号*/
+	@Excel(name = "原始模拟量位号", width = 15)
+    @ApiModelProperty(value = "原始模拟量位号")
+    private java.lang.String ysmnlTag;
+	/**原始模拟量值*/
+	@Excel(name = "原始模拟量值", width = 15)
+    @ApiModelProperty(value = "原始模拟量值")
+    private java.lang.String ysmnlValue;
+	/**高限*/
+	@Excel(name = "高限", width = 15)
+    @ApiModelProperty(value = "高限")
+    private java.lang.String upperLimit;
+	/**低限*/
+	@Excel(name = "低限", width = 15)
+    @ApiModelProperty(value = "低限")
+    private java.lang.String lowerLimit;
+	/**阈值*/
+	@Excel(name = "阈值", width = 15)
+    @ApiModelProperty(value = "阈值")
+    private java.lang.String thresholdValue;
+	/**时间*/
+	@Excel(name = "时间", width = 15)
+    @ApiModelProperty(value = "时间")
+    private java.lang.String thresholdTime;
+	/**时间单位*/
+	@Excel(name = "时间单位", width = 15)
+    @ApiModelProperty(value = "时间单位")
+    private java.lang.String thresholdTimeUnit;
+	/**控制系统状态(0正常1非正常)*/
+	@Excel(name = "控制系统状态(0正常1非正常)", width = 15)
+    @ApiModelProperty(value = "控制系统状态(0正常1非正常)")
+    private java.lang.String controlSystemStatus;
+	/**联锁设定值*/
+	@Excel(name = "联锁设定值", width = 15)
+    @ApiModelProperty(value = "联锁设定值")
+    private java.lang.String interlockSetValue;
+	/**联锁设定值点位*/
+	@Excel(name = "联锁设定值点位", width = 15)
+    @ApiModelProperty(value = "联锁设定值点位")
+    private java.lang.String interlockSetTag;
+	/**当前值*/
+	@Excel(name = "当前值", width = 15)
+    @ApiModelProperty(value = "当前值")
+    private java.lang.String currentValue;
+	/**当前值位号*/
+	@Excel(name = "当前值位号", width = 15)
+    @ApiModelProperty(value = "当前值位号")
+    private java.lang.String currentValueTag;
+	/**是否旁路*/
+	@Excel(name = "是否旁路", width = 15)
+    @ApiModelProperty(value = "是否旁路")
+    private java.lang.String ifBypass;
+	/**旁路状态*/
+	@Excel(name = "旁路状态", width = 15)
+    @ApiModelProperty(value = "旁路状态")
+    private java.lang.String bypass;
+	/**旁路状态点位*/
+	@Excel(name = "旁路状态点位", width = 15)
+    @ApiModelProperty(value = "旁路状态点位")
+    private java.lang.String bypassTag;
+	/**输入卡件状态*/
+	@Excel(name = "输入卡件状态", width = 15)
+    @ApiModelProperty(value = "输入卡件状态")
+    private java.lang.String inputStatus;
+	/**输入卡件状态点位*/
+	@Excel(name = "输入卡件状态点位", width = 15)
+    @ApiModelProperty(value = "输入卡件状态点位")
+    private java.lang.String inputStatusTag;
+	/**输出卡件状态*/
+	@Excel(name = "输出卡件状态", width = 15)
+    @ApiModelProperty(value = "输出卡件状态")
+    private java.lang.String outputStatus;
+	/**输出卡件状态点位*/
+	@Excel(name = "输出卡件状态点位", width = 15)
+    @ApiModelProperty(value = "输出卡件状态点位")
+    private java.lang.String outputStatusTag;
+	/**MP状态*/
+	@Excel(name = "MP状态", width = 15)
+    @ApiModelProperty(value = "MP状态")
+    private java.lang.String mpStatus;
+	/**状态点位*/
+	@Excel(name = "状态点位", width = 15)
+    @ApiModelProperty(value = "状态点位")
+    private java.lang.String mpStatusTag;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remark;
+}

+ 94 - 0
jeecg-module-interlock/src/main/java/org/jeecg/modules/history/entity/InterlockSummaryHistory.java

@@ -0,0 +1,94 @@
+package org.jeecg.modules.history.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 联锁总历史数据表
+ * @Author: jeecg-boot
+ * @Date:   2024-05-30
+ * @Version: V1.0
+ */
+@Data
+@TableName("interlock_summary_history")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="interlock_summary_history对象", description="联锁总历史数据表")
+public class InterlockSummaryHistory implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private java.lang.String id;
+	/**联锁名称*/
+	@Excel(name = "联锁名称", width = 15)
+    @ApiModelProperty(value = "联锁名称")
+    private java.lang.String interlockName;
+	/**系统id*/
+	@Excel(name = "系统id", width = 15)
+    @ApiModelProperty(value = "系统id")
+    private java.lang.String interlockSystemId;
+	/**装置id*/
+	@Excel(name = "装置id", width = 15)
+    @ApiModelProperty(value = "装置id")
+    private java.lang.String interlockApparatusId;
+	/**联锁状态(0未投用1投用)*/
+	@Excel(name = "联锁状态(0未投用1投用)", width = 15)
+    @ApiModelProperty(value = "联锁状态(0未投用1投用)")
+    private java.lang.String interlockStatus;
+	/**回路健康级别*/
+	@Excel(name = "回路健康级别", width = 15)
+    @ApiModelProperty(value = "回路健康级别")
+    private java.lang.String loopHealthLevel;
+	/**逻辑关系*/
+	@Excel(name = "逻辑关系", width = 15)
+    @ApiModelProperty(value = "逻辑关系")
+    private java.lang.String ljgx;
+	/**联锁输出值*/
+	@Excel(name = "联锁输出值", width = 15)
+    @ApiModelProperty(value = "联锁输出值")
+    private java.lang.String interlockOutValue;
+	/**联锁输出值点位*/
+	@Excel(name = "联锁输出值点位", width = 15)
+    @ApiModelProperty(value = "联锁输出值点位")
+    private java.lang.String interlockOutValueTag;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remark;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+}

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

@@ -0,0 +1,17 @@
+package org.jeecg.modules.history.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.history.entity.InterlockDetailHistory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 联锁详细信息历史数据表
+ * @Author: jeecg-boot
+ * @Date:   2024-05-30
+ * @Version: V1.0
+ */
+public interface InterlockDetailHistoryMapper extends BaseMapper<InterlockDetailHistory> {
+
+}

+ 17 - 0
jeecg-module-interlock/src/main/java/org/jeecg/modules/history/mapper/InterlockSummaryHistoryMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.history.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.history.entity.InterlockSummaryHistory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 联锁总历史数据表
+ * @Author: jeecg-boot
+ * @Date:   2024-05-30
+ * @Version: V1.0
+ */
+public interface InterlockSummaryHistoryMapper extends BaseMapper<InterlockSummaryHistory> {
+
+}

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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>

+ 5 - 0
jeecg-module-interlock/src/main/java/org/jeecg/modules/history/mapper/xml/InterlockSummaryHistoryMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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.InterlockSummaryHistoryMapper">
+
+</mapper>

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.history.service;
+
+import org.jeecg.modules.history.entity.InterlockDetailHistory;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 联锁详细信息历史数据表
+ * @Author: jeecg-boot
+ * @Date:   2024-05-30
+ * @Version: V1.0
+ */
+public interface IInterlockDetailHistoryService extends IService<InterlockDetailHistory> {
+
+}

+ 14 - 0
jeecg-module-interlock/src/main/java/org/jeecg/modules/history/service/IInterlockSummaryHistoryService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.history.service;
+
+import org.jeecg.modules.history.entity.InterlockSummaryHistory;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 联锁总历史数据表
+ * @Author: jeecg-boot
+ * @Date:   2024-05-30
+ * @Version: V1.0
+ */
+public interface IInterlockSummaryHistoryService extends IService<InterlockSummaryHistory> {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.history.service.impl;
+
+import org.jeecg.modules.history.entity.InterlockDetailHistory;
+import org.jeecg.modules.history.mapper.InterlockDetailHistoryMapper;
+import org.jeecg.modules.history.service.IInterlockDetailHistoryService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 联锁详细信息历史数据表
+ * @Author: jeecg-boot
+ * @Date:   2024-05-30
+ * @Version: V1.0
+ */
+@Service
+public class InterlockDetailHistoryServiceImpl extends ServiceImpl<InterlockDetailHistoryMapper, InterlockDetailHistory> implements IInterlockDetailHistoryService {
+
+}

+ 19 - 0
jeecg-module-interlock/src/main/java/org/jeecg/modules/history/service/impl/InterlockSummaryHistoryServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.history.service.impl;
+
+import org.jeecg.modules.history.entity.InterlockSummaryHistory;
+import org.jeecg.modules.history.mapper.InterlockSummaryHistoryMapper;
+import org.jeecg.modules.history.service.IInterlockSummaryHistoryService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 联锁总历史数据表
+ * @Author: jeecg-boot
+ * @Date:   2024-05-30
+ * @Version: V1.0
+ */
+@Service
+public class InterlockSummaryHistoryServiceImpl extends ServiceImpl<InterlockSummaryHistoryMapper, InterlockSummaryHistory> implements IInterlockSummaryHistoryService {
+
+}