From 8853292babb2ad94de4a3207966f1e83b767cd2d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sun, 17 Sep 2023 16:38:34 +0800
Subject: [PATCH] 新增流程节点进程查询接口
---
src/main/java/org/springblade/modules/system/controller/DeptController.java | 48 +++++++++++++++++++++++++-----------------------
1 files changed, 25 insertions(+), 23 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 b4d5bf0..de4a1a8 100644
--- a/src/main/java/org/springblade/modules/system/controller/DeptController.java
+++ b/src/main/java/org/springblade/modules/system/controller/DeptController.java
@@ -41,12 +41,14 @@
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.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.validation.Valid;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -69,6 +71,7 @@
private final IUserService userService;
private final IInformationService informationService;
+ private final MyAsyncService myAsyncService;
/**
* 详情
@@ -168,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
@@ -191,8 +207,8 @@
*/
@GetMapping("/security_lazy-tree")
@ApiOperation(value = "懒加载树形结构", notes = "树形结构")
- public R<List<DeptVO>> securityLazyTree(String jurisdiction, Long parentId) {
- List<DeptVO> tree = deptService.securityLazyTree(jurisdiction, parentId);
+ public R<List<DeptVO>> securityLazyTree(String jurisdiction, Long parentId,Long deptId) {
+ List<DeptVO> tree = deptService.securityLazyTree(jurisdiction, parentId,deptId);
return R.data(tree);
}
@@ -223,34 +239,13 @@
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入dept")
public R submit(@Valid @RequestBody Dept dept) {
- // Information information = new Information();
- //Integer isDeleted = 0;
if (deptService.submit(dept)) {
CacheUtil.clear(SYS_CACHE);
// 返回懒加载树更新节点所需字段
Kv kv = Kv.create().set("id", String.valueOf(dept.getId())).set("tenantId", dept.getTenantId())
.set("deptCategoryName", DictCache.getValue(DictEnum.ORG_CATEGORY, dept.getDeptCategory()));
-// String id = kv.get("id").toString();
-// information.setDepartmentid(id);
-// information.setEnterprisename(dept.getDeptName());
-// Integer deptCategory = dept.getDeptCategory();
-// information.setStats(String.valueOf(deptCategory));
return R.data(kv);
}
-// informationService.save(information);
-// String s = "insert into sys_information(id,enterpriseName,departmentid,stats) " +
-// "values(" + "'" + information.getId() + "'" +
-// "," + "'" + information.getEnterprisename() + "'" +
-// "," + "'" + information.getDepartmentid() + "'" +
-// "," + "'" + information.getStats() + "'"+ ")";
-// FtpUtil.sqlFileUpload(s);
-// String ss = "insert into blade_dept(id,parent_id,tenant_id,dept_name,ancestors,dept_category,is_deleted) values(" + "'" + dept.getId() + "'" + "," + "'" + dept.getParentId() + "'" + ","
-// + "'" + dept.getTenantId() + "'" +
-// "," + "'" + information.getEnterprisename() + "'" +
-// "," + "'" + dept.getAncestors() + "'" +
-// "," + "'" + dept.getDeptCategory() + "'" +
-// "," + "'" + isDeleted + "'" + ")";
-// FtpUtil.sqlFileUpload(ss);
return R.fail("操作失败");
}
@@ -262,6 +257,13 @@
@ApiOperation(value = "删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
CacheUtil.clear(SYS_CACHE);
+ List<String> list = Arrays.asList(ids.split(","));
+ list.forEach(id -> {
+ //内网同步
+ String s1 = "update blade_dept set is_deleted = 1 where id = " + "'" + id + "'";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
+ });
return R.status(deptService.removeDept(ids));
}
--
Gitblit v1.9.3