From 820e8dc642c37243cdb21a617f5ba646679351a7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 17 Mar 2021 13:13:17 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E6=8C=89=E5=A4=A9=E6=8A=BD=E5=8F=96?= =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=B3=A8=E9=87=8A=EF=BC=9AscreenProjectSettl?= =?UTF-8?q?eService.extractScreenData?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extract/toscreen/impl/ScreenExtractServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java index 37eae6ac60..74e3021a00 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java @@ -197,12 +197,13 @@ public class ScreenExtractServiceImpl implements ScreenExtractService { }catch (Exception e){ log.error("项目(事件)分析按组织_按天统计失败，customerId为："+customerId+"dateId为："+dateId, e); } - try{ + //项目分类打标签未上线，暂时屏蔽 + /*try{ //大屏项目数据抽取_按天抽取 screenProjectSettleService.extractScreenData(param); }catch (Exception e){ log.error("大屏项目数据抽取_按天抽取_按天统计失败，customerId为："+customerId+"dateId为："+dateId, e); - } + }*/ log.info("===== extractDaily method end ======"); } From 1d16f90d3e437d1dcfdf50f1b4e7697dbcf4d382 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 18 Mar 2021 15:06:39 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=97=A7=E7=A8=8B=E5=BA=8F=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/IssueSaveCategoryFormDTO.java | 6 +++++ .../controller/IssueCategoryController.java | 7 +++--- .../IssueProjectCategoryDictController.java | 7 +++--- .../dao/IssueProjectCategoryDictDao.java | 5 ++-- .../IssueProjectCategoryDictService.java | 5 ++-- .../impl/IssueCategoryServiceImpl.java | 10 ++++---- .../IssueProjectCategoryDictServiceImpl.java | 12 ++++++--- .../mapper/IssueProjectCategoryDictDao.xml | 1 + .../IssueProjectCategoryDictListFormDTO.java | 25 +++++++++++++++++++ .../dto/form/ProjectSaveCategoryFormDTO.java | 8 +++++- .../controller/ProjectCategoryController.java | 3 ++- 11 files changed, 68 insertions(+), 21 deletions(-) create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IssueProjectCategoryDictListFormDTO.java diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueSaveCategoryFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueSaveCategoryFormDTO.java index 4a9ef489ba..299a2d25d2 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueSaveCategoryFormDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueSaveCategoryFormDTO.java @@ -23,6 +23,12 @@ public class IssueSaveCategoryFormDTO implements Serializable { * 议题分类集合 */ private List categoryList; + + /** + * 客户Id + */ + private String customerId; + public interface SaveCategory{} } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCategoryController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCategoryController.java index f8755d1037..cba3ed0825 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCategoryController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCategoryController.java @@ -17,9 +17,9 @@ package com.epmet.controller; -import com.epmet.commons.tools.constant.NumConstant; -import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; @@ -128,7 +128,8 @@ public class IssueCategoryController { * @Author sun **/ @PostMapping("save") - public Result saveCategory(@RequestBody IssueSaveCategoryFormDTO formDTO) { + public Result saveCategory(@LoginUser TokenDto tokenDto, @RequestBody IssueSaveCategoryFormDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); ValidatorUtils.validateEntity(formDTO, IssueSaveCategoryFormDTO.SaveCategory.class); issueCategoryService.saveCategory(formDTO); return new Result(); diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java index 16fb700639..d6fb36123d 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java @@ -29,6 +29,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.IssueProjectCategoryDictDTO; import com.epmet.dto.form.CategoryTagInitFormDTO; +import com.epmet.dto.form.IssueProjectCategoryDictListFormDTO; import com.epmet.dto.form.ProjectSaveCategoryFormDTO; import com.epmet.dto.result.CustomerCategoryListResultDTO; import com.epmet.dto.result.ProjectIssueCategoryResultDTO; @@ -122,14 +123,14 @@ public class IssueProjectCategoryDictController { } /** - * @param cstegoryIdList + * @param formDTO * @return * @Description 批量查询分类信息 * @Author sun **/ @PostMapping("getcategorylist") - public Result> getCategoryList(@RequestBody List cstegoryIdList) { - return new Result>().ok(issueProjectCategoryDictService.getCategoryList(cstegoryIdList)); + public Result> getCategoryList(@RequestBody IssueProjectCategoryDictListFormDTO formDTO) { + return new Result>().ok(issueProjectCategoryDictService.getCategoryList(formDTO)); } /** diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java index 52405b07f5..28e1522491 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java @@ -19,6 +19,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.IssueProjectCategoryDictDTO; +import com.epmet.dto.form.IssueProjectCategoryDictListFormDTO; import com.epmet.dto.result.CustomerCategoryListResultDTO; import com.epmet.entity.IssueProjectCategoryDictEntity; import org.apache.ibatis.annotations.Mapper; @@ -55,12 +56,12 @@ public interface IssueProjectCategoryDictDao extends BaseDao selectCategoryListByCustomer(@Param("customerId") String customerId); /** - * @param cstegoryIdList + * @param formDTO * @return * @Description 批量查询分类信息 * @Author sun **/ - List selectCategoryList(@Param("cstegoryIdList") List cstegoryIdList); + List selectCategoryList(IssueProjectCategoryDictListFormDTO formDTO); /** * @Description 根据客户Id、类别名称、类型查询单个类别 默认查询二级分类 diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectCategoryDictService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectCategoryDictService.java index c283895c9f..3b1fa1def1 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectCategoryDictService.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectCategoryDictService.java @@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.IssueProjectCategoryDictDTO; import com.epmet.dto.form.CategoryTagInitFormDTO; +import com.epmet.dto.form.IssueProjectCategoryDictListFormDTO; import com.epmet.dto.form.ProjectSaveCategoryFormDTO; import com.epmet.dto.result.CustomerCategoryListResultDTO; import com.epmet.dto.result.ProjectIssueCategoryResultDTO; @@ -115,12 +116,12 @@ public interface IssueProjectCategoryDictService extends BaseService getCategoryList(List cstegoryIdList); + List getCategoryList(IssueProjectCategoryDictListFormDTO formDTO); /** * @param formDTO diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCategoryServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCategoryServiceImpl.java index 85d52737da..724d256e34 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCategoryServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCategoryServiceImpl.java @@ -29,10 +29,7 @@ import com.epmet.dao.IssueCategoryDao; import com.epmet.dao.IssueTagsDao; import com.epmet.dto.IssueCategoryDTO; import com.epmet.dto.IssueProjectCategoryDictDTO; -import com.epmet.dto.form.IssueCategoryTagListFormDTO; -import com.epmet.dto.form.IssueSaveCategoryFormDTO; -import com.epmet.dto.form.ProjectCategoryTagListFormDTO; -import com.epmet.dto.form.SaveIssueCategoryFormDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.IssueCategoryTagListResultDTO; import com.epmet.dto.result.IssueCategoryTagResultDTO; import com.epmet.dto.result.ProjectCategoryTagResultDTO; @@ -192,7 +189,10 @@ public class IssueCategoryServiceImpl extends BaseServiceImpl categoryIdList = formDTO.getCategoryList().stream().map(SaveIssueCategoryFormDTO::getId).collect(Collectors.toList()); - List categoryList = issueProjectCategoryDictService.getCategoryList(categoryIdList); + IssueProjectCategoryDictListFormDTO dictDto = new IssueProjectCategoryDictListFormDTO(); + dictDto.setCustomerId(formDTO.getCustomerId()); + dictDto.setCstegoryIdList(categoryIdList); + List categoryList = issueProjectCategoryDictService.getCategoryList(dictDto); if (null == categoryList) { throw new RenException(String.format("议题分类信息保存，根据分类Id获取分类信息失败")); } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java index 966fb2ce14..6b8f05d845 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java @@ -29,6 +29,7 @@ import com.epmet.dao.IssueProjectRelationDao; import com.epmet.dto.IssueDTO; import com.epmet.dto.IssueProjectCategoryDictDTO; import com.epmet.dto.form.CategoryTagInitFormDTO; +import com.epmet.dto.form.IssueProjectCategoryDictListFormDTO; import com.epmet.dto.form.ProjectSaveCategoryFormDTO; import com.epmet.dto.form.SaveIssueCategoryFormDTO; import com.epmet.dto.result.CustomerCategoryListResultDTO; @@ -132,14 +133,14 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl getCategoryList(List cstegoryIdList) { - return baseDao.selectCategoryList(cstegoryIdList); + public List getCategoryList(IssueProjectCategoryDictListFormDTO formDTO) { + return baseDao.selectCategoryList(formDTO); } /** @@ -160,7 +161,10 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl categoryIdList = formDTO.getCategoryList().stream().map(SaveIssueCategoryFormDTO::getId).collect(Collectors.toList()); - List categoryList = getCategoryList(categoryIdList); + IssueProjectCategoryDictListFormDTO dictDto = new IssueProjectCategoryDictListFormDTO(); + dictDto.setCustomerId(formDTO.getCustomerId()); + dictDto.setCstegoryIdList(categoryIdList); + List categoryList = getCategoryList(dictDto); if (null == categoryList) { throw new RenException(String.format("保存项目分类信息，根据分类Id获取分类信息失败")); } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml index 9bcdc54cdf..b531d9d26e 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml @@ -62,6 +62,7 @@ issue_project_category_dict WHERE del_flag = '0' + AND customer_id = #{customerId} id = #{id} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IssueProjectCategoryDictListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IssueProjectCategoryDictListFormDTO.java new file mode 100644 index 0000000000..ac2903fe32 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IssueProjectCategoryDictListFormDTO.java @@ -0,0 +1,25 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 批量查询分类信息-接口入参 + * @Author sun + */ +@Data +public class IssueProjectCategoryDictListFormDTO implements Serializable { + + private static final long serialVersionUID = 2599592072265715951L; + /** + * 客户Id + */ + private String customerId; + /** + * 分类Id集合 + */ + private List cstegoryIdList; + +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectSaveCategoryFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectSaveCategoryFormDTO.java index 9d0d1a407f..34a8732be5 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectSaveCategoryFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectSaveCategoryFormDTO.java @@ -15,7 +15,7 @@ public class ProjectSaveCategoryFormDTO implements Serializable { private static final long serialVersionUID = 2599592072265715951L; /** - * 议题Id + * 项目Id */ @NotBlank(message = "项目ID不能为空",groups = {SaveCategory.class}) private String projectId; @@ -23,6 +23,12 @@ public class ProjectSaveCategoryFormDTO implements Serializable { * 议题分类集合 */ private List categoryList; + + /** + * 客户Id + */ + private String customerId; + public interface SaveCategory{} } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectCategoryController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectCategoryController.java index c47fb0ea4c..d1392bd0a6 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectCategoryController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectCategoryController.java @@ -118,7 +118,8 @@ public class ProjectCategoryController { * @Author sun **/ @PostMapping("save") - public Result saveCategory(@RequestBody ProjectSaveCategoryFormDTO formDTO) { + public Result saveCategory(@LoginUser TokenDto tokenDto, @RequestBody ProjectSaveCategoryFormDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); ValidatorUtils.validateEntity(formDTO, ProjectSaveCategoryFormDTO.SaveCategory.class); projectCategoryService.saveCategory(formDTO); return new Result(); From 1bf983225849a51e0923467ae796f3c378132fa3 Mon Sep 17 00:00:00 2001 From: wangchao Date: Fri, 19 Mar 2021 10:13:25 +0800 Subject: [PATCH 03/16] =?UTF-8?q?1=E3=80=81=E5=A4=A7=E5=B1=8F=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E9=87=87=E9=9B=86=E5=88=86=E7=B1=BB=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=8A=E7=BA=A7=E5=88=86=E7=B1=BB=E7=94=A8-=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=EF=BC=8C=E5=A4=9A=E4=B8=AA=E5=88=86=E7=B1=BB=E7=94=A8?= =?UTF-8?q?,=E5=88=86=E5=89=B2=202=E3=80=81=E8=AE=AE=E9=A2=98=E8=BD=AC?= =?UTF-8?q?=E9=A1=B9=E7=9B=AEV2=E6=8E=A5=E5=8F=A3=E5=8F=91=E9=80=81?= =?UTF-8?q?=E7=A7=AF=E5=88=86=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/Issue/IssueService.java | 2 +- .../service/Issue/impl/IssueServiceImpl.java | 11 +++++- .../resources/mapper/issue/StatsIssueDao.xml | 36 +++++-------------- .../epmet/service/impl/IssueServiceImpl.java | 9 +++++ .../impl/IssueVoteStatisticalServiceImpl.java | 2 ++ 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/IssueService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/IssueService.java index 22201f81ab..b920c0e29a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/IssueService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/IssueService.java @@ -176,7 +176,7 @@ public interface IssueService { List selectIssueVoteStatis(String customerId, String monthId); /** - * @Description 查找项目的分类名称 以-相连 + * @Description 查找项目的分类名称 以-相连，以,分隔， * @param param * @return java.util.Map * @author wangc diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueServiceImpl.java index 4ad4e58488..44578a426a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueServiceImpl.java @@ -2,6 +2,7 @@ package com.epmet.service.Issue.impl; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.constant.DataSourceConstant; import com.epmet.dao.issue.StatsIssueDao; import com.epmet.dto.extract.result.IssueInfoResultDTO; @@ -146,14 +147,22 @@ public class IssueServiceImpl implements IssueService { return statsIssueDao.selectIssueVoteStatis(customerId, dateId); } + /** + * @Description 查找项目的分类名称 以-相连，以,分隔， + * @param param + * @return java.util.Map + * @author wangc + * @date 2021.03.09 00:23 + */ @Override public Map getIntegratedProjectCategory(Map> param,String customerId) { Map map = new HashMap<>(); param.forEach((projectId,categoryIds) -> { + //以下查询只适用于二级分类，如果分类层级变多了要修改此查询 List categories = statsIssueDao.selectCategory(customerId, categoryIds); if(!CollectionUtils.isEmpty(categories)){ StringBuilder str = new StringBuilder(); - categories.forEach(category -> {str.append(category.getCategoryName()).append("-");}); + categories.forEach(category -> {str.append(category.getCategoryName()).append(StrConstant.COMMA);}); map.put(projectId,str.substring(NumConstant.ZERO,str.length() - NumConstant.TWO)); } }); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml index b4619ff0a2..ce72f989f2 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml @@ -290,35 +290,15 @@ \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index fb3c07e7e8..c7856788b8 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -1011,6 +1011,15 @@ public class IssueServiceImpl extends BaseServiceImpl imp }catch(RenException e){ logger.error(e.getInternalMsg()); } + + + //7:发送话题转议题积分事件 + TopicEventFormDTO eventParam = new TopicEventFormDTO(); + eventParam.setTopicId(entity.getSourceId()); + eventParam.setEvent(EventEnum.TOPIC_SHIFTED_TO_PROJECT); + if(!resiGroupOpenFeignClient.sendEvent(eventParam).success()){ + logger.warn("com.epmet.service.impl.IssueServiceImpl.shiftProjectV2，话题被转为项目积分事件发送失败，参数：{}", JSON.toJSONString(formDTO)); + } } /** diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java index fc8a5138de..24845d3b7a 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java @@ -493,6 +493,8 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl Date: Fri, 19 Mar 2021 13:49:40 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E3=80=81=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=88=86=E7=B1=BB=E3=80=81=E6=A0=87=E7=AD=BEdb?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BC=95=E8=B5=B7=E7=9A=84=E5=8F=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/govproject/ProjectCategoryDTO.java | 10 + .../dto/govproject/ProjectTagsDTO.java | 5 + .../issue/IssueProjectCategoryDictDTO.java | 10 + .../epmet/dto/project/ProjectCategoryDTO.java | 10 + .../java/com/epmet/dto/IssueCategoryDTO.java | 10 + .../dto/IssueProjectCategoryDictDTO.java | 10 + .../com/epmet/dto/IssueProjectTagDictDTO.java | 5 + .../main/java/com/epmet/dto/IssueTagsDTO.java | 5 + .../com/epmet/entity/IssueCategoryEntity.java | 10 + .../IssueProjectCategoryDictEntity.java | 10 + .../entity/IssueProjectTagDictEntity.java | 5 + .../com/epmet/entity/IssueTagsEntity.java | 5 + .../migration/V0.0.11__alter_category_tag.sql | 212 ++++++++++++++++++ .../com/epmet/dto/ProjectCategoryDTO.java | 10 + .../java/com/epmet/dto/ProjectTagsDTO.java | 5 + .../epmet/entity/ProjectCategoryEntity.java | 10 + .../com/epmet/entity/ProjectTagsEntity.java | 5 + .../migration/V0.0.7__alter_category_tag.sql | 10 + 18 files changed, 347 insertions(+) create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.11__alter_category_tag.sql create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.7__alter_category_tag.sql diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectCategoryDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectCategoryDTO.java index cbda7d52f6..a4d6c1f284 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectCategoryDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectCategoryDTO.java @@ -64,6 +64,16 @@ public class ProjectCategoryDTO implements Serializable { */ private String categoryPids; + /** + * 分类编码，分类编码+customer_id唯一 + */ + private String categoryCode; + + /** + * 是否禁用(enable:启用 disable:禁用) + */ + private String isDisable; + /** * 删除标识 0未删除、1已删除 */ diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectTagsDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectTagsDTO.java index 60f01c7299..9873ed3ddd 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectTagsDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectTagsDTO.java @@ -58,6 +58,11 @@ public class ProjectTagsDTO implements Serializable { */ private String tagName; + /** + * 是否禁用(enable:启用 disable:禁用) + */ + private String isDisable; + /** * 删除标识 0.未删除 1.已删除 */ diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/issue/IssueProjectCategoryDictDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/issue/IssueProjectCategoryDictDTO.java index 1955847edd..c07037ee92 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/issue/IssueProjectCategoryDictDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/issue/IssueProjectCategoryDictDTO.java @@ -53,6 +53,11 @@ public class IssueProjectCategoryDictDTO implements Serializable { */ private String pids; + /** + * 上级分类编码 + */ + private String parentCategoryCode; + /** * 分类编码，分类编码+customer_id唯一 */ @@ -73,6 +78,11 @@ public class IssueProjectCategoryDictDTO implements Serializable { */ private Integer sort; + /** + * 是否禁用(enable:启用 disable:禁用) + */ + private String isDisable; + /** * 删除标识 0未删除、1已删除 */ diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/ProjectCategoryDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/ProjectCategoryDTO.java index 3ca8dc43fc..07ab948199 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/ProjectCategoryDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/ProjectCategoryDTO.java @@ -64,6 +64,16 @@ public class ProjectCategoryDTO implements Serializable { */ private String categoryPids; + /** + * 分类编码，分类编码+customer_id唯一 + */ + private String categoryCode; + + /** + * 是否禁用(enable:启用 disable:禁用) + */ + private String isDisable; + /** * 删除标识 0未删除、1已删除 */ diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueCategoryDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueCategoryDTO.java index 12d645937a..06d1f9d07d 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueCategoryDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueCategoryDTO.java @@ -63,6 +63,16 @@ public class IssueCategoryDTO implements Serializable { */ private String categoryPids; + /** + * 分类编码，分类编码+customer_id唯一 + */ + private String categoryCode; + + /** + * 是否禁用(enable:启用 disable:禁用) + */ + private String isDisable; + /** * 删除标识 0未删除、1已删除 */ diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectCategoryDictDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectCategoryDictDTO.java index d0df3169f5..a93a616cbf 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectCategoryDictDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectCategoryDictDTO.java @@ -53,6 +53,11 @@ public class IssueProjectCategoryDictDTO implements Serializable { */ private String pids; + /** + * 上级分类编码 + */ + private String parentCategoryCode; + /** * 分类编码，分类编码+customer_id唯一 */ @@ -73,6 +78,11 @@ public class IssueProjectCategoryDictDTO implements Serializable { */ private Integer sort; + /** + * 是否禁用(enable:启用 disable:禁用) + */ + private String isDisable; + /** * 删除标识 0未删除、1已删除 */ diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectTagDictDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectTagDictDTO.java index b13500e735..b07cf0042e 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectTagDictDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectTagDictDTO.java @@ -68,6 +68,11 @@ public class IssueProjectTagDictDTO implements Serializable { */ private Integer projectUseCount; + /** + * 是否禁用(enable:启用 disable:禁用) + */ + private String isDisable; + /** * 删除标识 0.未删除 1.已删除 */ diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueTagsDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueTagsDTO.java index 6ca1c51c6a..87e464f4db 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueTagsDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueTagsDTO.java @@ -63,6 +63,11 @@ public class IssueTagsDTO implements Serializable { */ private String tagName; + /** + * 是否禁用(enable:启用 disable:禁用) + */ + private String isDisable; + /** * 删除标识 0.未删除 1.已删除 */ diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueCategoryEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueCategoryEntity.java index fa9e5b8d5b..4f92ac6e6b 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueCategoryEntity.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueCategoryEntity.java @@ -63,4 +63,14 @@ public class IssueCategoryEntity extends BaseEpmetEntity { */ private String categoryPids; + /** + * 分类编码，分类编码+customer_id唯一 + */ + private String categoryCode; + + /** + * 是否禁用(enable:启用 disable:禁用) + */ + private String isDisable; + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectCategoryDictEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectCategoryDictEntity.java index 74a2e32b29..b99f37a2bf 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectCategoryDictEntity.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectCategoryDictEntity.java @@ -53,6 +53,11 @@ public class IssueProjectCategoryDictEntity extends BaseEpmetEntity { */ private String pids; + /** + * 上级分类编码 + */ + private String parentCategoryCode; + /** * 分类编码，分类编码+customer_id唯一 */ @@ -73,4 +78,9 @@ public class IssueProjectCategoryDictEntity extends BaseEpmetEntity { */ private Integer sort; + /** + * 是否禁用(enable:启用 disable:禁用) + */ + private String isDisable; + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectTagDictEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectTagDictEntity.java index c56d5974a7..48d457624b 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectTagDictEntity.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectTagDictEntity.java @@ -68,4 +68,9 @@ public class IssueProjectTagDictEntity extends BaseEpmetEntity { */ private Integer projectUseCount; + /** + * 是否禁用(enable:启用 disable:禁用) + */ + private String isDisable; + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueTagsEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueTagsEntity.java index 1dc56255fc..0933fa1402 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueTagsEntity.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueTagsEntity.java @@ -63,4 +63,9 @@ public class IssueTagsEntity extends BaseEpmetEntity { */ private String tagName; + /** + * 是否禁用(enable:启用 disable:禁用) + */ + private String isDisable; + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.11__alter_category_tag.sql b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.11__alter_category_tag.sql new file mode 100644 index 0000000000..e405d88027 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.11__alter_category_tag.sql @@ -0,0 +1,212 @@ +ALTER TABLE `issue_project_category_dict` +MODIFY COLUMN `CATEGORY_CODE` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '分类编码，分类编码+customer_id唯一' AFTER `PIDS`, +ADD COLUMN `PARENT_CATEGORY_CODE` varchar(50) NOT NULL COMMENT '上级分类编码' AFTER `PIDS`, +ADD COLUMN `IS_DISABLE` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '是否禁用(enable:启用 disable:禁用)' AFTER `SORT`; + +ALTER TABLE `issue_project_tag_dict` +ADD COLUMN `IS_DISABLE` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '是否禁用(enable:启用 disable:禁用)' AFTER `PROJECT_USE_COUNT`; + +ALTER TABLE `issue_category` +ADD COLUMN `CATEGORY_CODE` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '分类编码，分类编码+customer_id唯一' AFTER `CATEGORY_PIDS`, +ADD COLUMN `IS_DISABLE` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '是否禁用(enable:启用 disable:禁用)' AFTER `CATEGORY_CODE`; + +ALTER TABLE `issue_tags` +ADD COLUMN `IS_DISABLE` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '是否禁用(enable:启用 disable:禁用)' AFTER `TAG_NAME`; + +-- 删除表中历史数据，因为db做了调整 +DELETE FROM issue_project_category_dict; +DELETE FROM issue_project_tag_dict; +DELETE FROM issue_category; +DELETE FROM issue_tags; + +-- issue_project_category_dict表初始化默认数据 +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1001', 'default', '0', '0', '0', '1001', '城市管理', '1', '1', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1002', 'default', '0', '0', '0', '1002', '公安交通管理', '1', '2', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1003', 'default', '0', '0', '0', '1003', '消防安全', '1', '3', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1004', 'default', '0', '0', '0', '1004', '卫生计生监督执法', '1', '4', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1005', 'default', '0', '0', '0', '1005', '其他', '1', '5', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1006', 'default', '0', '0', '0', '1006', '创卫复审类', '1', '6', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1007', 'default', '0', '0', '0', '1007', '环境保护', '1', '7', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1008', 'default', '0', '0', '0', '1008', '安全监管', '1', '8', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1009', 'default', '0', '0', '0', '1009', '民政', '1', '9', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1010', 'default', '0', '0', '0', '1010', '建设管理', '1', '10', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1011', 'default', '0', '0', '0', '1011', '文化执法', '1', '11', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1012', 'default', '0', '0', '0', '1012', '社会治安综治', '1', '12', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1013', 'default', '0', '0', '0', '1013', '食品药品监管', '1', '13', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1014', 'default', '0', '0', '0', '1014', '市场监管', '1', '14', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1015', 'default', '1001', '1001', '1001', '10010001', '市政设施管理', '2', '1', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1016', 'default', '1001', '1001', '1001', '10010002', '环境卫生管理', '2', '2', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1017', 'default', '1001', '1001', '1001', '10010003', '园林绿化管理', '2', '3', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1018', 'default', '1001', '1001', '1001', '10010004', '市容市貌', '2', '4', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1019', 'default', '1001', '1001', '1001', '10010005', '早、夜市（摊点群）', '2', '5', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1020', 'default', '1001', '1001', '1001', '10010006', '城区公共健身设施管理', '2', '6', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1021', 'default', '1002', '1002', '1002', '10020001', '交通设施', '2', '1', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1022', 'default', '1002', '1002', '1002', '10020002', '车辆管理', '2', '2', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1023', 'default', '1002', '1002', '1002', '10020003', '违法停车', '2', '3', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1024', 'default', '1003', '1003', '1003', '10030001', '消防设施', '2', '1', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1025', 'default', '1003', '1003', '1003', '10030002', '应急疏散', '2', '2', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1026', 'default', '1003', '1003', '1003', '10030003', '消防隐患', '2', '3', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1027', 'default', '1004', '1004', '1004', '10040001', '公共场所卫生执法', '2', '1', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1028', 'default', '1005', '1005', '1005', '10050001', '其他', '2', '1', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1029', 'default', '1006', '1006', '1006', '10060001', '健康教育促进、公共卫生与医疗服务', '2', '1', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1030', 'default', '1006', '1006', '1006', '10060002', '农贸市场管理', '2', '2', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1031', 'default', '1006', '1006', '1006', '10060003', '食品安全及重点场所卫生', '2', '3', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1032', 'default', '1006', '1006', '1006', '10060004', '环境保护', '2', '4', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1033', 'default', '1006', '1006', '1006', '10060005', '病媚生物防治和控烟', '2', '5', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1034', 'default', '1006', '1006', '1006', '10060006', '市政道路与河道整治提升', '2', '6', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1035', 'default', '1006', '1006', '1006', '10060007', '环境保洁提升', '2', '7', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1036', 'default', '1006', '1006', '1006', '10060008', '绿化美化与铁路两侧环境提升', '2', '8', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1037', 'default', '1006', '1006', '1006', '10060009', '夜景亮化提升', '2', '9', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1038', 'default', '1006', '1006', '1006', '10060010', '单位和居民社区（小区）卫生', '2', '10', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1039', 'default', '1006', '1006', '1006', '10060011', '广告牌匾、市容秩序、违建治理及居民楼院环境提升', '2', '11', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1040', 'default', '1006', '1006', '1006', '10060012', '建筑立面、建设工地环境提升', '2', '12', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1041', 'default', '1007', '1007', '1007', '10070001', '排放污水', '2', '1', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1042', 'default', '1007', '1007', '1007', '10070002', '排放噪声', '2', '2', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1043', 'default', '1007', '1007', '1007', '10070003', '排放固体废物', '2', '3', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1044', 'default', '1007', '1007', '1007', '10070004', '排放大气污染物', '2', '4', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1045', 'default', '1008', '1008', '1008', '10080001', '危险化学品', '2', '1', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1046', 'default', '1009', '1009', '1009', '10090001', '救助管理', '2', '1', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1047', 'default', '1010', '1010', '1010', '10100001', '建设施工管理', '2', '1', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1048', 'default', '1010', '1010', '1010', '10100002', '河道管理', '2', '2', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1049', 'default', '1011', '1011', '1011', '10110001', '文化领域', '2', '1', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1050', 'default', '1011', '1011', '1011', '10110002', '广播影视领域', '2', '2', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1051', 'default', '1011', '1011', '1011', '10110003', '新闻出版领域', '2', '3', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1052', 'default', '1012', '1012', '1012', '10120001', '人口管理', '2', '1', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1053', 'default', '1012', '1012', '1012', '10120002', '民事纠纷', '2', '2', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1054', 'default', '1012', '1012', '1012', '10120003', '安全防控', '2', '3', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1055', 'default', '1012', '1012', '1012', '10120004', '社会治安', '2', '4', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1056', 'default', '1012', '1012', '1012', '10120005', '信访工作', '2', '5', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1057', 'default', '1013', '1013', '1013', '10130001', '食品监管', '2', '1', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1058', 'default', '1013', '1013', '1013', '10130002', '药品监管', '2', '2', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1059', 'default', '1013', '1013', '1013', '10130003', '医疗器械监管', '2', '3', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1060', 'default', '1013', '1013', '1013', '10130004', '保健食品监管', '2', '4', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1061', 'default', '1014', '1014', '1014', '10140001', '营业执照管理', '2', '1', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1062', 'default', '1014', '1014', '1014', '10140002', '特种设备安全', '2', '2', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_category_dict` (`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `PARENT_CATEGORY_CODE`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1063', 'default', '1014', '1014', '1014', '10140003', '广告管理', '2', '3', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); + +-- issue_project_tag_dict表初始化默认数据 +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1001', 'default', '车行道、人行道、盲道、无障碍通道、路名牌', '1015', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1002', 'default', '城市桥梁、人形天桥、地下人行通道管理', '1015', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1003', 'default', '道路占掘管理', '1015', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1004', 'default', '排水管理', '1015', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1005', 'default', '停车场管理', '1015', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1006', 'default', '公共事业', '1015', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1007', 'default', '照明路灯及景观灯饰管理', '1015', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1008', 'default', '城市广场管理', '1015', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1009', 'default', '防汛防滑', '1015', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1010', 'default', '清扫保洁', '1016', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1011', 'default', '垃圾收集和转运', '1016', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1012', 'default', '公厕', '1016', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1013', 'default', '病媚生物防治', '1016', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1014', 'default', '行道树、绿篱、绿地等职务养护', '1017', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1015', 'default', '环境管理', '1017', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1016', 'default', '公园管理', '1017', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1017', 'default', '市容秩序管理', '1018', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1018', 'default', '户外广告', '1018', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1019', 'default', '规划管理', '1018', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1020', 'default', '城管执法', '1018', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1021', 'default', '交易秩序', '1019', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1022', 'default', '健身设施维护与更新', '1020', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1023', 'default', '交通设施、标线', '1021', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1024', 'default', '废弃车辆', '1022', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1025', 'default', '畜力车进城', '1022', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1026', 'default', '人行道、车行道违法停车', '1023', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1027', 'default', '消防设施', '1024', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1028', 'default', '应急疏散', '1025', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1029', 'default', '各类大型活动不具备公共安全条件的严重隐患', '1026', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1030', 'default', '城市无烟草广告', '1027', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1031', 'default', '其他', '1028', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1032', 'default', '健康教育', '1029', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1033', 'default', '市民参与健身运动', '1029', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1034', 'default', '免疫门诊', '1029', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1035', 'default', '预检分诊点', '1029', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1036', 'default', '发热与肠道门诊设置', '1029', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1037', 'default', '医疗废弃物储存和处理', '1029', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1038', 'default', '基层医疗卫生机构标准化建设', '1029', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1039', 'default', '院内环卫设施及清扫保洁', '1029', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1040', 'default', '小型理发店、小旅店、小歌舞厅、小浴室等', '1029', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1041', 'default', '基本信息公示', '1030', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1042', 'default', '建设与管理', '1030', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1043', 'default', '市场公厕', '1030', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1044', 'default', '活禽售卖', '1030', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1045', 'default', '水产区', '1030', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1046', 'default', '食品安全', '1030', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1047', 'default', '基本信息公示', '1031', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1048', 'default', '设施与管理', '1031', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1049', 'default', '“五小”行业的食品安全管理', '1031', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1050', 'default', '噪音控制管理', '1032', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1051', 'default', '大气环境治理', '1032', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1052', 'default', '水源地保护', '1032', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1053', 'default', '医疗废弃物处置管理', '1032', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1054', 'default', '鼠防制', '1033', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1055', 'default', '蝇防制', '1033', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1056', 'default', '蚊防制', '1033', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1057', 'default', '蟑螂防制', '1033', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1058', 'default', '控制吸烟', '1033', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1059', 'default', '主次干道、背街小巷路面平坦，基础设施完好', '1034', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1060', 'default', '城中村及城乡结合部路面平整，沟渠密闭通畅', '1034', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1061', 'default', '公共河道、水域水面清洁，岸坡整洁完好，无直排污水现象', '1034', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1062', 'default', '清扫保洁', '1035', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1063', 'default', '垃圾收集运输', '1035', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1064', 'default', '垃圾中转站', '1035', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1065', 'default', '公厕', '1035', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1066', 'default', '社区与单位环境卫生', '1035', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1067', 'default', '城中村及城乡结合部卫生', '1035', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1068', 'default', '城市绿化', '1036', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1069', 'default', '社区、单位', '1036', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1070', 'default', '铁路沿线无“十乱”现象', '1036', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1071', 'default', '城市照明设施良好，保证路灯设施完好率和亮灯率达标', '1037', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1072', 'default', '社区（小区）居民和单位', '1038', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1073', 'default', '城中村及城乡结合部卫生', '1038', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1074', 'default', '城市户外广告、牌匾设置规范管理', '1039', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1075', 'default', '门前五包落实', '1039', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1076', 'default', '清理占道经营、店外经营', '1039', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1077', 'default', '“十乱”整治', '1039', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1078', 'default', '废品回收站规范管理', '1039', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1079', 'default', '流动商贩管理，早夜市卫生管理', '1039', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1080', 'default', '清理圈占绿地', '1039', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1081', 'default', '清理家畜饲养', '1039', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1082', 'default', '组织、指导各街道及相关部门清理乱搭乱建', '1039', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1083', 'default', '城市立面干净整洁', '1040', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1084', 'default', '建筑（代建、拆迁）工地', '1040', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1085', 'default', '向水体排放污染物', '1041', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1086', 'default', '向海域排放污染物', '1041', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1087', 'default', '生产、施工噪声', '1042', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1088', 'default', '室内音响噪声', '1042', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1089', 'default', '其他各种噪声', '1042', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1090', 'default', '排放固体废、危险废物、危险化学品、电子废物', '1043', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1091', 'default', '排放扬尘', '1044', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1092', 'default', '排放有毒有害气体', '1044', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1093', 'default', '排放油烟', '1044', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1094', 'default', '危险化学品', '1045', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1095', 'default', '流浪乞讨人员救助', '1046', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1096', 'default', '安全管理', '1047', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1097', 'default', '现场管理', '1047', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1098', 'default', '河堤破损', '1048', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1099', 'default', '歌舞娱乐场所', '1049', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1100', 'default', '游戏、游艺娱乐场所', '1049', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1101', 'default', '演出场所', '1049', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1102', 'default', '互联网商务服务营业场所', '1049', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1103', 'default', '文物监管', '1049', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1104', 'default', '卫星地面接收设施', '1050', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1105', 'default', '出版监管', '1051', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1106', 'default', '户籍人口', '1052', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1107', 'default', '流动人口', '1052', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1108', 'default', '矛盾纠纷排查化解', '1053', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1109', 'default', '涉及师生安全的案（事)件；涉及线、路案（事)件', '1054', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1110', 'default', '治安隐患上报；打架斗殴', '1055', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1111', 'default', '信访信息', '1056', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1112', 'default', '食品生产、流通企业监管', '1057', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1113', 'default', '活禽产品及冷鲜家禽质量问题', '1057', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1114', 'default', '餐饮服务单位监管', '1057', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1115', 'default', '药品生产、流通、使用单位监管', '1058', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1116', 'default', '医疗器械生产、经营、使用使用监管', '1059', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1117', 'default', '保健食品生产，经营监管', '1060', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1118', 'default', '显著位置悬挂营业执照', '1061', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1119', 'default', '门头字号与营业执照一致', '1061', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1120', 'default', '超出核准经营范围', '1061', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1121', 'default', '经营地址与营业执照一致', '1061', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1122', 'default', '无须许可、审批的各类经营主体无照经营', '1061', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1123', 'default', '电梯安全', '1062', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1124', 'default', '未经许可，擅自从事移动式压力容器或者气瓶充装活动的', '1062', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); +INSERT INTO `epmet_gov_issue`.`issue_project_tag_dict` (`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `IS_DISABLE`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1125', 'default', '违法广告发布', '1063', '0', '0', '0', 'enable', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41'); diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectCategoryDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectCategoryDTO.java index 4c7b39c7d6..e04ce6da98 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectCategoryDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectCategoryDTO.java @@ -63,6 +63,16 @@ public class ProjectCategoryDTO implements Serializable { */ private String categoryPids; + /** + * 分类编码，分类编码+customer_id唯一 + */ + private String categoryCode; + + /** + * 是否禁用(enable:启用 disable:禁用) + */ + private String isDisable; + /** * 删除标识 0未删除、1已删除 */ diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectTagsDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectTagsDTO.java index 1cc47c4bb6..30a3cf75d6 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectTagsDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectTagsDTO.java @@ -58,6 +58,11 @@ public class ProjectTagsDTO implements Serializable { */ private String tagName; + /** + * 是否禁用(enable:启用 disable:禁用) + */ + private String isDisable; + /** * 删除标识 0.未删除 1.已删除 */ diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectCategoryEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectCategoryEntity.java index ce718cc201..5a9fff63dc 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectCategoryEntity.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectCategoryEntity.java @@ -63,4 +63,14 @@ public class ProjectCategoryEntity extends BaseEpmetEntity { */ private String categoryPids; + /** + * 分类编码，分类编码+customer_id唯一 + */ + private String categoryCode; + + /** + * 是否禁用(enable:启用 disable:禁用) + */ + private String isDisable; + } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectTagsEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectTagsEntity.java index 12febddfea..2917f7e5e8 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectTagsEntity.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectTagsEntity.java @@ -58,4 +58,9 @@ public class ProjectTagsEntity extends BaseEpmetEntity { */ private String tagName; + /** + * 是否禁用(enable:启用 disable:禁用) + */ + private String isDisable; + } diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.7__alter_category_tag.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.7__alter_category_tag.sql new file mode 100644 index 0000000000..9b343fa74a --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.7__alter_category_tag.sql @@ -0,0 +1,10 @@ +ALTER TABLE `project_category` +ADD COLUMN `CATEGORY_CODE` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '分类编码，分类编码+customer_id唯一' AFTER `CATEGORY_PIDS`, +ADD COLUMN `IS_DISABLE` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '是否禁用(enable:启用 disable:禁用)' AFTER `CATEGORY_CODE`; + +ALTER TABLE `project_tags` +ADD COLUMN `IS_DISABLE` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '是否禁用(enable:启用 disable:禁用)' AFTER `TAG_NAME`; + +-- 删除表中历史数据，因为db做了调整 +DELETE FROM project_category; +DELETE FROM project_tags; From 5be7fdea0ea1b3b73a653ff3faceddc6c5c503cd Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 19 Mar 2021 17:03:41 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=88=86=E7=B1=BBdb=E8=B0=83=E6=95=B4=E5=BC=95=E8=B5=B7?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/IssueTagsFormDTO.java | 5 +++++ .../com/epmet/dao/IssueProjectCategoryDictDao.java | 2 +- .../epmet/service/impl/IssueCategoryServiceImpl.java | 2 ++ .../impl/IssueProjectCategoryDictServiceImpl.java | 2 +- .../com/epmet/service/impl/IssueTagsServiceImpl.java | 2 ++ .../src/main/java/com/epmet/utils/ModuleConstants.java | 8 ++++++++ .../resources/mapper/IssueProjectCategoryDictDao.xml | 2 ++ .../src/main/resources/mapper/IssueTagsDao.xml | 3 ++- .../epmet/dto/result/ProjectCategoryDTOResultDTO.java | 10 ++++++++++ .../epmet/service/impl/ProjectCategoryServiceImpl.java | 2 ++ 10 files changed, 35 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagsFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagsFormDTO.java index 8cb89dc4d7..908edfba19 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagsFormDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagsFormDTO.java @@ -43,6 +43,11 @@ public class IssueTagsFormDTO implements Serializable { */ private String name; + /** + * 是否禁用(enable:启用 disable:禁用) + */ + private String isDisable; + /** * 删除标识 0.未删除 1.已删除 */ diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java index 28e1522491..770c10cb99 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java @@ -37,7 +37,7 @@ import java.util.List; public interface IssueProjectCategoryDictDao extends BaseDao { /** - * @Description 客户分类列表查询，按分类升序排列 + * @Description 客户分类列表查询，按分类升序排列，查询未被禁用的 * @Author sun **/ List selectCustomerCategoryList(@Param("customerId") String customerId); diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCategoryServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCategoryServiceImpl.java index 724d256e34..2ca1c6a005 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCategoryServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCategoryServiceImpl.java @@ -208,6 +208,8 @@ public class IssueCategoryServiceImpl extends BaseServiceImpl { if (ca.getId().equals(cl.getId())) { entity.setCategoryPids(cl.getPids()); + entity.setCategoryCode(cl.getCategoryCode()); + entity.setIsDisable(cl.getIsDisable()); } }); entityList.add(entity); diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java index 6b8f05d845..86b6cb1305 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java @@ -123,7 +123,7 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueTagsDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueTagsDao.xml index 5f134b85a3..592cdb43fb 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueTagsDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueTagsDao.xml @@ -70,7 +70,7 @@ - INSERT INTO issue_tags ( ID, CUSTOMER_ID, GRID_ID, ISSUE_ID, TAG_ID, TAG_NAME, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME ) + INSERT INTO issue_tags ( ID, CUSTOMER_ID, GRID_ID, ISSUE_ID, TAG_ID, TAG_NAME, IS_DISABLE, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME ) VALUES ( @@ -80,6 +80,7 @@ #{l.issueId}, #{l.tagId}, #{l.name}, + #{l.isDisable}, #{l.delFlag}, #{l.revision}, #{l.createdBy}, diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectCategoryDTOResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectCategoryDTOResultDTO.java index 17a4e51c20..8215a8850f 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectCategoryDTOResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectCategoryDTOResultDTO.java @@ -32,6 +32,11 @@ public class ProjectCategoryDTOResultDTO implements Serializable { */ private String pids; + /** + * 上级分类编码 + */ + private String parentCategoryCode; + /** * 分类编码，分类编码+customer_id唯一 */ @@ -52,4 +57,9 @@ public class ProjectCategoryDTOResultDTO implements Serializable { */ private Integer sort; + /** + * 是否禁用(enable:启用 disable:禁用) + */ + private String isDisable; + } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java index 2db7977d67..f2a12df324 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java @@ -175,6 +175,8 @@ public class ProjectCategoryServiceImpl extends BaseServiceImpl { if (ca.getId().equals(cl.getId())) { entity.setCategoryPids(cl.getPids()); + entity.setCategoryCode(cl.getCategoryCode()); + entity.setIsDisable(cl.getIsDisable()); } }); entityList.add(entity); From a4b49c3ba996f1d6b099bc3594e0b24a5dd6f5d2 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 22 Mar 2021 10:31:05 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E6=96=B9=E6=B3=95=E4=BD=93=E6=96=B0?= =?UTF-8?q?=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IssueProjectCategoryDictController.java | 22 +++++++++++++++++++ .../IssueProjectCategoryDictService.java | 12 ++++++++++ .../IssueProjectCategoryDictServiceImpl.java | 20 +++++++++++++++++ 3 files changed, 54 insertions(+) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java index d6fb36123d..b0d5a7fd1f 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java @@ -144,4 +144,26 @@ public class IssueProjectCategoryDictController { return new Result().ok(issueProjectCategoryDictService.getProjectAndCategoryInfo(formDTO)); } + /** + * @param formDTO + * @return + * @Description 分类启用与禁用 + * @Author sun + **/ + @PostMapping("isdisablecategory") + public Result isDisableCategory(@RequestBody ProjectSaveCategoryFormDTO formDTO) { + return new Result().ok(issueProjectCategoryDictService.isDisableCategory(formDTO)); + } + + /** + * @param formDTO + * @return + * @Description 分类删除 + * @Author sun + **/ + @PostMapping("delcategory") + public Result delCategory(@RequestBody ProjectSaveCategoryFormDTO formDTO) { + return new Result().ok(issueProjectCategoryDictService.delCategory(formDTO)); + } + } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectCategoryDictService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectCategoryDictService.java index 3b1fa1def1..9de4150e08 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectCategoryDictService.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectCategoryDictService.java @@ -130,4 +130,16 @@ public interface IssueProjectCategoryDictService extends BaseService Date: Mon, 22 Mar 2021 11:04:13 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=8A=BD=E5=8F=96=E5=88=B0=E6=8C=87=E6=A0=87?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/DimController.java | 8 +- .../issue/IssueProjectCategoryDictDao.java | 39 ++++++++ .../stats/CustomerProjectCategoryDictDao.java | 39 ++++++++ .../stats/FactOrginProjectCategoryDao.java | 33 +++++++ .../issue/IssueProjectCategoryDictEntity.java | 83 ++++++++++++++++ .../CustomerProjectCategoryDictEntity.java | 95 ++++++++++++++++++ .../stats/FactOrginProjectCategoryEntity.java | 63 ++++++++++++ .../IssueProjectCategoryDictService.java | 37 +++++++ .../IssueProjectCategoryDictServiceImpl.java | 36 +++++++ .../com/epmet/service/StatsDimService.java | 2 + .../service/impl/StatsDimServiceImpl.java | 51 ++++++++++ .../CustomerProjectCategoryDictService.java | 45 +++++++++ .../FactOrginProjectCategoryService.java | 31 ++++++ ...ustomerProjectCategoryDictServiceImpl.java | 97 +++++++++++++++++++ .../FactOrginProjectCategoryServiceImpl.java | 35 +++++++ .../issue/IssueProjectCategoryDictDao.xml | 44 +++++++++ .../stats/CustomerProjectCategoryDictDao.xml | 41 ++++++++ .../stats/FactOrginProjectCategoryDao.xml | 8 ++ 18 files changed, 786 insertions(+), 1 deletion(-) create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/issue/IssueProjectCategoryDictDao.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/CustomerProjectCategoryDictDao.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactOrginProjectCategoryDao.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/issue/IssueProjectCategoryDictEntity.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/CustomerProjectCategoryDictEntity.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactOrginProjectCategoryEntity.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/IssueProjectCategoryDictService.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueProjectCategoryDictServiceImpl.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/CustomerProjectCategoryDictService.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactOrginProjectCategoryService.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/CustomerProjectCategoryDictServiceImpl.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactOrginProjectCategoryServiceImpl.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/IssueProjectCategoryDictDao.xml create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/CustomerProjectCategoryDictDao.xml create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactOrginProjectCategoryDao.xml diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DimController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DimController.java index 3e2a78b716..68dedbd4a0 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DimController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DimController.java @@ -1,7 +1,6 @@ package com.epmet.controller; import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.AgencySubDeptTreeDto; import com.epmet.dto.AgencySubTreeDto; import com.epmet.dto.stats.form.CustomerIdAndDateIdFormDTO; @@ -105,6 +104,13 @@ public class DimController { } catch (Exception e) { logger.error("初始化按周维度失败:", e); } + //项目分类字典维度 初始化 每天晚上凌晨10分执行 + try { + statsDimService.customerInitProjectCategory(); + logger.info("初始化项目分类成功"); + } catch (Exception e) { + logger.error("初始化项目分类失败：", e); + } return new Result(); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/issue/IssueProjectCategoryDictDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/issue/IssueProjectCategoryDictDao.java new file mode 100644 index 0000000000..9cc59cf996 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/issue/IssueProjectCategoryDictDao.java @@ -0,0 +1,39 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dao.issue; + +import com.epmet.entity.issue.IssueProjectCategoryDictEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.Date; +import java.util.List; + +/** + * 议题项目分类字典 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-12-08 + */ +@Mapper +public interface IssueProjectCategoryDictDao { + + List listInsertCategoies(@Param("start") Date start, @Param("end") Date end); + + List listByUpdatedTime(@Param("start") Date start, @Param("end") Date end); +} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/CustomerProjectCategoryDictDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/CustomerProjectCategoryDictDao.java new file mode 100644 index 0000000000..fd0cdd6eb2 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/CustomerProjectCategoryDictDao.java @@ -0,0 +1,39 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dao.stats; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.stats.CustomerProjectCategoryDictEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * 客户项目分类字典表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-03-19 + */ +@Mapper +public interface CustomerProjectCategoryDictDao extends BaseDao { + + CustomerProjectCategoryDictEntity getLatestProjectCategory(); + + CustomerProjectCategoryDictEntity getLatestUpdatedEntity(); + + CustomerProjectCategoryDictEntity selectByCustomerIdAndId(@Param("customerId") String customerId, @Param("categoryId") String categoryId); +} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactOrginProjectCategoryDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactOrginProjectCategoryDao.java new file mode 100644 index 0000000000..789dc926bb --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactOrginProjectCategoryDao.java @@ -0,0 +1,33 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dao.stats; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.stats.FactOrginProjectCategoryEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 项目所属分类表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-03-19 + */ +@Mapper +public interface FactOrginProjectCategoryDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/issue/IssueProjectCategoryDictEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/issue/IssueProjectCategoryDictEntity.java new file mode 100644 index 0000000000..67c82fee00 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/issue/IssueProjectCategoryDictEntity.java @@ -0,0 +1,83 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.entity.issue; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 议题项目分类字典 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-12-08 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("issue_project_category_dict") +public class IssueProjectCategoryDictEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户id, 产品默认default + */ + private String customerId; + + /** + * 上级分类ID 顶级此列存储0 + */ + private String pid; + + /** + * 所有上级分类ID，用逗号分开 + */ + private String pids; + + /** + * 上级分类编码 + */ + private String parentCategoryCode; + + /** + * 分类编码，分类编码+customer_id唯一 + */ + private String categoryCode; + + /** + * 分类名称 + */ + private String categoryName; + + /** + * 分类类别1,2,3,4.... + */ + private String categoryType; + + /** + * 排序 + */ + private Integer sort; + + /** + * 是否禁用(enable:启用 disable:禁用) + */ + private String isDisable; + +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/CustomerProjectCategoryDictEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/CustomerProjectCategoryDictEntity.java new file mode 100644 index 0000000000..82afefb88c --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/CustomerProjectCategoryDictEntity.java @@ -0,0 +1,95 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.entity.stats; + +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 2021-03-19 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("customer_project_category_dict") +public class CustomerProjectCategoryDictEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户id + */ + private String customerId; + + /** + * 外部客户：external;内部客户：internal + */ + private String customerType; + + /** + * 客户自己的分类编码 + */ + private String categoryCode; + + /** + * 客户自己的分类名称 + */ + private String categoryName; + + /** + * 父类分类编码，如果是一级分类，此列赋值为0 + */ + private String parentCategoryCode; + + /** + * 分类等级：1、2....；产品只有2级分类 + */ + private Integer level; + + /** + * 排序 + */ + private Integer sort; + + /** + * 是否禁用(enable:启用 disable:禁用) + */ + private String isDisable; + + /** + * 对应e世通中的分类编码，没有此列为空 + */ + private String epmetCategoryCode; + + /** + * 创建时间 + */ + private Date originCreatedTime; + /** + * 修改时间 + */ + private Date originUpdatedTime; + + private String categoryId; +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactOrginProjectCategoryEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactOrginProjectCategoryEntity.java new file mode 100644 index 0000000000..294bdfd92e --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactOrginProjectCategoryEntity.java @@ -0,0 +1,63 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.entity.stats; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 项目所属分类表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-03-19 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("fact_orgin_project_category") +public class FactOrginProjectCategoryEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户id + */ + private String customerId; + + /** + * 项目id + */ + private String projectId; + + /** + * 分类编码 + */ + private String categoryCode; + + /** + * 所属父类分类编码 + */ + private String parentCategoryCode; + + /** + * 分类等级：1、2....；产品目前只有2级分类 + */ + private Integer level; + +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/IssueProjectCategoryDictService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/IssueProjectCategoryDictService.java new file mode 100644 index 0000000000..3067657abb --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/IssueProjectCategoryDictService.java @@ -0,0 +1,37 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service.Issue; + +import com.epmet.entity.issue.IssueProjectCategoryDictEntity; + +import java.util.Date; +import java.util.List; + +/** + * 议题项目分类字典 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-12-08 + */ + +public interface IssueProjectCategoryDictService{ + + List listInsertCategoies(Date start, Date end); + + List listByUpdatedTime(Date start, Date end); +} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueProjectCategoryDictServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueProjectCategoryDictServiceImpl.java new file mode 100644 index 0000000000..98c18ec1fc --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueProjectCategoryDictServiceImpl.java @@ -0,0 +1,36 @@ +package com.epmet.service.Issue.impl; + +import com.epmet.commons.dynamic.datasource.annotation.DataSource; +import com.epmet.constant.DataSourceConstant; +import com.epmet.dao.issue.IssueProjectCategoryDictDao; +import com.epmet.entity.issue.IssueProjectCategoryDictEntity; +import com.epmet.service.Issue.IssueProjectCategoryDictService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +/** + * 描述一下 + * + * @author yinzuomei@elink-cn.com + * @date 2021/3/19 15:29 + */ +@Service +@DataSource(DataSourceConstant.GOV_ISSUE) +public class IssueProjectCategoryDictServiceImpl implements IssueProjectCategoryDictService { + @Autowired + private IssueProjectCategoryDictDao issueProjectCategoryDictDao; + + @Override + public List listInsertCategoies(Date start, Date end) { + return issueProjectCategoryDictDao.listInsertCategoies(start, end); + } + + @Override + public List listByUpdatedTime(Date start, Date end) { + return issueProjectCategoryDictDao.listByUpdatedTime(start, end); + } + +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsDimService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsDimService.java index 1e2f05991b..0bdac4cb04 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsDimService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsDimService.java @@ -10,4 +10,6 @@ public interface StatsDimService { void initCustomerDim(); void initDepartmentDim(); + + void customerInitProjectCategory(); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java index 6338145260..09db5e717d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java @@ -3,10 +3,12 @@ package com.epmet.service.impl; import com.epmet.constant.RobotConstant; import com.epmet.dto.org.result.CustomerAreaCodeResultDTO; import com.epmet.entity.crm.CustomerEntity; +import com.epmet.entity.issue.IssueProjectCategoryDictEntity; import com.epmet.entity.org.CustomerAgencyEntity; import com.epmet.entity.org.CustomerDepartmentEntity; import com.epmet.entity.org.CustomerGridEntity; import com.epmet.entity.stats.*; +import com.epmet.service.Issue.IssueProjectCategoryDictService; import com.epmet.service.StatsDimService; import com.epmet.service.crm.CustomerService; import com.epmet.service.org.CustomerAgencyService; @@ -52,6 +54,12 @@ public class StatsDimServiceImpl implements StatsDimService { @Autowired private DimDepartmentService dimDepartmentService; + @Autowired + private CustomerProjectCategoryDictService projectCategoryDictService; + + @Autowired + private IssueProjectCategoryDictService issueProjectCategoryDictService; + @Override public void initGridDim() { List newDimGrids = getNewDimGrids(); @@ -264,4 +272,47 @@ public class StatsDimServiceImpl implements StatsDimService { } return new ArrayList<>(); } + + /** + * @return void + * @author yinzuomei + * @description 初始化项目分类字典表 + * @Date 2021/3/19 15:44 + **/ + @Override + public void customerInitProjectCategory() { + Date now = new Date(); + List insertCategoies = listInsertCategoies(); + List updateCategoies = listUpdateCategoies(now); + projectCategoryDictService.initProjectCategory(insertCategoies,updateCategoies); + } + + /** + * @author yinzuomei + * @description 构造需要插入的分类字典 + * @Date 2021/3/19 15:52 + **/ + private List listInsertCategoies() { + CustomerProjectCategoryDictEntity lastInsertProjectCategory = projectCategoryDictService.getLatestProjectCategory(); + Date now = new Date(); + Date lastInitTime = null; + if (null != lastInsertProjectCategory) { + lastInitTime = lastInsertProjectCategory.getOriginCreatedTime(); + } + return issueProjectCategoryDictService.listInsertCategoies(lastInitTime, now); + } + + /** + * @param initTime + * @author yinzuomei + * @description + * @Date 2021/3/19 15:55 + **/ + private List listUpdateCategoies(Date initTime) { + CustomerProjectCategoryDictEntity lastUpdated = projectCategoryDictService.getLatestUpdatedEntity(); + if (lastUpdated != null) { + return issueProjectCategoryDictService.listByUpdatedTime(lastUpdated.getOriginUpdatedTime(), initTime); + } + return new ArrayList<>(); + } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/CustomerProjectCategoryDictService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/CustomerProjectCategoryDictService.java new file mode 100644 index 0000000000..36861d7b35 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/CustomerProjectCategoryDictService.java @@ -0,0 +1,45 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service.stats; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.entity.issue.IssueProjectCategoryDictEntity; +import com.epmet.entity.stats.CustomerProjectCategoryDictEntity; + +import java.util.List; + +/** + * 客户项目分类字典表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-03-19 + */ +public interface CustomerProjectCategoryDictService extends BaseService { + + void initProjectCategory(List insertCategoies, + List updateCategoies); + + /** + * @author yinzuomei + * @description 获取内部客户最近一次初始记录 + * @Date 2021/3/19 14:57 + **/ + CustomerProjectCategoryDictEntity getLatestProjectCategory(); + + CustomerProjectCategoryDictEntity getLatestUpdatedEntity(); +} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactOrginProjectCategoryService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactOrginProjectCategoryService.java new file mode 100644 index 0000000000..1d3a614ead --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactOrginProjectCategoryService.java @@ -0,0 +1,31 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service.stats; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.entity.stats.FactOrginProjectCategoryEntity; + +/** + * 项目所属分类表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-03-19 + */ +public interface FactOrginProjectCategoryService extends BaseService { + +} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/CustomerProjectCategoryDictServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/CustomerProjectCategoryDictServiceImpl.java new file mode 100644 index 0000000000..e81c8568ed --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/CustomerProjectCategoryDictServiceImpl.java @@ -0,0 +1,97 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service.stats.impl; + +import com.epmet.commons.dynamic.datasource.annotation.DataSource; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.constant.DataSourceConstant; +import com.epmet.dao.stats.CustomerProjectCategoryDictDao; +import com.epmet.entity.issue.IssueProjectCategoryDictEntity; +import com.epmet.entity.stats.CustomerProjectCategoryDictEntity; +import com.epmet.service.stats.CustomerProjectCategoryDictService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 客户项目分类字典表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-03-19 + */ +@Slf4j +@DataSource(DataSourceConstant.EVALUATION_INDEX) +@Service +public class CustomerProjectCategoryDictServiceImpl extends BaseServiceImpl implements CustomerProjectCategoryDictService { + + @DataSource(value = DataSourceConstant.EVALUATION_INDEX) + @Transactional(rollbackFor = Exception.class) + @Override + public void initProjectCategory(List insertCategoies, List updateCategoies) { + log.info(String.format("=============需要插入的条数=%s,更新的条数=%s",insertCategoies.size(),updateCategoies.size())); + insertCategoies.forEach(insertEntity -> { + CustomerProjectCategoryDictEntity entityInsert=new CustomerProjectCategoryDictEntity(); + entityInsert.setCustomerId(insertEntity.getCustomerId()); + entityInsert.setCustomerType("internal"); + entityInsert.setCategoryCode(insertEntity.getCategoryCode()); + entityInsert.setCategoryName(insertEntity.getCategoryName()); + entityInsert.setParentCategoryCode(insertEntity.getParentCategoryCode()); + entityInsert.setLevel(Integer.valueOf(insertEntity.getCategoryType())); + entityInsert.setSort(insertEntity.getSort()); + entityInsert.setIsDisable(insertEntity.getIsDisable()); + entityInsert.setOriginCreatedTime(insertEntity.getCreatedTime()); + entityInsert.setOriginUpdatedTime(insertEntity.getUpdatedTime()); + entityInsert.setCategoryId(insertEntity.getId()); + baseDao.insert(entityInsert); + }); + updateCategoies.forEach(updatedEntity -> { + CustomerProjectCategoryDictEntity entity=baseDao.selectByCustomerIdAndId(updatedEntity.getCustomerId(),updatedEntity.getId()); + if(null!=entity){ + entity.setCategoryCode(updatedEntity.getCategoryCode()); + entity.setCategoryName(updatedEntity.getCategoryName()); + entity.setParentCategoryCode(updatedEntity.getParentCategoryCode()); + entity.setLevel(Integer.valueOf(updatedEntity.getCategoryType())); + entity.setSort(updatedEntity.getSort()); + entity.setIsDisable(updatedEntity.getIsDisable()); + entity.setOriginCreatedTime(updatedEntity.getCreatedTime()); + entity.setOriginUpdatedTime(updatedEntity.getUpdatedTime()); + } + baseDao.updateById(entity); + }); + } + + /** + * @author yinzuomei + * @description 获取内部客户最近一次初始记录 + * @Date 2021/3/19 14:57 + **/ + @DataSource(value = DataSourceConstant.EVALUATION_INDEX) + @Override + public CustomerProjectCategoryDictEntity getLatestProjectCategory() { + return baseDao.getLatestProjectCategory(); + } + + @DataSource(value = DataSourceConstant.EVALUATION_INDEX) + @Override + public CustomerProjectCategoryDictEntity getLatestUpdatedEntity() { + return baseDao.getLatestUpdatedEntity(); + } + +} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactOrginProjectCategoryServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactOrginProjectCategoryServiceImpl.java new file mode 100644 index 0000000000..c2190ca008 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactOrginProjectCategoryServiceImpl.java @@ -0,0 +1,35 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service.stats.impl; + +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.dao.stats.FactOrginProjectCategoryDao; +import com.epmet.entity.stats.FactOrginProjectCategoryEntity; +import com.epmet.service.stats.FactOrginProjectCategoryService; +import org.springframework.stereotype.Service; + +/** + * 项目所属分类表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-03-19 + */ +@Service +public class FactOrginProjectCategoryServiceImpl extends BaseServiceImpl implements FactOrginProjectCategoryService { + +} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/IssueProjectCategoryDictDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/IssueProjectCategoryDictDao.xml new file mode 100644 index 0000000000..a1207ecd06 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/IssueProjectCategoryDictDao.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/CustomerProjectCategoryDictDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/CustomerProjectCategoryDictDao.xml new file mode 100644 index 0000000000..63b47e4456 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/CustomerProjectCategoryDictDao.xml @@ -0,0 +1,41 @@ + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactOrginProjectCategoryDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactOrginProjectCategoryDao.xml new file mode 100644 index 0000000000..572c1dc091 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactOrginProjectCategoryDao.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file From 6702899ec7e270317fb54df4c00d9d42192e9da8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Mar 2021 13:28:14 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=86=85=E3=80=81?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=86=85=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=A1=B9=E7=9B=AE=E6=95=B0=E9=87=8F=E9=87=87?= =?UTF-8?q?=E9=9B=86API=E8=B0=83=E6=95=B4=EF=BC=8C=20=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=B1=BB=E5=9E=8B=E5=88=86=E6=9E=90=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScreenProjectCategoryGridDailyDTO.java | 42 ++--------------- .../dto/ScreenProjectCategoryOrgDailyDTO.java | 42 ++--------------- .../ScreenProjectCategoryOrgDailyDao.xml | 40 +++++++++-------- .../ScreenProjectCategoryGridDailyDTO.java | 44 ++---------------- .../ScreenProjectCategoryOrgDailyDTO.java | 44 ++---------------- .../ScreenProjectCategoryGridDailyEntity.java | 45 +------------------ .../ScreenProjectCategoryOrgDailyEntity.java | 43 +----------------- .../ScreenProjectCategoryGridDailyDao.xml | 23 ---------- .../ScreenProjectCategoryOrgDailyDao.xml | 25 ----------- 9 files changed, 36 insertions(+), 312 deletions(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenProjectCategoryGridDailyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenProjectCategoryGridDailyDTO.java index b9cd6657b6..166be073a1 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenProjectCategoryGridDailyDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenProjectCategoryGridDailyDTO.java @@ -17,11 +17,10 @@ package com.epmet.dto; -import java.io.Serializable; -import java.util.Date; import lombok.Data; -import java.math.BigDecimal; +import java.io.Serializable; +import java.util.Date; /** * 项目(事件)分类按网格_按天统计 @@ -67,48 +66,13 @@ public class ScreenProjectCategoryGridDailyDTO implements Serializable { /** * e世通中的项目类别编码 */ - private String epmetCategoryCode; + private String categoryCode; /** * 该分类下所有项目总数 */ private Integer projectTotal; - /** - * 该分类下，正在处理中的项目总数 - */ - private Integer pendingTotal; - - /** - * 该分类下已结案的项目总数 - */ - private Integer closedTotal; - - /** - * 该分类下已结案无需解决的项目总数 - */ - private Integer unResolvedTotal; - - /** - * 该分类下已结案已解决的项目总数 - */ - private Integer resolvedTotal; - - /** - * 该分类下项目结案率 - */ - private BigDecimal closedRatio; - - /** - * 该分类下已结案项目解决率 - */ - private BigDecimal resolvedRatio; - - /** - * 该分类下已结案项目未解决率 - */ - private BigDecimal unResolvedRatio; - /** * 删除标识 */ diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenProjectCategoryOrgDailyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenProjectCategoryOrgDailyDTO.java index 1507a1f88a..0404581cf7 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenProjectCategoryOrgDailyDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenProjectCategoryOrgDailyDTO.java @@ -17,11 +17,10 @@ package com.epmet.dto; -import java.io.Serializable; -import java.util.Date; import lombok.Data; -import java.math.BigDecimal; +import java.io.Serializable; +import java.util.Date; /** * 项目(事件)分类按组织_按天统计 @@ -72,48 +71,13 @@ public class ScreenProjectCategoryOrgDailyDTO implements Serializable { /** * e世通中的项目类别编码 */ - private String epmetCategoryCode; + private String categoryCode; /** * 该分类下所有项目总数 */ private Integer projectTotal; - /** - * 该分类下，正在处理中的项目总数 - */ - private Integer pendingTotal; - - /** - * 该分类下已结案的项目总数 - */ - private Integer closedTotal; - - /** - * 该分类下已结案无需解决的项目总数 - */ - private Integer unResolvedTotal; - - /** - * 该分类下已结案已解决的项目总数 - */ - private Integer resolvedTotal; - - /** - * 该分类下项目结案率 - */ - private BigDecimal closedRatio; - - /** - * 该分类下已结案项目解决率 - */ - private BigDecimal resolvedRatio; - - /** - * 该分类下已结案项目未解决率 - */ - private BigDecimal unResolvedRatio; - /** * 删除标识 */ diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml index 5816def044..d2ac38a7f7 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml @@ -5,24 +5,26 @@ \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryGridDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryGridDailyDTO.java index 50afc350ef..582fc6d842 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryGridDailyDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryGridDailyDTO.java @@ -17,11 +17,10 @@ package com.epmet.dto.screen; -import java.io.Serializable; -import java.util.Date; import lombok.Data; -import java.math.BigDecimal; +import java.io.Serializable; +import java.util.Date; /** * 项目(事件)分类按网格_按天统计 @@ -67,50 +66,13 @@ public class ScreenProjectCategoryGridDailyDTO implements Serializable { /** * e世通中的项目类别编码 */ - private String epmetCategoryCode; - - private String epmetCategoryName; + private String categoryCode; /** * 该分类下所有项目总数 */ private Integer projectTotal; - /** - * 该分类下，正在处理中的项目总数 - */ - private Integer pendingTotal; - - /** - * 该分类下已结案的项目总数 - */ - private Integer closedTotal; - - /** - * 该分类下已结案无需解决的项目总数 - */ - private Integer unResolvedTotal; - - /** - * 该分类下已结案已解决的项目总数 - */ - private Integer resolvedTotal; - - /** - * 该分类下项目结案率 - */ - private BigDecimal closedRatio; - - /** - * 该分类下已结案项目解决率 - */ - private BigDecimal resolvedRatio; - - /** - * 该分类下已结案项目未解决率 - */ - private BigDecimal unResolvedRatio; - /** * 删除标识 */ diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryOrgDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryOrgDailyDTO.java index 49c85be67e..ed598e903f 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryOrgDailyDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryOrgDailyDTO.java @@ -17,11 +17,10 @@ package com.epmet.dto.screen; -import java.io.Serializable; -import java.util.Date; import lombok.Data; -import java.math.BigDecimal; +import java.io.Serializable; +import java.util.Date; /** * 项目(事件)分类按组织_按天统计 @@ -72,50 +71,13 @@ public class ScreenProjectCategoryOrgDailyDTO implements Serializable { /** * e世通中的项目类别编码 */ - private String epmetCategoryCode; - - private String epmetCategoryName; + private String categoryCode; /** * 该分类下所有项目总数 */ private Integer projectTotal; - /** - * 该分类下，正在处理中的项目总数 - */ - private Integer pendingTotal; - - /** - * 该分类下已结案的项目总数 - */ - private Integer closedTotal; - - /** - * 该分类下已结案无需解决的项目总数 - */ - private Integer unResolvedTotal; - - /** - * 该分类下已结案已解决的项目总数 - */ - private Integer resolvedTotal; - - /** - * 该分类下项目结案率 - */ - private BigDecimal closedRatio; - - /** - * 该分类下已结案项目解决率 - */ - private BigDecimal resolvedRatio; - - /** - * 该分类下已结案项目未解决率 - */ - private BigDecimal unResolvedRatio; - /** * 删除标识 */ diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryGridDailyEntity.java index ef91f696c2..5d40a12628 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryGridDailyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryGridDailyEntity.java @@ -18,14 +18,10 @@ package com.epmet.entity.evaluationindex.screen; import com.baomidou.mybatisplus.annotation.TableName; - import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.math.BigDecimal; -import java.util.Date; - /** * 项目(事件)分类按网格_按天统计 * @@ -65,50 +61,13 @@ public class ScreenProjectCategoryGridDailyEntity extends BaseEpmetEntity { private String pids; /** - * e世通中的项目类别编码 + * 项目类别编码 */ - private String epmetCategoryCode; - - private String epmetCategoryName; + private String categoryCode; /** * 该分类下所有项目总数 */ private Integer projectTotal; - /** - * 该分类下，正在处理中的项目总数 - */ - private Integer pendingTotal; - - /** - * 该分类下已结案的项目总数 - */ - private Integer closedTotal; - - /** - * 该分类下已结案无需解决的项目总数 - */ - private Integer unResolvedTotal; - - /** - * 该分类下已结案已解决的项目总数 - */ - private Integer resolvedTotal; - - /** - * 该分类下项目结案率 - */ - private BigDecimal closedRatio; - - /** - * 该分类下已结案项目解决率 - */ - private BigDecimal resolvedRatio; - - /** - * 该分类下已结案项目未解决率 - */ - private BigDecimal unResolvedRatio; - } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryOrgDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryOrgDailyEntity.java index 1ac6c76145..7c61d7069d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryOrgDailyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryOrgDailyEntity.java @@ -18,14 +18,10 @@ package com.epmet.entity.evaluationindex.screen; import com.baomidou.mybatisplus.annotation.TableName; - import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.math.BigDecimal; -import java.util.Date; - /** * 项目(事件)分类按组织_按天统计 * @@ -72,48 +68,11 @@ public class ScreenProjectCategoryOrgDailyEntity extends BaseEpmetEntity { /** * e世通中的项目类别编码 */ - private String epmetCategoryCode; - - private String epmetCategoryName; + private String categoryCode; /** * 该分类下所有项目总数 */ private Integer projectTotal; - /** - * 该分类下，正在处理中的项目总数 - */ - private Integer pendingTotal; - - /** - * 该分类下已结案的项目总数 - */ - private Integer closedTotal; - - /** - * 该分类下已结案无需解决的项目总数 - */ - private Integer unResolvedTotal; - - /** - * 该分类下已结案已解决的项目总数 - */ - private Integer resolvedTotal; - - /** - * 该分类下项目结案率 - */ - private BigDecimal closedRatio; - - /** - * 该分类下已结案项目解决率 - */ - private BigDecimal resolvedRatio; - - /** - * 该分类下已结案项目未解决率 - */ - private BigDecimal unResolvedRatio; - } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.xml index bc84c6b2df..e79da541d9 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.xml @@ -3,29 +3,6 @@ - - - - - - - - - - - - - - - - - - - - - - - delete from screen_project_category_grid_daily where customer_id = #{customerId} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml index 5d8cd9a73a..20c4452e69 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml @@ -2,31 +2,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - delete from screen_project_category_org_daily where customer_id = #{customerId} From f449c114660ba9acefc3fd11fac8ad8f63e14008 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Mar 2021 14:14:20 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E6=96=B0=E5=A2=9Efact=5Forigin=5Fproject?= =?UTF-8?q?=5Fcategory=5Fdaily?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extract/FactOriginProjectCategoryDailyDao.java} | 6 +++--- .../FactOriginProjectCategoryDailyEntity.java} | 6 +++--- .../FactOriginProjectCategoryDailyService.java} | 8 ++++---- .../todata/impl/FactOriginExtractServiceImpl.java | 7 ++++++- .../FactOriginProjectCategoryDailyServiceImpl.java} | 13 ++++++++----- .../extract/FactOriginProjectCategoryDailyDao.xml} | 2 +- 6 files changed, 25 insertions(+), 17 deletions(-) rename epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/{stats/FactOrginProjectCategoryDao.java => evaluationindex/extract/FactOriginProjectCategoryDailyDao.java} (79%) rename epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/{stats/FactOrginProjectCategoryEntity.java => evaluationindex/extract/FactOriginProjectCategoryDailyEntity.java} (89%) rename epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/{stats/FactOrginProjectCategoryService.java => evaluationindex/extract/todata/FactOriginProjectCategoryDailyService.java} (69%) rename epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/{stats/impl/FactOrginProjectCategoryServiceImpl.java => evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java} (58%) rename epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/{stats/FactOrginProjectCategoryDao.xml => evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml} (59%) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactOrginProjectCategoryDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectCategoryDailyDao.java similarity index 79% rename from epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactOrginProjectCategoryDao.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectCategoryDailyDao.java index 789dc926bb..ff9f8c1885 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactOrginProjectCategoryDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectCategoryDailyDao.java @@ -15,10 +15,10 @@ * along with this program. If not, see . */ -package com.epmet.dao.stats; +package com.epmet.dao.evaluationindex.extract; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.stats.FactOrginProjectCategoryEntity; +import com.epmet.entity.evaluationindex.extract.FactOriginProjectCategoryDailyEntity; import org.apache.ibatis.annotations.Mapper; /** @@ -28,6 +28,6 @@ import org.apache.ibatis.annotations.Mapper; * @since v1.0.0 2021-03-19 */ @Mapper -public interface FactOrginProjectCategoryDao extends BaseDao { +public interface FactOriginProjectCategoryDailyDao extends BaseDao { } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactOrginProjectCategoryEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginProjectCategoryDailyEntity.java similarity index 89% rename from epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactOrginProjectCategoryEntity.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginProjectCategoryDailyEntity.java index 294bdfd92e..4587577a2d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactOrginProjectCategoryEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginProjectCategoryDailyEntity.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.epmet.entity.stats; +package com.epmet.entity.evaluationindex.extract; import com.baomidou.mybatisplus.annotation.TableName; import com.epmet.commons.mybatis.entity.BaseEpmetEntity; @@ -30,8 +30,8 @@ import lombok.EqualsAndHashCode; */ @Data @EqualsAndHashCode(callSuper=false) -@TableName("fact_orgin_project_category") -public class FactOrginProjectCategoryEntity extends BaseEpmetEntity { +@TableName("fact_origin_project_category_daily") +public class FactOriginProjectCategoryDailyEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactOrginProjectCategoryService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectCategoryDailyService.java similarity index 69% rename from epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactOrginProjectCategoryService.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectCategoryDailyService.java index 1d3a614ead..2eb2de215e 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactOrginProjectCategoryService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectCategoryDailyService.java @@ -15,10 +15,10 @@ * along with this program. If not, see . */ -package com.epmet.service.stats; +package com.epmet.service.evaluationindex.extract.todata; import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.entity.stats.FactOrginProjectCategoryEntity; +import com.epmet.entity.evaluationindex.extract.FactOriginProjectCategoryDailyEntity; /** * 项目所属分类表 @@ -26,6 +26,6 @@ import com.epmet.entity.stats.FactOrginProjectCategoryEntity; * @author generator generator@elink-cn.com * @since v1.0.0 2021-03-19 */ -public interface FactOrginProjectCategoryService extends BaseService { - +public interface FactOriginProjectCategoryDailyService extends BaseService { + //todo 将epmet_gov_project库中的项目分类信息（project_category）同步到统计库epmet_data_statistical } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java index f44eef01de..67ba0f0c4f 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java @@ -46,7 +46,8 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService { private GroupExtractService groupExtractService; @Autowired private DimCustomerPartymemberService dimCustomerPartymemberService; - + @Autowired + private FactOriginProjectCategoryDailyService originProjectCategoryDailyService; @Override public void extractAll(ExtractOriginFormDTO extractOriginFormDTO) { @@ -200,6 +201,8 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService { } catch (Exception e) { log.error("抽取【项目数据】发生异常,参数:" + JSON.toJSONString(paramNew), e); } + //todo 新增项目分类抽取 shaowen + // originProjectCategoryDailyService.xxxx(); } else { try { for (int i = 0; i < finalDaysBetween.size(); i++) { @@ -219,6 +222,8 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService { } catch (Exception e) { log.error("抽取【项目数据】发生异常,参数:" + JSON.toJSONString(paramNew), e); } + //todo 新增项目分类抽取 shaowen + // originProjectCategoryDailyService.xxxx(); } }); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactOrginProjectCategoryServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java similarity index 58% rename from epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactOrginProjectCategoryServiceImpl.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java index c2190ca008..f9bd902765 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactOrginProjectCategoryServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java @@ -15,12 +15,14 @@ * along with this program. If not, see . */ -package com.epmet.service.stats.impl; +package com.epmet.service.evaluationindex.extract.todata.impl; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.dao.stats.FactOrginProjectCategoryDao; -import com.epmet.entity.stats.FactOrginProjectCategoryEntity; -import com.epmet.service.stats.FactOrginProjectCategoryService; +import com.epmet.constant.DataSourceConstant; +import com.epmet.dao.evaluationindex.extract.FactOriginProjectCategoryDailyDao; +import com.epmet.entity.evaluationindex.extract.FactOriginProjectCategoryDailyEntity; +import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectCategoryDailyService; import org.springframework.stereotype.Service; /** @@ -30,6 +32,7 @@ import org.springframework.stereotype.Service; * @since v1.0.0 2021-03-19 */ @Service -public class FactOrginProjectCategoryServiceImpl extends BaseServiceImpl implements FactOrginProjectCategoryService { +@DataSource(DataSourceConstant.STATS) +public class FactOriginProjectCategoryDailyServiceImpl extends BaseServiceImpl implements FactOriginProjectCategoryDailyService { } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactOrginProjectCategoryDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml similarity index 59% rename from epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactOrginProjectCategoryDao.xml rename to epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml index 572c1dc091..56ab802c01 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactOrginProjectCategoryDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml @@ -1,7 +1,7 @@ - + From d9aa8777872046597baf9ca9fe2daa4320204852 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Mar 2021 15:41:26 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E5=A2=9E=E5=8A=A0level?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/ScreenProjectCategoryGridDailyDTO.java | 5 +++++ .../java/com/epmet/dto/ScreenProjectCategoryOrgDailyDTO.java | 5 +++++ .../epmet/dto/screen/ScreenProjectCategoryGridDailyDTO.java | 5 +++++ .../epmet/dto/screen/ScreenProjectCategoryOrgDailyDTO.java | 5 +++++ .../screen/ScreenProjectCategoryGridDailyEntity.java | 4 ++++ .../screen/ScreenProjectCategoryOrgDailyEntity.java | 4 ++++ 6 files changed, 28 insertions(+) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenProjectCategoryGridDailyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenProjectCategoryGridDailyDTO.java index 166be073a1..0a015c6762 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenProjectCategoryGridDailyDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenProjectCategoryGridDailyDTO.java @@ -73,6 +73,11 @@ public class ScreenProjectCategoryGridDailyDTO implements Serializable { */ private Integer projectTotal; + /** + * 分类等级1、2.... + */ + private Integer level; + /** * 删除标识 */ diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenProjectCategoryOrgDailyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenProjectCategoryOrgDailyDTO.java index 0404581cf7..95d65184a8 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenProjectCategoryOrgDailyDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenProjectCategoryOrgDailyDTO.java @@ -78,6 +78,11 @@ public class ScreenProjectCategoryOrgDailyDTO implements Serializable { */ private Integer projectTotal; + /** + * 分类等级1、2.... + */ + private Integer level; + /** * 删除标识 */ diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryGridDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryGridDailyDTO.java index 582fc6d842..0406fb26f2 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryGridDailyDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryGridDailyDTO.java @@ -73,6 +73,11 @@ public class ScreenProjectCategoryGridDailyDTO implements Serializable { */ private Integer projectTotal; + /** + * 分类等级1、2.... + */ + private Integer level; + /** * 删除标识 */ diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryOrgDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryOrgDailyDTO.java index ed598e903f..117db2716c 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryOrgDailyDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectCategoryOrgDailyDTO.java @@ -78,6 +78,11 @@ public class ScreenProjectCategoryOrgDailyDTO implements Serializable { */ private Integer projectTotal; + /** + * 分类等级1、2.... + */ + private Integer level; + /** * 删除标识 */ diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryGridDailyEntity.java index 5d40a12628..82b03555ac 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryGridDailyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryGridDailyEntity.java @@ -70,4 +70,8 @@ public class ScreenProjectCategoryGridDailyEntity extends BaseEpmetEntity { */ private Integer projectTotal; + /** + * 分类等级1、2.... + */ + private Integer level; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryOrgDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryOrgDailyEntity.java index 7c61d7069d..5c097997a6 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryOrgDailyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectCategoryOrgDailyEntity.java @@ -75,4 +75,8 @@ public class ScreenProjectCategoryOrgDailyEntity extends BaseEpmetEntity { */ private Integer projectTotal; + /** + * 分类等级1、2.... + */ + private Integer level; } From c548c5b4defc63a15094b870e6d0ab24e5388b72 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Mon, 22 Mar 2021 15:45:26 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E3=80=8A002=E3=80=81=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E5=AD=97=E5=85=B8=E6=9F=A5=E8=AF=A2=E3=80=8B?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/dto/CustomerCategoryDTO.java | 43 +++++++++++++++ .../result/ProjectCategoryDictResultDTO.java | 41 ++++++++++++++ .../data-report/data-report-server/pom.xml | 6 +++ .../controller/project/ProjectController.java | 14 +++++ .../service/project/ProjectService.java | 10 ++++ .../project/impl/ProjectServiceImpl.java | 54 +++++++++++++++++-- .../gov-issue/gov-issue-client/pom.xml | 8 ++- .../epmet/feign/GovIssueOpenFeignClient.java | 16 ++++-- .../GovIssueOpenFeignClientFallBack.java | 10 ++-- .../gov-issue/gov-issue-server/pom.xml | 8 ++- .../IssueProjectCategoryDictController.java | 19 ++++++- .../dao/IssueProjectCategoryDictDao.java | 16 +++++- .../IssueProjectCategoryDictService.java | 16 +++++- .../IssueProjectCategoryDictServiceImpl.java | 7 ++- .../mapper/IssueProjectCategoryDictDao.xml | 19 ++++++- .../epmet/feign/OperCrmOpenFeignClient.java | 11 ++++ .../OperCrmOpenFeignClientFallback.java | 5 ++ .../epmet/controller/CustomerController.java | 17 ++++++ .../main/java/com/epmet/dao/CustomerDao.java | 11 +++- .../com/epmet/service/CustomerService.java | 10 ++++ .../service/impl/CustomerServiceImpl.java | 4 ++ .../src/main/resources/mapper/CustomerDao.xml | 10 ++++ 22 files changed, 336 insertions(+), 19 deletions(-) create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/CustomerCategoryDTO.java create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategoryDictResultDTO.java diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/CustomerCategoryDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/CustomerCategoryDTO.java new file mode 100644 index 0000000000..d351ae7346 --- /dev/null +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/CustomerCategoryDTO.java @@ -0,0 +1,43 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.project.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +@Data +public class CustomerCategoryDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 父id + * pid = 0 查询一级分类 + * pid != 0 查询二级分类 + */ + private String pid; + + /** + * 客户Id + */ + private String customerId; + +} diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategoryDictResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategoryDictResultDTO.java new file mode 100644 index 0000000000..ca534db2a9 --- /dev/null +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategoryDictResultDTO.java @@ -0,0 +1,41 @@ +package com.epmet.project.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author zhangyong + * @Description 002、项目分类字典查询 + **/ +@Data +public class ProjectCategoryDictResultDTO implements Serializable { + + private static final long serialVersionUID = 8529179932504931368L; + + /** + * 一级分类编码 + */ + private String categoryCode; + + /** + * 一级分类名称 + */ + private String categoryName; + + /** + * 二级分类列表 + */ + private List children; + + /** + * 主键 + **/ + private String id; + + /** + * 上级分类ID 顶级此列存储0 + **/ + private String pid; +} diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 8cb39e2c6b..4480ac88e7 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -94,6 +94,12 @@ 2.0.0 compile + + com.epmet + gov-issue-client + 2.0.0 + compile + diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java index ed31aef27a..2bb49d5c25 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java @@ -129,4 +129,18 @@ public class ProjectController { public Result> myNextAgency(@LoginUser TokenDto tokenDto){ return new Result>().ok(projectService.getMyNextAgency(tokenDto)); } + + /** + * 002、项目分类字典查询 + * 查询当前客户的父客户下，项目分类字典 + * + * @param tokenDto + * @return com.epmet.commons.tools.utils.Result> + * @Author zhangyong + * @Date 10:41 2021-03-22 + **/ + @PostMapping("categorydict") + public Result> categoryDict(@LoginUser TokenDto tokenDto) { + return new Result>().ok(projectService.getCategoryDict(tokenDto)); + } } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/ProjectService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/ProjectService.java index 18246addc6..bb2ffedd9c 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/ProjectService.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/ProjectService.java @@ -70,4 +70,14 @@ public interface ProjectService { * @date 2020.10.19 16:38 **/ List getMyNextAgency(TokenDto tokenDto); + + /** + * 002、项目分类字典查询 + * + * @param tokenDto + * @return java.util.List + * @Author zhangyong + * @Date 14:26 2021-03-22 + **/ + List getCategoryDict(TokenDto tokenDto); } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java index f095fb0666..4da82573c9 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java @@ -3,6 +3,7 @@ package com.epmet.datareport.service.project.impl; import com.alibaba.fastjson.JSON; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; @@ -18,20 +19,21 @@ import com.epmet.dto.form.ProcessListFormDTO; import com.epmet.dto.form.SubAgencyFormDTO; import com.epmet.dto.result.*; import com.epmet.evaluationindex.screen.dto.result.DepartmentNameListResultDTO; -import com.epmet.feign.EpmetUserOpenFeignClient; -import com.epmet.feign.GovOrgOpenFeignClient; -import com.epmet.feign.GovProjectOpenFeignClient; +import com.epmet.feign.*; import com.epmet.project.constant.ProjectConstant; +import com.epmet.project.dto.CustomerCategoryDTO; import com.epmet.project.dto.FactAgencyProjectDailyDTO; import com.epmet.project.dto.form.DifficultyRankFormDTO; import com.epmet.project.dto.form.ProjectIncrTrendFormDTO; -import com.epmet.project.dto.result.ProjectDetailResultDTO; import com.epmet.project.dto.result.*; +import com.epmet.project.dto.result.ProjectDetailResultDTO; import com.epmet.resi.group.dto.topic.ResiTopicDTO; import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; import com.github.pagehelper.PageHelper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -50,7 +52,7 @@ import java.util.List; @Slf4j @Service public class ProjectServiceImpl implements ProjectService { - + private Logger logger = LogManager.getLogger(getClass()); @Autowired private ProjectDao projectDao; @Autowired @@ -64,6 +66,11 @@ public class ProjectServiceImpl implements ProjectService { private GovOrgOpenFeignClient govOrgOpenFeignClient; @Autowired private ResiGroupOpenFeignClient resiGroupOpenFeignClient; + @Autowired + private GovIssueOpenFeignClient govIssueOpenFeignClient; + @Autowired + private OperCrmOpenFeignClient operCrmOpenFeignClient; + /** * @Author sun * @Description 数据-项目-获取汇总数据 @@ -350,4 +357,41 @@ public class ProjectServiceImpl implements ProjectService { return result; } + @Override + public List getCategoryDict(TokenDto tokenDto) { + List result = new ArrayList<>(); + Result parentCustomerId = operCrmOpenFeignClient.getExternalAndParentCustomerId(tokenDto.getCustomerId()); + if (!parentCustomerId.success() && null == parentCustomerId.getData()) { + logger.warn(String.format("调用%s服务查询外部客户的 父级客户ID 失败,入参%s", ServiceConstant.OPER_CRM_SERVER, + JSON.toJSONString(tokenDto.getCustomerId()))); + return result; + } + CustomerCategoryDTO argDto = new CustomerCategoryDTO(); + argDto.setCustomerId(parentCustomerId.getData()); + argDto.setPid(NumConstant.ZERO_STR); + // 获取客户一级分类 + Result> parentCategoryDict = govIssueOpenFeignClient.getCustomerCategoryDict(argDto); + if (!parentCategoryDict.success()) { + logger.warn(String.format("调用%s服务查询当前客户的父客户下，项目分类字典失败,入参%s", ServiceConstant.GOV_ISSUE_SERVER, + JSON.toJSONString(tokenDto.getCustomerId()))); + } else { + result = parentCategoryDict.getData(); + // 获取客户二级分类 + argDto.setPid(NumConstant.TWO_STR); + Result> childrenCategoryDict = govIssueOpenFeignClient.getCustomerCategoryDict(argDto); + for (ProjectCategoryDictResultDTO p : result) { + List children = new ArrayList<>(); + for (ProjectCategoryDictResultDTO c : childrenCategoryDict.getData()) { + if (p.getId().equals(c.getPid())) { + ProjectCategoryDictResultDTO dto = new ProjectCategoryDictResultDTO(); + dto.setCategoryCode(c.getCategoryCode()); + dto.setCategoryName(c.getCategoryName()); + children.add(dto); + } + } + p.setChildren(children); + } + } + return result; + } } diff --git a/epmet-module/gov-issue/gov-issue-client/pom.xml b/epmet-module/gov-issue/gov-issue-client/pom.xml index f77ec89656..9d07717da1 100644 --- a/epmet-module/gov-issue/gov-issue-client/pom.xml +++ b/epmet-module/gov-issue/gov-issue-client/pom.xml @@ -29,5 +29,11 @@ 2.0.0 compile + + com.epmet + data-report-client + 2.0.0 + compile + - \ No newline at end of file + diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java index 38bc581f8c..277239669d 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java @@ -2,13 +2,12 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.IssueApplicationDTO; -import com.epmet.dto.IssueDTO; -import com.epmet.dto.IssueSuggestionDTO; import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.feign.fallback.GovIssueOpenFeignClientFallBack; +import com.epmet.project.dto.CustomerCategoryDTO; +import com.epmet.project.dto.result.ProjectCategoryDictResultDTO; import com.epmet.resi.group.dto.group.form.AllIssueFormDTO; import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO; import com.epmet.resi.group.dto.group.form.ApplicationHistoryFormDTO; @@ -272,4 +271,15 @@ public interface GovIssueOpenFeignClient { @PostMapping("/gov/issue/issue/detail") Result queryIssueDetail(@RequestBody IssueDetailFormDTO formDTO); + + /** + * 获取客户 分类字典 信息 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result> + * @Author zhangyong + * @Date 14:10 2021-03-22 + **/ + @PostMapping(value = "/gov/issue/issueprojectcategorydict/getcustomercategorydict") + Result> getCustomerCategoryDict(@RequestBody CustomerCategoryDTO dto); } diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java index 0046975f18..a304db1fa7 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java @@ -3,13 +3,12 @@ package com.epmet.feign.fallback; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.IssueApplicationDTO; -import com.epmet.dto.IssueDTO; -import com.epmet.dto.IssueSuggestionDTO; import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.feign.GovIssueOpenFeignClient; +import com.epmet.project.dto.CustomerCategoryDTO; +import com.epmet.project.dto.result.ProjectCategoryDictResultDTO; import com.epmet.resi.group.dto.group.form.AllIssueFormDTO; import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO; import com.epmet.resi.group.dto.group.form.ApplicationHistoryFormDTO; @@ -237,4 +236,9 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient public Result queryIssueDetail(IssueDetailFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "detail", formDTO); } + + @Override + public Result> getCustomerCategoryDict(CustomerCategoryDTO customerCategoryDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getCustomerCategoryDict", customerCategoryDTO); + } } diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index 68e7b17d5b..673a33aeb9 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -96,6 +96,12 @@ 2.0.0 compile + + com.epmet + data-report-client + 2.0.0 + compile + @@ -270,4 +276,4 @@ - \ No newline at end of file + diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java index b0d5a7fd1f..cbd7c63190 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java @@ -34,6 +34,8 @@ import com.epmet.dto.form.ProjectSaveCategoryFormDTO; import com.epmet.dto.result.CustomerCategoryListResultDTO; import com.epmet.dto.result.ProjectIssueCategoryResultDTO; import com.epmet.excel.IssueProjectCategoryDictExcel; +import com.epmet.project.dto.CustomerCategoryDTO; +import com.epmet.project.dto.result.ProjectCategoryDictResultDTO; import com.epmet.service.IssueProjectCategoryDictService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -166,4 +168,19 @@ public class IssueProjectCategoryDictController { return new Result().ok(issueProjectCategoryDictService.delCategory(formDTO)); } -} \ No newline at end of file + /** + * 获取客户 分类字典 信息 + * + * @param dto + * pid = 0 查询一级分类 + * pid != 0 查询二级分类 + * @return com.epmet.commons.tools.utils.Result> + * @Author zhangyong + * @Date 14:10 2021-03-22 + **/ + @PostMapping("getcustomercategorydict") + public Result> getCustomerCategoryDict(@RequestBody CustomerCategoryDTO dto){ + return new Result>().ok(issueProjectCategoryDictService.listCategoryDict(dto.getCustomerId(), + dto.getPid())); + } +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java index 770c10cb99..1524bc1fc0 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java @@ -22,6 +22,7 @@ import com.epmet.dto.IssueProjectCategoryDictDTO; import com.epmet.dto.form.IssueProjectCategoryDictListFormDTO; import com.epmet.dto.result.CustomerCategoryListResultDTO; import com.epmet.entity.IssueProjectCategoryDictEntity; +import com.epmet.project.dto.result.ProjectCategoryDictResultDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -73,4 +74,17 @@ public interface IssueProjectCategoryDictDao extends BaseDao + * @Author zhangyong + * @Date 14:10 2021-03-22 + **/ + List selectListCategoryDict(@Param("customerId") String customerId, @Param("pid") String pid); +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectCategoryDictService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectCategoryDictService.java index 9de4150e08..24e824ffff 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectCategoryDictService.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectCategoryDictService.java @@ -26,6 +26,7 @@ import com.epmet.dto.form.ProjectSaveCategoryFormDTO; import com.epmet.dto.result.CustomerCategoryListResultDTO; import com.epmet.dto.result.ProjectIssueCategoryResultDTO; import com.epmet.entity.IssueProjectCategoryDictEntity; +import com.epmet.project.dto.result.ProjectCategoryDictResultDTO; import java.util.List; import java.util.Map; @@ -142,4 +143,17 @@ public interface IssueProjectCategoryDictService extends BaseService + * @Author zhangyong + * @Date 14:10 2021-03-22 + **/ + List listCategoryDict(String customerId, String pid); +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java index c77651b103..c154a5f7e2 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java @@ -38,6 +38,7 @@ import com.epmet.dto.result.ProjectIssueCategoryResultDTO; import com.epmet.dto.result.ProjectIssueDTOResultDTO; import com.epmet.entity.IssueProjectCategoryDictEntity; import com.epmet.entity.IssueProjectTagDictEntity; +import com.epmet.project.dto.result.ProjectCategoryDictResultDTO; import com.epmet.redis.IssueProjectCategoryDictRedis; import com.epmet.service.IssueProjectCategoryDictService; import com.epmet.service.IssueProjectTagDictService; @@ -221,4 +222,8 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl listCategoryDict(String customerId, String pid) { + return baseDao.selectListCategoryDict(customerId, pid); + } +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml index 096d54422a..5054069566 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml @@ -96,4 +96,21 @@ LIMIT 1 - \ No newline at end of file + + + diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java index 0f4313dfad..04508ac6df 100644 --- a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java +++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java @@ -122,4 +122,15 @@ public interface OperCrmOpenFeignClient { **/ @GetMapping("/oper/crm/customer/getallsubcustomerids/{customerId}") Result> getAllSubCustomerIds(@PathVariable("customerId") String customerId); + + /** + * 获取外部客户，的父级 客户id + * + * @param customerId + * @return com.epmet.commons.tools.utils.Result + * @Author zhangyong + * @Date 14:57 2021-03-22 + **/ + @GetMapping("/oper/crm/customer/getexternalandparentcustomerid/{customerId}") + Result getExternalAndParentCustomerId(@PathVariable("customerId") String customerId); } diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/fallback/OperCrmOpenFeignClientFallback.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/fallback/OperCrmOpenFeignClientFallback.java index 5de09ce167..b718517d4b 100644 --- a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/fallback/OperCrmOpenFeignClientFallback.java +++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/fallback/OperCrmOpenFeignClientFallback.java @@ -95,4 +95,9 @@ public class OperCrmOpenFeignClientFallback implements OperCrmOpenFeignClient { public Result> getAllSubCustomerIds(String customerId) { return ModuleUtils.feignConError(ServiceConstant.OPER_CRM_SERVER, "getAllSubCustomerIds", customerId); } + + @Override + public Result getExternalAndParentCustomerId(String customerId) { + return ModuleUtils.feignConError(ServiceConstant.OPER_CRM_SERVER, "getExternalAndParentCustomerId", customerId); + } } diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java index c5330a9abd..30fe309079 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java @@ -376,4 +376,21 @@ public class CustomerController { } return new Result<>(); } + + /** + * 获取外部客户，的父级 客户id + * + * @param customerId + * @return com.epmet.commons.tools.utils.Result + * @Author zhangyong + * @Date 14:57 2021-03-22 + **/ + @GetMapping("getexternalandparentcustomerid/{customerId}") + public Result getExternalAndParentCustomerId(@PathVariable("customerId") String customerId){ + if(StringUtils.isNotBlank(customerId)){ + String resultDTO = customerService.getExternalAndParentCustomerId(customerId); + return new Result().ok(resultDTO); + } + return new Result<>(); + } } diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/dao/CustomerDao.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/dao/CustomerDao.java index b7aed8f55a..02ae9d9890 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/dao/CustomerDao.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/dao/CustomerDao.java @@ -48,7 +48,7 @@ public interface CustomerDao extends BaseDao { * @param customerIdList * @Author yinzuomei * @Description 根据客户id查询客户信息 - * @Date 2020/4/24 9:21 + * @Date 2020/4/24 9:21 **/ List selectListByIds(@Param("customerIdList") List customerIdList); @@ -98,4 +98,13 @@ public interface CustomerDao extends BaseDao { */ List selectAllCustomerList(@Param("customerName") String customerName); + /** + * 获取外部客户，的父级 客户id + * + * @param customerId + * @return java.lang.String + * @Author zhangyong + * @Date 14:57 2021-03-22 + **/ + String getExternalAndParentCustomerId(@Param("customerId") String customerId); } diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerService.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerService.java index 82e872e511..f1efa2d087 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerService.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerService.java @@ -226,4 +226,14 @@ public interface CustomerService extends BaseService { * @Date 2021/2/3 12:52 **/ CustomerRelationInfoResultDTO queryCustomerInfoByCustomerId(String customerId); + + /** + * 获取外部客户，的父级 客户id + * + * @param customerId + * @return java.lang.String + * @Author zhangyong + * @Date 14:57 2021-03-22 + **/ + String getExternalAndParentCustomerId(String customerId); } diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java index 1fadbd8443..c2677c0504 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java @@ -785,4 +785,8 @@ public class CustomerServiceImpl extends BaseServiceImpl + + From 57888660664522e35eda80903a548170044d3f6d Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Mon, 22 Mar 2021 16:40:37 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E4=B8=8A=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/screen/CategoryDictDataFormDTO.java | 27 +++++++ .../dto/screen/form/CategoryDictFormDTO.java | 72 +++++++++++++++++++ .../ScreenProjectDataCollController.java | 25 +++++-- .../stats/CustomerProjectCategoryDictDao.java | 26 ++++++- .../CustomerProjectCategoryDictService.java | 15 +++- ...ustomerProjectCategoryDictServiceImpl.java | 19 ++++- .../stats/CustomerProjectCategoryDictDao.xml | 56 ++++++++++++++- 7 files changed, 231 insertions(+), 9 deletions(-) create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/CategoryDictDataFormDTO.java create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/CategoryDictFormDTO.java diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/CategoryDictDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/CategoryDictDataFormDTO.java new file mode 100644 index 0000000000..bd88161f54 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/CategoryDictDataFormDTO.java @@ -0,0 +1,27 @@ +package com.epmet.dto.screen; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import com.epmet.dto.screen.form.CategoryDictFormDTO; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + * 项目分类字典上报 + * @Auther: zhangyong + * @Date: 2021-03-22 + */ +@Data +public class CategoryDictDataFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 当isFirst=true时，直接根据 customerId 删除原有数据，再批量insert。 + */ + private Boolean isFirst; + + private List dataList; +} diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/CategoryDictFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/CategoryDictFormDTO.java new file mode 100644 index 0000000000..f60c33faa4 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/CategoryDictFormDTO.java @@ -0,0 +1,72 @@ +package com.epmet.dto.screen.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * 项目分类字典上报 + * @Auther: zhangyong + * @Date: 2021-03-22 + */ +@Data +public class CategoryDictFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + +// public interface ExtractDailyForm extends CustomerClientShowGroup {} + + /** + * 客户内自己的分类编码 + */ +// @NotBlank(message = "客户分类编码不能为空", groups = { ExtractDailyForm.class }) + private String categoryCode; + + /** + * 客户内自己的分类名称 + */ +// @NotBlank(message = "客户分类名称不能为空", groups = { ExtractDailyForm.class }) + private String categoryName; + + /** + * 父类分类编码，如果是一级分类，此列赋值为0 + */ +// @NotBlank(message = "父类分类编码不能为空", groups = { ExtractDailyForm.class }) + private String parentCategoryCode; + + /** + * 分类等级：1、2....； + */ +// @NotBlank(message = "分类等级不能为空", groups = { ExtractDailyForm.class }) + private Integer level; + + /** + * 排序 + */ +// @NotBlank(message = "排序不能为空", groups = { ExtractDailyForm.class }) + private Integer sort; + + /** + * 当前分类对应产品内的分类编码，如果对应不上，此列传空 + */ + private String epmetCategoryCode; + + /** + * 原始创建时间yyyy-MM-dd HH:mm:ss + */ + private String originCreatedTime; + + /** + * 原始更新时间yyyy-MM-dd HH:mm:ss + */ + private String orginUpdatedTime; + + /** + * 分类字典表主键 + */ +// @NotBlank(message = "分类字典表主键不能为空", groups = { ExtractDailyForm.class }) + private String categoryId; +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenProjectDataCollController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenProjectDataCollController.java index 0af70355e9..d51ca41f31 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenProjectDataCollController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenProjectDataCollController.java @@ -3,16 +3,15 @@ package com.epmet.controller; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.screen.*; +import com.epmet.dto.screen.form.CategoryDictFormDTO; import com.epmet.dto.screen.form.ScreenProjectDataInfoFormDTO; import com.epmet.dto.screen.form.ScreenProjectProcessFormDTO; import com.epmet.dto.screencoll.ScreenCollFormDTO; import com.epmet.service.evaluationindex.screen.*; +import com.epmet.service.stats.CustomerProjectCategoryDictService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** * @Description 事件/项目采集接口入口 @@ -41,7 +40,8 @@ public class ScreenProjectDataCollController { private ScreenProjectDataService projectDataService; @Autowired private ScreenProjectProcessService projectProcessService; - + @Autowired + private CustomerProjectCategoryDictService customerProjectCategoryDictService; /** * @author wangc * @description 【事件/项目分析】网格内月度数量统计 @@ -152,4 +152,19 @@ public class ScreenProjectDataCollController { return new Result(); } + /** + * 项目分类字典上报 + * 目标表：epmet_evaluation_index库的customer_project_category_dict + * + * @param customerId + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @Author zhangyong + * @Date 16:03 2021-03-22 + **/ + @PostMapping("uploadcategorydict") + public Result uploadcategorydict(@RequestHeader("CustomerId") String customerId, @RequestBody CategoryDictDataFormDTO formDTO) { + customerProjectCategoryDictService.uploadCategoryDict(customerId, formDTO); + return new Result(); + } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/CustomerProjectCategoryDictDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/CustomerProjectCategoryDictDao.java index fd0cdd6eb2..3489fc5917 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/CustomerProjectCategoryDictDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/CustomerProjectCategoryDictDao.java @@ -18,10 +18,13 @@ package com.epmet.dao.stats; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.screen.form.CategoryDictFormDTO; import com.epmet.entity.stats.CustomerProjectCategoryDictEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 客户项目分类字典表 * @@ -36,4 +39,25 @@ public interface CustomerProjectCategoryDictDao extends BaseDao list, @Param("customerId")String customerId); +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/CustomerProjectCategoryDictService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/CustomerProjectCategoryDictService.java index 36861d7b35..1b37c9448a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/CustomerProjectCategoryDictService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/CustomerProjectCategoryDictService.java @@ -18,6 +18,7 @@ package com.epmet.service.stats; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.dto.screen.CategoryDictDataFormDTO; import com.epmet.entity.issue.IssueProjectCategoryDictEntity; import com.epmet.entity.stats.CustomerProjectCategoryDictEntity; @@ -42,4 +43,16 @@ public interface CustomerProjectCategoryDictService extends BaseService NumConstant.ZERO); + } + if (!CollectionUtils.isEmpty(formDTO.getDataList())) { + baseDao.batchInsertCustomerProjectCategoryDict(formDTO.getDataList(), customerId); + } + } +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/CustomerProjectCategoryDictDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/CustomerProjectCategoryDictDao.xml index 63b47e4456..2802dc7625 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/CustomerProjectCategoryDictDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/CustomerProjectCategoryDictDao.xml @@ -38,4 +38,58 @@ and m.customer_id=#{customerId} and m.CATEGORY_ID=#{categoryId} - \ No newline at end of file + + + delete from customer_project_category_dict + where CUSTOMER_ID = #{customerId} + limit 1000; + + + + insert into customer_project_category_dict + ( + ID, + CUSTOMER_ID, + CUSTOMER_TYPE, + CATEGORY_CODE, + CATEGORY_NAME, + PARENT_CATEGORY_CODE, + `LEVEL`, + SORT, + IS_DISABLE, + EPMET_CATEGORY_CODE, + ORIGIN_CREATED_TIME, + ORIGIN_UPDATED_TIME, + CATEGORY_ID, + DEL_FLAG, + REVISION, + CREATED_BY, + CREATED_TIME, + UPDATED_BY, + UPDATED_TIME + ) values + + ( + (SELECT REPLACE(UUID(), '-', '') AS id), + #{customerId}, + 'external', + #{item.categoryCode}, + #{item.categoryName}, + #{item.parentCategoryCode}, + #{item.level}, + #{item.sort}, + 'enable', + #{item.epmetCategoryCode}, + #{item.originCreatedTime}, + #{item.orginUpdatedTime}, + #{item.categoryId}, + 0, + 0, + 'APP_USER', + now(), + 'APP_USER', + now() + ) + + + From 8bbbbc2610e567508520612c9036b1d9cec19283 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Mar 2021 17:06:30 +0800 Subject: [PATCH 13/16] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...V0.0.10__add_project_category_analysis.sql | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.10__add_project_category_analysis.sql diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.10__add_project_category_analysis.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.10__add_project_category_analysis.sql new file mode 100644 index 0000000000..391bb2af03 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.10__add_project_category_analysis.sql @@ -0,0 +1,47 @@ +-- epmet_data_statistical 库： +drop table if exists fact_origin_project_category_daily; +CREATE TABLE `fact_origin_project_category_daily` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', + `PROJECT_ID` varchar(64) NOT NULL COMMENT '项目id', + `CATEGORY_CODE` varchar(50) NOT NULL COMMENT '分类编码', + `PARENT_CATEGORY_CODE` varchar(50) NOT NULL COMMENT '所属父类分类编码', + `LEVEL` int(11) NOT NULL COMMENT '分类等级：1、2....；产品目前只有2级分类', + `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='项目所属分类表'; + +-- epmet_data_statistical_display 、epmet_evaluation_index： +drop table if exists customer_project_category_dict; +CREATE TABLE `customer_project_category_dict` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', + `CUSTOMER_TYPE` varchar(20) NOT NULL COMMENT '外部客户：external;内部客户：internal', + `CATEGORY_CODE` varchar(64) NOT NULL COMMENT '客户自己的分类编码', + `CATEGORY_NAME` varchar(500) CHARACTER SET utf8 NOT NULL COMMENT '客户自己的分类名称', + `PARENT_CATEGORY_CODE` varchar(64) NOT NULL COMMENT '父类分类编码，如果是一级分类，此列赋值为0', + `LEVEL` int(11) NOT NULL COMMENT '分类等级：1、2....；产品只有2级分类', + `SORT` int(11) unsigned NOT NULL COMMENT '排序', + `IS_DISABLE` varchar(32) CHARACTER SET utf8 NOT NULL COMMENT '是否禁用(enable:启用 disable:禁用)', + `EPMET_CATEGORY_CODE` varchar(64) DEFAULT NULL COMMENT '对应e世通中的分类编码，没有此列为空', + `ORIGIN_CREATED_TIME` datetime DEFAULT NULL COMMENT '原始创建时间', + `ORIGIN_UPDATED_TIME` datetime DEFAULT NULL COMMENT '原始更新时间', + `CATEGORY_ID` varchar(64) NOT NULL COMMENT '分类字典表主键', + `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE, + UNIQUE KEY `UN_KEY` (`CUSTOMER_ID`,`CATEGORY_CODE`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='客户项目分类字典表'; +-- epmet_data_statistical_display 、epmet_evaluation_index： + +alter table screen_project_category_org_daily add column `LEVEL` int(11) NOT NULL COMMENT '分类等级1、2....'; +alter table screen_project_category_grid_daily add column `LEVEL` int(11) NOT NULL COMMENT '分类等级1、2....'; From ef551f3eebd92a83ecd2414cbea8e10ef1627744 Mon Sep 17 00:00:00 2001 From: liushaowen <565850092@qq.com> Date: Mon, 22 Mar 2021 17:41:29 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8A=BD=E5=8F=96=E5=88=B0=E6=8C=87=E6=A0=87?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FactOriginProjectCategoryDailyDao.java | 6 +- .../issue/IssueProjectCategoryDictDao.java | 4 +- .../com/epmet/dao/project/ProjectDao.java | 4 +- .../IssueProjectCategoryDictService.java | 4 +- .../IssueProjectCategoryDictServiceImpl.java | 6 ++ ...FactOriginProjectCategoryDailyService.java | 12 ++- .../impl/FactOriginExtractServiceImpl.java | 19 ++++- ...OriginProjectCategoryDailyServiceImpl.java | 82 ++++++++++++++++++- .../epmet/service/project/ProjectService.java | 13 ++- .../project/impl/ProjectServiceImpl.java | 14 +++- .../FactOriginProjectCategoryDailyDao.xml | 13 ++- .../issue/IssueProjectCategoryDictDao.xml | 9 +- .../resources/mapper/project/ProjectDao.xml | 14 +++- 13 files changed, 180 insertions(+), 20 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectCategoryDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectCategoryDailyDao.java index ff9f8c1885..537468724a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectCategoryDailyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectCategoryDailyDao.java @@ -20,6 +20,7 @@ package com.epmet.dao.evaluationindex.extract; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.entity.evaluationindex.extract.FactOriginProjectCategoryDailyEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 项目所属分类表 @@ -29,5 +30,6 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface FactOriginProjectCategoryDailyDao extends BaseDao { - -} \ No newline at end of file + + void deleteOldData(@Param("customerId") String customerId,@Param("dateId") String dateId); +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/issue/IssueProjectCategoryDictDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/issue/IssueProjectCategoryDictDao.java index 9cc59cf996..371cda3cf2 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/issue/IssueProjectCategoryDictDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/issue/IssueProjectCategoryDictDao.java @@ -36,4 +36,6 @@ public interface IssueProjectCategoryDictDao { List listInsertCategoies(@Param("start") Date start, @Param("end") Date end); List listByUpdatedTime(@Param("start") Date start, @Param("end") Date end); -} \ No newline at end of file + + IssueProjectCategoryDictEntity getById(@Param("customerId")String customerId, @Param("id")String id);; +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java index 9d64b829da..2d3318c262 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java @@ -133,4 +133,6 @@ public interface ProjectDao extends BaseDao { * @date 2021.03.08 23:44 */ List selectProjectCategory(@Param("list")List list); -} \ No newline at end of file + + List getProjectCategoryData(@Param("customerId") String customerId, @Param("dateId") String dateId); +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/IssueProjectCategoryDictService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/IssueProjectCategoryDictService.java index 3067657abb..4d2a96f7be 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/IssueProjectCategoryDictService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/IssueProjectCategoryDictService.java @@ -34,4 +34,6 @@ public interface IssueProjectCategoryDictService{ List listInsertCategoies(Date start, Date end); List listByUpdatedTime(Date start, Date end); -} \ No newline at end of file + + IssueProjectCategoryDictEntity getById(String customerId,String id); +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueProjectCategoryDictServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueProjectCategoryDictServiceImpl.java index 98c18ec1fc..982030799f 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueProjectCategoryDictServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueProjectCategoryDictServiceImpl.java @@ -5,6 +5,7 @@ import com.epmet.constant.DataSourceConstant; import com.epmet.dao.issue.IssueProjectCategoryDictDao; import com.epmet.entity.issue.IssueProjectCategoryDictEntity; import com.epmet.service.Issue.IssueProjectCategoryDictService; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -33,4 +34,9 @@ public class IssueProjectCategoryDictServiceImpl implements IssueProjectCategory return issueProjectCategoryDictDao.listByUpdatedTime(start, end); } + @Override + public IssueProjectCategoryDictEntity getById(String customerId, String id) { + return issueProjectCategoryDictDao.getById(customerId,id); + } + } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectCategoryDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectCategoryDailyService.java index 2eb2de215e..70b5a73adb 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectCategoryDailyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectCategoryDailyService.java @@ -18,6 +18,7 @@ package com.epmet.service.evaluationindex.extract.todata; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.dto.extract.form.ExtractOriginFormDTO; import com.epmet.entity.evaluationindex.extract.FactOriginProjectCategoryDailyEntity; /** @@ -27,5 +28,12 @@ import com.epmet.entity.evaluationindex.extract.FactOriginProjectCategoryDailyEn * @since v1.0.0 2021-03-19 */ public interface FactOriginProjectCategoryDailyService extends BaseService { - //todo 将epmet_gov_project库中的项目分类信息（project_category）同步到统计库epmet_data_statistical -} \ No newline at end of file + /** + * @Description 将epmet_gov_project库中的项目分类信息（project_category）同步到统计库epmet_data_statistical + * @param paramNew + * @return void + * @Author liushaowen + * @Date 2021/3/22 15:28 + */ + void extractProjectCategory(ExtractOriginFormDTO paramNew); +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java index 67ba0f0c4f..d35cee00ee 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java @@ -201,8 +201,11 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService { } catch (Exception e) { log.error("抽取【项目数据】发生异常,参数:" + JSON.toJSONString(paramNew), e); } - //todo 新增项目分类抽取 shaowen - // originProjectCategoryDailyService.xxxx(); + try { + originProjectCategoryDailyService.extractProjectCategory(paramNew); + } catch (Exception e) { + log.error("抽取【项目分类数据】发生异常,参数:" + JSON.toJSONString(paramNew), e); + } } else { try { for (int i = 0; i < finalDaysBetween.size(); i++) { @@ -222,8 +225,16 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService { } catch (Exception e) { log.error("抽取【项目数据】发生异常,参数:" + JSON.toJSONString(paramNew), e); } - //todo 新增项目分类抽取 shaowen - // originProjectCategoryDailyService.xxxx(); + try { + for (int i = 0; i < finalDaysBetween.size(); i++) { + String dateDimId = finalDaysBetween.get(i); + paramNew.setDateId(dateDimId); + originProjectCategoryDailyService.extractProjectCategory(paramNew); + } + } catch (Exception e) { + log.error("抽取【项目分类数据】发生异常,参数:" + JSON.toJSONString(paramNew), e); + } + } }); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java index f9bd902765..abce84673b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java @@ -17,13 +17,30 @@ package com.epmet.service.evaluationindex.extract.todata.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.constant.DataSourceConstant; import com.epmet.dao.evaluationindex.extract.FactOriginProjectCategoryDailyDao; +import com.epmet.dto.ProjectCategoryDTO; +import com.epmet.dto.extract.form.ExtractOriginFormDTO; +import com.epmet.dto.extract.form.IssueMainDailyFormDTO; import com.epmet.entity.evaluationindex.extract.FactOriginProjectCategoryDailyEntity; +import com.epmet.entity.issue.IssueProjectCategoryDictEntity; +import com.epmet.service.Issue.IssueProjectCategoryDictService; +import com.epmet.service.Issue.IssueService; import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectCategoryDailyService; +import com.epmet.service.project.ProjectService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; + +import java.util.ArrayList; +import java.util.List; /** * 项目所属分类表 @@ -33,6 +50,67 @@ import org.springframework.stereotype.Service; */ @Service @DataSource(DataSourceConstant.STATS) +@Slf4j public class FactOriginProjectCategoryDailyServiceImpl extends BaseServiceImpl implements FactOriginProjectCategoryDailyService { - -} \ No newline at end of file + @Autowired + private ProjectService projectService; + @Autowired + private IssueProjectCategoryDictService issueProjectCategoryDictService; + /** + * @param extractOriginFormDTO + * @return void + * @Description 将epmet_gov_project库中的项目分类信息（project_category）同步到统计库epmet_data_statistical + * @Author liushaowen + * @Date 2021/3/22 15:28 + */ + @Override + public void extractProjectCategory(ExtractOriginFormDTO extractOriginFormDTO) { + String dateString = extractOriginFormDTO.getDateId(); + String customerId = extractOriginFormDTO.getCustomerId(); + List entities = new ArrayList<>(); + Integer count = baseDao.selectCount(new QueryWrapper().eq("customer_id",customerId)); + //如果count = 0 初始化该customer所有数据 + if (NumConstant.ZERO == count){ + dateString = null; + } + List projectCategoryData = projectService.getProjectCategoryData(customerId, dateString); + if (!CollectionUtils.isEmpty(projectCategoryData)){ + projectCategoryData.forEach(data->{ + FactOriginProjectCategoryDailyEntity insertEntity = new FactOriginProjectCategoryDailyEntity(); + IssueProjectCategoryDictEntity categoryDictEntity = issueProjectCategoryDictService.getById(customerId, data.getCategoryId()); + if (categoryDictEntity == null){ + log.warn("categoryDict not found : customerId:{},categoryId:{}",customerId,data.getCategoryId()); + } + insertEntity.setProjectId(data.getProjectId()); + insertEntity.setCategoryCode(categoryDictEntity.getCategoryCode()); + insertEntity.setParentCategoryCode(categoryDictEntity.getParentCategoryCode()); + insertEntity.setCustomerId(customerId); + //如果pid为0，说明是1级分类 + if (NumConstant.ZERO_STR.equals(categoryDictEntity.getPid())){ + insertEntity.setLevel(1); + }else { + insertEntity.setLevel(2); + } + insertEntity.setCreatedTime(data.getCreatedTime()); + entities.add(insertEntity); + }); + if (!CollectionUtils.isEmpty(entities)){ + delAndInsert(customerId,dateString,entities); + } + } + } + /** + * @Description category表删除插入 + * @param customerId + * @param dateId + * @param result + * @return void + * @Author liushaowen + * @Date 2021/3/22 17:01 + */ + @Transactional(rollbackFor = Exception.class) + public void delAndInsert(String customerId,String dateId,List result){ + baseDao.deleteOldData(customerId, dateId); + insertBatch(result); + } +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java index 6f283b852a..56a99d5257 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java @@ -18,6 +18,7 @@ package com.epmet.service.project; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.dto.ProjectCategoryDTO; import com.epmet.dto.ProjectDTO; import com.epmet.dto.project.ProjectAgencyDTO; import com.epmet.dto.project.ProjectGridDTO; @@ -141,4 +142,14 @@ public interface ProjectService extends BaseService { */ Map> getProjectCategory(List projectIds); -} \ No newline at end of file + /** + * @Description 抽取project_category + * @param customerId + * @param dateId + * @return java.util.List + * @Author liushaowen + * @Date 2021/3/22 15:44 + */ + List getProjectCategoryData(String customerId, String dateId); + +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java index 294d0e4f31..d2a3ff001d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java @@ -150,6 +150,18 @@ public class ProjectServiceImpl extends BaseServiceImpl + * @Description 抽取project_category + * @Author liushaowen + * @Date 2021/3/22 15:44 + */ + @Override + public List getProjectCategoryData(String customerId, String dateId) { + return baseDao.getProjectCategoryData(customerId,dateId); + } -} \ No newline at end of file +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml index 56ab802c01..73b0945d0b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml @@ -3,6 +3,15 @@ + + DELETE + FROM + fact_origin_project_category_daily + WHERE + CUSTOMER_ID = #{customerId} + + AND DATE_FORMAT(CREATED_TIME,'%Y%m%d') = #{dateId} + + - - \ No newline at end of file + diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/IssueProjectCategoryDictDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/IssueProjectCategoryDictDao.xml index a1207ecd06..50185c99cb 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/IssueProjectCategoryDictDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/IssueProjectCategoryDictDao.xml @@ -41,4 +41,11 @@ ORDER BY UPDATED_TIME ASC - \ No newline at end of file + + diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml index 2a8699d341..ec1cf07215 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml @@ -105,7 +105,7 @@ and CUSTOMER_ID = #{customerId} and PARAMETER_KEY ='detention_days' - + - \ No newline at end of file + + + From 27dcd06da9b1cdebd8c0bd65154b7cf15f2fee4f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Mar 2021 17:48:03 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=20=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8A=BD=E5=8F=96=E5=88=B0=E6=8C=87=E6=A0=87?= =?UTF-8?q?=E5=BA=93level=E8=B5=8B=E5=80=BC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FactOriginProjectCategoryDailyServiceImpl.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java index abce84673b..3f9a27c34b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java @@ -25,15 +25,12 @@ import com.epmet.constant.DataSourceConstant; import com.epmet.dao.evaluationindex.extract.FactOriginProjectCategoryDailyDao; import com.epmet.dto.ProjectCategoryDTO; import com.epmet.dto.extract.form.ExtractOriginFormDTO; -import com.epmet.dto.extract.form.IssueMainDailyFormDTO; import com.epmet.entity.evaluationindex.extract.FactOriginProjectCategoryDailyEntity; import com.epmet.entity.issue.IssueProjectCategoryDictEntity; import com.epmet.service.Issue.IssueProjectCategoryDictService; -import com.epmet.service.Issue.IssueService; import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectCategoryDailyService; import com.epmet.service.project.ProjectService; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -85,12 +82,7 @@ public class FactOriginProjectCategoryDailyServiceImpl extends BaseServiceImpl Date: Mon, 22 Mar 2021 17:58:41 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=86=85=E6=8C=89?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=BB=9F=E8=AE=A1=E9=A1=B9=E7=9B=AE=E6=95=B0?= =?UTF-8?q?=E9=87=8F=20start?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../toscreen/impl/ScreenExtractServiceImpl.java | 17 +++++++++++------ .../ScreenProjectCategoryGridDailyService.java | 10 ++++++++++ ...reenProjectCategoryGridDailyServiceImpl.java | 13 +++++++++++++ 3 files changed, 34 insertions(+), 6 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java index 74e3021a00..e145f3e1bf 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java @@ -11,10 +11,7 @@ import com.epmet.dto.indexcal.CalculateCommonFormDTO; import com.epmet.dto.screen.form.ScreenCentralZoneDataFormDTO; import com.epmet.service.evaluationindex.extract.toscreen.*; import com.epmet.service.evaluationindex.indexcal.IndexCalculateService; -import com.epmet.service.evaluationindex.screen.ScreenProjectGridDailyService; -import com.epmet.service.evaluationindex.screen.ScreenProjectOrgDailyService; -import com.epmet.service.evaluationindex.screen.ScreenProjectQuantityGridMonthlyService; -import com.epmet.service.evaluationindex.screen.ScreenProjectQuantityOrgMonthlyService; +import com.epmet.service.evaluationindex.screen.*; import com.epmet.service.stats.DimCustomerService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -68,6 +65,8 @@ public class ScreenExtractServiceImpl implements ScreenExtractService { private ScreenProjectOrgDailyService screenProjectOrgDailyService; @Autowired private ScreenProjectSettleService screenProjectSettleService; + @Autowired + private ScreenProjectCategoryGridDailyService projectCategoryGridDailyService; /** * @param extractOriginFormDTO @@ -198,12 +197,18 @@ public class ScreenExtractServiceImpl implements ScreenExtractService { log.error("项目(事件)分析按组织_按天统计失败，customerId为："+customerId+"dateId为："+dateId, e); } //项目分类打标签未上线，暂时屏蔽 - /*try{ + try{ //大屏项目数据抽取_按天抽取 screenProjectSettleService.extractScreenData(param); }catch (Exception e){ log.error("大屏项目数据抽取_按天抽取_按天统计失败，customerId为："+customerId+"dateId为："+dateId, e); - }*/ + } + //按天统计：网格内各个分类下的项目总数 + try{ + projectCategoryGridDailyService.extractProjectCategoryData(customerId,dateId); + }catch(Exception e){ + log.error("按天统计：网格内各个分类下的项目总数，customerId为："+customerId+"dateId为："+dateId, e); + } log.info("===== extractDaily method end ======"); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectCategoryGridDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectCategoryGridDailyService.java index da711d85e3..4fcb249db1 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectCategoryGridDailyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectCategoryGridDailyService.java @@ -102,4 +102,14 @@ public interface ScreenProjectCategoryGridDailyService extends BaseService param); + + /** + * @return void + * @param customerId + * @param dateId + * @author yinzuomei + * @description 产品内部计算：网格内按分类统计项目数量 + * @Date 2021/3/22 16:46 + **/ + void extractProjectCategoryData(String customerId, String dateId); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryGridDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryGridDailyServiceImpl.java index acc891ac1a..a7be71b6ae 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryGridDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryGridDailyServiceImpl.java @@ -128,4 +128,17 @@ public class ScreenProjectCategoryGridDailyServiceImpl extends BaseServiceImpl