From a144dec759ca53e72a6421596fda2e92b468084f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 02 Aug 2021 11:57:51 +0800
Subject: [PATCH] 数据操作同步监管后台
---
src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java | 2 +
src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java | 13 ++++--
src/main/java/org/springblade/modules/workreport/controller/WorkReportController.java | 6 --
src/main/java/org/springblade/modules/training/controller/TrainExamController.java | 1
src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java | 7 +++
src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java | 7 +++
src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java | 5 +-
src/main/java/org/springblade/modules/apply/controller/ApplyController.java | 2 +
src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java | 8 ++-
src/main/java/org/springblade/modules/directive/controller/DirectiveController.java | 11 ++++-
10 files changed, 45 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
index fbff242..12aad1c 100644
--- a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
+++ b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
@@ -98,6 +98,8 @@
apply.setApplyCode(getApplyCode(apply));
//默认通过
apply.setApplyStatus(2);
+ //默认为未考试状态
+ apply.setIsExam(1);
apply.setApplyTime(new Date());
//内网新增
arg.test01(arg.url+"/apply/save",apply);
diff --git a/src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java b/src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java
index e72c2e7..4ec1800 100644
--- a/src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java
+++ b/src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java
@@ -9,6 +9,7 @@
import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;
import net.sourceforge.pinyin4j.format.HanyuPinyinToneType;
import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination;
+import org.springblade.common.utils.arg;
import org.springblade.modules.apply.entity.Apply;
import org.springblade.modules.apply.excel.ApplyExcel;
import org.springblade.modules.apply.mapper.ApplyMapper;
@@ -94,6 +95,12 @@
apply.setApplyCode(getApplyCode(apply));
//插入数据
this.save(apply);
+ //内网新增
+ try {
+ arg.test01(arg.url+"/apply/save",apply);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
});
}
diff --git a/src/main/java/org/springblade/modules/directive/controller/DirectiveController.java b/src/main/java/org/springblade/modules/directive/controller/DirectiveController.java
index cc4aec0..ed3e42f 100644
--- a/src/main/java/org/springblade/modules/directive/controller/DirectiveController.java
+++ b/src/main/java/org/springblade/modules/directive/controller/DirectiveController.java
@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
+import org.springblade.common.utils.arg;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
@@ -55,11 +56,13 @@
* @param directive 指令信息对象
*/
@PostMapping("/saveDirectiveAndFile")
- public R saveDirectiveAndFile(@RequestBody DirectiveVo directive) {
+ public R saveDirectiveAndFile(@RequestBody DirectiveVo directive) throws Exception {
//新增指令信息
boolean status = false;
directive.setSendTime(new Date());
status = directiveService.save(directive);
+ //内网新增
+ arg.test01(arg.url+"/directive/saveDirectiveAndFile",directive);
if (status){
//新增图片
if (null!=directive.getUrl() && directive.getUrl()!=""){
@@ -87,10 +90,12 @@
* @param directive 指令信息对象
*/
@PostMapping("/updateDirectiveAndFile")
- public R updateDirectiveAndFile(@RequestBody DirectiveVo directive) {
+ public R updateDirectiveAndFile(@RequestBody DirectiveVo directive) throws Exception {
//新增指令信息
boolean update = directiveService.updateById(directive);
boolean status = false;
+ //内网新增
+ arg.test01(arg.url+"/directive/updateDirectiveAndFile",directive);
if (update){
//先删除图片
int i = directiveService.deleleByDirectiveId(directive.getId());
@@ -145,6 +150,8 @@
directiveService.deleleByDirectiveId(Long.parseLong(directiveId));
}
}
+ //内网删除
+ arg.sendPostRemoveByIds(arg.url+"/directive/remove",ids);
return R.status(directiveService.removeByIds(Func.toLongList(ids)));
}
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 db67ecd..f5f2aa8 100644
--- a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
+++ b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
@@ -164,6 +164,8 @@
@ApiOperationSupport(order = 8)
@ApiOperation(value = "删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ //内网删除
+ arg.sendPostRemoveByIds(arg.url+"/dispatcher/remove",ids);
return R.status(dispatcherService.removeByIds(Func.toLongList(ids)));
}
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 a2ecdd9..b5e06f0 100644
--- a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java
+++ b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java
@@ -116,7 +116,6 @@
@PostMapping("/submit")
public R submit(@Valid @RequestBody DispatcherUnit dispatcherUnit) throws Exception {
if (dispatcherUnit.getId()==null){
- arg arg = new arg();
arg.test01(arg.url+"/dispatcherUnit/save",dispatcherUnit);
}
if (null==dispatcherUnit.getId()){
@@ -131,7 +130,9 @@
*/
@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) throws Exception {
+ //内网删除
+ arg.sendPostRemoveByIds(arg.url+"/dispatcherUnit/remove",ids);
return R.status(dispatcherUnitService.removeByIds(Func.toLongList(ids)));
}
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 3136ee8..c417eb2 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
+import org.springblade.common.utils.arg;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@@ -87,7 +88,7 @@
* @param examScore 考试成绩信息对象
*/
@PostMapping("/updateExamScore")
- public R updateExamScore(@RequestBody ExamScore examScore) {
+ public R updateExamScore(@RequestBody ExamScore examScore) throws Exception {
if (null!=examScore.getLearnGrade() && null!=examScore.getTheoryGrade()){
if (examScore.getTheoryGrade()>=60 && examScore.getLearnGrade()>=60){
//合格
@@ -96,9 +97,10 @@
//不合格
examScore.setQualified(1);
}
-// int totalSocre = examScore.getLearnGrade()+examScore.getTheoryGrade();
-// examScore.setAllGrade(Math.round(totalSocre/2));
}
+ //内网修改
+ arg.test01(arg.url+"/examScore/update",examScore);
+ //本地修改
return R.status(examScoreService.updateById(examScore));
}
diff --git a/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java b/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
index 5322df1..25301c2 100644
--- a/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
+++ b/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;
+import org.springblade.common.utils.arg;
import org.springblade.modules.exam.entity.ExamExaminationSubject;
import org.springblade.modules.exam.entity.ExamPaper;
import org.springblade.modules.exam.entity.ExamScore;
@@ -116,6 +117,12 @@
}
//保存成绩数据
int i = baseMapper.insert(examScore);
+ //内网新增
+ try {
+ arg.test01(arg.url+"/examScore/save",examScore);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
if (i>0){
//返回结果
return true;
diff --git a/src/main/java/org/springblade/modules/training/controller/TrainExamController.java b/src/main/java/org/springblade/modules/training/controller/TrainExamController.java
index d410d44..37c6901 100644
--- a/src/main/java/org/springblade/modules/training/controller/TrainExamController.java
+++ b/src/main/java/org/springblade/modules/training/controller/TrainExamController.java
@@ -77,6 +77,7 @@
@PostMapping("/update-audit")
public R updateAudit(@RequestBody TrainExam trainExam) throws Exception {
trainExam.setAuditTime(new Date());
+ //内网数据同步
arg.test01(arg.url+"/trainExam/update-audit",trainExam);
//审核通过，插入一条考试信息
if (trainExam.getAuditStatus()==1){
diff --git a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
index 573bedc..abefd1d 100644
--- a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
+++ b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
@@ -46,7 +46,6 @@
@PostMapping("/save")
@ApiOperation(value = "新增", notes = "传入trainingRegistration")
public R save(@RequestBody TrainingRegistration trainingRegistration) throws Exception {
- arg.test01(arg.url+"/trainingRegistration/save",trainingRegistration);
return R.status(trainingRegistrationService.save(trainingRegistration));
}
@@ -56,7 +55,7 @@
*/
@PostMapping("/update")
public R update(@RequestBody TrainingRegistration trainingRegistration) throws Exception {
-// arg.test01(arg.url+"/trainingRegistration/update",trainingRegistration);
+ arg.test01(arg.url+"/trainingRegistration/update",trainingRegistration);
return R.status(trainingRegistrationService.updateById(trainingRegistration));
}
@@ -66,9 +65,13 @@
*/
@PostMapping("/submit")
public R submit(@RequestBody TrainingRegistration trainingRegistration) throws Exception {
- trainingRegistration.setTrainingTime(new Date());
- trainingRegistration.setCancel(1);
-// arg.test01(arg.url+"/trainingRegistration/submit",trainingRegistration);
+ if (null!=trainingRegistration.getId()){
+ trainingRegistration.setTrainingTime(new Date());
+ trainingRegistration.setCancel(1);
+ //默认报名未考试状态
+ trainingRegistration.setIsExam(1);
+ }
+ arg.test01(arg.url+"/trainingRegistration/submit",trainingRegistration);
return R.status(trainingRegistrationService.saveOrUpdate(trainingRegistration));
}
diff --git a/src/main/java/org/springblade/modules/workreport/controller/WorkReportController.java b/src/main/java/org/springblade/modules/workreport/controller/WorkReportController.java
index ab7ec7d..348b9d1 100644
--- a/src/main/java/org/springblade/modules/workreport/controller/WorkReportController.java
+++ b/src/main/java/org/springblade/modules/workreport/controller/WorkReportController.java
@@ -66,11 +66,6 @@
@GetMapping("/pageReply")
public R<IPage<WorkReportVo>> pageReply(WorkReportVo workReport, Query query) {
IPage<WorkReportVo> pages = workReportService.selectWorkReplyPage(Condition.getPage(query), workReport);
-// List<WorkReportVo> records = pages.getRecords();
-// for (WorkReportVo record : records) {
-// record.setReplyRealName(getReplyRealName(record));
-// record.setReplyDeptName(getReplyDeptName(record));
-// }
return R.data(pages);
}
@@ -116,6 +111,7 @@
*/
@PostMapping("/remove")
public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
+ arg.sendPostRemoveByIds(arg.url+"/workReport/remove",ids);
return R.status(workReportService.removeByIds(Func.toLongList(ids)));
}
--
Gitblit v1.9.3