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/dispatcher/controller/DispatcherUnitController.java | 124 +++++++++++++++++++++++++++++-----------
1 files changed, 89 insertions(+), 35 deletions(-)
diff --git a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java
index 38d4041..0eb1e35 100644
--- a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java
+++ b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java
@@ -22,12 +22,14 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
+import org.springblade.common.utils.DesensitizedUtil;
import org.springblade.common.utils.arg;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
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.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.FTP.FtpUtil;
@@ -41,6 +43,8 @@
import org.springblade.modules.dispatcher.vo.DispatcherVO;
import org.springblade.modules.exam.excel.ExamScoreExcel;
import org.springblade.modules.exam.excel.ExamScoreImporter;
+import org.springblade.modules.securitypaper.entity.SecurityPaper;
+import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -51,9 +55,10 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
- * 控制器
+ * 控制器
*
* @author zhongrj
* @since 2021-07-07
@@ -65,6 +70,8 @@
public class DispatcherUnitController extends BladeController {
private final IDispatcherUnitService dispatcherUnitService;
+ private final IDispatcherService dispatcherService;
+ private final MyAsyncService myAsyncService;
/**
* 详情
@@ -97,6 +104,7 @@
/**
* 自定义树
+ *
* @param dispatcher
* @return
*/
@@ -126,41 +134,78 @@
* 新增或修改
*/
@PostMapping("/submit")
- public R submit(@Valid @RequestBody DispatcherUnit dispatcherUnit){
+ public R submit(@Valid @RequestBody DispatcherUnit dispatcherUnit) {
boolean status = false;
- if (null==dispatcherUnit.getId()) {
+ //内网
+ DispatcherUnit dispatcherUnit1 = Objects.requireNonNull(BeanUtil.copy(dispatcherUnit, DispatcherUnit.class));
+ //脱敏处理
+ if (null!=dispatcherUnit.getLinkman()) {
+ dispatcherUnit1.setLinkman(DesensitizedUtil.desensitizedName(dispatcherUnit.getLinkman()));
+ }
+ if (null!=dispatcherUnit.getPhone()) {
+ dispatcherUnit1.setPhone(DesensitizedUtil.desensitizedPhoneNumber(dispatcherUnit.getPhone()));
+ }
+ dispatcherUnit1.setSecurityLinkman(DesensitizedUtil.desensitizedName(dispatcherUnit.getSecurityLinkman()));
+ dispatcherUnit1.setCell(DesensitizedUtil.desensitizedPhoneNumber(dispatcherUnit.getCell()));
+ if (null == dispatcherUnit.getId()) {
dispatcherUnit.setCreateTime(new Date());
//新增
- status = dispatcherUnitService.save(dispatcherUnit);
-
- //数据同步
- String s1 =
- "insert into sys_dispatcher_unit(id,name,dept_id,linkman,phone,jurisdiction,start_time,end_time,serve_type) " +
- "values(" + "'" + dispatcherUnit.getId() + "'" + "," +
- "'" + dispatcherUnit.getName() + "'" + "," +
- "'" + dispatcherUnit.getDeptId() + "'" + "," +
- "'" + dispatcherUnit.getLinkman() + "'" + "," +
- "'" + dispatcherUnit.getPhone() + "'" + "," +
- "'" + dispatcherUnit.getJurisdiction() + "'" + "," +
- "'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcherUnit.getStartTime()) + "'" + "," +
- "'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcherUnit.getEndTime()) + "'" + "," +
- "'" +dispatcherUnit.getServeType() + "'" + ")";
- FtpUtil.sqlFileUpload(s1);
- }else {
+ status = dispatcherUnitService.save(dispatcherUnit1);
+ if (status) {
+ //数据同步
+ String s1 =
+ "insert into sys_dispatcher_unit(id,name,dept_id,linkman,phone,jurisdiction,create_time,start_time,end_time," +
+ "serve_type,security_linkman,cell,num) " +
+ "values(" + "'" + dispatcherUnit1.getId() + "'" + "," +
+ "'" + dispatcherUnit.getName() + "'" + "," +
+ "'" + dispatcherUnit.getDeptId() + "'" + "," +
+ "'" + dispatcherUnit.getLinkman() + "'" + "," +
+ "'" + dispatcherUnit.getPhone() + "'" + "," +
+ "'" + dispatcherUnit.getJurisdiction() + "'" + "," +
+ "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(dispatcherUnit.getCreateTime()) + "'" + "," +
+ "'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcherUnit.getStartTime()) + "'" + "," +
+ "'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcherUnit.getEndTime()) + "'" + "," +
+ "'" + dispatcherUnit.getServeType() + "'" + "," +
+ "'" + dispatcherUnit.getSecurityLinkman() + "'" + "," +
+ "'" + dispatcherUnit.getCell() + "'" + "," +
+ "'" + dispatcherUnit.getNum() + "'" + ")";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
+ }
+ } else {
//修改
- status = dispatcherUnitService.updateById(dispatcherUnit);
- //内网同步
- String s1 =
+ status = dispatcherUnitService.updateById(dispatcherUnit1);
+ //派遣记录修改合同时间
+
+ Long id = dispatcherUnit.getId();
+ String ids = String.valueOf(id);
+ Date date = dispatcherUnit.getEndTime();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ String endTime = sdf.format(date);
+ dispatcherService.updateEndtime(endTime, ids);
+ if (status) {
+ //内网同步
+ String s1 =
"update sys_dispatcher_unit set name = " + "'" + dispatcherUnit.getName() + "'" +
- ",dept_id = " + "'" + dispatcherUnit.getDeptId() + "'" +
- ",linkman = " + "'" + dispatcherUnit.getLinkman() + "'" +
- ",phone = " + "'" + dispatcherUnit.getPhone() + "'" +
- ",jurisdiction = " + "'" + dispatcherUnit.getJurisdiction() + "'" +
- ",start_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcherUnit.getStartTime()) + "'" +
- ",end_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcherUnit.getEndTime()) + "'" +
- ",serve_type = " + "'" + dispatcherUnit.getServeType() + "'" +
- " " +"where id = " + "'" + dispatcherUnit.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ ",dept_id = " + "'" + dispatcherUnit.getDeptId() + "'" +
+ ",linkman = " + "'" + dispatcherUnit.getLinkman() + "'" +
+ ",phone = " + "'" + dispatcherUnit.getPhone() + "'" +
+ ",jurisdiction = " + "'" + dispatcherUnit.getJurisdiction() + "'" +
+ ",start_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcherUnit.getStartTime()) + "'" +
+ ",end_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcherUnit.getEndTime()) + "'" +
+ ",serve_type = " + "'" + dispatcherUnit.getServeType() + "'" +
+ ",security_linkman = " + "'" + dispatcherUnit.getSecurityLinkman() + "'" +
+ ",cell = " + "'" + dispatcherUnit.getCell() + "'" +
+ ",num = " + "'" + dispatcherUnit.getNum() + "'" +
+ " " + "where id = " + "'" + dispatcherUnit.getId() + "'";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
+ //内网同步派遣记录修改合同时间
+ String s2 =
+ "update sys_dispatcher set end_time = " + "'" + endTime + "'" + " " + "where dispatcher_unit_id = " + "'" + ids + "'";
+ //FtpUtil.sqlFileUpload(s2);
+ myAsyncService.FTP(s2);
+ }
}
return R.status(status);
}
@@ -171,19 +216,20 @@
*/
@PostMapping("/remove")
@ApiOperation(value = "删除", notes = "传入ids")
- public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids){
+ public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
//内网删除
List<Long> list = Func.toLongList(ids);
- list.forEach(id ->{
+ list.forEach(id -> {
//内网同步
String s1 = "delete from sys_dispatcher_unit where id = " + "'" + id + "'";
- FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
});
return R.status(dispatcherUnitService.removeByIds(Func.toLongList(ids)));
}
/**
* 导入派遣单位数据
+ *
* @param isCovered 1 覆盖 0不覆盖
* @return
*/
@@ -208,6 +254,10 @@
unitExcel.setPhone("13112341234");
unitExcel.setStartTime(new SimpleDateFormat("yyyy/MM/dd").parse("2020/5/1"));
unitExcel.setEndTime(new SimpleDateFormat("yyyy/MM/dd").parse("2021/5/1"));
+ unitExcel.setServeType("***");
+ unitExcel.setSecurityLinkman("王老五");
+ unitExcel.setCell("13112341234");
+ unitExcel.setNum(10);
list.add(unitExcel);
DispatcherUnitExcel unitExcel1 = new DispatcherUnitExcel();
@@ -217,9 +267,13 @@
unitExcel1.setPhone("13112341234");
unitExcel1.setStartTime(new SimpleDateFormat("yyyy/MM/dd").parse("2020/10/10"));
unitExcel1.setEndTime(new SimpleDateFormat("yyyy/MM/dd").parse("2021/10/10"));
+ unitExcel1.setServeType("***");
+ unitExcel1.setSecurityLinkman("钱小七");
+ unitExcel1.setCell("13112341234");
+ unitExcel1.setNum(100);
list.add(unitExcel1);
- ExcelUtil.export(response, "派遣单位数据导入模板"+ DateUtil.time(), "派遣单位数据表", list, DispatcherUnitExcel.class);
+ ExcelUtil.export(response, "派遣单位数据导入模板" + DateUtil.time(), "派遣单位数据表", list, DispatcherUnitExcel.class);
}
--
Gitblit v1.9.3