From c9424db1c23fcddd6f4eabdb5e3ef51d2c208613 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 24 Aug 2021 16:09:49 +0800
Subject: [PATCH] 派遣记录，单位数据内网推送
---
src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java | 31 ++++++++++++++-
src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java | 12 ++++++
src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java | 47 ++++++++++++++++++++++-
src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java | 3 +
src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java | 4 +-
src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml | 2
6 files changed, 89 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
index 17cfc7c..35d5456 100644
--- a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
+++ b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
@@ -129,17 +129,30 @@
//List<String> list = Arrays.asList(dispatcher.getUserIds().split(","));
//计算派遣人数
//dispatcher.setNum(list.size());
+ boolean status = false;
if (dispatcher.getId()==null){
User user = new User();
user.setId(Long.parseLong(dispatcher.getUserIds()));
user.setDispatch("0");
userService.updateById(user);
+
+ //新增派遣记录
+ status = dispatcherService.save(dispatcher);
+
+ //数据同步
String s1 =
+ "insert into sys_dispatcher(id,dispatcherTime,dispatcher_unit_id,user_ids,end_time,dept_id,jurisdiction) " +
+ "values(" + "'" + dispatcher.getId() + "'" + "," +
+ "'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcher.getDispatchertime()) + "'" + "," +
+ "'" + dispatcher.getDispatcherUnitId() + "'" + "," +
+ "'" + dispatcher.getUserIds() + "'" + "," +
+ "'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcher.getEndTime()) + "'" + "," +
+ "'" + dispatcher.getDeptId() + "'" + "," +
+ "'" +dispatcher.getJurisdiction() + "'" + ");" +
"update blade_user set dispatch = " + "'" + user.getDispatch() + "'" +
" " +"where id = " + "'" + user.getId() + "'";
FtpUtil.sqlFileUpload(s1);
- }
- else {
+ }else {
//查询当前派遣记录
Dispatcher dispatcher1 = dispatcherService.getById(dispatcher.getId());
if (!dispatcher1.getUserIds().equals(dispatcher.getUserIds())){
@@ -155,15 +168,27 @@
user1.setDispatch("0");
userService.updateById(user1);
+ //修改
+ status = dispatcherService.updateById(dispatcher);
+
+ //内网同步
String s1 =
"update blade_user set dispatch = " + "'" + user.getDispatch() + "'" +
+ " " +"where id = " + "'" + user.getId() + "';"+
+ "update sys_dispatcher set dispatcherTime = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcher.getDispatchertime()) + "'" +
+ ",dispatcher_unit_id = " + "'" + dispatcher.getDispatcherUnitId() + "'" +
+ ",user_ids = " + "'" + dispatcher.getUserIds() + "'" +
+ ",end_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcher.getEndTime()) + "'" +
+ ",dept_id = " + "'" + dispatcher.getDeptId() + "'" +
+ ",jurisdiction = " + "'" + dispatcher.getJurisdiction() + "'" +
" " +"where id = " + "'" + user.getId() + "';"+
"update blade_user set dispatch = " + "'" + user1.getDispatch() + "'" +
" " +"where id = " + "'" + user1.getId() + "'";
FtpUtil.sqlFileUpload(s1);
}
+
}
- return R.status(dispatcherService.saveOrUpdate(dispatcher));
+ return R.status(status);
}
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 1cbb51d..494d05e 100644
--- a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java
+++ b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java
@@ -29,6 +29,7 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.dispatcher.entity.Dispatcher;
import org.springblade.modules.dispatcher.entity.DispatcherUnit;
import org.springblade.modules.dispatcher.excel.DispatcherUnitExcel;
@@ -44,6 +45,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -122,11 +124,43 @@
* 新增或修改
*/
@PostMapping("/submit")
- public R submit(@Valid @RequestBody DispatcherUnit dispatcherUnit) throws Exception {
+ public R submit(@Valid @RequestBody DispatcherUnit dispatcherUnit){
+ boolean status = false;
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.updateById(dispatcherUnit);
+ //内网同步
+ 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);
}
- return R.status(dispatcherUnitService.saveOrUpdate(dispatcherUnit));
+ return R.status(status);
}
@@ -135,7 +169,14 @@
*/
@PostMapping("/remove")
@ApiOperation(value = "删除", notes = "传入ids")
- public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) throws Exception {
+ public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids){
+ //内网删除
+ List<Long> list = Func.toLongList(ids);
+ list.forEach(id ->{
+ //内网同步
+ String s1 = "delete from sys_dispatcher_unit where id = " + "'" + id + "'";
+ FtpUtil.sqlFileUpload(s1);
+ });
return R.status(dispatcherUnitService.removeByIds(Func.toLongList(ids)));
}
diff --git a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
index 22803cf..ddc31d2 100644
--- a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
+++ b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
@@ -15,7 +15,7 @@
<!--派遣记录分页数据-->
<select id="selectDispatcherPage" resultType="org.springblade.modules.dispatcher.vo.DispatcherVO">
select
- sd.*,bu.real_name securityName,sdu.name dispatcherCompany
+ sd.*,bu.real_name securityName,sdu.name dispatcherCompany,bu.cardid
from
sys_dispatcher sd
left join
diff --git a/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java b/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java
index 3c30b56..6695448 100644
--- a/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java
+++ b/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java
@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;
+import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.dispatcher.entity.Dispatcher;
import org.springblade.modules.dispatcher.entity.DispatcherUnit;
import org.springblade.modules.dispatcher.excel.DispatcherUnitExcel;
@@ -139,6 +140,17 @@
//新增
this.save(dispatcherUnit);
+ //数据同步
+ String s1 =
+ "insert into sys_dispatcher_unit(id,name,dept_id,linkman,phone,start_time,end_time) " +
+ "values(" + "'" + dispatcherUnit.getId() + "'" + "," +
+ "'" + dispatcherUnit.getName() + "'" + "," +
+ "'" + dispatcherUnit.getDeptId() + "'" + "," +
+ "'" + dispatcherUnit.getLinkman() + "'" + "," +
+ "'" + dispatcherUnit.getPhone() + "'" + "," +
+ "'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcherUnit.getStartTime()) + "'" + "," +
+ "'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcherUnit.getEndTime()) + "'" + ")";
+ FtpUtil.sqlFileUpload(s1);
});
}
}
diff --git a/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java b/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
index 7c86786..09a4532 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
@@ -104,7 +104,8 @@
boolean save = examPaperService.save(examPaper);
String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getStartTime());
String s = "insert into ksxt_exam(id,exam_name,exam_type,start_time) " +
- "values(" + "'" + examPaper.getId() + "'" + "," + "'" + examPaper.getExamName() + "'" + "," + "'" + examPaper.getExamType() +
+ "values(" + "'" + examPaper.getId() + "'" + "," + "'" + examPaper.getExamName() +
+ "'" + "," + "'" + examPaper.getExamType() +
"'" + "," +"'" + format + "'" + ")";
FtpUtil.sqlFileUpload(s);
return R.status(save);
diff --git a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
index 8d3baad..067fc26 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
@@ -81,8 +81,8 @@
Long sid = examScore.getId();
String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examScore.getExamTime());
String s = "insert into exam_score(id,exam_time) " +
- "values(" + "'" + sid + "'" + "," + "'" +
- format + "'" + "," + "'" + ")";
+ "values(" + "'" + sid + "'" +
+ "," + "'" +format + "'" + ")";
FtpUtil.sqlFileUpload(s);
//返回
return R.status(save);
--
Gitblit v1.9.3