From d9ee9d3b4c286f21d94b979465ed4db87b635a4d Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 16 Nov 2021 08:44:22 +0800
Subject: [PATCH] 1.押运公司保安添加持枪编码
---
src/main/java/org/springblade/modules/system/controller/DeptController.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 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 f16ac02..b4d5bf0 100644
--- a/src/main/java/org/springblade/modules/system/controller/DeptController.java
+++ b/src/main/java/org/springblade/modules/system/controller/DeptController.java
@@ -33,6 +33,9 @@
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.FTP.FtpUtil;
+import org.springblade.modules.information.entity.Information;
+import org.springblade.modules.information.service.IInformationService;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.node.TreeNodes;
@@ -65,6 +68,7 @@
private final IDeptService deptService;
private final IUserService userService;
+ private final IInformationService informationService;
/**
* 详情
@@ -125,8 +129,8 @@
@GetMapping("/lazy-tree")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "懒加载树形结构", notes = "树形结构")
- public R<List<DeptVO>> lazyTree(String tenantId, Long parentId, BladeUser bladeUser) {
- List<DeptVO> tree = deptService.lazyTree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()), parentId);
+ public R<List<DeptVO>> lazyTree(String tenantId, Long parentId, BladeUser bladeUser,String userId) {
+ List<DeptVO> tree = deptService.lazyTree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()), parentId,userId);
return R.data(tree);
}
@@ -219,13 +223,34 @@
@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("操作失败");
}
@@ -247,4 +272,12 @@
return R.data(tree);
}
+
+ @GetMapping("/selectInfos")
+ public R<List<DeptVO>> selectInfos() {
+ List<DeptVO> tree =deptService.selectInfos();
+ return R.data(tree);
+ }
+
+
}
--
Gitblit v1.9.3