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/recordk/controller/RecordkController.java |   50 +++++++++++++++++++++++++++++++-------------------
 1 files changed, 31 insertions(+), 19 deletions(-)

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 7b6fe16..a0b6657 100644
--- a/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
+++ b/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
@@ -22,26 +22,32 @@
 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;
 import org.springblade.modules.recordk.vo.RecordkVO;
+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;
 
 /**
  * 控制器
@@ -57,6 +63,7 @@
 
 	private final IRecordkService recordkService;
 	private final IInformationService informationService;
+	private final MyAsyncService myAsyncService;
 
 	/**
 	 * 详情
@@ -90,20 +97,6 @@
 	public R<IPage<RecordkVO>> page(RecordkVO recordk, Query query) {
 		IPage<RecordkVO> pages;
 		pages = recordkService.selectRecordkPage(Condition.getPage(query), recordk, recordk.getJurisdiction());
-//		if (recordk.getUsetype().equals("0")) {
-//			pages = recordkService.selectRecordkPage(Condition.getPage(query), recordk,null);
-//		} else if (recordk.getUsetype().equals("1")) {
-//			String childer = informationService.selJurchilder(recordk.getJurisdiction());
-//			String[] split = childer.split(",");
-//			String strArrays = "";
-//			for (int j = 0; j < split.length; j++) {
-//				strArrays += "'" + split[j] + "',";
-//			}
-//			String jurisdiction = strArrays.substring(0, strArrays.length() - 1);
-//			pages = recordkService.selectRecordkPage(Condition.getPage(query), recordk,jurisdiction);
-//		} else {
-//			pages = recordkService.selectRecordkPage(Condition.getPage(query), recordk,null);
-//		}
 		return R.data(pages);
 	}
 
@@ -124,9 +117,20 @@
 		recordk.setStorage("1");
 		recordk.setType("2");
 		recordk.setPermitime(new Date());
-		recordkService.save(recordk);
-		//String offtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(recordk.getOfficetime());
-		//String pertime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(recordk.getPermitime());
+
+		//脱敏处理
+		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," +
@@ -136,7 +140,7 @@
 			"kservicetime," +
 			"kaddress" +
 			")" +
-			"values(" + "'" + recordk.getId() + "'" + "," + "'" +
+			"values(" + "'" + recordk1.getId() + "'" + "," + "'" +
 			recordk.getCreditcode() + "'" + "," + "'" + recordk.getEnterprisename() + "'" + "," + "'"
 			+ recordk.getRepresentative() + "'" + "," + "'" +
 			recordk.getAddress() + "'" + "," + "'" + recordk.getBusiness() + "'" + "," + "'" +
@@ -195,7 +199,8 @@
 		boolean b = recordkService.updateById(recordk);
 		String s1 = "update sys_recordk set type = " + "'" + 0 + "'" + ",approve = " + "'" + recordk.getApprove() + "'" +
 			" " + "where id = " + "'" + recordk.getId() + "'";
-		FtpUtil.sqlFileUpload(s1);
+		//FtpUtil.sqlFileUpload(s1);
+		myAsyncService.FTP(s1);
 		return R.status(b);
 	}
 
@@ -217,6 +222,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_recordk where id = " + "'" + id + "'";
+			myAsyncService.FTP(s1);
+		});
 		return R.status(recordkService.removeByIds(Func.toLongList(ids)));
 	}
 

--
Gitblit v1.9.3