Merge remote-tracking branch 'origin/test' into test

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

@@ -99,7 +99,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
      * 聚邻社顶级商户
      */
     public static final String JLS_MERC_CODE = "10168";
-    private final CloudWalkApiService cloudWalkApiService;
+     private final CloudWalkApiService cloudWalkApiService;
     private final AlgorithmService algorithmService;
     private final CountApiService countApiService;
     private final TyApiService tyApiService;
@@ -1206,6 +1206,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         QueryWrapper<DeviceInfo> queryWrapper = new MybatisPlusQuery().eqWrapper(vo == null ? new DeviceInfoDto.Vo() : vo, DeviceInfo.class).buildQW();
 //        List<Long> placeLineIds = dto.getPlaceLineIds();
         List<Long> deviceIds = dto.getDeviceIds();
+        List<Long> mercIds = dto.getMercIds();
         List<String> columnList = dto.getColumnList();
 //        if (CollUtil.isNotEmpty(placeLineIds)) {
 //            queryWrapper.in(LambdaUtils.getUnderlineCaseName(DeviceInfo::getPlaceLineId), placeLineIds);
@@ -1224,6 +1225,9 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         if (CollUtil.isNotEmpty(deviceIds)) {
             queryWrapper.in(LambdaUtils.getUnderlineCaseName(DeviceInfo::getDeviceId), deviceIds);
         }
+        if (CollUtil.isNotEmpty(mercIds)) {
+            queryWrapper.in(LambdaUtils.getUnderlineCaseName(DeviceInfo::getMercId), mercIds);
+        }
         return R.ok(copy(DeviceInfoDto.Vo.class, list(queryWrapper)));
     }
 
@@ -2090,6 +2094,12 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         return R.ok(copy);
     }
 
+    @ApiOperation("检查设备是否开启重力配置")
+    @Override
+    public R<Boolean> checkWeightOpen(DevicePartDto.CheckWeightOpenDTO dto) {
+        return R.ok(devicePartService.checkWeightOpen(dto));
+    }
+
     @PostMapping("nfcActive")
     @ApiOperation("nfc设备激活")
     public R<Boolean> nfcActive(@RequestBody @Validated ActiveDeviceDTO dto) {

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

@@ -4,6 +4,7 @@ import cn.hutool.core.util.BooleanUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yitter.idgen.YitIdHelper;
 import com.xy.dto.DevicePartDto;
@@ -49,6 +50,18 @@ public class DevicePartServiceImpl extends ServiceImpl<DevicePartMapper, DeviceP
         return R.ok(copy(DevicePartDto.Vo.class, list));
     }
 
+    /**
+     * 检查重力配置是否开启
+     * @param dto
+     * @return
+     */
+    public boolean checkWeightOpen(DevicePartDto.CheckWeightOpenDTO dto) {
+        DevicePart devicePart = getOne(Wrappers.lambdaQuery(DevicePart.class).eq(DevicePart::getCode, "es").eq(DevicePart::getDeviceId, dto.getDeviceId()));
+        String value = devicePart.getValue();
+        JSONObject jsonObject = JSONUtil.parseObj(value);
+        return  BooleanUtil.isTrue(jsonObject.getBool("is"));
+    }
+
     @ApiOperation("添加或修改")
     @PostMapping("saveOrUpdate")
     public R saveOrUpdate(@RequestBody List<DevicePartDto.SaveOrUpdate> saveOrUpdates) {
@@ -91,4 +104,4 @@ public class DevicePartServiceImpl extends ServiceImpl<DevicePartMapper, DeviceP
         });
         return R.ok();
     }
-}
+}

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

@@ -430,8 +430,10 @@ public class DeviceInfoDto {
 //        @ApiModelProperty("线路id多个")
 //        private List<Long> placeLineIds;
 
-        @ApiModelProperty("id")
+        @ApiModelProperty("设备ID")
         private List<Long> deviceIds;
+        @ApiModelProperty("商户ID")
+        private List<Long> mercIds;
 
 
         @ApiModelProperty("指定字段查询")

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

@@ -24,7 +24,13 @@ public class DevicePartDto {
     public static class SelectList extends Vo {
 
     }
-
+    @Data
+    @Accessors(chain = true)
+    public static class CheckWeightOpenDTO {
+        @NotNull(message = "deviceId不能为空")
+        @ApiModelProperty(value = "设备id", required = true)
+        private Long deviceId;
+    }
     @Data
     @Accessors(chain = true)
     public static class SaveOrUpdate extends Vo {

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

@@ -3,6 +3,7 @@ package com.xy.service;
 import com.xy.annotate.RestMappingController;
 import com.xy.dto.DeviceDataDto;
 import com.xy.dto.DeviceInfoDto;
+import com.xy.dto.DevicePartDto;
 import com.xy.dto.DeviceSysinfoDto;
 import com.xy.utils.PageBean;
 import com.xy.utils.R;
@@ -248,4 +249,12 @@ public interface DeviceInfoService {
      */
     @PostMapping("mercNormalList")
     R<List<DeviceInfoDto.MercNormalListVo>> mercNormalList(@RequestBody @Validated DeviceInfoDto.MercNormalListDto dto);
+
+    /**
+     * 检查设备是否开启重力配置
+     * @param dto
+     * @return
+     */
+    @PostMapping("checkWeightOpen")
+     R<Boolean> checkWeightOpen(@RequestBody  @Validated DevicePartDto.CheckWeightOpenDTO dto) ;
 }