Merge branch 'bash_active' into test

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

@@ -26,6 +26,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import javax.validation.constraints.NotEmpty;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -218,7 +219,8 @@ public class DeviceChargingServiceImpl extends ServiceImpl<DeviceChargingMapper,
     @PostMapping("page")
     @ApiOperation("分页查询")
     public R<PageBean<DeviceChargingDto.PageVo>> page(@RequestBody DeviceChargingDto.Page page) {
-        Integer value = SysDictUtils.getValue(EnumDeviceChargingConfigType.Code.CODE.getCode(), EnumDeviceChargingConfigType.N_2.getCode(), Integer.class);
+        Integer value = SysDictUtils.getValue(EnumDeviceCharging.Code.CODE.getCode(), EnumDeviceCharging.N_200.getCode(), Integer.class);
+        Integer prep = SysDictUtils.getValue(EnumDeviceChargingConfigType.Code.CODE.getCode(), EnumDeviceChargingConfigType.N_2.getCode(), Integer.class);
         String theTime = DataTime.getStringAround(0, 0, value, 0, 0, 0);
         page.setThisTime(LocalDateTime.now()).setTheTime(DataTime.toLocal(theTime));
         IPage<DeviceChargingDto.PageVo> iPage = baseMapper.page(toIPage(page.getPage()), page);
@@ -238,12 +240,11 @@ public class DeviceChargingServiceImpl extends ServiceImpl<DeviceChargingMapper,
                 }
                 record.getDeviceCharging().setTimeoutStatus(timeoutStatus);
                 DeviceInfoDto.Vo deviceInfo = record.getDeviceInfo();
-
                 //查询设备计费配置
                 DeviceChargingConfigDto.SelectList selectList = new DeviceChargingConfigDto.SelectList()
                         .setDeviceType(deviceInfo.getDeviceType())
                         .setMercId(deviceInfo.getMercId());
-                selectList.setType(value);
+                selectList.setType(prep);
                 List<DeviceChargingConfigDto.Vo> deviceChargingConfigs = deviceChargingConfigService.list2(selectList).getData();
                 if (Emptys.check(deviceChargingConfigs)) {
                     //获取自定义配置计费标准