From 3c1126fbff1aaed94a2e16c2ef98a03e36bf49f1 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 06 May 2022 12:01:13 +0800
Subject: [PATCH] 心理咨询，业主反馈修改，bean copy 修改

---
 src/main/java/org/springblade/modules/recordLegalperson/controller/RecordLegalpersonController.java |   23 +++
 src/main/java/org/springblade/modules/recordLegalperson/entity/RecordLegalperson.java               |    2 
 src/main/java/org/springblade/modules/record/entity/Record.java                                     |    2 
 src/main/java/org/springblade/modules/permit/entity/Permit.java                                     |    2 
 src/main/java/org/springblade/modules/permit/controller/PermitController.java                       |   61 ++++++++-
 src/main/java/org/springblade/modules/talk/controller/TalkController.java                           |   40 ++++++
 src/main/java/org/springblade/modules/ownerFeed/entity/Owner.java                                   |    7 +
 src/main/java/org/springblade/modules/recordk/controller/RecordkController.java                     |   21 +++
 src/main/java/org/springblade/modules/ownerFeed/controller/OwnerController.java                     |   68 +++++++++++
 src/main/java/org/springblade/common/utils/BeanCopyUtils.java                                       |   80 +++++++++++++
 src/main/java/org/springblade/modules/recordk/entity/Recordk.java                                   |    2 
 src/main/java/org/springblade/modules/record/controller/RecordController.java                       |   38 +++++
 12 files changed, 319 insertions(+), 27 deletions(-)

diff --git a/src/main/java/org/springblade/common/utils/BeanCopyUtils.java b/src/main/java/org/springblade/common/utils/BeanCopyUtils.java
new file mode 100644
index 0000000..9e1710b
--- /dev/null
+++ b/src/main/java/org/springblade/common/utils/BeanCopyUtils.java
@@ -0,0 +1,80 @@
+package org.springblade.common.utils;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * ClassName: BeanCopyUtils
+ * Description: Bean拷贝工具类
+ *
+ */
+public class BeanCopyUtils {
+
+	private BeanCopyUtils() {
+	}
+
+	/**
+	 * 将对象属性拷贝到目标类型的同名属性字段中
+	 * @param <T>
+	 * @param source
+	 * @param targetClazz
+	 * @return
+	 */
+	public static <T> T copyProperties(Object source, Class<T> targetClazz) {
+
+		T target = null;
+		try {
+			target = targetClazz.newInstance();
+			BeanUtils.copyProperties(source, target);
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+
+		return target;
+	}
+
+	/**
+	 * 将对象属性拷贝到目标类型的同名属性字段中
+	 * @param source
+	 * @param target
+	 * @return
+	 */
+	public static <T> T copyProperties(Object source, T target) {
+		BeanUtils.copyProperties(source, target);
+		return target;
+	}
+
+
+	/**
+	 * 将list的对象拷贝到目标类型对象中
+	 * @param list
+	 * @param clazz
+	 * @return
+	 */
+	public static <V, E> List<E> copy(Collection<V> list, Class<E> clazz) {
+		List<E> result = new ArrayList<>(12);
+
+		if (!CollectionUtils.isEmpty(list)) {
+			for (V source : list) {
+				E target = null;
+				try {
+					target = (E) clazz.newInstance();
+					BeanUtils.copyProperties(source, target);
+				} catch (Exception e) {
+					throw new RuntimeException(e);
+				}
+
+				result.add(target);
+			}
+		}
+
+		return result;
+	}
+
+}
+
+
diff --git a/src/main/java/org/springblade/modules/ownerFeed/controller/OwnerController.java b/src/main/java/org/springblade/modules/ownerFeed/controller/OwnerController.java
index 6a153c3..185b397 100644
--- a/src/main/java/org/springblade/modules/ownerFeed/controller/OwnerController.java
+++ b/src/main/java/org/springblade/modules/ownerFeed/controller/OwnerController.java
@@ -7,20 +7,25 @@
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
+import org.springblade.common.utils.BeanCopyUtils;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tenant.annotation.TenantDS;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.modules.ownerFeed.entity.Owner;
 import org.springblade.modules.ownerFeed.service.IOwnerService;
 import org.springblade.modules.ownerFeed.vo.OwnerVO;
 import org.springblade.modules.ownerFeed.wrapper.OwnerWrapper;
+import org.springblade.modules.system.service.MyAsyncService;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
+import java.text.SimpleDateFormat;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * 控制器
@@ -34,6 +39,8 @@
 public class OwnerController extends BladeController {
 
 	private final IOwnerService ownerService;
+
+	private final MyAsyncService myAsyncService;
 
 	/**
 	 * 详情
@@ -103,7 +110,66 @@
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入owner")
 	public R submit(@RequestBody Owner owner) {
-		return R.status(ownerService.saveOrUpdate(owner));
+		boolean status = false;
+		//敏感数据处理
+		Owner owner1 = Objects.requireNonNull(BeanCopyUtils.copyProperties(owner, Owner.class));
+		if (null!=owner1.getCompanyContact() && !owner1.getCompanyContact().equals("")){
+			owner1.setCompanyContact("***");
+		}
+		if (null!=owner1.getCompany() && !owner1.getCompany().equals("")){
+			owner1.setCompany("***");
+		}
+		if (null!=owner1.getFeedbackTime()){
+			owner1.setFeedbackTime(null);
+		}
+		if (null!=owner1.getOpinion() && !owner1.getOpinion().equals("")){
+			owner1.setOpinion("***");
+		}
+		if (null!=owner1.getOwner() && !owner1.getOwner().equals("")){
+			owner1.setOwner("***");
+		}
+		if (null!=owner1.getOwnerContact() && !owner1.getOwnerContact().equals("")){
+			owner1.setOwnerContact("***");
+		}
+		if (null!=owner1.getRemarks() && !owner1.getRemarks().equals("")){
+			owner1.setRemarks("***");
+		}
+		if (null!=owner1.getResult() && !owner1.getResult().equals("")){
+			owner1.setResult("***");
+		}
+		if (null!= owner.getId()){
+			status = ownerService.updateById(owner1);
+			if (status){
+				String s1 = "update owner_feedback set company = " + "'" + owner.getCompany() + "'" +
+					",company_contact = " + "'" + owner.getCompanyContact() + "'" +
+					",feedback_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(owner.getFeedbackTime()) + "'" +
+					",opinion = " + "'" + owner.getOpinion() + "'" +
+					",owner = " + "'" + owner.getOwner() + "'" +
+					",owner_contact = " + "'" + owner.getOwnerContact() + "'" +
+					",remarks = " + "'" + owner.getRemarks() + "'" +
+					",result = " + "'" + owner.getResult() + "'" +
+					" " + "where id = " + "'" + owner.getId() + "'";
+				myAsyncService.FTP(s1);
+			}
+		}else {
+			status = ownerService.save(owner1);
+			if (status){
+				//数据同步
+				String s1 =
+					"insert into owner_feedback(id,company,company_contact,feedback_time,opinion,owner,owner_contact,remarks,result) " +
+						"values(" + "'" + owner1.getId() + "'" +
+						"," + "'" + owner.getCompany() + "'" +
+						"," + "'" + owner.getCompanyContact() + "'" +
+						"," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(owner.getFeedbackTime()) + "'" +
+						"," + "'" + owner.getOpinion() + "'" +
+						"," + "'" + owner.getOwner() + "'" +
+						"," + "'" + owner.getOwnerContact() + "'" +
+						"," + "'" + owner.getRemarks() + "'" +
+						"," + "'" + owner.getResult() + "'" + ")";
+				myAsyncService.FTP(s1);
+			}
+		}
+		return R.status(status);
 	}
 
 	/**
diff --git a/src/main/java/org/springblade/modules/ownerFeed/entity/Owner.java b/src/main/java/org/springblade/modules/ownerFeed/entity/Owner.java
index e0beac5..8ab7b4b 100644
--- a/src/main/java/org/springblade/modules/ownerFeed/entity/Owner.java
+++ b/src/main/java/org/springblade/modules/ownerFeed/entity/Owner.java
@@ -20,11 +20,14 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 实体类
@@ -62,7 +65,9 @@
 	 */
 	@ApiModelProperty(value = "反馈时间")
 	@TableField("feedback_time")
-	private String feedbackTime;
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date feedbackTime;
 
 	/**
 	 * 反馈意见
diff --git a/src/main/java/org/springblade/modules/permit/controller/PermitController.java b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
index 75c7343..065ff0c 100644
--- a/src/main/java/org/springblade/modules/permit/controller/PermitController.java
+++ b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
@@ -40,6 +40,8 @@
 import org.springblade.common.cache.ParamCache;
 import org.springblade.common.config.FtpConfig;
 import org.springblade.common.enums.DictEnum;
+import org.springblade.common.utils.BeanCopyUtils;
+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;
@@ -48,12 +50,14 @@
 import org.springblade.core.secure.utils.AuthUtil;
 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.FTP.OutJson;
 import org.springblade.modules.information.entity.Information;
 import org.springblade.modules.information.service.IInformationService;
+import org.springblade.modules.ownerFeed.entity.Owner;
 import org.springblade.modules.permit.dto.PermitDTO;
 import org.springblade.modules.permit.dto.PermitRecordDTO;
 import org.springblade.modules.permit.entity.Permit;
@@ -77,10 +81,7 @@
 import java.net.URI;
 import java.net.URL;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import static org.springblade.common.constant.CommonConstant.DEFAULT_PARAM_PASSWORD;
 import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
@@ -169,13 +170,27 @@
 		permit.setType("2");
 		permit.setStorage("1");
 		permit.setPermitime(new Date());
-		permitService.save(permit);
+
+		//脱敏处理
+		Permit permit1 = Objects.requireNonNull(BeanUtil.copy(permit, Permit.class));
+		//敏感数据处理
+		if (null!=permit1.getRepresentativecell() && !permit1.getRepresentativecell().equals("")) {
+			permit1.setRepresentativecell(DesensitizedUtil.desensitizedPhoneNumber(permit1.getRepresentativecell()));
+		}
+		if (null!=permit1.getContacts() && !permit1.getContacts().equals("")) {
+			permit1.setContacts(DesensitizedUtil.desensitizedName(permit1.getContacts()));
+		}
+		if (null!=permit1.getContactscell() && !permit1.getContactscell().equals("")) {
+			permit1.setContactscell(DesensitizedUtil.desensitizedPhoneNumber(permit1.getContactscell()));
+		}
+
+		permitService.save(permit1);
 		//String pertime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(permit.getPermitime());
 		String overtime = new SimpleDateFormat("yyyy-MM-dd").format(permit.getOvertime());
 		String s = "insert into sys_permit(id,creditCode,enterpriseName,representative," +
 			"registeredCapital,organizationCode,registrationNumber,identificationNumber,enterprises," +
 			"address,business,region,registration,industry,type,deptid,ptype,representativecell,contacts,contactscell,jurisdiction,cardid,overtime)" +
-			"values(" + "'" + permit.getId() + "'" + "," + "'" + permit.getCreditcode() + "'" + "," + "'" + permit.getEnterprisename() + "'" + "," + "'"
+			"values(" + "'" + permit1.getId() + "'" + "," + "'" + permit.getCreditcode() + "'" + "," + "'" + permit.getEnterprisename() + "'" + "," + "'"
 			+ permit.getRepresentative() + "'" + "," + "'" + permit.getRegisteredcapital() + "'" + "," + "'"
 			+ permit.getOrganizationcode() + "'" + "," + "'" + permit.getRegistrationnumber() + "'" + "," +
 			"'" + permit.getIdentificationnumber() + "'" + "," + "'" + permit.getEnterprises() + "'" + "," + "'" +
@@ -206,14 +221,27 @@
 		permit.setType("2");
 		permit.setStorage("1");
 		permit.setPermitime(new Date());
-		boolean save = permitService.save(permit);
+
+		//脱敏处理
+		Permit permit1 = Objects.requireNonNull(BeanUtil.copy(permit, Permit.class));
+		//敏感数据处理
+		if (null!=permit1.getRepresentativecell() && !permit1.getRepresentativecell().equals("")) {
+			permit1.setRepresentativecell(DesensitizedUtil.desensitizedPhoneNumber(permit1.getRepresentativecell()));
+		}
+		if (null!=permit1.getContacts() && !permit1.getContacts().equals("")) {
+			permit1.setContacts(DesensitizedUtil.desensitizedName(permit1.getContacts()));
+		}
+		if (null!=permit1.getContactscell() && !permit1.getContactscell().equals("")) {
+			permit1.setContactscell(DesensitizedUtil.desensitizedPhoneNumber(permit1.getContactscell()));
+		}
+		boolean save = permitService.save(permit1);
 		//String pertime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(permit.getPermitime());
 		String overtime = new SimpleDateFormat("yyyy-MM-dd").format(permit.getOvertime());
 		if (save) {
 			String s = "insert into sys_permit(id,creditCode,enterpriseName,representative," +
 				"registeredCapital,organizationCode,registrationNumber,identificationNumber,enterprises," +
 				"address,business,region,registration,industry,type,deptid,ptype,representativecell,contacts,contactscell,jurisdiction,cardid,overtime)" +
-				"values(" + "'" + permit.getId() + "'" + "," + "'" + permit.getCreditcode() + "'" + "," + "'" + permit.getEnterprisename() + "'" + "," + "'"
+				"values(" + "'" + permit1.getId() + "'" + "," + "'" + permit.getCreditcode() + "'" + "," + "'" + permit.getEnterprisename() + "'" + "," + "'"
 				+ permit.getRepresentative() + "'" + "," + "'" + permit.getRegisteredcapital() + "'" + "," + "'"
 				+ permit.getOrganizationcode() + "'" + "," + "'" + permit.getRegistrationnumber() + "'" + "," +
 				"'" + permit.getIdentificationnumber() + "'" + "," + "'" + permit.getEnterprises() + "'" + "," + "'" +
@@ -313,7 +341,20 @@
 				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();
@@ -335,7 +376,7 @@
 					",registeredCapital,organizationCode,registrationNumber, enterprises, address," +
 					" business,region,registration,industry,departmentid,stats,jurisdiction,representativecell," +
 					"contacts,contactscell,create_user_id) " +
-					"values(" + "'" + information.getId() + "'" +
+					"values(" + "'" + information1.getId() + "'" +
 					"," + "'" + information.getCreditcode() + "'" +
 					"," + "'" + information.getEnterprisename() + "'" +
 					"," + "'" + information.getRepresentative() + "'" +
diff --git a/src/main/java/org/springblade/modules/permit/entity/Permit.java b/src/main/java/org/springblade/modules/permit/entity/Permit.java
index fdf5647..12f6af9 100644
--- a/src/main/java/org/springblade/modules/permit/entity/Permit.java
+++ b/src/main/java/org/springblade/modules/permit/entity/Permit.java
@@ -32,7 +32,7 @@
 
 /**
  * 实体类
- *
+ * 许可申请表
  * @author BladeX
  * @since 2021-07-12
  */
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 479004c..ca7cc3f 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;
@@ -55,6 +58,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 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;
@@ -148,11 +152,24 @@
 		record.setStorage("1");
 		record.setType("2");
 		record.setPermitime(new Date());
-		boolean save = recordService.save(record);
+
+		//脱敏处理
+		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(" + "'" + record.getId() + "'" + "," +
+				"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() + "'" +
@@ -183,6 +200,7 @@
 			record.setStorage("0");
 			record.setType("2");
 			record.setPermitime(new Date());
+
 			recordService.save(record);
 		}
 		return R.success("暂存成功");
@@ -239,7 +257,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();
@@ -261,7 +291,7 @@
 					",registeredCapital,organizationCode,registrationNumber, enterprises, address," +
 					" business,region,registration,industry,departmentid,stats,jurisdiction,representativecell," +
 					"contacts,contactscell,create_user_id) " +
-					"values(" + "'" + information.getId() + "'" +
+					"values(" + "'" + information1.getId() + "'" +
 					"," + "'" + information.getCreditcode() + "'" +
 					"," + "'" + information.getEnterprisename() + "'" +
 					"," + "'" + information.getRepresentative() + "'" +
diff --git a/src/main/java/org/springblade/modules/record/entity/Record.java b/src/main/java/org/springblade/modules/record/entity/Record.java
index 02cd6e1..df8095c 100644
--- a/src/main/java/org/springblade/modules/record/entity/Record.java
+++ b/src/main/java/org/springblade/modules/record/entity/Record.java
@@ -31,7 +31,7 @@
 
 /**
  * 实体类
- *
+ * 备案表
  * @author BladeX
  * @since 2021-07-12
  */
diff --git a/src/main/java/org/springblade/modules/recordLegalperson/controller/RecordLegalpersonController.java b/src/main/java/org/springblade/modules/recordLegalperson/controller/RecordLegalpersonController.java
index f5d3869..4f6a993 100644
--- a/src/main/java/org/springblade/modules/recordLegalperson/controller/RecordLegalpersonController.java
+++ b/src/main/java/org/springblade/modules/recordLegalperson/controller/RecordLegalpersonController.java
@@ -26,6 +26,7 @@
 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.log.exception.ServiceException;
@@ -33,15 +34,18 @@
 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.record.entity.Record;
 import org.springblade.modules.recordLegalperson.dto.RecordLegalpersonDTO;
 import org.springblade.modules.recordLegalperson.entity.RecordLegalperson;
 import org.springblade.modules.recordLegalperson.service.IRecordLegalpersonService;
 import org.springblade.modules.recordLegalperson.vo.RecordLegalpersonVO;
+import org.springblade.modules.recordk.entity.Recordk;
 import org.springblade.modules.resource.service.IAttachService;
 import org.springblade.modules.system.entity.Dept;
 import org.springblade.modules.system.entity.User;
@@ -55,6 +59,7 @@
 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;
@@ -148,7 +153,21 @@
 		record.setStorage("1");
 		record.setType("2");
 		record.setPermitime(new Date());
-		recordService.save(record);
+
+		//脱敏处理
+		RecordLegalperson record1 = Objects.requireNonNull(BeanUtil.copy(record, RecordLegalperson.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()));
+		}
+
+		recordService.save(record1);
 		//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," +
@@ -157,7 +176,7 @@
 			"changecontacts," +
 			"changecontactscell" +
 			")" +
-			"values(" + "'" + record.getId() + "'" + "," +
+			"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() + "'" +
diff --git a/src/main/java/org/springblade/modules/recordLegalperson/entity/RecordLegalperson.java b/src/main/java/org/springblade/modules/recordLegalperson/entity/RecordLegalperson.java
index 0077cf0..befee74 100644
--- a/src/main/java/org/springblade/modules/recordLegalperson/entity/RecordLegalperson.java
+++ b/src/main/java/org/springblade/modules/recordLegalperson/entity/RecordLegalperson.java
@@ -31,7 +31,7 @@
 
 /**
  * 实体类
- *
+ * 法人变更表
  * @author BladeX
  * @since 2021-07-12
  */
diff --git a/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java b/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
index bceeccb..7ca4598 100644
--- a/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
+++ b/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
@@ -22,16 +22,19 @@
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
+import org.springblade.common.utils.DesensitizedUtil;
 import org.springblade.core.boot.ctrl.BladeController;
 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.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.modules.FTP.FtpUtil;
 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;
 import org.springblade.modules.recordk.dto.RecordkDTO;
 import org.springblade.modules.recordk.entity.Recordk;
 import org.springblade.modules.recordk.service.IRecordkService;
@@ -43,6 +46,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * 控制器
@@ -112,7 +116,20 @@
 		recordk.setStorage("1");
 		recordk.setType("2");
 		recordk.setPermitime(new Date());
-		recordkService.save(recordk);
+
+		//脱敏处理
+		Recordk recordk1 = Objects.requireNonNull(BeanUtil.copy(recordk, Recordk.class));
+		//敏感数据处理
+		if (null!=recordk1.getRepresentativecell() && !recordk1.getRepresentativecell().equals("")) {
+			recordk1.setRepresentativecell(DesensitizedUtil.desensitizedPhoneNumber(recordk1.getRepresentativecell()));
+		}
+		if (null!=recordk1.getContacts() && !recordk1.getContacts().equals("")) {
+			recordk1.setContacts(DesensitizedUtil.desensitizedName(recordk1.getContacts()));
+		}
+		if (null!=recordk1.getContactscell() && !recordk1.getContactscell().equals("")) {
+			recordk1.setContactscell(DesensitizedUtil.desensitizedPhoneNumber(recordk1.getContactscell()));
+		}
+		recordkService.save(recordk1);
 		String s = "insert into sys_recordk(id,creditCode,enterpriseName,representative," +
 			"address,business,region,registration,industry,type,deptid,ptype,representativecell,contacts,contactscell,cardid,overtime," +
 			"jurisdiction," +
@@ -122,7 +139,7 @@
 			"kservicetime," +
 			"kaddress" +
 			")" +
-			"values(" + "'" + recordk.getId() + "'" + "," + "'" +
+			"values(" + "'" + recordk1.getId() + "'" + "," + "'" +
 			recordk.getCreditcode() + "'" + "," + "'" + recordk.getEnterprisename() + "'" + "," + "'"
 			+ recordk.getRepresentative() + "'" + "," + "'" +
 			recordk.getAddress() + "'" + "," + "'" + recordk.getBusiness() + "'" + "," + "'" +
diff --git a/src/main/java/org/springblade/modules/recordk/entity/Recordk.java b/src/main/java/org/springblade/modules/recordk/entity/Recordk.java
index b32281c..c967a22 100644
--- a/src/main/java/org/springblade/modules/recordk/entity/Recordk.java
+++ b/src/main/java/org/springblade/modules/recordk/entity/Recordk.java
@@ -31,7 +31,7 @@
 
 /**
  * 实体类
- *
+ * 跨区域经营备案
  * @author BladeX
  * @since 2021-07-12
  */
diff --git a/src/main/java/org/springblade/modules/talk/controller/TalkController.java b/src/main/java/org/springblade/modules/talk/controller/TalkController.java
index 5b0e6fb..55b7041 100644
--- a/src/main/java/org/springblade/modules/talk/controller/TalkController.java
+++ b/src/main/java/org/springblade/modules/talk/controller/TalkController.java
@@ -25,12 +25,15 @@
 import javax.validation.Valid;
 
 import org.springblade.common.config.FtpConfig;
+import org.springblade.common.utils.DesensitizedUtil;
 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.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.modules.FTP.FtpUtil;
 import org.springblade.modules.information.entity.Information;
+import org.springblade.modules.recordLegalperson.entity.RecordLegalperson;
 import org.springblade.modules.system.service.MyAsyncService;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -43,6 +46,7 @@
 import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * 控制器
@@ -99,7 +103,22 @@
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入talk")
 	public R save(@Valid @RequestBody Talk talk) {
-		boolean save = talkService.save(talk);
+		//脱敏处理
+		Talk talk1 = Objects.requireNonNull(BeanUtil.copy(talk, Talk.class));
+		talk1.setTitle("***");
+		talk1.setRealName(DesensitizedUtil.desensitizedName(talk1.getRealName()));
+		if(null!= talk1.getTalkcontent() && !talk1.getTalkcontent().equals("")){
+			talk1.setTalkcontent("***");
+		}
+		if(null!= talk1.getEvaluate() && !talk1.getEvaluate().equals("")){
+			talk1.setEvaluate("***");
+		}
+		if(null!= talk1.getConclusion() && !talk1.getConclusion().equals("")){
+			talk1.setConclusion("***");
+		}
+		talk1.setImgurl(null);
+
+		boolean save = talkService.save(talk1);
 		String url = "";
 		String[] split = talk.getImgurl().split(",");
 		for (int i = 0; i < split.length; i++) {
@@ -112,7 +131,7 @@
 			//数据同步
 			String s1 =
 				"insert into sys_talk(id,title,real_name,talkcontent,talktime,conclusion,evaluate,deptid,imgurl) " +
-					"values(" + "'" + talk.getId() + "'" + "," +
+					"values(" + "'" + talk1.getId() + "'" + "," +
 					"'" + talk.getTitle() + "'" + "," +
 					"'" + talk.getRealName() + "'" + "," +
 					"'" + talk.getTalkcontent() + "'" + "," +
@@ -134,7 +153,22 @@
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入talk")
 	public R update(@Valid @RequestBody Talk talk) {
-		boolean b = talkService.updateById(talk);
+		//脱敏处理
+		Talk talk1 = Objects.requireNonNull(BeanUtil.copy(talk, Talk.class));
+		talk1.setTitle("***");
+		talk1.setRealName(DesensitizedUtil.desensitizedName(talk1.getRealName()));
+		if(null!= talk1.getTalkcontent() && !talk1.getTalkcontent().equals("")){
+			talk1.setTalkcontent("***");
+		}
+		if(null!= talk1.getEvaluate() && !talk1.getEvaluate().equals("")){
+			talk1.setEvaluate("***");
+		}
+		if(null!= talk1.getConclusion() && !talk1.getConclusion().equals("")){
+			talk1.setConclusion("***");
+		}
+		talk1.setImgurl(null);
+
+		boolean b = talkService.updateById(talk1);
 		String url = "";
 		String[] split = talk.getImgurl().split(",");
 		for (int i = 0; i < split.length; i++) {

--
Gitblit v1.9.3