From 86b1469f7a65f35dd6f756b75704d1f79a29dcc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Fri, 25 Feb 2022 16:48:41 +0800 Subject: [PATCH 1/5] =?UTF-8?q?kettle=E5=BF=97=E6=84=BF=E8=80=85=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dcp_job/user/volunteer_info.ktr | 75 +------------------ 1 file changed, 2 insertions(+), 73 deletions(-) diff --git a/esua-epdc/kettle-Code/dcp_job/user/volunteer_info.ktr b/esua-epdc/kettle-Code/dcp_job/user/volunteer_info.ktr index 1e81b58a0..5fe9a65d9 100644 --- a/esua-epdc/kettle-Code/dcp_job/user/volunteer_info.ktr +++ b/esua-epdc/kettle-Code/dcp_job/user/volunteer_info.ktr @@ -577,77 +577,6 @@ - - target-user - ${db.mysql.epdc.target.host} - MYSQL - Native - ${epmet.user.database} - ${db.mysql.epdc.target.port} - ${db.mysql.epdc.target.username} - ${db.mysql.epdc.target.password} - - - - - - EXTRA_OPTION_MYSQL.allowMultiQueries - true - - - EXTRA_OPTION_MYSQL.characterEncoding - UTF-8 - - - EXTRA_OPTION_MYSQL.useSSL - false - - - EXTRA_OPTION_MYSQL.useUnicode - true - - - FORCE_IDENTIFIERS_TO_LOWERCASE - N - - - FORCE_IDENTIFIERS_TO_UPPERCASE - N - - - IS_CLUSTERED - N - - - PORT_NUMBER - ${db.mysql.epdc.target.port} - - - PRESERVE_RESERVED_WORD_CASE - Y - - - QUOTE_ALL_FIELDS - N - - - STREAM_RESULTS - Y - - - SUPPORTS_BOOLEAN_DATA_TYPE - Y - - - SUPPORTS_TIMESTAMP_DATA_TYPE - Y - - - USE_POOLING - N - - - 数据库连接 2 @@ -843,14 +772,14 @@ AND DATE_FORMAT(info.UPDATED_TIME, '%Y-%m-%d %H:%i:%s') >?; none - target-user + target-hert SELECT IFNULL( ( SELECT u.UPDATED_TIME FROM - `user` u + `volunteer_info` u WHERE u.FROM_APP = 'resi' ORDER BY From ed2a5ecb4c6ddbb9d20cf76862a4eb8947c3af49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Fri, 25 Feb 2022 17:04:28 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esua-epdc/kettle-Code/dcp_job/user/volunteer_info.ktr | 2 -- 1 file changed, 2 deletions(-) diff --git a/esua-epdc/kettle-Code/dcp_job/user/volunteer_info.ktr b/esua-epdc/kettle-Code/dcp_job/user/volunteer_info.ktr index 5fe9a65d9..680df0a37 100644 --- a/esua-epdc/kettle-Code/dcp_job/user/volunteer_info.ktr +++ b/esua-epdc/kettle-Code/dcp_job/user/volunteer_info.ktr @@ -780,8 +780,6 @@ AND DATE_FORMAT(info.UPDATED_TIME, '%Y-%m-%d %H:%i:%s') >?; u.UPDATED_TIME FROM `volunteer_info` u - WHERE - u.FROM_APP = 'resi' ORDER BY u.UPDATED_TIME DESC LIMIT 1 From dcd6762c942459d4c752e6755235d2ea3cb51a1d Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 25 Feb 2022 17:13:56 +0800 Subject: [PATCH 3/5] =?UTF-8?q?kettle=E4=BF=AE=E6=94=B9-=E7=8E=8B=E5=85=AC?= =?UTF-8?q?=E5=B3=B0-2022-02-25?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esua-epdc/kettle-Code/dcp_job/epmet_gov_issue/issue.ktr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esua-epdc/kettle-Code/dcp_job/epmet_gov_issue/issue.ktr b/esua-epdc/kettle-Code/dcp_job/epmet_gov_issue/issue.ktr index 832d07e13..4ad69422f 100644 --- a/esua-epdc/kettle-Code/dcp_job/epmet_gov_issue/issue.ktr +++ b/esua-epdc/kettle-Code/dcp_job/epmet_gov_issue/issue.ktr @@ -760,7 +760,7 @@ issue.GRID_ID , REPLACE(issue.PARENT_DEPT_IDS,',',':') ORG_ID_PATH, SUBSTRING_INDEX(issue.PARENT_DEPT_IDS,',',-1) ORG_ID, issue.CREATED_TIME DECIDED_TIME, -(case when issue.ISSUE_STATE = 4 then item.CREATED_TIME else '' end) SHIFTED_TIME, +(case when issue.ISSUE_STATE = 4 then item.CREATED_TIME else null end) SHIFTED_TIME, hdl.CREATED_TIME CLOSED_TIME, issue.DEL_FLAG, issue.REVISION, From 89d4c761d1d5e5973f9f6bcb06c92d62e7bb9390 Mon Sep 17 00:00:00 2001 From: mkh Date: Tue, 1 Mar 2022 13:32:59 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/service/impl/SysUserServiceImpl.java | 71 ++++++++++++++----- 1 file changed, 53 insertions(+), 18 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java index 7abf194f4..0912d0b49 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java @@ -256,30 +256,65 @@ public class SysUserServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("USER_ID", dto.getId().toString()); CustomerStaffEntity customerStaffEntity = customerStaffDao.selectOne(queryWrapper); - customerStaffEntity.setRealName(dto.getRealName()); - customerStaffEntity.setGender(dto.getGender()); - customerStaffEntity.setEmail(dto.getEmail()); - customerStaffEntity.setMobile(dto.getMobile()); - if (StringUtils.isNotEmpty(dto.getPassword())) { - customerStaffEntity.setPassword(PasswordUtils.encode(dto.getPassword())); + if (customerStaffEntity == null) { + CustomerStaffEntity staffEntity = ConvertUtils.sourceToTarget(entity, CustomerStaffEntity.class); + staffEntity.setId(entity.getId().toString()); + staffEntity.setCustomerId(sysDictEntity.getDictValue()); + staffEntity.setUserId(entity.getId().toString()); + staffEntity.setHeadPhoto(entity.getHeadUrl()); + staffEntity.setWorkType("fulltime"); + staffEntity.setActiveFlag("active"); + staffEntity.setActiveTime(new Date()); + staffEntity.setEnableFlag("enable"); + if(StringUtils.isEmpty(entity.getPassword())){ + staffEntity.setPassword(PasswordUtils.encode(sysUserEntity.getPassword())); + }else { + staffEntity.setPassword(PasswordUtils.encode(entity.getPassword())); + } + customerStaffDao.insert(staffEntity); + } else { + customerStaffEntity.setRealName(dto.getRealName()); + customerStaffEntity.setGender(dto.getGender()); + customerStaffEntity.setEmail(dto.getEmail()); + customerStaffEntity.setMobile(dto.getMobile()); + if (StringUtils.isNotEmpty(dto.getPassword())) { + customerStaffEntity.setPassword(PasswordUtils.encode(dto.getPassword())); + } + customerStaffEntity.setHeadPhoto(dto.getHeadUrl()); + customerStaffDao.updateById(customerStaffEntity); } - customerStaffEntity.setHeadPhoto(dto.getHeadUrl()); - customerStaffDao.updateById(customerStaffEntity); //同步更新staff_org_relation QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("STAFF_ID",dto.getId().toString()); + wrapper.eq("STAFF_ID", dto.getId().toString()); StaffOrgRelationEntity staffOrgRelationEntity = staffOrgRelationDao.selectOne(wrapper); String typeKey = deptEntity.getTypeKey(); - staffOrgRelationEntity.setPids(StringUtils.join(StringUtils.split(deptEntity.getPids(), ","), ":")); - staffOrgRelationEntity.setOrgId(deptEntity.getId().toString()); - if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(typeKey)) { - staffOrgRelationEntity.setOrgType("grid"); - } else if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(typeKey) || OrganizationTypeConstant.ORG_TYPE_STREET_DEPT.equals(typeKey)) { - staffOrgRelationEntity.setOrgType("dept"); - } else { - staffOrgRelationEntity.setOrgType("agency"); + if(staffOrgRelationEntity==null){ + StaffOrgRelationEntity orgRelationEntity = new StaffOrgRelationEntity(); + orgRelationEntity.setId(entity.getId().toString()); + orgRelationEntity.setCustomerId(sysDictEntity.getDictValue()); + orgRelationEntity.setStaffId(entity.getId().toString()); + orgRelationEntity.setPids(StringUtils.join(StringUtils.split(deptEntity.getPids(), ","), ":")); + orgRelationEntity.setOrgId(deptEntity.getId().toString()); + if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(typeKey)) { + orgRelationEntity.setOrgType("grid"); + } else if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(typeKey) || OrganizationTypeConstant.ORG_TYPE_STREET_DEPT.equals(typeKey)) { + orgRelationEntity.setOrgType("dept"); + } else { + orgRelationEntity.setOrgType("agency"); + } + staffOrgRelationDao.insert(orgRelationEntity); + }else { + staffOrgRelationEntity.setPids(StringUtils.join(StringUtils.split(deptEntity.getPids(), ","), ":")); + staffOrgRelationEntity.setOrgId(deptEntity.getId().toString()); + if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(typeKey)) { + staffOrgRelationEntity.setOrgType("grid"); + } else if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(typeKey) || OrganizationTypeConstant.ORG_TYPE_STREET_DEPT.equals(typeKey)) { + staffOrgRelationEntity.setOrgType("dept"); + } else { + staffOrgRelationEntity.setOrgType("agency"); + } + staffOrgRelationDao.updateById(staffOrgRelationEntity); } - staffOrgRelationDao.updateById(staffOrgRelationEntity); } if (!sysUserEntity.getDeptId().equals(entity.getDeptId())) { From 0d67b1b6d1e2ac1f75d8f915888e64560db8314a Mon Sep 17 00:00:00 2001 From: mkh Date: Tue, 1 Mar 2022 16:05:15 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=96=B0=E5=A2=9Ebug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/service/impl/SysUserServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java index 0912d0b49..44a6a9f2f 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java @@ -172,6 +172,7 @@ public class SysUserServiceImpl extends BaseServiceImpl