From 98463b39a29d509961c650aa018ada22c6c6368a Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 8 Dec 2020 14:12:27 +0800
Subject: [PATCH 001/119] =?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=BE=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/IssueCategoryDTO.java  |  96 ++++++++++++++++
 .../dto/IssueProjectCategoryDictDTO.java      | 106 ++++++++++++++++++
 .../com/epmet/dto/IssueProjectTagDictDTO.java |  96 ++++++++++++++++
 .../main/java/com/epmet/dto/IssueTagsDTO.java |  96 ++++++++++++++++
 .../controller/IssueCategoryController.java   |  94 ++++++++++++++++
 .../IssueProjectCategoryDictController.java   |  94 ++++++++++++++++
 .../IssueProjectTagDictController.java        |  94 ++++++++++++++++
 .../epmet/controller/IssueTagsController.java |  94 ++++++++++++++++
 .../java/com/epmet/dao/IssueCategoryDao.java  |  33 ++++++
 .../dao/IssueProjectCategoryDictDao.java      |  33 ++++++
 .../com/epmet/dao/IssueProjectTagDictDao.java |  33 ++++++
 .../main/java/com/epmet/dao/IssueTagsDao.java |  33 ++++++
 .../com/epmet/entity/IssueCategoryEntity.java |  66 +++++++++++
 .../IssueProjectCategoryDictEntity.java       |  76 +++++++++++++
 .../entity/IssueProjectTagDictEntity.java     |  66 +++++++++++
 .../com/epmet/entity/IssueTagsEntity.java     |  66 +++++++++++
 .../com/epmet/excel/IssueCategoryExcel.java   |  71 ++++++++++++
 .../excel/IssueProjectCategoryDictExcel.java  |  77 +++++++++++++
 .../epmet/excel/IssueProjectTagDictExcel.java |  71 ++++++++++++
 .../java/com/epmet/excel/IssueTagsExcel.java  |  71 ++++++++++++
 .../com/epmet/redis/IssueCategoryRedis.java   |  47 ++++++++
 .../redis/IssueProjectCategoryDictRedis.java  |  47 ++++++++
 .../epmet/redis/IssueProjectTagDictRedis.java |  47 ++++++++
 .../java/com/epmet/redis/IssueTagsRedis.java  |  47 ++++++++
 .../epmet/service/IssueCategoryService.java   |  95 ++++++++++++++++
 .../IssueProjectCategoryDictService.java      |  95 ++++++++++++++++
 .../service/IssueProjectTagDictService.java   |  95 ++++++++++++++++
 .../com/epmet/service/IssueTagsService.java   |  95 ++++++++++++++++
 .../impl/IssueCategoryServiceImpl.java        | 104 +++++++++++++++++
 .../IssueProjectCategoryDictServiceImpl.java  | 104 +++++++++++++++++
 .../impl/IssueProjectTagDictServiceImpl.java  | 104 +++++++++++++++++
 .../service/impl/IssueTagsServiceImpl.java    | 104 +++++++++++++++++
 .../resources/mapper/IssueCategoryDao.xml     |   8 ++
 .../mapper/IssueProjectCategoryDictDao.xml    |   8 ++
 .../mapper/IssueProjectTagDictDao.xml         |   8 ++
 .../main/resources/mapper/IssueTagsDao.xml    |   8 ++
 .../com/epmet/dto/ProjectCategoryDTO.java     |  96 ++++++++++++++++
 .../java/com/epmet/dto/ProjectTagsDTO.java    |  91 +++++++++++++++
 .../controller/ProjectCategoryController.java |  94 ++++++++++++++++
 .../controller/ProjectTagsController.java     |  94 ++++++++++++++++
 .../com/epmet/dao/ProjectCategoryDao.java     |  33 ++++++
 .../java/com/epmet/dao/ProjectTagsDao.java    |  33 ++++++
 .../epmet/entity/ProjectCategoryEntity.java   |  66 +++++++++++
 .../com/epmet/entity/ProjectTagsEntity.java   |  61 ++++++++++
 .../com/epmet/excel/ProjectCategoryExcel.java |  71 ++++++++++++
 .../com/epmet/excel/ProjectTagsExcel.java     |  68 +++++++++++
 .../com/epmet/redis/ProjectCategoryRedis.java |  47 ++++++++
 .../com/epmet/redis/ProjectTagsRedis.java     |  47 ++++++++
 .../epmet/service/ProjectCategoryService.java |  95 ++++++++++++++++
 .../com/epmet/service/ProjectTagsService.java |  95 ++++++++++++++++
 .../impl/ProjectCategoryServiceImpl.java      | 104 +++++++++++++++++
 .../service/impl/ProjectTagsServiceImpl.java  | 104 +++++++++++++++++
 .../resources/mapper/ProjectCategoryDao.xml   |   8 ++
 .../main/resources/mapper/ProjectTagsDao.xml  |   8 ++
 54 files changed, 3697 insertions(+)
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueCategoryDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectCategoryDictDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectTagDictDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueTagsDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCategoryController.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectTagDictController.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueTagsController.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueTagsDao.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueCategoryEntity.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectCategoryDictEntity.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectTagDictEntity.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueTagsEntity.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueCategoryExcel.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProjectCategoryDictExcel.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProjectTagDictExcel.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueTagsExcel.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueCategoryRedis.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectCategoryDictRedis.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueTagsRedis.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCategoryService.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectCategoryDictService.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectTagDictService.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueTagsService.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCategoryServiceImpl.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueTagsDao.xml
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectCategoryDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectTagsDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectCategoryController.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTagsController.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectCategoryDao.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectTagsDao.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectCategoryEntity.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectTagsEntity.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectCategoryExcel.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectTagsExcel.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/ProjectCategoryRedis.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/ProjectTagsRedis.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectCategoryService.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectTagsService.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTagsServiceImpl.java
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectTagsDao.xml

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
new file mode 100644
index 0000000000..12d645937a
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueCategoryDTO.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 议题所属分类表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Data
+public class IssueCategoryDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 网格ID: 议题所属网格Id
+     */
+	private String gridId;
+
+    /**
+     * 议题id
+     */
+	private String issueId;
+
+    /**
+     * 分类id
+     */
+	private String categoryId;
+
+    /**
+     * 分类对应的所有上级,英文逗号隔开
+     */
+	private String categoryPids;
+
+    /**
+     * 删除标识 0未删除、1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..d0df3169f5
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectCategoryDictDTO.java
@@ -0,0 +1,106 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 议题项目分类字典
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Data
+public class IssueProjectCategoryDictDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户id,  产品默认default
+     */
+	private String customerId;
+
+    /**
+     * 上级分类ID 顶级此列存储0
+     */
+	private String pid;
+
+    /**
+     * 所有上级分类ID，用逗号分开
+     */
+	private String pids;
+
+    /**
+     * 分类编码，分类编码+customer_id唯一
+     */
+	private String categoryCode;
+
+    /**
+     * 分类名称
+     */
+	private String categoryName;
+
+    /**
+     * 分类类别1,2,3,4....
+     */
+	private String categoryType;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 删除标识 0未删除、1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..7d3e767591
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProjectTagDictDTO.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 议题、项目标签字典表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Data
+public class IssueProjectTagDictDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 标签名称
+     */
+	private String tagName;
+
+    /**
+     * 分类id, 用户自己添加的标签此列可为空
+     */
+	private String categoryId;
+
+    /**
+     * 议题对标签的引用次数
+     */
+	private Integer issueUseCount;
+
+    /**
+     * 项目对标签的引用次数
+     */
+	private Integer projectUseCount;
+
+    /**
+     * 删除标识 0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..6ca1c51c6a
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueTagsDTO.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 议题关联标签表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Data
+public class IssueTagsDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 议题所属网格id
+     */
+	private String gridId;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 标签ID
+     */
+	private String tagId;
+
+    /**
+     * 标签名称
+     */
+	private String tagName;
+
+    /**
+     * 删除标识 0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..ad5fd11583
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCategoryController.java
@@ -0,0 +1,94 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.dto.IssueCategoryDTO;
+import com.epmet.excel.IssueCategoryExcel;
+import com.epmet.service.IssueCategoryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 议题所属分类表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@RestController
+@RequestMapping("issuecategory")
+public class IssueCategoryController {
+    
+    @Autowired
+    private IssueCategoryService issueCategoryService;
+
+    @GetMapping("page")
+    public Result<PageData<IssueCategoryDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IssueCategoryDTO> page = issueCategoryService.page(params);
+        return new Result<PageData<IssueCategoryDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IssueCategoryDTO> get(@PathVariable("id") String id){
+        IssueCategoryDTO data = issueCategoryService.get(id);
+        return new Result<IssueCategoryDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IssueCategoryDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        issueCategoryService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IssueCategoryDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        issueCategoryService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        issueCategoryService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IssueCategoryDTO> list = issueCategoryService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IssueCategoryExcel.class);
+    }
+
+}
\ 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
new file mode 100644
index 0000000000..4f09b23bc1
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java
@@ -0,0 +1,94 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.dto.IssueProjectCategoryDictDTO;
+import com.epmet.excel.IssueProjectCategoryDictExcel;
+import com.epmet.service.IssueProjectCategoryDictService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 议题项目分类字典
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@RestController
+@RequestMapping("issueprojectcategorydict")
+public class IssueProjectCategoryDictController {
+    
+    @Autowired
+    private IssueProjectCategoryDictService issueProjectCategoryDictService;
+
+    @GetMapping("page")
+    public Result<PageData<IssueProjectCategoryDictDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IssueProjectCategoryDictDTO> page = issueProjectCategoryDictService.page(params);
+        return new Result<PageData<IssueProjectCategoryDictDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IssueProjectCategoryDictDTO> get(@PathVariable("id") String id){
+        IssueProjectCategoryDictDTO data = issueProjectCategoryDictService.get(id);
+        return new Result<IssueProjectCategoryDictDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IssueProjectCategoryDictDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        issueProjectCategoryDictService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IssueProjectCategoryDictDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        issueProjectCategoryDictService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        issueProjectCategoryDictService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IssueProjectCategoryDictDTO> list = issueProjectCategoryDictService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IssueProjectCategoryDictExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectTagDictController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectTagDictController.java
new file mode 100644
index 0000000000..f4dbe2b03e
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectTagDictController.java
@@ -0,0 +1,94 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.dto.IssueProjectTagDictDTO;
+import com.epmet.excel.IssueProjectTagDictExcel;
+import com.epmet.service.IssueProjectTagDictService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 议题、项目标签字典表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@RestController
+@RequestMapping("issueprojecttagdict")
+public class IssueProjectTagDictController {
+    
+    @Autowired
+    private IssueProjectTagDictService issueProjectTagDictService;
+
+    @GetMapping("page")
+    public Result<PageData<IssueProjectTagDictDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IssueProjectTagDictDTO> page = issueProjectTagDictService.page(params);
+        return new Result<PageData<IssueProjectTagDictDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IssueProjectTagDictDTO> get(@PathVariable("id") String id){
+        IssueProjectTagDictDTO data = issueProjectTagDictService.get(id);
+        return new Result<IssueProjectTagDictDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IssueProjectTagDictDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        issueProjectTagDictService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IssueProjectTagDictDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        issueProjectTagDictService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        issueProjectTagDictService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IssueProjectTagDictDTO> list = issueProjectTagDictService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IssueProjectTagDictExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueTagsController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueTagsController.java
new file mode 100644
index 0000000000..4be04baf85
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueTagsController.java
@@ -0,0 +1,94 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.dto.IssueTagsDTO;
+import com.epmet.excel.IssueTagsExcel;
+import com.epmet.service.IssueTagsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 议题关联标签表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@RestController
+@RequestMapping("issuetags")
+public class IssueTagsController {
+    
+    @Autowired
+    private IssueTagsService issueTagsService;
+
+    @GetMapping("page")
+    public Result<PageData<IssueTagsDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IssueTagsDTO> page = issueTagsService.page(params);
+        return new Result<PageData<IssueTagsDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IssueTagsDTO> get(@PathVariable("id") String id){
+        IssueTagsDTO data = issueTagsService.get(id);
+        return new Result<IssueTagsDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IssueTagsDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        issueTagsService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IssueTagsDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        issueTagsService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        issueTagsService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IssueTagsDTO> list = issueTagsService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IssueTagsExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
new file mode 100644
index 0000000000..94e91b086b
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IssueCategoryEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 议题所属分类表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Mapper
+public interface IssueCategoryDao extends BaseDao<IssueCategoryEntity> {
+	
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..bd770671d5
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IssueProjectCategoryDictEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 议题项目分类字典
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Mapper
+public interface IssueProjectCategoryDictDao extends BaseDao<IssueProjectCategoryDictEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java
new file mode 100644
index 0000000000..7f2bd323dd
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IssueProjectTagDictEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 议题、项目标签字典表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Mapper
+public interface IssueProjectTagDictDao extends BaseDao<IssueProjectTagDictEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueTagsDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueTagsDao.java
new file mode 100644
index 0000000000..1cd8838351
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueTagsDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IssueTagsEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 议题关联标签表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Mapper
+public interface IssueTagsDao extends BaseDao<IssueTagsEntity> {
+	
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..fa9e5b8d5b
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueCategoryEntity.java
@@ -0,0 +1,66 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 议题所属分类表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("issue_category")
+public class IssueCategoryEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 网格ID: 议题所属网格Id
+     */
+	private String gridId;
+
+    /**
+     * 议题id
+     */
+	private String issueId;
+
+    /**
+     * 分类id
+     */
+	private String categoryId;
+
+    /**
+     * 分类对应的所有上级,英文逗号隔开
+     */
+	private String categoryPids;
+
+}
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
new file mode 100644
index 0000000000..74a2e32b29
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectCategoryDictEntity.java
@@ -0,0 +1,76 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 议题项目分类字典
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-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;
+
+    /**
+     * 分类编码，分类编码+customer_id唯一
+     */
+	private String categoryCode;
+
+    /**
+     * 分类名称
+     */
+	private String categoryName;
+
+    /**
+     * 分类类别1,2,3,4....
+     */
+	private String categoryType;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+}
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
new file mode 100644
index 0000000000..52ad36b5ef
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectTagDictEntity.java
@@ -0,0 +1,66 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 议题、项目标签字典表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("issue_project_tag_dict")
+public class IssueProjectTagDictEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 标签名称
+     */
+	private String tagName;
+
+    /**
+     * 分类id, 用户自己添加的标签此列可为空
+     */
+	private String categoryId;
+
+    /**
+     * 议题对标签的引用次数
+     */
+	private Integer issueUseCount;
+
+    /**
+     * 项目对标签的引用次数
+     */
+	private Integer projectUseCount;
+
+}
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
new file mode 100644
index 0000000000..1dc56255fc
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueTagsEntity.java
@@ -0,0 +1,66 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 议题关联标签表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("issue_tags")
+public class IssueTagsEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 议题所属网格id
+     */
+	private String gridId;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 标签ID
+     */
+	private String tagId;
+
+    /**
+     * 标签名称
+     */
+	private String tagName;
+
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueCategoryExcel.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueCategoryExcel.java
new file mode 100644
index 0000000000..1d74b3fe92
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueCategoryExcel.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 议题所属分类表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Data
+public class IssueCategoryExcel {
+
+    @Excel(name = "主键")
+    private String id;
+
+    @Excel(name = "客户id")
+    private String customerId;
+
+    @Excel(name = "网格ID: 议题所属网格Id")
+    private String gridId;
+
+    @Excel(name = "议题id")
+    private String issueId;
+
+    @Excel(name = "分类id")
+    private String categoryId;
+
+    @Excel(name = "分类对应的所有上级,英文逗号隔开")
+    private String categoryPids;
+
+    @Excel(name = "删除标识 0未删除、1已删除")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProjectCategoryDictExcel.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProjectCategoryDictExcel.java
new file mode 100644
index 0000000000..4cef5ada59
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProjectCategoryDictExcel.java
@@ -0,0 +1,77 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 议题项目分类字典
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Data
+public class IssueProjectCategoryDictExcel {
+
+    @Excel(name = "主键")
+    private String id;
+
+    @Excel(name = "客户id,  产品默认default")
+    private String customerId;
+
+    @Excel(name = "上级分类ID 顶级此列存储0")
+    private String pid;
+
+    @Excel(name = "所有上级分类ID，用逗号分开")
+    private String pids;
+
+    @Excel(name = "分类编码，分类编码+customer_id唯一")
+    private String categoryCode;
+
+    @Excel(name = "分类名称")
+    private String categoryName;
+
+    @Excel(name = "分类类别1,2,3,4....")
+    private String categoryType;
+
+    @Excel(name = "排序")
+    private Integer sort;
+
+    @Excel(name = "删除标识 0未删除、1已删除")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProjectTagDictExcel.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProjectTagDictExcel.java
new file mode 100644
index 0000000000..2922932624
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProjectTagDictExcel.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 议题、项目标签字典表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Data
+public class IssueProjectTagDictExcel {
+
+    @Excel(name = "主键ID")
+    private String id;
+
+    @Excel(name = "客户ID")
+    private String customerId;
+
+    @Excel(name = "标签名称")
+    private String tagName;
+
+    @Excel(name = "分类id, 用户自己添加的标签此列可为空")
+    private String categoryId;
+
+    @Excel(name = "议题对标签的引用次数")
+    private Integer issueUseCount;
+
+    @Excel(name = "项目对标签的引用次数")
+    private Integer projectUseCount;
+
+    @Excel(name = "删除标识 0.未删除 1.已删除")
+    private Integer delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueTagsExcel.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueTagsExcel.java
new file mode 100644
index 0000000000..c790e5e6e2
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueTagsExcel.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 议题关联标签表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Data
+public class IssueTagsExcel {
+
+    @Excel(name = "主键ID")
+    private String id;
+
+    @Excel(name = "客户ID")
+    private String customerId;
+
+    @Excel(name = "议题所属网格id")
+    private String gridId;
+
+    @Excel(name = "议题ID")
+    private String issueId;
+
+    @Excel(name = "标签ID")
+    private String tagId;
+
+    @Excel(name = "标签名称")
+    private String tagName;
+
+    @Excel(name = "删除标识 0.未删除 1.已删除")
+    private Integer delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueCategoryRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueCategoryRedis.java
new file mode 100644
index 0000000000..f05e1bac72
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueCategoryRedis.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 议题所属分类表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Component
+public class IssueCategoryRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectCategoryDictRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectCategoryDictRedis.java
new file mode 100644
index 0000000000..f4bfbe0967
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectCategoryDictRedis.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 议题项目分类字典
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Component
+public class IssueProjectCategoryDictRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
new file mode 100644
index 0000000000..7c9f56bd38
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 议题、项目标签字典表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Component
+public class IssueProjectTagDictRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueTagsRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueTagsRedis.java
new file mode 100644
index 0000000000..3219ea7b57
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueTagsRedis.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 议题关联标签表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Component
+public class IssueTagsRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCategoryService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCategoryService.java
new file mode 100644
index 0000000000..92b700daa0
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCategoryService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IssueCategoryDTO;
+import com.epmet.entity.IssueCategoryEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 议题所属分类表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+public interface IssueCategoryService extends BaseService<IssueCategoryEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IssueCategoryDTO>
+     * @author generator
+     * @date 2020-12-08
+     */
+    PageData<IssueCategoryDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IssueCategoryDTO>
+     * @author generator
+     * @date 2020-12-08
+     */
+    List<IssueCategoryDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IssueCategoryDTO
+     * @author generator
+     * @date 2020-12-08
+     */
+    IssueCategoryDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-12-08
+     */
+    void save(IssueCategoryDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-12-08
+     */
+    void update(IssueCategoryDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-12-08
+     */
+    void delete(String[] ids);
+}
\ 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
new file mode 100644
index 0000000000..5937393e1a
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectCategoryDictService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IssueProjectCategoryDictDTO;
+import com.epmet.entity.IssueProjectCategoryDictEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 议题项目分类字典
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+public interface IssueProjectCategoryDictService extends BaseService<IssueProjectCategoryDictEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IssueProjectCategoryDictDTO>
+     * @author generator
+     * @date 2020-12-08
+     */
+    PageData<IssueProjectCategoryDictDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IssueProjectCategoryDictDTO>
+     * @author generator
+     * @date 2020-12-08
+     */
+    List<IssueProjectCategoryDictDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IssueProjectCategoryDictDTO
+     * @author generator
+     * @date 2020-12-08
+     */
+    IssueProjectCategoryDictDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-12-08
+     */
+    void save(IssueProjectCategoryDictDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-12-08
+     */
+    void update(IssueProjectCategoryDictDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-12-08
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectTagDictService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectTagDictService.java
new file mode 100644
index 0000000000..46521d6bbb
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectTagDictService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IssueProjectTagDictDTO;
+import com.epmet.entity.IssueProjectTagDictEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 议题、项目标签字典表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+public interface IssueProjectTagDictService extends BaseService<IssueProjectTagDictEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IssueProjectTagDictDTO>
+     * @author generator
+     * @date 2020-12-08
+     */
+    PageData<IssueProjectTagDictDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IssueProjectTagDictDTO>
+     * @author generator
+     * @date 2020-12-08
+     */
+    List<IssueProjectTagDictDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IssueProjectTagDictDTO
+     * @author generator
+     * @date 2020-12-08
+     */
+    IssueProjectTagDictDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-12-08
+     */
+    void save(IssueProjectTagDictDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-12-08
+     */
+    void update(IssueProjectTagDictDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-12-08
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueTagsService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueTagsService.java
new file mode 100644
index 0000000000..b4e37ae7c0
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueTagsService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IssueTagsDTO;
+import com.epmet.entity.IssueTagsEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 议题关联标签表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+public interface IssueTagsService extends BaseService<IssueTagsEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IssueTagsDTO>
+     * @author generator
+     * @date 2020-12-08
+     */
+    PageData<IssueTagsDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IssueTagsDTO>
+     * @author generator
+     * @date 2020-12-08
+     */
+    List<IssueTagsDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IssueTagsDTO
+     * @author generator
+     * @date 2020-12-08
+     */
+    IssueTagsDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-12-08
+     */
+    void save(IssueTagsDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-12-08
+     */
+    void update(IssueTagsDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-12-08
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..4e2a457af7
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCategoryServiceImpl.java
@@ -0,0 +1,104 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dao.IssueCategoryDao;
+import com.epmet.dto.IssueCategoryDTO;
+import com.epmet.entity.IssueCategoryEntity;
+import com.epmet.redis.IssueCategoryRedis;
+import com.epmet.service.IssueCategoryService;
+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 java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 议题所属分类表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Service
+public class IssueCategoryServiceImpl extends BaseServiceImpl<IssueCategoryDao, IssueCategoryEntity> implements IssueCategoryService {
+
+    @Autowired
+    private IssueCategoryRedis issueCategoryRedis;
+
+    @Override
+    public PageData<IssueCategoryDTO> page(Map<String, Object> params) {
+        IPage<IssueCategoryEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IssueCategoryDTO.class);
+    }
+
+    @Override
+    public List<IssueCategoryDTO> list(Map<String, Object> params) {
+        List<IssueCategoryEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IssueCategoryDTO.class);
+    }
+
+    private QueryWrapper<IssueCategoryEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IssueCategoryEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IssueCategoryDTO get(String id) {
+        IssueCategoryEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IssueCategoryDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IssueCategoryDTO dto) {
+        IssueCategoryEntity entity = ConvertUtils.sourceToTarget(dto, IssueCategoryEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IssueCategoryDTO dto) {
+        IssueCategoryEntity entity = ConvertUtils.sourceToTarget(dto, IssueCategoryEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..1bdb075c24
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java
@@ -0,0 +1,104 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dao.IssueProjectCategoryDictDao;
+import com.epmet.dto.IssueProjectCategoryDictDTO;
+import com.epmet.entity.IssueProjectCategoryDictEntity;
+import com.epmet.redis.IssueProjectCategoryDictRedis;
+import com.epmet.service.IssueProjectCategoryDictService;
+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 java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 议题项目分类字典
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Service
+public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssueProjectCategoryDictDao, IssueProjectCategoryDictEntity> implements IssueProjectCategoryDictService {
+
+    @Autowired
+    private IssueProjectCategoryDictRedis issueProjectCategoryDictRedis;
+
+    @Override
+    public PageData<IssueProjectCategoryDictDTO> page(Map<String, Object> params) {
+        IPage<IssueProjectCategoryDictEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IssueProjectCategoryDictDTO.class);
+    }
+
+    @Override
+    public List<IssueProjectCategoryDictDTO> list(Map<String, Object> params) {
+        List<IssueProjectCategoryDictEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IssueProjectCategoryDictDTO.class);
+    }
+
+    private QueryWrapper<IssueProjectCategoryDictEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IssueProjectCategoryDictEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IssueProjectCategoryDictDTO get(String id) {
+        IssueProjectCategoryDictEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IssueProjectCategoryDictDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IssueProjectCategoryDictDTO dto) {
+        IssueProjectCategoryDictEntity entity = ConvertUtils.sourceToTarget(dto, IssueProjectCategoryDictEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IssueProjectCategoryDictDTO dto) {
+        IssueProjectCategoryDictEntity entity = ConvertUtils.sourceToTarget(dto, IssueProjectCategoryDictEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
new file mode 100644
index 0000000000..2250587ec3
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
@@ -0,0 +1,104 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dao.IssueProjectTagDictDao;
+import com.epmet.dto.IssueProjectTagDictDTO;
+import com.epmet.entity.IssueProjectTagDictEntity;
+import com.epmet.redis.IssueProjectTagDictRedis;
+import com.epmet.service.IssueProjectTagDictService;
+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 java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 议题、项目标签字典表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Service
+public class IssueProjectTagDictServiceImpl extends BaseServiceImpl<IssueProjectTagDictDao, IssueProjectTagDictEntity> implements IssueProjectTagDictService {
+
+    @Autowired
+    private IssueProjectTagDictRedis issueProjectTagDictRedis;
+
+    @Override
+    public PageData<IssueProjectTagDictDTO> page(Map<String, Object> params) {
+        IPage<IssueProjectTagDictEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IssueProjectTagDictDTO.class);
+    }
+
+    @Override
+    public List<IssueProjectTagDictDTO> list(Map<String, Object> params) {
+        List<IssueProjectTagDictEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IssueProjectTagDictDTO.class);
+    }
+
+    private QueryWrapper<IssueProjectTagDictEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IssueProjectTagDictEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IssueProjectTagDictDTO get(String id) {
+        IssueProjectTagDictEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IssueProjectTagDictDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IssueProjectTagDictDTO dto) {
+        IssueProjectTagDictEntity entity = ConvertUtils.sourceToTarget(dto, IssueProjectTagDictEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IssueProjectTagDictDTO dto) {
+        IssueProjectTagDictEntity entity = ConvertUtils.sourceToTarget(dto, IssueProjectTagDictEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
new file mode 100644
index 0000000000..6a9002cd7c
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
@@ -0,0 +1,104 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dao.IssueTagsDao;
+import com.epmet.dto.IssueTagsDTO;
+import com.epmet.entity.IssueTagsEntity;
+import com.epmet.redis.IssueTagsRedis;
+import com.epmet.service.IssueTagsService;
+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 java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 议题关联标签表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Service
+public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTagsEntity> implements IssueTagsService {
+
+    @Autowired
+    private IssueTagsRedis issueTagsRedis;
+
+    @Override
+    public PageData<IssueTagsDTO> page(Map<String, Object> params) {
+        IPage<IssueTagsEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IssueTagsDTO.class);
+    }
+
+    @Override
+    public List<IssueTagsDTO> list(Map<String, Object> params) {
+        List<IssueTagsEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IssueTagsDTO.class);
+    }
+
+    private QueryWrapper<IssueTagsEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IssueTagsEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IssueTagsDTO get(String id) {
+        IssueTagsEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IssueTagsDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IssueTagsDTO dto) {
+        IssueTagsEntity entity = ConvertUtils.sourceToTarget(dto, IssueTagsEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IssueTagsDTO dto) {
+        IssueTagsEntity entity = ConvertUtils.sourceToTarget(dto, IssueTagsEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
new file mode 100644
index 0000000000..20f349dad8
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.IssueCategoryDao">
+
+
+
+</mapper>
\ No newline at end of file
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
new file mode 100644
index 0000000000..8be2371d88
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.IssueProjectCategoryDictDao">
+
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
new file mode 100644
index 0000000000..24ce93f310
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.IssueProjectTagDictDao">
+
+
+
+</mapper>
\ No newline at end of file
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
new file mode 100644
index 0000000000..d34e3bef22
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueTagsDao.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.IssueTagsDao">
+
+
+
+</mapper>
\ No newline at end of file
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
new file mode 100644
index 0000000000..4c7b39c7d6
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectCategoryDTO.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 项目所属分类表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Data
+public class ProjectCategoryDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 来源网格id
+     */
+	private String gridId;
+
+    /**
+     * 项目id
+     */
+	private String projectId;
+
+    /**
+     * 分类id
+     */
+	private String categoryId;
+
+    /**
+     * 分类对应的所有上级,英文逗号隔开
+     */
+	private String categoryPids;
+
+    /**
+     * 删除标识 0未删除、1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..1cc47c4bb6
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectTagsDTO.java
@@ -0,0 +1,91 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 项目关联标签表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Data
+public class ProjectTagsDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 项目ID
+     */
+	private String projectId;
+
+    /**
+     * 标签ID
+     */
+	private String tagId;
+
+    /**
+     * 标签名称
+     */
+	private String tagName;
+
+    /**
+     * 删除标识 0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..505d54c529
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectCategoryController.java
@@ -0,0 +1,94 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.dto.ProjectCategoryDTO;
+import com.epmet.excel.ProjectCategoryExcel;
+import com.epmet.service.ProjectCategoryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 项目所属分类表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@RestController
+@RequestMapping("projectcategory")
+public class ProjectCategoryController {
+    
+    @Autowired
+    private ProjectCategoryService projectCategoryService;
+
+    @GetMapping("page")
+    public Result<PageData<ProjectCategoryDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<ProjectCategoryDTO> page = projectCategoryService.page(params);
+        return new Result<PageData<ProjectCategoryDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<ProjectCategoryDTO> get(@PathVariable("id") String id){
+        ProjectCategoryDTO data = projectCategoryService.get(id);
+        return new Result<ProjectCategoryDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody ProjectCategoryDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        projectCategoryService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody ProjectCategoryDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        projectCategoryService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        projectCategoryService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<ProjectCategoryDTO> list = projectCategoryService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, ProjectCategoryExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTagsController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTagsController.java
new file mode 100644
index 0000000000..01ab68f1b9
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTagsController.java
@@ -0,0 +1,94 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.dto.ProjectTagsDTO;
+import com.epmet.excel.ProjectTagsExcel;
+import com.epmet.service.ProjectTagsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 项目关联标签表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@RestController
+@RequestMapping("projecttags")
+public class ProjectTagsController {
+    
+    @Autowired
+    private ProjectTagsService projectTagsService;
+
+    @GetMapping("page")
+    public Result<PageData<ProjectTagsDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<ProjectTagsDTO> page = projectTagsService.page(params);
+        return new Result<PageData<ProjectTagsDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<ProjectTagsDTO> get(@PathVariable("id") String id){
+        ProjectTagsDTO data = projectTagsService.get(id);
+        return new Result<ProjectTagsDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody ProjectTagsDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        projectTagsService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody ProjectTagsDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        projectTagsService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        projectTagsService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<ProjectTagsDTO> list = projectTagsService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, ProjectTagsExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectCategoryDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectCategoryDao.java
new file mode 100644
index 0000000000..8186178086
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectCategoryDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.ProjectCategoryEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 项目所属分类表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Mapper
+public interface ProjectCategoryDao extends BaseDao<ProjectCategoryEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectTagsDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectTagsDao.java
new file mode 100644
index 0000000000..2b4435ab5f
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectTagsDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.ProjectTagsEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 项目关联标签表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Mapper
+public interface ProjectTagsDao extends BaseDao<ProjectTagsEntity> {
+	
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..ce718cc201
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectCategoryEntity.java
@@ -0,0 +1,66 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 项目所属分类表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("project_category")
+public class ProjectCategoryEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 来源网格id
+     */
+	private String gridId;
+
+    /**
+     * 项目id
+     */
+	private String projectId;
+
+    /**
+     * 分类id
+     */
+	private String categoryId;
+
+    /**
+     * 分类对应的所有上级,英文逗号隔开
+     */
+	private String categoryPids;
+
+}
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
new file mode 100644
index 0000000000..12febddfea
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectTagsEntity.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 项目关联标签表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("project_tags")
+public class ProjectTagsEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 项目ID
+     */
+	private String projectId;
+
+    /**
+     * 标签ID
+     */
+	private String tagId;
+
+    /**
+     * 标签名称
+     */
+	private String tagName;
+
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectCategoryExcel.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectCategoryExcel.java
new file mode 100644
index 0000000000..515c2ddf7e
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectCategoryExcel.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 项目所属分类表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Data
+public class ProjectCategoryExcel {
+
+    @Excel(name = "主键")
+    private String id;
+
+    @Excel(name = "客户id")
+    private String customerId;
+
+    @Excel(name = "来源网格id")
+    private String gridId;
+
+    @Excel(name = "项目id")
+    private String projectId;
+
+    @Excel(name = "分类id")
+    private String categoryId;
+
+    @Excel(name = "分类对应的所有上级,英文逗号隔开")
+    private String categoryPids;
+
+    @Excel(name = "删除标识 0未删除、1已删除")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectTagsExcel.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectTagsExcel.java
new file mode 100644
index 0000000000..e923b47d6c
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectTagsExcel.java
@@ -0,0 +1,68 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 项目关联标签表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Data
+public class ProjectTagsExcel {
+
+    @Excel(name = "主键ID")
+    private String id;
+
+    @Excel(name = "客户ID")
+    private String customerId;
+
+    @Excel(name = "项目ID")
+    private String projectId;
+
+    @Excel(name = "标签ID")
+    private String tagId;
+
+    @Excel(name = "标签名称")
+    private String tagName;
+
+    @Excel(name = "删除标识 0.未删除 1.已删除")
+    private Integer delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/ProjectCategoryRedis.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/ProjectCategoryRedis.java
new file mode 100644
index 0000000000..cdf23a7a26
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/ProjectCategoryRedis.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 项目所属分类表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Component
+public class ProjectCategoryRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/ProjectTagsRedis.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/ProjectTagsRedis.java
new file mode 100644
index 0000000000..08f8b14e55
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/ProjectTagsRedis.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 项目关联标签表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Component
+public class ProjectTagsRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectCategoryService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectCategoryService.java
new file mode 100644
index 0000000000..551b77ffbb
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectCategoryService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.ProjectCategoryDTO;
+import com.epmet.entity.ProjectCategoryEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目所属分类表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+public interface ProjectCategoryService extends BaseService<ProjectCategoryEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<ProjectCategoryDTO>
+     * @author generator
+     * @date 2020-12-08
+     */
+    PageData<ProjectCategoryDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<ProjectCategoryDTO>
+     * @author generator
+     * @date 2020-12-08
+     */
+    List<ProjectCategoryDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return ProjectCategoryDTO
+     * @author generator
+     * @date 2020-12-08
+     */
+    ProjectCategoryDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-12-08
+     */
+    void save(ProjectCategoryDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-12-08
+     */
+    void update(ProjectCategoryDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-12-08
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectTagsService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectTagsService.java
new file mode 100644
index 0000000000..d281c2100e
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectTagsService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.ProjectTagsDTO;
+import com.epmet.entity.ProjectTagsEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目关联标签表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+public interface ProjectTagsService extends BaseService<ProjectTagsEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<ProjectTagsDTO>
+     * @author generator
+     * @date 2020-12-08
+     */
+    PageData<ProjectTagsDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<ProjectTagsDTO>
+     * @author generator
+     * @date 2020-12-08
+     */
+    List<ProjectTagsDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return ProjectTagsDTO
+     * @author generator
+     * @date 2020-12-08
+     */
+    ProjectTagsDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-12-08
+     */
+    void save(ProjectTagsDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-12-08
+     */
+    void update(ProjectTagsDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-12-08
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..5663981dba
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java
@@ -0,0 +1,104 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dao.ProjectCategoryDao;
+import com.epmet.dto.ProjectCategoryDTO;
+import com.epmet.entity.ProjectCategoryEntity;
+import com.epmet.redis.ProjectCategoryRedis;
+import com.epmet.service.ProjectCategoryService;
+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 java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目所属分类表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Service
+public class ProjectCategoryServiceImpl extends BaseServiceImpl<ProjectCategoryDao, ProjectCategoryEntity> implements ProjectCategoryService {
+
+    @Autowired
+    private ProjectCategoryRedis projectCategoryRedis;
+
+    @Override
+    public PageData<ProjectCategoryDTO> page(Map<String, Object> params) {
+        IPage<ProjectCategoryEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, ProjectCategoryDTO.class);
+    }
+
+    @Override
+    public List<ProjectCategoryDTO> list(Map<String, Object> params) {
+        List<ProjectCategoryEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, ProjectCategoryDTO.class);
+    }
+
+    private QueryWrapper<ProjectCategoryEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<ProjectCategoryEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public ProjectCategoryDTO get(String id) {
+        ProjectCategoryEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, ProjectCategoryDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(ProjectCategoryDTO dto) {
+        ProjectCategoryEntity entity = ConvertUtils.sourceToTarget(dto, ProjectCategoryEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(ProjectCategoryDTO dto) {
+        ProjectCategoryEntity entity = ConvertUtils.sourceToTarget(dto, ProjectCategoryEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTagsServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTagsServiceImpl.java
new file mode 100644
index 0000000000..4d4f135b6e
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTagsServiceImpl.java
@@ -0,0 +1,104 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dao.ProjectTagsDao;
+import com.epmet.dto.ProjectTagsDTO;
+import com.epmet.entity.ProjectTagsEntity;
+import com.epmet.redis.ProjectTagsRedis;
+import com.epmet.service.ProjectTagsService;
+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 java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目关联标签表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-08
+ */
+@Service
+public class ProjectTagsServiceImpl extends BaseServiceImpl<ProjectTagsDao, ProjectTagsEntity> implements ProjectTagsService {
+
+    @Autowired
+    private ProjectTagsRedis projectTagsRedis;
+
+    @Override
+    public PageData<ProjectTagsDTO> page(Map<String, Object> params) {
+        IPage<ProjectTagsEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, ProjectTagsDTO.class);
+    }
+
+    @Override
+    public List<ProjectTagsDTO> list(Map<String, Object> params) {
+        List<ProjectTagsEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, ProjectTagsDTO.class);
+    }
+
+    private QueryWrapper<ProjectTagsEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<ProjectTagsEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public ProjectTagsDTO get(String id) {
+        ProjectTagsEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, ProjectTagsDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(ProjectTagsDTO dto) {
+        ProjectTagsEntity entity = ConvertUtils.sourceToTarget(dto, ProjectTagsEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(ProjectTagsDTO dto) {
+        ProjectTagsEntity entity = ConvertUtils.sourceToTarget(dto, ProjectTagsEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml
new file mode 100644
index 0000000000..5689229906
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.ProjectCategoryDao">
+
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectTagsDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectTagsDao.xml
new file mode 100644
index 0000000000..50ed689ab5
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectTagsDao.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.ProjectTagsDao">
+
+
+
+</mapper>
\ No newline at end of file

From 866b4653c58f9864f3a38eaf76add10910a77023 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 8 Dec 2020 15:55:06 +0800
Subject: [PATCH 002/119] =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/IssueCategoryDTO.java        | 5 +++++
 .../src/main/java/com/epmet/dto/IssueProjectTagDictDTO.java  | 5 +++++
 .../src/main/java/com/epmet/entity/IssueCategoryEntity.java  | 5 +++++
 .../java/com/epmet/entity/IssueProjectTagDictEntity.java     | 5 +++++
 .../src/main/java/com/epmet/excel/IssueCategoryExcel.java    | 3 +++
 .../main/java/com/epmet/excel/IssueProjectTagDictExcel.java  | 3 +++
 .../src/main/java/com/epmet/dto/ProjectCategoryDTO.java      | 5 +++++
 .../main/java/com/epmet/entity/ProjectCategoryEntity.java    | 5 +++++
 .../src/main/java/com/epmet/excel/ProjectCategoryExcel.java  | 3 +++
 9 files changed, 39 insertions(+)

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..3883dc4b0f 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
@@ -58,6 +58,11 @@ public class IssueCategoryDTO implements Serializable {
      */
 	private String categoryId;
 
+    /**
+     * 分类名称
+     */
+    private String categoryName;
+
     /**
      * 分类对应的所有上级,英文逗号隔开
      */
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 7d3e767591..b13500e735 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
@@ -53,6 +53,11 @@ public class IssueProjectTagDictDTO implements Serializable {
      */
 	private String categoryId;
 
+    /**
+     * 是否是默认标签(0:是 1:否)
+     */
+    private String isDefault;
+
     /**
      * 议题对标签的引用次数
      */
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..c977beb4bf 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
@@ -58,6 +58,11 @@ public class IssueCategoryEntity extends BaseEpmetEntity {
      */
 	private String categoryId;
 
+    /**
+     * 分类名称
+     */
+	private String categoryName;
+
     /**
      * 分类对应的所有上级,英文逗号隔开
      */
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 52ad36b5ef..c56d5974a7 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
@@ -53,6 +53,11 @@ public class IssueProjectTagDictEntity extends BaseEpmetEntity {
      */
 	private String categoryId;
 
+    /**
+     * 是否是默认标签(0:是 1:否)
+     */
+	private String isDefault;
+
     /**
      * 议题对标签的引用次数
      */
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueCategoryExcel.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueCategoryExcel.java
index 1d74b3fe92..edb392740b 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueCategoryExcel.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueCategoryExcel.java
@@ -46,6 +46,9 @@ public class IssueCategoryExcel {
     @Excel(name = "分类id")
     private String categoryId;
 
+    @Excel(name = "分类名称")
+    private String categoryName;
+
     @Excel(name = "分类对应的所有上级,英文逗号隔开")
     private String categoryPids;
 
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProjectTagDictExcel.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProjectTagDictExcel.java
index 2922932624..26fee432bd 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProjectTagDictExcel.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProjectTagDictExcel.java
@@ -43,6 +43,9 @@ public class IssueProjectTagDictExcel {
     @Excel(name = "分类id, 用户自己添加的标签此列可为空")
     private String categoryId;
 
+    @Excel(name = "是否是默认标签(0:是 1:否)")
+    private String isDefault;
+
     @Excel(name = "议题对标签的引用次数")
     private Integer issueUseCount;
 
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..8ac01ddb81 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
@@ -58,6 +58,11 @@ public class ProjectCategoryDTO implements Serializable {
      */
 	private String categoryId;
 
+    /**
+     * 分类名称
+     */
+    private String categoryName;
+
     /**
      * 分类对应的所有上级,英文逗号隔开
      */
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..ffcbb81753 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
@@ -58,6 +58,11 @@ public class ProjectCategoryEntity extends BaseEpmetEntity {
      */
 	private String categoryId;
 
+	/**
+	 * 分类名称
+	 */
+	private String categoryName;
+
     /**
      * 分类对应的所有上级,英文逗号隔开
      */
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectCategoryExcel.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectCategoryExcel.java
index 515c2ddf7e..fe471b49cd 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectCategoryExcel.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectCategoryExcel.java
@@ -46,6 +46,9 @@ public class ProjectCategoryExcel {
     @Excel(name = "分类id")
     private String categoryId;
 
+    @Excel(name = "分类名称")
+    private String categoryName;
+
     @Excel(name = "分类对应的所有上级,英文逗号隔开")
     private String categoryPids;
 

From 4281356cee6142e7ddb3d8959f8d66671940a4bd Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 8 Dec 2020 16:02:16 +0800
Subject: [PATCH 003/119] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/IssueCategoryDTO.java        | 5 -----
 .../src/main/java/com/epmet/entity/IssueCategoryEntity.java  | 5 -----
 .../src/main/java/com/epmet/excel/IssueCategoryExcel.java    | 3 ---
 .../src/main/java/com/epmet/dto/ProjectCategoryDTO.java      | 5 -----
 .../main/java/com/epmet/entity/ProjectCategoryEntity.java    | 5 -----
 .../src/main/java/com/epmet/excel/ProjectCategoryExcel.java  | 3 ---
 6 files changed, 26 deletions(-)

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 3883dc4b0f..12d645937a 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
@@ -58,11 +58,6 @@ public class IssueCategoryDTO implements Serializable {
      */
 	private String categoryId;
 
-    /**
-     * 分类名称
-     */
-    private String categoryName;
-
     /**
      * 分类对应的所有上级,英文逗号隔开
      */
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 c977beb4bf..fa9e5b8d5b 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
@@ -58,11 +58,6 @@ public class IssueCategoryEntity extends BaseEpmetEntity {
      */
 	private String categoryId;
 
-    /**
-     * 分类名称
-     */
-	private String categoryName;
-
     /**
      * 分类对应的所有上级,英文逗号隔开
      */
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueCategoryExcel.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueCategoryExcel.java
index edb392740b..1d74b3fe92 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueCategoryExcel.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueCategoryExcel.java
@@ -46,9 +46,6 @@ public class IssueCategoryExcel {
     @Excel(name = "分类id")
     private String categoryId;
 
-    @Excel(name = "分类名称")
-    private String categoryName;
-
     @Excel(name = "分类对应的所有上级,英文逗号隔开")
     private String categoryPids;
 
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 8ac01ddb81..4c7b39c7d6 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
@@ -58,11 +58,6 @@ public class ProjectCategoryDTO implements Serializable {
      */
 	private String categoryId;
 
-    /**
-     * 分类名称
-     */
-    private String categoryName;
-
     /**
      * 分类对应的所有上级,英文逗号隔开
      */
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 ffcbb81753..ce718cc201 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
@@ -58,11 +58,6 @@ public class ProjectCategoryEntity extends BaseEpmetEntity {
      */
 	private String categoryId;
 
-	/**
-	 * 分类名称
-	 */
-	private String categoryName;
-
     /**
      * 分类对应的所有上级,英文逗号隔开
      */
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectCategoryExcel.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectCategoryExcel.java
index fe471b49cd..515c2ddf7e 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectCategoryExcel.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/ProjectCategoryExcel.java
@@ -46,9 +46,6 @@ public class ProjectCategoryExcel {
     @Excel(name = "分类id")
     private String categoryId;
 
-    @Excel(name = "分类名称")
-    private String categoryName;
-
     @Excel(name = "分类对应的所有上级,英文逗号隔开")
     private String categoryPids;
 

From 11d79aac71e1b61da29a3690a968e4ff5dd443ba Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 8 Dec 2020 17:11:30 +0800
Subject: [PATCH 004/119] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E8=AF=A6=E6=83=85-?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=88=86=E7=B1=BB=E6=9F=A5=E8=AF=A2-?=
 =?UTF-8?q?=E4=B8=A4=E7=AB=AF=E5=85=AC=E5=85=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/form/CategoryTagListFormDTO.java      | 21 +++++++++++++
 .../controller/IssueCategoryController.java   | 17 +++++++++++
 .../java/com/epmet/dao/IssueCategoryDao.java  | 11 ++++++-
 .../main/java/com/epmet/dao/IssueTagsDao.java | 11 ++++++-
 .../epmet/service/IssueCategoryService.java   | 11 +++++++
 .../impl/IssueCategoryServiceImpl.java        | 30 +++++++++++++++++++
 .../resources/mapper/IssueCategoryDao.xml     | 15 +++++++++-
 .../main/resources/mapper/IssueTagsDao.xml    | 13 +++++++-
 .../dto/result/CategoryTagListResultDTO.java  | 27 +++++++++++++++++
 .../dto/result/CategoryTagResultDTO.java      | 25 ++++++++++++++++
 10 files changed, 177 insertions(+), 4 deletions(-)
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CategoryTagListFormDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CategoryTagListResultDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CategoryTagResultDTO.java

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CategoryTagListFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CategoryTagListFormDTO.java
new file mode 100644
index 0000000000..0cece7cac2
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CategoryTagListFormDTO.java
@@ -0,0 +1,21 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 获取议题的分类、标签列表-接口入参
+ * @Author sun
+ */
+@Data
+public class CategoryTagListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 2599592072265715951L;
+    @NotBlank(message = "议题ID不能为空",groups = {CategoryTagListFormDTO.CategoryTag.class})
+    private String issueId;
+
+    public interface CategoryTag{}
+
+}
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 ad5fd11583..aaf37deea0 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
@@ -26,6 +26,11 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.IssueCategoryDTO;
+import com.epmet.dto.form.CategoryTagListFormDTO;
+import com.epmet.dto.form.ClosedProjectIssueListFormDTO;
+import com.epmet.dto.form.MyShiftIssueTopicsFormDTO;
+import com.epmet.dto.result.CategoryTagListResultDTO;
+import com.epmet.dto.result.LatestListResultDTO;
 import com.epmet.excel.IssueCategoryExcel;
 import com.epmet.service.IssueCategoryService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,4 +96,16 @@ public class IssueCategoryController {
         ExcelUtils.exportExcelToTarget(response, null, list, IssueCategoryExcel.class);
     }
 
+    /**
+     * @param formDTO
+     * @return
+     * @Description 获取议题的分类、标签列表
+     * @Author sun
+     **/
+    @PostMapping("categorytaglist")
+    public Result<CategoryTagListResultDTO> categoryTagList(@RequestBody CategoryTagListFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, CategoryTagListFormDTO.CategoryTag.class);
+        return new Result<CategoryTagListResultDTO>().ok(issueCategoryService.categoryTagList(formDTO));
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
index 94e91b086b..8fc966c738 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
@@ -18,8 +18,12 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.CategoryTagResultDTO;
 import com.epmet.entity.IssueCategoryEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 议题所属分类表
@@ -29,5 +33,10 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface IssueCategoryDao extends BaseDao<IssueCategoryEntity> {
-	
+
+    /**
+     * @Description 查询议题绑定的分类名称，按排序升序
+     * @Author sun
+     **/
+    List<CategoryTagResultDTO> selectIssueCategoryList(@Param("issueId") String issueId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueTagsDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueTagsDao.java
index 1cd8838351..89c3d9ef69 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueTagsDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueTagsDao.java
@@ -18,8 +18,12 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.CategoryTagResultDTO;
 import com.epmet.entity.IssueTagsEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 议题关联标签表
@@ -29,5 +33,10 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface IssueTagsDao extends BaseDao<IssueTagsEntity> {
-	
+
+    /**
+     * @Description 查询议题绑定的标签，按绑定时间升序
+     * @Author sun
+     **/
+    List<CategoryTagResultDTO> selectIssueTagList(@Param("issueId") String issueId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCategoryService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCategoryService.java
index 92b700daa0..167621df74 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCategoryService.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCategoryService.java
@@ -20,6 +20,8 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IssueCategoryDTO;
+import com.epmet.dto.form.CategoryTagListFormDTO;
+import com.epmet.dto.result.CategoryTagListResultDTO;
 import com.epmet.entity.IssueCategoryEntity;
 
 import java.util.List;
@@ -92,4 +94,13 @@ public interface IssueCategoryService extends BaseService<IssueCategoryEntity> {
      * @date 2020-12-08
      */
     void delete(String[] ids);
+
+    /**
+     * @param formDTO
+     * @return
+     * @Description 获取议题的分类、标签列表
+     * @Author sun
+     **/
+    CategoryTagListResultDTO categoryTagList(CategoryTagListFormDTO formDTO);
+
 }
\ No newline at end of file
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 4e2a457af7..0d9ae06927 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
@@ -20,11 +20,16 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.IssueCategoryDao;
+import com.epmet.dao.IssueTagsDao;
 import com.epmet.dto.IssueCategoryDTO;
+import com.epmet.dto.form.CategoryTagListFormDTO;
+import com.epmet.dto.result.CategoryTagListResultDTO;
+import com.epmet.dto.result.CategoryTagResultDTO;
 import com.epmet.entity.IssueCategoryEntity;
 import com.epmet.redis.IssueCategoryRedis;
 import com.epmet.service.IssueCategoryService;
@@ -33,6 +38,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -48,6 +54,8 @@ public class IssueCategoryServiceImpl extends BaseServiceImpl<IssueCategoryDao,
 
     @Autowired
     private IssueCategoryRedis issueCategoryRedis;
+    @Autowired
+    private IssueTagsDao issueTagsDao;
 
     @Override
     public PageData<IssueCategoryDTO> page(Map<String, Object> params) {
@@ -101,4 +109,26 @@ public class IssueCategoryServiceImpl extends BaseServiceImpl<IssueCategoryDao,
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @param formDTO
+     * @return
+     * @Description 获取议题的分类、标签列表
+     * @Author sun
+     **/
+    @Override
+    public CategoryTagListResultDTO categoryTagList(CategoryTagListFormDTO formDTO) {
+        CategoryTagListResultDTO resultDTO = new CategoryTagListResultDTO();
+        //1.查询议题绑定的分类名称，按排序升序
+        List<CategoryTagResultDTO> categoryList = baseDao.selectIssueCategoryList(formDTO.getIssueId());
+        if (categoryList.size() > NumConstant.ZERO) {
+            resultDTO.setCategoryList(categoryList);
+        }
+        //2.查询议题绑定的标签，按绑定时间升序
+        List<CategoryTagResultDTO> tagList = issueTagsDao.selectIssueTagList(formDTO.getIssueId());
+        if (tagList.size() > NumConstant.ZERO) {
+            resultDTO.setTagList(tagList);
+        }
+        return resultDTO;
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
index 20f349dad8..465833cee1 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
@@ -3,6 +3,19 @@
 
 <mapper namespace="com.epmet.dao.IssueCategoryDao">
 
-
+    <select id="selectIssueCategoryList" resultType="com.epmet.dto.result.CategoryTagResultDTO">
+        SELECT
+            ic.category_id AS "id",
+            ip.category_name AS "name"
+        FROM
+            issue_category ic
+        INNER JOIN issue_project_category_dict ip ON ic.category_id = ip.id
+        WHERE
+            ic.del_flag = '0'
+        AND ip.del_flag = '0'
+        AND ic.issue_id = #{issueId}
+        ORDER BY
+            ip.sort ASC
+    </select>
 
 </mapper>
\ No newline at end of file
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 d34e3bef22..ca008c94f6 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
@@ -3,6 +3,17 @@
 
 <mapper namespace="com.epmet.dao.IssueTagsDao">
 
-
+    <select id="selectIssueTagList" resultType="com.epmet.dto.result.CategoryTagResultDTO">
+        SELECT
+            it.tag_id AS "id",
+            it.tag_name AS "name"
+        FROM
+            issue_tags it
+        WHERE
+            it.del_flag = '0'
+        AND it.issue_id = #{issueId}
+        ORDER BY
+            it.created_time ASC
+    </select>
 
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CategoryTagListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CategoryTagListResultDTO.java
new file mode 100644
index 0000000000..ee6186e3aa
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CategoryTagListResultDTO.java
@@ -0,0 +1,27 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description 获取议题的分类、标签列表-接口返参
+ * @Author sun
+ */
+@Data
+public class CategoryTagListResultDTO implements Serializable {
+
+	private static final long serialVersionUID = 5957826616179876849L;
+
+	/**
+	 * 类别集合
+	 */
+	private List<CategoryTagResultDTO> categoryList = new ArrayList<>();
+	/**
+	 * 标签集合
+	 */
+	private List<CategoryTagResultDTO> tagList = new ArrayList<>();
+
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CategoryTagResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CategoryTagResultDTO.java
new file mode 100644
index 0000000000..2b4aa63fbe
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CategoryTagResultDTO.java
@@ -0,0 +1,25 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 获取议题的分类、标签列表-接口返参
+ * @Author sun
+ */
+@Data
+public class CategoryTagResultDTO implements Serializable {
+
+	private static final long serialVersionUID = 5957826616179876849L;
+
+	/**
+	 * 分类或标签Id
+	 */
+	private String id;
+	/**
+	 * 分类或标签名称
+	 */
+	private String name;
+
+}

From 4840bf722fd6d0d45bbe49160a99387dc5286f53 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 8 Dec 2020 18:07:11 +0800
Subject: [PATCH 005/119] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85-?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=88=86=E7=B1=BB=E6=9F=A5=E8=AF=A2-?=
 =?UTF-8?q?=E4=B8=A4=E7=AB=AF=E5=85=B1=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ....java => IssueCategoryTagListFormDTO.java} |  4 +-
 .../IssueCategoryTagListResultDTO.java}       |  6 +--
 .../result/IssueCategoryTagResultDTO.java}    |  2 +-
 .../epmet/feign/GovIssueOpenFeignClient.java  |  9 +++-
 .../GovIssueOpenFeignClientFallBack.java      | 11 ++++-
 .../controller/IssueCategoryController.java   | 27 ++++++++----
 .../java/com/epmet/dao/IssueCategoryDao.java  | 13 +++++-
 .../main/java/com/epmet/dao/IssueTagsDao.java |  4 +-
 .../epmet/service/IssueCategoryService.java   | 14 +++++--
 .../impl/IssueCategoryServiceImpl.java        | 29 +++++++++----
 .../resources/mapper/IssueCategoryDao.xml     | 19 ++++++++-
 .../main/resources/mapper/IssueTagsDao.xml    | 14 +++----
 .../form/ProjectCategoryTagListFormDTO.java   | 22 ++++++++++
 .../ProjectCategoryTagListResultDTO.java      | 27 ++++++++++++
 .../result/ProjectCategoryTagResultDTO.java   | 25 +++++++++++
 .../controller/ProjectCategoryController.java | 16 ++++++-
 .../com/epmet/dao/ProjectCategoryDao.java     | 11 ++++-
 .../java/com/epmet/dao/ProjectTagsDao.java    | 11 ++++-
 .../epmet/service/ProjectCategoryService.java | 10 +++++
 .../impl/ProjectCategoryServiceImpl.java      | 42 ++++++++++++++++++-
 .../resources/mapper/ProjectCategoryDao.xml   | 10 ++++-
 .../main/resources/mapper/ProjectTagsDao.xml  | 13 +++++-
 22 files changed, 292 insertions(+), 47 deletions(-)
 rename epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/{CategoryTagListFormDTO.java => IssueCategoryTagListFormDTO.java} (66%)
 rename epmet-module/{gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CategoryTagListResultDTO.java => gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueCategoryTagListResultDTO.java} (63%)
 rename epmet-module/{gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CategoryTagResultDTO.java => gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueCategoryTagResultDTO.java} (84%)
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectCategoryTagListFormDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectCategoryTagListResultDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectCategoryTagResultDTO.java

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CategoryTagListFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueCategoryTagListFormDTO.java
similarity index 66%
rename from epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CategoryTagListFormDTO.java
rename to epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueCategoryTagListFormDTO.java
index 0cece7cac2..d9339a0e97 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CategoryTagListFormDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueCategoryTagListFormDTO.java
@@ -10,10 +10,10 @@ import java.io.Serializable;
  * @Author sun
  */
 @Data
-public class CategoryTagListFormDTO implements Serializable {
+public class IssueCategoryTagListFormDTO implements Serializable {
 
     private static final long serialVersionUID = 2599592072265715951L;
-    @NotBlank(message = "议题ID不能为空",groups = {CategoryTagListFormDTO.CategoryTag.class})
+    @NotBlank(message = "议题ID不能为空",groups = {ProjectCategoryTagListFormDTO.CategoryTag.class})
     private String issueId;
 
     public interface CategoryTag{}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CategoryTagListResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueCategoryTagListResultDTO.java
similarity index 63%
rename from epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CategoryTagListResultDTO.java
rename to epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueCategoryTagListResultDTO.java
index ee6186e3aa..cd78b59aaf 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CategoryTagListResultDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueCategoryTagListResultDTO.java
@@ -11,17 +11,17 @@ import java.util.List;
  * @Author sun
  */
 @Data
-public class CategoryTagListResultDTO implements Serializable {
+public class IssueCategoryTagListResultDTO implements Serializable {
 
 	private static final long serialVersionUID = 5957826616179876849L;
 
 	/**
 	 * 类别集合
 	 */
-	private List<CategoryTagResultDTO> categoryList = new ArrayList<>();
+	private List<IssueCategoryTagResultDTO> categoryList = new ArrayList<>();
 	/**
 	 * 标签集合
 	 */
-	private List<CategoryTagResultDTO> tagList = new ArrayList<>();
+	private List<IssueCategoryTagResultDTO> tagList = new ArrayList<>();
 
 }
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CategoryTagResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueCategoryTagResultDTO.java
similarity index 84%
rename from epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CategoryTagResultDTO.java
rename to epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueCategoryTagResultDTO.java
index 2b4aa63fbe..23ac6afece 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CategoryTagResultDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueCategoryTagResultDTO.java
@@ -9,7 +9,7 @@ import java.io.Serializable;
  * @Author sun
  */
 @Data
-public class CategoryTagResultDTO implements Serializable {
+public class IssueCategoryTagResultDTO implements Serializable {
 
 	private static final long serialVersionUID = 5957826616179876849L;
 
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 a974ae1109..fc1da4b290 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,8 +2,8 @@ package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.IssueDTO;
 import com.epmet.dto.IssueApplicationDTO;
+import com.epmet.dto.IssueDTO;
 import com.epmet.dto.IssueSuggestionDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
@@ -209,4 +209,11 @@ public interface GovIssueOpenFeignClient {
 	 **/
 	@PostMapping(value = "/gov/issue/issueapplication/queryuserpubauditingissues")
     Result<List<UserPubAuditingIssueResDTO>> queryUserPubAuditingIssues(@RequestBody UserPubAuditingIssueFormDTO fomrDTO);
+
+	/**
+	 * @description 调用issue库，查询分类Id对应的分类名称，按分类升序排列
+	 * @author sun
+	 **/
+	@PostMapping(value = "/gov/issue/issuecategory/projectcategorylist")
+	Result<List<ProjectCategoryTagResultDTO>> projectCategoryList(@RequestBody List<String> categoryIdList);
 }
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 ea59c6d349..5866034512 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,8 +3,8 @@ 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.IssueDTO;
 import com.epmet.dto.IssueApplicationDTO;
+import com.epmet.dto.IssueDTO;
 import com.epmet.dto.IssueSuggestionDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
@@ -193,4 +193,13 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient
 	public Result<List<UserPubAuditingIssueResDTO>> queryUserPubAuditingIssues(UserPubAuditingIssueFormDTO fomrDTO) {
 		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "queryUserPubAuditingIssues", fomrDTO);
 	}
+
+	/**
+	 * @description 调用issue库，查询分类Id对应的分类名称，按分类升序排列
+	 * @author sun
+	 **/
+	@Override
+	public Result<List<ProjectCategoryTagResultDTO>> projectCategoryList(List<String> categoryIdList) {
+		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "projectCategoryList", categoryIdList);
+	}
 }
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 aaf37deea0..83aa6560d7 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
@@ -23,14 +23,12 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IssueCategoryDTO;
-import com.epmet.dto.form.CategoryTagListFormDTO;
-import com.epmet.dto.form.ClosedProjectIssueListFormDTO;
-import com.epmet.dto.form.MyShiftIssueTopicsFormDTO;
-import com.epmet.dto.result.CategoryTagListResultDTO;
-import com.epmet.dto.result.LatestListResultDTO;
+import com.epmet.dto.form.IssueCategoryTagListFormDTO;
+import com.epmet.dto.result.IssueCategoryTagListResultDTO;
+import com.epmet.dto.result.ProjectCategoryTagResultDTO;
 import com.epmet.excel.IssueCategoryExcel;
 import com.epmet.service.IssueCategoryService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -103,9 +101,20 @@ public class IssueCategoryController {
      * @Author sun
      **/
     @PostMapping("categorytaglist")
-    public Result<CategoryTagListResultDTO> categoryTagList(@RequestBody CategoryTagListFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO, CategoryTagListFormDTO.CategoryTag.class);
-        return new Result<CategoryTagListResultDTO>().ok(issueCategoryService.categoryTagList(formDTO));
+    public Result<IssueCategoryTagListResultDTO> categoryTagList(@RequestBody IssueCategoryTagListFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, IssueCategoryTagListFormDTO.CategoryTag.class);
+        return new Result<IssueCategoryTagListResultDTO>().ok(issueCategoryService.categoryTagList(formDTO));
+    }
+
+    /**
+     * @param categoryIdList
+     * @return
+     * @Description 查询分类Id集合对应的分类名称，按分类升序排列
+     * @Author sun
+     **/
+    @PostMapping("projectcategorylist")
+    public Result<List<ProjectCategoryTagResultDTO>> projectCategoryList(@RequestBody List<String> categoryIdList) {
+        return new Result<List<ProjectCategoryTagResultDTO>>().ok(issueCategoryService.projectCategoryList(categoryIdList));
     }
 
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
index 8fc966c738..b1929c55f7 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
@@ -18,7 +18,8 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.result.CategoryTagResultDTO;
+import com.epmet.dto.result.IssueCategoryTagResultDTO;
+import com.epmet.dto.result.ProjectCategoryTagResultDTO;
 import com.epmet.entity.IssueCategoryEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -38,5 +39,13 @@ public interface IssueCategoryDao extends BaseDao<IssueCategoryEntity> {
      * @Description 查询议题绑定的分类名称，按排序升序
      * @Author sun
      **/
-    List<CategoryTagResultDTO> selectIssueCategoryList(@Param("issueId") String issueId);
+    List<IssueCategoryTagResultDTO> selectIssueCategoryList(@Param("issueId") String issueId);
+
+    /**
+     * @param categoryIdList
+     * @return
+     * @Description 查询分类Id对应的分类名称，按分类升序排列
+     * @Author sun
+     **/
+    List<ProjectCategoryTagResultDTO> selectProjectCategoryList(List<String> categoryIdList);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueTagsDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueTagsDao.java
index 89c3d9ef69..e4c1e9e81d 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueTagsDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueTagsDao.java
@@ -18,7 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.result.CategoryTagResultDTO;
+import com.epmet.dto.result.IssueCategoryTagResultDTO;
 import com.epmet.entity.IssueTagsEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -38,5 +38,5 @@ public interface IssueTagsDao extends BaseDao<IssueTagsEntity> {
      * @Description 查询议题绑定的标签，按绑定时间升序
      * @Author sun
      **/
-    List<CategoryTagResultDTO> selectIssueTagList(@Param("issueId") String issueId);
+    List<IssueCategoryTagResultDTO> selectIssueTagList(@Param("issueId") String issueId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCategoryService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCategoryService.java
index 167621df74..6a3324c908 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCategoryService.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCategoryService.java
@@ -20,8 +20,9 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IssueCategoryDTO;
-import com.epmet.dto.form.CategoryTagListFormDTO;
-import com.epmet.dto.result.CategoryTagListResultDTO;
+import com.epmet.dto.form.IssueCategoryTagListFormDTO;
+import com.epmet.dto.result.IssueCategoryTagListResultDTO;
+import com.epmet.dto.result.ProjectCategoryTagResultDTO;
 import com.epmet.entity.IssueCategoryEntity;
 
 import java.util.List;
@@ -101,6 +102,13 @@ public interface IssueCategoryService extends BaseService<IssueCategoryEntity> {
      * @Description 获取议题的分类、标签列表
      * @Author sun
      **/
-    CategoryTagListResultDTO categoryTagList(CategoryTagListFormDTO formDTO);
+    IssueCategoryTagListResultDTO categoryTagList(IssueCategoryTagListFormDTO formDTO);
 
+    /**
+     * @param categoryIdList
+     * @return
+     * @Description 查询分类Id集合对应的分类名称，按分类升序排列
+     * @Author sun
+     **/
+    List<ProjectCategoryTagResultDTO> projectCategoryList(List<String> categoryIdList);
 }
\ No newline at end of file
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 0d9ae06927..82405538d6 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
@@ -20,16 +20,17 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.IssueCategoryDao;
 import com.epmet.dao.IssueTagsDao;
 import com.epmet.dto.IssueCategoryDTO;
-import com.epmet.dto.form.CategoryTagListFormDTO;
-import com.epmet.dto.result.CategoryTagListResultDTO;
-import com.epmet.dto.result.CategoryTagResultDTO;
+import com.epmet.dto.form.IssueCategoryTagListFormDTO;
+import com.epmet.dto.result.IssueCategoryTagListResultDTO;
+import com.epmet.dto.result.IssueCategoryTagResultDTO;
+import com.epmet.dto.result.ProjectCategoryTagResultDTO;
 import com.epmet.entity.IssueCategoryEntity;
 import com.epmet.redis.IssueCategoryRedis;
 import com.epmet.service.IssueCategoryService;
@@ -38,7 +39,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -116,19 +116,30 @@ public class IssueCategoryServiceImpl extends BaseServiceImpl<IssueCategoryDao,
      * @Author sun
      **/
     @Override
-    public CategoryTagListResultDTO categoryTagList(CategoryTagListFormDTO formDTO) {
-        CategoryTagListResultDTO resultDTO = new CategoryTagListResultDTO();
+    public IssueCategoryTagListResultDTO categoryTagList(IssueCategoryTagListFormDTO formDTO) {
+        IssueCategoryTagListResultDTO resultDTO = new IssueCategoryTagListResultDTO();
         //1.查询议题绑定的分类名称，按排序升序
-        List<CategoryTagResultDTO> categoryList = baseDao.selectIssueCategoryList(formDTO.getIssueId());
+        List<IssueCategoryTagResultDTO> categoryList = baseDao.selectIssueCategoryList(formDTO.getIssueId());
         if (categoryList.size() > NumConstant.ZERO) {
             resultDTO.setCategoryList(categoryList);
         }
         //2.查询议题绑定的标签，按绑定时间升序
-        List<CategoryTagResultDTO> tagList = issueTagsDao.selectIssueTagList(formDTO.getIssueId());
+        List<IssueCategoryTagResultDTO> tagList = issueTagsDao.selectIssueTagList(formDTO.getIssueId());
         if (tagList.size() > NumConstant.ZERO) {
             resultDTO.setTagList(tagList);
         }
         return resultDTO;
     }
 
+    /**
+     * @param categoryIdList
+     * @return
+     * @Description 查询分类Id集合对应的分类名称，按分类升序排列
+     * @Author sun
+     **/
+    @Override
+    public List<ProjectCategoryTagResultDTO> projectCategoryList(List<String> categoryIdList) {
+        return baseDao.selectProjectCategoryList(categoryIdList);
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
index 465833cee1..833bd4df11 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
@@ -3,7 +3,7 @@
 
 <mapper namespace="com.epmet.dao.IssueCategoryDao">
 
-    <select id="selectIssueCategoryList" resultType="com.epmet.dto.result.CategoryTagResultDTO">
+    <select id="selectIssueCategoryList" resultType="com.epmet.dto.result.IssueCategoryTagResultDTO">
         SELECT
             ic.category_id AS "id",
             ip.category_name AS "name"
@@ -18,4 +18,21 @@
             ip.sort ASC
     </select>
 
+    <select id="selectProjectCategoryList" resultType="com.epmet.dto.result.ProjectCategoryTagResultDTO">
+         SELECT
+            id AS "id",
+            category_name AS "name"
+        FROM
+            issue_project_category_dict
+        WHERE
+            del_flag = '0'
+        <if test="categoryIdList != null and categoryIdList!= ''">
+            <foreach collection="categoryIdList" item="id" open="AND(  " separator=" OR " index="index" close=")">
+                id = #{id}
+            </foreach>
+        </if>
+        ORDER BY
+            ip.sort ASC
+    </select>
+
 </mapper>
\ No newline at end of file
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 ca008c94f6..9e15021e6d 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
@@ -3,17 +3,17 @@
 
 <mapper namespace="com.epmet.dao.IssueTagsDao">
 
-    <select id="selectIssueTagList" resultType="com.epmet.dto.result.CategoryTagResultDTO">
+    <select id="selectIssueTagList" resultType="com.epmet.dto.result.IssueCategoryTagResultDTO">
         SELECT
-            it.tag_id AS "id",
-            it.tag_name AS "name"
+            tag_id AS "id",
+            tag_name AS "name"
         FROM
-            issue_tags it
+            issue_tags
         WHERE
-            it.del_flag = '0'
-        AND it.issue_id = #{issueId}
+            del_flag = '0'
+        AND issue_id = #{issueId}
         ORDER BY
-            it.created_time ASC
+            created_time ASC
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectCategoryTagListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectCategoryTagListFormDTO.java
new file mode 100644
index 0000000000..9c179732ac
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectCategoryTagListFormDTO.java
@@ -0,0 +1,22 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 获取议题的分类、标签列表-接口入参
+ * @Author sun
+ */
+@Data
+public class ProjectCategoryTagListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 2599592072265715951L;
+    @NotBlank(message = "议题ID不能为空",groups = {ProjectCategoryTagListFormDTO.CategoryTag.class})
+    private String projectId;
+
+    public interface CategoryTag{}
+
+
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectCategoryTagListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectCategoryTagListResultDTO.java
new file mode 100644
index 0000000000..43b33a74bf
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectCategoryTagListResultDTO.java
@@ -0,0 +1,27 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description 获取议题的分类、标签列表-接口返参
+ * @Author sun
+ */
+@Data
+public class ProjectCategoryTagListResultDTO implements Serializable {
+
+	private static final long serialVersionUID = 5957826616179876849L;
+
+	/**
+	 * 类别集合
+	 */
+	private List<ProjectCategoryTagResultDTO> categoryList = new ArrayList<>();
+	/**
+	 * 标签集合
+	 */
+	private List<ProjectCategoryTagResultDTO> tagList = new ArrayList<>();
+
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectCategoryTagResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectCategoryTagResultDTO.java
new file mode 100644
index 0000000000..375bc1a898
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectCategoryTagResultDTO.java
@@ -0,0 +1,25 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 获取议题的分类、标签列表-接口返参
+ * @Author sun
+ */
+@Data
+public class ProjectCategoryTagResultDTO implements Serializable {
+
+	private static final long serialVersionUID = 5957826616179876849L;
+
+	/**
+	 * 分类或标签Id
+	 */
+	private String id;
+	/**
+	 * 分类或标签名称
+	 */
+	private String name;
+
+}
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 505d54c529..c773ece4f9 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
@@ -23,9 +23,11 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.ProjectCategoryDTO;
+import com.epmet.dto.form.ProjectCategoryTagListFormDTO;
+import com.epmet.dto.result.ProjectCategoryTagListResultDTO;
 import com.epmet.excel.ProjectCategoryExcel;
 import com.epmet.service.ProjectCategoryService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,4 +93,16 @@ public class ProjectCategoryController {
         ExcelUtils.exportExcelToTarget(response, null, list, ProjectCategoryExcel.class);
     }
 
+    /**
+     * @param formDTO
+     * @return
+     * @Description 获取项目的分类、标签列表
+     * @Author sun
+     **/
+    @PostMapping("categorytaglist")
+    public Result<ProjectCategoryTagListResultDTO> categoryTagList(@RequestBody ProjectCategoryTagListFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, ProjectCategoryTagListFormDTO.CategoryTag.class);
+        return new Result<ProjectCategoryTagListResultDTO>().ok(projectCategoryService.categoryTagList(formDTO));
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectCategoryDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectCategoryDao.java
index 8186178086..ac041659f7 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectCategoryDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectCategoryDao.java
@@ -20,6 +20,9 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.entity.ProjectCategoryEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 项目所属分类表
@@ -29,5 +32,11 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ProjectCategoryDao extends BaseDao<ProjectCategoryEntity> {
-	
+
+    /**
+     * @Description 查询项目绑定的分类Id集合
+     * @Author sun
+     **/
+    List<String> selectProjectCategoryIdList(@Param("projectId") String projectId);
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectTagsDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectTagsDao.java
index 2b4435ab5f..da5b1d39c9 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectTagsDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectTagsDao.java
@@ -18,8 +18,12 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.ProjectCategoryTagResultDTO;
 import com.epmet.entity.ProjectTagsEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 项目关联标签表
@@ -29,5 +33,10 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ProjectTagsDao extends BaseDao<ProjectTagsEntity> {
-	
+
+    /**
+     * @Description 查询项目绑定的标签，按绑定时间升序
+     * @Author sun
+     **/
+    List<ProjectCategoryTagResultDTO> selectProjectTagList(@Param("projectId") String projectId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectCategoryService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectCategoryService.java
index 551b77ffbb..e31a951784 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectCategoryService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectCategoryService.java
@@ -20,6 +20,8 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.ProjectCategoryDTO;
+import com.epmet.dto.form.ProjectCategoryTagListFormDTO;
+import com.epmet.dto.result.ProjectCategoryTagListResultDTO;
 import com.epmet.entity.ProjectCategoryEntity;
 
 import java.util.List;
@@ -92,4 +94,12 @@ public interface ProjectCategoryService extends BaseService<ProjectCategoryEntit
      * @date 2020-12-08
      */
     void delete(String[] ids);
+
+    /**
+     * @param formDTO
+     * @return
+     * @Description 获取项目的分类、标签列表
+     * @Author sun
+     **/
+    ProjectCategoryTagListResultDTO categoryTagList(ProjectCategoryTagListFormDTO formDTO);
 }
\ No newline at end of file
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 5663981dba..315aa7fd59 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
@@ -20,12 +20,21 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.ProjectCategoryDao;
+import com.epmet.dao.ProjectTagsDao;
 import com.epmet.dto.ProjectCategoryDTO;
+import com.epmet.dto.form.ProjectCategoryTagListFormDTO;
+import com.epmet.dto.result.ProjectCategoryTagListResultDTO;
+import com.epmet.dto.result.ProjectCategoryTagResultDTO;
 import com.epmet.entity.ProjectCategoryEntity;
+import com.epmet.feign.GovIssueOpenFeignClient;
 import com.epmet.redis.ProjectCategoryRedis;
 import com.epmet.service.ProjectCategoryService;
 import org.apache.commons.lang3.StringUtils;
@@ -48,6 +57,10 @@ public class ProjectCategoryServiceImpl extends BaseServiceImpl<ProjectCategoryD
 
     @Autowired
     private ProjectCategoryRedis projectCategoryRedis;
+    @Autowired
+    private ProjectTagsDao projectTagsDao;
+    @Autowired
+    private GovIssueOpenFeignClient govIssueOpenFeignClient;
 
     @Override
     public PageData<ProjectCategoryDTO> page(Map<String, Object> params) {
@@ -101,4 +114,31 @@ public class ProjectCategoryServiceImpl extends BaseServiceImpl<ProjectCategoryD
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @param formDTO
+     * @return
+     * @Description 获取项目的分类、标签列表
+     * @Author sun
+     **/
+    @Override
+    public ProjectCategoryTagListResultDTO categoryTagList(ProjectCategoryTagListFormDTO formDTO) {
+        ProjectCategoryTagListResultDTO resultDTO = new ProjectCategoryTagListResultDTO();
+        //1.查询项目绑定的分类名称，按排序升序
+        List<String> categoryIdList = baseDao.selectProjectCategoryIdList(formDTO.getProjectId());
+        if (categoryIdList.size() > NumConstant.ZERO) {
+            //1-1.调用issue库，查询分类Id对应的分类名称，按分类升序排列
+            Result<List<ProjectCategoryTagResultDTO>> result = govIssueOpenFeignClient.projectCategoryList(categoryIdList);
+            if (!result.success()) {
+                throw new RenException(result.getInternalMsg());
+            }
+            resultDTO.setCategoryList(result.getData());
+        }
+        //2.查询项目绑定的标签，按绑定时间升序
+        List<ProjectCategoryTagResultDTO> tagList = projectTagsDao.selectProjectTagList(formDTO.getProjectId());
+        if (tagList.size() > NumConstant.ZERO) {
+            resultDTO.setTagList(tagList);
+        }
+        return resultDTO;
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml
index 5689229906..da4a2d332e 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml
@@ -3,6 +3,14 @@
 
 <mapper namespace="com.epmet.dao.ProjectCategoryDao">
 
-
+    <select id="selectProjectCategoryIdList" resultType="java.lang.String">
+        SELECT
+            CATEGORY_ID
+        FROM
+            project_category
+        WHERE
+            DEL_FLAG = '0'
+        AND PROJECT_ID = #{projectId}
+    </select>
 
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectTagsDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectTagsDao.xml
index 50ed689ab5..0936bcc4d4 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectTagsDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectTagsDao.xml
@@ -3,6 +3,17 @@
 
 <mapper namespace="com.epmet.dao.ProjectTagsDao">
 
-
+    <select id="selectProjectTagList" resultType="com.epmet.dto.result.ProjectCategoryTagResultDTO">
+        SELECT
+            tag_id AS "id",
+            tag_name AS "name"
+        FROM
+            project_tags
+        WHERE
+            del_flag = '0'
+        AND project_id = #{projectId}
+        ORDER BY
+            created_time ASC
+    </select>
 
 </mapper>
\ No newline at end of file

From 281404050b1c4500d0adadaa0873f0fa02952fe5 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 9 Dec 2020 10:46:15 +0800
Subject: [PATCH 006/119] =?UTF-8?q?=E5=88=86=E7=B1=BB=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/form/CustomerCategoryListFormDTO.java | 22 +++++++++++++
 .../IssueProjectCategoryDictController.java   | 28 +++++++++++++----
 .../dao/IssueProjectCategoryDictDao.java      | 16 +++++++++-
 .../IssueProjectCategoryDictService.java      | 10 ++++++
 .../IssueProjectCategoryDictServiceImpl.java  | 18 +++++++++--
 .../mapper/IssueProjectCategoryDictDao.xml    | 31 +++++++++++++++++++
 .../result/CustomerCategoryListResultDTO.java | 31 +++++++++++++++++++
 7 files changed, 147 insertions(+), 9 deletions(-)
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CustomerCategoryListFormDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CustomerCategoryListResultDTO.java

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CustomerCategoryListFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CustomerCategoryListFormDTO.java
new file mode 100644
index 0000000000..39ae42441e
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CustomerCategoryListFormDTO.java
@@ -0,0 +1,22 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 分类列表查询-接口入参
+ * @Author sun
+ */
+@Data
+public class CustomerCategoryListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 2599592072265715951L;
+    @NotBlank(message = "客户ID不能为空",groups = {CustomerCategoryListFormDTO.Category.class})
+    private String customerId;
+
+    public interface Category{}
+
+
+}
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 4f09b23bc1..87a31f658f 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
@@ -26,6 +26,10 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.IssueProjectCategoryDictDTO;
+import com.epmet.dto.form.CustomerCategoryListFormDTO;
+import com.epmet.dto.form.IssueCategoryTagListFormDTO;
+import com.epmet.dto.result.CustomerCategoryListResultDTO;
+import com.epmet.dto.result.ProjectCategoryTagResultDTO;
 import com.epmet.excel.IssueProjectCategoryDictExcel;
 import com.epmet.service.IssueProjectCategoryDictService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,24 +49,24 @@ import java.util.Map;
 @RestController
 @RequestMapping("issueprojectcategorydict")
 public class IssueProjectCategoryDictController {
-    
+
     @Autowired
     private IssueProjectCategoryDictService issueProjectCategoryDictService;
 
     @GetMapping("page")
-    public Result<PageData<IssueProjectCategoryDictDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<IssueProjectCategoryDictDTO>> page(@RequestParam Map<String, Object> params) {
         PageData<IssueProjectCategoryDictDTO> page = issueProjectCategoryDictService.page(params);
         return new Result<PageData<IssueProjectCategoryDictDTO>>().ok(page);
     }
 
     @GetMapping("{id}")
-    public Result<IssueProjectCategoryDictDTO> get(@PathVariable("id") String id){
+    public Result<IssueProjectCategoryDictDTO> get(@PathVariable("id") String id) {
         IssueProjectCategoryDictDTO data = issueProjectCategoryDictService.get(id);
         return new Result<IssueProjectCategoryDictDTO>().ok(data);
     }
 
     @PostMapping
-    public Result save(@RequestBody IssueProjectCategoryDictDTO dto){
+    public Result save(@RequestBody IssueProjectCategoryDictDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         issueProjectCategoryDictService.save(dto);
@@ -70,7 +74,7 @@ public class IssueProjectCategoryDictController {
     }
 
     @PutMapping
-    public Result update(@RequestBody IssueProjectCategoryDictDTO dto){
+    public Result update(@RequestBody IssueProjectCategoryDictDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         issueProjectCategoryDictService.update(dto);
@@ -78,7 +82,7 @@ public class IssueProjectCategoryDictController {
     }
 
     @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
+    public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
         issueProjectCategoryDictService.delete(ids);
@@ -91,4 +95,16 @@ public class IssueProjectCategoryDictController {
         ExcelUtils.exportExcelToTarget(response, null, list, IssueProjectCategoryDictExcel.class);
     }
 
+    /**
+     * @param formDTO
+     * @return
+     * @Description 客户分类列表查询，按分类升序排列
+     * @Author sun
+     **/
+    @PostMapping("list")
+    public Result<List<CustomerCategoryListResultDTO>> categoryList(@RequestBody CustomerCategoryListFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, CustomerCategoryListFormDTO.Category.class);
+        return new Result<List<CustomerCategoryListResultDTO>>().ok(issueProjectCategoryDictService.categoryList(formDTO));
+    }
+
 }
\ No newline at end of file
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 bd770671d5..485fef9b4b 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
@@ -18,8 +18,12 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.CustomerCategoryListResultDTO;
 import com.epmet.entity.IssueProjectCategoryDictEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 议题项目分类字典
@@ -29,5 +33,15 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface IssueProjectCategoryDictDao extends BaseDao<IssueProjectCategoryDictEntity> {
-	
+
+    /**
+     * @Description 客户分类列表查询，按分类升序排列
+     * @Author sun
+     **/
+    List<CustomerCategoryListResultDTO> selectCustomerCategoryList(@Param("customerId") String customerId);
+    /**
+     * @Description 查询某个分类的下级分类
+     * @Author sun
+     **/
+    List<CustomerCategoryListResultDTO> subCategoryList(@Param("categoryId") String categoryId);
 }
\ 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 5937393e1a..41a807cd40 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
@@ -20,6 +20,8 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IssueProjectCategoryDictDTO;
+import com.epmet.dto.form.CustomerCategoryListFormDTO;
+import com.epmet.dto.result.CustomerCategoryListResultDTO;
 import com.epmet.entity.IssueProjectCategoryDictEntity;
 
 import java.util.List;
@@ -92,4 +94,12 @@ public interface IssueProjectCategoryDictService extends BaseService<IssueProjec
      * @date 2020-12-08
      */
     void delete(String[] ids);
+
+    /**
+     * @param formDTO
+     * @return
+     * @Description 客户分类列表查询，按分类升序排列
+     * @Author sun
+     **/
+    List<CustomerCategoryListResultDTO> categoryList(CustomerCategoryListFormDTO formDTO);
 }
\ No newline at end of file
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 1bdb075c24..3aa823b8d3 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
@@ -25,6 +25,8 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.IssueProjectCategoryDictDao;
 import com.epmet.dto.IssueProjectCategoryDictDTO;
+import com.epmet.dto.form.CustomerCategoryListFormDTO;
+import com.epmet.dto.result.CustomerCategoryListResultDTO;
 import com.epmet.entity.IssueProjectCategoryDictEntity;
 import com.epmet.redis.IssueProjectCategoryDictRedis;
 import com.epmet.service.IssueProjectCategoryDictService;
@@ -65,8 +67,8 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
         return ConvertUtils.sourceToTarget(entityList, IssueProjectCategoryDictDTO.class);
     }
 
-    private QueryWrapper<IssueProjectCategoryDictEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+    private QueryWrapper<IssueProjectCategoryDictEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<IssueProjectCategoryDictEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -101,4 +103,16 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @param formDTO
+     * @return
+     * @Description 客户分类列表查询，按分类升序排列
+     * @Author sun
+     **/
+    @Override
+    public List<CustomerCategoryListResultDTO> categoryList(CustomerCategoryListFormDTO formDTO) {
+        List<CustomerCategoryListResultDTO> resultList = baseDao.selectCustomerCategoryList(formDTO.getCustomerId());
+        return resultList;
+    }
+
 }
\ No newline at end of file
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 8be2371d88..26caac2d50 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
@@ -3,6 +3,37 @@
 
 <mapper namespace="com.epmet.dao.IssueProjectCategoryDictDao">
 
+    <!-- sql递归 查询客户议题项目的分类信息以及递归查询二级分类信息 start-->
+    <resultMap id="categoryTree" type="com.epmet.dto.result.CustomerCategoryListResultDTO">
+        <id column="categoryId" property="id"/>
+        <result column="categoryName" property="name"/>
 
+        <collection property="subCategory" column="categoryId" ofType="com.epmet.dto.result.CustomerCategoryListResultDTO" select="subCategoryList">
+        </collection>
+    </resultMap>
+    <select id="selectCustomerCategoryList" resultMap="categoryTree">
+        SELECT
+            id AS "id",
+            category_type AS "name"
+        FROM
+            issue_project_category_dict
+        WHERE
+            del_flag = '0'
+        AND category_type = '1'
+        AND customer_id = #{customerId}
+        ORDER BY sort ASC
+    </select>
+    <select id="subCategoryList" resultMap="categoryTree">
+        SELECT
+            id AS "id",
+            category_type AS "name"
+        FROM
+            issue_project_category_dict
+        WHERE
+            del_flag = '0'
+        AND pid = #{categoryId}
+        ORDER BY sort ASC
+    </select>
+    <!-- sql递归 查询客户议题项目的分类信息以及递归查询二级分类信息 end-->
 
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CustomerCategoryListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CustomerCategoryListResultDTO.java
new file mode 100644
index 0000000000..2ae7331706
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CustomerCategoryListResultDTO.java
@@ -0,0 +1,31 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 获取议题的分类、标签列表-接口返参
+ * @Author sun
+ */
+@Data
+public class CustomerCategoryListResultDTO implements Serializable {
+
+	private static final long serialVersionUID = 5957826616179876849L;
+
+	/**
+	 * 分类Id
+	 */
+	private String id;
+	/**
+	 * 分类名称
+	 */
+	private String name;
+
+	/**
+	 * 子级分类对象
+	 */
+	private List<CustomerCategoryListResultDTO> subCategory;
+
+}

From 42fa70c787ac3275c78181b4fbb5a59157e0e13f Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Wed, 9 Dec 2020 13:52:08 +0800
Subject: [PATCH 007/119] =?UTF-8?q?=E6=A0=87=E7=AD=BEkey=20=20=20=20=20?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BEredis=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/constant/GovIssueRedisKeys.java | 12 +++++++++
 .../epmet/redis/IssueProjectTagDictRedis.java | 27 +++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/GovIssueRedisKeys.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/GovIssueRedisKeys.java
index 1da3dc7911..80635a483b 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/GovIssueRedisKeys.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/GovIssueRedisKeys.java
@@ -18,5 +18,17 @@ public class GovIssueRedisKeys {
     public static String getWorkGrassrootsIssueRedDotKey(String gridId) {
         return rootPrefix.concat(String.format("gov:wxmp:work:grassroots:issue:%s",gridId));
     }
+
+    /**
+     * 议题项目标签key         epmet:govern:customer:category:[customerId]:[categoryId]
+     *
+     * 自定义标签的categoryId统一为[customize]
+     * @param customerId
+     * @param categoryId
+     * @return
+     */
+    public static String getGovernmentTagKey(String customerId,String categoryId){
+        return rootPrefix.concat("govern:customer:category:").concat(customerId).concat(":").concat(categoryId);
+    }
 }
 
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
index 7c9f56bd38..662b85402c 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
@@ -18,9 +18,14 @@
 package com.epmet.redis;
 
 import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.dto.result.IssueCategoryTagResultDTO;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * 议题、项目标签字典表
  *
@@ -28,6 +33,7 @@ import org.springframework.stereotype.Component;
  * @since v1.0.0 2020-12-08
  */
 @Component
+@Slf4j
 public class IssueProjectTagDictRedis {
     @Autowired
     private RedisUtils redisUtils;
@@ -44,4 +50,25 @@ public class IssueProjectTagDictRedis {
         return null;
     }
 
+    /**
+     * @Description 传入category列表，返回对应category下的标签，按热度排序
+     *              category列表为空则查询客户下全部
+     *              如果想要自定义标签，单独请求一次，分类列表中只含"customize"
+     *
+     * @param customerId
+     * @param category
+     * @return java.util.List<com.epmet.dto.result.IssueCategoryTagResultDTO>
+     * @author wangc
+     * @date 2020.12.09 11:16
+    */
+    public List<IssueCategoryTagResultDTO> getTagsOrderByRank(String customerId,List<String> category){
+        if(StringUtils.isBlank(customerId)) {
+            log.error("customerId can not be null when obtain govern tags cache");
+            return null;
+        }
+
+
+        return null;
+    }
+
 }
\ No newline at end of file

From 2533e106f0152d19849fbbe17d34afecdf05034c Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 9 Dec 2020 14:16:09 +0800
Subject: [PATCH 008/119] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=87=AA=E6=B5=8B?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dao/IssueCategoryDao.java    |  2 +-
 .../com/epmet/dao/IssueProjectCategoryDictDao.java   |  2 +-
 .../src/main/resources/mapper/IssueCategoryDao.xml   |  4 ++--
 .../resources/mapper/IssueProjectCategoryDictDao.xml | 12 ++++++------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
index b1929c55f7..ad55b96802 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
@@ -47,5 +47,5 @@ public interface IssueCategoryDao extends BaseDao<IssueCategoryEntity> {
      * @Description 查询分类Id对应的分类名称，按分类升序排列
      * @Author sun
      **/
-    List<ProjectCategoryTagResultDTO> selectProjectCategoryList(List<String> categoryIdList);
+    List<ProjectCategoryTagResultDTO> selectProjectCategoryList(@Param("categoryIdList") List<String> categoryIdList);
 }
\ No newline at end of file
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 485fef9b4b..c3e44340e4 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
@@ -43,5 +43,5 @@ public interface IssueProjectCategoryDictDao extends BaseDao<IssueProjectCategor
      * @Description 查询某个分类的下级分类
      * @Author sun
      **/
-    List<CustomerCategoryListResultDTO> subCategoryList(@Param("categoryId") String categoryId);
+    List<CustomerCategoryListResultDTO> subCategoryList(@Param("id") String categoryId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
index 833bd4df11..875e1c755b 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
@@ -26,13 +26,13 @@
             issue_project_category_dict
         WHERE
             del_flag = '0'
-        <if test="categoryIdList != null and categoryIdList!= ''">
+        <if test="categoryIdList != null and categoryIdList.size() > 0">
             <foreach collection="categoryIdList" item="id" open="AND(  " separator=" OR " index="index" close=")">
                 id = #{id}
             </foreach>
         </if>
         ORDER BY
-            ip.sort ASC
+            sort ASC
     </select>
 
 </mapper>
\ No newline at end of file
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 26caac2d50..e638fec0b8 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
@@ -5,16 +5,16 @@
 
     <!-- sql递归 查询客户议题项目的分类信息以及递归查询二级分类信息 start-->
     <resultMap id="categoryTree" type="com.epmet.dto.result.CustomerCategoryListResultDTO">
-        <id column="categoryId" property="id"/>
-        <result column="categoryName" property="name"/>
+        <id column="id" property="id"/>
+        <result column="name" property="name"/>
 
-        <collection property="subCategory" column="categoryId" ofType="com.epmet.dto.result.CustomerCategoryListResultDTO" select="subCategoryList">
+        <collection property="subCategory" column="id" ofType="com.epmet.dto.result.CustomerCategoryListResultDTO" select="subCategoryList">
         </collection>
     </resultMap>
     <select id="selectCustomerCategoryList" resultMap="categoryTree">
         SELECT
             id AS "id",
-            category_type AS "name"
+            category_name AS "name"
         FROM
             issue_project_category_dict
         WHERE
@@ -26,12 +26,12 @@
     <select id="subCategoryList" resultMap="categoryTree">
         SELECT
             id AS "id",
-            category_type AS "name"
+            category_name AS "name"
         FROM
             issue_project_category_dict
         WHERE
             del_flag = '0'
-        AND pid = #{categoryId}
+        AND pid = #{id}
         ORDER BY sort ASC
     </select>
     <!-- sql递归 查询客户议题项目的分类信息以及递归查询二级分类信息 end-->

From 4b1cb6549835785774ec8763161bac4e0f410cf3 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 9 Dec 2020 14:39:39 +0800
Subject: [PATCH 009/119] =?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=BEspl?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/migration/V0.0.7__add_category_tag.sql | 67 +++++++++++++++++++
 .../db/migration/V0.0.5__add_category_tag.sql | 30 +++++++++
 2 files changed, 97 insertions(+)
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.7__add_category_tag.sql
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.5__add_category_tag.sql

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.7__add_category_tag.sql b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.7__add_category_tag.sql
new file mode 100644
index 0000000000..b198293630
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.7__add_category_tag.sql
@@ -0,0 +1,67 @@
+CREATE TABLE `issue_project_category_dict` (
+  `ID` varchar(64) NOT NULL COMMENT '主键',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id,  产品默认default',
+  `PID` varchar(64) NOT NULL COMMENT '上级分类ID 顶级此列存储0',
+  `PIDS` varchar(512) NOT NULL COMMENT '所有上级分类ID，用逗号分开',
+  `CATEGORY_CODE` varchar(50) DEFAULT NULL COMMENT '分类编码，分类编码+customer_id唯一',
+  `CATEGORY_NAME` varchar(500) NOT NULL COMMENT '分类名称',
+  `CATEGORY_TYPE` varchar(50) NOT NULL COMMENT '分类类别1,2,3,4....',
+  `SORT` int(10) unsigned NOT NULL COMMENT '排序',
+  `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除、1已删除',
+  `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁',
+  `CREATED_BY` varchar(32) CHARACTER SET utf8mb4 NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(32) CHARACTER SET utf8mb4 NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`,`CUSTOMER_ID`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='议题项目分类字典';
+
+CREATE TABLE `issue_project_tag_dict` (
+  `ID` varchar(64) NOT NULL COMMENT '主键ID',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
+  `TAG_NAME` varchar(32) NOT NULL COMMENT '标签名称',
+  `CATEGORY_ID` varchar(64) DEFAULT NULL COMMENT '分类id, 用户自己添加的标签此列可为空',
+  `IS_DEFAULT` varchar(32) NOT NULL COMMENT '是否是默认标签(0:是 1:否)',
+  `ISSUE_USE_COUNT` int(10) NOT NULL DEFAULT '0' COMMENT '议题对标签的引用次数',
+  `PROJECT_USE_COUNT` int(10) NOT NULL DEFAULT '0' COMMENT '项目对标签的引用次数',
+  `DEL_FLAG` int(11) 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
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='议题、项目标签字典表';
+
+
+CREATE TABLE `issue_category` (
+  `ID` varchar(64) NOT NULL COMMENT '主键',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
+  `GRID_ID` varchar(64) NOT NULL COMMENT '网格ID: 议题所属网格Id',
+  `ISSUE_ID` varchar(64) NOT NULL COMMENT '议题id',
+  `CATEGORY_ID` varchar(64) NOT NULL COMMENT '分类id',
+  `CATEGORY_PIDS` varchar(512) NOT NULL COMMENT '分类对应的所有上级,英文逗号隔开',
+  `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除、1已删除',
+  `REVISION` int(11) NOT NULL DEFAULT '0' 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
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='议题所属分类表';
+
+CREATE TABLE `issue_tags` (
+  `ID` varchar(64) NOT NULL COMMENT '主键ID',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
+  `GRID_ID` varchar(64) NOT NULL COMMENT '议题所属网格id',
+  `ISSUE_ID` varchar(64) NOT NULL COMMENT '议题ID',
+  `TAG_ID` varchar(64) NOT NULL COMMENT '标签ID',
+  `TAG_NAME` varchar(32) NOT NULL COMMENT '标签名称',
+  `DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除',
+  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='议题关联标签表';
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.5__add_category_tag.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.5__add_category_tag.sql
new file mode 100644
index 0000000000..b67338043b
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.5__add_category_tag.sql
@@ -0,0 +1,30 @@
+CREATE TABLE `project_category` (
+  `ID` varchar(64) NOT NULL COMMENT '主键',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
+  `GRID_ID` varchar(64) DEFAULT NULL COMMENT '来源网格id',
+  `PROJECT_ID` varchar(64) NOT NULL COMMENT '项目id',
+  `CATEGORY_ID` varchar(64) NOT NULL COMMENT '分类id',
+  `CATEGORY_PIDS` varchar(512) NOT NULL COMMENT '分类对应的所有上级,英文逗号隔开',
+  `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除、1已删除',
+  `REVISION` int(11) NOT NULL DEFAULT '0' 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
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='项目所属分类表';
+
+CREATE TABLE `project_tags` (
+  `ID` varchar(64) NOT NULL COMMENT '主键ID',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
+  `PROJECT_ID` varchar(64) NOT NULL COMMENT '项目ID',
+  `TAG_ID` varchar(64) NOT NULL COMMENT '标签ID',
+  `TAG_NAME` varchar(32) NOT NULL COMMENT '标签名称',
+  `DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除',
+  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='项目关联标签表';

From 95fc91a91024f4b8571a1f69be7bca9b3326c523 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 9 Dec 2020 15:12:27 +0800
Subject: [PATCH 010/119] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E6=AC=A1=E6=95=B0=E7=BC=93=E5=AD=98=E4=BF=AE=E6=94=B9=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/commons/tools/redis/RedisUtils.java | 18 ++++++++++---
 .../epmet/redis/IssueProjectTagDictRedis.java | 27 ++++++++++++++++++-
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java
index af891dc817..6e96d4c9dc 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java
@@ -10,12 +10,13 @@ package com.epmet.commons.tools.redis;
 
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
-import com.epmet.commons.tools.utils.ConvertUtils;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
-import org.springframework.data.redis.core.*;
+import org.springframework.data.redis.core.HashOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ZSetOperations;
 import org.springframework.data.redis.support.atomic.RedisAtomicLong;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
@@ -363,6 +364,17 @@ public class RedisUtils {
        return redisTemplate.opsForZSet().incrementScore(key, value, delta);
     }
 
+    /**
+     * @Description  获取某个Zset的score
+     * @Param key
+     * @Param o
+     * @author zxc
+     * @date 2020/12/9 下午3:07
+     */
+    public Double getScore(String key, Object o){
+        return redisTemplate.opsForZSet().score(key,o);
+    }
+
     /**
      * @Description 判断key是否存在
      * @param key
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
index 662b85402c..bfb6355cfa 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
@@ -17,10 +17,12 @@
 
 package com.epmet.redis;
 
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.constant.GovIssueRedisKeys;
 import com.epmet.dto.result.IssueCategoryTagResultDTO;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -71,4 +73,27 @@ public class IssueProjectTagDictRedis {
         return null;
     }
 
+    /**
+     * @Description  标签使用次数修改
+     * @Param customerId  客户ID
+     * @Param categoryId  标签ID 自定义标签的categoryId统一为[customize]
+     * @Param formDTO
+     * @Param status 标签次数更新状态 0：+1，1：-1
+     * @author zxc
+     * @date 2020/12/9 下午2:54
+     */
+    public void editTagUseCount(String customerId,String categoryId, Object formDTO,String status){
+        String key = GovIssueRedisKeys.getGovernmentTagKey(customerId, categoryId);
+        if (status.equals(NumConstant.ZERO_STR)){
+            // 标签使用次数+1
+            redisUtils.zIncrementScore(key, formDTO,NumConstant.ONE);
+        }
+        if (status.equals(NumConstant.ONE_STR)){
+            //标签使用次数-1
+            if (redisUtils.getScore(key,formDTO)>NumConstant.ZERO){
+                redisUtils.zIncrementScore(key, formDTO,NumConstant.ONE_NEG);
+            }
+        }
+    }
+
 }
\ No newline at end of file

From 7a46652a74dc1c96491b05ce24b703843301ef4d Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 9 Dec 2020 15:22:02 +0800
Subject: [PATCH 011/119] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/commons/tools/redis/RedisUtils.java   | 11 +++++++++++
 .../com/epmet/redis/IssueProjectTagDictRedis.java   | 13 +++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java
index 6e96d4c9dc..de481f10fd 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java
@@ -375,6 +375,17 @@ public class RedisUtils {
         return redisTemplate.opsForZSet().score(key,o);
     }
 
+    /**
+     * @Description  zset添加
+     * @Param key
+     * @Param o
+     * @author zxc
+     * @date 2020/12/9 下午3:18
+     */
+    public void zSetAdd(String key, Object o){
+        redisTemplate.opsForZSet().add(key,o,NumConstant.ZERO);
+    }
+
     /**
      * @Description 判断key是否存在
      * @param key
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
index bfb6355cfa..5236c91a56 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
@@ -96,4 +96,17 @@ public class IssueProjectTagDictRedis {
         }
     }
 
+    /**
+     * @Description  标签添加
+     * @Param customerId
+     * @Param categoryId
+     * @Param o
+     * @author zxc
+     * @date 2020/12/9 下午3:19
+     */
+    public void addIssueProjectTag(String customerId,String categoryId,Object o){
+        String key = GovIssueRedisKeys.getGovernmentTagKey(customerId, categoryId);
+        redisUtils.zSetAdd(key,o);
+    }
+
 }
\ No newline at end of file

From 8cfdf0b6678e2c63552c454cd77953c28589a2a8 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Wed, 9 Dec 2020 15:46:01 +0800
Subject: [PATCH 012/119] =?UTF-8?q?=E6=A0=87=E7=AD=BEredis=20fetch?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/IssueCategoryTagResultDTO.java | 15 ++++++
 .../com/epmet/constant/GovIssueRedisKeys.java |  6 ++-
 .../epmet/redis/IssueProjectTagDictRedis.java | 48 +++++++++++++++++--
 .../java/com/epmet/utils/ModuleConstants.java |  2 +
 4 files changed, 67 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueCategoryTagResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueCategoryTagResultDTO.java
index 23ac6afece..a36724d35a 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueCategoryTagResultDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueCategoryTagResultDTO.java
@@ -3,6 +3,7 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 /**
  * @Description 获取议题的分类、标签列表-接口返参
@@ -22,4 +23,18 @@ public class IssueCategoryTagResultDTO implements Serializable {
 	 */
 	private String name;
 
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
+		IssueCategoryTagResultDTO that = (IssueCategoryTagResultDTO) o;
+		return Objects.equals(id, that.id) &&
+				Objects.equals(name, that.name);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(id, name);
+	}
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/GovIssueRedisKeys.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/GovIssueRedisKeys.java
index 80635a483b..c9890f47b5 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/GovIssueRedisKeys.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/GovIssueRedisKeys.java
@@ -1,5 +1,9 @@
 package com.epmet.constant;
 
+import com.epmet.utils.ModuleConstants;
+
+import java.util.Optional;
+
 /**
  * @Description gov-issue-server模块redis key
  * @Author yinzuomei
@@ -28,7 +32,7 @@ public class GovIssueRedisKeys {
      * @return
      */
     public static String getGovernmentTagKey(String customerId,String categoryId){
-        return rootPrefix.concat("govern:customer:category:").concat(customerId).concat(":").concat(categoryId);
+        return rootPrefix.concat("govern:customer:category:").concat(customerId).concat(":").concat(Optional.ofNullable(categoryId).orElse(ModuleConstants.ASTERISK));
     }
 }
 
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
index 5236c91a56..873a5c9f83 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
@@ -22,11 +22,22 @@ import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.constant.GovIssueRedisKeys;
 import com.epmet.dto.result.IssueCategoryTagResultDTO;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.data.redis.connection.RedisConnection;
+import org.springframework.data.redis.core.RedisCallback;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.ZSetOperations;
+import org.springframework.lang.Nullable;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * 议题、项目标签字典表
@@ -39,7 +50,8 @@ import java.util.List;
 public class IssueProjectTagDictRedis {
     @Autowired
     private RedisUtils redisUtils;
-
+    @Autowired
+    private RedisTemplate redisTemplate;
     public void delete(Object[] ids) {
 
     }
@@ -65,10 +77,40 @@ public class IssueProjectTagDictRedis {
     */
     public List<IssueCategoryTagResultDTO> getTagsOrderByRank(String customerId,List<String> category){
         if(StringUtils.isBlank(customerId)) {
-            log.error("customerId can not be null when obtain govern tags cache");
+            log.error("customerId can not be null when obtain govern tags.");
             return null;
         }
 
+        Set<String> keys;
+        if(CollectionUtils.isEmpty(category))
+            keys = redisUtils.keys(GovIssueRedisKeys.getGovernmentTagKey(customerId,null));
+        else keys = category.stream().map(key -> {return GovIssueRedisKeys.getGovernmentTagKey(customerId,key);}).collect(Collectors.toSet());
+
+        List<Set<ZSetOperations.TypedTuple<Object>>> heatTuple = redisTemplate.executePipelined(new RedisCallback<Set<ZSetOperations.TypedTuple<Object>>>() {
+            @Nullable
+            @Override
+            public Set<ZSetOperations.TypedTuple<Object>> doInRedis(RedisConnection connection) throws DataAccessException {
+                connection.openPipeline();
+                keys.forEach(key -> {
+                    connection.zSetCommands().zRangeByScoreWithScores(redisTemplate.getKeySerializer().serialize(key), NumConstant.ZERO_L, (long) (NumConstant.ONE_NEG));
+                });
+                return null;
+            }
+        },redisTemplate.getValueSerializer());
+        //热度Map  分数为key
+        Map<Double,List<IssueCategoryTagResultDTO>> heatMap = new HashMap<>();
+        if(CollectionUtils.isEmpty(heatTuple)){
+
+        }
+
+        log.warn("fetch customer govern tag cache blankly , customerId:{} , now begin compensation...",customerId);
+        //TODO 补偿机制
+
+        log.warn("compensation completed !!");
+        return null;
+    }
+
+    public List<IssueCategoryTagResultDTO> compensate(String customerId,List<String> category){
 
         return null;
     }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/utils/ModuleConstants.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/utils/ModuleConstants.java
index 7aa596b986..a18dde80d5 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/utils/ModuleConstants.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/utils/ModuleConstants.java
@@ -154,4 +154,6 @@ public interface ModuleConstants {
     String ISSUE_ACTION_SHIFT = "转议题";
 
     String ISSUE_ACTION_REJECT = "驳回";
+
+    String ASTERISK = "*";
 }

From d537d7e8d6902b3a19331b25c26893f78776d8f3 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Wed, 9 Dec 2020 15:49:08 +0800
Subject: [PATCH 013/119] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/redis/IssueProjectTagDictRedis.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
index 873a5c9f83..df87613ffc 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
@@ -104,14 +104,16 @@ public class IssueProjectTagDictRedis {
         }
 
         log.warn("fetch customer govern tag cache blankly , customerId:{} , now begin compensation...",customerId);
-        //TODO 补偿机制
 
-        log.warn("compensation completed !!");
-        return null;
+        List<IssueCategoryTagResultDTO> compensate = compensate(customerId, category);
+
+        if(CollectionUtils.isEmpty(compensate)) {log.error("compensation failure or there is no default tag data in database !!"); return null;}
+        else{log.warn("compensation completed !!"); return compensate;}
+
     }
 
     public List<IssueCategoryTagResultDTO> compensate(String customerId,List<String> category){
-
+        //TODO 补偿机制
         return null;
     }
 

From 9a5ed155611d6e752d15d64ff2da0ce15e36c414 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Wed, 9 Dec 2020 16:06:01 +0800
Subject: [PATCH 014/119] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E8=BD=AC=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE-=E5=88=86=E7=B1=BB=E6=A0=87=E7=AD=BE=20=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/exception/EpmetErrorCode.java       |   1 +
 .../epmet/dto/form/ShiftProjectFormDTO.java   |  10 ++
 .../com/epmet/dto/form/TagListFormDTO.java    |  17 +++
 .../epmet/dto/result/TagListResultDTO.java    |  18 +++
 .../controller/IssueManageController.java     |  16 +++
 .../IssueProjectTagDictController.java        |  16 +++
 .../java/com/epmet/dao/IssueCategoryDao.java  |  11 ++
 .../main/java/com/epmet/dao/IssueTagsDao.java |  10 ++
 .../epmet/service/IssueCategoryService.java   |   9 ++
 .../service/IssueProjectTagDictService.java   |  13 ++
 .../java/com/epmet/service/IssueService.java  |   9 ++
 .../com/epmet/service/IssueTagsService.java   |   9 ++
 .../impl/IssueCategoryServiceImpl.java        |  13 ++
 .../impl/IssueProjectTagDictServiceImpl.java  |  17 +++
 .../epmet/service/impl/IssueServiceImpl.java  | 120 ++++++++++++++++++
 .../service/impl/IssueTagsServiceImpl.java    |  13 ++
 .../resources/mapper/IssueCategoryDao.xml     |  10 ++
 .../main/resources/mapper/IssueTagsDao.xml    |  12 ++
 .../service/impl/ProjectServiceImpl.java      |  33 +++++
 19 files changed, 357 insertions(+)
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/TagListFormDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/TagListResultDTO.java

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
index 4d3c107de3..102be5a3b7 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
@@ -126,6 +126,7 @@ public enum EpmetErrorCode {
 	ARTICLE_PUBLISH_ERROR(8801, "发布文章失败，请刷新重试"),
 	REPEATED_SUBMIT_ERROR(8998, "请勿重复提交"),
 	CUSTOMER_VALIDATE_ERROR(8999, "内部数据校验异常"),
+	CATEGORY_IS_NULL(8811, "请设置分类"),
 
 	//公众号  865..开头的码
 	PUBLIC_NOT_EXISTS(8651,"手机号未注册，请先完成信息注册"),
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ShiftProjectFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ShiftProjectFormDTO.java
index cf576522ac..b44cdb4acd 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ShiftProjectFormDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ShiftProjectFormDTO.java
@@ -1,6 +1,8 @@
 package com.epmet.dto.form;
 
+import com.epmet.dto.IssueCategoryDTO;
 import com.epmet.dto.IssueDTO;
+import com.epmet.dto.IssueTagsDTO;
 import com.epmet.resi.group.dto.topic.ResiTopicDTO;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
@@ -42,6 +44,14 @@ public class ShiftProjectFormDTO implements Serializable {
      * 话题对象信息
      */
     private ResiTopicDTO topicDTO ;
+    /**
+     * 议题分类
+     */
+    private List<IssueCategoryDTO> categoryList;
+    /**
+     * 议题标签
+     */
+    private List<IssueTagsDTO> tagList;
 
 }
 
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/TagListFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/TagListFormDTO.java
new file mode 100644
index 0000000000..f09aaa4272
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/TagListFormDTO.java
@@ -0,0 +1,17 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/12/9 15:32
+ */
+@Data
+public class TagListFormDTO implements Serializable {
+	private static final long serialVersionUID = -6448213704058150588L;
+	private List<String> categoryIdList;
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/TagListResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/TagListResultDTO.java
new file mode 100644
index 0000000000..1590463176
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/TagListResultDTO.java
@@ -0,0 +1,18 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/12/9 15:33
+ */
+@Data
+public class TagListResultDTO implements Serializable {
+	private static final long serialVersionUID = -4247291364077634874L;
+	List<IssueCategoryTagResultDTO> defaulted;
+	List<IssueCategoryTagResultDTO> customized;
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java
index 9eb5fb0c7d..3887b48938 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java
@@ -168,6 +168,22 @@ public class IssueManageController {
         return new Result();
     }
 
+    /**
+     * 议题管理-议题转项目-增加分类标签功能
+     * @author zhaoqifeng
+     * @date 2020/12/9 9:58
+     * @param tokenDTO
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     */
+    @PostMapping("shiftproject-v2")
+    public Result shiftProjectV2(@LoginUser TokenDto tokenDTO, @RequestBody ShiftProjectFormDTO formDTO) {
+        formDTO.setStaffId(tokenDTO.getUserId());
+        ValidatorUtils.validateEntity(formDTO);
+        issueService.shiftProject(formDTO);
+        return new Result();
+    }
+
     /**
      * @Description 政府端查看议题进展 (已关闭单表查询，转议题跨服务查询)
      * @param issueId
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectTagDictController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectTagDictController.java
index f4dbe2b03e..67d923b73a 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectTagDictController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectTagDictController.java
@@ -17,7 +17,9 @@
 
 package com.epmet.controller;
 
+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;
@@ -26,6 +28,8 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.IssueProjectTagDictDTO;
+import com.epmet.dto.form.TagListFormDTO;
+import com.epmet.dto.result.TagListResultDTO;
 import com.epmet.excel.IssueProjectTagDictExcel;
 import com.epmet.service.IssueProjectTagDictService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,4 +95,16 @@ public class IssueProjectTagDictController {
         ExcelUtils.exportExcelToTarget(response, null, list, IssueProjectTagDictExcel.class);
     }
 
+    /**
+     * 标签列表
+     * @author zhaoqifeng
+     * @date 2020/12/9 15:43
+     * @param tokenDto
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.TagListResultDTO>
+     */
+    @PostMapping("list")
+    public Result<TagListResultDTO> list(@LoginUser TokenDto tokenDto, @RequestBody TagListFormDTO formDTO) {
+        return new Result<TagListResultDTO>().ok(issueProjectTagDictService.getTagList(tokenDto, formDTO));
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
index ad55b96802..7c6d4dbcc8 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
@@ -18,6 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.IssueCategoryDTO;
 import com.epmet.dto.result.IssueCategoryTagResultDTO;
 import com.epmet.dto.result.ProjectCategoryTagResultDTO;
 import com.epmet.entity.IssueCategoryEntity;
@@ -48,4 +49,14 @@ public interface IssueCategoryDao extends BaseDao<IssueCategoryEntity> {
      * @Author sun
      **/
     List<ProjectCategoryTagResultDTO> selectProjectCategoryList(@Param("categoryIdList") List<String> categoryIdList);
+    List<ProjectCategoryTagResultDTO> selectProjectCategoryList(List<String> categoryIdList);
+
+    /**
+     * 获取议题分类
+     * @author zhaoqifeng
+     * @date 2020/12/9 10:46
+     * @param issueId
+     * @return java.util.List<com.epmet.dto.IssueCategoryDTO>
+     */
+    List<IssueCategoryDTO> selectCategoryByIssue(@Param("issueId") String issueId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueTagsDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueTagsDao.java
index e4c1e9e81d..547b840c17 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueTagsDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueTagsDao.java
@@ -18,6 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.IssueTagsDTO;
 import com.epmet.dto.result.IssueCategoryTagResultDTO;
 import com.epmet.entity.IssueTagsEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -39,4 +40,13 @@ public interface IssueTagsDao extends BaseDao<IssueTagsEntity> {
      * @Author sun
      **/
     List<IssueCategoryTagResultDTO> selectIssueTagList(@Param("issueId") String issueId);
+
+    /**
+     * 获取议题标签
+     * @author zhaoqifeng
+     * @date 2020/12/9 14:05
+     * @param issueId
+     * @return java.util.List<com.epmet.dto.IssueTagsDTO>
+     */
+    List<IssueTagsDTO> selectTagsByIssue(@Param("issueId") String issueId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCategoryService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCategoryService.java
index 6a3324c908..412c9199f1 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCategoryService.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCategoryService.java
@@ -111,4 +111,13 @@ public interface IssueCategoryService extends BaseService<IssueCategoryEntity> {
      * @Author sun
      **/
     List<ProjectCategoryTagResultDTO> projectCategoryList(List<String> categoryIdList);
+
+    /**
+     * 获取议题分类
+     * @author zhaoqifeng
+     * @date 2020/12/9 10:48
+     * @param issueId
+     * @return java.util.List<com.epmet.dto.IssueCategoryDTO>
+     */
+    List<IssueCategoryDTO> getCategoryByIssue(String issueId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectTagDictService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectTagDictService.java
index 46521d6bbb..9c730be5bc 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectTagDictService.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectTagDictService.java
@@ -19,7 +19,10 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.IssueProjectTagDictDTO;
+import com.epmet.dto.form.TagListFormDTO;
+import com.epmet.dto.result.TagListResultDTO;
 import com.epmet.entity.IssueProjectTagDictEntity;
 
 import java.util.List;
@@ -92,4 +95,14 @@ public interface IssueProjectTagDictService extends BaseService<IssueProjectTagD
      * @date 2020-12-08
      */
     void delete(String[] ids);
+
+    /**
+     * 标签列表
+     * @author zhaoqifeng
+     * @date 2020/12/9 15:41
+     * @param tokenDto
+     * @param formDTO
+     * @return com.epmet.dto.result.TagListResultDTO
+     */
+    TagListResultDTO getTagList(TokenDto tokenDto, TagListFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java
index 0c58cfc807..88338b2aed 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java
@@ -205,6 +205,15 @@ public interface IssueService extends BaseService<IssueEntity> {
      **/
     void shiftProject(ShiftProjectFormDTO formDTO);
 
+    /**
+     * 议题管理-议题转项目-增加分类标签功能
+     * @author zhaoqifeng
+     * @date 2020/12/9 10:01
+     * @param formDTO
+     * @return void
+     */
+    void shiftProjectV2(ShiftProjectFormDTO formDTO);
+
     /**
      * @Description 已关闭列表 政府端
      * @param issueListForm
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueTagsService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueTagsService.java
index b4e37ae7c0..5bc717fb3c 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueTagsService.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueTagsService.java
@@ -92,4 +92,13 @@ public interface IssueTagsService extends BaseService<IssueTagsEntity> {
      * @date 2020-12-08
      */
     void delete(String[] ids);
+
+    /**
+     * 获取议题标签
+     * @author zhaoqifeng
+     * @date 2020/12/9 14:07
+     * @param issueId
+     * @return java.util.List<com.epmet.dto.IssueTagsDTO>
+     */
+    List<IssueTagsDTO> getTagsByIssue(String issueId);
 }
\ No newline at end of file
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 82405538d6..94e492abf5 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
@@ -142,4 +142,17 @@ public class IssueCategoryServiceImpl extends BaseServiceImpl<IssueCategoryDao,
         return baseDao.selectProjectCategoryList(categoryIdList);
     }
 
+    /**
+     * 获取议题分类
+     *
+     * @param issueId
+     * @return java.util.List<com.epmet.dto.IssueCategoryDTO>
+     * @author zhaoqifeng
+     * @date 2020/12/9 10:48
+     */
+    @Override
+    public List<IssueCategoryDTO> getCategoryByIssue(String issueId) {
+        return baseDao.selectCategoryByIssue(issueId);
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
index 2250587ec3..aae0d8dc5d 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
@@ -21,10 +21,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.IssueProjectTagDictDao;
 import com.epmet.dto.IssueProjectTagDictDTO;
+import com.epmet.dto.form.TagListFormDTO;
+import com.epmet.dto.result.TagListResultDTO;
 import com.epmet.entity.IssueProjectTagDictEntity;
 import com.epmet.redis.IssueProjectTagDictRedis;
 import com.epmet.service.IssueProjectTagDictService;
@@ -101,4 +104,18 @@ public class IssueProjectTagDictServiceImpl extends BaseServiceImpl<IssueProject
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * 标签列表
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return com.epmet.dto.result.TagListResultDTO
+     * @author zhaoqifeng
+     * @date 2020/12/9 15:41
+     */
+    @Override
+    public TagListResultDTO getTagList(TokenDto tokenDto, TagListFormDTO formDTO) {
+        return null;
+    }
+
 }
\ 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 afa7f9782f..5eb6651ae4 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
@@ -110,6 +110,12 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
     private EpmetUserOpenFeignClient userOpenFeignClient;
     @Autowired
     private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
+    @Autowired
+    private IssueCategoryService issueCategoryService;
+    @Autowired
+    private IssueTagsService issueTagsService;
+    @Autowired
+    private IssueProjectTagDictService issueProjectTagDictService;
 
 
 	@Value("${openapi.scan.server.url}")
@@ -879,6 +885,120 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         }
 	}
 
+    /**
+     * 议题管理-议题转项目-增加分类标签功能
+     *
+     * @param formDTO
+     * @return void
+     * @author zhaoqifeng
+     * @date 2020/12/9 10:01
+     */
+    @Override
+    public void shiftProjectV2(ShiftProjectFormDTO formDTO) {
+
+        //获取议题分类
+        List<IssueCategoryDTO> categoryList = issueCategoryService.getCategoryByIssue(formDTO.getIssueId());
+        if (CollectionUtils.isEmpty(categoryList)) {
+            throw new RenException(EpmetErrorCode.CATEGORY_IS_NULL.getCode());
+        }
+
+        //公开回复内容审核
+        if (StringUtils.isNotBlank(formDTO.getPublicReply())) {
+            TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
+            TextTaskDTO taskDTO = new TextTaskDTO();
+            taskDTO.setDataId(UUID.randomUUID().toString().replace("-", ""));
+            taskDTO.setContent(formDTO.getPublicReply());
+            textScanParamDTO.getTasks().add(taskDTO);
+            Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
+            if (!textSyncScanResult.success()) {
+                throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+            } else {
+                if (!textSyncScanResult.getData().isAllPass()) {
+                    throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
+                }
+            }
+        }
+
+        //因需要保证议题表中的转项目时间与创建项目时间一致 因此先新增项目数据再更新议题数据
+        //1:查询议题数据
+        IssueEntity entity = baseDao.selectById(formDTO.getIssueId());
+        if (null == entity) {
+            throw new RenException(IssueConstant.SELECT_EXCEPTION);
+        }
+        if (IssueConstant.ISSUE_SHIFT_PROJECT.equals(entity.getIssueStatus())) {
+            throw new RenException(IssueConstant.ISSUE_SHIFT_PROJECT_EXCEPTION);
+        }
+        if (!IssueConstant.ISSUE_VOTING.equals(entity.getIssueStatus())) {
+            throw new RenException(IssueConstant.ISSUE_VOTING_EXCEPTION);
+        }
+        formDTO.setIssueDTO(ConvertUtils.sourceToTarget(entity, IssueDTO.class));
+
+        //2:调用resi-group查询话题创建人数据(目前议题来源只有来自话题),为了到项目服务初始数据以及发送消息使用
+        Result<ResiTopicDTO> resultTopicDTO = resiGroupFeignClient.getTopicById(entity.getSourceId());
+        if (!resultTopicDTO.success() || null == resultTopicDTO.getData()) {
+            throw new RenException(IssueConstant.SELECT_TOPIC_EXCEPTION);
+        }
+        ResiTopicDTO topicDTO = resultTopicDTO.getData();
+        formDTO.setTopicDTO(topicDTO);
+
+        //3:调用gov-project服务，新增项目各业务表初始数据
+        formDTO.setCategoryList(categoryList);
+        List<IssueTagsDTO> tagList = issueTagsService.getTagsByIssue(formDTO.getIssueId());
+        formDTO.setTagList(tagList);
+        Result<IssueProjectResultDTO> resultDTO = govProjectFeignClient.issueShiftProject(formDTO);
+        if (!resultDTO.success() || null == resultDTO.getData()) {
+            logger.error(resultDTO.getInternalMsg());
+            throw new RenException(IssueConstant.GOV_PRJECT_EXCEPTION);
+        }
+        IssueProjectResultDTO issueProjectResultDTO = resultDTO.getData();
+        //更新项目对标签的引用次数
+        if (CollectionUtils.isNotEmpty(tagList)) {
+            tagList.forEach(item -> {
+                IssueProjectTagDictDTO tag = issueProjectTagDictService.get(item.getTagId());
+                tag.setProjectUseCount(tag.getProjectUseCount() + NumConstant.ONE);
+                issueProjectTagDictService.update(tag);
+            });
+        }
+
+        //4:更新议题相关业务表数据
+        //4.1:更新议题表数据
+        entity.setIssueStatus(IssueConstant.ISSUE_SHIFT_PROJECT);
+        entity.setShiftedTime(issueProjectResultDTO.getShiftedTime());
+        baseDao.updateById(entity);
+
+        //4.2:议题处理进展表新增数据
+        IssueProcessEntity processEntity = new IssueProcessEntity();
+        processEntity.setIssueId(entity.getId());
+        processEntity.setIssueStatus(IssueConstant.ISSUE_SHIFT_PROJECT);
+        processEntity.setOrgType(IssueConstant.ISSUE_GRID);
+        processEntity.setOrgId(entity.getGridId());
+        processEntity.setOrgName(issueProjectResultDTO.getOrgName());
+        issueProcessDao.insert(processEntity);
+
+        //4.3:议题项目关系表新增数据
+        IssueProjectRelationEntity relationEntity = new IssueProjectRelationEntity();
+        relationEntity.setIssueId(entity.getId());
+        relationEntity.setProjectId(issueProjectResultDTO.getProjectId());
+        issueProjectRelationDao.insert(relationEntity);
+
+        //5:调用epmet-message服务，给居民端话题创建人、议题发起人以及政府端工作人员发送消息
+        if (!shiftProjectMessage(issueProjectResultDTO, formDTO, entity).success()) {
+            throw new RenException(IssueConstant.SAVE_MSG_EXCEPTION);
+        }
+        //5-1:2020.10.26  添加给居民端话题创建人、议题发起人以及政府端工作人员推送微信订阅消息功能  sun
+        if (!wxmpShiftProjectMessage(issueProjectResultDTO, formDTO, entity).success()) {
+            logger.error("议题转项目，推送微信订阅消息失败！");
+        }
+
+        //6:缓存中网格下表决中的议题总数减1
+        govIssueRedis.subtractWorkGrassrootsIssueRedDotValue(entity.getGridId());
+        try{
+            issueVoteStatisticalService.syncVotingCacheToDbByParams(formDTO.getIssueId(),entity.getGridId(),null);
+        }catch(RenException e){
+            logger.error(e.getInternalMsg());
+        }
+    }
+
     /**
      * @Description 议题转项目时给话题创建人、议题发起人、勾选的工作人员分别推送消息
      * @author sun
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
index 6a9002cd7c..7641a4bacb 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
@@ -101,4 +101,17 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * 获取议题标签
+     *
+     * @param issueId
+     * @return java.util.List<com.epmet.dto.IssueTagsDTO>
+     * @author zhaoqifeng
+     * @date 2020/12/9 14:07
+     */
+    @Override
+    public List<IssueTagsDTO> getTagsByIssue(String issueId) {
+        return baseDao.selectTagsByIssue(issueId);
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
index 875e1c755b..49a894c252 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
@@ -34,5 +34,15 @@
         ORDER BY
             sort ASC
     </select>
+    <select id="selectCategoryByIssue" resultType="com.epmet.dto.IssueCategoryDTO">
+        SELECT
+               CUSTOMER_ID,
+               GRID_ID,
+               CATEGORY_ID,
+               CATEGORY_PIDS
+        FROM issue_category
+        WHERE DEL_FLAG = '0'
+        AND ISSUE_ID = #{issueId}
+    </select>
 
 </mapper>
\ No newline at end of file
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 9e15021e6d..960983e143 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
@@ -15,5 +15,17 @@
         ORDER BY
             created_time ASC
     </select>
+    <select id="selectTagsByIssue" resultType="com.epmet.dto.IssueTagsDTO">
+        SELECT
+            CUSTOMER_ID,
+            GRID_ID,
+            TAG_ID,
+            TAG_NAME
+        FROM
+            issue_tags
+        WHERE
+            DEL_FLAG = '0'
+          AND ISSUE_ID = #{issueId}
+    </select>
 
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
index 7334c73c39..be402ac8a4 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@@ -102,6 +102,10 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	private String textSyncScanMethod;
 	@Autowired
 	private ProjectOrgRelationDao relationDao;
+	@Autowired
+	private ProjectCategoryService projectCategoryService;
+	@Autowired
+	private ProjectTagsService projectTagsService;
 
 	private final static String ONE_DAY = "<1";
 
@@ -850,6 +854,34 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		list.add(entity2);
 		projectRelatedPersonnelService.insertBatch(list);
 
+		//项目分类和标签表初始数据
+		if (CollectionUtils.isNotEmpty(formDTO.getCategoryList())) {
+			List<ProjectCategoryEntity> categoryList = new ArrayList<>();
+			formDTO.getCategoryList().forEach(item -> {
+				ProjectCategoryEntity entity = new ProjectCategoryEntity();
+				entity.setCategoryId(item.getCategoryId());
+				entity.setCategoryPids(item.getCategoryPids());
+				entity.setCustomerId(item.getCustomerId());
+				entity.setGridId(item.getGridId());
+				entity.setProjectId(projectEntity.getId());
+				categoryList.add(entity);
+			});
+			projectCategoryService.insertBatch(categoryList);
+
+			if (CollectionUtils.isNotEmpty(formDTO.getTagList())) {
+				List<ProjectTagsEntity> tagList = new ArrayList<>();
+				formDTO.getTagList().forEach(item -> {
+					ProjectTagsEntity entity = new ProjectTagsEntity();
+					entity.setCustomerId(item.getCustomerId());
+					entity.setTagId(item.getTagId());
+					entity.setTagName(item.getTagName());
+					entity.setProjectId(projectEntity.getId());
+					tagList.add(entity);
+				});
+				projectTagsService.insertBatch(tagList);
+			}
+		}
+
 		//6:返回接口参数
 		issueProjectResultDTO.setProjectId(projectEntity.getId());
 		issueProjectResultDTO.setOrgName(processEntity.getDepartmentName());
@@ -859,6 +891,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		return issueProjectResultDTO;
 	}
 
+
 	@Override
 	public void response(ProjectResponseFormDTO formDTO) {
 		//公开回复内容审核

From e4c97e682375fcc1784c5996096ed5b6294814ac Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Wed, 9 Dec 2020 16:46:09 +0800
Subject: [PATCH 015/119] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E7=B1=BB=E5=88=ABId=E5=B8=B8=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/redis/IssueProjectTagDictRedis.java | 45 ++++++++++++++-----
 .../java/com/epmet/utils/ModuleConstants.java |  4 ++
 2 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
index df87613ffc..119503607a 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
@@ -21,6 +21,8 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.constant.GovIssueRedisKeys;
 import com.epmet.dto.result.IssueCategoryTagResultDTO;
+import com.epmet.utils.ModuleConstants;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,10 +35,7 @@ import org.springframework.lang.Nullable;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -99,21 +98,42 @@ public class IssueProjectTagDictRedis {
         },redisTemplate.getValueSerializer());
         //热度Map  分数为key
         Map<Double,List<IssueCategoryTagResultDTO>> heatMap = new HashMap<>();
-        if(CollectionUtils.isEmpty(heatTuple)){
+        if(!CollectionUtils.isEmpty(heatTuple)){
+            heatTuple.forEach(tupleSet -> {
+                tupleSet.forEach( tuple -> {
+                    IssueCategoryTagResultDTO entity = parseObject(tuple.getValue(),IssueCategoryTagResultDTO.class);
+                    Double heatScore = tuple.getScore();
+                    List<IssueCategoryTagResultDTO> queue = heatMap.get(heatScore);
+                    if(CollectionUtils.isEmpty(queue)) queue = new LinkedList<>();
+                    queue.add(entity);
+                } );
+            });
+            List<IssueCategoryTagResultDTO> result = new LinkedList<>();
+            heatMap.keySet().stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList()).forEach(count -> {
+                result.addAll(heatMap.get(count));
+            });
+            return result;
 
         }
 
-        log.warn("fetch customer govern tag cache blankly , customerId:{} , now begin compensation...",customerId);
+        if(CollectionUtils.isEmpty(keys) || !keys.iterator().next().contains(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_ID)) {
+            log.warn("fetch customer govern tag cache blankly , customerId:{} , now begin compensation...", customerId);
 
-        List<IssueCategoryTagResultDTO> compensate = compensate(customerId, category);
-
-        if(CollectionUtils.isEmpty(compensate)) {log.error("compensation failure or there is no default tag data in database !!"); return null;}
-        else{log.warn("compensation completed !!"); return compensate;}
+            List<IssueCategoryTagResultDTO> compensate = compensate(customerId, category);
 
+            if (CollectionUtils.isEmpty(compensate)) {
+                log.error("compensation failure or there is no default tag data in database !!");
+                return null;
+            } else {
+                log.warn("compensation completed !!");
+                return compensate;
+            }
+        }return null;
     }
 
     public List<IssueCategoryTagResultDTO> compensate(String customerId,List<String> category){
         //TODO 补偿机制
+
         return null;
     }
 
@@ -153,4 +173,9 @@ public class IssueProjectTagDictRedis {
         redisUtils.zSetAdd(key,o);
     }
 
+    public <T> T parseObject(Object o,Class<T> clazz){
+        ObjectMapper objectMapper = new ObjectMapper();
+        T t = objectMapper.convertValue(o, clazz);
+        return t;
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/utils/ModuleConstants.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/utils/ModuleConstants.java
index a18dde80d5..2b90d2ff16 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/utils/ModuleConstants.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/utils/ModuleConstants.java
@@ -156,4 +156,8 @@ public interface ModuleConstants {
     String ISSUE_ACTION_REJECT = "驳回";
 
     String ASTERISK = "*";
+    /**
+     * 自定义标签类别缺省值
+     */
+    String CUSTOMIZED_TAG_CATEGORY_ID = "customize";
 }

From 54c03c1dbd61ee99a7a37a8b49a4f58e32123641 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 9 Dec 2020 17:42:38 +0800
Subject: [PATCH 016/119] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E3=80=81=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=EF=BC=9A=E4=BF=9D=E5=AD=98/=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/form/IssueSaveCategoryFormDTO.java    | 28 +++++++++
 .../dto/form/SaveIssueCategoryFormDTO.java    | 27 ++++++++
 .../epmet/feign/GovIssueOpenFeignClient.java  |  7 +++
 .../GovIssueOpenFeignClientFallBack.java      |  9 +++
 .../controller/IssueCategoryController.java   | 31 ++++++++--
 .../IssueProjectCategoryDictController.java   | 28 ++++++++-
 .../java/com/epmet/dao/IssueCategoryDao.java  |  7 ++-
 .../dao/IssueProjectCategoryDictDao.java      |  9 +++
 .../epmet/dao/IssueProjectRelationDao.java    |  6 ++
 .../epmet/service/IssueCategoryService.java   | 11 ++++
 .../IssueProjectCategoryDictService.java      | 18 ++++++
 .../impl/IssueCategoryServiceImpl.java        | 61 +++++++++++++++++++
 .../IssueProjectCategoryDictServiceImpl.java  | 48 ++++++++++++++-
 .../resources/mapper/IssueCategoryDao.xml     |  9 +++
 .../mapper/IssueProjectCategoryDictDao.xml    | 16 +++++
 .../mapper/IssueProjectRelationDao.xml        | 12 ++++
 .../gov-project/gov-project-client/pom.xml    |  6 ++
 .../dto/form/ProjectSaveCategoryFormDTO.java  | 28 +++++++++
 .../dto/form/SaveIssueCategoryFormDTO.java    | 26 ++++++++
 .../result/ProjectIssueCategoryResultDTO.java | 27 ++++++++
 .../controller/ProjectCategoryController.java | 19 ++++++
 .../com/epmet/dao/ProjectCategoryDao.java     |  5 ++
 .../epmet/service/ProjectCategoryService.java |  9 +++
 .../impl/ProjectCategoryServiceImpl.java      | 49 ++++++++++++++-
 .../resources/mapper/ProjectCategoryDao.xml   | 14 ++++-
 25 files changed, 495 insertions(+), 15 deletions(-)
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueSaveCategoryFormDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/SaveIssueCategoryFormDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectSaveCategoryFormDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/SaveIssueCategoryFormDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectIssueCategoryResultDTO.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
new file mode 100644
index 0000000000..4a9ef489ba
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueSaveCategoryFormDTO.java
@@ -0,0 +1,28 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 议题：保存/修改分类-接口入参
+ * @Author sun
+ */
+@Data
+public class IssueSaveCategoryFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 2599592072265715951L;
+    /**
+     * 议题Id
+     */
+    @NotBlank(message = "议题ID不能为空",groups = {ProjectSaveCategoryFormDTO.SaveCategory.class})
+    private String issueId;
+    /**
+     * 议题分类集合
+     */
+    private List<SaveIssueCategoryFormDTO> categoryList;
+    public interface SaveCategory{}
+
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/SaveIssueCategoryFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/SaveIssueCategoryFormDTO.java
new file mode 100644
index 0000000000..8941320269
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/SaveIssueCategoryFormDTO.java
@@ -0,0 +1,27 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 议题：保存/修改分类-接口入参
+ *
+ * @Author sun
+ */
+@Data
+public class SaveIssueCategoryFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 2599592072265715951L;
+    /**
+     * 分类Id
+     */
+    private String id;
+    /**
+     * 分类名称
+     */
+    private String name;
+
+
+}
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 fc1da4b290..f94291e5bb 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
@@ -216,4 +216,11 @@ public interface GovIssueOpenFeignClient {
 	 **/
 	@PostMapping(value = "/gov/issue/issuecategory/projectcategorylist")
 	Result<List<ProjectCategoryTagResultDTO>> projectCategoryList(@RequestBody List<String> categoryIdList);
+
+	/**
+	 * @description 查询项目所属客户和所属网格信息以及分类对应的分类信息
+	 * @author sun
+	 **/
+	@PostMapping(value = "/gov/issue/issueprojectcategorydict/getprojectandcategoryinfo")
+	Result<ProjectIssueCategoryResultDTO> getProjectAndCategoryInfo(ProjectSaveCategoryFormDTO formDTO);
 }
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 5866034512..c261fa79d1 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
@@ -202,4 +202,13 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient
 	public Result<List<ProjectCategoryTagResultDTO>> projectCategoryList(List<String> categoryIdList) {
 		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "projectCategoryList", categoryIdList);
 	}
+
+	/**
+	 * @description 查询项目所属客户和所属网格信息以及分类对应的分类信息
+	 * @author sun
+	 **/
+	@Override
+	public Result<ProjectIssueCategoryResultDTO> getProjectAndCategoryInfo(ProjectSaveCategoryFormDTO formDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getProjectAndCategoryInfo", formDTO);
+	}
 }
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 83aa6560d7..2da6a153eb 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,6 +17,8 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -27,6 +29,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IssueCategoryDTO;
 import com.epmet.dto.form.IssueCategoryTagListFormDTO;
+import com.epmet.dto.form.IssueSaveCategoryFormDTO;
 import com.epmet.dto.result.IssueCategoryTagListResultDTO;
 import com.epmet.dto.result.ProjectCategoryTagResultDTO;
 import com.epmet.excel.IssueCategoryExcel;
@@ -48,24 +51,24 @@ import java.util.Map;
 @RestController
 @RequestMapping("issuecategory")
 public class IssueCategoryController {
-    
+
     @Autowired
     private IssueCategoryService issueCategoryService;
 
     @GetMapping("page")
-    public Result<PageData<IssueCategoryDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<IssueCategoryDTO>> page(@RequestParam Map<String, Object> params) {
         PageData<IssueCategoryDTO> page = issueCategoryService.page(params);
         return new Result<PageData<IssueCategoryDTO>>().ok(page);
     }
 
     @GetMapping("{id}")
-    public Result<IssueCategoryDTO> get(@PathVariable("id") String id){
+    public Result<IssueCategoryDTO> get(@PathVariable("id") String id) {
         IssueCategoryDTO data = issueCategoryService.get(id);
         return new Result<IssueCategoryDTO>().ok(data);
     }
 
     @PostMapping
-    public Result save(@RequestBody IssueCategoryDTO dto){
+    public Result save(@RequestBody IssueCategoryDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         issueCategoryService.save(dto);
@@ -73,7 +76,7 @@ public class IssueCategoryController {
     }
 
     @PutMapping
-    public Result update(@RequestBody IssueCategoryDTO dto){
+    public Result update(@RequestBody IssueCategoryDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         issueCategoryService.update(dto);
@@ -81,7 +84,7 @@ public class IssueCategoryController {
     }
 
     @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
+    public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
         issueCategoryService.delete(ids);
@@ -117,4 +120,20 @@ public class IssueCategoryController {
         return new Result<List<ProjectCategoryTagResultDTO>>().ok(issueCategoryService.projectCategoryList(categoryIdList));
     }
 
+    /**
+     * @param formDTO
+     * @return
+     * @Description 议题：保存/修改分类
+     * @Author sun
+     **/
+    @PostMapping("save")
+    public Result saveCategory(@RequestBody IssueSaveCategoryFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, IssueSaveCategoryFormDTO.SaveCategory.class);
+        if(formDTO.getCategoryList().size()< NumConstant.ONE){
+            throw new RenException("请至少选择一个分类保存");
+        }
+        issueCategoryService.saveCategory(formDTO);
+        return new Result();
+    }
+
 }
\ 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 87a31f658f..c7ffed58f3 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
@@ -23,13 +23,13 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 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.CustomerCategoryListFormDTO;
-import com.epmet.dto.form.IssueCategoryTagListFormDTO;
+import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
 import com.epmet.dto.result.CustomerCategoryListResultDTO;
-import com.epmet.dto.result.ProjectCategoryTagResultDTO;
+import com.epmet.dto.result.ProjectIssueCategoryResultDTO;
 import com.epmet.excel.IssueProjectCategoryDictExcel;
 import com.epmet.service.IssueProjectCategoryDictService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -107,4 +107,26 @@ public class IssueProjectCategoryDictController {
         return new Result<List<CustomerCategoryListResultDTO>>().ok(issueProjectCategoryDictService.categoryList(formDTO));
     }
 
+    /**
+     * @param cstegoryIdList
+     * @return
+     * @Description 批量查询分类信息
+     * @Author sun
+     **/
+    @PostMapping("getcategorylist")
+    public Result<List<IssueProjectCategoryDictDTO>> getCategoryList(@RequestBody List<String> cstegoryIdList) {
+        return new Result<List<IssueProjectCategoryDictDTO>>().ok(issueProjectCategoryDictService.getCategoryList(cstegoryIdList));
+    }
+
+    /**
+     * @param formDTO
+     * @return
+     * @Description 查询项目所属客户和所属网格信息以及分类对应的分类信息
+     * @Author sun
+     **/
+    @PostMapping("getprojectandcategoryinfo")
+    public Result<ProjectIssueCategoryResultDTO> getProjectAndCategoryInfo(@RequestBody ProjectSaveCategoryFormDTO formDTO) {
+        return new Result<ProjectIssueCategoryResultDTO>().ok(issueProjectCategoryDictService.getProjectAndCategoryInfo(formDTO));
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
index 7c6d4dbcc8..0e214708e0 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
@@ -49,7 +49,6 @@ public interface IssueCategoryDao extends BaseDao<IssueCategoryEntity> {
      * @Author sun
      **/
     List<ProjectCategoryTagResultDTO> selectProjectCategoryList(@Param("categoryIdList") List<String> categoryIdList);
-    List<ProjectCategoryTagResultDTO> selectProjectCategoryList(List<String> categoryIdList);
 
     /**
      * 获取议题分类
@@ -59,4 +58,10 @@ public interface IssueCategoryDao extends BaseDao<IssueCategoryEntity> {
      * @return java.util.List<com.epmet.dto.IssueCategoryDTO>
      */
     List<IssueCategoryDTO> selectCategoryByIssue(@Param("issueId") String issueId);
+
+    /**
+     * @Description 删除议题的分类信息
+     * @Author sun
+     **/
+    void delByIssueId(@Param("issueId") String issueId);
 }
\ No newline at end of file
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 c3e44340e4..3d21dfa3a7 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
@@ -18,6 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.IssueProjectCategoryDictDTO;
 import com.epmet.dto.result.CustomerCategoryListResultDTO;
 import com.epmet.entity.IssueProjectCategoryDictEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -44,4 +45,12 @@ public interface IssueProjectCategoryDictDao extends BaseDao<IssueProjectCategor
      * @Author sun
      **/
     List<CustomerCategoryListResultDTO> subCategoryList(@Param("id") String categoryId);
+
+    /**
+     * @param cstegoryIdList
+     * @return
+     * @Description 批量查询分类信息
+     * @Author sun
+     **/
+    List<IssueProjectCategoryDictDTO> selectCategoryList(@Param("cstegoryIdList") List<String> cstegoryIdList);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java
index 017723d64a..437c5e3fe9 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java
@@ -18,6 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.IssueDTO;
 import com.epmet.entity.IssueProjectRelationEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -50,4 +51,9 @@ public interface IssueProjectRelationDao extends BaseDao<IssueProjectRelationEnt
      **/
     List<IssueProjectRelationEntity> selectRelationList(@Param("projectIdList") List<String> projectIdList);
 
+    /**
+     * @Author sun
+     * @Description 根据项目id查询对应的议题基本信息
+     **/
+    IssueDTO selectProjectToIssue(@Param("issueId") String issueId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCategoryService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCategoryService.java
index 412c9199f1..3f051a29ff 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCategoryService.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCategoryService.java
@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IssueCategoryDTO;
 import com.epmet.dto.form.IssueCategoryTagListFormDTO;
+import com.epmet.dto.form.IssueSaveCategoryFormDTO;
 import com.epmet.dto.result.IssueCategoryTagListResultDTO;
 import com.epmet.dto.result.ProjectCategoryTagResultDTO;
 import com.epmet.entity.IssueCategoryEntity;
@@ -120,4 +121,14 @@ public interface IssueCategoryService extends BaseService<IssueCategoryEntity> {
      * @return java.util.List<com.epmet.dto.IssueCategoryDTO>
      */
     List<IssueCategoryDTO> getCategoryByIssue(String issueId);
+
+
+    /**
+     * @param formDTO
+     * @return
+     * @Description 议题：保存/修改分类
+     * @Author sun
+     **/
+    void saveCategory(IssueSaveCategoryFormDTO 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 41a807cd40..cd995afe87 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,7 +21,9 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IssueProjectCategoryDictDTO;
 import com.epmet.dto.form.CustomerCategoryListFormDTO;
+import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
 import com.epmet.dto.result.CustomerCategoryListResultDTO;
+import com.epmet.dto.result.ProjectIssueCategoryResultDTO;
 import com.epmet.entity.IssueProjectCategoryDictEntity;
 
 import java.util.List;
@@ -102,4 +104,20 @@ public interface IssueProjectCategoryDictService extends BaseService<IssueProjec
      * @Author sun
      **/
     List<CustomerCategoryListResultDTO> categoryList(CustomerCategoryListFormDTO formDTO);
+
+    /**
+     * @param cstegoryIdList
+     * @return
+     * @Description 批量查询分类信息
+     * @Author sun
+     **/
+    List<IssueProjectCategoryDictDTO> getCategoryList(List<String> cstegoryIdList);
+
+    /**
+     * @param formDTO
+     * @return
+     * @Description 查询项目所属客户和所属网格信息以及分类对应的分类信息
+     * @Author sun
+     **/
+    ProjectIssueCategoryResultDTO getProjectAndCategoryInfo(ProjectSaveCategoryFormDTO formDTO);
 }
\ No newline at end of file
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 94e492abf5..32dcd13338 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
@@ -22,26 +22,35 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 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.SaveIssueCategoryFormDTO;
 import com.epmet.dto.result.IssueCategoryTagListResultDTO;
 import com.epmet.dto.result.IssueCategoryTagResultDTO;
 import com.epmet.dto.result.ProjectCategoryTagResultDTO;
 import com.epmet.entity.IssueCategoryEntity;
+import com.epmet.entity.IssueEntity;
 import com.epmet.redis.IssueCategoryRedis;
 import com.epmet.service.IssueCategoryService;
+import com.epmet.service.IssueProjectCategoryDictService;
+import com.epmet.service.IssueService;
 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 java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 议题所属分类表
@@ -56,6 +65,10 @@ public class IssueCategoryServiceImpl extends BaseServiceImpl<IssueCategoryDao,
     private IssueCategoryRedis issueCategoryRedis;
     @Autowired
     private IssueTagsDao issueTagsDao;
+    @Autowired
+    private IssueService issueService;
+    @Autowired
+    private IssueProjectCategoryDictService issueProjectCategoryDictService;
 
     @Override
     public PageData<IssueCategoryDTO> page(Map<String, Object> params) {
@@ -155,4 +168,52 @@ public class IssueCategoryServiceImpl extends BaseServiceImpl<IssueCategoryDao,
         return baseDao.selectCategoryByIssue(issueId);
     }
 
+    /**
+     * @param formDTO
+     * @return
+     * @Description 议题：保存/修改分类
+     * @Author sun
+     **/
+    @Override
+    public void saveCategory(IssueSaveCategoryFormDTO formDTO) {
+
+        //1.查询议题所属客户和所属网格信息
+        IssueEntity issue = issueService.selectById(formDTO.getIssueId());
+        if (null == issue) {
+            throw new RenException(String.format("根据议题Id获取议题信息失败，issueId->%s", formDTO.getIssueId()));
+        }
+
+        //2.批量查询分类信息
+        List<String> categoryIdList = formDTO.getCategoryList().stream().map(SaveIssueCategoryFormDTO::getId).collect(Collectors.toList());
+        List<IssueProjectCategoryDictDTO> categoryList = issueProjectCategoryDictService.getCategoryList(categoryIdList);
+        if (null == categoryList) {
+            throw new RenException(String.format("议题分类信息保存，根据分类Id获取分类信息失败"));
+        }
+
+        //3.汇总批量新增数据
+        List<IssueCategoryEntity> entityList = new ArrayList<>();
+        formDTO.getCategoryList().forEach(ca -> {
+            IssueCategoryEntity entity = new IssueCategoryEntity();
+            entity.setCustomerId(issue.getCustomerId());
+            entity.setGridId(issue.getGridId());
+            entity.setIssueId(formDTO.getIssueId());
+            entity.setCategoryId(ca.getId());
+            categoryList.forEach(cl -> {
+                if (ca.getId().equals(cl.getId())) {
+                    entity.setCategoryPids(cl.getPids());
+                }
+            });
+            entityList.add(entity);
+        });
+
+        //4.根据议题Id删除可能存在的分类信息
+        baseDao.delByIssueId(formDTO.getIssueId());
+
+        //5.批量保存议题分类信息
+        if (!insertBatch(entityList)) {
+            throw new RenException(String.format("议题分类信息保存失败"));
+        }
+
+    }
+
 }
\ No newline at end of file
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 3aa823b8d3..66dffc1690 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
@@ -20,13 +20,19 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.IssueProjectCategoryDictDao;
+import com.epmet.dao.IssueProjectRelationDao;
+import com.epmet.dto.IssueDTO;
 import com.epmet.dto.IssueProjectCategoryDictDTO;
 import com.epmet.dto.form.CustomerCategoryListFormDTO;
+import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
+import com.epmet.dto.form.SaveIssueCategoryFormDTO;
 import com.epmet.dto.result.CustomerCategoryListResultDTO;
+import com.epmet.dto.result.ProjectIssueCategoryResultDTO;
 import com.epmet.entity.IssueProjectCategoryDictEntity;
 import com.epmet.redis.IssueProjectCategoryDictRedis;
 import com.epmet.service.IssueProjectCategoryDictService;
@@ -38,6 +44,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 议题项目分类字典
@@ -50,6 +57,8 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
 
     @Autowired
     private IssueProjectCategoryDictRedis issueProjectCategoryDictRedis;
+    @Autowired
+    private IssueProjectRelationDao issueProjectRelationDao;
 
     @Override
     public PageData<IssueProjectCategoryDictDTO> page(Map<String, Object> params) {
@@ -115,4 +124,41 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
         return resultList;
     }
 
+    /**
+     * @param cstegoryIdList
+     * @return
+     * @Description 批量查询分类信息
+     * @Author sun
+     **/
+    @Override
+    public List<IssueProjectCategoryDictDTO> getCategoryList(List<String> cstegoryIdList) {
+        return baseDao.selectCategoryList(cstegoryIdList);
+    }
+
+    /**
+     * @param formDTO
+     * @return
+     * @Description 查询项目所属客户和所属网格信息以及分类对应的分类信息
+     * @Author sun
+     **/
+    @Override
+    public ProjectIssueCategoryResultDTO getProjectAndCategoryInfo(ProjectSaveCategoryFormDTO formDTO) {
+        ProjectIssueCategoryResultDTO resultDTO = new ProjectIssueCategoryResultDTO();
+        //1.根据项目id查询对应的议题基本信息
+        IssueDTO dto = issueProjectRelationDao.selectProjectToIssue(formDTO.getProjectId());
+        if (null == dto) {
+            throw new RenException(String.format("保存项目分类信息，获取项目对应的议题基本信息失败，projectId->%s", formDTO.getProjectId()));
+        }
+        resultDTO.setIssueDTO(dto);
+        //2.批量查询分类信息
+        List<String> categoryIdList = formDTO.getCategoryList().stream().map(SaveIssueCategoryFormDTO::getId).collect(Collectors.toList());
+        List<IssueProjectCategoryDictDTO> categoryList = getCategoryList(categoryIdList);
+        if (null == categoryList) {
+            throw new RenException(String.format("保存项目分类信息，根据分类Id获取分类信息失败"));
+        }
+        resultDTO.setCategoryList(categoryList);
+
+        return resultDTO;
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
index 49a894c252..9844127300 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
@@ -34,6 +34,7 @@
         ORDER BY
             sort ASC
     </select>
+
     <select id="selectCategoryByIssue" resultType="com.epmet.dto.IssueCategoryDTO">
         SELECT
                CUSTOMER_ID,
@@ -45,4 +46,12 @@
         AND ISSUE_ID = #{issueId}
     </select>
 
+    <delete id="delByIssueId">
+        DELETE
+        FROM
+            issue_category
+        WHERE
+            issue_id = #{issueId}
+    </delete>
+
 </mapper>
\ No newline at end of file
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 e638fec0b8..52bad40a4b 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
@@ -36,4 +36,20 @@
     </select>
     <!-- sql递归 查询客户议题项目的分类信息以及递归查询二级分类信息 end-->
 
+    <select id="selectCategoryList" resultType="com.epmet.dto.IssueProjectCategoryDictDTO">
+        SELECT
+            *
+        FROM
+            issue_project_category_dict
+        WHERE
+            del_flag = '0'
+        <if test="cstegoryIdList != null and cstegoryIdList.size() > 0">
+            <foreach collection="cstegoryIdList" item="id" open="AND(  " separator=" OR " index="index" close=")">
+                id = #{id}
+            </foreach>
+        </if>
+        ORDER BY
+            sort ASC
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectRelationDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectRelationDao.xml
index ae7ee4b255..44dac4af6c 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectRelationDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectRelationDao.xml
@@ -46,4 +46,16 @@
         )
     </select>
 
+    <select id="selectProjectToIssue" resultType="com.epmet.dto.IssueDTO">
+        SELECT
+            i.*
+        FROM
+            issue_project_relation ipr
+        INNER JOIN issue i ON ipr.ISSUE_ID = i.ID
+        WHERE
+            ipr.DEL_FLAG = '0'
+        AND i.DEL_FLAG = '0'
+        AND ipr.PROJECT_ID = #{issueId}
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-client/pom.xml b/epmet-module/gov-project/gov-project-client/pom.xml
index 6bf188e6e8..eabbdb58dc 100644
--- a/epmet-module/gov-project/gov-project-client/pom.xml
+++ b/epmet-module/gov-project/gov-project-client/pom.xml
@@ -23,5 +23,11 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>gov-issue-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
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
new file mode 100644
index 0000000000..9d0d1a407f
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectSaveCategoryFormDTO.java
@@ -0,0 +1,28 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 议题：保存/修改分类-接口入参
+ * @Author sun
+ */
+@Data
+public class ProjectSaveCategoryFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 2599592072265715951L;
+    /**
+     * 议题Id
+     */
+    @NotBlank(message = "项目ID不能为空",groups = {SaveCategory.class})
+    private String projectId;
+    /**
+     * 议题分类集合
+     */
+    private List<SaveIssueCategoryFormDTO> categoryList;
+    public interface SaveCategory{}
+
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/SaveIssueCategoryFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/SaveIssueCategoryFormDTO.java
new file mode 100644
index 0000000000..7c9a491004
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/SaveIssueCategoryFormDTO.java
@@ -0,0 +1,26 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 议题：保存/修改分类-接口入参
+ *
+ * @Author sun
+ */
+@Data
+public class SaveIssueCategoryFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 2599592072265715951L;
+    /**
+     * 分类Id
+     */
+    private String id;
+    /**
+     * 分类名称
+     */
+    private String name;
+
+
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectIssueCategoryResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectIssueCategoryResultDTO.java
new file mode 100644
index 0000000000..d42075e2f5
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectIssueCategoryResultDTO.java
@@ -0,0 +1,27 @@
+package com.epmet.dto.result;
+
+import com.epmet.dto.IssueDTO;
+import com.epmet.dto.IssueProjectCategoryDictDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @dscription 项目所属网格、分类基本信息-接口返参
+ * @author sun
+ */
+@Data
+public class ProjectIssueCategoryResultDTO implements Serializable {
+
+	private static final long serialVersionUID = 5957826616179876849L;
+	/**
+	 * 项目Id
+	 */
+	private IssueDTO issueDTO;
+	/**
+	 * 项目标题
+	 */
+	private List<IssueProjectCategoryDictDTO> categoryList;
+
+}
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 c773ece4f9..2160f44778 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
@@ -17,6 +17,8 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -27,6 +29,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.ProjectCategoryDTO;
 import com.epmet.dto.form.ProjectCategoryTagListFormDTO;
+import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
 import com.epmet.dto.result.ProjectCategoryTagListResultDTO;
 import com.epmet.excel.ProjectCategoryExcel;
 import com.epmet.service.ProjectCategoryService;
@@ -105,4 +108,20 @@ public class ProjectCategoryController {
         return new Result<ProjectCategoryTagListResultDTO>().ok(projectCategoryService.categoryTagList(formDTO));
     }
 
+    /**
+     * @param formDTO
+     * @return
+     * @Description 项目：保存/修改分类
+     * @Author sun
+     **/
+    @PostMapping("save")
+    public Result saveCategory(@RequestBody ProjectSaveCategoryFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, ProjectSaveCategoryFormDTO.SaveCategory.class);
+        if(formDTO.getCategoryList().size()< NumConstant.ONE){
+            throw new RenException("请至少选择一个分类保存");
+        }
+        projectCategoryService.saveCategory(formDTO);
+        return new Result();
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectCategoryDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectCategoryDao.java
index ac041659f7..424adbbc50 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectCategoryDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectCategoryDao.java
@@ -39,4 +39,9 @@ public interface ProjectCategoryDao extends BaseDao<ProjectCategoryEntity> {
      **/
     List<String> selectProjectCategoryIdList(@Param("projectId") String projectId);
 
+    /**
+     * @Description 删除项目的分类信息
+     * @Author sun
+     **/
+    void delByProjectId(@Param("projectId") String projectId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectCategoryService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectCategoryService.java
index e31a951784..d975623295 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectCategoryService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectCategoryService.java
@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.ProjectCategoryDTO;
 import com.epmet.dto.form.ProjectCategoryTagListFormDTO;
+import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
 import com.epmet.dto.result.ProjectCategoryTagListResultDTO;
 import com.epmet.entity.ProjectCategoryEntity;
 
@@ -102,4 +103,12 @@ public interface ProjectCategoryService extends BaseService<ProjectCategoryEntit
      * @Author sun
      **/
     ProjectCategoryTagListResultDTO categoryTagList(ProjectCategoryTagListFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @return
+     * @Description 项目：保存/修改分类
+     * @Author sun
+     **/
+    void saveCategory(ProjectSaveCategoryFormDTO formDTO);
 }
\ No newline at end of file
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 315aa7fd59..9d1700ce47 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
@@ -22,17 +22,20 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.ProjectCategoryDao;
 import com.epmet.dao.ProjectTagsDao;
+import com.epmet.dto.IssueDTO;
+import com.epmet.dto.IssueProjectCategoryDictDTO;
 import com.epmet.dto.ProjectCategoryDTO;
 import com.epmet.dto.form.ProjectCategoryTagListFormDTO;
+import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
 import com.epmet.dto.result.ProjectCategoryTagListResultDTO;
 import com.epmet.dto.result.ProjectCategoryTagResultDTO;
+import com.epmet.dto.result.ProjectIssueCategoryResultDTO;
 import com.epmet.entity.ProjectCategoryEntity;
 import com.epmet.feign.GovIssueOpenFeignClient;
 import com.epmet.redis.ProjectCategoryRedis;
@@ -42,6 +45,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -141,4 +145,47 @@ public class ProjectCategoryServiceImpl extends BaseServiceImpl<ProjectCategoryD
         return resultDTO;
     }
 
+    /**
+     * @param formDTO
+     * @return
+     * @Description 项目：保存/修改分类
+     * @Author sun
+     **/
+    @Override
+    public void saveCategory(ProjectSaveCategoryFormDTO formDTO) {
+
+        //1.查询项目所属客户和所属网格信息以及分类对应的分类信息
+        Result<ProjectIssueCategoryResultDTO> result = govIssueOpenFeignClient.getProjectAndCategoryInfo(formDTO);
+        if (!result.success()) {
+            throw new RenException(String.format("保存项目分类，获取项目对应的议题信息以及分类信息失败，projiectId->%s", formDTO.getProjectId()));
+        }
+        IssueDTO issue = result.getData().getIssueDTO();
+        List<IssueProjectCategoryDictDTO> categoryList = result.getData().getCategoryList();
+
+        //2.汇总批量新增数据
+        List<ProjectCategoryEntity> entityList = new ArrayList<>();
+        formDTO.getCategoryList().forEach(ca -> {
+            ProjectCategoryEntity entity = new ProjectCategoryEntity();
+            entity.setCustomerId(issue.getCustomerId());
+            entity.setGridId(issue.getGridId());
+            entity.setProjectId(formDTO.getProjectId());
+            entity.setCategoryId(ca.getId());
+            categoryList.forEach(cl -> {
+                if (ca.getId().equals(cl.getId())) {
+                    entity.setCategoryPids(cl.getPids());
+                }
+            });
+            entityList.add(entity);
+        });
+
+        //3.根据议题Id删除可能存在的分类信息
+        baseDao.delByProjectId(formDTO.getProjectId());
+
+        //4.批量保存议题分类信息
+        if (!insertBatch(entityList)) {
+            throw new RenException(String.format("项目分类信息保存失败"));
+        }
+
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml
index da4a2d332e..09dbfae3a9 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml
@@ -5,12 +5,20 @@
 
     <select id="selectProjectCategoryIdList" resultType="java.lang.String">
         SELECT
-            CATEGORY_ID
+            category_id
         FROM
             project_category
         WHERE
-            DEL_FLAG = '0'
-        AND PROJECT_ID = #{projectId}
+            del_flag = '0'
+        AND project_id = #{projectId}
     </select>
 
+    <delete id="delByProjectId">
+        DELETE
+        FROM
+            project_category
+        WHERE
+            project_id = #{projectId}
+    </delete>
+
 </mapper>
\ No newline at end of file

From ccd33df10d20d97510a7048742afe3149115826d Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 9 Dec 2020 17:50:47 +0800
Subject: [PATCH 017/119] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/form/AddTagFormDTO.java     | 24 +++++++++++
 .../com/epmet/dto/result/AddTagResultDTO.java | 23 ++++++++++
 .../epmet/controller/IssueTagsController.java | 19 +++++++-
 .../java/com/epmet/dao/IssueCategoryDao.java  |  1 +
 .../main/java/com/epmet/dao/IssueTagsDao.java |  9 ++++
 .../com/epmet/service/IssueTagsService.java   | 11 +++++
 .../service/impl/IssueTagsServiceImpl.java    | 43 ++++++++++++++++++-
 .../main/resources/mapper/IssueTagsDao.xml    | 10 +++++
 8 files changed, 138 insertions(+), 2 deletions(-)
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/AddTagFormDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/AddTagResultDTO.java

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/AddTagFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/AddTagFormDTO.java
new file mode 100644
index 0000000000..889c042c5f
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/AddTagFormDTO.java
@@ -0,0 +1,24 @@
+package com.epmet.dto.form;
+
+import com.google.gson.internal.$Gson$Types;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/12/9 下午3:25
+ */
+@Data
+public class AddTagFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -3245317956853388308L;
+
+    public interface AddTag{}
+
+    @NotBlank(message = "标签名称不能为空",groups = AddTag.class)
+    private String tagName;
+
+    private String customerId;
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/AddTagResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/AddTagResultDTO.java
new file mode 100644
index 0000000000..f78f4154c9
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/AddTagResultDTO.java
@@ -0,0 +1,23 @@
+package com.epmet.dto.result;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/12/9 下午5:09
+ */
+@Data
+@AllArgsConstructor
+public class AddTagResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 4769136806332933579L;
+
+    private String tagId;
+
+    public AddTagResultDTO() {
+        this.tagId = "";
+    }
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueTagsController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueTagsController.java
index 4be04baf85..6c6b768730 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueTagsController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueTagsController.java
@@ -17,15 +17,19 @@
 
 package com.epmet.controller;
 
+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;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IssueTagsDTO;
+import com.epmet.dto.form.AddTagFormDTO;
+import com.epmet.dto.result.AddTagResultDTO;
 import com.epmet.excel.IssueTagsExcel;
 import com.epmet.service.IssueTagsService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,4 +95,17 @@ public class IssueTagsController {
         ExcelUtils.exportExcelToTarget(response, null, list, IssueTagsExcel.class);
     }
 
+    /**
+     * @Description  标签添加
+     * @Param form
+     * @author zxc
+     * @date 2020/12/9 下午3:29
+     */
+    @PostMapping("add")
+    public Result<AddTagResultDTO> addTag(@RequestBody AddTagFormDTO form, @LoginUser TokenDto tokenDto){
+        ValidatorUtils.validateEntity(form, AddTagFormDTO.AddTag.class);
+        AddTagResultDTO addTagResultDTO = issueTagsService.addTag(form, tokenDto);
+        return new Result<AddTagResultDTO>().ok(addTagResultDTO);
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
index 0e214708e0..0d88504d4c 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
@@ -49,6 +49,7 @@ public interface IssueCategoryDao extends BaseDao<IssueCategoryEntity> {
      * @Author sun
      **/
     List<ProjectCategoryTagResultDTO> selectProjectCategoryList(@Param("categoryIdList") List<String> categoryIdList);
+//    List<ProjectCategoryTagResultDTO> selectProjectCategoryList(List<String> categoryIdList);
 
     /**
      * 获取议题分类
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueTagsDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueTagsDao.java
index 547b840c17..ba73daf786 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueTagsDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueTagsDao.java
@@ -19,6 +19,7 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.IssueTagsDTO;
+import com.epmet.dto.form.AddTagFormDTO;
 import com.epmet.dto.result.IssueCategoryTagResultDTO;
 import com.epmet.entity.IssueTagsEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -49,4 +50,12 @@ public interface IssueTagsDao extends BaseDao<IssueTagsEntity> {
      * @return java.util.List<com.epmet.dto.IssueTagsDTO>
      */
     List<IssueTagsDTO> selectTagsByIssue(@Param("issueId") String issueId);
+
+    /**
+     * @Description  查询标签是否重名
+     * @Param form
+     * @author zxc
+     * @date 2020/12/9 下午3:40
+     */
+    String selectTagNameCount(AddTagFormDTO form);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueTagsService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueTagsService.java
index 5bc717fb3c..c95e8cc51e 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueTagsService.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueTagsService.java
@@ -19,7 +19,10 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.IssueTagsDTO;
+import com.epmet.dto.form.AddTagFormDTO;
+import com.epmet.dto.result.AddTagResultDTO;
 import com.epmet.entity.IssueTagsEntity;
 
 import java.util.List;
@@ -101,4 +104,12 @@ public interface IssueTagsService extends BaseService<IssueTagsEntity> {
      * @return java.util.List<com.epmet.dto.IssueTagsDTO>
      */
     List<IssueTagsDTO> getTagsByIssue(String issueId);
+
+    /**
+     * @Description  标签添加
+     * @Param form
+     * @author zxc
+     * @date 2020/12/9 下午3:29
+     */
+    AddTagResultDTO addTag(AddTagFormDTO form, TokenDto tokenDto);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
index 7641a4bacb..6c2a1e6f2e 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
@@ -20,14 +20,23 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dao.IssueProjectTagDictDao;
 import com.epmet.dao.IssueTagsDao;
 import com.epmet.dto.IssueTagsDTO;
+import com.epmet.dto.form.AddTagFormDTO;
+import com.epmet.dto.result.AddTagResultDTO;
+import com.epmet.dto.result.IssueCategoryTagResultDTO;
+import com.epmet.entity.IssueProjectTagDictEntity;
 import com.epmet.entity.IssueTagsEntity;
+import com.epmet.redis.IssueProjectTagDictRedis;
 import com.epmet.redis.IssueTagsRedis;
 import com.epmet.service.IssueTagsService;
+import com.epmet.utils.ModuleConstants;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -48,6 +57,10 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
 
     @Autowired
     private IssueTagsRedis issueTagsRedis;
+    @Autowired
+    private IssueProjectTagDictDao issueProjectTagDictDao;
+    @Autowired
+    private IssueProjectTagDictRedis dictRedis;
 
     @Override
     public PageData<IssueTagsDTO> page(Map<String, Object> params) {
@@ -114,4 +127,32 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
         return baseDao.selectTagsByIssue(issueId);
     }
 
+    /**
+     * @Description  标签添加
+     * @Param form
+     * @author zxc
+     * @date 2020/12/9 下午3:29
+     */
+    @Override
+    public AddTagResultDTO addTag(AddTagFormDTO form, TokenDto tokenDto) {
+        form.setCustomerId(tokenDto.getCustomerId());
+        String tagId = baseDao.selectTagNameCount(form);
+        if (StringUtils.isNotBlank(tagId)){
+            return new AddTagResultDTO(tagId);
+        }
+        IssueProjectTagDictEntity entity = new IssueProjectTagDictEntity();
+        entity.setCustomerId(form.getCustomerId());
+        entity.setCategoryId(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_ID);
+        entity.setTagName(form.getTagName());
+        entity.setIsDefault(NumConstant.ONE_STR);
+        entity.setIssueUseCount(NumConstant.ZERO);
+        entity.setProjectUseCount(NumConstant.ZERO);
+        issueProjectTagDictDao.insert(entity);
+        IssueCategoryTagResultDTO issueCategoryTagResultDTO = new IssueCategoryTagResultDTO();
+        issueCategoryTagResultDTO.setId(entity.getId());
+        issueCategoryTagResultDTO.setName(entity.getTagName());
+        dictRedis.addIssueProjectTag(entity.getCustomerId(),entity.getCategoryId(),issueCategoryTagResultDTO);
+        return new AddTagResultDTO();
+    }
+
 }
\ No newline at end of file
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 960983e143..05de84ba07 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
@@ -28,4 +28,14 @@
           AND ISSUE_ID = #{issueId}
     </select>
 
+    <!-- 查询标签是否重名 -->
+    <select id="selectTagNameCount" resultType="java.lang.String">
+        SELECT
+            ID
+        FROM issue_project_tag_dict
+        WHERE DEL_FLAG = 0
+          AND TAG_NAME = #{tagName}
+          AND (CUSTOMER_ID = 'default' OR CUSTOMER_ID = #{customerId})
+    </select>
+
 </mapper>
\ No newline at end of file

From 5fe0f3d460c4160a1f182071d657b6890d062193 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 10 Dec 2020 09:29:10 +0800
Subject: [PATCH 018/119] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IssueProjectCategoryDictServiceImpl.java     |  4 ++--
 epmet-module/gov-project/gov-project-client/pom.xml   |  6 ------
 .../dto/result/ProjectIssueCategoryResultDTO.java     | 11 ++++-------
 .../service/impl/ProjectCategoryServiceImpl.java      |  8 ++------
 4 files changed, 8 insertions(+), 21 deletions(-)

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 66dffc1690..4c57777837 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
@@ -149,14 +149,14 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
         if (null == dto) {
             throw new RenException(String.format("保存项目分类信息，获取项目对应的议题基本信息失败，projectId->%s", formDTO.getProjectId()));
         }
-        resultDTO.setIssueDTO(dto);
+        //resultDTO.setIssueDTO(dto);
         //2.批量查询分类信息
         List<String> categoryIdList = formDTO.getCategoryList().stream().map(SaveIssueCategoryFormDTO::getId).collect(Collectors.toList());
         List<IssueProjectCategoryDictDTO> categoryList = getCategoryList(categoryIdList);
         if (null == categoryList) {
             throw new RenException(String.format("保存项目分类信息，根据分类Id获取分类信息失败"));
         }
-        resultDTO.setCategoryList(categoryList);
+       // resultDTO.setCategoryList(categoryList);
 
         return resultDTO;
     }
diff --git a/epmet-module/gov-project/gov-project-client/pom.xml b/epmet-module/gov-project/gov-project-client/pom.xml
index eabbdb58dc..6bf188e6e8 100644
--- a/epmet-module/gov-project/gov-project-client/pom.xml
+++ b/epmet-module/gov-project/gov-project-client/pom.xml
@@ -23,11 +23,5 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>com.epmet</groupId>
-            <artifactId>gov-issue-client</artifactId>
-            <version>2.0.0</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectIssueCategoryResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectIssueCategoryResultDTO.java
index d42075e2f5..9aad1bb5a9 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectIssueCategoryResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectIssueCategoryResultDTO.java
@@ -1,11 +1,8 @@
 package com.epmet.dto.result;
 
-import com.epmet.dto.IssueDTO;
-import com.epmet.dto.IssueProjectCategoryDictDTO;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @dscription 项目所属网格、分类基本信息-接口返参
@@ -18,10 +15,10 @@ public class ProjectIssueCategoryResultDTO implements Serializable {
 	/**
 	 * 项目Id
 	 */
-	private IssueDTO issueDTO;
-	/**
+	/*private IssueDTO issueDTO;
+	*//**
 	 * 项目标题
-	 */
-	private List<IssueProjectCategoryDictDTO> categoryList;
+	 *//*
+	private List<IssueProjectCategoryDictDTO> categoryList;*/
 
 }
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 9d1700ce47..ca2febe86c 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
@@ -28,14 +28,11 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.ProjectCategoryDao;
 import com.epmet.dao.ProjectTagsDao;
-import com.epmet.dto.IssueDTO;
-import com.epmet.dto.IssueProjectCategoryDictDTO;
 import com.epmet.dto.ProjectCategoryDTO;
 import com.epmet.dto.form.ProjectCategoryTagListFormDTO;
 import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
 import com.epmet.dto.result.ProjectCategoryTagListResultDTO;
 import com.epmet.dto.result.ProjectCategoryTagResultDTO;
-import com.epmet.dto.result.ProjectIssueCategoryResultDTO;
 import com.epmet.entity.ProjectCategoryEntity;
 import com.epmet.feign.GovIssueOpenFeignClient;
 import com.epmet.redis.ProjectCategoryRedis;
@@ -45,7 +42,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -155,7 +151,7 @@ public class ProjectCategoryServiceImpl extends BaseServiceImpl<ProjectCategoryD
     public void saveCategory(ProjectSaveCategoryFormDTO formDTO) {
 
         //1.查询项目所属客户和所属网格信息以及分类对应的分类信息
-        Result<ProjectIssueCategoryResultDTO> result = govIssueOpenFeignClient.getProjectAndCategoryInfo(formDTO);
+        /*Result<ProjectIssueCategoryResultDTO> result = govIssueOpenFeignClient.getProjectAndCategoryInfo(formDTO);
         if (!result.success()) {
             throw new RenException(String.format("保存项目分类，获取项目对应的议题信息以及分类信息失败，projiectId->%s", formDTO.getProjectId()));
         }
@@ -184,7 +180,7 @@ public class ProjectCategoryServiceImpl extends BaseServiceImpl<ProjectCategoryD
         //4.批量保存议题分类信息
         if (!insertBatch(entityList)) {
             throw new RenException(String.format("项目分类信息保存失败"));
-        }
+        }*/
 
     }
 

From 745e93b4f9e1a66852946bb7c1396469734409b3 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 10 Dec 2020 10:17:42 +0800
Subject: [PATCH 019/119] =?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=E4=BF=A1=E6=81=AF=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E8=87=AA=E6=B5=8B=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/feign/GovIssueOpenFeignClient.java  |  4 +-
 .../IssueProjectCategoryDictServiceImpl.java  |  8 +-
 .../result/ProjectCategoryDTOResultDTO.java   | 55 +++++++++++
 .../result/ProjectIssueCategoryResultDTO.java |  9 +-
 .../dto/result/ProjectIssueDTOResultDTO.java  | 96 +++++++++++++++++++
 .../impl/ProjectCategoryServiceImpl.java      | 12 +--
 6 files changed, 170 insertions(+), 14 deletions(-)
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectCategoryDTOResultDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectIssueDTOResultDTO.java

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 f94291e5bb..eebeae517c 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
@@ -34,8 +34,8 @@ import java.util.Map;
  * @author yinzuomei@elink-cn.com
  * @date 2020/6/4 13:37
  */
-@FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallback = GovIssueOpenFeignClientFallBack.class)
-//@FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallback = GovIssueOpenFeignClientFallBack.class,url = "localhost:8101")
+//@FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallback = GovIssueOpenFeignClientFallBack.class)
+@FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallback = GovIssueOpenFeignClientFallBack.class,url = "localhost:8101")
 public interface GovIssueOpenFeignClient {
 
     /**
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 4c57777837..2197ae8143 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
@@ -32,7 +32,9 @@ import com.epmet.dto.form.CustomerCategoryListFormDTO;
 import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
 import com.epmet.dto.form.SaveIssueCategoryFormDTO;
 import com.epmet.dto.result.CustomerCategoryListResultDTO;
+import com.epmet.dto.result.ProjectCategoryDTOResultDTO;
 import com.epmet.dto.result.ProjectIssueCategoryResultDTO;
+import com.epmet.dto.result.ProjectIssueDTOResultDTO;
 import com.epmet.entity.IssueProjectCategoryDictEntity;
 import com.epmet.redis.IssueProjectCategoryDictRedis;
 import com.epmet.service.IssueProjectCategoryDictService;
@@ -149,14 +151,16 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
         if (null == dto) {
             throw new RenException(String.format("保存项目分类信息，获取项目对应的议题基本信息失败，projectId->%s", formDTO.getProjectId()));
         }
-        //resultDTO.setIssueDTO(dto);
+        ProjectIssueDTOResultDTO issueDTO = ConvertUtils.sourceToTarget(dto,ProjectIssueDTOResultDTO.class);
+        resultDTO.setIssueDTO(issueDTO);
         //2.批量查询分类信息
         List<String> categoryIdList = formDTO.getCategoryList().stream().map(SaveIssueCategoryFormDTO::getId).collect(Collectors.toList());
         List<IssueProjectCategoryDictDTO> categoryList = getCategoryList(categoryIdList);
         if (null == categoryList) {
             throw new RenException(String.format("保存项目分类信息，根据分类Id获取分类信息失败"));
         }
-       // resultDTO.setCategoryList(categoryList);
+        List<ProjectCategoryDTOResultDTO> list = ConvertUtils.sourceToTarget(categoryList,ProjectCategoryDTOResultDTO.class);
+        resultDTO.setCategoryList(list);
 
         return resultDTO;
     }
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
new file mode 100644
index 0000000000..17a4e51c20
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectCategoryDTOResultDTO.java
@@ -0,0 +1,55 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @dscription 项目所属网格、分类基本信息-接口返参
+ * @author sun
+ */
+@Data
+public class ProjectCategoryDTOResultDTO implements Serializable {
+
+	private static final long serialVersionUID = 5957826616179876849L;
+	/**
+	 * 主键
+	 */
+	private String id;
+
+	/**
+	 * 客户id,  产品默认default
+	 */
+	private String customerId;
+
+	/**
+	 * 上级分类ID 顶级此列存储0
+	 */
+	private String pid;
+
+	/**
+	 * 所有上级分类ID，用逗号分开
+	 */
+	private String pids;
+
+	/**
+	 * 分类编码，分类编码+customer_id唯一
+	 */
+	private String categoryCode;
+
+	/**
+	 * 分类名称
+	 */
+	private String categoryName;
+
+	/**
+	 * 分类类别1,2,3,4....
+	 */
+	private String categoryType;
+
+	/**
+	 * 排序
+	 */
+	private Integer sort;
+
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectIssueCategoryResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectIssueCategoryResultDTO.java
index 9aad1bb5a9..e035523fe7 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectIssueCategoryResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectIssueCategoryResultDTO.java
@@ -3,6 +3,7 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @dscription 项目所属网格、分类基本信息-接口返参
@@ -15,10 +16,10 @@ public class ProjectIssueCategoryResultDTO implements Serializable {
 	/**
 	 * 项目Id
 	 */
-	/*private IssueDTO issueDTO;
-	*//**
+	private ProjectIssueDTOResultDTO issueDTO;
+	/**
 	 * 项目标题
-	 *//*
-	private List<IssueProjectCategoryDictDTO> categoryList;*/
+	 */
+	private List<ProjectCategoryDTOResultDTO> categoryList;
 
 }
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectIssueDTOResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectIssueDTOResultDTO.java
new file mode 100644
index 0000000000..0dd2698c4c
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectIssueDTOResultDTO.java
@@ -0,0 +1,96 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @dscription 项目所属网格、分类基本信息-接口返参
+ * @author sun
+ */
+@Data
+public class ProjectIssueDTOResultDTO implements Serializable {
+
+	private static final long serialVersionUID = 5957826616179876849L;
+	/**
+	 * 议题ID
+	 */
+	private String id;
+
+	/**
+	 * 议题状态 表决中：voting 已转项目：shift_project 已关闭：closed
+	 */
+	private String issueStatus;
+
+	/**
+	 * 来源类型 eg:resi_topic
+	 */
+	private String sourceType;
+
+	/**
+	 * 来源ID eg:2223232(当SOURCE_TYPE为"resi_topic"时，这里指话题的ID)
+	 */
+	private String sourceId;
+
+	/**
+	 * 关闭理由 【未关闭时可以为空】关闭议题时必填的理由，转项目后而且已经结案，这个字段不回写
+	 */
+	private String closeReason;
+
+	/**
+	 * 解决类型 【未关闭时可以为空】已解决resolved、未解决unresolved，对应在关闭议题时所选的checkbox，转项目后而且已经结案，这个字段不回写
+	 */
+	private String resolveType;
+
+	/**
+	 * 议题名称 最多20字
+	 */
+	private String issueTitle;
+
+	/**
+	 * 建议 最多1000字
+	 */
+	private String suggestion;
+
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
+	/**
+	 * 网格ID 居民端议题对应一个网格Id
+	 */
+	private String gridId;
+
+	/**
+	 * 所属机关 【数据权限-非必填】11:22:33(agencyId)数据权限控制
+	 */
+	private String orgIdPath;
+
+	/**
+	 * 组织ID 【数据权限-非必填】agencyId
+	 */
+	private String orgId;
+
+	/**
+	 * 表决截止日期
+	 */
+	private Date votingDeadline;
+
+	/**
+	 * 表决发起日期（转议题日期）
+	 */
+	private Date decidedTime;
+
+	/**
+	 * 转项目日期 （服务间调用日期一致性）
+	 */
+	private Date shiftedTime;
+
+	/**
+	 * 关闭日期
+	 */
+	private Date closedTime;
+
+}
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 ca2febe86c..74ed9133ee 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
@@ -31,8 +31,7 @@ import com.epmet.dao.ProjectTagsDao;
 import com.epmet.dto.ProjectCategoryDTO;
 import com.epmet.dto.form.ProjectCategoryTagListFormDTO;
 import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
-import com.epmet.dto.result.ProjectCategoryTagListResultDTO;
-import com.epmet.dto.result.ProjectCategoryTagResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.entity.ProjectCategoryEntity;
 import com.epmet.feign.GovIssueOpenFeignClient;
 import com.epmet.redis.ProjectCategoryRedis;
@@ -42,6 +41,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -151,12 +151,12 @@ public class ProjectCategoryServiceImpl extends BaseServiceImpl<ProjectCategoryD
     public void saveCategory(ProjectSaveCategoryFormDTO formDTO) {
 
         //1.查询项目所属客户和所属网格信息以及分类对应的分类信息
-        /*Result<ProjectIssueCategoryResultDTO> result = govIssueOpenFeignClient.getProjectAndCategoryInfo(formDTO);
+        Result<ProjectIssueCategoryResultDTO> result = govIssueOpenFeignClient.getProjectAndCategoryInfo(formDTO);
         if (!result.success()) {
             throw new RenException(String.format("保存项目分类，获取项目对应的议题信息以及分类信息失败，projiectId->%s", formDTO.getProjectId()));
         }
-        IssueDTO issue = result.getData().getIssueDTO();
-        List<IssueProjectCategoryDictDTO> categoryList = result.getData().getCategoryList();
+        ProjectIssueDTOResultDTO issue = result.getData().getIssueDTO();
+        List<ProjectCategoryDTOResultDTO> categoryList = result.getData().getCategoryList();
 
         //2.汇总批量新增数据
         List<ProjectCategoryEntity> entityList = new ArrayList<>();
@@ -180,7 +180,7 @@ public class ProjectCategoryServiceImpl extends BaseServiceImpl<ProjectCategoryD
         //4.批量保存议题分类信息
         if (!insertBatch(entityList)) {
             throw new RenException(String.format("项目分类信息保存失败"));
-        }*/
+        }
 
     }
 

From b2739fba459f64ec2883c68e2ef9ab2c7c0e6b5c Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 10 Dec 2020 10:48:44 +0800
Subject: [PATCH 020/119] =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/form/CategoryTagInitFormDTO.java      | 16 +++++++++
 .../IssueProjectCategoryDictController.java   | 14 ++++++++
 .../dao/IssueProjectCategoryDictDao.java      |  8 +++++
 .../com/epmet/dao/IssueProjectTagDictDao.java | 23 ++++++++++++-
 .../IssueProjectCategoryDictService.java      | 10 ++++++
 .../service/IssueProjectTagDictService.java   |  9 +++++
 .../IssueProjectCategoryDictServiceImpl.java  | 34 +++++++++++++++++++
 .../impl/IssueProjectTagDictServiceImpl.java  | 18 +++++++++-
 .../mapper/IssueProjectCategoryDictDao.xml    | 15 ++++++++
 .../mapper/IssueProjectTagDictDao.xml         | 30 +++++++++++++++-
 10 files changed, 174 insertions(+), 3 deletions(-)
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CategoryTagInitFormDTO.java

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CategoryTagInitFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CategoryTagInitFormDTO.java
new file mode 100644
index 0000000000..ac83a9750a
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CategoryTagInitFormDTO.java
@@ -0,0 +1,16 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/12/10 10:00
+ */
+@Data
+public class CategoryTagInitFormDTO implements Serializable {
+	private static final long serialVersionUID = -3420775041990761296L;
+	private String customerId;
+}
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 c7ffed58f3..cd7948cf91 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
@@ -26,6 +26,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 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.CustomerCategoryListFormDTO;
 import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
 import com.epmet.dto.result.CustomerCategoryListResultDTO;
@@ -107,6 +108,19 @@ public class IssueProjectCategoryDictController {
         return new Result<List<CustomerCategoryListResultDTO>>().ok(issueProjectCategoryDictService.categoryList(formDTO));
     }
 
+    /**
+     * 客户分类标签数据初始化
+     * @author zhaoqifeng
+     * @date 2020/12/10 10:02
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     */
+    @PostMapping("init")
+    public Result init(@RequestBody CategoryTagInitFormDTO formDTO) {
+        issueProjectCategoryDictService.init(formDTO);
+        return new Result();
+    }
+
     /**
      * @param cstegoryIdList
      * @return
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 3d21dfa3a7..fcf13cfd4d 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
@@ -46,6 +46,14 @@ public interface IssueProjectCategoryDictDao extends BaseDao<IssueProjectCategor
      **/
     List<CustomerCategoryListResultDTO> subCategoryList(@Param("id") String categoryId);
 
+    /**
+     * 获取默认标签配置
+     * @author zhaoqifeng
+     * @date 2020/12/10 10:06
+     * @return java.util.List<com.epmet.entity.IssueProjectCategoryDictEntity>
+     */
+    List<IssueProjectCategoryDictEntity> selectCategoryListByCustomer(@Param("customerId") String customerId);
+
     /**
      * @param cstegoryIdList
      * @return
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java
index 7f2bd323dd..589fe93403 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java
@@ -18,8 +18,12 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.IssueCategoryTagResultDTO;
 import com.epmet.entity.IssueProjectTagDictEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 议题、项目标签字典表
@@ -29,5 +33,22 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface IssueProjectTagDictDao extends BaseDao<IssueProjectTagDictEntity> {
-	
+	/**
+	 * 获取客户默认分类标签
+	 * @author zhaoqifeng
+	 * @date 2020/12/10 9:26
+	 * @param customerId
+	 * @param list
+	 * @return java.util.List<com.epmet.dto.result.IssueCategoryTagResultDTO>
+	 */
+	List<IssueCategoryTagResultDTO> selectDefaultList(@Param("customerId") String  customerId, @Param("list") List<String> list);
+
+	/**
+	 * 获取默认标签配置
+	 * @author zhaoqifeng
+	 * @date 2020/12/10 10:09
+	 * @param customerId
+	 * @return java.util.List<com.epmet.entity.IssueProjectTagDictEntity>
+	 */
+	List<IssueProjectTagDictEntity> selectTagListByCustomer(@Param("customerId") String  customerId);
 }
\ 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 cd995afe87..1e89188eff 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
@@ -20,6 +20,7 @@ package com.epmet.service;
 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.CustomerCategoryListFormDTO;
 import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
 import com.epmet.dto.result.CustomerCategoryListResultDTO;
@@ -105,6 +106,15 @@ public interface IssueProjectCategoryDictService extends BaseService<IssueProjec
      **/
     List<CustomerCategoryListResultDTO> categoryList(CustomerCategoryListFormDTO formDTO);
 
+    /**
+     * 客户分类标签数据初始化
+     * @author zhaoqifeng
+     * @date 2020/12/10 10:02
+     * @param formDTO
+     * @return void
+     */
+    void init(CategoryTagInitFormDTO formDTO);
+
     /**
      * @param cstegoryIdList
      * @return
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectTagDictService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectTagDictService.java
index 9c730be5bc..089aac5d68 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectTagDictService.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectTagDictService.java
@@ -105,4 +105,13 @@ public interface IssueProjectTagDictService extends BaseService<IssueProjectTagD
      * @return com.epmet.dto.result.TagListResultDTO
      */
     TagListResultDTO getTagList(TokenDto tokenDto, TagListFormDTO formDTO);
+
+    /**
+     * 获取默认标签配置
+     * @author zhaoqifeng
+     * @date 2020/12/10 10:12
+     * @param
+     * @return java.util.List<com.epmet.entity.IssueProjectTagDictEntity>
+     */
+    List<IssueProjectTagDictEntity> getTagListByCustomer(String customerId);
 }
\ No newline at end of file
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 2197ae8143..3030b696fd 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
@@ -28,6 +28,7 @@ import com.epmet.dao.IssueProjectCategoryDictDao;
 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.CustomerCategoryListFormDTO;
 import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
 import com.epmet.dto.form.SaveIssueCategoryFormDTO;
@@ -36,8 +37,11 @@ import com.epmet.dto.result.ProjectCategoryDTOResultDTO;
 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.redis.IssueProjectCategoryDictRedis;
 import com.epmet.service.IssueProjectCategoryDictService;
+import com.epmet.service.IssueProjectTagDictService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -61,6 +65,8 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
     private IssueProjectCategoryDictRedis issueProjectCategoryDictRedis;
     @Autowired
     private IssueProjectRelationDao issueProjectRelationDao;
+    @Autowired
+    private IssueProjectTagDictService issueProjectTagDictService;
 
     @Override
     public PageData<IssueProjectCategoryDictDTO> page(Map<String, Object> params) {
@@ -165,4 +171,32 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
         return resultDTO;
     }
 
+    /**
+     * 客户分类标签数据初始化
+     *
+     * @param formDTO
+     * @return void
+     * @author zhaoqifeng
+     * @date 2020/12/10 10:02
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void init(CategoryTagInitFormDTO formDTO) {
+        List<IssueProjectCategoryDictEntity> list = baseDao.selectCategoryListByCustomer(formDTO.getCustomerId());
+        if (CollectionUtils.isEmpty(list)) {
+            //分类初始化
+            List<IssueProjectCategoryDictEntity> categoryList = baseDao.selectCategoryListByCustomer("default");
+            categoryList.forEach(item -> {
+                item.setCustomerId(formDTO.getCustomerId());
+            });
+            this.insertBatch(categoryList);
+            //标签初始化
+            List<IssueProjectTagDictEntity> tagList = issueProjectTagDictService.getTagListByCustomer("default");
+            tagList.forEach(item -> {
+                item.setCustomerId(formDTO.getCustomerId());
+            });
+            issueProjectTagDictService.insertBatch(tagList);
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
index aae0d8dc5d..9b40e3350b 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
@@ -27,6 +27,7 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.IssueProjectTagDictDao;
 import com.epmet.dto.IssueProjectTagDictDTO;
 import com.epmet.dto.form.TagListFormDTO;
+import com.epmet.dto.result.IssueCategoryTagResultDTO;
 import com.epmet.dto.result.TagListResultDTO;
 import com.epmet.entity.IssueProjectTagDictEntity;
 import com.epmet.redis.IssueProjectTagDictRedis;
@@ -115,7 +116,22 @@ public class IssueProjectTagDictServiceImpl extends BaseServiceImpl<IssueProject
      */
     @Override
     public TagListResultDTO getTagList(TokenDto tokenDto, TagListFormDTO formDTO) {
-        return null;
+        TagListResultDTO result = new TagListResultDTO();
+        List<IssueCategoryTagResultDTO> defaultList = baseDao.selectDefaultList(tokenDto.getCustomerId(), formDTO.getCategoryIdList());
+        result.setDefaulted(defaultList);
+        return result;
+    }
+
+    /**
+     * 获取默认标签配置
+     *
+     * @return java.util.List<com.epmet.entity.IssueProjectTagDictEntity>
+     * @author zhaoqifeng
+     * @date 2020/12/10 10:12
+     */
+    @Override
+    public List<IssueProjectTagDictEntity> getTagListByCustomer(String customerId) {
+        return baseDao.selectTagListByCustomer(customerId);
     }
 
 }
\ No newline at end of file
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 52bad40a4b..6efb42b00c 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
@@ -35,6 +35,21 @@
         ORDER BY sort ASC
     </select>
     <!-- sql递归 查询客户议题项目的分类信息以及递归查询二级分类信息 end-->
+    <select id="selectCategoryListByCustomer" resultType="com.epmet.entity.IssueProjectCategoryDictEntity">
+        SELECT
+            ID,
+            PID,
+            PIDS,
+            CATEGORY_CODE,
+            CATEGORY_NAME,
+            CATEGORY_TYPE,
+            SORT
+        FROM
+            issue_project_category_dict
+        WHERE
+            DEL_FLAG = '0'
+            AND CUSTOMER_ID = #{customerId}
+    </select>
 
     <select id="selectCategoryList" resultType="com.epmet.dto.IssueProjectCategoryDictDTO">
         SELECT
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
index 24ce93f310..ba99a65080 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
@@ -3,6 +3,34 @@
 
 <mapper namespace="com.epmet.dao.IssueProjectTagDictDao">
 
-
+    <select id="selectDefaultList" resultType="com.epmet.dto.result.IssueCategoryTagResultDTO">
+        SELECT
+        TAG_ID AS "id",
+        TAG_NAME AS "name"
+        FROM
+        issue_tags
+        WHERE
+        DEL_FLAG = '0'
+        AND CUSTOMER_ID = #{customerId}
+        <if test="list != null and list.size() > 0">
+            <foreach item="category" collection="list" separator="OR" open="AND (" close=")" index="">
+                CATEGORY_ID = #{category}
+            </foreach>
+        </if>
+        ORDER BY TAG_ID
+    </select>
+    <select id="selectTagListByCustomer" resultType="com.epmet.entity.IssueProjectTagDictEntity">
+        SELECT
+            TAG_NAME,
+            CATEGORY_ID,
+            IS_DEFAULT,
+            ISSUE_USE_COUNT,
+            PROJECT_USE_COUNT
+        FROM
+            issue_project_tag_dict
+        WHERE
+            DEL_FLAG = '0'
+          AND CUSTOMER_ID = #{customerId}
+    </select>
 
 </mapper>
\ No newline at end of file

From 6bc5972bce0303a9ba621eb4fa0c67b256214b57 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 10 Dec 2020 13:35:59 +0800
Subject: [PATCH 021/119] =?UTF-8?q?sql=E8=84=9A=E6=9C=AC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/db/migration/V0.0.7__add_category_tag.sql    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.7__add_category_tag.sql b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.7__add_category_tag.sql
index b198293630..b610d1ebfe 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.7__add_category_tag.sql
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.7__add_category_tag.sql
@@ -13,7 +13,7 @@ CREATE TABLE `issue_project_category_dict` (
   `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
   `UPDATED_BY` varchar(32) CHARACTER SET utf8mb4 NOT NULL COMMENT '更新人',
   `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
-  PRIMARY KEY (`ID`,`CUSTOMER_ID`) USING BTREE
+  PRIMARY KEY (`ID`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='议题项目分类字典';
 
 CREATE TABLE `issue_project_tag_dict` (

From 55eed24e7318f343e276e7eeb9ec084f84880cad Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 10 Dec 2020 14:47:26 +0800
Subject: [PATCH 022/119] =?UTF-8?q?sql=E8=84=9A=E6=9C=AC=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/db/migration/V0.0.7__add_category_tag.sql    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.7__add_category_tag.sql b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.7__add_category_tag.sql
index b610d1ebfe..b198293630 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.7__add_category_tag.sql
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.7__add_category_tag.sql
@@ -13,7 +13,7 @@ CREATE TABLE `issue_project_category_dict` (
   `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
   `UPDATED_BY` varchar(32) CHARACTER SET utf8mb4 NOT NULL COMMENT '更新人',
   `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
-  PRIMARY KEY (`ID`) USING BTREE
+  PRIMARY KEY (`ID`,`CUSTOMER_ID`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='议题项目分类字典';
 
 CREATE TABLE `issue_project_tag_dict` (

From 7d334a268fcfddc112ea740670b1739531f4218d Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 10 Dec 2020 15:19:58 +0800
Subject: [PATCH 023/119] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9/=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/form/IssueTagFormDTO.java   | 24 +++++++
 .../com/epmet/dto/form/IssueTagsFormDTO.java  | 72 +++++++++++++++++++
 .../epmet/dto/form/IssueTagsSaveFormDTO.java  | 28 ++++++++
 .../dto/result/IssueProjectTagsResultDTO.java | 21 ++++++
 .../epmet/controller/IssueTagsController.java | 15 ++++
 .../com/epmet/dao/IssueProjectTagDictDao.java | 22 +++++-
 .../main/java/com/epmet/dao/IssueTagsDao.java | 34 +++++++++
 .../epmet/redis/IssueProjectTagDictRedis.java |  2 +-
 .../com/epmet/service/IssueTagsService.java   | 10 +++
 .../service/impl/IssueTagsServiceImpl.java    | 69 ++++++++++++++++++
 .../mapper/IssueProjectTagDictDao.xml         | 33 +++++++++
 .../main/resources/mapper/IssueTagsDao.xml    | 54 +++++++++++++-
 12 files changed, 381 insertions(+), 3 deletions(-)
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagFormDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagsFormDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagsSaveFormDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueProjectTagsResultDTO.java

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagFormDTO.java
new file mode 100644
index 0000000000..b49075bce4
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagFormDTO.java
@@ -0,0 +1,24 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/12/10 上午9:31
+ */
+@Data
+public class IssueTagFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -8678756265520573631L;
+
+    private String id;
+
+    private String tagName;
+
+    private String categoryId;
+
+    private String tagId;
+
+}
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
new file mode 100644
index 0000000000..e813b866f5
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagsFormDTO.java
@@ -0,0 +1,72 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/12/10 上午9:31
+ */
+@Data
+public class IssueTagsFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -8678756265520570931L;
+
+    /**
+     * 主键ID
+     */
+    private String id;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 议题所属网格id
+     */
+    private String gridId;
+
+    /**
+     * 议题ID
+     */
+    private String issueId;
+
+    /**
+     * 标签ID
+     */
+    private String tagId;
+
+    /**
+     * 标签名称
+     */
+    private String tagName;
+
+    /**
+     * 删除标识 0.未删除 1.已删除
+     */
+    private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    public IssueTagsFormDTO() {
+        this.delFlag = 0;
+        this.revision = 0;
+        this.createdBy = "APP_USER";
+        this.updatedBy = "APP_USER";
+    }
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagsSaveFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagsSaveFormDTO.java
new file mode 100644
index 0000000000..bbf3b9110e
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagsSaveFormDTO.java
@@ -0,0 +1,28 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/12/10 上午9:29
+ */
+@Data
+public class IssueTagsSaveFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 4122102633306198151L;
+
+    public interface IssueTagsSaveForm{}
+
+    @NotBlank(message = "议题ID不能为空",groups = {IssueTagsSaveForm.class})
+    private String issueId;
+
+    /**
+     * 标签集合 为空，清除此议题标签
+     */
+    private List<IssueTagFormDTO> tagList;
+
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueProjectTagsResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueProjectTagsResultDTO.java
new file mode 100644
index 0000000000..55a738b52e
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueProjectTagsResultDTO.java
@@ -0,0 +1,21 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/12/10 下午2:13
+ */
+@Data
+public class IssueProjectTagsResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -5035269596436047038L;
+
+    private String tagId;
+
+    private String tagName;
+
+    private String categoryId;
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueTagsController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueTagsController.java
index 6c6b768730..de6cfd4cc2 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueTagsController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueTagsController.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.IssueTagsDTO;
 import com.epmet.dto.form.AddTagFormDTO;
+import com.epmet.dto.form.IssueTagsSaveFormDTO;
 import com.epmet.dto.result.AddTagResultDTO;
 import com.epmet.excel.IssueTagsExcel;
 import com.epmet.service.IssueTagsService;
@@ -108,4 +109,18 @@ public class IssueTagsController {
         return new Result<AddTagResultDTO>().ok(addTagResultDTO);
     }
 
+    /**
+     * @Description  议题标签保存/修改
+     * @Param form
+     * @Param tokenDto
+     * @author zxc
+     * @date 2020/12/10 上午9:37
+     */
+    @PostMapping("save")
+    public Result issueTagSave(@RequestBody IssueTagsSaveFormDTO form,@LoginUser TokenDto tokenDto){
+        ValidatorUtils.validateEntity(form, IssueTagsSaveFormDTO.IssueTagsSaveForm.class);
+        issueTagsService.issueTagSave(form,tokenDto);
+        return new Result();
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java
index 589fe93403..5e615fca25 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java
@@ -18,10 +18,11 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.IssueTagFormDTO;
 import com.epmet.dto.result.IssueCategoryTagResultDTO;
 import com.epmet.entity.IssueProjectTagDictEntity;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
+import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 
@@ -33,6 +34,25 @@ import java.util.List;
  */
 @Mapper
 public interface IssueProjectTagDictDao extends BaseDao<IssueProjectTagDictEntity> {
+
+    /**
+     * @Description  更新标签使用次数
+     * @Param tags
+     * @Param status 0:+1；1：-1
+     * @author zxc
+     * @date 2020/12/10 上午10:29
+     */
+    void updateTagsUseCount(@Param("tags") List<IssueTagFormDTO> tags,@Param("customerId")String customerId,@Param("status")String status);
+
+    /**
+     * @Description  查询标签ID
+     * @Param newTags
+     * @Param customerId
+     * @author zxc
+     * @date 2020/12/10 下午2:16
+     */
+    List<IssueTagFormDTO> selectTagId(@Param("tags") List<IssueTagFormDTO> newTags, @Param("customerId")String customerId);
+
 	/**
 	 * 获取客户默认分类标签
 	 * @author zhaoqifeng
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueTagsDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueTagsDao.java
index ba73daf786..97d3bbea5e 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueTagsDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueTagsDao.java
@@ -20,6 +20,8 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.IssueTagsDTO;
 import com.epmet.dto.form.AddTagFormDTO;
+import com.epmet.dto.form.IssueTagFormDTO;
+import com.epmet.dto.form.IssueTagsFormDTO;
 import com.epmet.dto.result.IssueCategoryTagResultDTO;
 import com.epmet.entity.IssueTagsEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -58,4 +60,36 @@ public interface IssueTagsDao extends BaseDao<IssueTagsEntity> {
      * @date 2020/12/9 下午3:40
      */
     String selectTagNameCount(AddTagFormDTO form);
+
+    /**
+     * @Description  根据IssueId查询标签
+     * @Param issueId
+     * @author zxc
+     * @date 2020/12/10 上午10:05
+     */
+    List<IssueTagFormDTO> selectTagsByIssueId(@Param("issueId")String issueId);
+
+    /**
+     * @Description  根据IssueId删除标签
+     * @Param issueId
+     * @author zxc
+     * @date 2020/12/10 上午10:14
+     */
+    void deleteTagsByIssueId(@Param("issueId")String issueId);
+
+    /**
+     * @Description  查询此议题一条标签记录
+     * @Param issueId
+     * @author zxc
+     * @date 2020/12/10 下午1:49
+     */
+    IssueTagsDTO selectOneTagByIssueId(@Param("issueId")String issueId);
+
+    /**
+     * @Description  插入新的标签
+     * @Param needInsert
+     * @author zxc
+     * @date 2020/12/10 下午2:11
+     */
+    void insertNewTags(@Param("tags") List<IssueTagsFormDTO> needInsert);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
index 119503607a..4bcaf18866 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
@@ -154,7 +154,7 @@ public class IssueProjectTagDictRedis {
         }
         if (status.equals(NumConstant.ONE_STR)){
             //标签使用次数-1
-            if (redisUtils.getScore(key,formDTO)>NumConstant.ZERO){
+            if (null != redisUtils.getScore(key,formDTO) && redisUtils.getScore(key,formDTO)>NumConstant.ZERO){
                 redisUtils.zIncrementScore(key, formDTO,NumConstant.ONE_NEG);
             }
         }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueTagsService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueTagsService.java
index c95e8cc51e..b7970e8793 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueTagsService.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueTagsService.java
@@ -22,6 +22,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.IssueTagsDTO;
 import com.epmet.dto.form.AddTagFormDTO;
+import com.epmet.dto.form.IssueTagsSaveFormDTO;
 import com.epmet.dto.result.AddTagResultDTO;
 import com.epmet.entity.IssueTagsEntity;
 
@@ -112,4 +113,13 @@ public interface IssueTagsService extends BaseService<IssueTagsEntity> {
      * @date 2020/12/9 下午3:29
      */
     AddTagResultDTO addTag(AddTagFormDTO form, TokenDto tokenDto);
+
+    /**
+     * @Description  议题标签保存/修改
+     * @Param form
+     * @Param tokenDto
+     * @author zxc
+     * @date 2020/12/10 上午9:37
+     */
+    void issueTagSave(IssueTagsSaveFormDTO form, TokenDto tokenDto);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
index 6c2a1e6f2e..3b54780a02 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
@@ -29,6 +29,9 @@ import com.epmet.dao.IssueProjectTagDictDao;
 import com.epmet.dao.IssueTagsDao;
 import com.epmet.dto.IssueTagsDTO;
 import com.epmet.dto.form.AddTagFormDTO;
+import com.epmet.dto.form.IssueTagFormDTO;
+import com.epmet.dto.form.IssueTagsFormDTO;
+import com.epmet.dto.form.IssueTagsSaveFormDTO;
 import com.epmet.dto.result.AddTagResultDTO;
 import com.epmet.dto.result.IssueCategoryTagResultDTO;
 import com.epmet.entity.IssueProjectTagDictEntity;
@@ -41,11 +44,14 @@ 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.Arrays;
 import java.util.List;
 import java.util.Map;
 
+import static java.util.stream.Collectors.toList;
+
 /**
  * 议题关联标签表
  *
@@ -134,6 +140,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
      * @date 2020/12/9 下午3:29
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public AddTagResultDTO addTag(AddTagFormDTO form, TokenDto tokenDto) {
         form.setCustomerId(tokenDto.getCustomerId());
         String tagId = baseDao.selectTagNameCount(form);
@@ -155,4 +162,66 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
         return new AddTagResultDTO();
     }
 
+    /**
+     * @Description  议题标签保存/修改
+     * @Param form
+     * @Param tokenDto
+     * @author zxc
+     * @date 2020/12/10 上午9:37
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void issueTagSave(IssueTagsSaveFormDTO form, TokenDto tokenDto) {
+        String customerId = tokenDto.getCustomerId();
+        List<IssueTagFormDTO> tags = baseDao.selectTagsByIssueId(form.getIssueId());
+        if (CollectionUtils.isEmpty(form.getTagList())){
+            // 清空此议题的标签
+            if (!CollectionUtils.isEmpty(tags)){
+                tags.forEach(t -> {
+                    // 缓存标签 -1
+                    dictRedis.editTagUseCount(customerId,t.getCategoryId(),t,NumConstant.ONE_STR);
+                });
+                // 数据库有关标签使用次数 -1  0:+1 ; 1:-1;
+                issueProjectTagDictDao.updateTagsUseCount(tags,customerId,NumConstant.ONE_STR);
+            }
+            // 删除数据库有关此议题标签
+            baseDao.deleteTagsByIssueId(form.getIssueId());
+            return;
+        }
+        List<IssueTagFormDTO> selectTags = form.getTagList();
+        List<IssueTagFormDTO> newTags = issueProjectTagDictDao.selectTagId(selectTags, customerId);
+        IssueTagsDTO issueTagsDTO = baseDao.selectOneTagByIssueId(form.getIssueId());
+        if (!CollectionUtils.isEmpty(newTags)){
+            // 需要删除的标签
+            List<IssueTagFormDTO> delList = tags.stream().filter(tag -> !newTags.contains(tag)).collect(toList());
+            if (!CollectionUtils.isEmpty(delList)){
+                delList.forEach(d -> {
+                    dictRedis.editTagUseCount(customerId,d.getCategoryId(),d,NumConstant.ONE_STR);
+                });
+                // 数据库有关标签使用次数 -1  0:+1 ; 1:-1;
+                issueProjectTagDictDao.updateTagsUseCount(delList,customerId,NumConstant.ONE_STR);
+            }
+            // 需要新增的标签
+            List<IssueTagFormDTO> addList = newTags.stream().filter(tag -> !tags.contains(tag)).collect(toList());
+            if (!CollectionUtils.isEmpty(addList)){
+                addList.forEach(a -> {
+                    // 缓存标签+1
+                    dictRedis.editTagUseCount(customerId,a.getCategoryId(),a,NumConstant.ZERO_STR);
+                });
+                // 数据库对应标签 议题使用次数 +1
+                issueProjectTagDictDao.updateTagsUseCount(addList,customerId,NumConstant.ZERO_STR);
+            }
+            // 删除数据库有关此议题标签
+            baseDao.deleteTagsByIssueId(form.getIssueId());
+            // 新增最新议题标签
+            List<IssueTagsFormDTO> needInsert = ConvertUtils.sourceToTarget(newTags, IssueTagsFormDTO.class);
+            needInsert.forEach(n -> {
+                n.setCustomerId(customerId);
+                n.setGridId(issueTagsDTO.getGridId());
+                n.setIssueId(form.getIssueId());
+            });
+            baseDao.insertNewTags(needInsert);
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
index ba99a65080..6300fb488c 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
@@ -3,6 +3,39 @@
 
 <mapper namespace="com.epmet.dao.IssueProjectTagDictDao">
 
+    <!-- 更新标签使用次数 -->
+    <update id="updateTagsUseCount">
+        UPDATE issue_project_tag_dict
+        <if test="status == 1">
+            SET ISSUE_USE_COUNT = (CASE WHEN ISSUE_USE_COUNT = 0 THEN 0 ELSE (ISSUE_USE_COUNT - 1) END)
+        </if>
+        <if test="status == 0">
+            SET ISSUE_USE_COUNT = ISSUE_USE_COUNT + 1
+        </if>
+        <where>
+            DEL_FLAG = 0
+            AND CUSTOMER_ID = #{customerId}
+            AND
+            <foreach collection="tags" item="t" open=" ( " separator=" OR " close=" ) ">
+                CATEGORY_ID = #{t.id}
+                AND TAG_NAME = #{t.tagName}
+            </foreach>
+        </where>
+    </update>
+
+    <!-- 查询标签ID -->
+    <select id="selectTagId" resultType="com.epmet.dto.form.IssueTagFormDTO">
+        SELECT ID AS tagId,
+               TAG_NAME,
+               CATEGORY_ID,
+               id
+        FROM issue_project_tag_dict
+        WHERE DEL_FLAG = 0
+            AND
+            <foreach collection="tags" item="t" separator="or" open="(" close=")">
+                ID = #{t.id}
+            </foreach>
+    </select>
     <select id="selectDefaultList" resultType="com.epmet.dto.result.IssueCategoryTagResultDTO">
         SELECT
         TAG_ID AS "id",
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 05de84ba07..9b217b6223 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
@@ -35,7 +35,59 @@
         FROM issue_project_tag_dict
         WHERE DEL_FLAG = 0
           AND TAG_NAME = #{tagName}
-          AND (CUSTOMER_ID = 'default' OR CUSTOMER_ID = #{customerId})
+          AND CUSTOMER_ID = #{customerId}
     </select>
 
+    <!-- 根据IssueId查询标签 -->
+    <select id="selectTagsByIssueId" resultType="com.epmet.dto.form.IssueTagFormDTO">
+        SELECT
+            it.TAG_ID AS id,
+            it.TAG_NAME,
+            td.CATEGORY_ID,
+            it.TAG_ID AS tagId
+        FROM issue_tags it
+        LEFT JOIN issue_project_tag_dict td ON td.id = it.TAG_ID
+        WHERE it.DEL_FLAG = 0
+          AND td.DEL_FLAG = 0
+          AND it.ISSUE_ID = #{issueId}
+    </select>
+
+    <!-- 根据IssueId删除标签 -->
+    <delete id="deleteTagsByIssueId">
+        DELETE FROM issue_tags
+        WHERE DEL_FLAG = 0
+          AND ISSUE_ID = #{issueId}
+    </delete>
+
+    <!-- 查询此议题一条标签记录 -->
+    <select id="selectOneTagByIssueId" resultType="com.epmet.dto.IssueTagsDTO">
+        SELECT * FROM issue_tags
+        WHERE DEL_FLAG = 0
+          AND ISSUE_ID = #{issueId}
+        ORDER BY CREATED_TIME DESC
+        LIMIT 1
+    </select>
+
+    <!-- 插入新的标签 -->
+    <insert id="insertNewTags">
+        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 )
+        VALUES
+            <foreach collection="tags" item="l" separator=",">
+                (
+                REPLACE ( UUID(), '-', '' ),
+                #{l.customerId},
+                #{l.gridId},
+                #{l.issueId},
+                #{l.tagId},
+                #{l.tagName},
+                #{l.delFlag},
+                #{l.revision},
+                #{l.createdBy},
+                NOW(),
+                #{l.updatedBy},
+                NOW()
+                )
+            </foreach>
+    </insert>
+
 </mapper>
\ No newline at end of file

From a4ff09ef58941fa05d3f503c457c15ea239a5627 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 10 Dec 2020 15:40:57 +0800
Subject: [PATCH 024/119] =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/migration/V0.0.7__add_category_tag.sql | 174 +++++++++++++++++-
 .../mapper/IssueProjectTagDictDao.xml         |  13 +-
 2 files changed, 182 insertions(+), 5 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.7__add_category_tag.sql b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.7__add_category_tag.sql
index b198293630..0695671d9a 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.7__add_category_tag.sql
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.7__add_category_tag.sql
@@ -64,4 +64,176 @@ CREATE TABLE `issue_tags` (
   `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
   `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
   PRIMARY KEY (`ID`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='议题关联标签表';
\ No newline at end of file
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='议题关联标签表';
+
+
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1001', 'default', '0', '0', 'A00000', '城市管理', '1', '1', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1002', 'default', '0', '0', 'B00000', '公安交通管理', '1', '2', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1003', 'default', '0', '0', 'C00000', '消防安全', '1', '3', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1004', 'default', '0', '0', 'D00000', '卫生计生监督执法', '1', '4', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1005', 'default', '0', '0', 'E00000', '其他', '1', '5', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1006', 'default', '0', '0', 'F00000', '创卫复审类', '1', '6', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1007', 'default', '0', '0', 'G00000', '环境保护', '1', '7', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1008', 'default', '0', '0', 'H00000', '安全监管', '1', '8', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1009', 'default', '0', '0', 'I00000', '民政', '1', '9', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1010', 'default', '0', '0', 'J00000', '建设管理', '1', '10', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1011', 'default', '0', '0', 'K00000', '文化执法', '1', '11', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1012', 'default', '0', '0', 'L00000', '社会治安综治', '1', '12', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1013', 'default', '0', '0', 'M00000', '食品药品监管', '1', '13', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1014', 'default', '0', '0', 'N00000', '市场监管', '1', '14', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1015', 'default', '1001', '1001', 'A00001', '市政设施管理', '2', '1', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1016', 'default', '1001', '1001', 'A00002', '环境卫生管理', '2', '2', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1017', 'default', '1001', '1001', 'A00003', '园林绿化管理', '2', '3', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1018', 'default', '1001', '1001', 'A00004', '市容市貌', '2', '4', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1019', 'default', '1001', '1001', 'A00005', '早、夜市（摊点群）', '2', '5', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1020', 'default', '1001', '1001', 'A00006', '城区公共健身设施管理', '2', '6', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1021', 'default', '1002', '1002', 'B00001', '交通设施', '2', '1', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1022', 'default', '1002', '1002', 'B00002', '车辆管理', '2', '2', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1023', 'default', '1002', '1002', 'B00003', '违法停车', '2', '3', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1024', 'default', '1003', '1003', 'C00001', '消防设施', '2', '1', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1025', 'default', '1003', '1003', 'C00002', '应急疏散', '2', '2', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1026', 'default', '1003', '1003', 'C00003', '消防隐患', '2', '3', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1027', 'default', '1004', '1004', 'D00001', '公共场所卫生执法', '2', '1', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1028', 'default', '1005', '1005', 'E00001', '其他', '2', '1', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1029', 'default', '1006', '1006', 'F00001', '健康教育促进、公共卫生与医疗服务', '2', '1', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1030', 'default', '1006', '1006', 'F00002', '农贸市场管理', '2', '2', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1031', 'default', '1006', '1006', 'F00003', '食品安全及重点场所卫生', '2', '3', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1032', 'default', '1006', '1006', 'F00004', '环境保护', '2', '4', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1033', 'default', '1006', '1006', 'F00005', '病媚生物防治和控烟', '2', '5', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1034', 'default', '1006', '1006', 'F00006', '市政道路与河道整治提升', '2', '6', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1035', 'default', '1006', '1006', 'F00007', '环境保洁提升', '2', '7', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1036', 'default', '1006', '1006', 'F00008', '绿化美化与铁路两侧环境提升', '2', '8', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1037', 'default', '1006', '1006', 'F00009', '夜景亮化提升', '2', '9', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1038', 'default', '1006', '1006', 'F00010', '单位和居民社区（小区）卫生', '2', '10', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1039', 'default', '1006', '1006', 'F00011', '广告牌匾、市容秩序、违建治理及居民楼院环境提升', '2', '11', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1040', 'default', '1006', '1006', 'F00012', '建筑立面、建设工地环境提升', '2', '12', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1041', 'default', '1007', '1007', 'G00001', '排放污水', '2', '1', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1042', 'default', '1007', '1007', 'G00002', '排放噪声', '2', '2', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1043', 'default', '1007', '1007', 'G00003', '排放固体废物', '2', '3', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1044', 'default', '1007', '1007', 'G00004', '排放大气污染物', '2', '4', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1045', 'default', '1008', '1008', 'H00001', '危险化学品', '2', '1', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1046', 'default', '1009', '1009', 'I00001', '救助管理', '2', '1', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1047', 'default', '1010', '1010', 'J00001', '建设施工管理', '2', '1', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1048', 'default', '1010', '1010', 'J00002', '河道管理', '2', '2', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1049', 'default', '1011', '1011', 'K00001', '文化领域', '2', '1', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1050', 'default', '1011', '1011', 'K00002', '广播影视领域', '2', '2', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1051', 'default', '1011', '1011', 'K00003', '新闻出版领域', '2', '3', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1052', 'default', '1012', '1012', 'L00001', '人口管理', '2', '1', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1053', 'default', '1012', '1012', 'L00002', '民事纠纷', '2', '2', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1054', 'default', '1012', '1012', 'L00003', '安全防控', '2', '3', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1055', 'default', '1012', '1012', 'L00004', '社会治安', '2', '4', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1056', 'default', '1012', '1012', 'L00005', '信访工作', '2', '5', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1057', 'default', '1013', '1013', 'M00001', '食品监管', '2', '1', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1058', 'default', '1013', '1013', 'M00002', '药品监管', '2', '2', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1059', 'default', '1013', '1013', 'M00003', '医疗器械监管', '2', '3', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1060', 'default', '1013', '1013', 'M00004', '保健食品监管', '2', '4', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1061', 'default', '1014', '1014', 'N00001', '营业执照管理', '2', '1', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1062', 'default', '1014', '1014', 'N00002', '特种设备安全', '2', '2', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_category_dict`(`ID`, `CUSTOMER_ID`, `PID`, `PIDS`, `CATEGORY_CODE`, `CATEGORY_NAME`, `CATEGORY_TYPE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1063', 'default', '1014', '1014', 'N00003', '广告管理', '2', '3', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1020', 'default', '城管执法', '1018', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1021', 'default', '交易秩序', '1019', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1022', 'default', '健身设施维护与更新', '1020', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1023', 'default', '交通设施、标线', '1021', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1024', 'default', '废弃车辆', '1022', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1025', 'default', '畜力车进城', '1022', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1026', 'default', '人行道、车行道违法停车', '1023', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1027', 'default', '消防设施', '1024', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1028', 'default', '应急疏散', '1025', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1029', 'default', '各类大型活动不具备公共安全条件的严重隐患', '1026', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1030', 'default', '城市无烟草广告', '1027', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1031', 'default', '其他', '1028', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1032', 'default', '健康教育', '1029', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1033', 'default', '市民参与健身运动', '1029', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1034', 'default', '免疫门诊', '1029', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1035', 'default', '预检分诊点', '1029', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1036', 'default', '发热与肠道门诊设置', '1029', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1037', 'default', '医疗废弃物储存和处理', '1029', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1038', 'default', '基层医疗卫生机构标准化建设', '1029', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1039', 'default', '院内环卫设施及清扫保洁', '1029', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1040', 'default', '小型理发店、小旅店、小歌舞厅、小浴室等', '1029', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1041', 'default', '基本信息公示', '1030', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1042', 'default', '建设与管理', '1030', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1043', 'default', '市场公厕', '1030', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1044', 'default', '活禽售卖', '1030', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1045', 'default', '水产区', '1030', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1046', 'default', '食品安全', '1030', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1047', 'default', '基本信息公示', '1031', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1048', 'default', '设施与管理', '1031', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1049', 'default', '“五小”行业的食品安全管理', '1031', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1050', 'default', '噪音控制管理', '1032', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1051', 'default', '大气环境治理', '1032', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1052', 'default', '水源地保护', '1032', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1053', 'default', '医疗废弃物处置管理', '1032', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1054', 'default', '鼠防制', '1033', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1055', 'default', '蝇防制', '1033', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1056', 'default', '蚊防制', '1033', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1057', 'default', '蟑螂防制', '1033', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1058', 'default', '控制吸烟', '1033', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1059', 'default', '主次干道、背街小巷路面平坦，基础设施完好', '1034', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1060', 'default', '城中村及城乡结合部路面平整，沟渠密闭通畅', '1034', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1061', 'default', '公共河道、水域水面清洁，岸坡整洁完好，无直排污水现象', '1034', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1062', 'default', '清扫保洁', '1035', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1063', 'default', '垃圾收集运输', '1035', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1064', 'default', '垃圾中转站', '1035', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1065', 'default', '公厕', '1035', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1066', 'default', '社区与单位环境卫生', '1035', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1067', 'default', '城中村及城乡结合部卫生', '1035', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1068', 'default', '城市绿化', '1036', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1069', 'default', '社区、单位', '1036', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1070', 'default', '铁路沿线无“十乱”现象', '1036', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1071', 'default', '城市照明设施良好，保证路灯设施完好率和亮灯率达标', '1037', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1072', 'default', '社区（小区）居民和单位', '1038', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1073', 'default', '城中村及城乡结合部卫生', '1038', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1074', 'default', '城市户外广告、牌匾设置规范管理', '1039', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1075', 'default', '门前五包落实', '1039', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1076', 'default', '清理占道经营、店外经营', '1039', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1077', 'default', '“十乱”整治', '1039', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1078', 'default', '废品回收站规范管理', '1039', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1079', 'default', '流动商贩管理，早夜市卫生管理', '1039', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1080', 'default', '清理圈占绿地', '1039', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1081', 'default', '清理家畜饲养', '1039', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1082', 'default', '组织、指导各街道及相关部门清理乱搭乱建', '1039', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1083', 'default', '城市立面干净整洁', '1040', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1084', 'default', '建筑（代建、拆迁）工地', '1040', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1085', 'default', '向水体排放污染物', '1041', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1086', 'default', '向海域排放污染物', '1041', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1087', 'default', '生产、施工噪声', '1042', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1088', 'default', '室内音响噪声', '1042', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1089', 'default', '其他各种噪声', '1042', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1090', 'default', '排放固体废、危险废物、危险化学品、电子废物', '1043', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1091', 'default', '排放扬尘', '1044', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1092', 'default', '排放有毒有害气体', '1044', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1093', 'default', '排放油烟', '1044', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1094', 'default', '危险化学品', '1045', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1095', 'default', '流浪乞讨人员救助', '1046', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1096', 'default', '安全管理', '1047', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1097', 'default', '现场管理', '1047', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1098', 'default', '河堤破损', '1048', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1099', 'default', '歌舞娱乐场所', '1049', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1100', 'default', '游戏、游艺娱乐场所', '1049', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1101', 'default', '演出场所', '1049', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1102', 'default', '互联网商务服务营业场所', '1049', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1103', 'default', '文物监管', '1049', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1104', 'default', '卫星地面接收设施', '1050', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1105', 'default', '出版监管', '1051', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1106', 'default', '户籍人口', '1052', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1107', 'default', '流动人口', '1052', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1108', 'default', '矛盾纠纷排查化解', '1053', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1109', 'default', '涉及师生安全的案（事)件；涉及线、路案（事)件', '1054', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1110', 'default', '治安隐患上报；打架斗殴', '1055', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1111', 'default', '信访信息', '1056', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1112', 'default', '食品生产、流通企业监管', '1057', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1113', 'default', '活禽产品及冷鲜家禽质量问题', '1057', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1114', 'default', '餐饮服务单位监管', '1057', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1115', 'default', '药品生产、流通、使用单位监管', '1058', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1116', 'default', '医疗器械生产、经营、使用使用监管', '1059', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1117', 'default', '保健食品生产，经营监管', '1060', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1118', 'default', '显著位置悬挂营业执照', '1061', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1119', 'default', '门头字号与营业执照一致', '1061', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1120', 'default', '超出核准经营范围', '1061', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1121', 'default', '经营地址与营业执照一致', '1061', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1122', 'default', '无须许可、审批的各类经营主体无照经营', '1061', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1123', 'default', '电梯安全', '1062', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1124', 'default', '未经许可，擅自从事移动式压力容器或者气瓶充装活动的', '1062', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1125', 'default', '违法广告发布', '1063', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
index 6300fb488c..7aeeac687d 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
@@ -38,19 +38,24 @@
     </select>
     <select id="selectDefaultList" resultType="com.epmet.dto.result.IssueCategoryTagResultDTO">
         SELECT
-        TAG_ID AS "id",
+        ID AS "id",
         TAG_NAME AS "name"
         FROM
-        issue_tags
+        issue_project_tag_dict
         WHERE
         DEL_FLAG = '0'
         AND CUSTOMER_ID = #{customerId}
         <if test="list != null and list.size() > 0">
             <foreach item="category" collection="list" separator="OR" open="AND (" close=")" index="">
-                CATEGORY_ID = #{category}
+                <if test="category != '1028'">
+                    CATEGORY_ID = #{category}
+                </if>
+                <if test="category == '1028'">
+                    1=1
+                </if>
             </foreach>
         </if>
-        ORDER BY TAG_ID
+        ORDER BY ID
     </select>
     <select id="selectTagListByCustomer" resultType="com.epmet.entity.IssueProjectTagDictEntity">
         SELECT

From d89b66a1a8eeb6a7bb76f6f583e3f349bc1b596c Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 10 Dec 2020 15:48:20 +0800
Subject: [PATCH 025/119] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E6=96=B9=E6=B3=95=20IssueProjectTag?=
 =?UTF-8?q?DictRedis.getTagsOrderByRank(*)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/IssueProjectCategoryDictDao.java      |  11 ++
 .../com/epmet/dao/IssueProjectTagDictDao.java |  11 ++
 .../epmet/redis/IssueProjectTagDictRedis.java | 126 ++++++++++++------
 .../service/impl/IssueTagsServiceImpl.java    |   2 +-
 .../java/com/epmet/utils/ModuleConstants.java |  12 +-
 .../mapper/IssueProjectCategoryDictDao.xml    |  22 +++
 .../mapper/IssueProjectTagDictDao.xml         |  32 +++++
 7 files changed, 174 insertions(+), 42 deletions(-)

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 fcf13cfd4d..ec76ffd7b4 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
@@ -61,4 +61,15 @@ public interface IssueProjectCategoryDictDao extends BaseDao<IssueProjectCategor
      * @Author sun
      **/
     List<IssueProjectCategoryDictDTO> selectCategoryList(@Param("cstegoryIdList") List<String> cstegoryIdList);
+
+    /**
+     * @Description 根据客户Id、类别名称、类型查询单个类别 默认查询二级分类
+     * @param customerId
+     * @param categoryName
+     * @param categoryType
+     * @return com.epmet.entity.IssueProjectCategoryDictEntity
+     * @author wangc
+     * @date 2020.12.10 13:37
+    */
+    IssueProjectCategoryDictEntity selectSingleByCustomerIdAndCategoryNameAndCategoryType(@Param("customerId")String customerId,@Param("categoryName")String categoryName,@Param("categoryType")String categoryType);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java
index 5e615fca25..88c196a8d7 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java
@@ -71,4 +71,15 @@ public interface IssueProjectTagDictDao extends BaseDao<IssueProjectTagDictEntit
 	 * @return java.util.List<com.epmet.entity.IssueProjectTagDictEntity>
 	 */
 	List<IssueProjectTagDictEntity> selectTagListByCustomer(@Param("customerId") String  customerId);
+
+    /**
+     * @Description 根据类别查询客户下标签
+     * @param categories
+     * @param isDefault
+     * @param customerId
+     * @return java.util.List<com.epmet.entity.IssueProjectTagDictEntity>
+     * @author wangc
+     * @date 2020.12.10 10:07
+    */
+    List<IssueProjectTagDictEntity> selectTagByCategory(@Param("categories") List<String> categories,@Param("isDefault") String isDefault,@Param("customerId") String customerId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
index 4bcaf18866..18ebfdd206 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
@@ -20,8 +20,13 @@ package com.epmet.redis;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.constant.GovIssueRedisKeys;
+import com.epmet.dao.IssueProjectCategoryDictDao;
+import com.epmet.dao.IssueProjectTagDictDao;
 import com.epmet.dto.result.IssueCategoryTagResultDTO;
+import com.epmet.entity.IssueProjectCategoryDictEntity;
+import com.epmet.entity.IssueProjectTagDictEntity;
 import com.epmet.utils.ModuleConstants;
+import com.fasterxml.jackson.databind.Module;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
@@ -51,6 +56,10 @@ public class IssueProjectTagDictRedis {
     private RedisUtils redisUtils;
     @Autowired
     private RedisTemplate redisTemplate;
+    @Autowired
+    private IssueProjectTagDictDao poolDao;
+    @Autowired
+    private IssueProjectCategoryDictDao categoryDictDao;
     public void delete(Object[] ids) {
 
     }
@@ -74,66 +83,103 @@ public class IssueProjectTagDictRedis {
      * @author wangc
      * @date 2020.12.09 11:16
     */
-    public List<IssueCategoryTagResultDTO> getTagsOrderByRank(String customerId,List<String> category){
-        if(StringUtils.isBlank(customerId)) {
+    public Map<String,List<IssueCategoryTagResultDTO>> getTagsOrderByRank(String customerId,List<String> category) {
+        if (StringUtils.isBlank(customerId)) {
             log.error("customerId can not be null when obtain govern tags.");
             return null;
         }
 
+        IssueProjectCategoryDictEntity otherCategory = categoryDictDao.selectSingleByCustomerIdAndCategoryNameAndCategoryType(customerId, ModuleConstants.CATEGORY_NAME_OTHERS, null);
+        boolean ifOther = null == otherCategory ? false : (!CollectionUtils.isEmpty(category) && category.size() == NumConstant.ONE && category.contains(otherCategory.getId()) ? true : false);
         Set<String> keys;
-        if(CollectionUtils.isEmpty(category))
-            keys = redisUtils.keys(GovIssueRedisKeys.getGovernmentTagKey(customerId,null));
-        else keys = category.stream().map(key -> {return GovIssueRedisKeys.getGovernmentTagKey(customerId,key);}).collect(Collectors.toSet());
-
-        List<Set<ZSetOperations.TypedTuple<Object>>> heatTuple = redisTemplate.executePipelined(new RedisCallback<Set<ZSetOperations.TypedTuple<Object>>>() {
-            @Nullable
-            @Override
-            public Set<ZSetOperations.TypedTuple<Object>> doInRedis(RedisConnection connection) throws DataAccessException {
-                connection.openPipeline();
-                keys.forEach(key -> {
-                    connection.zSetCommands().zRangeByScoreWithScores(redisTemplate.getKeySerializer().serialize(key), NumConstant.ZERO_L, (long) (NumConstant.ONE_NEG));
+        if (CollectionUtils.isEmpty(category) || ifOther)
+            keys = redisUtils.keys(GovIssueRedisKeys.getGovernmentTagKey(customerId, null));
+        else keys = category.stream().map(key -> {
+            return GovIssueRedisKeys.getGovernmentTagKey(customerId, key);
+        }).collect(Collectors.toSet());
+        //如果keys集合为空，说明缓存中没有当前客户的标签排行信息，直接进行补偿
+        if (!CollectionUtils.isEmpty(keys)){
+            keys.remove(GovIssueRedisKeys.getGovernmentTagKey(customerId,ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME));
+            List<Set<ZSetOperations.TypedTuple<Object>>> heatTuple = redisTemplate.executePipelined(new RedisCallback<Set<ZSetOperations.TypedTuple<Object>>>() {
+                @Nullable
+                @Override
+                public Set<ZSetOperations.TypedTuple<Object>> doInRedis(RedisConnection connection) throws DataAccessException {
+                    connection.openPipeline();
+                    keys.forEach(key -> {
+                        connection.zSetCommands().zRangeByScoreWithScores(redisTemplate.getKeySerializer().serialize(key), NumConstant.ZERO_L, (long) (NumConstant.ONE_NEG));
+                    });
+                    return null;
+                }
+            }, redisTemplate.getValueSerializer());
+            //热度Map  分数为key
+            Map<Double, List<IssueCategoryTagResultDTO>> heatMap = new HashMap<>();
+            if (!CollectionUtils.isEmpty(heatTuple)) {
+                heatTuple.forEach(tupleSet -> {
+                    tupleSet.forEach(tuple -> {
+                        Double heatScore = tuple.getScore();
+                        List<IssueCategoryTagResultDTO> queue = heatMap.get(heatScore);
+                        if (CollectionUtils.isEmpty(queue)) queue = new LinkedList<>();
+                        queue.add(parseObject(tuple.getValue(), IssueCategoryTagResultDTO.class));
+                        heatMap.put(heatScore,queue);
+                    });
                 });
-                return null;
+                List<IssueCategoryTagResultDTO> defaultResult = new LinkedList<>();
+                heatMap.keySet().stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList()).forEach(count -> {
+                    defaultResult.addAll(heatMap.get(count));
+                });
+                Map<String,List<IssueCategoryTagResultDTO>> result = new HashMap<>();
+                result.put(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME,defaultResult);
+                Set<ZSetOperations.TypedTuple<Object>> customizedTuples = redisUtils.zReverseRangeWithScores(GovIssueRedisKeys.getGovernmentTagKey(customerId, null), NumConstant.ZERO_L, (long) (NumConstant.ONE_NEG));
+                if(!CollectionUtils.isEmpty(customizedTuples)){
+                    Map<Double, List<IssueCategoryTagResultDTO>> customizedHeatMap = new HashMap<>();
+                    customizedTuples.forEach(tuple -> {
+                        List<IssueCategoryTagResultDTO> queue = customizedHeatMap.get(tuple.getValue());
+                        if((CollectionUtils.isEmpty(queue))) queue = new LinkedList<>();
+                            queue.add(parseObject(tuple.getValue(), IssueCategoryTagResultDTO.class));
+                            heatMap.put((Double) tuple.getValue(),queue);
+                    });
+                    List<IssueCategoryTagResultDTO> customizedResult = new LinkedList<>();
+                    customizedHeatMap.keySet().stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList()).forEach(count -> {
+                        customizedResult.addAll(customizedHeatMap.get(count));
+                    });
+                    result.put(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME,customizedResult);
+                }
+                return result;
+
             }
-        },redisTemplate.getValueSerializer());
-        //热度Map  分数为key
-        Map<Double,List<IssueCategoryTagResultDTO>> heatMap = new HashMap<>();
-        if(!CollectionUtils.isEmpty(heatTuple)){
-            heatTuple.forEach(tupleSet -> {
-                tupleSet.forEach( tuple -> {
-                    IssueCategoryTagResultDTO entity = parseObject(tuple.getValue(),IssueCategoryTagResultDTO.class);
-                    Double heatScore = tuple.getScore();
-                    List<IssueCategoryTagResultDTO> queue = heatMap.get(heatScore);
-                    if(CollectionUtils.isEmpty(queue)) queue = new LinkedList<>();
-                    queue.add(entity);
-                } );
-            });
-            List<IssueCategoryTagResultDTO> result = new LinkedList<>();
-            heatMap.keySet().stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList()).forEach(count -> {
-                result.addAll(heatMap.get(count));
-            });
-            return result;
 
         }
+            log.warn("fetch customer govern tag cache blankly,customerId:{},now begin compensation...", customerId);
 
-        if(CollectionUtils.isEmpty(keys) || !keys.iterator().next().contains(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_ID)) {
-            log.warn("fetch customer govern tag cache blankly , customerId:{} , now begin compensation...", customerId);
-
-            List<IssueCategoryTagResultDTO> compensate = compensate(customerId, category);
+        Map<String,List<IssueCategoryTagResultDTO>> compensate = compensate(customerId, category, ifOther);
 
             if (CollectionUtils.isEmpty(compensate)) {
-                log.error("compensation failure or there is no default tag data in database !!");
+                log.error("compensation failure or there is no default tag data in database!!");
                 return null;
             } else {
-                log.warn("compensation completed !!");
+                log.warn("compensation completed!!");
                 return compensate;
             }
-        }return null;
     }
 
-    public List<IssueCategoryTagResultDTO> compensate(String customerId,List<String> category){
+    /**
+     * @Description    category为空，则补偿全部，返回全部
+     *                 category不为空，则补偿集合中的类别标签以及自定义标签
+     *                 category为"customize"，只补偿自定义标签
+     *                 只需查询标签库(issue_project_tag_dict)中的issueUseCount和projectUseCount即可
+     * @param customerId
+     * @param category
+     * @return java.util.List<com.epmet.dto.result.IssueCategoryTagResultDTO>
+     * @author wangc
+     * @date 2020.12.10 09:34
+    */
+    public Map<String,List<IssueCategoryTagResultDTO>> compensate(String customerId,List<String> category,boolean ifOther){
         //TODO 补偿机制
 
+        List<IssueProjectTagDictEntity> _default = poolDao.selectTagByCategory(ifOther || CollectionUtils.isEmpty(category) ? null : category, NumConstant.ZERO_STR, customerId);//默认
+        List<IssueProjectTagDictEntity> _customized = poolDao.selectTagByCategory(null,NumConstant.ONE_STR,customerId);//自定义
+
+
         return null;
     }
 
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
index 3b54780a02..1b7d4ed8b1 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
@@ -149,7 +149,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
         }
         IssueProjectTagDictEntity entity = new IssueProjectTagDictEntity();
         entity.setCustomerId(form.getCustomerId());
-        entity.setCategoryId(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_ID);
+        entity.setCategoryId(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME);
         entity.setTagName(form.getTagName());
         entity.setIsDefault(NumConstant.ONE_STR);
         entity.setIssueUseCount(NumConstant.ZERO);
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/utils/ModuleConstants.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/utils/ModuleConstants.java
index 2b90d2ff16..8b0214d2f4 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/utils/ModuleConstants.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/utils/ModuleConstants.java
@@ -159,5 +159,15 @@ public interface ModuleConstants {
     /**
      * 自定义标签类别缺省值
      */
-    String CUSTOMIZED_TAG_CATEGORY_ID = "customize";
+    String CUSTOMIZED_TAG_CATEGORY_NAME = "customize";
+
+    /**
+     * 默认标签类型
+     */
+    String DEFAULT_TAG_CATEGORY_NAME = "default";
+
+    /**
+     * 类别名称：其他
+     */
+    String CATEGORY_NAME_OTHERS = "其他";
 }
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 6efb42b00c..1e0d90e45c 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
@@ -67,4 +67,26 @@
             sort ASC
     </select>
 
+    <!-- 根据客户Id、类别名称、类型查询单个类别 -->
+    <select id="selectSingleByCustomerIdAndCategoryNameAndCategoryType" resultType="com.epmet.entity.IssueProjectCategoryDictEntity">
+        SELECT
+            *
+         FROM
+            issue_project_category_dict
+        WHERE
+            del_flag = '0'
+        AND
+            customer_id = #{customerId}
+        AND
+             category_name = #{categoryName}
+        <choose>
+            <when test='null != categoryType and "" != categoryType'>
+              AND  category_type = #{categoryType}
+            </when>
+            <otherwise>
+              AND  category_type = '2'
+            </otherwise>
+        </choose>
+        LIMIT 1
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
index 7aeeac687d..6815000576 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
@@ -70,5 +70,37 @@
             DEL_FLAG = '0'
           AND CUSTOMER_ID = #{customerId}
     </select>
+    <!-- 根据类别查询客户下标签 -->
+    <select id="selectTagByCategory" resultType="com.epmet.entity.IssueProjectTagDictEntity">
+        SELECT
+            tag.ID,
+            tag.TAG_NAME,
+            tag.CATEGORY_ID,
+            tag.IS_DEFAULT,
+            (IFNULL(tag.ISSUE_USE_COUNT,0) + IFNULL(tag.PROJECT_USE_COUNT,0)) AS issueUseCount
+        FROM
+            ISSUE_PROJECT_TAG_DICT tag LEFT JOIN ISSUE_PROJECT_CATEGORY_DICT type ON tag.CATEGORY_ID = type.ID
+        WHERE
+            tag.DEL_FLAG = '0'
+            AND tag.CUSTOMER_ID = #{customerId}
+            AND tag.IS_DEFAULT = #{isDefault}
+            <choose>
+                <when test="null != categories and categories.size > 0">
+                    <foreach collection="categories" item="id" open="AND ( " separator=" OR " close=" )">
+                        tag.CATEGORY_ID = #{id}
+                    </foreach>
+                    ORDER BY FIELD(
+                        tag.CATEGORY_ID,
+                        <foreach collection="categories" item="id" separator=" , ">
+                            #{id}
+                        </foreach>
+                    )
+                </when>
+                <otherwise>
+                    ORDER BY type.SORT
+                </otherwise>
+            </choose>
+                , tag.TAG_NAME
+    </select>
 
 </mapper>
\ No newline at end of file

From 15a4f4d319d43591867ecec53f7ec319dd5307a8 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 10 Dec 2020 15:56:56 +0800
Subject: [PATCH 026/119] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9/=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dao/IssueProjectTagDictDao.java   |  2 +-
 .../service/impl/IssueTagsServiceImpl.java      | 17 +++++++++++++----
 .../resources/mapper/IssueProjectTagDictDao.xml |  6 ++----
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java
index 88c196a8d7..2b61958883 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java
@@ -51,7 +51,7 @@ public interface IssueProjectTagDictDao extends BaseDao<IssueProjectTagDictEntit
      * @author zxc
      * @date 2020/12/10 下午2:16
      */
-    List<IssueTagFormDTO> selectTagId(@Param("tags") List<IssueTagFormDTO> newTags, @Param("customerId")String customerId);
+    List<IssueTagFormDTO> selectTagId(@Param("list") List<IssueTagFormDTO> newTags);
 
 	/**
 	 * 获取客户默认分类标签
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
index 1b7d4ed8b1..26ce23bd7a 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
@@ -179,7 +179,10 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
             if (!CollectionUtils.isEmpty(tags)){
                 tags.forEach(t -> {
                     // 缓存标签 -1
-                    dictRedis.editTagUseCount(customerId,t.getCategoryId(),t,NumConstant.ONE_STR);
+                    IssueCategoryTagResultDTO issueCategoryTagResultDTO = new IssueCategoryTagResultDTO();
+                    issueCategoryTagResultDTO.setName(t.getTagName());
+                    issueCategoryTagResultDTO.setId(t.getId());
+                    dictRedis.editTagUseCount(customerId,t.getCategoryId(),issueCategoryTagResultDTO,NumConstant.ONE_STR);
                 });
                 // 数据库有关标签使用次数 -1  0:+1 ; 1:-1;
                 issueProjectTagDictDao.updateTagsUseCount(tags,customerId,NumConstant.ONE_STR);
@@ -189,14 +192,17 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
             return;
         }
         List<IssueTagFormDTO> selectTags = form.getTagList();
-        List<IssueTagFormDTO> newTags = issueProjectTagDictDao.selectTagId(selectTags, customerId);
+        List<IssueTagFormDTO> newTags = issueProjectTagDictDao.selectTagId(selectTags);
         IssueTagsDTO issueTagsDTO = baseDao.selectOneTagByIssueId(form.getIssueId());
         if (!CollectionUtils.isEmpty(newTags)){
             // 需要删除的标签
             List<IssueTagFormDTO> delList = tags.stream().filter(tag -> !newTags.contains(tag)).collect(toList());
             if (!CollectionUtils.isEmpty(delList)){
                 delList.forEach(d -> {
-                    dictRedis.editTagUseCount(customerId,d.getCategoryId(),d,NumConstant.ONE_STR);
+                    IssueCategoryTagResultDTO issueCategoryTagResultDTO = new IssueCategoryTagResultDTO();
+                    issueCategoryTagResultDTO.setName(d.getTagName());
+                    issueCategoryTagResultDTO.setId(d.getId());
+                    dictRedis.editTagUseCount(customerId,d.getCategoryId(),issueCategoryTagResultDTO,NumConstant.ONE_STR);
                 });
                 // 数据库有关标签使用次数 -1  0:+1 ; 1:-1;
                 issueProjectTagDictDao.updateTagsUseCount(delList,customerId,NumConstant.ONE_STR);
@@ -206,7 +212,10 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
             if (!CollectionUtils.isEmpty(addList)){
                 addList.forEach(a -> {
                     // 缓存标签+1
-                    dictRedis.editTagUseCount(customerId,a.getCategoryId(),a,NumConstant.ZERO_STR);
+                    IssueCategoryTagResultDTO issueCategoryTagResultDTO = new IssueCategoryTagResultDTO();
+                    issueCategoryTagResultDTO.setName(a.getTagName());
+                    issueCategoryTagResultDTO.setId(a.getId());
+                    dictRedis.editTagUseCount(customerId,a.getCategoryId(),issueCategoryTagResultDTO,NumConstant.ZERO_STR);
                 });
                 // 数据库对应标签 议题使用次数 +1
                 issueProjectTagDictDao.updateTagsUseCount(addList,customerId,NumConstant.ZERO_STR);
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
index 6815000576..60beccaa6e 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
@@ -14,11 +14,9 @@
         </if>
         <where>
             DEL_FLAG = 0
-            AND CUSTOMER_ID = #{customerId}
             AND
             <foreach collection="tags" item="t" open=" ( " separator=" OR " close=" ) ">
-                CATEGORY_ID = #{t.id}
-                AND TAG_NAME = #{t.tagName}
+                id = #{t.id}
             </foreach>
         </where>
     </update>
@@ -32,7 +30,7 @@
         FROM issue_project_tag_dict
         WHERE DEL_FLAG = 0
             AND
-            <foreach collection="tags" item="t" separator="or" open="(" close=")">
+            <foreach collection="list" item="t" separator="or" open="(" close=")">
                 ID = #{t.id}
             </foreach>
     </select>

From ac3a8dd59d80fbc72f090b5207353745cb0fccc8 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 10 Dec 2020 16:02:37 +0800
Subject: [PATCH 027/119] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IssueProjectTagDictServiceImpl.java        | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
index 9b40e3350b..f2acf15e3c 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
@@ -20,6 +20,7 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -32,14 +33,14 @@ import com.epmet.dto.result.TagListResultDTO;
 import com.epmet.entity.IssueProjectTagDictEntity;
 import com.epmet.redis.IssueProjectTagDictRedis;
 import com.epmet.service.IssueProjectTagDictService;
+import com.epmet.utils.ModuleConstants;
 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 java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 议题、项目标签字典表
@@ -117,8 +118,10 @@ public class IssueProjectTagDictServiceImpl extends BaseServiceImpl<IssueProject
     @Override
     public TagListResultDTO getTagList(TokenDto tokenDto, TagListFormDTO formDTO) {
         TagListResultDTO result = new TagListResultDTO();
-        List<IssueCategoryTagResultDTO> defaultList = baseDao.selectDefaultList(tokenDto.getCustomerId(), formDTO.getCategoryIdList());
-        result.setDefaulted(defaultList);
+		Map<String,List<IssueCategoryTagResultDTO>> map =  issueProjectTagDictRedis.getTagsOrderByRank(tokenDto.getCustomerId(),
+				formDTO.getCategoryIdList());
+        result.setDefaulted(map.get(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME));
+        result.setCustomized(map.get(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME).stream().limit(NumConstant.TEN).collect(Collectors.toList()));
         return result;
     }
 

From 137d296242f117f9e7f26597248163ff7fa08b70 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 10 Dec 2020 16:05:01 +0800
Subject: [PATCH 028/119] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E6=96=B9=E6=B3=95=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/redis/IssueProjectTagDictRedis.java | 39 +++++++++++--------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
index 18ebfdd206..9e0cd829cb 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
@@ -90,9 +90,9 @@ public class IssueProjectTagDictRedis {
         }
 
         IssueProjectCategoryDictEntity otherCategory = categoryDictDao.selectSingleByCustomerIdAndCategoryNameAndCategoryType(customerId, ModuleConstants.CATEGORY_NAME_OTHERS, null);
-        boolean ifOther = null == otherCategory ? false : (!CollectionUtils.isEmpty(category) && category.size() == NumConstant.ONE && category.contains(otherCategory.getId()) ? true : false);
+        boolean ifOtherOnly = null == otherCategory ? false : (!CollectionUtils.isEmpty(category) && category.size() == NumConstant.ONE && category.contains(otherCategory.getId()) ? true : false);
         Set<String> keys;
-        if (CollectionUtils.isEmpty(category) || ifOther)
+        if (CollectionUtils.isEmpty(category) || ifOtherOnly)
             keys = redisUtils.keys(GovIssueRedisKeys.getGovernmentTagKey(customerId, null));
         else keys = category.stream().map(key -> {
             return GovIssueRedisKeys.getGovernmentTagKey(customerId, key);
@@ -111,32 +111,35 @@ public class IssueProjectTagDictRedis {
                     return null;
                 }
             }, redisTemplate.getValueSerializer());
-            //热度Map  分数为key
-            Map<Double, List<IssueCategoryTagResultDTO>> heatMap = new HashMap<>();
+
+            Map<String,List<IssueCategoryTagResultDTO>> result = new HashMap<>();
             if (!CollectionUtils.isEmpty(heatTuple)) {
+                //热度Map  分数为key
+                Map<Double, List<IssueCategoryTagResultDTO>> heatMap = new HashMap<>();
                 heatTuple.forEach(tupleSet -> {
                     tupleSet.forEach(tuple -> {
                         Double heatScore = tuple.getScore();
                         List<IssueCategoryTagResultDTO> queue = heatMap.get(heatScore);
                         if (CollectionUtils.isEmpty(queue)) queue = new LinkedList<>();
                         queue.add(parseObject(tuple.getValue(), IssueCategoryTagResultDTO.class));
-                        heatMap.put(heatScore,queue);
+                        heatMap.put(heatScore, queue);
                     });
                 });
                 List<IssueCategoryTagResultDTO> defaultResult = new LinkedList<>();
                 heatMap.keySet().stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList()).forEach(count -> {
                     defaultResult.addAll(heatMap.get(count));
                 });
-                Map<String,List<IssueCategoryTagResultDTO>> result = new HashMap<>();
-                result.put(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME,defaultResult);
-                Set<ZSetOperations.TypedTuple<Object>> customizedTuples = redisUtils.zReverseRangeWithScores(GovIssueRedisKeys.getGovernmentTagKey(customerId, null), NumConstant.ZERO_L, (long) (NumConstant.ONE_NEG));
-                if(!CollectionUtils.isEmpty(customizedTuples)){
+
+                result.put(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME, defaultResult);
+            }
+            Set<ZSetOperations.TypedTuple<Object>> customizedTuples = redisUtils.zReverseRangeWithScores(GovIssueRedisKeys.getGovernmentTagKey(customerId, null), NumConstant.ZERO_L, (long) (NumConstant.ONE_NEG));
+            if(!CollectionUtils.isEmpty(customizedTuples)){
                     Map<Double, List<IssueCategoryTagResultDTO>> customizedHeatMap = new HashMap<>();
                     customizedTuples.forEach(tuple -> {
                         List<IssueCategoryTagResultDTO> queue = customizedHeatMap.get(tuple.getValue());
                         if((CollectionUtils.isEmpty(queue))) queue = new LinkedList<>();
                             queue.add(parseObject(tuple.getValue(), IssueCategoryTagResultDTO.class));
-                            heatMap.put((Double) tuple.getValue(),queue);
+                        customizedHeatMap.put((Double) tuple.getValue(),queue);
                     });
                     List<IssueCategoryTagResultDTO> customizedResult = new LinkedList<>();
                     customizedHeatMap.keySet().stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList()).forEach(count -> {
@@ -144,14 +147,14 @@ public class IssueProjectTagDictRedis {
                     });
                     result.put(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME,customizedResult);
                 }
-                return result;
+            return result;
 
             }
 
-        }
+
             log.warn("fetch customer govern tag cache blankly,customerId:{},now begin compensation...", customerId);
 
-        Map<String,List<IssueCategoryTagResultDTO>> compensate = compensate(customerId, category, ifOther);
+        Map<String,List<IssueCategoryTagResultDTO>> compensate = compensate(customerId, category, ifOtherOnly);
 
             if (CollectionUtils.isEmpty(compensate)) {
                 log.error("compensation failure or there is no default tag data in database!!");
@@ -173,14 +176,16 @@ public class IssueProjectTagDictRedis {
      * @author wangc
      * @date 2020.12.10 09:34
     */
-    public Map<String,List<IssueCategoryTagResultDTO>> compensate(String customerId,List<String> category,boolean ifOther){
-        //TODO 补偿机制
+    public Map<String,List<IssueCategoryTagResultDTO>> compensate(String customerId,List<String> category,boolean ifOtherOnly){
+
 
-        List<IssueProjectTagDictEntity> _default = poolDao.selectTagByCategory(ifOther || CollectionUtils.isEmpty(category) ? null : category, NumConstant.ZERO_STR, customerId);//默认
+        List<IssueProjectTagDictEntity> _default = poolDao.selectTagByCategory(ifOtherOnly || CollectionUtils.isEmpty(category) ? null : category, NumConstant.ZERO_STR, customerId);//默认
         List<IssueProjectTagDictEntity> _customized = poolDao.selectTagByCategory(null,NumConstant.ONE_STR,customerId);//自定义
 
+        Map<String,Map<Integer,List<IssueCategoryTagResultDTO>>> fulfilled = new HashMap<>();
+        Map<String,List<IssueCategoryTagResultDTO>> result = new HashMap<>();
 
-        return null;
+        return result;
     }
 
     /**

From ea574c055c3cf2891636b6bd061be585e14469d1 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Fri, 11 Dec 2020 10:20:21 +0800
Subject: [PATCH 029/119] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=EF=BC=9A=E8=8E=B7=E5=8F=96=E9=BB=98=E8=AE=A4=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?(=E6=8C=89=E7=85=A7=E7=B1=BB=E5=88=AB=E6=8E=92=E5=BA=8F)?=
 =?UTF-8?q?=E5=92=8C=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A0=87=E7=AD=BE(?=
 =?UTF-8?q?=E6=8C=89=E7=85=A7=E7=83=AD=E5=BA=A6=E6=8E=92=E5=BA=8F)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dao/IssueProjectTagDictDao.java |   3 +-
 .../epmet/redis/IssueProjectTagDictRedis.java | 246 +++++++++++++-----
 .../mapper/IssueProjectTagDictDao.xml         |  18 +-
 3 files changed, 191 insertions(+), 76 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java
index 2b61958883..3da76c1ca6 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java
@@ -75,11 +75,10 @@ public interface IssueProjectTagDictDao extends BaseDao<IssueProjectTagDictEntit
     /**
      * @Description 根据类别查询客户下标签
      * @param categories
-     * @param isDefault
      * @param customerId
      * @return java.util.List<com.epmet.entity.IssueProjectTagDictEntity>
      * @author wangc
      * @date 2020.12.10 10:07
     */
-    List<IssueProjectTagDictEntity> selectTagByCategory(@Param("categories") List<String> categories,@Param("isDefault") String isDefault,@Param("customerId") String customerId);
+    List<IssueProjectTagDictEntity> selectTagByCategory(@Param("categories") List<String> categories,@Param("customerId") String customerId,@Param("isDefault")String isDefault);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
index 9e0cd829cb..1e4a4ec6f7 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
@@ -19,6 +19,7 @@ package com.epmet.redis;
 
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.constant.GovIssueRedisKeys;
 import com.epmet.dao.IssueProjectCategoryDictDao;
 import com.epmet.dao.IssueProjectTagDictDao;
@@ -72,18 +73,20 @@ public class IssueProjectTagDictRedis {
         return null;
     }
 
+
     /**
-     * @Description 传入category列表，返回对应category下的标签，按热度排序
-     *              category列表为空则查询客户下全部
-     *              如果想要自定义标签，单独请求一次，分类列表中只含"customize"
+     * @Description    category为空，则补偿全部，返回默认标签和自定义标签
+     *                 category仅包含"其他"这个分类的Id时，同上
+     *                 category不为空且不只有"其他"这个分类的Id时，则返回集合中的类别标签以及自定义标签
+     *                 默认标签不按照热度排序，自定义标签按照热度排序
      *
      * @param customerId
      * @param category
-     * @return java.util.List<com.epmet.dto.result.IssueCategoryTagResultDTO>
+     * @return
      * @author wangc
      * @date 2020.12.09 11:16
-    */
-    public Map<String,List<IssueCategoryTagResultDTO>> getTagsOrderByRank(String customerId,List<String> category) {
+     */
+    public Map<String,List<IssueCategoryTagResultDTO>> getDefaultTagsSortedByCategoryAndCustomizedTagsOrderByRank(String customerId,List<String> category) {
         if (StringUtils.isBlank(customerId)) {
             log.error("customerId can not be null when obtain govern tags.");
             return null;
@@ -91,73 +94,140 @@ public class IssueProjectTagDictRedis {
 
         IssueProjectCategoryDictEntity otherCategory = categoryDictDao.selectSingleByCustomerIdAndCategoryNameAndCategoryType(customerId, ModuleConstants.CATEGORY_NAME_OTHERS, null);
         boolean ifOtherOnly = null == otherCategory ? false : (!CollectionUtils.isEmpty(category) && category.size() == NumConstant.ONE && category.contains(otherCategory.getId()) ? true : false);
-        Set<String> keys;
-        if (CollectionUtils.isEmpty(category) || ifOtherOnly)
-            keys = redisUtils.keys(GovIssueRedisKeys.getGovernmentTagKey(customerId, null));
-        else keys = category.stream().map(key -> {
-            return GovIssueRedisKeys.getGovernmentTagKey(customerId, key);
-        }).collect(Collectors.toSet());
+
+        Map<String,List<IssueCategoryTagResultDTO>> result = new HashMap<>();
+
+        List<IssueProjectTagDictEntity> _default = poolDao.selectTagByCategory(ifOtherOnly || CollectionUtils.isEmpty(category) ? null : category, customerId, NumConstant.ZERO_STR);//默认
+        if(!CollectionUtils.isEmpty(_default)){
+            result.put(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME,_default.stream().map(o -> {
+                IssueCategoryTagResultDTO tag = ConvertUtils.sourceToTarget(o,IssueCategoryTagResultDTO.class);
+                tag.setName(o.getTagName()); return tag;}).collect(Collectors.toList()));
+        }else log.error("there is no default tag data in database , customerId : {}",customerId);
+
+
         //如果keys集合为空，说明缓存中没有当前客户的标签排行信息，直接进行补偿
-        if (!CollectionUtils.isEmpty(keys)){
-            keys.remove(GovIssueRedisKeys.getGovernmentTagKey(customerId,ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME));
-            List<Set<ZSetOperations.TypedTuple<Object>>> heatTuple = redisTemplate.executePipelined(new RedisCallback<Set<ZSetOperations.TypedTuple<Object>>>() {
-                @Nullable
-                @Override
-                public Set<ZSetOperations.TypedTuple<Object>> doInRedis(RedisConnection connection) throws DataAccessException {
-                    connection.openPipeline();
-                    keys.forEach(key -> {
-                        connection.zSetCommands().zRangeByScoreWithScores(redisTemplate.getKeySerializer().serialize(key), NumConstant.ZERO_L, (long) (NumConstant.ONE_NEG));
-                    });
-                    return null;
-                }
-            }, redisTemplate.getValueSerializer());
-
-            Map<String,List<IssueCategoryTagResultDTO>> result = new HashMap<>();
-            if (!CollectionUtils.isEmpty(heatTuple)) {
-                //热度Map  分数为key
-                Map<Double, List<IssueCategoryTagResultDTO>> heatMap = new HashMap<>();
-                heatTuple.forEach(tupleSet -> {
-                    tupleSet.forEach(tuple -> {
-                        Double heatScore = tuple.getScore();
-                        List<IssueCategoryTagResultDTO> queue = heatMap.get(heatScore);
-                        if (CollectionUtils.isEmpty(queue)) queue = new LinkedList<>();
-                        queue.add(parseObject(tuple.getValue(), IssueCategoryTagResultDTO.class));
-                        heatMap.put(heatScore, queue);
-                    });
+            Set<ZSetOperations.TypedTuple<Object>> customizedTuples = redisUtils.zReverseRangeWithScores(GovIssueRedisKeys.getGovernmentTagKey(customerId, null), NumConstant.ZERO_L, (long) (NumConstant.ONE_NEG));
+            if(!CollectionUtils.isEmpty(customizedTuples)){
+                Map<Double, List<IssueCategoryTagResultDTO>> customizedHeatMap = new HashMap<>();
+                customizedTuples.forEach(tuple -> {
+                    List<IssueCategoryTagResultDTO> queue = customizedHeatMap.get(tuple.getValue());
+                    if((CollectionUtils.isEmpty(queue))) queue = new LinkedList<>();
+                    queue.add(parseObject(tuple.getValue(), IssueCategoryTagResultDTO.class));
+                    customizedHeatMap.put((Double) tuple.getValue(),queue);
                 });
-                List<IssueCategoryTagResultDTO> defaultResult = new LinkedList<>();
-                heatMap.keySet().stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList()).forEach(count -> {
-                    defaultResult.addAll(heatMap.get(count));
+                List<IssueCategoryTagResultDTO> customizedResult = new LinkedList<>();
+                customizedHeatMap.keySet().stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList()).forEach(count -> {
+                    customizedResult.addAll(customizedHeatMap.get(count));
                 });
+                result.put(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME,customizedResult);
+            }
 
-                result.put(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME, defaultResult);
+            if(!CollectionUtils.isEmpty(result))
+            return result;
+
+
+        log.warn("fetch customer govern tag cache blankly,customerId:{},now begin compensation...", customerId);
+
+        Map<String,List<IssueCategoryTagResultDTO>> compensate = compensate(customerId, category, ifOtherOnly);
+
+        if (CollectionUtils.isEmpty(compensate)) {
+            log.error("compensation failure or there is no tag data in database!!");
+            return null;
+        } else {
+            log.warn("compensation completed!!");
+            return compensate;
+        }
+    }
+
+
+
+
+    /**
+     * @Description    category为空，则补偿全部，返回默认标签和自定义标签
+     *                 category仅包含"其他"这个分类的Id时，同上
+     *                 category不为空且不只有"其他"这个分类的Id时，则返回集合中的类别标签以及自定义标签
+     *                 默认标签不按照热度排序，自定义标签按照热度排序
+     *
+     * @param customerId
+     * @param category
+     * @return
+     * @author wangc
+     * @date 2020.12.09 11:16
+    */
+    public Map<String,List<IssueCategoryTagResultDTO>> getTagsOrderByRank(String customerId,List<String> category) {
+            if (StringUtils.isBlank(customerId)) {
+                log.error("customerId can not be null when obtain govern tags.");
+                return null;
             }
-            Set<ZSetOperations.TypedTuple<Object>> customizedTuples = redisUtils.zReverseRangeWithScores(GovIssueRedisKeys.getGovernmentTagKey(customerId, null), NumConstant.ZERO_L, (long) (NumConstant.ONE_NEG));
-            if(!CollectionUtils.isEmpty(customizedTuples)){
-                    Map<Double, List<IssueCategoryTagResultDTO>> customizedHeatMap = new HashMap<>();
-                    customizedTuples.forEach(tuple -> {
-                        List<IssueCategoryTagResultDTO> queue = customizedHeatMap.get(tuple.getValue());
-                        if((CollectionUtils.isEmpty(queue))) queue = new LinkedList<>();
+
+            IssueProjectCategoryDictEntity otherCategory = categoryDictDao.selectSingleByCustomerIdAndCategoryNameAndCategoryType(customerId, ModuleConstants.CATEGORY_NAME_OTHERS, null);
+            boolean ifOtherOnly = null == otherCategory ? false : (!CollectionUtils.isEmpty(category) && category.size() == NumConstant.ONE && category.contains(otherCategory.getId()) ? true : false);
+            Set<String> keys;
+            if (CollectionUtils.isEmpty(category) || ifOtherOnly)
+                keys = redisUtils.keys(GovIssueRedisKeys.getGovernmentTagKey(customerId, null));
+            else keys = category.stream().map(key -> {
+                return GovIssueRedisKeys.getGovernmentTagKey(customerId, key);
+            }).collect(Collectors.toSet());
+            //如果keys集合为空，说明缓存中没有当前客户的标签排行信息，直接进行补偿
+            if (!CollectionUtils.isEmpty(keys)){
+                keys.remove(GovIssueRedisKeys.getGovernmentTagKey(customerId,ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME));
+                List<Set<ZSetOperations.TypedTuple<Object>>> heatTuple = redisTemplate.executePipelined(new RedisCallback<Set<ZSetOperations.TypedTuple<Object>>>() {
+                    @Nullable
+                    @Override
+                    public Set<ZSetOperations.TypedTuple<Object>> doInRedis(RedisConnection connection) throws DataAccessException {
+                        connection.openPipeline();
+                        keys.forEach(key -> {
+                            connection.zSetCommands().zRangeByScoreWithScores(redisTemplate.getKeySerializer().serialize(key), NumConstant.ZERO_L, (long) (NumConstant.ONE_NEG));
+                        });
+                        return null;
+                    }
+                }, redisTemplate.getValueSerializer());
+
+                Map<String,List<IssueCategoryTagResultDTO>> result = new HashMap<>();
+                if (!CollectionUtils.isEmpty(heatTuple)) {
+                    //热度Map  分数为key
+                    Map<Double, List<IssueCategoryTagResultDTO>> heatMap = new HashMap<>();
+                    heatTuple.forEach(tupleSet -> {
+                        tupleSet.forEach(tuple -> {
+                            Double heatScore = tuple.getScore();
+                            List<IssueCategoryTagResultDTO> queue = heatMap.get(heatScore);
+                            if (CollectionUtils.isEmpty(queue)) queue = new LinkedList<>();
                             queue.add(parseObject(tuple.getValue(), IssueCategoryTagResultDTO.class));
-                        customizedHeatMap.put((Double) tuple.getValue(),queue);
+                            heatMap.put(heatScore, queue);
+                        });
                     });
-                    List<IssueCategoryTagResultDTO> customizedResult = new LinkedList<>();
-                    customizedHeatMap.keySet().stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList()).forEach(count -> {
-                        customizedResult.addAll(customizedHeatMap.get(count));
+                    List<IssueCategoryTagResultDTO> defaultResult = new LinkedList<>();
+                    heatMap.keySet().stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList()).forEach(count -> {
+                        defaultResult.addAll(heatMap.get(count));
                     });
-                    result.put(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME,customizedResult);
-                }
-            return result;
 
-            }
+                    result.put(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME, defaultResult);
+                }
+                Set<ZSetOperations.TypedTuple<Object>> customizedTuples = redisUtils.zReverseRangeWithScores(GovIssueRedisKeys.getGovernmentTagKey(customerId, null), NumConstant.ZERO_L, (long) (NumConstant.ONE_NEG));
+                if(!CollectionUtils.isEmpty(customizedTuples)){
+                        Map<Double, List<IssueCategoryTagResultDTO>> customizedHeatMap = new HashMap<>();
+                        customizedTuples.forEach(tuple -> {
+                            List<IssueCategoryTagResultDTO> queue = customizedHeatMap.get(tuple.getValue());
+                            if((CollectionUtils.isEmpty(queue))) queue = new LinkedList<>();
+                                queue.add(parseObject(tuple.getValue(), IssueCategoryTagResultDTO.class));
+                            customizedHeatMap.put((Double) tuple.getValue(),queue);
+                        });
+                        List<IssueCategoryTagResultDTO> customizedResult = new LinkedList<>();
+                        customizedHeatMap.keySet().stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList()).forEach(count -> {
+                            customizedResult.addAll(customizedHeatMap.get(count));
+                        });
+                        result.put(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME,customizedResult);
+                    }
+                return result;
 
+                }
 
             log.warn("fetch customer govern tag cache blankly,customerId:{},now begin compensation...", customerId);
 
-        Map<String,List<IssueCategoryTagResultDTO>> compensate = compensate(customerId, category, ifOtherOnly);
+            Map<String,List<IssueCategoryTagResultDTO>> compensate = compensate(customerId, category, ifOtherOnly);
 
             if (CollectionUtils.isEmpty(compensate)) {
-                log.error("compensation failure or there is no default tag data in database!!");
+                log.error("compensation failure or there is no tag data in database!!");
                 return null;
             } else {
                 log.warn("compensation completed!!");
@@ -165,26 +235,70 @@ public class IssueProjectTagDictRedis {
             }
     }
 
+
+
     /**
-     * @Description    category为空，则补偿全部，返回全部
-     *                 category不为空，则补偿集合中的类别标签以及自定义标签
-     *                 category为"customize"，只补偿自定义标签
-     *                 只需查询标签库(issue_project_tag_dict)中的issueUseCount和projectUseCount即可
+     * @Description    category为空，则补偿全部，返回默认标签和自定义标签，补偿全部
+     *                 category仅包含"其他"这个分类的Id时，返回同上，补偿全部
+     *                 category不为空且不只有"其他"这个分类的Id时，则返回并补偿集合中的类别标签以及自定义标签
+     *                 默认标签不按照热度排序，自定义标签按照热度排序
+     *
+     *
      * @param customerId
      * @param category
-     * @return java.util.List<com.epmet.dto.result.IssueCategoryTagResultDTO>
+     * @return
      * @author wangc
      * @date 2020.12.10 09:34
     */
     public Map<String,List<IssueCategoryTagResultDTO>> compensate(String customerId,List<String> category,boolean ifOtherOnly){
 
 
-        List<IssueProjectTagDictEntity> _default = poolDao.selectTagByCategory(ifOtherOnly || CollectionUtils.isEmpty(category) ? null : category, NumConstant.ZERO_STR, customerId);//默认
-        List<IssueProjectTagDictEntity> _customized = poolDao.selectTagByCategory(null,NumConstant.ONE_STR,customerId);//自定义
+        List<IssueProjectTagDictEntity> db = poolDao.selectTagByCategory(ifOtherOnly || CollectionUtils.isEmpty(category) ? null : category, customerId, null);
 
+
+        // key      ->      redisKey
+        // value    ->      [key : score ; value : object]
         Map<String,Map<Integer,List<IssueCategoryTagResultDTO>>> fulfilled = new HashMap<>();
-        Map<String,List<IssueCategoryTagResultDTO>> result = new HashMap<>();
+        if(!CollectionUtils.isEmpty(db)) {
+            Map<String, List<IssueProjectTagDictEntity>> categoryMap = db.stream().collect(Collectors.groupingBy(IssueProjectTagDictEntity::getCategoryId));
+            //key  ->  categoryId
+            categoryMap.forEach((k, v) -> {
+                Map<Integer, List<IssueCategoryTagResultDTO>> scoreMap = new HashMap<>();
+                String redisKey = GovIssueRedisKeys.getGovernmentTagKey(customerId, k);
+                v.forEach(tag -> {
+                    List<IssueCategoryTagResultDTO> unit = scoreMap.get(tag.getIssueUseCount());
+                    if (CollectionUtils.isEmpty(unit)) unit = new LinkedList<>();
+                    IssueCategoryTagResultDTO object = ConvertUtils.sourceToTarget(tag, IssueCategoryTagResultDTO.class);
+                    object.setName(tag.getTagName());
+                    unit.add(object);
+                    scoreMap.put(tag.getIssueUseCount(), unit);
+                });
+                fulfilled.put(redisKey, scoreMap);
+            });
+
 
+            redisTemplate.executePipelined((RedisCallback) connection -> {
+                fulfilled.forEach((redisKey, map) -> {
+                    map.forEach((score,list) -> {
+                        list.forEach(factor -> {
+                            connection.zSetCommands().zAdd(redisTemplate.getValueSerializer().serialize(redisKey),
+                                    score.doubleValue(),
+                                    redisTemplate.getValueSerializer().serialize(factor));
+                        });
+                    });
+
+                });
+                return null;
+            });
+        }
+
+        Map<String,List<IssueCategoryTagResultDTO>> result = new HashMap<>();
+        result.put(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME,CollectionUtils.isEmpty(db) ? null : db.stream().filter(o -> !StringUtils.equals(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME,o.getCategoryId())).map(entity -> {
+            IssueCategoryTagResultDTO tag = ConvertUtils.sourceToTarget(entity,IssueCategoryTagResultDTO.class);
+            tag.setName(entity.getTagName()); return tag;}).collect(Collectors.toList()));
+        result.put(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME,CollectionUtils.isEmpty(db) ? null : db.stream().filter(o -> !StringUtils.equals(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME,o.getCategoryId())).sorted(Comparator.comparing(IssueProjectTagDictEntity :: getIssueUseCount).reversed()).map(entity -> {
+            IssueCategoryTagResultDTO tag = ConvertUtils.sourceToTarget(entity,IssueCategoryTagResultDTO.class);
+            tag.setName(entity.getTagName());return tag;}).collect(Collectors.toList()));
         return result;
     }
 
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
index 60beccaa6e..2c5f2aab17 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
@@ -73,7 +73,7 @@
         SELECT
             tag.ID,
             tag.TAG_NAME,
-            tag.CATEGORY_ID,
+            IFNULL(tag.CATEGORY_ID,'customize') AS categoryId,
             tag.IS_DEFAULT,
             (IFNULL(tag.ISSUE_USE_COUNT,0) + IFNULL(tag.PROJECT_USE_COUNT,0)) AS issueUseCount
         FROM
@@ -81,24 +81,26 @@
         WHERE
             tag.DEL_FLAG = '0'
             AND tag.CUSTOMER_ID = #{customerId}
-            AND tag.IS_DEFAULT = #{isDefault}
+            <if test='null != isDefault and "" != isDefault'>
+                AND tag.IS_DEFAULT = #{isDefault}
+            </if>
             <choose>
                 <when test="null != categories and categories.size > 0">
-                    <foreach collection="categories" item="id" open="AND ( " separator=" OR " close=" )">
+                    <foreach collection="categories" item="id" open="AND ( tag.CATEGORY_ID IS NULL OR tag.CATEGORY_ID = '' OR " separator=" OR " close=" )">
                         tag.CATEGORY_ID = #{id}
                     </foreach>
                     ORDER BY FIELD(
-                        tag.CATEGORY_ID,
-                        <foreach collection="categories" item="id" separator=" , ">
-                            #{id}
-                        </foreach>
+                    tag.CATEGORY_ID,
+                    <foreach collection="categories" item="id" separator=" , ">
+                        #{id}
+                    </foreach>
                     )
                 </when>
                 <otherwise>
                     ORDER BY type.SORT
                 </otherwise>
             </choose>
-                , tag.TAG_NAME
+                ,  CONVERT ( tag.TAG_NAME USING gbk )
     </select>
 
 </mapper>
\ No newline at end of file

From eb21708f4b499126e3d2fe200d014d87b43d1de3 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Fri, 11 Dec 2020 10:23:53 +0800
Subject: [PATCH 030/119] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/redis/IssueProjectTagDictRedis.java   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
index 1e4a4ec6f7..c19eeee7de 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
@@ -75,10 +75,11 @@ public class IssueProjectTagDictRedis {
 
 
     /**
-     * @Description    category为空，则补偿全部，返回默认标签和自定义标签
-     *                 category仅包含"其他"这个分类的Id时，同上
-     *                 category不为空且不只有"其他"这个分类的Id时，则返回集合中的类别标签以及自定义标签
-     *                 默认标签不按照热度排序，自定义标签按照热度排序
+     * @Description
+     *
+     *                排序规则：
+     *                  1、默认标签，按照分类排序
+     *                  2、自定义标签，按照热度排序
      *
      * @param customerId
      * @param category

From f0b1db90f79a292be107411e03d11d3ee55ec1da Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 11 Dec 2020 10:35:27 +0800
Subject: [PATCH 031/119] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=85=A5=E5=8F=82=E5=8E=BB=E6=8E=89=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7Id=EF=BC=8C=E6=94=B9=E4=B8=BA=E5=9C=A8token=E4=B8=AD?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/form/CustomerCategoryListFormDTO.java | 22 -------------------
 .../IssueProjectCategoryDictController.java   | 10 ++++-----
 .../IssueProjectCategoryDictService.java      |  5 ++---
 .../IssueProjectCategoryDictServiceImpl.java  |  7 +++---
 4 files changed, 10 insertions(+), 34 deletions(-)
 delete mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CustomerCategoryListFormDTO.java

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CustomerCategoryListFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CustomerCategoryListFormDTO.java
deleted file mode 100644
index 39ae42441e..0000000000
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CustomerCategoryListFormDTO.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.epmet.dto.form;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-
-/**
- * 分类列表查询-接口入参
- * @Author sun
- */
-@Data
-public class CustomerCategoryListFormDTO implements Serializable {
-
-    private static final long serialVersionUID = 2599592072265715951L;
-    @NotBlank(message = "客户ID不能为空",groups = {CustomerCategoryListFormDTO.Category.class})
-    private String customerId;
-
-    public interface Category{}
-
-
-}
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 cd7948cf91..16fb700639 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
@@ -17,7 +17,9 @@
 
 package com.epmet.controller;
 
+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;
@@ -27,7 +29,6 @@ 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.CustomerCategoryListFormDTO;
 import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
 import com.epmet.dto.result.CustomerCategoryListResultDTO;
 import com.epmet.dto.result.ProjectIssueCategoryResultDTO;
@@ -97,15 +98,14 @@ public class IssueProjectCategoryDictController {
     }
 
     /**
-     * @param formDTO
+     * @param tokenDto
      * @return
      * @Description 客户分类列表查询，按分类升序排列
      * @Author sun
      **/
     @PostMapping("list")
-    public Result<List<CustomerCategoryListResultDTO>> categoryList(@RequestBody CustomerCategoryListFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO, CustomerCategoryListFormDTO.Category.class);
-        return new Result<List<CustomerCategoryListResultDTO>>().ok(issueProjectCategoryDictService.categoryList(formDTO));
+    public Result<List<CustomerCategoryListResultDTO>> categoryList(@LoginUser TokenDto tokenDto) {
+        return new Result<List<CustomerCategoryListResultDTO>>().ok(issueProjectCategoryDictService.categoryList(tokenDto.getCustomerId()));
     }
 
     /**
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 1e89188eff..c283895c9f 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,7 +21,6 @@ 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.CustomerCategoryListFormDTO;
 import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
 import com.epmet.dto.result.CustomerCategoryListResultDTO;
 import com.epmet.dto.result.ProjectIssueCategoryResultDTO;
@@ -99,12 +98,12 @@ public interface IssueProjectCategoryDictService extends BaseService<IssueProjec
     void delete(String[] ids);
 
     /**
-     * @param formDTO
+     * @param customerId
      * @return
      * @Description 客户分类列表查询，按分类升序排列
      * @Author sun
      **/
-    List<CustomerCategoryListResultDTO> categoryList(CustomerCategoryListFormDTO formDTO);
+    List<CustomerCategoryListResultDTO> categoryList(String customerId);
 
     /**
      * 客户分类标签数据初始化
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 3030b696fd..e767bc8113 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,7 +29,6 @@ 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.CustomerCategoryListFormDTO;
 import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
 import com.epmet.dto.form.SaveIssueCategoryFormDTO;
 import com.epmet.dto.result.CustomerCategoryListResultDTO;
@@ -121,14 +120,14 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
     }
 
     /**
-     * @param formDTO
+     * @param customerId
      * @return
      * @Description 客户分类列表查询，按分类升序排列
      * @Author sun
      **/
     @Override
-    public List<CustomerCategoryListResultDTO> categoryList(CustomerCategoryListFormDTO formDTO) {
-        List<CustomerCategoryListResultDTO> resultList = baseDao.selectCustomerCategoryList(formDTO.getCustomerId());
+    public List<CustomerCategoryListResultDTO> categoryList(String customerId) {
+        List<CustomerCategoryListResultDTO> resultList = baseDao.selectCustomerCategoryList(customerId);
         return resultList;
     }
 

From a910d2cfdda5d0c6ae167e6a193a08b1c430aade Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 11 Dec 2020 10:39:06 +0800
Subject: [PATCH 032/119] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9/=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/service/impl/IssueTagsServiceImpl.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
index 26ce23bd7a..fbe4f9782c 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
@@ -191,6 +191,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
             baseDao.deleteTagsByIssueId(form.getIssueId());
             return;
         }
+        // 不为空时走这
         List<IssueTagFormDTO> selectTags = form.getTagList();
         List<IssueTagFormDTO> newTags = issueProjectTagDictDao.selectTagId(selectTags);
         IssueTagsDTO issueTagsDTO = baseDao.selectOneTagByIssueId(form.getIssueId());

From 50e0558ca6d6593b3b1be86ea546a5d5597148cf Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 11 Dec 2020 11:02:41 +0800
Subject: [PATCH 033/119] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=81=94=E5=90=88?=
 =?UTF-8?q?=E4=B8=BB=E9=94=AE=E9=80=A0=E6=88=90=E7=9A=84=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dao/IssueProjectCategoryDictDao.java     |  2 +-
 .../resources/mapper/IssueProjectCategoryDictDao.xml   | 10 +++++++---
 .../dto/result/CustomerCategoryListResultDTO.java      |  6 ++++++
 3 files changed, 14 insertions(+), 4 deletions(-)

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 ec76ffd7b4..52405b07f5 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
@@ -44,7 +44,7 @@ public interface IssueProjectCategoryDictDao extends BaseDao<IssueProjectCategor
      * @Description 查询某个分类的下级分类
      * @Author sun
      **/
-    List<CustomerCategoryListResultDTO> subCategoryList(@Param("id") String categoryId);
+    List<CustomerCategoryListResultDTO> subCategoryList(@Param("id") String categoryId, @Param("customerId") String customerId);
 
     /**
      * 获取默认标签配置
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 1e0d90e45c..9bcdc54cdf 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
@@ -7,14 +7,16 @@
     <resultMap id="categoryTree" type="com.epmet.dto.result.CustomerCategoryListResultDTO">
         <id column="id" property="id"/>
         <result column="name" property="name"/>
+        <result column="customerId" property="customerId"/>
 
-        <collection property="subCategory" column="id" ofType="com.epmet.dto.result.CustomerCategoryListResultDTO" select="subCategoryList">
+        <collection property="subCategory" column="{id = id,customerId = customerId}" ofType="com.epmet.dto.result.CustomerCategoryListResultDTO" select="subCategoryList">
         </collection>
     </resultMap>
     <select id="selectCustomerCategoryList" resultMap="categoryTree">
         SELECT
             id AS "id",
-            category_name AS "name"
+            category_name AS "name",
+            customer_id AS "customerId"
         FROM
             issue_project_category_dict
         WHERE
@@ -26,12 +28,14 @@
     <select id="subCategoryList" resultMap="categoryTree">
         SELECT
             id AS "id",
-            category_name AS "name"
+            category_name AS "name",
+            customer_id AS "customerId"
         FROM
             issue_project_category_dict
         WHERE
             del_flag = '0'
         AND pid = #{id}
+        AND customer_id = #{customerId}
         ORDER BY sort ASC
     </select>
     <!-- sql递归 查询客户议题项目的分类信息以及递归查询二级分类信息 end-->
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CustomerCategoryListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CustomerCategoryListResultDTO.java
index 2ae7331706..117c6cd42b 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CustomerCategoryListResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CustomerCategoryListResultDTO.java
@@ -1,5 +1,6 @@
 package com.epmet.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -22,6 +23,11 @@ public class CustomerCategoryListResultDTO implements Serializable {
 	 * 分类名称
 	 */
 	private String name;
+	/**
+	 * 分类名称
+	 */
+	@JsonIgnore
+	private String customerId;
 
 	/**
 	 * 子级分类对象

From b96444ed21f3ae050e021d716f988f483380966f Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Fri, 11 Dec 2020 11:10:32 +0800
Subject: [PATCH 034/119] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IssueProjectTagDictServiceImpl.java   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
index f2acf15e3c..12c8cb4764 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
@@ -34,6 +34,7 @@ import com.epmet.entity.IssueProjectTagDictEntity;
 import com.epmet.redis.IssueProjectTagDictRedis;
 import com.epmet.service.IssueProjectTagDictService;
 import com.epmet.utils.ModuleConstants;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -118,10 +119,15 @@ public class IssueProjectTagDictServiceImpl extends BaseServiceImpl<IssueProject
     @Override
     public TagListResultDTO getTagList(TokenDto tokenDto, TagListFormDTO formDTO) {
         TagListResultDTO result = new TagListResultDTO();
-		Map<String,List<IssueCategoryTagResultDTO>> map =  issueProjectTagDictRedis.getTagsOrderByRank(tokenDto.getCustomerId(),
+		Map<String,List<IssueCategoryTagResultDTO>> map =  issueProjectTagDictRedis.getDefaultTagsSortedByCategoryAndCustomizedTagsOrderByRank(tokenDto.getCustomerId(),
 				formDTO.getCategoryIdList());
         result.setDefaulted(map.get(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME));
-        result.setCustomized(map.get(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME).stream().limit(NumConstant.TEN).collect(Collectors.toList()));
+        List<IssueCategoryTagResultDTO> list = map.get(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME);
+        if (CollectionUtils.isNotEmpty(list)) {
+            result.setCustomized(list.stream().limit(NumConstant.TEN).collect(Collectors.toList()));
+        } else {
+            result.setCustomized(Collections.emptyList());
+        }
         return result;
     }
 

From 1f08c1f64cfad0e5debd3746f3c89e0249ac0092 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 11 Dec 2020 13:47:44 +0800
Subject: [PATCH 035/119] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9/=E4=BF=9D=E5=AD=98=20tagName=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9name?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/form/IssueTagFormDTO.java   | 2 +-
 .../src/main/java/com/epmet/dto/form/IssueTagsFormDTO.java  | 2 +-
 .../java/com/epmet/service/impl/IssueTagsServiceImpl.java   | 6 +++---
 .../src/main/resources/mapper/IssueProjectTagDictDao.xml    | 2 +-
 .../src/main/resources/mapper/IssueTagsDao.xml              | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagFormDTO.java
index b49075bce4..3b9cfedb13 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagFormDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagFormDTO.java
@@ -15,7 +15,7 @@ public class IssueTagFormDTO implements Serializable {
 
     private String id;
 
-    private String tagName;
+    private String name;
 
     private String categoryId;
 
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 e813b866f5..8cb89dc4d7 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
@@ -41,7 +41,7 @@ public class IssueTagsFormDTO implements Serializable {
     /**
      * 标签名称
      */
-    private String tagName;
+    private String name;
 
     /**
      * 删除标识 0.未删除 1.已删除
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
index fbe4f9782c..744852e874 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
@@ -180,7 +180,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
                 tags.forEach(t -> {
                     // 缓存标签 -1
                     IssueCategoryTagResultDTO issueCategoryTagResultDTO = new IssueCategoryTagResultDTO();
-                    issueCategoryTagResultDTO.setName(t.getTagName());
+                    issueCategoryTagResultDTO.setName(t.getName());
                     issueCategoryTagResultDTO.setId(t.getId());
                     dictRedis.editTagUseCount(customerId,t.getCategoryId(),issueCategoryTagResultDTO,NumConstant.ONE_STR);
                 });
@@ -201,7 +201,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
             if (!CollectionUtils.isEmpty(delList)){
                 delList.forEach(d -> {
                     IssueCategoryTagResultDTO issueCategoryTagResultDTO = new IssueCategoryTagResultDTO();
-                    issueCategoryTagResultDTO.setName(d.getTagName());
+                    issueCategoryTagResultDTO.setName(d.getName());
                     issueCategoryTagResultDTO.setId(d.getId());
                     dictRedis.editTagUseCount(customerId,d.getCategoryId(),issueCategoryTagResultDTO,NumConstant.ONE_STR);
                 });
@@ -214,7 +214,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
                 addList.forEach(a -> {
                     // 缓存标签+1
                     IssueCategoryTagResultDTO issueCategoryTagResultDTO = new IssueCategoryTagResultDTO();
-                    issueCategoryTagResultDTO.setName(a.getTagName());
+                    issueCategoryTagResultDTO.setName(a.getName());
                     issueCategoryTagResultDTO.setId(a.getId());
                     dictRedis.editTagUseCount(customerId,a.getCategoryId(),issueCategoryTagResultDTO,NumConstant.ZERO_STR);
                 });
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
index 2c5f2aab17..8ed29444c2 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
@@ -24,7 +24,7 @@
     <!-- 查询标签ID -->
     <select id="selectTagId" resultType="com.epmet.dto.form.IssueTagFormDTO">
         SELECT ID AS tagId,
-               TAG_NAME,
+               TAG_NAME AS name,
                CATEGORY_ID,
                id
         FROM issue_project_tag_dict
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 9b217b6223..5f134b85a3 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
@@ -42,7 +42,7 @@
     <select id="selectTagsByIssueId" resultType="com.epmet.dto.form.IssueTagFormDTO">
         SELECT
             it.TAG_ID AS id,
-            it.TAG_NAME,
+            it.TAG_NAME as name,
             td.CATEGORY_ID,
             it.TAG_ID AS tagId
         FROM issue_tags it
@@ -79,7 +79,7 @@
                 #{l.gridId},
                 #{l.issueId},
                 #{l.tagId},
-                #{l.tagName},
+                #{l.name},
                 #{l.delFlag},
                 #{l.revision},
                 #{l.createdBy},

From 12cdac988c89371431cb53c64f50221643c6f0c3 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 11 Dec 2020 13:52:15 +0800
Subject: [PATCH 036/119] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E5=88=86=E7=B1=BB=E5=8F=AF=E4=BB=A5=E7=A9=BF=E7=A9=BA?=
 =?UTF-8?q?=E7=9A=84=E5=88=86=E7=B1=BB=E9=9B=86=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/controller/IssueCategoryController.java  | 3 ---
 .../com/epmet/service/impl/IssueCategoryServiceImpl.java    | 6 ++++++
 .../com/epmet/controller/ProjectCategoryController.java     | 3 ---
 .../com/epmet/service/impl/ProjectCategoryServiceImpl.java  | 5 +++++
 4 files changed, 11 insertions(+), 6 deletions(-)

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 2da6a153eb..bfd770a5ff 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
@@ -129,9 +129,6 @@ public class IssueCategoryController {
     @PostMapping("save")
     public Result saveCategory(@RequestBody IssueSaveCategoryFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, IssueSaveCategoryFormDTO.SaveCategory.class);
-        if(formDTO.getCategoryList().size()< NumConstant.ONE){
-            throw new RenException("请至少选择一个分类保存");
-        }
         issueCategoryService.saveCategory(formDTO);
         return new Result();
     }
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 32dcd13338..f806f28032 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
@@ -177,6 +177,12 @@ public class IssueCategoryServiceImpl extends BaseServiceImpl<IssueCategoryDao,
     @Override
     public void saveCategory(IssueSaveCategoryFormDTO formDTO) {
 
+        //0.如果传入的分类集合为空不管是否存在过历史分类数据，只执行一次删除操作
+        if(formDTO.getCategoryList().size()< NumConstant.ONE){
+            baseDao.delByIssueId(formDTO.getIssueId());
+            return;
+        }
+
         //1.查询议题所属客户和所属网格信息
         IssueEntity issue = issueService.selectById(formDTO.getIssueId());
         if (null == issue) {
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 2160f44778..f9c6b2acda 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
@@ -117,9 +117,6 @@ public class ProjectCategoryController {
     @PostMapping("save")
     public Result saveCategory(@RequestBody ProjectSaveCategoryFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, ProjectSaveCategoryFormDTO.SaveCategory.class);
-        if(formDTO.getCategoryList().size()< NumConstant.ONE){
-            throw new RenException("请至少选择一个分类保存");
-        }
         projectCategoryService.saveCategory(formDTO);
         return new Result();
     }
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 74ed9133ee..8cb2ec5a0b 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
@@ -150,6 +150,11 @@ public class ProjectCategoryServiceImpl extends BaseServiceImpl<ProjectCategoryD
     @Override
     public void saveCategory(ProjectSaveCategoryFormDTO formDTO) {
 
+        //0.如果传入的分类集合为空不管是否存在过历史分类数据，只执行一次删除操作
+        if(formDTO.getCategoryList().size()< NumConstant.ONE){
+            baseDao.delByProjectId(formDTO.getProjectId());
+            return;
+        }
         //1.查询项目所属客户和所属网格信息以及分类对应的分类信息
         Result<ProjectIssueCategoryResultDTO> result = govIssueOpenFeignClient.getProjectAndCategoryInfo(formDTO);
         if (!result.success()) {

From 7c5782f90c73553aba63203a7fba79f3d0779227 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 11 Dec 2020 14:11:31 +0800
Subject: [PATCH 037/119] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E7=BD=91=E6=A0=BCId?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/IssueTagsServiceImpl.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
index 744852e874..5b7b639389 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
@@ -25,6 +25,7 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.dao.IssueDao;
 import com.epmet.dao.IssueProjectTagDictDao;
 import com.epmet.dao.IssueTagsDao;
 import com.epmet.dto.IssueTagsDTO;
@@ -34,6 +35,7 @@ import com.epmet.dto.form.IssueTagsFormDTO;
 import com.epmet.dto.form.IssueTagsSaveFormDTO;
 import com.epmet.dto.result.AddTagResultDTO;
 import com.epmet.dto.result.IssueCategoryTagResultDTO;
+import com.epmet.entity.IssueEntity;
 import com.epmet.entity.IssueProjectTagDictEntity;
 import com.epmet.entity.IssueTagsEntity;
 import com.epmet.redis.IssueProjectTagDictRedis;
@@ -67,6 +69,8 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
     private IssueProjectTagDictDao issueProjectTagDictDao;
     @Autowired
     private IssueProjectTagDictRedis dictRedis;
+    @Autowired
+    private IssueDao issueDao;
 
     @Override
     public PageData<IssueTagsDTO> page(Map<String, Object> params) {
@@ -194,7 +198,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
         // 不为空时走这
         List<IssueTagFormDTO> selectTags = form.getTagList();
         List<IssueTagFormDTO> newTags = issueProjectTagDictDao.selectTagId(selectTags);
-        IssueTagsDTO issueTagsDTO = baseDao.selectOneTagByIssueId(form.getIssueId());
+        IssueEntity issueEntity = issueDao.selectById(form.getIssueId());
         if (!CollectionUtils.isEmpty(newTags)){
             // 需要删除的标签
             List<IssueTagFormDTO> delList = tags.stream().filter(tag -> !newTags.contains(tag)).collect(toList());
@@ -227,7 +231,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
             List<IssueTagsFormDTO> needInsert = ConvertUtils.sourceToTarget(newTags, IssueTagsFormDTO.class);
             needInsert.forEach(n -> {
                 n.setCustomerId(customerId);
-                n.setGridId(issueTagsDTO.getGridId());
+                n.setGridId(issueEntity.getGridId());
                 n.setIssueId(form.getIssueId());
             });
             baseDao.insertNewTags(needInsert);

From 930859563a5b7e7fe03d4688dfa4d1d8a18103a9 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 11 Dec 2020 14:33:38 +0800
Subject: [PATCH 038/119] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/service/impl/IssueTagsServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
index 5b7b639389..9598d00fbc 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
@@ -163,7 +163,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
         issueCategoryTagResultDTO.setId(entity.getId());
         issueCategoryTagResultDTO.setName(entity.getTagName());
         dictRedis.addIssueProjectTag(entity.getCustomerId(),entity.getCategoryId(),issueCategoryTagResultDTO);
-        return new AddTagResultDTO();
+        return new AddTagResultDTO(entity.getId());
     }
 
     /**

From 92bcea246957127caa1c3a12f4228956740a7c0a Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Fri, 11 Dec 2020 14:35:49 +0800
Subject: [PATCH 039/119] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=EF=BC=9A=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/form/TagDifferentSetFormDTO.java      | 28 +++++++++++
 .../epmet/feign/GovIssueOpenFeignClient.java  | 11 +++++
 .../GovIssueOpenFeignClientFallBack.java      |  5 ++
 .../IssueProjectTagDictController.java        | 15 ++++++
 .../epmet/redis/IssueProjectTagDictRedis.java |  7 ++-
 .../service/IssueProjectTagDictService.java   | 10 ++++
 .../IssueProjectCategoryDictServiceImpl.java  |  1 -
 .../impl/IssueProjectTagDictServiceImpl.java  | 13 +++++
 .../epmet/dto/form/ProjectTagHookFormDTO.java | 43 +++++++++++++++++
 .../controller/ProjectTagsController.java     | 13 +++--
 .../java/com/epmet/dao/ProjectTagsDao.java    | 18 +++++++
 .../com/epmet/service/ProjectTagsService.java | 11 +++++
 .../service/impl/ProjectTagsServiceImpl.java  | 48 +++++++++++++++++++
 .../main/resources/mapper/ProjectTagsDao.xml  | 38 +++++++++++++++
 14 files changed, 255 insertions(+), 6 deletions(-)
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/TagDifferentSetFormDTO.java
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectTagHookFormDTO.java

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/TagDifferentSetFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/TagDifferentSetFormDTO.java
new file mode 100644
index 0000000000..93685f4a81
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/TagDifferentSetFormDTO.java
@@ -0,0 +1,28 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 更新标签使用率入参DTO
+ * @ClassName TagDifferentSetFormDTO
+ * @Auth wangc
+ * @Date 2020-12-11 14:03
+ */
+@Data
+public class TagDifferentSetFormDTO implements Serializable {
+    private static final long serialVersionUID = -5232943723252172322L;
+
+    private List<String> plus;
+
+    private List<String> minus;
+
+    @NotBlank(message = "客户Id不能为空")
+    private String customerId;
+
+    @NotBlank(message = "用户Id不能为空")
+    private String userId;
+}
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 eebeae517c..5987bcacca 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
@@ -223,4 +223,15 @@ public interface GovIssueOpenFeignClient {
 	 **/
 	@PostMapping(value = "/gov/issue/issueprojectcategorydict/getprojectandcategoryinfo")
 	Result<ProjectIssueCategoryResultDTO> getProjectAndCategoryInfo(ProjectSaveCategoryFormDTO formDTO);
+
+	/**
+	 * @Description 更新标签热度 数据库/缓存
+	 * @param param
+	 * @return void
+	 * @author wangc
+	 * @date 2020.12.11 14:00
+	 */
+	@PostMapping("/gov/issue/issueprojecttagdict/updatecitations")
+	Result updateCitations(@RequestBody TagDifferentSetFormDTO param);
+
 }
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 c261fa79d1..537b7d3265 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
@@ -211,4 +211,9 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient
 	public Result<ProjectIssueCategoryResultDTO> getProjectAndCategoryInfo(ProjectSaveCategoryFormDTO formDTO) {
 		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getProjectAndCategoryInfo", formDTO);
 	}
+
+	@Override
+	public Result updateCitations(TagDifferentSetFormDTO param) {
+		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "updateCitations", param);
+	}
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectTagDictController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectTagDictController.java
index 67d923b73a..e87f9996d7 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectTagDictController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectTagDictController.java
@@ -28,6 +28,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.IssueProjectTagDictDTO;
+import com.epmet.dto.form.TagDifferentSetFormDTO;
 import com.epmet.dto.form.TagListFormDTO;
 import com.epmet.dto.result.TagListResultDTO;
 import com.epmet.excel.IssueProjectTagDictExcel;
@@ -107,4 +108,18 @@ public class IssueProjectTagDictController {
     public Result<TagListResultDTO> list(@LoginUser TokenDto tokenDto, @RequestBody TagListFormDTO formDTO) {
         return new Result<TagListResultDTO>().ok(issueProjectTagDictService.getTagList(tokenDto, formDTO));
     }
+
+    /**
+     * @Description 更新标签热度 数据库/缓存
+     * @param param
+     * @return void
+     * @author wangc
+     * @date 2020.12.11 14:00
+     */
+    @PostMapping("updatecitations")
+    public Result updateCitations(@RequestBody TagDifferentSetFormDTO param){
+        ValidatorUtils.validateEntity(param);
+        issueProjectTagDictService.updateTagHeat(param);
+        return new Result();
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
index c19eeee7de..cabdeca377 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
@@ -144,7 +144,10 @@ public class IssueProjectTagDictRedis {
 
 
     /**
-     * @Description    category为空，则补偿全部，返回默认标签和自定义标签
+     * @Description    FIXME 该方法保留，默认查询缓存，默认和自定义两种标签均按热度排序
+     *                 FIXME 如果缓存中没有相关数据，则进行补偿，返回的数据为：1、默认标签(分类排序) 2、自定义标签(热度排序)
+     *                 FIXME 补偿机制均是在缓存中存储热度得分，因此在业务改变之前不要调用该方法
+     *                 category为空，则补偿全部，返回默认标签和自定义标签
      *                 category仅包含"其他"这个分类的Id时，同上
      *                 category不为空且不只有"其他"这个分类的Id时，则返回集合中的类别标签以及自定义标签
      *                 默认标签不按照热度排序，自定义标签按照热度排序
@@ -294,9 +297,11 @@ public class IssueProjectTagDictRedis {
         }
 
         Map<String,List<IssueCategoryTagResultDTO>> result = new HashMap<>();
+        //默认标签：按照分类排序      Mapper返回的查询结果是有序的
         result.put(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME,CollectionUtils.isEmpty(db) ? null : db.stream().filter(o -> !StringUtils.equals(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME,o.getCategoryId())).map(entity -> {
             IssueCategoryTagResultDTO tag = ConvertUtils.sourceToTarget(entity,IssueCategoryTagResultDTO.class);
             tag.setName(entity.getTagName()); return tag;}).collect(Collectors.toList()));
+        //自定义标签：按照热度排序    sorted(Comparator.comparing(IssueProjectTagDictEntity :: getIssueUseCount).reversed())
         result.put(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME,CollectionUtils.isEmpty(db) ? null : db.stream().filter(o -> !StringUtils.equals(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME,o.getCategoryId())).sorted(Comparator.comparing(IssueProjectTagDictEntity :: getIssueUseCount).reversed()).map(entity -> {
             IssueCategoryTagResultDTO tag = ConvertUtils.sourceToTarget(entity,IssueCategoryTagResultDTO.class);
             tag.setName(entity.getTagName());return tag;}).collect(Collectors.toList()));
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectTagDictService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectTagDictService.java
index 089aac5d68..4e37aaf0d0 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectTagDictService.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectTagDictService.java
@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.IssueProjectTagDictDTO;
+import com.epmet.dto.form.TagDifferentSetFormDTO;
 import com.epmet.dto.form.TagListFormDTO;
 import com.epmet.dto.result.TagListResultDTO;
 import com.epmet.entity.IssueProjectTagDictEntity;
@@ -114,4 +115,13 @@ public interface IssueProjectTagDictService extends BaseService<IssueProjectTagD
      * @return java.util.List<com.epmet.entity.IssueProjectTagDictEntity>
      */
     List<IssueProjectTagDictEntity> getTagListByCustomer(String customerId);
+
+    /**
+     * @Description 更新标签热度 数据库/缓存
+     * @param param
+     * @return void
+     * @author wangc
+     * @date 2020.12.11 14:00
+    */
+    void updateTagHeat(TagDifferentSetFormDTO param);
 }
\ No newline at end of file
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 e767bc8113..966fb2ce14 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
@@ -197,5 +197,4 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
             issueProjectTagDictService.insertBatch(tagList);
         }
     }
-
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
index f2acf15e3c..2b7ced90e6 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
@@ -27,6 +27,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.IssueProjectTagDictDao;
 import com.epmet.dto.IssueProjectTagDictDTO;
+import com.epmet.dto.form.TagDifferentSetFormDTO;
 import com.epmet.dto.form.TagListFormDTO;
 import com.epmet.dto.result.IssueCategoryTagResultDTO;
 import com.epmet.dto.result.TagListResultDTO;
@@ -137,4 +138,16 @@ public class IssueProjectTagDictServiceImpl extends BaseServiceImpl<IssueProject
         return baseDao.selectTagListByCustomer(customerId);
     }
 
+    /**
+     * @Description 更新标签热度 数据库/缓存
+     * @param param
+     * @return void
+     * @author wangc
+     * @date 2020.12.11 14:00
+     */
+    @Override
+    public void updateTagHeat(TagDifferentSetFormDTO param) {
+
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectTagHookFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectTagHookFormDTO.java
new file mode 100644
index 0000000000..983dec0c1a
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectTagHookFormDTO.java
@@ -0,0 +1,43 @@
+package com.epmet.dto.form;
+
+import com.epmet.dto.result.ProjectCategoryTagResultDTO;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 项目-标签-钩子入参
+ * @ClassName ProjectTagHookFormDTO
+ * @Auth wangc
+ * @Date 2020-12-11 11:02
+ */
+@Data
+public class ProjectTagHookFormDTO implements Serializable {
+    private static final long serialVersionUID = 1432932825980640139L;
+
+    /**
+     * 项目Id
+     */
+    @NotBlank(message = "项目Id不能为空")
+    private String projectId;
+
+    /**
+     * 标签列表  标签Id  标签Name
+     * 为空表示清除项目的标签信息
+     */
+    private List<ProjectCategoryTagResultDTO> tagList;
+
+    /**
+     * 客户Id，从token中获取
+     */
+    @NotBlank(message = "客户Id不能为空")
+    private String customerId;
+
+    /**
+     * 工作人员Id，从token中获取
+     */
+    @NotBlank(message = "工作人员Id不能为空")
+    private String staffId;
+}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTagsController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTagsController.java
index 01ab68f1b9..80fad9fab5 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTagsController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTagsController.java
@@ -17,7 +17,9 @@
 
 package com.epmet.controller;
 
+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;
@@ -26,6 +28,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.ProjectTagsDTO;
+import com.epmet.dto.form.ProjectTagHookFormDTO;
 import com.epmet.excel.ProjectTagsExcel;
 import com.epmet.service.ProjectTagsService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,11 +64,13 @@ public class ProjectTagsController {
         return new Result<ProjectTagsDTO>().ok(data);
     }
 
-    @PostMapping
-    public Result save(@RequestBody ProjectTagsDTO dto){
+    @PostMapping("save")
+    public Result save(@RequestBody ProjectTagHookFormDTO dto, @LoginUser TokenDto token){
+        dto.setCustomerId(token.getCustomerId());
+        dto.setStaffId(token.getUserId());
         //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        projectTagsService.save(dto);
+        ValidatorUtils.validateEntity(dto);
+        projectTagsService.saveDifferentSet(dto);
         return new Result();
     }
 
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectTagsDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectTagsDao.java
index da5b1d39c9..6c72f46614 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectTagsDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectTagsDao.java
@@ -39,4 +39,22 @@ public interface ProjectTagsDao extends BaseDao<ProjectTagsEntity> {
      * @Author sun
      **/
     List<ProjectCategoryTagResultDTO> selectProjectTagList(@Param("projectId") String projectId);
+
+    /**
+     * @Description 删除项目的标签
+     * @param projectId
+     * @return void
+     * @author wangc
+     * @date 2020.12.11 13:26
+    */
+    void deleteProjectTags(@Param("projectId") String projectId);
+
+    /**
+     * @Description 批量插入
+     * @param list
+     * @return void
+     * @author wangc
+     * @date 2020.12.11 13:39
+    */
+    void insertBatch(@Param("list")List<ProjectTagsEntity> list);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectTagsService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectTagsService.java
index d281c2100e..a16e725bec 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectTagsService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectTagsService.java
@@ -20,6 +20,7 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.ProjectTagsDTO;
+import com.epmet.dto.form.ProjectTagHookFormDTO;
 import com.epmet.entity.ProjectTagsEntity;
 
 import java.util.List;
@@ -92,4 +93,14 @@ public interface ProjectTagsService extends BaseService<ProjectTagsEntity> {
      * @date 2020-12-08
      */
     void delete(String[] ids);
+
+    /**
+     * @Description 修改项目于标签的绑定关系并对标签的引用量做出相应调整
+     *              saveDifferentSet :: 保存差集
+     * @param param
+     * @return void
+     * @author wangc
+     * @date 2020.12.11 11:10
+    */
+    void saveDifferentSet(ProjectTagHookFormDTO param);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTagsServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTagsServiceImpl.java
index 4d4f135b6e..4154c9bd24 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTagsServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTagsServiceImpl.java
@@ -20,22 +20,30 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.ProjectTagsDao;
 import com.epmet.dto.ProjectTagsDTO;
+import com.epmet.dto.form.ProjectTagHookFormDTO;
+import com.epmet.dto.form.TagDifferentSetFormDTO;
+import com.epmet.dto.result.ProjectCategoryTagResultDTO;
 import com.epmet.entity.ProjectTagsEntity;
+import com.epmet.feign.GovIssueOpenFeignClient;
 import com.epmet.redis.ProjectTagsRedis;
 import com.epmet.service.ProjectTagsService;
 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.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 项目关联标签表
@@ -49,6 +57,9 @@ public class ProjectTagsServiceImpl extends BaseServiceImpl<ProjectTagsDao, Proj
     @Autowired
     private ProjectTagsRedis projectTagsRedis;
 
+    @Autowired
+    private GovIssueOpenFeignClient issueClient;
+
     @Override
     public PageData<ProjectTagsDTO> page(Map<String, Object> params) {
         IPage<ProjectTagsEntity> page = baseDao.selectPage(
@@ -101,4 +112,41 @@ public class ProjectTagsServiceImpl extends BaseServiceImpl<ProjectTagsDao, Proj
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @Description 修改项目于标签的绑定关系并对标签的引用量做出相应调整
+     *              saveDifferentSet :: 保存差集
+     * @param param
+     * @return void
+     * @author wangc
+     * @date 2020.12.11 11:10
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveDifferentSet(ProjectTagHookFormDTO param) {
+        //原始
+        List<ProjectCategoryTagResultDTO> orientHooks = baseDao.selectProjectTagList(param.getProjectId());
+        //新增
+        List<ProjectCategoryTagResultDTO> newHooks = param.getTagList();
+        if(!CollectionUtils.isEmpty(orientHooks)) baseDao.deleteProjectTags(param.getProjectId());
+        if(!CollectionUtils.isEmpty(newHooks)){
+            baseDao.insertBatch(newHooks.stream().map(o->{
+                ProjectTagsEntity hook = ConvertUtils.sourceToTarget(param,ProjectTagsEntity.class);hook.setTagId(o.getId());hook.setTagName(o.getName());hook.setCreatedBy(param.getStaffId());return hook;
+            }).collect(Collectors.toList()));
+        }
+
+        List<String> orientIds = CollectionUtils.isEmpty(orientHooks) ? null : orientHooks.stream().map(ProjectCategoryTagResultDTO :: getId).collect(Collectors.toList());
+        List<String> newIds = CollectionUtils.isEmpty(newHooks) ? null : newHooks.stream().map(ProjectCategoryTagResultDTO::getId).collect(Collectors.toList());
+        TagDifferentSetFormDTO differentSet = ConvertUtils.sourceToTarget(param,TagDifferentSetFormDTO.class);
+        differentSet.setUserId(param.getStaffId());
+        if(null == orientIds && null == newIds) return ;
+        if(null != orientIds && null == newIds) differentSet.setMinus(orientIds);
+        if(null == orientIds && null != newIds) differentSet.setPlus(newIds);
+        if(null != orientIds && null != newIds){
+            differentSet.setPlus(newIds.removeAll(orientIds) ? newIds : null);
+            differentSet.setMinus(orientIds.removeAll(newIds) ? orientIds : null);
+        }
+        Result result = issueClient.updateCitations(differentSet);
+        if(!result.success()) throw new RenException(result.getInternalMsg());
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectTagsDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectTagsDao.xml
index 0936bcc4d4..bf3fc03e65 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectTagsDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectTagsDao.xml
@@ -16,4 +16,42 @@
             created_time ASC
     </select>
 
+    <!-- 删除项目的标签 -->
+    <delete id="deleteProjectTags">
+        delete from project_tags
+        where del_flag = '0'
+        and project_id = #{projectId}
+    </delete>
+
+    <insert id="insertBatch" parameterType="java.util.List">
+        INSERT INTO project_tags
+        (
+        ID,
+        CUSTOMER_ID,
+        PROJECT_ID,
+        TAG_ID,
+        TAG_NAME,
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME
+        ) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            (SELECT REPLACE(UUID(), '-', '') AS id),
+            #{item.customerId},
+            #{item.projectId},
+            #{item.tagId},
+            #{item.tagName},
+            0,
+            0,
+            #{item.createdBy},
+            now(),
+            #{item.createdBy},
+            now()
+            )
+        </foreach>
+    </insert>
 </mapper>
\ No newline at end of file

From 97c0a2a8ab0ef08c9ded3899d381312f170f111a Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Fri, 11 Dec 2020 14:57:19 +0800
Subject: [PATCH 040/119] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E8=BD=AC=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE-=E5=88=86=E7=B1=BB=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/controller/IssueManageController.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java
index 3887b48938..b0e7af6b86 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java
@@ -180,7 +180,7 @@ public class IssueManageController {
     public Result shiftProjectV2(@LoginUser TokenDto tokenDTO, @RequestBody ShiftProjectFormDTO formDTO) {
         formDTO.setStaffId(tokenDTO.getUserId());
         ValidatorUtils.validateEntity(formDTO);
-        issueService.shiftProject(formDTO);
+        issueService.shiftProjectV2(formDTO);
         return new Result();
     }
 

From eb4a2401b568d0cac9f8490002f2ad3d546fb1ed Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 11 Dec 2020 15:08:30 +0800
Subject: [PATCH 041/119] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IssueCategoryDao.xml             | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
index 9844127300..e3713438a4 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
@@ -4,12 +4,13 @@
 <mapper namespace="com.epmet.dao.IssueCategoryDao">
 
     <select id="selectIssueCategoryList" resultType="com.epmet.dto.result.IssueCategoryTagResultDTO">
-        SELECT
+        SELECT DISTINCT
             ic.category_id AS "id",
             ip.category_name AS "name"
         FROM
             issue_category ic
         INNER JOIN issue_project_category_dict ip ON ic.category_id = ip.id
+        AND ic.customer_id = ip.customer_id
         WHERE
             ic.del_flag = '0'
         AND ip.del_flag = '0'

From 405e30dc9fbb844c40d61b635bb9257dd4d20c66 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 11 Dec 2020 16:11:14 +0800
Subject: [PATCH 042/119] =?UTF-8?q?=E9=94=99=E9=A2=98=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/feign/GovIssueOpenFeignClient.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 5987bcacca..1bc5ac3e14 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
@@ -34,8 +34,8 @@ import java.util.Map;
  * @author yinzuomei@elink-cn.com
  * @date 2020/6/4 13:37
  */
-//@FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallback = GovIssueOpenFeignClientFallBack.class)
-@FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallback = GovIssueOpenFeignClientFallBack.class,url = "localhost:8101")
+@FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallback = GovIssueOpenFeignClientFallBack.class)
+//@FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallback = GovIssueOpenFeignClientFallBack.class,url = "localhost:8101")
 public interface GovIssueOpenFeignClient {
 
     /**

From f9a2d2423901ab6aad18d88fa25d3943423aea84 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Fri, 11 Dec 2020 17:01:09 +0800
Subject: [PATCH 043/119] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=EF=BC=8C=E7=BC=93=E5=AD=98=E7=9A=84=E8=A1=A5=E5=81=BF=E6=9C=BA?=
 =?UTF-8?q?=E5=88=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/redis/IssueProjectTagDictRedis.java  | 14 ++++++++------
 .../resources/mapper/IssueProjectTagDictDao.xml    |  1 +
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
index cabdeca377..94452e8b00 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
@@ -27,7 +27,6 @@ import com.epmet.dto.result.IssueCategoryTagResultDTO;
 import com.epmet.entity.IssueProjectCategoryDictEntity;
 import com.epmet.entity.IssueProjectTagDictEntity;
 import com.epmet.utils.ModuleConstants;
-import com.fasterxml.jackson.databind.Module;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
@@ -107,14 +106,14 @@ public class IssueProjectTagDictRedis {
 
 
         //如果keys集合为空，说明缓存中没有当前客户的标签排行信息，直接进行补偿
-            Set<ZSetOperations.TypedTuple<Object>> customizedTuples = redisUtils.zReverseRangeWithScores(GovIssueRedisKeys.getGovernmentTagKey(customerId, null), NumConstant.ZERO_L, (long) (NumConstant.ONE_NEG));
+            Set<ZSetOperations.TypedTuple<Object>> customizedTuples = redisUtils.zReverseRangeWithScores(GovIssueRedisKeys.getGovernmentTagKey(customerId, ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME), NumConstant.ZERO_L, (long) (NumConstant.ONE_NEG));
             if(!CollectionUtils.isEmpty(customizedTuples)){
                 Map<Double, List<IssueCategoryTagResultDTO>> customizedHeatMap = new HashMap<>();
                 customizedTuples.forEach(tuple -> {
-                    List<IssueCategoryTagResultDTO> queue = customizedHeatMap.get(tuple.getValue());
+                    List<IssueCategoryTagResultDTO> queue = customizedHeatMap.get(tuple.getScore());
                     if((CollectionUtils.isEmpty(queue))) queue = new LinkedList<>();
                     queue.add(parseObject(tuple.getValue(), IssueCategoryTagResultDTO.class));
-                    customizedHeatMap.put((Double) tuple.getValue(),queue);
+                    customizedHeatMap.put(tuple.getScore(),queue);
                 });
                 List<IssueCategoryTagResultDTO> customizedResult = new LinkedList<>();
                 customizedHeatMap.keySet().stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList()).forEach(count -> {
@@ -123,7 +122,10 @@ public class IssueProjectTagDictRedis {
                 result.put(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME,customizedResult);
             }
 
-            if(!CollectionUtils.isEmpty(result))
+            //默认、自定义标签，只要有一个是空就触发补偿
+            //不信任缓存数据
+            if(!CollectionUtils.isEmpty(result) && !CollectionUtils.isEmpty(result.get(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME))
+                && !CollectionUtils.isEmpty(result.get(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME)))
             return result;
 
 
@@ -285,7 +287,7 @@ public class IssueProjectTagDictRedis {
                 fulfilled.forEach((redisKey, map) -> {
                     map.forEach((score,list) -> {
                         list.forEach(factor -> {
-                            connection.zSetCommands().zAdd(redisTemplate.getValueSerializer().serialize(redisKey),
+                            connection.zSetCommands().zAdd(redisTemplate.getKeySerializer().serialize(redisKey),
                                     score.doubleValue(),
                                     redisTemplate.getValueSerializer().serialize(factor));
                         });
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
index 8ed29444c2..fb36c15a15 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
@@ -78,6 +78,7 @@
             (IFNULL(tag.ISSUE_USE_COUNT,0) + IFNULL(tag.PROJECT_USE_COUNT,0)) AS issueUseCount
         FROM
             ISSUE_PROJECT_TAG_DICT tag LEFT JOIN ISSUE_PROJECT_CATEGORY_DICT type ON tag.CATEGORY_ID = type.ID
+            AND type.CUSTOMER_ID = #{customerId}
         WHERE
             tag.DEL_FLAG = '0'
             AND tag.CUSTOMER_ID = #{customerId}

From dd613eed12a51c593021fec0b05af8e755be75d6 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 14 Dec 2020 09:30:04 +0800
Subject: [PATCH 044/119] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/redis/IssueProjectTagDictRedis.java   | 4 +++-
 .../java/com/epmet/service/impl/IssueTagsServiceImpl.java     | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
index 94452e8b00..944b347b1e 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
@@ -327,7 +327,9 @@ public class IssueProjectTagDictRedis {
         }
         if (status.equals(NumConstant.ONE_STR)){
             //标签使用次数-1
-            if (null != redisUtils.getScore(key,formDTO) && redisUtils.getScore(key,formDTO)>NumConstant.ZERO){
+            Double score = redisUtils.getScore(key, formDTO);
+            // 避免score为负数
+            if (null != score && score > NumConstant.ZERO){
                 redisUtils.zIncrementScore(key, formDTO,NumConstant.ONE_NEG);
             }
         }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
index 9598d00fbc..4cc9b404e8 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
@@ -177,6 +177,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
     @Transactional(rollbackFor = Exception.class)
     public void issueTagSave(IssueTagsSaveFormDTO form, TokenDto tokenDto) {
         String customerId = tokenDto.getCustomerId();
+        // 根据议题ID查询此议题原来有哪些标签
         List<IssueTagFormDTO> tags = baseDao.selectTagsByIssueId(form.getIssueId());
         if (CollectionUtils.isEmpty(form.getTagList())){
             // 清空此议题的标签

From f1e6f33ee329712ba242867ba77519d81c97fc82 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 14 Dec 2020 10:07:19 +0800
Subject: [PATCH 045/119] =?UTF-8?q?=E5=88=86=E7=B1=BB=E8=A1=A8=E8=81=94?=
 =?UTF-8?q?=E5=90=88=E4=B8=BB=E9=94=AE=E5=BC=95=E8=B5=B7=E7=9A=84=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/feign/GovIssueOpenFeignClient.java     |  2 +-
 .../fallback/GovIssueOpenFeignClientFallBack.java    |  4 ++--
 .../epmet/controller/IssueCategoryController.java    |  7 ++++---
 .../main/java/com/epmet/dao/IssueCategoryDao.java    |  6 +++---
 .../java/com/epmet/service/IssueCategoryService.java |  5 +++--
 .../epmet/service/impl/IssueCategoryServiceImpl.java |  7 ++++---
 .../src/main/resources/mapper/IssueCategoryDao.xml   |  3 ++-
 .../dto/form/ProjectCategoryTagListFormDTO.java      | 12 +++++++++++-
 .../epmet/controller/ProjectCategoryController.java  |  5 ++++-
 .../service/impl/ProjectCategoryServiceImpl.java     |  3 ++-
 10 files changed, 36 insertions(+), 18 deletions(-)

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 1bc5ac3e14..283207c1b5 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
@@ -215,7 +215,7 @@ public interface GovIssueOpenFeignClient {
 	 * @author sun
 	 **/
 	@PostMapping(value = "/gov/issue/issuecategory/projectcategorylist")
-	Result<List<ProjectCategoryTagResultDTO>> projectCategoryList(@RequestBody List<String> categoryIdList);
+	Result<List<ProjectCategoryTagResultDTO>> projectCategoryList(@RequestBody ProjectCategoryTagListFormDTO formDTO);
 
 	/**
 	 * @description 查询项目所属客户和所属网格信息以及分类对应的分类信息
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 537b7d3265..3eacd247d8 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
@@ -199,8 +199,8 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient
 	 * @author sun
 	 **/
 	@Override
-	public Result<List<ProjectCategoryTagResultDTO>> projectCategoryList(List<String> categoryIdList) {
-		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "projectCategoryList", categoryIdList);
+	public Result<List<ProjectCategoryTagResultDTO>> projectCategoryList(ProjectCategoryTagListFormDTO formDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "projectCategoryList", formDTO);
 	}
 
 	/**
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 bfd770a5ff..f8755d1037 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
@@ -30,6 +30,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IssueCategoryDTO;
 import com.epmet.dto.form.IssueCategoryTagListFormDTO;
 import com.epmet.dto.form.IssueSaveCategoryFormDTO;
+import com.epmet.dto.form.ProjectCategoryTagListFormDTO;
 import com.epmet.dto.result.IssueCategoryTagListResultDTO;
 import com.epmet.dto.result.ProjectCategoryTagResultDTO;
 import com.epmet.excel.IssueCategoryExcel;
@@ -110,14 +111,14 @@ public class IssueCategoryController {
     }
 
     /**
-     * @param categoryIdList
+     * @param formDTO
      * @return
      * @Description 查询分类Id集合对应的分类名称，按分类升序排列
      * @Author sun
      **/
     @PostMapping("projectcategorylist")
-    public Result<List<ProjectCategoryTagResultDTO>> projectCategoryList(@RequestBody List<String> categoryIdList) {
-        return new Result<List<ProjectCategoryTagResultDTO>>().ok(issueCategoryService.projectCategoryList(categoryIdList));
+    public Result<List<ProjectCategoryTagResultDTO>> projectCategoryList(@RequestBody ProjectCategoryTagListFormDTO formDTO) {
+        return new Result<List<ProjectCategoryTagResultDTO>>().ok(issueCategoryService.projectCategoryList(formDTO));
     }
 
     /**
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
index 0d88504d4c..c263ec1ddb 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
@@ -19,6 +19,7 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.IssueCategoryDTO;
+import com.epmet.dto.form.ProjectCategoryTagListFormDTO;
 import com.epmet.dto.result.IssueCategoryTagResultDTO;
 import com.epmet.dto.result.ProjectCategoryTagResultDTO;
 import com.epmet.entity.IssueCategoryEntity;
@@ -43,13 +44,12 @@ public interface IssueCategoryDao extends BaseDao<IssueCategoryEntity> {
     List<IssueCategoryTagResultDTO> selectIssueCategoryList(@Param("issueId") String issueId);
 
     /**
-     * @param categoryIdList
+     * @param formDTO
      * @return
      * @Description 查询分类Id对应的分类名称，按分类升序排列
      * @Author sun
      **/
-    List<ProjectCategoryTagResultDTO> selectProjectCategoryList(@Param("categoryIdList") List<String> categoryIdList);
-//    List<ProjectCategoryTagResultDTO> selectProjectCategoryList(List<String> categoryIdList);
+    List<ProjectCategoryTagResultDTO> selectProjectCategoryList(ProjectCategoryTagListFormDTO formDTO);
 
     /**
      * 获取议题分类
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCategoryService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCategoryService.java
index 3f051a29ff..5717b27db0 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCategoryService.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCategoryService.java
@@ -22,6 +22,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IssueCategoryDTO;
 import com.epmet.dto.form.IssueCategoryTagListFormDTO;
 import com.epmet.dto.form.IssueSaveCategoryFormDTO;
+import com.epmet.dto.form.ProjectCategoryTagListFormDTO;
 import com.epmet.dto.result.IssueCategoryTagListResultDTO;
 import com.epmet.dto.result.ProjectCategoryTagResultDTO;
 import com.epmet.entity.IssueCategoryEntity;
@@ -106,12 +107,12 @@ public interface IssueCategoryService extends BaseService<IssueCategoryEntity> {
     IssueCategoryTagListResultDTO categoryTagList(IssueCategoryTagListFormDTO formDTO);
 
     /**
-     * @param categoryIdList
+     * @param formDTO
      * @return
      * @Description 查询分类Id集合对应的分类名称，按分类升序排列
      * @Author sun
      **/
-    List<ProjectCategoryTagResultDTO> projectCategoryList(List<String> categoryIdList);
+    List<ProjectCategoryTagResultDTO> projectCategoryList(ProjectCategoryTagListFormDTO 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 f806f28032..85d52737da 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
@@ -31,6 +31,7 @@ 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.result.IssueCategoryTagListResultDTO;
 import com.epmet.dto.result.IssueCategoryTagResultDTO;
@@ -145,14 +146,14 @@ public class IssueCategoryServiceImpl extends BaseServiceImpl<IssueCategoryDao,
     }
 
     /**
-     * @param categoryIdList
+     * @param formDTO
      * @return
      * @Description 查询分类Id集合对应的分类名称，按分类升序排列
      * @Author sun
      **/
     @Override
-    public List<ProjectCategoryTagResultDTO> projectCategoryList(List<String> categoryIdList) {
-        return baseDao.selectProjectCategoryList(categoryIdList);
+    public List<ProjectCategoryTagResultDTO> projectCategoryList(ProjectCategoryTagListFormDTO formDTO) {
+        return baseDao.selectProjectCategoryList(formDTO);
     }
 
     /**
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
index e3713438a4..93c51604f7 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
@@ -20,13 +20,14 @@
     </select>
 
     <select id="selectProjectCategoryList" resultType="com.epmet.dto.result.ProjectCategoryTagResultDTO">
-         SELECT
+        SELECT
             id AS "id",
             category_name AS "name"
         FROM
             issue_project_category_dict
         WHERE
             del_flag = '0'
+        AND customer_id = #{customerId}
         <if test="categoryIdList != null and categoryIdList.size() > 0">
             <foreach collection="categoryIdList" item="id" open="AND(  " separator=" OR " index="index" close=")">
                 id = #{id}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectCategoryTagListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectCategoryTagListFormDTO.java
index 9c179732ac..34b2543486 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectCategoryTagListFormDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectCategoryTagListFormDTO.java
@@ -4,6 +4,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 获取议题的分类、标签列表-接口入参
@@ -13,10 +14,19 @@ import java.io.Serializable;
 public class ProjectCategoryTagListFormDTO implements Serializable {
 
     private static final long serialVersionUID = 2599592072265715951L;
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
     @NotBlank(message = "议题ID不能为空",groups = {ProjectCategoryTagListFormDTO.CategoryTag.class})
     private String projectId;
-
+    /**
+     * 分类Id
+     */
+    private List<String> categoryIdList;
     public interface CategoryTag{}
 
 
+
 }
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 f9c6b2acda..c47fb0ea4c 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
@@ -17,9 +17,11 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
 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;
@@ -103,8 +105,9 @@ public class ProjectCategoryController {
      * @Author sun
      **/
     @PostMapping("categorytaglist")
-    public Result<ProjectCategoryTagListResultDTO> categoryTagList(@RequestBody ProjectCategoryTagListFormDTO formDTO) {
+    public Result<ProjectCategoryTagListResultDTO> categoryTagList(@LoginUser TokenDto tokenDto, @RequestBody ProjectCategoryTagListFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, ProjectCategoryTagListFormDTO.CategoryTag.class);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
         return new Result<ProjectCategoryTagListResultDTO>().ok(projectCategoryService.categoryTagList(formDTO));
     }
 
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 8cb2ec5a0b..2db7977d67 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
@@ -127,7 +127,8 @@ public class ProjectCategoryServiceImpl extends BaseServiceImpl<ProjectCategoryD
         List<String> categoryIdList = baseDao.selectProjectCategoryIdList(formDTO.getProjectId());
         if (categoryIdList.size() > NumConstant.ZERO) {
             //1-1.调用issue库，查询分类Id对应的分类名称，按分类升序排列
-            Result<List<ProjectCategoryTagResultDTO>> result = govIssueOpenFeignClient.projectCategoryList(categoryIdList);
+            formDTO.setCategoryIdList(categoryIdList);
+            Result<List<ProjectCategoryTagResultDTO>> result = govIssueOpenFeignClient.projectCategoryList(formDTO);
             if (!result.success()) {
                 throw new RenException(result.getInternalMsg());
             }

From e454251fcf8d0e9df6b02bbe80c1166cf970733e Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Mon, 14 Dec 2020 13:41:05 +0800
Subject: [PATCH 046/119] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dao/IssueProjectTagDictDao.java | 21 ++++++++
 .../epmet/redis/IssueProjectTagDictRedis.java | 21 ++++++++
 .../impl/IssueProjectTagDictServiceImpl.java  | 52 +++++++++++++++++++
 .../mapper/IssueProjectTagDictDao.xml         | 31 +++++++++++
 4 files changed, 125 insertions(+)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java
index 3da76c1ca6..2d14833f4a 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java
@@ -44,6 +44,17 @@ public interface IssueProjectTagDictDao extends BaseDao<IssueProjectTagDictEntit
      */
     void updateTagsUseCount(@Param("tags") List<IssueTagFormDTO> tags,@Param("customerId")String customerId,@Param("status")String status);
 
+    /**
+     * @Description 更新标签使用次数
+     * @param tagIds
+     * @param customerId
+     * @param score
+     * @return void
+     * @author wangc
+     * @date 2020.12.14 09:33
+    */
+    void updateTagUsage(@Param("tagIds") List<String> tagIds,@Param("customerId")String customerId,@Param("score") Integer score);
+
     /**
      * @Description  查询标签ID
      * @Param newTags
@@ -81,4 +92,14 @@ public interface IssueProjectTagDictDao extends BaseDao<IssueProjectTagDictEntit
      * @date 2020.12.10 10:07
     */
     List<IssueProjectTagDictEntity> selectTagByCategory(@Param("categories") List<String> categories,@Param("customerId") String customerId,@Param("isDefault")String isDefault);
+
+    /**
+     * @Description 根据客户Id和标签Id集合查询标签的基础信息(标签名、标签码，标签所属分类)
+     * @param customerId
+     * @param tagIds
+     * @return java.util.List<com.epmet.entity.IssueProjectTagDictEntity>
+     * @author wangc
+     * @date 2020.12.13 14:23
+    */
+    List<IssueProjectTagDictEntity> selectTagsByCustomerIdAndTagIds(@Param("customerId") String customerId,@Param("tagIds")List<String> tagIds);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
index 944b347b1e..8494a00ec7 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
@@ -39,6 +39,7 @@ import org.springframework.data.redis.core.ZSetOperations;
 import org.springframework.lang.Nullable;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
+import sun.security.krb5.internal.PAData;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -348,6 +349,26 @@ public class IssueProjectTagDictRedis {
         redisUtils.zSetAdd(key,o);
     }
 
+    public void batchIncrScore(Map<String,Map<String,List<IssueCategoryTagResultDTO>>> param){
+        if(CollectionUtils.isEmpty(param)) return;
+        redisTemplate.executePipelined((RedisCallback) connection -> {
+            param.forEach((operation,map) -> {
+                if(!CollectionUtils.isEmpty(map)){
+                    map.forEach((key,list) -> {
+                        if(!CollectionUtils.isEmpty(list)){
+                           list.forEach(obj -> {
+                               connection.zSetCommands().zIncrBy(redisTemplate.getKeySerializer().serialize(key),
+                                       StringUtils.equals(NumConstant.ONE_STR,operation) ? 1d : -1d ,
+                               redisTemplate.getValueSerializer().serialize(obj));
+                           });
+                        }
+                    });
+                }
+            });
+            return null;
+        });
+    }
+
     public <T> T parseObject(Object o,Class<T> clazz){
         ObjectMapper objectMapper = new ObjectMapper();
         T t = objectMapper.convertValue(o, clazz);
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
index d325b96b79..2fe298a91a 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
@@ -25,11 +25,13 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.constant.GovIssueRedisKeys;
 import com.epmet.dao.IssueProjectTagDictDao;
 import com.epmet.dto.IssueProjectTagDictDTO;
 import com.epmet.dto.form.TagDifferentSetFormDTO;
 import com.epmet.dto.form.TagListFormDTO;
 import com.epmet.dto.result.IssueCategoryTagResultDTO;
+import com.epmet.dto.result.IssueProjectTagsResultDTO;
 import com.epmet.dto.result.TagListResultDTO;
 import com.epmet.entity.IssueProjectTagDictEntity;
 import com.epmet.redis.IssueProjectTagDictRedis;
@@ -152,8 +154,58 @@ public class IssueProjectTagDictServiceImpl extends BaseServiceImpl<IssueProject
      * @date 2020.12.11 14:00
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void updateTagHeat(TagDifferentSetFormDTO param) {
+        //key   :   1(plus)      0(minus)
+        //value :   {
+        //              key     :    redisKey
+        //              value   :    List<Obj>
+        // }
+        Map<String,Map<String,List<IssueCategoryTagResultDTO>>> redisParam = new HashMap<>();
+
+        if(CollectionUtils.isNotEmpty(param.getMinus())){
+            List<IssueProjectTagDictEntity> tags = baseDao.selectTagsByCustomerIdAndTagIds(param.getCustomerId(),param.getMinus());
+            if(CollectionUtils.isNotEmpty(tags)){
+                Map<String,List<IssueCategoryTagResultDTO>> value = new HashMap<>();
+                tags.forEach(tag -> {
+                    String redisKey = GovIssueRedisKeys.getGovernmentTagKey(param.getCustomerId(),tag.getCategoryId());
+                    IssueCategoryTagResultDTO cache = new IssueCategoryTagResultDTO();
+                    cache.setId(tag.getId());cache.setName(tag.getTagName());
+                    if(CollectionUtils.isNotEmpty(value.get(redisKey))){
+                        value.get(redisKey).add(cache);
+                    }else{
+                        List<IssueCategoryTagResultDTO> list = new LinkedList<>();
+                        list.add(cache);
+                        value.put(redisKey,list);
+                    }
+                });
+                if(!value.isEmpty()) redisParam.put(NumConstant.ZERO_STR,value);
+                baseDao.updateTagUsage(param.getMinus(),param.getCustomerId(),NumConstant.ONE_NEG);
+            }
+        }
+
+        if(CollectionUtils.isNotEmpty(param.getPlus())){
+            List<IssueProjectTagDictEntity> tags = baseDao.selectTagsByCustomerIdAndTagIds(param.getCustomerId(),param.getPlus());
+            if(CollectionUtils.isNotEmpty(tags)){
+                Map<String,List<IssueCategoryTagResultDTO>> value = new HashMap<>();
+                tags.forEach(tag -> {
+                    String redisKey = GovIssueRedisKeys.getGovernmentTagKey(param.getCustomerId(),tag.getCategoryId());
+                    IssueCategoryTagResultDTO cache = new IssueCategoryTagResultDTO();
+                    cache.setId(tag.getId());cache.setName(tag.getTagName());
+                    if(CollectionUtils.isNotEmpty(value.get(redisKey))){
+                        value.get(redisKey).add(cache);
+                    }else{
+                        List<IssueCategoryTagResultDTO> list = new LinkedList<>();
+                        list.add(cache);
+                        value.put(redisKey,list);
+                    }
+                });
+                if(!value.isEmpty()) redisParam.put(NumConstant.ONE_STR,value);
+                baseDao.updateTagUsage(param.getPlus(),param.getCustomerId(),NumConstant.ONE);
+            }
+        }
 
+        issueProjectTagDictRedis.batchIncrScore(redisParam);
     }
 
 }
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
index fb36c15a15..ec80fe2af3 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
@@ -21,6 +21,22 @@
         </where>
     </update>
 
+    <update id="updateTagUsage">
+        UPDATE issue_project_tag_dict
+            SET issue_use_count = (CASE
+            WHEN issue_use_count IS NULL THEN IF(#{score} > 0 ,#{score} ,0)
+            WHEN issue_use_count <![CDATA[<]]> 0 THEN 0
+            ELSE issue_use_count + #{score} END)
+        <where>
+            del_flag = 0
+            AND
+            customer_id = #{customerId}
+            <foreach collection="tagIds" item="tagId" open=" AND ( " separator=" OR " close=" ) ">
+                id = #{tagId}
+            </foreach>
+        </where>
+    </update>
+
     <!-- 查询标签ID -->
     <select id="selectTagId" resultType="com.epmet.dto.form.IssueTagFormDTO">
         SELECT ID AS tagId,
@@ -104,4 +120,19 @@
                 ,  CONVERT ( tag.TAG_NAME USING gbk )
     </select>
 
+    <!-- 根据客户Id和标签Id集合查询标签的基础信息(标签名、标签码，标签所属分类) -->
+    <select id="selectTagsByCustomerIdAndTagIds" resultType="com.epmet.entity.IssueProjectTagDictEntity">
+        SELECT
+            *
+        FROM
+           issue_project_tag_dict
+        WHERE
+            del_flag = '0'
+        AND customer_id = #{customerId}
+        <if test="null != tagIds and tagIds.size() > 0">
+            <foreach collection="tagIds" item="tagId" open=" AND (" separator=" OR " close=" )">
+                ID = #{tagId}
+            </foreach>
+        </if>
+    </select>
 </mapper>
\ No newline at end of file

From b77916377d5a92dd45cd251728b0124432296039 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Tue, 15 Dec 2020 09:29:33 +0800
Subject: [PATCH 047/119] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/migration/V0.0.8__add_category_tag.sql | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.8__add_category_tag.sql

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.8__add_category_tag.sql b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.8__add_category_tag.sql
new file mode 100644
index 0000000000..155914a359
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.8__add_category_tag.sql
@@ -0,0 +1,19 @@
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1001', 'default', '车行道、人行道、盲道、无障碍通道、路名牌', '1015', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1002', 'default', '城市桥梁、人形天桥、地下人行通道管理', '1015', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1003', 'default', '道路占掘管理', '1015', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1004', 'default', '排水管理', '1015', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1005', 'default', '停车场管理', '1015', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1006', 'default', '公共事业', '1015', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1007', 'default', '照明路灯及景观灯饰管理', '1015', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1008', 'default', '城市广场管理', '1015', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1009', 'default', '防汛防滑', '1015', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1010', 'default', '清扫保洁', '1016', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1011', 'default', '垃圾收集和转运', '1016', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1012', 'default', '公厕', '1016', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1013', 'default', '病媚生物防治', '1016', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1014', 'default', '行道树、绿篱、绿地等职务养护', '1017', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1015', 'default', '环境管理', '1017', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1016', 'default', '公园管理', '1017', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1017', 'default', '市容秩序管理', '1018', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1018', 'default', '户外广告', '1018', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');
+INSERT INTO `issue_project_tag_dict`(`ID`, `CUSTOMER_ID`, `TAG_NAME`, `CATEGORY_ID`, `IS_DEFAULT`, `ISSUE_USE_COUNT`, `PROJECT_USE_COUNT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1019', 'default', '规划管理', '1018', '0', '0', '0', '0', '0', '1', '2020-08-04 17:40:41', '1', '2020-08-04 17:40:41');

From 6c7d7240b7ad87f9845b97a0268ff8262584abe0 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Tue, 15 Dec 2020 10:52:38 +0800
Subject: [PATCH 048/119] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E8=A1=A5=E5=81=BF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/redis/IssueProjectTagDictRedis.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
index 8494a00ec7..23229851b2 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
@@ -26,6 +26,7 @@ import com.epmet.dao.IssueProjectTagDictDao;
 import com.epmet.dto.result.IssueCategoryTagResultDTO;
 import com.epmet.entity.IssueProjectCategoryDictEntity;
 import com.epmet.entity.IssueProjectTagDictEntity;
+import com.epmet.service.IssueProjectCategoryDictService;
 import com.epmet.utils.ModuleConstants;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
@@ -39,7 +40,6 @@ import org.springframework.data.redis.core.ZSetOperations;
 import org.springframework.lang.Nullable;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
-import sun.security.krb5.internal.PAData;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -61,6 +61,8 @@ public class IssueProjectTagDictRedis {
     private IssueProjectTagDictDao poolDao;
     @Autowired
     private IssueProjectCategoryDictDao categoryDictDao;
+    @Autowired
+    private IssueProjectCategoryDictService categoryDictService;
     public void delete(Object[] ids) {
 
     }
@@ -305,7 +307,7 @@ public class IssueProjectTagDictRedis {
             IssueCategoryTagResultDTO tag = ConvertUtils.sourceToTarget(entity,IssueCategoryTagResultDTO.class);
             tag.setName(entity.getTagName()); return tag;}).collect(Collectors.toList()));
         //自定义标签：按照热度排序    sorted(Comparator.comparing(IssueProjectTagDictEntity :: getIssueUseCount).reversed())
-        result.put(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME,CollectionUtils.isEmpty(db) ? null : db.stream().filter(o -> !StringUtils.equals(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME,o.getCategoryId())).sorted(Comparator.comparing(IssueProjectTagDictEntity :: getIssueUseCount).reversed()).map(entity -> {
+        result.put(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME,CollectionUtils.isEmpty(db) ? null : db.stream().filter(o -> StringUtils.equals(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME,o.getCategoryId())).sorted(Comparator.comparing(IssueProjectTagDictEntity :: getIssueUseCount).reversed()).map(entity -> {
             IssueCategoryTagResultDTO tag = ConvertUtils.sourceToTarget(entity,IssueCategoryTagResultDTO.class);
             tag.setName(entity.getTagName());return tag;}).collect(Collectors.toList()));
         return result;

From bc9002e5a890f328275b2e5ec725039db1b69fd1 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Tue, 15 Dec 2020 15:58:51 +0800
Subject: [PATCH 049/119] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E8=A1=A5=E5=81=BF=E6=9C=BA=E5=88=B6=E9=87=8C?=
 =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=AE=A2=E6=88=B7=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E4=B8=80=E5=A5=97=E8=87=AA=E5=B7=B1=E7=9A=84=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E9=BB=98=E8=AE=A4=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E4=B8=80=E5=A5=97=E6=95=B0=E6=8D=AE=E8=BF=9B=E5=8E=BB?=
 =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E6=94=BE=E5=85=A5=E7=BC=93=E5=AD=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/redis/IssueProjectTagDictRedis.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
index 23229851b2..e95f856aae 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
@@ -23,6 +23,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.constant.GovIssueRedisKeys;
 import com.epmet.dao.IssueProjectCategoryDictDao;
 import com.epmet.dao.IssueProjectTagDictDao;
+import com.epmet.dto.form.CategoryTagInitFormDTO;
 import com.epmet.dto.result.IssueCategoryTagResultDTO;
 import com.epmet.entity.IssueProjectCategoryDictEntity;
 import com.epmet.entity.IssueProjectTagDictEntity;
@@ -264,6 +265,11 @@ public class IssueProjectTagDictRedis {
 
         List<IssueProjectTagDictEntity> db = poolDao.selectTagByCategory(ifOtherOnly || CollectionUtils.isEmpty(category) ? null : category, customerId, null);
 
+        if(CollectionUtils.isEmpty(db) && (ifOtherOnly || CollectionUtils.isEmpty(category))){
+            CategoryTagInitFormDTO customerIdParam = new CategoryTagInitFormDTO(); customerIdParam.setCustomerId(customerId);
+            categoryDictService.init(customerIdParam);
+            db = poolDao.selectTagByCategory(ifOtherOnly || CollectionUtils.isEmpty(category) ? null : category, customerId, null);
+        }
 
         // key      ->      redisKey
         // value    ->      [key : score ; value : object]

From e9ab4e1c65e216f75745cbf6d7573f60ebd02a1e Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Tue, 15 Dec 2020 17:20:53 +0800
Subject: [PATCH 050/119] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E6=97=B6=E5=AF=B9=E4=BA=8E=E7=89=B9=E5=AE=9A?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AF=E5=BC=BA=E5=88=B6=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/redis/IssueProjectTagDictRedis.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
index e95f856aae..7e4d3b456a 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
@@ -18,6 +18,7 @@
 package com.epmet.redis;
 
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.constant.GovIssueRedisKeys;
@@ -93,7 +94,7 @@ public class IssueProjectTagDictRedis {
     public Map<String,List<IssueCategoryTagResultDTO>> getDefaultTagsSortedByCategoryAndCustomizedTagsOrderByRank(String customerId,List<String> category) {
         if (StringUtils.isBlank(customerId)) {
             log.error("customerId can not be null when obtain govern tags.");
-            return null;
+            throw new RenException("customerId can not be null when obtain govern tags.");
         }
 
         IssueProjectCategoryDictEntity otherCategory = categoryDictDao.selectSingleByCustomerIdAndCategoryNameAndCategoryType(customerId, ModuleConstants.CATEGORY_NAME_OTHERS, null);
@@ -139,7 +140,7 @@ public class IssueProjectTagDictRedis {
 
         if (CollectionUtils.isEmpty(compensate)) {
             log.error("compensation failure or there is no tag data in database!!");
-            return null;
+            throw new RenException("compensation failure or there is no tag data in database!!");
         } else {
             log.warn("compensation completed!!");
             return compensate;

From 575a9f19221f37b6b9458b02c96bcc954068b7b7 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 16 Dec 2020 16:46:20 +0800
Subject: [PATCH 051/119] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E3=80=81=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=8E=A5=E5=8F=A3=E6=9F=A5=E8=AF=A2=E5=B7=B2=E6=9C=89?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E7=9A=84?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E5=90=8D=E7=A7=B0=E6=8B=BC=E6=8E=A5=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=80=E7=BA=A7=E5=88=86=E7=B1=BB=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/IssueCategoryDao.xml     | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
index 93c51604f7..6d9b7b80da 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
@@ -9,32 +9,41 @@
             ip.category_name AS "name"
         FROM
             issue_category ic
-        INNER JOIN issue_project_category_dict ip ON ic.category_id = ip.id
+        INNER JOIN (
+            SELECT
+                a.id AS "idd",
+                a.customer_id AS "customer_id",
+                a.sort AS "sort",
+                CONCAT(b.category_name, '-', a.category_name) AS "category_name"
+            FROM issue_project_category_dict a
+            INNER JOIN issue_project_category_dict b ON a.pid = b.id
+        ) ip ON ic.category_id = ip.idd
         AND ic.customer_id = ip.customer_id
         WHERE
             ic.del_flag = '0'
-        AND ip.del_flag = '0'
         AND ic.issue_id = #{issueId}
         ORDER BY
             ip.sort ASC
     </select>
 
     <select id="selectProjectCategoryList" resultType="com.epmet.dto.result.ProjectCategoryTagResultDTO">
-        SELECT
-            id AS "id",
-            category_name AS "name"
+        SELECT DISTINCT
+            ip.id AS "id",
+            CONCAT(cd.category_name,'-',ip.category_name) AS "name"
         FROM
-            issue_project_category_dict
+            issue_project_category_dict ip
+        INNER JOIN issue_project_category_dict cd ON ip.pid = cd.id
         WHERE
-            del_flag = '0'
-        AND customer_id = #{customerId}
+            ip.del_flag = '0'
+        AND cd.DEL_FLAG = '0'
+        AND ip.customer_id = #{customerId}
         <if test="categoryIdList != null and categoryIdList.size() > 0">
             <foreach collection="categoryIdList" item="id" open="AND(  " separator=" OR " index="index" close=")">
-                id = #{id}
+                ip.id = #{id}
             </foreach>
         </if>
         ORDER BY
-            sort ASC
+            ip.sort ASC
     </select>
 
     <select id="selectCategoryByIssue" resultType="com.epmet.dto.IssueCategoryDTO">

From ec5c0da8798704dea0590604e8783cf00d5f760b Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 16 Dec 2020 17:37:01 +0800
Subject: [PATCH 052/119] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IssueCategoryDao.xml            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
index 6d9b7b80da..ef271342d3 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
@@ -23,7 +23,7 @@
             ic.del_flag = '0'
         AND ic.issue_id = #{issueId}
         ORDER BY
-            ip.sort ASC
+            ip.idd ASC
     </select>
 
     <select id="selectProjectCategoryList" resultType="com.epmet.dto.result.ProjectCategoryTagResultDTO">
@@ -43,7 +43,7 @@
             </foreach>
         </if>
         ORDER BY
-            ip.sort ASC
+            ip.id ASC
     </select>
 
     <select id="selectCategoryByIssue" resultType="com.epmet.dto.IssueCategoryDTO">

From 1d16f90d3e437d1dcfdf50f1b4e7697dbcf4d382 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 18 Mar 2021 15:06:39 +0800
Subject: [PATCH 053/119] =?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<SaveIssueCategoryFormDTO> 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<List<IssueProjectCategoryDictDTO>> getCategoryList(@RequestBody List<String> cstegoryIdList) {
-        return new Result<List<IssueProjectCategoryDictDTO>>().ok(issueProjectCategoryDictService.getCategoryList(cstegoryIdList));
+    public Result<List<IssueProjectCategoryDictDTO>> getCategoryList(@RequestBody IssueProjectCategoryDictListFormDTO formDTO) {
+        return new Result<List<IssueProjectCategoryDictDTO>>().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<IssueProjectCategor
     List<IssueProjectCategoryDictEntity> selectCategoryListByCustomer(@Param("customerId") String customerId);
 
     /**
-     * @param cstegoryIdList
+     * @param formDTO
      * @return
      * @Description 批量查询分类信息
      * @Author sun
      **/
-    List<IssueProjectCategoryDictDTO> selectCategoryList(@Param("cstegoryIdList") List<String> cstegoryIdList);
+    List<IssueProjectCategoryDictDTO> 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<IssueProjec
     void init(CategoryTagInitFormDTO formDTO);
 
     /**
-     * @param cstegoryIdList
+     * @param formDTO
      * @return
      * @Description 批量查询分类信息
      * @Author sun
      **/
-    List<IssueProjectCategoryDictDTO> getCategoryList(List<String> cstegoryIdList);
+    List<IssueProjectCategoryDictDTO> 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<IssueCategoryDao,
 
         //2.批量查询分类信息
         List<String> categoryIdList = formDTO.getCategoryList().stream().map(SaveIssueCategoryFormDTO::getId).collect(Collectors.toList());
-        List<IssueProjectCategoryDictDTO> categoryList = issueProjectCategoryDictService.getCategoryList(categoryIdList);
+        IssueProjectCategoryDictListFormDTO dictDto = new IssueProjectCategoryDictListFormDTO();
+        dictDto.setCustomerId(formDTO.getCustomerId());
+        dictDto.setCstegoryIdList(categoryIdList);
+        List<IssueProjectCategoryDictDTO> 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<IssuePr
     }
 
     /**
-     * @param cstegoryIdList
+     * @param formDTO
      * @return
      * @Description 批量查询分类信息
      * @Author sun
      **/
     @Override
-    public List<IssueProjectCategoryDictDTO> getCategoryList(List<String> cstegoryIdList) {
-        return baseDao.selectCategoryList(cstegoryIdList);
+    public List<IssueProjectCategoryDictDTO> getCategoryList(IssueProjectCategoryDictListFormDTO formDTO) {
+        return baseDao.selectCategoryList(formDTO);
     }
 
     /**
@@ -160,7 +161,10 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
         resultDTO.setIssueDTO(issueDTO);
         //2.批量查询分类信息
         List<String> categoryIdList = formDTO.getCategoryList().stream().map(SaveIssueCategoryFormDTO::getId).collect(Collectors.toList());
-        List<IssueProjectCategoryDictDTO> categoryList = getCategoryList(categoryIdList);
+        IssueProjectCategoryDictListFormDTO dictDto = new IssueProjectCategoryDictListFormDTO();
+        dictDto.setCustomerId(formDTO.getCustomerId());
+        dictDto.setCstegoryIdList(categoryIdList);
+        List<IssueProjectCategoryDictDTO> 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}
         <if test="cstegoryIdList != null and cstegoryIdList.size() > 0">
             <foreach collection="cstegoryIdList" item="id" open="AND(  " separator=" OR " index="index" close=")">
                 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<String> 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<SaveIssueCategoryFormDTO> 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 <crystal_jupiter@163.com>
Date: Fri, 19 Mar 2021 10:13:25 +0800
Subject: [PATCH 054/119] =?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<IssueVoteStatisticalResultDTO> selectIssueVoteStatis(String customerId, String monthId);
 
     /**
-     * @Description 查找项目的分类名称 以-相连
+     * @Description 查找项目的分类名称 以-相连，以,分隔，
      * @param param
      * @return java.util.Map<java.lang.String,java.lang.String>
      * @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<java.lang.String,java.lang.String>
+	 * @author wangc
+	 * @date 2021.03.09 00:23
+	 */
 	@Override
 	public Map<String, String> getIntegratedProjectCategory(Map<String, Set<String>> param,String customerId) {
 		Map<String, String> map = new HashMap<>();
     	param.forEach((projectId,categoryIds) -> {
+    		//以下查询只适用于二级分类，如果分类层级变多了要修改此查询
 			List<IssueProjectCategoryDictDTO> 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 @@
 
     <select id="selectCategory" resultType="com.epmet.dto.issue.IssueProjectCategoryDictDTO">
         SELECT
-            *
-        FROM (
-
-        SELECT
-
-        *
-
-        FROM issue_project_category_dict
-        WHERE DEL_FLAG = '0'
-        AND CUSTOMER_ID = #{customerId}
-        <foreach collection="ids" item="id" open="AND (" separator=" OR " close=")">
-            id = #{id}
-        </foreach>
-        UNION
-        SELECT
-
-        *
-
-        FROM issue_project_category_dict outter
-        WHERE outter.DEL_FLAG = '0'
-        AND outter.CUSTOMER_ID = 'default'
+        a.ID,
+        IF(a.CATEGORY_TYPE = '2',concat(b.CATEGORY_NAME,'-',a.CATEGORY_NAME),a.CATEGORY_NAME) as categoryName
+        FROM issue_project_category_dict a
+        LEFT JOIN issue_project_category_dict b on a.pid = b.id and a.customer_id = b.customer_id
+        WHERE a.DEL_FLAG = '0'
+        AND a.CUSTOMER_ID = #{customerId}
         <foreach collection="ids" item="id" open="AND (" separator=" OR " close=")">
-            outter.id = #{id}
+            a.id = #{id}
         </foreach>
-        AND NOT EXISTS (
-        SELECT * FROM issue_project_category_dict WHERE del_flag = '0' AND
-        customer_id = #{customerId} and id = outter.id
-        )
-        ) temp
-        order by temp.category_type,temp.sort
+        order by a.category_type,a.sort
     </select>
 </mapper>
\ 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<IssueDao, IssueEntity> 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<IssueVoteSt
             if(null != existedStatistical && StringUtils.isNotBlank(existedStatistical.getId())){
                 toUpd.setId(existedStatistical.getId());
                 update(toUpd);
+            }else{
+                save(toUpd);
             }
         }
 

From 59ae4e23840eca33646861b38e3aa9eb551bf8b6 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 19 Mar 2021 13:49:40 +0800
Subject: [PATCH 055/119] =?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 <syc_ls@163.com>
Date: Fri, 19 Mar 2021 17:03:41 +0800
Subject: [PATCH 056/119] =?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<IssueProjectCategoryDictEntity> {
 
     /**
-     * @Description 客户分类列表查询，按分类升序排列
+     * @Description 客户分类列表查询，按分类升序排列，查询未被禁用的
      * @Author sun
      **/
     List<CustomerCategoryListResultDTO> 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<IssueCategoryDao,
             categoryList.forEach(cl -> {
                 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<IssuePr
     /**
      * @param customerId
      * @return
-     * @Description 客户分类列表查询，按分类升序排列
+     * @Description 客户分类列表查询，按分类升序排列，查询未被禁用的
      * @Author sun
      **/
     @Override
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
index 4cc9b404e8..0589da1fe4 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
@@ -158,6 +158,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
         entity.setIsDefault(NumConstant.ONE_STR);
         entity.setIssueUseCount(NumConstant.ZERO);
         entity.setProjectUseCount(NumConstant.ZERO);
+        entity.setIsDisable(ModuleConstants.ID_ENABLE);
         issueProjectTagDictDao.insert(entity);
         IssueCategoryTagResultDTO issueCategoryTagResultDTO = new IssueCategoryTagResultDTO();
         issueCategoryTagResultDTO.setId(entity.getId());
@@ -234,6 +235,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
                 n.setCustomerId(customerId);
                 n.setGridId(issueEntity.getGridId());
                 n.setIssueId(form.getIssueId());
+                n.setIsDisable(ModuleConstants.ID_ENABLE);
             });
             baseDao.insertNewTags(needInsert);
         }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/utils/ModuleConstants.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/utils/ModuleConstants.java
index 8b0214d2f4..b6a7f4cd49 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/utils/ModuleConstants.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/utils/ModuleConstants.java
@@ -170,4 +170,12 @@ public interface ModuleConstants {
      * 类别名称：其他
      */
     String CATEGORY_NAME_OTHERS = "其他";
+    /**
+     * 是否禁用  enable:启用
+     */
+    String ID_ENABLE = "enable";
+    /**
+     * 是否禁用  disable:禁用
+     */
+    String IS_DISABLE = "disable";
 }
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 b531d9d26e..096d54422a 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
@@ -23,6 +23,7 @@
             del_flag = '0'
         AND category_type = '1'
         AND customer_id = #{customerId}
+        AND is_disable = 'enable'
         ORDER BY sort ASC
     </select>
     <select id="subCategoryList" resultMap="categoryTree">
@@ -36,6 +37,7 @@
             del_flag = '0'
         AND pid = #{id}
         AND customer_id = #{customerId}
+        AND is_disable = 'enable'
         ORDER BY sort ASC
     </select>
     <!-- sql递归 查询客户议题项目的分类信息以及递归查询二级分类信息 end-->
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 id="insertNewTags">
-        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
             <foreach collection="tags" item="l" separator=",">
                 (
@@ -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<ProjectCategoryD
             categoryList.forEach(cl -> {
                 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 <syc_ls@163.com>
Date: Mon, 22 Mar 2021 10:31:05 +0800
Subject: [PATCH 057/119] =?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<ProjectIssueCategoryResultDTO>().ok(issueProjectCategoryDictService.getProjectAndCategoryInfo(formDTO));
     }
 
+    /**
+     * @param formDTO
+     * @return
+     * @Description 分类启用与禁用
+     * @Author sun
+     **/
+    @PostMapping("isdisablecategory")
+    public Result<ProjectIssueCategoryResultDTO> isDisableCategory(@RequestBody ProjectSaveCategoryFormDTO formDTO) {
+        return new Result<ProjectIssueCategoryResultDTO>().ok(issueProjectCategoryDictService.isDisableCategory(formDTO));
+    }
+
+    /**
+     * @param formDTO
+     * @return
+     * @Description 分类删除
+     * @Author sun
+     **/
+    @PostMapping("delcategory")
+    public Result<ProjectIssueCategoryResultDTO> delCategory(@RequestBody ProjectSaveCategoryFormDTO formDTO) {
+        return new Result<ProjectIssueCategoryResultDTO>().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<IssueProjec
      * @Author sun
      **/
     ProjectIssueCategoryResultDTO getProjectAndCategoryInfo(ProjectSaveCategoryFormDTO formDTO);
+
+    /**
+     * @Description 分类启用与禁用
+     * @Author sun
+     **/
+    ProjectIssueCategoryResultDTO isDisableCategory(ProjectSaveCategoryFormDTO formDTO);
+
+    /**
+     * @Description 分类删除
+     * @Author sun
+     **/
+    ProjectIssueCategoryResultDTO delCategory(ProjectSaveCategoryFormDTO formDTO);
 }
\ No newline at end of file
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 86b6cb1305..c77651b103 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
@@ -201,4 +201,24 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
             issueProjectTagDictService.insertBatch(tagList);
         }
     }
+
+    /**
+     * @Description 分类启用与禁用
+     * @Author sun
+     **/
+    @Override
+    public ProjectIssueCategoryResultDTO isDisableCategory(ProjectSaveCategoryFormDTO formDTO) {
+        return null;
+    }
+
+
+    /**
+     * @Description 分类删除
+     * @Author sun
+     **/
+    @Override
+    public ProjectIssueCategoryResultDTO delCategory(ProjectSaveCategoryFormDTO formDTO) {
+        return null;
+    }
+
 }
\ No newline at end of file

From 0d55115691b51d78c9ffb70628c20c165321f551 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 22 Mar 2021 11:04:13 +0800
Subject: [PATCH 058/119] =?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
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.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<IssueProjectCategoryDictEntity> listInsertCategoies(@Param("start") Date start, @Param("end") Date end);
+
+    List<IssueProjectCategoryDictEntity> 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
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.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> {
+
+    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
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.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<FactOrginProjectCategoryEntity> {
+	
+}
\ 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
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.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
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.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
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.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
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.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<IssueProjectCategoryDictEntity> listInsertCategoies(Date start, Date end);
+
+    List<IssueProjectCategoryDictEntity> 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<IssueProjectCategoryDictEntity> listInsertCategoies(Date start, Date end) {
+        return issueProjectCategoryDictDao.listInsertCategoies(start, end);
+    }
+
+    @Override
+    public List<IssueProjectCategoryDictEntity> 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<DimGridEntity> 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<IssueProjectCategoryDictEntity> insertCategoies = listInsertCategoies();
+        List<IssueProjectCategoryDictEntity> updateCategoies = listUpdateCategoies(now);
+        projectCategoryDictService.initProjectCategory(insertCategoies,updateCategoies);
+    }
+
+    /**
+     * @author yinzuomei
+     * @description 构造需要插入的分类字典
+     * @Date 2021/3/19 15:52
+     **/
+    private List<IssueProjectCategoryDictEntity> 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<IssueProjectCategoryDictEntity> 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
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.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<CustomerProjectCategoryDictEntity> {
+
+    void initProjectCategory(List<IssueProjectCategoryDictEntity> insertCategoies,
+                             List<IssueProjectCategoryDictEntity> 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
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.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<FactOrginProjectCategoryEntity> {
+
+}
\ 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
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.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<CustomerProjectCategoryDictDao, CustomerProjectCategoryDictEntity> implements CustomerProjectCategoryDictService {
+
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX)
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void initProjectCategory(List<IssueProjectCategoryDictEntity> insertCategoies, List<IssueProjectCategoryDictEntity> 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
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.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<FactOrginProjectCategoryDao, FactOrginProjectCategoryEntity> 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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.issue.IssueProjectCategoryDictDao">
+
+    <!--     构造需要插入的分类字典数据 -->
+    <select id="listInsertCategoies" parameterType="map" resultType="com.epmet.entity.issue.IssueProjectCategoryDictEntity">
+        SELECT
+            *
+        FROM
+          issue_project_category_dict
+        <where>
+            DEL_FLAG = 0
+            and CUSTOMER_ID !='default'
+            <if test="start != null">
+                AND CREATED_TIME &gt; #{start}
+            </if>
+            <if test="end != null">
+                AND CREATED_TIME &lt; #{end}
+            </if>
+        </where>
+        ORDER BY CREATED_TIME ASC
+    </select>
+
+    <!--     构造需要更新的分类字典数据 -->
+    <select id="listByUpdatedTime" parameterType="map" resultType="com.epmet.entity.issue.IssueProjectCategoryDictEntity">
+        SELECT
+            *
+        FROM
+            issue_project_category_dict
+        <where>
+            DEL_FLAG = 0
+            and CUSTOMER_ID !='default'
+            <if test="start != null">
+                AND UPDATED_TIME &gt; #{start}
+            </if>
+            <if test="end != null">
+                AND UPDATED_TIME &lt; #{end}
+            </if>
+        </where>
+        ORDER BY UPDATED_TIME ASC
+    </select>
+
+</mapper>
\ 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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.stats.CustomerProjectCategoryDictDao">
+    <select id="getLatestProjectCategory" resultType="com.epmet.entity.stats.CustomerProjectCategoryDictEntity">
+        SELECT
+            *
+        FROM
+            customer_project_category_dict m
+        WHERE
+            m.DEL_FLAG = '0'
+            AND m.CUSTOMER_TYPE = 'internal'
+        ORDER BY
+            m.ORIGIN_CREATED_TIME DESC
+            LIMIT 1
+    </select>
+
+    <select id="getLatestUpdatedEntity" resultType="com.epmet.entity.stats.CustomerProjectCategoryDictEntity">
+        SELECT
+            *
+        FROM
+            customer_project_category_dict m
+        WHERE
+            m.DEL_FLAG = '0'
+            AND m.CUSTOMER_TYPE = 'internal'
+        ORDER BY
+            m.ORIGIN_UPDATED_TIME DESC
+            LIMIT 1
+    </select>
+
+    <select id="selectByCustomerIdAndId" parameterType="map" resultType="com.epmet.entity.stats.CustomerProjectCategoryDictEntity">
+        SELECT
+            *
+        FROM
+            customer_project_category_dict m
+        WHERE
+            m.DEL_FLAG = '0'
+            and m.customer_id=#{customerId}
+            and m.CATEGORY_ID=#{categoryId}
+    </select>
+</mapper>
\ 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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.stats.FactOrginProjectCategoryDao">
+
+
+
+</mapper>
\ 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 059/119] =?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 @@
 
 
     <select id="selectCategoryAnalysis" resultType="com.epmet.dto.result.screen.CategoryAnalysisResultDTO">
-        SELECT EPMET_CATEGORY_NAME AS categoryName,
-			 PROJECT_TOTAL  AS projectTotal
-        FROM screen_project_category_org_daily
-        WHERE DEL_FLAG = '0'
-            AND ORG_ID = #{agencyId}
-            AND DATE_ID = (
-                select
-                        date_id
-                from
-                        screen_project_category_org_daily
-                where
-                        del_flag = '0'
-                and ORG_ID = #{agencyId}
-                order by
-                        date_id desc,
-                        created_time desc
-                limit 1
-            )
-        ORDER BY EPMET_CATEGORY_CODE
+        SELECT D.CATEGORY_NAME AS categoryName,
+			 M.PROJECT_TOTAL  AS projectTotal
+        FROM screen_project_category_org_daily m
+        left join customer_project_category_dict d
+            on(m.CATEGORY_CODE=D.CATEGORY_CODE AND D.DEL_FLAG='0')
+        WHERE M.DEL_FLAG = '0'
+                AND M.ORG_ID = #{agencyId}
+                AND M.DATE_ID = (
+                        select
+                            date_id
+                        from
+                            screen_project_category_org_daily
+                        where
+                            del_flag = '0'
+                        and ORG_ID = #{agencyId}
+                        order by
+                            date_id desc,
+                            created_time desc
+                        limit 1
+                )
+        ORDER BY M.CATEGORY_CODE ASC
     </select>
 </mapper>
\ 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 @@
 
 <mapper namespace="com.epmet.dao.evaluationindex.screen.ScreenProjectCategoryGridDailyDao">
 
-    <resultMap type="com.epmet.entity.evaluationindex.screen.ScreenProjectCategoryGridDailyEntity" id="screenProjectCategoryGridDailyMap">
-        <result property="id" column="ID"/>
-        <result property="customerId" column="CUSTOMER_ID"/>
-        <result property="dateId" column="DATE_ID"/>
-        <result property="gridId" column="GRID_ID"/>
-        <result property="pid" column="PID"/>
-        <result property="pids" column="PIDS"/>
-        <result property="epmetCategoryCode" column="EPMET_CATEGORY_CODE"/>
-        <result property="projectTotal" column="PROJECT_TOTAL"/>
-        <result property="pendingTotal" column="PENDING_TOTAL"/>
-        <result property="closedTotal" column="CLOSED_TOTAL"/>
-        <result property="unResolvedTotal" column="UN_RESOLVED_TOTAL"/>
-        <result property="resolvedTotal" column="RESOLVED_TOTAL"/>
-        <result property="closedRatio" column="CLOSED_RATIO"/>
-        <result property="resolvedRatio" column="RESOLVED_RATIO"/>
-        <result property="unResolvedRatio" column="UN_RESOLVED_RATIO"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
     <delete id="deleteByDateIdAndCustomerId">
         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 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.epmet.dao.evaluationindex.screen.ScreenProjectCategoryOrgDailyDao">
-
-    <resultMap type="com.epmet.entity.evaluationindex.screen.ScreenProjectCategoryOrgDailyEntity" id="screenProjectCategoryOrgDailyMap">
-        <result property="id" column="ID"/>
-        <result property="customerId" column="CUSTOMER_ID"/>
-        <result property="dateId" column="DATE_ID"/>
-        <result property="orgId" column="ORG_ID"/>
-        <result property="orgType" column="ORG_TYPE"/>
-        <result property="pid" column="PID"/>
-        <result property="pids" column="PIDS"/>
-        <result property="epmetCategoryCode" column="EPMET_CATEGORY_CODE"/>
-        <result property="projectTotal" column="PROJECT_TOTAL"/>
-        <result property="pendingTotal" column="PENDING_TOTAL"/>
-        <result property="closedTotal" column="CLOSED_TOTAL"/>
-        <result property="unResolvedTotal" column="UN_RESOLVED_TOTAL"/>
-        <result property="resolvedTotal" column="RESOLVED_TOTAL"/>
-        <result property="closedRatio" column="CLOSED_RATIO"/>
-        <result property="resolvedRatio" column="RESOLVED_RATIO"/>
-        <result property="unResolvedRatio" column="UN_RESOLVED_RATIO"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
     <delete id="deleteByDateIdAndCustomerId">
         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 060/119] =?UTF-8?q?=E6=96=B0=E5=A2=9Efact=5Forigin=5Fproje?=
 =?UTF-8?q?ct=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 <http://www.gnu.org/licenses/>.
  */
 
-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<FactOrginProjectCategoryEntity> {
+public interface FactOriginProjectCategoryDailyDao extends BaseDao<FactOriginProjectCategoryDailyEntity> {
 	
 }
\ 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 <http://www.gnu.org/licenses/>.
  */
 
-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 <http://www.gnu.org/licenses/>.
  */
 
-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<FactOrginProjectCategoryEntity> {
-
+public interface FactOriginProjectCategoryDailyService extends BaseService<FactOriginProjectCategoryDailyEntity> {
+    //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 <http://www.gnu.org/licenses/>.
  */
 
-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<FactOrginProjectCategoryDao, FactOrginProjectCategoryEntity> implements FactOrginProjectCategoryService {
+@DataSource(DataSourceConstant.STATS)
+public class FactOriginProjectCategoryDailyServiceImpl extends BaseServiceImpl<FactOriginProjectCategoryDailyDao, FactOriginProjectCategoryDailyEntity> 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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.stats.FactOrginProjectCategoryDao">
+<mapper namespace="com.epmet.dao.evaluationindex.extract.FactOriginProjectCategoryDailyDao">
 
 
 

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 061/119] =?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 062/119] =?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
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.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<ProjectCategoryDictResultDTO> 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 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>gov-issue-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
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<List<ProjectNextAgencyResultDTO>> myNextAgency(@LoginUser TokenDto tokenDto){
         return new Result<List<ProjectNextAgencyResultDTO>>().ok(projectService.getMyNextAgency(tokenDto));
     }
+
+    /**
+     * 002、项目分类字典查询
+     *      查询当前客户的父客户下，项目分类字典
+     *
+     * @param tokenDto
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.project.dto.result.ProjectCategoryDictResultDTO>>
+     * @Author zhangyong
+     * @Date 10:41 2021-03-22
+     **/
+    @PostMapping("categorydict")
+    public Result<List<ProjectCategoryDictResultDTO>> categoryDict(@LoginUser TokenDto tokenDto) {
+        return new Result<List<ProjectCategoryDictResultDTO>>().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<ProjectNextAgencyResultDTO> getMyNextAgency(TokenDto tokenDto);
+
+    /**
+     * 002、项目分类字典查询
+     *
+     * @param tokenDto
+     * @return java.util.List<com.epmet.project.dto.result.ProjectCategoryDictResultDTO>
+     * @Author zhangyong
+     * @Date 14:26 2021-03-22
+     **/
+    List<ProjectCategoryDictResultDTO> 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<ProjectCategoryDictResultDTO> getCategoryDict(TokenDto tokenDto) {
+        List<ProjectCategoryDictResultDTO> result = new ArrayList<>();
+        Result<String> 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<List<ProjectCategoryDictResultDTO>> 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<List<ProjectCategoryDictResultDTO>> childrenCategoryDict = govIssueOpenFeignClient.getCustomerCategoryDict(argDto);
+            for (ProjectCategoryDictResultDTO p : result) {
+                List<ProjectCategoryDictResultDTO> 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 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>data-report-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
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<IssueResultDTO> queryIssueDetail(@RequestBody IssueDetailFormDTO formDTO);
+
+	/**
+     * 获取客户 分类字典 信息
+     *
+     * @param dto
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.project.dto.result.ProjectCategoryDictResultDTO>>
+	 * @Author zhangyong
+	 * @Date 14:10 2021-03-22
+	 **/
+	@PostMapping(value = "/gov/issue/issueprojectcategorydict/getcustomercategorydict")
+	Result<List<ProjectCategoryDictResultDTO>> 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<IssueResultDTO> queryIssueDetail(IssueDetailFormDTO formDTO) {
 		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "detail", formDTO);
 	}
+
+	@Override
+	public Result<List<ProjectCategoryDictResultDTO>> 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 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>data-report-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -270,4 +276,4 @@
         </profile>
     </profiles>
 
-</project>
\ No newline at end of file
+</project>
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<ProjectIssueCategoryResultDTO>().ok(issueProjectCategoryDictService.delCategory(formDTO));
     }
 
-}
\ No newline at end of file
+    /**
+     * 获取客户 分类字典 信息
+     *
+     * @param dto
+     *              pid = 0  查询一级分类
+     *              pid != 0 查询二级分类
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.project.dto.result.ProjectCategoryDictResultDTO>>
+     * @Author zhangyong
+     * @Date 14:10 2021-03-22
+     **/
+    @PostMapping("getcustomercategorydict")
+    public Result<List<ProjectCategoryDictResultDTO>> getCustomerCategoryDict(@RequestBody CustomerCategoryDTO dto){
+        return new Result<List<ProjectCategoryDictResultDTO>>().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<IssueProjectCategor
      * @date 2020.12.10 13:37
     */
     IssueProjectCategoryDictEntity selectSingleByCustomerIdAndCategoryNameAndCategoryType(@Param("customerId")String customerId,@Param("categoryName")String categoryName,@Param("categoryType")String categoryType);
-}
\ No newline at end of file
+
+    /**
+     * 获取客户 分类字典 信息
+     *
+     * @param customerId
+     * @param pid           pid = 0  查询一级分类
+     *                      pid != 0 查询二级分类
+     *
+     * @return java.util.List<com.epmet.project.dto.result.ProjectCategoryDictResultDTO>
+     * @Author zhangyong
+     * @Date 14:10 2021-03-22
+     **/
+    List<ProjectCategoryDictResultDTO> 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<IssueProjec
      * @Author sun
      **/
     ProjectIssueCategoryResultDTO delCategory(ProjectSaveCategoryFormDTO formDTO);
-}
\ No newline at end of file
+
+    /**
+     * 获取客户 分类字典 信息
+     *
+     * @param customerId
+     * @param pid           pid = 0  查询一级分类
+     *                      pid != 0 查询二级分类
+     *
+     * @return java.util.List<com.epmet.project.dto.result.ProjectCategoryDictResultDTO>
+     * @Author zhangyong
+     * @Date 14:10 2021-03-22
+     **/
+    List<ProjectCategoryDictResultDTO> 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<IssuePr
         return null;
     }
 
-}
\ No newline at end of file
+    @Override
+    public List<ProjectCategoryDictResultDTO> 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 @@
         </choose>
         LIMIT 1
     </select>
-</mapper>
\ No newline at end of file
+
+    <select id="selectListCategoryDict" resultType="com.epmet.project.dto.result.ProjectCategoryDictResultDTO">
+        SELECT
+            CATEGORY_CODE categoryCode,
+            CATEGORY_NAME categoryName,
+            PID,
+            ID
+        FROM issue_project_category_dict d
+        WHERE d.CUSTOMER_ID = #{customerId}
+        AND d.DEL_FLAG ='0' AND d.IS_DISABLE = 'enable'
+        <if test="pid != null and pid == 0">
+            AND d.PID = '0'
+        </if>
+        <if test="pid != null and pid != 0">
+            AND d.PID != '0'
+        </if>
+    </select>
+</mapper>
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<List<String>> getAllSubCustomerIds(@PathVariable("customerId") String customerId);
+
+	/**
+	 * 获取外部客户，的父级 客户id
+     *
+	 * @param customerId
+	 * @return com.epmet.commons.tools.utils.Result<java.lang.String>
+	 * @Author zhangyong
+	 * @Date 14:57 2021-03-22
+	 **/
+	@GetMapping("/oper/crm/customer/getexternalandparentcustomerid/{customerId}")
+	Result<String> 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<List<String>> getAllSubCustomerIds(String customerId) {
 		return ModuleUtils.feignConError(ServiceConstant.OPER_CRM_SERVER, "getAllSubCustomerIds", customerId);
 	}
+
+	@Override
+	public Result<String> 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<java.lang.String>
+     * @Author zhangyong
+     * @Date 14:57 2021-03-22
+     **/
+	@GetMapping("getexternalandparentcustomerid/{customerId}")
+	public Result<String> getExternalAndParentCustomerId(@PathVariable("customerId") String customerId){
+		if(StringUtils.isNotBlank(customerId)){
+            String resultDTO = customerService.getExternalAndParentCustomerId(customerId);
+			return new Result<String>().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<CustomerEntity> {
 	 * @param customerIdList
 	 * @Author yinzuomei
 	 * @Description 根据客户id查询客户信息
-	 * @Date 2020/4/24 9:21 
+	 * @Date 2020/4/24 9:21
 	 **/
     List<CustomerDTO> selectListByIds(@Param("customerIdList") List<String> customerIdList);
 
@@ -98,4 +98,13 @@ public interface CustomerDao extends BaseDao<CustomerEntity> {
 	 */
 	List<CustomerListResultDTO> 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<CustomerEntity> {
      * @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<CustomerDao, CustomerEn
         return resultDTO;
     }
 
+    @Override
+    public String getExternalAndParentCustomerId(String customerId) {
+        return baseDao.getExternalAndParentCustomerId(customerId);
+    }
 }
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml b/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml
index d50ab9ce85..7ef7c8261d 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml
@@ -120,4 +120,14 @@
             AND customer_name LIKE concat('%', trim(#{customerName}), '%')
         </if>
     </select>
+
+    <select id="getExternalAndParentCustomerId" resultType="String">
+        SELECT
+          CR.PARENT_CUSTOMER_ID AS rootCustomerId
+        FROM customer_relation cr
+        WHERE cr.DEL_FLAG = '0'
+        AND cr.CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}
+        AND cr.PARENT_CUSTOMER_ID != '0'
+        AND cr.CUSTOMER_TYPE = 'external'
+    </select>
 </mapper>

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 063/119] =?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<CategoryDictFormDTO> 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<CustomerProjectC
     CustomerProjectCategoryDictEntity getLatestUpdatedEntity();
 
     CustomerProjectCategoryDictEntity selectByCustomerIdAndId(@Param("customerId") String customerId, @Param("categoryId") String categoryId);
-}
\ No newline at end of file
+
+    /**
+     * 当isFirst=true时，直接根据 customerId 删除原有数据，再批量insert。
+     *
+     * @param customerId
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 16:12 2021-03-22
+     **/
+    Integer deleteCustomerProjectCategoryDict(@Param("customerId") String customerId);
+
+    /**
+     * 批量insert。
+     *
+     * @param list
+     * @param customerId
+     * @return void
+     * @Author zhangyong
+     * @Date 16:13 2021-03-22
+     **/
+    void batchInsertCustomerProjectCategoryDict(@Param("list") List<CategoryDictFormDTO> 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<Customer
     CustomerProjectCategoryDictEntity getLatestProjectCategory();
 
     CustomerProjectCategoryDictEntity getLatestUpdatedEntity();
-}
\ No newline at end of file
+
+    /**
+     * 项目分类字典上报
+     *      目标表：epmet_evaluation_index库的customer_project_category_dict
+     *
+     * @param customerId
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 16:03 2021-03-22
+     **/
+    void uploadCategoryDict(String customerId, CategoryDictDataFormDTO formDTO);
+}
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
index e81c8568ed..455039a2a9 100644
--- 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
@@ -19,14 +19,17 @@ 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.commons.tools.constant.NumConstant;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.CustomerProjectCategoryDictDao;
+import com.epmet.dto.screen.CategoryDictDataFormDTO;
 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 org.apache.commons.collections4.CollectionUtils;
 
 import java.util.List;
 
@@ -94,4 +97,18 @@ public class CustomerProjectCategoryDictServiceImpl extends BaseServiceImpl<Cust
         return baseDao.getLatestUpdatedEntity();
     }
 
-}
\ No newline at end of file
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX)
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void uploadCategoryDict(String customerId, CategoryDictDataFormDTO formDTO) {
+        if (formDTO.getIsFirst()) {
+            int deleteNum;
+            do {
+                deleteNum = baseDao.deleteCustomerProjectCategoryDict(customerId);
+            } while (deleteNum > 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}
     </select>
-</mapper>
\ No newline at end of file
+
+    <delete id="deleteCustomerProjectCategoryDict">
+        delete from customer_project_category_dict
+        where CUSTOMER_ID = #{customerId}
+        limit 1000;
+    </delete>
+
+    <insert id="batchInsertCustomerProjectCategoryDict" parameterType="map">
+        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
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            (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()
+            )
+        </foreach>
+    </insert>
+</mapper>

From cd09ef54e259c51a5b7803c683d9788cc4747fdb Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Mon, 22 Mar 2021 16:42:55 +0800
Subject: [PATCH 064/119] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E6=96=B0=E5=A2=9E=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/redis/IssueProjectTagDictRedis.java   | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
index 7e4d3b456a..33896d5b16 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
@@ -378,6 +378,19 @@ public class IssueProjectTagDictRedis {
         });
     }
 
+    /**
+     * @Description 批量更新指定分类下的标签的禁用/启用属性
+     * @param customerId        客户Id
+     * @param secondCategoryIds 二级分类集合
+     * @param availableFlag     enable  |  disabled
+     * @return void
+     * @author wangc
+     * @date 2021.03.22 16:20
+    */
+    public void updateTagAvailabilityBySecondCategoryIds(String customerId,List<String>secondCategoryIds,String availableFlag){
+
+    }
+
     public <T> T parseObject(Object o,Class<T> clazz){
         ObjectMapper objectMapper = new ObjectMapper();
         T t = objectMapper.convertValue(o, clazz);

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 065/119] =?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 94acbdfc31d3f410a710ca2ad5c4e6dfceb4f1b0 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 22 Mar 2021 17:28:23 +0800
Subject: [PATCH 066/119] =?UTF-8?q?=E5=88=86=E7=B1=BB=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/exception/EpmetErrorCode.java       |  4 +-
 .../IssueProjectCategoryDictController.java   |  9 ++--
 .../java/com/epmet/dao/IssueCategoryDao.java  |  7 +++
 .../dao/IssueProjectCategoryDictDao.java      | 15 ++++++
 .../IssueProjectCategoryDictService.java      |  3 +-
 .../IssueProjectCategoryDictServiceImpl.java  | 52 ++++++++++++++++---
 .../resources/mapper/IssueCategoryDao.xml     | 14 +++++
 .../mapper/IssueProjectCategoryDictDao.xml    | 25 +++++++++
 .../epmet/dto/form/DelCategoryFormDTO.java    | 35 +++++++++++++
 .../feign/GovProjectOpenFeignClient.java      |  9 ++++
 .../GovProjectOpenFeignClientFallback.java    |  7 +++
 .../controller/ProjectCategoryController.java | 11 ++++
 .../com/epmet/dao/ProjectCategoryDao.java     |  8 +++
 .../epmet/service/ProjectCategoryService.java |  8 +++
 .../impl/ProjectCategoryServiceImpl.java      | 11 ++++
 .../resources/mapper/ProjectCategoryDao.xml   | 14 +++++
 16 files changed, 221 insertions(+), 11 deletions(-)
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/DelCategoryFormDTO.java

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
index d771565080..fa03a32618 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
@@ -144,7 +144,9 @@ public enum EpmetErrorCode {
 	TOPIC_SHIFTED_TO_ISSUE_UNDER_AUDITING(9004,"当前话题正在转议题审核"),
     TOPIC_ALREADY_SHIFTED_TO_ISSUE(9005,"该话题已被转为议题，请勿重复操作"),
     TOPIC_IS_HIDDEN(9006,"该话题已被屏蔽，请先解除屏蔽"),
-    TOPIC_IS_CLOSED(9008,"该话题已关闭，无法转为议题");
+    TOPIC_IS_CLOSED(9008,"该话题已关闭，无法转为议题"),
+
+    CUSTOMER_CATEGORY(9101,"分类已使用，不允许删除");
 
 	private int code;
 	private String msg;
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 cbd7c63190..484636d73f 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.DelCategoryFormDTO;
 import com.epmet.dto.form.IssueProjectCategoryDictListFormDTO;
 import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
 import com.epmet.dto.result.CustomerCategoryListResultDTO;
@@ -160,12 +161,14 @@ public class IssueProjectCategoryDictController {
     /**
      * @param formDTO
      * @return
-     * @Description 分类删除
+     * @Description 分类删除【存在客户在使用时不允许删除】
      * @Author sun
      **/
     @PostMapping("delcategory")
-    public Result<ProjectIssueCategoryResultDTO> delCategory(@RequestBody ProjectSaveCategoryFormDTO formDTO) {
-        return new Result<ProjectIssueCategoryResultDTO>().ok(issueProjectCategoryDictService.delCategory(formDTO));
+    public Result delCategory(@RequestBody DelCategoryFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, DelCategoryFormDTO.DelCategory.class);
+        issueProjectCategoryDictService.delCategory(formDTO);
+        return new Result();
     }
 
     /**
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
index c263ec1ddb..650e4ac227 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
@@ -19,6 +19,7 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.IssueCategoryDTO;
+import com.epmet.dto.form.DelCategoryFormDTO;
 import com.epmet.dto.form.ProjectCategoryTagListFormDTO;
 import com.epmet.dto.result.IssueCategoryTagResultDTO;
 import com.epmet.dto.result.ProjectCategoryTagResultDTO;
@@ -65,4 +66,10 @@ public interface IssueCategoryDao extends BaseDao<IssueCategoryEntity> {
      * @Author sun
      **/
     void delByIssueId(@Param("issueId") String issueId);
+
+    /**
+     * @Description 查询客户分类有没有被议题使用
+     * @Author sun
+     **/
+    List<IssueCategoryDTO> selectIssueList(DelCategoryFormDTO formDTO);
 }
\ No newline at end of file
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 1524bc1fc0..45ec49e689 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.DelCategoryFormDTO;
 import com.epmet.dto.form.IssueProjectCategoryDictListFormDTO;
 import com.epmet.dto.result.CustomerCategoryListResultDTO;
 import com.epmet.entity.IssueProjectCategoryDictEntity;
@@ -87,4 +88,18 @@ public interface IssueProjectCategoryDictDao extends BaseDao<IssueProjectCategor
      * @Date 14:10 2021-03-22
      **/
     List<ProjectCategoryDictResultDTO> selectListCategoryDict(@Param("customerId") String customerId, @Param("pid") String pid);
+
+    /**
+     * 查询客户某个分类信息
+     * @author sun
+     */
+    IssueProjectCategoryDictDTO selectByCustomerId(@Param("customerId") String customerId, @Param("categoryId") String categoryId);
+
+    /**
+     * 删除一级或二级分类，二级分类下默认有的标签不作处理
+     * @author sun
+     */
+    int delCategory(DelCategoryFormDTO formDTO);
+
+
 }
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 24e824ffff..067c0a059d 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.DelCategoryFormDTO;
 import com.epmet.dto.form.IssueProjectCategoryDictListFormDTO;
 import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
 import com.epmet.dto.result.CustomerCategoryListResultDTO;
@@ -142,7 +143,7 @@ public interface IssueProjectCategoryDictService extends BaseService<IssueProjec
      * @Description 分类删除
      * @Author sun
      **/
-    ProjectIssueCategoryResultDTO delCategory(ProjectSaveCategoryFormDTO formDTO);
+    void delCategory(DelCategoryFormDTO formDTO);
 
     /**
      * 获取客户 分类字典 信息
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 c154a5f7e2..e056f436df 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
@@ -21,29 +21,35 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dao.IssueCategoryDao;
 import com.epmet.dao.IssueProjectCategoryDictDao;
 import com.epmet.dao.IssueProjectRelationDao;
+import com.epmet.dto.IssueCategoryDTO;
 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.ProjectCategoryDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.CustomerCategoryListResultDTO;
 import com.epmet.dto.result.ProjectCategoryDTOResultDTO;
 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.feign.GovProjectOpenFeignClient;
 import com.epmet.project.dto.result.ProjectCategoryDictResultDTO;
 import com.epmet.redis.IssueProjectCategoryDictRedis;
 import com.epmet.service.IssueProjectCategoryDictService;
 import com.epmet.service.IssueProjectTagDictService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -62,6 +68,7 @@ import java.util.stream.Collectors;
 @Service
 public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssueProjectCategoryDictDao, IssueProjectCategoryDictEntity> implements IssueProjectCategoryDictService {
 
+    private static Logger logger = LoggerFactory.getLogger(IssueProjectCategoryDictServiceImpl.class);
     @Autowired
     private IssueProjectCategoryDictRedis issueProjectCategoryDictRedis;
     @Autowired
@@ -69,6 +76,11 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
     @Autowired
     private IssueProjectTagDictService issueProjectTagDictService;
 
+    @Autowired
+    private IssueCategoryDao issueCategoryDao;
+    @Autowired
+    private GovProjectOpenFeignClient govProjectOpenFeignClient;
+
     @Override
     public PageData<IssueProjectCategoryDictDTO> page(Map<String, Object> params) {
         IPage<IssueProjectCategoryDictEntity> page = baseDao.selectPage(
@@ -215,11 +227,39 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
 
     /**
      * @Description 分类删除
+     * 分类客户没有使用过的可以直接删除 包括子类删除，只要客户用过 不管什么状态都不能再删除，允许删除的也跟标签没关系，不删标签
      * @Author sun
      **/
     @Override
-    public ProjectIssueCategoryResultDTO delCategory(ProjectSaveCategoryFormDTO formDTO) {
-        return null;
+    public void delCategory(DelCategoryFormDTO formDTO) {
+        //1.查询分类信息
+        IssueProjectCategoryDictDTO dto = baseDao.selectByCustomerId(formDTO.getCustomerId(), formDTO.getCategoryId());
+        if (null == dto) {
+            throw new RuntimeException("未查询到客户分类信息！");
+        }
+        //2.判断分类有没有被客户的议题、项目使用过
+        formDTO.setLevel(dto.getCategoryType());
+        //2-1.判断议题有无使用
+        List<IssueCategoryDTO> issueList = issueCategoryDao.selectIssueList(formDTO);
+        //已使用，不允许删除
+        if (null != issueList || issueList.size() > NumConstant.ZERO) {
+            throw new RenException(EpmetErrorCode.CUSTOMER_CATEGORY.getCode(), EpmetErrorCode.CUSTOMER_CATEGORY.getMsg());
+        }
+        //2-2.判断项目有无使用
+        Result<List<ProjectCategoryDTO>> resultList = govProjectOpenFeignClient.getProjectCategoryList(formDTO);
+        if (!resultList.success()) {
+            throw new RenException(resultList.getCode(), resultList.getMsg());
+        }
+        if (null != resultList.getData() || resultList.getData().size() > NumConstant.ZERO) {
+            throw new RenException(EpmetErrorCode.CUSTOMER_CATEGORY.getCode(), EpmetErrorCode.CUSTOMER_CATEGORY.getMsg());
+        }
+
+        //3.分类未被使用，则删除一级、二级分类，二级分类下默认有的标签不作处理
+        if (baseDao.delCategory(formDTO) < NumConstant.ONE) {
+            logger.error(String.format("分类删除失败，客户Id->%s,分类Id->%s", formDTO.getCustomerId(), formDTO.getCategoryId()));
+            throw new RuntimeException("分类删除失败！");
+        }
+
     }
 
     @Override
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
index ef271342d3..d5fc89045e 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
@@ -57,6 +57,20 @@
         AND ISSUE_ID = #{issueId}
     </select>
 
+    <select id="selectIssueList" resultType="com.epmet.dto.IssueCategoryDTO">
+        SELECT
+           *
+        FROM issue_category
+        WHERE del_flag = '0'
+        AND customer_id = #{customerId}
+        <if test="level != null and '' != level and '1' == level ">
+            AND category_pids = #{categoryId}
+        </if>
+        <if test="level != null and '' != level and '2' == level ">
+            AND category_id = #{categoryId}
+        </if>
+    </select>
+
     <delete id="delByIssueId">
         DELETE
         FROM
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 5054069566..ac2dcd2730 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
@@ -113,4 +113,29 @@
             AND d.PID != '0'
         </if>
     </select>
+
+    <select id="selectByCustomerId" resultType="com.epmet.dto.IssueProjectCategoryDictDTO">
+        SELECT
+            *
+        FROM
+            issue_project_category_dict
+        WHERE
+            del_flag = '0'
+        AND customer_id = #{customerId}
+        AND id = #{categoryId}
+    </select>
+
+    <update id="delCategory">
+        UPDATE issue_project_category_dict
+        SET DEL_FLAG = '1'
+        WHERE
+        CUSTOMER_ID = #{customerId}
+        <if test="level != null and '' != level and '1' == level ">
+            AND id = #{categoryId}
+        </if>
+        <if test="level != null and '' != level and '2' == level ">
+            AND pid = #{categoryId}
+        </if>
+    </update>
+
 </mapper>
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/DelCategoryFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/DelCategoryFormDTO.java
new file mode 100644
index 0000000000..c1fa3252c6
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/DelCategoryFormDTO.java
@@ -0,0 +1,35 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 分类删除-接口入参
+ * @Author sun
+ */
+@Data
+public class DelCategoryFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 2599592072265715951L;
+    public interface DelCategory{}
+
+    /**
+     * 客户Id
+     */
+    @NotBlank(message = "客户ID不能为空",groups = {DelCategory.class})
+    private String customerId;
+    /**
+     * 分类Id
+     */
+    @NotBlank(message = "分类ID不能为空",groups = {DelCategory.class})
+    private String categoryId;
+    /**
+     * 分类级别 1:一类  2:二类
+     */
+    private String level;
+
+
+}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java
index 49b573f0be..e3246e8bae 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java
@@ -2,7 +2,9 @@ package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.ProjectCategoryDTO;
 import com.epmet.dto.ProjectDTO;
+import com.epmet.dto.form.DelCategoryFormDTO;
 import com.epmet.dto.form.ProcessListFormDTO;
 import com.epmet.dto.form.ProjectByCreateTopicUserFormDTO;
 import com.epmet.dto.form.ProjectListFromDTO;
@@ -77,4 +79,11 @@ public interface GovProjectOpenFeignClient {
 
 	@GetMapping("gov/project/project/queryprojectinfobyprojectid/{projectId}")
 	Result<ProjectInfoDTO> queryProjectInfoByProjectId(@PathVariable("projectId")String projectId);
+
+	/**
+	 * @Description 判断分类有没有被项目使用
+	 * @Author sun
+	 **/
+	@PostMapping("gov/project/projectcategory/getprojectcategorylist")
+	Result<List<ProjectCategoryDTO>> getProjectCategoryList(@RequestBody DelCategoryFormDTO formDTO);
 }
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java
index ca4488be17..f03dabfef1 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java
@@ -3,7 +3,9 @@ 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.ProjectCategoryDTO;
 import com.epmet.dto.ProjectDTO;
+import com.epmet.dto.form.DelCategoryFormDTO;
 import com.epmet.dto.form.ProcessListFormDTO;
 import com.epmet.dto.form.ProjectByCreateTopicUserFormDTO;
 import com.epmet.dto.form.ProjectListFromDTO;
@@ -71,4 +73,9 @@ public class GovProjectOpenFeignClientFallback implements GovProjectOpenFeignCli
 	public Result<ProjectInfoDTO> queryProjectInfoByProjectId(String projectId) {
 		return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "queryProjectInfoByProjectId", projectId);
 	}
+
+	@Override
+	public Result<List<ProjectCategoryDTO>> getProjectCategoryList(DelCategoryFormDTO formDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "getProjectCategoryList", formDTO);
+	}
 }
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 d1392bd0a6..ff9417e6ca 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
@@ -30,6 +30,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.ProjectCategoryDTO;
+import com.epmet.dto.form.DelCategoryFormDTO;
 import com.epmet.dto.form.ProjectCategoryTagListFormDTO;
 import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
 import com.epmet.dto.result.ProjectCategoryTagListResultDTO;
@@ -125,4 +126,14 @@ public class ProjectCategoryController {
         return new Result();
     }
 
+    /**
+     * @param formDTO
+     * @Description 判断分类有没有被项目使用
+     * @Author sun
+     **/
+    @PostMapping("getprojectcategorylist")
+    public Result<List<ProjectCategoryDTO>> getProjectCategoryList(@RequestBody DelCategoryFormDTO formDTO) {
+        return new Result<List<ProjectCategoryDTO>>().ok(projectCategoryService.getProjectCategoryList(formDTO));
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectCategoryDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectCategoryDao.java
index 424adbbc50..247f239261 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectCategoryDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectCategoryDao.java
@@ -18,6 +18,8 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.ProjectCategoryDTO;
+import com.epmet.dto.form.DelCategoryFormDTO;
 import com.epmet.entity.ProjectCategoryEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -44,4 +46,10 @@ public interface ProjectCategoryDao extends BaseDao<ProjectCategoryEntity> {
      * @Author sun
      **/
     void delByProjectId(@Param("projectId") String projectId);
+
+    /**
+     * @Description 判断分类有没有被项目使用
+     * @Author sun
+     **/
+    List<ProjectCategoryDTO> selectProjectCategoryList(DelCategoryFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectCategoryService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectCategoryService.java
index d975623295..37fb5fa984 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectCategoryService.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectCategoryService.java
@@ -20,6 +20,7 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.ProjectCategoryDTO;
+import com.epmet.dto.form.DelCategoryFormDTO;
 import com.epmet.dto.form.ProjectCategoryTagListFormDTO;
 import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
 import com.epmet.dto.result.ProjectCategoryTagListResultDTO;
@@ -111,4 +112,11 @@ public interface ProjectCategoryService extends BaseService<ProjectCategoryEntit
      * @Author sun
      **/
     void saveCategory(ProjectSaveCategoryFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @Description 判断分类有没有被项目使用
+     * @Author sun
+     **/
+    List<ProjectCategoryDTO> getProjectCategoryList(DelCategoryFormDTO formDTO);
 }
\ No newline at end of file
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 f2a12df324..4562835095 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
@@ -29,6 +29,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.ProjectCategoryDao;
 import com.epmet.dao.ProjectTagsDao;
 import com.epmet.dto.ProjectCategoryDTO;
+import com.epmet.dto.form.DelCategoryFormDTO;
 import com.epmet.dto.form.ProjectCategoryTagListFormDTO;
 import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
 import com.epmet.dto.result.*;
@@ -192,4 +193,14 @@ public class ProjectCategoryServiceImpl extends BaseServiceImpl<ProjectCategoryD
 
     }
 
+    /**
+     * @param formDTO
+     * @Description 判断分类有没有被项目使用
+     * @Author sun
+     **/
+    @Override
+    public List<ProjectCategoryDTO> getProjectCategoryList(DelCategoryFormDTO formDTO) {
+        return baseDao.selectProjectCategoryList(formDTO);
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml
index 09dbfae3a9..bb6a148e90 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml
@@ -13,6 +13,20 @@
         AND project_id = #{projectId}
     </select>
 
+    <select id="selectProjectCategoryList" resultType="com.epmet.dto.ProjectCategoryDTO">
+        SELECT
+        *
+        FROM project_category
+        WHERE del_flag = '0'
+        AND customer_id = #{customerId}
+        <if test="level != null and '' != level and '1' == level ">
+            AND category_pids = #{categoryId}
+        </if>
+        <if test="level != null and '' != level and '2' == level ">
+            AND category_id = #{categoryId}
+        </if>
+    </select>
+
     <delete id="delByProjectId">
         DELETE
         FROM

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 067/119] =?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<FactOriginProjectCategoryDailyEntity> {
-	
-}
\ 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<IssueProjectCategoryDictEntity> listInsertCategoies(@Param("start") Date start, @Param("end") Date end);
 
     List<IssueProjectCategoryDictEntity> 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<ProjectEntity> {
      * @date 2021.03.08 23:44
     */
     List<ProjectCategoryDTO> selectProjectCategory(@Param("list")List<String> list);
-}
\ No newline at end of file
+
+    List<com.epmet.dto.ProjectCategoryDTO> 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<IssueProjectCategoryDictEntity> listInsertCategoies(Date start, Date end);
 
     List<IssueProjectCategoryDictEntity> 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<FactOriginProjectCategoryDailyEntity> {
-    //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<FactOriginProjectCategoryDailyDao, FactOriginProjectCategoryDailyEntity> 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<FactOriginProjectCategoryDailyEntity> entities = new ArrayList<>();
+        Integer count = baseDao.selectCount(new QueryWrapper<FactOriginProjectCategoryDailyEntity>().eq("customer_id",customerId));
+        //如果count = 0 初始化该customer所有数据
+        if (NumConstant.ZERO == count){
+            dateString = null;
+        }
+        List<ProjectCategoryDTO> 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<FactOriginProjectCategoryDailyEntity> 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<ProjectEntity> {
     */
     Map<String,Set<String>> getProjectCategory(List<String> projectIds);
 
-}
\ No newline at end of file
+    /**
+     * @Description 抽取project_category
+     * @param customerId
+     * @param dateId
+     * @return java.util.List<com.epmet.dto.ProjectCategoryDTO>
+     * @Author liushaowen
+     * @Date 2021/3/22 15:44
+     */
+    List<ProjectCategoryDTO> 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<ProjectDao, ProjectEntit
 		return map;
 	}
 
+	/**
+	 * @param customerId
+	 * @param dateId
+	 * @return java.util.List<com.epmet.dto.ProjectCategoryDTO>
+	 * @Description 抽取project_category
+	 * @Author liushaowen
+	 * @Date 2021/3/22 15:44
+	 */
+	@Override
+	public List<com.epmet.dto.ProjectCategoryDTO> 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 @@
 
 <mapper namespace="com.epmet.dao.evaluationindex.extract.FactOriginProjectCategoryDailyDao">
 
+    <delete id="deleteOldData">
+        DELETE
+        FROM
+            fact_origin_project_category_daily
+        WHERE
+            CUSTOMER_ID = #{customerId}
+            <if test="dateId != null">
+                AND DATE_FORMAT(CREATED_TIME,'%Y%m%d') = #{dateId}
+            </if>
+    </delete>
 
-
-</mapper>
\ No newline at end of file
+</mapper>
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
     </select>
 
-</mapper>
\ No newline at end of file
+    <select id="getById" resultType="com.epmet.entity.issue.IssueProjectCategoryDictEntity">
+        select *
+        from issue_project_category_dict
+        where del_flag = '0'
+          and customer_id = #{customerId}
+          and id = #{id}
+    </select>
+</mapper>
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'
     </select>
-    
+
     <select id="selectProjectExceedParams" resultType="com.epmet.dto.project.result.ProjectExceedParamsResultDTO">
             select
          IF(customer_id = 'default' <![CDATA[&&]]> PARAMETER_KEY = 'detention_days',PARAMETER_VALUE,null) as defaultExceedLimit,
@@ -135,4 +135,14 @@
             project_id = #{id}
         </foreach>
     </select>
-</mapper>
\ No newline at end of file
+
+    <select id="getProjectCategoryData" resultType="com.epmet.dto.ProjectCategoryDTO">
+        select * from
+         `project_category`
+        where del_flag = '0'
+        and customer_id = #{customerId}
+        <if test="dateId != null">
+            AND DATE_FORMAT(CREATED_TIME,'%Y%m%d')=#{dateId}
+        </if>
+    </select>
+</mapper>

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 068/119] =?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<F
                 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.setLevel(Integer.valueOf(categoryDictEntity.getCategoryType()));
                 insertEntity.setCreatedTime(data.getCreatedTime());
                 entities.add(insertEntity);
             });

From ddc38610ba40a8675d9400fab96a683f3ad55370 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 22 Mar 2021 17:58:41 +0800
Subject: [PATCH 069/119] =?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<Scree
      * @return void
      */
     void collect(ScreenCollFormDTO<ScreenProjectCategoryGridDailyDTO> 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<S
         }
     }
 
+    /**
+     * @param customerId
+     * @param dateId
+     * @return void
+     * @author yinzuomei
+     * @description 产品内部计算：网格内按分类统计项目数量
+     * @Date 2021/3/22 16:46
+     **/
+    @Override
+    public void extractProjectCategoryData(String customerId, String dateId) {
+        //todo
+    }
+
 }
\ No newline at end of file

From 09455ae033aabe584710336435429f43eeb03ad3 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Mon, 22 Mar 2021 18:01:28 +0800
Subject: [PATCH 070/119] =?UTF-8?q?=E7=BB=99=E6=A0=87=E7=AD=BE=E7=83=AD?=
 =?UTF-8?q?=E5=BA=A6=E7=BC=93=E5=AD=98dto=E5=8A=A0=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/result/IssueCategoryTagResultDTO.java | 5 +++++
 .../epmet/service/impl/IssueProjectTagDictServiceImpl.java   | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueCategoryTagResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueCategoryTagResultDTO.java
index a36724d35a..bfd9eec5f4 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueCategoryTagResultDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueCategoryTagResultDTO.java
@@ -23,7 +23,12 @@ public class IssueCategoryTagResultDTO implements Serializable {
 	 */
 	private String name;
 
+	/**
+	 * 是否禁用(enable:启用 disable:禁用)
+	 */
+	private String isDisable;
 
+	//equals计算时忽略isDisable属性
 	@Override
 	public boolean equals(Object o) {
 		if (this == o) return true;
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
index 2fe298a91a..5919990477 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
@@ -170,7 +170,7 @@ public class IssueProjectTagDictServiceImpl extends BaseServiceImpl<IssueProject
                 tags.forEach(tag -> {
                     String redisKey = GovIssueRedisKeys.getGovernmentTagKey(param.getCustomerId(),tag.getCategoryId());
                     IssueCategoryTagResultDTO cache = new IssueCategoryTagResultDTO();
-                    cache.setId(tag.getId());cache.setName(tag.getTagName());
+                    cache.setId(tag.getId());cache.setName(tag.getTagName());cache.setIsDisable(tag.getIsDisable());
                     if(CollectionUtils.isNotEmpty(value.get(redisKey))){
                         value.get(redisKey).add(cache);
                     }else{
@@ -191,7 +191,7 @@ public class IssueProjectTagDictServiceImpl extends BaseServiceImpl<IssueProject
                 tags.forEach(tag -> {
                     String redisKey = GovIssueRedisKeys.getGovernmentTagKey(param.getCustomerId(),tag.getCategoryId());
                     IssueCategoryTagResultDTO cache = new IssueCategoryTagResultDTO();
-                    cache.setId(tag.getId());cache.setName(tag.getTagName());
+                    cache.setId(tag.getId());cache.setName(tag.getTagName());cache.setIsDisable(tag.getIsDisable());
                     if(CollectionUtils.isNotEmpty(value.get(redisKey))){
                         value.get(redisKey).add(cache);
                     }else{

From 6581047b40ae2508e2792fdd2167a045d533856b Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 23 Mar 2021 10:21:28 +0800
Subject: [PATCH 071/119] =?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=20start1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/controller/DemoController.java  | 21 +++++---
 .../FactOriginProjectCategoryDailyDao.java    | 11 +++++
 ...FactOriginProjectCategoryDailyService.java | 11 +++++
 ...OriginProjectCategoryDailyServiceImpl.java | 14 ++++++
 ...enProjectCategoryGridDailyServiceImpl.java | 11 ++++-
 .../FactOriginProjectCategoryDailyDao.xml     | 48 +++++++++++++++++++
 6 files changed, 108 insertions(+), 8 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
index 4bb409b6eb..85befe73c6 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
@@ -2,6 +2,7 @@ package com.epmet.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -37,10 +38,7 @@ import com.epmet.service.evaluationindex.extract.dataToIndex.*;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginTopicMainDailyService;
 import com.epmet.service.evaluationindex.extract.toscreen.*;
 import com.epmet.service.evaluationindex.indexcal.*;
-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.DimAgencyService;
 import com.epmet.service.stats.DimCustomerPartymemberService;
 import lombok.extern.slf4j.Slf4j;
@@ -49,6 +47,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
@@ -103,6 +102,11 @@ public class DemoController {
     private GovernRankDataExtractService governRankDataExtractService;
     @Autowired
     private OrgRankExtractService orgRankExtractService;
+    @Autowired
+    private ScreenProjectSettleService screenProjectSettleService;
+    @Autowired
+    private ScreenProjectCategoryGridDailyService projectCategoryGridDailyService;
+
     @GetMapping("testAlarm")
     public void testAlarm() {
         //for (int i = 0; i < 20; i++) {
@@ -815,8 +819,6 @@ public class DemoController {
         return new Result();
     }*/
 
-    @Autowired
-    private ScreenProjectSettleService screenProjectSettleService;
     @PostMapping("project-test")
     public Result project(@RequestBody ScreenCentralZoneDataFormDTO param){
         screenProjectSettleService.extractScreenData(param);
@@ -828,4 +830,11 @@ public class DemoController {
             System.out.println(monthId);
         }
     }
+
+    @PostMapping("extractProjectCategoryData")
+    public Result extractProjectCategoryData(@RequestParam("customerId") String customerId){
+        String dateId = LocalDate.now().minusDays(NumConstant.ONE).toString().replace("-", "");
+        projectCategoryGridDailyService.extractProjectCategoryData(customerId,dateId);
+        return new Result();
+    }
 }
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 537468724a..010004d7ba 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
@@ -18,10 +18,13 @@
 package com.epmet.dao.evaluationindex.extract;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screen.ScreenProjectCategoryGridDailyDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectCategoryDailyEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 项目所属分类表
  *
@@ -32,4 +35,12 @@ import org.apache.ibatis.annotations.Param;
 public interface FactOriginProjectCategoryDailyDao extends BaseDao<FactOriginProjectCategoryDailyEntity> {
 
     void deleteOldData(@Param("customerId") String customerId,@Param("dateId") String dateId);
+
+    /**
+     * @param customerId
+     * @author yinzuomei
+     * @description 计算当前客户下，各个网格内，各项目分类下项目数量
+     * @Date 2021/3/23 9:58
+     **/
+    List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryGridDailyDTO(@Param("customerId") String customerId);
 }
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 70b5a73adb..1a0a27eda9 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
@@ -19,8 +19,11 @@ package com.epmet.service.evaluationindex.extract.todata;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
+import com.epmet.dto.screen.ScreenProjectCategoryGridDailyDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectCategoryDailyEntity;
 
+import java.util.List;
+
 /**
  * 项目所属分类表
  *
@@ -36,4 +39,12 @@ public interface FactOriginProjectCategoryDailyService extends BaseService<FactO
      * @Date 2021/3/22 15:28
      */
     void extractProjectCategory(ExtractOriginFormDTO paramNew);
+
+    /**
+     * @param customerId
+     * @author yinzuomei
+     * @description 计算当前客户下，各个网格内，各项目分类下项目数量
+     * @Date 2021/3/23 9:56
+     **/
+    List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryGridDailyDTO(String customerId);
 }
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 3f9a27c34b..c97322b4b4 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,6 +25,7 @@ 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.screen.ScreenProjectCategoryGridDailyDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectCategoryDailyEntity;
 import com.epmet.entity.issue.IssueProjectCategoryDictEntity;
 import com.epmet.service.Issue.IssueProjectCategoryDictService;
@@ -105,4 +106,17 @@ public class FactOriginProjectCategoryDailyServiceImpl extends BaseServiceImpl<F
         baseDao.deleteOldData(customerId, dateId);
         insertBatch(result);
     }
+
+
+    /**
+     * @param customerId
+     * @author yinzuomei
+     * @description 计算当前客户下，各个网格内，各项目分类下项目数量
+     * @Date 2021/3/23 9:56
+     **/
+    @Override
+    public List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryGridDailyDTO(String customerId) {
+        List<ScreenProjectCategoryGridDailyDTO> list=baseDao.selectListProjectCategoryGridDailyDTO(customerId);
+        return list;
+    }
 }
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 a7be71b6ae..5901e47b35 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
@@ -30,8 +30,11 @@ import com.epmet.dao.evaluationindex.screen.ScreenProjectCategoryGridDailyDao;
 import com.epmet.dto.screen.ScreenProjectCategoryGridDailyDTO;
 import com.epmet.dto.screencoll.ScreenCollFormDTO;
 import com.epmet.entity.evaluationindex.screen.ScreenProjectCategoryGridDailyEntity;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectCategoryDailyService;
 import com.epmet.service.evaluationindex.screen.ScreenProjectCategoryGridDailyService;
+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;
@@ -46,10 +49,12 @@ import java.util.Map;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-02-23
  */
+@Slf4j
 @Service
 @DataSource(DataSourceConstant.EVALUATION_INDEX)
 public class ScreenProjectCategoryGridDailyServiceImpl extends BaseServiceImpl<ScreenProjectCategoryGridDailyDao, ScreenProjectCategoryGridDailyEntity> implements ScreenProjectCategoryGridDailyService {
-
+    @Autowired
+    private FactOriginProjectCategoryDailyService factOriginProjectCategoryDailyService;
 
     @Override
     public PageData<ScreenProjectCategoryGridDailyDTO> page(Map<String, Object> params) {
@@ -138,7 +143,9 @@ public class ScreenProjectCategoryGridDailyServiceImpl extends BaseServiceImpl<S
      **/
     @Override
     public void extractProjectCategoryData(String customerId, String dateId) {
-        //todo
+        List<ScreenProjectCategoryGridDailyDTO> listDTO= factOriginProjectCategoryDailyService.selectListProjectCategoryGridDailyDTO(customerId);
+        boolean insertRes=insertBatch(ConvertUtils.sourceToTarget(listDTO, ScreenProjectCategoryGridDailyEntity.class));
+        log.info("insertRes is {}",insertRes);
     }
 
 }
\ 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 73b0945d0b..451acb81d5 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
@@ -14,4 +14,52 @@
             </if>
     </delete>
 
+    <!-- 计算当前客户下，各个网格内，各项目分类下项目数量 -->
+    <!--  先算出二级分类的 + 一级分类  -->
+    <select id="selectListProjectCategoryGridDailyDTO" parameterType="map" resultType="com.epmet.dto.screen.ScreenProjectCategoryGridDailyDTO">
+            SELECT
+                c.CUSTOMER_ID,
+                c.CATEGORY_CODE,
+                c.`LEVEL`,
+                p.GRID_ID,
+                p.AGENCY_ID AS PID,
+                P.PIDS,
+                count(1)as projectTotal
+            FROM
+                fact_origin_project_category_daily c
+                LEFT JOIN fact_origin_project_main_daily p ON ( c.PROJECT_Id = p.id and p.del_flag='0')
+            WHERE
+                c.DEL_FLAG = '0'
+                AND c.CUSTOMER_ID = #{customerId}
+                AND c.`LEVEL` = '2'
+            GROUP BY
+                c.CUSTOMER_ID,
+                c.CATEGORY_CODE,
+                c.`LEVEL`,
+                p.GRID_ID,
+                p.AGENCY_ID,
+                P.PIDS
+                union all
+            SELECT
+                c.CUSTOMER_ID,
+                left(c.CATEGORY_CODE, 4) as CATEGORY_CODE,
+                c.`LEVEL`,
+                p.GRID_ID,
+                p.AGENCY_ID AS PID,
+                P.PIDS,
+                count(distinct c.project_id)as projectTotal
+            FROM
+                fact_origin_project_category_daily c
+                LEFT JOIN fact_origin_project_main_daily p ON ( c.PROJECT_Id = p.id and p.del_flag='0')
+            WHERE
+                c.DEL_FLAG = '0'
+                AND c.CUSTOMER_ID = #{customerId}
+            GROUP BY
+                c.CUSTOMER_ID,
+                left(c.CATEGORY_CODE, 4),
+                c.`LEVEL`,
+                p.GRID_ID,
+                p.AGENCY_ID,
+                P.PIDS
+    </select>
 </mapper>

From fc3952b77aa2b197e2f9f250dc813152f0ad1a5d Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 23 Mar 2021 10:34:28 +0800
Subject: [PATCH 072/119] =?UTF-8?q?=E5=90=AF=E7=94=A8=E3=80=81=E7=A6=81?=
 =?UTF-8?q?=E7=94=A8=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IssueProjectCategoryDictController.java   | 15 ++++----
 .../dao/IssueProjectCategoryDictDao.java      | 11 ++++++
 .../IssueProjectCategoryDictService.java      |  7 ++--
 .../IssueProjectCategoryDictServiceImpl.java  | 33 +++++++++++++++--
 .../mapper/IssueProjectCategoryDictDao.xml    | 25 +++++++++++--
 .../dto/form/IsDisableCategoryFormDTO.java    | 36 +++++++++++++++++++
 6 files changed, 112 insertions(+), 15 deletions(-)
 create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IsDisableCategoryFormDTO.java

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 484636d73f..bc6a3607c6 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
@@ -28,16 +28,14 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 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.DelCategoryFormDTO;
-import com.epmet.dto.form.IssueProjectCategoryDictListFormDTO;
-import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
+import com.epmet.dto.form.*;
 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 com.epmet.utils.ModuleConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -154,8 +152,13 @@ public class IssueProjectCategoryDictController {
      * @Author sun
      **/
     @PostMapping("isdisablecategory")
-    public Result<ProjectIssueCategoryResultDTO> isDisableCategory(@RequestBody ProjectSaveCategoryFormDTO formDTO) {
-        return new Result<ProjectIssueCategoryResultDTO>().ok(issueProjectCategoryDictService.isDisableCategory(formDTO));
+    public Result isDisableCategory(@RequestBody IsDisableCategoryFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, IsDisableCategoryFormDTO.IsDisableCategory.class);
+        if(!ModuleConstants.ID_ENABLE.equals(formDTO.getType())&&!ModuleConstants.IS_DISABLE.equals(formDTO.getType())){
+            throw new RuntimeException("参数错误，操作类型值错误！");
+        }
+        issueProjectCategoryDictService.isDisableCategory(formDTO);
+        return new Result();
     }
 
     /**
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 45ec49e689..6698b28722 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
@@ -20,6 +20,7 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.IssueProjectCategoryDictDTO;
 import com.epmet.dto.form.DelCategoryFormDTO;
+import com.epmet.dto.form.IsDisableCategoryFormDTO;
 import com.epmet.dto.form.IssueProjectCategoryDictListFormDTO;
 import com.epmet.dto.result.CustomerCategoryListResultDTO;
 import com.epmet.entity.IssueProjectCategoryDictEntity;
@@ -101,5 +102,15 @@ public interface IssueProjectCategoryDictDao extends BaseDao<IssueProjectCategor
      */
     int delCategory(DelCategoryFormDTO formDTO);
 
+    /**
+     * 查询客户全部子类分类信息
+     * @author sun
+     */
+    List<ProjectCategoryDictResultDTO> selectSubCustomerCategoryDict(@Param("customerId") String customerId, @Param("pid") String pid);
 
+    /**
+     * 批量修改分类启用、禁用状态
+     * @author sun
+     */
+    int updateCustomerCategory(IsDisableCategoryFormDTO formDTO);
 }
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 067c0a059d..55fc4871c3 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
@@ -20,10 +20,7 @@ package com.epmet.service;
 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.DelCategoryFormDTO;
-import com.epmet.dto.form.IssueProjectCategoryDictListFormDTO;
-import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.CustomerCategoryListResultDTO;
 import com.epmet.dto.result.ProjectIssueCategoryResultDTO;
 import com.epmet.entity.IssueProjectCategoryDictEntity;
@@ -137,7 +134,7 @@ public interface IssueProjectCategoryDictService extends BaseService<IssueProjec
      * @Description 分类启用与禁用
      * @Author sun
      **/
-    ProjectIssueCategoryResultDTO isDisableCategory(ProjectSaveCategoryFormDTO formDTO);
+    void isDisableCategory(IsDisableCategoryFormDTO formDTO);
 
     /**
      * @Description 分类删除
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 e056f436df..0a9a266b67 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
@@ -54,6 +54,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -220,8 +221,35 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
      * @Author sun
      **/
     @Override
-    public ProjectIssueCategoryResultDTO isDisableCategory(ProjectSaveCategoryFormDTO formDTO) {
-        return null;
+    @Transactional(rollbackFor = Exception.class)
+    public void isDisableCategory(IsDisableCategoryFormDTO formDTO) {
+        //1.查询客户分类信息
+        IssueProjectCategoryDictDTO dto = baseDao.selectByCustomerId(formDTO.getCustomerId(), formDTO.getCategoryId());
+        if (null == dto) {
+            throw new RuntimeException("未查询到客户分类信息！");
+        }
+        //2.汇总二级分类Id集合
+        //待修改的分类Id汇总
+        List<String> categoryList = new ArrayList<>();
+        //待修改的二级分类Id汇总
+        List<String> secondList = new ArrayList<>();
+        if("1".equals(dto.getCategoryType())){
+            //2-1.查询子类信息
+            List<ProjectCategoryDictResultDTO> subList = baseDao.selectSubCustomerCategoryDict(formDTO.getCustomerId(),formDTO.getCategoryId());
+            secondList = subList.stream().map(sub->sub.getId()).collect(Collectors.toList());
+            categoryList.add(formDTO.getCategoryId());
+        }else {
+            secondList.add(formDTO.getCategoryId());
+        }
+        categoryList.addAll(secondList);
+        formDTO.setCategoryList(categoryList);
+
+        //3.修改标签、分类表数据状态
+        if(baseDao.updateCustomerCategory(formDTO)<NumConstant.ONE){
+            logger.error(String.format("修改分类信息状态失败，客户Id->%s,分类Id->%s", formDTO.getCustomerId(), formDTO.getCategoryId()));
+            throw new RuntimeException("分类信息修改失败！");
+        }
+        //4.修改缓存中标签状态 todo
     }
 
 
@@ -231,6 +259,7 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
      * @Author sun
      **/
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void delCategory(DelCategoryFormDTO formDTO) {
         //1.查询分类信息
         IssueProjectCategoryDictDTO dto = baseDao.selectByCustomerId(formDTO.getCustomerId(), formDTO.getCategoryId());
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 ac2dcd2730..7752ab2c35 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
@@ -125,11 +125,22 @@
         AND id = #{categoryId}
     </select>
 
+    <select id="selectSubCustomerCategoryDict" resultType="com.epmet.project.dto.result.ProjectCategoryDictResultDTO">
+        SELECT
+            *
+        FROM
+            issue_project_category_dict
+        WHERE
+            del_flag = '0'
+        AND customer_id = #{customerId}
+        AND pid = #{categoryId}
+    </select>
+
     <update id="delCategory">
         UPDATE issue_project_category_dict
-        SET DEL_FLAG = '1'
+        SET del_flag = '1'
         WHERE
-        CUSTOMER_ID = #{customerId}
+            customer_id = #{customerId}
         <if test="level != null and '' != level and '1' == level ">
             AND id = #{categoryId}
         </if>
@@ -138,4 +149,14 @@
         </if>
     </update>
 
+    <update id="updateCustomerCategory">
+        UPDATE issue_project_category_dict
+        SET is_disable = #{type}
+        WHERE
+            customer_id = #{customerId}
+        <foreach item="ids" collection="categoryList" separator="OR" open="AND (" close=")" index="">
+            id = #{ids}
+        </foreach>
+    </update>
+
 </mapper>
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IsDisableCategoryFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IsDisableCategoryFormDTO.java
new file mode 100644
index 0000000000..e259fd81a9
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IsDisableCategoryFormDTO.java
@@ -0,0 +1,36 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 议题：保存/修改分类-接口入参
+ * @Author sun
+ */
+@Data
+public class IsDisableCategoryFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 2599592072265715951L;
+    public interface IsDisableCategory{}
+    /**
+     * 客户Id
+     */
+    @NotBlank(message = "客户ID不能为空",groups = {IsDisableCategory.class})
+    private String customerId;
+    /**
+     * 分类Id
+     */
+    @NotBlank(message = "分类ID不能为空",groups = {IsDisableCategory.class})
+    private String categoryId;
+    /**
+     * 操作类型(启用:enable 禁用:disable)
+     */
+    @NotBlank(message = "是否启用类型不能为空",groups = {IsDisableCategory.class})
+    private String type;
+
+    private List<String> categoryList;
+
+}

From c779d674bc3c2b82d09b7e18362c882fbc958d40 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 23 Mar 2021 10:53:30 +0800
Subject: [PATCH 073/119] =?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=20start2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/controller/DemoController.java  | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
index 85befe73c6..720b3d9a23 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
@@ -35,6 +35,7 @@ import com.epmet.entity.stats.DimDateEntity;
 import com.epmet.entity.stats.DimMonthEntity;
 import com.epmet.service.StatsDemoService;
 import com.epmet.service.evaluationindex.extract.dataToIndex.*;
+import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectCategoryDailyService;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginTopicMainDailyService;
 import com.epmet.service.evaluationindex.extract.toscreen.*;
 import com.epmet.service.evaluationindex.indexcal.*;
@@ -106,6 +107,8 @@ public class DemoController {
     private ScreenProjectSettleService screenProjectSettleService;
     @Autowired
     private ScreenProjectCategoryGridDailyService projectCategoryGridDailyService;
+    @Autowired
+    private FactOriginProjectCategoryDailyService originProjectCategoryDailyService;
 
     @GetMapping("testAlarm")
     public void testAlarm() {
@@ -831,10 +834,29 @@ public class DemoController {
         }
     }
 
+    /**
+     * @return com.epmet.commons.tools.utils.Result
+     * @param customerId
+     * @author yinzuomei
+     * @description 产品内部计算：网格内按分类统计项目数量
+     * @Date 2021/3/23 10:52
+     **/
     @PostMapping("extractProjectCategoryData")
     public Result extractProjectCategoryData(@RequestParam("customerId") String customerId){
         String dateId = LocalDate.now().minusDays(NumConstant.ONE).toString().replace("-", "");
         projectCategoryGridDailyService.extractProjectCategoryData(customerId,dateId);
         return new Result();
     }
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result
+     * @author yinzuomei
+     * @description  将epmet_gov_project库中的项目分类信息（project_category）同步到统计库epmet_data_statistical
+     * @Date 2021/3/23 10:52
+     **/
+    @PostMapping("extractProjectCategory")
+    public Result extractProjectCategory(@RequestBody ExtractOriginFormDTO formDTO){
+        originProjectCategoryDailyService.extractProjectCategory(formDTO);
+        return new Result();
+    }
 }

From c72cf84966b4995d56d4fb512b4d30669b3497dd Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 23 Mar 2021 11:03:54 +0800
Subject: [PATCH 074/119] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dao/crm/CustomerRelationDao.java    |  8 ++
 .../service/crm/CustomerRelationService.java  | 10 +++
 .../crm/impl/CustomerRelationServiceImpl.java | 16 ++++
 .../ScreenProjectCategoryOrgDailyService.java |  9 +++
 ...eenProjectCategoryOrgDailyServiceImpl.java | 74 +++++++++++++++++++
 .../mapper/crm/CustomerRelationDao.xml        |  5 ++
 6 files changed, 122 insertions(+)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/crm/CustomerRelationDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/crm/CustomerRelationDao.java
index fabee946e7..11ec9c119c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/crm/CustomerRelationDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/crm/CustomerRelationDao.java
@@ -43,4 +43,12 @@ public interface CustomerRelationDao extends BaseDao<CustomerRelationEntity> {
     CustomerSubInfoDTO selectCustomerSubInfo(@Param("customerId")String customerId);
 
     List<CustomerRelationEntity> selectListByPids(String customerId);
+
+    /**
+     * @Description  查询子级客户
+     * @Param customerId
+     * @author zxc
+     * @date 2021/3/23 上午10:21
+     */
+    List<CustomerRelationEntity> selectSubCustomer(@Param("customerId") String customerId);
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/crm/CustomerRelationService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/crm/CustomerRelationService.java
index f139c49bab..4c2a37620f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/crm/CustomerRelationService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/crm/CustomerRelationService.java
@@ -22,6 +22,8 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.dto.indexcal.CustomerSubInfoDTO;
 import com.epmet.entity.crm.CustomerRelationEntity;
 
+import java.util.List;
+
 /**
  * 客户关系表(01.14 add)
  *
@@ -40,4 +42,12 @@ public interface CustomerRelationService extends BaseService<CustomerRelationEnt
     CustomerSubInfoDTO getCustomerSubInfo(String customerId);
 
     boolean haveSubCustomer(String customerId);
+
+    /**
+     * @Description  查询子级客户
+     * @Param customerId
+     * @author zxc
+     * @date 2021/3/23 上午10:21
+     */
+    List<CustomerRelationEntity> selectSubCustomer(String customerId);
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/crm/impl/CustomerRelationServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/crm/impl/CustomerRelationServiceImpl.java
index cab6ed0adc..06d2b580fc 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/crm/impl/CustomerRelationServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/crm/impl/CustomerRelationServiceImpl.java
@@ -27,9 +27,11 @@ import com.epmet.entity.crm.CustomerRelationEntity;
 import com.epmet.service.crm.CustomerRelationService;
 import com.epmet.service.stats.DimCustomerService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -70,4 +72,18 @@ public class CustomerRelationServiceImpl extends BaseServiceImpl<CustomerRelatio
         }
         return true;
     }
+
+    /**
+     * @Description  查询子级客户
+     * @Param customerId
+     * @author zxc
+     * @date 2021/3/23 上午10:21
+     */
+    @Override
+    public List<CustomerRelationEntity> selectSubCustomer(String customerId) {
+        if (StringUtils.isEmpty(customerId)){
+            return new ArrayList<>();
+        }
+        return baseDao.selectSubCustomer(customerId);
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectCategoryOrgDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectCategoryOrgDailyService.java
index ce71722794..150c15a0d4 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectCategoryOrgDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectCategoryOrgDailyService.java
@@ -102,4 +102,13 @@ public interface ScreenProjectCategoryOrgDailyService extends BaseService<Screen
      * @return void
      */
     void collect(ScreenCollFormDTO<ScreenProjectCategoryOrgDailyDTO> param);
+
+    /**
+     * @Description  按组织计算分类统计项目数量
+     * @Param customerId
+     * @Param dateId
+     * @author zxc
+     * @date 2021/3/23 上午10:07
+     */
+    void extractProjectCategoryOrgData(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/ScreenProjectCategoryOrgDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java
index 5660fad150..c9af2a289c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java
@@ -29,14 +29,19 @@ import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.evaluationindex.screen.ScreenProjectCategoryOrgDailyDao;
 import com.epmet.dto.screen.ScreenProjectCategoryOrgDailyDTO;
 import com.epmet.dto.screencoll.ScreenCollFormDTO;
+import com.epmet.entity.crm.CustomerRelationEntity;
 import com.epmet.entity.evaluationindex.screen.ScreenProjectCategoryOrgDailyEntity;
+import com.epmet.service.crm.CustomerRelationService;
 import com.epmet.service.evaluationindex.screen.ScreenProjectCategoryOrgDailyService;
 import com.google.common.collect.Lists;
+import org.apache.commons.collections4.ListUtils;
 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.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -51,6 +56,8 @@ import java.util.Map;
 @DataSource(DataSourceConstant.EVALUATION_INDEX)
 public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<ScreenProjectCategoryOrgDailyDao, ScreenProjectCategoryOrgDailyEntity> implements ScreenProjectCategoryOrgDailyService {
 
+    @Autowired
+    private CustomerRelationService relationService;
 
     @Override
     public PageData<ScreenProjectCategoryOrgDailyDTO> page(Map<String, Object> params) {
@@ -131,4 +138,71 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
         }
     }
 
+    /**
+     * @Description  按组织计算分类统计项目数量
+     * @Param customerId
+     * @Param dateId
+     * @author zxc
+     * @date 2021/3/23 上午10:07
+     */
+    @Override
+    public void extractProjectCategoryOrgData(String customerId, String dateId) {
+        List<ScreenProjectCategoryOrgDailyEntity> needInsert = new ArrayList<>();
+        // 先查询有无子客户
+        List<CustomerRelationEntity> relationInfo = relationService.selectSubCustomer(customerId);
+        if (CollectionUtils.isEmpty(relationInfo)){
+            needInsert = disposeOneCustomer(customerId, dateId);
+        }else {
+            needInsert = disposeMoreCustomer(customerId,dateId,relationInfo);
+        }
+        deleteAndInsert(customerId,dateId,needInsert);
+    }
+
+    /**
+     * @Description  单客户处理
+     * @Param customerId
+     * @Param dateId
+     * @author zxc
+     * @date 2021/3/23 上午10:40
+     */
+    private List<ScreenProjectCategoryOrgDailyEntity> disposeOneCustomer(String customerId, String dateId){
+
+        return new ArrayList<>();
+    }
+
+    /**
+     * @Description  多客户处理
+     * @Param customerId
+     * @Param dateId
+     * @Param relationInfo 子级客户信息
+     * @author zxc
+     * @date 2021/3/23 上午10:40
+     */
+    private List<ScreenProjectCategoryOrgDailyEntity> disposeMoreCustomer(String customerId, String dateId,List<CustomerRelationEntity> relationInfo){
+
+        return new ArrayList<>();
+    }
+
+    /**
+     * @Description  删除和新增
+     * @Param customerId
+     * @Param dateId
+     * @author zxc
+     * @date 2021/3/23 上午10:52
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteAndInsert(String customerId, String dateId, List<ScreenProjectCategoryOrgDailyEntity> needInsert){
+        if (CollectionUtils.isEmpty(needInsert)){
+            return;
+        }
+        Integer row = NumConstant.ZERO;
+        do {
+            row = baseDao.deleteByDateIdAndCustomerId(customerId, dateId);
+        }while (row > NumConstant.ZERO && row == NumConstant.ONE_THOUSAND);
+        List<List<ScreenProjectCategoryOrgDailyEntity>> partition = ListUtils.partition(needInsert, NumConstant.ONE_HUNDRED);
+        partition.forEach(p -> {
+            insertBatch(p);
+        });
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/crm/CustomerRelationDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/crm/CustomerRelationDao.xml
index 88c12c8deb..fad1ca0443 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/crm/CustomerRelationDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/crm/CustomerRelationDao.xml
@@ -34,4 +34,9 @@
             #{customerId},
             '%')
     </select>
+
+    <!-- 查询子级客户 -->
+    <select id="selectSubCustomer" resultType="com.epmet.entity.crm.CustomerRelationEntity">
+        SELECT * FROM customer_relation WHERE DEL_FLAG = 0 AND PARENT_CUSTOMER_ID = #{customerId}
+    </select>
 </mapper>
\ No newline at end of file

From 7477d6f536ac585a4607e37d254f380a93adc116 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 23 Mar 2021 11:15:02 +0800
Subject: [PATCH 075/119] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E3=80=81=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=AF=B9=E5=BA=94=E7=9A=84=E5=88=86=E7=B1=BB=E3=80=81?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=85=B3=E7=B3=BB=E8=A1=A8=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E5=A4=9A=E4=BD=99=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dataaggre/dto/govproject/ProjectCategoryDTO.java   | 5 -----
 .../com/epmet/dataaggre/dto/govproject/ProjectTagsDTO.java   | 5 -----
 .../main/java/com/epmet/dto/project/ProjectCategoryDTO.java  | 5 -----
 .../src/main/java/com/epmet/dto/IssueCategoryDTO.java        | 5 -----
 .../src/main/java/com/epmet/dto/IssueTagsDTO.java            | 5 -----
 .../src/main/java/com/epmet/dto/form/IssueTagsFormDTO.java   | 5 -----
 .../src/main/java/com/epmet/entity/IssueCategoryEntity.java  | 5 -----
 .../src/main/java/com/epmet/entity/IssueTagsEntity.java      | 5 -----
 .../com/epmet/service/impl/IssueCategoryServiceImpl.java     | 1 -
 .../java/com/epmet/service/impl/IssueTagsServiceImpl.java    | 1 -
 .../db/migration/V0.0.12__del_category_tag_field.sql         | 4 ++++
 .../src/main/resources/mapper/IssueTagsDao.xml               | 3 +--
 .../src/main/java/com/epmet/dto/ProjectCategoryDTO.java      | 5 -----
 .../src/main/java/com/epmet/dto/ProjectTagsDTO.java          | 5 -----
 .../main/java/com/epmet/entity/ProjectCategoryEntity.java    | 5 -----
 .../src/main/java/com/epmet/entity/ProjectTagsEntity.java    | 5 -----
 .../com/epmet/service/impl/ProjectCategoryServiceImpl.java   | 1 -
 .../db/migration/V0.0.8__del_category_tag_field.sql          | 4 ++++
 18 files changed, 9 insertions(+), 65 deletions(-)
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.12__del_category_tag_field.sql
 create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.8__del_category_tag_field.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 a4d6c1f284..752262827e 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
@@ -69,11 +69,6 @@ public class ProjectCategoryDTO implements Serializable {
      */
     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 9873ed3ddd..60f01c7299 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,11 +58,6 @@ 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/project/ProjectCategoryDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/ProjectCategoryDTO.java
index 07ab948199..8977da4ee3 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
@@ -69,11 +69,6 @@ public class ProjectCategoryDTO implements Serializable {
      */
     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 06d1f9d07d..fd33177b01 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
@@ -68,11 +68,6 @@ public class IssueCategoryDTO implements Serializable {
      */
     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/IssueTagsDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueTagsDTO.java
index 87e464f4db..6ca1c51c6a 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,11 +63,6 @@ public class IssueTagsDTO implements Serializable {
      */
 	private String tagName;
 
-    /**
-     * 是否禁用(enable:启用 disable:禁用)
-     */
-    private String isDisable;
-
     /**
      * 删除标识 0.未删除 1.已删除
      */
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 908edfba19..8cb89dc4d7 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,11 +43,6 @@ 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/entity/IssueCategoryEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueCategoryEntity.java
index 4f92ac6e6b..f0478e560f 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
@@ -68,9 +68,4 @@ public class IssueCategoryEntity extends BaseEpmetEntity {
 	 */
 	private String categoryCode;
 
-	/**
-	 * 是否禁用(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 0933fa1402..1dc56255fc 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,9 +63,4 @@ 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/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 2ca1c6a005..c86e5d926d 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
@@ -209,7 +209,6 @@ public class IssueCategoryServiceImpl extends BaseServiceImpl<IssueCategoryDao,
                 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/IssueTagsServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
index 0589da1fe4..af19d3c033 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
@@ -235,7 +235,6 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
                 n.setCustomerId(customerId);
                 n.setGridId(issueEntity.getGridId());
                 n.setIssueId(form.getIssueId());
-                n.setIsDisable(ModuleConstants.ID_ENABLE);
             });
             baseDao.insertNewTags(needInsert);
         }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.12__del_category_tag_field.sql b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.12__del_category_tag_field.sql
new file mode 100644
index 0000000000..2f794d5bbb
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.12__del_category_tag_field.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `issue_category` DROP COLUMN `IS_DISABLE`;
+
+ALTER TABLE `issue_tags` DROP COLUMN `IS_DISABLE`;
+
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 592cdb43fb..5f134b85a3 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 id="insertNewTags">
-        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 )
+        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 )
         VALUES
             <foreach collection="tags" item="l" separator=",">
                 (
@@ -80,7 +80,6 @@
                 #{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/ProjectCategoryDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectCategoryDTO.java
index e04ce6da98..cbce91656e 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
@@ -68,11 +68,6 @@ public class ProjectCategoryDTO implements Serializable {
      */
     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 30a3cf75d6..1cc47c4bb6 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,11 +58,6 @@ 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 5a9fff63dc..f1fc7eb4e8 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
@@ -68,9 +68,4 @@ public class ProjectCategoryEntity extends BaseEpmetEntity {
 	 */
 	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 2917f7e5e8..12febddfea 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,9 +58,4 @@ 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/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 4562835095..022e777d9a 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
@@ -177,7 +177,6 @@ public class ProjectCategoryServiceImpl extends BaseServiceImpl<ProjectCategoryD
                 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-project/gov-project-server/src/main/resources/db/migration/V0.0.8__del_category_tag_field.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.8__del_category_tag_field.sql
new file mode 100644
index 0000000000..7ab81a8c1d
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.8__del_category_tag_field.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `project_category` DROP COLUMN `IS_DISABLE`;
+
+ALTER TABLE `project_tags` DROP COLUMN `IS_DISABLE`;
+

From 9a56db476d45bb14f5eaab0e174033d03b7a543c Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 23 Mar 2021 13:20:09 +0800
Subject: [PATCH 076/119] =?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=20start3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/impl/ScreenProjectCategoryGridDailyServiceImpl.java | 3 +++
 .../extract/FactOriginProjectCategoryDailyDao.xml              | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

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 5901e47b35..3a8752e20e 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
@@ -144,6 +144,9 @@ public class ScreenProjectCategoryGridDailyServiceImpl extends BaseServiceImpl<S
     @Override
     public void extractProjectCategoryData(String customerId, String dateId) {
         List<ScreenProjectCategoryGridDailyDTO> listDTO= factOriginProjectCategoryDailyService.selectListProjectCategoryGridDailyDTO(customerId);
+        listDTO.forEach(dto->{
+            dto.setDateId(dateId);
+        });
         boolean insertRes=insertBatch(ConvertUtils.sourceToTarget(listDTO, ScreenProjectCategoryGridDailyEntity.class));
         log.info("insertRes is {}",insertRes);
     }
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 451acb81d5..7836274c05 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
@@ -43,7 +43,7 @@
             SELECT
                 c.CUSTOMER_ID,
                 left(c.CATEGORY_CODE, 4) as CATEGORY_CODE,
-                c.`LEVEL`,
+                '1'as `LEVEL`,
                 p.GRID_ID,
                 p.AGENCY_ID AS PID,
                 P.PIDS,

From 4fa14db16bd61ad9da5983e26a9fd72cbf36e81b Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 23 Mar 2021 13:37:28 +0800
Subject: [PATCH 077/119] =?UTF-8?q?=E8=A7=A3=E5=86=B3sql=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=86=B2=E7=AA=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ..._category_tag_field.sql => V0.0.9__del_category_tag_field.sql} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/{V0.0.8__del_category_tag_field.sql => V0.0.9__del_category_tag_field.sql} (100%)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.8__del_category_tag_field.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.9__del_category_tag_field.sql
similarity index 100%
rename from epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.8__del_category_tag_field.sql
rename to epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.9__del_category_tag_field.sql

From b5f2aab02997ed9e718f20ea9b95304d580ed49d Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 23 Mar 2021 13:56:07 +0800
Subject: [PATCH 078/119] =?UTF-8?q?/data/report/project/categorydict?=
 =?UTF-8?q?=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

---
 .../controller/project/ProjectController.java         | 11 ++++-------
 .../datareport/service/project/ProjectService.java    |  4 ++--
 .../service/project/impl/ProjectServiceImpl.java      |  8 ++++----
 3 files changed, 10 insertions(+), 13 deletions(-)

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 2bb49d5c25..2f704b6b16 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
@@ -16,10 +16,7 @@ import com.epmet.project.dto.form.DifficultyRankFormDTO;
 import com.epmet.project.dto.form.ProjectIncrTrendFormDTO;
 import com.epmet.project.dto.result.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -134,13 +131,13 @@ public class ProjectController {
      * 002、项目分类字典查询
      *      查询当前客户的父客户下，项目分类字典
      *
-     * @param tokenDto
+     * @param customerId
      * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.project.dto.result.ProjectCategoryDictResultDTO>>
      * @Author zhangyong
      * @Date 10:41 2021-03-22
      **/
     @PostMapping("categorydict")
-    public Result<List<ProjectCategoryDictResultDTO>> categoryDict(@LoginUser TokenDto tokenDto) {
-        return new Result<List<ProjectCategoryDictResultDTO>>().ok(projectService.getCategoryDict(tokenDto));
+    public Result<List<ProjectCategoryDictResultDTO>> categoryDict(@RequestHeader("CustomerId") String customerId) {
+        return new Result<List<ProjectCategoryDictResultDTO>>().ok(projectService.getCategoryDict(customerId));
     }
 }
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 bb2ffedd9c..917113fe12 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
@@ -74,10 +74,10 @@ public interface ProjectService {
     /**
      * 002、项目分类字典查询
      *
-     * @param tokenDto
+     * @param customerId
      * @return java.util.List<com.epmet.project.dto.result.ProjectCategoryDictResultDTO>
      * @Author zhangyong
      * @Date 14:26 2021-03-22
      **/
-    List<ProjectCategoryDictResultDTO> getCategoryDict(TokenDto tokenDto);
+    List<ProjectCategoryDictResultDTO> getCategoryDict(String customerId);
 }
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 4da82573c9..4d2df70470 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
@@ -358,12 +358,12 @@ public class ProjectServiceImpl implements ProjectService {
     }
 
     @Override
-    public List<ProjectCategoryDictResultDTO> getCategoryDict(TokenDto tokenDto) {
+    public List<ProjectCategoryDictResultDTO> getCategoryDict(String customerId) {
         List<ProjectCategoryDictResultDTO> result = new ArrayList<>();
-        Result<String> parentCustomerId = operCrmOpenFeignClient.getExternalAndParentCustomerId(tokenDto.getCustomerId());
+        Result<String> parentCustomerId = operCrmOpenFeignClient.getExternalAndParentCustomerId(customerId);
         if (!parentCustomerId.success() && null == parentCustomerId.getData()) {
             logger.warn(String.format("调用%s服务查询外部客户的 父级客户ID 失败,入参%s", ServiceConstant.OPER_CRM_SERVER,
-                    JSON.toJSONString(tokenDto.getCustomerId())));
+                    JSON.toJSONString(customerId)));
             return result;
         }
         CustomerCategoryDTO argDto = new CustomerCategoryDTO();
@@ -373,7 +373,7 @@ public class ProjectServiceImpl implements ProjectService {
         Result<List<ProjectCategoryDictResultDTO>> parentCategoryDict = govIssueOpenFeignClient.getCustomerCategoryDict(argDto);
         if (!parentCategoryDict.success()) {
             logger.warn(String.format("调用%s服务查询当前客户的父客户下，项目分类字典失败,入参%s", ServiceConstant.GOV_ISSUE_SERVER,
-                    JSON.toJSONString(tokenDto.getCustomerId())));
+                    JSON.toJSONString(customerId)));
         } else {
             result = parentCategoryDict.getData();
             // 获取客户二级分类

From e391ab9b13183c1f50bad960ba01079c601f87c4 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 23 Mar 2021 14:09:22 +0800
Subject: [PATCH 079/119] =?UTF-8?q?/data/report/project/categorydict?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B42?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/project/dto/result/ProjectCategoryDictResultDTO.java | 3 +++
 1 file changed, 3 insertions(+)

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
index ca534db2a9..ad19f97e1c 100644
--- 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
@@ -1,5 +1,6 @@
 package com.epmet.project.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -32,10 +33,12 @@ public class ProjectCategoryDictResultDTO implements Serializable {
     /**
      * 主键
      **/
+    @JsonIgnore
     private String id;
 
     /**
      * 上级分类ID 顶级此列存储0
      **/
+    @JsonIgnore
     private String pid;
 }

From 7d7975a4ae7683a626bfa719c592ed2d2d289607 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 23 Mar 2021 14:16:09 +0800
Subject: [PATCH 080/119] =?UTF-8?q?/data/report/project/categorydict?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4back?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/project/dto/result/ProjectCategoryDictResultDTO.java | 3 ---
 1 file changed, 3 deletions(-)

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
index ad19f97e1c..ca534db2a9 100644
--- 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
@@ -1,6 +1,5 @@
 package com.epmet.project.dto.result;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -33,12 +32,10 @@ public class ProjectCategoryDictResultDTO implements Serializable {
     /**
      * 主键
      **/
-    @JsonIgnore
     private String id;
 
     /**
      * 上级分类ID 顶级此列存储0
      **/
-    @JsonIgnore
     private String pid;
 }

From b3b2e51df83211dbb50e4d1b6242e9e076f53220 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 23 Mar 2021 14:19:38 +0800
Subject: [PATCH 081/119] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E5=88=86=E7=B1=BB=E3=80=81=E6=A0=87=E7=AD=BE=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gov-issue/gov-issue-server/pom.xml        |  6 +++
 .../IssueProjectCategoryDictServiceImpl.java  | 51 ++++++++++++-------
 .../mapper/IssueProjectCategoryDictDao.xml    |  1 +
 3 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml
index 673a33aeb9..54a2ff009c 100644
--- a/epmet-module/gov-issue/gov-issue-server/pom.xml
+++ b/epmet-module/gov-issue/gov-issue-server/pom.xml
@@ -102,6 +102,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>oper-crm-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
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 0a9a266b67..1ba11ff550 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
@@ -30,10 +30,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IssueCategoryDao;
 import com.epmet.dao.IssueProjectCategoryDictDao;
 import com.epmet.dao.IssueProjectRelationDao;
-import com.epmet.dto.IssueCategoryDTO;
-import com.epmet.dto.IssueDTO;
-import com.epmet.dto.IssueProjectCategoryDictDTO;
-import com.epmet.dto.ProjectCategoryDTO;
+import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.CustomerCategoryListResultDTO;
 import com.epmet.dto.result.ProjectCategoryDTOResultDTO;
@@ -42,6 +39,7 @@ import com.epmet.dto.result.ProjectIssueDTOResultDTO;
 import com.epmet.entity.IssueProjectCategoryDictEntity;
 import com.epmet.entity.IssueProjectTagDictEntity;
 import com.epmet.feign.GovProjectOpenFeignClient;
+import com.epmet.feign.OperCrmOpenFeignClient;
 import com.epmet.project.dto.result.ProjectCategoryDictResultDTO;
 import com.epmet.redis.IssueProjectCategoryDictRedis;
 import com.epmet.service.IssueProjectCategoryDictService;
@@ -76,11 +74,12 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
     private IssueProjectRelationDao issueProjectRelationDao;
     @Autowired
     private IssueProjectTagDictService issueProjectTagDictService;
-
     @Autowired
     private IssueCategoryDao issueCategoryDao;
     @Autowired
     private GovProjectOpenFeignClient govProjectOpenFeignClient;
+    @Autowired
+    private OperCrmOpenFeignClient operCrmOpenFeignClient;
 
     @Override
     public PageData<IssueProjectCategoryDictDTO> page(Map<String, Object> params) {
@@ -199,21 +198,35 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void init(CategoryTagInitFormDTO formDTO) {
-        List<IssueProjectCategoryDictEntity> list = baseDao.selectCategoryListByCustomer(formDTO.getCustomerId());
-        if (CollectionUtils.isEmpty(list)) {
-            //分类初始化
-            List<IssueProjectCategoryDictEntity> categoryList = baseDao.selectCategoryListByCustomer("default");
-            categoryList.forEach(item -> {
-                item.setCustomerId(formDTO.getCustomerId());
-            });
-            this.insertBatch(categoryList);
-            //标签初始化
-            List<IssueProjectTagDictEntity> tagList = issueProjectTagDictService.getTagListByCustomer("default");
-            tagList.forEach(item -> {
-                item.setCustomerId(formDTO.getCustomerId());
-            });
-            issueProjectTagDictService.insertBatch(tagList);
+        //2021.3.23 sun  不传客户Id时默认查询所有有效客户列表 循环添加
+        List<String> customerIdList = new ArrayList<>();
+        if(StringUtils.isBlank(formDTO.getCustomerId())){
+            Result<List<CustomerDTO>> resultList = operCrmOpenFeignClient.getAllCustomerList();
+            if(!resultList.success()){
+                throw new RuntimeException("crm库获取有效客户列表失败！");
+            }
+            customerIdList = resultList.getData().stream().map(cu->cu.getId()).collect(Collectors.toList());
+        }else {
+            customerIdList.add(formDTO.getCustomerId());
         }
+        //end  sun
+        customerIdList.forEach(cu->{
+            List<IssueProjectCategoryDictEntity> list = baseDao.selectCategoryListByCustomer(formDTO.getCustomerId());
+            if (CollectionUtils.isEmpty(list)) {
+                //分类初始化
+                List<IssueProjectCategoryDictEntity> categoryList = baseDao.selectCategoryListByCustomer("default");
+                categoryList.forEach(item -> {
+                    item.setCustomerId(formDTO.getCustomerId());
+                });
+                this.insertBatch(categoryList);
+                //标签初始化
+                List<IssueProjectTagDictEntity> tagList = issueProjectTagDictService.getTagListByCustomer("default");
+                tagList.forEach(item -> {
+                    item.setCustomerId(formDTO.getCustomerId());
+                });
+                issueProjectTagDictService.insertBatch(tagList);
+            }
+        });
     }
 
     /**
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 7752ab2c35..4d1bc0da0b 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
@@ -46,6 +46,7 @@
             ID,
             PID,
             PIDS,
+            PARENT_CATEGORY_CODE,
             CATEGORY_CODE,
             CATEGORY_NAME,
             CATEGORY_TYPE,

From 945d994c15b76043b258aa1ef47f6955236ceabb Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 23 Mar 2021 14:28:30 +0800
Subject: [PATCH 082/119] =?UTF-8?q?=E6=BC=8F=E6=8F=90=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IssueProjectCategoryDictDao.xml  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 4d1bc0da0b..20f8c5cfdd 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
@@ -50,7 +50,8 @@
             CATEGORY_CODE,
             CATEGORY_NAME,
             CATEGORY_TYPE,
-            SORT
+            SORT,
+            IS_DISABLE
         FROM
             issue_project_category_dict
         WHERE

From b129219f2722c67272330129ebd91ef53f89360d Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 23 Mar 2021 14:35:07 +0800
Subject: [PATCH 083/119] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5=20sql=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IssueProjectTagDictDao.xml       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
index ec80fe2af3..5988ddbbbd 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
@@ -77,7 +77,8 @@
             CATEGORY_ID,
             IS_DEFAULT,
             ISSUE_USE_COUNT,
-            PROJECT_USE_COUNT
+            PROJECT_USE_COUNT,
+            IS_DISABLE
         FROM
             issue_project_tag_dict
         WHERE

From 322701126842c472acaee3c4c3adad8bc5e24adc Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 23 Mar 2021 14:53:58 +0800
Subject: [PATCH 084/119] =?UTF-8?q?=E4=BB=A3=E7=A0=81=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

---
 .../service/impl/IssueProjectCategoryDictServiceImpl.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 1ba11ff550..c4faa05e5d 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
@@ -211,18 +211,18 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
         }
         //end  sun
         customerIdList.forEach(cu->{
-            List<IssueProjectCategoryDictEntity> list = baseDao.selectCategoryListByCustomer(formDTO.getCustomerId());
+            List<IssueProjectCategoryDictEntity> list = baseDao.selectCategoryListByCustomer(cu);
             if (CollectionUtils.isEmpty(list)) {
                 //分类初始化
                 List<IssueProjectCategoryDictEntity> categoryList = baseDao.selectCategoryListByCustomer("default");
                 categoryList.forEach(item -> {
-                    item.setCustomerId(formDTO.getCustomerId());
+                    item.setCustomerId(cu);
                 });
                 this.insertBatch(categoryList);
                 //标签初始化
                 List<IssueProjectTagDictEntity> tagList = issueProjectTagDictService.getTagListByCustomer("default");
                 tagList.forEach(item -> {
-                    item.setCustomerId(formDTO.getCustomerId());
+                    item.setCustomerId(cu);
                 });
                 issueProjectTagDictService.insertBatch(tagList);
             }

From 25f34e8c976f51162b4ff418a570153493e3c7e1 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 23 Mar 2021 16:11:44 +0800
Subject: [PATCH 085/119] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E9=87=87=E9=9B=86api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/screen/form/CategoryDictFormDTO.java | 13 +------------
 .../ScreenProjectDataCollController.java           |  6 ++++--
 .../stats/CustomerProjectCategoryDictService.java  |  6 +++---
 .../CustomerProjectCategoryDictServiceImpl.java    | 14 ++++++++------
 4 files changed, 16 insertions(+), 23 deletions(-)

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
index f60c33faa4..364c497eb1 100644
--- 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
@@ -1,11 +1,8 @@
 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;
 
 /**
  * 项目分类字典上报
@@ -15,38 +12,31 @@ import java.math.BigDecimal;
 @Data
 public class CategoryDictFormDTO implements Serializable {
 
-    private static final long serialVersionUID = 1L;
-
-//    public interface ExtractDailyForm extends CustomerClientShowGroup {}
 
+    private static final long serialVersionUID = 1245827825857891963L;
     /**
      * 客户内自己的分类编码
      */
-//    @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;
 
     /**
@@ -67,6 +57,5 @@ public class CategoryDictFormDTO implements Serializable {
     /**
      * 分类字典表主键
      */
-//    @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 d51ca41f31..db45cca198 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
@@ -163,8 +163,10 @@ public class ScreenProjectDataCollController {
      * @Date 16:03 2021-03-22
      **/
     @PostMapping("uploadcategorydict")
-    public Result uploadcategorydict(@RequestHeader("CustomerId") String customerId, @RequestBody CategoryDictDataFormDTO formDTO) {
-        customerProjectCategoryDictService.uploadCategoryDict(customerId, formDTO);
+    public Result uploadcategorydict(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<CategoryDictFormDTO> formDTO) {
+        formDTO.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(formDTO, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.DataListShowGroup.class);
+        customerProjectCategoryDictService.uploadCategoryDict(formDTO);
         return new Result();
     }
 }
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 1b37c9448a..ef8440c594 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,7 +18,8 @@
 package com.epmet.service.stats;
 
 import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.dto.screen.CategoryDictDataFormDTO;
+import com.epmet.dto.screen.form.CategoryDictFormDTO;
+import com.epmet.dto.screencoll.ScreenCollFormDTO;
 import com.epmet.entity.issue.IssueProjectCategoryDictEntity;
 import com.epmet.entity.stats.CustomerProjectCategoryDictEntity;
 
@@ -48,11 +49,10 @@ public interface CustomerProjectCategoryDictService extends BaseService<Customer
      * 项目分类字典上报
      *      目标表：epmet_evaluation_index库的customer_project_category_dict
      *
-     * @param customerId
      * @param formDTO
      * @return void
      * @Author zhangyong
      * @Date 16:03 2021-03-22
      **/
-    void uploadCategoryDict(String customerId, CategoryDictDataFormDTO formDTO);
+    void uploadCategoryDict(ScreenCollFormDTO<CategoryDictFormDTO> formDTO);
 }
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
index 455039a2a9..b610fa9c6c 100644
--- 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
@@ -22,14 +22,15 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.stats.CustomerProjectCategoryDictDao;
-import com.epmet.dto.screen.CategoryDictDataFormDTO;
+import com.epmet.dto.screen.form.CategoryDictFormDTO;
+import com.epmet.dto.screencoll.ScreenCollFormDTO;
 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.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.apache.commons.collections4.CollectionUtils;
 
 import java.util.List;
 
@@ -97,18 +98,19 @@ public class CustomerProjectCategoryDictServiceImpl extends BaseServiceImpl<Cust
         return baseDao.getLatestUpdatedEntity();
     }
 
-    @DataSource(value = DataSourceConstant.EVALUATION_INDEX)
+
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void uploadCategoryDict(String customerId, CategoryDictDataFormDTO formDTO) {
+    public void uploadCategoryDict(ScreenCollFormDTO<CategoryDictFormDTO> formDTO) {
         if (formDTO.getIsFirst()) {
             int deleteNum;
             do {
-                deleteNum = baseDao.deleteCustomerProjectCategoryDict(customerId);
+                deleteNum = baseDao.deleteCustomerProjectCategoryDict(formDTO.getCustomerId());
             } while (deleteNum > NumConstant.ZERO);
         }
         if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
-            baseDao.batchInsertCustomerProjectCategoryDict(formDTO.getDataList(), customerId);
+            baseDao.batchInsertCustomerProjectCategoryDict(formDTO.getDataList(), formDTO.getCustomerId());
         }
     }
 }

From 87868161caa25fccd3827a3389ce5abd6a13c143 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Tue, 23 Mar 2021 16:19:44 +0800
Subject: [PATCH 086/119] =?UTF-8?q?=E4=B8=80=E7=BA=A7=E3=80=81=E4=BA=8C?=
 =?UTF-8?q?=E7=BA=A7=E5=88=86=E7=B1=BB=E6=96=B0=E5=A2=9E/=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/form/FirstCategoryFormDTO.java  |  47 +++++++
 .../epmet/dto/form/SecondCategoryFormDTO.java |  21 +++
 .../IssueProjectCategoryDictController.java   |  50 +++++++
 .../dao/IssueProjectCategoryDictDao.java      |  29 +++++
 .../IssueProjectCategoryDictService.java      |  42 ++++++
 .../IssueProjectCategoryDictServiceImpl.java  | 122 ++++++++++++++++++
 .../mapper/IssueProjectCategoryDictDao.xml    |  27 ++++
 7 files changed, 338 insertions(+)
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/FirstCategoryFormDTO.java
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/SecondCategoryFormDTO.java

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/FirstCategoryFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/FirstCategoryFormDTO.java
new file mode 100644
index 0000000000..cb50e8dbe2
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/FirstCategoryFormDTO.java
@@ -0,0 +1,47 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 一级分类   新增/修改
+ * @Auth zy
+ * @Date 2021-03-22 09:17
+ */
+@Data
+public class FirstCategoryFormDTO implements Serializable {
+    private static final long serialVersionUID = 3188828578545996470L;
+    public interface AddCategoryInternalGroup {
+    }
+
+    /**
+     * 客户Id
+     **/
+    @NotBlank(message = "customerId不能为空", groups = AddCategoryInternalGroup.class)
+    private String customerId;
+
+    /**
+     * 分类Id
+     *  issue_project_category_dict 表主键，只有执行修改操作时，才会传入
+     **/
+    private String categoryId;
+
+    /**
+     * 分类名称
+     **/
+    private String categoryName;
+
+    /**
+     * 排序
+     **/
+    private Integer sort;
+
+    /**
+     * 操作类型(add:新增  edit:编辑)
+     **/
+    @NotBlank(message = "操作类型不能为空", groups = AddCategoryInternalGroup.class)
+    private String type;
+}
diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/SecondCategoryFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/SecondCategoryFormDTO.java
new file mode 100644
index 0000000000..7b3d389462
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/SecondCategoryFormDTO.java
@@ -0,0 +1,21 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 二级分类   新增/修改
+ * @ClassName CommonGridIdListFormDTO
+ * @Auth zy
+ * @Date 2021-03-22 09:17
+ */
+@Data
+public class SecondCategoryFormDTO extends FirstCategoryFormDTO implements Serializable{
+    private static final long serialVersionUID = 3188828578545996470L;
+
+    /**
+     * 一级分类Id
+     **/
+    private String parentCategoryId;
+}
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 bc6a3607c6..44464df978 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
@@ -18,6 +18,8 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.enums.CommonOperateTypeEnum;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
@@ -31,11 +33,13 @@ import com.epmet.dto.IssueProjectCategoryDictDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.CustomerCategoryListResultDTO;
 import com.epmet.dto.result.ProjectIssueCategoryResultDTO;
+import com.epmet.entity.IssueProjectCategoryDictEntity;
 import com.epmet.excel.IssueProjectCategoryDictExcel;
 import com.epmet.project.dto.CustomerCategoryDTO;
 import com.epmet.project.dto.result.ProjectCategoryDictResultDTO;
 import com.epmet.service.IssueProjectCategoryDictService;
 import com.epmet.utils.ModuleConstants;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -189,4 +193,50 @@ public class IssueProjectCategoryDictController {
         return new Result<List<ProjectCategoryDictResultDTO>>().ok(issueProjectCategoryDictService.listCategoryDict(dto.getCustomerId(),
                 dto.getPid()));
     }
+
+    /**
+     * 新增或修改一级分类信息，分类名称在同一个客户下有效数据中不允许重复
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<java.lang.String>
+     * @Author zhangyong
+     * @Date 10:27 2021-03-23
+     **/
+    @PostMapping("savefirstcategory")
+    public Result<String> saveFirstCategory(@RequestBody SecondCategoryFormDTO formDTO) {
+        if (StringUtils.isBlank(formDTO.getCustomerId())) {
+            throw new RenException("客户id 不能为空");
+        }
+        if (CommonOperateTypeEnum.ADD.getCode().equals(formDTO.getType())) {
+            return issueProjectCategoryDictService.saveFirstCategory(formDTO);
+        } else if (CommonOperateTypeEnum.EDIT.getCode().equals(formDTO.getType())){
+            return issueProjectCategoryDictService.editFirstCategory(formDTO);
+        }
+        throw new RenException("操作类型为空，或错误。type：" + formDTO.getType());
+    }
+
+    /**
+     * 新增或修改二级分类信息，分类名称在同一个客户下同一 一级分类下有效数据中不允许重复
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<java.lang.String>
+     * @Author zhangyong
+     * @Date 10:27 2021-03-23
+     **/
+    @PostMapping("savesecondcategory")
+    public Result<String> saveSecondCategory(@RequestBody SecondCategoryFormDTO formDTO) {
+        if (StringUtils.isBlank(formDTO.getCustomerId())) {
+            throw new RenException("客户id 不能为空");
+        }
+        if (StringUtils.isBlank(formDTO.getParentCategoryId())) {
+            throw new RenException("一级分类Id 不能为空");
+        }
+        if (CommonOperateTypeEnum.ADD.getCode().equals(formDTO.getType())) {
+            return issueProjectCategoryDictService.saveSecondCategory(formDTO);
+        } else if (CommonOperateTypeEnum.EDIT.getCode().equals(formDTO.getType())){
+            return issueProjectCategoryDictService.editSecondCategory(formDTO);
+        }
+        throw new RenException("操作类型为空，或错误。type：" + formDTO.getType());
+    }
 }
+
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 6698b28722..293e469d1f 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
@@ -113,4 +113,33 @@ public interface IssueProjectCategoryDictDao extends BaseDao<IssueProjectCategor
      * @author sun
      */
     int updateCustomerCategory(IsDisableCategoryFormDTO formDTO);
+
+    /**
+     * 获取客户下 最大的分类编码
+     *
+     * @param customerId
+     * @param parentCategoryCode
+     *                      = 0 查询一级分类的最大分类编码
+     *                      = 10xx 根据上级分类编码，查询某个子级的最大分类编码
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 13:35 2021-03-23
+     **/
+    Integer getMaxCategoryCode(@Param("customerId") String customerId, @Param("parentCategoryCode") String parentCategoryCode);
+
+    /**
+     * 判断同一个客户下有效数据中 分类名称是否重复
+     *      > 0 则为重复
+     *
+     *
+     * @param customerId
+     * @param categoryName
+     * @param pid           != null 表示 将查询范围，限制在某一个一级分类 及 一级分类下的有效数据
+     * @param id            修改时，不一定会修改分类名称，所以需通过id 过滤自己
+     * @return java.lang.Boolean
+     * @Author zhangyong
+     * @Date 14:11 2021-03-23
+     **/
+    Integer isCategoryName(@Param("customerId") String customerId, @Param("categoryName") String categoryName,
+                           @Param("pid") String pid, @Param("id") String 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 55fc4871c3..b310f32706 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
@@ -19,12 +19,14 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IssueProjectCategoryDictDTO;
 import com.epmet.dto.form.*;
 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 org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;
@@ -154,4 +156,44 @@ public interface IssueProjectCategoryDictService extends BaseService<IssueProjec
      * @Date 14:10 2021-03-22
      **/
     List<ProjectCategoryDictResultDTO> listCategoryDict(String customerId, String pid);
+
+    /**
+     * 新增一级分类信息，分类名称在同一个客户下有效数据中不允许重复
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<java.lang.String>  新增后的主键
+     * @Author zhangyong
+     * @Date 10:27 2021-03-23
+     **/
+    Result<String> saveFirstCategory(SecondCategoryFormDTO formDTO);
+
+    /**
+     * 修改一级分类信息，分类名称在同一个客户下有效数据中不允许重复
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<java.lang.String>  新增后的主键
+     * @Author zhangyong
+     * @Date 10:27 2021-03-23
+     **/
+    Result<String> editFirstCategory(SecondCategoryFormDTO formDTO);
+
+    /**
+     * 新增二级分类信息，分类名称在同一个客户下同一 一级分类下有效数据中不允许重复
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<java.lang.String>  新增后的主键
+     * @Author zhangyong
+     * @Date 10:27 2021-03-23
+     **/
+    Result<String> saveSecondCategory(SecondCategoryFormDTO formDTO);
+
+    /**
+     * 修改二级分类信息，分类名称在同一个客户下有效数据中不允许重复
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<java.lang.String>  新增后的主键
+     * @Author zhangyong
+     * @Date 10:27 2021-03-23
+     **/
+    Result<String> editSecondCategory(SecondCategoryFormDTO formDTO);
 }
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 c4faa05e5d..56463a8854 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
@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.enums.CommonOperateTypeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
@@ -307,5 +308,126 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
     @Override
     public List<ProjectCategoryDictResultDTO> listCategoryDict(String customerId, String pid) {
         return baseDao.selectListCategoryDict(customerId, pid);
+     }
+
+    @Override
+    public Result<String> saveFirstCategory(SecondCategoryFormDTO formDTO) {
+        // 分类名称在同一个客户下有效数据中不允许重复
+        Integer numCategoryName = baseDao.isCategoryName(formDTO.getCustomerId(), formDTO.getCategoryName(), null,null);
+        if (NumConstant.ZERO < numCategoryName) {
+            throw new RenException("现添加的一级分类名称 重复");
+        }
+        IssueProjectCategoryDictEntity entity = this.packageFirstCategoryDictEntity(formDTO);
+        baseDao.insert(entity);
+        return new Result<String>().ok(entity.getId());
+    }
+
+    /**
+     * 一级分类 组装字段
+     *
+     * @param formDTO
+     * @return com.epmet.entity.IssueProjectCategoryDictEntity
+     * @Author zhangyong
+     * @Date 10:46 2021-03-23
+     **/
+    private IssueProjectCategoryDictEntity packageFirstCategoryDictEntity(SecondCategoryFormDTO formDTO) {
+        IssueProjectCategoryDictEntity entity = new IssueProjectCategoryDictEntity();
+        entity.setCustomerId(formDTO.getCustomerId());
+        entity.setPid(NumConstant.ZERO_STR );
+        entity.setPids(NumConstant.ZERO_STR );
+        entity.setParentCategoryCode(NumConstant.ZERO_STR);
+        // 查询 当前客户下，+1 后最大的一级分类数。从1开始
+        Integer maxCategoryCode = baseDao.getMaxCategoryCode(formDTO.getCustomerId(), NumConstant.ZERO_STR);
+        if (NumConstant.ZERO == maxCategoryCode) {
+            maxCategoryCode = 1001;
+        } else {
+            maxCategoryCode++;
+        }
+        entity.setCategoryCode(String.valueOf(maxCategoryCode));
+
+        entity.setCategoryName(formDTO.getCategoryName());
+        entity.setCategoryType(NumConstant.ONE_STR);
+        entity.setSort(formDTO.getSort());
+        entity.setIsDisable("enable");
+        return entity;
+    }
+
+    @Override
+    public Result<String> editFirstCategory(SecondCategoryFormDTO formDTO) {
+        if (StringUtils.isBlank(formDTO.getCategoryId())) {
+            throw new RenException("分类Id 不能为空");
+        }
+        // 分类名称在同一个客户下有效数据中不允许重复
+        Integer numCategoryName = baseDao.isCategoryName(formDTO.getCustomerId(), formDTO.getCategoryName(), null, formDTO.getCategoryId());
+        if (NumConstant.ZERO < numCategoryName) {
+            throw new RenException("现添加的一级分类名称 重复");
+        }
+        IssueProjectCategoryDictEntity entity = new IssueProjectCategoryDictEntity();
+        entity.setCategoryName(formDTO.getCategoryName());
+        entity.setSort(formDTO.getSort());
+        entity.setId(formDTO.getCategoryId());
+        baseDao.updateById(entity);
+        return new Result<>();
+    }
+
+    @Override
+    public Result<String> saveSecondCategory(SecondCategoryFormDTO formDTO) {
+        // 分类名称在同一个客户下同一 一级分类下有效数据中不允许重复
+        Integer numCategoryName = baseDao.isCategoryName(formDTO.getCustomerId(), formDTO.getCategoryName(), formDTO.getParentCategoryId(), null);
+        if (NumConstant.ZERO < numCategoryName) {
+            throw new RenException("现添加的二级分类名称 重复");
+        }
+        IssueProjectCategoryDictEntity entity = this.packageSecondCategoryDictEntity(formDTO);
+        baseDao.insert(entity);
+        return new Result<String>().ok(entity.getId());
+    }
+
+    /**
+     * 二级分类 组装字段
+     *
+     * @param formDTO
+     * @return com.epmet.entity.IssueProjectCategoryDictEntity
+     * @Author zhangyong
+     * @Date 10:46 2021-03-23
+     **/
+    private IssueProjectCategoryDictEntity packageSecondCategoryDictEntity(SecondCategoryFormDTO formDTO) {
+        IssueProjectCategoryDictEntity entity = new IssueProjectCategoryDictEntity();
+        entity.setCustomerId(formDTO.getCustomerId());
+        entity.setPid(formDTO.getParentCategoryId());
+        entity.setPids(formDTO.getParentCategoryId());
+        IssueProjectCategoryDictEntity parentCategoryCode = baseDao.selectById(formDTO.getParentCategoryId());
+        entity.setParentCategoryCode(parentCategoryCode.getCategoryCode());
+        // 查询 当前客户下，+1 后最大的一级分类数
+        Integer maxCategoryCode = baseDao.getMaxCategoryCode(formDTO.getCustomerId(), parentCategoryCode.getCategoryCode());
+        if (NumConstant.ZERO == maxCategoryCode) {
+            maxCategoryCode = Integer.valueOf(parentCategoryCode.getCategoryCode() + "1001");
+        } else {
+            maxCategoryCode++;
+        }
+        entity.setCategoryCode(String.valueOf(maxCategoryCode));
+
+        entity.setCategoryName(formDTO.getCategoryName());
+        entity.setCategoryType(NumConstant.TWO_STR);
+        entity.setSort(formDTO.getSort());
+        entity.setIsDisable("enable");
+        return entity;
+    }
+
+    @Override
+    public Result<String> editSecondCategory(SecondCategoryFormDTO formDTO) {
+        if (StringUtils.isBlank(formDTO.getCategoryId())) {
+            throw new RenException("分类Id 不能为空");
+        }
+        // 分类名称在同一个客户下同一 一级分类下有效数据中不允许重复
+        Integer numCategoryName = baseDao.isCategoryName(formDTO.getCustomerId(), formDTO.getCategoryName(), formDTO.getParentCategoryId(), formDTO.getCategoryId());
+        if (NumConstant.ZERO < numCategoryName) {
+            throw new RenException("现添加的二级分类名称 重复");
+        }
+        IssueProjectCategoryDictEntity entity = new IssueProjectCategoryDictEntity();
+        entity.setCategoryName(formDTO.getCategoryName());
+        entity.setSort(formDTO.getSort());
+        entity.setId(formDTO.getCategoryId());
+        baseDao.updateById(entity);
+        return new Result<>();
     }
 }
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 20f8c5cfdd..52fc76e925 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
@@ -161,4 +161,31 @@
         </foreach>
     </update>
 
+    <select id="getMaxCategoryCode" resultType="Integer">
+        SELECT
+            IFNULL( MAX(CATEGORY_CODE), 0)
+        FROM
+            `issue_project_category_dict`
+        WHERE
+            PARENT_CATEGORY_CODE = #{parentCategoryCode}
+            AND CUSTOMER_ID = #{customerId}
+            AND DEL_FLAG = '0'
+    </select>
+
+    <select id="isCategoryName" resultType="Integer">
+        SELECT
+            COUNT(1)
+        FROM
+            `issue_project_category_dict`
+        WHERE
+            CATEGORY_NAME = #{categoryName}
+            AND CUSTOMER_ID = #{customerId}
+            AND DEL_FLAG = '0'
+            <if test="pid != null and pid != '' ">
+                AND (ID = #{pid} OR PID = #{pid})
+            </if>
+            <if test="id != null">
+                AND id != #{id}
+            </if>
+    </select>
 </mapper>

From cfe0913cb059e07553904664be1931afbb7aff1f Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Tue, 23 Mar 2021 16:55:20 +0800
Subject: [PATCH 087/119] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/CustomerCategoryResultDTO.java | 48 +++++++++++++++++++
 .../IssueProjectCategoryDictController.java   | 20 ++++++++
 .../dao/IssueProjectCategoryDictDao.java      | 14 ++++++
 .../IssueProjectCategoryDictService.java      | 12 +++++
 .../IssueProjectCategoryDictServiceImpl.java  | 29 +++++++++--
 .../mapper/IssueProjectCategoryDictDao.xml    | 20 ++++++++
 6 files changed, 138 insertions(+), 5 deletions(-)
 create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CustomerCategoryResultDTO.java

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CustomerCategoryResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CustomerCategoryResultDTO.java
new file mode 100644
index 0000000000..5121a13471
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CustomerCategoryResultDTO.java
@@ -0,0 +1,48 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 客户分类列表
+ *
+ * @Author ZY
+ * @DateTime 2021/03/23
+ */
+@Data
+public class CustomerCategoryResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 4769136806332933579L;
+
+    /**
+     * 分类Id
+     */
+    private String categoryId;
+
+    /**
+     * 分类名称
+     */
+    private String categoryName;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 是否禁用(enable:启用 disable:禁用)
+     */
+    private String isDisable;
+
+    /**
+     * 二级分类
+     */
+    private List<CustomerCategoryResultDTO> children;
+
+    /**
+     * pid
+     */
+    private String pid;
+}
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 44464df978..7f1e1f3e7b 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
@@ -18,6 +18,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.enums.CommonOperateTypeEnum;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
@@ -32,6 +33,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IssueProjectCategoryDictDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.CustomerCategoryListResultDTO;
+import com.epmet.dto.result.CustomerCategoryResultDTO;
 import com.epmet.dto.result.ProjectIssueCategoryResultDTO;
 import com.epmet.entity.IssueProjectCategoryDictEntity;
 import com.epmet.excel.IssueProjectCategoryDictExcel;
@@ -238,5 +240,23 @@ public class IssueProjectCategoryDictController {
         }
         throw new RenException("操作类型为空，或错误。type：" + formDTO.getType());
     }
+
+    /**
+     * 客户分类列表
+     *   按客户查询已有一级二级分类列表，升序排列，全部查询，不涉及分页
+     *
+     * @param map
+     *          customerId
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.CustomerCategoryResultDTO>>
+     * @Author zhangyong
+     * @Date 16:30 2021-03-23
+     **/
+    @PostMapping("customercategorylist")
+    public Result<List<CustomerCategoryResultDTO>> customerCategoryList(@RequestBody Map<String, String> map) {
+        if (StringUtils.isBlank(map.get(FieldConstant.CUSTOMER_ID_HUMP))) {
+            throw new RenException("客户id 不能为空");
+        }
+        return new Result<List<CustomerCategoryResultDTO>>().ok(issueProjectCategoryDictService.customerCategoryList(map.get(FieldConstant.CUSTOMER_ID_HUMP)));
+    }
 }
 
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 293e469d1f..d85eaa3295 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
@@ -23,6 +23,7 @@ import com.epmet.dto.form.DelCategoryFormDTO;
 import com.epmet.dto.form.IsDisableCategoryFormDTO;
 import com.epmet.dto.form.IssueProjectCategoryDictListFormDTO;
 import com.epmet.dto.result.CustomerCategoryListResultDTO;
+import com.epmet.dto.result.CustomerCategoryResultDTO;
 import com.epmet.entity.IssueProjectCategoryDictEntity;
 import com.epmet.project.dto.result.ProjectCategoryDictResultDTO;
 import org.apache.ibatis.annotations.Mapper;
@@ -142,4 +143,17 @@ public interface IssueProjectCategoryDictDao extends BaseDao<IssueProjectCategor
      **/
     Integer isCategoryName(@Param("customerId") String customerId, @Param("categoryName") String categoryName,
                            @Param("pid") String pid, @Param("id") String id);
+
+    /**
+     * 获取客户所有的 分类字典 信息(包含已被禁用的)
+     *
+     * @param customerId
+     * @param pid           pid = 0  查询一级分类
+     *                      pid != 0 查询二级分类
+     *
+     * @return java.util.List<com.epmet.project.dto.result.ProjectCategoryDictResultDTO>
+     * @Author zhangyong
+     * @Date 14:10 2021-03-22
+     **/
+    List<CustomerCategoryResultDTO> selectListAllCategoryDict(@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 b310f32706..639888bc23 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
@@ -23,6 +23,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IssueProjectCategoryDictDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.CustomerCategoryListResultDTO;
+import com.epmet.dto.result.CustomerCategoryResultDTO;
 import com.epmet.dto.result.ProjectIssueCategoryResultDTO;
 import com.epmet.entity.IssueProjectCategoryDictEntity;
 import com.epmet.project.dto.result.ProjectCategoryDictResultDTO;
@@ -196,4 +197,15 @@ public interface IssueProjectCategoryDictService extends BaseService<IssueProjec
      * @Date 10:27 2021-03-23
      **/
     Result<String> editSecondCategory(SecondCategoryFormDTO formDTO);
+
+    /**
+     * 客户分类列表
+     *   按客户查询已有一级二级分类列表，升序排列，全部查询，不涉及分页
+     *
+     * @param customerId
+     * @return java.util.List<com.epmet.dto.result.CustomerCategoryResultDTO>
+     * @Author zhangyong
+     * @Date 16:30 2021-03-23
+     **/
+    List<CustomerCategoryResultDTO> customerCategoryList(String customerId);
 }
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 56463a8854..516ee31de3 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
@@ -22,7 +22,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.enums.CommonOperateTypeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
@@ -33,10 +32,7 @@ import com.epmet.dao.IssueProjectCategoryDictDao;
 import com.epmet.dao.IssueProjectRelationDao;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.CustomerCategoryListResultDTO;
-import com.epmet.dto.result.ProjectCategoryDTOResultDTO;
-import com.epmet.dto.result.ProjectIssueCategoryResultDTO;
-import com.epmet.dto.result.ProjectIssueDTOResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.entity.IssueProjectCategoryDictEntity;
 import com.epmet.entity.IssueProjectTagDictEntity;
 import com.epmet.feign.GovProjectOpenFeignClient;
@@ -430,4 +426,27 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
         baseDao.updateById(entity);
         return new Result<>();
     }
+
+    @Override
+    public List<CustomerCategoryResultDTO> customerCategoryList(String customerId) {
+        List<CustomerCategoryResultDTO> parentCategoryDict = baseDao.selectListAllCategoryDict(customerId, NumConstant.ZERO_STR);
+        List<CustomerCategoryResultDTO> childrenCategoryDict = baseDao.selectListAllCategoryDict(customerId, NumConstant.ONE_STR);
+
+        for (CustomerCategoryResultDTO p : parentCategoryDict) {
+            List<CustomerCategoryResultDTO> children = new ArrayList<>();
+            for (CustomerCategoryResultDTO c : childrenCategoryDict) {
+                if (p.getCategoryId().equals(c.getPid())) {
+                    CustomerCategoryResultDTO dto = new CustomerCategoryResultDTO();
+                    dto.setCategoryId(c.getCategoryId());
+                    dto.setCategoryName(c.getCategoryName());
+                    dto.setSort(c.getSort());
+                    dto.setIsDisable(c.getIsDisable());
+                    dto.setPid(c.getPid());
+                    children.add(dto);
+                }
+            }
+            p.setChildren(children);
+        }
+        return parentCategoryDict;
+    }
 }
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 52fc76e925..2dea34a9fd 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
@@ -188,4 +188,24 @@
                 AND id != #{id}
             </if>
     </select>
+
+    <select id="selectListAllCategoryDict" resultType="com.epmet.dto.result.CustomerCategoryResultDTO">
+        SELECT
+            CATEGORY_CODE categoryCode,
+            CATEGORY_NAME categoryName,
+            IS_DISABLE isDisable,
+            SORT,
+            PID,
+            ID categoryId
+        FROM issue_project_category_dict d
+        WHERE d.CUSTOMER_ID = #{customerId}
+        AND d.DEL_FLAG ='0'
+        <if test="pid != null and pid == 0">
+            AND d.PID = '0'
+        </if>
+        <if test="pid != null and pid != 0">
+            AND d.PID != '0'
+        </if>
+        ORDER BY CATEGORY_CODE ASC
+    </select>
 </mapper>

From abbba792a9e60b999f52a91751b9ca21e60127c0 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 23 Mar 2021 17:15:27 +0800
Subject: [PATCH 088/119] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=87=AA=E6=B5=8B?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IssueProjectCategoryDictController.java   |  6 +++--
 .../com/epmet/dao/IssueProjectTagDictDao.java |  7 +++++
 .../IssueProjectCategoryDictServiceImpl.java  | 26 +++++++++++++------
 .../resources/mapper/IssueCategoryDao.xml     |  4 +--
 .../mapper/IssueProjectCategoryDictDao.xml    | 19 +++++++++-----
 .../mapper/IssueProjectTagDictDao.xml         | 13 ++++++++++
 .../epmet/dto/form/DelCategoryFormDTO.java    |  5 ++++
 .../dto/form/IsDisableCategoryFormDTO.java    | 13 ++++++++++
 .../resources/mapper/ProjectCategoryDao.xml   |  4 +--
 9 files changed, 76 insertions(+), 21 deletions(-)

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 7f1e1f3e7b..df85854df5 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
@@ -158,8 +158,9 @@ public class IssueProjectCategoryDictController {
      * @Author sun
      **/
     @PostMapping("isdisablecategory")
-    public Result isDisableCategory(@RequestBody IsDisableCategoryFormDTO formDTO) {
+    public Result isDisableCategory(@LoginUser TokenDto tokenDto, @RequestBody IsDisableCategoryFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, IsDisableCategoryFormDTO.IsDisableCategory.class);
+        formDTO.setUserId(tokenDto.getUserId());
         if(!ModuleConstants.ID_ENABLE.equals(formDTO.getType())&&!ModuleConstants.IS_DISABLE.equals(formDTO.getType())){
             throw new RuntimeException("参数错误，操作类型值错误！");
         }
@@ -174,8 +175,9 @@ public class IssueProjectCategoryDictController {
      * @Author sun
      **/
     @PostMapping("delcategory")
-    public Result delCategory(@RequestBody DelCategoryFormDTO formDTO) {
+    public Result delCategory(@LoginUser TokenDto tokenDto, @RequestBody DelCategoryFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, DelCategoryFormDTO.DelCategory.class);
+        formDTO.setUserId(tokenDto.getUserId());
         issueProjectCategoryDictService.delCategory(formDTO);
         return new Result();
     }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java
index 2d14833f4a..9fa8ef840d 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java
@@ -18,6 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.IsDisableCategoryFormDTO;
 import com.epmet.dto.form.IssueTagFormDTO;
 import com.epmet.dto.result.IssueCategoryTagResultDTO;
 import com.epmet.entity.IssueProjectTagDictEntity;
@@ -102,4 +103,10 @@ public interface IssueProjectTagDictDao extends BaseDao<IssueProjectTagDictEntit
      * @date 2020.12.13 14:23
     */
     List<IssueProjectTagDictEntity> selectTagsByCustomerIdAndTagIds(@Param("customerId") String customerId,@Param("tagIds")List<String> tagIds);
+
+	/**
+	 * 批量修改标签的启用、禁用状态
+	 * @author sun
+	 */
+    int updateCustomerTag(IsDisableCategoryFormDTO formDTO);
 }
\ No newline at end of file
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 516ee31de3..006568d0e2 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
@@ -30,6 +30,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IssueCategoryDao;
 import com.epmet.dao.IssueProjectCategoryDictDao;
 import com.epmet.dao.IssueProjectRelationDao;
+import com.epmet.dao.IssueProjectTagDictDao;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
@@ -77,6 +78,8 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
     private GovProjectOpenFeignClient govProjectOpenFeignClient;
     @Autowired
     private OperCrmOpenFeignClient operCrmOpenFeignClient;
+    @Autowired
+    private IssueProjectTagDictDao issueProjectTagDictDao;
 
     @Override
     public PageData<IssueProjectCategoryDictDTO> page(Map<String, Object> params) {
@@ -243,25 +246,32 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
         List<String> categoryList = new ArrayList<>();
         //待修改的二级分类Id汇总
         List<String> secondList = new ArrayList<>();
-        if("1".equals(dto.getCategoryType())){
+        if ("1".equals(dto.getCategoryType())) {
             //2-1.查询子类信息
-            List<ProjectCategoryDictResultDTO> subList = baseDao.selectSubCustomerCategoryDict(formDTO.getCustomerId(),formDTO.getCategoryId());
-            secondList = subList.stream().map(sub->sub.getId()).collect(Collectors.toList());
+            List<ProjectCategoryDictResultDTO> subList = baseDao.selectSubCustomerCategoryDict(formDTO.getCustomerId(), formDTO.getCategoryId());
+            secondList = subList.stream().map(sub -> sub.getId()).collect(Collectors.toList());
             categoryList.add(formDTO.getCategoryId());
-        }else {
+        } else {
             secondList.add(formDTO.getCategoryId());
         }
         categoryList.addAll(secondList);
         formDTO.setCategoryList(categoryList);
+        formDTO.setSecondCategorylist(secondList);
 
         //3.修改标签、分类表数据状态
-        if(baseDao.updateCustomerCategory(formDTO)<NumConstant.ONE){
+        //修改分类数据
+        if (baseDao.updateCustomerCategory(formDTO) < NumConstant.ONE) {
             logger.error(String.format("修改分类信息状态失败，客户Id->%s,分类Id->%s", formDTO.getCustomerId(), formDTO.getCategoryId()));
             throw new RuntimeException("分类信息修改失败！");
         }
+        //修改吧二级分类下默认的标签数据
+        if (issueProjectTagDictDao.updateCustomerTag(formDTO) < NumConstant.ONE) {
+            logger.error(String.format("修改标签信息状态失败，客户Id->%s,分类Id->%s", formDTO.getCustomerId(), formDTO.getCategoryId()));
+            throw new RuntimeException("分类、标签信息修改失败！");
+        }
         //4.修改缓存中标签状态 todo
-    }
 
+    }
 
     /**
      * @Description 分类删除
@@ -281,7 +291,7 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
         //2-1.判断议题有无使用
         List<IssueCategoryDTO> issueList = issueCategoryDao.selectIssueList(formDTO);
         //已使用，不允许删除
-        if (null != issueList || issueList.size() > NumConstant.ZERO) {
+        if (null != issueList && issueList.size() > NumConstant.ZERO) {
             throw new RenException(EpmetErrorCode.CUSTOMER_CATEGORY.getCode(), EpmetErrorCode.CUSTOMER_CATEGORY.getMsg());
         }
         //2-2.判断项目有无使用
@@ -289,7 +299,7 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
         if (!resultList.success()) {
             throw new RenException(resultList.getCode(), resultList.getMsg());
         }
-        if (null != resultList.getData() || resultList.getData().size() > NumConstant.ZERO) {
+        if (null != resultList.getData() && resultList.getData().size() > NumConstant.ZERO) {
             throw new RenException(EpmetErrorCode.CUSTOMER_CATEGORY.getCode(), EpmetErrorCode.CUSTOMER_CATEGORY.getMsg());
         }
 
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
index d5fc89045e..159debdd32 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
@@ -63,10 +63,10 @@
         FROM issue_category
         WHERE del_flag = '0'
         AND customer_id = #{customerId}
-        <if test="level != null and '' != level and '1' == level ">
+        <if test="1 == level ">
             AND category_pids = #{categoryId}
         </if>
-        <if test="level != null and '' != level and '2' == level ">
+        <if test="2 == level ">
             AND category_id = #{categoryId}
         </if>
     </select>
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 2dea34a9fd..6cfbb5f164 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
@@ -135,25 +135,29 @@
         WHERE
             del_flag = '0'
         AND customer_id = #{customerId}
-        AND pid = #{categoryId}
+        AND pid = #{pid}
     </select>
 
     <update id="delCategory">
         UPDATE issue_project_category_dict
-        SET del_flag = '1'
+        SET del_flag = '1',
+            updated_by = #{userId},
+            updated_time = NOW()
         WHERE
             customer_id = #{customerId}
-        <if test="level != null and '' != level and '1' == level ">
-            AND id = #{categoryId}
+        <if test="1 == level ">
+            AND id = #{categoryId} OR pid = #{categoryId}
         </if>
-        <if test="level != null and '' != level and '2' == level ">
-            AND pid = #{categoryId}
+        <if test="2 == level ">
+            AND id = #{categoryId}
         </if>
     </update>
 
     <update id="updateCustomerCategory">
         UPDATE issue_project_category_dict
-        SET is_disable = #{type}
+        SET is_disable = #{type},
+            updated_by = #{userId},
+            updated_time = NOW()
         WHERE
             customer_id = #{customerId}
         <foreach item="ids" collection="categoryList" separator="OR" open="AND (" close=")" index="">
@@ -161,6 +165,7 @@
         </foreach>
     </update>
 
+
     <select id="getMaxCategoryCode" resultType="Integer">
         SELECT
             IFNULL( MAX(CATEGORY_CODE), 0)
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
index 5988ddbbbd..e141bba4b1 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
@@ -136,4 +136,17 @@
             </foreach>
         </if>
     </select>
+
+    <update id="updateCustomerTag">
+        UPDATE issue_project_tag_dict
+        SET is_disable = #{type},
+        updated_by = #{userId},
+        updated_time = NOW()
+        WHERE
+            customer_id = #{customerId}
+        <foreach item="ids" collection="secondCategorylist" separator="OR" open="AND (" close=")" index="">
+            category_id = #{ids}
+        </foreach>
+    </update>
+
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/DelCategoryFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/DelCategoryFormDTO.java
index c1fa3252c6..48ac7e6404 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/DelCategoryFormDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/DelCategoryFormDTO.java
@@ -31,5 +31,10 @@ public class DelCategoryFormDTO implements Serializable {
      */
     private String level;
 
+    /**
+     * token中用户
+     */
+    private String userId;
+
 
 }
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IsDisableCategoryFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IsDisableCategoryFormDTO.java
index e259fd81a9..ccd91a49c5 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IsDisableCategoryFormDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IsDisableCategoryFormDTO.java
@@ -31,6 +31,19 @@ public class IsDisableCategoryFormDTO implements Serializable {
     @NotBlank(message = "是否启用类型不能为空",groups = {IsDisableCategory.class})
     private String type;
 
+    /**
+     * 一类、二类分类Id集合
+     */
     private List<String> categoryList;
 
+    /**
+     * 二类分类Id集合
+     */
+    private List<String> secondCategorylist;
+
+    /**
+     * token中用户
+     */
+    private String userId;
+
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml
index bb6a148e90..30033c620e 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml
@@ -19,10 +19,10 @@
         FROM project_category
         WHERE del_flag = '0'
         AND customer_id = #{customerId}
-        <if test="level != null and '' != level and '1' == level ">
+        <if test="1 == level ">
             AND category_pids = #{categoryId}
         </if>
-        <if test="level != null and '' != level and '2' == level ">
+        <if test="2 == level ">
             AND category_id = #{categoryId}
         </if>
     </select>

From 17d4db86d5310cc143ebe2bf293b55dafe9cd330 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Tue, 23 Mar 2021 18:56:22 +0800
Subject: [PATCH 089/119] =?UTF-8?q?=E2=91=A0=E4=BF=AE=E6=94=B9=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=A0=87=E7=AD=BE=E7=9A=84=E6=8E=92=E5=BA=8F=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=20=E2=91=A1=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=97=B6=E6=9F=A5=E8=AF=A2=E4=B8=BAnull?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E8=A1=A5=E5=81=BF=E6=96=B9=E6=B3=95=20?=
 =?UTF-8?q?=E2=91=A2=E6=96=B0=E5=A2=9E=E6=89=B9=E9=87=8F=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E5=88=86=E7=B1=BB=E4=B8=8B=E7=9A=84=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E5=9C=A8=E7=BC=93=E5=AD=98=E4=B8=AD=E7=9A=84"?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E7=A6=81=E7=94=A8"=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/commons/tools/redis/RedisUtils.java |  12 ++
 .../com/epmet/dao/IssueProjectTagDictDao.java |  33 +++++-
 .../epmet/redis/IssueProjectTagDictRedis.java | 106 ++++++++++++++----
 .../IssueProjectCategoryDictServiceImpl.java  |   7 +-
 .../mapper/IssueProjectTagDictDao.xml         | 106 +++++++++++++-----
 5 files changed, 210 insertions(+), 54 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java
index 2fcabf5d57..309cb9192e 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java
@@ -357,6 +357,18 @@ public class RedisUtils {
         return typedTuples;
     }
 
+    public <T> Set<T> zReverseRange(String key, long start, long end, Class<T> clazz) {
+        Set<Object> objects = redisTemplate.opsForZSet().reverseRange(key, start, end);
+        if(CollectionUtils.isEmpty(objects)) return null;
+        return objects.stream().map(o->{
+            try {
+                T target = clazz.newInstance();
+                BeanUtils.copyProperties(o, target);
+                return target;
+            }catch (Exception e){throw new RenException("convert error");}
+        }).collect(Collectors.toSet());
+    }
+
     /**
      * @Description 标签使用数量缓存更新
      * @param key
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java
index 9fa8ef840d..8439b7d940 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java
@@ -92,10 +92,41 @@ public interface IssueProjectTagDictDao extends BaseDao<IssueProjectTagDictEntit
      * @author wangc
      * @date 2020.12.10 10:07
     */
-    List<IssueProjectTagDictEntity> selectTagByCategory(@Param("categories") List<String> categories,@Param("customerId") String customerId,@Param("isDefault")String isDefault);
+    List<IssueProjectTagDictEntity> selectTagByCategory(@Param("categories") List<String> categories,@Param("customerId") String customerId,@Param("targetCustomerId") String targetCustomerId);
+
+    /**
+     * @Description 查询客户下的标签数量
+     * @param customerId
+     * @return int
+     * @author wangc
+     * @date 2021.03.23 16:51
+    */
+    int selectCountByCustomerId(@Param("customerId") String customerId);
+
+    /**
+     * @Description 查询客户下自定义标签
+     * @param customerId
+     * @return java.util.List<com.epmet.entity.IssueProjectTagDictEntity>
+     * @author wangc
+     * @date 2021.03.23 16:56
+    */
+	List<IssueProjectTagDictEntity> selectCustomizedByCustomerId(@Param("customerId") String customerId);
+
+    /**
+     * @Description 根据传入的二级分类Id查询默认标签
+	 * 当categories为空时，查询全部默认分类的标签，排序规则：先按照二级分类的上级分类的Sort排序(asc)，然后按照二级分类的Sort排序(asc)，然后按照标签名拼音排序
+	 * 当categories不为空时，按照传入的二级分类的顺序排序，然后按照标签名拼音排序
+     * @param customerId
+     * @param categories
+     * @return java.util.List<com.epmet.dto.result.IssueCategoryTagResultDTO>
+     * @author wangc
+     * @date 2021.03.23 15:19
+    */
+    List<IssueCategoryTagResultDTO> selectDefault(@Param("customerId") String customerId,@Param("categories") List<String> categories);
 
     /**
      * @Description 根据客户Id和标签Id集合查询标签的基础信息(标签名、标签码，标签所属分类)
+	 * 不管标签是否被禁用，都可以更新热度，因此这个查询不能加是否禁用的限制
      * @param customerId
      * @param tagIds
      * @return java.util.List<com.epmet.entity.IssueProjectTagDictEntity>
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
index 33896d5b16..8424fa7ec4 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
@@ -29,6 +29,7 @@ import com.epmet.dto.result.IssueCategoryTagResultDTO;
 import com.epmet.entity.IssueProjectCategoryDictEntity;
 import com.epmet.entity.IssueProjectTagDictEntity;
 import com.epmet.service.IssueProjectCategoryDictService;
+import com.epmet.service.IssueProjectTagDictService;
 import com.epmet.utils.ModuleConstants;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
@@ -65,6 +66,8 @@ public class IssueProjectTagDictRedis {
     private IssueProjectCategoryDictDao categoryDictDao;
     @Autowired
     private IssueProjectCategoryDictService categoryDictService;
+    @Autowired
+    private IssueProjectTagDictService tagDictService;
     public void delete(Object[] ids) {
 
     }
@@ -101,12 +104,10 @@ public class IssueProjectTagDictRedis {
         boolean ifOtherOnly = null == otherCategory ? false : (!CollectionUtils.isEmpty(category) && category.size() == NumConstant.ONE && category.contains(otherCategory.getId()) ? true : false);
 
         Map<String,List<IssueCategoryTagResultDTO>> result = new HashMap<>();
-
-        List<IssueProjectTagDictEntity> _default = poolDao.selectTagByCategory(ifOtherOnly || CollectionUtils.isEmpty(category) ? null : category, customerId, NumConstant.ZERO_STR);//默认
+        //传入的categories不会只包含"其他"这个分类，因为情况下ifOtherOnly为true，直接传入null
+        List<IssueCategoryTagResultDTO> _default = poolDao.selectDefault(customerId,ifOtherOnly ? null : category);
         if(!CollectionUtils.isEmpty(_default)){
-            result.put(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME,_default.stream().map(o -> {
-                IssueCategoryTagResultDTO tag = ConvertUtils.sourceToTarget(o,IssueCategoryTagResultDTO.class);
-                tag.setName(o.getTagName()); return tag;}).collect(Collectors.toList()));
+            result.put(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME,_default);
         }else log.error("there is no default tag data in database , customerId : {}",customerId);
 
 
@@ -127,16 +128,19 @@ public class IssueProjectTagDictRedis {
                 result.put(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME,customizedResult);
             }
 
-            //默认、自定义标签，只要有一个是空就触发补偿
-            //不信任缓存数据
-            if(!CollectionUtils.isEmpty(result) && !CollectionUtils.isEmpty(result.get(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME))
+
+        //默认、自定义标签，只要有一个是空就触发补偿
+        //不信任缓存数据
+        if(!CollectionUtils.isEmpty(result) && !CollectionUtils.isEmpty(result.get(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME))
                 && !CollectionUtils.isEmpty(result.get(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME)))
             return result;
 
 
+
+
         log.warn("fetch customer govern tag cache blankly,customerId:{},now begin compensation...", customerId);
 
-        Map<String,List<IssueCategoryTagResultDTO>> compensate = compensate(customerId, category, ifOtherOnly);
+        Map<String,List<IssueCategoryTagResultDTO>> compensate = compensate(customerId, category, ifOtherOnly,result);
 
         if (CollectionUtils.isEmpty(compensate)) {
             log.error("compensation failure or there is no tag data in database!!");
@@ -235,7 +239,7 @@ public class IssueProjectTagDictRedis {
 
             log.warn("fetch customer govern tag cache blankly,customerId:{},now begin compensation...", customerId);
 
-            Map<String,List<IssueCategoryTagResultDTO>> compensate = compensate(customerId, category, ifOtherOnly);
+            Map<String,List<IssueCategoryTagResultDTO>> compensate = compensate(customerId, category, ifOtherOnly,null);
 
             if (CollectionUtils.isEmpty(compensate)) {
                 log.error("compensation failure or there is no tag data in database!!");
@@ -249,10 +253,7 @@ public class IssueProjectTagDictRedis {
 
 
     /**
-     * @Description    category为空，则补偿全部，返回默认标签和自定义标签，补偿全部
-     *                 category仅包含"其他"这个分类的Id时，返回同上，补偿全部
-     *                 category不为空且不只有"其他"这个分类的Id时，则返回并补偿集合中的类别标签以及自定义标签
-     *                 默认标签不按照热度排序，自定义标签按照热度排序
+     * @Description    如果之前查询的结果为空，说明默认与自定义都没有
      *
      *
      * @param customerId
@@ -261,17 +262,38 @@ public class IssueProjectTagDictRedis {
      * @author wangc
      * @date 2020.12.10 09:34
     */
-    public Map<String,List<IssueCategoryTagResultDTO>> compensate(String customerId,List<String> category,boolean ifOtherOnly){
-
+    public Map<String,List<IssueCategoryTagResultDTO>> compensate(String customerId,List<String> category,boolean ifOtherOnly,Map<String,List<IssueCategoryTagResultDTO>> preResult){
 
-        List<IssueProjectTagDictEntity> db = poolDao.selectTagByCategory(ifOtherOnly || CollectionUtils.isEmpty(category) ? null : category, customerId, null);
+        List<IssueProjectTagDictEntity> db = new LinkedList<>();
 
-        if(CollectionUtils.isEmpty(db) && (ifOtherOnly || CollectionUtils.isEmpty(category))){
+        if(CollectionUtils.isEmpty(preResult) || CollectionUtils.isEmpty(preResult.get(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME))){
             CategoryTagInitFormDTO customerIdParam = new CategoryTagInitFormDTO(); customerIdParam.setCustomerId(customerId);
-            categoryDictService.init(customerIdParam);
-            db = poolDao.selectTagByCategory(ifOtherOnly || CollectionUtils.isEmpty(category) ? null : category, customerId, null);
+            if(ifOtherOnly || CollectionUtils.isEmpty(category)) {
+                //补偿全部默认标签
+                categoryDictService.init(customerIdParam);
+                db.addAll(poolDao.selectTagListByCustomer(customerId));
+            }else{
+                if(NumConstant.ZERO <= poolDao.selectCountByCustomerId(customerId)){
+                    categoryDictService.init(customerIdParam);
+                }else{
+                    //只插入category中的标签
+                    tagDictService.insertBatch(poolDao.selectTagByCategory(category,"default",customerId));
+                    db.addAll(poolDao.selectTagsByCustomerIdAndTagIds(customerId,category));
+                }
+            }
+        }
+
+        if(CollectionUtils.isEmpty(preResult) || CollectionUtils.isEmpty(preResult.get(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME))){
+            //先去数据库查询自定义，为空则是最终结果，不为空则补偿
+            List<IssueProjectTagDictEntity> customizedTags = poolDao.selectCustomizedByCustomerId(customerId);
+            if(!CollectionUtils.isEmpty(customizedTags)){
+                db.addAll(customizedTags);
+            }
         }
 
+
+
+
         // key      ->      redisKey
         // value    ->      [key : score ; value : object]
         Map<String,Map<Integer,List<IssueCategoryTagResultDTO>>> fulfilled = new HashMap<>();
@@ -310,9 +332,12 @@ public class IssueProjectTagDictRedis {
 
         Map<String,List<IssueCategoryTagResultDTO>> result = new HashMap<>();
         //默认标签：按照分类排序      Mapper返回的查询结果是有序的
-        result.put(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME,CollectionUtils.isEmpty(db) ? null : db.stream().filter(o -> !StringUtils.equals(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME,o.getCategoryId())).map(entity -> {
-            IssueCategoryTagResultDTO tag = ConvertUtils.sourceToTarget(entity,IssueCategoryTagResultDTO.class);
-            tag.setName(entity.getTagName()); return tag;}).collect(Collectors.toList()));
+        //result.put(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME,CollectionUtils.isEmpty(db) ? null : db.stream().filter(o -> !StringUtils.equals(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME,o.getCategoryId())).map(entity -> {
+        //    IssueCategoryTagResultDTO tag = ConvertUtils.sourceToTarget(entity,IssueCategoryTagResultDTO.class);
+        //    tag.setName(entity.getTagName()); return tag;}).collect(Collectors.toList()));
+        result.put(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME,poolDao.selectDefault(customerId,ifOtherOnly ? null : category));
+
+
         //自定义标签：按照热度排序    sorted(Comparator.comparing(IssueProjectTagDictEntity :: getIssueUseCount).reversed())
         result.put(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME,CollectionUtils.isEmpty(db) ? null : db.stream().filter(o -> StringUtils.equals(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME,o.getCategoryId())).sorted(Comparator.comparing(IssueProjectTagDictEntity :: getIssueUseCount).reversed()).map(entity -> {
             IssueCategoryTagResultDTO tag = ConvertUtils.sourceToTarget(entity,IssueCategoryTagResultDTO.class);
@@ -388,7 +413,42 @@ public class IssueProjectTagDictRedis {
      * @date 2021.03.22 16:20
     */
     public void updateTagAvailabilityBySecondCategoryIds(String customerId,List<String>secondCategoryIds,String availableFlag){
+        if(CollectionUtils.isEmpty(secondCategoryIds)) return;
+        secondCategoryIds.forEach(cid -> {
+            String key = GovIssueRedisKeys.getGovernmentTagKey(customerId, cid);
+
+            Set<ZSetOperations.TypedTuple<Object>> tagTuples = 
+                    redisUtils.zReverseRangeWithScores(key, NumConstant.ZERO_L, (long) (NumConstant.ONE_NEG));
+
+            if(!CollectionUtils.isEmpty(tagTuples)){
+                Map<Double, Set<IssueCategoryTagResultDTO>> heatMap = new HashMap<>();
+                tagTuples.forEach(tuple -> {
+                    Set<IssueCategoryTagResultDTO> queue = heatMap.get(tuple.getValue());
+                    if((CollectionUtils.isEmpty(queue))) queue = new HashSet<>();
+                    IssueCategoryTagResultDTO ele = parseObject(tuple.getValue(), IssueCategoryTagResultDTO.class);
+                    ele.setIsDisable(availableFlag);
+                    queue.add(ele);
+                    heatMap.put((Double) tuple.getValue(),queue);
+                });
+                List<IssueCategoryTagResultDTO> customizedResult = new LinkedList<>();
+                heatMap.keySet().stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList()).forEach(count -> {
+                    customizedResult.addAll(heatMap.get(count));
+                });
+
+                redisUtils.delete(key);
 
+                redisTemplate.executePipelined((RedisCallback) connection -> {
+                    heatMap.forEach((score,set) -> {
+                            set.forEach(o -> {
+                                connection.zSetCommands().zIncrBy(redisTemplate.getKeySerializer().serialize(key),
+                                        score ,
+                                        redisTemplate.getValueSerializer().serialize(o));
+                            });
+                    });
+                    return null;
+                });
+            }
+        });
     }
 
     public <T> T parseObject(Object o,Class<T> clazz){
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 006568d0e2..5bdf0a58fe 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
@@ -40,6 +40,7 @@ import com.epmet.feign.GovProjectOpenFeignClient;
 import com.epmet.feign.OperCrmOpenFeignClient;
 import com.epmet.project.dto.result.ProjectCategoryDictResultDTO;
 import com.epmet.redis.IssueProjectCategoryDictRedis;
+import com.epmet.redis.IssueProjectTagDictRedis;
 import com.epmet.service.IssueProjectCategoryDictService;
 import com.epmet.service.IssueProjectTagDictService;
 import org.apache.commons.collections4.CollectionUtils;
@@ -80,6 +81,8 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
     private OperCrmOpenFeignClient operCrmOpenFeignClient;
     @Autowired
     private IssueProjectTagDictDao issueProjectTagDictDao;
+    @Autowired
+    private IssueProjectTagDictRedis dictRedis;
 
     @Override
     public PageData<IssueProjectCategoryDictDTO> page(Map<String, Object> params) {
@@ -269,8 +272,8 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
             logger.error(String.format("修改标签信息状态失败，客户Id->%s,分类Id->%s", formDTO.getCustomerId(), formDTO.getCategoryId()));
             throw new RuntimeException("分类、标签信息修改失败！");
         }
-        //4.修改缓存中标签状态 todo
-
+        //4.修改缓存中标签状态
+        dictRedis.updateTagAvailabilityBySecondCategoryIds(formDTO.getCustomerId(),formDTO.getSecondCategorylist(),formDTO.getType());
     }
 
     /**
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
index e141bba4b1..487dd5b466 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
@@ -88,37 +88,87 @@
     <!-- 根据类别查询客户下标签 -->
     <select id="selectTagByCategory" resultType="com.epmet.entity.IssueProjectTagDictEntity">
         SELECT
-            tag.ID,
-            tag.TAG_NAME,
+            ID,
+            <if test='null != targetCustomerId and "" != targetCustomerId'>
+                #{targetCustomerId} as customerId,
+            </if>
+            TAG_NAME,CATEGORY_ID,IS_DEFAULT,ISSUE_USE_COUNT,PROJECT_USE_COUNT,IS_DISABLE,DEL_FLAG,REVISION
+        FROM
+            ISSUE_PROJECT_TAG_DICT
+        WHERE
+            DEL_FLAG = '0'
+        AND
+            CUSTOMER_ID = #{customerId}
+        <foreach collection="categories" item="categoryId"  open="AND ( "  separator=" OR " close=" )">
+            CATEGORY_ID = #{categoryId}
+        </foreach>
+    </select>
+
+    <select id="selectCountByCustomerId" resultType="int">
+        SELECT COUNT(id) FROM ISSUE_PROJECT_CATEGORY_DICT
+        WHERE DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId}
+    </select>
+
+    <select id="selectCustomizedByCustomerId" resultType="com.epmet.entity.IssueProjectTagDictEntity">
+        SELECT
+            ID,
+            TAG_NAME,
             IFNULL(tag.CATEGORY_ID,'customize') AS categoryId,
-            tag.IS_DEFAULT,
-            (IFNULL(tag.ISSUE_USE_COUNT,0) + IFNULL(tag.PROJECT_USE_COUNT,0)) AS issueUseCount
+            IS_DEFAULT,
+            (IFNULL(ISSUE_USE_COUNT,0) + IFNULL(PROJECT_USE_COUNT,0)) AS issueUseCount,
+            IS_DISABLE
+         FROM ISSUE_PROJECT_CATEGORY_DICT
+        WHERE DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId} AND IS_DEFAULT = '0'
+    </select>
+
+    <select id="selectDefault" resultType="com.epmet.dto.result.IssueCategoryTagResultDTO">
+        SELECT
+        tag.ID,
+        tag.TAG_NAME AS NAME,
+        tag.category_id,
+        tag.IS_DISABLE
+        FROM
+        ISSUE_PROJECT_TAG_DICT tag
+        INNER JOIN (
+        SELECT
+        c1.id,
+        c1.CATEGORY_NAME,
+        c1.CATEGORY_CODE,
+        c2.sort AS pSort,
+        c1.sort
         FROM
-            ISSUE_PROJECT_TAG_DICT tag LEFT JOIN ISSUE_PROJECT_CATEGORY_DICT type ON tag.CATEGORY_ID = type.ID
-            AND type.CUSTOMER_ID = #{customerId}
+        ISSUE_PROJECT_CATEGORY_DICT c1
+        INNER JOIN ISSUE_PROJECT_CATEGORY_DICT c2 ON c1.PID = c2.ID
         WHERE
-            tag.DEL_FLAG = '0'
-            AND tag.CUSTOMER_ID = #{customerId}
-            <if test='null != isDefault and "" != isDefault'>
-                AND tag.IS_DEFAULT = #{isDefault}
-            </if>
-            <choose>
-                <when test="null != categories and categories.size > 0">
-                    <foreach collection="categories" item="id" open="AND ( tag.CATEGORY_ID IS NULL OR tag.CATEGORY_ID = '' OR " separator=" OR " close=" )">
-                        tag.CATEGORY_ID = #{id}
-                    </foreach>
-                    ORDER BY FIELD(
-                    tag.CATEGORY_ID,
-                    <foreach collection="categories" item="id" separator=" , ">
-                        #{id}
-                    </foreach>
-                    )
-                </when>
-                <otherwise>
-                    ORDER BY type.SORT
-                </otherwise>
-            </choose>
-                ,  CONVERT ( tag.TAG_NAME USING gbk )
+        c1.CATEGORY_TYPE = '2'
+        AND c1.CUSTOMER_ID = #{customerId}
+        AND c1.IS_DISABLE = 'enable'
+        AND c2.CUSTOMER_ID = #{customerId}
+        ) type ON tag.CATEGORY_ID = type.ID
+        WHERE
+        tag.DEL_FLAG = '0'
+        AND tag.CUSTOMER_ID = #{customerId}
+        AND tag.IS_DISABLE = 'enable'
+        AND tag.IS_DEFAULT = '0'
+        <choose>
+            <when test="null != categories and categories.size > 0">
+                <foreach collection="categories" item="id" open="AND (  " separator=" OR " close=" )">
+                    tag.CATEGORY_ID = #{id}
+                </foreach>
+                ORDER BY FIELD(
+                tag.CATEGORY_ID,
+                <foreach collection="categories" item="id" separator=" , ">
+                    #{id}
+                </foreach>
+                )
+            </when>
+            <otherwise>
+                ORDER BY
+                type.pSort,
+                type.SORT ASC
+            </otherwise>
+        </choose>
+        ,CONVERT ( tag.TAG_NAME USING gbk )
     </select>
 
     <!-- 根据客户Id和标签Id集合查询标签的基础信息(标签名、标签码，标签所属分类) -->

From 8aea84d02d2a87c25a18db54d9896addf28b9356 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 24 Mar 2021 10:25:07 +0800
Subject: [PATCH 090/119] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=AE=AE=E9=A2=98?=
 =?UTF-8?q?=E8=BD=AC=E9=A1=B9=E7=9B=AEbug=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/service/impl/ProjectServiceImpl.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
index e50f3944eb..e51d824913 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@@ -1023,6 +1023,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 				entity.setCustomerId(item.getCustomerId());
 				entity.setGridId(item.getGridId());
 				entity.setProjectId(projectEntity.getId());
+				entity.setCategoryCode(item.getCategoryCode());
 				categoryList.add(entity);
 			});
 			projectCategoryService.insertBatch(categoryList);

From 58a6d5c5b6f88b6f019ff97328c0a23b3c8fe92a Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 24 Mar 2021 11:19:30 +0800
Subject: [PATCH 091/119] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=20sql=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IssueCategoryDao.xml     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
index 159debdd32..f1027a6759 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
@@ -48,10 +48,12 @@
 
     <select id="selectCategoryByIssue" resultType="com.epmet.dto.IssueCategoryDTO">
         SELECT
-               CUSTOMER_ID,
-               GRID_ID,
-               CATEGORY_ID,
-               CATEGORY_PIDS
+           CUSTOMER_ID,
+           GRID_ID,
+           ISSUE_ID,
+           CATEGORY_ID,
+           CATEGORY_PIDS,
+           CATEGORY_CODE
         FROM issue_category
         WHERE DEL_FLAG = '0'
         AND ISSUE_ID = #{issueId}

From 88ac6d948fa7cc2c56191450046a096e9e7a244c Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Wed, 24 Mar 2021 14:32:05 +0800
Subject: [PATCH 092/119] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=9B=B4=E6=96=B0=E6=97=B6=E7=9A=84=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/ProjectTagsServiceImpl.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTagsServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTagsServiceImpl.java
index 4154c9bd24..87edc5e00b 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTagsServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTagsServiceImpl.java
@@ -41,6 +41,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.Arrays;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -142,8 +143,9 @@ public class ProjectTagsServiceImpl extends BaseServiceImpl<ProjectTagsDao, Proj
         if(null != orientIds && null == newIds) differentSet.setMinus(orientIds);
         if(null == orientIds && null != newIds) differentSet.setPlus(newIds);
         if(null != orientIds && null != newIds){
+            List<String> replaceNews = new LinkedList<>(newIds);
             differentSet.setPlus(newIds.removeAll(orientIds) ? newIds : null);
-            differentSet.setMinus(orientIds.removeAll(newIds) ? orientIds : null);
+            differentSet.setMinus(orientIds.removeAll(replaceNews) ? orientIds : null);
         }
         Result result = issueClient.updateCitations(differentSet);
         if(!result.success()) throw new RenException(result.getInternalMsg());

From 9f8e27e61b5fbff4dd211643fb28e0165a879095 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Wed, 24 Mar 2021 16:25:50 +0800
Subject: [PATCH 093/119] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IssueProjectCategoryDictServiceImpl.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 5bdf0a58fe..6a21d19c46 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
@@ -345,7 +345,7 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
         entity.setPid(NumConstant.ZERO_STR );
         entity.setPids(NumConstant.ZERO_STR );
         entity.setParentCategoryCode(NumConstant.ZERO_STR);
-        // 查询 当前客户下，+1 后最大的一级分类数。从1开始
+        // 查询 当前客户下最大的一级分类数。
         Integer maxCategoryCode = baseDao.getMaxCategoryCode(formDTO.getCustomerId(), NumConstant.ZERO_STR);
         if (NumConstant.ZERO == maxCategoryCode) {
             maxCategoryCode = 1001;
@@ -406,7 +406,7 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
         entity.setPids(formDTO.getParentCategoryId());
         IssueProjectCategoryDictEntity parentCategoryCode = baseDao.selectById(formDTO.getParentCategoryId());
         entity.setParentCategoryCode(parentCategoryCode.getCategoryCode());
-        // 查询 当前客户下，+1 后最大的一级分类数
+        // 查询 当前客户下最大的一级分类数。
         Integer maxCategoryCode = baseDao.getMaxCategoryCode(formDTO.getCustomerId(), parentCategoryCode.getCategoryCode());
         if (NumConstant.ZERO == maxCategoryCode) {
             maxCategoryCode = Integer.valueOf(parentCategoryCode.getCategoryCode() + "1001");

From 93a928b79361b0b3b235bb6f8134f41723b27411 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 24 Mar 2021 17:16:03 +0800
Subject: [PATCH 094/119] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E3=80=81=E6=A0=87=E7=AD=BE=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E9=97=AE=E9=A2=98=E4=B8=8D=E6=94=BE=E5=9C=A8=E6=96=B0?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=88=9B=E5=BB=BA=E8=BF=87=E7=A8=8B=E4=B8=AD?=
 =?UTF-8?q?=20=E5=B5=8C=E5=85=A5=E5=85=B7=E4=BD=93=E7=9A=84=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E9=80=BB=E8=BE=91=E4=B8=AD=EF=BC=8C=E9=99=8D=E4=BD=8E?=
 =?UTF-8?q?=E6=96=B0=E5=AE=A2=E6=88=B7=E5=88=9D=E5=A7=8B=E5=8C=96=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E5=8E=8B=E5=8A=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IssueProjectCategoryDictServiceImpl.java  | 59 ++++++++++---------
 .../impl/IssueProjectTagDictServiceImpl.java  | 24 +++++++-
 2 files changed, 52 insertions(+), 31 deletions(-)

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 6a21d19c46..d78c3a3458 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
@@ -31,7 +31,10 @@ import com.epmet.dao.IssueCategoryDao;
 import com.epmet.dao.IssueProjectCategoryDictDao;
 import com.epmet.dao.IssueProjectRelationDao;
 import com.epmet.dao.IssueProjectTagDictDao;
-import com.epmet.dto.*;
+import com.epmet.dto.IssueCategoryDTO;
+import com.epmet.dto.IssueDTO;
+import com.epmet.dto.IssueProjectCategoryDictDTO;
+import com.epmet.dto.ProjectCategoryDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.IssueProjectCategoryDictEntity;
@@ -145,6 +148,18 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
     @Override
     public List<CustomerCategoryListResultDTO> categoryList(String customerId) {
         List<CustomerCategoryListResultDTO> resultList = baseDao.selectCustomerCategoryList(customerId);
+        //2021.3.24 sun 客户初始化分类标签的接口不想加到新客户创建的程序里，因此加到这里 在标签列表的查询方法中也有关于初始化分类标签的逻辑
+        try {
+            if(CollectionUtils.isEmpty(resultList)){
+                CategoryTagInitFormDTO dto = new CategoryTagInitFormDTO();
+                dto.setCustomerId(customerId);
+                init(dto);
+                resultList = baseDao.selectCustomerCategoryList(customerId);
+            }
+        } catch (Exception e) {
+            logger.error("客户初始化分类、标签失败，客户Id->"+customerId, e);
+        }
+        //end
         return resultList;
     }
 
@@ -201,35 +216,21 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void init(CategoryTagInitFormDTO formDTO) {
-        //2021.3.23 sun  不传客户Id时默认查询所有有效客户列表 循环添加
-        List<String> customerIdList = new ArrayList<>();
-        if(StringUtils.isBlank(formDTO.getCustomerId())){
-            Result<List<CustomerDTO>> resultList = operCrmOpenFeignClient.getAllCustomerList();
-            if(!resultList.success()){
-                throw new RuntimeException("crm库获取有效客户列表失败！");
-            }
-            customerIdList = resultList.getData().stream().map(cu->cu.getId()).collect(Collectors.toList());
-        }else {
-            customerIdList.add(formDTO.getCustomerId());
+        List<IssueProjectCategoryDictEntity> list = baseDao.selectCategoryListByCustomer(formDTO.getCustomerId());
+        if (CollectionUtils.isEmpty(list)) {
+            //分类初始化
+            List<IssueProjectCategoryDictEntity> categoryList = baseDao.selectCategoryListByCustomer("default");
+            categoryList.forEach(item -> {
+                item.setCustomerId(formDTO.getCustomerId());
+            });
+            this.insertBatch(categoryList);
+            //标签初始化
+            List<IssueProjectTagDictEntity> tagList = issueProjectTagDictService.getTagListByCustomer("default");
+            tagList.forEach(item -> {
+                item.setCustomerId(formDTO.getCustomerId());
+            });
+            issueProjectTagDictService.insertBatch(tagList);
         }
-        //end  sun
-        customerIdList.forEach(cu->{
-            List<IssueProjectCategoryDictEntity> list = baseDao.selectCategoryListByCustomer(cu);
-            if (CollectionUtils.isEmpty(list)) {
-                //分类初始化
-                List<IssueProjectCategoryDictEntity> categoryList = baseDao.selectCategoryListByCustomer("default");
-                categoryList.forEach(item -> {
-                    item.setCustomerId(cu);
-                });
-                this.insertBatch(categoryList);
-                //标签初始化
-                List<IssueProjectTagDictEntity> tagList = issueProjectTagDictService.getTagListByCustomer("default");
-                tagList.forEach(item -> {
-                    item.setCustomerId(cu);
-                });
-                issueProjectTagDictService.insertBatch(tagList);
-            }
-        });
     }
 
     /**
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
index 5919990477..ee06f971d3 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
@@ -20,25 +20,28 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.constant.GovIssueRedisKeys;
 import com.epmet.dao.IssueProjectTagDictDao;
 import com.epmet.dto.IssueProjectTagDictDTO;
+import com.epmet.dto.form.CategoryTagInitFormDTO;
 import com.epmet.dto.form.TagDifferentSetFormDTO;
 import com.epmet.dto.form.TagListFormDTO;
 import com.epmet.dto.result.IssueCategoryTagResultDTO;
-import com.epmet.dto.result.IssueProjectTagsResultDTO;
 import com.epmet.dto.result.TagListResultDTO;
 import com.epmet.entity.IssueProjectTagDictEntity;
 import com.epmet.redis.IssueProjectTagDictRedis;
+import com.epmet.service.IssueProjectCategoryDictService;
 import com.epmet.service.IssueProjectTagDictService;
 import com.epmet.utils.ModuleConstants;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -55,8 +58,11 @@ import java.util.stream.Collectors;
 @Service
 public class IssueProjectTagDictServiceImpl extends BaseServiceImpl<IssueProjectTagDictDao, IssueProjectTagDictEntity> implements IssueProjectTagDictService {
 
+    private static Logger logger = LoggerFactory.getLogger(IssueProjectTagDictServiceImpl.class);
     @Autowired
     private IssueProjectTagDictRedis issueProjectTagDictRedis;
+    @Autowired
+    private IssueProjectCategoryDictService issueProjectCategoryDictService;
 
     @Override
     public PageData<IssueProjectTagDictDTO> page(Map<String, Object> params) {
@@ -125,6 +131,20 @@ public class IssueProjectTagDictServiceImpl extends BaseServiceImpl<IssueProject
 		Map<String,List<IssueCategoryTagResultDTO>> map =  issueProjectTagDictRedis.getDefaultTagsSortedByCategoryAndCustomizedTagsOrderByRank(tokenDto.getCustomerId(),
 				formDTO.getCategoryIdList());
         result.setDefaulted(map.get(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME));
+        //2021.3.24 sun 客户初始化分类标签的接口不想加到新客户创建的程序里，因此加到这里 在分类列表的查询方法中也有关于初始化分类标签的逻辑
+        try {
+            if(CollectionUtils.isEmpty(result.getDefaulted())){
+                CategoryTagInitFormDTO dto = new CategoryTagInitFormDTO();
+                dto.setCustomerId(tokenDto.getCustomerId());
+                issueProjectCategoryDictService.init(dto);
+                Map<String,List<IssueCategoryTagResultDTO>> map1 =  issueProjectTagDictRedis.getDefaultTagsSortedByCategoryAndCustomizedTagsOrderByRank(tokenDto.getCustomerId(),
+                        formDTO.getCategoryIdList());
+                result.setDefaulted(map1.get(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME));
+            }
+        } catch (Exception e) {
+            logger.error("客户初始化分类、标签失败，客户Id->"+tokenDto.getCustomerId(), e);
+        }
+        //end
         List<IssueCategoryTagResultDTO> list = map.get(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME);
         if (CollectionUtils.isNotEmpty(list)) {
             result.setCustomized(list.stream().limit(NumConstant.TEN).collect(Collectors.toList()));

From 05d5fa1174d0d5760c05a2892ae55110e7fb8d32 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 25 Mar 2021 11:04:47 +0800
Subject: [PATCH 095/119] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5txt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/test/java/resources/数据对接.txt         | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 epmet-module/data-statistical/data-statistical-server/src/test/java/resources/数据对接.txt

diff --git a/epmet-module/data-statistical/data-statistical-server/src/test/java/resources/数据对接.txt b/epmet-module/data-statistical/data-statistical-server/src/test/java/resources/数据对接.txt
new file mode 100644
index 0000000000..7d03dd36f8
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/test/java/resources/数据对接.txt
@@ -0,0 +1,12 @@
+截止到2021-03-25数据对接外部客户：
+1、市北党建
+2、安宁e家
+3、大美孔村街道
+4、e锦水街道（没有自己的大屏）
+5、微笑榆山街道（没有自己的大屏）
+产品自己的客户上线的大屏：
+1、城阳
+2、临沂龙湾社区
+3、平阴县
+孔村、锦水、榆山这三个街道的数据上报时间要早于平阴县计算的时间，目前已经按天上报和按月上报的，让孔村、榆山、锦水调整到2点前推送了。
+

From 70d8669fdf7f82e039cbe816553498faf9e7fcd6 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 25 Mar 2021 11:11:35 +0800
Subject: [PATCH 096/119] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/screen/ScreenCustomerGridDTO.java     |   2 +
 .../result/CategoryProjectResultDTO.java      |  56 ++++++
 .../com/epmet/controller/DemoController.java  |  10 +
 .../screen/ScreenCustomerGridDao.java         |   9 +
 .../ScreenProjectCategoryGridDailyDao.java    |  12 ++
 .../ScreenProjectCategoryOrgDailyDao.java     |  26 +++
 .../screen/ScreenCustomerGridService.java     |  10 +
 .../impl/ScreenCustomerGridServiceImpl.java   |  13 ++
 ...eenProjectCategoryOrgDailyServiceImpl.java | 182 +++++++++++++++++-
 .../screen/ScreenCustomerGridDao.xml          |  13 ++
 .../ScreenProjectCategoryGridDailyDao.xml     |  30 +++
 .../ScreenProjectCategoryOrgDailyDao.xml      |  53 +++++
 12 files changed, 408 insertions(+), 8 deletions(-)
 create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/result/CategoryProjectResultDTO.java

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenCustomerGridDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenCustomerGridDTO.java
index ee7863d40b..65e98b940b 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenCustomerGridDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenCustomerGridDTO.java
@@ -112,5 +112,7 @@ public class ScreenCustomerGridDTO implements Serializable {
      * 所有上级ID，用英文逗号分开
      */
 	private String allParentIds;
+	private String pid;
+	private String pids;
 
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/result/CategoryProjectResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/result/CategoryProjectResultDTO.java
new file mode 100644
index 0000000000..2ed95c1a35
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/result/CategoryProjectResultDTO.java
@@ -0,0 +1,56 @@
+package com.epmet.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/3/23 下午2:38
+ * @DESC
+ */
+@Data
+public class CategoryProjectResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -5774330825880917524L;
+
+    private String pid;
+    private String pids;
+
+    /**
+     * 组织ID
+     */
+    private String orgId;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 分类码
+     */
+    private String categoryCode;
+
+    /**
+     * 项目总数
+     */
+    private Integer projectTotal;
+
+    /**
+     * 分类级别
+     */
+    private Integer level;
+
+    /**
+     * 日期ID
+     */
+    private String dateId;
+
+    /**
+     * 组织级别
+     */
+    private String orgType;
+
+    private Boolean status = false;
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
index 720b3d9a23..9259e12463 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
@@ -859,4 +859,14 @@ public class DemoController {
         originProjectCategoryDailyService.extractProjectCategory(formDTO);
         return new Result();
     }
+
+    @Autowired
+    private ScreenProjectCategoryOrgDailyService screenProjectCategoryOrgDailyService;
+
+    @PostMapping("orgdaily")
+    public Result orgDaily(@RequestParam("customerId")String customerId,@RequestParam("dateId")String dateId){
+        screenProjectCategoryOrgDailyService.extractProjectCategoryOrgData(customerId,dateId);
+        return new Result();
+    }
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerGridDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerGridDao.java
index c06e189d7c..1d5099bc67 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerGridDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerGridDao.java
@@ -194,4 +194,13 @@ public interface ScreenCustomerGridDao extends BaseDao<ScreenCustomerGridEntity>
      * @date 2021/1/28 下午3:18
      */
     List<ScreenProjectGridDailyDTO> selectGridInfoByCustomerId(@Param("customerId") String customerId);
+
+    /**
+     * @Description  查询直属网格信息
+     * @Param customerId
+     * @Param level
+     * @author zxc
+     * @date 2021/3/23 下午4:03
+     */
+    List<ScreenCustomerGridDTO> selectBelongGridInfo(@Param("customerId") String customerId,@Param("level") String level);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.java
index 5b96c10067..bad0a291bf 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.java
@@ -18,10 +18,13 @@
 package com.epmet.dao.evaluationindex.screen;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screen.result.CategoryProjectResultDTO;
 import com.epmet.entity.evaluationindex.screen.ScreenProjectCategoryGridDailyEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 项目(事件)分类按网格_按天统计
  *
@@ -39,4 +42,13 @@ public interface ScreenProjectCategoryGridDailyDao extends BaseDao<ScreenProject
 	 * @return int
 	 */
 	int deleteByDateIdAndCustomerId(@Param("customerId") String customerId, @Param("dateId") String dateId);
+
+	/**
+	 * @Description  查询分类信息
+	 * @Param customerId
+	 * @Param dateId
+	 * @author zxc
+	 * @date 2021/3/23 下午2:49
+	 */
+	List<CategoryProjectResultDTO> selectCategoryInfo(@Param("customerId") String customerId,@Param("dateId") String dateId,@Param("level")String level,@Param("gridIds")List<String> gridIds);
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java
index c87d8bec0f..9f55340594 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java
@@ -18,10 +18,14 @@
 package com.epmet.dao.evaluationindex.screen;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screen.result.CategoryProjectResultDTO;
 import com.epmet.entity.evaluationindex.screen.ScreenProjectCategoryOrgDailyEntity;
+import com.sun.org.apache.xpath.internal.operations.Bool;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 项目(事件)分类按组织_按天统计
  *
@@ -39,4 +43,26 @@ public interface ScreenProjectCategoryOrgDailyDao extends BaseDao<ScreenProjectC
 	 * @return int
 	 */
 	int deleteByDateIdAndCustomerId(@Param("customerId") String customerId, @Param("dateId") String dateId);
+
+	/**
+	 * @Description  查询组织分类信息
+	 * @Param customerId
+	 * @Param dateId
+	 * @Param level 组织级别
+	 * @author zxc
+	 * @date 2021/3/23 下午3:22
+	 */
+	List<CategoryProjectResultDTO> selectOrgCategoryInfo(@Param("customerId") String customerId, @Param("dateId") String dateId,@Param("level")String level);
+
+	/**
+	 * @Description  查询组织分类信息【多客户】
+	 * @Param customerId
+	 * @Param dateId
+	 * @Param level
+	 * @Param existsStatus 父客户是否存在
+	 * @author zxc
+	 * @date 2021/3/24 下午2:48
+	 */
+	List<CategoryProjectResultDTO> selectOrgCategoryMoreCustomerInfo(@Param("customerIds")List<String> customerIds, @Param("dateId") String dateId,
+																	 @Param("level")String level, @Param("customerId")String customerId, @Param("existsStatus")Boolean existsStatus);
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCustomerGridService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCustomerGridService.java
index 3d2fc7a15a..ef39e1b781 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCustomerGridService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCustomerGridService.java
@@ -19,6 +19,7 @@ package com.epmet.service.evaluationindex.screen;
 
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.dto.ScreenCustomerGridDTO;
 import com.epmet.dto.extract.form.*;
 import com.epmet.dto.extract.result.GridInfoResultDTO;
 import com.epmet.dto.indexcollect.form.CustomerBizOrgFormDTO;
@@ -92,4 +93,13 @@ public interface ScreenCustomerGridService extends BaseService<ScreenCustomerGri
      * @date 2020/10/21 2:33 下午
      */
     Boolean initBizOrg(CustomerBizOrgFormDTO formDTO);
+
+    /**
+     * @Description  查询直属网格信息
+     * @Param customerId
+     * @Param level
+     * @author zxc
+     * @date 2021/3/23 下午4:02
+     */
+    List<ScreenCustomerGridDTO> selectBelongGridInfo(String customerId,String level);
 }
\ 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/ScreenCustomerGridServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java
index 6655be0a08..67dae90b1c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java
@@ -24,6 +24,7 @@ import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.OrgSourceTypeConstant;
 import com.epmet.dao.evaluationindex.screen.ScreenCustomerGridDao;
+import com.epmet.dto.ScreenCustomerGridDTO;
 import com.epmet.dto.extract.form.*;
 import com.epmet.dto.extract.result.GridInfoResultDTO;
 import com.epmet.dto.indexcollect.form.CustomerBizOrgFormDTO;
@@ -166,4 +167,16 @@ public class ScreenCustomerGridServiceImpl extends BaseServiceImpl<ScreenCustome
     public Boolean initBizOrg(CustomerBizOrgFormDTO formDTO) {
         return null;
     }
+
+    /**
+     * @Description  查询直属网格信息
+     * @Param customerId
+     * @Param level
+     * @author zxc
+     * @date 2021/3/23 下午4:03
+     */
+    @Override
+    public List<ScreenCustomerGridDTO> selectBelongGridInfo(String customerId, String level) {
+        return baseDao.selectBelongGridInfo(customerId, level);
+    }
 }
\ 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/ScreenProjectCategoryOrgDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java
index c9af2a289c..4fced8e2ee 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java
@@ -26,14 +26,22 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.constant.DataSourceConstant;
+import com.epmet.constant.ScreenConstant;
+import com.epmet.dao.evaluationindex.screen.ScreenProjectCategoryGridDailyDao;
 import com.epmet.dao.evaluationindex.screen.ScreenProjectCategoryOrgDailyDao;
+import com.epmet.dto.ScreenCustomerGridDTO;
+import com.epmet.dto.extract.result.CustomerAgencyInfoResultDTO;
 import com.epmet.dto.screen.ScreenProjectCategoryOrgDailyDTO;
+import com.epmet.dto.screen.result.CategoryProjectResultDTO;
 import com.epmet.dto.screencoll.ScreenCollFormDTO;
 import com.epmet.entity.crm.CustomerRelationEntity;
 import com.epmet.entity.evaluationindex.screen.ScreenProjectCategoryOrgDailyEntity;
 import com.epmet.service.crm.CustomerRelationService;
+import com.epmet.service.evaluationindex.screen.ScreenCustomerAgencyService;
+import com.epmet.service.evaluationindex.screen.ScreenCustomerGridService;
 import com.epmet.service.evaluationindex.screen.ScreenProjectCategoryOrgDailyService;
 import com.google.common.collect.Lists;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,6 +53,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 项目(事件)分类按组织_按天统计
@@ -54,10 +63,17 @@ import java.util.Map;
  */
 @Service
 @DataSource(DataSourceConstant.EVALUATION_INDEX)
+@Slf4j
 public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<ScreenProjectCategoryOrgDailyDao, ScreenProjectCategoryOrgDailyEntity> implements ScreenProjectCategoryOrgDailyService {
 
     @Autowired
     private CustomerRelationService relationService;
+    @Autowired
+    private ScreenCustomerAgencyService agencyService;
+    @Autowired
+    private ScreenProjectCategoryGridDailyDao gridDailyDao;
+    @Autowired
+    private ScreenCustomerGridService gridService;
 
     @Override
     public PageData<ScreenProjectCategoryOrgDailyDTO> page(Map<String, Object> params) {
@@ -147,15 +163,15 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
      */
     @Override
     public void extractProjectCategoryOrgData(String customerId, String dateId) {
-        List<ScreenProjectCategoryOrgDailyEntity> needInsert = new ArrayList<>();
         // 先查询有无子客户
         List<CustomerRelationEntity> relationInfo = relationService.selectSubCustomer(customerId);
         if (CollectionUtils.isEmpty(relationInfo)){
-            needInsert = disposeOneCustomer(customerId, dateId);
+            // 单客户
+            disposeOneCustomer(customerId, dateId);
         }else {
-            needInsert = disposeMoreCustomer(customerId,dateId,relationInfo);
+            // 多客户
+            disposeMoreCustomer(customerId,dateId,relationInfo);
         }
-        deleteAndInsert(customerId,dateId,needInsert);
     }
 
     /**
@@ -165,9 +181,75 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
      * @author zxc
      * @date 2021/3/23 上午10:40
      */
-    private List<ScreenProjectCategoryOrgDailyEntity> disposeOneCustomer(String customerId, String dateId){
+    private void disposeOneCustomer(String customerId, String dateId){
+        List<CustomerAgencyInfoResultDTO> agencyIdList = agencyService.selectAllAgencyId(customerId);
+        if (!CollectionUtils.isEmpty(agencyIdList)){
+            // 根据组织级别分组
+            Map<String, List<CustomerAgencyInfoResultDTO>> groupByLevel = agencyIdList.stream().collect(Collectors.groupingBy(CustomerAgencyInfoResultDTO::getLevel));
+            if (groupByLevel.containsKey(ScreenConstant.COMMUNITY)){
+                // 社区级别
+                disposeOneCustomerSub(ScreenConstant.COMMUNITY,true,customerId,dateId);
+            }
+            if (groupByLevel.containsKey(ScreenConstant.STREET)){
+                // 街道级别
+                disposeOneCustomerSub(ScreenConstant.STREET,false,customerId,dateId);
+            }
+            if (groupByLevel.containsKey(ScreenConstant.DISTRICT)){
+                // 区级
+                disposeOneCustomerSub(ScreenConstant.DISTRICT,false,customerId,dateId);
+            }
+            if (groupByLevel.containsKey(ScreenConstant.CITY)){
+                // 市级
+                disposeOneCustomerSub(ScreenConstant.CITY,false,customerId,dateId);
+            }
+            if (groupByLevel.containsKey(ScreenConstant.PROVINCE)){
+                // 省级
+                disposeOneCustomerSub(ScreenConstant.PROVINCE,false,customerId,dateId);
+            }
+        }
+    }
 
-        return new ArrayList<>();
+    /**
+     * @Description  单客户处理
+     * @Param level
+     * @Param isGrid
+     * @Param customerId
+     * @Param dateId
+     * @author zxc
+     * @date 2021/3/25 上午10:44
+     */
+    public void disposeOneCustomerSub(String level, Boolean isGrid, String customerId, String dateId){
+        List<ScreenProjectCategoryOrgDailyEntity> result = new ArrayList<>();
+        if (isGrid){
+            // 是社区级别
+            List<CategoryProjectResultDTO> categoryInfos = gridDailyDao.selectCategoryInfo(customerId, dateId,null,null);
+            if (!CollectionUtils.isEmpty(categoryInfos)){
+                result = ConvertUtils.sourceToTarget(categoryInfos, ScreenProjectCategoryOrgDailyEntity.class);
+            }
+        }else {
+            List<CategoryProjectResultDTO> categoryProjectResultDTOS = baseDao.selectOrgCategoryInfo(customerId, dateId, level);
+            List<ScreenCustomerGridDTO> belongGridInfos = gridService.selectBelongGridInfo(customerId, level);
+            if (!CollectionUtils.isEmpty(belongGridInfos)){
+                // 存在直属网格
+                List<String> gridIds = belongGridInfos.stream().map(m -> m.getGridId()).collect(Collectors.toList());
+                List<CategoryProjectResultDTO> categoryProjectGrid = gridDailyDao.selectCategoryInfo(customerId, dateId, level, gridIds);
+                if (!CollectionUtils.isEmpty(categoryProjectGrid)){
+                    categoryProjectResultDTOS.forEach(agency -> {
+                        categoryProjectGrid.forEach(grid -> {
+                            if (agency.getOrgId().equals(grid.getOrgId()) && agency.getCategoryCode().equals(grid.getCategoryCode())){
+                                agency.setProjectTotal(agency.getProjectTotal() + grid.getProjectTotal());
+                                grid.setStatus(true);
+                            }
+                        });
+                    });
+                    Map<Boolean, List<CategoryProjectResultDTO>> groupByStatus = categoryProjectGrid.stream().collect(Collectors.groupingBy(CategoryProjectResultDTO::getStatus));
+                    List<CategoryProjectResultDTO> categoryProjectResultDTOS1 = groupByStatus.get(false);
+                    if (!CollectionUtils.isEmpty(categoryProjectResultDTOS1)) categoryProjectResultDTOS.addAll(categoryProjectResultDTOS1);
+                }
+            }
+            result = ConvertUtils.sourceToTarget(categoryProjectResultDTOS,ScreenProjectCategoryOrgDailyEntity.class);
+        }
+        deleteAndInsert(customerId,dateId,result);
     }
 
     /**
@@ -178,9 +260,93 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
      * @author zxc
      * @date 2021/3/23 上午10:40
      */
-    private List<ScreenProjectCategoryOrgDailyEntity> disposeMoreCustomer(String customerId, String dateId,List<CustomerRelationEntity> relationInfo){
+    private void disposeMoreCustomer(String customerId, String dateId,List<CustomerRelationEntity> relationInfo){
+        List<CustomerAgencyInfoResultDTO> agencyIdList = agencyService.selectAllAgencyId(customerId);
+        if (!CollectionUtils.isEmpty(agencyIdList)){
+            // 根据组织级别分组
+            Map<String, List<CustomerAgencyInfoResultDTO>> groupByLevel = agencyIdList.stream().collect(Collectors.groupingBy(CustomerAgencyInfoResultDTO::getLevel));
+            if (groupByLevel.containsKey(ScreenConstant.COMMUNITY)){
+                // 社区级别
+                disposeMoreCustomerSub(ScreenConstant.COMMUNITY,true,customerId,dateId,relationInfo);
+            }
+            if (groupByLevel.containsKey(ScreenConstant.STREET)){
+                // 街道级别
+                disposeMoreCustomerSub(ScreenConstant.STREET,false,customerId,dateId,relationInfo);
+            }
+            if (groupByLevel.containsKey(ScreenConstant.DISTRICT)){
+                // 区级
+                disposeMoreCustomerSub(ScreenConstant.DISTRICT,false,customerId,dateId,relationInfo);
+            }
+            if (groupByLevel.containsKey(ScreenConstant.CITY)){
+                // 市级
+                disposeMoreCustomerSub(ScreenConstant.CITY,false,customerId,dateId,relationInfo);
+            }
+            if (groupByLevel.containsKey(ScreenConstant.PROVINCE)){
+                // 省级
+                disposeMoreCustomerSub(ScreenConstant.PROVINCE,false,customerId,dateId,relationInfo);
+            }
+        }
+    }
 
-        return new ArrayList<>();
+    private void disposeMoreCustomerSub(String level,Boolean isGrid,String customerId, String dateId, List<CustomerRelationEntity> relationInfo){
+        List<ScreenProjectCategoryOrgDailyEntity> result = new ArrayList<>();
+        if (isGrid){
+            List<CategoryProjectResultDTO> categoryInfos = gridDailyDao.selectCategoryInfo(customerId, dateId,null,null);
+            if (!CollectionUtils.isEmpty(categoryInfos)){
+                result = ConvertUtils.sourceToTarget(categoryInfos, ScreenProjectCategoryOrgDailyEntity.class);
+            }
+        }else {
+            List<CategoryProjectResultDTO> categoryProjectResultDTOS = baseDao.selectOrgCategoryInfo(customerId, dateId, level);
+            List<ScreenCustomerGridDTO> belongGridInfos = gridService.selectBelongGridInfo(customerId, level);
+            if (!CollectionUtils.isEmpty(belongGridInfos)){
+                // 存在直属网格
+                List<String> gridIds = belongGridInfos.stream().map(m -> m.getGridId()).collect(Collectors.toList());
+                List<CategoryProjectResultDTO> categoryProjectGrid = gridDailyDao.selectCategoryInfo(customerId, dateId, level, gridIds);
+                if (!CollectionUtils.isEmpty(categoryProjectGrid)){
+                    categoryProjectResultDTOS.forEach(agency -> {
+                        categoryProjectGrid.forEach(grid -> {
+                            if (agency.getOrgId().equals(grid.getOrgId()) && agency.getCategoryCode().equals(grid.getCategoryCode())){
+                                agency.setProjectTotal(agency.getProjectTotal() + grid.getProjectTotal());
+                                grid.setStatus(true);
+                            }
+                        });
+                    });
+                    Map<Boolean, List<CategoryProjectResultDTO>> groupByStatus = categoryProjectGrid.stream().collect(Collectors.groupingBy(CategoryProjectResultDTO::getStatus));
+                    List<CategoryProjectResultDTO> categoryProjectResultDTOS1 = groupByStatus.get(false);
+                    categoryProjectResultDTOS.addAll(categoryProjectResultDTOS1);
+                }
+            }
+            result = ConvertUtils.sourceToTarget(categoryProjectResultDTOS,ScreenProjectCategoryOrgDailyEntity.class);
+            if (ScreenConstant.DISTRICT.equals(level)){
+                // 子级客户ID
+                List<String> customerIds = relationInfo.stream().map(m -> m.getCustomerId()).collect(Collectors.toList());
+                // 父客户存在的分类
+                List<CategoryProjectResultDTO> categoryProjectExists = baseDao.selectOrgCategoryMoreCustomerInfo(customerIds, dateId, level, customerId, true);
+                if (!CollectionUtils.isEmpty(categoryProjectExists)){
+                    result.forEach(r -> {
+                        categoryProjectExists.forEach(c -> {
+                            if (r.getCategoryCode().equals(c.getCategoryCode())){
+                                r.setProjectTotal(r.getProjectTotal() + c.getProjectTotal());
+                                c.setStatus(true);
+                            }
+                        });
+                    });
+                    Map<Boolean, List<CategoryProjectResultDTO>> groupByStatus = categoryProjectExists.stream().collect(Collectors.groupingBy(CategoryProjectResultDTO::getStatus));
+                    List<CategoryProjectResultDTO> categoryProjectFalse = groupByStatus.get(false);
+                    if (!CollectionUtils.isEmpty(categoryProjectFalse)){
+                        List<ScreenProjectCategoryOrgDailyEntity> f = ConvertUtils.sourceToTarget(categoryProjectFalse, ScreenProjectCategoryOrgDailyEntity.class);
+                        result.addAll(f);
+                    }
+                }
+                // 父客户不存在的分类
+                List<CategoryProjectResultDTO> categoryProjectNotExists = baseDao.selectOrgCategoryMoreCustomerInfo(customerIds, dateId, level, customerId, false);
+                if (!CollectionUtils.isEmpty(categoryProjectNotExists)){
+                    List<ScreenProjectCategoryOrgDailyEntity> notExists = ConvertUtils.sourceToTarget(categoryProjectNotExists, ScreenProjectCategoryOrgDailyEntity.class);
+                    result.addAll(notExists);
+                }
+            }
+        }
+        deleteAndInsert(customerId,dateId,result);
     }
 
     /**
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerGridDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerGridDao.xml
index c6ad68ca8b..e5d0c1a183 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerGridDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerGridDao.xml
@@ -359,4 +359,17 @@
           AND cg.CUSTOMER_ID = #{customerId}
     </select>
 
+    <!-- 查询直属网格信息 -->
+    <select id="selectBelongGridInfo" resultType="com.epmet.dto.ScreenCustomerGridDTO">
+        SELECT
+            sca.AGENCY_ID AS PID,
+            sca.PIDS,
+            scg.*
+        FROM screen_customer_agency sca
+        LEFT JOIN screen_customer_grid scg ON scg.PARENT_AGENCY_ID = sca.AGENCY_ID
+        WHERE sca.`LEVEL` = #{level}
+          AND scg.DEL_FLAG = 0
+          AND scg.CUSTOMER_ID = #{customerId}
+    </select>
+
 </mapper>
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 e79da541d9..4bf7ba8edf 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
@@ -10,5 +10,35 @@
         limit 1000
     </delete>
 
+    <!-- 查询分类信息 -->
+    <select id="selectCategoryInfo" resultType="com.epmet.dto.screen.result.CategoryProjectResultDTO">
+        SELECT
+            sg.pid AS orgId,
+            sca.PID,
+            sca.pids,
+            sg.CUSTOMER_ID,
+            sg.CATEGORY_CODE,
+            SUM(sg.PROJECT_TOTAL) AS projectTotal,
+            sg.level,
+            sg.DATE_ID,
+            sca.`LEVEL` AS orgType
+        FROM screen_project_category_grid_daily sg
+        LEFT JOIN screen_customer_agency sca ON sca.AGENCY_ID = sg.PID
+        WHERE 1=1
+          AND sg.DEL_FLAG = '0'
+            <if test="null == level ">
+                AND sca.`LEVEL` = 'community'
+            </if>
+            <if test="null != level and '' != level">
+                AND sca.`LEVEL` = #{level}
+                <foreach collection="gridIds" item="gridId" separator=" OR ">
+                    AND sg.GRID_ID = #{gridId}
+                </foreach>
+            </if>
+          AND sg.CUSTOMER_ID = #{customerId}
+          AND sg.DATE_ID = #{dateId}
+        GROUP BY sg.CATEGORY_CODE,sca.AGENCY_ID
+    </select>
+
 
 </mapper>
\ No newline at end of file
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 20c4452e69..98b4eb7248 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
@@ -9,4 +9,57 @@
         limit 1000
     </delete>
 
+    <!-- 查询组织分类信息 -->
+    <select id="selectOrgCategoryInfo" resultType="com.epmet.dto.screen.result.CategoryProjectResultDTO">
+        SELECT
+            IF(sa.pid = '0', sa.ORG_ID,sa.pid) AS orgId,
+            IFNULL(sca.PID,'0') AS pid,
+            IFNULL(sca.PIDS,'0') AS pids,
+            sa.CUSTOMER_ID,
+            sa.CATEGORY_CODE,
+            SUM(sa.PROJECT_TOTAL) AS projectTotal,
+            sa.level,
+            sa.DATE_ID,
+            sca.`LEVEL` AS orgType
+        FROM screen_project_category_org_daily sa
+        LEFT JOIN screen_customer_agency sca ON sca.AGENCY_ID = sa.PID
+        WHERE sca.`LEVEL` = #{level}
+          AND sa.DEL_FLAG = '0'
+          AND sa.CUSTOMER_ID = #{customerId}
+          AND sa.DATE_ID = #{dateId}
+        GROUP BY sa.CATEGORY_CODE,sca.AGENCY_ID
+    </select>
+
+    <!-- 查询组织分类信息【多客户】 -->
+    <select id="selectOrgCategoryMoreCustomerInfo" resultType="com.epmet.dto.screen.result.CategoryProjectResultDTO">
+        SELECT
+            IF(od.pid = '0', od.ORG_ID,od.pid) AS orgId,
+            IFNULL(sca.PID,'0') AS pid,
+            IFNULL(sca.PIDS,'0') AS pids,
+            #{customerId} as customerId,
+            od.level,
+            od.CATEGORY_CODE,
+            SUM(od.PROJECT_TOTAL) AS projectTotal,
+            #{level} as orgType,
+            od.DATE_ID
+        FROM screen_project_category_org_daily od
+        LEFT JOIN customer_project_category_dict cd ON cd.CATEGORY_CODE = od.CATEGORY_CODE
+        LEFT JOIN screen_customer_agency sca ON sca.AGENCY_ID = od.PID
+        WHERE 1=1
+          AND od.DEL_FLAG = '0'
+          AND (
+          <foreach collection="customerIds" item="id" separator=" OR ">od.CUSTOMER_ID = #{id}
+          </foreach>
+                  )
+          <if test="existsStatus == true">
+              AND cd.EPMET_CATEGORY_CODE IS NOT NULL
+          </if>
+          <if test="existsStatus == false">
+              AND cd.EPMET_CATEGORY_CODE IS NULL
+          </if>
+          AND od.pid = '0'
+          AND od.date_id = #{dateId}
+        GROUP BY od.CATEGORY_CODE,od.pid
+    </select>
+
 </mapper>
\ No newline at end of file

From abedb8acff58b6bcd0a64ffa96648fb87a82238f Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 25 Mar 2021 15:07:51 +0800
Subject: [PATCH 097/119] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E8=A1=A5=E5=81=BF=E6=9C=BA=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IssueProjectTagDictDao.xml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
index 487dd5b466..d23b67ac1d 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
@@ -117,7 +117,7 @@
             IS_DEFAULT,
             (IFNULL(ISSUE_USE_COUNT,0) + IFNULL(PROJECT_USE_COUNT,0)) AS issueUseCount,
             IS_DISABLE
-         FROM ISSUE_PROJECT_CATEGORY_DICT
+         FROM ISSUE_PROJECT_TAG_DICT
         WHERE DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId} AND IS_DEFAULT = '0'
     </select>
 

From 291c469c7ba439ea87db72da0ec3103e6fc98ba3 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 25 Mar 2021 15:16:18 +0800
Subject: [PATCH 098/119] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...creenProjectCategoryOrgDailyServiceImpl.java | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java
index 4fced8e2ee..8dbbe72d73 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java
@@ -156,6 +156,7 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
 
     /**
      * @Description  按组织计算分类统计项目数量
+     * 查询sql以pid为orgId，pid的parentAgencyId为pid
      * @Param customerId
      * @Param dateId
      * @author zxc
@@ -170,6 +171,11 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
             disposeOneCustomer(customerId, dateId);
         }else {
             // 多客户
+            /**
+             * 1.查自己客户分类标签统计
+             * 2.查询子级客户分类标签【分为 epmet_category_code is null 和 is not null】，pid = '0'，跟父客户对比，同类标签项目数累加，不同直接添加到父客户
+             * 注：加入直属网格
+             */
             disposeMoreCustomer(customerId,dateId,relationInfo);
         }
     }
@@ -288,9 +294,20 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
         }
     }
 
+    /**
+     * @Description  多客户处理
+     * @Param level 级别
+     * @Param isGrid
+     * @Param customerId
+     * @Param dateId
+     * @Param relationInfo 子级客户信息
+     * @author zxc
+     * @date 2021/3/25 下午1:29
+     */
     private void disposeMoreCustomerSub(String level,Boolean isGrid,String customerId, String dateId, List<CustomerRelationEntity> relationInfo){
         List<ScreenProjectCategoryOrgDailyEntity> result = new ArrayList<>();
         if (isGrid){
+            // community级别走这
             List<CategoryProjectResultDTO> categoryInfos = gridDailyDao.selectCategoryInfo(customerId, dateId,null,null);
             if (!CollectionUtils.isEmpty(categoryInfos)){
                 result = ConvertUtils.sourceToTarget(categoryInfos, ScreenProjectCategoryOrgDailyEntity.class);

From 43b9772fd96dcf9efdab92a82e219d0c7dc1a925 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 25 Mar 2021 15:22:46 +0800
Subject: [PATCH 099/119] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E8=A1=A5=E5=81=BF=E6=9C=BA=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IssueProjectTagDictDao.xml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
index d23b67ac1d..ca8b48d0c7 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
@@ -113,7 +113,7 @@
         SELECT
             ID,
             TAG_NAME,
-            IFNULL(tag.CATEGORY_ID,'customize') AS categoryId,
+            IFNULL(CATEGORY_ID,'customize') AS categoryId,
             IS_DEFAULT,
             (IFNULL(ISSUE_USE_COUNT,0) + IFNULL(PROJECT_USE_COUNT,0)) AS issueUseCount,
             IS_DISABLE

From 6ebfdb1e87811d481b93a9c6cc57464b86f3bca8 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 25 Mar 2021 15:24:23 +0800
Subject: [PATCH 100/119] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=B7=9F=E8=B8=AA-?=
 =?UTF-8?q?=E5=BE=85=E5=A4=84=E7=90=86=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98=EF=BC=8C=E5=B8=A6=E5=A5=87?=
 =?UTF-8?q?=E5=B3=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gov-project-server/src/main/resources/mapper/ProjectDao.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
index c47def3cc0..50f8bc6433 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
@@ -38,7 +38,7 @@
                              GROUP BY ps.PROJECT_ID) psp ON p.ID = psp.PROJECT_ID
         WHERE p.DEL_FLAG = '0'
         AND p.status = 'pending'
-        ORDER BY p.CREATED_TIME ASC
+        ORDER BY psp.created_time, p.created_time ASC<!-- 先按滞留时间降序再按创建时间升序（带奇峰修改） -->
         LIMIT #{pageNo}, #{pageSize}
     </select>
     <select id="selectCreatedList" resultType="com.epmet.dto.ProjectDTO" parameterType="com.epmet.dto.form.ProjectListFromDTO">

From a65a3c1faee8a405fd8656306da1bf2ad70fe0ac Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 25 Mar 2021 15:26:24 +0800
Subject: [PATCH 101/119] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E8=A1=A5=E5=81=BF=E6=9C=BA=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IssueProjectTagDictDao.xml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
index ca8b48d0c7..8bd6bbba53 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
@@ -118,7 +118,7 @@
             (IFNULL(ISSUE_USE_COUNT,0) + IFNULL(PROJECT_USE_COUNT,0)) AS issueUseCount,
             IS_DISABLE
          FROM ISSUE_PROJECT_TAG_DICT
-        WHERE DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId} AND IS_DEFAULT = '0'
+        WHERE DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId} AND IS_DEFAULT = '1'
     </select>
 
     <select id="selectDefault" resultType="com.epmet.dto.result.IssueCategoryTagResultDTO">

From fa8918d425d52613abd7bfe94263461a495707b1 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 25 Mar 2021 16:04:15 +0800
Subject: [PATCH 102/119] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E8=A1=A5=E5=81=BF=E6=9C=BA=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/redis/IssueProjectTagDictRedis.java | 40 +++++++++++--------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
index 8424fa7ec4..b5ee686890 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
@@ -266,22 +266,30 @@ public class IssueProjectTagDictRedis {
 
         List<IssueProjectTagDictEntity> db = new LinkedList<>();
 
-        if(CollectionUtils.isEmpty(preResult) || CollectionUtils.isEmpty(preResult.get(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME))){
-            CategoryTagInitFormDTO customerIdParam = new CategoryTagInitFormDTO(); customerIdParam.setCustomerId(customerId);
-            if(ifOtherOnly || CollectionUtils.isEmpty(category)) {
-                //补偿全部默认标签
-                categoryDictService.init(customerIdParam);
-                db.addAll(poolDao.selectTagListByCustomer(customerId));
-            }else{
-                if(NumConstant.ZERO <= poolDao.selectCountByCustomerId(customerId)){
-                    categoryDictService.init(customerIdParam);
-                }else{
-                    //只插入category中的标签
-                    tagDictService.insertBatch(poolDao.selectTagByCategory(category,"default",customerId));
-                    db.addAll(poolDao.selectTagsByCustomerIdAndTagIds(customerId,category));
-                }
-            }
-        }
+		CategoryTagInitFormDTO customerIdParam = new CategoryTagInitFormDTO();
+		customerIdParam.setCustomerId(customerId);
+		if (!CollectionUtils.isEmpty(redisUtils.keys(GovIssueRedisKeys.getGovernmentTagKey(customerId, null)))){
+        	if(CollectionUtils.isEmpty(preResult) || CollectionUtils.isEmpty(preResult.get(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME))) {
+				if (ifOtherOnly || CollectionUtils.isEmpty(category)) {
+					//补偿全部默认标签
+					categoryDictService.init(customerIdParam);
+					db.addAll(poolDao.selectTagListByCustomer(customerId));
+					} else {
+							if (NumConstant.ZERO <= poolDao.selectCountByCustomerId(customerId)) {
+								categoryDictService.init(customerIdParam);
+								} else {
+									//只插入category中的标签
+									tagDictService.insertBatch(poolDao.selectTagByCategory(category, "default", customerId));
+									db.addAll(poolDao.selectTagsByCustomerIdAndTagIds(customerId, category));
+									}
+							}
+        		}
+		}else{
+			if (NumConstant.ZERO <= poolDao.selectCountByCustomerId(customerId)) {
+				categoryDictService.init(customerIdParam);
+			}
+			db.addAll(poolDao.selectTagListByCustomer(customerId));
+		}
 
         if(CollectionUtils.isEmpty(preResult) || CollectionUtils.isEmpty(preResult.get(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME))){
             //先去数据库查询自定义，为空则是最终结果，不为空则补偿

From 049e403bf6125ea62a098f0e4a2e8372c83b85ea Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 25 Mar 2021 16:04:18 +0800
Subject: [PATCH 103/119] =?UTF-8?q?=E5=B0=86=E5=AE=A2=E6=88=B7=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96=E5=88=86=E7=B1=BB=E6=A0=87=E7=AD=BE=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E6=94=BE=E5=85=A5=E6=96=B0=E5=AE=A2=E6=88=B7=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E7=9A=84=E4=BA=8B=E4=BB=B6=E7=9B=91=E5=90=AC=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constants/ConsomerGroupConstants.java     |  4 ++
 .../gov-issue/gov-issue-server/pom.xml        |  6 ++
 .../IssueProjectCategoryTagInitListener.java  | 67 +++++++++++++++++++
 .../IssueProjectCategoryDictServiceImpl.java  | 12 ----
 .../impl/IssueProjectTagDictServiceImpl.java  | 14 ----
 5 files changed, 77 insertions(+), 26 deletions(-)
 create mode 100644 epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/mq/listener/IssueProjectCategoryTagInitListener.java

diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java
index 9c332a6626..ded5a9aa8d 100644
--- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java
+++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java
@@ -17,5 +17,9 @@ public interface ConsomerGroupConstants {
      * 初始化客户组织机构信息分组
      */
     String INIT_CUSTOMER_ORG_ROLES_GROUP = "init_customer_org_roles_group";
+    /**
+     * 客户初始化议题、项目分类、标签数据
+     */
+    String ISSUE_PROJECT_CATEGORY_TAG = "issue_project_category_tag";
 
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml
index 54a2ff009c..208fea460c 100644
--- a/epmet-module/gov-issue/gov-issue-server/pom.xml
+++ b/epmet-module/gov-issue/gov-issue-server/pom.xml
@@ -108,6 +108,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-rocketmq</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/mq/listener/IssueProjectCategoryTagInitListener.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/mq/listener/IssueProjectCategoryTagInitListener.java
new file mode 100644
index 0000000000..beb1fa1473
--- /dev/null
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/mq/listener/IssueProjectCategoryTagInitListener.java
@@ -0,0 +1,67 @@
+package com.epmet.mq.listener;
+
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.rocketmq.constants.ConsomerGroupConstants;
+import com.epmet.commons.rocketmq.constants.TopicConstants;
+import com.epmet.commons.rocketmq.messages.InitCustomerMQMsg;
+import com.epmet.commons.tools.distributedlock.DistributedLock;
+import com.epmet.commons.tools.exception.ExceptionUtils;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.dto.form.CategoryTagInitFormDTO;
+import com.epmet.service.IssueProjectCategoryDictService;
+import org.apache.rocketmq.common.message.MessageExt;
+import org.apache.rocketmq.spring.annotation.MessageModel;
+import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
+import org.apache.rocketmq.spring.core.RocketMQListener;
+import org.redisson.api.RLock;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 监听初始化客户动作，为客户初始化议题、项目的分类、标签数据
+ */
+@RocketMQMessageListener(topic = TopicConstants.INIT_CUSTOMER,
+        consumerGroup = ConsomerGroupConstants.ISSUE_PROJECT_CATEGORY_TAG,
+        messageModel = MessageModel.CLUSTERING,
+        selectorExpression = "*")
+@Component
+public class IssueProjectCategoryTagInitListener implements RocketMQListener<MessageExt> {
+
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private IssueProjectCategoryDictService issueProjectCategoryDictService;
+
+    @Autowired
+    private DistributedLock distributedLock;
+
+    @Override
+    public void onMessage(MessageExt messageExt) {
+        String msg = new String(messageExt.getBody());
+        logger.info("初始化客户-初始化客户自定义信息-收到消息内容:{}", msg);
+        InitCustomerMQMsg msgObj = JSON.parseObject(msg, InitCustomerMQMsg.class);
+
+        CategoryTagInitFormDTO dto = new CategoryTagInitFormDTO();
+        dto.setCustomerId(msgObj.getCustomerId());
+
+        RLock lock = null;
+        try {
+            lock = distributedLock.getLock(String.format("lock:init_customer_home:%s", msgObj.getCustomerId()),
+                    30l, 30l, TimeUnit.SECONDS);
+            issueProjectCategoryDictService.init(dto);
+        } catch (RenException e) {
+            // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试
+            logger.error("【RocketMQ】初始化客户组件失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
+        } catch (Exception e) {
+            // 不是我们自己抛出的异常，可以让MQ重试
+            logger.error("【RocketMQ】初始化客户组件失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
+             throw e;
+        } finally {
+            distributedLock.unLock(lock);
+        }
+    }
+}
\ No newline at end of file
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 d78c3a3458..545e6e810d 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
@@ -148,18 +148,6 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
     @Override
     public List<CustomerCategoryListResultDTO> categoryList(String customerId) {
         List<CustomerCategoryListResultDTO> resultList = baseDao.selectCustomerCategoryList(customerId);
-        //2021.3.24 sun 客户初始化分类标签的接口不想加到新客户创建的程序里，因此加到这里 在标签列表的查询方法中也有关于初始化分类标签的逻辑
-        try {
-            if(CollectionUtils.isEmpty(resultList)){
-                CategoryTagInitFormDTO dto = new CategoryTagInitFormDTO();
-                dto.setCustomerId(customerId);
-                init(dto);
-                resultList = baseDao.selectCustomerCategoryList(customerId);
-            }
-        } catch (Exception e) {
-            logger.error("客户初始化分类、标签失败，客户Id->"+customerId, e);
-        }
-        //end
         return resultList;
     }
 
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
index ee06f971d3..deede50676 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
@@ -131,20 +131,6 @@ public class IssueProjectTagDictServiceImpl extends BaseServiceImpl<IssueProject
 		Map<String,List<IssueCategoryTagResultDTO>> map =  issueProjectTagDictRedis.getDefaultTagsSortedByCategoryAndCustomizedTagsOrderByRank(tokenDto.getCustomerId(),
 				formDTO.getCategoryIdList());
         result.setDefaulted(map.get(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME));
-        //2021.3.24 sun 客户初始化分类标签的接口不想加到新客户创建的程序里，因此加到这里 在分类列表的查询方法中也有关于初始化分类标签的逻辑
-        try {
-            if(CollectionUtils.isEmpty(result.getDefaulted())){
-                CategoryTagInitFormDTO dto = new CategoryTagInitFormDTO();
-                dto.setCustomerId(tokenDto.getCustomerId());
-                issueProjectCategoryDictService.init(dto);
-                Map<String,List<IssueCategoryTagResultDTO>> map1 =  issueProjectTagDictRedis.getDefaultTagsSortedByCategoryAndCustomizedTagsOrderByRank(tokenDto.getCustomerId(),
-                        formDTO.getCategoryIdList());
-                result.setDefaulted(map1.get(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME));
-            }
-        } catch (Exception e) {
-            logger.error("客户初始化分类、标签失败，客户Id->"+tokenDto.getCustomerId(), e);
-        }
-        //end
         List<IssueCategoryTagResultDTO> list = map.get(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME);
         if (CollectionUtils.isNotEmpty(list)) {
             result.setCustomized(list.stream().limit(NumConstant.TEN).collect(Collectors.toList()));

From 19fbf3780086334fc735bb4ebfacb26a57b06eb8 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 25 Mar 2021 16:46:03 +0800
Subject: [PATCH 104/119] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E8=A1=A5=E5=81=BF=E6=9C=BA=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dao/IssueProjectTagDictDao.java |  2 +-
 .../epmet/redis/IssueProjectTagDictRedis.java | 13 +++++++----
 .../mapper/IssueProjectTagDictDao.xml         | 23 +++++++++++++++----
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java
index 8439b7d940..45fa05d7cf 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java
@@ -85,7 +85,7 @@ public interface IssueProjectTagDictDao extends BaseDao<IssueProjectTagDictEntit
 	List<IssueProjectTagDictEntity> selectTagListByCustomer(@Param("customerId") String  customerId);
 
     /**
-     * @Description 根据类别查询客户下标签
+     * @Description 根据类别查询客户下默认标签
      * @param categories
      * @param customerId
      * @return java.util.List<com.epmet.entity.IssueProjectTagDictEntity>
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
index b5ee686890..b041b7efd4 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
@@ -269,26 +269,31 @@ public class IssueProjectTagDictRedis {
 		CategoryTagInitFormDTO customerIdParam = new CategoryTagInitFormDTO();
 		customerIdParam.setCustomerId(customerId);
 		if (!CollectionUtils.isEmpty(redisUtils.keys(GovIssueRedisKeys.getGovernmentTagKey(customerId, null)))){
+		    //缓存不为空
         	if(CollectionUtils.isEmpty(preResult) || CollectionUtils.isEmpty(preResult.get(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME))) {
 				if (ifOtherOnly || CollectionUtils.isEmpty(category)) {
 					//补偿全部默认标签
 					categoryDictService.init(customerIdParam);
-					db.addAll(poolDao.selectTagListByCustomer(customerId));
+					db.addAll(poolDao.selectTagByCategory(null, customerId, customerId));
 					} else {
 							if (NumConstant.ZERO <= poolDao.selectCountByCustomerId(customerId)) {
 								categoryDictService.init(customerIdParam);
 								} else {
 									//只插入category中的标签
-									tagDictService.insertBatch(poolDao.selectTagByCategory(category, "default", customerId));
-									db.addAll(poolDao.selectTagsByCustomerIdAndTagIds(customerId, category));
+                                    List<IssueProjectTagDictEntity> missingTags = poolDao.selectTagByCategory(category, "default", customerId);
+                                    if(!CollectionUtils.isEmpty(missingTags)){
+                                    tagDictService.insertBatch(missingTags);
+									db.addAll(missingTags);}
 									}
 							}
         		}
+
 		}else{
+		    //缓存为空
 			if (NumConstant.ZERO <= poolDao.selectCountByCustomerId(customerId)) {
 				categoryDictService.init(customerIdParam);
 			}
-			db.addAll(poolDao.selectTagListByCustomer(customerId));
+			db.addAll(poolDao.selectTagByCategory(null, customerId, customerId));
 		}
 
         if(CollectionUtils.isEmpty(preResult) || CollectionUtils.isEmpty(preResult.get(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME))){
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
index 8bd6bbba53..51b847163b 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
@@ -92,16 +92,31 @@
             <if test='null != targetCustomerId and "" != targetCustomerId'>
                 #{targetCustomerId} as customerId,
             </if>
-            TAG_NAME,CATEGORY_ID,IS_DEFAULT,ISSUE_USE_COUNT,PROJECT_USE_COUNT,IS_DISABLE,DEL_FLAG,REVISION
+            TAG_NAME,CATEGORY_ID,IS_DEFAULT,
+            <choose>
+                <when test='"default" == customerId'>
+                    ISSUE_USE_COUNT,
+                </when>
+                <otherwise>
+                    IFNULL(ISSUE_USE_COUNT,0)+IFNULL(PROJECT_USE_COUNT,0) AS issueUseCount,
+                </otherwise>
+            </choose>
+            PROJECT_USE_COUNT,
+            IS_DISABLE,DEL_FLAG,REVISION
         FROM
             ISSUE_PROJECT_TAG_DICT
         WHERE
             DEL_FLAG = '0'
         AND
             CUSTOMER_ID = #{customerId}
-        <foreach collection="categories" item="categoryId"  open="AND ( "  separator=" OR " close=" )">
-            CATEGORY_ID = #{categoryId}
-        </foreach>
+        AND
+            IS_DEFAULT = '0'
+            <if test="null != categories and categories.size() > 0">
+                <foreach collection="categories" item="categoryId"  open="AND ( "  separator=" OR " close=" )">
+                    CATEGORY_ID = #{categoryId}
+                </foreach>
+            </if>
+
     </select>
 
     <select id="selectCountByCustomerId" resultType="int">

From 6a2168ab60ee6e7e7d7e3944aaeb7cddae9e5f6d Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Fri, 26 Mar 2021 09:13:28 +0800
Subject: [PATCH 105/119] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
index b041b7efd4..db39993fa7 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
@@ -441,7 +441,7 @@ public class IssueProjectTagDictRedis {
                     IssueCategoryTagResultDTO ele = parseObject(tuple.getValue(), IssueCategoryTagResultDTO.class);
                     ele.setIsDisable(availableFlag);
                     queue.add(ele);
-                    heatMap.put((Double) tuple.getValue(),queue);
+                    heatMap.put(tuple.getScore(),queue);
                 });
                 List<IssueCategoryTagResultDTO> customizedResult = new LinkedList<>();
                 heatMap.keySet().stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList()).forEach(count -> {

From cfe67f667001b8041410c5c249836781ea671f90 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Fri, 26 Mar 2021 09:15:23 +0800
Subject: [PATCH 106/119] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/redis/IssueProjectTagDictRedis.java  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
index db39993fa7..3eeefd9afe 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
@@ -443,10 +443,7 @@ public class IssueProjectTagDictRedis {
                     queue.add(ele);
                     heatMap.put(tuple.getScore(),queue);
                 });
-                List<IssueCategoryTagResultDTO> customizedResult = new LinkedList<>();
-                heatMap.keySet().stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList()).forEach(count -> {
-                    customizedResult.addAll(heatMap.get(count));
-                });
+
 
                 redisUtils.delete(key);
 

From 7132e0b689ee2baaf902649ecc25278461c15340 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Fri, 26 Mar 2021 09:30:31 +0800
Subject: [PATCH 107/119] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=AE=A1=E7=90=86=20=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/IssueProjectCategoryDictServiceImpl.java | 2 +-
 .../src/main/resources/mapper/IssueProjectCategoryDictDao.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 545e6e810d..d59598a4c1 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
@@ -393,7 +393,7 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
         entity.setCustomerId(formDTO.getCustomerId());
         entity.setPid(formDTO.getParentCategoryId());
         entity.setPids(formDTO.getParentCategoryId());
-        IssueProjectCategoryDictEntity parentCategoryCode = baseDao.selectById(formDTO.getParentCategoryId());
+        IssueProjectCategoryDictDTO parentCategoryCode = baseDao.selectByCustomerId(formDTO.getCustomerId(),formDTO.getParentCategoryId());
         entity.setParentCategoryCode(parentCategoryCode.getCategoryCode());
         // 查询 当前客户下最大的一级分类数。
         Integer maxCategoryCode = baseDao.getMaxCategoryCode(formDTO.getCustomerId(), parentCategoryCode.getCategoryCode());
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 6cfbb5f164..385719ca7e 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
@@ -211,6 +211,6 @@
         <if test="pid != null and pid != 0">
             AND d.PID != '0'
         </if>
-        ORDER BY CATEGORY_CODE ASC
+        ORDER BY SORT, CATEGORY_CODE ASC
     </select>
 </mapper>

From fd06b6f0239c6ede6b7b93914cfc6893c8849782 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Fri, 26 Mar 2021 10:00:38 +0800
Subject: [PATCH 108/119] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=AE=A1=E7=90=86=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dao/IssueProjectCategoryDictDao.java   |  3 ++-
 .../impl/IssueProjectCategoryDictServiceImpl.java    | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

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 d85eaa3295..296e6ab41d 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
@@ -29,6 +29,7 @@ import com.epmet.project.dto.result.ProjectCategoryDictResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -155,5 +156,5 @@ public interface IssueProjectCategoryDictDao extends BaseDao<IssueProjectCategor
      * @Author zhangyong
      * @Date 14:10 2021-03-22
      **/
-    List<CustomerCategoryResultDTO> selectListAllCategoryDict(@Param("customerId") String customerId, @Param("pid") String pid);
+    LinkedList<CustomerCategoryResultDTO> selectListAllCategoryDict(@Param("customerId") String customerId, @Param("pid") 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 d59598a4c1..223137d692 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
@@ -54,10 +54,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -394,6 +391,9 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
         entity.setPid(formDTO.getParentCategoryId());
         entity.setPids(formDTO.getParentCategoryId());
         IssueProjectCategoryDictDTO parentCategoryCode = baseDao.selectByCustomerId(formDTO.getCustomerId(),formDTO.getParentCategoryId());
+        if (null == parentCategoryCode) {
+            throw new RenException(String.format("获取一级分类信息失败，入参[客户id: %s, 一级分类Id: %s]",formDTO.getCustomerId(),formDTO.getParentCategoryId()));
+        }
         entity.setParentCategoryCode(parentCategoryCode.getCategoryCode());
         // 查询 当前客户下最大的一级分类数。
         Integer maxCategoryCode = baseDao.getMaxCategoryCode(formDTO.getCustomerId(), parentCategoryCode.getCategoryCode());
@@ -431,8 +431,8 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
 
     @Override
     public List<CustomerCategoryResultDTO> customerCategoryList(String customerId) {
-        List<CustomerCategoryResultDTO> parentCategoryDict = baseDao.selectListAllCategoryDict(customerId, NumConstant.ZERO_STR);
-        List<CustomerCategoryResultDTO> childrenCategoryDict = baseDao.selectListAllCategoryDict(customerId, NumConstant.ONE_STR);
+        LinkedList<CustomerCategoryResultDTO> parentCategoryDict = baseDao.selectListAllCategoryDict(customerId, NumConstant.ZERO_STR);
+        LinkedList<CustomerCategoryResultDTO> childrenCategoryDict = baseDao.selectListAllCategoryDict(customerId, NumConstant.ONE_STR);
 
         for (CustomerCategoryResultDTO p : parentCategoryDict) {
             List<CustomerCategoryResultDTO> children = new ArrayList<>();

From 9feb6da7a5c3a5d8498679f0ce56a56cd4c1c91d Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Fri, 26 Mar 2021 10:04:03 +0800
Subject: [PATCH 109/119] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E4=B8=8B=20=E6=9C=80=E5=A4=A7=E7=9A=84=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E7=BC=96=E7=A0=81=EF=BC=8C=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

---
 .../main/java/com/epmet/dao/IssueProjectCategoryDictDao.java    | 2 +-
 .../src/main/resources/mapper/IssueProjectCategoryDictDao.xml   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

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 296e6ab41d..a6478d987f 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
@@ -117,7 +117,7 @@ public interface IssueProjectCategoryDictDao extends BaseDao<IssueProjectCategor
     int updateCustomerCategory(IsDisableCategoryFormDTO formDTO);
 
     /**
-     * 获取客户下 最大的分类编码
+     * 获取客户下 最大的分类编码(包含已被删除的编码)
      *
      * @param customerId
      * @param parentCategoryCode
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 385719ca7e..f9bc6b4b97 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
@@ -174,7 +174,6 @@
         WHERE
             PARENT_CATEGORY_CODE = #{parentCategoryCode}
             AND CUSTOMER_ID = #{customerId}
-            AND DEL_FLAG = '0'
     </select>
 
     <select id="isCategoryName" resultType="Integer">

From 4d13a3a9a1a88d92f07a2cab629acdccf3bab5a7 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 26 Mar 2021 10:09:42 +0800
Subject: [PATCH 110/119] =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=AB=AF=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E8=AE=BE=E7=BD=AE=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commons/tools/exception/EpmetErrorCode.java   |  3 ++-
 .../impl/IssueProjectCategoryDictServiceImpl.java | 15 ++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
index fa03a32618..94642c8a21 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
@@ -146,7 +146,8 @@ public enum EpmetErrorCode {
     TOPIC_IS_HIDDEN(9006,"该话题已被屏蔽，请先解除屏蔽"),
     TOPIC_IS_CLOSED(9008,"该话题已关闭，无法转为议题"),
 
-    CUSTOMER_CATEGORY(9101,"分类已使用，不允许删除");
+    CUSTOMER_CATEGORY(9101,"分类已使用，不允许删除"),
+    CATEGORY_NAME(9102,"分类名称已存在，不允许重复");
 
 	private int code;
 	private String msg;
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 223137d692..9dd3f3ac23 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
@@ -253,11 +253,8 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
             logger.error(String.format("修改分类信息状态失败，客户Id->%s,分类Id->%s", formDTO.getCustomerId(), formDTO.getCategoryId()));
             throw new RuntimeException("分类信息修改失败！");
         }
-        //修改吧二级分类下默认的标签数据
-        if (issueProjectTagDictDao.updateCustomerTag(formDTO) < NumConstant.ONE) {
-            logger.error(String.format("修改标签信息状态失败，客户Id->%s,分类Id->%s", formDTO.getCustomerId(), formDTO.getCategoryId()));
-            throw new RuntimeException("分类、标签信息修改失败！");
-        }
+        //修改把二级分类下默认的标签数据
+        issueProjectTagDictDao.updateCustomerTag(formDTO);
         //4.修改缓存中标签状态
         dictRedis.updateTagAvailabilityBySecondCategoryIds(formDTO.getCustomerId(),formDTO.getSecondCategorylist(),formDTO.getType());
     }
@@ -310,7 +307,7 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
         // 分类名称在同一个客户下有效数据中不允许重复
         Integer numCategoryName = baseDao.isCategoryName(formDTO.getCustomerId(), formDTO.getCategoryName(), null,null);
         if (NumConstant.ZERO < numCategoryName) {
-            throw new RenException("现添加的一级分类名称 重复");
+            throw new RenException(EpmetErrorCode.CATEGORY_NAME.getCode(), EpmetErrorCode.CATEGORY_NAME.getMsg());
         }
         IssueProjectCategoryDictEntity entity = this.packageFirstCategoryDictEntity(formDTO);
         baseDao.insert(entity);
@@ -355,7 +352,7 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
         // 分类名称在同一个客户下有效数据中不允许重复
         Integer numCategoryName = baseDao.isCategoryName(formDTO.getCustomerId(), formDTO.getCategoryName(), null, formDTO.getCategoryId());
         if (NumConstant.ZERO < numCategoryName) {
-            throw new RenException("现添加的一级分类名称 重复");
+            throw new RenException(EpmetErrorCode.CATEGORY_NAME.getCode(), EpmetErrorCode.CATEGORY_NAME.getMsg());
         }
         IssueProjectCategoryDictEntity entity = new IssueProjectCategoryDictEntity();
         entity.setCategoryName(formDTO.getCategoryName());
@@ -370,7 +367,7 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
         // 分类名称在同一个客户下同一 一级分类下有效数据中不允许重复
         Integer numCategoryName = baseDao.isCategoryName(formDTO.getCustomerId(), formDTO.getCategoryName(), formDTO.getParentCategoryId(), null);
         if (NumConstant.ZERO < numCategoryName) {
-            throw new RenException("现添加的二级分类名称 重复");
+            throw new RenException(EpmetErrorCode.CATEGORY_NAME.getCode(), EpmetErrorCode.CATEGORY_NAME.getMsg());
         }
         IssueProjectCategoryDictEntity entity = this.packageSecondCategoryDictEntity(formDTO);
         baseDao.insert(entity);
@@ -419,7 +416,7 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
         // 分类名称在同一个客户下同一 一级分类下有效数据中不允许重复
         Integer numCategoryName = baseDao.isCategoryName(formDTO.getCustomerId(), formDTO.getCategoryName(), formDTO.getParentCategoryId(), formDTO.getCategoryId());
         if (NumConstant.ZERO < numCategoryName) {
-            throw new RenException("现添加的二级分类名称 重复");
+            throw new RenException(EpmetErrorCode.CATEGORY_NAME.getCode(), EpmetErrorCode.CATEGORY_NAME.getMsg());
         }
         IssueProjectCategoryDictEntity entity = new IssueProjectCategoryDictEntity();
         entity.setCategoryName(formDTO.getCategoryName());

From 9ea9301c10ee2533b810e2523769c2d19fc69a6d Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Fri, 26 Mar 2021 10:38:31 +0800
Subject: [PATCH 111/119] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=AE=A1=E7=90=86=EF=BC=8C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/form/FirstCategoryFormDTO.java  | 10 +++++-----
 .../controller/IssueProjectCategoryDictController.java |  8 ++------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/FirstCategoryFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/FirstCategoryFormDTO.java
index cb50e8dbe2..065b0bd359 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/FirstCategoryFormDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/FirstCategoryFormDTO.java
@@ -1,10 +1,10 @@
 package com.epmet.dto.form;
 
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @Description 一级分类   新增/修改
@@ -14,13 +14,11 @@ import java.util.List;
 @Data
 public class FirstCategoryFormDTO implements Serializable {
     private static final long serialVersionUID = 3188828578545996470L;
-    public interface AddCategoryInternalGroup {
-    }
 
     /**
      * 客户Id
      **/
-    @NotBlank(message = "customerId不能为空", groups = AddCategoryInternalGroup.class)
+    @NotBlank(message = "customerId不能为空")
     private String customerId;
 
     /**
@@ -32,6 +30,8 @@ public class FirstCategoryFormDTO implements Serializable {
     /**
      * 分类名称
      **/
+    @Length(max=20,message = "分类名称不能超过20个字")
+    @Length(min=2,message = "分类名称不能少于2个字")
     private String categoryName;
 
     /**
@@ -42,6 +42,6 @@ public class FirstCategoryFormDTO implements Serializable {
     /**
      * 操作类型(add:新增  edit:编辑)
      **/
-    @NotBlank(message = "操作类型不能为空", groups = AddCategoryInternalGroup.class)
+    @NotBlank(message = "操作类型不能为空")
     private String type;
 }
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 df85854df5..c4080d0f10 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
@@ -208,9 +208,7 @@ public class IssueProjectCategoryDictController {
      **/
     @PostMapping("savefirstcategory")
     public Result<String> saveFirstCategory(@RequestBody SecondCategoryFormDTO formDTO) {
-        if (StringUtils.isBlank(formDTO.getCustomerId())) {
-            throw new RenException("客户id 不能为空");
-        }
+        ValidatorUtils.validateEntity(formDTO);
         if (CommonOperateTypeEnum.ADD.getCode().equals(formDTO.getType())) {
             return issueProjectCategoryDictService.saveFirstCategory(formDTO);
         } else if (CommonOperateTypeEnum.EDIT.getCode().equals(formDTO.getType())){
@@ -229,9 +227,7 @@ public class IssueProjectCategoryDictController {
      **/
     @PostMapping("savesecondcategory")
     public Result<String> saveSecondCategory(@RequestBody SecondCategoryFormDTO formDTO) {
-        if (StringUtils.isBlank(formDTO.getCustomerId())) {
-            throw new RenException("客户id 不能为空");
-        }
+        ValidatorUtils.validateEntity(formDTO);
         if (StringUtils.isBlank(formDTO.getParentCategoryId())) {
             throw new RenException("一级分类Id 不能为空");
         }

From b72ea48415567594043150c1ba29a0bda1199b30 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 26 Mar 2021 13:29:30 +0800
Subject: [PATCH 112/119] =?UTF-8?q?isDisable=20=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/form/IssueTagFormDTO.java      | 2 ++
 .../main/java/com/epmet/service/impl/IssueTagsServiceImpl.java | 3 +++
 .../src/main/resources/mapper/IssueTagsDao.xml                 | 3 ++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagFormDTO.java
index 3b9cfedb13..f67bbe2c34 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagFormDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagFormDTO.java
@@ -21,4 +21,6 @@ public class IssueTagFormDTO implements Serializable {
 
     private String tagId;
 
+    private String isDisable;
+
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
index af19d3c033..1a55271ca7 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
@@ -188,6 +188,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
                     IssueCategoryTagResultDTO issueCategoryTagResultDTO = new IssueCategoryTagResultDTO();
                     issueCategoryTagResultDTO.setName(t.getName());
                     issueCategoryTagResultDTO.setId(t.getId());
+                    issueCategoryTagResultDTO.setIsDisable(t.getIsDisable());
                     dictRedis.editTagUseCount(customerId,t.getCategoryId(),issueCategoryTagResultDTO,NumConstant.ONE_STR);
                 });
                 // 数据库有关标签使用次数 -1  0:+1 ; 1:-1;
@@ -209,6 +210,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
                     IssueCategoryTagResultDTO issueCategoryTagResultDTO = new IssueCategoryTagResultDTO();
                     issueCategoryTagResultDTO.setName(d.getName());
                     issueCategoryTagResultDTO.setId(d.getId());
+                    issueCategoryTagResultDTO.setIsDisable(d.getIsDisable());
                     dictRedis.editTagUseCount(customerId,d.getCategoryId(),issueCategoryTagResultDTO,NumConstant.ONE_STR);
                 });
                 // 数据库有关标签使用次数 -1  0:+1 ; 1:-1;
@@ -222,6 +224,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
                     IssueCategoryTagResultDTO issueCategoryTagResultDTO = new IssueCategoryTagResultDTO();
                     issueCategoryTagResultDTO.setName(a.getName());
                     issueCategoryTagResultDTO.setId(a.getId());
+                    issueCategoryTagResultDTO.setIsDisable(a.getIsDisable());
                     dictRedis.editTagUseCount(customerId,a.getCategoryId(),issueCategoryTagResultDTO,NumConstant.ZERO_STR);
                 });
                 // 数据库对应标签 议题使用次数 +1
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..064a02b31e 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
@@ -44,7 +44,8 @@
             it.TAG_ID AS id,
             it.TAG_NAME as name,
             td.CATEGORY_ID,
-            it.TAG_ID AS tagId
+            it.TAG_ID AS tagId,
+            td.IS_DISABLE
         FROM issue_tags it
         LEFT JOIN issue_project_tag_dict td ON td.id = it.TAG_ID
         WHERE it.DEL_FLAG = 0

From 8011d03b9696800ab10a0e9e173d077d3433d3ff Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 26 Mar 2021 14:04:35 +0800
Subject: [PATCH 113/119] =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=8A=A0=E5=85=A5mq=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E9=98=9F=E6=B7=BB=E5=8A=A0=E7=9B=B8=E5=BA=94=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-module/gov-issue/gov-issue-server/pom.xml               | 4 ++++
 .../gov-issue-server/src/main/resources/bootstrap.yml         | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml
index 208fea460c..1576e55e52 100644
--- a/epmet-module/gov-issue/gov-issue-server/pom.xml
+++ b/epmet-module/gov-issue/gov-issue-server/pom.xml
@@ -210,6 +210,10 @@
                 <!--钉钉 机器人地址-->
                 <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</dingTalk.robot.secret>
+
+                <!--rocketmq-->
+                <rocketmq.nameserver>192.168.1.130:9876;192.168.1.132:9876</rocketmq.nameserver>
+                <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
         </profile>
         <profile>
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml
index 06974a6810..93a6d381c2 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml
@@ -128,3 +128,5 @@ shutdown:
     enable: true #是否开启优雅停机
     waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警
 
+rocketmq:
+  name-server: @rocketmq.nameserver@

From 1a5055817e01ae7451d059ff5f33a55b96fbe39c Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 26 Mar 2021 14:05:12 +0800
Subject: [PATCH 114/119] =?UTF-8?q?isDisable=20=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/service/impl/IssueTagsServiceImpl.java | 1 +
 .../src/main/resources/mapper/IssueProjectTagDictDao.xml       | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
index 1a55271ca7..1d24217321 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
@@ -163,6 +163,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
         IssueCategoryTagResultDTO issueCategoryTagResultDTO = new IssueCategoryTagResultDTO();
         issueCategoryTagResultDTO.setId(entity.getId());
         issueCategoryTagResultDTO.setName(entity.getTagName());
+        issueCategoryTagResultDTO.setIsDisable(entity.getIsDisable());
         dictRedis.addIssueProjectTag(entity.getCustomerId(),entity.getCategoryId(),issueCategoryTagResultDTO);
         return new AddTagResultDTO(entity.getId());
     }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
index 51b847163b..6e63c32fab 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml
@@ -42,7 +42,8 @@
         SELECT ID AS tagId,
                TAG_NAME AS name,
                CATEGORY_ID,
-               id
+               id,
+               is_disable
         FROM issue_project_tag_dict
         WHERE DEL_FLAG = 0
             AND

From 30d0dfe363fc05c452b1eaa0968ecddde9bb9d6e Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Fri, 26 Mar 2021 14:33:01 +0800
Subject: [PATCH 115/119] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=EF=BC=9Arocketmq=E7=9A=84xml=E7=9A=84=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-module/gov-issue/gov-issue-server/pom.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml
index 1576e55e52..cce26d7129 100644
--- a/epmet-module/gov-issue/gov-issue-server/pom.xml
+++ b/epmet-module/gov-issue/gov-issue-server/pom.xml
@@ -173,6 +173,9 @@
                 <!--钉钉 机器人地址-->
                 <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</dingTalk.robot.secret>
+
+                <!--rocketmq-->
+                <rocketmq.nameserver>192.168.1.130:9876;192.168.1.132:9876</rocketmq.nameserver>
             </properties>
         </profile>
         <profile>
@@ -251,6 +254,8 @@
                 <!--测试钉钉 机器人地址-->
                 <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</dingTalk.robot.secret>
+
+                <rocketmq.nameserver>192.168.10.161:9876</rocketmq.nameserver>
             </properties>
         </profile>
         <profile>
@@ -288,6 +293,9 @@
                 </dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
                 </dingTalk.robot.secret>
+
+                <!--rocketmq-->
+                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
             </properties>
         </profile>
     </profiles>

From b7a6bc76ce9b4c22614bdf356af3164d1fd4f68c Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 26 Mar 2021 16:27:05 +0800
Subject: [PATCH 116/119] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E9=BB=98=E8=AE=A4=E6=8C=89=E7=83=AD=E5=BA=A6=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E5=8F=96=E5=89=8D=E4=B8=80=E5=8D=83=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/IssueProjectTagDictServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
index deede50676..cf5af822da 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
@@ -133,7 +133,7 @@ public class IssueProjectTagDictServiceImpl extends BaseServiceImpl<IssueProject
         result.setDefaulted(map.get(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME));
         List<IssueCategoryTagResultDTO> list = map.get(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME);
         if (CollectionUtils.isNotEmpty(list)) {
-            result.setCustomized(list.stream().limit(NumConstant.TEN).collect(Collectors.toList()));
+            result.setCustomized(list.stream().limit(NumConstant.ONE_THOUSAND).collect(Collectors.toList()));
         } else {
             result.setCustomized(Collections.emptyList());
         }

From af6daf48afb6b1f22d77324950956a36313c2b3d Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 29 Mar 2021 13:32:30 +0800
Subject: [PATCH 117/119] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=BF=90=E8=90=A5?=
 =?UTF-8?q?=E7=AB=AF=E6=96=B0=E5=A2=9E=E5=88=86=E7=B1=BB=20=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=88=B0=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/redis/IssueProjectTagDictRedis.java | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
index 3eeefd9afe..5cfb9a1c5c 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java
@@ -100,7 +100,9 @@ public class IssueProjectTagDictRedis {
             throw new RenException("customerId can not be null when obtain govern tags.");
         }
 
+        //查询客户的“其他"分类的Id
         IssueProjectCategoryDictEntity otherCategory = categoryDictDao.selectSingleByCustomerIdAndCategoryNameAndCategoryType(customerId, ModuleConstants.CATEGORY_NAME_OTHERS, null);
+        //判断入参是否是只有一个分类Id并且是"其他"的Id
         boolean ifOtherOnly = null == otherCategory ? false : (!CollectionUtils.isEmpty(category) && category.size() == NumConstant.ONE && category.contains(otherCategory.getId()) ? true : false);
 
         Map<String,List<IssueCategoryTagResultDTO>> result = new HashMap<>();
@@ -348,13 +350,22 @@ public class IssueProjectTagDictRedis {
         //result.put(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME,CollectionUtils.isEmpty(db) ? null : db.stream().filter(o -> !StringUtils.equals(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME,o.getCategoryId())).map(entity -> {
         //    IssueCategoryTagResultDTO tag = ConvertUtils.sourceToTarget(entity,IssueCategoryTagResultDTO.class);
         //    tag.setName(entity.getTagName()); return tag;}).collect(Collectors.toList()));
-        result.put(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME,poolDao.selectDefault(customerId,ifOtherOnly ? null : category));
-
+        if (!CollectionUtils.isEmpty(preResult) && !CollectionUtils.isEmpty(preResult.get(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME))) {
+            result.put(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME, preResult.get(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME));
+        } else {
+            result.put(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME, poolDao.selectDefault(customerId, ifOtherOnly ? null : category));
+        }
 
         //自定义标签：按照热度排序    sorted(Comparator.comparing(IssueProjectTagDictEntity :: getIssueUseCount).reversed())
-        result.put(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME,CollectionUtils.isEmpty(db) ? null : db.stream().filter(o -> StringUtils.equals(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME,o.getCategoryId())).sorted(Comparator.comparing(IssueProjectTagDictEntity :: getIssueUseCount).reversed()).map(entity -> {
-            IssueCategoryTagResultDTO tag = ConvertUtils.sourceToTarget(entity,IssueCategoryTagResultDTO.class);
-            tag.setName(entity.getTagName());return tag;}).collect(Collectors.toList()));
+        if (!CollectionUtils.isEmpty(preResult) && !CollectionUtils.isEmpty(preResult.get(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME))) {
+            result.put(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME, preResult.get(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME));
+        } else {
+            result.put(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME, CollectionUtils.isEmpty(db) ? null : db.stream().filter(o -> StringUtils.equals(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME, o.getCategoryId())).sorted(Comparator.comparing(IssueProjectTagDictEntity::getIssueUseCount).reversed()).map(entity -> {
+                IssueCategoryTagResultDTO tag = ConvertUtils.sourceToTarget(entity, IssueCategoryTagResultDTO.class);
+                tag.setName(entity.getTagName());
+                return tag;
+            }).collect(Collectors.toList()));
+        }
         return result;
     }
 

From 306d979b440e74f6e7256e3d5a626a4e9f39a83f Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 30 Mar 2021 09:44:25 +0800
Subject: [PATCH 118/119] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CustomerProjectCategoryDictServiceImpl.java     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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
index b610fa9c6c..97a8a560f5 100644
--- 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
@@ -29,6 +29,7 @@ import com.epmet.entity.stats.CustomerProjectCategoryDictEntity;
 import com.epmet.service.stats.CustomerProjectCategoryDictService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -67,17 +68,19 @@ public class CustomerProjectCategoryDictServiceImpl extends BaseServiceImpl<Cust
         });
         updateCategoies.forEach(updatedEntity -> {
             CustomerProjectCategoryDictEntity entity=baseDao.selectByCustomerIdAndId(updatedEntity.getCustomerId(),updatedEntity.getId());
-            if(null!=entity){
+            if (null != entity) {
                 entity.setCategoryCode(updatedEntity.getCategoryCode());
                 entity.setCategoryName(updatedEntity.getCategoryName());
                 entity.setParentCategoryCode(updatedEntity.getParentCategoryCode());
-                entity.setLevel(Integer.valueOf(updatedEntity.getCategoryType()));
+                if (StringUtils.isNotBlank(updatedEntity.getCategoryType())) {
+                    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);
             }
-            baseDao.updateById(entity);
         });
     }
 

From c589a9d00e00b39ab92181263a6a88d77f45e5e5 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Tue, 30 Mar 2021 10:06:31 +0800
Subject: [PATCH 119/119] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E5=AD=97=E5=85=B8=E8=A1=A8=EF=BC=8C=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AEid+customerId=E8=81=94=E5=90=88=E4=B8=BB=E9=94=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/IssueProjectCategoryDictDao.java      | 10 ++++++
 .../IssueProjectCategoryDictServiceImpl.java  |  6 ++--
 .../mapper/IssueProjectCategoryDictDao.xml    | 33 +++++++++++++++++++
 3 files changed, 47 insertions(+), 2 deletions(-)

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 a6478d987f..ff49f564b1 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
@@ -157,4 +157,14 @@ public interface IssueProjectCategoryDictDao extends BaseDao<IssueProjectCategor
      * @Date 14:10 2021-03-22
      **/
     LinkedList<CustomerCategoryResultDTO> selectListAllCategoryDict(@Param("customerId") String customerId, @Param("pid") String pid);
+
+    /**
+     * 根据 主键+customerId 修改议题项目分类字典
+     *
+     * @param entity
+     * @return int
+     * @Author zhangyong
+     * @Date 09:53 2021-03-30
+     **/
+    int updateIssueProjectCategoryDict(IssueProjectCategoryDictEntity 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 9dd3f3ac23..62d39412c3 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
@@ -355,10 +355,11 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
             throw new RenException(EpmetErrorCode.CATEGORY_NAME.getCode(), EpmetErrorCode.CATEGORY_NAME.getMsg());
         }
         IssueProjectCategoryDictEntity entity = new IssueProjectCategoryDictEntity();
+        entity.setCustomerId(formDTO.getCustomerId());
         entity.setCategoryName(formDTO.getCategoryName());
         entity.setSort(formDTO.getSort());
         entity.setId(formDTO.getCategoryId());
-        baseDao.updateById(entity);
+        baseDao.updateIssueProjectCategoryDict(entity);
         return new Result<>();
     }
 
@@ -419,10 +420,11 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
             throw new RenException(EpmetErrorCode.CATEGORY_NAME.getCode(), EpmetErrorCode.CATEGORY_NAME.getMsg());
         }
         IssueProjectCategoryDictEntity entity = new IssueProjectCategoryDictEntity();
+        entity.setCustomerId(formDTO.getCustomerId());
         entity.setCategoryName(formDTO.getCategoryName());
         entity.setSort(formDTO.getSort());
         entity.setId(formDTO.getCategoryId());
-        baseDao.updateById(entity);
+        baseDao.updateIssueProjectCategoryDict(entity);
         return new Result<>();
     }
 
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 f9bc6b4b97..3a29df5f14 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
@@ -212,4 +212,37 @@
         </if>
         ORDER BY SORT, CATEGORY_CODE ASC
     </select>
+
+    <update id="updateIssueProjectCategoryDict">
+        UPDATE issue_project_category_dict
+        SET
+        <if test='pid != "" and pid != null'>
+            PID = #{pid},
+        </if>
+        <if test='pids != "" and pids != null'>
+            PIDS = #{pids},
+        </if>
+        <if test='parentCategoryCode != "" and parentCategoryCode != null'>
+            PARENT_CATEGORY_CODE = #{parentCategoryCode},
+        </if>
+        <if test='categoryCode != "" and categoryCode != null'>
+            CATEGORY_CODE = #{categoryCode},
+        </if>
+        <if test='categoryName != "" and categoryName != null'>
+            CATEGORY_NAME = #{categoryName},
+        </if>
+        <if test='categoryType != "" and categoryType != null'>
+            CATEGORY_TYPE = #{categoryType},
+        </if>
+
+        <if test='sort != "" and sort != null'>
+            SORT = #{sort},
+        </if>
+        <if test='isDisable != "" and isDisable != null'>
+            IS_DISABLE = #{isDisable},
+        </if>
+        UPDATED_TIME = NOW()
+        WHERE
+        customer_id = #{customerId} AND id = #{id} AND DEL_FLAG = '0'
+    </update>
 </mapper>