Merge remote-tracking branch 'origin/V0.0.6-iot' into V0.0.6-iot

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/IotDvrDisk.java

@@ -7,9 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
 
 /**
  * <p>
@@ -20,6 +18,8 @@ import lombok.EqualsAndHashCode;
  * @since 2024-02-21
  */
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 @Builder
 @EqualsAndHashCode(callSuper = false)
 @TableName("iot_dvr_disk")

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/controller/DvrDiskController.java

@@ -48,7 +48,7 @@ class DvrDiskController {
 
     @ApiOperation("dvr硬盘统计，只按机构过滤")
     @GetMapping({"/web/diskstatistic"})
-    AjaxResult diskStatistic(@RequestBody final DvrDiskPageDto request) {
+    AjaxResult diskStatistic(DvrDiskPageDto request) {
         return AjaxResult.success(this.dvrDiskService.diskStatistic(request));
     }
 

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/dto/dvrDisk/DvrDiskPageDto.java

@@ -29,11 +29,11 @@ public class DvrDiskPageDto extends PageDto {
 //    )
     private String equipmentCode;
 
-    @ApiModelProperty("录像机的名称")
+    @ApiModelProperty("监控主机的名称")
 //    @Query(
 //            type = QueryConditionType.like
 //    )
-    private String equipmentName;
+    private String hostName;
 //    @ApiModelProperty("报警状态")
 //    @Query(
 //            type = QueryConditionType.equal

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/impl/IotDvrDiskServiceImpl.java

@@ -79,10 +79,6 @@ public class IotDvrDiskServiceImpl extends ServiceImpl<IotDvrDiskMapper, IotDvrD
 
         page = baseMapper.selectHostPage(page, pageDto, orgPath);
         page.getRecords().forEach(r -> {
-            if (ObjectUtil.isNotNull(r.getNetState())) {
-                r.setNetStateStr(r.getNetState().getText());
-            }
-
             if (ObjectUtil.isNotEmpty(r.getDiskInfos())) {
                 r.setDiskCount(r.getDiskInfos().size());
                 r.setDiskExceptionCount((int) r.getDiskInfos().stream().filter(di -> ObjectUtil.equal(di.getState(), 1)).count());
@@ -107,5 +103,4 @@ public class IotDvrDiskServiceImpl extends ServiceImpl<IotDvrDiskMapper, IotDvrD
         DvrDiskStatisticVo vo = baseMapper.diskStatistic(pageDto, orgPath);
         return vo;
     }
-
 }

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/vo/dvrDisk/DvrDiskPageVo.java

@@ -51,8 +51,6 @@ public class DvrDiskPageVo {
    @ApiModelProperty("网络状态")
    private NetStatus netState;
 
-   @ApiModelProperty("网络状态")
-   private String netStateStr;
 //   @ApiModelProperty("报警状态")
 //   private AlarmStatus status;
 

soc-modules/soc-modules-iot/src/main/resources/mapper/DvrDiskMapper.xml

@@ -47,8 +47,8 @@
         <if test="pageDto.checkSub==false">
             and d.org_id = #{pageDto.orgId}
         </if>
-        <if test="pageDto.equipmentName!=null and pageDto.equipmentName!=''">
-            and d.NAME like concat('%', #{pageDto.equipmentName},'%')
+        <if test="pageDto.hostName!=null and pageDto.hostName!=''">
+            and d.equipment_name like concat('%', #{pageDto.hostName},'%')
         </if>
 <!--        <if test="pageDto.status !=null">-->
 <!--            and dhd.`status` = #{pageDto.status}-->
@@ -71,7 +71,7 @@
                `host_code`,
                `org_id`
         from iot_dvr_disk
-        where equipment_code = #{equipmentCode}
+        where host_code = #{equipmentCode} and deleted=0
     </select>
     <select id="getRecordAlarmHistoryList"
             resultType="com.xunmei.iot.vo.dvrDisk.DvrDiskAlarmHistoryPageVo">
@@ -117,13 +117,13 @@
                SUM(DD.count) AS diskTotal,
                SUM(dd.exceptionCount) as diskExceptionCount
         FROM iot_device d
-        LEFT JOIN (SELECT equipment_code,count(0) as count,SUM(if(state=1,1,0)) as exceptionCount from iot_dvr_disk WHERE deleted=0 )  dd on d.equipment_code =dd.equipment_code
+        LEFT JOIN (SELECT host_code,count(0) as count,SUM(if(state=1,1,0)) as exceptionCount from iot_dvr_disk WHERE deleted=0 )  dd on dd.host_code =d.equipment_code
         where  d.deleted=0 and d.category_id=#{pageDto.categoryId}
         <if test="pageDto.checkSub==true">
             and d.org_path like concat(#{orgPath},"%")
         </if>
         <if test="pageDto.checkSub==false">
-            and d.org_id = #{request.orgId}
+            and d.org_id = #{pageDto.orgId}
         </if>
     </select>