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/information/controller/InformationController.java | 288 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 186 insertions(+), 102 deletions(-)
diff --git a/src/main/java/org/springblade/modules/information/controller/InformationController.java b/src/main/java/org/springblade/modules/information/controller/InformationController.java
index 2912373..3bc4f69 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -26,6 +26,7 @@
import org.springblade.common.cache.DictCache;
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.excel.util.ExcelUtil;
@@ -34,12 +35,10 @@
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.DateUtil;
-import org.springblade.core.tool.utils.DigestUtil;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.core.tool.utils.*;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.FTP.OutJson;
+import org.springblade.modules.dispatcher.entity.DispatcherUnit;
import org.springblade.modules.information.entity.Information;
import org.springblade.modules.information.excel.ExportInformationExcel;
import org.springblade.modules.information.excel.ExportInformationSecurityStatistics;
@@ -53,7 +52,9 @@
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IRoleService;
import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -96,6 +97,7 @@
private final IUserService userService;
private final IRoleService roleService;
+ private final MyAsyncService myAsyncService;
/**
* 详情
@@ -147,7 +149,8 @@
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入information")
- public R save(@Valid @RequestBody Information information){
+ @Transactional(rollbackFor = Exception.class)
+ public R save(@Valid @RequestBody Information information) {
Dept dept = new Dept();
//自招保安公司
if (information.getStats().equals("0")) {
@@ -189,8 +192,20 @@
information.setCreateTime(new Date());
+ 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()));
+ }
+
//公司新增
- boolean status = informationService.save(information);
+ boolean status = informationService.save(information1);
//公司新增成功则创建默认账户，公司名即为账号名，默认密码为 123456
if (status) {
@@ -203,6 +218,7 @@
}
user.setDeptId(information.getDepartmentid());
user.setTenantId("000000");
+ user.setCreateUser(Long.parseLong(information.getCreateUserId()));
user.setCreateTime(new Date());
user.setUpdateTime(new Date());
user.setStatus(1);
@@ -210,61 +226,64 @@
//分配保安角色
//如果是本市保安公司，分公司，自招保安公司，分配保安公司管理员角色，如果是培训学校，则分配的是培训公司管理员角色
Role role = new Role();
- if (information.getStats().equals("1")){
+ if (information.getStats().equals("1")) {
role.setRoleAlias("培训公司管理员");
- }else {
+ } else {
role.setRoleAlias("保安公司管理员");
}
Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
user.setRoleId(oneRole.getId().toString());
//插入用户数据
- userService.save(user);
+ boolean save = userService.save(user);
+ if (save) {
+ Integer isDeleted = 0;
+ 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(" + "'" + 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() + "'" +
+ "," + "'" + 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,dept_id,create_user,create_time,update_time,status,is_deleted,role_id) " +
+ "values(" + "'" + user.getId() + "'" +
+ "," + "'" + user.getTenantId() + "'"
+ + "," + "'" + user.getAccount() + "'" +
+ "," + "'" + user.getPassword() + "'" +
+ "," + "'" + user.getDeptId() + "'" +
+ "," + "'" + user.getCreateUser() + "'" +
+ "," + "'" + 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() + "'" +
+ "," + "'" + user.getRoleId() + "'" + ")";
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.FTP(s);
- Integer isDeleted = 0;
- //Integer id = information.getId();
- 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() + "'" +
- "," + "'" + user.getRoleId() + "'" +
- "," + "'" + 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);
+ }
}
return R.success("成功");
}
@@ -276,49 +295,85 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入information")
public R update(@Valid @RequestBody Information information) throws Exception {
- informationService.updateById(information);
- String businessLicense = null;
- String businessLicenses = null;
- String licence = null;
- String licences = null;
- String format = "";
- if (information.getBusinessLicense() != null && !"".equals(information.getBusinessLicense())) {
- businessLicense = information.getBusinessLicense().substring(26, information.getBusinessLicense().length());
- businessLicenses = FtpConfig.ip + businessLicense;
- } else {
- businessLicenses = "";
+ Information information1 = Objects.requireNonNull(BeanUtil.copy(information, Information.class));;
+ //敏感数据处理
+ if (null!=information1.getRepresentativecell() && !information1.getRepresentativecell().equals("")) {
+ information1.setRepresentativecell(DesensitizedUtil.desensitizedPhoneNumber(information1.getRepresentativecell()));
}
- if (information.getLicence() != null && !"".equals(information.getLicence())) {
- licence = information.getLicence().substring(26, information.getLicence().length());
- licences = FtpConfig.ip + licence;
- } else {
- licences = "";
+ if (null!=information1.getContacts() && !information1.getContacts().equals("")) {
+ information1.setContacts(DesensitizedUtil.desensitizedName(information1.getContacts()));
}
- if (information.getEstablishtime() != null && !"".equals(information.getEstablishtime())) {
- format = new SimpleDateFormat("yyyy-MM-dd").format(information.getEstablishtime());
+ if (null!=information1.getContactscell() && !information1.getContactscell().equals("")) {
+ information1.setContactscell(DesensitizedUtil.desensitizedPhoneNumber(information1.getContactscell()));
}
- //内网同步
- String s1 = "update sys_information set creditCode = " + "'" + information.getCreditcode() + "'" +
- ",enterpriseName = " + "'" + information.getEnterprisename() + "'" +
- ",representative = " + "'" + information.getRepresentative() + "'" +
- ",establishTime = " + "'" + format + "'" +
- ",registeredCapital = " + "'" + information.getRegisteredcapital() + "'" +
- ",jurisdiction = " + "'" + information.getJurisdiction() + "'" +
- ",enterprises = " + "'" + information.getEnterprises() + "'" +
- ",address = " + "'" + information.getAddress() + "'" +
- ",business = " + "'" + information.getBusiness() + "'" +
- ",region = " + "'" + information.getRegion() + "'" +
- ",registration = " + "'" + information.getRegistration() + "'" +
- ",industry = " + "'" + information.getIndustry() + "'" +
- ",departmentid = " + "'" + information.getDepartmentid() + "'" +
- ",stats = " + "'" + information.getStats() + "'" +
- ",representativecell = " + "'" + information.getRepresentativecell() + "'" +
- ",contacts = " + "'" + information.getContacts() + "'" +
- ",contactscell = " + "'" + information.getContactscell() + "'" +
- ",business_License = " + "'" + businessLicenses + "'" +
- ",licence = " + "'" + licences + "'" +
- " " + "where id = " + "'" + information.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ boolean b = informationService.updateById(information1);
+ if (b) {
+ String businessLicense = null;
+ String businessLicenses = null;
+ String licence = null;
+ String licences = null;
+ String format = "";
+ if (information.getBusinessLicense() != null && !"".equals(information.getBusinessLicense())) {
+ businessLicense = information.getBusinessLicense().substring(26, information.getBusinessLicense().length());
+ businessLicenses = FtpConfig.ip + businessLicense;
+ } else {
+ businessLicenses = "";
+ }
+ if (information.getLicence() != null && !"".equals(information.getLicence())) {
+ licence = information.getLicence().substring(26, information.getLicence().length());
+ licences = FtpConfig.ip + licence;
+ } else {
+ licences = "";
+ }
+
+ if (information.getEstablishtime() != null && !"".equals(information.getEstablishtime())) {
+ format = new SimpleDateFormat("yyyy-MM-dd").format(information.getEstablishtime());
+ //内网同步
+ String s1 = "update sys_information set creditCode = " + "'" + information.getCreditcode() + "'" +
+ ",enterpriseName = " + "'" + information.getEnterprisename() + "'" +
+ ",representative = " + "'" + information.getRepresentative() + "'" +
+ ",establishTime = " + "'" + format + "'" +
+ ",registeredCapital = " + "'" + information.getRegisteredcapital() + "'" +
+ ",jurisdiction = " + "'" + information.getJurisdiction() + "'" +
+ ",enterprises = " + "'" + information.getEnterprises() + "'" +
+ ",address = " + "'" + information.getAddress() + "'" +
+ ",business = " + "'" + information.getBusiness() + "'" +
+ ",region = " + "'" + information.getRegion() + "'" +
+ ",registration = " + "'" + information.getRegistration() + "'" +
+ ",industry = " + "'" + information.getIndustry() + "'" +
+ ",departmentid = " + "'" + information.getDepartmentid() + "'" +
+ ",stats = " + "'" + information.getStats() + "'" +
+ ",representativecell = " + "'" + information.getRepresentativecell() + "'" +
+ ",contacts = " + "'" + information.getContacts() + "'" +
+ ",contactscell = " + "'" + information.getContactscell() + "'" +
+ ",business_License = " + "'" + businessLicenses + "'" +
+ ",licence = " + "'" + licences + "'" +
+ " " + "where id = " + "'" + information.getId() + "'";
+ }else {
+ //内网同步
+ String s1 = "update sys_information set creditCode = " + "'" + information.getCreditcode() + "'" +
+ ",enterpriseName = " + "'" + information.getEnterprisename() + "'" +
+ ",representative = " + "'" + information.getRepresentative() + "'" +
+ ",registeredCapital = " + "'" + information.getRegisteredcapital() + "'" +
+ ",jurisdiction = " + "'" + information.getJurisdiction() + "'" +
+ ",enterprises = " + "'" + information.getEnterprises() + "'" +
+ ",address = " + "'" + information.getAddress() + "'" +
+ ",business = " + "'" + information.getBusiness() + "'" +
+ ",region = " + "'" + information.getRegion() + "'" +
+ ",registration = " + "'" + information.getRegistration() + "'" +
+ ",industry = " + "'" + information.getIndustry() + "'" +
+ ",departmentid = " + "'" + information.getDepartmentid() + "'" +
+ ",stats = " + "'" + information.getStats() + "'" +
+ ",representativecell = " + "'" + information.getRepresentativecell() + "'" +
+ ",contacts = " + "'" + information.getContacts() + "'" +
+ ",contactscell = " + "'" + information.getContactscell() + "'" +
+ ",business_License = " + "'" + businessLicenses + "'" +
+ ",licence = " + "'" + licences + "'" +
+ " " + "where id = " + "'" + information.getId() + "'";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
+ }
+ }
return R.success("修改成功");
}
@@ -351,22 +406,27 @@
//机构删除
informationService.deleteDept(s);
//当前公司下人员逻辑删除
- informationService.deleteUserByDeptId(s);
+ informationService.deleteUserByDeptId(s);
//保安公司信息
String s1 = "delete from sys_information where departmentid = " + "'" + s + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
//主要管理人
String s2 = "delete from sys_shareholder where dept_id = " + "'" + s + "'";
- FtpUtil.sqlFileUpload(s2);
+ //FtpUtil.sqlFileUpload(s2);
+ myAsyncService.FTP(s2);
//出资人
String s3 = "delete from sys_member where dept_id = " + "'" + s + "'";
- FtpUtil.sqlFileUpload(s3);
+ //FtpUtil.sqlFileUpload(s3);
+ myAsyncService.FTP(s3);
//组织机构信息逻辑删除
String s4 = "update blade_dept set is_deleted = 1 where id = " + "'" + s + "'";
- FtpUtil.sqlFileUpload(s4);
+ //FtpUtil.sqlFileUpload(s4);
+ myAsyncService.FTP(s4);
//保安公司人员信息删除
String s5 = "update blade_user set is_deleted = 1 where dept_id " + "'" + s + "'";
- FtpUtil.sqlFileUpload(s5);
+ //FtpUtil.sqlFileUpload(s5);
+ myAsyncService.FTP(s5);
});
//返回
return R.success("删除成功");
@@ -428,6 +488,7 @@
}
return R.data(list);
}
+
/**
* 导入单位信息
@@ -510,7 +571,7 @@
*/
@GetMapping("/export-business-statis")
public void exportBusinessStatis(HttpServletResponse response, InformationVO information) {
- List<ExportInformationExcel> list= informationService.exportBusinessStatis(information);
+ List<ExportInformationExcel> list = informationService.exportBusinessStatis(information);
ExcelUtil.export(response, "业务统计数据" + DateUtil.time(), "业务统计数据表", list, ExportInformationExcel.class);
}
@@ -518,7 +579,7 @@
* 保安员情况统计导出
*/
@GetMapping("/export-security-statis-info")
- public void exportSecurityStatisInfo(HttpServletResponse response,InformationVO information) {
+ public void exportSecurityStatisInfo(HttpServletResponse response, InformationVO information) {
List<ExportInformationSecurityStatistics> list = informationService.exportSecurityStatisInfo(information);
ExcelUtil.export(response, "保安员统计数据" + DateUtil.time(), "保安员统计数据表", list, ExportInformationSecurityStatistics.class);
}
@@ -532,4 +593,27 @@
return R.data(list);
}
+ /**
+ * 查询学历统计信息
+ *
+ * @param deptid 部门id
+ * @param jurisdiction 辖区
+ * @return
+ */
+ @PostMapping("/getEducationStatistics")
+ public R getEducationStatistics(String deptid, String jurisdiction) {
+ return R.data(informationService.getEducationStatistics(deptid, jurisdiction));
+ }
+
+ /**
+ * 获取部门信息（）
+ *
+ * @param information
+ * @return
+ */
+ @GetMapping("/getInformationDetails")
+ public R getInformationDetails(InformationVO information) {
+ return R.data(informationService.getInformationDetails(information));
+ }
+
}
--
Gitblit v1.9.3