新增监控区域ip

huimv-admin/src/main/java/com/huimv/admin/entity/vo/CameraBaseVo.java

@@ -0,0 +1,9 @@
+package com.huimv.admin.entity.vo;
+
+import com.huimv.admin.entity.CameraBase;
+import lombok.Data;
+
+@Data
+public class CameraBaseVo extends CameraBase {
+    private String ip;
+}

huimv-admin/src/main/java/com/huimv/admin/entity/vo/CameraListVo.java

@@ -12,6 +12,6 @@ public class CameraListVo {
     private Integer brandId;
     private Integer sort;
     private Integer farmId;
-    private String regionUuuid;
+    private String regionUuid;
     private Integer onLineStatus;
 }

huimv-admin/src/main/java/com/huimv/admin/mapper/CameraBaseMapper.java

@@ -1,7 +1,13 @@
 package com.huimv.admin.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.admin.entity.CameraBase;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.admin.entity.vo.CameraBaseVo;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -13,4 +19,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface CameraBaseMapper extends BaseMapper<CameraBase> {
 
+    IPage<CameraBaseVo> listPage(Page<CameraBase> page,@Param(Constants.WRAPPER) QueryWrapper<CameraBase> wrapper);
 }

huimv-admin/src/main/java/com/huimv/admin/service/impl/CameraBaseServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.admin.common.utils.Result;
@@ -16,10 +17,7 @@ import com.huimv.admin.entity.CameraBrand;
 import com.huimv.admin.entity.dto.CameraNameDto;
 import com.huimv.admin.entity.hkwsdto.CameraDto1;
 import com.huimv.admin.entity.hkwsdto.UnitDto1;
-import com.huimv.admin.entity.vo.CameraListVo;
-import com.huimv.admin.entity.vo.CameraListsVo;
-import com.huimv.admin.entity.vo.CameraVo;
-import com.huimv.admin.entity.vo.TreeBasePigpen;
+import com.huimv.admin.entity.vo.*;
 import com.huimv.admin.mapper.CameraAreaMapper;
 import com.huimv.admin.mapper.CameraBaseMapper;
 import com.huimv.admin.mapper.CameraBrandMapper;
@@ -60,7 +58,7 @@ public class CameraBaseServiceImpl extends ServiceImpl<CameraBaseMapper, CameraB
         Integer sort = cameraListVo.getSort();
         Integer farmId = cameraListVo.getFarmId();
         Integer onLineStatus = cameraListVo.getOnLineStatus();
-        String regionUuuid = cameraListVo.getRegionUuuid();
+        String regionUuid = cameraListVo.getRegionUuid();
         QueryWrapper<CameraBase> wrapper = new QueryWrapper<>();
         if (null == current) {
             current = 1;
@@ -69,27 +67,28 @@ public class CameraBaseServiceImpl extends ServiceImpl<CameraBaseMapper, CameraB
             size = 10;
         }
         if (farmId != null) {
-            wrapper.eq("farm_id", farmId);
+            wrapper.eq("cb.farm_id", farmId);
         }
-        if (StringUtils.isNotBlank(regionUuuid)) {
-            wrapper.eq("area_id", regionUuuid);
+        if (StringUtils.isNotBlank(regionUuid)) {
+            wrapper.eq("cb.region_uuid", regionUuid);
         }
         if (onLineStatus != null) {
-            wrapper.eq("on_line_status", onLineStatus);
+            wrapper.eq("cb.on_line_status", onLineStatus);
         }
         if (StringUtils.isNotBlank(strchStr)) {
-            wrapper.and(i -> i.like("camera_name", strchStr));
+            wrapper.and(i -> i.like("cb.camera_name", strchStr));
         }
         if (sort == null) {
-            wrapper.orderByDesc("id");
+            wrapper.orderByDesc("cb.id");
         } else if (sort == 1) {
-            wrapper.orderByDesc("sort");
+            wrapper.orderByDesc("cb.sort");
         } else {
-            wrapper.orderByAsc("sort");
+            wrapper.orderByAsc("cb.sort");
         }
-        wrapper.orderByDesc("id");
-        Page<CameraBase> page = page(new Page<CameraBase>(current, size), wrapper);
-        return new Result(ResultCode.SUCCESS, page);
+        wrapper.orderByDesc("cb.id");
+        Page<CameraBase> page = new Page<>(current,size);
+        IPage<CameraBaseVo> cameraBaseVoIPage = cameraBaseMapper.listPage(page, wrapper);
+        return new Result(ResultCode.SUCCESS, cameraBaseVoIPage);
     }
 
     @Override

huimv-admin/src/main/resources/com/huimv/admin/mapper/CameraBaseMapper.xml

@@ -2,25 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huimv.admin.mapper.CameraBaseMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.admin.entity.CameraBase">
-        <id column="id" property="id" />
-        <result column="camera_name" property="cameraName" />
-        <result column="account" property="account" />
-        <result column="password" property="password" />
-        <result column="area_name" property="areaName" />
-        <result column="area_id" property="areaId" />
-        <result column="camera_ip" property="cameraIp" />
-        <result column="attention" property="attention" />
-        <result column="brand_name" property="brandName" />
-        <result column="brand_id" property="brandId" />
-        <result column="run_status" property="runStatus" />
-        <result column="sort" property="sort" />
-        <result column="farm_id" property="farmId" />
-        <result column="room_id" property="roomId" />
-        <result column="icc_channel" property="iccChannel" />
-        <result column="function_id" property="functionId" />
-        <result column="is_online" property="isOnline" />
-    </resultMap>
-
+    <select id="listPage" resultType="com.huimv.admin.entity.vo.CameraBaseVo">
+        select cb.*,ca.public_url as ip from camera_base cb left join camera_area ca on cb.region_uuid =ca.region_uuid
+        ${ew.customSqlSegment}
+    </select>
 </mapper>