From a830a73fd10a21e3793c79a35be4e532de124c6f Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 17 十月 2023 17:25:16 +0800
Subject: [PATCH] 10.17.1
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java | 139 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 117 insertions(+), 22 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 f5f3c49..7b8a5aa 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
@@ -1,7 +1,9 @@
package com.dsh.guns.modular.system.controller.code;
import java.math.BigDecimal;
+import cn.hutool.core.collection.CollectionUtil;
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;
@@ -124,13 +126,28 @@
QueryWrapper<TSiteType> wrapper = new QueryWrapper<>();
wrapper.eq("state",1);
List<TSiteType> siteType = siteTypeService.list(wrapper);
- model.addAttribute("list",set);
+
+ List<TCity> list3 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+
+
+
+
+
+
+
+ model.addAttribute("list",list3);
model.addAttribute("siteType",siteType);
String roleid = UserExt.getUser().getRoleid();
model.addAttribute("role",roleid);
model.addAttribute("objectType",objectType);
model.addAttribute("objectId",objectId);
model.addAttribute("type",1);
+
+
+ List<TOperator> list5 = tOperatorService.list();
+
+ model.addAttribute("list5",list5);
+
return PREFIX + "TSite.html";
}
/**
@@ -184,13 +201,15 @@
@RequestMapping("/addSiteLock")
@ResponseBody
public Object addSiteLock(@RequestBody TSiteLockDTO dto){
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
- try {
- dto.setStartTime(simpleDateFormat.parse(dto.getSsTime()));
- dto.setEndTime(simpleDateFormat.parse(dto.getEeTime()));
- } catch (ParseException e) {
- e.printStackTrace();
- }
+// SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+// try {
+// dto.setStartTime(simpleDateFormat.parse(dto.getSsTime()));
+// dto.setEndTime(simpleDateFormat.parse(dto.getEeTime()));
+// } catch (ParseException e) {
+// e.printStackTrace();
+// }
+
+ System.out.println(dto);
Object o = siteLockClient.addSiteLock(dto);
return ResultUtil.success(o);
}
@@ -278,8 +297,15 @@
for (String s : nextName.split(",")) {
strings1.add(s);
}
- model.addAttribute("nextNames",strings1);
+ if (!strings1.get(0).equals("")){
+ System.out.println("=========执行nextNames====");
+ 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<>();
@@ -354,6 +380,41 @@
}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);
+ }
+ System.out.println("========="+strings1);
+ System.out.println("====000====="+strings1.get(0));
+
+ if (CollectionUtil.isNotEmpty(strings1)) {
+ System.out.println("====执行===");
+ 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();
@@ -406,22 +467,30 @@
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("short_name",site.getName());
- map.put("location",city);
- map.put("address",store.getAddress());
- map.put("telephone",store.getPhone());
- map.put("linkman","");
- map.put("business_time","[{\"start_time\":\"00:00\",\"close_time\":\"23:59\"}]");
- map.put("logo",store.getCoverDrawing());
- map.put("remark",site.getIntroduce());
- map.put("lat",store.getLat());
- map.put("lng",store.getLon());
- HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpace", map);
+ 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("添加成功");
}
@@ -436,6 +505,9 @@
if(site.getInsuranceImg().equals("")){
site.setInsuranceImg(null);
}
+
+ TSite byId = siteService.getById(site.getId());
+
Store store = storeClient.getStoreById(site.getStoreId());
String province = store.getProvince();
@@ -453,6 +525,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();
}
/**
@@ -489,7 +583,7 @@
*/
@RequestMapping(value= "/listExipre")
@ResponseBody
- public List<TSiteDTO> listExipre(String province,String city,String storeName,Integer siteTypeId,String name) {
+ public List<TSiteDTO> listExipre(String province,String city,String storeName,Integer siteTypeId,String name,Integer opId) {
// 对象类型
Integer type = UserExt.getUser().getObjectType();
// 对象类型Id
@@ -502,6 +596,7 @@
vo.setName(name);
vo.setObjectType(type);
vo.setObjectId(objectId);
+ vo.setOpId(opId);
return siteClient.listExipre(vo);
}
--
Gitblit v1.7.1