diff --git a/src/main/java/com/example/demo/controller/RateController.java b/src/main/java/com/example/demo/controller/RateController.java index c73e7c5..a7b6e16 100644 --- a/src/main/java/com/example/demo/controller/RateController.java +++ b/src/main/java/com/example/demo/controller/RateController.java @@ -50,6 +50,10 @@ public class RateController { } } + @PostMapping("/status") + public Result status(@RequestBody Rate rate) throws Exception { + return Result.success(rateService.selectByStatus(rate)); + } @PostMapping("/searchById") public Result searchById(@RequestParam Integer rateId) { diff --git a/src/main/java/com/example/demo/domain/entity/Rate.java b/src/main/java/com/example/demo/domain/entity/Rate.java index c0b42e9..8a11fc3 100644 --- a/src/main/java/com/example/demo/domain/entity/Rate.java +++ b/src/main/java/com/example/demo/domain/entity/Rate.java @@ -30,5 +30,6 @@ public class Rate { private Integer flag; private String token; private Integer updateId; + private Integer status; } diff --git a/src/main/java/com/example/demo/mapper/RateMapper.java b/src/main/java/com/example/demo/mapper/RateMapper.java index b4b08d0..0341139 100644 --- a/src/main/java/com/example/demo/mapper/RateMapper.java +++ b/src/main/java/com/example/demo/mapper/RateMapper.java @@ -37,6 +37,7 @@ public interface RateMapper { "exchange_rate=#{exchangeRate},", "update_time=#{updateTime},", "admin_id=#{adminId},", + "`status`=#{status},", "", "where rate_id = #{rateId}", "" @@ -63,9 +64,14 @@ public interface RateMapper { "AND r.update_time LIKE CONCAT('%', #{updateTime}, '%')", "AND r.admin_id = #{adminId}", "AND r.update_id = #{updateId}", - "ORDER BY r.create_time DESC", + "`status`=#{status},", + "ORDER BY r.status ASC,r.create_time DESC", "" }) List select(Rate rate); + @Select({ + "select * from rate where status=1 and flag=1" + }) + List selectByStatus(Rate rate); } diff --git a/src/main/java/com/example/demo/serviceImpl/RateServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/RateServiceImpl.java index 55a563b..508cf09 100644 --- a/src/main/java/com/example/demo/serviceImpl/RateServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/RateServiceImpl.java @@ -12,6 +12,7 @@ import org.springframework.cache.annotation.*; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.Date; import java.util.List; @Transactional @Service @@ -52,6 +53,11 @@ public class RateServiceImpl implements RateService { return rateMapper.insert(rate); } + @Override + public List selectByStatus(Rate rate) throws Exception { + return rateMapper.selectByStatus(rate); + } + //软删除 @CacheEvict(value = "rate",allEntries = true) @Override @@ -77,8 +83,29 @@ public class RateServiceImpl implements RateService { @Cacheable(key="#root.method.name + ':'+ #pageNum + '-' + #pageSize + '-' + #rate.hashCode() ") @Override public PageInfo searchForPage(Integer pageNum, Integer pageSize, Rate rate) { +// PageHelper.startPage(pageNum, pageSize); +// List list = rateMapper.select(rate); +// return new PageInfo<>(list); PageHelper.startPage(pageNum, pageSize); List list = rateMapper.select(rate); + Date nowDate = new Date(); + list.forEach(rate1 -> { + // 假设 getStartTime() 和 getEndTime() 返回的是 java.util.Date 类型 + Date startTime = rate1.getStartTime(); + Date endTime = rate1.getEndTime(); + + // 使用 Date 类的 before 和 after 方法进行比较 + if (nowDate.before(startTime)) { + rate1.setStatus(0); // 设置状态为 0 + } else if (nowDate.after(endTime)) { + rate1.setStatus(2); // 设置状态为 2 + } else { + rate1.setStatus(1); // 设置状态为 1 + } + + // 保存修改后的对象 + rateMapper.update(rate1); + }); return new PageInfo<>(list); } } diff --git a/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java index 516ad21..9935a7a 100644 --- a/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java @@ -120,6 +120,7 @@ public class StatisticsServiceImpl implements StatisticsService { public List getMediuConsumeCoin() { return statisticsMapper.getMediuConsumeCoin(); } + @Cacheable(key="#root.method.name") public SumCoin getMess(Integer jwcode){ return statisticsMapper.getMess(jwcode); } @@ -135,7 +136,7 @@ public class StatisticsServiceImpl implements StatisticsService { } - + @Cacheable(key="#root.method.name + '-' + #meium.hashCode() ") @Override public List getMee( Meium meium) { @@ -233,7 +234,7 @@ public class StatisticsServiceImpl implements StatisticsService { // return null; // // } - +@Cacheable(key="#root.method.name + '-' + #sumcoin.hashCode() ") public List getCoinTime(SumCoin sumcoin) { System.out.println(sumcoin + "-------sumcoin----"); diff --git a/src/main/java/com/example/demo/sevice/RateService.java b/src/main/java/com/example/demo/sevice/RateService.java index cefe5b3..06857e8 100644 --- a/src/main/java/com/example/demo/sevice/RateService.java +++ b/src/main/java/com/example/demo/sevice/RateService.java @@ -9,7 +9,7 @@ import java.util.List; public interface RateService { int add(Rate rate) throws Exception; int edit(Rate rate) throws Exception; - + List selectByStatus(Rate rate) throws Exception; void softDelete(Integer rateId) throws Exception; Rate getById(Integer rateId); List search(Rate rate);