From 08363052cecb30230a2c8b3eba791ca8d1be00a5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 31 Aug 2021 15:32:38 +0800
Subject: [PATCH] 二维码生成地址修改，保安证编码生成修改
---
src/main/java/org/springblade/modules/directive/controller/DirectiveController.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
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 25d2f3a..419fd37 100644
--- a/src/main/java/org/springblade/modules/directive/controller/DirectiveController.java
+++ b/src/main/java/org/springblade/modules/directive/controller/DirectiveController.java
@@ -4,15 +4,20 @@
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;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.directive.entity.Directive;
import org.springblade.modules.directive.entity.DirectiveFile;
import org.springblade.modules.directive.service.DirectiveService;
import org.springblade.modules.directive.vo.DirectiveVo;
import org.springframework.web.bind.annotation.*;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
/**
* @author zhongrj
@@ -53,11 +58,12 @@
* @param directive 指令信息对象
*/
@PostMapping("/saveDirectiveAndFile")
- public R saveDirectiveAndFile(@RequestBody DirectiveVo directive) {
+ public R saveDirectiveAndFile(@RequestBody DirectiveVo directive) throws Exception {
//新增指令信息
- boolean save = directiveService.save(directive);
boolean status = false;
- if (save){
+ directive.setSendTime(new Date());
+ status = directiveService.save(directive);
+ if (status){
//新增图片
if (null!=directive.getUrl() && directive.getUrl()!=""){
String[] directiveUrl = directive.getUrl().split(",");
@@ -68,7 +74,7 @@
directiveFile.setUrl(url);
status = directiveService.saveDirectiveFile(directiveFile);
if (!status){
- R.status(false);
+ return R.status(false);
}
}
}
@@ -84,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());
@@ -142,6 +150,8 @@
directiveService.deleleByDirectiveId(Long.parseLong(directiveId));
}
}
+ //内网删除
+ //arg.sendPostRemoveByIds(arg.url+"/directive/remove",ids);
return R.status(directiveService.removeByIds(Func.toLongList(ids)));
}
--
Gitblit v1.9.3