From 59a2b8cdc7e6b74ff3a82f4c0b416868a3a71579 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 22 Feb 2022 14:18:28 +0800
Subject: [PATCH] 活动
---
src/main/java/org/springblade/modules/architecture/controller/ArchitectureController.java | 136 ++++++++++++++++++++++++++------------------
1 files changed, 80 insertions(+), 56 deletions(-)
diff --git a/src/main/java/org/springblade/modules/architecture/controller/ArchitectureController.java b/src/main/java/org/springblade/modules/architecture/controller/ArchitectureController.java
index f5c3dc6..802fa7b 100644
--- a/src/main/java/org/springblade/modules/architecture/controller/ArchitectureController.java
+++ b/src/main/java/org/springblade/modules/architecture/controller/ArchitectureController.java
@@ -106,7 +106,7 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入architecture")
public R save(@Valid @RequestBody Architecture architecture) {
- architecture.setPitch("-80");
+ architecture.setPitch("-90");
architecture.setHeading("0");
architecture.setRoll("0");
architecture.setGd("0");
@@ -247,6 +247,78 @@
return R.data(list2);
}
+// /**
+// * 校园搜索
+// *
+// * @param mechanismName 名称模糊查询
+// * @return
+// */
+// @GetMapping("/selectLook")
+// public R selectLook(String mechanismName) {
+// List list = new ArrayList();
+// String sub = "";
+// List<Map<Object, Object>> maps = architectureService.selectLook(mechanismName);
+// //排除为null的数据
+// List<Map<Object, Object>> list2 = maps.parallelStream().filter(Objects::nonNull).collect(Collectors.toList());
+// if (list2.size() != 0) {
+// for (int i = 0; i < list2.size(); i++) {
+// String mechanismname = list2.get(i).get("mechanismname").toString();
+// if (i == list2.size() - 1) {
+// sub += mechanismname;
+// } else {
+// sub += mechanismname + ",";
+// }
+// }
+// String[] split = sub.split(",");
+// long startTime = System.currentTimeMillis(); //获取开始时间
+// for (int j = 0; j < split.length; j++) {
+// //机构设施
+// Mechanism mechanism = new Mechanism();
+// mechanism.setMechanismname(split[j]);
+// Mechanism one = mechanismService.getOne(Condition.getQueryWrapper(mechanism));
+// //建筑
+// Architecture architecture = new Architecture();
+// architecture.setMechanismname(split[j]);
+// Architecture one1 = architectureService.getOne(Condition.getQueryWrapper(architecture));
+// //生活
+// Life life = new Life();
+// life.setMechanismname(split[j]);
+// Life one2 = lifeService.getOne(Condition.getQueryWrapper(life));
+// //机构设施
+// if (one != null) {
+// Map map = new HashMap();
+// map.put("name", split[j]);
+// map.put("list", one);
+// list.add(map);
+// }
+// //建筑
+// else if (one1 != null) {
+// Map map = new HashMap();
+//// //教学科研行政
+//// String jx = mechanismService.selectIn(one1.getId().toString());
+//// //生活设施
+//// String sh = architectureService.selectIns(one1.getId().toString());
+//// map.put("jx", jx);
+//// map.put("sh", sh);
+// map.put("name", split[j]);
+// map.put("list", one1);
+// list.add(map);
+// }
+// //生活
+// else {
+// Map map = new HashMap();
+// map.put("name", split[j]);
+// map.put("list", one2);
+// list.add(map);
+// }
+//
+// }
+// long endTime = System.currentTimeMillis(); //获取结束时间
+// System.out.println("程序运行时间： " + (endTime - startTime) + "ms");
+// }
+// return R.data(list);
+// }
+
/**
* 校园搜索
*
@@ -256,63 +328,15 @@
@GetMapping("/selectLook")
public R selectLook(String mechanismName) {
List list = new ArrayList();
- String sub = "";
List<Map<Object, Object>> maps = architectureService.selectLook(mechanismName);
//排除为null的数据
List<Map<Object, Object>> list2 = maps.parallelStream().filter(Objects::nonNull).collect(Collectors.toList());
- if (list2.size() != 0) {
- for (int i = 0; i < list2.size(); i++) {
- String mechanismname = list2.get(i).get("mechanismname").toString();
- if (i == list2.size() - 1) {
- sub += mechanismname;
- } else {
- sub += mechanismname + ",";
- }
- }
- String[] split = sub.split(",");
- for (int j = 0; j < split.length; j++) {
- //机构设施
- Mechanism mechanism = new Mechanism();
- mechanism.setMechanismname(split[j]);
- Mechanism one = mechanismService.getOne(Condition.getQueryWrapper(mechanism));
- //建筑
- Architecture architecture = new Architecture();
- architecture.setMechanismname(split[j]);
- Architecture one1 = architectureService.getOne(Condition.getQueryWrapper(architecture));
- //生活
- Life life = new Life();
- life.setMechanismname(split[j]);
- Life one2 = lifeService.getOne(Condition.getQueryWrapper(life));
- //机构设施
- if (one != null) {
- Map map = new HashMap();
- map.put("name", split[j]);
- map.put("list", one);
- list.add(map);
- }
- //建筑
- else if (one1 != null) {
- Map map = new HashMap();
- //教学科研行政
- String jx = mechanismService.selectIn(one1.getId().toString());
- //生活设施
- String sh = architectureService.selectIns(one1.getId().toString());
- map.put("jx", jx);
- map.put("sh", sh);
- map.put("name", split[j]);
- map.put("list", one1);
- list.add(map);
- }
- //生活
- else {
- Map map = new HashMap();
- map.put("name", split[j]);
- map.put("list", one2);
- list.add(map);
- }
-
- }
- }
- return R.data(list);
+// for (int i = 0; i < list2.size(); i++) {
+// Map map = new HashMap();
+// map.put("name", list2.get(i).get("mechanismname"));
+// map.put("list", list2);
+// list.add(map);
+// }
+ return R.data(list2);
}
}
--
Gitblit v1.9.3