From a04977b1534b846ae1a50db5f15a9fccd555dd60 Mon Sep 17 00:00:00 2001
From: dhy1725534722 <1725534722@qq.com>
Date: Fri, 13 Oct 2023 11:10:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E7=BB=9C=E5=AE=89=E5=85=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tcZz/controller/TcDbdwController.java     |   2 +-
 .../tcZz/controller/TcDbxtController.java     |   2 +-
 .../tcZz/controller/TcIdcdwController.java    |   2 +-
 .../tcZz/controller/TcJgdwController.java     |   2 +-
 .../tcZz/controller/TcSjlyController.java     |  26 +-
 .../tcZz/controller/TcSjlytjController.java   |  26 +-
 .../tcZz/controller/TcXtjcController.java     |   2 +-
 .../tcZz/controller/TcZfwzController.java     |   2 +-
 .../java/com/ruoyi/tcZz/domain/TcAqyh.java    |  48 +---
 .../java/com/ruoyi/tcZz/domain/TcBmtb.java    |  72 +----
 .../java/com/ruoyi/tcZz/domain/TcDbdw.java    | 223 +++------------
 .../java/com/ruoyi/tcZz/domain/TcDbxt.java    | 264 ++++--------------
 .../java/com/ruoyi/tcZz/domain/TcFbqk.java    |  48 +---
 .../java/com/ruoyi/tcZz/domain/TcIdcdw.java   |  77 +----
 .../java/com/ruoyi/tcZz/domain/TcJgdw.java    | 144 ++--------
 .../java/com/ruoyi/tcZz/domain/TcMap.java     |  63 +----
 .../java/com/ruoyi/tcZz/domain/TcSdtb.java    |  74 +----
 .../com/ruoyi/tcZz/domain/TcSgjipTop5.java    |  48 +---
 .../java/com/ruoyi/tcZz/domain/TcSjly.java    |  23 +-
 .../java/com/ruoyi/tcZz/domain/TcSjlytj.java  |  76 +----
 .../java/com/ruoyi/tcZz/domain/TcTbcz.java    | 109 ++------
 .../java/com/ruoyi/tcZz/domain/TcTbwc.java    |  89 +-----
 .../java/com/ruoyi/tcZz/domain/TcWljgtj.java  |  70 +----
 .../java/com/ruoyi/tcZz/domain/TcXtjc.java    | 128 ++-------
 .../java/com/ruoyi/tcZz/domain/TcZfwz.java    |  92 ++----
 .../java/com/ruoyi/tcZz/domain/TcZxyh.java    | 121 ++------
 .../com/ruoyi/tcZz/mapper/TcDbdwMapper.java   |   2 +-
 .../com/ruoyi/tcZz/mapper/TcDbxtMapper.java   |   2 +-
 .../com/ruoyi/tcZz/mapper/TcIdcdwMapper.java  |   2 +-
 .../com/ruoyi/tcZz/mapper/TcJgdwMapper.java   |   2 +-
 .../com/ruoyi/tcZz/mapper/TcSjlyMapper.java   |  30 +-
 .../com/ruoyi/tcZz/mapper/TcSjlytjMapper.java |  30 +-
 .../com/ruoyi/tcZz/mapper/TcXtjcMapper.java   |   2 +-
 .../com/ruoyi/tcZz/mapper/TcZfwzMapper.java   |   2 +-
 .../ruoyi/tcZz/service/ITcDbdwService.java    |   2 +-
 .../ruoyi/tcZz/service/ITcDbxtService.java    |   2 +-
 .../ruoyi/tcZz/service/ITcIdcdwService.java   |   2 +-
 .../ruoyi/tcZz/service/ITcJgdwService.java    |   2 +-
 .../ruoyi/tcZz/service/ITcSjlyService.java    |  32 +--
 .../ruoyi/tcZz/service/ITcSjlytjService.java  |  32 +--
 .../ruoyi/tcZz/service/ITcXtjcService.java    |   2 +-
 .../ruoyi/tcZz/service/ITcZfwzService.java    |   2 +-
 .../tcZz/service/impl/TcDbdwServiceImpl.java  |   2 +-
 .../tcZz/service/impl/TcDbxtServiceImpl.java  |   2 +-
 .../tcZz/service/impl/TcIdcdwServiceImpl.java |   2 +-
 .../tcZz/service/impl/TcJgdwServiceImpl.java  |   2 +-
 .../tcZz/service/impl/TcSjlyServiceImpl.java  |  32 +--
 .../service/impl/TcSjlytjServiceImpl.java     |  32 +--
 .../tcZz/service/impl/TcXtjcServiceImpl.java  |   2 +-
 .../tcZz/service/impl/TcZfwzServiceImpl.java  |   2 +-
 .../tcZz/networkSecurity/TcDbdwMapper.xml     |  19 ++
 .../tcZz/networkSecurity/TcDbxtMapper.xml     |  20 ++
 .../tcZz/networkSecurity/TcIdcdwMapper.xml    |   5 +-
 .../tcZz/networkSecurity/TcJgdwMapper.xml     |  11 +
 .../tcZz/networkSecurity/TcSjlyMapper.xml     |  13 +
 .../tcZz/networkSecurity/TcSjlytjMapper.xml   |   6 +
 .../tcZz/networkSecurity/TcXtjcMapper.xml     |   7 +
 .../tcZz/networkSecurity/TcZfwzMapper.xml     |   9 +
 58 files changed, 540 insertions(+), 1607 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcDbdwController.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcDbdwController.java
index 0f468691..89336b8f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcDbdwController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcDbdwController.java
@@ -25,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 等保单位Controller
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
 @RestController
 @RequestMapping("/tcZz/networkSecurity/dbdw")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcDbxtController.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcDbxtController.java
index 2851f9a0..3c0b3912 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcDbxtController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcDbxtController.java
@@ -25,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 等保系统Controller
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
 @RestController
 @RequestMapping("/tcZz/networkSecurity/dbxt")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcIdcdwController.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcIdcdwController.java
index 744e1a3f..93519f05 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcIdcdwController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcIdcdwController.java
@@ -25,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  *  IDC单位Controller
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
 @RestController
 @RequestMapping("/tcZz/networkSecurity/idcdw")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcJgdwController.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcJgdwController.java
index dcf8baa2..a1bc1904 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcJgdwController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcJgdwController.java
@@ -25,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 监管单位Controller
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
 @RestController
 @RequestMapping("/tcZz/networkSecurity/jgdw")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcSjlyController.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcSjlyController.java
index aacc2ad1..bd6074ea 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcSjlyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcSjlyController.java
@@ -22,10 +22,10 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
- * 数据来源 tc_sjly(可推送)Controller
+ * 硬探针、软探针Controller
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
 @RestController
 @RequestMapping("/tcZz/networkSecurity/ryz")
@@ -35,7 +35,7 @@ public class TcSjlyController extends BaseController
     private ITcSjlyService tcSjlyService;
 
     /**
-     * 查询数据来源 tc_sjly(可推送)列表
+     * 查询硬探针、软探针列表
      */
     @PreAuthorize("@ss.hasPermi('tcZz/networkSecurity:ryz:list')")
     @GetMapping("/list")
@@ -47,20 +47,20 @@ public class TcSjlyController extends BaseController
     }
 
     /**
-     * 导出数据来源 tc_sjly(可推送)列表
+     * 导出硬探针、软探针列表
      */
     @PreAuthorize("@ss.hasPermi('tcZz/networkSecurity:ryz:export')")
-    @Log(title = "数据来源 tc_sjly(可推送)", businessType = BusinessType.EXPORT)
+    @Log(title = "硬探针、软探针", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TcSjly tcSjly)
     {
         List<TcSjly> list = tcSjlyService.selectTcSjlyList(tcSjly);
         ExcelUtil<TcSjly> util = new ExcelUtil<TcSjly>(TcSjly.class);
-        util.exportExcel(response, list, "数据来源 tc_sjly(可推送)数据");
+        util.exportExcel(response, list, "硬探针、软探针数据");
     }
 
     /**
-     * 获取数据来源 tc_sjly(可推送)详细信息
+     * 获取硬探针、软探针详细信息
      */
     @PreAuthorize("@ss.hasPermi('tcZz/networkSecurity:ryz:query')")
     @GetMapping(value = "/{id}")
@@ -70,10 +70,10 @@ public class TcSjlyController extends BaseController
     }
 
     /**
-     * 新增数据来源 tc_sjly(可推送)
+     * 新增硬探针、软探针
      */
     @PreAuthorize("@ss.hasPermi('tcZz/networkSecurity:ryz:add')")
-    @Log(title = "数据来源 tc_sjly(可推送)", businessType = BusinessType.INSERT)
+    @Log(title = "硬探针、软探针", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TcSjly tcSjly)
     {
@@ -81,10 +81,10 @@ public class TcSjlyController extends BaseController
     }
 
     /**
-     * 修改数据来源 tc_sjly(可推送)
+     * 修改硬探针、软探针
      */
     @PreAuthorize("@ss.hasPermi('tcZz/networkSecurity:ryz:edit')")
-    @Log(title = "数据来源 tc_sjly(可推送)", businessType = BusinessType.UPDATE)
+    @Log(title = "硬探针、软探针", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TcSjly tcSjly)
     {
@@ -92,10 +92,10 @@ public class TcSjlyController extends BaseController
     }
 
     /**
-     * 删除数据来源 tc_sjly(可推送)
+     * 删除硬探针、软探针
      */
     @PreAuthorize("@ss.hasPermi('tcZz/networkSecurity:ryz:remove')")
-    @Log(title = "数据来源 tc_sjly(可推送)", businessType = BusinessType.DELETE)
+    @Log(title = "硬探针、软探针", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcSjlytjController.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcSjlytjController.java
index c1965aaf..e7b42432 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcSjlytjController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcSjlytjController.java
@@ -22,10 +22,10 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
- * 数据来源统计tc_sjlytj Controller
+ * 数据来源统计Controller
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
 @RestController
 @RequestMapping("/tcZz/networkSecurity/DataSourceTj")
@@ -35,7 +35,7 @@ public class TcSjlytjController extends BaseController
     private ITcSjlytjService tcSjlytjService;
 
     /**
-     * 查询数据来源统计tc_sjlytj 列表
+     * 查询数据来源统计列表
      */
     @PreAuthorize("@ss.hasPermi('tcZz/networkSecurity:DataSourceTj:list')")
     @GetMapping("/list")
@@ -47,20 +47,20 @@ public class TcSjlytjController extends BaseController
     }
 
     /**
-     * 导出数据来源统计tc_sjlytj 列表
+     * 导出数据来源统计列表
      */
     @PreAuthorize("@ss.hasPermi('tcZz/networkSecurity:DataSourceTj:export')")
-    @Log(title = "数据来源统计tc_sjlytj ", businessType = BusinessType.EXPORT)
+    @Log(title = "数据来源统计", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TcSjlytj tcSjlytj)
     {
         List<TcSjlytj> list = tcSjlytjService.selectTcSjlytjList(tcSjlytj);
         ExcelUtil<TcSjlytj> util = new ExcelUtil<TcSjlytj>(TcSjlytj.class);
-        util.exportExcel(response, list, "数据来源统计tc_sjlytj 数据");
+        util.exportExcel(response, list, "数据来源统计数据");
     }
 
     /**
-     * 获取数据来源统计tc_sjlytj 详细信息
+     * 获取数据来源统计详细信息
      */
     @PreAuthorize("@ss.hasPermi('tcZz/networkSecurity:DataSourceTj:query')")
     @GetMapping(value = "/{id}")
@@ -70,10 +70,10 @@ public class TcSjlytjController extends BaseController
     }
 
     /**
-     * 新增数据来源统计tc_sjlytj 
+     * 新增数据来源统计
      */
     @PreAuthorize("@ss.hasPermi('tcZz/networkSecurity:DataSourceTj:add')")
-    @Log(title = "数据来源统计tc_sjlytj ", businessType = BusinessType.INSERT)
+    @Log(title = "数据来源统计", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TcSjlytj tcSjlytj)
     {
@@ -81,10 +81,10 @@ public class TcSjlytjController extends BaseController
     }
 
     /**
-     * 修改数据来源统计tc_sjlytj 
+     * 修改数据来源统计
      */
     @PreAuthorize("@ss.hasPermi('tcZz/networkSecurity:DataSourceTj:edit')")
-    @Log(title = "数据来源统计tc_sjlytj ", businessType = BusinessType.UPDATE)
+    @Log(title = "数据来源统计", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TcSjlytj tcSjlytj)
     {
@@ -92,10 +92,10 @@ public class TcSjlytjController extends BaseController
     }
 
     /**
-     * 删除数据来源统计tc_sjlytj 
+     * 删除数据来源统计
      */
     @PreAuthorize("@ss.hasPermi('tcZz/networkSecurity:DataSourceTj:remove')")
-    @Log(title = "数据来源统计tc_sjlytj ", businessType = BusinessType.DELETE)
+    @Log(title = "数据来源统计", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
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 6bd3aef9..2dc2e851 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
@@ -25,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 系统监测Controller
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
 @RestController
 @RequestMapping("/tcZz/networkSecurity/xtjc")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcZfwzController.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcZfwzController.java
index 26a0cc94..8a752900 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcZfwzController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcZfwzController.java
@@ -25,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 政府网站Controller
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
 @RestController
 @RequestMapping("/tcZz/networkSecurity/zfwz")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcAqyh.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcAqyh.java
index 38d093e7..fdc610d7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcAqyh.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcAqyh.java
@@ -1,5 +1,8 @@
 package com.ruoyi.tcZz.domain;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -11,60 +14,25 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2023-10-12
  */
+@Data
+@ApiModel("安全隐患")
 public class TcAqyh extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "id")
     private Long id;
 
     /** 隐患名称 */
+    @ApiModelProperty(value = "隐患名称")
     @Excel(name = "隐患名称")
     private String yhName;
 
     /** 隐患数量 */
+    @ApiModelProperty(value = "隐患数量")
     @Excel(name = "隐患数量")
     private String yhCount;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
 
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setYhName(String yhName) 
-    {
-        this.yhName = yhName;
-    }
-
-    public String getYhName() 
-    {
-        return yhName;
-    }
-    public void setYhCount(String yhCount) 
-    {
-        this.yhCount = yhCount;
-    }
-
-    public String getYhCount() 
-    {
-        return yhCount;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("yhName", getYhName())
-            .append("yhCount", getYhCount())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcBmtb.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcBmtb.java
index 3b84eeb9..f902ad63 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcBmtb.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcBmtb.java
@@ -1,5 +1,8 @@
 package com.ruoyi.tcZz.domain;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -11,88 +14,35 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2023-10-12
  */
+@Data
+@ApiModel("部门通报对象")
 public class TcBmtb extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "id")
     private Long id;
 
     /** 启用/禁用 */
-    @Excel(name = "启用/禁用")
+    @ApiModelProperty(value = "启用/禁用,1=启用,2=禁用")
+    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
     private Long isStatus;
 
     /** 部门名称 */
+    @ApiModelProperty(value = "部门名称")
     @Excel(name = "部门名称")
     private String depName;
 
     /** 文件名称 */
+    @ApiModelProperty(value = "文件名称")
     @Excel(name = "文件名称")
     private String fileName;
 
     /** 文件路径(完整路径) */
+    @ApiModelProperty(value = "文件路径(完整路径)")
     @Excel(name = "文件路径(完整路径)")
     private String fileUrl;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
 
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setIsStatus(Long isStatus) 
-    {
-        this.isStatus = isStatus;
-    }
-
-    public Long getIsStatus() 
-    {
-        return isStatus;
-    }
-    public void setDepName(String depName) 
-    {
-        this.depName = depName;
-    }
-
-    public String getDepName() 
-    {
-        return depName;
-    }
-    public void setFileName(String fileName) 
-    {
-        this.fileName = fileName;
-    }
-
-    public String getFileName() 
-    {
-        return fileName;
-    }
-    public void setFileUrl(String fileUrl) 
-    {
-        this.fileUrl = fileUrl;
-    }
-
-    public String getFileUrl() 
-    {
-        return fileUrl;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("isStatus", getIsStatus())
-            .append("depName", getDepName())
-            .append("fileName", getFileName())
-            .append("fileUrl", getFileUrl())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcDbdw.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcDbdw.java
index 62eacb9c..60622a31 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcDbdw.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcDbdw.java
@@ -1,5 +1,8 @@
 package com.ruoyi.tcZz.domain;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -9,247 +12,97 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 等保单位对象 tc_dbdw
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
+@Data
+@ApiModel("等保单位对象")
 public class TcDbdw extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "id")
     private Long id;
 
-    /** 区域id */
-    @Excel(name = "区域id")
+    /** 区域 */
+    @ApiModelProperty(value = "区域,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道")
+    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道")
     private String areaId;
 
     /** 单位名称 */
+    @ApiModelProperty(value = "单位名称")
     @Excel(name = "单位名称")
     private String unitName;
 
     /** 邮政编码 */
+    @ApiModelProperty(value = "邮政编码")
     @Excel(name = "邮政编码")
     private String postalCode;
 
     /** 单位地址—省 */
+    @ApiModelProperty(value = "单位地址—省")
+    @Excel(name = "单位地址—省")
     private String addressProvince;
 
     /** 单位地址—市 */
+    @ApiModelProperty(value = "单位地址—市")
+    @Excel(name = "单位地址—市")
     private String addressCity;
 
     /** 单位地址—区/县 */
+    @ApiModelProperty(value = "单位地址—区/县")
+    @Excel(name = "单位地址—区/县")
     private String addressCounty;
 
     /** 单位地址 */
+    @ApiModelProperty(value = "单位地址")
     @Excel(name = "单位地址")
     private String unitAddress;
 
     /** 行政区域代码 */
+    @ApiModelProperty(value = "行政区域代码")
     @Excel(name = "行政区域代码")
     private String countyCode;
 
     /** 隶属关系 */
+    @ApiModelProperty(value = "隶属关系")
+    @Excel(name = "隶属关系")
     private String lsGx;
 
     /** 单位类型 */
+    @ApiModelProperty(value = "单位类型")
+    @Excel(name = "单位类型")
     private String unitType;
 
     /** 行业类型 */
+    @ApiModelProperty(value = "行业类型")
+    @Excel(name = "行业类型")
     private String industryType;
 
     /** 单位责任人—姓名 */
+    @ApiModelProperty(value = "单位责任人—姓名")
+    @Excel(name = "单位责任人—姓名")
     private String fzrName;
 
     /** 单位责任人—职务 */
+    @ApiModelProperty(value = "单位责任人—职务")
+    @Excel(name = "单位责任人—职务")
     private String fzrDuty;
 
     /** 单位责任人—办公电话 */
+    @ApiModelProperty(value = "单位责任人—办公电话")
+    @Excel(name = "单位责任人—办公电话")
     private String fzrTel;
 
     /** 单位责任人—电子邮件 */
+    @ApiModelProperty(value = "单位责任人—电子邮件")
+    @Excel(name = "单位责任人—电子邮件")
     private String fzrEmail;
 
-    /** 1.启用 2.禁用 */
+    /** 启用/禁用 */
+    @ApiModelProperty(value = "启用/禁用,1=启用,2=禁用")
+    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
     private Long isStatus;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setAreaId(String areaId) 
-    {
-        this.areaId = areaId;
-    }
-
-    public String getAreaId() 
-    {
-        return areaId;
-    }
-    public void setUnitName(String unitName) 
-    {
-        this.unitName = unitName;
-    }
-
-    public String getUnitName() 
-    {
-        return unitName;
-    }
-    public void setPostalCode(String postalCode) 
-    {
-        this.postalCode = postalCode;
-    }
-
-    public String getPostalCode() 
-    {
-        return postalCode;
-    }
-    public void setAddressProvince(String addressProvince) 
-    {
-        this.addressProvince = addressProvince;
-    }
-
-    public String getAddressProvince() 
-    {
-        return addressProvince;
-    }
-    public void setAddressCity(String addressCity) 
-    {
-        this.addressCity = addressCity;
-    }
-
-    public String getAddressCity() 
-    {
-        return addressCity;
-    }
-    public void setAddressCounty(String addressCounty) 
-    {
-        this.addressCounty = addressCounty;
-    }
-
-    public String getAddressCounty() 
-    {
-        return addressCounty;
-    }
-    public void setUnitAddress(String unitAddress) 
-    {
-        this.unitAddress = unitAddress;
-    }
-
-    public String getUnitAddress() 
-    {
-        return unitAddress;
-    }
-    public void setCountyCode(String countyCode) 
-    {
-        this.countyCode = countyCode;
-    }
-
-    public String getCountyCode() 
-    {
-        return countyCode;
-    }
-    public void setLsGx(String lsGx) 
-    {
-        this.lsGx = lsGx;
-    }
-
-    public String getLsGx() 
-    {
-        return lsGx;
-    }
-    public void setUnitType(String unitType) 
-    {
-        this.unitType = unitType;
-    }
-
-    public String getUnitType() 
-    {
-        return unitType;
-    }
-    public void setIndustryType(String industryType) 
-    {
-        this.industryType = industryType;
-    }
-
-    public String getIndustryType() 
-    {
-        return industryType;
-    }
-    public void setFzrName(String fzrName) 
-    {
-        this.fzrName = fzrName;
-    }
-
-    public String getFzrName() 
-    {
-        return fzrName;
-    }
-    public void setFzrDuty(String fzrDuty) 
-    {
-        this.fzrDuty = fzrDuty;
-    }
-
-    public String getFzrDuty() 
-    {
-        return fzrDuty;
-    }
-    public void setFzrTel(String fzrTel) 
-    {
-        this.fzrTel = fzrTel;
-    }
-
-    public String getFzrTel() 
-    {
-        return fzrTel;
-    }
-    public void setFzrEmail(String fzrEmail) 
-    {
-        this.fzrEmail = fzrEmail;
-    }
-
-    public String getFzrEmail() 
-    {
-        return fzrEmail;
-    }
-    public void setIsStatus(Long isStatus) 
-    {
-        this.isStatus = isStatus;
-    }
-
-    public Long getIsStatus() 
-    {
-        return isStatus;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("areaId", getAreaId())
-            .append("unitName", getUnitName())
-            .append("postalCode", getPostalCode())
-            .append("addressProvince", getAddressProvince())
-            .append("addressCity", getAddressCity())
-            .append("addressCounty", getAddressCounty())
-            .append("unitAddress", getUnitAddress())
-            .append("countyCode", getCountyCode())
-            .append("lsGx", getLsGx())
-            .append("unitType", getUnitType())
-            .append("industryType", getIndustryType())
-            .append("fzrName", getFzrName())
-            .append("fzrDuty", getFzrDuty())
-            .append("fzrTel", getFzrTel())
-            .append("fzrEmail", getFzrEmail())
-            .append("isStatus", getIsStatus())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
+
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcDbxt.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcDbxt.java
index 6d4ab528..0a50faba 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcDbxt.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcDbxt.java
@@ -2,295 +2,129 @@ package com.ruoyi.tcZz.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 等保系统对象 tc_dbxt
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
+@Data
+@ApiModel("等保系统对象")
 public class TcDbxt extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "id")
     private Long id;
 
-    /** 区域id */
-    @Excel(name = "区域id")
+    /** 区域 */
+    @ApiModelProperty(value = "区域,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道")
+    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道")
     private String areaId;
 
     /** 系统名称 */
+    @ApiModelProperty(value = "系统名称")
     @Excel(name = "系统名称")
     private String systemName;
 
     /** 备案编号 */
+    @ApiModelProperty(value = "备案编号")
     @Excel(name = "备案编号")
     private String beianNum;
 
     /** 信息系统安全保护等级 */
+    @ApiModelProperty(value = "信息系统安全保护等级")
     @Excel(name = "信息系统安全保护等级")
     private String safetyLevel;
 
     /** 单位名称 */
+    @ApiModelProperty(value = "单位名称")
+    @Excel(name = "单位名称")
     private String unitName;
 
     /** 业务类型 */
+    @ApiModelProperty(value = "业务类型")
+    @Excel(name = "业务类型")
     private String businessType;
 
     /** 服务范围 */
+    @ApiModelProperty(value = "服务范围")
+    @Excel(name = "服务范围")
     private String serviceArea;
 
     /** 服务对象 */
+    @ApiModelProperty(value = "服务对象")
+    @Excel(name = "服务对象")
     private String serviceObj;
 
     /** 覆盖范围 */
+    @ApiModelProperty(value = "覆盖范围")
+    @Excel(name = "覆盖范围")
     private String coverageArea;
 
     /** 网络性质 */
+    @ApiModelProperty(value = "网络性质")
+    @Excel(name = "网络性质")
     private String networkProperty;
 
     /** 系统互联情况 */
+    @ApiModelProperty(value = "系统互联情况")
+    @Excel(name = "系统互联情况")
     private String systemHlql;
 
     /** 投入运行使用日期 */
+    @Excel(name = "投入运行使用日期", dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "投入运行使用日期")
     private Date startTime;
 
     /** 系统是否分级 */
+    @ApiModelProperty(value = "系统是否分级")
+    @Excel(name = "系统是否分级")
     private String isLevel;
 
     /** 系统定级时间 */
+    @Excel(name = "系统定级时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "系统定级时间")
     private Date systemDjtime;
 
     /** 专家评审情况 */
+    @ApiModelProperty(value = "专家评审情况")
+    @Excel(name = "专家评审情况")
     private String psQk;
 
     /** 是否有主管部门 */
+    @ApiModelProperty(value = "是否有主管部门")
+    @Excel(name = "是否有主管部门")
     private String isHavedep;
 
     /** 系统定级报告 */
+    @ApiModelProperty(value = "系统定级报告")
+    @Excel(name = "系统定级报告")
     private String systemDjbg;
 
     /** 系统状态 */
+    @ApiModelProperty(value = "系统状态")
+    @Excel(name = "系统状态")
     private String systemState;
 
-    /** 1.启用 2.禁用 */
-    @Excel(name = "1.启用 2.禁用")
+    /** 启用/禁用 */
+    @ApiModelProperty(value = "启用/禁用,1=启用,2=禁用")
+    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
     private Long isStatus;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
 
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setAreaId(String areaId) 
-    {
-        this.areaId = areaId;
-    }
-
-    public String getAreaId() 
-    {
-        return areaId;
-    }
-    public void setSystemName(String systemName) 
-    {
-        this.systemName = systemName;
-    }
-
-    public String getSystemName() 
-    {
-        return systemName;
-    }
-    public void setBeianNum(String beianNum) 
-    {
-        this.beianNum = beianNum;
-    }
-
-    public String getBeianNum() 
-    {
-        return beianNum;
-    }
-    public void setSafetyLevel(String safetyLevel) 
-    {
-        this.safetyLevel = safetyLevel;
-    }
-
-    public String getSafetyLevel() 
-    {
-        return safetyLevel;
-    }
-    public void setUnitName(String unitName) 
-    {
-        this.unitName = unitName;
-    }
-
-    public String getUnitName() 
-    {
-        return unitName;
-    }
-    public void setBusinessType(String businessType) 
-    {
-        this.businessType = businessType;
-    }
-
-    public String getBusinessType() 
-    {
-        return businessType;
-    }
-    public void setServiceArea(String serviceArea) 
-    {
-        this.serviceArea = serviceArea;
-    }
-
-    public String getServiceArea() 
-    {
-        return serviceArea;
-    }
-    public void setServiceObj(String serviceObj) 
-    {
-        this.serviceObj = serviceObj;
-    }
-
-    public String getServiceObj() 
-    {
-        return serviceObj;
-    }
-    public void setCoverageArea(String coverageArea) 
-    {
-        this.coverageArea = coverageArea;
-    }
-
-    public String getCoverageArea() 
-    {
-        return coverageArea;
-    }
-    public void setNetworkProperty(String networkProperty) 
-    {
-        this.networkProperty = networkProperty;
-    }
-
-    public String getNetworkProperty() 
-    {
-        return networkProperty;
-    }
-    public void setSystemHlql(String systemHlql) 
-    {
-        this.systemHlql = systemHlql;
-    }
-
-    public String getSystemHlql() 
-    {
-        return systemHlql;
-    }
-    public void setStartTime(Date startTime) 
-    {
-        this.startTime = startTime;
-    }
-
-    public Date getStartTime() 
-    {
-        return startTime;
-    }
-    public void setIsLevel(String isLevel) 
-    {
-        this.isLevel = isLevel;
-    }
-
-    public String getIsLevel() 
-    {
-        return isLevel;
-    }
-    public void setSystemDjtime(Date systemDjtime) 
-    {
-        this.systemDjtime = systemDjtime;
-    }
-
-    public Date getSystemDjtime() 
-    {
-        return systemDjtime;
-    }
-    public void setPsQk(String psQk) 
-    {
-        this.psQk = psQk;
-    }
-
-    public String getPsQk() 
-    {
-        return psQk;
-    }
-    public void setIsHavedep(String isHavedep) 
-    {
-        this.isHavedep = isHavedep;
-    }
-
-    public String getIsHavedep() 
-    {
-        return isHavedep;
-    }
-    public void setSystemDjbg(String systemDjbg) 
-    {
-        this.systemDjbg = systemDjbg;
-    }
-
-    public String getSystemDjbg() 
-    {
-        return systemDjbg;
-    }
-    public void setSystemState(String systemState) 
-    {
-        this.systemState = systemState;
-    }
-
-    public String getSystemState() 
-    {
-        return systemState;
-    }
-    public void setIsStatus(Long isStatus) 
-    {
-        this.isStatus = isStatus;
-    }
-
-    public Long getIsStatus() 
-    {
-        return isStatus;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("areaId", getAreaId())
-            .append("systemName", getSystemName())
-            .append("beianNum", getBeianNum())
-            .append("safetyLevel", getSafetyLevel())
-            .append("unitName", getUnitName())
-            .append("businessType", getBusinessType())
-            .append("serviceArea", getServiceArea())
-            .append("serviceObj", getServiceObj())
-            .append("coverageArea", getCoverageArea())
-            .append("networkProperty", getNetworkProperty())
-            .append("systemHlql", getSystemHlql())
-            .append("startTime", getStartTime())
-            .append("isLevel", getIsLevel())
-            .append("systemDjtime", getSystemDjtime())
-            .append("psQk", getPsQk())
-            .append("isHavedep", getIsHavedep())
-            .append("systemDjbg", getSystemDjbg())
-            .append("systemState", getSystemState())
-            .append("isStatus", getIsStatus())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcFbqk.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcFbqk.java
index 675ce981..a75c23d0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcFbqk.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcFbqk.java
@@ -1,5 +1,8 @@
 package com.ruoyi.tcZz.domain;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -11,60 +14,25 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2023-10-12
  */
+@Data
+@ApiModel("分布情况")
 public class TcFbqk extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "id")
     private Long id;
 
     /** 名称 */
+    @ApiModelProperty(value = "名称")
     @Excel(name = "名称")
     private String cityName;
 
     /** 占比 */
+    @ApiModelProperty(value = "占比")
     @Excel(name = "占比")
     private String zb;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
 
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setCityName(String cityName) 
-    {
-        this.cityName = cityName;
-    }
-
-    public String getCityName() 
-    {
-        return cityName;
-    }
-    public void setZb(String zb) 
-    {
-        this.zb = zb;
-    }
-
-    public String getZb() 
-    {
-        return zb;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("cityName", getCityName())
-            .append("zb", getZb())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcIdcdw.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcIdcdw.java
index a3f1fc82..a03b93e1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcIdcdw.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcIdcdw.java
@@ -1,5 +1,8 @@
 package com.ruoyi.tcZz.domain;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -9,90 +12,36 @@ import com.ruoyi.common.core.domain.BaseEntity;
  *  IDC单位对象 tc_idcdw
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
+@Data
+@ApiModel("IDC单位对象")
 public class TcIdcdw extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "id")
     private Long id;
 
     /** 区域 */
-    @Excel(name = "区域")
+    @ApiModelProperty(value = "区域,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道")
+    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道")
     private String areaId;
 
     /** 启用/禁用 */
-    @Excel(name = "启用/禁用")
+    @ApiModelProperty(value = "启用/禁用,1=启用,2=禁用")
+    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
     private Long isStatus;
 
     /** lDC名称 */
+    @ApiModelProperty(value = "lDC名称")
     @Excel(name = "lDC名称")
     private String ldcName;
 
     /** iP段信息 */
+    @ApiModelProperty(value = "iP段信息")
     @Excel(name = "iP段信息")
     private String ipData;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setAreaId(String areaId) 
-    {
-        this.areaId = areaId;
-    }
-
-    public String getAreaId() 
-    {
-        return areaId;
-    }
-    public void setIsStatus(Long isStatus) 
-    {
-        this.isStatus = isStatus;
-    }
-
-    public Long getIsStatus() 
-    {
-        return isStatus;
-    }
-    public void setLdcName(String ldcName) 
-    {
-        this.ldcName = ldcName;
-    }
-
-    public String getLdcName() 
-    {
-        return ldcName;
-    }
-    public void setIpData(String ipData) 
-    {
-        this.ipData = ipData;
-    }
-
-    public String getIpData() 
-    {
-        return ipData;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("areaId", getAreaId())
-            .append("isStatus", getIsStatus())
-            .append("ldcName", getLdcName())
-            .append("ipData", getIpData())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcJgdw.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcJgdw.java
index 0d65b927..18fa1797 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcJgdw.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcJgdw.java
@@ -1,5 +1,8 @@
 package com.ruoyi.tcZz.domain;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -9,159 +12,62 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 监管单位对象 tc_jgdw
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
+@Data
+@ApiModel("监管单位对象")
 public class TcJgdw extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "id")
     private Long id;
 
-    /** 区域id */
-    @Excel(name = "区域id")
+    /** 区域 */
+    @ApiModelProperty(value = "区域,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道")
+    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道")
     private String areaId;
 
-    /** 1.启用 2.禁用 */
-    @Excel(name = "1.启用 2.禁用")
+    /** 启用/禁用 */
+    @ApiModelProperty(value = "启用/禁用,1=启用,2=禁用")
+    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
     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;
 
-    /** 记录类型(1. 监管单位
-2.网站监测
-) */
-    @Excel(name = "记录类型", readConverterExp = "1=.,监=管单位 2.网站监测")
+    /** 记录类型 */
+    @ApiModelProperty(value = "记录类型,1=监管单位,2=网站监测")
+    @Excel(name = "记录类型",readConverterExp = "1=监管单位,2=网站监测",combo = "1=监管单位,2=网站监测")
     private Long type;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
 
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setAreaId(String areaId) 
-    {
-        this.areaId = areaId;
-    }
-
-    public String getAreaId() 
-    {
-        return areaId;
-    }
-    public void setIsStatus(Long isStatus) 
-    {
-        this.isStatus = isStatus;
-    }
-
-    public Long getIsStatus() 
-    {
-        return isStatus;
-    }
-    public void setUnitName(String unitName) 
-    {
-        this.unitName = unitName;
-    }
-
-    public String getUnitName() 
-    {
-        return unitName;
-    }
-    public void setSystemName(String systemName) 
-    {
-        this.systemName = systemName;
-    }
-
-    public String getSystemName() 
-    {
-        return systemName;
-    }
-    public void setSystemUrl(String systemUrl) 
-    {
-        this.systemUrl = systemUrl;
-    }
-
-    public String getSystemUrl() 
-    {
-        return systemUrl;
-    }
-    public void setSysyemIp(String sysyemIp) 
-    {
-        this.sysyemIp = sysyemIp;
-    }
-
-    public String getSysyemIp() 
-    {
-        return sysyemIp;
-    }
-    public void setIsFocus(String isFocus) 
-    {
-        this.isFocus = isFocus;
-    }
-
-    public String getIsFocus() 
-    {
-        return isFocus;
-    }
-    public void setLevel(String level) 
-    {
-        this.level = level;
-    }
-
-    public String getLevel() 
-    {
-        return level;
-    }
-    public void setType(Long type) 
-    {
-        this.type = type;
-    }
-
-    public Long getType() 
-    {
-        return type;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("areaId", getAreaId())
-            .append("isStatus", getIsStatus())
-            .append("unitName", getUnitName())
-            .append("systemName", getSystemName())
-            .append("systemUrl", getSystemUrl())
-            .append("sysyemIp", getSysyemIp())
-            .append("isFocus", getIsFocus())
-            .append("level", getLevel())
-            .append("type", getType())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcMap.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcMap.java
index 710e42af..77ecaefe 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcMap.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcMap.java
@@ -1,5 +1,8 @@
 package com.ruoyi.tcZz.domain;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -11,76 +14,30 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2023-10-12
  */
+@Data
+@ApiModel("地图统计对象")
 public class TcMap extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "id")
     private Long id;
 
     /** 名称 */
+    @ApiModelProperty(value = "名称")
     @Excel(name = "名称")
     private String name;
 
     /** 数量 */
+    @ApiModelProperty(value = "数量")
     @Excel(name = "数量")
     private String count;
 
     /** 1.国际
 2.国内
  */
-    @Excel(name = "1.国际 2.国内")
+    @ApiModelProperty(value = "类型,1=国际,2=国内")
+    @Excel(name = "类型",readConverterExp = "1=国际,2=国内",combo = "1=国际,2=国内")
     private Long type;
-
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setName(String name) 
-    {
-        this.name = name;
-    }
-
-    public String getName() 
-    {
-        return name;
-    }
-    public void setCount(String count) 
-    {
-        this.count = count;
-    }
-
-    public String getCount() 
-    {
-        return count;
-    }
-    public void setType(Long type) 
-    {
-        this.type = type;
-    }
-
-    public Long getType() 
-    {
-        return type;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("name", getName())
-            .append("count", getCount())
-            .append("type", getType())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcSdtb.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcSdtb.java
index b6abe90e..0655d575 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcSdtb.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcSdtb.java
@@ -1,5 +1,8 @@
 package com.ruoyi.tcZz.domain;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -11,88 +14,35 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2023-10-12
  */
+@Data
+@ApiModel("属地通报对象")
 public class TcSdtb extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "id")
     private Long id;
 
     /** 属地名称 */
-    @Excel(name = "属地名称")
+    @ApiModelProperty(value = "属地名称,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道")
+    @Excel(name = "属地名称",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道")
     private Long area;
 
     /** 启用/禁用 */
-    @Excel(name = "启用/禁用")
+    @ApiModelProperty(value = "启用/禁用,1=启用,2=禁用")
+    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
     private Long isStatus;
 
     /** 文件名称 */
+    @ApiModelProperty(value = "文件名称")
     @Excel(name = "文件名称")
     private String fileName;
 
     /** 文件路径(完整路径) */
+    @ApiModelProperty(value = "文件路径(完整路径)")
     @Excel(name = "文件路径(完整路径)")
     private String fileUrl;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
 
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setArea(Long area) 
-    {
-        this.area = area;
-    }
-
-    public Long getArea() 
-    {
-        return area;
-    }
-    public void setIsStatus(Long isStatus) 
-    {
-        this.isStatus = isStatus;
-    }
-
-    public Long getIsStatus() 
-    {
-        return isStatus;
-    }
-    public void setFileName(String fileName) 
-    {
-        this.fileName = fileName;
-    }
-
-    public String getFileName() 
-    {
-        return fileName;
-    }
-    public void setFileUrl(String fileUrl) 
-    {
-        this.fileUrl = fileUrl;
-    }
-
-    public String getFileUrl() 
-    {
-        return fileUrl;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("area", getArea())
-            .append("isStatus", getIsStatus())
-            .append("fileName", getFileName())
-            .append("fileUrl", getFileUrl())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcSgjipTop5.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcSgjipTop5.java
index 926c96d1..c6307ed8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcSgjipTop5.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcSgjipTop5.java
@@ -1,5 +1,8 @@
 package com.ruoyi.tcZz.domain;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -11,60 +14,25 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2023-10-12
  */
+@Data
+@ApiModel("受攻击IPTOP5对象")
 public class TcSgjipTop5 extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "id")
     private Long id;
 
     /** 受攻击IP */
+    @ApiModelProperty(value = "受攻击IP")
     @Excel(name = "受攻击IP")
     private String sAttackIp;
 
     /** 受攻击次数 */
+    @ApiModelProperty(value = "受攻击次数")
     @Excel(name = "受攻击次数")
     private String sAttackCount;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
 
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setsAttackIp(String sAttackIp) 
-    {
-        this.sAttackIp = sAttackIp;
-    }
-
-    public String getsAttackIp() 
-    {
-        return sAttackIp;
-    }
-    public void setsAttackCount(String sAttackCount) 
-    {
-        this.sAttackCount = sAttackCount;
-    }
-
-    public String getsAttackCount() 
-    {
-        return sAttackCount;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("sAttackIp", getsAttackIp())
-            .append("sAttackCount", getsAttackCount())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcSjly.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcSjly.java
index 73d9184a..ea6123cc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcSjly.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcSjly.java
@@ -9,13 +9,13 @@ import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 数据来源 tc_sjly(可推送)对象 tc_sjly
+ * 硬探针、软探针对象 tc_sjly
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
 @Data
-@ApiModel("数据来源")
+@ApiModel("硬探针、软探针对象")
 public class TcSjly extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -24,37 +24,44 @@ public class TcSjly extends BaseEntity
     @ApiModelProperty(value = "id")
     private Long id;
 
-    /** 区域id */
-    @Excel(name = "区域id")
+    /** 区域 */
+    @ApiModelProperty(value = "区域,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道")
+    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道")
     private String areaId;
 
     /** 类型 */
-    @Excel(name = "类型")
+    @ApiModelProperty(value = "类型,1=硬探针,2=软探针")
+    @Excel(name = "类型",readConverterExp = "1=硬探针,2=软探针",combo = "1=硬探针,2=软探针")
     private Long type;
 
     /** 启用/禁用 */
-    @Excel(name = "启用/禁用")
+    @ApiModelProperty(value = "启用/禁用,1=启用,2=禁用")
+    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
     private Long isStatus;
 
     /** 资产名称 */
+    @ApiModelProperty(value = "资产名称")
     @Excel(name = "资产名称")
     private String zcName;
 
     /** 所属单位 */
+    @ApiModelProperty(value = "所属单位")
     @Excel(name = "所属单位")
     private String affUnit;
 
     /** IP地址 */
+    @ApiModelProperty(value = "IP地址")
     @Excel(name = "IP地址")
     private String sysyemIp;
 
     /** 操作系统 */
+    @ApiModelProperty(value = "操作系统")
     @Excel(name = "操作系统")
     private String os;
 
     /** 版本 */
+    @ApiModelProperty(value = "版本")
     @Excel(name = "版本")
     private String versions;
 
-
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcSjlytj.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcSjlytj.java
index c2addb39..00cef9b1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcSjlytj.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcSjlytj.java
@@ -1,98 +1,46 @@
 package com.ruoyi.tcZz.domain;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 数据来源统计tc_sjlytj 对象 tc_sjlytj
+ * 数据来源统计对象 tc_sjlytj
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
+@Data
+@ApiModel("数据来源统计对象")
 public class TcSjlytj extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "id")
     private Long id;
 
     /** 云端监测(G) */
+    @ApiModelProperty(value = "云端监测(G)")
     @Excel(name = "云端监测(G)")
     private String lable1;
 
     /** 云端监测(G)总量 */
+    @ApiModelProperty(value = "云端监测(G)总量")
     @Excel(name = "云端监测(G)总量")
     private String lable1Sum;
 
     /** APT(M) */
+    @ApiModelProperty(value = "APT(M)")
     @Excel(name = "APT(M)")
     private String lable2;
 
     /** APT(M) 总量 */
+    @ApiModelProperty(value = "APT(M) 总量")
     @Excel(name = "APT(M) 总量")
     private String lable2Sum;
-
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setLable1(String lable1) 
-    {
-        this.lable1 = lable1;
-    }
-
-    public String getLable1() 
-    {
-        return lable1;
-    }
-    public void setLable1Sum(String lable1Sum) 
-    {
-        this.lable1Sum = lable1Sum;
-    }
-
-    public String getLable1Sum() 
-    {
-        return lable1Sum;
-    }
-    public void setLable2(String lable2) 
-    {
-        this.lable2 = lable2;
-    }
-
-    public String getLable2() 
-    {
-        return lable2;
-    }
-    public void setLable2Sum(String lable2Sum) 
-    {
-        this.lable2Sum = lable2Sum;
-    }
-
-    public String getLable2Sum() 
-    {
-        return lable2Sum;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("lable1", getLable1())
-            .append("lable1Sum", getLable1Sum())
-            .append("lable2", getLable2())
-            .append("lable2Sum", getLable2Sum())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcTbcz.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcTbcz.java
index 3ef1dea0..fc71e6cb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcTbcz.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcTbcz.java
@@ -1,5 +1,8 @@
 package com.ruoyi.tcZz.domain;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -11,128 +14,50 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2023-10-12
  */
+@Data
+@ApiModel("通报处置对象")
 public class TcTbcz extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "id")
     private Long id;
 
     /** 区域 */
-    @Excel(name = "区域")
+    @ApiModelProperty(value = "区域,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道")
+    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道")
     private String areaId;
 
     /** 启用/禁用 */
-    @Excel(name = "启用/禁用")
+    @ApiModelProperty(value = "启用/禁用,1=启用,2=禁用")
+    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
     private Long isStatus;
 
     /** 单位名称 */
+    @ApiModelProperty(value = "单位名称")
     @Excel(name = "单位名称")
     private String unitName;
 
     /** 目标IP/域名 */
+    @ApiModelProperty(value = "目标IP/域名")
     @Excel(name = "目标IP/域名")
     private String ipAddress;
 
     /** 处置情况 */
+    @ApiModelProperty(value = "处置情况")
     @Excel(name = "处置情况")
     private String czState;
 
     /** 文件名称 */
+    @ApiModelProperty(value = "文件名称")
+    @Excel(name = "文件名称")
     private String fileName;
 
     /** 文件路径(完整路径) */
+    @ApiModelProperty(value = "文件路径(完整路径)")
+    @Excel(name = "文件路径(完整路径)")
     private String fileUrl;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
 
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setAreaId(String areaId) 
-    {
-        this.areaId = areaId;
-    }
-
-    public String getAreaId() 
-    {
-        return areaId;
-    }
-    public void setIsStatus(Long isStatus) 
-    {
-        this.isStatus = isStatus;
-    }
-
-    public Long getIsStatus() 
-    {
-        return isStatus;
-    }
-    public void setUnitName(String unitName) 
-    {
-        this.unitName = unitName;
-    }
-
-    public String getUnitName() 
-    {
-        return unitName;
-    }
-    public void setIpAddress(String ipAddress) 
-    {
-        this.ipAddress = ipAddress;
-    }
-
-    public String getIpAddress() 
-    {
-        return ipAddress;
-    }
-    public void setCzState(String czState) 
-    {
-        this.czState = czState;
-    }
-
-    public String getCzState() 
-    {
-        return czState;
-    }
-    public void setFileName(String fileName) 
-    {
-        this.fileName = fileName;
-    }
-
-    public String getFileName() 
-    {
-        return fileName;
-    }
-    public void setFileUrl(String fileUrl) 
-    {
-        this.fileUrl = fileUrl;
-    }
-
-    public String getFileUrl() 
-    {
-        return fileUrl;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("areaId", getAreaId())
-            .append("isStatus", getIsStatus())
-            .append("unitName", getUnitName())
-            .append("ipAddress", getIpAddress())
-            .append("czState", getCzState())
-            .append("fileName", getFileName())
-            .append("fileUrl", getFileUrl())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcTbwc.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcTbwc.java
index 2f27d762..efb451e0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcTbwc.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcTbwc.java
@@ -2,10 +2,14 @@ package com.ruoyi.tcZz.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 通报完成情况对象 tc_tbwc
@@ -13,103 +17,40 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2023-10-12
  */
+@Data
+@ApiModel("通报完成情况对象")
 public class TcTbwc extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "id")
     private Long id;
 
     /** 时间名称 */
+    @ApiModelProperty(value = "时间名称")
     @Excel(name = "时间名称")
     private String timeName;
 
     /** 通报数量 */
+    @ApiModelProperty(value = "通报数量")
     @Excel(name = "通报数量")
     private String tbCount;
 
     /** 完成期数 */
+    @ApiModelProperty(value = "完成期数")
     @Excel(name = "完成期数")
     private String overCount;
 
     /** 完成比例 */
+    @ApiModelProperty(value = "完成比例")
     @Excel(name = "完成比例")
     private String overScale;
 
     /** 年份 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "年份", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "年份", dateFormat = "yyyy-MM-dd")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "年份")
     private Date year;
-
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setTimeName(String timeName) 
-    {
-        this.timeName = timeName;
-    }
-
-    public String getTimeName() 
-    {
-        return timeName;
-    }
-    public void setTbCount(String tbCount) 
-    {
-        this.tbCount = tbCount;
-    }
-
-    public String getTbCount() 
-    {
-        return tbCount;
-    }
-    public void setOverCount(String overCount) 
-    {
-        this.overCount = overCount;
-    }
-
-    public String getOverCount() 
-    {
-        return overCount;
-    }
-    public void setOverScale(String overScale) 
-    {
-        this.overScale = overScale;
-    }
-
-    public String getOverScale() 
-    {
-        return overScale;
-    }
-    public void setYear(Date year) 
-    {
-        this.year = year;
-    }
-
-    public Date getYear() 
-    {
-        return year;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("timeName", getTimeName())
-            .append("tbCount", getTbCount())
-            .append("overCount", getOverCount())
-            .append("overScale", getOverScale())
-            .append("year", getYear())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWljgtj.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWljgtj.java
index d7c9d5af..295c3037 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWljgtj.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcWljgtj.java
@@ -1,5 +1,8 @@
 package com.ruoyi.tcZz.domain;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -11,88 +14,35 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2023-10-12
  */
+@Data
+@ApiModel("网络监测统计对象")
 public class TcWljgtj extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "id")
     private Long id;
 
     /** 网络攻击(万次) */
+    @ApiModelProperty(value = "网络攻击(万次)")
     @Excel(name = "网络攻击(万次)")
     private String netAttack;
 
     /** 入侵攻击 */
+    @ApiModelProperty(value = "入侵攻击")
     @Excel(name = "入侵攻击")
     private String rqAttack;
 
     /** 恶意扫描 */
+    @ApiModelProperty(value = "恶意扫描")
     @Excel(name = "恶意扫描")
     private String smAttack;
 
     /** 僵木蠕病毒 */
+    @ApiModelProperty(value = "僵木蠕病毒")
     @Excel(name = "僵木蠕病毒")
     private String bdAttack;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
 
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setNetAttack(String netAttack) 
-    {
-        this.netAttack = netAttack;
-    }
-
-    public String getNetAttack() 
-    {
-        return netAttack;
-    }
-    public void setRqAttack(String rqAttack) 
-    {
-        this.rqAttack = rqAttack;
-    }
-
-    public String getRqAttack() 
-    {
-        return rqAttack;
-    }
-    public void setSmAttack(String smAttack) 
-    {
-        this.smAttack = smAttack;
-    }
-
-    public String getSmAttack() 
-    {
-        return smAttack;
-    }
-    public void setBdAttack(String bdAttack) 
-    {
-        this.bdAttack = bdAttack;
-    }
-
-    public String getBdAttack() 
-    {
-        return bdAttack;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("netAttack", getNetAttack())
-            .append("rqAttack", getRqAttack())
-            .append("smAttack", getSmAttack())
-            .append("bdAttack", getBdAttack())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcXtjc.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcXtjc.java
index 9e86e985..c51e6809 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcXtjc.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcXtjc.java
@@ -1,5 +1,8 @@
 package com.ruoyi.tcZz.domain;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -9,144 +12,57 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 系统监测对象 tc_xtjc
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
+@Data
+@ApiModel("系统监测对象")
+
 public class TcXtjc extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "id")
     private Long id;
 
-    /** 区域id */
-    @Excel(name = "区域id")
+    /** 区域 */
+    @ApiModelProperty(value = "区域,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道")
+    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道")
     private String areaId;
 
-    /** 1.启用 2.禁用 */
-    @Excel(name = "1.启用 2.禁用")
+    /** 启用/禁用 */
+    @ApiModelProperty(value = "启用/禁用,1=启用,2=禁用")
+    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
     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;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setAreaId(String areaId) 
-    {
-        this.areaId = areaId;
-    }
-
-    public String getAreaId() 
-    {
-        return areaId;
-    }
-    public void setIsStatus(Long isStatus) 
-    {
-        this.isStatus = isStatus;
-    }
-
-    public Long getIsStatus() 
-    {
-        return isStatus;
-    }
-    public void setUnitName(String unitName) 
-    {
-        this.unitName = unitName;
-    }
-
-    public String getUnitName() 
-    {
-        return unitName;
-    }
-    public void setSystemName(String systemName) 
-    {
-        this.systemName = systemName;
-    }
-
-    public String getSystemName() 
-    {
-        return systemName;
-    }
-    public void setSystemUrl(String systemUrl) 
-    {
-        this.systemUrl = systemUrl;
-    }
-
-    public String getSystemUrl() 
-    {
-        return systemUrl;
-    }
-    public void setSysyemIp(String sysyemIp) 
-    {
-        this.sysyemIp = sysyemIp;
-    }
-
-    public String getSysyemIp() 
-    {
-        return sysyemIp;
-    }
-    public void setIsFocus(String isFocus) 
-    {
-        this.isFocus = isFocus;
-    }
-
-    public String getIsFocus() 
-    {
-        return isFocus;
-    }
-    public void setLevel(String level) 
-    {
-        this.level = level;
-    }
-
-    public String getLevel() 
-    {
-        return level;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("areaId", getAreaId())
-            .append("isStatus", getIsStatus())
-            .append("unitName", getUnitName())
-            .append("systemName", getSystemName())
-            .append("systemUrl", getSystemUrl())
-            .append("sysyemIp", getSysyemIp())
-            .append("isFocus", getIsFocus())
-            .append("level", getLevel())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZfwz.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZfwz.java
index 26897c5f..b2d4e209 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZfwz.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZfwz.java
@@ -1,5 +1,8 @@
 package com.ruoyi.tcZz.domain;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -9,104 +12,41 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 政府网站对象 tc_zfwz
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
+@Data
+@ApiModel("政府网站对象")
 public class TcZfwz extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "id")
     private Long id;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /** 区域 */
+    @ApiModelProperty(value = "区域,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道")
+    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道")
     private String areaId;
 
-    /** 1.启用 2.禁用 */
-    @Excel(name = "1.启用 2.禁用")
+    /** 启用/禁用 */
+    @ApiModelProperty(value = "启用/禁用,1=启用,2=禁用")
+    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
     private Long isStatus;
 
     /** 网站地址 */
+    @ApiModelProperty(value = "网站地址")
     @Excel(name = "网站地址")
     private String webUrl;
 
     /** 资产名称 */
+    @ApiModelProperty(value = "资产名称")
     @Excel(name = "资产名称")
     private String assetName;
 
     /** 资产重要等级 */
+    @ApiModelProperty(value = "资产重要等级")
     @Excel(name = "资产重要等级")
     private String assetLevel;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setAreaId(String areaId) 
-    {
-        this.areaId = areaId;
-    }
-
-    public String getAreaId() 
-    {
-        return areaId;
-    }
-    public void setIsStatus(Long isStatus) 
-    {
-        this.isStatus = isStatus;
-    }
-
-    public Long getIsStatus() 
-    {
-        return isStatus;
-    }
-    public void setWebUrl(String webUrl) 
-    {
-        this.webUrl = webUrl;
-    }
-
-    public String getWebUrl() 
-    {
-        return webUrl;
-    }
-    public void setAssetName(String assetName) 
-    {
-        this.assetName = assetName;
-    }
-
-    public String getAssetName() 
-    {
-        return assetName;
-    }
-    public void setAssetLevel(String assetLevel) 
-    {
-        this.assetLevel = assetLevel;
-    }
-
-    public String getAssetLevel() 
-    {
-        return assetLevel;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("areaId", getAreaId())
-            .append("isStatus", getIsStatus())
-            .append("webUrl", getWebUrl())
-            .append("assetName", getAssetName())
-            .append("assetLevel", getAssetLevel())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZxyh.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZxyh.java
index bf1cf2ed..9fc276ba 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZxyh.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcZxyh.java
@@ -1,5 +1,8 @@
 package com.ruoyi.tcZz.domain;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -11,141 +14,55 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2023-10-12
  */
+@Data
+@ApiModel("最新隐患对象")
 public class TcZxyh extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "id")
     private Long id;
 
     /** 区域 */
-    @Excel(name = "区域")
+    @ApiModelProperty(value = "区域,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道")
+    @Excel(name = "区域",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道")
     private String areaId;
 
     /** 启用/禁用 */
-    @Excel(name = "启用/禁用")
+    @ApiModelProperty(value = "启用/禁用,1=启用,2=禁用")
+    @Excel(name = "启用/禁用",readConverterExp = "1=启用,2=禁用",combo = "1=启用,2=禁用")
     private Long isStatus;
 
     /** 单位名称 */
+    @ApiModelProperty(value = "单位名称")
     @Excel(name = "单位名称")
     private String unitName;
 
     /** 隐患名称 */
+    @ApiModelProperty(value = "隐患名称")
     @Excel(name = "隐患名称")
     private String yhName;
 
     /** 等级 */
+    @ApiModelProperty(value = "等级")
+    @Excel(name = "等级")
     private String level;
 
     /** 隐患来源 */
+    @ApiModelProperty(value = "隐患来源")
     @Excel(name = "隐患来源")
     private String yhLy;
 
     /** 文件名称 */
+    @ApiModelProperty(value = "文件名称")
+    @Excel(name = "文件名称")
     private String fileName;
 
     /** 文件路径(完整路径) */
+    @ApiModelProperty(value = "文件路径(完整路径)")
+    @Excel(name = "文件路径(完整路径)")
     private String fileUrl;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
 
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setAreaId(String areaId) 
-    {
-        this.areaId = areaId;
-    }
-
-    public String getAreaId() 
-    {
-        return areaId;
-    }
-    public void setIsStatus(Long isStatus) 
-    {
-        this.isStatus = isStatus;
-    }
-
-    public Long getIsStatus() 
-    {
-        return isStatus;
-    }
-    public void setUnitName(String unitName) 
-    {
-        this.unitName = unitName;
-    }
-
-    public String getUnitName() 
-    {
-        return unitName;
-    }
-    public void setYhName(String yhName) 
-    {
-        this.yhName = yhName;
-    }
-
-    public String getYhName() 
-    {
-        return yhName;
-    }
-    public void setLevel(String level) 
-    {
-        this.level = level;
-    }
-
-    public String getLevel() 
-    {
-        return level;
-    }
-    public void setYhLy(String yhLy) 
-    {
-        this.yhLy = yhLy;
-    }
-
-    public String getYhLy() 
-    {
-        return yhLy;
-    }
-    public void setFileName(String fileName) 
-    {
-        this.fileName = fileName;
-    }
-
-    public String getFileName() 
-    {
-        return fileName;
-    }
-    public void setFileUrl(String fileUrl) 
-    {
-        this.fileUrl = fileUrl;
-    }
-
-    public String getFileUrl() 
-    {
-        return fileUrl;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("areaId", getAreaId())
-            .append("isStatus", getIsStatus())
-            .append("unitName", getUnitName())
-            .append("yhName", getYhName())
-            .append("level", getLevel())
-            .append("yhLy", getYhLy())
-            .append("fileName", getFileName())
-            .append("fileUrl", getFileUrl())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcDbdwMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcDbdwMapper.java
index 9a37f1a9..dcb9e5eb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcDbdwMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcDbdwMapper.java
@@ -7,7 +7,7 @@ import com.ruoyi.tcZz.domain.TcDbdw;
  * 等保单位Mapper接口
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
 public interface TcDbdwMapper 
 {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcDbxtMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcDbxtMapper.java
index 6be529f0..c5821f2f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcDbxtMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcDbxtMapper.java
@@ -7,7 +7,7 @@ import com.ruoyi.tcZz.domain.TcDbxt;
  * 等保系统Mapper接口
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
 public interface TcDbxtMapper 
 {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcIdcdwMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcIdcdwMapper.java
index 785a755c..038306e6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcIdcdwMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcIdcdwMapper.java
@@ -7,7 +7,7 @@ import com.ruoyi.tcZz.domain.TcIdcdw;
  *  IDC单位Mapper接口
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
 public interface TcIdcdwMapper 
 {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcJgdwMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcJgdwMapper.java
index 9fa9c95c..c275394b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcJgdwMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcJgdwMapper.java
@@ -7,7 +7,7 @@ import com.ruoyi.tcZz.domain.TcJgdw;
  * 监管单位Mapper接口
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
 public interface TcJgdwMapper 
 {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcSjlyMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcSjlyMapper.java
index a8c4f5a9..7c826ed7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcSjlyMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcSjlyMapper.java
@@ -4,55 +4,55 @@ import java.util.List;
 import com.ruoyi.tcZz.domain.TcSjly;
 
 /**
- * 数据来源 tc_sjly(可推送)Mapper接口
+ * 硬探针、软探针Mapper接口
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
 public interface TcSjlyMapper 
 {
     /**
-     * 查询数据来源 tc_sjly(可推送)
+     * 查询硬探针、软探针
      * 
-     * @param id 数据来源 tc_sjly(可推送)主键
-     * @return 数据来源 tc_sjly(可推送)
+     * @param id 硬探针、软探针主键
+     * @return 硬探针、软探针
      */
     public TcSjly selectTcSjlyById(Long id);
 
     /**
-     * 查询数据来源 tc_sjly(可推送)列表
+     * 查询硬探针、软探针列表
      * 
-     * @param tcSjly 数据来源 tc_sjly(可推送)
-     * @return 数据来源 tc_sjly(可推送)集合
+     * @param tcSjly 硬探针、软探针
+     * @return 硬探针、软探针集合
      */
     public List<TcSjly> selectTcSjlyList(TcSjly tcSjly);
 
     /**
-     * 新增数据来源 tc_sjly(可推送)
+     * 新增硬探针、软探针
      * 
-     * @param tcSjly 数据来源 tc_sjly(可推送)
+     * @param tcSjly 硬探针、软探针
      * @return 结果
      */
     public int insertTcSjly(TcSjly tcSjly);
 
     /**
-     * 修改数据来源 tc_sjly(可推送)
+     * 修改硬探针、软探针
      * 
-     * @param tcSjly 数据来源 tc_sjly(可推送)
+     * @param tcSjly 硬探针、软探针
      * @return 结果
      */
     public int updateTcSjly(TcSjly tcSjly);
 
     /**
-     * 删除数据来源 tc_sjly(可推送)
+     * 删除硬探针、软探针
      * 
-     * @param id 数据来源 tc_sjly(可推送)主键
+     * @param id 硬探针、软探针主键
      * @return 结果
      */
     public int deleteTcSjlyById(Long id);
 
     /**
-     * 批量删除数据来源 tc_sjly(可推送)
+     * 批量删除硬探针、软探针
      * 
      * @param ids 需要删除的数据主键集合
      * @return 结果
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcSjlytjMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcSjlytjMapper.java
index 73b118b0..a3f42073 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcSjlytjMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcSjlytjMapper.java
@@ -4,55 +4,55 @@ import java.util.List;
 import com.ruoyi.tcZz.domain.TcSjlytj;
 
 /**
- * 数据来源统计tc_sjlytj Mapper接口
+ * 数据来源统计Mapper接口
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
 public interface TcSjlytjMapper 
 {
     /**
-     * 查询数据来源统计tc_sjlytj 
+     * 查询数据来源统计
      * 
-     * @param id 数据来源统计tc_sjlytj 主键
-     * @return 数据来源统计tc_sjlytj 
+     * @param id 数据来源统计主键
+     * @return 数据来源统计
      */
     public TcSjlytj selectTcSjlytjById(Long id);
 
     /**
-     * 查询数据来源统计tc_sjlytj 列表
+     * 查询数据来源统计列表
      * 
-     * @param tcSjlytj 数据来源统计tc_sjlytj 
-     * @return 数据来源统计tc_sjlytj 集合
+     * @param tcSjlytj 数据来源统计
+     * @return 数据来源统计集合
      */
     public List<TcSjlytj> selectTcSjlytjList(TcSjlytj tcSjlytj);
 
     /**
-     * 新增数据来源统计tc_sjlytj 
+     * 新增数据来源统计
      * 
-     * @param tcSjlytj 数据来源统计tc_sjlytj 
+     * @param tcSjlytj 数据来源统计
      * @return 结果
      */
     public int insertTcSjlytj(TcSjlytj tcSjlytj);
 
     /**
-     * 修改数据来源统计tc_sjlytj 
+     * 修改数据来源统计
      * 
-     * @param tcSjlytj 数据来源统计tc_sjlytj 
+     * @param tcSjlytj 数据来源统计
      * @return 结果
      */
     public int updateTcSjlytj(TcSjlytj tcSjlytj);
 
     /**
-     * 删除数据来源统计tc_sjlytj 
+     * 删除数据来源统计
      * 
-     * @param id 数据来源统计tc_sjlytj 主键
+     * @param id 数据来源统计主键
      * @return 结果
      */
     public int deleteTcSjlytjById(Long id);
 
     /**
-     * 批量删除数据来源统计tc_sjlytj 
+     * 批量删除数据来源统计
      * 
      * @param ids 需要删除的数据主键集合
      * @return 结果
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 e5208f11..4105d4b5 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
@@ -7,7 +7,7 @@ import com.ruoyi.tcZz.domain.TcXtjc;
  * 系统监测Mapper接口
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
 public interface TcXtjcMapper 
 {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcZfwzMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcZfwzMapper.java
index e74c9875..04980061 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcZfwzMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcZfwzMapper.java
@@ -7,7 +7,7 @@ import com.ruoyi.tcZz.domain.TcZfwz;
  * 政府网站Mapper接口
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
 public interface TcZfwzMapper 
 {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcDbdwService.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcDbdwService.java
index 6ea42c38..7bc2eb09 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcDbdwService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcDbdwService.java
@@ -7,7 +7,7 @@ import com.ruoyi.tcZz.domain.TcDbdw;
  * 等保单位Service接口
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
 public interface ITcDbdwService 
 {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcDbxtService.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcDbxtService.java
index 607194f2..c4a655d7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcDbxtService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcDbxtService.java
@@ -7,7 +7,7 @@ import com.ruoyi.tcZz.domain.TcDbxt;
  * 等保系统Service接口
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
 public interface ITcDbxtService 
 {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcIdcdwService.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcIdcdwService.java
index c213ff3f..6a411d03 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcIdcdwService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcIdcdwService.java
@@ -7,7 +7,7 @@ import com.ruoyi.tcZz.domain.TcIdcdw;
  *  IDC单位Service接口
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
 public interface ITcIdcdwService 
 {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcJgdwService.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcJgdwService.java
index 99e4c31d..47b7c9fd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcJgdwService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcJgdwService.java
@@ -7,7 +7,7 @@ import com.ruoyi.tcZz.domain.TcJgdw;
  * 监管单位Service接口
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
 public interface ITcJgdwService 
 {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcSjlyService.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcSjlyService.java
index 81e309c1..62b6dcdd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcSjlyService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcSjlyService.java
@@ -4,57 +4,57 @@ import java.util.List;
 import com.ruoyi.tcZz.domain.TcSjly;
 
 /**
- * 数据来源 tc_sjly(可推送)Service接口
+ * 硬探针、软探针Service接口
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
 public interface ITcSjlyService 
 {
     /**
-     * 查询数据来源 tc_sjly(可推送)
+     * 查询硬探针、软探针
      * 
-     * @param id 数据来源 tc_sjly(可推送)主键
-     * @return 数据来源 tc_sjly(可推送)
+     * @param id 硬探针、软探针主键
+     * @return 硬探针、软探针
      */
     public TcSjly selectTcSjlyById(Long id);
 
     /**
-     * 查询数据来源 tc_sjly(可推送)列表
+     * 查询硬探针、软探针列表
      * 
-     * @param tcSjly 数据来源 tc_sjly(可推送)
-     * @return 数据来源 tc_sjly(可推送)集合
+     * @param tcSjly 硬探针、软探针
+     * @return 硬探针、软探针集合
      */
     public List<TcSjly> selectTcSjlyList(TcSjly tcSjly);
 
     /**
-     * 新增数据来源 tc_sjly(可推送)
+     * 新增硬探针、软探针
      * 
-     * @param tcSjly 数据来源 tc_sjly(可推送)
+     * @param tcSjly 硬探针、软探针
      * @return 结果
      */
     public int insertTcSjly(TcSjly tcSjly);
 
     /**
-     * 修改数据来源 tc_sjly(可推送)
+     * 修改硬探针、软探针
      * 
-     * @param tcSjly 数据来源 tc_sjly(可推送)
+     * @param tcSjly 硬探针、软探针
      * @return 结果
      */
     public int updateTcSjly(TcSjly tcSjly);
 
     /**
-     * 批量删除数据来源 tc_sjly(可推送)
+     * 批量删除硬探针、软探针
      * 
-     * @param ids 需要删除的数据来源 tc_sjly(可推送)主键集合
+     * @param ids 需要删除的硬探针、软探针主键集合
      * @return 结果
      */
     public int deleteTcSjlyByIds(Long[] ids);
 
     /**
-     * 删除数据来源 tc_sjly(可推送)信息
+     * 删除硬探针、软探针信息
      * 
-     * @param id 数据来源 tc_sjly(可推送)主键
+     * @param id 硬探针、软探针主键
      * @return 结果
      */
     public int deleteTcSjlyById(Long id);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcSjlytjService.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcSjlytjService.java
index a2b15240..c3319851 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcSjlytjService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcSjlytjService.java
@@ -4,57 +4,57 @@ import java.util.List;
 import com.ruoyi.tcZz.domain.TcSjlytj;
 
 /**
- * 数据来源统计tc_sjlytj Service接口
+ * 数据来源统计Service接口
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
 public interface ITcSjlytjService 
 {
     /**
-     * 查询数据来源统计tc_sjlytj 
+     * 查询数据来源统计
      * 
-     * @param id 数据来源统计tc_sjlytj 主键
-     * @return 数据来源统计tc_sjlytj 
+     * @param id 数据来源统计主键
+     * @return 数据来源统计
      */
     public TcSjlytj selectTcSjlytjById(Long id);
 
     /**
-     * 查询数据来源统计tc_sjlytj 列表
+     * 查询数据来源统计列表
      * 
-     * @param tcSjlytj 数据来源统计tc_sjlytj 
-     * @return 数据来源统计tc_sjlytj 集合
+     * @param tcSjlytj 数据来源统计
+     * @return 数据来源统计集合
      */
     public List<TcSjlytj> selectTcSjlytjList(TcSjlytj tcSjlytj);
 
     /**
-     * 新增数据来源统计tc_sjlytj 
+     * 新增数据来源统计
      * 
-     * @param tcSjlytj 数据来源统计tc_sjlytj 
+     * @param tcSjlytj 数据来源统计
      * @return 结果
      */
     public int insertTcSjlytj(TcSjlytj tcSjlytj);
 
     /**
-     * 修改数据来源统计tc_sjlytj 
+     * 修改数据来源统计
      * 
-     * @param tcSjlytj 数据来源统计tc_sjlytj 
+     * @param tcSjlytj 数据来源统计
      * @return 结果
      */
     public int updateTcSjlytj(TcSjlytj tcSjlytj);
 
     /**
-     * 批量删除数据来源统计tc_sjlytj 
+     * 批量删除数据来源统计
      * 
-     * @param ids 需要删除的数据来源统计tc_sjlytj 主键集合
+     * @param ids 需要删除的数据来源统计主键集合
      * @return 结果
      */
     public int deleteTcSjlytjByIds(Long[] ids);
 
     /**
-     * 删除数据来源统计tc_sjlytj 信息
+     * 删除数据来源统计信息
      * 
-     * @param id 数据来源统计tc_sjlytj 主键
+     * @param id 数据来源统计主键
      * @return 结果
      */
     public int deleteTcSjlytjById(Long id);
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 710ed74a..ae069a53 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
@@ -7,7 +7,7 @@ import com.ruoyi.tcZz.domain.TcXtjc;
  * 系统监测Service接口
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
 public interface ITcXtjcService 
 {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcZfwzService.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcZfwzService.java
index 74244233..d32b0537 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcZfwzService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcZfwzService.java
@@ -7,7 +7,7 @@ import com.ruoyi.tcZz.domain.TcZfwz;
  * 政府网站Service接口
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
 public interface ITcZfwzService 
 {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcDbdwServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcDbdwServiceImpl.java
index be81ea87..68d2fc9b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcDbdwServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcDbdwServiceImpl.java
@@ -12,7 +12,7 @@ import com.ruoyi.tcZz.service.ITcDbdwService;
  * 等保单位Service业务层处理
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
 @Service
 public class TcDbdwServiceImpl implements ITcDbdwService 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcDbxtServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcDbxtServiceImpl.java
index d5232976..38ab73fb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcDbxtServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcDbxtServiceImpl.java
@@ -12,7 +12,7 @@ import com.ruoyi.tcZz.service.ITcDbxtService;
  * 等保系统Service业务层处理
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
 @Service
 public class TcDbxtServiceImpl implements ITcDbxtService 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcIdcdwServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcIdcdwServiceImpl.java
index 62ae9f61..a320e265 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcIdcdwServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcIdcdwServiceImpl.java
@@ -12,7 +12,7 @@ import com.ruoyi.tcZz.service.ITcIdcdwService;
  *  IDC单位Service业务层处理
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
 @Service
 public class TcIdcdwServiceImpl implements ITcIdcdwService 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcJgdwServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcJgdwServiceImpl.java
index 158de9a7..ee166b2d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcJgdwServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcJgdwServiceImpl.java
@@ -12,7 +12,7 @@ import com.ruoyi.tcZz.service.ITcJgdwService;
  * 监管单位Service业务层处理
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
 @Service
 public class TcJgdwServiceImpl implements ITcJgdwService 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcSjlyServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcSjlyServiceImpl.java
index 60256874..f144a2f6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcSjlyServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcSjlyServiceImpl.java
@@ -9,10 +9,10 @@ import com.ruoyi.tcZz.domain.TcSjly;
 import com.ruoyi.tcZz.service.ITcSjlyService;
 
 /**
- * 数据来源 tc_sjly(可推送)Service业务层处理
+ * 硬探针、软探针Service业务层处理
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
 @Service
 public class TcSjlyServiceImpl implements ITcSjlyService 
@@ -21,10 +21,10 @@ public class TcSjlyServiceImpl implements ITcSjlyService
     private TcSjlyMapper tcSjlyMapper;
 
     /**
-     * 查询数据来源 tc_sjly(可推送)
+     * 查询硬探针、软探针
      * 
-     * @param id 数据来源 tc_sjly(可推送)主键
-     * @return 数据来源 tc_sjly(可推送)
+     * @param id 硬探针、软探针主键
+     * @return 硬探针、软探针
      */
     @Override
     public TcSjly selectTcSjlyById(Long id)
@@ -33,10 +33,10 @@ public class TcSjlyServiceImpl implements ITcSjlyService
     }
 
     /**
-     * 查询数据来源 tc_sjly(可推送)列表
+     * 查询硬探针、软探针列表
      * 
-     * @param tcSjly 数据来源 tc_sjly(可推送)
-     * @return 数据来源 tc_sjly(可推送)
+     * @param tcSjly 硬探针、软探针
+     * @return 硬探针、软探针
      */
     @Override
     public List<TcSjly> selectTcSjlyList(TcSjly tcSjly)
@@ -45,9 +45,9 @@ public class TcSjlyServiceImpl implements ITcSjlyService
     }
 
     /**
-     * 新增数据来源 tc_sjly(可推送)
+     * 新增硬探针、软探针
      * 
-     * @param tcSjly 数据来源 tc_sjly(可推送)
+     * @param tcSjly 硬探针、软探针
      * @return 结果
      */
     @Override
@@ -58,9 +58,9 @@ public class TcSjlyServiceImpl implements ITcSjlyService
     }
 
     /**
-     * 修改数据来源 tc_sjly(可推送)
+     * 修改硬探针、软探针
      * 
-     * @param tcSjly 数据来源 tc_sjly(可推送)
+     * @param tcSjly 硬探针、软探针
      * @return 结果
      */
     @Override
@@ -71,9 +71,9 @@ public class TcSjlyServiceImpl implements ITcSjlyService
     }
 
     /**
-     * 批量删除数据来源 tc_sjly(可推送)
+     * 批量删除硬探针、软探针
      * 
-     * @param ids 需要删除的数据来源 tc_sjly(可推送)主键
+     * @param ids 需要删除的硬探针、软探针主键
      * @return 结果
      */
     @Override
@@ -83,9 +83,9 @@ public class TcSjlyServiceImpl implements ITcSjlyService
     }
 
     /**
-     * 删除数据来源 tc_sjly(可推送)信息
+     * 删除硬探针、软探针信息
      * 
-     * @param id 数据来源 tc_sjly(可推送)主键
+     * @param id 硬探针、软探针主键
      * @return 结果
      */
     @Override
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcSjlytjServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcSjlytjServiceImpl.java
index 6df9e55a..ca0e7ff9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcSjlytjServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcSjlytjServiceImpl.java
@@ -9,10 +9,10 @@ import com.ruoyi.tcZz.domain.TcSjlytj;
 import com.ruoyi.tcZz.service.ITcSjlytjService;
 
 /**
- * 数据来源统计tc_sjlytj Service业务层处理
+ * 数据来源统计Service业务层处理
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
 @Service
 public class TcSjlytjServiceImpl implements ITcSjlytjService 
@@ -21,10 +21,10 @@ public class TcSjlytjServiceImpl implements ITcSjlytjService
     private TcSjlytjMapper tcSjlytjMapper;
 
     /**
-     * 查询数据来源统计tc_sjlytj 
+     * 查询数据来源统计
      * 
-     * @param id 数据来源统计tc_sjlytj 主键
-     * @return 数据来源统计tc_sjlytj 
+     * @param id 数据来源统计主键
+     * @return 数据来源统计
      */
     @Override
     public TcSjlytj selectTcSjlytjById(Long id)
@@ -33,10 +33,10 @@ public class TcSjlytjServiceImpl implements ITcSjlytjService
     }
 
     /**
-     * 查询数据来源统计tc_sjlytj 列表
+     * 查询数据来源统计列表
      * 
-     * @param tcSjlytj 数据来源统计tc_sjlytj 
-     * @return 数据来源统计tc_sjlytj 
+     * @param tcSjlytj 数据来源统计
+     * @return 数据来源统计
      */
     @Override
     public List<TcSjlytj> selectTcSjlytjList(TcSjlytj tcSjlytj)
@@ -45,9 +45,9 @@ public class TcSjlytjServiceImpl implements ITcSjlytjService
     }
 
     /**
-     * 新增数据来源统计tc_sjlytj 
+     * 新增数据来源统计
      * 
-     * @param tcSjlytj 数据来源统计tc_sjlytj 
+     * @param tcSjlytj 数据来源统计
      * @return 结果
      */
     @Override
@@ -58,9 +58,9 @@ public class TcSjlytjServiceImpl implements ITcSjlytjService
     }
 
     /**
-     * 修改数据来源统计tc_sjlytj 
+     * 修改数据来源统计
      * 
-     * @param tcSjlytj 数据来源统计tc_sjlytj 
+     * @param tcSjlytj 数据来源统计
      * @return 结果
      */
     @Override
@@ -71,9 +71,9 @@ public class TcSjlytjServiceImpl implements ITcSjlytjService
     }
 
     /**
-     * 批量删除数据来源统计tc_sjlytj 
+     * 批量删除数据来源统计
      * 
-     * @param ids 需要删除的数据来源统计tc_sjlytj 主键
+     * @param ids 需要删除的数据来源统计主键
      * @return 结果
      */
     @Override
@@ -83,9 +83,9 @@ public class TcSjlytjServiceImpl implements ITcSjlytjService
     }
 
     /**
-     * 删除数据来源统计tc_sjlytj 信息
+     * 删除数据来源统计信息
      * 
-     * @param id 数据来源统计tc_sjlytj 主键
+     * @param id 数据来源统计主键
      * @return 结果
      */
     @Override
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 bf1585a7..c6d64966 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
@@ -12,7 +12,7 @@ import com.ruoyi.tcZz.service.ITcXtjcService;
  * 系统监测Service业务层处理
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
 @Service
 public class TcXtjcServiceImpl implements ITcXtjcService 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcZfwzServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcZfwzServiceImpl.java
index 8d819fdc..8867932e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcZfwzServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcZfwzServiceImpl.java
@@ -12,7 +12,7 @@ import com.ruoyi.tcZz.service.ITcZfwzService;
  * 政府网站Service业务层处理
  * 
  * @author ruoyi
- * @date 2023-10-12
+ * @date 2023-10-13
  */
 @Service
 public class TcZfwzServiceImpl implements ITcZfwzService 
diff --git a/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcDbdwMapper.xml b/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcDbdwMapper.xml
index 53254db4..aaf68474 100644
--- a/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcDbdwMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcDbdwMapper.xml
@@ -36,9 +36,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTcDbdwList" parameterType="TcDbdw" resultMap="TcDbdwResult">
         <include refid="selectTcDbdwVo"/>
         <where>  
+            <if test="id != null "> and id = #{id}</if>
             <if test="areaId != null  and areaId != ''"> and area_id = #{areaId}</if>
             <if test="unitName != null  and unitName != ''"> and unit_name like concat('%', #{unitName}, '%')</if>
+            <if test="postalCode != null  and postalCode != ''"> and postal_code = #{postalCode}</if>
+            <if test="addressProvince != null  and addressProvince != ''"> and address_province = #{addressProvince}</if>
+            <if test="addressCity != null  and addressCity != ''"> and address_city = #{addressCity}</if>
+            <if test="addressCounty != null  and addressCounty != ''"> and address_county = #{addressCounty}</if>
+            <if test="unitAddress != null  and unitAddress != ''"> and unit_address = #{unitAddress}</if>
+            <if test="countyCode != null  and countyCode != ''"> and county_code = #{countyCode}</if>
+            <if test="lsGx != null  and lsGx != ''"> and ls_gx = #{lsGx}</if>
+            <if test="unitType != null  and unitType != ''"> and unit_type = #{unitType}</if>
+            <if test="industryType != null  and industryType != ''"> and industry_type = #{industryType}</if>
+            <if test="fzrName != null  and fzrName != ''"> and fzr_name like concat('%', #{fzrName}, '%')</if>
+            <if test="fzrDuty != null  and fzrDuty != ''"> and fzr_duty = #{fzrDuty}</if>
+            <if test="fzrTel != null  and fzrTel != ''"> and fzr_tel = #{fzrTel}</if>
+            <if test="fzrEmail != null  and fzrEmail != ''"> and fzr_email = #{fzrEmail}</if>
             <if test="isStatus != null "> and isStatus = #{isStatus}</if>
+            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
+            <if test="params.beginUpdateTime != null and params.beginUpdateTime != '' and params.endUpdateTime != null and params.endUpdateTime != ''"> and update_time between #{params.beginUpdateTime} and #{params.endUpdateTime}</if>
+            <if test="remark != null  and remark != ''"> and remark = #{remark}</if>
         </where>
     </select>
     
diff --git a/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcDbxtMapper.xml b/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcDbxtMapper.xml
index cd623c7c..fc8a9f41 100644
--- a/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcDbxtMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcDbxtMapper.xml
@@ -39,11 +39,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTcDbxtList" parameterType="TcDbxt" resultMap="TcDbxtResult">
         <include refid="selectTcDbxtVo"/>
         <where>  
+            <if test="id != null "> and id = #{id}</if>
             <if test="areaId != null  and areaId != ''"> and area_id = #{areaId}</if>
             <if test="systemName != null  and systemName != ''"> and system_name like concat('%', #{systemName}, '%')</if>
             <if test="beianNum != null  and beianNum != ''"> and beian_num = #{beianNum}</if>
+            <if test="safetyLevel != null  and safetyLevel != ''"> and safety_level = #{safetyLevel}</if>
             <if test="unitName != null  and unitName != ''"> and unit_name like concat('%', #{unitName}, '%')</if>
+            <if test="businessType != null  and businessType != ''"> and business_type = #{businessType}</if>
+            <if test="serviceArea != null  and serviceArea != ''"> and service_area = #{serviceArea}</if>
+            <if test="serviceObj != null  and serviceObj != ''"> and service_obj = #{serviceObj}</if>
+            <if test="coverageArea != null  and coverageArea != ''"> and coverage_area = #{coverageArea}</if>
+            <if test="networkProperty != null  and networkProperty != ''"> and network_property = #{networkProperty}</if>
+            <if test="systemHlql != null  and systemHlql != ''"> and system_hlql = #{systemHlql}</if>
+            <if test="startTime != null "> and start_time = #{startTime}</if>
+            <if test="isLevel != null  and isLevel != ''"> and is_level = #{isLevel}</if>
+            <if test="systemDjtime != null "> and system_djtime = #{systemDjtime}</if>
+            <if test="psQk != null  and psQk != ''"> and ps_qk = #{psQk}</if>
+            <if test="isHavedep != null  and isHavedep != ''"> and is_haveDep = #{isHavedep}</if>
+            <if test="systemDjbg != null  and systemDjbg != ''"> and system_djbg = #{systemDjbg}</if>
+            <if test="systemState != null  and systemState != ''"> and system_state = #{systemState}</if>
             <if test="isStatus != null "> and isStatus = #{isStatus}</if>
+            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
+            <if test="params.beginUpdateTime != null and params.beginUpdateTime != '' and params.endUpdateTime != null and params.endUpdateTime != ''"> and update_time between #{params.beginUpdateTime} and #{params.endUpdateTime}</if>
+            <if test="remark != null  and remark != ''"> and remark = #{remark}</if>
         </where>
     </select>
     
diff --git a/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcIdcdwMapper.xml b/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcIdcdwMapper.xml
index 28ad88fb..f38ca6c1 100644
--- a/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcIdcdwMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcIdcdwMapper.xml
@@ -24,14 +24,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTcIdcdwList" parameterType="TcIdcdw" resultMap="TcIdcdwResult">
         <include refid="selectTcIdcdwVo"/>
         <where>  
+            <if test="id != null "> and id = #{id}</if>
             <if test="areaId != null  and areaId != ''"> and area_id = #{areaId}</if>
             <if test="isStatus != null "> and isStatus = #{isStatus}</if>
             <if test="ldcName != null  and ldcName != ''"> and ldc_name like concat('%', #{ldcName}, '%')</if>
             <if test="ipData != null  and ipData != ''"> and ip_data = #{ipData}</if>
             <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
-            <if test="createTime != null "> and create_time = #{createTime}</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
             <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
-            <if test="updateTime != null "> and update_time = #{updateTime}</if>
+            <if test="params.beginUpdateTime != null and params.beginUpdateTime != '' and params.endUpdateTime != null and params.endUpdateTime != ''"> and update_time between #{params.beginUpdateTime} and #{params.endUpdateTime}</if>
             <if test="remark != null  and remark != ''"> and remark = #{remark}</if>
         </where>
     </select>
diff --git a/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcJgdwMapper.xml b/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcJgdwMapper.xml
index 5002db8e..975ad520 100644
--- a/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcJgdwMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcJgdwMapper.xml
@@ -29,10 +29,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTcJgdwList" parameterType="TcJgdw" resultMap="TcJgdwResult">
         <include refid="selectTcJgdwVo"/>
         <where>  
+            <if test="id != null "> and id = #{id}</if>
             <if test="areaId != null  and areaId != ''"> and area_id = #{areaId}</if>
             <if test="isStatus != null "> and isStatus = #{isStatus}</if>
             <if test="unitName != null  and unitName != ''"> and unit_name like concat('%', #{unitName}, '%')</if>
+            <if test="systemName != null  and systemName != ''"> and system_name like concat('%', #{systemName}, '%')</if>
+            <if test="systemUrl != null  and systemUrl != ''"> and system_url = #{systemUrl}</if>
+            <if test="sysyemIp != null  and sysyemIp != ''"> and sysyem_ip = #{sysyemIp}</if>
+            <if test="isFocus != null  and isFocus != ''"> and is_focus = #{isFocus}</if>
+            <if test="level != null  and level != ''"> and level = #{level}</if>
             <if test="type != null "> and type = #{type}</if>
+            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
+            <if test="params.beginUpdateTime != null and params.beginUpdateTime != '' and params.endUpdateTime != null and params.endUpdateTime != ''"> and update_time between #{params.beginUpdateTime} and #{params.endUpdateTime}</if>
+            <if test="remark != null  and remark != ''"> and remark = #{remark}</if>
         </where>
     </select>
     
diff --git a/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcSjlyMapper.xml b/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcSjlyMapper.xml
index b93a548a..714f42fc 100644
--- a/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcSjlyMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcSjlyMapper.xml
@@ -28,7 +28,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTcSjlyList" parameterType="TcSjly" resultMap="TcSjlyResult">
         <include refid="selectTcSjlyVo"/>
         <where>  
+            <if test="id != null "> and id = #{id}</if>
             <if test="areaId != null  and areaId != ''"> and area_id = #{areaId}</if>
+            <if test="type != null "> and type = #{type}</if>
+            <if test="isStatus != null "> and isStatus = #{isStatus}</if>
+            <if test="zcName != null  and zcName != ''"> and zc_name like concat('%', #{zcName}, '%')</if>
+            <if test="affUnit != null  and affUnit != ''"> and aff_unit = #{affUnit}</if>
+            <if test="sysyemIp != null  and sysyemIp != ''"> and sysyem_ip = #{sysyemIp}</if>
+            <if test="os != null  and os != ''"> and os = #{os}</if>
+            <if test="versions != null  and versions != ''"> and versions = #{versions}</if>
+            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
+            <if test="params.beginUpdateTime != null and params.beginUpdateTime != '' and params.endUpdateTime != null and params.endUpdateTime != ''"> and update_time between #{params.beginUpdateTime} and #{params.endUpdateTime}</if>
+            <if test="remark != null  and remark != ''"> and remark = #{remark}</if>
         </where>
     </select>
     
diff --git a/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcSjlytjMapper.xml b/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcSjlytjMapper.xml
index 0a1484b9..ba502962 100644
--- a/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcSjlytjMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcSjlytjMapper.xml
@@ -24,10 +24,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTcSjlytjList" parameterType="TcSjlytj" resultMap="TcSjlytjResult">
         <include refid="selectTcSjlytjVo"/>
         <where>  
+            <if test="id != null "> and id = #{id}</if>
             <if test="lable1 != null  and lable1 != ''"> and lable1 = #{lable1}</if>
             <if test="lable1Sum != null  and lable1Sum != ''"> and lable1Sum = #{lable1Sum}</if>
             <if test="lable2 != null  and lable2 != ''"> and lable2 = #{lable2}</if>
             <if test="lable2Sum != null  and lable2Sum != ''"> and lable2Sum = #{lable2Sum}</if>
+            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
+            <if test="params.beginUpdateTime != null and params.beginUpdateTime != '' and params.endUpdateTime != null and params.endUpdateTime != ''"> and update_time between #{params.beginUpdateTime} and #{params.endUpdateTime}</if>
+            <if test="remark != null  and remark != ''"> and remark = #{remark}</if>
         </where>
     </select>
     
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 419b39e0..521aa376 100644
--- a/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcXtjcMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcXtjcMapper.xml
@@ -28,8 +28,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTcXtjcList" parameterType="TcXtjc" resultMap="TcXtjcResult">
         <include refid="selectTcXtjcVo"/>
         <where>  
+            <if test="id != null "> and id = #{id}</if>
             <if test="areaId != null  and areaId != ''"> and area_id = #{areaId}</if>
             <if test="isStatus != null "> and isStatus = #{isStatus}</if>
+            <if test="unitName != null  and unitName != ''"> and unit_name like concat('%', #{unitName}, '%')</if>
+            <if test="systemName != null  and systemName != ''"> and system_name like concat('%', #{systemName}, '%')</if>
+            <if test="systemUrl != null  and systemUrl != ''"> and system_url = #{systemUrl}</if>
+            <if test="sysyemIp != null  and sysyemIp != ''"> and sysyem_ip = #{sysyemIp}</if>
+            <if test="isFocus != null  and isFocus != ''"> and is_focus = #{isFocus}</if>
+            <if test="level != null  and level != ''"> and level = #{level}</if>
         </where>
     </select>
     
diff --git a/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcZfwzMapper.xml b/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcZfwzMapper.xml
index f188e357..968ea8f1 100644
--- a/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcZfwzMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcZfwzMapper.xml
@@ -25,8 +25,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTcZfwzList" parameterType="TcZfwz" resultMap="TcZfwzResult">
         <include refid="selectTcZfwzVo"/>
         <where>  
+            <if test="id != null "> and id = #{id}</if>
             <if test="areaId != null  and areaId != ''"> and area_id = #{areaId}</if>
             <if test="isStatus != null "> and isStatus = #{isStatus}</if>
+            <if test="webUrl != null  and webUrl != ''"> and web_url = #{webUrl}</if>
+            <if test="assetName != null  and assetName != ''"> and asset_name like concat('%', #{assetName}, '%')</if>
+            <if test="assetLevel != null  and assetLevel != ''"> and asset_level = #{assetLevel}</if>
+            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
+            <if test="params.beginUpdateTime != null and params.beginUpdateTime != '' and params.endUpdateTime != null and params.endUpdateTime != ''"> and update_time between #{params.beginUpdateTime} and #{params.endUpdateTime}</if>
+            <if test="remark != null  and remark != ''"> and remark = #{remark}</if>
         </where>
     </select>