del useless code

TastSong · Dec 28, 2023 · ba037fe · ba037fe
1 parent e1aadd3
commit ba037fe
Show file tree

Hide file tree

Showing 50 changed files with 5 additions and 109 deletions.
diff --git a/CrazyCarServer/src/main/java/com/tastsong/crazycar/common/Result.java b/CrazyCarServer/src/main/java/com/tastsong/crazycar/common/Result.java
@@ -3,6 +3,7 @@
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Optional;
 
 @Data
 public class Result<T> implements Serializable {
@@ -71,12 +72,12 @@ public static <T> Result<T> success(int code, String message) {
         return success(code, message, null);
     }
 
-    public static <T> Result<T> success(int code,String message,T data) {
-        Result<T> result = new Result<T>();
+    public static <T> Result<T> success(int code, String message, T data) {
+        Result<T> result = new Result<>();
         result.setCode(code);
         result.setMsg(message);
         result.setSuccess(true);
-        result.setData(data != null ? data : (T)"");
+        result.setData(Optional.ofNullable(data).orElse(null));
         return result;
     }
 
@@ -124,7 +125,7 @@ public static <T> Result<T> failure(int code, String message, T data) {
         result.setCode(code);
         result.setMsg(message);
         result.setSuccess(false);
-        result.setData(data != null ? data : (T)"");
+        result.setData(Optional.ofNullable(data).orElse(null));
         return result;
     }
 

diff --git a/CrazyCarServer/src/main/java/com/tastsong/crazycar/config/CORSFilter.java b/CrazyCarServer/src/main/java/com/tastsong/crazycar/config/CORSFilter.java
@@ -17,7 +17,6 @@
 
 import com.tastsong.crazycar.common.Result;
 import com.tastsong.crazycar.common.ResultCode;
-import com.tastsong.crazycar.utils.Util;
 
 import cn.hutool.json.JSONUtil;
 import lombok.extern.slf4j.Slf4j;

diff --git a/CrazyCarServer/src/main/java/com/tastsong/crazycar/config/GlobalExceptionConfig.java b/CrazyCarServer/src/main/java/com/tastsong/crazycar/config/GlobalExceptionConfig.java
@@ -3,7 +3,6 @@
 
 import com.tastsong.crazycar.common.Result;
 import com.tastsong.crazycar.common.ResultCode;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.validation.BindException;
 import org.springframework.validation.FieldError;
@@ -13,7 +12,6 @@
 
 import java.util.List;
 
-@Slf4j
 @RestControllerAdvice
 public class GlobalExceptionConfig {
 

diff --git a/CrazyCarServer/src/main/java/com/tastsong/crazycar/controller/AvatarController.java b/CrazyCarServer/src/main/java/com/tastsong/crazycar/controller/AvatarController.java
@@ -17,8 +17,6 @@
 import com.tastsong.crazycar.service.AvatarService;
 import com.tastsong.crazycar.utils.Util;
 
-import cn.hutool.json.JSONObject;
-
 import javax.validation.Valid;
 
 @Slf4j

diff --git a/...yCarServer/src/main/java/com/tastsong/crazycar/controller/BackgroundAssetsController.java b/...yCarServer/src/main/java/com/tastsong/crazycar/controller/BackgroundAssetsController.java
@@ -18,9 +18,6 @@
 import com.tastsong.crazycar.model.AssetsUpdatingModel;
 import com.tastsong.crazycar.service.AssetsUpdatingService;
 
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONObject;
-
 import javax.validation.Valid;
 
 @Slf4j

diff --git a/...yCarServer/src/main/java/com/tastsong/crazycar/controller/BackgroundAvatarController.java b/...yCarServer/src/main/java/com/tastsong/crazycar/controller/BackgroundAvatarController.java
@@ -16,8 +16,6 @@
 import com.tastsong.crazycar.model.AvatarModel;
 import com.tastsong.crazycar.service.AvatarService;
 
-import cn.hutool.json.JSONObject;
-
 import javax.validation.Valid;
 import java.util.List;
 

diff --git a/...rServer/src/main/java/com/tastsong/crazycar/controller/BackgroundDashboardController.java b/...rServer/src/main/java/com/tastsong/crazycar/controller/BackgroundDashboardController.java
@@ -1,8 +1,5 @@
 package com.tastsong.crazycar.controller;
 
-import com.tastsong.crazycar.dto.resp.RespDashboardData;
-import com.tastsong.crazycar.service.AvatarService;
-import com.tastsong.crazycar.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -11,8 +8,6 @@
 
 import com.tastsong.crazycar.service.BackgroundDashboardService;
 
-import cn.hutool.json.JSONObject;
-
 @RestController
 @Scope("prototype")
 @RequestMapping(value = "/v2/Background")

diff --git a/CrazyCarServer/src/main/java/com/tastsong/crazycar/controller/BackgroundEquipController.java b/CrazyCarServer/src/main/java/com/tastsong/crazycar/controller/BackgroundEquipController.java
@@ -18,8 +18,6 @@
 import com.tastsong.crazycar.model.EquipModel;
 import com.tastsong.crazycar.service.EquipService;
 
-import cn.hutool.json.JSONObject;
-
 import javax.validation.Valid;
 
 @RestController

diff --git a/CrazyCarServer/src/main/java/com/tastsong/crazycar/controller/BackgroundLogin.java b/CrazyCarServer/src/main/java/com/tastsong/crazycar/controller/BackgroundLogin.java
@@ -2,7 +2,6 @@
 
 import com.tastsong.crazycar.dto.req.ReqBackgroundLogin;
 import com.tastsong.crazycar.service.LoginService;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -14,13 +13,9 @@
 import com.tastsong.crazycar.common.ResultCode;
 import com.tastsong.crazycar.model.AdminUserModel;
 import com.tastsong.crazycar.service.BackgroundUserService;
-import com.tastsong.crazycar.utils.Util;
-
-import cn.hutool.json.JSONObject;
 
 import javax.validation.Valid;
 
-@Slf4j
 @RestController
 @Scope("prototype")
 @RequestMapping(value = "/v1/Background")

diff --git a/CrazyCarServer/src/main/java/com/tastsong/crazycar/controller/BackgroundMatchController.java b/CrazyCarServer/src/main/java/com/tastsong/crazycar/controller/BackgroundMatchController.java
@@ -16,7 +16,6 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import com.tastsong.crazycar.model.MatchMapModel;
-import com.tastsong.crazycar.service.MatchRecordService;
 
 import cn.hutool.json.JSONObject;
 

diff --git a/...rServer/src/main/java/com/tastsong/crazycar/controller/BackgroundTimeTrialController.java b/...rServer/src/main/java/com/tastsong/crazycar/controller/BackgroundTimeTrialController.java
@@ -17,9 +17,6 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import com.tastsong.crazycar.model.TimeTrialClassModel;
-import com.tastsong.crazycar.service.TimeTrialRecordService;
-
-import cn.hutool.json.JSONObject;
 
 import javax.validation.Valid;
 

diff --git a/CrazyCarServer/src/main/java/com/tastsong/crazycar/controller/BackgroundUser.java b/CrazyCarServer/src/main/java/com/tastsong/crazycar/controller/BackgroundUser.java
@@ -13,26 +13,21 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.tastsong.crazycar.common.Result;
 import com.tastsong.crazycar.common.ResultCode;
 import com.tastsong.crazycar.model.AdminUserModel;
 import com.tastsong.crazycar.model.UserModel;
 import com.tastsong.crazycar.service.BackgroundUserService;
-import com.tastsong.crazycar.service.LoginService;
 import com.tastsong.crazycar.utils.Util;
 
 import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONObject;
-import lombok.extern.slf4j.Slf4j;
 
 import javax.validation.Valid;
 
 @RestController
 @Scope("prototype")
-@Slf4j
 @RequestMapping(value = "/v2/Background")
 public class BackgroundUser {
     @Autowired

diff --git a/...CarServer/src/main/java/com/tastsong/crazycar/controller/BackgroundVersionController.java b/...CarServer/src/main/java/com/tastsong/crazycar/controller/BackgroundVersionController.java
@@ -13,8 +13,6 @@
 import com.tastsong.crazycar.model.VersionModel;
 import com.tastsong.crazycar.service.VersionService;
 
-import cn.hutool.json.JSONObject;
-
 import javax.validation.Valid;
 import java.util.List;
 

diff --git a/CrazyCarServer/src/main/java/com/tastsong/crazycar/controller/EquipController.java b/CrazyCarServer/src/main/java/com/tastsong/crazycar/controller/EquipController.java
@@ -16,8 +16,6 @@
 import com.tastsong.crazycar.common.Result;
 import com.tastsong.crazycar.common.ResultCode;
 
-import cn.hutool.json.JSONObject;
-
 import javax.validation.Valid;
 
 @RestController

diff --git a/CrazyCarServer/src/main/java/com/tastsong/crazycar/controller/GameController.java b/CrazyCarServer/src/main/java/com/tastsong/crazycar/controller/GameController.java
@@ -12,15 +12,12 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import cn.hutool.json.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 
 import com.tastsong.crazycar.common.GameType;
 import com.tastsong.crazycar.common.NetType;
 import com.tastsong.crazycar.common.Result;
 import com.tastsong.crazycar.common.ResultCode;
-import com.tastsong.crazycar.service.MatchRecordService;
-import com.tastsong.crazycar.service.TimeTrialRecordService;
 import com.tastsong.crazycar.utils.Util;
 
 import javax.validation.Valid;
@@ -30,13 +27,9 @@
 @Slf4j
 @RequestMapping(value = "/v2/Game")
 public class GameController {
-    @Autowired
-    private TimeTrialRecordService timeTrialRecordService;
     @Autowired
     private TimeTrialClassService timeTrialClassService;
 
-    @Autowired
-    private MatchRecordService matchRecordService;
     @Autowired
     private UserService userService;
 

diff --git a/CrazyCarServer/src/main/java/com/tastsong/crazycar/controller/KCPRttController.java b/CrazyCarServer/src/main/java/com/tastsong/crazycar/controller/KCPRttController.java
@@ -1,6 +1,5 @@
 package com.tastsong.crazycar.controller;
 
-import java.io.Serial;
 import java.util.concurrent.ConcurrentHashMap;
 
 import javax.servlet.http.HttpServlet;

diff --git a/CrazyCarServer/src/main/java/com/tastsong/crazycar/controller/#Controller.java b/CrazyCarServer/src/main/java/com/tastsong/crazycar/controller/#Controller.java
@@ -2,7 +2,6 @@
 
 import com.tastsong.crazycar.dto.req.ReqLogin;
 import com.tastsong.crazycar.dto.resp.RespConfig;
-import com.tastsong.crazycar.service.UserLoginRecordService;
 import com.tastsong.crazycar.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
@@ -19,7 +18,6 @@
 import com.tastsong.crazycar.service.LoginService;
 import com.tastsong.crazycar.utils.Util;
 
-import cn.hutool.json.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 
 import javax.validation.Valid;
@@ -33,8 +31,6 @@ public class LoginController {
 	private LoginService loginService;
 	@Autowired
 	private UserService userService;
-	@Autowired
-	private UserLoginRecordService userLoginRecordService;
 
 	@PostMapping(value = "/#")
 	public Object login(@Valid @RequestBody ReqLogin req) throws Exception {

diff --git a/CrazyCarServer/src/main/java/com/tastsong/crazycar/controller/TimeTrialController.java b/CrazyCarServer/src/main/java/com/tastsong/crazycar/controller/TimeTrialController.java
@@ -20,8 +20,6 @@
 import com.tastsong.crazycar.service.TimeTrialRecordService;
 import com.tastsong.crazycar.utils.Util;
 
-import cn.hutool.json.JSONObject;
-
 import javax.validation.Valid;
 
 @RestController
@@ -51,7 +49,6 @@ public Object getDetail(@RequestHeader(Util.TOKEN) String token) throws Exceptio
     public Object budClass(@RequestHeader(Util.TOKEN) String token, @Valid @RequestBody ReqMatchInfo req) throws Exception {
         int uid = Util.getUidByToken(token);
         int cid = req.getCid();
-        JSONObject data = new JSONObject();
         if (timeTrialClassService.hasClass(uid, cid)) {
             System.out.print("++++++++ isHasClass ");
             return userService.getUserByUid(uid);

diff --git a/CrazyCarServer/src/main/java/com/tastsong/crazycar/controller/UserInfoController.java b/CrazyCarServer/src/main/java/com/tastsong/crazycar/controller/UserInfoController.java
@@ -16,8 +16,6 @@
 import com.tastsong.crazycar.service.LoginService;
 import com.tastsong.crazycar.utils.Util;
 
-import cn.hutool.json.JSONObject;
-
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;

diff --git a/CrazyCarServer/src/main/java/com/tastsong/crazycar/dto/req/ReqAvatar.java b/CrazyCarServer/src/main/java/com/tastsong/crazycar/dto/req/ReqAvatar.java
@@ -1,7 +1,5 @@
 package com.tastsong.crazycar.dto.req;
 
-
-import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

diff --git a/CrazyCarServer/src/main/java/com/tastsong/crazycar/dto/req/ReqRoomMsg.java b/CrazyCarServer/src/main/java/com/tastsong/crazycar/dto/req/ReqRoomMsg.java
@@ -6,7 +6,6 @@
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
-import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 
 @NoArgsConstructor

diff --git a/CrazyCarServer/src/main/java/com/tastsong/crazycar/dto/req/ReqUpdateAvatar.java b/CrazyCarServer/src/main/java/com/tastsong/crazycar/dto/req/ReqUpdateAvatar.java
@@ -1,7 +1,5 @@
 package com.tastsong.crazycar.dto.req;
 
-
-import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

diff --git a/CrazyCarServer/src/main/java/com/tastsong/crazycar/dto/req/ReqUpdateEquip.java b/CrazyCarServer/src/main/java/com/tastsong/crazycar/dto/req/ReqUpdateEquip.java
@@ -1,13 +1,10 @@
 package com.tastsong.crazycar.dto.req;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
-import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 
 @NoArgsConstructor

diff --git a/CrazyCarServer/src/main/java/com/tastsong/crazycar/dto/req/ReqUpdateRole.java b/CrazyCarServer/src/main/java/com/tastsong/crazycar/dto/req/ReqUpdateRole.java
@@ -1,7 +1,5 @@
 package com.tastsong.crazycar.dto.req;
 
-
-import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

diff --git a/CrazyCarServer/src/main/java/com/tastsong/crazycar/dto/req/ReqUpdateUserPassword.java b/CrazyCarServer/src/main/java/com/tastsong/crazycar/dto/req/ReqUpdateUserPassword.java
@@ -6,7 +6,6 @@
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
-import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 
 @NoArgsConstructor

diff --git a/CrazyCarServer/src/main/java/com/tastsong/crazycar/dto/req/ReqUpdateVersion.java b/CrazyCarServer/src/main/java/com/tastsong/crazycar/dto/req/ReqUpdateVersion.java
@@ -1,15 +1,10 @@
 package com.tastsong.crazycar.dto.req;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.tastsong.crazycar.model.ConstModelNameAttribute;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
-import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 
 @NoArgsConstructor

diff --git a/CrazyCarServer/src/main/java/com/tastsong/crazycar/dto/resp/RespAvatarList.java b/CrazyCarServer/src/main/java/com/tastsong/crazycar/dto/resp/RespAvatarList.java
@@ -1,6 +1,5 @@
 package com.tastsong.crazycar.dto.resp;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

diff --git a/CrazyCarServer/src/main/java/com/tastsong/crazycar/dto/resp/RespDashboardData.java b/CrazyCarServer/src/main/java/com/tastsong/crazycar/dto/resp/RespDashboardData.java
@@ -1,6 +1,5 @@
 package com.tastsong.crazycar.dto.resp;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

diff --git a/CrazyCarServer/src/main/java/com/tastsong/crazycar/dto/resp/RespEnterGame.java b/CrazyCarServer/src/main/java/com/tastsong/crazycar/dto/resp/RespEnterGame.java
@@ -5,9 +5,6 @@
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @NoArgsConstructor
 @AllArgsConstructor
 @ToString

diff --git a/CrazyCarServer/src/main/java/com/tastsong/crazycar/dto/resp/RespTimeTrailResult.java b/CrazyCarServer/src/main/java/com/tastsong/crazycar/dto/resp/RespTimeTrailResult.java
@@ -6,9 +6,6 @@
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @NoArgsConstructor
 @AllArgsConstructor
 @ToString

diff --git a/CrazyCarServer/src/main/java/com/tastsong/crazycar/mapper/AdminUserMapper.java b/CrazyCarServer/src/main/java/com/tastsong/crazycar/mapper/AdminUserMapper.java
@@ -1,7 +1,5 @@
 package com.tastsong.crazycar.mapper;
 
-import java.util.List;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.tastsong.crazycar.model.AdminUserModel;