Merge pull request 'zzw-one' (#15) from zzw-one into master
All checks were successful
continuous-integration/drone Build is passing

Reviewed-on: #15
This commit is contained in:
root 2024-08-20 15:22:27 +08:00
commit 0596884364
5 changed files with 14 additions and 5 deletions

View File

@ -15,7 +15,7 @@ import java.util.Map;
*/
@Tag(name = "大屏服务 - 检票")
@RestController
@RequestMapping("/datacenter/checkticket")
@RequestMapping("/checkticket")
@Validated
public class CheckTicketApi {
@Resource

View File

@ -10,6 +10,8 @@ import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* @Description 售票
@ -37,7 +39,14 @@ public class SaleDataApi {
@GetMapping("/lastyear/{startTime}")
@Operation(summary = "获得去年日期往前推十天的数据")
public List<Map<String, String>> lastyearNum(@PathVariable("startTime") String startTime) {
return saleDataService.findCheckticketcountBytime(startTime);
String resultStr = startTime.replaceAll("-", "");
// 正则表达式匹配 yyyyMMdd 格式
Pattern pattern = Pattern.compile("^\\d{8}$");
Matcher matcher = pattern.matcher(resultStr);
if (matcher.matches()){
return saleDataService.findCheckticketcountBytime(resultStr);
}
return null;
}
@GetMapping("/gender")

View File

@ -21,7 +21,7 @@ import java.net.URL;
*/
@Tag(name = "大屏服务 - 车辆过渡情况")
@RestController
@RequestMapping("/datacenter/h5/transitionFlight")
@RequestMapping("/h5/transitionFlight")
@Validated
public class TransitionFlightApi {
//智慧票务检票系统车辆过渡情况(南日)

View File

@ -24,7 +24,7 @@ import java.util.Optional;
@Tag(name = "大屏服务 - 停车场接口")
@RestController
@RequestMapping("/datacenter/h5/vehicleAccess")
@RequestMapping("/h5/vehicleAccess")
public class VehicleAccessApi {
@Autowired

View File

@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
*/
@Tag(name = "大屏服务 - 天气接口")
@RestController
@RequestMapping("/datacenter/h5/weather")
@RequestMapping("/h5/weather")
@Validated
public class WeatherApi {
@GetMapping(value = "/getWeather")