From 6e59817048a2afb982cdd1c14eaa9502c809d896 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 27 Jul 2021 18:11:24 +0800
Subject: [PATCH] 1.公共类
---
src/main/java/org/springblade/modules/information/controller/InformationController.java | 97 ++++++++++++++----------------------------------
1 files changed, 28 insertions(+), 69 deletions(-)
diff --git a/src/main/java/org/springblade/modules/information/controller/InformationController.java b/src/main/java/org/springblade/modules/information/controller/InformationController.java
index a1e6b95..c279eec 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -21,13 +21,19 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
+import org.springblade.common.cache.DictCache;
+import org.springblade.common.enums.DictEnum;
+import org.springblade.common.utils.arg;
import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.cache.utils.CacheUtil;
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.support.Kv;
import org.springblade.modules.information.entity.Information;
import org.springblade.modules.information.service.IInformationService;
import org.springblade.modules.information.vo.InformationVO;
+import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.service.IDeptService;
import org.springframework.web.bind.annotation.*;
@@ -36,6 +42,8 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
+import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
/**
* 控制器
@@ -92,7 +100,23 @@
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入information")
- public R save(@Valid @RequestBody Information information) {
+ public R save(@Valid @RequestBody Information information) throws Exception {
+ Dept dept= new Dept();
+ Long i = 1413470343230877697L;
+ dept.setParentId(i);
+ dept.setTenantId("000000");
+ dept.setDeptName(information.getEnterprisename());
+ dept.setAncestors("0,1413470343230877697");
+ dept.setDeptCategory(1);
+ if (iDeptService.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);
+ }
+ arg.test01(arg.url+"/information/save",information);
return R.status(informationService.save(information));
}
@@ -102,7 +126,8 @@
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入information")
- public R update(@Valid @RequestBody Information information) {
+ public R update(@Valid @RequestBody Information information) throws Exception {
+ arg.test01(arg.url+"/information/update",information);
return R.status(informationService.updateById(information));
}
@@ -123,78 +148,12 @@
@PostMapping("/remove")
@ApiOperationSupport(order = 8)
@ApiOperation(value = "删除", notes = "传入ids")
- public R remove(String creditcode) {
+ public R remove(String creditcode) throws Exception {
informationService.deleteIn(creditcode);
informationService.deleteSh(creditcode);
informationService.deleteMe(creditcode);
return R.success("删除成功");
}
- /**
- * 首页保安公司统计接口
- * @return
- */
- @PostMapping("/SelectCount")
- public R SelectCount() {
- String name="分局";
- List<Map<Object, String>> list = iDeptService.selectCount(name);
- List<Map<String, Object>> lists = new ArrayList<>();
- for (int i=0;i<list.size();i++){
- String title = list.get(i).get("title");//部门名称
- String departmentid = String.valueOf(list.get(i).get("jurisdiction"));//部门id
- Map<String, Object> map = new HashMap<String, Object>();
- Map maps = informationService.selectCount(departmentid);
- map.put("name",title);
- map.put("server",maps);
- lists.add(map);
- }
- return R.data(lists);
- }
-
- /**
- * 首页保安持证统计接口
- * @return
- */
- @PostMapping("/SelectCounthold")
- public R SelectCounthold() {
- String name="分局";
- List<Map<Object, String>> list = iDeptService.selectCount(name);
- List<Map<String, Object>> lists = new ArrayList<>();
- for (int i=0;i<list.size();i++){
- int cznumber=0;//总的持证数量
- int wcznumber=0;//总的未持证数量
- String title = list.get(i).get("title");//部门名称
- Map<String, Object> map = new HashMap<String, Object>();
- Map<Object, Integer> objectStringMap = iDeptService.selectHold(String.valueOf(list.get(i).get("jurisdiction")));
- cznumber=objectStringMap.get("cz");;
- wcznumber=objectStringMap.get("wcz");;
- map.put("name",title);
- map.put("cz",cznumber);
- map.put("wcz",wcznumber);
- lists.add(map);
- }
- return R.data(lists);
- }
-
-
- /**
- *统计保安公司未持证的保安的公司数量
- */
- @PostMapping("/selectInCount")
- public R selectInCount() {
- List<Map<Object, String>> maps = informationService.selectInCount();
- return R.data(maps);
- }
-
-
- /**
- *管辖区域下拉
- */
- @PostMapping("/selecttree")
- public R selecttree() {
- String name="分局";
- List<Map<Object, String>> maps = iDeptService.selectCount(name);
- return R.data(maps);
- }
}
--
Gitblit v1.9.3