From dda580447dcaf211ea7a9a4b3a1f89e789fdce43 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 27 Jan 2022 09:27:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?sql=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migration/V0.0.13__ic_individual_category_manage.sql | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.13__ic_individual_category_manage.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.13__ic_individual_category_manage.sql index 31753118ea..058cbfe048 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.13__ic_individual_category_manage.sql +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.13__ic_individual_category_manage.sql @@ -20,14 +20,13 @@ SET FOREIGN_KEY_CHECKS = 0; -- ---------------------------- -- Table structure for ic_individual_category_manage -- ---------------------------- -DROP TABLE IF EXISTS `ic_individual_category_manage`; CREATE TABLE `ic_individual_category_manage` ( `ID` varchar(32) NOT NULL COMMENT 'ID', - `CUSTOMER_ID` varchar(255) NOT NULL COMMENT '客户ID', - `USER_ID` varchar(255) NOT NULL COMMENT '用户ID', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `USER_ID` varchar(64) NOT NULL COMMENT '用户ID', `COLUMN_ID` varchar(255) DEFAULT NULL, `SORT` int(11) NOT NULL COMMENT '排序', - `DEL_FLAG` int(11) NOT NULL COMMENT '删除标记', + `DEL_FLAG` char(1) NOT NULL COMMENT '删除标记', `REVISION` varchar(32) NOT NULL COMMENT '乐观锁', `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', From 0d5f36f4b70471d9b88954467443cf0200b1bf42 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 27 Jan 2022 09:28:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=201.flyway?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E7=9A=84=E5=AD=97=E6=AE=B5=E9=95=BF=E5=BA=A6?= =?UTF-8?q?=E9=97=AE=E9=A2=98fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.6__ic_often_use_function.sql | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V0.0.6__ic_often_use_function.sql b/epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V0.0.6__ic_often_use_function.sql index 3d22c6aa0a..1178d4a5e6 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V0.0.6__ic_often_use_function.sql +++ b/epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V0.0.6__ic_often_use_function.sql @@ -20,14 +20,14 @@ SET FOREIGN_KEY_CHECKS = 0; -- ---------------------------- -- Table structure for ic_often_use_function -- ---------------------------- -DROP TABLE IF EXISTS `ic_often_use_function`; +-- DROP TABLE IF EXISTS `ic_often_use_function`; CREATE TABLE `ic_often_use_function` ( `ID` varchar(32) NOT NULL, - `CUSTOMER_ID` varchar(255) NOT NULL COMMENT '客户ID', - `USER_ID` varchar(255) NOT NULL COMMENT '用户ID', - `MENU_ID` varchar(255) NOT NULL COMMENT '菜单ID', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `USER_ID` varchar(64) NOT NULL COMMENT '用户ID', + `MENU_ID` varchar(64) NOT NULL COMMENT '菜单ID', `SORT` int(11) NOT NULL COMMENT '排序', - `DEL_FLAG` int(11) NOT NULL COMMENT '删除标记', + `DEL_FLAG` char(1) NOT NULL COMMENT '删除标记', `REVISION` varchar(32) NOT NULL COMMENT '乐观锁', `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', From 4aee21a14c8ef6586ed5a585a68a6b8815103171 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 27 Jan 2022 10:08:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95=E6=95=B0=E6=8D=AE=E6=97=B6?= =?UTF-8?q?18=E7=B1=BB=E9=83=BD=E4=B8=BA=E5=90=A6=E7=9A=84=E4=B9=9F?= =?UTF-8?q?=E8=A6=81=E6=9C=89=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=8F=AA=E6=98=AF=E6=B2=A1=E6=9C=89=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcUserChangeRecordServiceImpl.java | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java index a2606c3aaa..58c4f2da00 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java @@ -221,29 +221,29 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl NumConstant.ZERO) { detailedList.addAll(subList); - if (!hash.containsKey(map.get("CREATED_BY"))) { - CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(customerId, map.get("CREATED_BY")); - //被删除或被移除的工作人员，名字为空 - hash.put(map.get("CREATED_BY"), null != staffInfoCache ? staffInfoCache.getRealName() : ""); - } - change = new IcUserChangeRecordEntity(); - change.setId(changeId); - change.setCustomerId(customerId); - change.setOperatorId(map.get("CREATED_BY")); - change.setIcUserId(map.get("ID")); - change.setOperatorName(hash.get(map.get("CREATED_BY"))); - change.setIcUserName(map.get("NAME")); - change.setType("add"); - change.setTypeName("新增"); - change.setBeforeChangeName("-"); - change.setAfterChangeName("-"); - change.setChangeTime(sdf.parse(map.get("CREATED_TIME"))); - change.setCreatedBy(map.get("CREATED_BY")); - change.setCreatedTime(sdf.parse(map.get("CREATED_TIME"))); - change.setUpdatedBy("APP_USER"); - change.setUpdatedTime(new Date()); - changeList.add(change); } + if (!hash.containsKey(map.get("CREATED_BY"))) { + CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(customerId, map.get("CREATED_BY")); + //被删除或被移除的工作人员，名字为空 + hash.put(map.get("CREATED_BY"), null != staffInfoCache ? staffInfoCache.getRealName() : ""); + } + change = new IcUserChangeRecordEntity(); + change.setId(changeId); + change.setCustomerId(customerId); + change.setOperatorId(map.get("CREATED_BY")); + change.setIcUserId(map.get("ID")); + change.setOperatorName(hash.get(map.get("CREATED_BY"))); + change.setIcUserName(map.get("NAME")); + change.setType("add"); + change.setTypeName("新增"); + change.setBeforeChangeName("-"); + change.setAfterChangeName("-"); + change.setChangeTime(sdf.parse(map.get("CREATED_TIME"))); + change.setCreatedBy(map.get("CREATED_BY")); + change.setCreatedTime(sdf.parse(map.get("CREATED_TIME"))); + change.setUpdatedBy("APP_USER"); + change.setUpdatedTime(new Date()); + changeList.add(change); } } while (icUserList.size() == NumConstant.ONE_THOUSAND); //4.批量新增数据,先删后增【只删除新增节点的历史数据】