From add2d28c3aeccfe57338c439967abbb83117b20e Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 17 十月 2023 09:56:55 +0800
Subject: [PATCH] 修改bug
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java | 149 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 144 insertions(+), 5 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
index 2cfba7a..4efb096 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
@@ -2,6 +2,7 @@
import java.math.BigDecimal;
import cn.hutool.crypto.SecureUtil;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -27,10 +28,14 @@
import com.dsh.guns.core.util.ToolUtil;
import com.dsh.guns.modular.system.model.*;
import com.dsh.guns.modular.system.service.*;
+import com.dsh.guns.modular.system.util.HttpRequestUtil;
import com.dsh.guns.modular.system.util.ResultUtil;
+
+import groovyjarjarpicocli.CommandLine;
import net.bytebuddy.asm.Advice;
import org.aspectj.weaver.ast.Var;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpRequest;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
@@ -40,10 +45,7 @@
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
+import java.util.*;
/**
* 车辆管理控制器
@@ -90,6 +92,17 @@
private SiteLockClient siteLockClient;
+ /**
+ * 选择市 返回场地列表
+ */
+ @ResponseBody
+ @RequestMapping(value = "/getSiteByCity")
+ public List<TSite> getSiteByCity(String oneId) {
+ if (oneId.equals("")){
+ return siteService.list(new QueryWrapper<TSite>());
+ }
+ return siteService.list(new QueryWrapper<TSite>().eq("cityCode",oneId));
+ }
/**
* 跳转到场地管理首页
*/
@@ -219,6 +232,10 @@
}
Integer objectType = UserExt.getUser().getObjectType();
Integer objectId = UserExt.getUser().getObjectId();
+
+ List<TOperator> list = tOperatorService.list();
+ model.addAttribute("yysList",list);
+
model.addAttribute("userType",objectType);
HashSet<String> set = new HashSet<String>(list1);
QueryWrapper<TSiteType> wrapper = new QueryWrapper<>();
@@ -256,6 +273,33 @@
model.addAttribute("objectType",objectType);
model.addAttribute("objectId",objectId);
model.addAttribute("stores",stores);
+
+ String nextName = site.getNextName();
+ ArrayList<String> strings1 = new ArrayList<>();
+ for (String s : nextName.split(",")) {
+ strings1.add(s);
+ }
+ model.addAttribute("nextNames",strings1);
+
+ ArrayList<String> strings3 = new ArrayList<>();
+ strings3.add("普通场地");
+ strings3.add("智慧场地");
+ model.addAttribute("typeNames",strings3);
+
+ String halfNames = site.getHalfName();
+ ArrayList<String> strings2 = new ArrayList<>();
+ String[] split = halfNames.split(",");
+ String halfName=null;
+ for (int i = 0; i < split.length; i++) {
+ if(i==0){
+ halfName = split[0];
+ }else {
+ strings2.add(split[i]);
+ }
+ }
+ model.addAttribute("halfNames",strings2);
+ model.addAttribute("halfName",halfName);
+
return PREFIX + "TSite_edit.html";
}
@@ -287,6 +331,8 @@
list1.add(cityManager.getProvince());
}
Integer objectType = UserExt.getUser().getObjectType();
+ List<TOperator> list = tOperatorService.list();
+ model.addAttribute("yysList",list);
Integer objectId = UserExt.getUser().getObjectId();
model.addAttribute("userType",objectType);
HashSet<String> set = new HashSet<String>(list1);
@@ -313,6 +359,36 @@
}else{
stores = storeClient.getStore(site.getCity());
}
+
+ ArrayList<String> strings3 = new ArrayList<>();
+ strings3.add("普通场地");
+ strings3.add("智慧场地");
+ model.addAttribute("typeNames",strings3);
+
+
+ String nextName = site.getNextName();
+ ArrayList<String> strings1 = new ArrayList<>();
+ for (String s : nextName.split(",")) {
+ strings1.add(s);
+ }
+ model.addAttribute("nextNames",strings1);
+
+
+
+ String halfNames = site.getHalfName();
+ ArrayList<String> strings2 = new ArrayList<>();
+ String[] split = halfNames.split(",");
+ String halfName=null;
+ for (int i = 0; i < split.length; i++) {
+ if(i==0){
+ halfName = split[0];
+ }else {
+ strings2.add(split[i]);
+ }
+ }
+ model.addAttribute("halfNames",strings2);
+ model.addAttribute("halfName",halfName);
+
List<CityManager> accounts = cityManagerClient.getAccount(site.getCity());
model.addAttribute("list",site);
Date insuranceEndTime = site.getInsuranceEndTime();
@@ -345,6 +421,7 @@
Region name = regionService.getOne(new QueryWrapper<Region>().eq("name", province));
return regionService.list(new QueryWrapper<Region>().eq("parent_id", name.getId()));
}
+
/**
* 添加场地管理
*/
@@ -364,9 +441,35 @@
site.setCityManagerId(cityManagerId);
site.setInsertTime(new Date());
site.setState(1);
- siteClient.addSite(site);
+ Integer integer1 = siteClient.addSite(site);
+
+ HashMap<String, String> map = new HashMap<>();
+ map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
+ map.put("name",site.getName());
+ map.put("space_id",integer1.toString());
+ String s = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpaceArea", map);
+
+ // 添加门禁
+ JSONObject jsonObject = JSONObject.parseObject(s);
+ JSONObject data = jsonObject.getJSONObject("data");
+ String spaceId = data.getString("space_id");
+ Integer integer = Integer.valueOf(spaceId);
+
+ for (String s1 : site.getIds().split(",")) {
+ HashMap<String, String> map1 = new HashMap<>();
+ map1.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
+ map1.put("space_id",site.getStoreId()+"");
+ map1.put("device_id",s1);
+ map1.put("region_id",integer1+"");
+ String s2 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addDevice", map1);
+ System.out.println("添加闸机："+s2);
+ }
+
+
return ResultUtil.success("添加成功");
}
+
+
/**
* 编辑场地管理
*/
@@ -376,6 +479,9 @@
if(site.getInsuranceImg().equals("")){
site.setInsuranceImg(null);
}
+
+ TSite byId = siteService.getById(site.getId());
+
Store store = storeClient.getStoreById(site.getStoreId());
String province = store.getProvince();
@@ -393,6 +499,28 @@
site.setInsertTime(new Date());
site.setState(1);
siteClient.addSite(site);
+
+ String ids = byId.getIds();
+ HashMap<String, String> map = new HashMap<>();
+ map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
+ for (String s : ids.split(",")) {
+ String s1 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/deleteDevice/ids/" + s,map);
+ System.out.println(s1);
+ }
+
+ for (String s : site.getIds().split(",")) {
+ HashMap<String, String> map1 = new HashMap<>();
+ map1.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
+ map1.put("space_id",store.getId()+"");
+ map1.put("device_id",s);
+ map1.put("region_id",site.getId()+"");
+ // 添加门禁
+ String s1 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addDevice", map1);
+ System.out.println(s1);
+ }
+
+
+
return ResultUtil.success();
}
/**
@@ -539,6 +667,17 @@
}
}
+ @RequestMapping(value = "/getChangeOne")
+ @ResponseBody
+ public Object getChangeOne(Integer oneId) {
+ try {
+ return storeService.list(new LambdaQueryWrapper<TStore>().eq(TStore::getOperatorId,oneId).eq(TStore::getState,1));
+ }catch (Exception e){
+ e.printStackTrace();
+ return ERROR;
+ }
+ }
+
// 选择市后 获取对应账号
@RequestMapping(value = "/accountChangeNext")
@ResponseBody
--
Gitblit v1.7.1