From ea2e322e4564a177b49ad38fda2d42780632ea0d Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期一, 16 十月 2023 11:07:26 +0800
Subject: [PATCH] 10.16
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java | 71 +++++++++++++++++++++++++++++++++--
1 files changed, 67 insertions(+), 4 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 49571e4..50cac19 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,8 +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.*;
@@ -38,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.*;
/**
* 车辆管理控制器
@@ -88,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));
+ }
/**
* 跳转到场地管理首页
*/
@@ -372,6 +387,7 @@
Region name = regionService.getOne(new QueryWrapper<Region>().eq("name", province));
return regionService.list(new QueryWrapper<Region>().eq("parent_id", name.getId()));
}
+
/**
* 添加场地管理
*/
@@ -392,8 +408,38 @@
site.setInsertTime(new Date());
site.setState(1);
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());
+ // 添加门禁
+ String s = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpace", map);
+ JSONObject jsonObject = JSONObject.parseObject(s);
+ JSONObject data = jsonObject.getJSONObject("data");
+ String spaceId = data.getString("space_id");
+ Integer integer = Integer.valueOf(spaceId);
+
+ HashMap<String, String> map1 = new HashMap<>();
+ map1.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
+ map1.put("space_id",integer+"");
+ map1.put("device_id",site.getIds()+"");
+ map1.put("region_id","");
+ String s1 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addDevice", map1);
+
return ResultUtil.success("添加成功");
}
+
+
/**
* 编辑场地管理
*/
@@ -420,6 +466,8 @@
site.setInsertTime(new Date());
site.setState(1);
siteClient.addSite(site);
+ Integer id = site.getId();
+
return ResultUtil.success();
}
/**
@@ -585,6 +633,21 @@
return cityManagerClient.getAccount(oneId);
}
+
+ // 选择账号 获取对应门店
+ @RequestMapping(value = "/getStore")
+ @ResponseBody
+ public Object getStore(Integer oneId) {
+ if (oneId == null){
+ return null;
+ }
+ List<Store> list = storeClient.getStoreByCityManagerId(oneId);
+ if (list.size()==0){
+ return list;
+ }
+ return list;
+ }
+
// 选择市后 获取对应门店
@RequestMapping(value = "/storeChangeNext")
@ResponseBody
--
Gitblit v1.7.1