From 232d3efb20f87f9c60faeda7bae4bc96e5687bd3 Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期三, 11 十月 2023 19:19:47 +0800 Subject: [PATCH] 10.12 --- cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java | 79 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 75 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 2cfba7a..f5f3c49 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 @@ -27,10 +27,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 +44,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 +91,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 +231,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 +272,29 @@ 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); + + + 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 +326,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); @@ -345,6 +386,7 @@ Region name = regionService.getOne(new QueryWrapper<Region>().eq("name", province)); return regionService.list(new QueryWrapper<Region>().eq("parent_id", name.getId())); } + /** * 添加场地管理 */ @@ -365,8 +407,26 @@ 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()); + HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpace", map); + return ResultUtil.success("添加成功"); } + + /** * 编辑场地管理 */ @@ -539,6 +599,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