diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/controller/ZongzhiScreenOpinionController.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/controller/ZongzhiScreenOpinionController.java
index a65e208..9471f9a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/screen/controller/ZongzhiScreenOpinionController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/controller/ZongzhiScreenOpinionController.java
@@ -10,7 +10,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/controller/ZongzhiScreenSaftyController.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/controller/ZongzhiScreenSaftyController.java
index 1921d22..6149ad3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/screen/controller/ZongzhiScreenSaftyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/controller/ZongzhiScreenSaftyController.java
@@ -5,7 +5,6 @@ import com.ruoyi.screen.domain.response.*;
 import com.ruoyi.screen.service.ZongzhiScreenSaftyService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiSourceResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiSourceResponse.java
index 60e7708..f33fab0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiSourceResponse.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/screen/domain/response/ZongzhiSourceResponse.java
@@ -19,8 +19,10 @@ public class ZongzhiSourceResponse {
 
 
     /**
-     * 类型 1.云断监管  2：APT（M） 3.硬探针 4.软探针 5.系统检测
+     * 类型 1.云断监管  2：APT（M） 3.硬探针 4.软探针 5.监管单位
+     * 6.网站监测
+     * 7.系统监测
      */
-    @ApiModelProperty(value = "类型 1.云断监管  2：APT（M） 3.硬探针 4.软探针 5.系统检测")
+    @ApiModelProperty(value = "类型 1.云断监管  2：APT（M） 3.硬探针 4.软探针 5.监管单位 6.网站监测 7.系统监测")
     private int type;
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/controller/TcWorkDongtaiController.java b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/controller/TcWorkDongtaiController.java
index 2f5c5c9..b279894 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/controller/TcWorkDongtaiController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/zongzhi/controller/TcWorkDongtaiController.java
@@ -1,27 +1,17 @@
 package com.ruoyi.zongzhi.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import io.swagger.annotations.Api;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.zongzhi.domain.TcWorkDongtai;
 import com.ruoyi.zongzhi.service.ITcWorkDongtaiService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 工作动态Controller
@@ -100,4 +90,8 @@ public class TcWorkDongtaiController extends BaseController
     {
         return toAjax(tcWorkDongtaiService.deleteTcWorkDongtaiByIds(ids));
     }
+
+
+
+
 }
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 8bef8da..e6a2384 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
@@ -36,7 +36,7 @@ public class TcDataSource extends BaseEntity {
      * 4.	软探针
      * 5.	系统检测
      */
-    @ApiModelProperty(value = "1.云断监管 2.APT")
+    @ApiModelProperty(value = "类型 1.云断监管  2：APT（M） 3.硬探针 4.软探针 5.监管单位 6.网站监测 7.系统监测")
     @Excel(name = "类型")
     private Long type;
 
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 57f03f4..fecb441 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
@@ -46,6 +46,14 @@ public class TcWorkDongtai extends BaseEntity {
     @ApiModelProperty(value = "材料名称")
     private String materialsName;
 
+
+    /**
+     * 动态名称
+     */
+    @Excel(name = "动态名称")
+    @ApiModelProperty(value = "动态名称")
+    private String name;
+
     /**
      * 发布时间
      */
@@ -81,4 +89,7 @@ public class TcWorkDongtai extends BaseEntity {
     @ApiModelProperty(value = "修改人ID")
     private Long updateId;
 
+
+
+
 }
diff --git a/ruoyi-system/src/main/resources/mapper/zongzhi/TcWorkDongtaiMapper.xml b/ruoyi-system/src/main/resources/mapper/zongzhi/TcWorkDongtaiMapper.xml
index d0adeb1..60d7280 100644
--- a/ruoyi-system/src/main/resources/mapper/zongzhi/TcWorkDongtaiMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/zongzhi/TcWorkDongtaiMapper.xml
@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="areaId"    column="area_id"    />
         <result property="type"    column="type"    />
+        <result property="name"    column="name"    />
         <result property="materialsName"    column="materials_name"    />
         <result property="fabuTime"    column="fabu_time"    />
         <result property="materialsFileName"    column="materials_file_name"    />
@@ -22,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTcWorkDongtaiVo">
-        select id, area_id, type, materials_name, fabu_time, materials_file_name, materials_file_url, create_id, create_by, create_time, update_id, update_by, update_time, remark from tc_work_dongtai
+        select id, area_id, type, materials_name, name,fabu_time, materials_file_name, materials_file_url, create_id, create_by, create_time, update_id, update_by, update_time, remark from tc_work_dongtai
     </sql>
 
     <select id="selectTcWorkDongtaiList" parameterType="TcWorkDongtai" resultMap="TcWorkDongtaiResult">
@@ -30,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="areaId != null "> and area_id = #{areaId}</if>
             <if test="type != null  and type != ''"> and type = #{type}</if>
+            <if test="name != null  and name != ''"> and name = #{name}</if>
             <if test="materialsName != null  and materialsName != ''"> and materials_name like concat('%', #{materialsName}, '%')</if>
             <if test="fabuTime != null "> and fabu_time = #{fabuTime}</if>
             <if test="materialsFileName != null  and materialsFileName != ''"> and materials_file_name like concat('%', #{materialsFileName}, '%')</if>
@@ -50,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="id != null">id,</if>
             <if test="areaId != null">area_id,</if>
             <if test="type != null">type,</if>
+            <if test="name != null">name,</if>
             <if test="materialsName != null">materials_name,</if>
             <if test="fabuTime != null">fabu_time,</if>
             <if test="materialsFileName != null">materials_file_name,</if>
@@ -66,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="id != null">#{id},</if>
             <if test="areaId != null">#{areaId},</if>
             <if test="type != null">#{type},</if>
+            <if test="name != null">#{name},</if>
             <if test="materialsName != null">#{materialsName},</if>
             <if test="fabuTime != null">#{fabuTime},</if>
             <if test="materialsFileName != null">#{materialsFileName},</if>
@@ -85,6 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="areaId != null">area_id = #{areaId},</if>
             <if test="type != null">type = #{type},</if>
+            <if test="name != null">name = #{name},</if>
             <if test="materialsName != null">materials_name = #{materialsName},</if>
             <if test="fabuTime != null">fabu_time = #{fabuTime},</if>
             <if test="materialsFileName != null">materials_file_name = #{materialsFileName},</if>