From 46bf350f8fd4026999b1d6f720ae6701f416e143 Mon Sep 17 00:00:00 2001
From: luoyisheng <2855143437@qq.com>
Date: 星期四, 05 十月 2023 16:48:00 +0800
Subject: [PATCH] 9.26。15
---
cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java | 8 ++
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html | 103 +++++++++++++++++++++++++++++++++
.idea/workspace.xml | 15 ++++-
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 10 +++
4 files changed, 130 insertions(+), 6 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 97f25fb..7f92887 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -27,8 +27,9 @@
<component name="ChangeListManager">
<list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="9.26。15">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/BallClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/BallClient.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -303,7 +304,7 @@
<workItem from="1696427897814" duration="1362000" />
<workItem from="1696433675086" duration="2211000" />
<workItem from="1696462020097" duration="481000" />
- <workItem from="1696465598653" duration="14243000" />
+ <workItem from="1696465598653" duration="19850000" />
</task>
<task id="LOCAL-00001" summary="后台代码删除">
<created>1690249807612</created>
@@ -588,7 +589,15 @@
<option name="project" value="LOCAL" />
<updated>1696488897295</updated>
</task>
- <option name="localTasksCounter" value="38" />
+ <task id="LOCAL-00038" summary="9.26。15">
+ <option name="closed" value="true" />
+ <created>1696489413711</created>
+ <option name="number" value="00038" />
+ <option name="presentableId" value="LOCAL-00038" />
+ <option name="project" value="LOCAL" />
+ <updated>1696489413712</updated>
+ </task>
+ <option name="localTasksCounter" value="39" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
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 52ce056..8179ac2 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
@@ -116,7 +116,15 @@
@RequestMapping("/save")
@ResponseBody
- public ResultUtil save(@RequestBody Game game) {
+ public ResultUtil save(String red,String blue,String province,String city, Integer site,Integer store) {
+// JSONObject jsonObject = JSONObject.parseObject("111");
+ Game game = new Game();
+ game.setRed(red);
+ game.setBlue(blue);
+ game.setProvince(province);
+ game.setCity(city);
+ game.setSiteId(site);
+ game.setStoreId(store);
System.out.println("============"+game);
ballClient.save(game);
return null;
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html
index f84ddbc..6c4a8d0 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html
@@ -200,7 +200,12 @@
"label": "蓝色方",
"name": "blue",
"id": "u:a4dbdeb9165e",
- "mode": "inline"
+ "mode": "inline",
+ "size": "xs",
+ "horizontal": {
+ "leftFixed": "sm"
+ },
+ "value": ""
},
{
"type": "input-text",
@@ -208,6 +213,13 @@
"name": "red",
"id": "u:b0544634a698",
"mode": "inline"
+ },
+ {
+ "type": "tpl",
+ "tpl": "请编辑内容",
+ "inline": true,
+ "wrapperComponent": "",
+ "id": "u:89c3a95a6721"
},
{
"type": "button",
@@ -223,6 +235,93 @@
}
},
"id": "u:b96a47957f17"
+ },
+ {
+ "type": "divider",
+ "id": "u:cc7161244b32"
+ },
+ {
+ "type": "tpl",
+ "id": "u:89c3a95a6721",
+ "tpl": "游戏配置：",
+ "inline": true,
+ "wrapperComponent": "h2"
+ },
+ {
+ "type": "container",
+ "body": [
+ {
+ "type": "card",
+ "header": {
+ "title": "激战球场",
+ "subTitle": "副标题"
+ },
+ "body": [
+ {
+ "type": "input-image",
+ "label": "背景图：",
+ "name": "image",
+ "autoUpload": true,
+ "proxy": true,
+ "uploadType": "fileReceptor",
+ "imageClassName": "r w-full",
+ "receiver": {
+ "url": "object-upload://default",
+ "method": "post"
+ },
+ "id": "u:824383a8e878",
+ "labelClassName": "text-dark"
+ },
+ {
+ "type": "input-text",
+ "label": "游戏名称",
+ "name": "ciji",
+ "id": "u:a4dbdeb9115e",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b",
+ "value": "激战球场"
+ },
+ {
+ "type": "input-text",
+ "label": "玩派币",
+ "name": "cijiCoin",
+ "id": "u:99015dfd4264",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b text-lg"
+ },
+ {
+ "type": "input-text",
+ "label": "现金",
+ "name": "cijiCash",
+ "id": "u:31888fb92add",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b text-lg"
+ },
+ {
+ "type": "input-text",
+ "label": "积分",
+ "name": "cijiInt",
+ "id": "u:c42ab4593d20",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b text-lg"
+ }
+ ],
+ "actions": [
+ ],
+ "id": "u:8445330f451b"
+ }
+ ],
+ "style": {
+ "position": "static",
+ "display": "block",
+ "flexWrap": "nowrap",
+ "maxWidth": "300px",
+ "overflowX": "auto",
+ "margin": "0"
+ },
+ "id": "u:08adb1dcf6b9",
+ "isFixedHeight": false,
+ "isFixedWidth": false
}
],
"api": {
@@ -230,7 +329,7 @@
"method": "post",
"messages": {
},
- "dataType": "form"
+ "dataType": "json"
}
}
]
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java
index b11550b..4012ed7 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java
@@ -37,6 +37,14 @@
}
+ @ResponseBody
+ @PostMapping("/save")
+ public void save(@RequestBody Game game){
+
+ gameService.save(game);
+ }
+
+
}
--
Gitblit v1.7.1