1.包层级修改

epmet-module/data-report/data-report-server/pom.xml

@@ -100,7 +100,7 @@
 
                 <!-- 数据库配置-->
                 <datasource.druid.url>
-                    <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://118.190.150.119:47306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.url>
                 <datasource.druid.username>epmet_data_statistical_user</datasource.druid.username>
                 <datasource.druid.password>EpmEt-db-UsEr</datasource.druid.password>

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/group/controller/GroupController.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/group/GroupController.java

@@ -9,7 +9,7 @@ import com.epmet.group.dto.result.GroupIncrTrendResultDTO;
 import com.epmet.group.dto.result.GroupSubAgencyResultDTO;
 import com.epmet.group.dto.result.GroupSubGridResultDTO;
 import com.epmet.group.dto.result.GroupSummaryInfoResultDTO;
-import com.epmet.module.group.service.GroupService;
+import com.epmet.service.group.GroupService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/issue/controller/IssueController.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/issue/IssueController.java

@@ -1,11 +1,11 @@
-package com.epmet.module.issue.controller;
+package com.epmet.controller.issue;
 
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.issue.dto.form.IssueIncrtrendFormDTO;
 import com.epmet.issue.dto.result.*;
-import com.epmet.module.issue.service.IssueService;
+import com.epmet.service.issue.IssueService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/publicity/controller/PublicityController.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/publicity/PublicityController.java

@@ -15,17 +15,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.module.publicity.controller;
+package com.epmet.controller.publicity;
 
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.module.publicity.service.PublicityService;
 import com.epmet.publicity.dto.form.TagFormDTO;
 import com.epmet.publicity.dto.result.FactArticlePublishedAgencyDailyDTO;
 import com.epmet.publicity.dto.result.FactTagAgencyDTO;
+import com.epmet.service.publicity.PublicityService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -48,7 +48,6 @@ public class PublicityController {
 
 
     /**
-     * @param tokenDTO
      * @return
      * @Author jyy
      * @Description 宣传能力—工作端—当前机关累计发文和当前发文

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/topic/controller/TopicController.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/topic/TopicController.java

@@ -1,10 +1,10 @@
-package com.epmet.module.topic.controller;
+package com.epmet.controller.topic;
 
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.module.topic.service.TopicService;
+import com.epmet.service.topic.TopicService;
 import com.epmet.topic.dto.form.TopicIncrTrendFormDTO;
 import com.epmet.topic.dto.result.*;
 import org.springframework.beans.factory.annotation.Autowired;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/group/dao/GroupDao.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/group/GroupDao.java

@@ -1,4 +1,4 @@
-package com.epmet.module.group.dao;
+package com.epmet.dao.group;
 
 import com.epmet.group.dto.result.*;
 import org.apache.ibatis.annotations.Mapper;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/issue/dao/IssueDao.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/issue/IssueDao.java

@@ -1,4 +1,4 @@
-package com.epmet.module.issue.dao;
+package com.epmet.dao.issue;
 
 import com.epmet.issue.dto.result.IssueDataDTO;
 import org.apache.ibatis.annotations.Mapper;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/project/dao/ProjectDao.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/project/ProjectDao.java

@@ -1,4 +1,4 @@
-package com.epmet.module.project.dao;
+package com.epmet.dao.project;
 
 import com.epmet.project.dto.FactAgencyProjectDailyDTO;
 import com.epmet.project.dto.result.*;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/publicity/dao/FactArticlePublishedAgencyDailyDao.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactArticlePublishedAgencyDailyDao.java

@@ -15,11 +15,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.module.publicity.dao;
+package com.epmet.dao.publicity;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.publicity.FactArticlePublishedAgencyDailyEntity;
 import com.epmet.publicity.dto.result.FactArticlePublishedAgencyDailyDTO;
-import com.epmet.entity.FactArticlePublishedAgencyDailyEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/publicity/dao/FactArticlePublishedDepartmentDailyDao.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactArticlePublishedDepartmentDailyDao.java

@@ -15,10 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.module.publicity.dao;
+package com.epmet.dao.publicity;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.FactArticlePublishedDepartmentDailyEntity;
+import com.epmet.entity.publicity.FactArticlePublishedDepartmentDailyEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/publicity/dao/FactArticlePublishedGridDailyDao.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactArticlePublishedGridDailyDao.java

@@ -15,10 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.module.publicity.dao;
+package com.epmet.dao.publicity;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.FactArticlePublishedGridDailyEntity;
+import com.epmet.entity.publicity.FactArticlePublishedGridDailyEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/publicity/dao/FactTagUsedAgencyMonthlyDao.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagUsedAgencyMonthlyDao.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.module.publicity.dao;
+package com.epmet.dao.publicity;
 
 import com.epmet.publicity.dto.result.FactTagAgencyDTO;
 import org.apache.ibatis.annotations.Mapper;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/publicity/dao/FactTagUsedAgencyQuarterlyDao.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagUsedAgencyQuarterlyDao.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.module.publicity.dao;
+package com.epmet.dao.publicity;
 
 import com.epmet.publicity.dto.result.FactTagAgencyDTO;
 import org.apache.ibatis.annotations.Mapper;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/publicity/dao/FactTagUsedAgencyYearlyDao.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagUsedAgencyYearlyDao.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.module.publicity.dao;
+package com.epmet.dao.publicity;
 
 import com.epmet.publicity.dto.result.FactTagAgencyDTO;
 import org.apache.ibatis.annotations.Mapper;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/publicity/dao/FactTagViewedAgencyDailyDao.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyDailyDao.java

@@ -15,10 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.module.publicity.dao;
+package com.epmet.dao.publicity;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.FactTagViewedAgencyDailyEntity;
+import com.epmet.entity.publicity.FactTagViewedAgencyDailyEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/publicity/dao/FactTagViewedAgencyMonthlyDao.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyMonthlyDao.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.module.publicity.dao;
+package com.epmet.dao.publicity;
 
 import com.epmet.publicity.dto.result.FactTagAgencyDTO;
 import org.apache.ibatis.annotations.Mapper;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/publicity/dao/FactTagViewedAgencyQuarterlyDao.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyQuarterlyDao.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.module.publicity.dao;
+package com.epmet.dao.publicity;
 
 import com.epmet.publicity.dto.result.FactTagAgencyDTO;
 import org.apache.ibatis.annotations.Mapper;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/publicity/dao/FactTagViewedAgencyYearlyDao.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyYearlyDao.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.module.publicity.dao;
+package com.epmet.dao.publicity;
 
 import com.epmet.publicity.dto.result.FactTagAgencyDTO;
 import org.apache.ibatis.annotations.Mapper;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/publicity/dao/FactTagViewedGridDailyDao.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridDailyDao.java

@@ -15,10 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.module.publicity.dao;
+package com.epmet.dao.publicity;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.FactTagViewedGridDailyEntity;
+import com.epmet.entity.publicity.FactTagViewedGridDailyEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/publicity/dao/FactTagViewedGridMonthlyDao.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridMonthlyDao.java

@@ -15,10 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.module.publicity.dao;
+package com.epmet.dao.publicity;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.FactTagViewedGridMonthlyEntity;
+import com.epmet.entity.publicity.FactTagViewedGridMonthlyEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/publicity/dao/FactTagViewedGridQuarterlyDao.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridQuarterlyDao.java

@@ -15,10 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.module.publicity.dao;
+package com.epmet.dao.publicity;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.FactTagViewedGridQuarterlyEntity;
+import com.epmet.entity.publicity.FactTagViewedGridQuarterlyEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/publicity/dao/FactTagViewedGridYearlyDao.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridYearlyDao.java

@@ -15,10 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.module.publicity.dao;
+package com.epmet.dao.publicity;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.FactTagViewedGridYearlyEntity;
+import com.epmet.entity.publicity.FactTagViewedGridYearlyEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/topic/dao/TopicDao.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/topic/TopicDao.java

@@ -1,4 +1,4 @@
-package com.epmet.module.topic.dao;
+package com.epmet.dao.topic;
 
 import com.epmet.group.dto.result.GroupIncrTrendResultDTO;
 import com.epmet.topic.dto.result.*;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/publicity/entity/FactArticlePublishedAgencyDailyEntity.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactArticlePublishedAgencyDailyEntity.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.entity;
+package com.epmet.entity.publicity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/publicity/entity/FactArticlePublishedDepartmentDailyEntity.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactArticlePublishedDepartmentDailyEntity.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.entity;
+package com.epmet.entity.publicity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/publicity/entity/FactArticlePublishedGridDailyEntity.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactArticlePublishedGridDailyEntity.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.entity;
+package com.epmet.entity.publicity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/publicity/entity/FactTagViewedAgencyDailyEntity.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyDailyEntity.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.entity;
+package com.epmet.entity.publicity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/publicity/entity/FactTagViewedAgencyMonthlyEntity.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyMonthlyEntity.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.entity;
+package com.epmet.entity.publicity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/publicity/entity/FactTagViewedAgencyQuarterlyEntity.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyQuarterlyEntity.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.entity;
+package com.epmet.entity.publicity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/publicity/entity/FactTagViewedAgencyYearlyEntity.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyYearlyEntity.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.entity;
+package com.epmet.entity.publicity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/publicity/entity/FactTagViewedGridDailyEntity.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridDailyEntity.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.entity;
+package com.epmet.entity.publicity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/publicity/entity/FactTagViewedGridMonthlyEntity.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridMonthlyEntity.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.entity;
+package com.epmet.entity.publicity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/publicity/entity/FactTagViewedGridQuarterlyEntity.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridQuarterlyEntity.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.entity;
+package com.epmet.entity.publicity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/publicity/entity/FactTagViewedGridYearlyEntity.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridYearlyEntity.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.entity;
+package com.epmet.entity.publicity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/group/service/GroupService.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/group/GroupService.java

@@ -1,4 +1,4 @@
-package com.epmet.module.group.service;
+package com.epmet.service.group;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.group.dto.form.GroupIncrTrendFormDTO;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/group/service/impl/GroupServiceImpl.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/group/impl/GroupServiceImpl.java

@@ -1,15 +1,15 @@
-package com.epmet.module.group.service.impl;
+package com.epmet.service.group.impl;
 
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.dao.group.GroupDao;
 import com.epmet.dto.form.LoginUserDetailsFormDTO;
 import com.epmet.dto.result.LoginUserDetailsResultDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.group.constant.GroupConstant;
 import com.epmet.group.dto.form.GroupIncrTrendFormDTO;
 import com.epmet.group.dto.result.*;
-import com.epmet.module.group.dao.GroupDao;
-import com.epmet.module.group.service.GroupService;
+import com.epmet.service.group.GroupService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/issue/service/IssueService.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/issue/IssueService.java

@@ -1,4 +1,4 @@
-package com.epmet.module.issue.service;
+package com.epmet.service.issue;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.issue.dto.form.IssueIncrtrendFormDTO;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/issue/service/impl/IssueServiceImpl.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/issue/impl/IssueServiceImpl.java

@@ -1,14 +1,14 @@
-package com.epmet.module.issue.service.impl;
+package com.epmet.service.issue.impl;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.dao.issue.IssueDao;
 import com.epmet.dto.form.LoginUserDetailsFormDTO;
 import com.epmet.dto.result.LoginUserDetailsResultDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.issue.constant.IssueConstant;
 import com.epmet.issue.dto.form.IssueIncrtrendFormDTO;
 import com.epmet.issue.dto.result.*;
-import com.epmet.module.issue.dao.IssueDao;
-import com.epmet.module.issue.service.IssueService;
+import com.epmet.service.issue.IssueService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/project/service/impl/ProjectServiceImpl.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java

@@ -1,12 +1,12 @@
-package com.epmet.module.project.service.impl;
+package com.epmet.service.project.impl;
 
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.dao.project.ProjectDao;
 import com.epmet.dto.form.LoginUserDetailsFormDTO;
 import com.epmet.dto.result.LoginUserDetailsResultDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
-import com.epmet.module.project.dao.ProjectDao;
 import com.epmet.module.project.service.ProjectService;
 import com.epmet.project.constant.ProjectConstant;
 import com.epmet.project.dto.FactAgencyProjectDailyDTO;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/publicity/service/PublicityService.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/PublicityService.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.module.publicity.service;
+package com.epmet.service.publicity;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.publicity.dto.result.FactArticlePublishedAgencyDailyDTO;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/publicity/service/impl/PublicityServiceImpl.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/impl/PublicityServiceImpl.java

@@ -15,22 +15,22 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.module.publicity.service.impl;
+package com.epmet.service.publicity.impl;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.dao.publicity.FactArticlePublishedAgencyDailyDao;
+import com.epmet.dao.publicity.FactTagViewedAgencyMonthlyDao;
+import com.epmet.dao.publicity.FactTagViewedAgencyQuarterlyDao;
+import com.epmet.dao.publicity.FactTagViewedAgencyYearlyDao;
 import com.epmet.dto.form.LoginUserDetailsFormDTO;
 import com.epmet.dto.result.LoginUserDetailsResultDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
-import com.epmet.module.publicity.dao.FactArticlePublishedAgencyDailyDao;
-import com.epmet.module.publicity.dao.FactTagViewedAgencyMonthlyDao;
-import com.epmet.module.publicity.dao.FactTagViewedAgencyQuarterlyDao;
-import com.epmet.module.publicity.dao.FactTagViewedAgencyYearlyDao;
 
-import com.epmet.module.publicity.service.PublicityService;
 import com.epmet.publicity.dto.result.FactArticlePublishedAgencyDailyDTO;
 
 import com.epmet.publicity.dto.result.FactTagAgencyDTO;
+import com.epmet.service.publicity.PublicityService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/topic/service/TopicService.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/TopicService.java

@@ -1,4 +1,4 @@
-package com.epmet.module.topic.service;
+package com.epmet.service.topic;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.topic.dto.form.TopicIncrTrendFormDTO;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/module/topic/service/impl/TopicServiceImpl.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java

@@ -1,12 +1,12 @@
-package com.epmet.module.topic.service.impl;
+package com.epmet.service.topic.impl;
 
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.dao.topic.TopicDao;
 import com.epmet.dto.form.LoginUserDetailsFormDTO;
 import com.epmet.dto.result.LoginUserDetailsResultDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
-import com.epmet.module.topic.dao.TopicDao;
-import com.epmet.module.topic.service.TopicService;
+import com.epmet.service.topic.TopicService;
 import com.epmet.topic.constant.TopicConstant;
 import com.epmet.topic.dto.form.TopicIncrTrendFormDTO;
 import com.epmet.topic.dto.result.*;

epmet-module/data-report/data-report-server/src/main/resources/mapper/group/GroupDao.xml

@@ -1,7 +1,7 @@
 <?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.module.group.dao.GroupDao">
+<mapper namespace="com.epmet.dao.group.GroupDao">
 
     <!-- 网格小组：网格总数、网格小组数、小组平均数、小组人数中位数 -->
     <select id="summaryInfo" parameterType="java.lang.String" resultType="com.epmet.group.dto.result.GroupSummaryInfoResultDTO">

epmet-module/data-report/data-report-server/src/main/resources/mapper/issue/IssueDao.xml

@@ -1,7 +1,7 @@
 <?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.module.issue.dao.IssueDao">
+<mapper namespace="com.epmet.dao.issue.IssueDao">
     <!--    获取当前机关统计信息-->
     <select id="selectAgencyInfo" resultType="com.epmet.issue.dto.result.IssueDataDTO">
         SELECT AGENCY_ID,

epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml

@@ -1,7 +1,7 @@
 <?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.module.project.dao.ProjectDao">
+<mapper namespace="com.epmet.dao.project.ProjectDao">
 
 
     <select id="selectProjectSummary" resultType="com.epmet.project.dto.result.ProjectSummaryResultDTO">

epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactArticlePublishedAgencyDailyDao.xml

@@ -1,9 +1,9 @@
 <?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.dao.FactArticlePublishedAgencyDailyDao">
+<mapper namespace="com.epmet.dao.publicity.FactArticlePublishedAgencyDailyDao">
 
-    <resultMap type="com.epmet.entity.FactArticlePublishedAgencyDailyEntity" id="factArticlePublishedAgencyDailyMap">
+    <resultMap type="com.epmet.entity.publicity.FactArticlePublishedAgencyDailyEntity" id="factArticlePublishedAgencyDailyMap">
         <result property="id" column="ID"/>
         <result property="customerId" column="CUSTOMER_ID"/>
         <result property="pid" column="PID"/>

epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactArticlePublishedDepartmentDailyDao.xml

@@ -3,7 +3,7 @@
 
 <mapper namespace="com.epmet.dao.FactArticlePublishedDepartmentDailyDao">
 
-    <resultMap type="com.epmet.entity.FactArticlePublishedDepartmentDailyEntity" id="factArticlePublishedDepartmentDailyMap">
+    <resultMap type="com.epmet.entity.publicity.FactArticlePublishedDepartmentDailyEntity" id="factArticlePublishedDepartmentDailyMap">
         <result property="id" column="ID"/>
         <result property="customerId" column="CUSTOMER_ID"/>
         <result property="agencyId" column="AGENCY_ID"/>

epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactArticlePublishedGridDailyDao.xml

@@ -3,7 +3,7 @@
 
 <mapper namespace="com.epmet.dao.FactArticlePublishedGridDailyDao">
 
-    <resultMap type="com.epmet.entity.FactArticlePublishedGridDailyEntity" id="factArticlePublishedGridDailyMap">
+    <resultMap type="com.epmet.entity.publicity.FactArticlePublishedGridDailyEntity" id="factArticlePublishedGridDailyMap">
         <result property="id" column="ID"/>
         <result property="customerId" column="CUSTOMER_ID"/>
         <result property="agencyId" column="AGENCY_ID"/>

epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedAgencyDailyDao.xml

@@ -3,7 +3,7 @@
 
 <mapper namespace="com.epmet.dao.FactTagViewedAgencyDailyDao">
 
-    <resultMap type="com.epmet.entity.FactTagViewedAgencyDailyEntity" id="factTagViewedAgencyDailyMap">
+    <resultMap type="com.epmet.entity.publicity.FactTagViewedAgencyDailyEntity" id="factTagViewedAgencyDailyMap">
         <result property="id" column="ID"/>
         <result property="customerId" column="CUSTOMER_ID"/>
         <result property="pid" column="PID"/>

epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridDailyDao.xml

@@ -3,7 +3,7 @@
 
 <mapper namespace="com.epmet.dao.FactTagViewedGridDailyDao">
 
-    <resultMap type="com.epmet.entity.FactTagViewedGridDailyEntity" id="factTagViewedGridDailyMap">
+    <resultMap type="com.epmet.entity.publicity.FactTagViewedGridDailyEntity" id="factTagViewedGridDailyMap">
         <result property="id" column="ID"/>
         <result property="customerId" column="CUSTOMER_ID"/>
         <result property="agencyId" column="AGENCY_ID"/>

epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridMonthlyDao.xml

@@ -3,7 +3,7 @@
 
 <mapper namespace="com.epmet.dao.FactTagViewedGridMonthlyDao">
 
-    <resultMap type="com.epmet.entity.FactTagViewedGridMonthlyEntity" id="factTagViewedGridMonthlyMap">
+    <resultMap type="com.epmet.entity.publicity.FactTagViewedGridMonthlyEntity" id="factTagViewedGridMonthlyMap">
         <result property="id" column="ID"/>
         <result property="customerId" column="CUSTOMER_ID"/>
         <result property="agencyId" column="AGENCY_ID"/>

epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridQuarterlyDao.xml

@@ -3,7 +3,7 @@
 
 <mapper namespace="com.epmet.dao.FactTagViewedGridQuarterlyDao">
 
-    <resultMap type="com.epmet.entity.FactTagViewedGridQuarterlyEntity" id="factTagViewedGridQuarterlyMap">
+    <resultMap type="com.epmet.entity.publicity.FactTagViewedGridQuarterlyEntity" id="factTagViewedGridQuarterlyMap">
         <result property="id" column="ID"/>
         <result property="customerId" column="CUSTOMER_ID"/>
         <result property="agencyId" column="AGENCY_ID"/>

epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridYearlyDao.xml

@@ -3,7 +3,7 @@
 
 <mapper namespace="com.epmet.dao.FactTagViewedGridYearlyDao">
 
-    <resultMap type="com.epmet.entity.FactTagViewedGridYearlyEntity" id="factTagViewedGridYearlyMap">
+    <resultMap type="com.epmet.entity.publicity.FactTagViewedGridYearlyEntity" id="factTagViewedGridYearlyMap">
         <result property="id" column="ID"/>
         <result property="customerId" column="CUSTOMER_ID"/>
         <result property="agencyId" column="AGENCY_ID"/>

epmet-module/data-report/data-report-server/src/main/resources/mapper/topic/TopicDao.xml

@@ -1,7 +1,7 @@
 <?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.module.topic.dao.TopicDao">
+<mapper namespace="com.epmet.dao.topic.TopicDao">
 
     <!--获取话题数量及状态-->
     <select id="getTopicStatus" parameterType="java.lang.String" resultType="com.epmet.topic.dto.result.TopicStatusResultDTO">