设备管理费改版

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

@@ -20,6 +20,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.List;
 
 
@@ -38,7 +39,9 @@ public class DeviceChargingConfigServiceImpl extends ServiceImpl<DeviceChargingC
 
     private MercService mercService;
 
-    @Override
+    private DeviceAlgorithmChargingServiceImpl deviceAlgorithmChargingService;
+
+    @PostMapping("list")
     @ApiOperation("集合查询")
     public R<List<DeviceChargingConfigDto.Vo>> list(DeviceChargingConfigDto.SelectList selectList) {
         MercDto.Vo merc = mercService.obj(new MercDto.Vo().setId(selectList.getMercId())).getData();
@@ -88,4 +91,18 @@ public class DeviceChargingConfigServiceImpl extends ServiceImpl<DeviceChargingC
         }
         return R.ok();
     }
+
+    @Override
+    @ApiOperation("集合查询2")
+    public R<List<DeviceChargingConfigDto.Vo>> list2(DeviceChargingConfigDto.SelectList selectList) {
+        MercDto.Vo merc = mercService.obj(new MercDto.Vo().setId(selectList.getMercId())).getData();
+        List<String> mercCodes = new ArrayList<>();
+        deviceAlgorithmChargingService.getMercCodes(merc.getMercCode(), mercCodes);
+        LambdaQueryWrapper<DeviceChargingConfig> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(selectList, DeviceChargingConfig.class)
+                .in(DeviceChargingConfig::getMercCode, mercCodes)
+                .build()
+                .orderByDesc(DeviceChargingConfig::getMercCode);
+        List<DeviceChargingConfig> list = list(lambdaQueryWrapper);
+        return R.ok(Beans.copy(DeviceChargingConfigDto.Vo.class, list));
+    }
 }

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

@@ -4,6 +4,7 @@ import com.xy.annotate.RestMappingController;
 import com.xy.dto.DeviceChargingConfigDto;
 import com.xy.utils.R;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
@@ -19,5 +20,6 @@ import java.util.List;
 @RestMappingController("/device-charging-config")
 public interface DeviceChargingConfigService {
 
-    R<List<DeviceChargingConfigDto.Vo>> list(@RequestBody @Validated DeviceChargingConfigDto.SelectList selectList);
+    @PostMapping("list2")
+    R<List<DeviceChargingConfigDto.Vo>> list2(@RequestBody @Validated DeviceChargingConfigDto.SelectList selectList);
 }