diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java
index faaf5f2c3a..55793d7d56 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java
@@ -374,13 +374,6 @@ public class DateUtils {
         return DateUtils.addDateDays(nextMonth, -1);
     }
 
-//    public static void main(String[] args) {
-//        //int weekOfYear = getWeekOfYear(new Date());
-//        String format = String.format("%02d", 9);
-//
-//        System.out.println(666);
-//    }
-
     /**
      * 获取日期前一天
      * @author zhaoqifeng
@@ -825,24 +818,6 @@ public class DateUtils {
         return  com.epmet.commons.tools.utils.DateUtils.format(nowDate, com.epmet.commons.tools.utils.DateUtils.DATE_PATTERN_YYYYMM);
     }
 
-    /**
-     * @Author sun
-     * @Description 获取当前日期的前一天日期（yyyy-mm-dd）
-     **/
-    public static Date yesterDay() {
-        Date date = new Date();
-        try {
-            DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-            Calendar calendar = Calendar.getInstance();
-            calendar.set(Calendar.HOUR_OF_DAY, -24);
-            String str = sdf.format(calendar.getTime());
-            date = sdf.parse(str);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return date;
-    }
-
     /**
      * 格式化日期
      * @param dateStr String 字符型日期
@@ -864,9 +839,9 @@ public class DateUtils {
      * @Author sun
      * @Description 获取当前日期几个自然月之前的日期（yyyy-MM-dd HH:mm:ss）
      **/
-    public static String getBeforeMonthDate(int beforMonth){
+    public static String getBeforeMonthDate(int beforeMonth){
         Calendar c = Calendar.getInstance();
-        c.add(Calendar.MONTH, - beforMonth);
+        c.add(Calendar.MONTH, - beforeMonth);
         Date date = c.getTime();
         return DateUtils.format(date,DateUtils.DATE_TIME_PATTERN);
     }
@@ -882,63 +857,6 @@ public class DateUtils {
         return DateUtils.format(date,dateType);
     }
 
-    /**
-     * 获取指定日期的 所在周的第一天和和最后一天
-     * @param dataStr
-     * @return
-     * @throws ParseException
-     */
-    public static String getLastOfWeek(String dataStr) throws ParseException {
-        Calendar cal = Calendar.getInstance();
-        if (StringUtils.isNotBlank(dataStr)){
-            cal.setTime(new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD).parse(dataStr));
-        }
-
-        int d = 0;
-        if (cal.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) {
-            d = -6;
-        } else {
-            d = 2 - cal.get(Calendar.DAY_OF_WEEK);
-        }
-        cal.add(Calendar.DAY_OF_WEEK, d);
-        // 所在周开始日期
-        String data1 = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD).format(cal.getTime());
-        cal.add(Calendar.DAY_OF_WEEK, 6);
-        // 所在周结束日期
-        String data2 = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD).format(cal.getTime());
-        return data1 + "-" + data2;
-
-    }
-
-    /**
-     * 获取指定日期的 所在周的第一天和和最后一天
-     * @param dataStr
-     * @return
-     * @throws ParseException
-     */
-    public static String getFirstOfWeek(String dataStr) throws ParseException {
-        Calendar cal = Calendar.getInstance();
-        if (StringUtils.isNotBlank(dataStr)){
-            cal.setTime(new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD).parse(dataStr));
-        }
-
-        int d = 0;
-        if (cal.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) {
-            d = -6;
-        } else {
-            d = 2 - cal.get(Calendar.DAY_OF_WEEK);
-        }
-        cal.add(Calendar.DAY_OF_WEEK, d);
-        // 所在周开始日期
-        String data1 = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD).format(cal.getTime());
-        cal.add(Calendar.DAY_OF_WEEK, 6);
-        // 所在周结束日期
-        String data2 = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD).format(cal.getTime());
-        return data1 + "-" + data2;
-
-    }
-
-
     /**
      * 获取本周的第一天
      * @return String
@@ -981,10 +899,8 @@ public class DateUtils {
 
 
     public static void main(String[] args) throws ParseException {
-        String first = DateUtils.getFirstOfWeek("20210801");
-        System.out.println(first);
-        String fLastOfWeek = DateUtils.getLastOfWeek("20210801");
-        System.out.println(fLastOfWeek);
+        Date dayOfMonth = DateUtils.getMonthEnd(DateUtils.addDateMonths(new Date(),-1));
+        System.out.println(DateUtils.format(dayOfMonth, DateUtils.DATE_PATTERN_YYYYMMDD));
 
         System.out.println(DateUtils.getWeekStart("20210801"));
         System.out.println(DateUtils.getWeekEnd("20210801"));
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/BaseStatsDataResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/BaseStatsDataResultDTO.java
index 8302d08e49..1381870afa 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/BaseStatsDataResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/BaseStatsDataResultDTO.java
@@ -14,18 +14,12 @@ public class BaseStatsDataResultDTO implements Serializable {
 
     private Integer topicTotal;
     private Integer topicIncr;
-   // private Integer topicToIssueTotal;
     private Integer issueTotal;
     private Integer issueIncr;
-   // private Integer issueToProjectTotal;
     private Integer projectTotal;
     private Integer projectIncr;
     private Integer closedProjectTotal;
     private Integer closedProjectIncr;
-//    private Integer patrolTotal;
-//    private Integer patrolTotalTime;
-//    private Integer orgId;
-//    private Integer orgName;
 
 
 
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/UserAndGroupTotalResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/UserAndGroupTotalResultDTO.java
new file mode 100644
index 0000000000..38b7cc273e
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/UserAndGroupTotalResultDTO.java
@@ -0,0 +1,33 @@
+package com.epmet.dataaggre.dto.datastats.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 对外接口--查询当前组织的用户和小组总数数
+ * @Auth sun
+ */
+@Data
+public class UserAndGroupTotalResultDTO implements Serializable {
+    private static final long serialVersionUID = 3564816296202777303L;
+    /**
+     * 话题总数
+     */
+    private Integer userTotal = 0;
+    /**
+     * 小组总数
+     */
+    private Integer groupTotal = 0;
+
+    /**
+     * 用户新增
+     */
+    private Integer userIncr = 0;
+
+    /**
+     * 小组新增
+     */
+    private Integer groupIncr = 0;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java
index 8a0c8ae877..dab47ac8c4 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java
@@ -7,10 +7,7 @@ import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.dto.datastats.form.BaseDataFormDTO;
-import com.epmet.dataaggre.dto.datastats.result.BaseStatsDataResultDTO;
-import com.epmet.dataaggre.dto.datastats.result.SubTopicAndGroupResultDTO;
-import com.epmet.dataaggre.dto.datastats.result.SubUserTotalResultDTO;
-import com.epmet.dataaggre.dto.datastats.result.WorkFactResultDTO;
+import com.epmet.dataaggre.dto.datastats.result.*;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -93,11 +90,21 @@ public class PubController {
         return new Result<List<SubTopicAndGroupResultDTO>>().ok(data);
     }
 
+    /**
+     * @Param formDTO
+     * @Description 对外接口--查询当前组织的用户和小组总数数
+     * @author sun
+     */
+    @PostMapping("getUserAndGroupTotal")
+    public Result<UserAndGroupTotalResultDTO> getUserAndGroupTotal(@RequestBody BaseDataFormDTO formDTO) {
+        //ValidatorUtils.validateEntity(formDTO, BaseDataFormDTO.AgencyIdAndLevel.class);
+        return new Result<UserAndGroupTotalResultDTO>().ok(dataStatsService.getUserAndGroupTotal(formDTO));
+    }
+
     /**
      * 导出数据，使用map接收
      *
      * @param formDTO
-     * @param response
      * @throws IOException
      * @return
      */
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
index 46f7e64cb6..e9772bf321 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
@@ -276,9 +276,28 @@ public interface DataStatsDao {
 
     /**
      * 获取话题相关总数
+     *
      * @param agencyList
      * @param dateId
      * @return
      */
     List<BaseStatsDataResultDTO> getSubSumAgencyTopic(@Param("agencyList") List<String> agencyList, @Param("dateId") String dateId);
+
+    /**
+     * desc:获取用户总数
+     *
+     * @param agencyList
+     * @param dateId
+     * @return
+     */
+    TotalAndIncrResultDTO getAgencySumUser(@Param("agencyList") List<String> agencyList, @Param("dateId") String dateId);
+
+    /**
+     * desc:获取小组总数
+     *
+     * @param agencyList
+     * @param dateId
+     * @return
+     */
+    TotalAndIncrResultDTO getAgencySumGroup(@Param("agencyList") List<String> agencyList, @Param("dateId") String dateId);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
index 9db20ef41c..8d0cb5fa76 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
@@ -211,4 +211,14 @@ public interface DataStatsService {
      * @param formDTO
      */
     List<SubTopicAndGroupResultDTO> subTopicAndGroup(BaseDataFormDTO formDTO);
+
+    /**
+     * desc: 对外接口--查询当前组织的用户和小组总数数
+     *
+     * @param formDTO
+     * @return java.util.List<com.epmet.dataaggre.dto.datastats.result.UserAndGroupTotalResultDTO>
+     * @author LiuJanJun
+     * @date 2021/8/12 2:23 下午
+     */
+    UserAndGroupTotalResultDTO getUserAndGroupTotal(BaseDataFormDTO formDTO);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 0fede9e608..6a8896618d 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -1799,4 +1799,35 @@ public class DataStatsServiceImpl implements DataStatsService {
         return resultList;
     }
 
+    @Override
+    public UserAndGroupTotalResultDTO getUserAndGroupTotal(BaseDataFormDTO formDTO) {
+        //入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            formDTO.setDateId(DateUtils.getBeforeNDay(1));
+        }
+        //格式不对
+        String lastMonthDateId = DateUtils.format(DateUtils.getMonthEnd(DateUtils.addDateMonths(DateUtils.parseDate(formDTO.getDateId(),DateUtils.DATE_PATTERN_YYYYMMDD),-1)),DateUtils.DATE_PATTERN_YYYYMMDD);
+        UserAndGroupTotalResultDTO result = new UserAndGroupTotalResultDTO();
+
+        //0.根据组织Id查询是否存在子客户，存在的按areaCode查询当前客户之外的客户组织列表
+        List<String> agencyList = indexService.getAgencyIdsByAgencyId(formDTO.getAgencyId());
+        agencyList.add(formDTO.getAgencyId());
+
+        //3-2.查询组织下用户
+        TotalAndIncrResultDTO userTotal = dataStatsDao.getAgencySumUser(agencyList, formDTO.getDateId());
+        result.setUserTotal(userTotal == null? NumConstant.ZERO:userTotal.getTotal());
+
+        TotalAndIncrResultDTO userTotalLastMonthDay = dataStatsDao.getAgencySumUser(agencyList, lastMonthDateId);
+        int lastUser = userTotalLastMonthDay == null ? NumConstant.ZERO : userTotalLastMonthDay.getTotal();
+        result.setUserIncr(result.getUserTotal()-lastUser);
+        //3-3.查询直属下级组织小组日统计数据
+        TotalAndIncrResultDTO groupTotal = dataStatsDao.getAgencySumGroup(agencyList, formDTO.getDateId());
+        result.setGroupTotal(groupTotal == null? NumConstant.ZERO:groupTotal.getTotal());
+
+        TotalAndIncrResultDTO groupTotalLastMonthDay = dataStatsDao.getAgencySumGroup(agencyList, lastMonthDateId);
+        int lastGroup = groupTotalLastMonthDay == null ? NumConstant.ZERO : groupTotalLastMonthDay.getTotal();
+        result.setGroupIncr(result.getGroupTotal()-lastGroup);
+        return result;
+    }
+
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
index 37221ebb03..32bce002dc 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
@@ -280,16 +280,18 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         formDTO.setPatrolStartTime(DateUtils.getBeforeMonthDate(formDTO.getTime(), "yyyyMMdd"));
         List<CustomerStaffDTO> staffList = new ArrayList<>();
         //2-1.按名字检索时先查询人员基础信息
-        if (StringUtils.isEmpty(formDTO.getStaffName())) {
+        if (!StringUtils.isEmpty(formDTO.getStaffName())) {
             staffList = customerStaffDao.selectByStaffIds(null, formDTO.getStaffName());
             if (!CollectionUtils.isEmpty(staffList)) {
                 formDTO.setStaffId(staffList.get(0).getUserId());
+            }else {
+                return resultList;
             }
         }
         //2-2.查询业务数据
         resultList = staffPatrolRecordDao.selectStaffPatrolList(formDTO);
         //2-3.查询人员基本信息【之前sql关联人员表查性别、姓名效率低 所以分开查）
-        if (!CollectionUtils.isEmpty(staffList)) {
+        if (CollectionUtils.isEmpty(staffList)) {
             List<String> staffIdList = resultList.stream().map(StaffListResultDTO::getStaffId).collect(Collectors.toList());
             staffList = customerStaffDao.selectByStaffIds(staffIdList, null);
         }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
index eb3f9c7d33..ca06b808fe 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
@@ -742,5 +742,31 @@
             agency_id = #{agencyId}
         </foreach>
     </select>
+    <select id="getAgencySumUser" resultType="com.epmet.dataaggre.dto.datastats.result.TotalAndIncrResultDTO">
+        SELECT
+            SUM(reg_total) AS total
+        FROM
+            fact_reg_user_agency_daily
+        WHERE
+            del_flag = '0'
+        AND date_id = #{dateId}
+        <foreach item="agencyId" collection="agencyList" open="AND (" separator="or" close=")" index="">
+            agency_id = #{agencyId}
+        </foreach>
+    </select>
+    <select id="getAgencySumGroup" resultType="com.epmet.dataaggre.dto.datastats.result.TotalAndIncrResultDTO">
+         SELECT
+            group_total AS total
+        FROM
+            fact_group_total_agency_daily
+        WHERE
+            del_flag = '0'
+        AND date_id = #{dateId}
+        <foreach item="agencyId" collection="agencyList" open="AND (" separator="or" close=")" index="">
+            agency_id = #{agencyId}
+        </foreach>
+        ORDER BY
+            group_total DESC
+    </select>
 
 </mapper>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
index 897aa9d07c..4e84fe035c 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
@@ -13,6 +13,7 @@
         WHERE
             del_flag = '0'
             AND all_parent_ids LIKE CONCAT('%',#{agencyId},'%')
+            and PARTY_FLAG = 0
         ORDER BY
             point_total DESC,
             convert(user_name using gbk) ASC
@@ -67,7 +68,7 @@
             </if>
         </if>
         ORDER BY
-            point_total DESC
+            point_total DESC, convert(user_name using gbk) ASC
         LIMIT #{topNum}
     </select>
 
@@ -128,6 +129,7 @@
         WHERE
                 m.DEL_FLAG = '0'
                 and scg.AREA_CODE like CONCAT(#{areaCode},'%')
+                and m.PARTY_FLAG = 0
         ORDER BY
                 m.POINT_TOTAL DESC,
                 convert(m.user_name using gbk) ASC
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ExternalAppController.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ExternalAppController.java
index baee81af67..c0cacc525d 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ExternalAppController.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ExternalAppController.java
@@ -103,7 +103,7 @@ public class ExternalAppController {
      */
     @PostMapping("/list")
     public Result<PageData<ExternalAppResultDTO>> list(@RequestBody ExternalAppFormDTO formDTO) {
-        PageData<ExternalAppResultDTO> page = externalAppService.listPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getCustomerId());
+        PageData<ExternalAppResultDTO> page = externalAppService.listPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getCustomerId(), formDTO.getCustomerType());
         return new Result<PageData<ExternalAppResultDTO>>().ok(page);
     }
 
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/ExternalAppDao.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/ExternalAppDao.java
index b2f89b9b90..2139245165 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/ExternalAppDao.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/ExternalAppDao.java
@@ -39,7 +39,7 @@ public interface ExternalAppDao extends BaseDao<ExternalAppEntity> {
 
     ExternalAppResultDTO getByNameAndCustomerId(@Param("appName") String appName, @Param("customerId") String customerId);
 
-    List<ExternalAppResultDTO> list(@Param("customerId") String customerId);
+    List<ExternalAppResultDTO> list(@Param("customerId") String customerId, @Param("customerType") String customerType);
 
     List<String> getCustomerIds();
 
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ExternalAppService.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ExternalAppService.java
index 77e4c32f48..b32ef9467e 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ExternalAppService.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ExternalAppService.java
@@ -35,7 +35,7 @@ public interface ExternalAppService {
 
     ExternalAppResultDTO updateById(String appId, String appName, String customerId, String customerType);
 
-    PageData<ExternalAppResultDTO> listPage(Integer pageNo, Integer pageSize, String customerId);
+    PageData<ExternalAppResultDTO> listPage(Integer pageNo, Integer pageSize, String customerId, String customerType);
 
     List<String> getCustomerIds();
 
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ExternalAppServiceImpl.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ExternalAppServiceImpl.java
index 9d7fee1483..12f84f3456 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ExternalAppServiceImpl.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ExternalAppServiceImpl.java
@@ -158,9 +158,9 @@ public class ExternalAppServiceImpl implements ExternalAppService {
     }
 
     @Override
-    public PageData<ExternalAppResultDTO> listPage(Integer pageNo, Integer pageSize, String customerId) {
+    public PageData<ExternalAppResultDTO> listPage(Integer pageNo, Integer pageSize, String customerId, String customerType) {
         PageHelper.startPage(pageNo, pageSize);
-        List<ExternalAppResultDTO> list = externalAppDao.list(customerId);
+        List<ExternalAppResultDTO> list = externalAppDao.list(customerId, customerType);
         for (ExternalAppResultDTO app : list) {
             // 设置客户类型中文
             app.setCustomerTypeName(CustomerTypeEnum.getName(app.getCustomerType()));
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/ExternalAppDao.xml b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/ExternalAppDao.xml
index 55889d71b1..fbc74db7ff 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/ExternalAppDao.xml
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/ExternalAppDao.xml
@@ -45,6 +45,9 @@
             <if test="customerId != null and customerId != ''">
                 AND ea.CUSTOMER_ID = #{customerId}
             </if>
+            <if test="customerType != null and customerType != ''">
+                AND ea.CUSTOMER_TYPE = #{customerType}
+            </if>
         </where>
     </select>
 
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
index 0b6a959987..fc1f3a67ce 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
@@ -49,7 +49,7 @@
             ORDER BY re.CLOSE_CASE_TIME DESC
         </if>
         )t
-        LEFT JOIN resi_event_attachment rea ON (rea.RESI_EVENT_ID = t.eventId AND rea.DEL_FLAG = '0' AND rea.ATTACHMENT_TYPE = 'image' AND (rea.SORT = 0 OR rea.SORT = 1 OR rea.SORT = 2))
+        LEFT JOIN resi_event_attachment rea ON (rea.RESI_EVENT_ID = t.eventId AND rea.DEL_FLAG = '0' AND rea.ATTACHMENT_TYPE = 'image' AND (rea.SORT = 3 OR rea.SORT = 1 OR rea.SORT = 2))
     </select>
 
 
@@ -97,7 +97,7 @@
                 and re.READ_FLAG='1'
                 and re.`STATUS`=#{statusCondition}
             </if>
-            order by re.LATEST_OPERATED_TIME desc
+            order by re.LATEST_OPERATED_TIME desc,rea.sort asc
     </select>
 
     <!-- 报事详情 -->
@@ -182,7 +182,7 @@
         FROM resi_event_report_org ro
         LEFT JOIN resi_event re ON (re.ID = ro.RESI_EVENT_ID AND re.DEL_FLAG = '0')
         LEFT JOIN resi_event_attachment ea ON (ea.RESI_EVENT_ID = ro.RESI_EVENT_ID AND ea.DEL_FLAG = '0' AND
-        ea.ATTACHMENT_TYPE = 'image' AND ea.SORT IN (0,1,2))
+        ea.ATTACHMENT_TYPE = 'image' AND ea.SORT IN (3,1,2))
         WHERE ro.DEL_FLAG = '0'
         AND ro.ORG_READ = 'un_read'
         AND ro.ORG_ID IN(
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml
index 28548eaad9..b7c65d32be 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml
@@ -46,11 +46,11 @@
             AND rem.READ_FLAG =#{readFlag}
         <if test='readFlag == "un_read" '>
             ORDER BY
-            re.CREATED_TIME ASC
+            re.CREATED_TIME ASC,rea.sort asc
         </if>
         <if test='readFlag == "read" '>
             ORDER BY
-            re.LATEST_OPERATED_TIME DESC
+            re.LATEST_OPERATED_TIME DESC,rea.sort asc
         </if>
     </select>
 
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-client/pom.xml b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-client/pom.xml
deleted file mode 100644
index 5c57808384..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-client/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>epmet-openapi-adv</artifactId>
-        <groupId>com.epmet</groupId>
-        <version>2.0.0</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>epmet-openapi-adv-client</artifactId>
-
-
-</project>
\ No newline at end of file
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/Dockerfile b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/Dockerfile
deleted file mode 100644
index d15b865820..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM java:8
-
-RUN export LANG="zh_CN.UTF-8"
-RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
-RUN echo 'Asia/Shanghai' > /etc/timezone
-
-COPY ./target/*.jar ./epmet-openapi-adv.jar
-
-EXPOSE 8115
-
-ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]
\ No newline at end of file
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-dev.yml b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-dev.yml
deleted file mode 100644
index 79721a6cb7..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-dev.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-version: "3.7"
-services:
-  epmet-openapi-adv-server:
-    container_name: epmet-openapi-adv-server-dev
-    image: 192.168.1.140:5000/epmet-cloud-dev/epmet-openapi-adv-server:version_placeholder
-    ports:
-      - "8015:8015"
-    network_mode: host # 不会创建新的网络
-    volumes:
-      - "/opt/epmet-cloud-logs/dev:/logs"
-    environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-openapi-adv.jar"
-    restart: "unless-stopped"
-    deploy:
-      resources:
-        limits:
-          cpus: '0.1'
-          memory: 300M
\ No newline at end of file
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-prod.yml b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-prod.yml
deleted file mode 100644
index b5a13e04e3..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-prod.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-version: "3.7"
-services:
-  epmet-openapi-adv-server:
-    container_name: epmet-openapi-adv-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-openapi-adv-server:0.3.3
-    ports:
-      - "8015:8015"
-    network_mode: host # 不会创建新的网络
-    volumes:
-      - "/opt/epmet-cloud-logs/prod:/logs"
-    environment:
-      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-openapi-adv.jar"
-    restart: "unless-stopped"
-    deploy:
-      resources:
-        limits:
-          cpus: '0.1'
-          memory: 600M
\ No newline at end of file
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-test.yml b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-test.yml
deleted file mode 100644
index 45d536cb2f..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-test.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-version: "3.7"
-services:
-  epmet-openapi-adv-server:
-    container_name: epmet-openapi-adv-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-openapi-adv-server:version_placeholder
-    ports:
-      - "8015:8015"
-    network_mode: host # 不会创建新的网络
-    volumes:
-      - "/opt/epmet-cloud-logs/test:/logs"
-    environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-openapi-adv.jar"
-    restart: "unless-stopped"
-    deploy:
-      resources:
-        limits:
-          cpus: '0.1'
-          memory: 300M
\ No newline at end of file
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/pom.xml b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/pom.xml
deleted file mode 100644
index 14d5226105..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/pom.xml
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <version>0.3.3</version>
-    <parent>
-        <artifactId>epmet-openapi-adv</artifactId>
-        <groupId>com.epmet</groupId>
-        <version>2.0.0</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>epmet-openapi-adv-server</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.epmet</groupId>
-            <artifactId>epmet-commons-mybatis</artifactId>
-            <version>2.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context-support</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-        <!-- 替换Feign原生httpclient -->
-        <dependency>
-            <groupId>io.github.openfeign</groupId>
-            <artifactId>feign-httpclient</artifactId>
-            <version>10.3.0</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <skipTests>true</skipTests>
-                </configuration>
-            </plugin>
-        </plugins>
-
-        <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
-        <resources>
-            <resource>
-                <filtering>true</filtering>
-                <directory>${basedir}/src/main/resources</directory>
-            </resource>
-        </resources>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>dev</id>
-            <properties>
-                <server.port>8115</server.port>
-                <spring.profiles.active>dev</spring.profiles.active>
-
-                <!-- 数据库配置-->
-                <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_adv?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epmet_adv_user</spring.datasource.druid.username>
-                <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
-                <!-- redis配置 -->
-                <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>192.168.1.140</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>123456</spring.redis.password>
-                <!-- nacos -->
-                <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.1.140:8848</nacos.server-addr>
-                <nacos.discovery.namespace>1fecc730-5e6e-464c-aae9-7567944e7936</nacos.discovery.namespace>
-                <nacos.config.namespace></nacos.config.namespace>
-                <nacos.config.group></nacos.config.group>
-                <nacos.config-enabled>false</nacos.config-enabled>
-                <nacos.ip/>
-
-                <spring.flyway.enabled>false</spring.flyway.enabled>
-                <!--钉钉 机器人地址-->
-                <dingTalk.robot.webHook>
-                    https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
-                </dingTalk.robot.webHook>
-                <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
-                </dingTalk.robot.secret>
-            </properties>
-        </profile>
-        <profile>
-            <id>local</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <server.port>8115</server.port>
-                <spring.profiles.active>local</spring.profiles.active>
-
-                <!-- 数据库配置-->
-                <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://118.190.150.119:47306/epmet_adv?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epmet_adv_user</spring.datasource.druid.username>
-                <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
-                <!-- redis配置 -->
-                <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>118.190.150.119</spring.redis.host>
-                <spring.redis.port>47379</spring.redis.port>
-                <spring.redis.password>123456</spring.redis.password>
-                <!-- nacos -->
-                <nacos.register-enabled>false</nacos.register-enabled>
-                <nacos.server-addr>192.168.1.140:8848</nacos.server-addr>
-                <nacos.discovery.namespace>1fecc730-5e6e-464c-aae9-7567944e7936</nacos.discovery.namespace>
-                <nacos.config.namespace></nacos.config.namespace>
-                <nacos.config.group></nacos.config.group>
-                <nacos.config-enabled>false</nacos.config-enabled>
-                <nacos.ip/>
-
-                <spring.flyway.enabled>false</spring.flyway.enabled>
-                <!--钉钉 机器人地址-->
-                <dingTalk.robot.webHook>
-                    https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
-                </dingTalk.robot.webHook>
-                <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
-                </dingTalk.robot.secret>
-                <openapi.scan.server.url>https://epmet-dev.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
-            </properties>
-        </profile>
-        <profile>
-            <id>test</id>
-            <!--  <activation>
-                  <activeByDefault>true</activeByDefault>
-              </activation>-->
-            <properties>
-                <server.port>8115</server.port>
-                <spring.profiles.active>test</spring.profiles.active>
-
-                <!-- 数据库配置-->
-                <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_adv?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
-                <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
-                <!-- redis配置 -->
-                <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
-                <!-- nacos -->
-                <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.10.150:8848</nacos.server-addr>
-                <nacos.discovery.namespace>67e3c350-533e-4d7c-9f8f-faf1b4aa82ae</nacos.discovery.namespace>
-                <nacos.config.namespace></nacos.config.namespace>
-                <nacos.config.group></nacos.config.group>
-                <nacos.config-enabled>false</nacos.config-enabled>
-                <nacos.ip/>
-
-                <spring.flyway.enabled>true</spring.flyway.enabled>
-                <!--测试钉钉 机器人地址-->
-                <dingTalk.robot.webHook>
-                    https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
-                </dingTalk.robot.webHook>
-                <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
-                </dingTalk.robot.secret>
-            </properties>
-        </profile>
-        <profile>
-            <id>prod</id>
-            <properties>
-                <server.port>8115</server.port>
-                <spring.profiles.active>prod</spring.profiles.active>
-
-                <!-- 数据库配置-->
-                <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_adv?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epmet_adv_user</spring.datasource.druid.username>
-                <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
-                <!-- redis配置 -->
-                <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
-                <!-- nacos -->
-                <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
-                <nacos.config.namespace></nacos.config.namespace>
-                <nacos.config.group></nacos.config.group>
-                <nacos.config-enabled>false</nacos.config-enabled>
-                <nacos.ip/>
-
-                <spring.flyway.enabled>true</spring.flyway.enabled>
-
-                <!--生产钉钉 机器人地址-->
-                <dingTalk.robot.webHook>
-                    https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
-                </dingTalk.robot.webHook>
-                <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
-                </dingTalk.robot.secret>
-            </properties>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/AdvApplication.java b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/AdvApplication.java
deleted file mode 100644
index 61c5d3b4b8..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/AdvApplication.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.epmet;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-
-@SpringBootApplication
-@EnableDiscoveryClient
-@EnableFeignClients
-public class AdvApplication {
-    public static void main(String[] args) {
-        SpringApplication.run(AdvApplication.class, args);
-    }
-}
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/aspect/RequestLogAspect.java b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/aspect/RequestLogAspect.java
deleted file mode 100644
index e06fdc2c95..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/aspect/RequestLogAspect.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.epmet.adv.aspect;
-
-import com.epmet.commons.tools.aspect.BaseRequestLogAspect;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-import org.springframework.web.context.request.RequestAttributes;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * 日志/异常处理切面实现，调用父类方法完成日志记录和异常处理。
- */
-@Aspect
-@Component
-@Order(0)
-public class RequestLogAspect extends BaseRequestLogAspect {
-
-    @Override
-    @Around(value = "execution(* com.epmet.adv.controller.*Controller*.*(..)) ")
-    public Object proceed(ProceedingJoinPoint point) throws Throwable {
-        return super.proceed(point, getRequest());
-    }
-
-    /**
-     * 获取Request对象
-     *
-     * @return
-     */
-    private HttpServletRequest getRequest() {
-        RequestAttributes ra = RequestContextHolder.getRequestAttributes();
-        ServletRequestAttributes sra = (ServletRequestAttributes) ra;
-        return sra.getRequest();
-    }
-
-}
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/config/ModuleConfigImpl.java b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/config/ModuleConfigImpl.java
deleted file mode 100644
index 8d88549b66..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/config/ModuleConfigImpl.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Copyright (c) 2018 人人开源 All rights reserved.
- *
- * https://www.renren.io
- *
- * 版权所有，侵权必究！
- */
-
-package com.epmet.adv.config;
-
-import com.epmet.commons.tools.config.ModuleConfig;
-import org.springframework.stereotype.Service;
-
-/**
- * 模块配置信息
- *
- * @author Mark sunlightcs@gmail.com
- * @since 1.0.0
- */
-@Service
-public class ModuleConfigImpl implements ModuleConfig {
-    @Override
-    public String getName() {
-        return "adv";
-    }
-}
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/controller/AdvVideoController.java b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/controller/AdvVideoController.java
deleted file mode 100644
index 5c032ad562..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/controller/AdvVideoController.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.epmet.adv.controller;
-
-import com.epmet.adv.entity.AdvVedioEntity;
-import com.epmet.adv.service.AdvVedioService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.io.IOException;
-
-@Controller
-@RequestMapping("video")
-public class AdvVideoController {
-
-    @Autowired
-    private AdvVedioService advVedioService;
-
-    @GetMapping("company-adv")
-    public String toVedio() throws IOException {
-        AdvVedioEntity enableAdvVedioEntity = advVedioService.getEnableAdvVedioEntity();
-        String redirectUrl = enableAdvVedioEntity != null ? enableAdvVedioEntity.getPath() : "404";
-        return String.format("redirect:%s", redirectUrl);
-        //response.sendRedirect("www.baidu.com");
-    }
-
-}
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/dao/AdvVedioDao.java b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/dao/AdvVedioDao.java
deleted file mode 100644
index c14da09d52..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/dao/AdvVedioDao.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * <p>
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.epmet.adv.dao;
-
-import com.epmet.adv.entity.AdvVedioEntity;
-import com.epmet.commons.mybatis.dao.BaseDao;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 宣传视频
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-12-30
- */
-@Mapper
-public interface AdvVedioDao extends BaseDao<AdvVedioEntity> {
-	AdvVedioEntity getEnableAdvVedioEntity();
-}
\ No newline at end of file
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/entity/AdvVedioEntity.java b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/entity/AdvVedioEntity.java
deleted file mode 100644
index a25c6ea77e..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/entity/AdvVedioEntity.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * <p>
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.epmet.adv.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-/**
- * 宣传视频
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-12-30
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("adv_vedio")
-public class AdvVedioEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 存储路径
-     */
-	private String path;
-
-    /**
-     * 存储类型。aliyun_oss,local
-     */
-	private String storeType;
-
-    /**
-     * 是否启用
-     */
-	private Integer enable;
-
-}
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/service/AdvVedioService.java b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/service/AdvVedioService.java
deleted file mode 100644
index 38091ee496..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/service/AdvVedioService.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.epmet.adv.service;
-
-import com.epmet.adv.entity.AdvVedioEntity;
-
-public interface AdvVedioService {
-    AdvVedioEntity getEnableAdvVedioEntity();
-}
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/service/impl/AdvVedioServiceImpl.java b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/service/impl/AdvVedioServiceImpl.java
deleted file mode 100644
index cecc710c39..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/java/com/epmet/adv/service/impl/AdvVedioServiceImpl.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.epmet.adv.service.impl;
-
-import com.epmet.adv.dao.AdvVedioDao;
-import com.epmet.adv.entity.AdvVedioEntity;
-import com.epmet.adv.service.AdvVedioService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class AdvVedioServiceImpl implements AdvVedioService {
-    @Autowired
-    private AdvVedioDao advVedioDao;
-
-    public AdvVedioEntity getEnableAdvVedioEntity() {
-        return advVedioDao.getEnableAdvVedioEntity();
-    }
-
-}
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/resources/bootstrap.yml b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/resources/bootstrap.yml
deleted file mode 100644
index 0bd40dcca7..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,140 +0,0 @@
-server:
-  port: @server.port@
-  version: @version@
-  servlet:
-    context-path: /adv
-
-spring:
-  main:
-    allow-bean-definition-overriding: true
-  application:
-    name: epmet-openapi-adv-server
-  #环境 dev|test|prod
-  profiles:
-    active:  @spring.profiles.active@
-  messages:
-    encoding: UTF-8
-    basename: i18n/messages_common
-  jackson:
-    time-zone: GMT+8
-    date-format: yyyy-MM-dd HH:mm:ss
-  redis:
-    database: @spring.redis.index@
-    host: @spring.redis.host@
-    port: @spring.redis.port@
-    password: @spring.redis.password@
-    timeout: 30s
-  datasource:
-    druid:
-      #MySQL
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      url: @spring.datasource.druid.url@
-      username: @spring.datasource.druid.username@
-      password: @spring.datasource.druid.password@
-      initial-size: 10
-      max-active: 100
-      min-idle: 10
-      max-wait: 60000
-      pool-prepared-statements: true
-      max-pool-prepared-statement-per-connection-size: 20
-      time-between-eviction-runs-millis: 60000
-      min-evictable-idle-time-millis: 300000
-      #Oracle需要打开注释
-      #validation-query: SELECT 1 FROM DUAL
-      test-while-idle: true
-      test-on-borrow: false
-      test-on-return: false
-      filter:
-        stat:
-          log-slow-sql: true
-          slow-sql-millis: 1000
-          merge-sql: false
-        wall:
-          config:
-            multi-statement-allow: true
-  # 数据迁移工具flyway
-  flyway:
-    enabled: @spring.flyway.enabled@
-    locations: classpath:db/migration
-    url: @spring.datasource.druid.url@
-    user: @spring.datasource.druid.username@
-    password: @spring.datasource.druid.password@
-    baseline-on-migrate: true
-    baseline-version: 0
-  cloud:
-    nacos:
-      discovery:
-        server-addr: @nacos.server-addr@
-        #nacos的命名空间ID，默认是public
-        namespace: @nacos.discovery.namespace@
-        #不把自己注册到注册中心的地址
-        register-enabled: @nacos.register-enabled@
-        ip: @nacos.ip@
-      config:
-        enabled: @nacos.config-enabled@
-        server-addr: @nacos.server-addr@
-        namespace: @nacos.config.namespace@
-        group: @nacos.config.group@
-        file-extension: yaml
-management:
-  endpoints:
-    web:
-      exposure:
-        include: "*"
-  endpoint:
-    health:
-      show-details: ALWAYS
-
-mybatis-plus:
-  mapper-locations: classpath:/mapper/**/*.xml
-  #实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: com.epmet.entity
-  global-config:
-    #数据库相关配置
-    db-config:
-      #主键类型  AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
-      id-type: ID_WORKER
-      #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
-      field-strategy: NOT_NULL
-      #驼峰下划线转换
-      column-underline: true
-    banner: false
-  #原生配置
-  configuration:
-    map-underscore-to-camel-case: true
-    cache-enabled: false
-    call-setters-on-nulls: true
-    jdbc-type-for-null: 'null'
-
-feign:
-  hystrix:
-    enabled: true
-  client:
-    config:
-      default:
-        loggerLevel: BASIC
-  okhttp:
-    enabled: true
-
-
-hystrix:
-  command:
-    default:
-      execution:
-        isolation:
-          thread:
-            timeoutInMilliseconds: 60000 #缺省为1000
-
-ribbon:
-  ReadTimeout: 300000
-  ConnectTimeout: 300000
-
-#pageHelper分页插件
-pagehelper:
-  helper-dialect: mysql
-  reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
-
-dingTalk:
-  robot:
-    webHook: @dingTalk.robot.webHook@
-    secret: @dingTalk.robot.secret@
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/resources/db/migration/V0.0.1__createAdvVedio.sql b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/resources/db/migration/V0.0.1__createAdvVedio.sql
deleted file mode 100644
index 007c12b55f..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/resources/db/migration/V0.0.1__createAdvVedio.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- create database epmet_adv default character set utf8mb4;
-
--- CREATE USER epmet_adv_user@'%' IDENTIFIED BY 'EpmEt-db-UsEr';
--- GRANT ALL ON `epmet_adv%`.* TO 'epmet_adv_user'@'%';
--- flush privileges;
-
-CREATE TABLE `adv_vedio` (
-  `ID` varchar(64) NOT NULL COMMENT 'id' primary key ,
-  `PATH` varchar(255) NOT NULL COMMENT '存储路径',
-  `STORE_TYPE` varchar(30) NOT NULL COMMENT '存储类型。aliyun_oss,local',
-  `ENABLE` tinyint(1) NOT NULL COMMENT '是否启用',
-  `REVISION` int(11) DEFAULT NULL COMMENT '乐观锁',
-  `DEL_FLAG` int(11) unsigned DEFAULT NULL COMMENT '删除标识  0：未删除    1：删除',
-  `CREATED_BY` varchar(32) DEFAULT NULL COMMENT '创建者',
-  `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间',
-  `UPDATED_BY` varchar(32) DEFAULT NULL COMMENT '更新者',
-  `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='宣传视频'
\ No newline at end of file
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/resources/logback-spring.xml b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/resources/logback-spring.xml
deleted file mode 100644
index 06a21d317c..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/resources/logback-spring.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
-
-    <property name="log.path" value="logs/adv"/>
-
-    <springProperty scope="context" name="appname" source="spring.application.name"/>
-    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
-    <springProperty scope="context" name="secret" source="dingTalk.robot.secret"/>
-
-    <!-- 日志上下文名称 -->
-    <contextName>${appname}</contextName>
-
-    <!-- 彩色日志格式 -->
-    <property name="CONSOLE_LOG_PATTERN"
-              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
-
-    <!--1. 输出到控制台-->
-    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-        <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>debug</level>
-        </filter>
-        <encoder>
-            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
-            <!-- 设置字符集 -->
-            <charset>UTF-8</charset>
-        </encoder>
-    </appender>
-
-    <!--2. 输出到文档-->
-    <!-- 2.1 level为 DEBUG 日志，时间滚动输出  -->
-    <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${log.path}/debug.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 设置字符集 -->
-        </encoder>
-        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志归档 -->
-            <fileNamePattern>${log.path}/debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <!--日志文档保留天数-->
-            <maxHistory>15</maxHistory>
-        </rollingPolicy>
-        <!-- 此日志文档只记录debug级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>debug</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 2.2 level为 INFO 日志，时间滚动输出  -->
-    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${log.path}/info.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 每天日志归档路径以及格式 -->
-            <fileNamePattern>${log.path}/info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <!--日志文档保留天数-->
-            <maxHistory>15</maxHistory>
-        </rollingPolicy>
-        <!-- 此日志文档只记录info级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>info</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 2.3 level为 WARN 日志，时间滚动输出  -->
-    <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${log.path}/warn.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
-        </encoder>
-        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}/warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <!--日志文档保留天数-->
-            <maxHistory>15</maxHistory>
-        </rollingPolicy>
-        <!-- 此日志文档只记录warn级别的 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>warn</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 2.4 level为 ERROR 日志，时间滚动输出  -->
-    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文档的路径及文档名 -->
-        <file>${log.path}/error.log</file>
-        <!--日志文档输出格式-->
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
-        </encoder>
-        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}/error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
-            <!--日志文档保留天数-->
-            <maxHistory>15</maxHistory>
-        </rollingPolicy>
-        <!-- 此日志文档只记录ERROR级别的 发送钉钉短信 -->
-        <filter class="com.epmet.commons.tools.filter.LogMsgSendFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-            <webHook>${webHook}</webHook>
-            <secret>${secret}</secret>
-            <appName>${appname}</appName>
-        </filter>
-    </appender>
-
-    <!-- 开发、测试环境 -->
-    <springProfile name="dev,test">
-        <logger name="org.springframework.web" level="INFO"/>
-        <logger name="org.springboot.sample" level="INFO"/>
-        <logger name="com.epmet.dao" level="INFO"/>
-        <logger name="com.epmet.dao" level="DEBUG"/>
-        <root level="INFO">
-            <appender-ref ref="DEBUG_FILE"/>
-            <appender-ref ref="INFO_FILE"/>
-            <appender-ref ref="WARN_FILE"/>
-            <appender-ref ref="ERROR_FILE"/>
-        </root>
-    </springProfile>
-
-    <!-- 生产环境 -->
-    <springProfile name="prod">
-        <logger name="org.springframework.web" level="INFO"/>
-        <logger name="org.springboot.sample" level="INFO"/>
-        <logger name="com.epmet.dao" level="INFO"/>
-        <root level="INFO">
-            <appender-ref ref="CONSOLE"/>
-            <appender-ref ref="DEBUG_FILE"/>
-            <appender-ref ref="INFO_FILE"/>
-            <appender-ref ref="WARN_FILE"/>
-            <appender-ref ref="ERROR_FILE"/>
-        </root>
-    </springProfile>
-
-</configuration>
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/resources/mapper/AdvVedioDao.xml b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/resources/mapper/AdvVedioDao.xml
deleted file mode 100644
index 92a4993b9f..0000000000
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/resources/mapper/AdvVedioDao.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.epmet.adv.dao.AdvVedioDao">
-
-    <resultMap type="com.epmet.adv.entity.AdvVedioEntity" id="entityMap">
-        <result property="id" column="ID"/>
-        <result property="path" column="PATH"/>
-        <result property="storeType" column="STORE_TYPE"/>
-        <result property="enable" column="ENABLE"/>
-        <result property="revision" column="REVISION"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
-
-    <select id="getEnableAdvVedioEntity" resultMap="entityMap">
-        select id,
-               path,
-               store_type,
-               enable,
-               revision,
-               del_flag,
-               created_by,
-               created_time,
-               updated_by,
-               updated_time
-        from adv_vedio
-        where ENABLE = 1
-        limit 1;
-    </select>
-
-</mapper>
\ No newline at end of file
diff --git a/epmet-openapi/epmet-openapi-adv/pom.xml b/epmet-openapi/epmet-openapi-adv/pom.xml
deleted file mode 100644
index 13490687d1..0000000000
--- a/epmet-openapi/epmet-openapi-adv/pom.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>epmet-openapi</artifactId>
-        <groupId>com.epmet</groupId>
-        <version>2.0.0</version>
-    </parent>
-    <packaging>pom</packaging>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>epmet-openapi-adv</artifactId>
-
-    <modules>
-        <module>epmet-openapi-adv-client</module>
-        <module>epmet-openapi-adv-server</module>
-    </modules>
-
-
-</project>
\ No newline at end of file
diff --git a/epmet-openapi/pom.xml b/epmet-openapi/pom.xml
index fd15705343..9db62073f3 100644
--- a/epmet-openapi/pom.xml
+++ b/epmet-openapi/pom.xml
@@ -13,7 +13,6 @@
     <artifactId>epmet-openapi</artifactId>
     <modules>
         <module>epmet-openapi-scan</module>
-        <module>epmet-openapi-adv</module>
     </modules>
 
 </project>
\ No newline at end of file