diff --git a/m2pool-common/common-core/src/main/java/com/m2pool/common/core/utils/DateUtils.java b/m2pool-common/common-core/src/main/java/com/m2pool/common/core/utils/DateUtils.java index 2ae76a9..e34048b 100644 --- a/m2pool-common/common-core/src/main/java/com/m2pool/common/core/utils/DateUtils.java +++ b/m2pool-common/common-core/src/main/java/com/m2pool/common/core/utils/DateUtils.java @@ -358,7 +358,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils public static Date getOneMonthAgo(Date date) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); - calendar.add(Calendar.MONTH, -1); + calendar.add(Calendar.DAY_OF_MONTH, -30); return calendar.getTime(); } diff --git a/m2pool-common/common-swagger/src/main/java/com/m2pool/common/swagger/config/SwaggerAutoConfiguration.java b/m2pool-common/common-swagger/src/main/java/com/m2pool/common/swagger/config/SwaggerAutoConfiguration.java index 7516fe1..1c1b7bb 100644 --- a/m2pool-common/common-swagger/src/main/java/com/m2pool/common/swagger/config/SwaggerAutoConfiguration.java +++ b/m2pool-common/common-swagger/src/main/java/com/m2pool/common/swagger/config/SwaggerAutoConfiguration.java @@ -5,6 +5,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Profile; import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.PathSelectors; import springfox.documentation.builders.RequestHandlerSelectors; diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/mapper/ManageWalletOutInMapper.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/mapper/ManageWalletOutInMapper.java index 247f1d6..4305fcf 100644 --- a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/mapper/ManageWalletOutInMapper.java +++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/mapper/ManageWalletOutInMapper.java @@ -43,4 +43,12 @@ public interface ManageWalletOutInMapper extends BaseMapper { @DistributionDB List summaryOfPendingPayments(); + + /** + * 获取最大日期 + * @param coin + * @return + */ + LocalDateTime getMaxDateData(); + } diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/ManageWalletOutInService.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/ManageWalletOutInService.java index c47f06a..f4ca738 100644 --- a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/ManageWalletOutInService.java +++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/ManageWalletOutInService.java @@ -9,6 +9,7 @@ import com.m2pool.manage.entity.ManageWalletOutIn; import com.m2pool.manage.vo.ManageBaseVo; import com.m2pool.manage.vo.ManageBroadcastVo; import com.m2pool.manage.vo.PageVo; +import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/impl/ManageUserServiceImpl.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/impl/ManageUserServiceImpl.java index 0160728..b6984f9 100644 --- a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/impl/ManageUserServiceImpl.java +++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/impl/ManageUserServiceImpl.java @@ -252,7 +252,7 @@ public class ManageUserServiceImpl implements ManageUserService { //查询起付额 List startPayments = manageBroadcastMapper.getStartPayments(summaryOfPendingPaymentsList); - // 创建一个 Map 用于存储第二个集合中元素的 user 和 coin 组合对应的 startPayAmount + // 创建一个 Map 用于存储第二个集合中元素的 user 和 coin 组合对应的 startPayAmount . 这里可以优化一下，防止多key报错，不过一般不出这个问题 Map startPayAmountMap = startPayments.stream() .collect(Collectors.toMap( dto -> dto.getUser() + "_" + dto.getCoin(), diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/task/ManageTask.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/task/ManageTask.java index 44f00bf..e05e48b 100644 --- a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/task/ManageTask.java +++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/task/ManageTask.java @@ -42,20 +42,18 @@ public class ManageTask { /** * 存储交易记录定时任务 */ - @Scheduled(cron = "22 35 0/1 * * ?") - //@Scheduled(cron = "0 0/1 * * * ?") + //@Scheduled(cron = "22 58 0/1 * * ?") + @Scheduled(cron = "0 0/1 * * * ?") public void insertDataToWalletOutInDb(){ - ManageWalletOutIn manageWalletOutIn = manageWalletOutInMapper.selectOne(new LambdaQueryWrapper() - .orderByDesc(ManageWalletOutIn::getDate - ).last("limit 1")); + LocalDateTime maxDateData = manageWalletOutInMapper.getMaxDateData(); LocalDateTime startDate = null; List manageWalletOutIns = new ArrayList<>(); - if (manageWalletOutIn != null){ - startDate = manageWalletOutIn.getDate(); + if (maxDateData != null){ + startDate = LocalDateTime.now().toLocalDate().atStartOfDay(); //获取startDate 后的数据,用于比对 manageWalletOutIns = manageWalletOutInMapper.selectList(new LambdaQueryWrapper() - .ge(ManageWalletOutIn::getDate, startDate.toLocalDate().atStartOfDay())); + .ge(ManageWalletOutIn::getDate, startDate)); } List walletIn = manageWalletOutInMapper.getWalletIn(startDate); @@ -99,7 +97,12 @@ public class ManageTask { walletInfo.addAll(updatedInList); } else { - walletInfo.addAll(outList); + List collect = outList.stream().peek(outItem -> { + if (outItem.getShouldOutDate() == null) { + outItem.setShouldOutDate(outItem.getDate().toLocalDate().atStartOfDay()); + } + }).collect(Collectors.toList()); + walletInfo.addAll(collect); } } //外层为in，内层为out -----新增当天只有walletIn,没有walletOut的数据 diff --git a/m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageBroadcastMapper.xml b/m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageBroadcastMapper.xml index ef5248e..9585985 100644 --- a/m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageBroadcastMapper.xml +++ b/m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageBroadcastMapper.xml @@ -36,7 +36,7 @@ `user`, address, `date`, - DATE(`date`) as shouldOutDate, + COALESCE(DATE(`should_out_date`),DATE(`date`)) as shouldOutDate, max_height, allocation_amount as allocationAmount, transfer_amount as transferAmount @@ -53,7 +53,7 @@ - order by `date` desc + order by `shouldOutDate` desc diff --git a/m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageWalletOutInMapper.xml b/m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageWalletOutInMapper.xml index 7eb6dcc..f2c6851 100644 --- a/m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageWalletOutInMapper.xml +++ b/m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageWalletOutInMapper.xml @@ -9,19 +9,19 @@ SELECT wi.coin, wi.`user`, - wi.should_out_date AS `date`, + COALESCE(wi.`should_out_date`, wi.`create_date`) as `date`, wi.amount AS allocationAmount, - wi.`create_date` as `shouldOutDate`, + wi.should_out_date AS `shouldOutDate`, wi.max_height AS maxHeight FROM wallet_in wi - wi.`should_out_date` >= DATE(#{startDate}) + wi.`create_date` >= DATE(#{startDate}) - wi.`should_out_date` NOW() + wi.`create_date` NOW() @@ -47,4 +47,7 @@ + diff --git a/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/controller/PoolController.java b/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/controller/PoolController.java index cc196a8..e4e434f 100644 --- a/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/controller/PoolController.java +++ b/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/controller/PoolController.java @@ -205,7 +205,23 @@ public class PoolController extends BaseController { return poolService.test1(); } + @PostMapping("/dataSupplement") + public String dataSupplement(@RequestBody DataSupplementVo vo){ + if (vo.getKey().equals("dsadasdwfddasdfsafadsfs")){ + return poolService.dataSupplement(vo); + }else{ + return "失败:key传递错误"; + } + } + @PostMapping("/dataDelete") + public String dataDelete(@RequestBody DataSupplementVo vo){ + if (vo.getKey().equals("dsadasdwfddasdfsafadsfs")){ + return poolService.dataDelete(vo); + }else{ + return "失败:key传递错误"; + } + } } diff --git a/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/mapper/PoolMapper.java b/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/mapper/PoolMapper.java index 10c6f77..8bf770e 100644 --- a/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/mapper/PoolMapper.java +++ b/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/mapper/PoolMapper.java @@ -270,4 +270,13 @@ public interface PoolMapper { * @return */ BlockInfo getMoneroBlockInfo(); + + + int deleteMhs30m(@Param("coin") String coin,@Param("date") String date); + + + int deletePool30m(@Param("coin") String coin,@Param("date") String date); + + int deleteUsers30m(@Param("coin") String coin,@Param("date") String date); + } diff --git a/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/PoolService.java b/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/PoolService.java index 3484220..e17c824 100644 --- a/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/PoolService.java +++ b/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/PoolService.java @@ -46,4 +46,18 @@ public interface PoolService { * @return */ AjaxResult getMinerPowerFor30min( MinerMhsVo minerMhsVo); + + + /** + * 数据补全 + * @param vo + */ + String dataSupplement( DataSupplementVo vo); + + /** + * 数据删除 + * @param vo + * @return + */ + String dataDelete(DataSupplementVo vo); } diff --git a/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/impl/PoolServiceImpl.java b/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/impl/PoolServiceImpl.java index ea16eda..ded4c36 100644 --- a/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/impl/PoolServiceImpl.java +++ b/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/impl/PoolServiceImpl.java @@ -12,17 +12,16 @@ import com.m2pool.common.datasource.annotation.UserDB; import com.m2pool.common.redis.service.RedisService; import com.m2pool.pool.dto.*; import com.m2pool.pool.entity.BlockInfo; +import com.m2pool.pool.entity.PoolPower; import com.m2pool.pool.enums.*; import com.m2pool.pool.mapper.PoolMapper; import com.m2pool.pool.mapper.UserAccountMapper; import com.m2pool.pool.service.PoolService; +import com.m2pool.pool.task.DataTask; import com.m2pool.pool.utils.EnumUtils; import com.m2pool.pool.utils.NodeRpc; import com.m2pool.pool.utils.PowerUnitUtils; -import com.m2pool.pool.vo.BalanceListGetVo; -import com.m2pool.pool.vo.CoinVo; -import com.m2pool.pool.vo.MinerAccountAddVo; -import com.m2pool.pool.vo.MinerMhsVo; +import com.m2pool.pool.vo.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -33,6 +32,7 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.time.ZoneId; import java.util.*; +import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; /** @@ -719,4 +719,111 @@ public class PoolServiceImpl implements PoolService { return AjaxResult.success(minerPowerFor30min); } + + @Override + @DSTransactional + public String dataSupplement(DataSupplementVo vo) { + + String nowStr = vo.getDate(); + + //检查二级表是否有当前时间数据 + //int count = poolMapper.getLastDataTime(vo.getCoin() + "_mhs30m", nowStr); + + + List list = poolMapper.getHourMinerDataList(vo.getCoin()+"_mhsv2",nowStr); + if(list.size() > 0){ + List offlineList = new ArrayList<>(); + list.stream().forEach(e -> { + if(StringUtils.isNotNull(e.getMhs())){ + e.setMhs(e.getMhs() * Pools.NEXA.getFac()); + } + if("offline".equals(e.getState())){ + offlineList.add(e); + } + }); + //list = DataTask.filterList(list,now); + + boolean result = poolMapper.batchInsertMhsDataToDB(vo.getCoin() + "_mhs30m", DataTask.getToHourDBListByMinerDataList(list)); + + Map> map = list.stream().collect(Collectors.groupingBy(MinerDataDto::getDate)); + map.forEach((date,dList) -> { + PoolPower poolPower = new PoolPower(); + //poolPower.setDate(date); + poolPower.setDateStr(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,date)); + Map stateCount = dList.stream().collect(Collectors.groupingBy(MinerDataDto::getState, Collectors.counting())); + poolPower.setMhs(dList.stream().map(e -> BigDecimal.valueOf(e.getMhs())).reduce(BigDecimal::add).get().stripTrailingZeros()); + poolPower.setMiners(dList.size()); + poolPower.setOnline(Convert.toInt(stateCount.get("online"),0)); + poolPower.setOffline(Convert.toInt(stateCount.get("offline"),0)); + + boolean poolResult = poolMapper.insertPoolPower(vo.getCoin() + "_pool_30m", poolPower); + int time =0; + while (!poolResult){ + poolResult = poolMapper.insertPoolPower(vo.getCoin() + "_pool_30m", poolPower); + if (time > 5) { + break; + } + time ++; + } + + System.out.println("构造写入user算力表数据"); + Map> userMap = dList.stream().collect(Collectors.groupingBy(MinerDataDto::getUser)); + List userList = new ArrayList<>(); + userMap.forEach((user,uList)->{ + MinerDataInsertDBDto uDto = new MinerDataInsertDBDto(); + uDto.setDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,date)); + uDto.setUser(user); + uDto.setMhs(uList.stream().map(e->BigDecimal.valueOf(e.getMhs())).reduce(BigDecimal::add).get().doubleValue()); + userList.add(uDto); + } ); + System.out.println("user算力表入库数据条数："+userList.size()); + boolean userResult = poolMapper.batchInsertUserMhsDateToDB(vo.getCoin() + "_users_30m", userList); + int uTime =0; + while (!userResult){ + userResult = poolMapper.batchInsertUserMhsDateToDB(vo.getCoin() + "_users_30m", userList); + if (uTime > 5) { + break; + } + uTime ++; + } + + + + + }); + + Map> userMap = list.stream().collect(Collectors.groupingBy(MinerDataDto::getMiner)); + if (result) { + System.out.println(DateUtils.dateTimeNow() + "nexa小时数据存入数据成功"); + } else { + System.out.println(DateUtils.dateTimeNow() + "nexa小时数据存入数据失败"); + } + + if(offlineList.size() >0){ + CompletableFuture.runAsync(()->{ + + //根据挖矿账户分组、统计离线矿机名单、离线矿机数 + + //对比redis中该挖矿账户上一次离线矿机数 + //有redis数据 需要判断 上一次离线矿机数<本次矿机离线数 才执行通知 否则跳过 + //无redis数据 说明是第一次 执行通知 + }); + + } + return "成功"; + + } + + + return "hashrate库"+vo.getCoin()+"_mhsv2表未查到数据,补充数据失败"; + } + + + @Override + public String dataDelete(DataSupplementVo vo) { + int i = poolMapper.deleteUsers30m(vo.getCoin(), vo.getDate()); + int i1 = poolMapper.deletePool30m(vo.getCoin(), vo.getDate()); + int i2 = poolMapper.deleteMhs30m(vo.getCoin(), vo.getDate()); + return "删除"+vo.getCoin()+"_mhs30m表"+i+"条数据，删除"+vo.getCoin()+"_pool_30m表"+i1+"条数据，删除"+vo.getCoin()+"_users_30m表"+i2+"条数据"; + } } diff --git a/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/task/DataTask.java b/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/task/DataTask.java index dc48e44..f2e10ff 100644 --- a/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/task/DataTask.java +++ b/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/task/DataTask.java @@ -23,6 +23,8 @@ import org.springframework.scheduling.annotation.Scheduled; import java.math.BigDecimal; import java.math.RoundingMode; +import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.function.Function; diff --git a/m2pool-modules/m2pool-pool/src/main/resources/mapper/pool/PoolMapper.xml b/m2pool-modules/m2pool-pool/src/main/resources/mapper/pool/PoolMapper.xml index f5b3a00..5230d06 100644 --- a/m2pool-modules/m2pool-pool/src/main/resources/mapper/pool/PoolMapper.xml +++ b/m2pool-modules/m2pool-pool/src/main/resources/mapper/pool/PoolMapper.xml @@ -4,6 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + - - + delete from ${coin}_mhs30m where `date` = #{date} + delete from ${coin}_pool_30m where `date` = #{date} + delete from ${coin}_users_30m where `date` = #{date}