设备激活费用配置查询

device-api-service/src/main/java/com/xy/service/DeviceTypeAlgorithmBeforConfigServiceImpl.java

@@ -1,5 +1,6 @@
 package com.xy.service;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -27,6 +28,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -72,34 +74,49 @@ public class DeviceTypeAlgorithmBeforConfigServiceImpl extends ServiceImpl<Devic
     @PostMapping("deviceActiveFeeList")
     @ApiOperation("费用管理-设备激活费用查询")
     public R<List<DeviceTypeAlgorithmBeforConfigDto.DeviceActiveFeeVO>> deviceActiveFeeList(@RequestBody DeviceTypeAlgorithmBeforConfigDto.DeviceActiveFeeDTO dto) {
+        Long mercId = dto.getMercId();
         LambdaQueryWrapper<DeviceTypeAlgorithmBeforConfig> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(dto, DeviceTypeAlgorithmBeforConfig.class).build();
         List<DeviceTypeAlgorithmBeforConfig> list = list(lambdaQueryWrapper);
         //查询默认算法信息
         List<AlgorithmDto.ListNameId> listNameIds = R.feignCheckData(algorithmService.ListNameId());
         List<Long> algorithmIds = listNameIds.stream().map(AlgorithmDto.ListNameId::getId).collect(Collectors.toList());
-        Map<Long, String> moonAlgorithmTypesMap = new HashMap<>();
+        Map<Long, String> agMap = listNameIds.stream().collect(Collectors.toMap(AlgorithmDto.ListNameId::getId, AlgorithmDto.ListNameId::getName));
+//        Map<Long, String> moonAlgorithmTypesMap = new HashMap<>();
         Map<Long, String> algorithmPayConfigMap = new HashMap<>();
         for (Long algorithmId : algorithmIds) {
             SysDictRedis moonAlgorithmTypes = SysDictUtils.get(EnumAlgorithmTypes.Code.CODE.getCode(), String.valueOf(algorithmId));
             SysDictRedis algorithmPayConfig = SysDictUtils.get(EnumAlgorithmPayConfig.Code.CODE.getCode(), String.valueOf(algorithmId));
-            if (Emptys.check(moonAlgorithmTypes)) {
-                moonAlgorithmTypesMap.put(algorithmId, moonAlgorithmTypes.getMsg());
-            }
+//            if (Emptys.check(moonAlgorithmTypes)) {
+//                moonAlgorithmTypesMap.put(algorithmId, moonAlgorithmTypes.getMsg());
+//            }
             if (Emptys.check(algorithmPayConfig)) {
                 algorithmPayConfigMap.put(algorithmId, algorithmPayConfig.getValue());
             }
+        }
+        if (CollUtil.isNotEmpty(list)) {
+            for (DeviceTypeAlgorithmBeforConfig dc : list) {
+              
 
-
+            }
         }
+        List<DeviceTypeAlgorithmBeforConfigDto.DeviceActiveFeeVO> deviceActiveFeeVOS = new ArrayList<>();
         for (Long algorithmId : algorithmIds) {
-            String algorithmName = moonAlgorithmTypesMap.get(algorithmId);
+            String algorithmName = agMap.get(algorithmId);
             String algorithmPayConfig = algorithmPayConfigMap.get(algorithmId);
             DeviceAlgorithmChargingDto.AlgorithmMoonConfig algorithmMoonConfig = JSONUtil.parseObj(algorithmPayConfig).toBean(DeviceAlgorithmChargingDto.AlgorithmMoonConfig.class);
             DeviceAlgorithmChargingDto.AlgorithmMoonConfig.Inf inf = algorithmMoonConfig.getInf();
+            Integer money = inf.getMoney();
+            DeviceTypeAlgorithmBeforConfigDto.DeviceActiveFeeVO vo = new DeviceTypeAlgorithmBeforConfigDto.DeviceActiveFeeVO();
+            vo.setAlgorithmId(algorithmId);
+            vo.setAlgorithmName(algorithmName);
+            vo.setMoney(money);
+            vo.setMercId(mercId);
+            vo.setDeviceType(-1);
+            deviceActiveFeeVOS.add(vo);
         }
 
 
-        return R.ok(copy(DeviceTypeAlgorithmBeforConfigDto.DeviceActiveFeeVO.class, list));
+        return R.ok(deviceActiveFeeVOS);
     }
 
     @LogOperate

device-api/src/main/java/com/xy/dto/DeviceTypeAlgorithmBeforConfigDto.java

@@ -57,6 +57,9 @@ public class DeviceTypeAlgorithmBeforConfigDto {
         @ApiModelProperty(value = "算法id")
         private Long algorithmId;
 
+        @ApiModelProperty(value = "算法名称")
+        private String algorithmName;
+
         @ApiModelProperty(value = "预充金额;单位：分")
         private Integer money;