From 56de4337364fa6308f7835decc8ba4e268274558 Mon Sep 17 00:00:00 2001 From: Qi <3194726156@qq.com> Date: Fri, 16 May 2025 12:18:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E6=B7=BBH5=E6=AE=B5=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E6=97=B6=E9=97=B4api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contoller/CeesAdminInfoController.java | 11 ++++- .../contoller/h5/h5CeesUserController.java | 4 ++ .../org/jeecg/modules/entity/CeesH5Time.java | 31 +++++++++++++ .../modules/mapper/CeesH5TimeMapper.java | 7 +++ .../modules/mapper/xml/CeesH5TimeMapper.xml | 5 +++ .../service/ICeesAdminInfoService.java | 5 +++ .../modules/service/ICeesUserService.java | 2 + .../impl/CeesAdminInfoServiceImpl.java | 45 +++++++++++++++++++ .../service/impl/CeesUserServiceImpl.java | 15 +++++++ 9 files changed, 124 insertions(+), 1 deletion(-) create mode 100644 jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CeesH5Time.java create mode 100644 jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/mapper/CeesH5TimeMapper.java create mode 100644 jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/mapper/xml/CeesH5TimeMapper.xml diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/CeesAdminInfoController.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/CeesAdminInfoController.java index 2f493a85..6ea314b0 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/CeesAdminInfoController.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/CeesAdminInfoController.java @@ -11,6 +11,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.modules.entity.CeesAdminInfo; +import org.jeecg.modules.entity.CeesH5Time; import org.jeecg.modules.service.ICeesAdminInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -151,5 +152,13 @@ public class CeesAdminInfoController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, CeesAdminInfo.class); } - + @GetMapping(value="/getH5Time") + public Result getH5Time(){ + return ceesAdminInfoService.getH5Time(); + } + @PostMapping(value="/setH5Time") + public Result setH5Time(@RequestBody CeesH5Time ceesH5Time){ + log.info(ceesH5Time.toString()); + return ceesAdminInfoService.setH5Time(ceesH5Time); + } } diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/h5/h5CeesUserController.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/h5/h5CeesUserController.java index 6f427cc6..24c82eb3 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/h5/h5CeesUserController.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/h5/h5CeesUserController.java @@ -53,4 +53,8 @@ public class h5CeesUserController { public Result getGroupName(@RequestParam String groupId){ return ceesUserService.getGroupName(groupId); } + @GetMapping(value="/getH5Time") + public Result getH5Time(){ + return ceesUserService.getH5Time(); + } } diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CeesH5Time.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CeesH5Time.java new file mode 100644 index 00000000..d61fe448 --- /dev/null +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CeesH5Time.java @@ -0,0 +1,31 @@ +package org.jeecg.modules.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; +@Data +@TableName("cees_h5_time") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="h5时间管理", description="h5时间管理") +public class CeesH5Time { + private Integer id; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") // 前端传入时解析 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") // 后端返回时格式化 + @ApiModelProperty(value = "移动段开始时间") + private Date startTime; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") // 前端传入时解析 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") // 后端返回时格式化 + @ApiModelProperty(value = "移动段结束时间") + private Date endTime; + + private Integer status; + +} diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/mapper/CeesH5TimeMapper.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/mapper/CeesH5TimeMapper.java new file mode 100644 index 00000000..f4354f3f --- /dev/null +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/mapper/CeesH5TimeMapper.java @@ -0,0 +1,7 @@ +package org.jeecg.modules.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.entity.CeesH5Time; + +public interface CeesH5TimeMapper extends BaseMapper { +} diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/mapper/xml/CeesH5TimeMapper.xml b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/mapper/xml/CeesH5TimeMapper.xml new file mode 100644 index 00000000..25739a9f --- /dev/null +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/mapper/xml/CeesH5TimeMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICeesAdminInfoService.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICeesAdminInfoService.java index 2359fbdf..817c834c 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICeesAdminInfoService.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICeesAdminInfoService.java @@ -1,7 +1,9 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.common.api.vo.Result; import org.jeecg.modules.entity.CeesAdminInfo; +import org.jeecg.modules.entity.CeesH5Time; /** * @Description: cees_admin_info @@ -11,4 +13,7 @@ import org.jeecg.modules.entity.CeesAdminInfo; */ public interface ICeesAdminInfoService extends IService { + Result setH5Time(CeesH5Time ceesH5Time); + + Result getH5Time(); } diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICeesUserService.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICeesUserService.java index db555dfc..45e459e5 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICeesUserService.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICeesUserService.java @@ -28,4 +28,6 @@ public interface ICeesUserService extends IService { Result updateGenerateRule(Long id, Integer groupType, Integer majorId); Result createAccount(CreateAccountDto createAccountDto); + + Result getH5Time(); } diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesAdminInfoServiceImpl.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesAdminInfoServiceImpl.java index 10ebd477..3bc819af 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesAdminInfoServiceImpl.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesAdminInfoServiceImpl.java @@ -1,11 +1,19 @@ package org.jeecg.modules.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.common.api.vo.Result; import org.jeecg.modules.entity.CeesAdminInfo; +import org.jeecg.modules.entity.CeesH5Time; import org.jeecg.modules.mapper.CeesAdminInfoMapper; +import org.jeecg.modules.mapper.CeesH5TimeMapper; import org.jeecg.modules.service.ICeesAdminInfoService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * @Description: cees_admin_info * @Author: jeecg-boot @@ -14,5 +22,42 @@ import org.springframework.stereotype.Service; */ @Service public class CeesAdminInfoServiceImpl extends ServiceImpl implements ICeesAdminInfoService { + @Autowired + private CeesH5TimeMapper ceesH5TimeMapper; + @Override + public Result setH5Time(CeesH5Time ceesH5Time) { + try { + // 查询数据库是否已有时间配置（根据你实际字段条件，假设只存一条） + List list = ceesH5TimeMapper.selectList(null); + int result; + + if (list != null && !list.isEmpty()) { + // 如果存在记录，更新第一条记录 + CeesH5Time existing = list.get(0); + ceesH5Time.setId(existing.getId()); // 注意必须设置 ID 才能更新 + result = ceesH5TimeMapper.updateById(ceesH5Time); + } else { + // 不存在记录，插入新数据 + result = ceesH5TimeMapper.insert(ceesH5Time); + } + + return result > 0 ? Result.ok("设置成功") : Result.error("操作失败"); + } catch (Exception e) { + e.printStackTrace(); + return Result.error("设置失败：" + e.getMessage()); + } + } + + @Override + public Result getH5Time() { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(CeesH5Time::getId, '1'); + CeesH5Time ceesH5TimeData = ceesH5TimeMapper.selectOne(wrapper); + CeesH5Time cesH5Time = new CeesH5Time(); + cesH5Time.setId(ceesH5TimeData.getId()); + cesH5Time.setStartTime(ceesH5TimeData.getStartTime()); + cesH5Time.setEndTime(ceesH5TimeData.getEndTime()); + return Result.ok(cesH5Time); + } } diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesUserServiceImpl.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesUserServiceImpl.java index dd8198dd..fe49826c 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesUserServiceImpl.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesUserServiceImpl.java @@ -47,6 +47,9 @@ public class CeesUserServiceImpl extends ServiceImpl i @Resource CeesGenerativeRulesMapper ceesGenerativeRulesMapper; + @Resource + CeesH5TimeMapper ceesH5TimeMapper; + /** * @param ceesUser * @return {@link String } @@ -348,6 +351,18 @@ public class CeesUserServiceImpl extends ServiceImpl i } } + @Override + public Result getH5Time() { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(CeesH5Time::getId, '1'); + CeesH5Time ceesH5TimeData = ceesH5TimeMapper.selectOne(wrapper); + CeesH5Time cesH5Time = new CeesH5Time(); + cesH5Time.setId(ceesH5TimeData.getId()); + cesH5Time.setStartTime(ceesH5TimeData.getStartTime()); + cesH5Time.setEndTime(ceesH5TimeData.getEndTime()); + return Result.ok(cesH5Time); + } + // 获取生成规则---用户前端获取rule public Result getGenerativeRules() { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();