diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcXtjcController.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcXtjcController.java index 91c39364..b70dafba 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcXtjcController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcXtjcController.java @@ -5,6 +5,7 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.tcZz.domain.TcXtjc; +import com.ruoyi.tcZz.domain.request.TxtjcRequest; import com.ruoyi.tcZz.service.ITcXtjcService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -33,7 +34,7 @@ public class TcXtjcController extends BaseController { */ @ApiOperation("导出系统监测列表") @PostMapping("/export") - public void export(HttpServletResponse response, TcXtjc tcXtjc) { + public void export(HttpServletResponse response, TxtjcRequest tcXtjc) { List list = tcXtjcService.selectTcXtjcList(tcXtjc); ExcelUtil util = new ExcelUtil(TcXtjc.class); util.exportExcel(response, list, "系统监测数据"); @@ -81,7 +82,7 @@ public class TcXtjcController extends BaseController { */ @ApiOperation(value = "查询系统监测列表", response = TcXtjc.class) @GetMapping("/ListNoToken") - public TableDataInfo ListNoToken(TcXtjc tcXtjc) { + public TableDataInfo ListNoToken(TxtjcRequest tcXtjc) { startPage(); List list = tcXtjcService.selectTcXtjcList(tcXtjc); return getDataTable(list); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/request/TxtjcRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/request/TxtjcRequest.java new file mode 100644 index 00000000..f9884e9a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/request/TxtjcRequest.java @@ -0,0 +1,63 @@ +package com.ruoyi.tcZz.domain.request; + +import com.ruoyi.common.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author du + * @since 2024/2/22 19:47 + */ +@Data +@ApiModel("系统监测对象") +public class TxtjcRequest { + + /** $column.columnComment */ + @ApiModelProperty(value = "id") + private Long id; + + /** 区域 */ + @ApiModelProperty(value = "区域,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城") + @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "太仓市,城厢镇,沙溪镇,浏河镇,浮桥镇,璜泾镇,双凤镇,娄东街道,陆渡街道,科教新城") + private String areaId; + + /** bigId */ + @ApiModelProperty(value = "bigId") + private Long bigId; + + /** 启用/禁用 */ + @ApiModelProperty(value = "启用/禁用,1=启用,2=禁用") + @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "启用,禁用") + private Long isStatus; + + /** 单位名称 */ + @ApiModelProperty(value = "单位名称") + @Excel(name = "单位名称") + private String unitName; + + /** 网站/系统名称 */ + @ApiModelProperty(value = "网站/系统名称") + @Excel(name = "网站/系统名称") + private String systemName; + + /** 网站地址(url) */ + @ApiModelProperty(value = "网站地址(url)") + @Excel(name = "网站地址(url)") + private String systemUrl; + + /** IP地址 */ + @ApiModelProperty(value = "IP地址") + @Excel(name = "IP地址") + private String sysyemIp; + + /** 是否关注重点 */ + @ApiModelProperty(value = "是否关注重点") + @Excel(name = "是否关注重点") + private String isFocus; + + /** 等保级别 */ + @ApiModelProperty(value = "等保级别") + @Excel(name = "等保级别") + private String level; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcXtjcMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcXtjcMapper.java index 56ab2eee..185cd0c9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcXtjcMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcXtjcMapper.java @@ -2,6 +2,7 @@ package com.ruoyi.tcZz.mapper; import java.util.List; import com.ruoyi.tcZz.domain.TcXtjc; +import com.ruoyi.tcZz.domain.request.TxtjcRequest; import org.apache.ibatis.annotations.Param; /** @@ -26,7 +27,7 @@ public interface TcXtjcMapper * @param tcXtjc 系统监测 * @return 系统监测集合 */ - public List selectTcXtjcList(TcXtjc tcXtjc); + public List selectTcXtjcList(TxtjcRequest tcXtjc); /** * 新增系统监测 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcXtjcService.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcXtjcService.java index 8408889f..79189c74 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcXtjcService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcXtjcService.java @@ -4,6 +4,7 @@ import java.util.List; import com.ruoyi.tcZz.domain.TcCy; import com.ruoyi.tcZz.domain.TcXtjc; +import com.ruoyi.tcZz.domain.request.TxtjcRequest; /** * 系统监测Service接口 @@ -27,7 +28,7 @@ public interface ITcXtjcService * @param tcXtjc 系统监测 * @return 系统监测集合 */ - public List selectTcXtjcList(TcXtjc tcXtjc); + public List selectTcXtjcList(TxtjcRequest tcXtjc); /** * 新增系统监测 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcXtjcServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcXtjcServiceImpl.java index 97dfc2b8..30c770b8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcXtjcServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcXtjcServiceImpl.java @@ -3,12 +3,15 @@ package com.ruoyi.tcZz.service.impl; import java.util.List; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.tcZz.domain.TcCy; +import com.ruoyi.tcZz.domain.request.TxtjcRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.tcZz.mapper.TcXtjcMapper; import com.ruoyi.tcZz.domain.TcXtjc; import com.ruoyi.tcZz.service.ITcXtjcService; +import javax.annotation.Resource; + /** * 系统监测Service业务层处理 * @@ -18,7 +21,7 @@ import com.ruoyi.tcZz.service.ITcXtjcService; @Service public class TcXtjcServiceImpl implements ITcXtjcService { - @Autowired + @Resource private TcXtjcMapper tcXtjcMapper; /** @@ -40,7 +43,7 @@ public class TcXtjcServiceImpl implements ITcXtjcService * @return 系统监测 */ @Override - public List selectTcXtjcList(TcXtjc tcXtjc) + public List selectTcXtjcList(TxtjcRequest tcXtjc) { return tcXtjcMapper.selectTcXtjcList(tcXtjc); } diff --git a/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcXtjcMapper.xml b/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcXtjcMapper.xml index fe353e30..72ea22c6 100644 --- a/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcXtjcMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcXtjcMapper.xml @@ -29,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and id = #{id} + and id > #{bigId} and area_id = #{areaId} and isStatus = #{isStatus} and unit_name like concat('%', #{unitName}, '%')