From f435d50064d048c7bbc2fb46ffcd518cb19b9764 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 23 Aug 2021 09:47:04 +0800
Subject: [PATCH] 文件上传接口新增
---
src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 insertions(+), 6 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 96d44cb..4ecca78 100644
--- a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
+++ b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
@@ -29,6 +29,8 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.dispatcher.service.IDispatcherUnitService;
+import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IUserService;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.dispatcher.entity.Dispatcher;
@@ -37,6 +39,7 @@
import org.springblade.core.boot.ctrl.BladeController;
import java.util.Arrays;
+import java.util.List;
/**
* 控制器
@@ -53,6 +56,8 @@
private final IDispatcherService dispatcherService;
private final IDispatcherUnitService dispatcherUnitService;
+
+ private final IUserService userService;
/**
* 详情
@@ -94,6 +99,12 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入dispatcher")
public R save(@Valid @RequestBody Dispatcher dispatcher) {
+ if (null != dispatcher.getUserIds() && dispatcher.getUserIds() != "") {
+ //计算派遣人数
+// dispatcher.setNum(Arrays.asList(dispatcher.getUserIds().split(",")).size());
+ //查询派遣单位的信息,设置行政区
+ dispatcher.setJurisdiction(dispatcherUnitService.getById(dispatcher.getDispatcherUnitId()).getJurisdiction().toString());
+ }
return R.status(dispatcherService.save(dispatcher));
}
@@ -113,21 +124,41 @@
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入dispatcher")
- public R submit(@Valid @RequestBody Dispatcher dispatcher) throws Exception {
+ public R submit(@Valid @RequestBody Dispatcher dispatcher) {
if (dispatcher.getId()==null){
if (null!=dispatcher.getUserIds() && dispatcher.getUserIds()!=""){
- //计算派遣人数
- dispatcher.setNum(Arrays.asList(dispatcher.getUserIds().split(",")).size());
+// List<String> list = Arrays.asList(dispatcher.getUserIds().split(","));
+// //计算派遣人数
+// dispatcher.setNum(list.size());
+ //修改保安人员的派遣状态
+ User user = new User();
+ user.setId(Long.parseLong(dispatcher.getUserIds()));
+ user.setDispatch("0");
+ userService.updateById(user);
//查询派遣单位的信息,设置行政区
dispatcher.setJurisdiction(dispatcherUnitService.getById(dispatcher.getDispatcherUnitId()).getJurisdiction().toString());
}
- arg arg = new arg();
- arg.test01(arg.url+"/dispatcher/save",dispatcher);
}
else {
if (null != dispatcher.getUserIds() && dispatcher.getUserIds() != "") {
+// List<String> list = Arrays.asList(dispatcher.getUserIds().split(","));
//计算派遣人数
- dispatcher.setNum(Arrays.asList(dispatcher.getUserIds().split(",")).size());
+// dispatcher.setNum(list.size());
+ //查询当前派遣记录
+ Dispatcher dispatcher1 = dispatcherService.getById(dispatcher.getId());
+ if (!dispatcher1.getUserIds().equals(dispatcher.getUserIds())){
+ //修改原保安人员的派遣状态
+ User user = new User();
+ user.setId(Long.parseLong(dispatcher1.getUserIds()));
+ user.setDispatch("1");
+ userService.updateById(user);
+
+ //修改当前保安人员的派遣状态
+ User user1 = new User();
+ user1.setId(Long.parseLong(dispatcher.getUserIds()));
+ user1.setDispatch("0");
+ userService.updateById(user1);
+ }
//查询派遣单位的信息,设置行政区
dispatcher.setJurisdiction(dispatcherUnitService.getById(dispatcher.getDispatcherUnitId()).getJurisdiction().toString());
}
@@ -143,6 +174,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)));
}
--
Gitblit v1.9.3