Merge remote-tracking branch 'origin/master'

device-api-cloud/src/main/java/com/xy/feign/DeviceErrorsRecordFeign.java

@@ -0,0 +1,18 @@
+package com.xy.feign;
+
+import com.xy.FeignInterceptor;
+import com.xy.consts.ServiceConsts;
+import com.xy.service.DeviceErrorsRecordService;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author hechunping
+ * @since 2023/3/3
+ */
+@FeignClient(value = ServiceConsts.SERVICE_NAME, configuration = FeignInterceptor.class)
+public interface DeviceErrorsRecordFeign extends DeviceErrorsRecordService {
+}

device-api-cloud/src/main/java/com/xy/feign/DeviceNetRecordFeign.java

@@ -0,0 +1,18 @@
+package com.xy.feign;
+
+import com.xy.FeignInterceptor;
+import com.xy.consts.ServiceConsts;
+import com.xy.service.DeviceNetRecordService;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author hechunping
+ * @since 2023/3/3
+ */
+@FeignClient(value = ServiceConsts.SERVICE_NAME, configuration = FeignInterceptor.class)
+public interface DeviceNetRecordFeign extends DeviceNetRecordService {
+}

device-api-cloud/src/main/java/com/xy/feign/DeviceTempRecordsFeign.java

@@ -0,0 +1,18 @@
+package com.xy.feign;
+
+import com.xy.FeignInterceptor;
+import com.xy.consts.ServiceConsts;
+import com.xy.service.DeviceTempRecordsService;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author hechunping
+ * @since 2023/3/3
+ */
+@FeignClient(value = ServiceConsts.SERVICE_NAME, configuration = FeignInterceptor.class)
+public interface DeviceTempRecordsFeign extends DeviceTempRecordsService {
+}

device-api-service/pom.xml

@@ -35,6 +35,12 @@
             <version>1.0</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.xy</groupId>
+            <artifactId>goods-api</artifactId>
+            <version>1.0</version>
+        </dependency>
+
         <dependency>
             <groupId>com.xy</groupId>
             <artifactId>xy-redis</artifactId>

device-api-service/src/main/java/com/xy/entity/DeviceRecords.java

@@ -52,8 +52,11 @@ public class DeviceRecords implements Serializable {
     @ApiModelProperty(value = "创建人")
     private Long createUser;
 
+    @ApiModelProperty(value = "创建人姓名")
+    private String createUserName;
+
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createTime;
 
 
-}
+}

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

@@ -45,9 +45,9 @@ public class DeviceErrorsRecordServiceImpl extends ServiceImpl<DeviceErrorsRecor
         return R.ok();
     }
 
-    @PostMapping("page")
+    @Override
     @ApiOperation("分页查询")
-    private R<PageBean<DeviceErrorsRecordDto.Vo>> page(@RequestBody DeviceErrorsRecordDto.Page page) {
+    public R<PageBean<DeviceErrorsRecordDto.Vo>> page(@RequestBody DeviceErrorsRecordDto.Page page) {
         PageBean pageBean = page.getPage();
         LambdaQueryWrapper<DeviceErrorsRecord> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(page, DeviceErrorsRecord.class)
                 .ge(DeviceErrorsRecord::getCreateTime, page.getBeginCreateTime())
@@ -60,7 +60,7 @@ public class DeviceErrorsRecordServiceImpl extends ServiceImpl<DeviceErrorsRecor
 
     @PostMapping("list")
     @ApiOperation("集合查询")
-    private R<List<DeviceErrorsRecordDto.Vo>> list(@RequestBody DeviceErrorsRecordDto.SelectList selectList) {
+    public R<List<DeviceErrorsRecordDto.Vo>> list(@RequestBody DeviceErrorsRecordDto.SelectList selectList) {
         LambdaQueryWrapper<DeviceErrorsRecord> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(selectList, DeviceErrorsRecord.class)
                 .in(DeviceErrorsRecord::getId, selectList.getIds())
                 .in(DeviceErrorsRecord::getDeviceId, selectList.getDeviceIds())
@@ -69,4 +69,4 @@ public class DeviceErrorsRecordServiceImpl extends ServiceImpl<DeviceErrorsRecor
         return R.ok(copy(DeviceErrorsRecordDto.Vo.class, list));
     }
 
-}
+}

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

@@ -69,6 +69,8 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
     private final DeviceErrorsRecordServiceImpl deviceErrorsRecordService;
     private final DeviceDataServiceImpl deviceDataService;
 
+    private final GoodsDeviceService goodsDeviceService;
+
     private final RedisService<String> redisService;
 
     private final String keyPrefix = "device:history:";
@@ -530,7 +532,8 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
 
     @ApiOperation("小程序商户设备搜索")
     @Override
-    public R<PageBean<DeviceInfoDto.Vo2>> mercDeviceSearchPage(@RequestBody DeviceInfoDto.Page page) {
+    public R<PageBean<DeviceInfoDto.MerHomeSearchVO>> mercDeviceSearchPage(@RequestBody DeviceInfoDto.Page page) {
+        PageBean<DeviceInfoDto.MerHomeSearchVO> pageData = new PageBean<>();
         //小程序独有查询字段 缺货状态：stockStatus ，是否查故障设备：fault
         Boolean fault = page.getFault();
         Long mercId = page.getMercId();
@@ -548,31 +551,38 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         PageBean<DeviceInfoDto.Vo2> pageBean = queryPage(page);
         List<DeviceInfoDto.Vo2> records = pageBean.getRecords();
         if (CollUtil.isNotEmpty(records)) {
-            List<Long> deviceIds = records.stream().map(DeviceInfoDto.Vo2::getDeviceId).collect(Collectors.toList());
-
-
-            String type = SysDictUtils.getValue(DictEnum.DEVICE_DATA_TYPE.getKey(), DictSonEnum.DEVICE_DATA_TYPE_DAY.getKey(), String.class);
-            String todayDate = DateUtil.format(new Date(), DatePattern.PURE_DATE_PATTERN);
-            //查询当天
-            DeviceDataDto.ListDTO dto = new DeviceDataDto.ListDTO()
-                    .setDeviceIds(deviceIds).setType(type).setDateValue(Integer.valueOf(todayDate)).setMercId(mercId);
-            List<DeviceDataDto.Vo> deviceDataList = deviceDataService.list(dto);
-            if (CollUtil.isNotEmpty(deviceDataList)) {
-                //统计数据反显
-                Map<Long, DeviceDataDto.Vo> dataMap = deviceDataList.stream().collect(Collectors.toMap(DeviceDataDto.Vo::getDeviceId, d -> d));
-                records.forEach(v -> {
-                    Long deviceId = v.getDeviceId();
-                    DeviceDataDto.Vo vo = dataMap.get(deviceId);
-                    //今日订单数
-                    v.setDayOrderNum(vo != null ? vo.getSalesCount() : 0);
-                    v.setDaySalesPrice(vo != null ? vo.getSalesMoney() : 0);
-                });
-                pageBean.setRecords(records);
-            }
-
-
+            return R.ok(pageData);
         }
-        return R.ok(pageBean);
+        List<DeviceInfoDto.MerHomeSearchVO> merHomeSearchRecords = new ArrayList<>();
+        List<Long> deviceIds = records.stream().map(DeviceInfoDto.Vo2::getDeviceId).collect(Collectors.toList());
+        String type = SysDictUtils.getValue(DictEnum.DEVICE_DATA_TYPE.getKey(), DictSonEnum.DEVICE_DATA_TYPE_DAY.getKey(), String.class);
+        String todayDate = DateUtil.format(new Date(), DatePattern.PURE_DATE_PATTERN);
+        //查询当天
+        DeviceDataDto.ListDTO dto = new DeviceDataDto.ListDTO()
+                .setDeviceIds(deviceIds).setType(type).setDateValue(Integer.valueOf(todayDate)).setMercId(mercId);
+        BeanUtil.copyProperties(pageBean, pageData);
+        List<DeviceDataDto.Vo> deviceDataList = deviceDataService.list(dto);
+        if (CollUtil.isNotEmpty(deviceDataList)) {
+            //统计数据反显
+            Map<Long, DeviceDataDto.Vo> dataMap = deviceDataList.stream().collect(Collectors.toMap(DeviceDataDto.Vo::getDeviceId, d -> d));
+            records.forEach(v -> {
+                DeviceInfoDto.MerHomeSearchVO merHomeSearchVO = new DeviceInfoDto.MerHomeSearchVO();
+                Long deviceId = v.getDeviceId();
+                DeviceDataDto.Vo vo = dataMap.get(deviceId);
+                //今日订单数
+                v.setDayOrderNum(vo != null ? vo.getSalesCount() : 0);
+                v.setDaySalesPrice(vo != null ? vo.getSalesMoney() : 0);
+                DeviceSysinfoDto.Vo deviceSysinfo = v.getDeviceSysinfo();
+                DeviceStatusDto.Vo deviceStatus = v.getDeviceStatus();
+                BeanUtil.copyProperties(vo, merHomeSearchVO);
+                merHomeSearchVO.setAppUpmVersion(deviceSysinfo.getAppUpmVersion());
+                merHomeSearchVO.setTempValue(deviceStatus.getTempValue());
+                merHomeSearchVO.setNetDbm(deviceStatus.getNetDbm());
+                merHomeSearchRecords.add(merHomeSearchVO);
+            });
+            pageData.setRecords(merHomeSearchRecords);
+        }
+        return R.ok(pageData);
     }
 
     @ApiOperation("小程序商户设备详情-数据统计")
@@ -661,7 +671,18 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
      * @return
      */
     private DeviceInfoDto.DeviceDataCountVO dataCount5(DeviceInfoDto.DeviceDataCountDTO dto) {
+        Long deviceId = dto.getDeviceId();
         DeviceInfoDto.DeviceDataCountVO vo = new DeviceInfoDto.DeviceDataCountVO();
+        DeviceStatus deviceStatus = deviceStatusService.getById(dto.getDeviceId());
+        DeviceInfoDto.GoodsData goodsData = copy(DeviceInfoDto.GoodsData.class, deviceStatus);
+        //在售商品种类
+        //根据设备ID查商品id
+        GoodsDeviceDto.SelectList selectList = new GoodsDeviceDto.SelectList();
+        selectList.setDeviceId(deviceId);
+        R<List<GoodsDeviceDto.Vo>> r = R.feignCheck(goodsDeviceService.list(selectList));
+        List<GoodsDeviceDto.Vo> goodsDeviceList = r.getData();
+        goodsData.setCategoryNum(CollUtil.isNotEmpty(goodsDeviceList) ? goodsDeviceList.size() : 0);
+        vo.setGoodsData(goodsData);
         return vo;
     }
 

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

@@ -47,7 +47,8 @@ public class DeviceNetRecordServiceImpl extends ServiceImpl<DeviceNetRecordMappe
         return R.ok();
     }
 
-    @PostMapping("page")
+
+    @Override
     @ApiOperation("分页查询")
     public R<PageBean<DeviceNetRecordDto.Vo>> page(@RequestBody DeviceNetRecordDto.Page page) {
         PageBean pageBean = page.getPage();
@@ -72,4 +73,4 @@ public class DeviceNetRecordServiceImpl extends ServiceImpl<DeviceNetRecordMappe
         List<DeviceNetRecord> list = list(lambdaQueryWrapper);
         return R.ok(copy(DeviceNetRecordDto.Vo.class, list));
     }
-}
+}

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

@@ -38,9 +38,9 @@ import static com.xy.utils.PlusBeans.toPageBean;
 @Api(tags = "设备温度日志表")
 public class DeviceTempRecordsServiceImpl extends ServiceImpl<DeviceTempRecordsMapper, DeviceTempRecords> implements DeviceTempRecordsService {
 
-    @PostMapping("page")
+    @Override
     @ApiOperation("分页查询")
-    private R<PageBean<DeviceTempRecordsDto.Vo>> page(@RequestBody DeviceTempRecordsDto.Page page) {
+    public R<PageBean<DeviceTempRecordsDto.Vo>> page(@RequestBody DeviceTempRecordsDto.Page page) {
         PageBean pageBean = page.getPage();
         LambdaQueryWrapper<DeviceTempRecords> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(page, DeviceTempRecords.class)
                 .ge(DeviceTempRecords::getCreateTime, page.getBeginCreateTime())

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

@@ -341,6 +341,63 @@ public class DeviceInfoDto {
         private Integer daySalesPrice;
 
 
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class MerHomeSearchVO {
+
+
+        @ApiModelProperty("今日订单数")
+        private Integer dayOrderNum;
+
+        @ApiModelProperty("今日销售额")
+        private Integer daySalesPrice;
+
+
+        @ApiModelProperty("设备id")
+        private Long deviceId;
+
+        @ApiModelProperty("设备名称")
+        private String deviceName;
+
+        @DictFormat(DictConsts.DEVICE_TYPE)
+        @ApiModelProperty("设备类型")
+        private Integer deviceType;
+
+        @ApiModelProperty("商户编码")
+        private String mercCode;
+
+        @ApiModelProperty("商户名称")
+        private String mercName;
+
+
+        @DictFormat(DictConsts.DEVICE_BUSY_STATUS)
+        @ApiModelProperty("运营状态")
+        private Integer busyState;
+
+
+        @DictFormat(DictConsts.DEVICE_FAULT_LEVEL)
+        @ApiModelProperty("故障等级")
+        private Integer faultLevel;
+
+
+        @ApiModelProperty("更新时间")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        private LocalDateTime updateTime;
+
+
+        @ApiModelProperty("上位机版本号=软件版本号")
+        private String appUpmVersion;
+
+
+        @ApiModelProperty("联网信号强度")
+        private Integer netDbm;
+
+        @ApiModelProperty("温度值")
+        private Integer tempValue;
+ 
+
     }
 
 
@@ -595,6 +652,9 @@ public class DeviceInfoDto {
         @ApiModelProperty("(月)经营数据")
         BusinessData monthBusinessData;
 
+        @ApiModelProperty("商品统计数据")
+        GoodsData goodsData;
+
     }
 
 
@@ -622,7 +682,32 @@ public class DeviceInfoDto {
         @ApiModelProperty(value = "0元订单笔数")
         private Integer zeroCount;
 
-  
+    }
+
+    /**
+     * 商品管理统计数据
+     */
+    @Data
+    @Accessors(chain = true)
+    public static class GoodsData {
+
+        @ApiModelProperty("在售商品种类")
+        private Integer categoryNum;
+
+
+        /**
+         * 设备商品在售库存数
+         */
+        @ApiModelProperty("可售库存")
+        private Integer stock;
+
+        /**
+         * 最近一次补货后的库存数
+         */
+        @ApiModelProperty("上次补货后库存")
+        private Integer afterFillStock;
+
+
     }
 
 

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

@@ -85,11 +85,12 @@ public class DeviceRecordsDto {
         @ApiModelProperty(value = "创建人")
         private Long createUser;
 
+        @ApiModelProperty(value = "创建人姓名")
+        private String createUserName;
+
         @ApiModelProperty(value = "创建时间")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime createTime;
-
-
     }
 
-}
+}

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

@@ -1,6 +1,11 @@
 package com.xy.service;
 
 import com.xy.annotate.RestMappingController;
+import com.xy.dto.DeviceErrorsRecordDto;
+import com.xy.utils.PageBean;
+import com.xy.utils.R;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * <p>
@@ -12,5 +17,6 @@ import com.xy.annotate.RestMappingController;
  */
 @RestMappingController("/device-errors-record")
 public interface DeviceErrorsRecordService {
-
-}
+    @PostMapping("page")
+    R<PageBean<DeviceErrorsRecordDto.Vo>> page(@RequestBody DeviceErrorsRecordDto.Page page);
+}

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

@@ -132,7 +132,7 @@ public interface DeviceInfoService {
      * @return
      */
     @PostMapping("mercDeviceSearchPage")
-    R<PageBean<DeviceInfoDto.Vo2>> mercDeviceSearchPage(@RequestBody @Validated DeviceInfoDto.Page page);
+    R<PageBean<DeviceInfoDto.MerHomeSearchVO>> mercDeviceSearchPage(@RequestBody @Validated DeviceInfoDto.Page page);
 
     /**
      * 小程序商户设备详情-数据统计

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

@@ -1,6 +1,11 @@
 package com.xy.service;
 
 import com.xy.annotate.RestMappingController;
+import com.xy.dto.DeviceNetRecordDto;
+import com.xy.utils.PageBean;
+import com.xy.utils.R;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * <p>
@@ -13,4 +18,6 @@ import com.xy.annotate.RestMappingController;
 @RestMappingController("/device-net-record")
 public interface DeviceNetRecordService {
 
-}
+    @PostMapping("page")
+    R<PageBean<DeviceNetRecordDto.Vo>> page(@RequestBody DeviceNetRecordDto.Page page);
+}

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

@@ -1,6 +1,11 @@
 package com.xy.service;
 
 import com.xy.annotate.RestMappingController;
+import com.xy.dto.DeviceTempRecordsDto;
+import com.xy.utils.PageBean;
+import com.xy.utils.R;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * <p>
@@ -12,5 +17,6 @@ import com.xy.annotate.RestMappingController;
  */
 @RestMappingController("/device-temp-records")
 public interface DeviceTempRecordsService {
-
-}
+    @PostMapping("page")
+    R<PageBean<DeviceTempRecordsDto.Vo>> page(@RequestBody DeviceTempRecordsDto.Page page);
+}

device-api/src/main/java/com/xy/utils/enums/DeviceErrorRecordTypesEnum.java

@@ -0,0 +1,30 @@
+package com.xy.utils.enums;
+
+import lombok.Getter;
+
+/**
+ * <p>
+ * 设备故障类型枚举
+ * </p>
+ *
+ * @author hechunping
+ * @since 2023/3/3
+ */
+@Getter
+public enum DeviceErrorRecordTypesEnum {
+
+    NET("1","联网故障"),
+    DOOR_LOCK("2","门锁故障"),
+    T("3","温控仪故障"),
+    LIGHT("4","灯光故障"),
+    CAMERA("4","摄像头故障"),
+    COMPRESSOR("4","压缩机故障"),
+    ;
+    private String code;
+    private String msg;
+    DeviceErrorRecordTypesEnum(String code,String msg){
+        this.code = code;
+        this.msg = msg;
+    }
+
+}

device-api/src/main/java/com/xy/utils/enums/DeviceRecordsChangeType.java → device-api/src/main/java/com/xy/utils/enums/DeviceRecordsChangeTypeEnum.java

@@ -11,14 +11,14 @@ import lombok.Getter;
  * @since 2023/3/2
  */
 @Getter
-public enum DeviceRecordsChangeType {
+public enum DeviceRecordsChangeTypeEnum {
     CHANGE_PRICE("1","更改价格"),
     BING_GOODS("2","绑定商品")
     ;
     private String code;
     private String msg;
 
-    DeviceRecordsChangeType(String code, String msg) {
+    DeviceRecordsChangeTypeEnum(String code, String msg) {
         this.code = code;
         this.msg = msg;
     }

device-start/pom.xml

@@ -34,6 +34,11 @@
             <artifactId>order-api-cloud</artifactId>
             <version>1.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.xy</groupId>
+            <artifactId>goods-api-cloud</artifactId>
+            <version>1.0</version>
+        </dependency>
 
         <dependency>
             <groupId>com.xy</groupId>
@@ -99,4 +104,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>