Merge branch 'master' into test

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

@@ -8,6 +8,8 @@ import com.xy.dto.be.MercDto;
 import com.xy.entity.DeviceChargingConfig;
 import com.xy.mapper.DeviceChargingConfigMapper;
 import com.xy.service.be.MercService;
+import com.xy.utils.Beans;
+import com.xy.utils.MybatisPlusQuery;
 import com.xy.utils.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
@@ -36,6 +38,17 @@ public class DeviceChargingConfigServiceImpl extends ServiceImpl<DeviceChargingC
 
     private MercService mercService;
 
+    @PostMapping("list")
+    @ApiModelProperty("集合查询")
+    public R<List<DeviceChargingConfigDto.Vo>> list(@RequestBody @Validated DeviceChargingConfigDto.SelectList selectList) {
+        MercDto.Vo merc = mercService.obj(new MercDto.Vo().setId(selectList.getMercId())).getData();
+        LambdaQueryWrapper<DeviceChargingConfig> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(selectList, DeviceChargingConfig.class)
+                .eq(DeviceChargingConfig::getMercCode, merc.getMercCode())
+                .build();
+        List<DeviceChargingConfig> list = list(lambdaQueryWrapper);
+        return R.ok(Beans.copy(DeviceChargingConfigDto.Vo.class, list));
+    }
+
     @PostMapping("saveOrUpdate")
     @ApiModelProperty("添加或修改")
     public R saveOrUpdate(@RequestBody @Validated DeviceChargingConfigDto.SaveOrUpdate saveOrUpdate) {

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

@@ -20,6 +20,15 @@ import java.util.List;
  */
 public class DeviceChargingConfigDto {
 
+    @Data
+    @Accessors(chain = true)
+    public static class SelectList extends Vo {
+
+        @NotNull(message = "mercId不能为空")
+        @ApiModelProperty(value = "商户id", required = true)
+        private Long mercId;
+    }
+
     @Data
     @Accessors(chain = true)
     public static class SaveOrUpdate extends Vo {