From 8b375fe00a241b3a769b82fe3dac8d1c9dce8a02 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 16 Jun 2022 14:36:07 +0800
Subject: [PATCH] 模拟考试修改
---
src/main/java/org/springblade/modules/system/controller/DeptController.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/DeptController.java b/src/main/java/org/springblade/modules/system/controller/DeptController.java
index 02394cd..eb887bc 100644
--- a/src/main/java/org/springblade/modules/system/controller/DeptController.java
+++ b/src/main/java/org/springblade/modules/system/controller/DeptController.java
@@ -41,6 +41,7 @@
import org.springblade.modules.system.node.TreeNodes;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.system.service.MyAsyncService;
import org.springblade.modules.system.vo.DeptVO;
import org.springblade.modules.system.wrapper.DeptWrapper;
import org.springframework.web.bind.annotation.*;
@@ -70,6 +71,7 @@
private final IUserService userService;
private final IInformationService informationService;
+ private final MyAsyncService myAsyncService;
/**
* 详情
@@ -169,6 +171,19 @@
/**
+ * 懒加载获取单位树,电子围栏用
+ * @param type 1：本单位 2：分公司 3：服务单位
+ * @param deptId
+ * @return
+ */
+ @GetMapping("/lazy-tree-rail")
+ public R<List<DeptVO>> lazyTreeRail(Integer type,Long deptId) {
+ List<DeptVO> tree = deptService.lazyTreeRail(type,deptId);
+ return R.data(tree);
+ }
+
+
+ /**
* 懒加载获取部门树形结构(包含用户数据)app
* @param type 1:保安对保安 2：保安向民警 3：民警向民警
* @return
@@ -249,7 +264,8 @@
"," + "'" + dept.getSort() + "'" +
"," + "'" + dept.getRemark() + "'" +
"," + "'" + isDeleted + "'" + ")";
- FtpUtil.sqlFileUpload(ss);
+ //FtpUtil.sqlFileUpload(ss);
+ myAsyncService.FTP(ss);
}else {
//修改
//内网同步
@@ -263,7 +279,8 @@
+ ",remark = " + "'" + dept.getRemark() + "'"
+ ",is_deleted = " + "'" + dept.getIsDeleted() + "'"
+ " " + "where id = " + "'" + dept.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
}
// String id = kv.get("id").toString();
// information.setDepartmentid(id);
@@ -294,7 +311,8 @@
list.forEach(id -> {
//内网同步
String s1 = "update blade_dept set is_deleted = 1 where id = " + "'" + id + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
});
return R.status(deptService.removeDept(ids));
}
--
Gitblit v1.9.3