From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 19 Aug 2021 15:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/information/controller/InformationController.java | 191 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 173 insertions(+), 18 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 81e9805..1220323 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -16,28 +16,41 @@
*/
package org.springblade.modules.information.controller;
+import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
+import com.alibaba.fastjson.JSON;
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.excel.util.ExcelUtil;
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.excel.InforExcel;
+import org.springblade.modules.information.excel.InforImporter;
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.excel.UserExcel;
+import org.springblade.modules.system.excel.UserImporter;
import org.springblade.modules.system.service.IDeptService;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -45,8 +58,9 @@
import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
+
/**
- * 控制器
+ * 控制器
*
* @author BladeX
* @since 2021-07-07
@@ -59,7 +73,6 @@
private final IInformationService informationService;
private final IDeptService iDeptService;
-
/**
* 详情
@@ -89,10 +102,22 @@
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入information")
- public R<IPage<InformationVO>> page(InformationVO information, Query query) {
- IPage<InformationVO> pages = informationService.selectInformationPage(Condition.getPage(query), information);
+ public R<IPage<Information>> page(Information information, Query query) {
+ IPage<Information> pages = informationService.selectInformationPage(Condition.getPage(query), information);
return R.data(pages);
}
+
+
+ /**
+ * 培训公司信息查询
+ */
+ @GetMapping("/security-page")
+ public R<IPage<InformationVO>> securityPage(InformationVO information, Query query) {
+ IPage<InformationVO> pages = informationService.securityPage(Condition.getPage(query), information);
+ return R.data(pages);
+ }
+
+
/**
* 新增
@@ -101,13 +126,52 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入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);
+ Dept dept = new Dept();
+ //自招保安公司
+ if (information.getStats().equals("0")) {
+ Long i = 1420222768149966850L;
+ dept.setParentId(i);
+ dept.setTenantId("000000");
+ dept.setDeptName(information.getEnterprisename());
+ dept.setAncestors("0,1420222768149966850");
+ dept.setDeptCategory(1);
+ }
+ //保安培训公司
+ if (information.getStats().equals("1")) {
+ Long i = 1418458374477549569L;
+ dept.setParentId(i);
+ dept.setTenantId("000000");
+ dept.setDeptName(information.getEnterprisename());
+ dept.setAncestors("0,1418458374477549569");
+ dept.setDeptCategory(1);
+ }
+ //保安服务公司
+ if (information.getStats().equals("2")) {
+ Long i = 1413470343230877697L;
+ dept.setParentId(i);
+ dept.setTenantId("000000");
+ dept.setDeptName(information.getEnterprisename());
+ dept.setAncestors("0,1413470343230877697");
+ dept.setDeptCategory(1);
+ }
+ //武装守押公司
+ if (information.getStats().equals("3")) {
+ Long i = 1420222961377357825L;
+ dept.setParentId(i);
+ dept.setTenantId("000000");
+ dept.setDeptName(information.getEnterprisename());
+ dept.setAncestors("0,1420222961377357825");
+ dept.setDeptCategory(1);
+ }
+ //跨区域保安公司
+ if (information.getStats().equals("4")) {
+ Long i = 1425366663452196865L;
+ dept.setParentId(i);
+ dept.setTenantId("000000");
+ dept.setDeptName(information.getEnterprisename());
+ dept.setAncestors("0,1425366663452196865");
+ dept.setDeptCategory(1);
+ }
if (iDeptService.submit(dept)) {
CacheUtil.clear(SYS_CACHE);
// 返回懒加载树更新节点所需字段
@@ -116,7 +180,9 @@
String id = kv.get("id").toString();
information.setDepartmentid(id);
}
- arg.test01(arg.url+"/information/save",information);
+ String json=JSON.toJSONString(information);
+ //com.util.OutJson.createJsonFile(json,"d:/anbao/information/","informationSave");
+ //arg.test01(arg.url + "/information/save", information);
return R.status(informationService.save(information));
}
@@ -127,7 +193,7 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入information")
public R update(@Valid @RequestBody Information information) throws Exception {
- arg.test01(arg.url+"/information/update",information);
+ //arg.test01(arg.url + "/information/update", information);
return R.status(informationService.updateById(information));
}
@@ -148,13 +214,102 @@
@PostMapping("/remove")
@ApiOperationSupport(order = 8)
@ApiOperation(value = "删除", notes = "传入ids")
- public R remove(String creditcode) throws Exception {
- informationService.deleteIn(creditcode);
- informationService.deleteSh(creditcode);
- informationService.deleteMe(creditcode);
- arg.sendPostRemoveByIds(arg.url+"/information/remove",creditcode);
+ public R remove(String creditcode, String departmentid) throws Exception {
+ String[] strArray = creditcode.split(",");
+ String[] strArrays = departmentid.split(",");
+ for (int i = 0; i < strArray.length; i++) {
+ informationService.deleteIn(strArray[i]);
+ informationService.deleteSh(strArray[i]);
+ informationService.deleteMe(strArray[i]);
+ //arg.sendPostRemoveByIds(arg.url + "/information/remove", strArray[i]);
+
+ }
+ for (int j = 0; j < strArrays.length; j++) {
+ //机构删除
+ informationService.deleteDept(strArrays[j]);
+ //arg.sendPostRemoveByIds(arg.url + "/information/deleteDept", strArrays[j]);
+ }
+
return R.success("删除成功");
}
+ /**
+ * 统计保安员资格异常的数量
+ */
+ @PostMapping("/selectExtype")
+ public R selectExtype(String deptid) {
+ List<Map<Object, Object>> lists = informationService.selectExtype(deptid);
+ return R.data(lists);
+ }
+
+ /**
+ * 统计保安员持证的数量
+ */
+ @PostMapping("/selectHold")
+ public R selectHold(String deptid) {
+ List<Map<Object, Object>> lists = informationService.selectHold(deptid);
+ return R.data(lists);
+ }
+
+ /**
+ * 派遣服务单位统计
+ */
+ @PostMapping("/selectDis")
+ public R selectDis(String deptid) {
+ List<Map<Object, Object>> lists = informationService.selectDis(deptid);
+ return R.data(lists);
+ }
+
+ /**
+ * 保安派遣数量统计
+ */
+ @PostMapping("/selectDisp")
+ public R selectDisp(String deptid) {
+ List<Map<Object, Object>> lists = informationService.selectDisp(deptid);
+ return R.data(lists);
+ }
+
+ /**
+ * 社保统计
+ */
+ @PostMapping("/selectSoil")
+ public R selectSoil(String deptid) {
+ List<Map<Object, Object>> lists = informationService.selectSoil(deptid);
+ List<Map<String, Object>> list = new ArrayList<>();
+ for (int i = 0; i < lists.size(); i++) {
+ Map<String, Object> map = new HashMap<String, Object>();
+ String numj = lists.get(i).get("numj").toString();
+ Integer a = Integer.valueOf(numj);
+ String numz = lists.get(i).get("numz").toString();
+ Integer b = Integer.valueOf(numz);
+ Integer c = b - a;
+ map.put("numj", a);
+ map.put("nmuwj", c);
+ list.add(map);
+ }
+ return R.data(list);
+ }
+
+ /**
+ * 导入单位信息
+ */
+ @PostMapping("import-informaton")
+ @ApiOperationSupport(order = 12)
+ @ApiOperation(value = "导入单位", notes = "传入excel")
+ public R importUser(MultipartFile file, Integer isCovered) {
+ InforImporter inforImporter = new InforImporter(informationService, false);
+ ExcelUtil.save(file, inforImporter, InforExcel.class);
+ return R.success("操作成功");
+ }
+
+// public static void main(String[] args) {
+// Information information = new Information();
+// information.setAddress("2");
+// information.setDepartmentid("123");
+// String json=JSON.toJSONString(information);//关键
+// com.util.OutJson.createJsonFile(json,"d:/anbao/information/","informationSave");
+// System.out.println("生成文件完成！");
+// }
+
}
--
Gitblit v1.9.3