From 8b375fe00a241b3a769b82fe3dac8d1c9dce8a02 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 16 Jun 2022 14:36:07 +0800
Subject: [PATCH] 模拟考试修改
---
src/main/java/org/springblade/modules/record/controller/RecordController.java | 326 +++++++++++++++++++++++++----------------------------
1 files changed, 153 insertions(+), 173 deletions(-)
diff --git a/src/main/java/org/springblade/modules/record/controller/RecordController.java b/src/main/java/org/springblade/modules/record/controller/RecordController.java
index 8bd7bd1..438ca41 100644
--- a/src/main/java/org/springblade/modules/record/controller/RecordController.java
+++ b/src/main/java/org/springblade/modules/record/controller/RecordController.java
@@ -26,17 +26,20 @@
import org.springblade.common.cache.ParamCache;
import org.springblade.common.config.FtpConfig;
import org.springblade.common.enums.DictEnum;
+import org.springblade.common.utils.DesensitizedUtil;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.support.Kv;
+import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.DigestUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.information.entity.Information;
import org.springblade.modules.information.service.IInformationService;
+import org.springblade.modules.permit.entity.Permit;
import org.springblade.modules.permit.vo.PermitVO;
import org.springblade.modules.record.dto.RecordDTO;
import org.springblade.modules.record.entity.Record;
@@ -48,12 +51,15 @@
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.List;
import java.util.Map;
+import java.util.Objects;
import static org.springblade.common.constant.CommonConstant.DEFAULT_PARAM_PASSWORD;
import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
@@ -75,6 +81,7 @@
private final IInformationService informationService;
private final IUserService userService;
private final IAttachService attachService;
+ private final MyAsyncService myAsyncService;
/**
* 详情
@@ -140,25 +147,39 @@
String id = map.get("id").toString();
recordService.removeByIds(Func.toLongList(id));
String s1 = "delete from sys_record where id = " + "'" + id + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
}
record.setStorage("1");
record.setType("2");
record.setPermitime(new Date());
- recordService.save(record);
- //String offtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(record.getOfficetime());
- //String pertime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(record.getPermitime());
- String s = "insert into sys_record(id,representative," +
- "address,business,registration,industry,type,ptype,representativecell,contacts,contactscell,perid,offices,jurisdiction,cardid,storage,overtime)" +
- "values(" + "'" + record.getId() + "'" + "," +
- "'" + record.getRepresentative() + "'" + "," + "'" +
- record.getAddress() + "'" + "," + "'" + record.getBusiness() + "'" + "," + "'" + record.getRegistration() + "'" + "," + "'" + record.getIndustry() + "'" + "," + "'" + record.getType() + "'" + "," + "'" + record.getPtype() + "'" + "," +
- "'" + record.getRepresentativecell() + "'" + "," + "'" + record.getContacts() + "'" + "," + "'" + record.getContactscell() + "'" + "," + "'" + record.getPerid() + "'" + "," + "'" + record.getOffices() + "'" + "," + "'" + record.getJurisdiction() + "'" +
- "," + "'" + record.getCardid() + "'" +
- "," + "'" + record.getStorage() + "'" +
- "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(record.getOvertime()) + "'"
- + ")";
- FtpUtil.sqlFileUpload(s);
+
+ //脱敏处理
+ Record record1 = Objects.requireNonNull(BeanUtil.copy(record, Record.class));
+ //敏感数据处理
+ if (null!=record1.getRepresentativecell() && !record1.getRepresentativecell().equals("")) {
+ record1.setRepresentativecell(DesensitizedUtil.desensitizedPhoneNumber(record1.getRepresentativecell()));
+ }
+ if (null!=record1.getContacts() && !record1.getContacts().equals("")) {
+ record1.setContacts(DesensitizedUtil.desensitizedName(record1.getContacts()));
+ }
+ if (null!=record1.getContactscell() && !record1.getContactscell().equals("")) {
+ record1.setContactscell(DesensitizedUtil.desensitizedPhoneNumber(record1.getContactscell()));
+ }
+ boolean save = recordService.save(record1);
+ if (save) {
+ String s = "insert into sys_record(id,representative," +
+ "address,business,registration,industry,type,ptype,representativecell,contacts,contactscell,perid,offices,jurisdiction,cardid,storage,overtime)" +
+ "values(" + "'" + record1.getId() + "'" + "," +
+ "'" + record.getRepresentative() + "'" + "," + "'" +
+ record.getAddress() + "'" + "," + "'" + record.getBusiness() + "'" + "," + "'" + record.getRegistration() + "'" + "," + "'" + record.getIndustry() + "'" + "," + "'" + record.getType() + "'" + "," + "'" + record.getPtype() + "'" + "," +
+ "'" + record.getRepresentativecell() + "'" + "," + "'" + record.getContacts() + "'" + "," + "'" + record.getContactscell() + "'" + "," + "'" + record.getPerid() + "'" + "," + "'" + record.getOffices() + "'" + "," + "'" + record.getJurisdiction() + "'" +
+ "," + "'" + record.getCardid() + "'" +
+ "," + "'" + record.getStorage() + "'" +
+ "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(record.getOvertime()) + "'"
+ + ")";
+ myAsyncService.FTP(s);
+ }
return R.success("成功");
}
@@ -180,6 +201,7 @@
record.setStorage("0");
record.setType("2");
record.setPermitime(new Date());
+
recordService.save(record);
}
return R.success("暂存成功");
@@ -236,7 +258,19 @@
String id = kv.get("id").toString();
information.setDepartmentid(id);
}
- informationService.save(information);
+
+ Information information1 = Objects.requireNonNull(BeanUtil.copy(information, Information.class));
+ //敏感数据处理
+ if (null!=information1.getRepresentativecell() && !information1.getRepresentativecell().equals("")) {
+ information1.setRepresentativecell(DesensitizedUtil.desensitizedPhoneNumber(information1.getRepresentativecell()));
+ }
+ if (null!=information1.getContacts() && !information1.getContacts().equals("")) {
+ information1.setContacts(DesensitizedUtil.desensitizedName(information1.getContacts()));
+ }
+ if (null!=information1.getContactscell() && !information1.getContactscell().equals("")) {
+ information1.setContactscell(DesensitizedUtil.desensitizedPhoneNumber(information1.getContactscell()));
+ }
+ informationService.save(information1);
Integer isDeleted = 0;
//注册用户
User user = new User();
@@ -251,163 +285,101 @@
user.setRoleId("1414575196264300546");
user.setStatus(1);
user.setIsDeleted(0);
- userService.save(user);
- String roleid = "1415563428727328770";
- String s = "insert into sys_information(id,creditCode,enterpriseName,representative" +
- ",registeredCapital,organizationCode,registrationNumber, enterprises, address," +
- " business,region,registration,industry,departmentid,stats,jurisdiction,representativecell," +
- "contacts,contactscell,create_user_id) " +
- "values(" + "'" + information.getId() + "'" +
- "," + "'" + information.getCreditcode() + "'" +
- "," + "'" + information.getEnterprisename() + "'" +
- "," + "'" + information.getRepresentative() + "'" +
- "," + "'" + information.getRegisteredcapital() + "'" +
- "," + "'" + information.getOrganizationcode() + "'" +
- "," + "'" + information.getRegistrationnumber() + "'" +
- "," + "'" + information.getEnterprises() + "'" +
- "," + "'" + information.getAddress() + "'" +
- "," + "'" + information.getBusiness() + "'" +
- "," + "'" + information.getRegion() + "'" +
- "," + "'" + information.getRegistration() + "'" +
- "," + "'" + information.getIndustry() + "'" +
- "," + "'" + information.getDepartmentid() + "'" +
- "," + "'" + information.getStats() + "'" +
- "," + "'" + information.getJurisdiction() + "'" +
- "," + "'" + information.getRepresentativecell() + "'" +
- "," + "'" + information.getContacts() + "'" +
- "," + "'" + information.getContactscell() + "'" +
- "," + "'" + information.getCreateUserId() + "'" + ")";
- FtpUtil.sqlFileUpload(s);
- String ss = "insert into blade_dept(id,parent_id,tenant_id,dept_name,ancestors,dept_category,is_deleted) values(" + "'" + dept.getId() + "'" + "," + "'" + dept.getParentId() + "'" + ","
- + "'" + dept.getTenantId() + "'" +
- "," + "'" + information.getEnterprisename() + "'" +
- "," + "'" + dept.getAncestors() + "'" +
- "," + "'" + dept.getDeptCategory() + "'" +
- "," + "'" + isDeleted + "'" + ")";
- FtpUtil.sqlFileUpload(ss);
- String rtime;
- String paperTime;
- if (user.getRtime() == null) {
- rtime = null;
- } else {
- rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime());
- }
- //发证日期处理
- if (user.getPaperTime() == null) {
- paperTime = "";
- } else {
- paperTime = new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime());
- }
- //头像
- if (null != user.getAvatar() && !user.getAvatar().equals("")) {
- user.setAvatar(FtpConfig.ip + user.getAvatar().substring(26));
- }
+ boolean save = userService.save(user);
+ if (save) {
+ String roleid = "1415563428727328770";
+ String s = "insert into sys_information(id,creditCode,enterpriseName,representative" +
+ ",registeredCapital,organizationCode,registrationNumber, enterprises, address," +
+ " business,region,registration,industry,departmentid,stats,jurisdiction,representativecell," +
+ "contacts,contactscell,create_user_id) " +
+ "values(" + "'" + information1.getId() + "'" +
+ "," + "'" + information.getCreditcode() + "'" +
+ "," + "'" + information.getEnterprisename() + "'" +
+ "," + "'" + information.getRepresentative() + "'" +
+ "," + "'" + information.getRegisteredcapital() + "'" +
+ "," + "'" + information.getOrganizationcode() + "'" +
+ "," + "'" + information.getRegistrationnumber() + "'" +
+ "," + "'" + information.getEnterprises() + "'" +
+ "," + "'" + information.getAddress() + "'" +
+ "," + "'" + information.getBusiness() + "'" +
+ "," + "'" + information.getRegion() + "'" +
+ "," + "'" + information.getRegistration() + "'" +
+ "," + "'" + information.getIndustry() + "'" +
+ "," + "'" + information.getDepartmentid() + "'" +
+ "," + "'" + information.getStats() + "'" +
+ "," + "'" + information.getJurisdiction() + "'" +
+ "," + "'" + information.getRepresentativecell() + "'" +
+ "," + "'" + information.getContacts() + "'" +
+ "," + "'" + information.getContactscell() + "'" +
+ "," + "'" + information.getCreateUserId() + "'" + ")";
+ myAsyncService.FTP(s);
+ String ss = "insert into blade_dept(id,parent_id,tenant_id,dept_name,ancestors,dept_category,is_deleted) values(" + "'" + dept.getId() + "'" + "," + "'" + dept.getParentId() + "'" + ","
+ + "'" + dept.getTenantId() + "'" +
+ "," + "'" + information.getEnterprisename() + "'" +
+ "," + "'" + dept.getAncestors() + "'" +
+ "," + "'" + dept.getDeptCategory() + "'" +
+ "," + "'" + isDeleted + "'" + ")";
+ myAsyncService.FTP(ss);
+ String rtime;
+ String paperTime;
+ if (user.getRtime() == null) {
+ rtime = null;
+ } else {
+ rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime());
+ }
+ //发证日期处理
+ if (user.getPaperTime() == null) {
+ paperTime = "";
+ } else {
+ paperTime = new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime());
+ }
+ //头像
+ if (null != user.getAvatar() && !user.getAvatar().equals("")) {
+ user.setAvatar(FtpConfig.ip + user.getAvatar().substring(26));
+ }
- //指纹
- if (null != user.getFingerprint() && !user.getFingerprint().equals("")) {
- user.setFingerprint(FtpConfig.ip + user.getFingerprint().substring(26));
- }
+ //指纹
+ if (null != user.getFingerprint() && !user.getFingerprint().equals("")) {
+ user.setFingerprint(FtpConfig.ip + user.getFingerprint().substring(26));
+ }
- String sss = "insert into blade_user(" +
- "id,tenant_id,account,password,name,real_name,avatar,email,phone,sex," +
- "role_id,dept_id,cardid,nativePlace,nation,fingerprint,education," +
- "politicaloutlook,healstats,height,address,registered,rtime," +
- "securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch) " +
- "values(" + "'" + user.getId() + "'" +
- "," + "'" + user.getTenantId() + "'" +
- "," + "'" + user.getAccount() + "'" +
- "," + "'" + user.getPassword() + "'" +
- "," + "'" + user.getName() + "'" +
- "," + "'" + user.getRealName() + "'" +
- "," + "'" + user.getAvatar() + "'" +
- "," + "'" + user.getEmail() + "'" +
- "," + "'" + user.getPhone() + "'" +
- "," + "'" + null + "'" +
- "," + "'" + roleid + "'" +
- "," + "'" + user.getDeptId() + "'" +
- "," + "'" + user.getCardid() + "'" +
- "," + "'" + user.getNativeplace() + "'" +
- "," + "'" + user.getNation() + "'" +
- "," + "'" + user.getFingerprint() + "'" +
- "," + "'" + user.getEducation() + "'" +
- "," + "'" + user.getPoliticaloutlook() + "'" +
- "," + "'" + user.getHealstats() + "'" +
- "," + "'" + user.getHeight() + "'" +
- "," + "'" + user.getAddress() + "'" +
- "," + "'" + user.getRegistered() + "'" +
- "," + "'" + rtime + "'" +
- "," + "'" + user.getSecuritynumber() + "'" +
- "," + "'" + user.getHold() + "'" +
- "," + "'" + user.getJurisdiction() + "'" +
- "," + "'" + user.getExaminationType() + "'" +
- "," + "'" + user.getStatus() + "'" +
- "," + "'" + user.getIsDeleted() + "'" +
- "," + "'" + user.getDispatch() + "'" + ")";
- FtpUtil.sqlFileUpload(sss);
-// Integer isDeleted = 0;
-// //注册用户
-// User user = new User();
-// user.setDeptId(information.getDepartmentid());
-// user.setTenantId("000000");
-// user.setAccount(record.getEnterprisename());
-// String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
-// user.setPassword(initPassword);
-// user.setCreateTime(new Date());
-// user.setUpdateTime(new Date());
-// user.setRoleId("1414575196264300546");
-// user.setStatus(1);
-// user.setIsDeleted(0);
-// userService.save(user);
-// String roleid = "1415563428727328770";
-// String s = "insert into sys_information(id,creditCode,enterpriseName,representative" +
-// ",registeredCapital,organizationCode,registrationNumber, enterprises, address," +
-// " business,region,registration,industry,departmentid,stats,jurisdiction,representativecell," +
-// "contacts,contactscell,create_time,create_user_id) " +
-// "values(" + "'" + information.getId() + "'" +
-// "," + "'" + information.getCreditcode() + "'" +
-// "," + "'" + information.getEnterprisename() + "'" +
-// "," + "'" + information.getRepresentative() + "'" +
-// "," + "'" + information.getRegisteredcapital() + "'" +
-// "," + "'" + information.getOrganizationcode() + "'" +
-// "," + "'" + information.getRegistrationnumber() + "'" +
-// "," + "'" + information.getEnterprises() + "'" +
-// "," + "'" + information.getAddress() + "'" +
-// "," + "'" + information.getBusiness() + "'" +
-// "," + "'" + information.getRegion() + "'" +
-// "," + "'" + information.getRegistration() + "'" +
-// "," + "'" + information.getIndustry() + "'" +
-// "," + "'" + information.getDepartmentid() + "'" +
-// "," + "'" + information.getStats() + "'" +
-// "," + "'" + information.getJurisdiction() + "'" +
-// "," + "'" + information.getRepresentativecell() + "'" +
-// "," + "'" + information.getContacts() + "'" +
-// "," + "'" + information.getContactscell() + "'" +
-// "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(information.getCreateTime()) + "'" +
-// "," + "'" + information.getCreateUserId() + "'" + ");" +
-// "insert into blade_dept(id,parent_id,tenant_id,dept_name,ancestors,dept_category,is_deleted) values(" + "'" + information.getDepartmentid() + "'" + "," + "'" + dept.getParentId() + "'" + ","
-// + "'" + dept.getTenantId() + "'" +
-// "," + "'" + information.getEnterprisename() + "'" +
-// "," + "'" + dept.getAncestors() + "'" +
-// "," + "'" + dept.getDeptCategory() + "'" +
-// "," + "'" + isDeleted + "'" + ");" +
-// "insert into blade_user(id,tenant_id,account,password,role_id,dept_id,create_time,update_time,status,is_deleted) " +
-// "values(" + "'" + user.getId() + "'" +
-// "," + "'" + user.getTenantId() + "'"
-// + "," + "'" + user.getAccount() + "'" +
-// "," + "'" + user.getPassword() + "'" +
-// "," + "'" + roleid + "'" +
-// "," + "'" + user.getDeptId() + "'" +
-// "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getCreateTime()) + "'" +
-// "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'" +
-// "," + "'" + user.getStatus() + "'" +
-// "," + "'" + user.getIsDeleted() + "'" + ")";
-// FtpUtil.sqlFileUpload(s);
-// //注册用户
-// User user = new User();
-// user.setAccount(record.getEnterprisename());
-// String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
-// user.setPassword(initPassword);
-// boolean b = userService.saveOrUpdate(user);
+ String sss = "insert into blade_user(" +
+ "id,tenant_id,account,password,name,real_name,avatar,email,phone,sex," +
+ "role_id,dept_id,cardid,nativePlace,nation,fingerprint,education," +
+ "politicaloutlook,healstats,height,address,registered,rtime," +
+ "securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch) " +
+ "values(" + "'" + user.getId() + "'" +
+ "," + "'" + user.getTenantId() + "'" +
+ "," + "'" + user.getAccount() + "'" +
+ "," + "'" + user.getPassword() + "'" +
+ "," + "'" + user.getName() + "'" +
+ "," + "'" + user.getRealName() + "'" +
+ "," + "'" + user.getAvatar() + "'" +
+ "," + "'" + user.getEmail() + "'" +
+ "," + "'" + user.getPhone() + "'" +
+ "," + "'" + null + "'" +
+ "," + "'" + roleid + "'" +
+ "," + "'" + user.getDeptId() + "'" +
+ "," + "'" + user.getCardid() + "'" +
+ "," + "'" + user.getNativeplace() + "'" +
+ "," + "'" + user.getNation() + "'" +
+ "," + "'" + user.getFingerprint() + "'" +
+ "," + "'" + user.getEducation() + "'" +
+ "," + "'" + user.getPoliticaloutlook() + "'" +
+ "," + "'" + user.getHealstats() + "'" +
+ "," + "'" + user.getHeight() + "'" +
+ "," + "'" + user.getAddress() + "'" +
+ "," + "'" + user.getRegistered() + "'" +
+ "," + "'" + rtime + "'" +
+ "," + "'" + user.getSecuritynumber() + "'" +
+ "," + "'" + user.getHold() + "'" +
+ "," + "'" + user.getJurisdiction() + "'" +
+ "," + "'" + user.getExaminationType() + "'" +
+ "," + "'" + user.getStatus() + "'" +
+ "," + "'" + user.getIsDeleted() + "'" +
+ "," + "'" + user.getDispatch() + "'" + ")";
+ myAsyncService.FTP(sss);
+ }
//把附件添加单位id
attachService.updat(information.getDepartmentid(), record.getCardid());
String s1 = "update sys_record set type = " + "'" + record.getType() + "'" +
@@ -421,7 +393,7 @@
",stime = " + "'" + record.getStime() + "'" +
",xtime = " + "'" + record.getXtime() + "'" +
" " + "where id = " + "'" + record.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
} else {
String s1 = "update sys_record set type = " + "'" + record.getType() + "'" +
",papprove = " + "'" + record.getPapprove() + "'" +
@@ -434,7 +406,7 @@
",stime = " + "'" + record.getStime() + "'" +
",xtime = " + "'" + record.getXtime() + "'" +
" " + "where id = " + "'" + record.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
}
return R.status(recordService.saveOrUpdate(record));
}
@@ -457,6 +429,13 @@
@ApiOperationSupport(order = 8)
@ApiOperation(value = "删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ //内网删除
+ List<Long> list = Func.toLongList(ids);
+ list.forEach(id -> {
+ //内网同步
+ String s1 = "delete from sys_record where id = " + "'" + id + "'";
+ myAsyncService.FTP(s1);
+ });
return R.status(recordService.removeByIds(Func.toLongList(ids)));
}
@@ -469,6 +448,7 @@
/**
* 保安公司备案信息(基本信息和附件列表信息)
+ *
* @param record
* @return
*/
--
Gitblit v1.9.3