Merge remote-tracking branch 'origin/master'

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

@@ -290,6 +290,11 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
         return R.ok(this.getMercDataOneDay(dto.getMercId(), dto.getDateValue()));
     }
 
+    @Override
+    public R<List<DeviceDataDto.Vo>> getMercDataOneMonth(DeviceDataDto.CountByMonth dto) {
+        return R.ok(this.getMercDataOneMonth(dto.getMercId(), dto.getDateValue()));
+    }
+
     public static class SaveOrAccum {
 
         public R saveOrAccum(DeviceDataDto.SaveOrAccum saveOrAccum, DeviceDataServiceImpl deviceDataService) {

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

@@ -630,6 +630,15 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                     device.setNetStateName(DeviceNetSateType.getEnumByCode(deviceStatus.getNetState()).getDescription());
                 }
 
+                Integer deviceStateL = deviceStatus.getDeviceStateL();
+                Integer deviceStateR = deviceStatus.getDeviceStateR();
+                device.setDeviceStateL(deviceStateL);
+                device.setDeviceStateR(deviceStateR);
+                DeviceLockState deviceLockStateL = DeviceLockState.getEnumByCode(deviceStateL);
+                DeviceLockState deviceLockStateR = DeviceLockState.getEnumByCode(deviceStateR);
+                device.setDeviceStateRName(deviceLockStateR == null ? "未知" : deviceLockStateR.getDescription());
+                device.setDeviceStateLName(deviceLockStateL == null ? "未知" : deviceLockStateL.getDescription());
+
             }
 
             //在线排序

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

@@ -293,5 +293,21 @@ public class DeviceDataDto {
 
     }
 
+    @Data
+    @Accessors(chain = true)
+    public static class CountByMonth {
+
+        @ApiModelProperty(value = "设备ID")
+        private Long deviceId;
+
+        @ApiModelProperty(value = "商户ID")
+        private Long mercId;
+
+        @ApiModelProperty(value = "日期")
+        private String dateValue;
+
+
+    }
+
 
 }

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

@@ -689,6 +689,20 @@ public class DeviceInfoDto {
         @ApiModelProperty("补货数")
         private Integer fillNum;
 
+
+        @ApiModelProperty("左门锁机状态名称")
+        private String deviceStateLName;
+
+        @ApiModelProperty("右门锁机状态名称")
+        private String deviceStateRName;
+
+        @ApiModelProperty("左门锁机状态，字典类型：devcie_lock_status")
+        private Integer deviceStateL;
+
+
+        @ApiModelProperty("右门锁机状态，字典类型：devcie_lock_status")
+        private Integer deviceStateR;
+
     }
 
 

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

@@ -73,6 +73,13 @@ public class MercMiniDeviceDto {
 
     }
 
+    @Data
+    @Accessors(chain = true)
+    public static class HomePageMonthDTO {
+        @JsonFormat(pattern = "yyyy-MM")
+        private DateTime date;
+    }
+
     @Data
     @Accessors(chain = true)
     public static class HomePageDayDTO {
@@ -80,6 +87,26 @@ public class MercMiniDeviceDto {
         private DateTime date;
     }
 
+    @Data
+    @Accessors(chain = true)
+    public static class HomePageMonthVO {
+        @ApiModelProperty(value = "本月收款")
+        private Integer monthReceivedMoney;
+        @ApiModelProperty(value = "本月销售-订单金额")
+        private Integer monthOrderTotalMoney;
+
+        @ApiModelProperty(value = "本月销售-到账金额")
+        private Integer monthOrderRealMoney;
+        @ApiModelProperty(value = "本月销售-数量")
+        private Integer monthOrderNum;
+
+        @ApiModelProperty(value = "本月订单-未收款金额")
+        private Integer noPaymentMoney;
+
+        @ApiModelProperty(value = "历史订单-未收款金额")
+        private Integer hisNoPaymentMoney;
+    }
+
     @Data
     @Accessors(chain = true)
     public static class HomePageDayVO {

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

@@ -28,4 +28,13 @@ public interface DeviceDataService {
     @PostMapping("getByDay")
     R<List<DeviceDataDto.Vo>> getMercDataOneDay(@RequestBody @Validated DeviceDataDto.CountByDay dto);
 
+    /**
+     * 指定查询商户所有设备某月数据
+     *
+     * @param dto
+     * @return
+     */
+    @PostMapping("getMercDataOneMonth")
+    R<List<DeviceDataDto.Vo>> getMercDataOneMonth(@RequestBody @Validated DeviceDataDto.CountByMonth dto);
+
 }