Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai int...

puzhibing

2024-03-21 c77909ffc32e43ccde9e530cc746161a61f16b30

Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java

@@ -109,13 +109,17 @@
    @PostMapping("/worldCup/getWorldCupStoreListByStoreId")
    public List<WorldCupStoreVO> getWorldCupStoreListByStoreId(@RequestBody Integer storeId){
        List<WorldCupStoreVO> res = new ArrayList<>();

        List<WorldCupStore> storeId1 = worldCupStoreService.list(new QueryWrapper<WorldCupStore>().eq("storeId", storeId));
        List<WorldCupStore> storeId1 = worldCupStoreService.list(
                new QueryWrapper<WorldCupStore>()
                        .eq("storeId", storeId));
        for (WorldCupStore worldCupStore : storeId1) {
            WorldCupStoreVO worldCupStoreVO = new WorldCupStoreVO();
            BeanUtils.copyProperties(worldCupStore,worldCupStoreVO);
            // 查询世界杯活动名称
            WorldCup byId = worldCupService.getById(worldCupStore.getWorldCupId());
            if (byId.getStatus()==3 || byId.getStatus()==4){
                continue;
            }
            worldCupStoreVO.setName(byId.getName());
            res.add(worldCupStoreVO);
        }

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java

@@ -1,6 +1,5 @@
package com.dsh.guns.modular.system.controller.system;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.nacos.common.utils.Md5Utils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -40,6 +39,7 @@
import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
import org.apache.commons.fileupload.FileItem;
import org.apache.tomcat.util.http.fileupload.ByteArrayOutputStream;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.ByteArrayResource;
@@ -316,6 +316,7 @@
        game.setId(id);



        if (!operationId.equals("平台")){
        game.setOperationId(Integer.valueOf(operationId));}
        else {
@@ -323,81 +324,35 @@
        }
        System.out.println("============"+game);

        // 判断一下新增还是修改
        // 如果是修改的话判断 有没有修改场地id 有的话需要重新生成二维码 和sutuid
        if(id!=null){
            Game game1 = ballClient.queryGame(id);
            // 如果场地id不相同那么要重新生成sutu二维码
            if (!game1.getSiteId().equals(site)){
                // 添加sutu编号
                HashMap<String, String> map3 = new HashMap<>();
                HashMap<String, String> map4 = new HashMap<>();
                // 添加sutu编号
                // 调用两次 创建sutu
                TSite si = siteService.getById(site);
                map3.put("sign", "0DB011836143EEE2C2E072967C9F4E4B");
                map4.put("sign", "0DB011836143EEE2C2E072967C9F4E4B");
                map3.put("space_id", si.getId() + "");
                map4.put("space_id", si.getId() + "");
                map3.put("name", blue);
                map4.put("name", red);
                map3.put("city_code", city);
                map4.put("city_code", city);
                String s3 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpaceSutu", map3);
                String s4 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpaceSutu", map4);
                JSONObject jsonObject = new JSONObject(s3);
                JSONObject jsonObject1 = new JSONObject(s4);
                // 获取 data 字段的值
                JSONObject dataObject = jsonObject.getJSONObject("data");
                JSONObject dataObject1 = jsonObject1.getJSONObject("data");
                // 获取 sutu_id 字段的值
                String sutuIdValue = dataObject.getString("sutu_id");
                String sutuIdValue1 = dataObject1.getString("sutu_id");
                Integer sutuId = Integer.valueOf(sutuIdValue);
                Integer sutuId1 = Integer.valueOf(sutuIdValue1);
                game.setBlue(""+sutuId);
                game.setRed(""+sutuId1);

                // 生成红蓝sutu二维码
                HashMap<String, String> blueCode = new HashMap<>();
                blueCode.put("scan_type", "1000");
                blueCode.put("sutu_id", ""+sutuId);
                blueCode.put("space_id", si.getId() + "");
                HashMap<String, String> redCode = new HashMap<>();
                redCode.put("scan_type", "1000");
                redCode.put("sutu_id", sutuId1+"");
                redCode.put("space_id", si.getId() + "");
                String blueS= "{\"scan_type\": 1000, \"space_id\": "+si.getId()+", \"sutu_id\": "+sutuId+"}";
                String redS= "{\"scan_type\": 1000, \"space_id\": "+si.getId()+", \"sutu_id\": "+sutuId1+"}";
                MyQrCodeUtil.createCodeToFile(blueS);
                MyQrCodeUtil.createCodeToFile(redS);
                BufferedImage blueImage = QRCodeUtil.createImage(blueS);
                BufferedImage redImage = QRCodeUtil.createImage(redS);
                MultipartFile blueFile = convert(blueImage, new Date().getTime()+UUIDUtil.getRandomCode(3)+".PNG");
                MultipartFile redFile = convert(redImage, new Date().getTime()+UUIDUtil.getRandomCode(3)+".PNG");
                String s = OssUploadUtil.ossUpload("img/", blueFile);
                String s1 = OssUploadUtil.ossUpload("img/", redFile);
                game.setBlueCode(s);
                game.setRedCode(s1);
            }
        }else{
            // 添加sutu编号
        HashMap<String, String> map5 = new HashMap<>();
        map5.put("space_id", store+"");
        map5.put("area_id", site+"");
        String s5 = HttpRequestUtil.getRequest("https://try.daowepark.com/v7/user_api/general/get_space_sutu", map5);
        System.err.println(s5);
        JSONObject jsonObject5 = new JSONObject(s5);
        // 获取 data 字段的值
        JSONArray data = jsonObject5.getJSONArray("data");
        Integer temp = null;  // 临时sutuid
        Integer temp1 = null; // 临时sutuid
        TSite si = siteService.getById(site);
        if (data.length() == 0){
            // 这个场地没有添加过sutu
            HashMap<String, String> map3 = new HashMap<>();
            HashMap<String, String> map4 = new HashMap<>();
            // 添加sutu编号
            // 调用两次 创建sutu
            TSite si = siteService.getById(site);
            map3.put("sign", "0DB011836143EEE2C2E072967C9F4E4B");
            map4.put("sign", "0DB011836143EEE2C2E072967C9F4E4B");
            map3.put("space_id", si.getId() + "");
            map4.put("space_id", si.getId() + "");
            map3.put("space_id", store + "");
            map3.put("area_id", si.getId() + "");
            map4.put("space_id", store + "");
            map4.put("area_id", si.getId() + "");
            map3.put("name", blue);
            map4.put("name", red);
            map3.put("city_code", city);
            map4.put("city_code", city);
            String s3 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpaceSutu", map3);
            String s4 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpaceSutu", map4);
            System.out.println("---------------------------"+s3);
            JSONObject jsonObject = new JSONObject(s3);
            JSONObject jsonObject1 = new JSONObject(s4);
            // 获取 data 字段的值
@@ -410,7 +365,6 @@
            Integer sutuId1 = Integer.valueOf(sutuIdValue1);
            game.setBlue(""+sutuId);
            game.setRed(""+sutuId1);

            // 生成红蓝sutu二维码
            HashMap<String, String> blueCode = new HashMap<>();
            blueCode.put("scan_type", "1000");
@@ -422,6 +376,43 @@
            redCode.put("space_id", si.getId() + "");
            String blueS= "{\"scan_type\": 1000, \"space_id\": "+si.getId()+", \"sutu_id\": "+sutuId+"}";
            String redS= "{\"scan_type\": 1000, \"space_id\": "+si.getId()+", \"sutu_id\": "+sutuId1+"}";
            MyQrCodeUtil.createCodeToFile(blueS);
            MyQrCodeUtil.createCodeToFile(redS);
            BufferedImage blueImage = QRCodeUtil.createImage(blueS);
            BufferedImage redImage = QRCodeUtil.createImage(redS);
            MultipartFile blueFile = convert(blueImage, new Date().getTime()+UUIDUtil.getRandomCode(3)+".PNG");
            MultipartFile redFile = convert(redImage, new Date().getTime()+UUIDUtil.getRandomCode(3)+".PNG");
            String s = OssUploadUtil.ossUpload("img/", blueFile);
            String s1 = OssUploadUtil.ossUpload("img/", redFile);
            game.setBlueCode(s);
            game.setRedCode(s1);
        }else{
            Integer sutuid=0;
            Integer sutuid1=0;
            JSONObject element = data.getJSONObject(0);
            if (site==27){
                sutuid=1036;
                sutuid1=1037;
                game.setBlue(sutuid.toString());
                game.setRed(sutuid1.toString());
            }else{
                sutuid = element.getInt("id");
                game.setBlue(sutuid.toString());
                JSONObject element1 = data.getJSONObject(1);
                sutuid1 = element1.getInt("id");
                game.setRed(sutuid1.toString());
            }
            // 生成红蓝sutu二维码
            HashMap<String, String> blueCode = new HashMap<>();
            blueCode.put("scan_type", "1000");
            blueCode.put("sutu_id", ""+sutuid);
            blueCode.put("space_id", si.getId() + "");
            HashMap<String, String> redCode = new HashMap<>();
            redCode.put("scan_type", "1000");
            redCode.put("sutu_id", sutuid1+"");
            redCode.put("space_id", si.getId() + "");
            String blueS= "{\"scan_type\": 1000, \"space_id\": "+si.getId()+", \"sutu_id\": "+sutuid+"}";
            String redS= "{\"scan_type\": 1000, \"space_id\": "+si.getId()+", \"sutu_id\": "+sutuid1+"}";
            MyQrCodeUtil.createCodeToFile(blueS);
            MyQrCodeUtil.createCodeToFile(redS);
            BufferedImage blueImage = QRCodeUtil.createImage(blueS);
@@ -582,6 +573,14 @@
        return null;
    }

    public static void main(String[] args) {
        HashMap<String, String> map3 = new HashMap<>();
        map3.put("space_id", "1001");
        map3.put("area_id", "4352");
        String s3 = HttpRequestUtil.getRequest("https://try.daowepark.com/v7/user_api/general/get_space_sutu", map3);

        System.err.println(s3);
    }
    @RequestMapping("/pre_add")
    public String add(Model model) {


 cloud-server-management/src/main/resources/mapper/RoleMapper.xml

@@ -26,8 +26,8 @@
        <if test="objectType == 3">
            and rr.objType =3  and rr.objId =#{objectId}
        </if>
        <if test="objectType == 2">
            and rr.objType =2
        <if test="objectType == 1">
            and rr.objType =1
        </if>
    </select>


 cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop.html

@@ -72,7 +72,7 @@
                    <#button name="SUTU设置" icon="fa-plus" clickFun="TCompetition.addDevice()" space="true"/>
                    @if(role == '1'){
                        @if(shiro.hasPermission("/tHomeModule/tHomeModule_platformSet")){
                        <#button name="平台首页设置" icon="fa-edit" clickFun="TCompetition.platformSet()" space="true"/>
                        <#button name="图文模块设置" icon="fa-edit" clickFun="TCompetition.platformSet()" space="true"/>
                        @}
                    @}
                </div>

 cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop.js

@@ -181,7 +181,7 @@
TCompetition.platformSet = function () {
    var index = layer.open({
        type: 2,
        title:'平台首页设置',
        title:'图文模块设置',
        area: ['100%', '100%'], //宽高
        fix: false, //不固定
        maxmin: true,