Merge branch 'master' into hcp

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

@@ -116,6 +116,16 @@ public class DeviceSysinfo {
      */
     private Boolean isHaveLightSecond;
 
+    /**
+     * 是否冷冻机
+     */
+    private Boolean isHaveFreeze;
+
+    /**
+     * 是否有玻璃加热
+     */
+    private Boolean isHaveHeat;
+
     /**
      * 设备型号
      */

device-api-service/src/main/java/com/xy/mapper/DeviceInfoMapper.java

@@ -37,4 +37,6 @@ public interface DeviceInfoMapper extends BaseMapper<DeviceInfo> {
     List<DeviceInfoDto.MercHomeCountVO> merHomeCountList(@Param("query") DeviceInfoDto.MercHomeQueryDTO queryDTO);
 
     List<DeviceInfoDto.NetStateCount> netStateCount(@Param("mercIdList") List<Long> mercIdList);
+
+    List<DeviceInfoDto.PlaceDeviceNumVo> placeDeviceNum(@Param("dto") DeviceInfoDto.PlaceDeviceNumDto dto);
 }

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

@@ -105,6 +105,13 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
 
     private final DeviceAlgorithmChargingServiceImpl deviceAlgorithmChargingService;
 
+
+    @ApiOperation("点位设备数量查询")
+    @Override
+    public R<List<DeviceInfoDto.PlaceDeviceNumVo>> placeDeviceNum(@RequestBody @Validated DeviceInfoDto.PlaceDeviceNumDto dto){
+        return R.ok(baseMapper.placeDeviceNum(dto));
+    }
+
     @ApiOperation("设备列表带卡包数")
     @PostMapping("algorithmChargingDevice")
     public R<PageBean<DeviceInfoDto.AlgorithmChargingVo>> algorithmChargingDevice(@RequestBody @Validated DeviceInfoDto.AlgorithmCharging algorithmCharging) {

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

@@ -45,7 +45,11 @@
             <result column="sim_company" property="simCompany"/>
             <result column="disk_space" property="diskSpace"/>
             <result column="memery_space" property="memerySpace"/>
-            <result column="sysinfo_create_time" property="createTime"/>
+            <result column="is_have_temp" property="isHaveTemp"/>
+            <result column="is_have_light_main" property="isHaveLightMain"/>
+            <result column="is_have_light_second" property="isHaveLightSecond"/>
+            <result column="is_have_freeze" property="isHaveFreeze"/>
+            <result column="is_have_heat" property="isHaveHeat"/>
         </association>
         <association property="deviceStatus" javaType="com.xy.dto.DeviceStatusDto$Vo">
             <result column="sys_start_time" property="sysStartTime"/>
@@ -116,6 +120,11 @@
         sysinfo.disk_space,
         sysinfo.memery_space,
         sysinfo.create_time as sysinfo_create_time,
+        sysinfo.is_have_temp,
+        sysinfo.is_have_light_main,
+        sysinfo.is_have_light_second,
+        sysinfo.is_have_freeze,
+        sysinfo.is_have_heat,
         status.sys_start_time,
         status.sys_cur_time,
         status.sys_power,
@@ -353,4 +362,20 @@
         </where>
         GROUP BY d.merc_id,s.net_state
     </select>
+    <select id="placeDeviceNum" resultType="com.xy.dto.DeviceInfoDto$PlaceDeviceNumVo">
+        SELECT place_id,count(*) as num
+        FROM device_info
+        <where>
+            <if test="dto.placeId != null">
+                AND place_id = #{dto.placeId}
+            </if>
+            <if test="dto.placeIdList != null and dto.placeIdList.size() > 0">
+                AND place_id IN
+                <foreach collection="dto.placeIdList" item="placeId" index="index" open="(" close=")" separator=",">
+                    #{placeId}
+                </foreach>
+            </if>
+        </where>
+        GROUP BY place_id
+    </select>
 </mapper>

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

@@ -1019,4 +1019,24 @@ public class DeviceInfoDto {
         private List<Long> deviceId;
     }
 
+    @Data
+    @Accessors(chain = true)
+    public static class PlaceDeviceNumDto {
+        @ApiModelProperty("点位id")
+        private Long placeId;
+
+        @ApiModelProperty("点位ID列表")
+        private List<Long> placeIdList;
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class PlaceDeviceNumVo {
+        @ApiModelProperty("点位id")
+        private Long placeId;
+
+        @ApiModelProperty("数量")
+        private Integer num;
+    }
+
 }

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

@@ -110,6 +110,12 @@ public class DeviceSysinfoDto {
         @ApiModelProperty("是否可调副灯")
         private Boolean isHaveLightSecond;
 
+        @ApiModelProperty("是否冷冻机")
+        private Boolean isHaveFreeze;
+
+        @ApiModelProperty("是否有玻璃加热")
+        private Boolean isHaveHeat;
+
         @ApiModelProperty("设备型号")
         private String deviceModel;
 

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

@@ -174,4 +174,12 @@ public interface DeviceInfoService {
     @PostMapping("getDeviceSysinfo")
     R<DeviceSysinfoDto.Vo> getDeviceSysinfo(@RequestBody @Validated DeviceSysinfoDto.DeviceSysInfo dto);
 
+    /**
+     * 点位设备数量查询
+     *
+     * @param dto
+     * @return
+     */
+    @PostMapping("placeDeviceNum")
+    R<List<DeviceInfoDto.PlaceDeviceNumVo>> placeDeviceNum(@RequestBody @Validated DeviceInfoDto.PlaceDeviceNumDto dto);
 }