Merge remote-tracking branch 'origin/master'

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

@@ -51,9 +51,21 @@ public class DeviceTempSet {
     /**
      * 目标温度
      */
-    @ApiModelProperty(value = "目标温度")
+    @ApiModelProperty(value = "目标温度1")
     private Integer tempValue;
 
+    /**
+     * 目标温度
+     */
+    @ApiModelProperty(value = "目标温度2")
+    private Integer tempValue2;
+
+    /**
+     * 目标温度
+     */
+    @ApiModelProperty(value = "目标温度3")
+    private Integer tempValue3;
+
     /**
      * 工作时段1起始时间
      */
@@ -64,7 +76,7 @@ public class DeviceTempSet {
      * 工作时段1结束时间
      */
     @ApiModelProperty(value = "工作时段1结束时间")
-    private Integer job1StartEnd;
+    private Integer job1EndTime;
 
     /**
      * 工作时段2起始时间
@@ -76,7 +88,7 @@ public class DeviceTempSet {
      * 工作时段2结束时间
      */
     @ApiModelProperty(value = "工作时段2结束时间")
-    private Integer job2StartEnd;
+    private Integer job2EndTime;
 
     /**
      * 工作时段3起始时间

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

@@ -30,12 +30,14 @@ import com.xy.device.EnumQualityMercSets;
 import com.xy.dto.*;
 import com.xy.dto.api.biz.ContainerAddDTO;
 import com.xy.dto.be.MercDto;
+import com.xy.dto.common.MercRegionDto;
 import com.xy.entity.*;
 import com.xy.enums.FileExportType;
 import com.xy.error.CommRuntimeException;
 import com.xy.mapper.DeviceInfoMapper;
 import com.xy.mapper.entity.DeviceInfoQueryPage;
 import com.xy.service.be.MercFeignService;
+import com.xy.service.common.MercRegionService;
 import com.xy.sys.EnumDataClearSize;
 import com.xy.util.ExcelUtils;
 import com.xy.utils.*;
@@ -102,6 +104,8 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
     private final AlipayDeviceService alipayDeviceService;
     private final String keyPrefix = "device:history:";
 
+    private final MercRegionService mercRegionService;
+
     @Override
     @ApiOperation("设备在线数查询")
     public R<Map<Long, DeviceInfoDto.NetStateCountVo>> netStateCount(DeviceInfoDto.NetStateCountDto dto) {
@@ -591,12 +595,12 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         String deviceSearch = dto.getDeviceSearch();
         DeviceInfoDto.Vo vo = dto.getVo();
         QueryWrapper<DeviceInfo> queryWrapper = new MybatisPlusQuery().eqWrapper(vo == null ? new DeviceInfoDto.Vo() : vo, DeviceInfo.class).buildQW();
-        List<Long> placeLineIds = dto.getPlaceLineIds();
+//        List<Long> placeLineIds = dto.getPlaceLineIds();
         List<Long> deviceIds = dto.getDeviceIds();
         List<String> columnList = dto.getColumnList();
-        if (CollUtil.isNotEmpty(placeLineIds)) {
-            queryWrapper.in(LambdaUtils.getUnderlineCaseName(DeviceInfo::getPlaceLineId), placeLineIds);
-        }
+//        if (CollUtil.isNotEmpty(placeLineIds)) {
+//            queryWrapper.in(LambdaUtils.getUnderlineCaseName(DeviceInfo::getPlaceLineId), placeLineIds);
+//        }
 
         //fixed
         if (StrUtil.isNotEmpty(deviceSearch)) {
@@ -769,20 +773,24 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         lqw.in(CollUtil.isNotEmpty(deviceIdList), DeviceInfo::getDeviceId, deviceIdList);
         lqw.like(StrUtil.isNotEmpty(deviceName), DeviceInfo::getDeviceName, deviceName).orderByAsc(true, DeviceInfo::getDeviceName, DeviceInfo::getDeviceId);
         List<DeviceInfo> deviceInfoList = this.list(lqw);
-        //未分配线路的设置默认值
-        deviceInfoList.stream().filter(s -> s.getPlaceLineId() == null).forEach(s -> s.setPlaceLineId(-1L));
-        //根据线路id分组
-        Map<Long, List<DeviceInfo>> deviceMap = deviceInfoList.stream().collect(Collectors.groupingBy(DeviceInfo::getPlaceLineId));
+        //未分区域的设置默认值
+        deviceInfoList.stream().filter(s -> s.getDistrictId() == null).forEach(s -> s.setDistrictId(-1L));
+        Map<Long, String> districtMap = new HashMap<>();
+        List<Long> districtIdList = list.stream().map(DeviceInfoDto.MercHomeCountVO::getDistrictId).filter(i -> i != -1).collect(Collectors.toList());
+        districtMap = mercRegionService.getNameList(new MercRegionDto.GetNameListDto().setIds(districtIdList)).getData();
+        //根据区域id分组
+        Map<Long, List<DeviceInfo>> deviceMap = deviceInfoList.stream().collect(Collectors.groupingBy(DeviceInfo::getDistrictId));
         DateTime date = DateTime.now();
         DateTime start = DateUtil.beginOfDay(date);
         DateTime end = DateUtil.endOfDay(date);
         for (DeviceInfoDto.MercHomeCountVO v : list) {
             DeviceInfoDto.MercHomeListVO vo = new DeviceInfoDto.MercHomeListVO();
-            Long placeLineId = v.getPlaceLineId();
+            Long districtId = v.getDistrictId();
             vo.setDeviceNum(v.getDeviceNum());
-            vo.setPlaceLineId(v.getPlaceLineId());
-            //线路下的设备列表
-            List<DeviceInfoDto.MercHomeDeviceVo> deviceInfos = BeanUtil.copyToList(deviceMap.get(placeLineId), DeviceInfoDto.MercHomeDeviceVo.class);
+            vo.setDistrictId(v.getDistrictId());
+            vo.setDistrictName(Emptys.check(districtMap.get(v.getDistrictId())) ? districtMap.get(v.getDistrictId()) : "未分配区域");
+            //区域下的设备列表
+            List<DeviceInfoDto.MercHomeDeviceVo> deviceInfos = BeanUtil.copyToList(deviceMap.get(districtId), DeviceInfoDto.MercHomeDeviceVo.class);
             if (CollUtil.isEmpty(deviceInfos)) {
                 continue;
             }

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

@@ -1,6 +1,5 @@
 package com.xy.service;
 
-import cn.hutool.core.lang.Console;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xy.dto.DeviceTempSetDto;
@@ -33,23 +32,22 @@ public class DeviceTempSetServiceImpl extends ServiceImpl<DeviceTempSetMapper, D
     @ApiOperation("新增")
     @PostMapping("save")
     public R save(@RequestBody DeviceTempSetDto.Save dto) {
-        DeviceTempSet save = copy(DeviceTempSet.class,dto);
+        DeviceTempSet save = copy(DeviceTempSet.class, dto);
         save.setStatus(DeviceTempSetStatusEnum.SETTING.getCode());
         save(save);
-        Console.log(save.getId());
         return R.ok();
     }
 
     @ApiOperation("获取最新一条记录")
     @PostMapping("getLastOne")
-    public R<DeviceTempSetDto.Vo> getLastOne(@RequestBody DeviceTempSetDto.GetLastOneDto dto){
-        LambdaQueryWrapper lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(dto,DeviceTempSet.class)
+    public R<DeviceTempSetDto.Vo> getLastOne(@RequestBody DeviceTempSetDto.GetLastOneDto dto) {
+        LambdaQueryWrapper lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(dto, DeviceTempSet.class)
                 .build()
                 .orderByDesc(DeviceTempSet::getId)
                 .last("limit 1");
         DeviceTempSet tempSet = getOne(lambdaQueryWrapper);
-        if(Emptys.check(tempSet)){
-            return R.ok(copy(DeviceTempSetDto.Vo.class,tempSet));
+        if (Emptys.check(tempSet)) {
+            return R.ok(copy(DeviceTempSetDto.Vo.class, tempSet));
         }
         return R.ok();
     }

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

@@ -36,9 +36,9 @@ public class SetsCmdServiceImpl implements CmdService {
                         .setWorkMode(data.getStr("workModel"))
                         .setTempValue(data.getInt("target"))
                         .setJob1StartTime(data.getInt("start1"))
-                        .setJob1StartEnd(data.getInt("end1"))
+                        .setJob1EndTime(data.getInt("end1"))
                         .setJob2StartTime(data.getInt("start2"))
-                        .setJob2StartEnd(data.getInt("end2"))
+                        .setJob2EndTime(data.getInt("end2"))
                         .setJob3StartTime(data.getInt("start3"))
                         .setJob3EndTime(data.getInt("end3"));
                 String warningLow = data.getStr("warningLow");

device-api-service/src/main/resources/mapper/DeviceInfoMapper.xml

@@ -304,7 +304,7 @@
 
     <!--  小程序首页设备列表线路分组  -->
     <select id="merHomeCountList" resultType="com.xy.dto.DeviceInfoDto$MercHomeCountVO">
-        select count(*) deviceNum, IFNULL(place_line_id, -1) placeLineId
+        select count(*) deviceNum, IFNULL(district_id, -1) districtId
         from device_info
 
         <where>
@@ -333,7 +333,7 @@
                 </foreach>
             </if>
         </where>
-        group by place_line_id
+        group by district_id
     </select>
     <select id="netStateCount" resultType="com.xy.dto.DeviceInfoDto$NetStateCount">
         SELECT d.merc_id,net_state, count(*) as count

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

@@ -109,8 +109,8 @@ public class DeviceInfoDto {
     public static class ListCommon {
         @ApiModelProperty("设备信息VO")
         Vo vo;
-        @ApiModelProperty("线路id多个")
-        private List<Long> placeLineIds;
+//        @ApiModelProperty("线路id多个")
+//        private List<Long> placeLineIds;
 
         @ApiModelProperty("id")
         private List<Long> deviceIds;
@@ -702,11 +702,11 @@ public class DeviceInfoDto {
     @Data
     @Accessors(chain = true)
     public static class MercHomeListVO {
-        @ApiModelProperty(value = "线路名称")
-        private String placeLineName;
+        @ApiModelProperty(value = "区域名称")
+        private String districtName;
 
-        @ApiModelProperty(value = "线路ID")
-        private Long placeLineId;
+        @ApiModelProperty(value = "区域ID")
+        private Long districtId;
 
         @ApiModelProperty(value = "设备数")
         private Integer deviceNum;
@@ -714,6 +714,11 @@ public class DeviceInfoDto {
         @ApiModelProperty(value = "列表设备信息")
         private List<MercHomeDeviceVo> deviceInfos;
 
+        @ApiModelProperty(value = "线路名称")
+        private String placeLineName;
+
+        @ApiModelProperty(value = "线路ID")
+        private Long placeLineId;
     }
 
     @Data
@@ -721,8 +726,8 @@ public class DeviceInfoDto {
     public static class MercHomeCountVO {
 
 
-        @ApiModelProperty(value = "线路ID")
-        private Long placeLineId;
+        @ApiModelProperty(value = "区域ID")
+        private Long districtId;
 
         @ApiModelProperty(value = "设备数")
         private Integer deviceNum;

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

@@ -43,20 +43,26 @@ public class DeviceTempSetDto {
         @ApiModelProperty(value = "最高温度报警")
         private Integer warningHigh;
 
-        @ApiModelProperty(value = "目标温度")
+        @ApiModelProperty(value = "目标温度1")
         private Integer tempValue;
 
+        @ApiModelProperty(value = "目标温度2")
+        private Integer tempValue2;
+
+        @ApiModelProperty(value = "目标温度3")
+        private Integer tempValue3;
+
         @ApiModelProperty(value = "工作时段1起始时间")
         private Integer job1StartTime;
 
         @ApiModelProperty(value = "工作时段1结束时间")
-        private Integer job1StartEnd;
+        private Integer job1EndTime;
 
         @ApiModelProperty(value = "工作时段2起始时间")
         private Integer job2StartTime;
 
         @ApiModelProperty(value = "工作时段2结束时间")
-        private Integer job2StartEnd;
+        private Integer job2EndTime;
 
         @ApiModelProperty(value = "工作时段3起始时间")
         private Integer job3StartTime;
@@ -95,20 +101,26 @@ public class DeviceTempSetDto {
         @ApiModelProperty(value = "最高温度报警")
         private Integer warningHigh;
 
-        @ApiModelProperty(value = "目标温度")
+        @ApiModelProperty(value = "目标温度1")
         private Integer tempValue;
 
+        @ApiModelProperty(value = "目标温度2")
+        private Integer tempValue2;
+
+        @ApiModelProperty(value = "目标温度3")
+        private Integer tempValue3;
+
         @ApiModelProperty(value = "工作时段1起始时间")
         private Integer job1StartTime;
 
         @ApiModelProperty(value = "工作时段1结束时间")
-        private Integer job1StartEnd;
+        private Integer job1EndTime;
 
         @ApiModelProperty(value = "工作时段2起始时间")
         private Integer job2StartTime;
 
         @ApiModelProperty(value = "工作时段2结束时间")
-        private Integer job2StartEnd;
+        private Integer job2EndTime;
 
         @ApiModelProperty(value = "工作时段3起始时间")
         private Integer job3StartTime;