fix: thread interrupt handling + dbinfo null safety
This commit is contained in:
@@ -13,19 +13,12 @@ import com.datao.vo.*;
|
|||||||
import io.swagger.v3.oas.annotations.Parameter;
|
import io.swagger.v3.oas.annotations.Parameter;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springdoc.core.annotations.ParameterObject;
|
import org.springdoc.core.annotations.ParameterObject;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.validation.annotation.Validated;
|
import org.springframework.validation.annotation.Validated;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.time.LocalTime;
|
|
||||||
import java.time.ZoneOffset;
|
import java.time.ZoneOffset;
|
||||||
import java.time.format.DateTimeFormatter;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@@ -112,13 +105,13 @@ public class DataServiceController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@PutMapping("/scan")
|
@PutMapping("/scan")
|
||||||
public Result updateScan(@RequestBody @Validated Scan scanData) {
|
public Result<?> updateScan(@RequestBody @Validated Scan scanData) {
|
||||||
boolean result = scanService.updateById(scanData);
|
boolean result = scanService.updateById(scanData);
|
||||||
return Result.judge(result);
|
return Result.judge(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping("/scan")
|
@PostMapping("/scan")
|
||||||
public Result addScan(@RequestBody @Validated Scan scanData) {
|
public Result<?> addScan(@RequestBody @Validated Scan scanData) {
|
||||||
boolean result = scanService.save(scanData);
|
boolean result = scanService.save(scanData);
|
||||||
return Result.judge(result);
|
return Result.judge(result);
|
||||||
}
|
}
|
||||||
@@ -131,7 +124,7 @@ public class DataServiceController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping("/game")
|
@PostMapping("/game")
|
||||||
public Result saveGame(@RequestBody @Validated Game gameData) {
|
public Result<?> saveGame(@RequestBody @Validated Game gameData) {
|
||||||
boolean result = gameService.saveOrUpdate(gameData);
|
boolean result = gameService.saveOrUpdate(gameData);
|
||||||
return Result.judge(result);
|
return Result.judge(result);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,15 +1,10 @@
|
|||||||
package com.datao.service;
|
package com.datao.service;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
||||||
import com.datao.domain.*;
|
import com.datao.domain.*;
|
||||||
import io.swagger.v3.oas.models.security.SecurityScheme;
|
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import org.jsoup.HttpStatusException;
|
import org.jsoup.HttpStatusException;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.web.client.RestClientException;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.net.ConnectException;
|
import java.net.ConnectException;
|
||||||
import java.net.SocketTimeoutException;
|
import java.net.SocketTimeoutException;
|
||||||
import java.text.ParseException;
|
import java.text.ParseException;
|
||||||
|
|||||||
Reference in New Issue
Block a user