From abbaf2374fff7d02ecc3eecd6bf62504fbf27c4b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 06 Apr 2021 22:33:25 +0800
Subject: [PATCH] 预警数量统计接口修改，预警数量分布接口修改，预警分类占比接口新增
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/controller/catalogController.java | 146 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 140 insertions(+), 6 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/controller/catalogController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/controller/catalogController.java
index 367b41f..3be319f 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/controller/catalogController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/controller/catalogController.java
@@ -25,20 +25,25 @@
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
+import org.springblade.jfpt.alarm.service.IAlarmService;
import org.springblade.jfpt.catalog.entitly.catalog;
import org.springblade.jfpt.catalog.service.catalogService;
import org.springblade.jfpt.catalog.vo.catalogVO;
+import org.springblade.jfpt.equipment.service.IEquipmentService;
+import org.springblade.jfpt.parcel.service.ParcelService;
+import org.springblade.jfpt.parcel.vo.ConditionVo;
+import org.springblade.jfpt.suser.service.ISuserService;
+import org.springblade.system.vo.DeptVO;
import org.springframework.web.bind.annotation.*;
import org.springblade.jfpt.catalog.wrapper.catalogWrapper;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
* 控制器
@@ -53,6 +58,14 @@
public class catalogController extends BladeController {
private final org.springblade.jfpt.catalog.service.catalogService catalogService;
+
+ private final IAlarmService iAlarmService;
+
+ private final ParcelService parcelService;
+
+ private final IEquipmentService iEquipmentService;
+
+ private final ISuserService iSuserService;
/**
* 详情
@@ -166,6 +179,7 @@
mapa.put("backgroundColor","#F56C6C");
mapa.put("prefixText","警情总数");
mapa.put("suffixText","条");
+
mape.put("value",list1.get(1).get("counta"));
mape.put("backgroundColor","#67C23A");
mape.put("prefixText","设备总数");
@@ -185,6 +199,87 @@
lists.add(maps);
lists.add(mapse);
return R.data(lists);
+ }
+
+
+ /**
+ * 系统首页展示条各个总数
+ * @time 2021-03-12 arsn新增
+ * @param response
+ * @param conditionVo 条件 status 0:本日 1：本周 2：本月
+ * @return
+ */
+ @GetMapping("/selectIndexCount")
+ public R selectIndexCount(HttpServletResponse response, ConditionVo conditionVo) {
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials","true");
+ //数据返回
+ return R.data(getIndexCountData(conditionVo));
+ }
+
+ /**
+ * 按时间条件查询统计数据
+ * @param conditionVo 条件 status 0:本日 1：本周 2：本月 startTime endTime时间条件查询
+ * @return
+ */
+ private List<Map<String, Object>> getIndexCountData(ConditionVo conditionVo) {
+ List<Map<String, Object>> lists = new ArrayList<>();
+ Map<String, Object> mapa = new HashMap<String, Object>();
+ Map<String, Object> mape = new HashMap<String, Object>();
+ Map<String, Object> maps = new HashMap<String, Object>();
+ Map<String, Object> mapse = new HashMap<String, Object>();
+ Map<String, Object> mapsu = new HashMap<String, Object>();
+ Integer alarmCount = null;
+ List<Integer> parcelCount = new ArrayList<>();
+ Integer equipmentCount = null;
+ Integer suserCount = null;
+ //查询今日警情
+ //1.查询警情总数
+ alarmCount = iAlarmService.selectAlarmCount(conditionVo);
+ //2.查询包裹总数,违禁品总数
+ parcelCount = parcelService.selectParcelCount(conditionVo);
+ //3.查询在线设备总数
+ equipmentCount = iEquipmentService.selectEquipmentCount(conditionVo);
+ //4.查询业主总数
+ suserCount = iSuserService.selectSuserCount(conditionVo);
+
+ //1.警情总数
+ mapa.put("value",alarmCount);
+ mapa.put("backgroundColor","#F56C6C");
+ mapa.put("prefixText","今日警情");
+ mapa.put("suffixText","条");
+
+ //2.包裹总数
+ mape.put("value",parcelCount.get(0));
+ mape.put("backgroundColor","#67C23A");
+ mape.put("prefixText","今日违禁包裹");
+ mape.put("suffixText","个");
+
+ //3.违禁品总数
+ maps.put("value",parcelCount.get(1));
+ maps.put("backgroundColor","#E6A23C");
+ maps.put("prefixText","今日违禁物品");
+ maps.put("suffixText","个");
+
+ //4.在线设备总数
+ mapse.put("value",equipmentCount);
+ mapse.put("backgroundColor","#409EFF");
+ mapse.put("prefixText","在线设备");
+ mapse.put("suffixText","个");
+
+ //5.业主总数
+ mapsu.put("value",suserCount);
+ mapsu.put("backgroundColor","#00BFFF");
+ mapsu.put("prefixText","客户数量");
+ mapsu.put("suffixText","个");
+ //数据存入集合
+ lists.add(mapa);
+ lists.add(mape);
+ lists.add(maps);
+ lists.add(mapse);
+ lists.add(mapsu);
+ return lists;
}
@@ -226,8 +321,47 @@
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
response.setHeader("Access-Control-Allow-Credentials","true");
- List<Map<String, Object>> list = catalogService.selectWar();
- return R.data(list);
+ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");//设置日期格式
+ List<Map<String, Object>> listc = new ArrayList<>();
+ String[] str={"内部","周边","挟持","救护","旁路","火警","紧急","出入","防拆"};
+ Map<String, Object> map = new HashMap<String, Object>();
+ String endTime = df.format(new Date());// new Date()为获取当前系统时间
+ String beginTime = getPastDate(7);
+ List<Map<String, Object>> list = catalogService.selectWar(beginTime,endTime);
+ map.put("lists",list);
+ map.put("type",str);
+ listc.add(map);
+ return R.data(listc);
+ }
+ public static String getPastDate(int past) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - past);
+ Date today = calendar.getTime();
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ String result = format.format(today);
+ return result;
+ }
+
+
+ /**
+ * 懒加载获取部门树形结构
+ */
+ @GetMapping("/lazy-tree")
+ public R<List<catalogVO>> lazyTree(String tenantId, Long parentId, BladeUser bladeUser) {
+ List<catalogVO> tree = catalogService.lazyTree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()), parentId);
+ return R.data(tree);
+ }
+
+ /**
+ * 获取部门树形结构
+ * @return
+ */
+ @GetMapping("/tree")
+ @ApiOperationSupport(order = 4)
+ @ApiOperation(value = "树形结构", notes = "树形结构")
+ public R<List<catalogVO>> tree() {
+ List<catalogVO> tree = catalogService.tree();
+ return R.data(tree);
}
}
--
Gitblit v1.9.3