From 3d387e6e148b8907bea1e50caa64664bc4a2178c Mon Sep 17 00:00:00 2001 From: nickchange <126672920+nickchange@users.noreply.github.com> Date: 星期一, 16 十月 2023 16:30:39 +0800 Subject: [PATCH] 10.16 --- cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java | 12 cloud-server-other/src/main/java/com/dsh/other/entity/Game.java | 1 cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Game.java | 1 cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit.html | 5 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 69 ++ cloud-server-management/src/main/webapp/static/modular/system/ball/ball.js | 85 ++ cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball.html | 5 cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_info.html | 1518 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 1,676 insertions(+), 20 deletions(-) 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 6c7ba02..99df168 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 @@ -14,6 +14,7 @@ import com.dsh.course.feignClient.course.CoursePackageDiscountClient; import com.dsh.course.feignClient.course.CoursePackagePaymentConfigClient; import com.dsh.course.feignClient.course.CoursePackageTypeClient; +import com.dsh.course.feignClient.course.model.TCoursePackage; import com.dsh.course.feignClient.course.model.TCoursePackageType; import com.dsh.course.feignClient.other.BallClient; import com.dsh.course.feignClient.other.SiteClient; @@ -40,10 +41,7 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.util.Base64Utils; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.io.BufferedReader; @@ -188,6 +186,18 @@ return ballClient.list(ballQueryDto); } + @ResponseBody + @PostMapping("/editCoursePackageState") + public ResultUtil editCoursePackageState(Integer id, Integer state){ + Game game = new Game(); + game.setId(id); + game.setState(state); + ballClient.save(game); + + return ResultUtil.success(); + } + + @RequestMapping("/save") @ResponseBody public ResultUtil save(Integer id, String operationId, String red, String blue, String province, String city, Integer site, Integer store @@ -202,14 +212,11 @@ , String zs2, BigDecimal zs2Coin, BigDecimal zs2Cash, String zs2Image, BigDecimal zs2Int, Integer zs2Id,Integer zs2IId , String ly, BigDecimal lyCoin, BigDecimal lyCash, String lyImage, BigDecimal lyInt, Integer lyId,Integer lyIId - - - - ) { Game game = new Game(); game.setRed(red); + game.setState(0); game.setBlue(blue); game.setProvinceCode(province); game.setCityCode(city); @@ -422,6 +429,52 @@ return PREFIX+"ball_pre_edit.html"; } + + @RequestMapping("/pre_info/{id}") + public String pre_info(@PathVariable("id") Integer id,Model model) { + + Game game = ballClient.queryGame(id); + System.out.println("---------game------"+game); + model.addAttribute("game",game); + + + TGameConfig kc = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 14)); + model.addAttribute("kc",kc); + + + TGameConfig sq = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 16)); + model.addAttribute("sq",sq); + + + TGameConfig sm = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 13)); + model.addAttribute("sm",sm); + + TGameConfig sd = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 15)); + model.addAttribute("sd",sd); + + TGameConfig fk = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 1)); + model.addAttribute("fk",fk); + + TGameConfig jx = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 7)); + model.addAttribute("jx",jx); + + TGameConfig qw = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 8)); + model.addAttribute("qw",qw); + + TGameConfig zs = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 10)); + model.addAttribute("zs",zs); + + TGameConfig zs2 = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 11)); + model.addAttribute("zs2",zs2); + + TGameConfig ly = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 5)); + model.addAttribute("ly",ly); + + + + return PREFIX+"ball_pre_info.html"; + } + @Autowired private ISiteBookingService iSiteBookingService; diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Game.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Game.java index 890a043..e72a27d 100644 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Game.java +++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/Game.java @@ -25,5 +25,6 @@ private Date insertTime; + private Integer state; // 获取和设置方法 } \ No newline at end of file diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball.html index 821164a..0b57dfb 100644 --- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball.html +++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball.html @@ -56,7 +56,12 @@ <#button name="添加" icon="fa-plus" clickFun="TStudent.openAddTStudent()"/> <#button name="修改" icon="fa-edit" clickFun="TStudent.openTStudentDetail()" space="true"/> + <#button name="开启" icon="fa-refresh" clickFun="TStudent.editCoursePackageState(0)" space="true"/> + <#button name="关闭" icon="fa-warning" clickFun="TStudent.editCoursePackageState(1)" space="true"/> + <#button name="查看详情" icon="fa-edit" clickFun="TStudent.openTStudentDetail3()" space="true"/> + <#button name="介绍管理" icon="fa-edit" clickFun="TStudent.openTStudentDetail1()" space="true"/> + <#button name="数据统计" icon="fa-edit" clickFun="TStudent.openTStudentDetail5()" space="true"/> @if(shiro.hasPermission("/tStudent/delete")){ <#button name="删除" icon="fa-remove" clickFun="TStudent.delete()" space="true"/> diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit.html index 9963d5b..a6507d2 100644 --- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit.html +++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit.html @@ -1432,11 +1432,6 @@ }, "script": "window.parent.TStudent.table.refresh();", "actionType": "custom" - }, - { - "args": {}, - "script": "parent.layer.close(window.parent.TStudent.layerIndex);", - "actionType": "custom" } ] } diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_info.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_info.html new file mode 100644 index 0000000..7ac554d --- /dev/null +++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_info.html @@ -0,0 +1,1518 @@ +<!DOCTYPE html> +<html lang="zh"> +<head> + <meta charset="UTF-8" /> + <title>amis demo</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta + name="viewport" + content="width=device-width, initial-scale=1, maximum-scale=1" + /> + <meta http-equiv="X-UA-Compatible" content="IE=Edge" /> + <link rel="stylesheet" href="${ctxPath}/sdk/sdk.css" /> + <link rel="stylesheet" href="${ctxPath}/sdk/helper.css" /> + <link rel="stylesheet" href="${ctxPath}/sdk/iconfont.css" /> + <!-- 这是默认主题所需的,如果是其他主题则不需要 --> + <!-- 从 1.1.0 开始 sdk.css 将不支持 IE 11,如果要支持 IE11 请引用这个 css,并把前面那个删了 --> + <!-- <link rel="stylesheet" href="sdk-ie11.css" /> --> + <!-- 不过 amis 开发团队几乎没测试过 IE 11 下的效果,所以可能有细节功能用不了,如果发现请报 issue --> + <style> + html, + body, + .app-wrapper { + position: relative; + width: 100%; + height: 100%; + margin: 0; + padding: 0; + } + </style> +</head> +<body> +<div id="root" class="app-wrapper"></div> +<script src="${ctxPath}/sdk/sdk.js"></script> +<script type="text/javascript"> + (function () { + let amis = amisRequire('amis/embed'); + // 通过替换下面这个配置来生成不同页面 + let amisJSON = { + "type": "page", + "id": "u:8c028a595aa6", + "body": [ + { + "type": "form", + "id": "u:24af29be25d2", + "title": "", + "body": [ + { + "type": "tpl", + "id": "u:587781d5d181", + "tpl": "                                    *所属运营商:", + "inline": true, + "wrapperComponent": "", + "style": { + "marginLeft": "0" + } + }, + { + "type": "hidden", + "label": "", + "name": "id", + "id": "u:a4dbdeb9115e", + "mode": "inline", + "labelClassName": "text-dark m-b", + "value": `${game.id}`, + "static": true, + } + , + { + "type": "select", + "label": "", + "name": "operationId", + "id": "u:c037c33c2c81", + "mode": "inline", + "size": "md", + "multiple": false, + "showInvalidMatch": false, + "searchable": true, + "clearable": true, + "static": true, + "horizontal": { + "leftFixed": "lg" + }, + "disabledOn": "is!=0", + "required": true, + "source": { + "url": "/ball/yunying", + "method": "post", + "messages": { + } + }, + "labelField": "value", + "valueField": "id", + "value":`${game.operationId}` + },{ + "type": "checkbox", + "option": "平台", + "name": "is", + "static": true, + "id": "u:88f23ebcf4f7", + "onEvent": { + "change": { + "weight": 0, + "actions": [ + { + "componentId": "u:c037c33c2c81", + "args": { + "value": "$event.data.value" + }, + "actionType": "setValue" + } + ] + } + }, + "trueValue": "平台", + "falseValue": 0, + "mode": "inline" + }, + { + "type": "select", + "label": "所在省:", + "name": "province", + "static": true, + "id": "u:63c85c19f3aa", + "multiple": false, + "mode": "horizontal", + "size": "md", + "value":`${game.provinceCode}`, + "horizontal": { + "leftFixed": "lg" + }, + "source": { + "url": "/coursePackage/queryProvince", + "method": "get", + "messages": { + }, + "sendOn": "" + }, + "onEvent": { + "change": { + "weight": 0, + "actions": [ + { + "componentId": "u:14bafe37d5f3", + "actionType": "reload", + "dataMergeMode": "merge" + } + ] + } + }, + "labelField": "name", + "valueField": "code", + "required": true + }, + { + "type": "select", + "label": "所在市:", + "name": "city", + "static": true, + "value":`${game.cityCode}`, + "id": "u:14bafe37d5f3", + "multiple": false, + "mode": "horizontal", + "size": "md", + "horizontal": { + "leftFixed": "lg" + }, + "source": { + "url": "/coursePackage/queryCity1/$province", + "method": "post", + "messages": { + }, + "sendOn": "this.province != null &&this.province != ' '" + }, + "onEvent": { + "change": { + "weight": 0, + "actions": [ + { + "componentId": "u:576899b1b531", + "actionType": "reload", + "dataMergeMode": "merge" + } + ] + } + }, + "labelField": "name", + "valueField": "code", + "required": true + }, + { + "type": "select", + "label": "所属门店:", + "name": "store", + "static": true, + "value":`${game.storeId}`, + "id": "u:576899b1b531", + "multiple": false, + "mode": "horizontal", + "size": "md", + "horizontal": { + "leftFixed": "lg" + }, + "source": { + "method": "post", + "url": "/coursePackage/queryStore1/$city", + "messages": { + }, + "sendOn": "this.city != null &&this.city != ' '" + }, + "labelField": "name", + "valueField": "id", + "onEvent": { + "change": { + "weight": 0, + "actions": [ + { + "componentId": "u:0d288f4bdd8e", + "actionType": "reload", + "dataMergeMode": "merge" + } + ] + } + }, + "required": true + }, + { + "type": "select", + "label": "所属场地:", + "name": "site", + "static": true, + "value":`${game.siteId}`, + "id": "u:0d288f4bdd8e", + "multiple": false, + "mode": "horizontal", + "size": "md", + "horizontal": { + "leftFixed": "lg" + }, + "source": { + "url": "/coursePackage/querySite/$store", + "method": "post", + "messages": { + }, + "dataType": "form", + "requestAdaptor": "", + "adaptor": "", + "silent": true, + "replaceData": true + }, + "labelField": "name", + "valueField": "id", + "required": true + }, + { + "type": "tpl", + "tpl": "                                设备ID:", + "inline": true, + "wrapperComponent": "", + "id": "u:587781d5d181", + "style": { + "marginLeft": "0" + } + }, + { + "type": "input-text", + "label": "蓝色方", + "name": "blue", + "id": "u:a4dbdeb9165e", + "mode": "inline", + "size": "sm", + "static": true, + "horizontal": { + "leftFixed": "sm" + }, + "value": "", + "required": true + , + "value":`${game.blue}` + }, + { + "type": "input-text", + "label": "红色方", + "name": "red", + "id": "u:b0544634a698", + "mode": "inline", + "static": true, + "clearValueOnHidden": false, + "hidden": false, + "required": true + , + "value":`${game.red}` + }, + { + "type": "button", + "label": "按钮", + "onEvent": { + "click": { + "actions": [ + { + "componentId": "u:24af29be25d2", + "actionType": "submit" + } + ] + } + }, + "id": "u:b96a47957f17", + "hidden": true + }, + { + "type": "divider", + "id": "u:cc7161244b32" + }, + { + "type": "tpl", + "id": "u:89c3a95a6721", + "tpl": "游戏配置:", + "inline": true, + "wrapperComponent": "h2" + }, + { + "type": "grid", + "columns": [ + { + "body": [ + { + "type": "card", + "header": { + "title": "玩湃跨城赛", + "subTitle": "" + }, + "body": [ + { + "type": "input-image", + "label": "背景图:", + "name": "kuachengImage", + "autoUpload": true, + "proxy": true, + "uploadType": "fileReceptor", + "imageClassName": "r w-full", + "disabled": true, + "receiver": { + "url": "/mgr/uploadImgAmis", + "method": "post" + }, + "id": "u:824383a8e878", + "labelClassName": "text-dark", + "mode": "inline", + "accept": ".jpeg, .jpg, .png, .gif", + "multiple": false, + "hideUploadButton": false, + "fixedSize": false, + "value":`${kc.img}` + }, + { + "type": "hidden", + "label": "", + "name": "kuacheng", + "id": "u:a4dbdeb9115e", + "mode": "inline", + "labelClassName": "text-dark m-b", + "value": "玩湃跨城赛" + },{ + "type": "hidden", + "label": "", + "name": "kcId", + "id": "u:a4dbdeb9115e", + "mode": "inline", + "labelClassName": "text-dark m-b", + "value": `${kc.id}` + }, + { + "type": "hidden", + "label": "", + "name": "kuachengId", + "id": "u:89bccaf7242f", + "mode": "inline", + "labelClassName": "text-dark m-b", + "value": "14" + }, + { + "type": "tpl", + "id": "u:587781d5d181", + "tpl": "                                ", + "inline": true, + "wrapperComponent": "", + "style": { + "marginLeft": "0" + } + }, + { + "type": "input-text", + "label": "玩派币", + "name": "kuachengCoin", + "id": "u:99015dfd4264", + "mode": "inline", + "static": true, + "labelClassName": "text-dark m-b text-lg" + ,"value" :`${kc.playCoin}` + }, + { + "type": "input-text", + "label": "现金", + "name": "kuachengCash", + "id": "u:31888fb92add", + "mode": "inline", + "static": true, + "labelClassName": "text-dark m-b text-lg", + "value" :`${kc.cash}` + }, + { + "type": "input-text", + "label": "积分", + "name": "kuachengInt", + "id": "u:c42ab4593d20", + "mode": "inline", + "static": true, + "labelClassName": "text-dark m-b text-lg", + "value":`${kc.integral}` + } + ], + "actions": [ + ], + "id": "u:8445330f451b", + "bodyClassName": "no-border b-light", + "className": "no-border" + } + ], + "id": "u:a63f776f28ca", + "columnClassName": "p-l-lg" + }, + { + "body": [ + { + "type": "card", + "header": { + "title": "社区冠军赛", + "subTitle": "" + }, + "body": [ + { + "type": "hidden", + "label": "", + "name": "shequIId", + "id": "u:a4dbdeb9115e", + "mode": "inline", + "labelClassName": "text-dark m-b", + "value": `${sq.id}` + }, + { + "type": "input-image", + "label": "背景图:", + "name": "shequImage", + "autoUpload": true, + "proxy": true, + "disabled": true, + "uploadType": "fileReceptor", + "imageClassName": "r w-full", + "receiver": { + "url": "/mgr/uploadImgAmis", + "method": "post" + }, + "id": "u:824383a8e878", + "labelClassName": "text-dark", + "mode": "inline", + "accept": ".jpeg, .jpg, .png, .gif", + "multiple": false, + "hideUploadButton": false, + "fixedSize": false, + "value":`${sq.img}` + }, + { + "type": "hidden", + "label": "", + "name": "shequ", + "id": "u:a4dbdeb9115e", + "mode": "inline", + "labelClassName": "text-dark m-b", + "value": "社区冠军赛" + }, + { + "type": "hidden", + "label": "", + "name": "shequId", + "id": "u:89bccaf7242f", + "mode": "inline", + "labelClassName": "text-dark m-b", + "value": "16" + }, + { + "type": "tpl", + "id": "u:587781d5d181", + "tpl": "                                ", + "inline": true, + "wrapperComponent": "", + "style": { + "marginLeft": "0" + } + }, + { + "type": "input-text", + "label": "玩派币", + "name": "shequCoin", + "id": "u:99015dfd4264", + "mode": "inline", + "static": true, + "labelClassName": "text-dark m-b text-lg", + "value":`${sq.playCoin}` + }, + { + "type": "input-text", + "label": "现金", + "name": "shequCash", + "id": "u:31888fb92add", + "mode": "inline", + "static": true, + "labelClassName": "text-dark m-b text-lg", + "value":`${sq.cash}` + }, + { + "type": "input-text", + "label": "积分", + "name": "shequInt", + "id": "u:c42ab4593d20", + "static": true, + "mode": "inline", + "labelClassName": "text-dark m-b text-lg", + "value":`${sq.integral}` + } + ], + "actions": [ + ], + "id": "u:8445330f451b", + "bodyClassName": "no-border b-light", + "className": "no-border" + } + ], + "id": "u:882210cd7611" + }, + { + "body": [ + { + "type": "card", + "header": { + "title": "射门速度-玩湃熊之力", + "subTitle": "" + }, + "body": [ + { + "type": "hidden", + "label": "", + "name": "smId", + "id": "u:a4dbdeb9115e", + "mode": "inline", + "labelClassName": "text-dark m-b", + "value": `${sm.id}` + }, + { + "type": "input-image", + "label": "背景图:", + "name": "shemenImage", + "autoUpload": true, + "proxy": true, + "uploadType": "fileReceptor", + "imageClassName": "r w-full", + "disabled":true, + "receiver": { + "url": "/mgr/uploadImgAmis", + "method": "post" + }, + "id": "u:824383a8e878", + "labelClassName": "text-dark", + "mode": "inline", + "accept": ".jpeg, .jpg, .png, .gif", + "multiple": false, + "hideUploadButton": false, + "fixedSize": false, + "value":`${sm.img}` + }, + { + "type": "hidden", + "label": "", + "name": "shemen", + "id": "u:a4dbdeb9115e", + "mode": "inline", + "labelClassName": "text-dark m-b", + "value": "射门速度-玩湃熊之力" + }, + { + "type": "hidden", + "label": "", + "name": "shemenId", + "id": "u:89bccaf7242f", + "mode": "inline", + "labelClassName": "text-dark m-b", + "value": "13" + }, + { + "type": "tpl", + "id": "u:587781d5d181", + "tpl": "                                ", + "inline": true, + "wrapperComponent": "", + "style": { + "marginLeft": "0" + } + }, + { + "type": "input-text", + "label": "玩派币", + "name": "shemenCoin", + "id": "u:99015dfd4264", + "mode": "inline", + "static": true, + "labelClassName": "text-dark m-b text-lg", + "value":`${sm.playCoin}` + }, + { + "type": "input-text", + "label": "现金", + "name": "shemenCash", + "id": "u:31888fb92add", + "mode": "inline", + "static": true, + "labelClassName": "text-dark m-b text-lg", + "value":`${sm.cash}` + }, + { + "type": "input-text", + "label": "积分", + "name": "shemenInt", + "id": "u:c42ab4593d20", + "mode": "inline", + "static": true, + "labelClassName": "text-dark m-b text-lg", + "value":`${sm.integral}` + } + ], + "actions": [ + ], + "id": "u:8445330f451b", + "bodyClassName": "no-border b-light", + "className": "no-border" + } + ], + "id": "u:d191f24cb064" + } + ], + "id": "u:676721d0a98a" + }, + { + "type": "grid", + "columns": [ + { + "body": [ + { + "type": "hidden", + "label": "", + "name": "sdId", + "id": "u:a4dbdeb9115e", + "mode": "inline", + "labelClassName": "text-dark m-b", + "value": `${sd.id}` + }, + { + "type": "card", + "header": { + "title": "玩湃熊之力-速度", + "subTitle": "" + }, + "body": [ + { + "type": "input-image", + "label": "背景图:", + "name": "suduImage", + "autoUpload": true, + "proxy": true, + "disabled":true, + "uploadType": "fileReceptor", + "imageClassName": "r w-full", + "receiver": { + "url": "/mgr/uploadImgAmis", + "method": "post" + }, + "id": "u:4abd099fd344", + "labelClassName": "text-dark", + "mode": "inline", + "accept": ".jpeg, .jpg, .png, .gif", + "multiple": false, + "hideUploadButton": false, + "fixedSize": false, + "value":`${sd.img}` + }, + { + "type": "hidden", + "label": "", + "name": "sudu", + "id": "u:825f01e97cf5", + "mode": "inline", + "labelClassName": "text-dark m-b", + "value": "玩湃熊之力-速度" + }, + { + "type": "tpl", + "id": "u:587781d5d181", + "tpl": "                                ", + "inline": true, + "wrapperComponent": "", + "style": { + "marginLeft": "0" + } + }, + { + "type": "hidden", + "label": "", + "name": "suduId", + "id": "u:ca5a1fd9c191", + "mode": "inline", + "labelClassName": "text-dark m-b", + "value": "15" + }, + { + "type": "input-text", + "label": "玩派币", + "name": "suduCoin", + "id": "u:b6faed384d78", + "mode": "inline", + "static": true, + "labelClassName": "text-dark m-b text-lg", + "value":`${sm.playCoin}` + }, + { + "type": "input-text", + "label": "现金", + "name": "suduCash", + "id": "u:c7181c9b3ded", + "mode": "inline", + "static": true, + "labelClassName": "text-dark m-b text-lg", + "value":`${sm.cash}` + }, + { + "type": "input-text", + "label": "积分", + "name": "suduInt", + "id": "u:ee897e373acb", + "mode": "inline", + "static": true, + "labelClassName": "text-dark m-b text-lg", + "value":`${sm.integral}` + } + ], + "actions": [ + ], + "id": "u:89bd6bd7e231", + "bodyClassName": "no-border b-light", + "className": "no-border" + } + ], + "id": "u:e49a95f9b2c8", + "columnClassName": "p-l-lg" + }, + { + "body": [ + { + "type": "hidden", + "label": "", + "name": "fkId", + "id": "u:a4dbdeb9115e", + "mode": "inline", + "labelClassName": "text-dark m-b", + "value": `${fk.id}` + }, + { + "type": "card", + "header": { + "title": "方块球王", + "subTitle": "" + }, + "body": [ + { + "type": "input-image", + "label": "背景图:", + "name": "fangkuaiImage", + "autoUpload": true, + "proxy": true, + "disabled":true, + "uploadType": "fileReceptor", + "imageClassName": "r w-full", + "receiver": { + "url": "/mgr/uploadImgAmis", + "method": "post" + }, + "id": "u:824383a8e878", + "labelClassName": "text-dark", + "mode": "inline", + "accept": ".jpeg, .jpg, .png, .gif", + "multiple": false, + "hideUploadButton": false, + "fixedSize": false, + "value":`${fk.img}` + }, + { + "type": "hidden", + "label": "", + "name": "fangkuai", + "id": "u:a4dbdeb9115e", + "mode": "inline", + "labelClassName": "text-dark m-b", + "value": "方块球王" + }, + { + "type": "hidden", + "label": "", + "name": "fangkuaiId", + "id": "u:89bccaf7242f", + "mode": "inline", + "labelClassName": "text-dark m-b", + "value": "1" + }, + { + "type": "tpl", + "id": "u:587781d5d181", + "tpl": "                                ", + "inline": true, + "wrapperComponent": "", + "style": { + "marginLeft": "0" + } + }, + { + "type": "input-text", + "label": "玩派币", + "name": "fangkuaiCoin", + "id": "u:99015dfd4264", + "mode": "inline", + "static": true, + "labelClassName": "text-dark m-b text-lg", + "value":`${fk.playCoin}` + }, + { + "type": "input-text", + "label": "现金", + "name": "fangkuaiCash", + "id": "u:31888fb92add", + "mode": "inline", + "static": true, + "labelClassName": "text-dark m-b text-lg", + "value":`${fk.cash}` + }, + { + "type": "input-text", + "label": "积分", + "name": "fangkuaiInt", + "id": "u:c42ab4593d20", + "mode": "inline", + "static": true, + "labelClassName": "text-dark m-b text-lg", + "value" :`${fk.integral}` + } + ], + "actions": [ + ], + "id": "u:8445330f451b", + "bodyClassName": "no-border b-light", + "className": "no-border" + } + ], + "id": "u:3aaf60604641" + }, + { + "body": [ + { + "type": "hidden", + "label": "", + "name": "jxIId", + "id": "u:a4dbdeb9115e", + "mode": "inline", + "labelClassName": "text-dark m-b", + "value": `${jx.id}` + }, + { + "type": "card", + "header": { + "title": "镜像阵容", + "subTitle": "" + }, + "body": [ + { + "type": "input-image", + "label": "背景图:", + "name": "jxImage", + "autoUpload": true, + "proxy": true, + "disabled":true, + "uploadType": "fileReceptor", + "imageClassName": "r w-full", + "receiver": { + "url": "/mgr/uploadImgAmis", + "method": "post" + }, + "id": "u:824383a8e878", + "labelClassName": "text-dark", + "mode": "inline", + "accept": ".jpeg, .jpg, .png, .gif", + "multiple": false, + "hideUploadButton": false, + "fixedSize": false, + "value":`${jx.img}` + }, + { + "type": "hidden", + "label": "", + "name": "jx", + "id": "u:a4dbdeb9115e", + "mode": "inline", + "labelClassName": "text-dark m-b", + "value": "镜像阵容" + }, + { + "type": "hidden", + "label": "", + "name": "jxId", + "id": "u:89bccaf7242f", + "mode": "inline", + "labelClassName": "text-dark m-b", + "value": "7" + }, + { + "type": "tpl", + "id": "u:587781d5d181", + "tpl": "                                ", + "inline": true, + "wrapperComponent": "", + "style": { + "marginLeft": "0" + } + }, + { + "type": "input-text", + "label": "玩派币", + "name": "jxCoin", + "id": "u:99015dfd4264", + "mode": "inline", "static": true, + "labelClassName": "text-dark m-b text-lg", + "value":`${jx.playCoin}` + }, + { + "type": "input-text", + "label": "现金", + "name": "jxCash", + "id": "u:31888fb92add", + "mode": "inline", + "static": true, + "labelClassName": "text-dark m-b text-lg", + "value":`${jx.cash}` + }, + { + "type": "input-text", + "label": "积分", + "name": "jxInt", + "id": "u:c42ab4593d20", + "static": true, + "mode": "inline", + "labelClassName": "text-dark m-b text-lg", + "value":`${jx.integral}` + } + ], + "actions": [ + ], + "id": "u:8445330f451b", + "bodyClassName": "no-border b-light", + "className": "no-border" + } + ], + "id": "u:e80cbf026419" + } + ], + "id": "u:a53000ecee93" + }, + { + "type": "grid", + "columns": [ + { + "body": [ + { + "type": "hidden", + "label": "", + "name": "qwId", + "id": "u:a4dbdeb9115e", + "mode": "inline", + "labelClassName": "text-dark m-b", + "value": `${qw.id}` + }, + { + "type": "card", + "header": { + "title": "社区小球王", + "subTitle": "" + }, + "body": [ + { + "type": "input-image", + "label": "背景图:", + "name": "sqImage", + "autoUpload": true, + "proxy": true, + "disabled":true, + "uploadType": "fileReceptor", + "imageClassName": "r w-full", + "receiver": { + "url": "/mgr/uploadImgAmis", + "method": "post" + }, + "id": "u:94fe22c43628", + "labelClassName": "text-dark", + "mode": "inline", + "accept": ".jpeg, .jpg, .png, .gif", + "multiple": false, + "hideUploadButton": false, + "fixedSize": false, + "value":`${qw.img}` + }, + { + "type": "hidden", + "label": "", + "name": "sq", + "id": "u:49202e62cd8f", + "mode": "inline", + "labelClassName": "text-dark m-b", + "value": "社区小球王" + }, + { + "type": "hidden", + "label": "", + "name": "sqId", + "id": "u:49c300f663f6", + "mode": "inline", + "labelClassName": "text-dark m-b", + "value": "8" + }, + { + "type": "tpl", + "id": "u:587781d5d181", + "tpl": "                                ", + "inline": true, + "wrapperComponent": "", + "style": { + "marginLeft": "0" + } + }, + { + "type": "input-text", + "label": "玩派币", + "name": "sqCoin", + "id": "u:a58559426478", + "mode": "inline", + "static": true, + "labelClassName": "text-dark m-b text-lg", + "value":`${qw.playCoin}` + }, + { + "type": "input-text", + "label": "现金", + "name": "sqCash", + "id": "u:e563cc483458", + "mode": "inline", + "static": true, + "labelClassName": "text-dark m-b text-lg", + "value":`${qw.cash}` + }, + { + "type": "input-text", + "label": "积分", + "name": "sqInt", + "id": "u:688f4b7c3392", + "mode": "inline", + "static": true, + "labelClassName": "text-dark m-b text-lg", + "value":`${qw.integral}` + } + ], + "actions": [ + ], + "id": "u:20efa0a87285", + "bodyClassName": "no-border b-light", + "className": "no-border" + } + ], + "id": "u:19d3a6b86a8d", + "columnClassName": "p-l-lg" + }, + { + "body": [ + { + "type": "hidden", + "label": "", + "name": "zsIId", + "id": "u:a4dbdeb9115e", + "mode": "inline", + "labelClassName": "text-dark m-b", + "value": `${zs.id}` + }, + { + "type": "card", + "header": { + "title": "涨姿势", + "subTitle": "" + }, + "body": [ + { + "type": "input-image", + "label": "背景图:", + "name": "zsImage", + "autoUpload": true, + "proxy": true, + "disabled":true, + "uploadType": "fileReceptor", + "imageClassName": "r w-full", + "receiver": { + "url": "/mgr/uploadImgAmis", + "method": "post" + }, + "id": "u:70a81ae5d75c", + "labelClassName": "text-dark", + "mode": "inline", + "accept": ".jpeg, .jpg, .png, .gif", + "multiple": false, + "hideUploadButton": false, + "fixedSize": false, + "value":`${zs.img}` + }, + { + "type": "hidden", + "label": "", + "name": "zs", + "id": "u:fd19ffe45790", + "mode": "inline", + "labelClassName": "text-dark m-b", + "value": "涨姿势" + }, + { + "type": "hidden", + "label": "", + "name": "zsId", + "id": "u:fe85cbcb2f69", + "mode": "inline", + "labelClassName": "text-dark m-b", + "value": "10" + }, + { + "type": "tpl", + "id": "u:587781d5d181", + "tpl": "                                ", + "inline": true, + "wrapperComponent": "", + "style": { + "marginLeft": "0" + } + }, + { + "type": "input-text", + "label": "玩派币", + "name": "zsCoin", + "id": "u:af69b1a1d9cb", + "mode": "inline", + "static": true, + "labelClassName": "text-dark m-b text-lg", + "value":`${zs.playCoin}` + }, + { + "type": "input-text", + "label": "现金", + "name": "zsCash", + "id": "u:8ba3c740b10c", + "mode": "inline", + "static": true, + "labelClassName": "text-dark m-b text-lg", + "value":`${zs.cash}` + }, + { + "type": "input-text", + "label": "积分", + "name": "zsInt", + "id": "u:6d91bb154939", + "static": true, + "mode": "inline", + "labelClassName": "text-dark m-b text-lg", + "value":`${zs.integral}` + } + ], + "actions": [ + ], + "id": "u:4b37f6a2c067", + "bodyClassName": "no-border b-light", + "className": "no-border" + } + ], + "id": "u:848bad292c8c" + }, + { + "body": [ + + + { + "type": "card", + "header": { + "title": "涨姿势[2]", + "subTitle": "" + }, + "body": [ + + { + "type": "hidden", + "label": "", + "name": "zs2IId", + "id": "u:a4dbdeb9115e", + "mode": "inline", + "labelClassName": "text-dark m-b", + "value": `${zs2.id}` + }, + { + "type": "input-image", + "label": "背景图:", + "name": "zs2Image", + "autoUpload": true, + "disabled":true, + "proxy": true, + "uploadType": "fileReceptor", + "imageClassName": "r w-full", + "receiver": { + "url": "/mgr/uploadImgAmis", + "method": "post" + }, + "id": "u:22f44cb955d7", + "labelClassName": "text-dark", + "mode": "inline", + "accept": ".jpeg, .jpg, .png, .gif", + "multiple": false, + "hideUploadButton": false, + "fixedSize": false, + "value":`${zs2.img}` + }, + { + "type": "hidden", + "label": "", + "name": "zs2", + "id": "u:97b8937d26a1", + "mode": "inline", + "labelClassName": "text-dark m-b", + "value": "激战球场" + }, + { + "type": "hidden", + "label": "", + "name": "zs2Id", + "id": "u:49ad851a7bf9", + "mode": "inline", + "labelClassName": "text-dark m-b", + "value": "11" + }, + { + "type": "tpl", + "id": "u:587781d5d181", + "tpl": "                                ", + "inline": true, + "wrapperComponent": "", + "style": { + "marginLeft": "0" + } + }, + { + "type": "input-text", + "label": "玩派币", + "name": "zs2Coin", + "id": "u:b29c25f053d9", + "static": true, + "mode": "inline", + "labelClassName": "text-dark m-b text-lg", + "value":`${zs2.playCoin}` + }, + { + "type": "input-text", + "label": "现金", + "name": "zs2Cash", + "id": "u:88a44c71abb0", + "static": true, + "mode": "inline", + "labelClassName": "text-dark m-b text-lg", + "value":`${zs2.cash}` + }, + { + "type": "input-text", + "label": "积分", + "name": "zs2Int", + "static": true, + "id": "u:fb82b3cf486c", + "mode": "inline", + "labelClassName": "text-dark m-b text-lg", + "value":`${zs2.integral}` + } + ], + "actions": [ + ], + "id": "u:cd832349886c", + "bodyClassName": "no-border b-light", + "className": "no-border" + } + ], + "id": "u:68716b29d1cd" + } + ], + "id": "u:0df19fcc8fc2" + }, + { + "type": "grid", + "columns": [ + { + "body": [ + { + "type": "hidden", + "label": "", + "name": "lyIId", + "id": "u:a4dbdeb9115e", + "mode": "inline", + "labelClassName": "text-dark m-b", + "value": `${ly.id}` + }, + { + "type": "card", + "header": { + "title": "绿茵密码", + "subTitle": "" + }, + "body": [ + { + "type": "input-image", + "label": "背景图:", + "name": "lyImage", + "disabled":true, + "autoUpload": true, + "proxy": true, + "uploadType": "fileReceptor", + "imageClassName": "r w-full", + "receiver": { + "url": "/mgr/uploadImgAmis", + "method": "post" + }, + "id": "u:704c6970b70d", + "labelClassName": "text-dark", + "mode": "inline", + "accept": ".jpeg, .jpg, .png, .gif", + "multiple": false, + "hideUploadButton": false, + "fixedSize": false, + "value":`${ly.img}` + }, + { + "type": "hidden", + "label": "", + "name": "ly", + "id": "u:c4a543b6cda0", + "mode": "inline", + "labelClassName": "text-dark m-b", + "value": "绿茵密码" + }, + { + "type": "hidden", + "label": "", + "name": "lyId", + "id": "u:90d5f2fa406a", + "mode": "inline", + "labelClassName": "text-dark m-b", + "value": "5" + }, + { + "type": "tpl", + "id": "u:587781d5d181", + "tpl": "                                ", + "inline": true, + "wrapperComponent": "", + "style": { + "marginLeft": "0" + } + }, + { + "type": "input-text", + "label": "玩派币", + "name": "lyCoin", + "id": "u:d78d236c5f95", + "mode": "inline", + "static": true, + "labelClassName": "text-dark m-b text-lg", + "value":`${ly.playCoin}` + }, + { + "type": "input-text", + "label": "现金", + "name": "lyCash", + "static": true, + "id": "u:20b24611e53c", + "mode": "inline", + "labelClassName": "text-dark m-b text-lg", + "value":`${ly.cash}` + }, + { + "type": "input-text", + "label": "积分", + "name": "lyInt", + "id": "u:25e10253effb", + "static": true, + "mode": "inline", + "labelClassName": "text-dark m-b text-lg", + "value":`${ly.integral}` + } + ], + "actions": [ + ], + "id": "u:fe79896823ad", + "bodyClassName": "no-border b-light", + "className": "no-border" + } + ], + "id": "u:b496c245ddf5", + "columnClassName": "p-l-lg" + }, + { + "body": [ + ], + "id": "u:5a16b34e0128" + }, + { + "body": [ + ], + "id": "u:a49cf291b3fe" + } + ], + "id": "u:4641470c31fd" + }, + { + "type": "grid", + "columns": [ + { + "body": [ + { + "id": "u:8254704349a2", + "type": "flex", + "className": "p-1", + "items": [ + { + "type": "button", + "id": "u:6c0b8f917bf7", + "label": "关闭", + "onEvent": { + "click": { + "actions": [ + { + "args": { + }, + "script": "parent.layer.close(window.parent.TStudent.layerIndex);", + "actionType": "custom" + } + ] + } + } + } + ], + "style": { + "position": "relative" + } + } + ], + "id": "u:ebd322f2aab8" + } + ], + "id": "u:1b16988908d9" + } + ], + "api": { + "url": "/ball/save", + "method": "post", + "messages": { + }, + "dataType": "form-data" + }, + "actions": [ + ], + "onEvent": { + "submitSucc": { + "weight": 0, + "actions": [ + { + "args": { + }, + "script": "parent.layer.close(window.parent.TStudent.layerIndex);", + "actionType": "custom" + } + ] + } + } + } + ] + }; + + let amisScoped = amis.embed('#root', amisJSON); + + + })(); + + function test(){ + console.log("测试成功") + } + + var myButton = document.getElementById("ttt"); + myButton.addEventListener("click",test); +</script> + +</body> +</html> \ No newline at end of file diff --git a/cloud-server-management/src/main/webapp/static/modular/system/ball/ball.js b/cloud-server-management/src/main/webapp/static/modular/system/ball/ball.js index eff8c4c..9f402bf 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/ball/ball.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/ball/ball.js @@ -15,7 +15,16 @@ return [ {field: 'selectItem', radio: true}, {title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'}, - {title: '所属运营商', field: 'operation', visible: true, align: 'center', valign: 'middle'}, + { + title: '所属运营商', field: 'operation', visible: true, align: 'center', valign: 'middle', + formatter: function(value, row, index) { + if (value === null) { + return '平台'; + } else { + return value; + } + } + }, {title: '省', field: 'province', visible: true, align: 'center', valign: 'middle'}, {title: '市', field: 'city', visible: true, align: 'center', valign: 'middle'}, { title: '门店名称', field: 'store', visible: true, align: 'center', valign: 'middle'}, @@ -23,7 +32,18 @@ { title: '设备ID', field: 'blue', visible: true, align: 'center', valign: 'middle'}, { title: '设备类型', field: 'red', visible: true, align: 'center', valign: 'middle'}, { title: '设备类型', field: 'red', visible: true, align: 'center', valign: 'middle'}, - { title: '状态', field: 'state', visible: true, align: 'center', valign: 'middle'} + { + title: '状态', field: 'state', visible: true, align: 'center', valign: 'middle', + formatter: function(value, row, index) { + if (value === 0) { + return '开启'; + } else if (value === 1) { + return '关闭'; + } else { + return ''; + } + } + } ]; @@ -43,6 +63,38 @@ } }; + + +TStudent.editCoursePackageState = function (state) { + if (this.check()) { + + if(TStudent.seItem.state == state){ + Feng.error("不能重复操作"); + return + } + parent.layer.confirm(state == 1 ? '是否开启' : "是否关闭" , { + btn: ['确定', '取消'] + }, function (index) { + let ajax = new $ax(Feng.ctxPath + "/ball/editCoursePackageState", function (data) { + Feng.success(state == 1 ? '开启' : "关闭" + "成功!"); + TStudent.table.refresh(); + }, function (data) { + Feng.error(state == 1 ? '开启' : "关闭" + "失败!" + data.responseJSON.message + "!"); + }); + ajax.set("id", TStudent.seItem.id); + ajax.set("state", state); + ajax.start(); + parent.layer.close(index); + + }, function (index) { + parent.layer.close(index); + } + + + ) + + } +}; /** * 点击添加 */ @@ -75,6 +127,35 @@ } }; +TStudent.openTStudentDetail3 = function () { + if (this.check()) { + var index = layer.open({ + type: 2, + title: '详情', + area: ['100%', '100%'], //宽高 + fix: false, //不固定 + maxmin: true, + content: Feng.ctxPath + '/ball/pre_info/' + TStudent.seItem.id + }); + this.layerIndex = index; + } +}; + + +TStudent.openTStudentDetail5 = function () { + if (this.check()) { + var index = layer.open({ + type: 2, + title: '详情', + area: ['100%', '100%'], //宽高 + fix: false, //不固定 + maxmin: true, + content: Feng.ctxPath + '/gameData' + }); + this.layerIndex = index; + } +}; + /** * 打开详情 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 08782b2..71585a9 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 @@ -47,14 +47,16 @@ @PostMapping("/save") public Integer save(@RequestBody Game game){ - Region city = regionService.getOne(new QueryWrapper<Region>().eq("code", game.getCityCode())); - game.setCity(city.getName()); + + if (game.getCityCode()!=null) { + Region city = regionService.getOne(new QueryWrapper<Region>().eq("code", game.getCityCode())); + game.setCity(city.getName()); - Region province = regionService.getOne(new QueryWrapper<Region>().eq("code", game.getProvinceCode())); - game.setProvince(province.getName()); + Region province = regionService.getOne(new QueryWrapper<Region>().eq("code", game.getProvinceCode())); + game.setProvince(province.getName()); - + } gameService.saveOrUpdate(game); diff --git a/cloud-server-other/src/main/java/com/dsh/other/entity/Game.java b/cloud-server-other/src/main/java/com/dsh/other/entity/Game.java index ebc2d76..ba410e4 100644 --- a/cloud-server-other/src/main/java/com/dsh/other/entity/Game.java +++ b/cloud-server-other/src/main/java/com/dsh/other/entity/Game.java @@ -47,6 +47,7 @@ @TableField("insertTime") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date insertTime; + private Integer state; // 获取和设置方法 } \ No newline at end of file -- Gitblit v1.7.1