diff --git a/lottery-system/lottery-pojo/src/main/java/com/lottery/vo/FundingDataVO.java b/lottery-system/lottery-pojo/src/main/java/com/lottery/vo/FundingDataVO.java new file mode 100644 index 0000000..3e0e1f1 --- /dev/null +++ b/lottery-system/lottery-pojo/src/main/java/com/lottery/vo/FundingDataVO.java @@ -0,0 +1,32 @@ +package com.lottery.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @program: lottery-system + * @ClassName FundingDataVO + * @description: + * @author:jihaipeng + * @create: 2025−07-18 11:06 + * @Version 1.0 + **/ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class FundingDataVO { + private String marketOne; + private String marketTwo; + private Integer time; + + private Integer showOne; + private Integer showTwo; + + private Integer markerOneVirtual; + private Integer markerTwoVirtual; + + + private Integer markerOneTotal; + private Integer markerTwoTotal; +} diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/ExportController.java b/lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/ExportController.java deleted file mode 100644 index 692b8bc..0000000 --- a/lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/ExportController.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.lottery.admin.controller; - -/** - * @program: lottery-system - * @ClassName ExportController - * @description: - * @author:jihaipeng - * @create: 2025−07-17 14:36 - * @Version 1.0 - **/ - -public class ExportController { - -} diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/FundingController.java b/lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/FundingController.java index 4e7d77f..8738804 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/FundingController.java +++ b/lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/FundingController.java @@ -1,12 +1,15 @@ package com.lottery.admin.controller; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import com.lottery.dto.FundingActivityDto; import com.lottery.admin.service.IFundingService; import com.lottery.dto.FundingRecordDto; import com.lottery.dto.FundingUserDto; import com.lottery.result.Result; import com.lottery.vo.FundingActivityVo; +import com.lottery.vo.FundingDataVO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -127,9 +130,18 @@ public class FundingController { //返回数据详情 @PostMapping("/getDate") - public Result> getDate(@RequestParam Integer activityId) { + public Result getDate(@RequestParam Integer activityId) { LOGGER.info("返回id={}的活动的设置数据详情", activityId); - return Result.success(fundingService.getDate(activityId)); + FundingDataVO date = fundingService.getDate1(activityId); + try { + ObjectMapper mapper = new ObjectMapper(); + String json = mapper.writeValueAsString(date); + LOGGER.info("返回的 JSON 数据: {}", json); + } catch (JsonProcessingException e) { + LOGGER.error("JSON 转换失败", e); + } + return Result.success(date); + //return Result.success(date); } //获取市场股票列表 diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/IFundingService.java b/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/IFundingService.java index be4a0c3..6fecb47 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/IFundingService.java +++ b/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/IFundingService.java @@ -5,6 +5,7 @@ import com.lottery.dto.FundingRecordDto; import com.lottery.dto.FundingUserDto; import com.lottery.result.Result; import com.lottery.vo.FundingActivityVo; +import com.lottery.vo.FundingDataVO; import com.lottery.vo.FundingUserVo; import javax.servlet.http.HttpServletResponse; @@ -40,7 +41,7 @@ public interface IFundingService { Result addVirtual(Integer activityId, String stock, Integer addTotal); - Map getDate(Integer activityId); + FundingDataVO getDate1(Integer activityId); List getMarketList(); diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/FundingServiceImpl.java b/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/FundingServiceImpl.java index 3590078..b23ce98 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/FundingServiceImpl.java +++ b/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/FundingServiceImpl.java @@ -16,6 +16,7 @@ import com.lottery.utils.ConvertBeanUtil; import com.lottery.utils.HttpUtils; import com.lottery.utils.ValidationUtils; import com.lottery.vo.FundingActivityVo; +import com.lottery.vo.FundingDataVO; import com.lottery.vo.FundingUserVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -240,7 +241,7 @@ public class FundingServiceImpl implements IFundingService { } @Override - public Map getDate(Integer activityId) { + public FundingDataVO getDate1(Integer activityId) { //根据活动id查询俩个市场,俩个市场是一条数据 Map market = fundingMapper.getMarket(activityId); //获取map @@ -262,14 +263,9 @@ public class FundingServiceImpl implements IFundingService { Integer time = fundingMapper.getTime(activityId,marketOne); Map result = new HashMap<>(); - result.put("time", time) ; - result.put("showOne", showOne); - result.put("showTwo", showTwo); - result.put("markerOneTotal", markerTwoVirtual); - result.put("markerTwoTotal", markerTwoVirtual); - result.put("marketOneVirtual", markerOneVirtual); - result.put("marketTwoVirtual", markerTwoVirtual); - return result; + FundingDataVO fundingDataVO = new FundingDataVO(marketOne, marketTwo, time, showOne, showTwo, markerOneVirtual, markerTwoVirtual, markerOneTotal, markerTwoTotal); + + return fundingDataVO; } @Override