From 94b60aee558bb21623efd77483b11457464c2288 Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Thu, 6 Jun 2024 19:41:58 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/user/service/UserServiceImpl.java | 140 ++++++++++-------- .../templates/project/code/linkage/add.html | 6 +- .../templates/project/code/linkage/edit.html | 8 +- .../project/code/linkage/userCheckOpt.html | 2 +- .../templates/project/code/linkage/view.html | 4 +- .../zdxt/code/mapper/StatisticalMapper.java | 1 + .../service/impl/LinkageDictServiceImpl.java | 3 - .../service/impl/StatisticalServiceImpl.java | 1 + .../resources/mapper/StatisticalMapper.xml | 8 + 9 files changed, 99 insertions(+), 74 deletions(-) diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java index 4d760122..6ac5aeeb 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java @@ -624,70 +624,88 @@ public class UserServiceImpl implements IUserService { int insertNum = 0; int updateNum = 0; for (int i = 0; i < dataArr.size(); i++) { - JSONObject jsonObject = dataArr.getJSONObject(i); - // 通过登录名判断用户是否存在 + try { + JSONObject jsonObject = dataArr.getJSONObject(i); + // 通过登录名判断用户是否存在 // checkLoginNameUnique(jsonObject.getString("username")); - if (StringUtils.isEmpty(jsonObject.getString("username"))) { continue; } + if (StringUtils.isEmpty(jsonObject.getString("username"))) { + continue; + } - try { - // 返回每条拉取的成功情况 - String taskId = jsonObject.getString("taskId"); - String params = "{\"token\":\""+token+"\",[{\"taskId\":\""+taskId+"\",\"result\":\"SUCCESS\"}]}"; - connect("/ebus/sfrzhqxglmk/sysDoneTacc", params); - }catch (Exception e){ - log.info("用户数据下拉完成异常，异常任务id：{}",jsonObject.getString("taskId")); - e.printStackTrace(); - } + try { + // 返回每条拉取的成功情况 + String taskId = jsonObject.getString("taskId"); + String params = "{\"token\":\"" + token + "\",[{\"taskId\":\"" + taskId + "\",\"result\":\"SUCCESS\"}]}"; + connect("/ebus/sfrzhqxglmk/sysDoneTacc", params); + } catch (Exception e) { + log.info("用户数据下拉完成异常，异常任务id：{}", jsonObject.getString("taskId")); + e.printStackTrace(); + } - User user = new User(); - user.setDeptId(jsonObject.getString("organizationId")); - user.setOrganizationId(jsonObject.getString("organizationId")); - user.setStrUserId(jsonObject.getString("userId")); - user.setSrzUserid(jsonObject.getString("srzUserId")); - user.setFullname(jsonObject.getString("fullname")); - user.setUserName(jsonObject.getString("fullname")); - user.setTaskId(jsonObject.getString("taskId")); - user.setSystemId(jsonObject.getString("systemId")); - user.setLoginName(jsonObject.getString("username")); - user.setEffectOn(jsonObject.getString("effectOn")); - user.setIsDisabled(jsonObject.getString("isDisabled")); - user.setIsDeleted(jsonObject.getString("isDeleted")); - user.setCreateAt(jsonObject.getString("createAt")); - user.setUpdateAt(jsonObject.getString("updateAt")); - user.setGuid(jsonObject.getString("guid")); - //手机号加密 - String mobileNumber = - IdCardCryptoUtil.symmetricEncryptIdCard(secretKey, jsonObject.getString("mobileNumber")); - user.setMobileNumber(mobileNumber); - - user.setPhonenumber(mobileNumber); - user.setEmail(jsonObject.getString("email")); - user.setCertificateTypeId(jsonObject.getString("certificateTypeId")); - user.setCertificateTypeIdCode(jsonObject.getString("certificateTypeIdCode")); - //证件号加密 - String certificateNumber = - IdCardCryptoUtil.symmetricEncryptIdCard(secretKey, jsonObject.getString("certificateNumber")); - user.setCertificateNumber(certificateNumber); - user.setIsMappingPerson(jsonObject.getString("isMappingPerson")); - //证件号加密 - String units = - IdCardCryptoUtil.symmetricEncryptIdCard(secretKey, jsonObject.getString("units")); - user.setUnits(units); - - user.randomSalt(); - //新增用户默认不删除标记 - user.setDelFlag("0"); - - User uniqueUser = userMapper.selectUserByLoginName(jsonObject.getString("username")); - if (null != uniqueUser && uniqueUser.getUserId() != null) { - // 跟新数据库 - user.setUserId(uniqueUser.getUserId()); - int rowNum = userMapper.updateUser(user); - updateNum += rowNum; - } else { - // 插入数据库 - int rowNum = userMapper.insertUser(user); - insertNum += rowNum; + User user = new User(); + user.setDeptId(jsonObject.getString("organizationId")); + user.setOrganizationId(jsonObject.getString("organizationId")); + user.setStrUserId(jsonObject.getString("userId")); + user.setSrzUserid(jsonObject.getString("srzUserId")); + user.setFullname(jsonObject.getString("fullname")); + user.setUserName(jsonObject.getString("fullname")); + user.setTaskId(jsonObject.getString("taskId")); + user.setSystemId(jsonObject.getString("systemId")); + user.setLoginName(jsonObject.getString("username")); + user.setEffectOn(jsonObject.getString("effectOn")); + user.setIsDisabled(jsonObject.getString("isDisabled")); + user.setIsDeleted(jsonObject.getString("isDeleted")); + user.setCreateAt(jsonObject.getString("createAt")); + user.setUpdateAt(jsonObject.getString("updateAt")); + user.setGuid(jsonObject.getString("guid")); + //手机号加密 + String mobileNumber = ""; + try { + mobileNumber = IdCardCryptoUtil.symmetricEncryptIdCard(secretKey, jsonObject.getString("mobileNumber")); + } catch (Exception e) { + mobileNumber = ""; + } + user.setMobileNumber(mobileNumber); + + user.setPhonenumber(mobileNumber); + user.setEmail(jsonObject.getString("email")); + user.setCertificateTypeId(jsonObject.getString("certificateTypeId")); + user.setCertificateTypeIdCode(jsonObject.getString("certificateTypeIdCode")); + //证件号加密 + String certificateNumber = ""; + try { + certificateNumber = IdCardCryptoUtil.symmetricEncryptIdCard(secretKey, jsonObject.getString("certificateNumber")); + } catch (Exception e) { + certificateNumber = ""; + } + user.setCertificateNumber(certificateNumber); + user.setIsMappingPerson(jsonObject.getString("isMappingPerson")); + //证件号加密 + String units = ""; + try { + units = IdCardCryptoUtil.symmetricEncryptIdCard(secretKey, jsonObject.getString("units")); + } catch (Exception e) { + units = ""; + } + user.setUnits(units); + + user.randomSalt(); + //新增用户默认不删除标记 + user.setDelFlag("0"); + + User uniqueUser = userMapper.selectUserByLoginName(jsonObject.getString("username")); + if (null != uniqueUser && uniqueUser.getUserId() != null) { + // 跟新数据库 + user.setUserId(uniqueUser.getUserId()); + int rowNum = userMapper.updateUser(user); + updateNum += rowNum; + } else { + // 插入数据库 + int rowNum = userMapper.insertUser(user); + insertNum += rowNum; + } + } catch (Exception e) { + continue; } } Map resMap = new HashedMap(); diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/linkage/add.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/linkage/add.html index 32c89131..bfdbbb8c 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/linkage/add.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/linkage/add.html @@ -9,7 +9,7 @@
- +
@@ -70,7 +70,7 @@ }, messages: { "deptName": { - remote: "部门已经存在" + remote: "节点已经存在" } }, focusCleanup: true @@ -82,7 +82,7 @@ } } - /*部门管理-修改-选择部门树*/ + /*节点管理-修改-选择节点树*/ function selectItemTree() { var id = $("#treeId").val(); var options = { diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/linkage/edit.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/linkage/edit.html index 2283c6bb..f7781d31 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/linkage/edit.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/linkage/edit.html @@ -10,7 +10,7 @@
- +
@@ -35,7 +35,7 @@
- +
@@ -80,7 +80,7 @@ }, messages: { "deptName": { - remote: "部门已经存在" + remote: "节点已经存在" } }, focusCleanup: true @@ -92,7 +92,7 @@ } } - /*部门管理-修改-选择部门树*/ + /*节点管理-修改-选择节点树*/ function selectItemTree() { var id = $("#treeId").val(); if(id > 0 || id.length > 1) { diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/linkage/userCheckOpt.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/linkage/userCheckOpt.html index 4a56a0dd..c04485cf 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/linkage/userCheckOpt.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/linkage/userCheckOpt.html @@ -15,7 +15,7 @@
- +
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/linkage/view.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/linkage/view.html index ea62a885..ee097109 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/linkage/view.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/linkage/view.html @@ -11,7 +11,7 @@
  • - 名称： + 名称：
  • 状态： +