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 | 51 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 39 insertions(+), 12 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 4efb096..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,6 +1,7 @@
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;
@@ -125,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";
}
/**
@@ -185,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);
}
@@ -279,7 +297,10 @@
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("普通场地");
@@ -371,8 +392,13 @@
for (String s : nextName.split(",")) {
strings1.add(s);
}
- model.addAttribute("nextNames",strings1);
+ 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();
@@ -453,7 +479,7 @@
JSONObject jsonObject = JSONObject.parseObject(s);
JSONObject data = jsonObject.getJSONObject("data");
String spaceId = data.getString("space_id");
- Integer integer = Integer.valueOf(spaceId);
+// Integer integer = Integer.valueOf(spaceId);
for (String s1 : site.getIds().split(",")) {
HashMap<String, String> map1 = new HashMap<>();
@@ -557,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
@@ -570,6 +596,7 @@
vo.setName(name);
vo.setObjectType(type);
vo.setObjectId(objectId);
+ vo.setOpId(opId);
return siteClient.listExipre(vo);
}
--
Gitblit v1.7.1