From 9e8ce689c89c4b03bfc67a60d7da13a7d593725a Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 24 十月 2023 20:33:41 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java | 10 +++--
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java | 49 +++++++++++++-----------
cloud-server-other/src/main/java/com/dsh/other/entity/BallQueryDto.java | 2 +
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/dto/BallQueryDto.java | 3 +
cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js | 2
cloud-server-course/src/main/java/com/dsh/course/model/QueryCoursePackageLists.java | 1
cloud-server-other/src/main/resources/mapper/GameMapper.xml | 22 ++++++-----
cloud-server-other/src/main/resources/mapper/StoreMapper.xml | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage.html | 5 ++
cloud-server-other/src/main/java/com/dsh/other/mapper/GameMapper.java | 3 +
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 3 +
cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_add.html | 5 +-
12 files changed, 64 insertions(+), 43 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/model/QueryCoursePackageLists.java b/cloud-server-course/src/main/java/com/dsh/course/model/QueryCoursePackageLists.java
index 26b384f..d4c6cdc 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/model/QueryCoursePackageLists.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/model/QueryCoursePackageLists.java
@@ -41,4 +41,5 @@
private Integer offset;
private Integer limit;
private String sort;
+
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
index 42555bb..9cf7bd0 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
@@ -335,7 +335,6 @@
if(yyId==null || type==1){
yyId=0;
}
-
if(yyId!=0) {
List<TOperatorCity> list1 = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getOperatorId, yyId));
if(list1.size()>0){
@@ -388,17 +387,20 @@
}
user.setAccount(userPhone);
user.setName(userName);
- user.setRoleid("2");
+ user.setRoleid("3");
user.setPhone(userPhone);
user.setPassword(SecureUtil.md5("a123456"));
- userMapper.insert(user);
+ user.setObjectType(3);
+ user.setStatus(1);
tStore.setStoreStaffId(user.getId());
tStore.setLon(lon);
tStore.setLat(lat);
-
storeService.save(tStore);
+ user.setObjectId(tStore.getId());
+ userMapper.insert(user);
+
ArrayList<StoreConfig> storeConfigs = new ArrayList<>();
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 ba17e32..1ff8c53 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
@@ -40,6 +40,7 @@
import org.springframework.http.HttpRequest;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.resource.HttpResource;
@@ -482,15 +483,16 @@
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);
+ if(StringUtils.hasLength( site.getIds())) {
+ 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);
+ }
}
@@ -531,20 +533,23 @@
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);
+ if(StringUtils.hasLength(ids)) {
+ 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);
+ 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://try.daowepark.com/v7/user_api/general/addDevice", map1);
+ System.out.println(s1);
+ }
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
index bccc7ab..27eae7f 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
@@ -182,6 +182,9 @@
@ResponseBody
public List<Game> changelist(BallQueryDto ballQueryDto) {
System.out.println("=======ballQueryDto=========="+ballQueryDto);
+ User user = UserExt.getUser();
+ ballQueryDto.setType(user.getObjectType());
+ ballQueryDto.setId(user.getObjectId());
return ballClient.list(ballQueryDto);
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/dto/BallQueryDto.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/dto/BallQueryDto.java
index 7b5c7b9..6723a59 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/dto/BallQueryDto.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/dto/BallQueryDto.java
@@ -8,5 +8,6 @@
String cityCode;
String store;
String site;
-
+ Integer type;
+ Integer id;
}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage.html
index 945abaa..a9cfb51 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage.html
@@ -63,17 +63,20 @@
</div>
</div>
<div class="hidden-xs" id="managerTableToolbar" role="group">
+ @if(objectType !=3){
<#button name="添加" icon="fa-plus" clickFun="CoursePackage.addCoursePackage1()"/>
-
<!-- <#button name="添加" icon="fa-plus" clickFun="CoursePackage.addCoursePackage()"/>-->
<#button name="编辑" icon="fa-edit" clickFun="CoursePackage.editCoursePackage()" space="true"/>
<#button name="上架" icon="fa-refresh" clickFun="CoursePackage.editCoursePackageState(1)" space="true"/>
<#button name="下架" icon="fa-warning" clickFun="CoursePackage.editCoursePackageState(2)" space="true"/>
<#button name="折扣管理" icon="fa-check-circle" clickFun="CoursePackage.coursePackageDiscount()" space="true"/>
<#button name="详情" icon="fa-check-circle" clickFun="CoursePackage.detailsCoursePackage()" space="true"/>
+ @}
<#button name="报名信息" icon="fa-check-circle" clickFun="CoursePackage.registrationRecord()" space="true"/>
+ @if(objectType !=3){
<#button name="暂停" icon="fa-refresh" clickFun="CoursePackage.editCoursePackageState1(1)" space="true"/>
<#button name="开课" icon="fa-warning" clickFun="CoursePackage.editCoursePackageState1(2)" space="true"/>
+ @}
</div>
<#table id="managerTable"/>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_add.html
index b0a57c3..54b4341 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_add.html
@@ -66,6 +66,9 @@
<label class="col-sm-3 control-label">*所属门店：</label>
<div class="col-sm-9">
<select style="width: 300px" class="form-control" id="store" name="store" >
+ @for(obj in stores){
+ <option style="width: 300px" value="${obj.id}">${obj.name}</option>
+ @}
</select>
</div>
</div>
@@ -169,7 +172,6 @@
<button class="btn btn-outline btn-success" type="file" onclick="UploadFileFn()"><i class="fa fa-upload"></i>上传文件</button>
</div>
</div>
- @if(objectType==1){
<div class="row" id="app1">
<div class="form-group">
<label class="col-sm-3 control-label head-scu-label">*实景图片(请上传不超过五张图片): </label>
@@ -190,7 +192,6 @@
</div>
</div>
</div>
- @}
@if(objectType==1){
<#input style="width: 300px" id="ids" name="*添加闸机:" placeholder="请输入闸机ID" type="text"/>
@}
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js b/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js
index 7dcd0eb..324eb4f 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js
@@ -23,7 +23,7 @@
{field: 'selectItem', checkbox: true},
{title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
{
- title: '所属运营商', field: 'operator', visible: true, align: 'center', valign: 'middle',
+ title: '所属运营商', field: 'operator', visible: objectType==3?false:true, align: 'center', valign: 'middle',
formatter: function(value, row, index) {
if (!value || value.trim() === '' || value.trim() === 0) {
return '平台';
diff --git a/cloud-server-other/src/main/java/com/dsh/other/entity/BallQueryDto.java b/cloud-server-other/src/main/java/com/dsh/other/entity/BallQueryDto.java
index 733af90..f353c59 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/entity/BallQueryDto.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/entity/BallQueryDto.java
@@ -12,5 +12,7 @@
String cityCode;
String store;
String site;
+ Integer type;
+ Integer id;
}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/mapper/GameMapper.java b/cloud-server-other/src/main/java/com/dsh/other/mapper/GameMapper.java
index 9ae5c8a..abbe66e 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/mapper/GameMapper.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/mapper/GameMapper.java
@@ -5,6 +5,7 @@
import com.dsh.other.entity.BookingQuery;
import com.dsh.other.entity.Game;
import com.dsh.other.entity.Notice;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
@@ -19,7 +20,7 @@
*/
public interface GameMapper extends BaseMapper<Game> {
- List<Game> queryAll(BallQueryDto ballQueryDto);
+ List<Game> queryAll(@Param("query") BallQueryDto ballQueryDto);
List<Map<String, Object>> orderlist(BookingQuery bookingQuery);
}
diff --git a/cloud-server-other/src/main/resources/mapper/GameMapper.xml b/cloud-server-other/src/main/resources/mapper/GameMapper.xml
index 81f95c4..16290e2 100644
--- a/cloud-server-other/src/main/resources/mapper/GameMapper.xml
+++ b/cloud-server-other/src/main/resources/mapper/GameMapper.xml
@@ -10,24 +10,26 @@
LEFT JOIN t_store st ON ga.storeId = st.id
LEFT JOIN t_operator op ON ga.operationId = op.id
LEFT JOIN t_site si on ga.siteId = si.id
- <where>
- <if test="provinceCode!=null and provinceCode!=''">
- ga.provinceCode = #{provinceCode}
+ where 1=1
+ <if test ="query.type==3">
+ and st.id =#{query.id}
+ </if>
+ <if test="query.provinceCode!=null and query.provinceCode!=''">
+ and ga.provinceCode = #{query.provinceCode}
</if>
- <if test="cityCode!=null and cityCode!=''">
- and ga.cityCode = #{cityCode}
+ <if test="query.cityCode!=null and query.cityCode!=''">
+ and ga.cityCode = #{query.cityCode}
</if>
- <if test="store!=null and store!=''">
- and st.`name` like concat('%',#{store},'%')
+ <if test="query.store!=null and query.store!=''">
+ and st.`name` like concat('%',#{query.store},'%')
</if>
- <if test="site!=null and site!=''">
- and si.`name` like concat('%',#{site},'%')
+ <if test="query.site!=null and query.site!=''">
+ and si.`name` like concat('%',#{query.site},'%')
</if>
- </where>
</select>
diff --git a/cloud-server-other/src/main/resources/mapper/StoreMapper.xml b/cloud-server-other/src/main/resources/mapper/StoreMapper.xml
index 3e4311c..f48630d 100644
--- a/cloud-server-other/src/main/resources/mapper/StoreMapper.xml
+++ b/cloud-server-other/src/main/resources/mapper/StoreMapper.xml
@@ -23,7 +23,7 @@
select * from t_store where cityManagerId = #{id}
</select>
<select id="getStoreByStoreStaffId" resultType="com.dsh.other.entity.Store">
- select * from t_store where storeStaffId = #{id}
+ select * from t_store where id = #{id}
</select>
<select id="getOName" resultType="java.lang.String">
select name from t_operator where id =#{operatorId}
--
Gitblit v1.7.1