From 415d710b1931b32634ed7323dcacc1e837ebf26f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 29 Jul 2021 20:35:49 +0800
Subject: [PATCH] 轨迹定位接口同步，保安员信息查询接口修改，新增经纬度返回
---
src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 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 6176fff..db67ecd 100644
--- a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
+++ b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
@@ -23,10 +23,14 @@
import lombok.AllArgsConstructor;
import javax.validation.Valid;
+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.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;
@@ -35,6 +39,7 @@
import org.springblade.core.boot.ctrl.BladeController;
import java.util.Arrays;
+import java.util.List;
/**
* 控制器
@@ -49,6 +54,10 @@
public class DispatcherController extends BladeController {
private final IDispatcherService dispatcherService;
+
+ private final IDispatcherUnitService dispatcherUnitService;
+
+ private final IUserService userService;
/**
* 详情
@@ -109,10 +118,40 @@
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入dispatcher")
- public R submit(@Valid @RequestBody Dispatcher dispatcher) {
- if (null!=dispatcher.getUserIds() && dispatcher.getUserIds()!=""){
- //计算派遣人数
- dispatcher.setNum(Arrays.asList(dispatcher.getUserIds().split(",")).size());
+ public R submit(@Valid @RequestBody Dispatcher dispatcher) throws Exception {
+ if (dispatcher.getId()==null){
+ if (null!=dispatcher.getUserIds() && dispatcher.getUserIds()!=""){
+ List<String> list = Arrays.asList(dispatcher.getUserIds().split(","));
+ //计算派遣人数
+ dispatcher.setNum(list.size());
+ //修改保安人员的派遣状态
+ list.forEach(id -> {
+ User user = new User();
+ user.setId(Long.parseLong(id));
+ user.setDispatch("0");
+ userService.updateById(user);
+ });
+ //查询派遣单位的信息,设置行政区
+ dispatcher.setJurisdiction(dispatcherUnitService.getById(dispatcher.getDispatcherUnitId()).getJurisdiction().toString());
+ }
+ arg.test01(arg.url+"/dispatcher/save",dispatcher);
+ }
+ else {
+ if (null != dispatcher.getUserIds() && dispatcher.getUserIds() != "") {
+ List<String> list = Arrays.asList(dispatcher.getUserIds().split(","));
+ //计算派遣人数
+ dispatcher.setNum(list.size());
+ //修改保安人员的派遣状态
+ list.forEach(id -> {
+ User user = new User();
+ user.setId(Long.parseLong(id));
+ user.setDispatch("0");
+ userService.updateById(user);
+ });
+ //查询派遣单位的信息,设置行政区
+ dispatcher.setJurisdiction(dispatcherUnitService.getById(dispatcher.getDispatcherUnitId()).getJurisdiction().toString());
+ }
+ arg.test01(arg.url+"/dispatcher/update",dispatcher);
}
return R.status(dispatcherService.saveOrUpdate(dispatcher));
}
--
Gitblit v1.9.3