From 46f7fdff7f7c7640e899b686031b8ccbc9c8b14c Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 27 May 2022 10:52:42 +0800
Subject: [PATCH] 1、资讯模糊匹配修改
---
src/main/java/org/springblade/modules/zc/controller/ZcController.java | 92 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 73 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/springblade/modules/zc/controller/ZcController.java b/src/main/java/org/springblade/modules/zc/controller/ZcController.java
index 35a9b6b..3f65ede 100644
--- a/src/main/java/org/springblade/modules/zc/controller/ZcController.java
+++ b/src/main/java/org/springblade/modules/zc/controller/ZcController.java
@@ -141,6 +141,26 @@
}
}
+ for (int j = 0; j < page.getRecords().size(); j++) {
+ if (page.getRecords().get(j).getWorkjurisdiction() != null && !page.getRecords().get(j).getWorkjurisdiction().equals("")) {
+ String[] split = page.getRecords().get(j).getWorkjurisdiction().split(",");
+ List<String> list = Arrays.asList(split);
+ StringBuffer deptNameBuiffer = new StringBuffer();
+ //数据匹配封装
+ for (String deptId : list) {
+ for (DeptVo deptVo : xqVos) {
+ if (deptId.equals(deptVo.getId().toString())) {
+ deptNameBuiffer.append(deptVo.getDeptName()).append(",");
+ }
+ }
+ }
+ //封装部门名称数据
+ if (deptNameBuiffer.length() > 0) {
+ page.getRecords().get(j).setWorkname(deptNameBuiffer.substring(0, deptNameBuiffer.length() - 1));
+ }
+ }
+ }
+
return R.data(page);
}
@@ -184,6 +204,16 @@
return R.success("成功");
}
+ /**
+ * 新增或修改
+ */
+ @PostMapping("/examineList")
+ @ApiOperationSupport(order = 6)
+ @ApiOperation(value = "新增或修改", notes = "传入zc")
+ public R examineList(@Valid @RequestParam String ids,String names) {
+ zcService.updateExamine(ids,Func.toStrList(names));
+ return R.success("成功");
+ }
/**
* 删除
@@ -205,37 +235,61 @@
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String times = df.format(new Date());
zc.setZctime(times);
- Integer userCount = iUserService.selectCount(zc.getUsername());
- if (userCount > 0) {
- throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前用户 [{}] 已存在!", zc.getUsername()));
- }
+
+ //保留未脱敏数据
+ String names = zc.getSname();
+ String cardids = zc.getCardid();
+ String phones = zc.getPhone();
+
//数据脱敏处理
String name = DesensitizedUtil.desensitizedName(zc.getSname());
String cardid = DesensitizedUtil.desensitizedIdNumber(zc.getCardid());
String phone = DesensitizedUtil.desensitizedPhoneNumber(zc.getPhone());
//帐号默认姓+身份证后四位
- zc.setUsername(name.substring(0,1)+cardid.substring(cardid.length()-4));
+ zc.setUsername(name.substring(0, 1) + zc.getCardid().substring(zc.getCardid().length() - 4));
+ Integer userCount = iUserService.selectCount(zc.getUsername());
+ if (userCount > 0) {
+ throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前用户 [{}] 已存在!", zc.getUsername()));
+ }
- //内网储存完整数据
- String s = "insert into act_zc(id,username,password,sname,sex,phone,zctime,parent_id,jurisdiction,cardid,address)" +
- "values(" + "'" + zc.getId() + "'" +
- "," + "'" + zc.getUsername() + "'" +
- "," + "'" + zc.getPassword() + "'" +
- "," + "'" + zc.getSname() + "'" +
- "," + "'" + zc.getSex() + "'" +
- "," + "'" + zc.getPhone() + "'" +
- "," + "'" + zc.getZctime() + "'" +
- "," + "'" + zc.getParentId() + "'" +
- "," + "'" + zc.getJurisdiction() + "'" +
- "," + "'" + zc.getCardid() + "'" +
- "," + "'" + zc.getAddress() + "'"
- + ")";
+
zc.setSname(name);
zc.setCardid(cardid);
zc.setPhone(phone);
zcService.inster(zc);
+ System.out.println("插入id++++++++++++"+zc.getId());
+ //内网储存完整数据
+ String s = "insert into act_zc(id,username,password,sname,sex,phone,zctime,parent_id,jurisdiction,cardid,address,workjurisdiction)" +
+ "values(" + "'" + zc.getId() + "'" +
+ "," + "'" + zc.getUsername() + "'" +
+ "," + "'" + zc.getPassword() + "'" +
+ "," + "'" + names + "'" +
+ "," + "'" + zc.getSex() + "'" +
+ "," + "'" + phones + "'" +
+ "," + "'" + zc.getZctime() + "'" +
+ "," + "'" + zc.getParentId() + "'" +
+ "," + "'" + zc.getJurisdiction() + "'" +
+ "," + "'" + cardids + "'" +
+ "," + "'" + zc.getAddress() + "'" +
+ "," + "'" + zc.getWorkjurisdiction() + "'"
+ + ");"
+ +
+ "insert into blade_user(account,password,real_name,sex,phone,workjurisdiction,role_id,jurisdiction,cardid,address)" +
+ "values(" +
+ "'" + zc.getUsername() + "'" +
+ "," + "'" + DigestUtil.encrypt(zc.getPassword()) + "'" +
+ "," + "'" + names + "'" +
+ "," + "'" + zc.getSex() + "'" +
+ "," + "'" + phones + "'" +
+ "," + "'" + zc.getWorkjurisdiction() + "'" +
+ "," + "'" + zc.getParentId() + "'" +
+ "," + "'" + zc.getJurisdiction() + "'" +
+ "," + "'" + cardids + "'" +
+ "," + "'" + zc.getAddress() + "'"
+ + ")";
+ System.out.println("插入语句++++++++++++"+s);
//同时新增到用户表
User user = new User();
user.setAccount(zc.getUsername());
--
Gitblit v1.9.3