diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcBjsj.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcBjsj.java
index 3fc0c1f..c6c3914 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcBjsj.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcBjsj.java
@@ -1,5 +1,6 @@
 package com.ruoyi.zongzhi.domain;
 
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -8,76 +9,38 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 本级上级网评指令比列 (月)对象 tc_bjsj
- * 
+ *
  * @author ruoyi
  * @date 2023-08-28
  */
-public class TcBjsj extends BaseEntity
-{
+@Data
+public class TcBjsj extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     private Long id;
 
-    /** 区域Id */
+    /**
+     * 区域Id
+     */
     @Excel(name = "区域Id")
-@ApiModelProperty(value = "区域Id")
-    private Long areaId;
+    @ApiModelProperty(value = "区域Id")
+    private String areaId;
 
-    /** 占比名称 */
+    /**
+     * 占比名称
+     */
     @Excel(name = "占比名称")
-@ApiModelProperty(value = "占比名称")
+    @ApiModelProperty(value = "占比名称")
     private String name;
 
-    /** 所占百分比 */
+    /**
+     * 所占百分比
+     */
     @Excel(name = "所占百分比")
-@ApiModelProperty(value = "所占百分比")
+    @ApiModelProperty(value = "所占百分比")
     private String percent;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setAreaId(Long areaId) 
-    {
-        this.areaId = areaId;
-    }
-
-    public Long getAreaId() 
-    {
-        return areaId;
-    }
-    public void setName(String name) 
-    {
-        this.name = name;
-    }
-
-    public String getName() 
-    {
-        return name;
-    }
-    public void setPercent(String percent) 
-    {
-        this.percent = percent;
-    }
-
-    public String getPercent() 
-    {
-        return percent;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("areaId", getAreaId())
-            .append("name", getName())
-            .append("percent", getPercent())
-            .toString();
-    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcCommentator.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcCommentator.java
index d493dae..b6ff058 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcCommentator.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcCommentator.java
@@ -27,7 +27,7 @@ public class TcCommentator extends BaseEntity {
      */
     @Excel(name = "区域id")
     @ApiModelProperty(value = "区域id")
-    private Long areaId;
+    private String areaId;
 
     /**
      * 姓名
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcDataSource.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcDataSource.java
index e6a2384..89fa69a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcDataSource.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcDataSource.java
@@ -27,7 +27,7 @@ public class TcDataSource extends BaseEntity {
      */
     @Excel(name = "区域id")
     @ApiModelProperty(value = "区域id")
-    private Long areaId;
+    private String areaId;
 
     /**
      * 1.	云断监管
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcDengbaoSystem.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcDengbaoSystem.java
index 56757b6..14ad847 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcDengbaoSystem.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcDengbaoSystem.java
@@ -30,7 +30,7 @@ public class TcDengbaoSystem extends BaseEntity {
      */
     @Excel(name = "区域id")
     @ApiModelProperty(value = "区域id")
-    private Long areaId;
+    private String areaId;
 
     /**
      * 系统名称
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcDengbaoUnit.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcDengbaoUnit.java
index 8b2c5aa..31d8f77 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcDengbaoUnit.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcDengbaoUnit.java
@@ -27,7 +27,7 @@ public class TcDengbaoUnit extends BaseEntity {
      */
     @Excel(name = "区域id")
     @ApiModelProperty(value = "区域id")
-    private Long areaId;
+    private String areaId;
 
     /**
      * 单位名称
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcDtSx.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcDtSx.java
index c3d41cc..265660f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcDtSx.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcDtSx.java
@@ -1,5 +1,6 @@
 package com.ruoyi.zongzhi.domain;
 
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -8,106 +9,52 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 动态筛选对象 tc_dt_sx
- * 
+ *
  * @author ruoyi
  * @date 2023-08-28
  */
-public class TcDtSx extends BaseEntity
-{
+@Data
+public class TcDtSx extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     private Long id;
 
-    /** 区域id */
+    /**
+     * 区域id
+     */
     @Excel(name = "区域id")
-@ApiModelProperty(value = "区域id")
-    private Long areaId;
+    @ApiModelProperty(value = "区域id")
+    private String areaId;
 
-    /** 监测信息总数 */
+    /**
+     * 监测信息总数
+     */
     @Excel(name = "监测信息总数")
-@ApiModelProperty(value = "监测信息总数")
+    @ApiModelProperty(value = "监测信息总数")
     private Long jcxxCount;
 
-    /** 排除信息总数 */
+    /**
+     * 排除信息总数
+     */
     @Excel(name = "排除信息总数")
-@ApiModelProperty(value = "排除信息总数")
+    @ApiModelProperty(value = "排除信息总数")
     private Long pcxxCount;
 
-    /** 舆情预警总数 */
+    /**
+     * 舆情预警总数
+     */
     @Excel(name = "舆情预警总数")
-@ApiModelProperty(value = "舆情预警总数")
+    @ApiModelProperty(value = "舆情预警总数")
     private Long yqyjCount;
 
-    /** 舆情预警占比 */
+    /**
+     * 舆情预警占比
+     */
     @Excel(name = "舆情预警占比")
-@ApiModelProperty(value = "舆情预警占比")
+    @ApiModelProperty(value = "舆情预警占比")
     private Long yqyjZb;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setAreaId(Long areaId) 
-    {
-        this.areaId = areaId;
-    }
-
-    public Long getAreaId() 
-    {
-        return areaId;
-    }
-    public void setJcxxCount(Long jcxxCount) 
-    {
-        this.jcxxCount = jcxxCount;
-    }
-
-    public Long getJcxxCount() 
-    {
-        return jcxxCount;
-    }
-    public void setPcxxCount(Long pcxxCount) 
-    {
-        this.pcxxCount = pcxxCount;
-    }
-
-    public Long getPcxxCount() 
-    {
-        return pcxxCount;
-    }
-    public void setYqyjCount(Long yqyjCount) 
-    {
-        this.yqyjCount = yqyjCount;
-    }
-
-    public Long getYqyjCount() 
-    {
-        return yqyjCount;
-    }
-    public void setYqyjZb(Long yqyjZb) 
-    {
-        this.yqyjZb = yqyjZb;
-    }
-
-    public Long getYqyjZb() 
-    {
-        return yqyjZb;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("areaId", getAreaId())
-            .append("jcxxCount", getJcxxCount())
-            .append("pcxxCount", getPcxxCount())
-            .append("yqyjCount", getYqyjCount())
-            .append("yqyjZb", getYqyjZb())
-            .toString();
-    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcExtworkSafetyadmin.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcExtworkSafetyadmin.java
index b38f23f..987fc31 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcExtworkSafetyadmin.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcExtworkSafetyadmin.java
@@ -27,7 +27,7 @@ public class TcExtworkSafetyadmin extends BaseEntity {
      */
     @Excel(name = "区域id")
     @ApiModelProperty(value = "区域id")
-    private Long areaId;
+    private String areaId;
 
     /**
      * 单位
@@ -106,131 +106,4 @@ public class TcExtworkSafetyadmin extends BaseEntity {
     @ApiModelProperty(value = "修改人ID")
     private Long updateId;
 
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setAreaId(Long areaId) {
-        this.areaId = areaId;
-    }
-
-    public Long getAreaId() {
-        return areaId;
-    }
-
-    public void setUnit(String unit) {
-        this.unit = unit;
-    }
-
-    public String getUnit() {
-        return unit;
-    }
-
-    public void setFirstPrincipal(String firstPrincipal) {
-        this.firstPrincipal = firstPrincipal;
-    }
-
-    public String getFirstPrincipal() {
-        return firstPrincipal;
-    }
-
-    public void setDuty(String duty) {
-        this.duty = duty;
-    }
-
-    public String getDuty() {
-        return duty;
-    }
-
-    public void setDirectPrincipal(String directPrincipal) {
-        this.directPrincipal = directPrincipal;
-    }
-
-    public String getDirectPrincipal() {
-        return directPrincipal;
-    }
-
-    public void setDuty1(String duty1) {
-        this.duty1 = duty1;
-    }
-
-    public String getDuty1() {
-        return duty1;
-    }
-
-    public void setFuzeKeshi(String fuzeKeshi) {
-        this.fuzeKeshi = fuzeKeshi;
-    }
-
-    public String getFuzeKeshi() {
-        return fuzeKeshi;
-    }
-
-    public void setNetworkAqg(String networkAqg) {
-        this.networkAqg = networkAqg;
-    }
-
-    public String getNetworkAqg() {
-        return networkAqg;
-    }
-
-    public void setDuty2(String duty2) {
-        this.duty2 = duty2;
-    }
-
-    public String getDuty2() {
-        return duty2;
-    }
-
-    public void setTel(String tel) {
-        this.tel = tel;
-    }
-
-    public String getTel() {
-        return tel;
-    }
-
-    public void setCreateId(Long createId) {
-        this.createId = createId;
-    }
-
-    public Long getCreateId() {
-        return createId;
-    }
-
-    public void setUpdateId(Long updateId) {
-        this.updateId = updateId;
-    }
-
-    public Long getUpdateId() {
-        return updateId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("areaId", getAreaId())
-                .append("unit", getUnit())
-                .append("firstPrincipal", getFirstPrincipal())
-                .append("duty", getDuty())
-                .append("directPrincipal", getDirectPrincipal())
-                .append("duty1", getDuty1())
-                .append("fuzeKeshi", getFuzeKeshi())
-                .append("networkAqg", getNetworkAqg())
-                .append("duty2", getDuty2())
-                .append("tel", getTel())
-                .append("createId", getCreateId())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateId", getUpdateId())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .append("remark", getRemark())
-                .toString();
-    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcGovernmentWeb.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcGovernmentWeb.java
index 40d872e..998ad53 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcGovernmentWeb.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcGovernmentWeb.java
@@ -27,7 +27,7 @@ public class TcGovernmentWeb extends BaseEntity {
      */
     @Excel(name = "区域id")
     @ApiModelProperty(value = "区域id")
-    private Long areaId;
+    private String areaId;
 
     /**
      * 网址
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcIdcUnit.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcIdcUnit.java
index 2e0c0c7..15c54c3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcIdcUnit.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcIdcUnit.java
@@ -27,7 +27,7 @@ public class TcIdcUnit extends BaseEntity {
      */
     @Excel(name = "区域id")
     @ApiModelProperty(value = "区域id")
-    private Long areaId;
+    private String areaId;
 
     /**
      * 名称
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkArticle.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkArticle.java
index 983344a..628e979 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkArticle.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkArticle.java
@@ -31,7 +31,7 @@ public class TcNetworkArticle extends BaseEntity {
      */
     @Excel(name = "区域id")
     @ApiModelProperty(value = "区域id")
-    private Long areaId;
+    private String areaId;
 
     /**
      * 文章类型1.	本地录用
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkEvaluate.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkEvaluate.java
index b0ba04c..01ed977 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkEvaluate.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkEvaluate.java
@@ -31,7 +31,7 @@ public class TcNetworkEvaluate extends BaseEntity {
      */
     @Excel(name = "区域id")
     @ApiModelProperty(value = "区域id")
-    private Long areaId;
+    private String areaId;
 
     /**
      * 文章ID
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkMqPrincipal.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkMqPrincipal.java
index ebebfa6..4b478f7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkMqPrincipal.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkMqPrincipal.java
@@ -27,7 +27,7 @@ public class TcNetworkMqPrincipal extends BaseEntity {
      */
     @Excel(name = "区域id")
     @ApiModelProperty(value = "区域id")
-    private Long areaId;
+    private String areaId;
 
     /**
      * 单位名称
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkPingtai.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkPingtai.java
index f50cbc4..b5317b6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkPingtai.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkPingtai.java
@@ -27,7 +27,7 @@ public class TcNetworkPingtai extends BaseEntity {
      */
     @Excel(name = "区域id")
     @ApiModelProperty(value = "区域id")
-    private Long areaId;
+    private String areaId;
 
     /**
      * 平台类别1.	网址
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkReport.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkReport.java
index 1bc9775..d161d24 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkReport.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkReport.java
@@ -30,7 +30,7 @@ public class TcNetworkReport extends BaseEntity {
      */
     @Excel(name = "区域id")
     @ApiModelProperty(value = "区域id")
-    private Long areaId;
+    private String areaId;
 
     /**
      * 举报人
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkSentiment.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkSentiment.java
index b79cf1a..bd25311 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkSentiment.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkSentiment.java
@@ -30,7 +30,7 @@ public class TcNetworkSentiment extends BaseEntity {
      */
     @Excel(name = "区域id")
     @ApiModelProperty(value = "区域id")
-    private Long areaId;
+    private String areaId;
 
     /**
      * 舆情名称
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkSupportUnit.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkSupportUnit.java
index 75dde0a..3fc302a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkSupportUnit.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkSupportUnit.java
@@ -27,7 +27,7 @@ public class TcNetworkSupportUnit extends BaseEntity {
      */
     @Excel(name = "区域id")
     @ApiModelProperty(value = "区域id")
-    private Long areaId;
+    private String areaId;
 
     /**
      * 单位名称
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkVolunteer.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkVolunteer.java
index cc1b95a..ac85f91 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkVolunteer.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcNetworkVolunteer.java
@@ -27,7 +27,7 @@ public class TcNetworkVolunteer extends BaseEntity {
      */
     @Excel(name = "区域id")
     @ApiModelProperty(value = "区域id")
-    private Long areaId;
+    private String areaId;
 
     /**
      * 类别1.	银龄生活
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcQinglangZhuanxiang.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcQinglangZhuanxiang.java
index adf9158..7ece0ff 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcQinglangZhuanxiang.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcQinglangZhuanxiang.java
@@ -30,7 +30,7 @@ public class TcQinglangZhuanxiang extends BaseEntity {
      */
     @Excel(name = "区域id")
     @ApiModelProperty(value = "区域id")
-    private Long areaId;
+    private String areaId;
 
     /**
      * 专项标题
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcQlzxxdsj.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcQlzxxdsj.java
index 01ced3e..eb6f8e8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcQlzxxdsj.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcQlzxxdsj.java
@@ -1,7 +1,9 @@
 package com.ruoyi.zongzhi.domain;
 
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -10,91 +12,45 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 清郎专项行动数据统计对象 tc_qlzxxdsj
- * 
+ *
  * @author ruoyi
  * @date 2023-08-28
  */
-public class TcQlzxxdsj extends BaseEntity
-{
+@Data
+public class TcQlzxxdsj extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     private Long id;
 
-    /** 区域id */
+    /**
+     * 区域id
+     */
     @Excel(name = "区域id")
-@ApiModelProperty(value = "区域id")
-    private Long areaId;
+    @ApiModelProperty(value = "区域id")
+    private String areaId;
 
-    /** 类型 */
+    /**
+     * 类型
+     */
     @Excel(name = "类型")
-@ApiModelProperty(value = "类型")
+    @ApiModelProperty(value = "类型")
     private Long type;
 
-    /** 年月 */
+    /**
+     * 年月
+     */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "年月", width = 30, dateFormat = "yyyy-MM-dd")
     private Date yearMonth;
 
-    /** 数量 */
+    /**
+     * 数量
+     */
     @Excel(name = "数量")
-@ApiModelProperty(value = "数量")
+    @ApiModelProperty(value = "数量")
     private Long count;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setAreaId(Long areaId) 
-    {
-        this.areaId = areaId;
-    }
-
-    public Long getAreaId() 
-    {
-        return areaId;
-    }
-    public void setType(Long type) 
-    {
-        this.type = type;
-    }
-
-    public Long getType() 
-    {
-        return type;
-    }
-    public void setYearMonth(Date yearMonth) 
-    {
-        this.yearMonth = yearMonth;
-    }
-
-    public Date getYearMonth() 
-    {
-        return yearMonth;
-    }
-    public void setCount(Long count) 
-    {
-        this.count = count;
-    }
-
-    public Long getCount() 
-    {
-        return count;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("areaId", getAreaId())
-            .append("type", getType())
-            .append("yearMonth", getYearMonth())
-            .append("count", getCount())
-            .toString();
-    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcSafetyDanger.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcSafetyDanger.java
index f2f4336..1b6632f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcSafetyDanger.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcSafetyDanger.java
@@ -30,7 +30,7 @@ public class TcSafetyDanger extends BaseEntity {
      */
     @Excel(name = "区域id")
     @ApiModelProperty(value = "区域id")
-    private Long areaId;
+    private String areaId;
 
     /**
      * 隐患类型1.	敏感信息泄露漏洞
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcSafetyDetection.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcSafetyDetection.java
index ab3130a..e9196af 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcSafetyDetection.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcSafetyDetection.java
@@ -31,7 +31,7 @@ public class TcSafetyDetection extends BaseEntity {
      */
     @Excel(name = "区域id")
     @ApiModelProperty(value = "区域id")
-    private Long areaId;
+    private String areaId;
 
     /**
      * 攻击发起时间
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcTb.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcTb.java
index ea36755..1623459 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcTb.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcTb.java
@@ -30,7 +30,7 @@ public class TcTb extends BaseEntity {
      */
     @Excel(name = "区域id")
     @ApiModelProperty(value = "区域id")
-    private Long areaId;
+    private String areaId;
 
     /**
      * 部门名称
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcWorkDongtai.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcWorkDongtai.java
index fecb441..0c63fce 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcWorkDongtai.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcWorkDongtai.java
@@ -30,7 +30,7 @@ public class TcWorkDongtai extends BaseEntity {
      */
     @Excel(name = "区域id")
     @ApiModelProperty(value = "区域id")
-    private Long areaId;
+    private String areaId;
 
     /**
      * 类型
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcWpyrwwcl.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcWpyrwwcl.java
index fcf89d6..74585a1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcWpyrwwcl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcWpyrwwcl.java
@@ -1,5 +1,6 @@
 package com.ruoyi.zongzhi.domain;
 
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -8,61 +9,29 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 网评员任务完成率心对象 tc_wpyrwwcl
- * 
+ *
  * @author ruoyi
  * @date 2023-08-28
  */
-public class TcWpyrwwcl extends BaseEntity
-{
+@Data
+public class TcWpyrwwcl extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     private Long id;
 
-    /** $column.columnComment */
-@ApiModelProperty(value = "${comment}")
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**
+     * 区域id
+     */
+    @ApiModelProperty(value = "区域id")
     private Long areaId;
 
-    /** $column.columnComment */
-@ApiModelProperty(value = "${comment}")
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /**
+     * 完成数
+     */
+    @ApiModelProperty(value = "完成数")
     private Long finish;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setAreaId(Long areaId) 
-    {
-        this.areaId = areaId;
-    }
-
-    public Long getAreaId() 
-    {
-        return areaId;
-    }
-    public void setFinish(Long finish) 
-    {
-        this.finish = finish;
-    }
-
-    public Long getFinish() 
-    {
-        return finish;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("areaId", getAreaId())
-            .append("finish", getFinish())
-            .toString();
-    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcYqFl.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcYqFl.java
index ac696d3..7037de7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcYqFl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcYqFl.java
@@ -1,113 +1,60 @@
 package com.ruoyi.zongzhi.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
 import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 舆情分类对象 tc_yq_fl
- * 
+ *
  * @author ruoyi
  * @date 2023-08-28
  */
-public class TcYqFl extends BaseEntity
-{
+@Data
+public class TcYqFl extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     private Long id;
 
-    /** 区域id */
+    /**
+     * 区域id
+     */
     @Excel(name = "区域id")
-@ApiModelProperty(value = "区域id")
-    private Long areaId;
+    @ApiModelProperty(value = "区域id")
+    private String areaId;
 
-    /** 媒体类型 */
+    /**
+     * 媒体类型
+     */
     @Excel(name = "媒体类型")
-@ApiModelProperty(value = "媒体类型")
+    @ApiModelProperty(value = "媒体类型")
     private Long mediaType;
 
-    /** 涉事类型 */
+    /**
+     * 涉事类型
+     */
     @Excel(name = "涉事类型")
-@ApiModelProperty(value = "涉事类型")
+    @ApiModelProperty(value = "涉事类型")
     private Long eventType;
 
-    /** 媒体数据 */
+    /**
+     * 媒体数据
+     */
     @Excel(name = "媒体数据")
-@ApiModelProperty(value = "媒体数据")
+    @ApiModelProperty(value = "媒体数据")
     private String mediaCount;
 
-    /** 涉事数量 */
+    /**
+     * 涉事数量
+     */
     @Excel(name = "涉事数量")
-@ApiModelProperty(value = "涉事数量")
+    @ApiModelProperty(value = "涉事数量")
     private String eventCount;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setAreaId(Long areaId) 
-    {
-        this.areaId = areaId;
-    }
-
-    public Long getAreaId() 
-    {
-        return areaId;
-    }
-    public void setMediaType(Long mediaType) 
-    {
-        this.mediaType = mediaType;
-    }
-
-    public Long getMediaType() 
-    {
-        return mediaType;
-    }
-    public void setEventType(Long eventType) 
-    {
-        this.eventType = eventType;
-    }
-
-    public Long getEventType() 
-    {
-        return eventType;
-    }
-    public void setMediaCount(String mediaCount) 
-    {
-        this.mediaCount = mediaCount;
-    }
-
-    public String getMediaCount() 
-    {
-        return mediaCount;
-    }
-    public void setEventCount(String eventCount) 
-    {
-        this.eventCount = eventCount;
-    }
-
-    public String getEventCount() 
-    {
-        return eventCount;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("areaId", getAreaId())
-            .append("mediaType", getMediaType())
-            .append("eventType", getEventType())
-            .append("mediaCount", getMediaCount())
-            .append("eventCount", getEventCount())
-            .toString();
-    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcYqZs.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcYqZs.java
index a283ba7..4dbe85e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcYqZs.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcYqZs.java
@@ -1,7 +1,9 @@
 package com.ruoyi.zongzhi.domain;
 
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -10,91 +12,45 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 舆情走势图对象 tc_yq_zs
- * 
+ *
  * @author ruoyi
  * @date 2023-08-28
  */
-public class TcYqZs extends BaseEntity
-{
+@Data
+public class TcYqZs extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     private Long id;
 
-    /** 区域id */
+    /**
+     * 区域id
+     */
     @Excel(name = "区域id")
-@ApiModelProperty(value = "区域id")
-    private Long areaId;
+    @ApiModelProperty(value = "区域id")
+    private String areaId;
 
-    /** 类型 */
+    /**
+     * 类型
+     */
     @Excel(name = "类型")
-@ApiModelProperty(value = "类型")
+    @ApiModelProperty(value = "类型")
     private Long type;
 
-    /** 日期 */
+    /**
+     * 日期
+     */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date dateTime;
 
-    /** 数量 */
+    /**
+     * 数量
+     */
     @Excel(name = "数量")
-@ApiModelProperty(value = "数量")
+    @ApiModelProperty(value = "数量")
     private Long count;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setAreaId(Long areaId) 
-    {
-        this.areaId = areaId;
-    }
-
-    public Long getAreaId() 
-    {
-        return areaId;
-    }
-    public void setType(Long type) 
-    {
-        this.type = type;
-    }
-
-    public Long getType() 
-    {
-        return type;
-    }
-    public void setDateTime(Date dateTime) 
-    {
-        this.dateTime = dateTime;
-    }
-
-    public Date getDateTime() 
-    {
-        return dateTime;
-    }
-    public void setCount(Long count) 
-    {
-        this.count = count;
-    }
-
-    public Long getCount() 
-    {
-        return count;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("areaId", getAreaId())
-            .append("type", getType())
-            .append("dateTime", getDateTime())
-            .append("count", getCount())
-            .toString();
-    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcZhongdianDomain.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcZhongdianDomain.java
index b0bee4b..f1b518f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcZhongdianDomain.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcZhongdianDomain.java
@@ -24,7 +24,7 @@ public class TcZhongdianDomain extends BaseEntity
     /** 区域id */
     @Excel(name = "区域id")
     @ApiModelProperty(value = "区域id")
-    private Long areaId;
+    private String areaId;
 
     /** 企业类型 */
     @Excel(name = "企业类型")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcZhongdianEnterprise.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcZhongdianEnterprise.java
index 113b1c8..bdbef6e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcZhongdianEnterprise.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcZhongdianEnterprise.java
@@ -24,7 +24,7 @@ public class TcZhongdianEnterprise extends BaseEntity
     /** 区域id */
     @Excel(name = "区域id")
     @ApiModelProperty(value = "区域id")
-    private Long areaId;
+    private String areaId;
 
     /** 企业名称 */
     @Excel(name = "企业名称")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcZhongdianWork.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcZhongdianWork.java
index 9319d24..888424c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcZhongdianWork.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/domain/TcZhongdianWork.java
@@ -27,7 +27,7 @@ public class TcZhongdianWork extends BaseEntity {
      */
     @Excel(name = "区域id")
     @ApiModelProperty(value = "区域id")
-    private Long areaId;
+    private String areaId;
 
     /**
      * 推进单位