From 6ee0c7abed78a110eacb8f2b92fece0d29bc2292 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 07 七月 2025 17:12:12 +0800
Subject: [PATCH] bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java | 45 ++++-----------------------------------------
1 files changed, 4 insertions(+), 41 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 9c652e9..aebfaa6 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
@@ -488,6 +488,7 @@
site.setCityManagerId(cityManagerId);
site.setInsertTime(new Date());
site.setState(1);
+ site.setOperatorId(store.getOperatorId());
// site.setOperatorId(UserExt.getUser().getObjectId());
// 添加场地
@@ -516,54 +517,20 @@
if(site.getInsuranceImg().equals("")){
site.setInsuranceImg(null);
}
-
- TSite byId = siteService.getById(site.getId());
-
Store store = storeClient.getStoreById(site.getStoreId());
-
String province = store.getProvince();
String provinceCode = store.getProvinceCode();
String city = store.getCity();
String cityCode = store.getCityCode();
- Integer cityManagerId = store.getCityManagerId();
-
+ site.setOperatorId(store.getOperatorId());
site.setProvince(province);
site.setProvinceCode(provinceCode);
site.setCity(city);
site.setCityCode(cityCode);
- site.setCityManagerId(cityManagerId);
-
+ site.setCityManagerId(store.getOperatorId());
site.setInsertTime(new Date());
site.setState(1);
siteClient.addSite(site);
-
- /**
- * 取消闸机输入 新增模块闸机管理
- */
-// String ids = byId.getIds();
-// HashMap<String, String> map = new HashMap<>();
-// map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
-// if(StringUtils.hasLength(ids)) {
-// for (String s : ids.split(",")) {
-// String s1 = HttpRequestUtil.postRequest("https://port.daowepark.com/v7/user_api/general/deleteDevice/ids/" + s, map);
-// System.out.println(s1);
-// }
-// }
-// if(StringUtils.hasLength( site.getIds())) {
-// 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://port.daowepark.com/v7/user_api/general/addDevice", map1);
-// System.out.println(s1);
-// }
-// }
-
-
-
return ResultUtil.success();
}
/**
@@ -619,12 +586,8 @@
Integer storeId = tSiteDTO.getStoreId();
TStore byId = storeService.getById(storeId);
if (byId!=null){
- if (byId.getType()==1){
+ if (byId.getOperatorId()==null || byId.getOperatorId()==0){
tSiteDTO.setOperator("平台");
- }else{
- TOperator byId1 = tOperatorService.getById(tSiteDTO.getOperatorId());
- if (byId1!=null)
- tSiteDTO.setOperator(byId1.getName());
}
}
}
--
Gitblit v1.7.1