小程序接口迁移到ry

pom.xml

@@ -175,7 +175,26 @@
                 <artifactId>jjwt</artifactId>
                 <version>${jjwt.version}</version>
             </dependency>
-
+            <dependency>
+                <groupId>com.auth0</groupId>
+                <artifactId>java-jwt</artifactId>
+                <version>3.4.0</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.hutool</groupId>
+                <artifactId>hutool-all</artifactId>
+                <version>5.7.12</version>
+            </dependency>
+<!--            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-boot-starter</artifactId>
+                <version>3.5.3.1</version>
+            </dependency>-->
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>easyexcel</artifactId>
+                <version>3.2.1</version>
+            </dependency>
             <!-- 线程传递值 -->
             <dependency>
                 <groupId>com.alibaba</groupId>

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java

@@ -1,5 +1,6 @@
 package com.ruoyi.system.api;
 
+import com.ruoyi.system.api.model.WxLoginUser;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -31,6 +32,9 @@ public interface RemoteUserService
     @GetMapping("/user/info/{username}")
     public R<LoginUser> getUserInfo(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
+    @PostMapping("/wxLogin/getWxUserInfo")
+    public R<LoginUser> getWxUserInfo(@RequestBody LoginUser wxLoginBody, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
     /**
      * 注册用户信息
      *

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java

@@ -31,6 +31,11 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
                 return R.fail("获取用户失败:" + throwable.getMessage());
             }
 
+            @Override
+            public R<LoginUser> getWxUserInfo(LoginUser wxLoginBody,String source) {
+                return R.fail("获取用户失败:" + throwable.getMessage());
+            }
+
             @Override
             public R<Boolean> registerUserInfo(SysUser sysUser, String source)
             {

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/WxLoginUser.java

@@ -0,0 +1,148 @@
+package com.ruoyi.system.api.model;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+/**
+ * @author 吴一博
+ * @date 2023年07月07日 17:53
+ * @Description
+ */
+public class WxLoginUser {
+    /**
+     * 用户ID
+     */
+    private Long userId;
+    /**
+     * 微信多平台用户唯一ID
+     */
+    private String unionid;
+
+    /**
+     * 微信用户唯一OPEN_ID
+     */
+    private String openId;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+    /**
+     * 用户真实姓名
+     */
+    private String realName;
+    /**
+     * 登录账号
+     */
+    private String loginName;
+
+    /**
+     * 角色ID列表
+     */
+    private List<String> roleCodes;
+    /**
+     * token
+     */
+
+    @ApiModelProperty(value = "token")
+    private String accessToken;
+    /**
+     *刷新token
+     */
+
+    @ApiModelProperty(value = "刷新token")
+    private String refreshToken;
+    /**
+     *用户所拥有的菜单权限(给前端控制菜单和按钮的显示和隐藏)
+     */
+    /*@Setter
+    @Getter
+    @ApiModelProperty(value = "用户所拥有的菜单权限(给前端控制菜单和按钮的显示和隐藏)")
+    private List<PermissionRespNode> list;*/
+
+    /**
+     * wx 登录 后返回的 session_key
+     */
+    private String sessionKey;
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getUnionid() {
+        return unionid;
+    }
+
+    public void setUnionid(String unionid) {
+        this.unionid = unionid;
+    }
+
+    public String getOpenId() {
+        return openId;
+    }
+
+    public void setOpenId(String openId) {
+        this.openId = openId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+        this.loginName = loginName;
+    }
+
+    public List<String> getRoleCodes() {
+        return roleCodes;
+    }
+
+    public void setRoleCodes(List<String> roleCodes) {
+        this.roleCodes = roleCodes;
+    }
+
+    public String getAccessToken() {
+        return accessToken;
+    }
+
+    public void setAccessToken(String accessToken) {
+        this.accessToken = accessToken;
+    }
+
+    public String getRefreshToken() {
+        return refreshToken;
+    }
+
+    public void setRefreshToken(String refreshToken) {
+        this.refreshToken = refreshToken;
+    }
+
+    public String getSessionKey() {
+        return sessionKey;
+    }
+
+    public void setSessionKey(String sessionKey) {
+        this.sessionKey = sessionKey;
+    }
+}

ruoyi-auth/src/main/java/com/ruoyi/auth/controller/WxLoginController.java

@@ -0,0 +1,75 @@
+package com.ruoyi.auth.controller;
+
+/**
+ * @author 吴一博
+ * @date 2023年07月07日 17:47
+ * @Description
+ */
+
+import com.ruoyi.auth.form.WxLoginBody;
+import com.ruoyi.auth.service.SysLoginService;
+import com.ruoyi.auth.service.WxLoginService;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.system.api.model.LoginUser;
+import com.ruoyi.system.api.model.WxLoginUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 微信小程序登录Controller
+ *
+ * @author wyb
+ * @date 2023-07-06
+ */
+@RestController
+@RequestMapping(value="/wxLogin")
+@Api(description = "微信小程序-登录接口")
+public class WxLoginController {
+
+    @Resource
+    private WxLoginService wxLoginService;
+    @Autowired
+    private TokenService tokenService;
+    @ApiOperation("wx用户登录")
+    @PostMapping("/loginInFromWx")
+    @ResponseBody
+    public R<?> loginInFromWx(@RequestBody LoginUser entity) {
+        LoginUser loginUser = wxLoginService.loginInFromWx(entity);
+        return R.ok(tokenService.createToken(loginUser));
+    }
+
+
+    @PostMapping("/user/register")
+    @ApiOperation(value = "wx用户注册接口")
+    public AjaxResult register(@RequestBody WxLoginBody entity) {
+        //loginFeign.register(entity);
+        return AjaxResult.success("注册成功");
+    }
+
+    @ApiOperation("用户登出")
+    @GetMapping("/loginOut")
+    @ResponseBody
+    public AjaxResult loginOut(@PathVariable("id") Long id) throws Exception {
+        return AjaxResult.success("登出成功");
+    }
+}

ruoyi-auth/src/main/java/com/ruoyi/auth/form/WxLoginBody.java

@@ -0,0 +1,114 @@
+package com.ruoyi.auth.form;
+
+import io.swagger.annotations.ApiModelProperty;
+import jdk.nashorn.internal.objects.annotations.Getter;
+import jdk.nashorn.internal.objects.annotations.Setter;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+/**
+ * @author 吴一博
+ * @date 2023年07月07日 17:49
+ * @Description
+ */
+public class WxLoginBody {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 账号(手机号/微信code)
+     */
+
+    @ApiModelProperty(value="账号(手机号/微信code)",required=false)
+    @NotBlank(message = "登录账号不能为空")
+    private String loginName;
+    /**
+     * 登录密码
+     */
+
+    @ApiModelProperty(value = "用户密码")
+    private String password;
+    /**
+     * 用户手机号（微信登录需要传）
+     */
+
+    @ApiModelProperty(value = "用户手机号")
+    private String telephone;
+    /**
+     *头像（微信登录需要传）
+     */
+    private String avatar;
+    /**
+     *性别（微信登录需要传）
+     */
+
+    private Integer gender;
+    /**
+     *昵称（微信登录需要传）
+     */
+
+    private String nickname;
+    /**
+     * 登录类型(1:pc;2:wx)
+     */
+
+    @ApiModelProperty(value = "登录类型(1:pc;2:wx)")
+    @NotBlank(message = "登录类型不能为空")
+    private String type;
+
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+        this.loginName = loginName;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getTelephone() {
+        return telephone;
+    }
+
+    public void setTelephone(String telephone) {
+        this.telephone = telephone;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public Integer getGender() {
+        return gender;
+    }
+
+    public void setGender(Integer gender) {
+        this.gender = gender;
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+}

ruoyi-auth/src/main/java/com/ruoyi/auth/service/WxLoginService.java

@@ -0,0 +1,26 @@
+package com.ruoyi.auth.service;
+
+import com.ruoyi.auth.form.WxLoginBody;
+import com.ruoyi.common.core.constant.SecurityConstants;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.api.RemoteUserService;
+import com.ruoyi.system.api.model.LoginUser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author 吴一博
+ * @date 2023年07月07日 17:52
+ * @Description
+ */
+@Component
+public class WxLoginService {
+    @Autowired
+    private RemoteUserService remoteUserService;
+    public LoginUser loginInFromWx(LoginUser entity) {
+        // 查询用户信息
+        R<LoginUser> userResult  = remoteUserService.getWxUserInfo(entity,SecurityConstants.INNER);
+        LoginUser userInfo = userResult.getData();
+        return userInfo;
+    }
+}

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java

@@ -121,10 +121,133 @@ public class Constants
      * 定时任务白名单配置（仅允许访问的包名，如其他需要可以自行添加）
      */
     public static final String[] JOB_WHITELIST_STR = { "com.ruoyi" };
-
     /**
      * 定时任务违规的字符
      */
     public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",
             "org.springframework", "org.apache", "com.ruoyi.common.core.utils.file" };
+
+
+    /**
+     * 用户ID key
+     */
+    public static final String JWT_USER_ID="user_id";
+    /**
+     * 用户ID key
+     */
+    public static final String JWT_USER_NAME="user_name";
+    /**
+     * 用户ID key
+     */
+    public static final String JWT_LOGIN_NAME="login_name";
+
+    /**
+     * 真实姓名
+     */
+    public static final String JWT_REAL_NAME="real_name";
+
+    /**
+     * 微信多平台唯一ID key
+     */
+    public static final String JWT_UNIONID="unionid";
+    /**
+     * 登录微信后的session_key
+     */
+    public static final String JWT_SESSION_KEY = "session_key";
+
+    /**
+     * 登录微信后的open_id
+     */
+    public static final String JWT_OPEN_ID = "open_id";
+    /**
+     * 小程序ACCESS_TOKEN缓存key
+     */
+    public static final String WX_APPLETS_REDIS_ACCESS_TOKEN_KEY="wx.applets.access.token.key";
+    /**
+     * 微信小程序--服务器验证专用token
+     */
+    public static final String WX_APPLETS_TOKEN="oHDqn56DWSxUHyiOnqLAyawfUj0k";
+    /**
+     * 微信小程序--开发者账号的appid
+     */
+    public static final String WX_APPLETS_APP_ID="wxd4300820f84a6d6b";
+    /**
+     * 微信小程序--开发者账号的AppSecret
+     */
+    public static final String WX_APPLETS_APP_SERCERT="16daf686025b3d9755976d79615b254f";
+
+    /**
+     * 公众号ACCESS_TOKEN缓存key
+     */
+    public static final String WX_OFFICIAL_ACCOUNT_REDIS_ACCESS_TOKEN_KEY="wx.officialAccount.access.token.key";
+    /**
+     * 微信公众号--服务器验证专用token
+     */
+    public static final String WX_OFFICIAL_ACCOUNT_TOKEN="oHDqn56DWSxUHyiOnqLAyawfUj0k";
+    /**
+     * 微信公众号--开发者账号的appid
+     */
+    public static final String WX_OFFICIAL_ACCOUNT_APPID ="wx42f8776ad330e623";
+    /**
+     * 微信公众号--开发者账号的AppSecret
+     */
+    public static final String WX_OFFICIAL_ACCOUNT_APPSECRET="6dd7ea55e17ec30df20164f1de1e9e5f";
+
+    /**
+     * 赛会： 赛会创建-防重提交缓存key
+     */
+    public static final String COMPETITION_CREATE_KEY = "competition:create:code:";
+    /**
+     * 赛会： 赛会创建时保存的短信验证码缓存key
+     */
+    public static final String ESTABLISH_COMPETITION_SMS_CAPTCHA = "competition:verifyCode:";
+
+    /**
+     * 赛会： 球队申请加入赛会-短信验证码缓存key
+     */
+    public static final String COMPETITION_TEAM_CAPTCHA = "competition:team:verifyCode:";
+    /**
+     * 赛会：球队-球员申请加入球队-短信验证码缓存key
+     */
+    public static final String COMPETITION_TEAM_MEMBER_CAPTCHA = "competition:team:member:verifyCode:";
+    /**
+     * 球队加入验证码过期时间-有效期 (秒)
+     */
+    public static final Long COMPETITION_TEAM_MEMBER_CAPTCHA_EXPIRES = 300L;
+    /**
+     * 泡泡短信平台-url前缀
+     */
+    public static final String SMS_PAOPAO_URL = "http://47.94.229.220:7862/sms";
+    /**
+     * 泡泡短信平台-account
+     */
+    public static final String SMS_PAOPAO_ACCOUNT = "911136";
+    /**
+     * 泡泡短信平台-密码 password
+     */
+    public static final String SMS_PAOPAO_PASSWORD = "MMfZ3p";
+    /**
+     * 泡泡短信平台-接入号 extno
+     */
+    public static final String SMS_PAOPAO_EXTNO = "106901911136";
+    /**
+     * 泡泡短信平台-有效期 (秒)
+     */
+    public static final Long SMS_PAOPAO_EXPIRES = 900L;
+    /**
+     * 短信签名
+     */
+    public static final String SMS_PAOPAO_SIGN="【篮球Zone】";
+    /**
+     * 存放赛程循环赛的锁的key
+     */
+    public static final String ARRANGE_TEAM_GROUP_SCHEDULE="arrange:team:group:schedule:";
+    /**
+     * Redis 存放乐橙云 管理员token
+     */
+    public static final String LECHANGE_ACCESSTOKEN = "lechange:accesstoken";
+    /**
+     * Redis 存放乐橙云 轻应用播放token
+     */
+    public static final String LECHANGE_LIVE_KITTOKEN = "lechange:live:kittoken";
 }

ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/InnerAuthAspect.java

@@ -11,6 +11,8 @@ import com.ruoyi.common.core.utils.ServletUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.security.annotation.InnerAuth;
 
+import static com.ruoyi.common.core.constant.SecurityConstants.FROM_SOURCE;
+
 /**
  * 内部服务调用验证处理
  * 
@@ -23,7 +25,7 @@ public class InnerAuthAspect implements Ordered
     @Around("@annotation(innerAuth)")
     public Object innerAround(ProceedingJoinPoint point, InnerAuth innerAuth) throws Throwable
     {
-        String source = ServletUtils.getRequest().getHeader(SecurityConstants.FROM_SOURCE);
+        String source = ServletUtils.getRequest().getHeader(FROM_SOURCE);
         // 内部请求验证
         if (!StringUtils.equals(SecurityConstants.INNER, source))
         {

ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java

@@ -4,6 +4,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import javax.servlet.http.HttpServletRequest;
+
+import com.ruoyi.system.api.model.WxLoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import com.ruoyi.common.core.constant.CacheConstants;
@@ -44,8 +46,8 @@ public class TokenService
     public Map<String, Object> createToken(LoginUser loginUser)
     {
         String token = IdUtils.fastUUID();
-        Long userId = loginUser.getSysUser().getUserId();
-        String userName = loginUser.getSysUser().getUserName();
+        Long userId = loginUser.getUserid();
+        String userName = loginUser.getUsername();
         loginUser.setToken(token);
         loginUser.setUserid(userId);
         loginUser.setUsername(userName);
@@ -62,9 +64,9 @@ public class TokenService
         Map<String, Object> rspMap = new HashMap<String, Object>();
         rspMap.put("access_token", JwtUtils.createToken(claimsMap));
         rspMap.put("expires_in", expireTime);
+        rspMap.put("user",loginUser);
         return rspMap;
     }
-
     /**
      * 获取用户身份信息
      *

ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/apiConstants/ApiTerminal.java

@@ -0,0 +1,10 @@
+package com.ruoyi.common.swagger.apiConstants;
+/**
+ * @description API 接口使用终端
+ * @author 吴一博
+ * @date 2023/7/4 10:18
+ */
+public class ApiTerminal {
+    public static final String wxMiniProgram="微信小程序-";
+    public static final String pc="PC端-";
+}

ruoyi-modules/ruoyi-system/pom.xml

@@ -71,7 +71,18 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common-log</artifactId>
         </dependency>
-        
+        <dependency>
+            <groupId>com.auth0</groupId>
+            <artifactId>java-jwt</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel</artifactId>
+        </dependency>
         <!-- RuoYi Common Swagger -->
         <dependency>
             <groupId>com.ruoyi</groupId>

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/BuildingInfoDetailController.java

@@ -0,0 +1,105 @@
+package com.ruoyi.system.controller;
+
+import java.util.List;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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.RestController;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.system.domain.BuildingInfoDetail;
+import com.ruoyi.system.service.IBuildingInfoDetailService;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+
+/**
+ * 【请填写功能名称】Controller
+ * 
+ * @author ruoyi
+ * @date 2023-07-06
+ */
+@RestController
+@RequestMapping("/buildingInfoDetail")
+public class BuildingInfoDetailController extends BaseController
+{
+    @Autowired
+    private IBuildingInfoDetailService buildingInfoDetailService;
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @RequiresPermissions("system:detail:list")
+    @GetMapping("/list")
+    public TableDataInfo list(BuildingInfoDetail buildingInfoDetail)
+    {
+        startPage();
+        List<BuildingInfoDetail> list = buildingInfoDetailService.selectBuildingInfoDetailList(buildingInfoDetail);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出【请填写功能名称】列表
+     */
+    @RequiresPermissions("system:detail:export")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BuildingInfoDetail buildingInfoDetail)
+    {
+        List<BuildingInfoDetail> list = buildingInfoDetailService.selectBuildingInfoDetailList(buildingInfoDetail);
+        ExcelUtil<BuildingInfoDetail> util = new ExcelUtil<BuildingInfoDetail>(BuildingInfoDetail.class);
+        util.exportExcel(response, list, "【请填写功能名称】数据");
+    }
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     */
+    @RequiresPermissions("system:detail:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(buildingInfoDetailService.selectBuildingInfoDetailById(id));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    @RequiresPermissions("system:detail:add")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BuildingInfoDetail buildingInfoDetail)
+    {
+        return toAjax(buildingInfoDetailService.insertBuildingInfoDetail(buildingInfoDetail));
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    @RequiresPermissions("system:detail:edit")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BuildingInfoDetail buildingInfoDetail)
+    {
+        return toAjax(buildingInfoDetailService.updateBuildingInfoDetail(buildingInfoDetail));
+    }
+
+    /**
+     * 删除【请填写功能名称】
+     */
+    @RequiresPermissions("system:detail:remove")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(buildingInfoDetailService.deleteBuildingInfoDetailByIds(ids));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/BuildingLabelController.java

@@ -0,0 +1,105 @@
+package com.ruoyi.system.controller;
+
+import java.util.List;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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.RestController;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.system.domain.BuildingLabel;
+import com.ruoyi.system.service.IBuildingLabelService;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+
+/**
+ * 【请填写功能名称】Controller
+ * 
+ * @author ruoyi
+ * @date 2023-07-04
+ */
+@RestController
+@RequestMapping("/label")
+public class BuildingLabelController extends BaseController
+{
+    @Autowired
+    private IBuildingLabelService buildingLabelService;
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @RequiresPermissions("system:label:list")
+    @GetMapping("/list")
+    public TableDataInfo list(BuildingLabel buildingLabel)
+    {
+        startPage();
+        List<BuildingLabel> list = buildingLabelService.selectBuildingLabelList(buildingLabel);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出【请填写功能名称】列表
+     */
+    @RequiresPermissions("system:label:export")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BuildingLabel buildingLabel)
+    {
+        List<BuildingLabel> list = buildingLabelService.selectBuildingLabelList(buildingLabel);
+        ExcelUtil<BuildingLabel> util = new ExcelUtil<BuildingLabel>(BuildingLabel.class);
+        util.exportExcel(response, list, "【请填写功能名称】数据");
+    }
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     */
+    @RequiresPermissions("system:label:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(buildingLabelService.selectBuildingLabelById(id));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    @RequiresPermissions("system:label:add")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BuildingLabel buildingLabel)
+    {
+        return toAjax(buildingLabelService.insertBuildingLabel(buildingLabel));
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    @RequiresPermissions("system:label:edit")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BuildingLabel buildingLabel)
+    {
+        return toAjax(buildingLabelService.updateBuildingLabel(buildingLabel));
+    }
+
+    /**
+     * 删除【请填写功能名称】
+     */
+    @RequiresPermissions("system:label:remove")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(buildingLabelService.deleteBuildingLabelByIds(ids));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/BuildingTeamRelController.java

@@ -0,0 +1,105 @@
+package com.ruoyi.system.controller;
+
+import java.util.List;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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.RestController;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.system.domain.BuildingTeamRel;
+import com.ruoyi.system.service.IBuildingTeamRelService;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+
+/**
+ * 【请填写功能名称】Controller
+ * 
+ * @author ruoyi
+ * @date 2023-07-04
+ */
+@RestController
+@RequestMapping("/buildingTeamRel")
+public class BuildingTeamRelController extends BaseController
+{
+    @Autowired
+    private IBuildingTeamRelService buildingTeamRelService;
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @RequiresPermissions("system:rel:list")
+    @GetMapping("/list")
+    public TableDataInfo list(BuildingTeamRel buildingTeamRel)
+    {
+        startPage();
+        List<BuildingTeamRel> list = buildingTeamRelService.selectBuildingTeamRelList(buildingTeamRel);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出【请填写功能名称】列表
+     */
+    @RequiresPermissions("system:rel:export")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BuildingTeamRel buildingTeamRel)
+    {
+        List<BuildingTeamRel> list = buildingTeamRelService.selectBuildingTeamRelList(buildingTeamRel);
+        ExcelUtil<BuildingTeamRel> util = new ExcelUtil<BuildingTeamRel>(BuildingTeamRel.class);
+        util.exportExcel(response, list, "【请填写功能名称】数据");
+    }
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     */
+    @RequiresPermissions("system:rel:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(buildingTeamRelService.selectBuildingTeamRelById(id));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    @RequiresPermissions("system:rel:add")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BuildingTeamRel buildingTeamRel)
+    {
+        return toAjax(buildingTeamRelService.insertBuildingTeamRel(buildingTeamRel));
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    @RequiresPermissions("system:rel:edit")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BuildingTeamRel buildingTeamRel)
+    {
+        return toAjax(buildingTeamRelService.updateBuildingTeamRel(buildingTeamRel));
+    }
+
+    /**
+     * 删除【请填写功能名称】
+     */
+    @RequiresPermissions("system:rel:remove")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(buildingTeamRelService.deleteBuildingTeamRelByIds(ids));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CameraInfoController.java

@@ -0,0 +1,105 @@
+package com.ruoyi.system.controller;
+
+import java.util.List;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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.RestController;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.system.domain.CameraInfo;
+import com.ruoyi.system.service.ICameraInfoService;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+
+/**
+ * 【请填写功能名称】Controller
+ * 
+ * @author ruoyi
+ * @date 2023-07-04
+ */
+@RestController
+@RequestMapping("/cameraInfo")
+public class CameraInfoController extends BaseController
+{
+    @Autowired
+    private ICameraInfoService cameraInfoService;
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @RequiresPermissions("system:info:list")
+    @GetMapping("/list")
+    public TableDataInfo list(CameraInfo cameraInfo)
+    {
+        startPage();
+        List<CameraInfo> list = cameraInfoService.selectCameraInfoList(cameraInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出【请填写功能名称】列表
+     */
+    @RequiresPermissions("system:info:export")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CameraInfo cameraInfo)
+    {
+        List<CameraInfo> list = cameraInfoService.selectCameraInfoList(cameraInfo);
+        ExcelUtil<CameraInfo> util = new ExcelUtil<CameraInfo>(CameraInfo.class);
+        util.exportExcel(response, list, "【请填写功能名称】数据");
+    }
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     */
+    @RequiresPermissions("system:info:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(cameraInfoService.selectCameraInfoById(id));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    @RequiresPermissions("system:info:add")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CameraInfo cameraInfo)
+    {
+        return toAjax(cameraInfoService.insertCameraInfo(cameraInfo));
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    @RequiresPermissions("system:info:edit")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CameraInfo cameraInfo)
+    {
+        return toAjax(cameraInfoService.updateCameraInfo(cameraInfo));
+    }
+
+    /**
+     * 删除【请填写功能名称】
+     */
+    @RequiresPermissions("system:info:remove")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(cameraInfoService.deleteCameraInfoByIds(ids));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionController.java

@@ -1,28 +1,58 @@
 package com.ruoyi.system.controller;
 
-import java.util.List;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.security.InvalidParameterException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
 import java.io.IOException;
+import java.util.concurrent.TimeUnit;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.system.UserInfo;
+import com.alibaba.csp.sentinel.util.IdUtil;
+import com.alibaba.fastjson.JSON;
+import com.ruoyi.common.core.constant.Constants;
+import com.ruoyi.common.core.exception.CheckedException;
+import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.uuid.IdUtils;
+import com.ruoyi.common.redis.service.RedisService;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.common.swagger.apiConstants.ApiTerminal;
 import com.ruoyi.system.api.domain.vo.WxAppletsCodeVo;
+import com.ruoyi.system.api.model.LoginUser;
+import com.ruoyi.system.api.model.WxLoginUser;
+import com.ruoyi.system.domain.*;
+import com.ruoyi.system.domain.vo.*;
+import com.ruoyi.system.service.*;
+import com.ruoyi.system.utils.LoginUserUtil;
+import com.ruoyi.system.utils.UtilTool;
+import io.seata.core.model.Result;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.ooxml.POIXMLDocumentPart;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.usermodel.*;
+import org.aspectj.weaver.loadtime.Aj;
+import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-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.RestController;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.system.domain.Competition;
-import com.ruoyi.system.service.ICompetitionService;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.web.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 比赛信息Controller
@@ -36,6 +66,24 @@ public class CompetitionController extends BaseController
 {
     @Autowired
     private ICompetitionService competitionService;
+    @Autowired
+    private ICompetitionOfTeamService competitionOfTeamService;
+    @Autowired
+    private ICompetitionMembersService competitionMembersService;
+    @Autowired
+    private IWxUserService wxUserService;
+
+    @Autowired
+    private RedisService redisService;
+    @Autowired
+    private SmsService smsService;
+
+    @Value("${image.location.linux}")
+    private String linuxLocation;
+    @Value("${image.location.windows}")
+    private String winLocation;
+    @Value("${image.domainName}")
+    private String domainName;
 
     /**
      * 查询比赛信息列表
@@ -66,19 +114,50 @@ public class CompetitionController extends BaseController
      * 获取比赛信息详细信息
      */
     @RequiresPermissions("system:competition:query")
-    @GetMapping(value = "/{id}")
+    @GetMapping(value = "/getInfo/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
         return AjaxResult.success(competitionService.selectCompetitionById(id));
     }
-
+    @ApiOperation(ApiTerminal.wxMiniProgram+"根据ID查询比赛详情")
+    @GetMapping("/detail/{id}")
+    @ResponseBody
+    public AjaxResult detail(@PathVariable("id") Long id){
+        CompetitionResponse competition = competitionService.getCompetitionById(id);
+        return AjaxResult.success(competition);
+    }
+    @PostMapping("/getMyJoinCompetition")
+    @ResponseBody
+    @ApiOperation(value = ApiTerminal.wxMiniProgram+"分页获取我参与过的比赛列表")
+    public TableDataInfo getMyJoinCompetition(@RequestBody CompetitionVo entity) {
+        startPage();
+        //关键字word包含：球队名称、地点名称、球馆名称，支持模糊搜索；
+        entity.setIsDeleted(0);
+        List<Competition> list = competitionService.getMyJoinCompetition(entity);
+        return getDataTable(list);
+    }
+    @ApiOperation(ApiTerminal.wxMiniProgram+"创建约战")
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult add(@RequestBody Competition entity)  {
+        return AjaxResult.success(competitionService.add(entity));
+    }
+    @ApiOperation(ApiTerminal.wxMiniProgram+"获取自动生成的赛会唯一编码")
+    @GetMapping("/genCompetitionCode")
+    @ResponseBody
+    public AjaxResult genCompetitionCode() {
+        DateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+        System.out.println(sdf.format(new Date()) + RandomStringUtils.randomNumeric(6));
+        String code = "B" + sdf.format(new Date()) + RandomStringUtils.randomNumeric(6);
+        return AjaxResult.success(code);
+    }
     /**
      * 新增比赛信息
      */
     @RequiresPermissions("system:competition:add")
     @Log(title = "比赛信息", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody Competition competition)
+    public AjaxResult addCompetition(@RequestBody Competition competition)
     {
         return toAjax(competitionService.insertCompetition(competition));
     }
@@ -97,7 +176,7 @@ public class CompetitionController extends BaseController
     @RequiresPermissions("system:competition:edit")
     @Log(title = "比赛信息", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody Competition competition)
+    public AjaxResult editCompetition(@RequestBody Competition competition)
     {
         return toAjax(competitionService.updateCompetition(competition));
     }
@@ -112,4 +191,453 @@ public class CompetitionController extends BaseController
     {
         return toAjax(competitionService.deleteCompetitionByIds(ids));
     }
+
+    @ApiOperation(ApiTerminal.wxMiniProgram+"应战确认")
+    @PostMapping("/challengeConfirm")
+    @ResponseBody
+    public AjaxResult challengeConfirm(@RequestBody Competition entity) throws Exception {
+        if (UtilTool.isNull(entity)) {
+            throw new InvalidParameterException("参数异常，非法操作！");
+        } else if (entity.getId() == null) {
+            throw new InvalidParameterException("约战id不能为空");
+        } else if (entity.getGuestTeamId() == null) {
+            throw new InvalidParameterException("应战teamId不能为空");
+        }
+        return AjaxResult.success(competitionService.challengeConfirm(entity));
+    }
+    @ApiOperation(ApiTerminal.wxMiniProgram+"创建赛会")
+    @PostMapping("/establishCompetition")
+    @ResponseBody
+    public AjaxResult establishCompetition(@RequestBody CompetitionVo entity){
+        //校验数据字段
+        if (StringUtils.isEmpty(entity)) {
+            throw new InvalidParameterException("参数异常，非法操作！");
+        }
+        if (StringUtils.isEmpty(entity.getCompetitionName())) {
+            throw new InvalidParameterException("赛会名称【competitionName】不能为空！");
+        } else if (StringUtils.isEmpty(entity.getCityCode())) {
+            throw new InvalidParameterException("举办城市【cityCode】不能为空！");
+        } else if (StringUtils.isEmpty(entity.getCompetitionType())) {
+            throw new InvalidParameterException("赛制【competitionType】不能为空！");
+        } else if (StringUtils.isEmpty(entity.getEnrollBeginTime())) {
+            throw new InvalidParameterException("报名开始时间【EnrollBeginTime】不能为空！");
+        } else if (StringUtils.isEmpty(entity.getEnrollEndTime())) {
+            throw new InvalidParameterException("报名结束时间【EnrollEndTime】不能为空！");
+        } else if (StringUtils.isEmpty(entity.getCompetitionBeginTime())) {
+            throw new InvalidParameterException("比赛开始时间【CompetitionBeginTime】不能为空！");
+        } else if (StringUtils.isEmpty(entity.getCompetitionEndTime())) {
+            throw new InvalidParameterException("比赛结束时间【CompetitionEndTime】不能为空！");
+        } else if (StringUtils.isEmpty(entity.getContacts())) {
+            throw new InvalidParameterException("赛会联系人【Contacts】不能为空！");
+        } else if (StringUtils.isEmpty(entity.getContactsAreaCode())) {
+            throw new InvalidParameterException("赛会联系人电话区号【ContactsAreaCode】不能为空！");
+        } else if (StringUtils.isEmpty(entity.getContactsTel())) {
+            throw new InvalidParameterException("赛会联系人电话【ContactsTel】不能为空！");
+        } else if (StringUtils.isEmpty(entity.getCaptcha())) {
+            throw new InvalidParameterException("短信验证码【Captcha】不能为空！");
+        }
+        //获取短信验证码校验短信验证码是否有效
+        Object captcha = redisService.getCacheObject(Constants.ESTABLISH_COMPETITION_SMS_CAPTCHA + entity.getContactsTel());
+        if (!entity.getCaptcha().equals(String.valueOf(captcha))) {
+            throw new ServiceException("短信验证码【"+entity.getCaptcha()+"】已过期或有误！请重新获取！");
+        }
+        return AjaxResult.success(competitionService.establishCompetition(entity));
+    }
+
+    @PostMapping("/getCompetitionByCondition")
+    @ApiOperation(ApiTerminal.wxMiniProgram+"获取赛会数据")
+    @ResponseBody
+    public TableDataInfo getCompetitionByCondition(@RequestBody CompetitionVo competition){
+        startPage();
+        competition.setIsDeleted(0);
+        List<Competition> list = competitionService.getCompetitionByCondition(competition);
+        return getDataTable(list);
+    }
+    @PostMapping("/getAllCompetition")
+    @ResponseBody
+    @ApiOperation(value = ApiTerminal.wxMiniProgram+"分页获取所有比赛列表")
+    public TableDataInfo getAllCompetition(@RequestBody CompetitionVo entity) {
+        entity.setIsDeleted(0);
+        List<Competition> list = competitionService.getCompetitionByCondition(entity);
+        return getDataTable(list);
+    }
+    @ApiOperation(ApiTerminal.wxMiniProgram+"编辑")
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult edit(@RequestBody Competition entity) throws Exception {
+        if (StringUtils.isEmpty(entity)) {
+            throw new ServiceException("参数异常，非法操作！");
+        }
+        if (StringUtils.isEmpty(entity.getId())) {
+            throw new ServiceException("id为空！");
+        }
+        competitionService.edit(entity);
+        return AjaxResult.success();
+    }
+
+    @PostMapping("/sendSms")
+    @ApiOperation(ApiTerminal.wxMiniProgram+"创建赛会-发送手机验证码")
+    @ResponseBody
+    public AjaxResult sendSms(@RequestBody Sms sms) throws Exception {
+        if (StringUtils.isEmpty(sms)) {
+            throw new InvalidParameterException("sms is empty!");
+        } else if (StringUtils.isEmpty(sms.getMb())) {
+            throw new InvalidParameterException("手机号码不能为空!");
+        }
+        //生成6位随机数
+        int randomNums = (int) ((Math.random() * 9 + 1) * 100000);
+        if (StringUtils.isEmpty(sms.getMs())) {
+            StringBuffer msg = new StringBuffer(Constants.SMS_PAOPAO_SIGN);
+            msg.append("你的验证码为");
+            msg.append(randomNums);
+            msg.append(",有效时间");
+            msg.append(Constants.SMS_PAOPAO_EXPIRES / 60);
+            msg.append("分钟,请勿泄露给他人");
+            sms.setMs(msg.toString());
+        } else {
+            sms.setMs(sms.getMs().replace("{}", String.valueOf(randomNums)));
+        }
+        SmsResponse smsResponse = smsService.sendSms(sms);
+        if (smsResponse.getStatus() == 0) {
+            //保存到缓存
+            redisService.setCacheObject(Constants.ESTABLISH_COMPETITION_SMS_CAPTCHA + sms.getMb(), randomNums, Constants.SMS_PAOPAO_EXPIRES, TimeUnit.SECONDS);
+        }
+        return AjaxResult.success(smsResponse);
+    }
+
+    @PostMapping("/teamEnrollExcleImport")
+    @ResponseBody
+    @ApiOperation(value = ApiTerminal.wxMiniProgram+"导入球队报名excel(包含图片)")
+    public AjaxResult teamEnrollExcleImport(
+            @RequestParam(value = "competitionId", required = true) Long competitionId,
+            @RequestParam("file") MultipartFile file) throws Exception {
+        CompetitionExcleVo excleVo = new CompetitionExcleVo();
+        String fileName = file.getOriginalFilename();
+
+        String time = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+        //System.out.println("获取到精确到日的时间格式为"+time);
+        String[] str = time.split("-");//根据‘-’进行拆分字符串 拆分出来的日期有，年，日，月，根据年日月创建文件夹
+        String datePath = "/" + str[0] + "/" + str[1] + "/" + str[2] + "/";
+        // 上传文件为空
+        if (StringUtils.isEmpty(fileName)) {
+            throw new CheckedException("没有导入文件");
+        }
+        // 上传文件名格式不正确
+        if (fileName.lastIndexOf(".") != -1 && !".xlsx".equals(fileName.substring(fileName.lastIndexOf(".")))) {
+            throw new CheckedException("文件名格式不正确, 请使用后缀名为.xlsx的文件");
+        }
+        String filePath = getFilePath(file);
+        Sheet sheet = null;
+        Workbook wb = null;
+        //读图片--开始
+        Map<String, PictureData> maplist = null;
+        BufferedInputStream inputStream = new BufferedInputStream(file.getInputStream());
+        // 判断用07还是03的方法获取图片
+        if (filePath.endsWith("xls")) {
+            wb = new HSSFWorkbook(inputStream);
+            sheet = wb.getSheetAt(0);
+            maplist = getPictures03((HSSFSheet) sheet);
+        } else if (filePath.endsWith("xlsx")) {
+            wb = new XSSFWorkbook(inputStream);
+            sheet = wb.getSheetAt(0);
+            maplist = getPictures07((XSSFSheet) sheet);
+        } else {
+            throw new CheckedException("Excel文件格式不支持");
+        }
+        //读图片--结束
+        // printImg(maplist);
+        //获得数据的总行数
+        int totalRowNum = sheet.getLastRowNum();
+        //todo 获取赛事编码
+        Row row1 = sheet.getRow(1);
+        Cell cell1 = row1.getCell(5);
+        if (cell1 == null) {
+            throw new CheckedException("赛事编码不能为空");
+        }
+        cell1.setCellType(CellType.STRING);
+        String competitionCode = cell1.getStringCellValue().toString();
+        if (StringUtils.isEmpty(competitionCode)) {
+            throw new CheckedException("赛事编码不能为空");
+        }
+        System.out.println("赛事编码" + competitionCode);
+        Row row5 = sheet.getRow(5);
+        Cell cell5_1 = row5.getCell(0);
+        if (cell5_1 == null) {
+            throw new CheckedException("球队logo不能为空");
+        }
+        cell5_1.setCellType(CellType.STRING);
+        //todo 获取赛事信息
+        Competition competition = competitionService.selectCompetitionById(competitionId);
+        //校验比赛编码是否是本
+        BeanUtil.copyProperties(competition, excleVo);
+        if (UtilTool.isNull(competition)) {
+            throw new CheckedException("赛会信息不存在;");
+        }
+        if (!competition.getCompetitionCode().equals(competitionCode)) {
+            throw new CheckedException("导入的文件中的赛事编码错误");
+        }
+        Cell cell5_2 = row5.getCell(1);
+        if (cell5_2 == null) {
+            throw new CheckedException("球队名称不能为空");
+        }
+        cell5_2.setCellType(CellType.STRING);
+        String teamName = cell5_2.getStringCellValue().trim();
+        if (StringUtils.isEmpty(teamName)) {
+            throw new CheckedException("球队名称不能为空");
+        }
+        //球队队长
+        Cell cell5_2_1 = row5.getCell(4);
+        String captain = "";
+        if (cell5_2_1 != null) {
+            captain = cell5_2_1.getStringCellValue();
+        }
+        Cell cell5_3 = row5.getCell(5);
+        if (cell5_3 == null) {
+            throw new CheckedException("球队领队不能为空");
+        }
+        cell5_3.setCellType(CellType.STRING);
+        String teamLeader = cell5_3.getStringCellValue();
+        if (StringUtils.isEmpty(teamLeader)) {
+            throw new CheckedException("球队领队不能为空");
+        }
+        Cell cell5_4 = row5.getCell(6);
+        if (cell5_4 == null) {
+            throw new CheckedException("球队领队手机号码不能为空");
+        }
+        cell5_4.setCellType(CellType.STRING);
+        String teamLeaderTel = cell5_4.getStringCellValue().toString();
+        if (StringUtils.isEmpty(teamLeaderTel)) {
+            throw new CheckedException("球队队长手机号码不能为空");
+        }
+        Cell cell5_5 = row5.getCell(7);
+        if (cell5_5 == null) {
+            throw new CheckedException("球队人数不能为空");
+        }
+        cell5_5.setCellType(CellType.STRING);
+        String teamUserNum = cell5_5.getStringCellValue();
+        if (StringUtils.isEmpty(teamUserNum)) {
+            throw new CheckedException("球队人数不能为空");
+        }
+        //todo 获取到数据后，开始保存数据
+        LoginUser user = SecurityUtils.getLoginUser();
+        CompetitionOfTeamVo team = new CompetitionOfTeamVo();
+        team.setTeamName(teamName);
+        team.setRemark("导入方式报名");
+        team.setContactsTel(teamLeaderTel);
+        team.setContacts(teamLeader);
+        team.setCaptain(captain);
+        team.setCreatedTime(new Date());
+        team.setCreatedBy(String.valueOf(user.getUserid()));
+        team.setCreatedTime(new Date());
+        team.setSerialNumber(Integer.parseInt(teamUserNum));
+        team.setCompetitionId(competition.getId());
+        //保存图片
+        PictureData pictureData = maplist.get("5_0");
+        if (pictureData == null) {
+            throw new CheckedException("球队logo不能为空");
+        }
+        byte[] data = pictureData.getData();
+        //得到保存的file
+        String osPath = linuxLocation;
+        String os = System.getProperty("os.name");
+        if (os.toLowerCase().startsWith("win")) {
+            osPath = winLocation;
+        }
+        String newFileName = UUID.randomUUID() + "_5.jpg";
+        String uploadpath = UtilTool.getFileUploadPath(osPath);
+        File file2 = UtilTool.bytesToFile(data, uploadpath, newFileName);
+        team.setTeamLogo(domainName + datePath + newFileName);
+        team.setStatus(0);
+        System.out.println(JSON.toJSONString(team));
+        //todo 保存球队数据;
+        CompetitionOfTeam competitionOfTeam = competitionOfTeamService.selectOneByTeamName(teamName);
+        if (UtilTool.isNotNull(competitionOfTeam)) {
+            team.setId(competitionOfTeam.getId());
+            competitionOfTeamService.updateCompetitionOfTeam(team);
+        }else {
+            competitionOfTeamService.insertCompetitionOfTeam(team);
+        }
+        excleVo.setOfTeam(team);
+        //todo 清空球员数据
+        competitionMembersService.deleteByMembers(competition.getId(), team.getId());
+        //要获得属性
+        List<CompetitionMembers> membersVos = new ArrayList<>();
+        for (int i = 8; i < totalRowNum; i++) {
+            CompetitionMembers membersVo = new CompetitionMembers();
+            membersVo.setCompetitionId(competition.getId());
+            //membersVo.setCompetitionTeamId(team.getId());
+            membersVo.setCompetitionOfTeamId(team.getId());
+            membersVo.setCompetitionNature(1);
+            membersVo.setCreatedBy(String.valueOf(user.getUserid()));
+            membersVo.setCreatedTime(new Date());
+            //获得第i行对象
+            Row row = sheet.getRow(i);
+            //真实姓名
+            Cell cell = row.getCell(1);
+            if (cell != null) {
+                cell.setCellType(CellType.STRING);
+            }
+            membersVo.setRealName(cell.getStringCellValue());
+            if (StringUtils.isEmpty(membersVo.getRealName())) {
+                break;
+            }
+            //球衣号码
+            cell = row.getCell(2);
+            if (cell != null) {
+                cell.setCellType(CellType.STRING);
+                membersVo.setJerseyNumber(cell.getStringCellValue());
+            }
+            //位置
+            cell = row.getCell(3);
+            if (cell != null) {
+                cell.setCellType(CellType.STRING);
+                membersVo.setTeamPosition(cell.getStringCellValue());
+            }
+            //身高
+            cell = row.getCell(4);
+            if (cell != null) {
+                cell.setCellType(CellType.STRING);
+                membersVo.setHeight(new BigDecimal(cell.getStringCellValue()));
+            }
+            //体重
+            cell = row.getCell(5);
+            if (cell != null) {
+                cell.setCellType(CellType.STRING);
+                membersVo.setWeight(new BigDecimal(cell.getStringCellValue()));
+            }
+            //证件号码
+            cell = row.getCell(6);
+            if (cell != null) {
+                membersVo.setIdType("身份证");
+                membersVo.setIdCardNo(cell.getStringCellValue());
+            }
+            //电话
+            cell = row.getCell(7);
+            if (cell != null) {
+                membersVo.setContactsAreaCode("86");
+                membersVo.setContactsTel(String.valueOf(((XSSFCell) cell).getRawValue()));
+            }
+            //电话
+            cell = row.getCell(8);
+            if (cell != null) {
+                membersVo.setIdCardNo(String.valueOf(((XSSFCell) cell).getRawValue()));
+            }
+            //membersVo.setAvatar(domainName+datePath+newFileName);
+            //保存图片
+            PictureData pictureData2 = maplist.get(i + "_0");
+            if (pictureData2 == null) {
+
+            }
+            byte[] data2 = pictureData2.getData();
+            String newFileName2 = UUID.randomUUID() + "_0.jpg";
+            String uploadpath2 = UtilTool.getFileUploadPath(osPath);
+            File file3 = UtilTool.bytesToFile(data2, uploadpath2, newFileName2);
+            membersVo.setPersonalPhoto(domainName + datePath + newFileName2);
+            membersVo.setCreatedTime(new Date());
+            //默认球员是已确认状态
+            membersVo.setStatus(1);
+            System.out.println(JSON.toJSONString((membersVo)));
+            membersVo.setCreatedBy(String.valueOf(user.getUserid()));
+            membersVos.add(membersVo);
+            competitionMembersService.insertCompetitionMembers(membersVo);
+        }
+
+        excleVo.setTeamMemberList(membersVos);
+        //todo 发个短信通知管理员
+        Sms sms = new Sms();
+        StringBuffer msg = new StringBuffer(Constants.SMS_PAOPAO_SIGN);
+        msg.append("赛会[");
+        msg.append(competition.getCompetitionName());
+        msg.append("]");
+        msg.append("已有球队[");
+        msg.append(teamName);
+        msg.append("]申请出战,请尽快审批处理！");
+        sms.setMs(msg.toString());
+        WxUser userInfo = wxUserService.selectWxUserById(12L);
+        sms.setMobile(userInfo.getTelephone());
+        sms.setMb(userInfo.getTelephone());
+      /*  SmsResponse smsResponse = smsFeign.sendSms(sms);
+        if (smsResponse.getStatus() == 0) {
+            //保存到缓存
+            // redisUtil.set(Constant.ESTABLISH_COMPETITION_SMS_CAPTCHA+sms.getMb(), randomNums,Constant.SMS_PAOPAO_EXPIRES);
+        }*/
+        //使用完成关闭
+        wb.close();
+        if (inputStream != null) {
+            inputStream.close();
+        }
+        return AjaxResult.success(excleVo);
+    }
+
+    /**
+     * 获取03图片和位置 (xls) clerk
+     *
+     * @param sheet
+     * @return
+     * @throws IOException
+     */
+    public static Map<String, PictureData> getPictures03(HSSFSheet sheet) throws IOException {
+        Map<String, PictureData> map = new HashMap<String, PictureData>();
+        List<HSSFShape> list = sheet.getDrawingPatriarch().getChildren();
+
+        for (HSSFShape shape : list) {
+            if (shape instanceof HSSFPicture) {
+                HSSFPicture picture = (HSSFPicture) shape;
+                HSSFClientAnchor cAnchor = (HSSFClientAnchor) picture.getAnchor();
+                HSSFPictureData pdata = picture.getPictureData();
+                String key = cAnchor.getRow1() + "_" + cAnchor.getCol1(); // 行号-列号
+                map.put(key, pdata);
+            }
+        }
+        return map;
+    }
+
+    /**
+     * 获取Excel2007图片
+     *
+     * @param sheet 当前sheet对象
+     * @return Map key:图片单元格索引（0_1）String，value:图片流PictureData
+     */
+    public static Map<String, PictureData> getPictures07(XSSFSheet sheet) {
+        int sheetNum = 0;
+        Map<String, PictureData> sheetIndexPicMap = new HashMap<String, PictureData>();
+        for (POIXMLDocumentPart dr : sheet.getRelations()) {
+            if (dr instanceof XSSFDrawing) {
+                XSSFDrawing drawing = (XSSFDrawing) dr;
+                List<XSSFShape> shapes = drawing.getShapes();
+
+                for (XSSFShape shape : shapes) {
+                    XSSFPicture pic = (XSSFPicture) shape;
+                    XSSFClientAnchor anchor = pic.getPreferredSize();
+                    CTMarker ctMarker = anchor.getFrom();
+
+                    String picIndex = ctMarker.getRow() + "_" + ctMarker.getCol();
+                    if (sheetNum == ctMarker.getCol()) {
+                        sheetIndexPicMap.put(picIndex, pic.getPictureData());
+
+                    }
+
+                }
+            }
+        }
+        return sheetIndexPicMap;
+    }
+
+    private String getFilePath(MultipartFile file) {
+        String dirPath = FileUtil.getTmpDirPath();
+        try {
+            InputStream inputStream = file.getInputStream();
+            File fromStream = FileUtil.writeFromStream(inputStream, dirPath + "/" + IdUtils.simpleUUID() + file.getOriginalFilename());
+            return fromStream.getAbsolutePath();
+        } catch (IOException e) {
+            throw new CheckedException("导入文件异常");
+        }
+    }
+    @GetMapping("/getTeamEnrollExcleImpData")
+    @ApiOperation(value = ApiTerminal.wxMiniProgram+"获取通过excle导入的报名球队以及队员数据")
+    public AjaxResult getTeamEnrollExcleImpData(@RequestParam("competitionId") Long competitionId, @RequestParam("userId") Long userId) {
+        CompetitionExcleVo excleVo = competitionService.getTeamEnrollExcleImpData(competitionId, userId);
+        return AjaxResult.success(excleVo);
+    }
+
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionMembersController.java

@@ -3,15 +3,13 @@ package com.ruoyi.system.controller;
 import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.swagger.apiConstants.ApiTerminal;
+import com.ruoyi.system.domain.vo.CompetitionMembersVo;
+import io.seata.core.model.Result;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-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.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
@@ -102,4 +100,12 @@ public class CompetitionMembersController extends BaseController
     {
         return toAjax(competitionMembersService.deleteCompetitionMembersByIds(ids));
     }
+    @PostMapping("/getJoinCompetitionMembersPage")
+    @ResponseBody
+    @ApiOperation(value = ApiTerminal.wxMiniProgram+"分页获取参与比赛的人员列表")
+    public TableDataInfo getJoinCompetitionMembersPage(@RequestBody CompetitionMembersVo entity){
+        startPage();
+        List<CompetitionMembersVo> list = competitionMembersService.getJoinCompetitionMembersPage(entity);
+        return getDataTable(list);
+    }
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionOfTeamController.java

@@ -1,20 +1,37 @@
 package com.ruoyi.system.controller;
 
-import java.util.List;
+import java.net.URLEncoder;
+import java.security.InvalidParameterException;
+import java.util.*;
 import java.io.IOException;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.util.MapUtils;
+import com.alibaba.fastjson.JSON;
+import com.ruoyi.common.core.constant.Constants;
+import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.common.swagger.apiConstants.ApiTerminal;
+import com.ruoyi.system.domain.Competition;
+import com.ruoyi.system.domain.CompetitionTeamGroup;
+import com.ruoyi.system.domain.Sms;
+import com.ruoyi.system.domain.vo.CompetitionOfTeamGroupVo;
 import com.ruoyi.system.domain.vo.CompetitionOfTeamVo;
+import com.ruoyi.system.domain.vo.SmsResponse;
+import com.ruoyi.system.service.ICompetitionService;
+import com.ruoyi.system.service.ICompetitionTeamGroupService;
+import com.ruoyi.system.service.SmsService;
+import com.ruoyi.system.utils.LoginUserUtil;
+import com.ruoyi.system.utils.UtilTool;
+import io.seata.core.model.Result;
+import io.swagger.annotations.ApiOperation;
 import io.swagger.v3.oas.annotations.Parameters;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-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.RestController;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
@@ -37,7 +54,18 @@ public class CompetitionOfTeamController extends BaseController
 {
     @Autowired
     private ICompetitionOfTeamService competitionOfTeamService;
-
+    @Autowired
+    private ICompetitionService competitionService;
+    @Autowired
+    private ICompetitionTeamGroupService competitionTeamGroupService;
+    @Autowired
+    private SmsService smsService;
+    @Value("${image.location.linux}")
+    private String linuxLocation;
+    @Value("${image.location.windows}")
+    private String winLocation;
+    @Value("${image.domainName}")
+    private String domainName;
     /**
      * 查询赛会中-参赛队伍列表
      */
@@ -127,4 +155,167 @@ public class CompetitionOfTeamController extends BaseController
     {
         return toAjax(competitionOfTeamService.deleteCompetitionOfTeamByIds(ids));
     }
+
+    @ApiOperation(ApiTerminal.wxMiniProgram+"新增")
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult add(@RequestBody CompetitionTeamGroup entity) throws Exception {
+        entity.setCreatedTime(new Date());
+        entity.setCreatedBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
+        return AjaxResult.success(competitionTeamGroupService.add(entity));
+    }
+    @ApiOperation(ApiTerminal.wxMiniProgram+"编辑")
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editCompetitionOfTeam(@RequestBody CompetitionOfTeam entity) throws Exception {
+        if(StringUtils.isEmpty(entity)){
+            throw new ServiceException("参数异常，非法操作！");
+        }
+        if(StringUtils.isEmpty(entity.getId())){
+            throw new ServiceException("id为空！");
+        }
+        return AjaxResult.success(competitionOfTeamService.edit(entity));
+    }
+    @PostMapping("/getJoinCompetitionTeam")
+    @ResponseBody
+    @ApiOperation(value = ApiTerminal.wxMiniProgram+"分页获取参与比赛的球队列表")
+    public TableDataInfo getJoinCompetitionTeam(@RequestBody CompetitionOfTeam entity){
+        startPage();
+        //关键字word包含：球队名称、地点名称、球馆名称，支持模糊搜索；
+        List<CompetitionOfTeamVo> list = competitionOfTeamService.getJoinCompetitionTeam(entity);
+        return getDataTable(list);
+    }
+    @ApiOperation(ApiTerminal.wxMiniProgram+"参赛球队审批")
+    @PostMapping("/teamApprove")
+    @ResponseBody
+    public AjaxResult approve(@RequestBody CompetitionOfTeam entity) throws Exception {
+        if(StringUtils.isEmpty(entity)){
+            throw new ServiceException("参数异常，非法操作！");
+        }
+        if(StringUtils.isEmpty(entity.getId())){
+            throw new InvalidParameterException("id为空！");
+        }if(StringUtils.isEmpty(entity.getStatus())){
+            throw new InvalidParameterException("status为空！");
+        }
+        CompetitionOfTeam old = competitionOfTeamService.selectCompetitionOfTeamById(entity.getId());
+        Competition competition =  competitionService.selectCompetitionById(old.getCompetitionId());
+        StringBuffer msg = new StringBuffer(Constants.SMS_PAOPAO_SIGN);
+        if(old.getStatus().intValue()!=entity.getStatus()){
+            String passMsg = "已通过,让我们携手共创新的荣耀";
+            if(entity.getStatus()==-1){
+                passMsg  = "已被驳回,原因是："+entity.getRemark();
+            }
+            competitionOfTeamService.edit(entity);
+            //todo 发个短信通知管理员
+            Sms sms = new Sms();
+            msg.append("你的球队[");
+            msg.append(old.getTeamName());
+            msg.append("]加入赛会[");
+            msg.append(competition.getCompetitionName());
+            msg.append("]的申请");
+            msg.append(passMsg);
+            sms.setMs(msg.toString());
+            sms.setMb(old.getContactsTel());
+            SmsResponse smsResponse = smsService.sendSms(sms);
+        }
+        return AjaxResult.success(Boolean.TRUE);
+    }
+    @PostMapping("/getJoinCompetitionGroupTeam")
+    @ResponseBody
+    @ApiOperation(value = ApiTerminal.wxMiniProgram+"获取赛事中参与的球队的分组数据")
+    public AjaxResult getJoinCompetitionGroupTeam(@RequestBody CompetitionOfTeamVo entity){
+        //关键字word包含：球队名称、地点名称、球馆名称，支持模糊搜索；
+//        List<CompetitionOfTeamVo> competitionOfTeamVos = competitionOfTeamFeign.getJoinCompetitionGroupTeam(entity);
+//        List<CompetitionOfTeamVo> isNotGroupList = list.stream().filter(a -> StringUtils.isEmpty(a.getCompetitionGroup())).collect(Collectors.toList());
+//        List<CompetitionOfTeamVo> list1 = list.stream().filter(a -> !StringUtils.isEmpty(a.getCompetitionGroup())).collect(Collectors.toList());
+//        //1.根据字符串类型日期分组，并按照日期升序排序，返回TreeMap<String,List>，map的key为字符串日期，value为list
+//        TreeMap<String,List<CompetitionOfTeamVo>> dataGroupMap =  list1.stream().collect(Collectors.groupingBy(a->a.getCompetitionGroup(), TreeMap::new,Collectors.toList()));
+//        List<Map> listMap = new ArrayList<>();
+//        for(Map.Entry<String, List<CompetitionOfTeamVo>> entry:dataGroupMap.entrySet()){
+//            Map resMap =new HashMap();
+//            resMap.put("competitionGroup",entry.getKey());
+//            resMap.put("competitionOfTeamList",entry.getValue());
+//            listMap.add(resMap);
+//        }
+//        maps.put("isGroup",listMap);
+//        maps.put("isNotGroup",isNotGroupList);
+        Map hashMap = new HashMap();
+        List<CompetitionOfTeamGroupVo> competitionOfTeamGroupVoList = null;
+        List<CompetitionOfTeamVo> competitionOfTeamVos = competitionOfTeamService.findCompetitionTeamGroupList(entity);
+        if(UtilTool.isNotNull(competitionOfTeamVos)){
+            competitionOfTeamGroupVoList = new ArrayList<>();
+            //获取没有分组的球队
+            List<CompetitionOfTeamVo> groupNull = competitionOfTeamVos.stream().filter(a -> UtilTool.isNull(a.getCompetitionGroup())).collect(Collectors.toList());
+
+            //过滤分组为空的球队
+            competitionOfTeamVos = competitionOfTeamVos.stream().filter(a -> UtilTool.isNotNull(a.getCompetitionGroup())).collect(Collectors.toList());
+
+            //分组去重并返回SET
+            List<CompetitionOfTeamVo> setList = competitionOfTeamVos.stream()
+                    .collect(Collectors.collectingAndThen(Collectors.toCollection(() ->
+                            new TreeSet<>(Comparator.comparing(CompetitionOfTeamVo::getCompetitionGroup))), ArrayList::new));
+            //排序
+            setList.sort((o1, o2) -> o1.getCompetitionGroup().compareTo(o2.getCompetitionGroup())); //正序
+            CompetitionOfTeamGroupVo competitionOfTeamGroupVo = null;
+            for(CompetitionOfTeamVo competitionOfTeamVo : setList){
+                competitionOfTeamGroupVo = new CompetitionOfTeamGroupVo();
+                List<CompetitionOfTeamVo> groupList = competitionOfTeamVos.stream().filter(s -> s.getCompetitionGroup().equals(competitionOfTeamVo.getCompetitionGroup())).collect(Collectors.toList());
+                groupList.sort((o1, o2) -> o2.getIntegral().compareTo(o1.getIntegral())); //正序
+                competitionOfTeamGroupVo.setGroupName(competitionOfTeamVo.getCompetitionGroup());
+                competitionOfTeamGroupVo.setTeamList(groupList);
+                competitionOfTeamGroupVoList.add(competitionOfTeamGroupVo);
+            }
+
+            //添加未分组球队
+            if(UtilTool.isNotNull(groupNull)){
+                competitionOfTeamGroupVo = new CompetitionOfTeamGroupVo();
+                competitionOfTeamGroupVo.setGroupName("未分");
+                competitionOfTeamGroupVo.setTeamList(groupNull);
+                competitionOfTeamGroupVoList.add(competitionOfTeamGroupVo);
+            }
+
+            hashMap.put("competitionOfTeamGroupVo",competitionOfTeamGroupVoList);
+        }
+
+        return AjaxResult.success(hashMap);
+    }
+    @GetMapping("/teamEnrollExcleExport")
+    @ApiOperation(value = ApiTerminal.wxMiniProgram+"球队报名excel模板文件导出(get)")
+    public void teamEnrollExcleExport(@RequestParam(value = "competitionId", required = true) Long competitionId, HttpServletResponse response) throws IOException {
+        // 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman
+        Competition competition = competitionService.selectCompetitionById(competitionId);
+        // 模板注意 用{} 来表示你要用的变量 如果本来就有"{","}" 特殊字符 用"\{","\}"代替
+        // {} 代表普通变量 {.} 代表是list的变量 {前缀.} 前缀可以区分不同的list
+        String osPath = linuxLocation;
+        String os = System.getProperty("os.name");
+        if (os.toLowerCase().startsWith("win")) {
+            osPath = winLocation;
+        }
+        Long times = System.currentTimeMillis();
+        String templateFileName = osPath + "apply.xlsx";
+        String fileName = osPath+ "compositeFill" + times + ".xlsx";
+        try {
+            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+            response.setCharacterEncoding("utf-8");
+            // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系
+            String fileName1 = URLEncoder.encode(competition.getCompetitionName()+"球队报名登记表", "UTF-8").replaceAll("\\+", "%20");
+            response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName1 + ".xlsx");
+            // EasyExcel.write(response.getOutputStream(), DownloadData.class).sheet("模板").doWrite(data());
+            // 这里需要设置不关闭流
+            // 方案1
+            //EasyExcel.write(response.getOutputStream()).withTemplate(templateFileName).sheet().doFill(competition);
+            System.out.println(templateFileName);
+            //todo 先把文件输出到服务器，
+            EasyExcel.write(response.getOutputStream()).withTemplate(templateFileName).sheet().doFill(competition);
+        } catch (Exception e) {
+            // 重置response
+            response.reset();
+            response.setContentType("application/json");
+            response.setCharacterEncoding("utf-8");
+            Map<String, String> map = MapUtils.newHashMap();
+            map.put("status", "failure");
+            map.put("message", "下载文件失败" + e.getMessage());
+            response.getWriter().println(JSON.toJSONString(map));
+        }
+    }
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionResultController.java

@@ -1,19 +1,26 @@
 package com.ruoyi.system.controller;
 
+import java.security.InvalidParameterException;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Date;
 import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.common.swagger.apiConstants.ApiTerminal;
+import com.ruoyi.system.domain.CompetitionMembersScore;
 import com.ruoyi.system.domain.vo.CompetitionVsRecordVo;
+import com.ruoyi.system.domain.vo.PersonalHonorResponse;
+import com.ruoyi.system.service.ICompetitionMembersScoreService;
+import com.ruoyi.system.utils.UtilTool;
+import io.seata.core.model.Result;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-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.RestController;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
@@ -36,6 +43,8 @@ public class CompetitionResultController extends BaseController
 {
     @Autowired
     private ICompetitionResultService competitionResultService;
+    @Autowired
+    private ICompetitionMembersScoreService competitionMembersScoreService;
 
     /**
      * 查询赛会中-赛程结果记录列表
@@ -118,4 +127,77 @@ public class CompetitionResultController extends BaseController
     {
         return toAjax(competitionResultService.deleteCompetitionResultByIds(ids));
     }
+    @ApiOperation(ApiTerminal.wxMiniProgram+"球员数据-新增、编辑")
+    @PostMapping("/insertOrUpdateMemberScore")
+    @ResponseBody
+    public AjaxResult insertOrUpdateMemberScore(@RequestBody CompetitionMembersScore request) throws Exception {
+        if(UtilTool.isNull(request)){
+            throw new ServiceException("参数不能为空1");
+        }
+
+        //新增
+        if(request.getId()==null){
+            request.setCreatedBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
+            request.setCreatedTime(new Date());
+            competitionMembersScoreService.insertCompetitionMembersScore(request);
+        } else {//编辑、
+            if(StringUtils.isEmpty(request.getId())){
+                throw new ServiceException("id为空");
+            }
+            request.setLastUpdatedTime(new Date());
+            request.setModifiedBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
+            competitionMembersScoreService.updateCompetitionMembersScore(request);
+        }
+        return AjaxResult.success();
+    }
+    @ApiOperation(ApiTerminal.wxMiniProgram+"赛会个人荣誉榜")
+    @GetMapping("/getHonorList/{competitionId}")
+    @ResponseBody
+    public TableDataInfo getHonorList(@PathVariable("competitionId") Long competitionId) throws Exception {
+        if(UtilTool.isNull(competitionId)){
+            throw new InvalidParameterException("赛会id不能为");
+        }
+        List<PersonalHonorResponse> honorResponseList = null;
+
+        //查询赛会得分数据
+        List<CompetitionMembersScore> membersScoreList = competitionMembersScoreService.getHonorList(competitionId,null);
+        if(UtilTool.isNotNull(membersScoreList)){
+            honorResponseList = new ArrayList<>();
+
+            CompetitionMembersScore membersScore = null;
+            //3分王
+            membersScore = membersScoreList.stream().max(Comparator.comparing(CompetitionMembersScore::getThreePoints)).get();
+            setHonorData(honorResponseList,membersScore,"3分王");
+            //篮板王
+            membersScore = membersScoreList.stream().max(Comparator.comparing(CompetitionMembersScore::getBackboard)).get();
+            setHonorData(honorResponseList,membersScore,"篮板王");
+            //效率王
+//                membersScore = membersScoreList.stream().max(Comparator.comparing(CompetitionMembersScore::getThreePoints)).get();
+//                setHonorData(membersScore,"效率王");
+            //助攻王
+            membersScore = membersScoreList.stream().max(Comparator.comparing(CompetitionMembersScore::getAssists)).get();
+            setHonorData(honorResponseList,membersScore,"助攻王");
+            //得分王
+            membersScore = membersScoreList.stream().max(Comparator.comparing(CompetitionMembersScore::getTotalScore)).get();
+            setHonorData(honorResponseList,membersScore,"得分王");
+            //盖帽王
+            membersScore = membersScoreList.stream().max(Comparator.comparing(CompetitionMembersScore::getBlock)).get();
+            setHonorData(honorResponseList,membersScore,"盖帽王");
+            //抢断王
+            membersScore = membersScoreList.stream().max(Comparator.comparing(CompetitionMembersScore::getSnatch)).get();
+            setHonorData(honorResponseList,membersScore,"抢断王");
+
+        }
+        return getDataTable(honorResponseList);
+    }
+
+    private void setHonorData(List<PersonalHonorResponse> honorResponseList,CompetitionMembersScore membersScore,String honorName) {
+        if(UtilTool.isNotNull(membersScore)){
+            PersonalHonorResponse honorResponse = new PersonalHonorResponse();
+            honorResponse.setHonorName(honorName);
+            honorResponse.setHonoraryPersonnel(membersScore.getRealName());
+            honorResponse.setTeamName(membersScore.getTeamName());
+            honorResponseList.add(honorResponse);
+        }
+    }
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionTeamGroupController.java

@@ -1,17 +1,27 @@
 package com.ruoyi.system.controller;
 
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
+import java.util.TreeMap;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.common.swagger.apiConstants.ApiTerminal;
+import com.ruoyi.system.domain.CompetitionOfTeam;
+import com.ruoyi.system.domain.vo.CompetitionOfTeamVo;
+import com.ruoyi.system.domain.vo.CompetitionTeamGroupVo;
+import com.ruoyi.system.domain.vo.TeamGroupRequest;
+import com.ruoyi.system.service.ICompetitionOfTeamService;
+import com.ruoyi.system.utils.LoginUserUtil;
+import io.seata.core.model.Result;
+import io.swagger.annotations.ApiOperation;
+import org.aspectj.weaver.loadtime.Aj;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-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.RestController;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
@@ -34,6 +44,8 @@ public class CompetitionTeamGroupController extends BaseController
 {
     @Autowired
     private ICompetitionTeamGroupService competitionTeamGroupService;
+    @Autowired
+    private ICompetitionOfTeamService competitionOfTeamService;
 
     /**
      * 查询赛会中-分组列表
@@ -91,7 +103,7 @@ public class CompetitionTeamGroupController extends BaseController
     {
         return toAjax(competitionTeamGroupService.updateCompetitionTeamGroup(competitionTeamGroup));
     }
-    @RequiresPermissions("system:competitionTeamGroup:arrangeTeamGroupSchedule")
+    //@RequiresPermissions("system:competitionTeamGroup:arrangeTeamGroupSchedule")
     @Log(title = "赛会中-一键编排分组内的球队的单组循环赛赛程", businessType = BusinessType.OTHER)
     @PostMapping("/arrangeTeamGroupSchedule")
     public AjaxResult arrangeTeamGroupSchedule(@RequestBody CompetitionTeamGroup competitionTeamGroup)
@@ -108,4 +120,102 @@ public class CompetitionTeamGroupController extends BaseController
     {
         return toAjax(competitionTeamGroupService.deleteCompetitionTeamGroupByIds(ids));
     }
+
+
+
+    @PostMapping("/getTeamGroupByCondition")
+    @ResponseBody
+    @ApiOperation(value = ApiTerminal.wxMiniProgram+"分页获取比赛分组列表")
+    public TableDataInfo getTeamGroupByCondition(@RequestBody CompetitionTeamGroup entity){
+        startPage();
+        entity.setIsDeleted(0);
+        List<CompetitionTeamGroup> list =competitionTeamGroupService.getTeamGroupByCondition(entity);
+        return getDataTable(list);
+    }
+    @ApiOperation(ApiTerminal.wxMiniProgram+"新增")
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addCompetitionTeamGroup(@RequestBody CompetitionTeamGroup entity)  {
+        return AjaxResult.success(competitionTeamGroupService.add(entity));
+    }
+    @PostMapping("/getJoinCompetitionGroupTeam")
+    @ResponseBody
+    @ApiOperation(value = ApiTerminal.wxMiniProgram+"获取赛事中参与的球队的分组数据")
+    public AjaxResult getJoinCompetitionGroupTeam(@RequestBody CompetitionTeamGroup entity){
+        if(StringUtils.isEmpty(entity)){
+            throw new ServiceException("参数异常，非法操作！");
+        }
+        if(StringUtils.isEmpty(entity.getCompetitionId())){
+            throw new ServiceException("CompetitionId为空！");
+        }
+
+        entity.setIsDeleted(0);
+        List<CompetitionTeamGroup> groupList =competitionTeamGroupService.getTeamGroupByCondition(entity);
+        CompetitionTeamGroupVo competitionTeamGroupVo = new CompetitionTeamGroupVo();
+        CompetitionOfTeam ofTeam =new CompetitionOfTeam();
+        ofTeam.setCompetitionId(entity.getCompetitionId());
+        ofTeam.setStatus(1);
+        List<CompetitionOfTeamVo> list = competitionOfTeamService.getJoinCompetitionGroupTeam(ofTeam);
+        List<CompetitionOfTeamVo> isNotGroupList = list.stream().filter(a -> StringUtils.isEmpty(a.getCompetitionGroup())).collect(Collectors.toList());
+        List<CompetitionOfTeamVo> list1 = list.stream().filter(a -> !StringUtils.isEmpty(a.getCompetitionGroup())).collect(Collectors.toList());
+        //1.根据字符串类型日期分组，并按照日期升序排序，返回TreeMap<String,List>，map的key为字符串日期，value为list
+        TreeMap<String,List<CompetitionOfTeamVo>> dataGroupMap =  list1.stream().collect(Collectors.groupingBy(a->a.getCompetitionGroup(), TreeMap::new,Collectors.toList()));
+        List<CompetitionTeamGroupVo.IsGroupBean> listMap = new ArrayList<>();
+
+//        for(Map.Entry<String, List<CompetitionOfTeamVo>> entry:dataGroupMap.entrySet()){
+//            CompetitionTeamGroupVo.IsGroupBean resMap =new CompetitionTeamGroupVo.IsGroupBean();
+//
+//
+//            resMap.setCompetitionGroup(entry.getKey());
+//            resMap.setCompetitionOfTeamList(entry.getValue());
+//            listMap.add(resMap);
+//        }
+
+        if(groupList.size()>0){
+            for (CompetitionTeamGroup teamGroup:groupList) {
+                CompetitionTeamGroupVo.IsGroupBean resMap =new CompetitionTeamGroupVo.IsGroupBean();
+                resMap.setCompetitionGroup(teamGroup.getCompetitionGroup());
+                resMap.setCompetitionOfTeamList(dataGroupMap.get(teamGroup.getCompetitionGroup()));
+                listMap.add(resMap);
+            }
+        }
+
+        competitionTeamGroupVo.setIsGroup(listMap);
+        competitionTeamGroupVo.setIsNotGroup(isNotGroupList);
+        return AjaxResult.success(competitionTeamGroupVo);
+    }
+    @ApiOperation(ApiTerminal.wxMiniProgram+"批量设置球队分组数据")
+    @PostMapping("/batchEditTeamGroup")
+    @ResponseBody
+    public AjaxResult batchEditTeamGroup(@RequestBody TeamGroupRequest entity) throws Exception {
+        if(StringUtils.isEmpty(entity)){
+            throw new ServiceException("参数异常，非法操作！");
+        }
+        if(StringUtils.isEmpty(entity.getGroup())){
+            throw new ServiceException("Group为空！");
+        }if(StringUtils.isEmpty(entity.getOfTeamIds())||entity.getOfTeamIds().size()==0){
+            throw new ServiceException("ids为空！");
+        }
+        return AjaxResult.success(competitionTeamGroupService.batchEditTeamGroup(entity));
+    }
+    @ApiOperation(ApiTerminal.wxMiniProgram+"随机设置球队分组数据")
+    @PostMapping("/randomTeamGroup")
+    @ResponseBody
+    public AjaxResult randomTeamGroup(@RequestBody List<TeamGroupRequest> list, @RequestParam("competitionId") Long competitionId) throws Exception {
+        if(StringUtils.isEmpty(list)||list.size()==0){
+            throw new ServiceException("参数异常，非法操作！");
+        }
+        if(StringUtils.isEmpty(competitionId)){
+            throw new ServiceException("competitionId为空，非法操作！");
+        }
+        for (TeamGroupRequest teamGroupRequest: list) {
+            if(StringUtils.isEmpty(teamGroupRequest.getGroup())){
+                throw new ServiceException("group为空！");
+            }if(StringUtils.isEmpty(teamGroupRequest.getOfTeamIds())||teamGroupRequest.getOfTeamIds().size()==0){
+                throw new ServiceException("ofTeamIds为空！");
+            }
+        }
+
+        return AjaxResult.success(competitionTeamGroupService.randomTeamGroup(list,competitionId));
+    }
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionTeamVsTeamController.java

@@ -1,11 +1,22 @@
 package com.ruoyi.system.controller;
 
+import java.security.InvalidParameterException;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.io.IOException;
+import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.common.core.exception.CheckedException;
+import com.ruoyi.common.swagger.apiConstants.ApiTerminal;
+import com.ruoyi.system.domain.CompetitionResult;
+import com.ruoyi.system.domain.vo.CompetitionTeamIntegralVo;
+import com.ruoyi.system.domain.vo.CompetitionTeamVsTeamRequest;
 import com.ruoyi.system.domain.vo.CompetitionTeamVsTeamVo;
 import com.ruoyi.system.domain.vo.CompetitionUnifiedRecordVo;
+import com.ruoyi.system.utils.UtilTool;
 import io.seata.core.model.Result;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -113,4 +124,54 @@ public class CompetitionTeamVsTeamController extends BaseController
     public AjaxResult getCompetitionVsRecordById(@PathVariable("id") Long id) {
         return AjaxResult.success(competitionTeamVsTeamService.getCompetitionVsRecordById(id));
     }
+
+    @PostMapping("/getCompetitionSchedule")
+    @ResponseBody
+    @ApiOperation(ApiTerminal.wxMiniProgram+"分页获取赛事-赛程列表")
+    public TableDataInfo getCompetitionSchedule(@RequestBody CompetitionTeamVsTeam entity) throws ParseException {
+        startPage();
+        //关键字word包含：球队名称、地点名称、球馆名称，支持模糊搜索；
+        List<CompetitionTeamVsTeamRequest> listMap = new ArrayList<>();
+        entity.setIsDeleted(0);
+        Map<String, List<CompetitionTeamVsTeamVo>> map = competitionTeamVsTeamService.getCompetitionSchedule(entity);
+        for(Map.Entry<String, List<CompetitionTeamVsTeamVo>> entry:map.entrySet()){
+            CompetitionTeamVsTeamRequest request =new CompetitionTeamVsTeamRequest();
+            request.setCompetitionDate(entry.getKey());
+            request.setWeekDay(UtilTool.dateToWeek(entry.getKey()));
+            request.setTeamVsTeamList(entry.getValue());
+            request.setCompetitionId(entity.getCompetitionId());
+            request.setIsDisabled(UtilTool.compareToDate(entry.getKey(),new Date()));
+            listMap.add(request);
+        }
+        return getDataTable(listMap);
+    }
+    @ApiOperation(ApiTerminal.wxMiniProgram+"根据赛会ID获取所有球队的积分列表")
+    @GetMapping("/competitionTeamIntegralList/{id}")
+    @ResponseBody
+    public TableDataInfo competitionTeamIntegralList(@PathVariable("id") Long id) throws Exception {
+        List<CompetitionTeamIntegralVo> list = competitionTeamVsTeamService.getCompetitionTeamIntegralListById(id);
+        return getDataTable(list);
+    }
+
+
+    @PostMapping("/competitionScheduleSubmit")
+    @ResponseBody
+    @ApiOperation(value = "赛事-比赛赛程提交")
+    public AjaxResult competitionScheduleSubmit(@RequestBody List<CompetitionTeamVsTeamRequest> vsTeamRequestList){
+        return AjaxResult.success(competitionTeamVsTeamService.competitionScheduleSubmit(vsTeamRequestList));
+    }
+    /**
+     * 赛事队伍积分提交
+     * @param request
+     * @return
+     */
+    @PostMapping("/competitionScoreSubmit")
+    @ResponseBody
+    @ApiOperation(value = "赛事队伍积分提交")
+    public AjaxResult competitionScoreSubmit(@RequestBody List<CompetitionResult> request){
+        if(UtilTool.isNull(request)){
+            throw new CheckedException("参数不能为空");
+        }
+        return AjaxResult.success(competitionTeamVsTeamService.competitionScoreSubmit(request));
+    }
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/DataDictionaryController.java

@@ -0,0 +1,119 @@
+package com.ruoyi.system.controller;
+
+import java.util.HashMap;
+import java.util.List;
+import java.io.IOException;
+import java.util.Map;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.swagger.apiConstants.ApiTerminal;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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.RestController;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.system.domain.DataDictionary;
+import com.ruoyi.system.service.IDataDictionaryService;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+
+/**
+ * 【请填写功能名称】Controller
+ * 
+ * @author ruoyi
+ * @date 2023-07-04
+ */
+@RestController
+@RequestMapping("/dictionary")
+public class DataDictionaryController extends BaseController
+{
+    @Autowired
+    private IDataDictionaryService dataDictionaryService;
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @RequiresPermissions("system:dictionary:list")
+    @GetMapping("/list")
+    public TableDataInfo list(DataDictionary dataDictionary)
+    {
+        startPage();
+        List<DataDictionary> list = dataDictionaryService.selectDataDictionaryList(dataDictionary);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出【请填写功能名称】列表
+     */
+    @RequiresPermissions("system:dictionary:export")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, DataDictionary dataDictionary)
+    {
+        List<DataDictionary> list = dataDictionaryService.selectDataDictionaryList(dataDictionary);
+        ExcelUtil<DataDictionary> util = new ExcelUtil<DataDictionary>(DataDictionary.class);
+        util.exportExcel(response, list, "【请填写功能名称】数据");
+    }
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     */
+    @RequiresPermissions("system:dictionary:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(dataDictionaryService.selectDataDictionaryById(id));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    @RequiresPermissions("system:dictionary:add")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody DataDictionary dataDictionary)
+    {
+        return toAjax(dataDictionaryService.insertDataDictionary(dataDictionary));
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    @RequiresPermissions("system:dictionary:edit")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody DataDictionary dataDictionary)
+    {
+        return toAjax(dataDictionaryService.updateDataDictionary(dataDictionary));
+    }
+
+    /**
+     * 删除【请填写功能名称】
+     */
+    @RequiresPermissions("system:dictionary:remove")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(dataDictionaryService.deleteDataDictionaryByIds(ids));
+    }
+    @ApiOperation(ApiTerminal.wxMiniProgram+"通过parentKey获取数据字典")
+    @GetMapping(value = "/getChildByParentKey/{parentKey}")
+    AjaxResult getChildByParentKey(@PathVariable("parentKey") String parentKey){
+        if(StringUtils.isBlank(parentKey)){
+            throw new IllegalArgumentException("参数["+parentKey+"]不能为空");
+        }
+        return AjaxResult.success(dataDictionaryService.getChildByParentKey(parentKey));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/FeatureLabelController.java

@@ -0,0 +1,105 @@
+package com.ruoyi.system.controller;
+
+import java.util.List;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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.RestController;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.system.domain.FeatureLabel;
+import com.ruoyi.system.service.IFeatureLabelService;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+
+/**
+ * 球馆特征Controller
+ * 
+ * @author ruoyi
+ * @date 2023-07-06
+ */
+@RestController
+@RequestMapping("/featureLabel")
+public class FeatureLabelController extends BaseController
+{
+    @Autowired
+    private IFeatureLabelService featureLabelService;
+
+    /**
+     * 查询球馆特征列表
+     */
+    @RequiresPermissions("system:featureLabel:list")
+    @GetMapping("/list")
+    public TableDataInfo list(FeatureLabel featureLabel)
+    {
+        startPage();
+        List<FeatureLabel> list = featureLabelService.selectFeatureLabelList(featureLabel);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出球馆特征列表
+     */
+    @RequiresPermissions("system:featureLabel:export")
+    @Log(title = "球馆特征", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, FeatureLabel featureLabel)
+    {
+        List<FeatureLabel> list = featureLabelService.selectFeatureLabelList(featureLabel);
+        ExcelUtil<FeatureLabel> util = new ExcelUtil<FeatureLabel>(FeatureLabel.class);
+        util.exportExcel(response, list, "球馆特征数据");
+    }
+
+    /**
+     * 获取球馆特征详细信息
+     */
+    @RequiresPermissions("system:featureLabel:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(featureLabelService.selectFeatureLabelById(id));
+    }
+
+    /**
+     * 新增球馆特征
+     */
+    @RequiresPermissions("system:featureLabel:add")
+    @Log(title = "球馆特征", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody FeatureLabel featureLabel)
+    {
+        return toAjax(featureLabelService.insertFeatureLabel(featureLabel));
+    }
+
+    /**
+     * 修改球馆特征
+     */
+    @RequiresPermissions("system:featureLabel:edit")
+    @Log(title = "球馆特征", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody FeatureLabel featureLabel)
+    {
+        return toAjax(featureLabelService.updateFeatureLabel(featureLabel));
+    }
+
+    /**
+     * 删除球馆特征
+     */
+    @RequiresPermissions("system:featureLabel:remove")
+    @Log(title = "球馆特征", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(featureLabelService.deleteFeatureLabelByIds(ids));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/GlobalAttachmentController.java

@@ -0,0 +1,110 @@
+package com.ruoyi.system.controller;
+
+import java.util.List;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.swagger.apiConstants.ApiTerminal;
+import io.seata.core.model.Result;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.system.domain.GlobalAttachment;
+import com.ruoyi.system.service.IGlobalAttachmentService;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+
+/**
+ * 【请填写功能名称】Controller
+ * 
+ * @author ruoyi
+ * @date 2023-07-04
+ */
+@RestController
+@RequestMapping("/globalAttachment")
+public class GlobalAttachmentController extends BaseController
+{
+    @Autowired
+    private IGlobalAttachmentService globalAttachmentService;
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @RequiresPermissions("system:attachment:list")
+    @GetMapping("/list")
+    public TableDataInfo list(GlobalAttachment globalAttachment)
+    {
+        startPage();
+        List<GlobalAttachment> list = globalAttachmentService.selectGlobalAttachmentList(globalAttachment);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出【请填写功能名称】列表
+     */
+    @RequiresPermissions("system:attachment:export")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, GlobalAttachment globalAttachment)
+    {
+        List<GlobalAttachment> list = globalAttachmentService.selectGlobalAttachmentList(globalAttachment);
+        ExcelUtil<GlobalAttachment> util = new ExcelUtil<GlobalAttachment>(GlobalAttachment.class);
+        util.exportExcel(response, list, "【请填写功能名称】数据");
+    }
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     */
+    @RequiresPermissions("system:attachment:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(globalAttachmentService.selectGlobalAttachmentById(id));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    @RequiresPermissions("system:attachment:add")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody GlobalAttachment globalAttachment)
+    {
+        return toAjax(globalAttachmentService.insertGlobalAttachment(globalAttachment));
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    @RequiresPermissions("system:attachment:edit")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody GlobalAttachment globalAttachment)
+    {
+        return toAjax(globalAttachmentService.updateGlobalAttachment(globalAttachment));
+    }
+
+    /**
+     * 删除【请填写功能名称】
+     */
+    @RequiresPermissions("system:attachment:remove")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(globalAttachmentService.deleteGlobalAttachmentByIds(ids));
+    }
+
+    @ApiOperation(ApiTerminal.wxMiniProgram+"查询首页图片")
+    @PostMapping("/getBanner")
+    @ResponseBody
+    public TableDataInfo getBanner(@RequestBody GlobalAttachment entity) throws Exception {
+        List<GlobalAttachment> list = globalAttachmentService.selectGlobalAttachmentList(entity);
+        return getDataTable(list);
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/GroupWechatController.java

@@ -0,0 +1,105 @@
+package com.ruoyi.system.controller;
+
+import java.util.List;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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.RestController;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.system.domain.GroupWechat;
+import com.ruoyi.system.service.IGroupWechatService;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+
+/**
+ * 【请填写功能名称】Controller
+ * 
+ * @author ruoyi
+ * @date 2023-07-04
+ */
+@RestController
+@RequestMapping("/weChat")
+public class GroupWechatController extends BaseController
+{
+    @Autowired
+    private IGroupWechatService groupWechatService;
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @RequiresPermissions("system:wechat:list")
+    @GetMapping("/list")
+    public TableDataInfo list(GroupWechat groupWechat)
+    {
+        startPage();
+        List<GroupWechat> list = groupWechatService.selectGroupWechatList(groupWechat);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出【请填写功能名称】列表
+     */
+    @RequiresPermissions("system:wechat:export")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, GroupWechat groupWechat)
+    {
+        List<GroupWechat> list = groupWechatService.selectGroupWechatList(groupWechat);
+        ExcelUtil<GroupWechat> util = new ExcelUtil<GroupWechat>(GroupWechat.class);
+        util.exportExcel(response, list, "【请填写功能名称】数据");
+    }
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     */
+    @RequiresPermissions("system:wechat:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(groupWechatService.selectGroupWechatById(id));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    @RequiresPermissions("system:wechat:add")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody GroupWechat groupWechat)
+    {
+        return toAjax(groupWechatService.insertGroupWechat(groupWechat));
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    @RequiresPermissions("system:wechat:edit")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody GroupWechat groupWechat)
+    {
+        return toAjax(groupWechatService.updateGroupWechat(groupWechat));
+    }
+
+    /**
+     * 删除【请填写功能名称】
+     */
+    @RequiresPermissions("system:wechat:remove")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(groupWechatService.deleteGroupWechatByIds(ids));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/MessageController.java

@@ -0,0 +1,111 @@
+package com.ruoyi.system.controller;
+
+import java.util.List;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.swagger.apiConstants.ApiTerminal;
+import io.seata.core.model.Result;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.system.domain.Message;
+import com.ruoyi.system.service.IMessageService;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+
+/**
+ * 【请填写功能名称】Controller
+ * 
+ * @author ruoyi
+ * @date 2023-07-04
+ */
+@RestController
+@RequestMapping("/message")
+public class MessageController extends BaseController
+{
+    @Autowired
+    private IMessageService messageService;
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @RequiresPermissions("system:message:list")
+    @GetMapping("/list")
+    public TableDataInfo list(Message message)
+    {
+        startPage();
+        List<Message> list = messageService.selectMessageList(message);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出【请填写功能名称】列表
+     */
+    @RequiresPermissions("system:message:export")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, Message message)
+    {
+        List<Message> list = messageService.selectMessageList(message);
+        ExcelUtil<Message> util = new ExcelUtil<Message>(Message.class);
+        util.exportExcel(response, list, "【请填写功能名称】数据");
+    }
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     */
+    @RequiresPermissions("system:message:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(messageService.selectMessageById(id));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    @RequiresPermissions("system:message:add")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody Message message)
+    {
+        return toAjax(messageService.insertMessage(message));
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    @RequiresPermissions("system:message:edit")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody Message message)
+    {
+        return toAjax(messageService.updateMessage(message));
+    }
+
+    /**
+     * 删除【请填写功能名称】
+     */
+    @RequiresPermissions("system:message:remove")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(messageService.deleteMessageByIds(ids));
+    }
+
+    @ApiOperation(ApiTerminal.wxMiniProgram+"我的消息列表")
+    @PostMapping("/getMessagePage")
+    @ResponseBody
+    public TableDataInfo getMessageList(@RequestBody Message message) throws Exception {
+        startPage();
+        List<Message> list = messageService.selectMessageList(message);
+        return getDataTable(list);
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/ShAreaController.java

@@ -0,0 +1,119 @@
+package com.ruoyi.system.controller;
+
+import java.util.List;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.swagger.apiConstants.ApiTerminal;
+import io.seata.core.model.Result;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.system.domain.ShArea;
+import com.ruoyi.system.service.IShAreaService;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+
+/**
+ * 【请填写功能名称】Controller
+ * 
+ * @author ruoyi
+ * @date 2023-07-04
+ */
+@RestController
+@RequestMapping("/shArea")
+public class ShAreaController extends BaseController
+{
+    @Autowired
+    private IShAreaService shAreaService;
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @RequiresPermissions("system:area:list")
+    @GetMapping("/list")
+    public TableDataInfo list(ShArea shArea)
+    {
+        startPage();
+        List<ShArea> list = shAreaService.selectShAreaList(shArea);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出【请填写功能名称】列表
+     */
+    @RequiresPermissions("system:area:export")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ShArea shArea)
+    {
+        List<ShArea> list = shAreaService.selectShAreaList(shArea);
+        ExcelUtil<ShArea> util = new ExcelUtil<ShArea>(ShArea.class);
+        util.exportExcel(response, list, "【请填写功能名称】数据");
+    }
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     */
+    @RequiresPermissions("system:area:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(shAreaService.selectShAreaById(id));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    @RequiresPermissions("system:area:add")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ShArea shArea)
+    {
+        return toAjax(shAreaService.insertShArea(shArea));
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    @RequiresPermissions("system:area:edit")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ShArea shArea)
+    {
+        return toAjax(shAreaService.updateShArea(shArea));
+    }
+
+    /**
+     * 删除【请填写功能名称】
+     */
+    @RequiresPermissions("system:area:remove")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(shAreaService.deleteShAreaByIds(ids));
+    }
+
+    @ApiOperation(ApiTerminal.wxMiniProgram+"查询离得最近的城市")
+    @PostMapping("/findMyCity")
+    @ResponseBody
+    public TableDataInfo findMyCity(@RequestBody ShArea entity) throws Exception {
+        List<ShArea> list = shAreaService.findMyCity(entity);
+        return getDataTable(list);
+    }
+    @ApiOperation(ApiTerminal.wxMiniProgram+"获取所有城市接口")
+    @PostMapping("/findAllCity")
+    @ResponseBody
+    public TableDataInfo findAllCity() throws Exception {
+        ShArea entity=new ShArea();
+        entity.setLevel(2);
+        List<ShArea> list = shAreaService.selectShAreaList(entity);
+        return getDataTable(list);
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/TeamMembersController.java

@@ -4,16 +4,13 @@ import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.common.swagger.apiConstants.ApiTerminal;
+import com.ruoyi.system.domain.vo.TeamMembersResponse;
 import com.ruoyi.system.domain.vo.TeamMembersVo;
+import io.seata.core.model.Result;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-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.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
@@ -104,4 +101,11 @@ public class TeamMembersController extends BaseController
     {
         return toAjax(teamMembersService.deleteTeamMembersByIds(ids));
     }
+    @ApiOperation(ApiTerminal.wxMiniProgram+"根据球队ID查询加入球队的队员列表")
+    @PostMapping("/getTeamMembersByTeamId")
+    @ResponseBody
+    public TableDataInfo getTeamMembersByTeamId(@RequestParam("teamId") Long teamId) throws Exception {
+        List<TeamMembersResponse> list = teamMembersService.getTeamMembersByTeamId(teamId);
+        return getDataTable(list);
+    }
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/TokenInfoController.java

@@ -0,0 +1,105 @@
+package com.ruoyi.system.controller;
+
+import java.util.List;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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.RestController;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.system.domain.TokenInfo;
+import com.ruoyi.system.service.ITokenInfoService;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+
+/**
+ * 【请填写功能名称】Controller
+ * 
+ * @author ruoyi
+ * @date 2023-07-04
+ */
+@RestController
+@RequestMapping("/tokenInfo")
+public class TokenInfoController extends BaseController
+{
+    @Autowired
+    private ITokenInfoService tokenInfoService;
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @RequiresPermissions("system:info:list")
+    @GetMapping("/list")
+    public TableDataInfo list(TokenInfo tokenInfo)
+    {
+        startPage();
+        List<TokenInfo> list = tokenInfoService.selectTokenInfoList(tokenInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出【请填写功能名称】列表
+     */
+    @RequiresPermissions("system:info:export")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TokenInfo tokenInfo)
+    {
+        List<TokenInfo> list = tokenInfoService.selectTokenInfoList(tokenInfo);
+        ExcelUtil<TokenInfo> util = new ExcelUtil<TokenInfo>(TokenInfo.class);
+        util.exportExcel(response, list, "【请填写功能名称】数据");
+    }
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     */
+    @RequiresPermissions("system:info:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tokenInfoService.selectTokenInfoById(id));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    @RequiresPermissions("system:info:add")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TokenInfo tokenInfo)
+    {
+        return toAjax(tokenInfoService.insertTokenInfo(tokenInfo));
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    @RequiresPermissions("system:info:edit")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TokenInfo tokenInfo)
+    {
+        return toAjax(tokenInfoService.updateTokenInfo(tokenInfo));
+    }
+
+    /**
+     * 删除【请填写功能名称】
+     */
+    @RequiresPermissions("system:info:remove")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tokenInfoService.deleteTokenInfoByIds(ids));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/TrainingInfoController.java

@@ -0,0 +1,105 @@
+package com.ruoyi.system.controller;
+
+import java.util.List;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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.RestController;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.system.domain.TrainingInfo;
+import com.ruoyi.system.service.ITrainingInfoService;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+
+/**
+ * 【请填写功能名称】Controller
+ * 
+ * @author ruoyi
+ * @date 2023-07-04
+ */
+@RestController
+@RequestMapping("/trainingInfo")
+public class TrainingInfoController extends BaseController
+{
+    @Autowired
+    private ITrainingInfoService trainingInfoService;
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @RequiresPermissions("system:info:list")
+    @GetMapping("/list")
+    public TableDataInfo list(TrainingInfo trainingInfo)
+    {
+        startPage();
+        List<TrainingInfo> list = trainingInfoService.selectTrainingInfoList(trainingInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出【请填写功能名称】列表
+     */
+    @RequiresPermissions("system:info:export")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TrainingInfo trainingInfo)
+    {
+        List<TrainingInfo> list = trainingInfoService.selectTrainingInfoList(trainingInfo);
+        ExcelUtil<TrainingInfo> util = new ExcelUtil<TrainingInfo>(TrainingInfo.class);
+        util.exportExcel(response, list, "【请填写功能名称】数据");
+    }
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     */
+    @RequiresPermissions("system:info:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(trainingInfoService.selectTrainingInfoById(id));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    @RequiresPermissions("system:info:add")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TrainingInfo trainingInfo)
+    {
+        return toAjax(trainingInfoService.insertTrainingInfo(trainingInfo));
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    @RequiresPermissions("system:info:edit")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TrainingInfo trainingInfo)
+    {
+        return toAjax(trainingInfoService.updateTrainingInfo(trainingInfo));
+    }
+
+    /**
+     * 删除【请填写功能名称】
+     */
+    @RequiresPermissions("system:info:remove")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(trainingInfoService.deleteTrainingInfoByIds(ids));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/UserBuildingRelController.java

@@ -0,0 +1,105 @@
+package com.ruoyi.system.controller;
+
+import java.util.List;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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.RestController;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.system.domain.UserBuildingRel;
+import com.ruoyi.system.service.IUserBuildingRelService;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+
+/**
+ * 【请填写功能名称】Controller
+ * 
+ * @author ruoyi
+ * @date 2023-07-04
+ */
+@RestController
+@RequestMapping("/rel")
+public class UserBuildingRelController extends BaseController
+{
+    @Autowired
+    private IUserBuildingRelService userBuildingRelService;
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @RequiresPermissions("system:rel:list")
+    @GetMapping("/list")
+    public TableDataInfo list(UserBuildingRel userBuildingRel)
+    {
+        startPage();
+        List<UserBuildingRel> list = userBuildingRelService.selectUserBuildingRelList(userBuildingRel);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出【请填写功能名称】列表
+     */
+    @RequiresPermissions("system:rel:export")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, UserBuildingRel userBuildingRel)
+    {
+        List<UserBuildingRel> list = userBuildingRelService.selectUserBuildingRelList(userBuildingRel);
+        ExcelUtil<UserBuildingRel> util = new ExcelUtil<UserBuildingRel>(UserBuildingRel.class);
+        util.exportExcel(response, list, "【请填写功能名称】数据");
+    }
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     */
+    @RequiresPermissions("system:rel:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(userBuildingRelService.selectUserBuildingRelById(id));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    @RequiresPermissions("system:rel:add")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody UserBuildingRel userBuildingRel)
+    {
+        return toAjax(userBuildingRelService.insertUserBuildingRel(userBuildingRel));
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    @RequiresPermissions("system:rel:edit")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody UserBuildingRel userBuildingRel)
+    {
+        return toAjax(userBuildingRelService.updateUserBuildingRel(userBuildingRel));
+    }
+
+    /**
+     * 删除【请填写功能名称】
+     */
+    @RequiresPermissions("system:rel:remove")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(userBuildingRelService.deleteUserBuildingRelByIds(ids));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/UserRoleController.java

@@ -0,0 +1,105 @@
+package com.ruoyi.system.controller;
+
+import java.util.List;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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.RestController;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.system.domain.UserRole;
+import com.ruoyi.system.service.IUserRoleService;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+
+/**
+ * 【请填写功能名称】Controller
+ * 
+ * @author ruoyi
+ * @date 2023-07-04
+ */
+@RestController
+@RequestMapping("/wxUserRole")
+public class UserRoleController extends BaseController
+{
+    @Autowired
+    private IUserRoleService userRoleService;
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @RequiresPermissions("system:role:list")
+    @GetMapping("/list")
+    public TableDataInfo list(UserRole userRole)
+    {
+        startPage();
+        List<UserRole> list = userRoleService.selectUserRoleList(userRole);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出【请填写功能名称】列表
+     */
+    @RequiresPermissions("system:role:export")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, UserRole userRole)
+    {
+        List<UserRole> list = userRoleService.selectUserRoleList(userRole);
+        ExcelUtil<UserRole> util = new ExcelUtil<UserRole>(UserRole.class);
+        util.exportExcel(response, list, "【请填写功能名称】数据");
+    }
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     */
+    @RequiresPermissions("system:role:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(userRoleService.selectUserRoleById(id));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    @RequiresPermissions("system:role:add")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody UserRole userRole)
+    {
+        return toAjax(userRoleService.insertUserRole(userRole));
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    @RequiresPermissions("system:role:edit")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody UserRole userRole)
+    {
+        return toAjax(userRoleService.updateUserRole(userRole));
+    }
+
+    /**
+     * 删除【请填写功能名称】
+     */
+    @RequiresPermissions("system:role:remove")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(userRoleService.deleteUserRoleByIds(ids));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/UserWxAqrCodeController.java

@@ -9,6 +9,7 @@ import com.ruoyi.system.domain.WxUser;
 import com.ruoyi.system.domain.vo.UserWxAqrCodeVo;
 import com.ruoyi.system.service.IWxBasketballTeamService;
 import com.ruoyi.system.service.IWxUserService;
+import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxApplesCodeController.java

@@ -6,16 +6,30 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.swagger.apiConstants.ApiTerminal;
 import com.ruoyi.system.api.domain.vo.WxAppletsCodeVo;
 import com.ruoyi.system.domain.UserWxAqrCode;
 import com.ruoyi.system.domain.vo.UserWxAqrCodeVo;
 import com.ruoyi.system.service.IWxUserService;
 import com.ruoyi.system.service.WxApplesCodeService;
+import io.seata.core.model.Result;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.client.RestTemplate;
+import sun.misc.BASE64Encoder;
 
 import javax.annotation.Resource;
-import java.util.List;
+import java.io.*;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * @author 吴一博

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxAppletsController.java

@@ -0,0 +1,153 @@
+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.swagger.apiConstants.ApiTerminal;
+import com.ruoyi.system.api.domain.vo.WxAppletsCodeVo;
+import com.ruoyi.system.service.WxAppletsService;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.client.RestTemplate;
+import sun.misc.BASE64Encoder;
+
+import java.io.*;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * @author 吴一博
+ * @date 2023年07月08日 18:11
+ * @Description
+ */
+@RestController
+@RequestMapping("/wxApplets")
+public class WxAppletsController {
+    @Autowired
+    private WxAppletsService wxAppletsService;
+    @Autowired
+    private RestTemplate restTemplate;
+    @Value("${image.location.linux}")
+    private String linuxLocation;
+    @Value("${image.location.windows}")
+    private String winLocation;
+    @Value("${image.domainName}")
+    private String domainName;
+
+    @PostMapping("/getWxacodeunlimit")
+    @ApiOperation(ApiTerminal.wxMiniProgram +"微信小程序-获取小程序码")
+    @ResponseBody
+    public AjaxResult getWxacodeunlimit(@RequestBody WxAppletsCodeVo wxAppletsCodeVo) throws Exception {
+        if(restTemplate==null){
+            restTemplate = new RestTemplate();
+        }
+        InputStream inputStream = null;
+        OutputStream outputStream = null;
+        //根据APPid和密钥获取存取令牌
+        try {
+            String url = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=" + wxAppletsService.getAccessToken();
+            //定义生产二维码所需的参数、样式
+            Map<String, Object> param = new HashMap<>();
+            param.put("scene", wxAppletsCodeVo.getScene());
+            param.put("page", wxAppletsCodeVo.getPage());
+            param.put("width", StringUtils.isEmpty(wxAppletsCodeVo.getPage())?10:wxAppletsCodeVo.getPage());
+            param.put("auto_color", wxAppletsCodeVo.getAutoColor()==null?false:wxAppletsCodeVo.getAutoColor());
+            param.put("is_hyaline",wxAppletsCodeVo.getIsHyaline()==null?false:wxAppletsCodeVo.getIsHyaline());
+            Map<String, Object> line_color = new HashMap<>();
+            line_color.put("r", 0);
+            line_color.put("g", 0);
+            line_color.put("b", 0);
+            param.put("line_color", line_color);
+            System.out.println(param+"调用微信URL传参");
+            MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
+            HttpEntity requestEntity = new HttpEntity(param, headers);
+            //System.out.println("协议请求头"+headers+""+requestEntity);
+            ResponseEntity<byte[]> entity = restTemplate.exchange(url, HttpMethod.POST, requestEntity, byte[].class, new Object[0]);
+            //            LOG.info("调用小程序生成微信永久小程序码URL接口返回结果:" + entity.getBody());
+            //  System.out.println("返回结果"+entity.getBody()+".."+entity);
+            byte[] result = entity.getBody();
+//            LOG.info(Base64.encodeBase64String(result));
+            //   System.out.println("不知道是什么："+Base64.encodeBase64String(result));
+            inputStream = new ByteArrayInputStream(result);
+//            生成随机数命名图片
+            String filename = UUID.randomUUID().toString();
+            //     System.out.println(filename);
+            Date date = new Date();
+            String time = new SimpleDateFormat("yyyy-MM-dd").format(date);
+            String[] str = time.split("-");//根据‘-’进行拆分字符串 拆分出来的日期有，年，日，月，根据年日月创建文件夹
+            String datePath="/"+str[0]+"/"+str[1]+"/"+str[2]+"/";
+            //创建文件夹
+            String xdpath = datePath+filename+".png";
+            String filePath = linuxLocation+datePath+filename+".png";
+//           服务器存放位置
+            File file = new File(filePath);
+            //文件目录不存在需要先创建
+            if(!file.getParentFile().exists()){
+                file.getParentFile().mkdirs();
+            }
+            outputStream = new FileOutputStream(file);
+            int len = 0;
+            byte[] buf = new byte[1024];
+            while ((len = inputStream.read(buf, 0, 1024)) != -1) {
+                outputStream.write(buf, 0, len);
+            }
+            outputStream.flush();
+            wxAppletsCodeVo.setBase64(getBase64(file));
+            wxAppletsCodeVo.setCodeImgUrl(domainName+xdpath);
+            return AjaxResult.success(wxAppletsCodeVo);
+
+        } catch (Exception e) {
+//            LOG.error("调用小程序生成微信永久小程序码URL接口异常", e);
+        } finally {
+            if (inputStream != null) {
+                try {
+                    inputStream.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if (outputStream != null) {
+                try {
+                    outputStream.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        System.out.println("获取二维码");
+        return AjaxResult.success(wxAppletsCodeVo);
+    }
+
+    public String getBase64(File file){
+        String imgStr = "";
+        try {
+            FileInputStream fis = new FileInputStream(file);
+            byte[] buffer = new byte[(int) file.length()];
+            int offset = 0;
+            int numRead = 0;
+            while (offset < buffer.length && (numRead = fis.read(buffer, offset, buffer.length - offset)) >= 0) {
+                offset += numRead;
+            }
+
+            if (offset != buffer.length) {
+                throw new IOException("Could not completely read file "
+                        + file.getName());
+            }
+            fis.close();
+            BASE64Encoder encoder = new BASE64Encoder();
+            imgStr = encoder.encode(buffer);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return imgStr;
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxBasketballTeamController.java

@@ -1,17 +1,16 @@
 package com.ruoyi.system.controller;
 
 import java.util.List;
-import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.common.swagger.apiConstants.ApiTerminal;
+import com.ruoyi.system.api.model.LoginUser;
+import com.ruoyi.system.api.model.WxLoginUser;
+import com.ruoyi.system.utils.LoginUserUtil;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-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.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
@@ -102,4 +101,13 @@ public class WxBasketballTeamController extends BaseController
     {
         return toAjax(wxBasketballTeamService.deleteWxBasketballTeamByIds(ids));
     }
+    @PostMapping("/getMyBasketBallTeam")
+    @ResponseBody
+    @ApiOperation(value = ApiTerminal.wxMiniProgram+"分页获取我的球队列表")
+    public TableDataInfo getMyBasketBallTeam(@RequestBody WxBasketballTeam entity){
+        LoginUser user = SecurityUtils.getLoginUser();
+        entity.setCreatedId(user.getUserid());
+        List<WxBasketballTeam> list =wxBasketballTeamService.getMyBasketBallTeam(entity);
+        return getDataTable(list);
+    }
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxBuildingInfoController.java

@@ -1,17 +1,25 @@
 package com.ruoyi.system.controller;
 
+import java.util.Date;
 import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.common.swagger.apiConstants.ApiTerminal;
+import com.ruoyi.system.api.model.LoginUser;
+import com.ruoyi.system.api.model.WxLoginUser;
+import com.ruoyi.system.domain.BuildingInfoDetail;
+import com.ruoyi.system.domain.vo.BuildingInfoRequest;
+import com.ruoyi.system.domain.vo.BuildingInfoResponse;
+import com.ruoyi.system.service.IBuildingInfoDetailService;
+import com.ruoyi.system.utils.LoginUserUtil;
+import io.seata.core.model.Result;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-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.RestController;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
@@ -29,11 +37,13 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
  * @date 2022-08-30
  */
 @RestController
-@RequestMapping("/WxBuilding")
+@RequestMapping("/wxBuildingInfo")
 public class WxBuildingInfoController extends BaseController
 {
     @Autowired
     private IWxBuildingInfoService wxBuildingInfoService;
+    @Autowired
+    private IBuildingInfoDetailService buildingInfoDetailService;
 
     /**
      * 查询球场管理列表
@@ -102,4 +112,95 @@ public class WxBuildingInfoController extends BaseController
     {
         return toAjax(wxBuildingInfoService.deleteWxBuildingInfoByIds(ids));
     }
+
+    @ApiOperation(ApiTerminal.wxMiniProgram+"保存")
+    @PostMapping("/save")
+    @ResponseBody
+    public AjaxResult save(@RequestBody BuildingInfoRequest entity) throws Exception {
+        LoginUser user = SecurityUtils.getLoginUser();
+        WxBuildingInfo buildingInfo=new WxBuildingInfo();
+        BeanUtils.copyProperties(entity,buildingInfo);
+        buildingInfo.setCreatedTime(new Date());
+        buildingInfo.setCreatedBy(String.valueOf(user.getUserid()));
+        if(!ObjectUtils.isEmpty(buildingInfo.getId())){
+            wxBuildingInfoService.updateWxBuildingInfo(buildingInfo);
+        }else{
+            //设置球场创建人
+            buildingInfo.setCreatedId(user.getUserid());
+            wxBuildingInfoService.insertWxBuildingInfo(buildingInfo);
+        }
+        BuildingInfoDetail detail=new BuildingInfoDetail();
+        BuildingInfoDetail details=new BuildingInfoDetail();
+        details.setBuildingId(buildingInfo.getId());
+        List<BuildingInfoDetail> detailList=buildingInfoDetailService.selectBuildingInfoDetailList(details);
+        BeanUtils.copyProperties(entity,detail);
+        if(detailList.size()>0){
+            detail.setId(detailList.get(0).getId());
+            detail.setBuildingId(buildingInfo.getId());
+            buildingInfoDetailService.updateBuildingInfoDetail(detail);
+        }else{
+            detail.setId(null);
+            if(ObjectUtils.isEmpty(entity.getOpenId())){
+                detail.setCreatedBy("admin");
+                detail.setCreatedTime(new Date());
+            }
+            detail.setBuildingId(buildingInfo.getId());
+            buildingInfoDetailService.insertBuildingInfoDetail(detail);
+        }
+        return AjaxResult.success(Boolean.TRUE);
+    }
+
+    @ApiOperation(ApiTerminal.wxMiniProgram+"获取附近球场列表")
+    @PostMapping("/findNearbyBuilding")
+    @ResponseBody
+    public TableDataInfo findNearbyBuilding(@RequestBody WxBuildingInfo entity) throws Exception {
+        List<WxBuildingInfo> list = wxBuildingInfoService.findNearbyBuilding(entity);
+        return getDataTable(list);
+    }
+
+    @PostMapping("/getBuildingByCity")
+    @ApiOperation(ApiTerminal.wxMiniProgram+"获取球场列表")
+    @ResponseBody
+    public TableDataInfo getBuildingByCity(@RequestBody WxBuildingInfo entity){
+        List<WxBuildingInfo> list = wxBuildingInfoService.getBuildingByCity(entity);
+        return getDataTable(list);
+
+    }
+
+    @PostMapping("/getAuditList")
+    @ResponseBody
+    @ApiOperation(value = ApiTerminal.wxMiniProgram+"获取审核球场列表")
+    public TableDataInfo getAuditPage(@RequestBody BuildingInfoRequest entity){
+        startPage();
+        WxBuildingInfo buildingInfo=new WxBuildingInfo();
+        BeanUtils.copyProperties(entity,buildingInfo);
+        if(!ObjectUtils.isEmpty(entity.getOpenId())){
+            buildingInfo.setCreatedBy(entity.getOpenId());
+        }
+        List<WxBuildingInfo> list =wxBuildingInfoService.getAuditPage(buildingInfo);
+        return getDataTable(list);
+    }
+    @ApiOperation(ApiTerminal.wxMiniProgram+"根据ID查询场地明细信息")
+    @GetMapping("/findAllInfoById/{id}")
+    @ResponseBody
+    public AjaxResult findAllInfoById(@PathVariable("id") Long id) throws Exception {
+        BuildingInfoResponse entity = wxBuildingInfoService.findAllInfoById(id);
+        return AjaxResult.success(entity);
+    }
+    @PostMapping("/getAllBuildingByCondition")
+    @ResponseBody
+    @ApiOperation(value = ApiTerminal.wxMiniProgram+"分页获取球场列表")
+    public TableDataInfo getAllBuildingByCondition(@RequestBody BuildingInfoRequest entity){
+        List<BuildingInfoResponse> list =wxBuildingInfoService.getAllBuildingByCondition(entity);
+        for(BuildingInfoResponse response:list){
+            if(1==response.getStatus()){
+                response.setStatusName("待审核");
+            }else if(2==response.getStatus()){
+                response.setStatusName("已审核");
+            }else if(3==response.getStatus()){
+                response.setStatusName("已拒绝");
+            }
+        }
+        return getDataTable(list);
+    }
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxLoginController.java

@@ -0,0 +1,68 @@
+package com.ruoyi.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.security.annotation.InnerAuth;
+import com.ruoyi.common.swagger.apiConstants.ApiTerminal;
+import com.ruoyi.system.api.model.LoginUser;
+import com.ruoyi.system.api.model.WxLoginUser;
+import com.ruoyi.system.domain.vo.WxLoginRequest;
+import com.ruoyi.system.domain.vo.WxRegisterRequest;
+import com.ruoyi.system.service.WxLoginService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 微信小程序登录Controller
+ *
+ * @author wyb
+ * @date 2023-07-06
+ */
+@RestController
+@RequestMapping(value="/wxLogin")
+@Api(description = ApiTerminal.wxMiniProgram+"登录接口")
+public class WxLoginController {
+
+    @Resource
+    private WxLoginService wxLoginService;
+
+    @ApiOperation(ApiTerminal.wxMiniProgram+"wx用户登录")
+    @PostMapping("/loginInFromWx")
+    @ResponseBody
+    public AjaxResult loginInFromWx(@RequestBody WxLoginRequest entity) throws Exception {
+        WxLoginUser loginUser=wxLoginService.loginInFromWx(entity);
+        return AjaxResult.success(loginUser);
+    }
+
+
+    @PostMapping("/user/register")
+    @ApiOperation(value = ApiTerminal.wxMiniProgram+"用户注册接口")
+    public AjaxResult register(@RequestBody WxRegisterRequest entity){
+        //loginFeign.register(entity);
+        return AjaxResult.success("注册成功");
+    }
+    
+    @ApiOperation("用户登出")
+    @GetMapping("/loginOut")
+    @ResponseBody
+    public AjaxResult loginOut(@PathVariable("id") Long id) throws Exception {
+        return AjaxResult.success("登出成功");
+    }
+
+    /**
+     * 获取当前用户信息
+     */
+    @InnerAuth
+    @PostMapping("/getWxUserInfo")
+    public R<LoginUser> getWxUserInfo(@RequestBody LoginUser loginUser)
+    {
+        LoginUser loginUser1=wxLoginService.loginFromWx(loginUser);
+        System.out.println(JSON.toJSONString(loginUser1));
+        return R.ok(loginUser1);
+    }
+    
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxUserController.java

@@ -1,17 +1,29 @@
 package com.ruoyi.system.controller;
 
+import java.security.InvalidParameterException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.List;
 import java.io.IOException;
+import java.util.Map;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
+
+import com.github.pagehelper.util.StringUtil;
+import com.ruoyi.common.swagger.apiConstants.ApiTerminal;
+import com.ruoyi.system.domain.UserRole;
+import com.ruoyi.system.domain.vo.PersonalCareerVo;
+import com.ruoyi.system.domain.vo.UserInfoResponse;
+import com.ruoyi.system.service.ICompetitionMembersScoreService;
+import com.ruoyi.system.service.IDataDictionaryService;
+import com.ruoyi.system.service.IUserRoleService;
+import com.ruoyi.system.utils.AgeUtils;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-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.RestController;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
@@ -34,7 +46,12 @@ public class WxUserController extends BaseController
 {
     @Autowired
     private IWxUserService wxUserService;
-
+    @Autowired
+    private IDataDictionaryService dataDictionaryService;
+    @Autowired
+    private IUserRoleService userRoleService;
+    @Autowired
+    private ICompetitionMembersScoreService competitionMembersScoreService;
     /**
      * 查询微信用户列表
      */
@@ -102,4 +119,67 @@ public class WxUserController extends BaseController
     {
         return toAjax(wxUserService.deleteWxUserByIds(ids));
     }
+
+    @ApiOperation(ApiTerminal.wxMiniProgram+"根据用户id查询个人中心详情")
+    @PostMapping("/detail/{userId}")
+    @ResponseBody
+    public AjaxResult detail(@PathVariable("userId") Long userId){
+        UserInfoResponse userInfoResponse = new UserInfoResponse();
+        //查询用户基本信息
+        WxUser userInfo = wxUserService.selectWxUserById(userId);
+        if(userInfo==null){
+            throw new InvalidParameterException("根据传入的userId【"+userId+"】未查询到用户信息");
+        }
+        //赋值
+        BeanUtils.copyProperties(userInfo,userInfoResponse);
+
+        if(ObjectUtils.isNotEmpty(userInfo.getBirthday())){
+            //根据日期计算年龄
+            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+            String birthTimeString = format.format(userInfo.getBirthday());
+            userInfoResponse.setAge(AgeUtils.getAgeFromBirthTime(birthTimeString));
+        }
+
+        //球队位置组装
+        if(userInfo.getTeamPosition()!=null){
+            Map<String, String> teamPositionMap = dataDictionaryService.getChildByParentKey("teamPosition");
+            String[] teamPositionArgs = userInfo.getTeamPosition().split(",");
+            if(teamPositionArgs!=null&&teamPositionArgs.length>0){
+                List<String> teamPositionName = new ArrayList<>();
+                for(String teamPosition : teamPositionArgs){
+                    teamPositionName.add(teamPositionMap.get(teamPosition));
+                }
+                userInfoResponse.setTeamPositionName(teamPositionName);
+            }
+        }
+
+        //标签数据组装
+        if(userInfo.getTag()!=null){
+            Map<String, String>  tagMap = dataDictionaryService.getChildByParentKey("tag");
+            String[] tagArgs = userInfo.getTag().split(",");
+            if(tagArgs!=null&&tagArgs.length>0){
+                List<String> tagName = new ArrayList<>();
+                for(String tag : tagArgs){
+                    tagName.add(tagMap.get(tag));
+                }
+                userInfoResponse.setTagName(tagName);
+            }
+        }
+
+        //查询此用户的角色有哪些
+        UserRole userRole=new UserRole();
+        userRole.setUserId(userId);
+        List<UserRole> userRoles=userRoleService.selectUserRoleList(userRole);
+        if(!StringUtils.isEmpty(userRoles)&&userRoles.size()>0){
+            userInfoResponse.setRoleCodes(userRoles.stream().map(UserRole::getRoleCode).collect(Collectors.toList()));
+        }
+
+        //个人生涯
+        PersonalCareerVo personalCareerVo = competitionMembersScoreService.getUserScoreByUserId(userId);
+        if(personalCareerVo==null){
+            personalCareerVo = new PersonalCareerVo();
+        }
+        userInfoResponse.setPersonalCareerVo(personalCareerVo);
+        return AjaxResult.success(userInfoResponse);
+    }
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/BuildingInfoDetail.java

@@ -0,0 +1,78 @@
+package com.ruoyi.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.*;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+
+/**
+ * 【请填写功能名称】对象 building_info_detail
+ * 
+ * @author ruoyi
+ * @date 2023-07-06
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+public class BuildingInfoDetail extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long isDeleted;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date createdTime;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String createdBy;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String modifiedBy;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date lastUpdatedTime;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long buildingId;
+
+    /** 营业时间 */
+    @Excel(name = "营业时间")
+    private String businessHours;
+
+    /** 联系人 */
+    @Excel(name = "联系人")
+    private String linkman;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String linkphone;
+
+    /** 收费标准 */
+    @Excel(name = "收费标准")
+    private String feeStandard;
+
+    /** 球馆标签 */
+    @Excel(name = "球馆标签")
+    private String labelDesc;
+
+    /** 公告 */
+    @Excel(name = "公告")
+    private String notice;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/BuildingLabel.java

@@ -0,0 +1,138 @@
+package com.ruoyi.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+
+/**
+ * 【请填写功能名称】对象 building_label
+ * 
+ * @author ruoyi
+ * @date 2023-07-04
+ */
+public class BuildingLabel extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Integer isDeleted;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date createdTime;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String createdBy;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String modifiedBy;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date lastUpdatedTime;
+
+    /** 场馆id */
+    @Excel(name = "场馆id")
+    private Long buildingId;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long featureLabelId;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setIsDeleted(Integer isDeleted) 
+    {
+        this.isDeleted = isDeleted;
+    }
+
+    public Integer getIsDeleted() 
+    {
+        return isDeleted;
+    }
+    public void setCreatedTime(Date createdTime) 
+    {
+        this.createdTime = createdTime;
+    }
+
+    public Date getCreatedTime() 
+    {
+        return createdTime;
+    }
+    public void setCreatedBy(String createdBy) 
+    {
+        this.createdBy = createdBy;
+    }
+
+    public String getCreatedBy() 
+    {
+        return createdBy;
+    }
+    public void setModifiedBy(String modifiedBy) 
+    {
+        this.modifiedBy = modifiedBy;
+    }
+
+    public String getModifiedBy() 
+    {
+        return modifiedBy;
+    }
+    public void setLastUpdatedTime(Date lastUpdatedTime) 
+    {
+        this.lastUpdatedTime = lastUpdatedTime;
+    }
+
+    public Date getLastUpdatedTime() 
+    {
+        return lastUpdatedTime;
+    }
+    public void setBuildingId(Long buildingId) 
+    {
+        this.buildingId = buildingId;
+    }
+
+    public Long getBuildingId() 
+    {
+        return buildingId;
+    }
+    public void setFeatureLabelId(Long featureLabelId) 
+    {
+        this.featureLabelId = featureLabelId;
+    }
+
+    public Long getFeatureLabelId() 
+    {
+        return featureLabelId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("isDeleted", getIsDeleted())
+            .append("createdTime", getCreatedTime())
+            .append("createdBy", getCreatedBy())
+            .append("modifiedBy", getModifiedBy())
+            .append("lastUpdatedTime", getLastUpdatedTime())
+            .append("buildingId", getBuildingId())
+            .append("featureLabelId", getFeatureLabelId())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/BuildingTeamRel.java

@@ -0,0 +1,137 @@
+package com.ruoyi.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+
+/**
+ * 【请填写功能名称】对象 building_team_rel
+ * 
+ * @author ruoyi
+ * @date 2023-07-04
+ */
+public class BuildingTeamRel extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String isDeleted;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date createdTime;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String createdBy;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String modifiedBy;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date lastUpdatedTime;
+
+    /** 场馆id */
+    @Excel(name = "场馆id")
+    private Long buildingId;
+
+    /** 球队场馆关联表 */
+    @Excel(name = "球队场馆关联表")
+    private Long teamId;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setIsDeleted(String isDeleted) 
+    {
+        this.isDeleted = isDeleted;
+    }
+
+    public String getIsDeleted() 
+    {
+        return isDeleted;
+    }
+    public void setCreatedTime(Date createdTime) 
+    {
+        this.createdTime = createdTime;
+    }
+
+    public Date getCreatedTime() 
+    {
+        return createdTime;
+    }
+    public void setCreatedBy(String createdBy) 
+    {
+        this.createdBy = createdBy;
+    }
+
+    public String getCreatedBy() 
+    {
+        return createdBy;
+    }
+    public void setModifiedBy(String modifiedBy) 
+    {
+        this.modifiedBy = modifiedBy;
+    }
+
+    public String getModifiedBy() 
+    {
+        return modifiedBy;
+    }
+    public void setLastUpdatedTime(Date lastUpdatedTime) 
+    {
+        this.lastUpdatedTime = lastUpdatedTime;
+    }
+
+    public Date getLastUpdatedTime() 
+    {
+        return lastUpdatedTime;
+    }
+    public void setBuildingId(Long buildingId) 
+    {
+        this.buildingId = buildingId;
+    }
+
+    public Long getBuildingId() 
+    {
+        return buildingId;
+    }
+    public void setTeamId(Long teamId) 
+    {
+        this.teamId = teamId;
+    }
+
+    public Long getTeamId() 
+    {
+        return teamId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("isDeleted", getIsDeleted())
+            .append("createdTime", getCreatedTime())
+            .append("createdBy", getCreatedBy())
+            .append("modifiedBy", getModifiedBy())
+            .append("lastUpdatedTime", getLastUpdatedTime())
+            .append("buildingId", getBuildingId())
+            .append("teamId", getTeamId())
+            .toString();
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CameraInfo.java

@@ -0,0 +1,208 @@
+package com.ruoyi.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+
+/**
+ * 【请填写功能名称】对象 camera_info
+ * 
+ * @author ruoyi
+ * @date 2023-07-04
+ */
+public class CameraInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long isDeleted;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date createdTime;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String createdBy;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String modifiedBy;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date lastUpdatedTime;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private String status;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String cityCode;
+
+    /** 产品类型 */
+    @Excel(name = "产品类型")
+    private String type;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String name;
+
+    /** 设备号 */
+    @Excel(name = "设备号")
+    private String sn;
+
+    /** 场地ID */
+    @Excel(name = "场地ID")
+    private Long buildingId;
+
+    /** 播放路径 */
+    @Excel(name = "播放路径")
+    private String url;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setIsDeleted(Long isDeleted) 
+    {
+        this.isDeleted = isDeleted;
+    }
+
+    public Long getIsDeleted() 
+    {
+        return isDeleted;
+    }
+    public void setCreatedTime(Date createdTime) 
+    {
+        this.createdTime = createdTime;
+    }
+
+    public Date getCreatedTime() 
+    {
+        return createdTime;
+    }
+    public void setCreatedBy(String createdBy) 
+    {
+        this.createdBy = createdBy;
+    }
+
+    public String getCreatedBy() 
+    {
+        return createdBy;
+    }
+    public void setModifiedBy(String modifiedBy) 
+    {
+        this.modifiedBy = modifiedBy;
+    }
+
+    public String getModifiedBy() 
+    {
+        return modifiedBy;
+    }
+    public void setLastUpdatedTime(Date lastUpdatedTime) 
+    {
+        this.lastUpdatedTime = lastUpdatedTime;
+    }
+
+    public Date getLastUpdatedTime() 
+    {
+        return lastUpdatedTime;
+    }
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+    public void setCityCode(String cityCode) 
+    {
+        this.cityCode = cityCode;
+    }
+
+    public String getCityCode() 
+    {
+        return cityCode;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setSn(String sn) 
+    {
+        this.sn = sn;
+    }
+
+    public String getSn() 
+    {
+        return sn;
+    }
+    public void setBuildingId(Long buildingId) 
+    {
+        this.buildingId = buildingId;
+    }
+
+    public Long getBuildingId() 
+    {
+        return buildingId;
+    }
+    public void setUrl(String url) 
+    {
+        this.url = url;
+    }
+
+    public String getUrl() 
+    {
+        return url;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("isDeleted", getIsDeleted())
+            .append("createdTime", getCreatedTime())
+            .append("createdBy", getCreatedBy())
+            .append("modifiedBy", getModifiedBy())
+            .append("lastUpdatedTime", getLastUpdatedTime())
+            .append("status", getStatus())
+            .append("cityCode", getCityCode())
+            .append("type", getType())
+            .append("name", getName())
+            .append("sn", getSn())
+            .append("buildingId", getBuildingId())
+            .append("remark", getRemark())
+            .append("url", getUrl())
+            .toString();
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Competition.java

@@ -1,7 +1,10 @@
 package com.ruoyi.system.domain;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
@@ -13,6 +16,12 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2022-11-02
  */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
 public class Competition extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -27,10 +36,14 @@ public class Competition extends BaseEntity
     /** 主队名 */
     @Excel(name = "主队名")
     private String mainTeamName;
+    @ApiModelProperty(value = "主队logo", required = false)
+    private String mainTeamLogo;
 
     /** 客队ID */
     @Excel(name = "客队ID")
     private Long guestTeamId;
+    @ApiModelProperty(value = "客队logo", required = false)
+    private String guestTeamLogo;
 
     /** 客队名 */
     @Excel(name = "客队名")
@@ -109,15 +122,15 @@ public class Competition extends BaseEntity
 
     /** 是否删除 */
     @Excel(name = "是否删除")
-    private Long isDeleted;
+    private Integer isDeleted;
 
     /** 经度 */
     @Excel(name = "经度")
-    private Long longitude;
+    private BigDecimal longitude;
 
     /** 纬度 */
     @Excel(name = "纬度")
-    private Long latitude;
+    private BigDecimal latitude;
 
     /** 比赛性质（0=约战；1=赛事） */
     @Excel(name = "比赛性质", readConverterExp = "0==约战；1=赛事")
@@ -183,411 +196,4 @@ public class Competition extends BaseEntity
     @Excel(name = "赞助商")
     private String sponsor;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setMainTeamId(Long mainTeamId) 
-    {
-        this.mainTeamId = mainTeamId;
-    }
-
-    public Long getMainTeamId() 
-    {
-        return mainTeamId;
-    }
-    public void setMainTeamName(String mainTeamName) 
-    {
-        this.mainTeamName = mainTeamName;
-    }
-
-    public String getMainTeamName() 
-    {
-        return mainTeamName;
-    }
-    public void setGuestTeamId(Long guestTeamId) 
-    {
-        this.guestTeamId = guestTeamId;
-    }
-
-    public Long getGuestTeamId() 
-    {
-        return guestTeamId;
-    }
-    public void setGuestTeamName(String guestTeamName) 
-    {
-        this.guestTeamName = guestTeamName;
-    }
-
-    public String getGuestTeamName() 
-    {
-        return guestTeamName;
-    }
-    public void setCompetitionCode(String competitionCode) 
-    {
-        this.competitionCode = competitionCode;
-    }
-
-    public String getCompetitionCode() 
-    {
-        return competitionCode;
-    }
-    public void setCompetitionName(String competitionName) 
-    {
-        this.competitionName = competitionName;
-    }
-
-    public String getCompetitionName() 
-    {
-        return competitionName;
-    }
-    public void setDesignated(Integer designated) 
-    {
-        this.designated = designated;
-    }
-
-    public Integer getDesignated() 
-    {
-        return designated;
-    }
-    public void setCompetitionType(Long competitionType) 
-    {
-        this.competitionType = competitionType;
-    }
-
-    public Long getCompetitionType() 
-    {
-        return competitionType;
-    }
-    public void setCompetitionTime(Date competitionTime) 
-    {
-        this.competitionTime = competitionTime;
-    }
-
-    public Date getCompetitionTime() 
-    {
-        return competitionTime;
-    }
-    public void setBuildingId(Long buildingId) 
-    {
-        this.buildingId = buildingId;
-    }
-
-    public Long getBuildingId() 
-    {
-        return buildingId;
-    }
-    public void setBuildingName(String buildingName) 
-    {
-        this.buildingName = buildingName;
-    }
-
-    public String getBuildingName() 
-    {
-        return buildingName;
-    }
-    public void setCompetitionAddress(String competitionAddress) 
-    {
-        this.competitionAddress = competitionAddress;
-    }
-
-    public String getCompetitionAddress() 
-    {
-        return competitionAddress;
-    }
-    public void setFounder(Long founder) 
-    {
-        this.founder = founder;
-    }
-
-    public Long getFounder() 
-    {
-        return founder;
-    }
-    public void setStatus(Integer status) 
-    {
-        this.status = status;
-    }
-
-    public Integer getStatus() 
-    {
-        return status;
-    }
-    public void setCityCode(String cityCode) 
-    {
-        this.cityCode = cityCode;
-    }
-
-    public String getCityCode() 
-    {
-        return cityCode;
-    }
-    public void setCityName(String cityName) 
-    {
-        this.cityName = cityName;
-    }
-
-    public String getCityName() 
-    {
-        return cityName;
-    }
-    public void setMaxPlayer(Long maxPlayer) 
-    {
-        this.maxPlayer = maxPlayer;
-    }
-
-    public Long getMaxPlayer() 
-    {
-        return maxPlayer;
-    }
-    public void setCreatedTime(Date createdTime) 
-    {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() 
-    {
-        return createdTime;
-    }
-    public void setLastUpdatedTime(Date lastUpdatedTime) 
-    {
-        this.lastUpdatedTime = lastUpdatedTime;
-    }
-
-    public Date getLastUpdatedTime() 
-    {
-        return lastUpdatedTime;
-    }
-    public void setCreatedBy(String createdBy) 
-    {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() 
-    {
-        return createdBy;
-    }
-    public void setModifiedBy(String modifiedBy) 
-    {
-        this.modifiedBy = modifiedBy;
-    }
-
-    public String getModifiedBy() 
-    {
-        return modifiedBy;
-    }
-    public void setIsDeleted(Long isDeleted) 
-    {
-        this.isDeleted = isDeleted;
-    }
-
-    public Long getIsDeleted() 
-    {
-        return isDeleted;
-    }
-    public void setLongitude(Long longitude) 
-    {
-        this.longitude = longitude;
-    }
-
-    public Long getLongitude() 
-    {
-        return longitude;
-    }
-    public void setLatitude(Long latitude) 
-    {
-        this.latitude = latitude;
-    }
-
-    public Long getLatitude() 
-    {
-        return latitude;
-    }
-    public void setCompetitionNature(Integer competitionNature) 
-    {
-        this.competitionNature = competitionNature;
-    }
-
-    public Integer getCompetitionNature() 
-    {
-        return competitionNature;
-    }
-    public void setEnrollBeginTime(Date enrollBeginTime) 
-    {
-        this.enrollBeginTime = enrollBeginTime;
-    }
-
-    public Date getEnrollBeginTime() 
-    {
-        return enrollBeginTime;
-    }
-    public void setEnrollEndTime(Date enrollEndTime) 
-    {
-        this.enrollEndTime = enrollEndTime;
-    }
-
-    public Date getEnrollEndTime() 
-    {
-        return enrollEndTime;
-    }
-    public void setContacts(String contacts) 
-    {
-        this.contacts = contacts;
-    }
-
-    public String getContacts() 
-    {
-        return contacts;
-    }
-    public void setContactsAreaCode(String contactsAreaCode) 
-    {
-        this.contactsAreaCode = contactsAreaCode;
-    }
-
-    public String getContactsAreaCode() 
-    {
-        return contactsAreaCode;
-    }
-    public void setContactsTel(String contactsTel) 
-    {
-        this.contactsTel = contactsTel;
-    }
-
-    public String getContactsTel() 
-    {
-        return contactsTel;
-    }
-    public void setCompetitionBeginTime(Date competitionBeginTime) 
-    {
-        this.competitionBeginTime = competitionBeginTime;
-    }
-
-    public Date getCompetitionBeginTime() 
-    {
-        return competitionBeginTime;
-    }
-    public void setCompetitionEndTime(Date competitionEndTime) 
-    {
-        this.competitionEndTime = competitionEndTime;
-    }
-
-    public Date getCompetitionEndTime() 
-    {
-        return competitionEndTime;
-    }
-    public void setOrganizer(String organizer) 
-    {
-        this.organizer = organizer;
-    }
-
-    public String getOrganizer() 
-    {
-        return organizer;
-    }
-    public void setUndertake(String undertake) 
-    {
-        this.undertake = undertake;
-    }
-
-    public String getUndertake() 
-    {
-        return undertake;
-    }
-    public void setCompetitionBackImg(String competitionBackImg) 
-    {
-        this.competitionBackImg = competitionBackImg;
-    }
-
-    public String getCompetitionBackImg() 
-    {
-        return competitionBackImg;
-    }
-    public void setCreatedId(Long createdId) 
-    {
-        this.createdId = createdId;
-    }
-
-    public Long getCreatedId() 
-    {
-        return createdId;
-    }
-    public void setAuditStatus(Long auditStatus) 
-    {
-        this.auditStatus = auditStatus;
-    }
-
-    public Long getAuditStatus() 
-    {
-        return auditStatus;
-    }
-    public void setHeightHide(Integer heightHide) 
-    {
-        this.heightHide = heightHide;
-    }
-
-    public Integer getHeightHide() 
-    {
-        return heightHide;
-    }
-    public void setSponsor(String sponsor) 
-    {
-        this.sponsor = sponsor;
-    }
-
-    public String getSponsor() 
-    {
-        return sponsor;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("mainTeamId", getMainTeamId())
-            .append("mainTeamName", getMainTeamName())
-            .append("guestTeamId", getGuestTeamId())
-            .append("guestTeamName", getGuestTeamName())
-            .append("competitionCode", getCompetitionCode())
-            .append("competitionName", getCompetitionName())
-            .append("designated", getDesignated())
-            .append("competitionType", getCompetitionType())
-            .append("competitionTime", getCompetitionTime())
-            .append("buildingId", getBuildingId())
-            .append("buildingName", getBuildingName())
-            .append("competitionAddress", getCompetitionAddress())
-            .append("founder", getFounder())
-            .append("status", getStatus())
-            .append("cityCode", getCityCode())
-            .append("cityName", getCityName())
-            .append("maxPlayer", getMaxPlayer())
-            .append("createdTime", getCreatedTime())
-            .append("lastUpdatedTime", getLastUpdatedTime())
-            .append("createdBy", getCreatedBy())
-            .append("modifiedBy", getModifiedBy())
-            .append("isDeleted", getIsDeleted())
-            .append("longitude", getLongitude())
-            .append("latitude", getLatitude())
-            .append("remark", getRemark())
-            .append("competitionNature", getCompetitionNature())
-            .append("enrollBeginTime", getEnrollBeginTime())
-            .append("enrollEndTime", getEnrollEndTime())
-            .append("contacts", getContacts())
-            .append("contactsAreaCode", getContactsAreaCode())
-            .append("contactsTel", getContactsTel())
-            .append("competitionBeginTime", getCompetitionBeginTime())
-            .append("competitionEndTime", getCompetitionEndTime())
-            .append("organizer", getOrganizer())
-            .append("undertake", getUndertake())
-            .append("competitionBackImg", getCompetitionBackImg())
-            .append("createdId", getCreatedId())
-            .append("auditStatus", getAuditStatus())
-            .append("heightHide", getHeightHide())
-            .append("sponsor", getSponsor())
-            .toString();
-    }
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionMembers.java

@@ -1,7 +1,9 @@
 package com.ruoyi.system.domain;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
@@ -13,6 +15,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2022-11-03
  */
+@Data
 public class CompetitionMembers extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -100,7 +103,7 @@ public class CompetitionMembers extends BaseEntity
 
     /** 比赛性质（0=约战；1=赛事） */
     @Excel(name = "比赛性质", readConverterExp = "0==约战；1=赛事")
-    private Long competitionNature;
+    private Integer competitionNature;
 
     /** 真实姓名 */
     @Excel(name = "真实姓名")
@@ -137,311 +140,11 @@ public class CompetitionMembers extends BaseEntity
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Integer isFirstLaunch;
+    @Excel(name = "位置")
+    private String teamPosition;
+    @Excel(name = "身高")
+    private BigDecimal height;
+    @Excel(name = "体重")
+    private BigDecimal weight;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setUserId(Long userId) 
-    {
-        this.userId = userId;
-    }
-
-    public Long getUserId() 
-    {
-        return userId;
-    }
-    public void setRoleCode(String roleCode) 
-    {
-        this.roleCode = roleCode;
-    }
-
-    public String getRoleCode() 
-    {
-        return roleCode;
-    }
-    public void setCompetitionId(Long competitionId) 
-    {
-        this.competitionId = competitionId;
-    }
-
-    public Long getCompetitionId() 
-    {
-        return competitionId;
-    }
-    public void setCompetitionTeamId(Long competitionTeamId) 
-    {
-        this.competitionTeamId = competitionTeamId;
-    }
-
-    public Long getCompetitionTeamId() 
-    {
-        return competitionTeamId;
-    }
-    public void setScore(Integer score) 
-    {
-        this.score = score;
-    }
-
-    public Integer getScore() 
-    {
-        return score;
-    }
-    public void setPenalty(Integer penalty) 
-    {
-        this.penalty = penalty;
-    }
-
-    public Integer getPenalty() 
-    {
-        return penalty;
-    }
-    public void setTwoPoints(Integer twoPoints) 
-    {
-        this.twoPoints = twoPoints;
-    }
-
-    public Integer getTwoPoints() 
-    {
-        return twoPoints;
-    }
-    public void setThreePoints(Integer threePoints) 
-    {
-        this.threePoints = threePoints;
-    }
-
-    public Integer getThreePoints() 
-    {
-        return threePoints;
-    }
-    public void setBreaks(Integer breaks) 
-    {
-        this.breaks = breaks;
-    }
-
-    public Integer getBreaks() 
-    {
-        return breaks;
-    }
-    public void setRebound(Integer rebound) 
-    {
-        this.rebound = rebound;
-    }
-
-    public Integer getRebound() 
-    {
-        return rebound;
-    }
-    public void setBlock(Integer block) 
-    {
-        this.block = block;
-    }
-
-    public Integer getBlock() 
-    {
-        return block;
-    }
-    public void setIsDeleted(Integer isDeleted) 
-    {
-        this.isDeleted = isDeleted;
-    }
-
-    public Integer getIsDeleted() 
-    {
-        return isDeleted;
-    }
-    public void setCreatedBy(String createdBy) 
-    {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() 
-    {
-        return createdBy;
-    }
-    public void setModifiedBy(String modifiedBy) 
-    {
-        this.modifiedBy = modifiedBy;
-    }
-
-    public String getModifiedBy() 
-    {
-        return modifiedBy;
-    }
-    public void setCreatedTime(Date createdTime) 
-    {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() 
-    {
-        return createdTime;
-    }
-    public void setLastUpdatedTime(Date lastUpdatedTime) 
-    {
-        this.lastUpdatedTime = lastUpdatedTime;
-    }
-
-    public Date getLastUpdatedTime() 
-    {
-        return lastUpdatedTime;
-    }
-    public void setStatus(Integer status) 
-    {
-        this.status = status;
-    }
-
-    public Integer getStatus() 
-    {
-        return status;
-    }
-    public void setUserType(Integer userType) 
-    {
-        this.userType = userType;
-    }
-
-    public Integer getUserType() 
-    {
-        return userType;
-    }
-    public void setCompetitionOfTeamId(Long competitionOfTeamId) 
-    {
-        this.competitionOfTeamId = competitionOfTeamId;
-    }
-
-    public Long getCompetitionOfTeamId() 
-    {
-        return competitionOfTeamId;
-    }
-    public void setCompetitionNature(Long competitionNature) 
-    {
-        this.competitionNature = competitionNature;
-    }
-
-    public Long getCompetitionNature() 
-    {
-        return competitionNature;
-    }
-    public void setRealName(String realName) 
-    {
-        this.realName = realName;
-    }
-
-    public String getRealName() 
-    {
-        return realName;
-    }
-    public void setJerseyNumber(String jerseyNumber) 
-    {
-        this.jerseyNumber = jerseyNumber;
-    }
-
-    public String getJerseyNumber() 
-    {
-        return jerseyNumber;
-    }
-    public void setIdType(String idType) 
-    {
-        this.idType = idType;
-    }
-
-    public String getIdType() 
-    {
-        return idType;
-    }
-    public void setIdCardNo(String idCardNo) 
-    {
-        this.idCardNo = idCardNo;
-    }
-
-    public String getIdCardNo() 
-    {
-        return idCardNo;
-    }
-    public void setContactsTel(String contactsTel) 
-    {
-        this.contactsTel = contactsTel;
-    }
-
-    public String getContactsTel() 
-    {
-        return contactsTel;
-    }
-    public void setContacts(String contacts) 
-    {
-        this.contacts = contacts;
-    }
-
-    public String getContacts() 
-    {
-        return contacts;
-    }
-    public void setContactsAreaCode(String contactsAreaCode) 
-    {
-        this.contactsAreaCode = contactsAreaCode;
-    }
-
-    public String getContactsAreaCode() 
-    {
-        return contactsAreaCode;
-    }
-    public void setPersonalPhoto(String personalPhoto) 
-    {
-        this.personalPhoto = personalPhoto;
-    }
-
-    public String getPersonalPhoto() 
-    {
-        return personalPhoto;
-    }
-    public void setIsFirstLaunch(Integer isFirstLaunch) 
-    {
-        this.isFirstLaunch = isFirstLaunch;
-    }
-
-    public Integer getIsFirstLaunch() 
-    {
-        return isFirstLaunch;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("userId", getUserId())
-            .append("roleCode", getRoleCode())
-            .append("competitionId", getCompetitionId())
-            .append("competitionTeamId", getCompetitionTeamId())
-            .append("score", getScore())
-            .append("penalty", getPenalty())
-            .append("twoPoints", getTwoPoints())
-            .append("threePoints", getThreePoints())
-            .append("breaks", getBreaks())
-            .append("rebound", getRebound())
-            .append("block", getBlock())
-            .append("isDeleted", getIsDeleted())
-            .append("createdBy", getCreatedBy())
-            .append("modifiedBy", getModifiedBy())
-            .append("createdTime", getCreatedTime())
-            .append("lastUpdatedTime", getLastUpdatedTime())
-            .append("status", getStatus())
-            .append("userType", getUserType())
-            .append("competitionOfTeamId", getCompetitionOfTeamId())
-            .append("competitionNature", getCompetitionNature())
-            .append("realName", getRealName())
-            .append("jerseyNumber", getJerseyNumber())
-            .append("idType", getIdType())
-            .append("idCardNo", getIdCardNo())
-            .append("contactsTel", getContactsTel())
-            .append("contacts", getContacts())
-            .append("contactsAreaCode", getContactsAreaCode())
-            .append("personalPhoto", getPersonalPhoto())
-            .append("isFirstLaunch", getIsFirstLaunch())
-            .toString();
-    }
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionMembersScore.java

@@ -2,6 +2,8 @@ package com.ruoyi.system.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
@@ -13,6 +15,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2022-11-03
  */
+@Data
 public class CompetitionMembersScore extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -122,271 +125,7 @@ public class CompetitionMembersScore extends BaseEntity
     @Excel(name = "是否首发球员")
     private Integer isFirstLaunch;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
+    @ApiModelProperty(value = "真实姓名", required = false)
+    private String realName;
 
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setCompetitionId(Long competitionId) 
-    {
-        this.competitionId = competitionId;
-    }
-
-    public Long getCompetitionId() 
-    {
-        return competitionId;
-    }
-    public void setCompetitionVsId(Long competitionVsId) 
-    {
-        this.competitionVsId = competitionVsId;
-    }
-
-    public Long getCompetitionVsId() 
-    {
-        return competitionVsId;
-    }
-    public void setTeamId(Long teamId) 
-    {
-        this.teamId = teamId;
-    }
-
-    public Long getTeamId() 
-    {
-        return teamId;
-    }
-    public void setTeamName(String teamName) 
-    {
-        this.teamName = teamName;
-    }
-
-    public String getTeamName() 
-    {
-        return teamName;
-    }
-    public void setNodeNum(Long nodeNum) 
-    {
-        this.nodeNum = nodeNum;
-    }
-
-    public Long getNodeNum() 
-    {
-        return nodeNum;
-    }
-    public void setTeamUserId(Long teamUserId) 
-    {
-        this.teamUserId = teamUserId;
-    }
-
-    public Long getTeamUserId() 
-    {
-        return teamUserId;
-    }
-    public void setJerseyNumber(String jerseyNumber) 
-    {
-        this.jerseyNumber = jerseyNumber;
-    }
-
-    public String getJerseyNumber() 
-    {
-        return jerseyNumber;
-    }
-    public void setTotalScore(Long totalScore) 
-    {
-        this.totalScore = totalScore;
-    }
-
-    public Long getTotalScore() 
-    {
-        return totalScore;
-    }
-    public void setTwoPoints(Long twoPoints) 
-    {
-        this.twoPoints = twoPoints;
-    }
-
-    public Long getTwoPoints() 
-    {
-        return twoPoints;
-    }
-    public void setThreePoints(Long threePoints) 
-    {
-        this.threePoints = threePoints;
-    }
-
-    public Long getThreePoints() 
-    {
-        return threePoints;
-    }
-    public void setPenalty(Long penalty) 
-    {
-        this.penalty = penalty;
-    }
-
-    public Long getPenalty() 
-    {
-        return penalty;
-    }
-    public void setBackboard(Long backboard) 
-    {
-        this.backboard = backboard;
-    }
-
-    public Long getBackboard() 
-    {
-        return backboard;
-    }
-    public void setFrontPlate(Long frontPlate) 
-    {
-        this.frontPlate = frontPlate;
-    }
-
-    public Long getFrontPlate() 
-    {
-        return frontPlate;
-    }
-    public void setBackPlate(Long backPlate) 
-    {
-        this.backPlate = backPlate;
-    }
-
-    public Long getBackPlate() 
-    {
-        return backPlate;
-    }
-    public void setAssists(Long assists) 
-    {
-        this.assists = assists;
-    }
-
-    public Long getAssists() 
-    {
-        return assists;
-    }
-    public void setSnatch(Long snatch) 
-    {
-        this.snatch = snatch;
-    }
-
-    public Long getSnatch() 
-    {
-        return snatch;
-    }
-    public void setBlock(Long block) 
-    {
-        this.block = block;
-    }
-
-    public Long getBlock() 
-    {
-        return block;
-    }
-    public void setFault(Long fault) 
-    {
-        this.fault = fault;
-    }
-
-    public Long getFault() 
-    {
-        return fault;
-    }
-    public void setBreaks(Long breaks) 
-    {
-        this.breaks = breaks;
-    }
-
-    public Long getBreaks() 
-    {
-        return breaks;
-    }
-    public void setCreatedTime(Date createdTime) 
-    {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() 
-    {
-        return createdTime;
-    }
-    public void setLastUpdatedTime(Date lastUpdatedTime) 
-    {
-        this.lastUpdatedTime = lastUpdatedTime;
-    }
-
-    public Date getLastUpdatedTime() 
-    {
-        return lastUpdatedTime;
-    }
-    public void setCreatedBy(String createdBy) 
-    {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() 
-    {
-        return createdBy;
-    }
-    public void setModifiedBy(String modifiedBy) 
-    {
-        this.modifiedBy = modifiedBy;
-    }
-
-    public String getModifiedBy() 
-    {
-        return modifiedBy;
-    }
-    public void setIsDeleted(Long isDeleted) 
-    {
-        this.isDeleted = isDeleted;
-    }
-
-    public Long getIsDeleted() 
-    {
-        return isDeleted;
-    }
-    public void setIsFirstLaunch(Integer isFirstLaunch) 
-    {
-        this.isFirstLaunch = isFirstLaunch;
-    }
-
-    public Integer getIsFirstLaunch() 
-    {
-        return isFirstLaunch;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("competitionId", getCompetitionId())
-            .append("competitionVsId", getCompetitionVsId())
-            .append("teamId", getTeamId())
-            .append("teamName", getTeamName())
-            .append("nodeNum", getNodeNum())
-            .append("teamUserId", getTeamUserId())
-            .append("jerseyNumber", getJerseyNumber())
-            .append("totalScore", getTotalScore())
-            .append("twoPoints", getTwoPoints())
-            .append("threePoints", getThreePoints())
-            .append("penalty", getPenalty())
-            .append("backboard", getBackboard())
-            .append("frontPlate", getFrontPlate())
-            .append("backPlate", getBackPlate())
-            .append("assists", getAssists())
-            .append("snatch", getSnatch())
-            .append("block", getBlock())
-            .append("fault", getFault())
-            .append("breaks", getBreaks())
-            .append("createdTime", getCreatedTime())
-            .append("lastUpdatedTime", getLastUpdatedTime())
-            .append("createdBy", getCreatedBy())
-            .append("modifiedBy", getModifiedBy())
-            .append("isDeleted", getIsDeleted())
-            .append("remark", getRemark())
-            .append("isFirstLaunch", getIsFirstLaunch())
-            .toString();
-    }
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionOfTeam.java

@@ -2,6 +2,7 @@ package com.ruoyi.system.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
@@ -13,6 +14,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2022-11-03
  */
+@Data
 public class CompetitionOfTeam extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -76,163 +78,6 @@ public class CompetitionOfTeam extends BaseEntity
 
     /** 组内的序号 */
     @Excel(name = "组内的序号")
-    private Long serialNumber;
+    private Integer serialNumber;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setCompetitionId(Long competitionId) 
-    {
-        this.competitionId = competitionId;
-    }
-
-    public Long getCompetitionId() 
-    {
-        return competitionId;
-    }
-    public void setTeamId(Long teamId) 
-    {
-        this.teamId = teamId;
-    }
-
-    public Long getTeamId() 
-    {
-        return teamId;
-    }
-    public void setTeamName(String teamName) 
-    {
-        this.teamName = teamName;
-    }
-
-    public String getTeamName() 
-    {
-        return teamName;
-    }
-    public void setCompetitionGroup(String competitionGroup) 
-    {
-        this.competitionGroup = competitionGroup;
-    }
-
-    public String getCompetitionGroup() 
-    {
-        return competitionGroup;
-    }
-    public void setCreatedTime(Date createdTime) 
-    {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() 
-    {
-        return createdTime;
-    }
-    public void setStatus(Integer status) 
-    {
-        this.status = status;
-    }
-
-    public Integer getStatus() 
-    {
-        return status;
-    }
-    public void setLastUpdatedTime(Date lastUpdatedTime) 
-    {
-        this.lastUpdatedTime = lastUpdatedTime;
-    }
-
-    public Date getLastUpdatedTime() 
-    {
-        return lastUpdatedTime;
-    }
-    public void setCreatedBy(String createdBy) 
-    {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() 
-    {
-        return createdBy;
-    }
-    public void setModifiedBy(String modifiedBy) 
-    {
-        this.modifiedBy = modifiedBy;
-    }
-
-    public String getModifiedBy() 
-    {
-        return modifiedBy;
-    }
-    public void setIsDeleted(Long isDeleted) 
-    {
-        this.isDeleted = isDeleted;
-    }
-
-    public Long getIsDeleted() 
-    {
-        return isDeleted;
-    }
-    public void setContacts(String contacts) 
-    {
-        this.contacts = contacts;
-    }
-
-    public String getContacts() 
-    {
-        return contacts;
-    }
-    public void setContactsTel(String contactsTel) 
-    {
-        this.contactsTel = contactsTel;
-    }
-
-    public String getContactsTel() 
-    {
-        return contactsTel;
-    }
-    public void setContactsAreaCode(String contactsAreaCode) 
-    {
-        this.contactsAreaCode = contactsAreaCode;
-    }
-
-    public String getContactsAreaCode() 
-    {
-        return contactsAreaCode;
-    }
-    public void setSerialNumber(Long serialNumber) 
-    {
-        this.serialNumber = serialNumber;
-    }
-
-    public Long getSerialNumber() 
-    {
-        return serialNumber;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("competitionId", getCompetitionId())
-            .append("teamId", getTeamId())
-            .append("teamName", getTeamName())
-            .append("competitionGroup", getCompetitionGroup())
-            .append("createdTime", getCreatedTime())
-            .append("status", getStatus())
-            .append("lastUpdatedTime", getLastUpdatedTime())
-            .append("createdBy", getCreatedBy())
-            .append("modifiedBy", getModifiedBy())
-            .append("isDeleted", getIsDeleted())
-            .append("remark", getRemark())
-            .append("contacts", getContacts())
-            .append("contactsTel", getContactsTel())
-            .append("contactsAreaCode", getContactsAreaCode())
-            .append("serialNumber", getSerialNumber())
-            .toString();
-    }
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionResult.java

@@ -2,6 +2,8 @@ package com.ruoyi.system.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
@@ -13,6 +15,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2022-11-03
  */
+@Data
 public class CompetitionResult extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -38,11 +41,11 @@ public class CompetitionResult extends BaseEntity
 
     /** 比赛节数1计分 */
     @Excel(name = "比赛节数1计分")
-    private Long oneNodeScore;
+    private Integer oneNodeScore;
 
     /** 比赛节数2计分 */
     @Excel(name = "比赛节数2计分")
-    private Long twoNodeScore;
+    private Integer twoNodeScore;
 
     /** 比赛分组(A,B,C) */
     @Excel(name = "比赛分组(A,B,C)")
@@ -76,219 +79,26 @@ public class CompetitionResult extends BaseEntity
 
     /** 比赛节数3计分 */
     @Excel(name = "比赛节数3计分")
-    private Long threeNodeScore;
+    private Integer threeNodeScore;
 
     /** 比赛节数4计分 */
     @Excel(name = "比赛节数4计分")
-    private Long fourNodeScore;
+    private Integer fourNodeScore;
 
     /** 比赛节数5计分 */
     @Excel(name = "比赛节数5计分")
-    private Long fiveNodeScore;
+    private Integer fiveNodeScore;
 
     /** 比赛节数6计分 */
     @Excel(name = "比赛节数6计分")
-    private Long sixNodeScore;
+    private Integer sixNodeScore;
 
     /** 比赛积分 */
     @Excel(name = "比赛积分")
-    private Long integral;
+    private Integer integral;
+    @ApiModelProperty(value = "比赛结果", required = false)
+    private String vsResult;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setCompetitionId(Long competitionId) 
-    {
-        this.competitionId = competitionId;
-    }
-
-    public Long getCompetitionId() 
-    {
-        return competitionId;
-    }
-    public void setCompetitionVsId(Long competitionVsId) 
-    {
-        this.competitionVsId = competitionVsId;
-    }
-
-    public Long getCompetitionVsId() 
-    {
-        return competitionVsId;
-    }
-    public void setTeamId(Long teamId) 
-    {
-        this.teamId = teamId;
-    }
-
-    public Long getTeamId() 
-    {
-        return teamId;
-    }
-    public void setTeamName(String teamName) 
-    {
-        this.teamName = teamName;
-    }
-
-    public String getTeamName() 
-    {
-        return teamName;
-    }
-    public void setOneNodeScore(Long oneNodeScore) 
-    {
-        this.oneNodeScore = oneNodeScore;
-    }
-
-    public Long getOneNodeScore() 
-    {
-        return oneNodeScore;
-    }
-    public void setTwoNodeScore(Long twoNodeScore) 
-    {
-        this.twoNodeScore = twoNodeScore;
-    }
-
-    public Long getTwoNodeScore() 
-    {
-        return twoNodeScore;
-    }
-    public void setCompetitionGroup(String competitionGroup) 
-    {
-        this.competitionGroup = competitionGroup;
-    }
-
-    public String getCompetitionGroup() 
-    {
-        return competitionGroup;
-    }
-    public void setStatus(Integer status) 
-    {
-        this.status = status;
-    }
-
-    public Integer getStatus() 
-    {
-        return status;
-    }
-    public void setCreatedTime(Date createdTime) 
-    {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() 
-    {
-        return createdTime;
-    }
-    public void setLastUpdatedTime(Date lastUpdatedTime) 
-    {
-        this.lastUpdatedTime = lastUpdatedTime;
-    }
-
-    public Date getLastUpdatedTime() 
-    {
-        return lastUpdatedTime;
-    }
-    public void setCreatedBy(String createdBy) 
-    {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() 
-    {
-        return createdBy;
-    }
-    public void setModifiedBy(String modifiedBy) 
-    {
-        this.modifiedBy = modifiedBy;
-    }
-
-    public String getModifiedBy() 
-    {
-        return modifiedBy;
-    }
-    public void setIsDeleted(Long isDeleted) 
-    {
-        this.isDeleted = isDeleted;
-    }
-
-    public Long getIsDeleted() 
-    {
-        return isDeleted;
-    }
-    public void setThreeNodeScore(Long threeNodeScore) 
-    {
-        this.threeNodeScore = threeNodeScore;
-    }
-
-    public Long getThreeNodeScore() 
-    {
-        return threeNodeScore;
-    }
-    public void setFourNodeScore(Long fourNodeScore) 
-    {
-        this.fourNodeScore = fourNodeScore;
-    }
-
-    public Long getFourNodeScore() 
-    {
-        return fourNodeScore;
-    }
-    public void setFiveNodeScore(Long fiveNodeScore) 
-    {
-        this.fiveNodeScore = fiveNodeScore;
-    }
-
-    public Long getFiveNodeScore() 
-    {
-        return fiveNodeScore;
-    }
-    public void setSixNodeScore(Long sixNodeScore) 
-    {
-        this.sixNodeScore = sixNodeScore;
-    }
-
-    public Long getSixNodeScore() 
-    {
-        return sixNodeScore;
-    }
-    public void setIntegral(Long integral) 
-    {
-        this.integral = integral;
-    }
-
-    public Long getIntegral() 
-    {
-        return integral;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("competitionId", getCompetitionId())
-            .append("competitionVsId", getCompetitionVsId())
-            .append("teamId", getTeamId())
-            .append("teamName", getTeamName())
-            .append("oneNodeScore", getOneNodeScore())
-            .append("twoNodeScore", getTwoNodeScore())
-            .append("competitionGroup", getCompetitionGroup())
-            .append("status", getStatus())
-            .append("createdTime", getCreatedTime())
-            .append("lastUpdatedTime", getLastUpdatedTime())
-            .append("createdBy", getCreatedBy())
-            .append("modifiedBy", getModifiedBy())
-            .append("isDeleted", getIsDeleted())
-            .append("remark", getRemark())
-            .append("threeNodeScore", getThreeNodeScore())
-            .append("fourNodeScore", getFourNodeScore())
-            .append("fiveNodeScore", getFiveNodeScore())
-            .append("sixNodeScore", getSixNodeScore())
-            .append("integral", getIntegral())
-            .toString();
-    }
+    @ApiModelProperty(value = "比赛总分", required = false)
+    private Integer totalScore;
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionTeamGroup.java

@@ -2,6 +2,7 @@ package com.ruoyi.system.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.*;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
@@ -13,6 +14,12 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2022-11-03
  */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
 public class CompetitionTeamGroup extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -52,117 +59,10 @@ public class CompetitionTeamGroup extends BaseEntity
 
     /** 是否删除 */
     @Excel(name = "是否删除")
-    private Long isDeleted;
+    private Integer isDeleted;
 
     /** 循环赛编排状态 0=未编排，1=已编排 */
     @Excel(name = "循环赛编排状态 0=未编排，1=已编排")
-    private Long isCycle;
+    private Integer isCycle;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setCompetitionId(Long competitionId) 
-    {
-        this.competitionId = competitionId;
-    }
-
-    public Long getCompetitionId() 
-    {
-        return competitionId;
-    }
-    public void setCompetitionGroup(String competitionGroup) 
-    {
-        this.competitionGroup = competitionGroup;
-    }
-
-    public String getCompetitionGroup() 
-    {
-        return competitionGroup;
-    }
-    public void setCreatedTime(Date createdTime) 
-    {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() 
-    {
-        return createdTime;
-    }
-    public void setStatus(Integer status) 
-    {
-        this.status = status;
-    }
-
-    public Integer getStatus() 
-    {
-        return status;
-    }
-    public void setLastUpdatedTime(Date lastUpdatedTime) 
-    {
-        this.lastUpdatedTime = lastUpdatedTime;
-    }
-
-    public Date getLastUpdatedTime() 
-    {
-        return lastUpdatedTime;
-    }
-    public void setCreatedBy(String createdBy) 
-    {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() 
-    {
-        return createdBy;
-    }
-    public void setModifiedBy(String modifiedBy) 
-    {
-        this.modifiedBy = modifiedBy;
-    }
-
-    public String getModifiedBy() 
-    {
-        return modifiedBy;
-    }
-    public void setIsDeleted(Long isDeleted) 
-    {
-        this.isDeleted = isDeleted;
-    }
-
-    public Long getIsDeleted() 
-    {
-        return isDeleted;
-    }
-    public void setIsCycle(Long isCycle) 
-    {
-        this.isCycle = isCycle;
-    }
-
-    public Long getIsCycle() 
-    {
-        return isCycle;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("competitionId", getCompetitionId())
-            .append("competitionGroup", getCompetitionGroup())
-            .append("createdTime", getCreatedTime())
-            .append("status", getStatus())
-            .append("lastUpdatedTime", getLastUpdatedTime())
-            .append("createdBy", getCreatedBy())
-            .append("modifiedBy", getModifiedBy())
-            .append("isDeleted", getIsDeleted())
-            .append("remark", getRemark())
-            .append("isCycle", getIsCycle())
-            .toString();
-    }
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionTeamVsTeam.java

@@ -2,6 +2,7 @@ package com.ruoyi.system.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
@@ -13,6 +14,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2022-11-03
  */
+@Data
 public class CompetitionTeamVsTeam extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -85,15 +87,15 @@ public class CompetitionTeamVsTeam extends BaseEntity
 
     /** 是否删除 */
     @Excel(name = "是否删除")
-    private Long isDeleted;
+    private Integer isDeleted;
 
     /** 主队得分 */
     @Excel(name = "主队得分")
-    private Long mainTeamScore;
+    private Integer mainTeamScore;
 
     /** 客队得分 */
     @Excel(name = "客队得分")
-    private Long guestTeamScore;
+    private Integer guestTeamScore;
 
     /** 比赛类型：循环赛，淘汰赛 */
     @Excel(name = "比赛类型：循环赛，淘汰赛")
@@ -103,221 +105,4 @@ public class CompetitionTeamVsTeam extends BaseEntity
     @Excel(name = "系统生成的赛程的批次号")
     private String batchNumber;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setCompetitionId(Long competitionId) 
-    {
-        this.competitionId = competitionId;
-    }
-
-    public Long getCompetitionId() 
-    {
-        return competitionId;
-    }
-    public void setMainTeamId(Long mainTeamId) 
-    {
-        this.mainTeamId = mainTeamId;
-    }
-
-    public Long getMainTeamId() 
-    {
-        return mainTeamId;
-    }
-    public void setMainTeamName(String mainTeamName) 
-    {
-        this.mainTeamName = mainTeamName;
-    }
-
-    public String getMainTeamName() 
-    {
-        return mainTeamName;
-    }
-    public void setGuestTeamId(Long guestTeamId) 
-    {
-        this.guestTeamId = guestTeamId;
-    }
-
-    public Long getGuestTeamId() 
-    {
-        return guestTeamId;
-    }
-    public void setGuestTeamName(String guestTeamName) 
-    {
-        this.guestTeamName = guestTeamName;
-    }
-
-    public String getGuestTeamName() 
-    {
-        return guestTeamName;
-    }
-    public void setCompetitionTime(Date competitionTime) 
-    {
-        this.competitionTime = competitionTime;
-    }
-
-    public Date getCompetitionTime() 
-    {
-        return competitionTime;
-    }
-    public void setBuildingId(Long buildingId) 
-    {
-        this.buildingId = buildingId;
-    }
-
-    public Long getBuildingId() 
-    {
-        return buildingId;
-    }
-    public void setBuildingName(String buildingName) 
-    {
-        this.buildingName = buildingName;
-    }
-
-    public String getBuildingName() 
-    {
-        return buildingName;
-    }
-    public void setCompetitionAddress(String competitionAddress) 
-    {
-        this.competitionAddress = competitionAddress;
-    }
-
-    public String getCompetitionAddress() 
-    {
-        return competitionAddress;
-    }
-    public void setCompetitionGroup(String competitionGroup) 
-    {
-        this.competitionGroup = competitionGroup;
-    }
-
-    public String getCompetitionGroup() 
-    {
-        return competitionGroup;
-    }
-    public void setStatus(Integer status) 
-    {
-        this.status = status;
-    }
-
-    public Integer getStatus() 
-    {
-        return status;
-    }
-    public void setCreatedTime(Date createdTime) 
-    {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() 
-    {
-        return createdTime;
-    }
-    public void setLastUpdatedTime(Date lastUpdatedTime) 
-    {
-        this.lastUpdatedTime = lastUpdatedTime;
-    }
-
-    public Date getLastUpdatedTime() 
-    {
-        return lastUpdatedTime;
-    }
-    public void setCreatedBy(String createdBy) 
-    {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() 
-    {
-        return createdBy;
-    }
-    public void setModifiedBy(String modifiedBy) 
-    {
-        this.modifiedBy = modifiedBy;
-    }
-
-    public String getModifiedBy() 
-    {
-        return modifiedBy;
-    }
-    public void setIsDeleted(Long isDeleted) 
-    {
-        this.isDeleted = isDeleted;
-    }
-
-    public Long getIsDeleted() 
-    {
-        return isDeleted;
-    }
-    public void setMainTeamScore(Long mainTeamScore) 
-    {
-        this.mainTeamScore = mainTeamScore;
-    }
-
-    public Long getMainTeamScore() 
-    {
-        return mainTeamScore;
-    }
-    public void setGuestTeamScore(Long guestTeamScore) 
-    {
-        this.guestTeamScore = guestTeamScore;
-    }
-
-    public Long getGuestTeamScore() 
-    {
-        return guestTeamScore;
-    }
-    public void setVsType(String vsType) 
-    {
-        this.vsType = vsType;
-    }
-
-    public String getVsType() 
-    {
-        return vsType;
-    }
-    public void setBatchNumber(String batchNumber) 
-    {
-        this.batchNumber = batchNumber;
-    }
-
-    public String getBatchNumber() 
-    {
-        return batchNumber;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("competitionId", getCompetitionId())
-            .append("mainTeamId", getMainTeamId())
-            .append("mainTeamName", getMainTeamName())
-            .append("guestTeamId", getGuestTeamId())
-            .append("guestTeamName", getGuestTeamName())
-            .append("competitionTime", getCompetitionTime())
-            .append("buildingId", getBuildingId())
-            .append("buildingName", getBuildingName())
-            .append("competitionAddress", getCompetitionAddress())
-            .append("competitionGroup", getCompetitionGroup())
-            .append("status", getStatus())
-            .append("createdTime", getCreatedTime())
-            .append("lastUpdatedTime", getLastUpdatedTime())
-            .append("createdBy", getCreatedBy())
-            .append("modifiedBy", getModifiedBy())
-            .append("isDeleted", getIsDeleted())
-            .append("remark", getRemark())
-            .append("mainTeamScore", getMainTeamScore())
-            .append("guestTeamScore", getGuestTeamScore())
-            .append("vsType", getVsType())
-            .append("batchNumber", getBatchNumber())
-            .toString();
-    }
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/DataDictionary.java

@@ -0,0 +1,179 @@
+package com.ruoyi.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+
+/**
+ * 【请填写功能名称】对象 data_dictionary
+ * 
+ * @author ruoyi
+ * @date 2023-07-04
+ */
+public class DataDictionary extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String createdBy;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date createdTime;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String modifiedBy;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date lastUpdatedTime;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long isDeleted;
+
+    /** key */
+    @Excel(name = "key")
+    private String key;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String name;
+
+    /** 停用 */
+    @Excel(name = "停用")
+    private Integer enabled;
+
+    /** 父节点 */
+    @Excel(name = "父节点")
+    private Long parentId;
+
+    /** 排序 */
+    @Excel(name = "排序")
+    private Long sortNumber;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setCreatedBy(String createdBy) 
+    {
+        this.createdBy = createdBy;
+    }
+
+    public String getCreatedBy() 
+    {
+        return createdBy;
+    }
+    public void setCreatedTime(Date createdTime) 
+    {
+        this.createdTime = createdTime;
+    }
+
+    public Date getCreatedTime() 
+    {
+        return createdTime;
+    }
+    public void setModifiedBy(String modifiedBy) 
+    {
+        this.modifiedBy = modifiedBy;
+    }
+
+    public String getModifiedBy() 
+    {
+        return modifiedBy;
+    }
+    public void setLastUpdatedTime(Date lastUpdatedTime) 
+    {
+        this.lastUpdatedTime = lastUpdatedTime;
+    }
+
+    public Date getLastUpdatedTime() 
+    {
+        return lastUpdatedTime;
+    }
+    public void setIsDeleted(Long isDeleted) 
+    {
+        this.isDeleted = isDeleted;
+    }
+
+    public Long getIsDeleted() 
+    {
+        return isDeleted;
+    }
+    public void setKey(String key) 
+    {
+        this.key = key;
+    }
+
+    public String getKey() 
+    {
+        return key;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setEnabled(Integer enabled) 
+    {
+        this.enabled = enabled;
+    }
+
+    public Integer getEnabled() 
+    {
+        return enabled;
+    }
+    public void setParentId(Long parentId) 
+    {
+        this.parentId = parentId;
+    }
+
+    public Long getParentId() 
+    {
+        return parentId;
+    }
+    public void setSortNumber(Long sortNumber) 
+    {
+        this.sortNumber = sortNumber;
+    }
+
+    public Long getSortNumber() 
+    {
+        return sortNumber;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("createdBy", getCreatedBy())
+            .append("createdTime", getCreatedTime())
+            .append("modifiedBy", getModifiedBy())
+            .append("lastUpdatedTime", getLastUpdatedTime())
+            .append("isDeleted", getIsDeleted())
+            .append("key", getKey())
+            .append("name", getName())
+            .append("enabled", getEnabled())
+            .append("parentId", getParentId())
+            .append("sortNumber", getSortNumber())
+            .toString();
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/FeatureLabel.java

@@ -0,0 +1,138 @@
+package com.ruoyi.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+
+/**
+ * 球馆特征对象 feature_label
+ * 
+ * @author ruoyi
+ * @date 2023-07-06
+ */
+public class FeatureLabel extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Integer isDeleted;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date createdTime;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String createdBy;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String modifiedBy;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date lastUpdatedTime;
+
+    /** 描述 */
+    @Excel(name = "描述")
+    private String description;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long buildingId;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setIsDeleted(Integer isDeleted) 
+    {
+        this.isDeleted = isDeleted;
+    }
+
+    public Integer getIsDeleted() 
+    {
+        return isDeleted;
+    }
+    public void setCreatedTime(Date createdTime) 
+    {
+        this.createdTime = createdTime;
+    }
+
+    public Date getCreatedTime() 
+    {
+        return createdTime;
+    }
+    public void setCreatedBy(String createdBy) 
+    {
+        this.createdBy = createdBy;
+    }
+
+    public String getCreatedBy() 
+    {
+        return createdBy;
+    }
+    public void setModifiedBy(String modifiedBy) 
+    {
+        this.modifiedBy = modifiedBy;
+    }
+
+    public String getModifiedBy() 
+    {
+        return modifiedBy;
+    }
+    public void setLastUpdatedTime(Date lastUpdatedTime) 
+    {
+        this.lastUpdatedTime = lastUpdatedTime;
+    }
+
+    public Date getLastUpdatedTime() 
+    {
+        return lastUpdatedTime;
+    }
+    public void setDescription(String description) 
+    {
+        this.description = description;
+    }
+
+    public String getDescription() 
+    {
+        return description;
+    }
+    public void setBuildingId(Long buildingId) 
+    {
+        this.buildingId = buildingId;
+    }
+
+    public Long getBuildingId() 
+    {
+        return buildingId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("isDeleted", getIsDeleted())
+            .append("createdTime", getCreatedTime())
+            .append("createdBy", getCreatedBy())
+            .append("modifiedBy", getModifiedBy())
+            .append("lastUpdatedTime", getLastUpdatedTime())
+            .append("description", getDescription())
+            .append("remark", getRemark())
+            .append("buildingId", getBuildingId())
+            .toString();
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/GlobalAttachment.java

@@ -0,0 +1,207 @@
+package com.ruoyi.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+
+/**
+ * 【请填写功能名称】对象 global_attachment
+ * 
+ * @author ruoyi
+ * @date 2023-07-04
+ */
+public class GlobalAttachment extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private Long id;
+
+    /** 单据类型 */
+    @Excel(name = "单据类型")
+    private String bizType;
+
+    /** 单据id */
+    @Excel(name = "单据id")
+    private Long bizId;
+
+    /** 附件名称 */
+    @Excel(name = "附件名称")
+    private String attachmentName;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long attachmentType;
+
+    /** url */
+    @Excel(name = "url")
+    private String attachmentUrl;
+
+    /** 版本号 */
+    @Excel(name = "版本号")
+    private Long version;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long isDeleted;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date createdTime;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String createdBy;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String modifiedBy;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date lastUpdatedTime;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String consultType;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setBizType(String bizType) 
+    {
+        this.bizType = bizType;
+    }
+
+    public String getBizType() 
+    {
+        return bizType;
+    }
+    public void setBizId(Long bizId) 
+    {
+        this.bizId = bizId;
+    }
+
+    public Long getBizId() 
+    {
+        return bizId;
+    }
+    public void setAttachmentName(String attachmentName) 
+    {
+        this.attachmentName = attachmentName;
+    }
+
+    public String getAttachmentName() 
+    {
+        return attachmentName;
+    }
+    public void setAttachmentType(Long attachmentType) 
+    {
+        this.attachmentType = attachmentType;
+    }
+
+    public Long getAttachmentType() 
+    {
+        return attachmentType;
+    }
+    public void setAttachmentUrl(String attachmentUrl) 
+    {
+        this.attachmentUrl = attachmentUrl;
+    }
+
+    public String getAttachmentUrl() 
+    {
+        return attachmentUrl;
+    }
+    public void setVersion(Long version) 
+    {
+        this.version = version;
+    }
+
+    public Long getVersion() 
+    {
+        return version;
+    }
+    public void setIsDeleted(Long isDeleted) 
+    {
+        this.isDeleted = isDeleted;
+    }
+
+    public Long getIsDeleted() 
+    {
+        return isDeleted;
+    }
+    public void setCreatedTime(Date createdTime) 
+    {
+        this.createdTime = createdTime;
+    }
+
+    public Date getCreatedTime() 
+    {
+        return createdTime;
+    }
+    public void setCreatedBy(String createdBy) 
+    {
+        this.createdBy = createdBy;
+    }
+
+    public String getCreatedBy() 
+    {
+        return createdBy;
+    }
+    public void setModifiedBy(String modifiedBy) 
+    {
+        this.modifiedBy = modifiedBy;
+    }
+
+    public String getModifiedBy() 
+    {
+        return modifiedBy;
+    }
+    public void setLastUpdatedTime(Date lastUpdatedTime) 
+    {
+        this.lastUpdatedTime = lastUpdatedTime;
+    }
+
+    public Date getLastUpdatedTime() 
+    {
+        return lastUpdatedTime;
+    }
+    public void setConsultType(String consultType) 
+    {
+        this.consultType = consultType;
+    }
+
+    public String getConsultType() 
+    {
+        return consultType;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("bizType", getBizType())
+            .append("bizId", getBizId())
+            .append("attachmentName", getAttachmentName())
+            .append("attachmentType", getAttachmentType())
+            .append("attachmentUrl", getAttachmentUrl())
+            .append("version", getVersion())
+            .append("isDeleted", getIsDeleted())
+            .append("createdTime", getCreatedTime())
+            .append("createdBy", getCreatedBy())
+            .append("modifiedBy", getModifiedBy())
+            .append("lastUpdatedTime", getLastUpdatedTime())
+            .append("consultType", getConsultType())
+            .toString();
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/GroupWechat.java

@@ -0,0 +1,221 @@
+package com.ruoyi.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+
+/**
+ * 【请填写功能名称】对象 group_wechat
+ * 
+ * @author ruoyi
+ * @date 2023-07-04
+ */
+public class GroupWechat extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long buildingId;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String groupName;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String headerPicture;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String groupCode;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String scanNum;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String serviceUser;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String serviceUserQrcode;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String remarks;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long isDeleted;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date createdTime;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String createdBy;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String modifiedBy;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date lastUpdatedTime;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setBuildingId(Long buildingId) 
+    {
+        this.buildingId = buildingId;
+    }
+
+    public Long getBuildingId() 
+    {
+        return buildingId;
+    }
+    public void setGroupName(String groupName) 
+    {
+        this.groupName = groupName;
+    }
+
+    public String getGroupName() 
+    {
+        return groupName;
+    }
+    public void setHeaderPicture(String headerPicture) 
+    {
+        this.headerPicture = headerPicture;
+    }
+
+    public String getHeaderPicture() 
+    {
+        return headerPicture;
+    }
+    public void setGroupCode(String groupCode) 
+    {
+        this.groupCode = groupCode;
+    }
+
+    public String getGroupCode() 
+    {
+        return groupCode;
+    }
+    public void setScanNum(String scanNum) 
+    {
+        this.scanNum = scanNum;
+    }
+
+    public String getScanNum() 
+    {
+        return scanNum;
+    }
+    public void setServiceUser(String serviceUser) 
+    {
+        this.serviceUser = serviceUser;
+    }
+
+    public String getServiceUser() 
+    {
+        return serviceUser;
+    }
+    public void setServiceUserQrcode(String serviceUserQrcode) 
+    {
+        this.serviceUserQrcode = serviceUserQrcode;
+    }
+
+    public String getServiceUserQrcode() 
+    {
+        return serviceUserQrcode;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+    public void setIsDeleted(Long isDeleted) 
+    {
+        this.isDeleted = isDeleted;
+    }
+
+    public Long getIsDeleted() 
+    {
+        return isDeleted;
+    }
+    public void setCreatedTime(Date createdTime) 
+    {
+        this.createdTime = createdTime;
+    }
+
+    public Date getCreatedTime() 
+    {
+        return createdTime;
+    }
+    public void setCreatedBy(String createdBy) 
+    {
+        this.createdBy = createdBy;
+    }
+
+    public String getCreatedBy() 
+    {
+        return createdBy;
+    }
+    public void setModifiedBy(String modifiedBy) 
+    {
+        this.modifiedBy = modifiedBy;
+    }
+
+    public String getModifiedBy() 
+    {
+        return modifiedBy;
+    }
+    public void setLastUpdatedTime(Date lastUpdatedTime) 
+    {
+        this.lastUpdatedTime = lastUpdatedTime;
+    }
+
+    public Date getLastUpdatedTime() 
+    {
+        return lastUpdatedTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("buildingId", getBuildingId())
+            .append("groupName", getGroupName())
+            .append("headerPicture", getHeaderPicture())
+            .append("groupCode", getGroupCode())
+            .append("scanNum", getScanNum())
+            .append("serviceUser", getServiceUser())
+            .append("serviceUserQrcode", getServiceUserQrcode())
+            .append("remarks", getRemarks())
+            .append("isDeleted", getIsDeleted())
+            .append("createdTime", getCreatedTime())
+            .append("createdBy", getCreatedBy())
+            .append("modifiedBy", getModifiedBy())
+            .append("lastUpdatedTime", getLastUpdatedTime())
+            .toString();
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Message.java

@@ -0,0 +1,222 @@
+package com.ruoyi.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+
+/**
+ * 【请填写功能名称】对象 message
+ * 
+ * @author ruoyi
+ * @date 2023-07-04
+ */
+public class Message extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String createdBy;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date createdTime;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String modifiedBy;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date lastUpdatedTime;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Integer isDeleted;
+
+    /** 消息标题 */
+    @Excel(name = "消息标题")
+    private String messageTitle;
+
+    /** 消息类型【字典】 */
+    @Excel(name = "消息类型【字典】")
+    private String messageType;
+
+    /** 业务标识 */
+    @Excel(name = "业务标识")
+    private String flowType;
+
+    /** 审核人 */
+    @Excel(name = "审核人")
+    private Long auditor;
+
+    /** 审核时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date auditDate;
+
+    /** 来源id */
+    @Excel(name = "来源id")
+    private Long sourceId;
+
+    /** 是否同意【0.拒绝 1.同意】 */
+    @Excel(name = "是否同意【0.拒绝 1.同意】")
+    private Integer agreeFlag;
+
+    /** 流程参数【json】 */
+    @Excel(name = "流程参数【json】")
+    private String flowEntity;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setCreatedBy(String createdBy) 
+    {
+        this.createdBy = createdBy;
+    }
+
+    public String getCreatedBy() 
+    {
+        return createdBy;
+    }
+    public void setCreatedTime(Date createdTime) 
+    {
+        this.createdTime = createdTime;
+    }
+
+    public Date getCreatedTime() 
+    {
+        return createdTime;
+    }
+    public void setModifiedBy(String modifiedBy) 
+    {
+        this.modifiedBy = modifiedBy;
+    }
+
+    public String getModifiedBy() 
+    {
+        return modifiedBy;
+    }
+    public void setLastUpdatedTime(Date lastUpdatedTime) 
+    {
+        this.lastUpdatedTime = lastUpdatedTime;
+    }
+
+    public Date getLastUpdatedTime() 
+    {
+        return lastUpdatedTime;
+    }
+    public void setIsDeleted(Integer isDeleted) 
+    {
+        this.isDeleted = isDeleted;
+    }
+
+    public Integer getIsDeleted() 
+    {
+        return isDeleted;
+    }
+    public void setMessageTitle(String messageTitle) 
+    {
+        this.messageTitle = messageTitle;
+    }
+
+    public String getMessageTitle() 
+    {
+        return messageTitle;
+    }
+    public void setMessageType(String messageType) 
+    {
+        this.messageType = messageType;
+    }
+
+    public String getMessageType() 
+    {
+        return messageType;
+    }
+    public void setFlowType(String flowType) 
+    {
+        this.flowType = flowType;
+    }
+
+    public String getFlowType() 
+    {
+        return flowType;
+    }
+    public void setAuditor(Long auditor) 
+    {
+        this.auditor = auditor;
+    }
+
+    public Long getAuditor() 
+    {
+        return auditor;
+    }
+    public void setAuditDate(Date auditDate) 
+    {
+        this.auditDate = auditDate;
+    }
+
+    public Date getAuditDate() 
+    {
+        return auditDate;
+    }
+    public void setSourceId(Long sourceId) 
+    {
+        this.sourceId = sourceId;
+    }
+
+    public Long getSourceId() 
+    {
+        return sourceId;
+    }
+    public void setAgreeFlag(Integer agreeFlag) 
+    {
+        this.agreeFlag = agreeFlag;
+    }
+
+    public Integer getAgreeFlag() 
+    {
+        return agreeFlag;
+    }
+    public void setFlowEntity(String flowEntity) 
+    {
+        this.flowEntity = flowEntity;
+    }
+
+    public String getFlowEntity() 
+    {
+        return flowEntity;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("createdBy", getCreatedBy())
+            .append("createdTime", getCreatedTime())
+            .append("modifiedBy", getModifiedBy())
+            .append("lastUpdatedTime", getLastUpdatedTime())
+            .append("isDeleted", getIsDeleted())
+            .append("messageTitle", getMessageTitle())
+            .append("messageType", getMessageType())
+            .append("flowType", getFlowType())
+            .append("auditor", getAuditor())
+            .append("auditDate", getAuditDate())
+            .append("sourceId", getSourceId())
+            .append("agreeFlag", getAgreeFlag())
+            .append("flowEntity", getFlowEntity())
+            .toString();
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/ShArea.java

@@ -0,0 +1,263 @@
+package com.ruoyi.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+
+/**
+ * 【请填写功能名称】对象 sh_area
+ * 
+ * @author ruoyi
+ * @date 2023-07-04
+ */
+public class ShArea extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 父id */
+    @Excel(name = "父id")
+    private Long pid;
+
+    /** 简称 */
+    @Excel(name = "简称")
+    private String shortname;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String cityname;
+
+    /** 全称 */
+    @Excel(name = "全称")
+    private String mergerName;
+
+    /** 层级 0 1 2 省市区县 */
+    @Excel(name = "层级 0 1 2 省市区县")
+    private Integer level;
+
+    /** 拼音 */
+    @Excel(name = "拼音")
+    private String pinyin;
+
+    /** 长途区号 */
+    @Excel(name = "长途区号")
+    private String code;
+
+    /** 邮编 */
+    @Excel(name = "邮编")
+    private String zipCode;
+
+    /** 首字母 */
+    @Excel(name = "首字母")
+    private String first;
+
+    /** 经度 */
+    @Excel(name = "经度")
+    private String longitude;
+
+    /** 纬度 */
+    @Excel(name = "纬度")
+    private String latitude;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long isDeleted;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date createdTime;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String createdBy;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String modifiedBy;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date lastUpdatedTime;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setPid(Long pid) 
+    {
+        this.pid = pid;
+    }
+
+    public Long getPid() 
+    {
+        return pid;
+    }
+    public void setShortname(String shortname) 
+    {
+        this.shortname = shortname;
+    }
+
+    public String getShortname() 
+    {
+        return shortname;
+    }
+    public void setCityname(String cityname) 
+    {
+        this.cityname = cityname;
+    }
+
+    public String getCityname() 
+    {
+        return cityname;
+    }
+    public void setMergerName(String mergerName) 
+    {
+        this.mergerName = mergerName;
+    }
+
+    public String getMergerName() 
+    {
+        return mergerName;
+    }
+    public void setLevel(Integer level) 
+    {
+        this.level = level;
+    }
+
+    public Integer getLevel() 
+    {
+        return level;
+    }
+    public void setPinyin(String pinyin) 
+    {
+        this.pinyin = pinyin;
+    }
+
+    public String getPinyin() 
+    {
+        return pinyin;
+    }
+    public void setCode(String code) 
+    {
+        this.code = code;
+    }
+
+    public String getCode() 
+    {
+        return code;
+    }
+    public void setZipCode(String zipCode) 
+    {
+        this.zipCode = zipCode;
+    }
+
+    public String getZipCode() 
+    {
+        return zipCode;
+    }
+    public void setFirst(String first) 
+    {
+        this.first = first;
+    }
+
+    public String getFirst() 
+    {
+        return first;
+    }
+    public void setLongitude(String longitude) 
+    {
+        this.longitude = longitude;
+    }
+
+    public String getLongitude() 
+    {
+        return longitude;
+    }
+    public void setLatitude(String latitude) 
+    {
+        this.latitude = latitude;
+    }
+
+    public String getLatitude() 
+    {
+        return latitude;
+    }
+    public void setIsDeleted(Long isDeleted) 
+    {
+        this.isDeleted = isDeleted;
+    }
+
+    public Long getIsDeleted() 
+    {
+        return isDeleted;
+    }
+    public void setCreatedTime(Date createdTime) 
+    {
+        this.createdTime = createdTime;
+    }
+
+    public Date getCreatedTime() 
+    {
+        return createdTime;
+    }
+    public void setCreatedBy(String createdBy) 
+    {
+        this.createdBy = createdBy;
+    }
+
+    public String getCreatedBy() 
+    {
+        return createdBy;
+    }
+    public void setModifiedBy(String modifiedBy) 
+    {
+        this.modifiedBy = modifiedBy;
+    }
+
+    public String getModifiedBy() 
+    {
+        return modifiedBy;
+    }
+    public void setLastUpdatedTime(Date lastUpdatedTime) 
+    {
+        this.lastUpdatedTime = lastUpdatedTime;
+    }
+
+    public Date getLastUpdatedTime() 
+    {
+        return lastUpdatedTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("pid", getPid())
+            .append("shortname", getShortname())
+            .append("cityname", getCityname())
+            .append("mergerName", getMergerName())
+            .append("level", getLevel())
+            .append("pinyin", getPinyin())
+            .append("code", getCode())
+            .append("zipCode", getZipCode())
+            .append("first", getFirst())
+            .append("longitude", getLongitude())
+            .append("latitude", getLatitude())
+            .append("isDeleted", getIsDeleted())
+            .append("createdTime", getCreatedTime())
+            .append("createdBy", getCreatedBy())
+            .append("modifiedBy", getModifiedBy())
+            .append("lastUpdatedTime", getLastUpdatedTime())
+            .toString();
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/Sms.java

@@ -0,0 +1,44 @@
+package com.ruoyi.system.domain;
+
+import com.ruoyi.common.core.constant.Constants;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * 此类的描述：短信的封装类型。
+ */
+@Getter
+@Setter
+public class Sms {
+	/**
+     * 发送内容，如果含有空格，百分数等特殊内容，请用utf8方式进行编码，最多500个文字（1个英文或数字也算1个文字）
+     */
+    private String content;
+    /**
+     * 发送用户帐号
+     */
+    private String account = Constants.SMS_PAOPAO_ACCOUNT;
+    /**
+     * 发送帐号密码
+     */
+    private String password = Constants.SMS_PAOPAO_PASSWORD;
+    
+    /**发送任务命令*/
+    private String action;
+    
+    /**发送的目的号码*/
+    private String mobile;
+    /**
+     * 原来内容
+     */
+    private String ms;
+    /**
+     * 原来手机号
+     */
+    private String mb;
+    /**
+     * 接入号
+     */
+    private String extno = Constants.SMS_PAOPAO_EXTNO;
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/TeamMembers.java

@@ -2,6 +2,7 @@ package com.ruoyi.system.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.*;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
@@ -13,6 +14,12 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2022-11-03
  */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
 public class TeamMembers extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -66,131 +73,4 @@ public class TeamMembers extends BaseEntity
     @Excel(name = "角色名称")
     private String roleName;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setTeamId(Long teamId) 
-    {
-        this.teamId = teamId;
-    }
-
-    public Long getTeamId() 
-    {
-        return teamId;
-    }
-    public void setUserId(Long userId) 
-    {
-        this.userId = userId;
-    }
-
-    public Long getUserId() 
-    {
-        return userId;
-    }
-    public void setRoleCode(String roleCode) 
-    {
-        this.roleCode = roleCode;
-    }
-
-    public String getRoleCode() 
-    {
-        return roleCode;
-    }
-    public void setJerseyNumber(String jerseyNumber) 
-    {
-        this.jerseyNumber = jerseyNumber;
-    }
-
-    public String getJerseyNumber() 
-    {
-        return jerseyNumber;
-    }
-    public void setStatus(Integer status) 
-    {
-        this.status = status;
-    }
-
-    public Integer getStatus() 
-    {
-        return status;
-    }
-    public void setCreatedTime(Date createdTime) 
-    {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() 
-    {
-        return createdTime;
-    }
-    public void setCreatedBy(String createdBy) 
-    {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() 
-    {
-        return createdBy;
-    }
-    public void setIsDeleted(Long isDeleted) 
-    {
-        this.isDeleted = isDeleted;
-    }
-
-    public Long getIsDeleted() 
-    {
-        return isDeleted;
-    }
-    public void setLastUpdatedTime(Date lastUpdatedTime) 
-    {
-        this.lastUpdatedTime = lastUpdatedTime;
-    }
-
-    public Date getLastUpdatedTime() 
-    {
-        return lastUpdatedTime;
-    }
-    public void setModifiedBy(String modifiedBy) 
-    {
-        this.modifiedBy = modifiedBy;
-    }
-
-    public String getModifiedBy() 
-    {
-        return modifiedBy;
-    }
-    public void setRoleName(String roleName) 
-    {
-        this.roleName = roleName;
-    }
-
-    public String getRoleName() 
-    {
-        return roleName;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("teamId", getTeamId())
-            .append("userId", getUserId())
-            .append("roleCode", getRoleCode())
-            .append("jerseyNumber", getJerseyNumber())
-            .append("status", getStatus())
-            .append("remark", getRemark())
-            .append("createdTime", getCreatedTime())
-            .append("createdBy", getCreatedBy())
-            .append("isDeleted", getIsDeleted())
-            .append("lastUpdatedTime", getLastUpdatedTime())
-            .append("modifiedBy", getModifiedBy())
-            .append("roleName", getRoleName())
-            .toString();
-    }
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/TokenInfo.java

@@ -0,0 +1,137 @@
+package com.ruoyi.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+
+/**
+ * 【请填写功能名称】对象 token_info
+ * 
+ * @author ruoyi
+ * @date 2023-07-04
+ */
+public class TokenInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long isDeleted;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date createdTime;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String createdBy;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String modifiedBy;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date lastUpdatedTime;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String mainToken;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String kikToken;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setIsDeleted(Long isDeleted) 
+    {
+        this.isDeleted = isDeleted;
+    }
+
+    public Long getIsDeleted() 
+    {
+        return isDeleted;
+    }
+    public void setCreatedTime(Date createdTime) 
+    {
+        this.createdTime = createdTime;
+    }
+
+    public Date getCreatedTime() 
+    {
+        return createdTime;
+    }
+    public void setCreatedBy(String createdBy) 
+    {
+        this.createdBy = createdBy;
+    }
+
+    public String getCreatedBy() 
+    {
+        return createdBy;
+    }
+    public void setModifiedBy(String modifiedBy) 
+    {
+        this.modifiedBy = modifiedBy;
+    }
+
+    public String getModifiedBy() 
+    {
+        return modifiedBy;
+    }
+    public void setLastUpdatedTime(Date lastUpdatedTime) 
+    {
+        this.lastUpdatedTime = lastUpdatedTime;
+    }
+
+    public Date getLastUpdatedTime() 
+    {
+        return lastUpdatedTime;
+    }
+    public void setMainToken(String mainToken) 
+    {
+        this.mainToken = mainToken;
+    }
+
+    public String getMainToken() 
+    {
+        return mainToken;
+    }
+    public void setKikToken(String kikToken) 
+    {
+        this.kikToken = kikToken;
+    }
+
+    public String getKikToken() 
+    {
+        return kikToken;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("isDeleted", getIsDeleted())
+            .append("createdTime", getCreatedTime())
+            .append("createdBy", getCreatedBy())
+            .append("modifiedBy", getModifiedBy())
+            .append("lastUpdatedTime", getLastUpdatedTime())
+            .append("mainToken", getMainToken())
+            .append("kikToken", getKikToken())
+            .toString();
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/TrainingInfo.java

@@ -0,0 +1,207 @@
+package com.ruoyi.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+
+/**
+ * 【请填写功能名称】对象 training_info
+ * 
+ * @author ruoyi
+ * @date 2023-07-04
+ */
+public class TrainingInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long isDeleted;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date createdTime;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String createdBy;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String modifiedBy;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date lastUpdatedTime;
+
+    /** 培训机构名称 */
+    @Excel(name = "培训机构名称")
+    private String trainName;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String phone;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String linkman;
+
+    /** 培训公告 */
+    @Excel(name = "培训公告")
+    private String trainDesc;
+
+    /** 场馆ID */
+    @Excel(name = "场馆ID")
+    private Long buildId;
+
+    /** 默认图片 */
+    @Excel(name = "默认图片")
+    private String defaultPicture;
+
+    /** 培训价格 */
+    @Excel(name = "培训价格")
+    private String price;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setIsDeleted(Long isDeleted) 
+    {
+        this.isDeleted = isDeleted;
+    }
+
+    public Long getIsDeleted() 
+    {
+        return isDeleted;
+    }
+    public void setCreatedTime(Date createdTime) 
+    {
+        this.createdTime = createdTime;
+    }
+
+    public Date getCreatedTime() 
+    {
+        return createdTime;
+    }
+    public void setCreatedBy(String createdBy) 
+    {
+        this.createdBy = createdBy;
+    }
+
+    public String getCreatedBy() 
+    {
+        return createdBy;
+    }
+    public void setModifiedBy(String modifiedBy) 
+    {
+        this.modifiedBy = modifiedBy;
+    }
+
+    public String getModifiedBy() 
+    {
+        return modifiedBy;
+    }
+    public void setLastUpdatedTime(Date lastUpdatedTime) 
+    {
+        this.lastUpdatedTime = lastUpdatedTime;
+    }
+
+    public Date getLastUpdatedTime() 
+    {
+        return lastUpdatedTime;
+    }
+    public void setTrainName(String trainName) 
+    {
+        this.trainName = trainName;
+    }
+
+    public String getTrainName() 
+    {
+        return trainName;
+    }
+    public void setPhone(String phone) 
+    {
+        this.phone = phone;
+    }
+
+    public String getPhone() 
+    {
+        return phone;
+    }
+    public void setLinkman(String linkman) 
+    {
+        this.linkman = linkman;
+    }
+
+    public String getLinkman() 
+    {
+        return linkman;
+    }
+    public void setTrainDesc(String trainDesc) 
+    {
+        this.trainDesc = trainDesc;
+    }
+
+    public String getTrainDesc() 
+    {
+        return trainDesc;
+    }
+    public void setBuildId(Long buildId) 
+    {
+        this.buildId = buildId;
+    }
+
+    public Long getBuildId() 
+    {
+        return buildId;
+    }
+    public void setDefaultPicture(String defaultPicture) 
+    {
+        this.defaultPicture = defaultPicture;
+    }
+
+    public String getDefaultPicture() 
+    {
+        return defaultPicture;
+    }
+    public void setPrice(String price) 
+    {
+        this.price = price;
+    }
+
+    public String getPrice() 
+    {
+        return price;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("isDeleted", getIsDeleted())
+            .append("createdTime", getCreatedTime())
+            .append("createdBy", getCreatedBy())
+            .append("modifiedBy", getModifiedBy())
+            .append("lastUpdatedTime", getLastUpdatedTime())
+            .append("trainName", getTrainName())
+            .append("phone", getPhone())
+            .append("linkman", getLinkman())
+            .append("trainDesc", getTrainDesc())
+            .append("buildId", getBuildId())
+            .append("defaultPicture", getDefaultPicture())
+            .append("price", getPrice())
+            .toString();
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserBuildingRel.java

@@ -0,0 +1,137 @@
+package com.ruoyi.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+
+/**
+ * 【请填写功能名称】对象 user_building_rel
+ * 
+ * @author ruoyi
+ * @date 2023-07-04
+ */
+public class UserBuildingRel extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String isDeleted;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date createdTime;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String createdBy;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String modifiedBy;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date lastUpdatedTime;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String userCode;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long buildingId;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setIsDeleted(String isDeleted) 
+    {
+        this.isDeleted = isDeleted;
+    }
+
+    public String getIsDeleted() 
+    {
+        return isDeleted;
+    }
+    public void setCreatedTime(Date createdTime) 
+    {
+        this.createdTime = createdTime;
+    }
+
+    public Date getCreatedTime() 
+    {
+        return createdTime;
+    }
+    public void setCreatedBy(String createdBy) 
+    {
+        this.createdBy = createdBy;
+    }
+
+    public String getCreatedBy() 
+    {
+        return createdBy;
+    }
+    public void setModifiedBy(String modifiedBy) 
+    {
+        this.modifiedBy = modifiedBy;
+    }
+
+    public String getModifiedBy() 
+    {
+        return modifiedBy;
+    }
+    public void setLastUpdatedTime(Date lastUpdatedTime) 
+    {
+        this.lastUpdatedTime = lastUpdatedTime;
+    }
+
+    public Date getLastUpdatedTime() 
+    {
+        return lastUpdatedTime;
+    }
+    public void setUserCode(String userCode) 
+    {
+        this.userCode = userCode;
+    }
+
+    public String getUserCode() 
+    {
+        return userCode;
+    }
+    public void setBuildingId(Long buildingId) 
+    {
+        this.buildingId = buildingId;
+    }
+
+    public Long getBuildingId() 
+    {
+        return buildingId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("isDeleted", getIsDeleted())
+            .append("createdTime", getCreatedTime())
+            .append("createdBy", getCreatedBy())
+            .append("modifiedBy", getModifiedBy())
+            .append("lastUpdatedTime", getLastUpdatedTime())
+            .append("userCode", getUserCode())
+            .append("buildingId", getBuildingId())
+            .toString();
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserRole.java

@@ -0,0 +1,62 @@
+package com.ruoyi.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.*;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+
+/**
+ * 【请填写功能名称】对象 user_role
+ * 
+ * @author ruoyi
+ * @date 2023-07-04
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+public class UserRole extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 用户id */
+    @Excel(name = "用户id")
+    private Long userId;
+
+    /** 角色编码 */
+    @Excel(name = "角色编码")
+    private String roleCode;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date createdTime;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String createdBy;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String modifiedBy;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Integer isDeleted;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Date lastUpdatedTime;
+
+    /** 角色编码 */
+    @Excel(name = "角色id")
+    private Long roleId;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WxBuildingInfo.java

@@ -23,7 +23,7 @@ public class WxBuildingInfo extends BaseEntity
 
     /** 删除 */
     @Excel(name = "删除")
-    private Long isDeleted;
+    private Integer isDeleted;
 
     /** 创建时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -85,7 +85,7 @@ public class WxBuildingInfo extends BaseEntity
 
     /** 球馆状态 */
     @Excel(name = "球馆状态")
-    private Long status;
+    private Integer status;
 
     /** 拒绝原因 */
     @Excel(name = "拒绝原因")
@@ -120,12 +120,12 @@ public class WxBuildingInfo extends BaseEntity
     {
         return id;
     }
-    public void setIsDeleted(Long isDeleted) 
+    public void setIsDeleted(Integer isDeleted)
     {
         this.isDeleted = isDeleted;
     }
 
-    public Long getIsDeleted() 
+    public Integer getIsDeleted()
     {
         return isDeleted;
     }
@@ -255,12 +255,12 @@ public class WxBuildingInfo extends BaseEntity
     {
         return isSupportlive;
     }
-    public void setStatus(Long status) 
+    public void setStatus(Integer status)
     {
         this.status = status;
     }
 
-    public Long getStatus() 
+    public Integer getStatus()
     {
         return status;
     }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WxUser.java

@@ -65,7 +65,7 @@ public class WxUser extends BaseEntity
 
     /** 性别 */
     @Excel(name = "性别")
-    private String gender;
+    private Integer gender;
 
     /** 用户名称 */
     @Excel(name = "用户名称")
@@ -98,7 +98,7 @@ public class WxUser extends BaseEntity
 
     /** 状态 */
     @Excel(name = "状态")
-    private String enabled;
+    private Integer enabled;
 
     /** 微信多平台唯一ID */
     @Excel(name = "微信多平台唯一ID")
@@ -211,12 +211,12 @@ public class WxUser extends BaseEntity
     {
         return avatar;
     }
-    public void setGender(String gender) 
+    public void setGender(Integer gender)
     {
         this.gender = gender;
     }
 
-    public String getGender() 
+    public Integer getGender()
     {
         return gender;
     }
@@ -283,12 +283,12 @@ public class WxUser extends BaseEntity
     {
         return tag;
     }
-    public void setEnabled(String enabled) 
+    public void setEnabled(Integer enabled)
     {
         this.enabled = enabled;
     }
 
-    public String getEnabled() 
+    public Integer getEnabled()
     {
         return enabled;
     }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/enums/CompetitionStatusEnum.java

@@ -0,0 +1,31 @@
+package com.ruoyi.system.domain.enums;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/** : 比赛状态
+ * @author :
+ * @date : 2019/11/30
+ */
+public enum CompetitionStatusEnum {
+    TREATY_WAR("treatyWar",0, "约战中"),
+    ACCEPT_WAR("acceptWar", 1,"已应战"),
+    WAREND("warEnd",2 ,"已结束");
+
+    @Getter
+    @Setter
+    private String code;
+    @Getter
+    @Setter
+    private Integer value;
+    @Getter
+    @Setter
+    private String desc;
+
+    CompetitionStatusEnum(String code, Integer value, String desc) {
+        this.code = code;
+        this.desc = desc;
+        this.value = value;
+    }
+
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/enums/FowTypeEnum.java

@@ -0,0 +1,29 @@
+package com.ruoyi.system.domain.enums;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author :
+ * @date : 2019/11/30
+ */
+public enum FowTypeEnum {
+
+    MEMBER_APPLY("memberApply", "队员申请"),
+
+    MAKE_AN_APPOINTMENT("makeAnAppointment", "约战消息");
+
+    @Getter
+    @Setter
+    private String code;
+
+    @Getter
+    @Setter
+    private String desc;
+
+    FowTypeEnum(String code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/enums/RoleEnum.java

@@ -0,0 +1,33 @@
+package com.ruoyi.system.domain.enums;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author :
+ * @date : 2019/11/30
+ */
+public enum RoleEnum {
+
+    GUEST("guest", "游客"),
+
+    TEAM_MANAGER("teamManager", "队长"),
+
+    TEAM_MEMBER("teamMember", "队员"),
+
+    REFEREES("referees", "裁判员");
+
+    @Getter
+    @Setter
+    private String code;
+
+    @Getter
+    @Setter
+    private String desc;
+
+    RoleEnum(String code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/enums/UserRoles.java

@@ -0,0 +1,41 @@
+package com.ruoyi.system.domain.enums;
+
+import org.springframework.util.StringUtils;
+
+/**
+ * Created by jackma on 2020/1/17.
+ */
+public enum UserRoles {
+    ADMIN("admin", "管理员"),
+    CURATOR("curator", "球馆负责人"),
+    customer("customer", "普通用户");
+
+    private String code;
+
+    private String message;
+
+    UserRoles(String code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public static String getMessageByCode(String code){
+        if(StringUtils.isEmpty(code)){
+            return null;
+        }
+        for(UserRoles roles:UserRoles.values()){
+            if(code.equals(roles.code())){
+                return roles.message();
+            }
+        }
+        return null;
+    }
+
+    public String code() {
+        return this.code;
+    }
+
+    public String message() {
+        return this.message;
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/enums/VsResultEnums.java

@@ -0,0 +1,37 @@
+package com.ruoyi.system.domain.enums;
+
+import org.springframework.util.StringUtils;
+
+public enum VsResultEnums {
+    win("win", "胜"),
+    fail("fail", "负");
+
+    private String code;
+
+    private String message;
+
+    VsResultEnums(String code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public static String getMessageByCode(String code){
+        if(StringUtils.isEmpty(code)){
+            return null;
+        }
+        for(VsResultEnums roles:VsResultEnums.values()){
+            if(code.equals(roles.code())){
+                return roles.message();
+            }
+        }
+        return null;
+    }
+
+    public String code() {
+        return this.code;
+    }
+
+    public String message() {
+        return this.message;
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/enums/WxAppletsSendErrCodesEnum.java

@@ -0,0 +1,42 @@
+package com.ruoyi.system.domain.enums;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.util.StringUtils;
+
+/**微信小程序发送模版消息返回errcode
+ * @author :wyb
+ * @date : 2019/11/30
+ */
+public enum WxAppletsSendErrCodesEnum {
+    ERR_CODES_40003("40003", "touser字段openid为空或者不正确"),
+    ERR_CODES_40037("40037", "订阅模板id为空不正确"),
+    ERR_CODES_43101 ("43101", "用户拒绝接受消息，如果用户之前曾经订阅过，则表示用户取消了订阅关系"),
+    ERR_CODES_47003("47003", "模板参数不准确，可能为空或者不满足规则，errmsg会提示具体是哪个字段出错"),
+    ERR_CODES_41030 ("41030", "page路径不正确，需要保证在现网版本小程序中存在，与app.json保持一致");
+
+    @Getter
+    @Setter
+    private String code;
+
+    @Getter
+    @Setter
+    private String desc;
+
+    WxAppletsSendErrCodesEnum(String code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+    public static String getDescByCode(String code){
+        if(StringUtils.isEmpty(code)){
+            return null;
+        }
+        for(WxAppletsSendErrCodesEnum codesEnum:WxAppletsSendErrCodesEnum.values()){
+            if(code.equals(codesEnum.code)){
+                return codesEnum.desc;
+            }
+        }
+        return null;
+    }
+
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/enums/WxAppletsTemplateIdsEnum.java

@@ -0,0 +1,31 @@
+package com.ruoyi.system.domain.enums;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**微信小程序模版id
+ * @author :wyb
+ * @date : 2019/11/30
+ */
+public enum WxAppletsTemplateIdsEnum {
+    COMPETITION_SIGN_UP("nsYn7oicXL4bdmQcLgvjIj7tKK3cdTgk8fo1AtOgbMU", "赛事报名通知"),
+    JOIN_COMPETITION_REMIND("F827c-LWDS3UTaJYthC-i_V_2G1ZlmDhiaipzcl8_Xk", "参赛提醒"),
+    COMPETITION_COURSE_REMIND("PpYtjeEGaP12P3ZptJAkIeaaF3WAlwrjy5Kd7qjF22Y", "比赛赛程提醒"),
+    TREATY_WAR("Ixgc13ZUMPrOZbR05EvdicqpsH88WMByfXULm7IGrmQ", "约战准备提醒"),
+    TREATY_WAR_SUCCESS("Ixgc13ZUMPrOZbR05EvdicqpsH88WMByfXULm7IGrmQ", "约战成功提醒"),
+    ACCEPT_WAR ("QfLtKHzgj7R-Qa73x1loykHbcy4FkiAGLWeZPpSqEQk", "应战提醒");
+
+    @Getter
+    @Setter
+    private String code;
+
+    @Getter
+    @Setter
+    private String desc;
+
+    WxAppletsTemplateIdsEnum(String code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/BasketballTeamRequest.java

@@ -0,0 +1,27 @@
+package com.ruoyi.system.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * Created by liguanghui on 2019/12/26.
+ */
+public class BasketballTeamRequest implements Serializable{
+    private static final long serialVersionUID = 1L;
+    /**
+     *市
+     */
+    @Setter
+    @Getter
+    private String cityCode;
+    /**
+     *球队名称
+     */
+    @Setter
+    @Getter
+    @ApiModelProperty(value="球队名称",required=false)
+    private String teamName;
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/BasketballTeamResponse.java

@@ -0,0 +1,50 @@
+package com.ruoyi.system.domain.vo;
+
+import com.ruoyi.system.domain.WxBasketballTeam;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * Created by liguanghui on 2019/12/26.
+ */
+public class BasketballTeamResponse extends WxBasketballTeam {
+    /**
+     *名称
+     */
+    @Setter
+    @Getter
+    private String buildingName;
+    /**
+     *
+     */
+    @Setter
+    @Getter
+    private String address;
+    /**
+     *经度
+     */
+    @Setter
+    @Getter
+    private BigDecimal longitude;
+
+    /**
+     *纬度
+     */
+    @Setter
+    @Getter
+    private BigDecimal latitude;
+    /**
+     * 场馆照片
+     */
+    @Setter
+    @Getter
+    private String defaultPicture;
+    /**
+     *备注
+     */
+    @Setter
+    @Getter
+    private String desc;
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/BuildingInfoRequest.java

@@ -0,0 +1,60 @@
+package com.ruoyi.system.domain.vo;
+
+import com.ruoyi.system.domain.WxBuildingInfo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * Created by liguanghui on 2020/1/17.
+ */
+public class BuildingInfoRequest extends WxBuildingInfo {
+    @Setter
+    @Getter
+    private String openId;
+    /**
+     *
+     */
+    @Setter
+    @Getter
+    private Long buildingId;
+    /**
+     *营业时间
+     */
+    @Setter
+    @Getter
+    private String businessHours;
+
+    /**
+     *联系人
+     */
+    @Setter
+    @Getter
+    private String linkman;
+
+    /**
+     *联系电话
+     */
+    @Setter
+    @Getter
+    private String linkphone;
+
+    /**
+     *收费标准
+     */
+    @Setter
+    @Getter
+    private String feeStandard;
+
+    /**
+     *球馆标签
+     */
+    @Setter
+    @Getter
+    private String labelDesc;
+    /**
+     *公告
+     */
+    @Setter
+    @Getter
+    private String notice;
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/BuildingInfoResponse.java

@@ -0,0 +1,113 @@
+package com.ruoyi.system.domain.vo;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.system.domain.BuildingInfoDetail;
+import com.ruoyi.system.domain.FeatureLabel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Setter
+@Getter
+@ApiModel(value="球馆全部详情")
+public class BuildingInfoResponse extends BuildingInfoDetail {
+    @ApiModelProperty(value="球馆ID",required=false)
+    private Long id;
+    /**
+     *名称
+     */
+
+    @ApiModelProperty(value="球馆名称",required=false)
+    private String buildingName;
+    /**
+     *
+     */
+    @ApiModelProperty(value="球馆地址",required=false)
+    private String address;
+    /**
+     *经度
+     */
+    @ApiModelProperty(value="球馆经度",required=false)
+    private BigDecimal longitude;
+
+    /**
+     *纬度
+     */
+    @ApiModelProperty(value="球馆维度",required=false)
+    private BigDecimal latitude;
+    /**
+     *省
+     */
+    @ApiModelProperty(value="省",required=false)
+    private String provinceCode;
+    /**
+     *市
+     */
+    @ApiModelProperty(value="市",required=false)
+    private String cityCode;
+    /**
+     *区县编码
+     */
+    @ApiModelProperty(value="区县编码",required=false)
+    private String countyCode;
+    /**
+     *备注
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String desc;
+
+    @ApiModelProperty(value="备注1",required=false)
+    private String remark;
+    /**
+     *场馆特征
+     */
+    @ApiModelProperty(value="场馆特征",required=false)
+    private List<FeatureLabel> labels;
+    /**
+     * 场馆照片
+     */
+    @ApiModelProperty(value="场馆照片",required=false)
+    private String defaultPicture;
+
+    /**
+     * 球场距离
+     */
+    @ApiModelProperty(value="球场距离",required=false)
+    private Double distance;
+    /**
+     * 球馆状态
+     */
+    @ApiModelProperty(value="球馆状态",required=false)
+    private Long status;
+    /**
+     * 拒绝原因
+     */
+    @ApiModelProperty(value="拒绝原因",required=false)
+    private String rejectReason;
+
+    /**
+     * 是否在线球场
+     */
+    @ApiModelProperty(value="是否在线球场",required=false)
+    private String isSupportlive;
+    /**
+     *市名称
+     */
+    @ApiModelProperty(value="城市名称",required=false)
+    private String cityName;
+    /**
+     * 球馆状态中文
+     */
+    @ApiModelProperty(value="球馆状态中文",required=false)
+    private String statusName;
+
+
+    private String mittelkurs;
+    @Excel(name = "创建人ID")
+    private Long createdId;
+
+    private String chatGroupUrl;
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionExcleVo.java

@@ -0,0 +1,22 @@
+package com.ruoyi.system.domain.vo;
+
+import com.ruoyi.system.domain.Competition;
+import com.ruoyi.system.domain.CompetitionMembers;
+import com.ruoyi.system.domain.CompetitionOfTeam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author 吴一博
+ * @date 2023年04月14日 10:39
+ * @Description
+ */
+@Data
+public class CompetitionExcleVo extends Competition {
+    @ApiModelProperty(value = "球队", required = false)
+    public CompetitionOfTeam ofTeam;
+    @ApiModelProperty(value = "参赛人员", required = false)
+    List<CompetitionMembers> teamMemberList;
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionMembersVo.java

@@ -0,0 +1,72 @@
+package com.ruoyi.system.domain.vo;
+import com.ruoyi.system.domain.CompetitionMembers;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <B>系统名称：future篮球后台系统系统</B><BR>
+ * <B>模块名称：BASKETBALL-DOMAIN</B><BR>
+ * <B>中文类名：比赛参与人员表 实体类</B><BR>
+ * <B>概要说明：比赛参与人员表 实体类</B><BR>
+ * <B>@version：v1.0</B><BR>
+ * <B>版本 修改人 备注</B><BR>
+ *
+ * @author : gc
+ * @date : 2020年08月07日
+ */
+@ApiModel(value = "比赛参与人员Vo")
+@Setter
+@Getter
+public class CompetitionMembersVo extends CompetitionMembers {
+
+    private static final long serialVersionUID = 1L;
+    /**
+     *用户名称
+     */
+    @ApiModelProperty(value="用户名称",required=false)
+    private String userName;
+    /**
+     *用户CODE
+     */
+    @ApiModelProperty(value="用户CODE",required=false)
+    private String userCode;
+    /**
+     *登录名
+     */
+    @ApiModelProperty(value="登录名",required=false)
+    private String loginName;
+
+    /**
+     *角色
+     */
+    @ApiModelProperty(value="角色",required=false)
+    private String role;
+    /**
+     *头像
+     */
+    @ApiModelProperty(value="头像",required=false)
+    private String avatar;
+    /**
+     *性别
+     */
+    @ApiModelProperty(value="性别",required=false)
+    private String gender;
+
+    @ApiModelProperty(value = "短信验证码", required = false)
+    private String captcha;
+
+    @ApiModelProperty(value="身高",required=false)
+    private java.math.BigDecimal height;
+
+
+    @ApiModelProperty(value="体重",required=false)
+    private java.math.BigDecimal weight;
+
+    /**
+     *球队位置【字典】
+     */
+    @ApiModelProperty(value="球队位置【字典】",required=false)
+    private String teamPosition;
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionOfTeamGroupVo.java

@@ -0,0 +1,20 @@
+package com.ruoyi.system.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Setter
+@Getter
+public class CompetitionOfTeamGroupVo {
+
+    @ApiModelProperty(value = "分组名", required = false)
+    private String groupName;
+
+    @ApiModelProperty(value="球队列表",required=false)
+    private List<CompetitionOfTeamVo> teamList;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionOfTeamVo.java

@@ -1,6 +1,7 @@
 package com.ruoyi.system.domain.vo;
 
 import com.ruoyi.system.domain.CompetitionOfTeam;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -13,4 +14,28 @@ public class CompetitionOfTeamVo extends CompetitionOfTeam {
     /** 球队logo */
     private String teamLogo;
     private String defaultPicture;
+
+    private String captain;
+
+
+    @ApiModelProperty(value="球队图片",required=false)
+    private String teamImg;
+
+    @ApiModelProperty(value="用户id",required=false)
+    private Long userId;
+
+    @ApiModelProperty(value="球队队长userId",required=false)
+    private String teamManagerUserId;
+
+    @ApiModelProperty(value="胜场",required=false)
+    private int victory;
+
+    @ApiModelProperty(value="负场",required=false)
+    private int lose;
+
+    @ApiModelProperty(value="积分",required=false)
+    private Integer integral = 0;
+
+    @ApiModelProperty(value="赛程类型【0 循环赛 1 淘汰赛】",required=false)
+    private int vsType;
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionResponse.java

@@ -0,0 +1,49 @@
+package com.ruoyi.system.domain.vo;
+import com.ruoyi.system.domain.Competition;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * <B>系统名称：future篮球后台系统系统</B><BR>
+ * <B>模块名称：BASKETBALL-DOMAIN</B><BR>
+ * <B>中文类名：比赛信息表 实体类</B><BR>
+ * <B>概要说明：比赛信息表 实体类</B><BR>
+ * <B>@version：v1.0</B><BR>
+ * <B>版本 修改人 备注</B><BR>
+ *
+ * @author : gc
+ * @date : 2020年08月06日
+ */
+@ApiModel(value = "比赛详情实体")
+@Setter
+@Getter
+public class CompetitionResponse extends Competition {
+
+    @ApiModelProperty(value = "主队合照", required = false)
+    private String mainTeamPhoto;
+
+    @ApiModelProperty(value = "主队介绍", required = false)
+    private String mainTeamDes;
+
+    @ApiModelProperty(value = "客队合照", required = false)
+    private String guestTeamPhoto;
+
+    @ApiModelProperty(value = "客队介绍", required = false)
+    private String guestTeamDes;
+
+    @ApiModelProperty(value = "主队参赛人员", required = false)
+    List<CompetitionMembersVo> mainTeamMemberList;
+
+    @ApiModelProperty(value = "主队最近赛事", required = false)
+    List<CompetitionTeamVsTeamVo> mainCompetitionTeamVsTeamList;
+
+    @ApiModelProperty(value = "客队参赛人员", required = false)
+    List<CompetitionMembersVo> guestTeamMemberList;
+
+    @ApiModelProperty(value = "客队最近赛事", required = false)
+    List<CompetitionTeamVsTeamVo> guestCompetitionTeamVsTeamList;
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionTeamGroupVo.java

@@ -0,0 +1,26 @@
+package com.ruoyi.system.domain.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Getter
+@Setter
+public class CompetitionTeamGroupVo {
+
+    private List<CompetitionOfTeamVo> isNotGroup;
+
+    private List<IsGroupBean> isGroup;
+    @Getter
+    @Setter
+    public static class IsGroupBean {
+        /**
+         * competitionOfTeamList : [{"createdTime":"2020-10-28 21:27:33","lastUpdatedTime":"2020-11-03 10:09:38","createdBy":"柯里","modifiedBy":"柯里","isDeleted":0,"id":9,"competitionId":26,"teamId":3,"teamName":"爱的表达","competitionGroup":"A","status":1,"remark":"","contacts":"张三","contactsTel":"15202838161","contactsAreaCode":"86","captcha":null,"teamLogo":"https://mall.lzsport.cn/image/2020/10/29/ae3756ab-c721-4277-bf0f-506d83c34818.jpg","teamImg":"https://adu.shjmall.cn/liguanghui/image//2020/10/28/19b257f9-433e-403c-abfd-f6d4fec88953.jpg","userId":null,"teamManagerUserId":6},{"createdTime":"2020-10-28 15:55:24","lastUpdatedTime":"2020-11-03 10:09:32","createdBy":"辉","modifiedBy":"博博","isDeleted":0,"id":5,"competitionId":26,"teamId":6,"teamName":"超燃队","competitionGroup":"A","status":1,"remark":"","contacts":"看看哇","contactsTel":"18202860065","contactsAreaCode":"86","captcha":null,"teamLogo":"https://adu.shjmall.cn/liguanghui/image//2020/10/29/8178f499-3114-4512-af3b-28ec535cee6a.jpg","teamImg":"https://adu.shjmall.cn/liguanghui/image//2020/09/18/ff110b5f-3e4c-4a4f-a3a3-dcfcfbf6560e.jpg","userId":null,"teamManagerUserId":5}]
+         * competitionGroup : A
+         */
+        private String competitionGroup;
+        private List<CompetitionOfTeamVo> competitionOfTeamList;
+
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionTeamIntegralVo.java

@@ -0,0 +1,20 @@
+package com.ruoyi.system.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author 吴一博
+ * @date 2023年06月26日 17:36
+ * @Description
+ */
+@Data
+public class CompetitionTeamIntegralVo implements Serializable {
+    private String teamName;
+    private String teamLogo;
+    private Integer win;
+    private Integer fail;
+    private Integer totalScore;
+    private Integer integral;
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionTeamVsTeamRequest.java

@@ -0,0 +1,28 @@
+package com.ruoyi.system.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Setter
+@Getter
+public class CompetitionTeamVsTeamRequest {
+    @ApiModelProperty(value="比赛赛事ID",required=false)
+    Long competitionId;
+    @ApiModelProperty(value="比赛日期",required=false)
+
+    String competitionDate;
+    @ApiModelProperty(value="日期对应的星期几",required=false)
+    String weekDay;
+
+    @ApiModelProperty(value="比赛方式：循环赛，淘汰赛",required=false)
+    String vsType;
+
+    @ApiModelProperty(value="禁止操作",required=false)
+    Boolean isDisabled;
+
+    @ApiModelProperty(value="比赛的双方球队",required=false)
+    List<CompetitionTeamVsTeamVo> teamVsTeamList;
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionTeamVsTeamVo.java

@@ -23,9 +23,8 @@ public class CompetitionTeamVsTeamVo extends CompetitionTeamVsTeam {
 
     @ApiModelProperty(value = "中文状态", required = false)
     private String statusName;
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "比赛时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date competitionDate;
+    @ApiModelProperty(value = "比赛日期", required = false)
+    private String competitionDate;
     private String weekDayName;
     private String theTime;
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionVo.java

@@ -0,0 +1,19 @@
+package com.ruoyi.system.domain.vo;
+import com.ruoyi.system.domain.Competition;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+public class CompetitionVo extends Competition {
+    @ApiModelProperty(value = "多字段过滤条件", required = false)
+    private String word;
+
+    @ApiModelProperty(value = "用户id", required = false)
+    private Long userId;
+
+    @ApiModelProperty(value = "短信验证码", required = false)
+    private String captcha;
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/PersonalCareerVo.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.domain.vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ *
+ */
+@ApiModel(value = "个人生涯Vo")
+@Setter
+@Getter
+public class PersonalCareerVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *场均得分
+     */
+    @ApiModelProperty(value="场均得分",required=false)
+    private BigDecimal totalScore;
+
+    /**
+     *场均篮板
+     */
+    @ApiModelProperty(value="场均篮板",required=false)
+    private BigDecimal backboard;
+
+    /**
+     *场均3分
+     */
+    @ApiModelProperty(value="场均3分",required=false)
+    private BigDecimal threePoints;
+
+    /**
+     *场均2分
+     */
+    @ApiModelProperty(value="场均2分",required=false)
+    private BigDecimal twoPoints;
+
+    /**
+     *场均罚球
+     */
+    @ApiModelProperty(value="场均罚球",required=false)
+    private BigDecimal penalty;
+
+    /**
+     *场均抢断
+     */
+    @ApiModelProperty(value="场均抢断",required=false)
+    private BigDecimal snatch;
+
+    /**
+     *场均盖帽
+     */
+    @ApiModelProperty(value="场均盖帽",required=false)
+    private BigDecimal block;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/PersonalHonorResponse.java

@@ -0,0 +1,26 @@
+package com.ruoyi.system.domain.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+
+/**
+ * 个人荣誉榜
+ */
+@ApiModel(value = "个人荣誉榜")
+@Setter
+@Getter
+public class PersonalHonorResponse {
+
+    @ApiModelProperty(value = "荣誉名称", required = false)
+    private String honorName;
+
+    @ApiModelProperty(value = "荣誉人员", required = false)
+    private String honoraryPersonnel;
+
+    @ApiModelProperty(value = "球队名称", required = false)
+    private String teamName;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/PhoneRequest.java

@@ -0,0 +1,29 @@
+package com.ruoyi.system.domain.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+@ApiModel(value="用户登录获取手机号码请求信息")
+@Setter
+@Getter
+public class PhoneRequest implements Serializable {
+    @ApiModelProperty(value="包括敏感数据在内的完整用户信息的加密数据",required=false)
+    private String encryptedData;
+    @ApiModelProperty(value = "动态令牌。可通过动态令牌换取用户手机号",required=false)
+    private String code;
+
+    private String cloudID;
+    @ApiModelProperty(value="加密算法的初始向量",required=false)
+    private String iv;
+    @ApiModelProperty(value="sessionKey",required=false)
+    private String sessionKey;
+    @ApiModelProperty(value="错误信息",required=false)
+    private String errMsg;
+
+    @ApiModelProperty(value="userid",required=false)
+    private String userId;
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SmsResponse.java

@@ -0,0 +1,14 @@
+package com.ruoyi.system.domain.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+@Setter
+@Getter
+public class SmsResponse implements Serializable {
+    private int status;
+    private String batchNo;
+    private String msg;
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TeamGroupRequest.java

@@ -0,0 +1,18 @@
+package com.ruoyi.system.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Setter
+@Getter
+public class TeamGroupRequest {
+    @ApiModelProperty(value = "分组", required = false)
+    private String group;
+    @ApiModelProperty(value = "比赛ID", required = false)
+    private Long competitionId;
+    @ApiModelProperty(value = "IDS", required = false)
+    private List<Long> ofTeamIds;
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TeamMembersResponse.java

@@ -0,0 +1,63 @@
+package com.ruoyi.system.domain.vo;
+
+import com.ruoyi.system.domain.TeamMembers;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <B>系统名称：future篮球后台系统系统</B><BR>
+ * <B>模块名称：BASKETBALL-DOMAIN</B><BR>
+ * <B>中文类名：球队人员表 实体类</B><BR>
+ * <B>概要说明：球队人员表 实体类</B><BR>
+ * <B>@version：v1.0</B><BR>
+ * <B>版本 修改人 备注</B><BR>
+ *
+ * @author : gc
+ * @date : 2020年08月06日
+ */
+@ApiModel(value = "参与球队人员数据")
+@Setter
+@Getter
+public class TeamMembersResponse extends TeamMembers {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *用户名称
+     */
+    @ApiModelProperty(value="用户名称",required=false)
+    private String userName;
+    /**
+     *用户CODE
+     */
+    @ApiModelProperty(value="用户CODE",required=false)
+    private String userCode;
+    /**
+     *登录名
+     */
+    @ApiModelProperty(value="登录名",required=false)
+    private String loginName;
+
+    /**
+     *角色
+     */
+    @ApiModelProperty(value="角色",required=false)
+    private String role;
+    /**
+     *头像
+     */
+    @ApiModelProperty(value="头像",required=false)
+    private String avatar;
+    /**
+     *性别
+     */
+    @ApiModelProperty(value="性别",required=false)
+    private String gender;
+    /**
+     *手机号
+     */
+    @ApiModelProperty(value="手机号",required=false)
+    private String telephone;
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TemplateDataVo.java

@@ -0,0 +1,26 @@
+package com.ruoyi.system.domain.vo;
+
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/*
+ * 设置推送的文字和颜色
+ * */
+@Builder
+@Data
+@NoArgsConstructor
+public class TemplateDataVo implements Serializable {
+    //字段值例如：keyword1：订单类型，keyword2：下单金额，keyword3：配送地址，keyword4：取件地址，keyword5备注
+    private String value;//依次排下去
+    private String color;
+    public TemplateDataVo(String value) {
+        this.value = value;
+    }
+    public TemplateDataVo(String value, String color) {
+        this.value = value;
+        this.color = color;
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserInfoResponse.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.domain.vo;
+import com.ruoyi.system.domain.WxUser;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * Created by jackma on 2020/5/25.
+ */
+@ApiModel(value="个人中心-用户信息")
+public class UserInfoResponse extends WxUser {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *年龄
+     */
+    @Setter
+    @Getter
+    @ApiModelProperty(value="年龄",required=false)
+    private int age;
+
+    /**
+     *角色名称
+     */
+    @Setter
+    @Getter
+    @ApiModelProperty(value="角色名称",required=false)
+    private String roleName;
+
+    /**
+     *球队位置-中文
+     */
+    @Setter
+    @Getter
+    @ApiModelProperty(value="球队位置-中文",required=false)
+    private List<String> teamPositionName;
+
+    /**
+     *标签名称-中文
+     */
+    @Setter
+    @Getter
+    @ApiModelProperty(value="标签名称-中文",required=false)
+    private List<String> tagName;
+    @Setter
+    @Getter
+    @ApiModelProperty(value="角色codes",required=false)
+    private List<String> roleCodes;
+
+    /**
+     * 个人生涯
+     */
+    @Setter
+    @Getter
+    @ApiModelProperty(value="个人生涯",required=false)
+    private PersonalCareerVo personalCareerVo;
+
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/WxApplesRes.java

@@ -0,0 +1,12 @@
+package com.ruoyi.system.domain.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class WxApplesRes {
+    private String errcode;
+    private String errmsg;
+    private String msgid;
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/WxLoginRequest.java

@@ -0,0 +1,66 @@
+package com.ruoyi.system.domain.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * Created by jackma on 2020/7/20.
+ */
+@ApiModel(value="用户登录请求信息")
+public class WxLoginRequest implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 账号(手机号/微信code)
+     */
+    @Setter
+    @Getter
+    @ApiModelProperty(value="账号(手机号/微信code)",required=false)
+    @NotBlank(message = "登录账号不能为空")
+    private String loginName;
+    /**
+     * 登录密码
+     */
+    @Setter
+    @Getter
+    @ApiModelProperty(value = "用户密码")
+    private String password;
+    /**
+     * 用户手机号（微信登录需要传）
+     */
+    @Setter
+    @Getter
+    @ApiModelProperty(value = "用户手机号")
+    private String telephone;
+    /**
+     *头像（微信登录需要传）
+     */
+    @Setter
+    @Getter
+    private String avatar;
+    /**
+     *性别（微信登录需要传）
+     */
+    @Setter
+    @Getter
+    private Integer gender;
+    /**
+     *昵称（微信登录需要传）
+     */
+    @Setter
+    @Getter
+    private String nickname;
+    /**
+     * 登录类型(1:pc;2:wx)
+     */
+    @Setter
+    @Getter
+    @ApiModelProperty(value = "登录类型(1:pc;2:wx)")
+    @NotBlank(message = "登录类型不能为空")
+    private String type;
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/WxMssVo.java

@@ -0,0 +1,33 @@
+package com.ruoyi.system.domain.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.io.Serializable;
+import java.util.Map;
+
+/*
+ * 小程序推送所需数据
+ * */
+@Builder
+@Data
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@NoArgsConstructor
+@ApiModel(value="微信小程序发送模版消息专用vo")
+public class WxMssVo implements Serializable {
+    @ApiModelProperty(value="用户openid",required=true)
+    private String touser;
+    @ApiModelProperty(value="消息模版id",required=true)
+    private String template_id;
+    @ApiModelProperty(value="默认跳到小程序首页地址路径",required=false)
+    private String page = "pages/my/my";
+    @ApiModelProperty(value="跳转小程序类型：developer为开发版；trial为体验版；formal为正式版；默认为正式版",required=false)
+    private String miniprogram_state="formal";
+    @ApiModelProperty(value="进入小程序查看”的语言类型，支持zh_CN(简体中文)、en_US(英文)、zh_HK(繁体中文)、zh_TW(繁体中文)，默认为zh_CN",required=false)
+    private String lang="zh_CN";
+    @ApiModelProperty(value="模板内容，格式形如 { \"key1\": { \"value\": any }, \"key2\": { \"value\": any } }",required=true)
+    private Map<String, TemplateDataVo> data;
+    @ApiModelProperty(value="小程序全局唯一后台接口调用凭据",required=false)
+    private String accessToken;
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/WxPhoneNumberVo.java

@@ -0,0 +1,50 @@
+package com.ruoyi.system.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author 吴一博
+ * @date 2022年11月01日 17:17
+ * @Description 微信小程序获取手机号码返回对象
+ */
+@Data
+public class WxPhoneNumberVo implements Serializable {
+
+    /**
+     * errcode : 0
+     * errmsg : ok
+     * phone_info : {"phoneNumber":"xxxxxx","purePhoneNumber":"xxxxxx","countryCode":86,"watermark":{"timestamp":1637744274,"appid":"xxxx"}}
+     */
+
+    private int errcode;
+    private String errmsg;
+    private PhoneInfoBean phone_info;
+
+    @Data
+    public static class PhoneInfoBean implements Serializable {
+        /**
+         * phoneNumber : xxxxxx
+         * purePhoneNumber : xxxxxx
+         * countryCode : 86
+         * watermark : {"timestamp":1637744274,"appid":"xxxx"}
+         */
+
+        private String phoneNumber;
+        private String purePhoneNumber;
+        private int countryCode;
+        private WatermarkBean watermark;
+
+        @Data
+        public static class WatermarkBean implements Serializable {
+            /**
+             * timestamp : 1637744274
+             * appid : xxxx
+             */
+
+            private int timestamp;
+            private String appid;
+        }
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/WxRegisterRequest.java

@@ -0,0 +1,51 @@
+package com.ruoyi.system.domain.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * Created by jackma on 2020/7/20.
+ */
+@ApiModel(value="用户注册请求信息")
+public class WxRegisterRequest {
+    @Setter
+    @Getter
+    @ApiModelProperty(value = "账号")
+    @NotBlank(message = "账号不能为空")
+    private String account;
+
+    @Setter
+    @Getter
+    @ApiModelProperty(value = "密码")
+    @NotBlank(message = "密码不能为空")
+    private String password;
+
+    @Setter
+    @Getter
+    @ApiModelProperty(value = "电话")
+    private String telephone;
+
+    @Setter
+    @Getter
+    @ApiModelProperty(value = "真实名称")
+    private String realName;
+
+    @Setter
+    @Getter
+    @ApiModelProperty(value = "昵称")
+    private String nickName;
+
+    @Setter
+    @Getter
+    @ApiModelProperty(value = "邮箱")
+    private String email;
+
+    @Setter
+    @Getter
+    @ApiModelProperty(value = "性别(1.男 2.女) ")
+    private Integer gender;
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BuildingInfoDetailMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.BuildingInfoDetail;
+
+/**
+ * 【请填写功能名称】Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-07-06
+ */
+public interface BuildingInfoDetailMapper 
+{
+    /**
+     * 查询【请填写功能名称】
+     * 
+     * @param id 【请填写功能名称】主键
+     * @return 【请填写功能名称】
+     */
+    public BuildingInfoDetail selectBuildingInfoDetailById(Long id);
+
+    /**
+     * 查询【请填写功能名称】列表
+     * 
+     * @param buildingInfoDetail 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    public List<BuildingInfoDetail> selectBuildingInfoDetailList(BuildingInfoDetail buildingInfoDetail);
+
+    /**
+     * 新增【请填写功能名称】
+     * 
+     * @param buildingInfoDetail 【请填写功能名称】
+     * @return 结果
+     */
+    public int insertBuildingInfoDetail(BuildingInfoDetail buildingInfoDetail);
+
+    /**
+     * 修改【请填写功能名称】
+     * 
+     * @param buildingInfoDetail 【请填写功能名称】
+     * @return 结果
+     */
+    public int updateBuildingInfoDetail(BuildingInfoDetail buildingInfoDetail);
+
+    /**
+     * 删除【请填写功能名称】
+     * 
+     * @param id 【请填写功能名称】主键
+     * @return 结果
+     */
+    public int deleteBuildingInfoDetailById(Long id);
+
+    /**
+     * 批量删除【请填写功能名称】
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteBuildingInfoDetailByIds(Long[] ids);
+
+    BuildingInfoDetail selectOneByBuildingId(Long id);
+}