Merge remote-tracking branch 'origin/master' into prod

device-api-service-merc-mini/src/main/java/com/xy/controller/MercMiniDeviceController.java

@@ -1,13 +1,20 @@
 package com.xy.controller;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.xy.annotate.RestMappingController;
 import com.xy.dto.DeviceInfoDto;
 import com.xy.dto.MercMiniDeviceDto;
 import com.xy.dto.be.MercDto;
+import com.xy.dto.common.MercLineDto;
+import com.xy.dto.common.MercPlaceDto;
+import com.xy.dto.mini.MiniMercRegionDto;
 import com.xy.entity.DeviceInfo;
 import com.xy.enums.MercStatus;
 import com.xy.service.DeviceInfoServiceImpl;
 import com.xy.service.be.MercFeignService;
+import com.xy.service.common.MercLineService;
+import com.xy.service.common.MercPlaceService;
 import com.xy.utils.Emptys;
 import com.xy.utils.MercAuthUtils;
 import com.xy.utils.PageBean;
@@ -22,6 +29,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
 import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 import static com.xy.utils.Beans.copy;
@@ -42,6 +51,9 @@ public class MercMiniDeviceController {
     private final MercFeignService mercFeignService;
 
     private final DeviceInfoServiceImpl deviceInfoService;
+    private final MercPlaceService mercPlaceService;
+    private final MercLineService mercLineService;
+
 
     @ApiOperation("商户设备首页统计")
     @PostMapping("mercHomeStatistical")
@@ -61,7 +73,24 @@ public class MercMiniDeviceController {
     @PostMapping("detail")
     R<DeviceInfoDto.Vo> detail(@RequestBody DeviceInfoDto.Obj obj) {
         obj.setMercId(MercAuthUtils.getMercId());
-        return deviceInfoService.obj(obj);
+        R<DeviceInfoDto.Vo> r = deviceInfoService.obj(obj);
+        DeviceInfoDto.Vo vo = r.getData();
+        if (vo != null) {
+            //点位
+            Long placeId = vo.getPlaceId();
+            List<MercPlaceDto.Vo> merPlaceList = R.feignCheckData(mercPlaceService.list(new MercPlaceDto.ListDto().setIds(CollUtil.newArrayList(placeId))));
+            MercPlaceDto.Vo mercPlace = merPlaceList.get(0);
+            vo.setPlaceName(mercPlace == null ? StrUtil.EMPTY : mercPlace.getPlaceName());
+            //线路
+            Long placeLineId = vo.getPlaceLineId();
+            Map<Long, String> placeLineMap = R.feignCheckData(mercLineService.getNameList(new MercLineDto.GetNameListDto().setIds(CollUtil.newArrayList(placeLineId))));
+            vo.setPlaceLineName(placeLineMap.get(placeLineId));
+            //区域
+            Long districtId = vo.getDistrictId();
+            Map<Long, String> districtMap = R.feignCheckData(mercPlaceService.merReginId2Name(new MiniMercRegionDto.IdList().setIds(CollUtil.newArrayList(districtId))));
+            vo.setDistrictName(districtMap.get(districtId));
+        }
+        return R.ok(vo);
     }
 
     @ApiOperation("小程序商户设备详情-数据统计")

device-api-service-merc-mini/src/main/java/com/xy/controller/MercMiniOrderController.java

@@ -32,7 +32,7 @@ public class MercMiniOrderController {
     private final DeviceDataServiceImpl deviceDataService;
 
 
-    @ApiOperation("订单列表页统计")
+    @ApiOperation("订单列表页统计-作废，转移到分页接口直接返回，因为要根据各种条件筛选统计")
     @PostMapping("count")
     public R<DeviceDataDto.MercOrdersDayCountVO> mercHomeStatistical(@RequestBody @Valid DeviceDataDto.MercOrdersDayCountDTO dto) {
         DeviceDataDto.MercOrdersDayCountVO vo = new DeviceDataDto.MercOrdersDayCountVO().setOrderNum(0).setOrderTotalAmount(0);

device-api-service/src/main/java/com/xy/service/factory/SetsCmdServiceImpl.java

@@ -42,6 +42,14 @@ public class SetsCmdServiceImpl implements CmdService {
                         .setJob2StartEnd(data.getInt("end2"))
                         .setJob3StartTime(data.getInt("start3"))
                         .setJob3EndTime(data.getInt("end3"));
+                String warningLow = data.getStr("warningLow");
+                String warningHigh = data.getStr("warningHigh");
+                if (!warningLow.equals("$warningLow$")) {
+                    save.setWarningLow(Integer.valueOf(warningLow));
+                }
+                if (!warningHigh.equals("$warningHigh$")) {
+                    save.setWarningHigh(Integer.valueOf(warningHigh));
+                }
                 deviceTempSetService.save(save);
             }
         }

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

@@ -239,6 +239,7 @@ public class DeviceInfoDto {
         @ApiModelProperty("设备id")
         private Long deviceId;
 
+
         @ApiModelProperty("设备名称")
         private String deviceName;
 
@@ -264,12 +265,22 @@ public class DeviceInfoDto {
         @ApiModelProperty("点位id")
         private Long placeId;
 
+        @ApiModelProperty("点位")
+        private String placeName;
+
         @ApiModelProperty("线路id")
         private Long placeLineId;
 
+        @ApiModelProperty("线路")
+        private String placeLineName;
+
         @ApiModelProperty("区域id")
         private Long districtId;
 
+
+        @ApiModelProperty("区域")
+        private String districtName;
+
         @DictFormat(DictConsts.DEVICE_ACTIVE_STATUS)
         @ApiModelProperty("激活状态")
         private Integer activeState;