监控

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/LoginController.java

@@ -9,9 +9,11 @@ import com.huimv.guowei.admin.common.utils.ResultCode;
 import com.huimv.guowei.admin.common.utils.VerifyUtil;
 import com.huimv.guowei.admin.entity.SysAccountMultilevel;
 import com.huimv.guowei.admin.entity.SysCamera;
+import com.huimv.guowei.admin.entity.SysCameraArea;
 import com.huimv.guowei.admin.mapper.SysCameraMapper;
 import com.huimv.guowei.admin.service.ILoginService;
 import com.huimv.guowei.admin.service.IRawDataService;
+import com.huimv.guowei.admin.service.ISysCameraAreaService;
 import com.huimv.guowei.admin.service.ISysCameraService;
 import com.huimv.guowei.admin.session.AccessToken;
 import com.huimv.guowei.admin.utils.IpUtil;
@@ -32,7 +34,7 @@ public class LoginController {
     @Autowired
     ILoginService iLoginService;
     @Autowired
-    private SysCameraMapper sysCameraMapper;
+    private ISysCameraAreaService sysCameraAreaService;
 
     @RequestMapping("/test")
     public String logout() {
@@ -133,7 +135,13 @@ public class LoginController {
 
     @GetMapping("/listCameraIp")
     public Result getIpAddr(){
-        return new Result(ResultCode.SUCCESS,sysCameraMapper.listCameraIp());
+        List<SysCameraArea> list = sysCameraAreaService.list();
+        if (ObjectUtil.isNotEmpty(list)){
+            return new Result(ResultCode.SUCCESS, list.get(0).getPublicUrl());
+        }else {
+            return Result.ERROR();
+        }
+
     }
 
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/mapper/SysCameraMapper.java

@@ -24,5 +24,4 @@ public interface SysCameraMapper extends BaseMapper<SysCamera> {
 
     IPage<CameraBaseVo> listPage(Page<SysCamera> page, @Param(Constants.WRAPPER) QueryWrapper<SysCamera> wrapper);
 
-    List<CarmeraIpResult> listCameraIp();
 }

huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/SysCameraMapper.xml

@@ -27,7 +27,4 @@
         select cb.*,ca.public_url as ip from sys_camera cb left join sys_camera_area ca on cb.region_uuid =ca.region_uuid
         ${ew.customSqlSegment}
     </select>
-    <select id="listCameraIp" resultType="com.huimv.guowei.admin.entity.vo.CarmeraIpResult">
-        SELECT c.id,c.camera_name,c.account,c.password,c.area_name,c.camera_ip,c.run_status,a.public_url AS 'publicUrl' FROM `sys_camera` c LEFT JOIN `sys_camera_area` a ON c.area_id = a.id
-    </select>
 </mapper>