添加视频管理

huimv-smart-management/src/main/java/com/huimv/management/controller/CameraInfoController.java

@@ -5,6 +5,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -28,6 +29,7 @@ import com.huimv.common.utils.R;
  */
 @RestController
 @RequestMapping("management/camerainfo")
+@Api(tags ="摄像头管理")
 public class CameraInfoController {
     @Autowired
     private CameraInfoService cameraInfoService;
@@ -85,18 +87,17 @@ public class CameraInfoController {
 
 
     @RequestMapping("/getCameraDetails")
-    private R getCameraDetails(@RequestParam Map<String, Object> params){
-        String areaIds = (String)params.get("aredIds");
-        String formFarmId = (String)params.get("formFarmId");
-        if (formFarmId == null || "".equals(formFarmId)){
-            return R.error("请选择牧场");
-        }
-        if (formFarmId == null || "".equals(formFarmId)){
+    private R getCameraDetails(Integer cameraId){
+        if (cameraId == null ){
             return R.error("请选择摄像头");
         }
+        List list =  cameraInfoService.getCameraDetails(cameraId);
+        return R.ok().put("data",list);
+    }
 
-
-        List list =  cameraInfoService.getCameraDetails(areaIds,Integer.parseInt(formFarmId));
-        return R.ok().put("all",list);
+    @RequestMapping("/getByAreaId")
+    private R getByAreaId(Integer areaId){
+        List list = cameraInfoService.getByAreaId(areaId);
+        return R.ok().put("data",list);
     }
 }

huimv-smart-management/src/main/java/com/huimv/management/controller/PastureAreaController.java

@@ -4,6 +4,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -27,6 +28,7 @@ import com.huimv.common.utils.R;
  */
 @RestController
 @RequestMapping("management/pasturearea")
+@Api(tags = "区域管理")
 public class PastureAreaController {
     @Autowired
     private PastureAreaService pastureAreaService;
@@ -77,6 +79,9 @@ public class PastureAreaController {
      */
     @RequestMapping("/delete")
     public R delete(@RequestBody Integer[] ids){
+        if (pastureAreaService.findCamerInfoByAreaId(ids)){
+            return R.error("该区域下有摄像头，请先删除摄像头");
+        }
 		pastureAreaService.removeByIds(Arrays.asList(ids));
 
         return R.ok();

huimv-smart-management/src/main/java/com/huimv/management/controller/PublicNetworkController.java

@@ -81,4 +81,12 @@ public class PublicNetworkController {
         return R.ok();
     }
 
+    @RequestMapping("/findAll")
+    public R findAll(Integer formFarmId){
+        if (formFarmId == null){
+            return R.error("请选择牧场");
+        }
+       return R.ok().put("data", publicNetworkService.findAll(formFarmId));
+    }
+
 }

huimv-smart-management/src/main/java/com/huimv/management/entity/CameraInfoEntity.java

@@ -1,6 +1,7 @@
 package com.huimv.management.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.io.Serializable;
@@ -40,14 +41,13 @@ public class CameraInfoEntity implements Serializable {
 	 * 
 	 */
 	private String areaName;
+
+	private Integer areaId;
 	/**
 	 * 
 	 */
 	private String ip;
-	/**
-	 * 
-	 */
-	private Integer areaId;
+
 	/**
 	 * 
 	 */
@@ -61,4 +61,14 @@ public class CameraInfoEntity implements Serializable {
 	 */
 	private Integer attention;
 
+	private String cameraType;
+
+	private String rtsp;
+
+	/**
+	 * 删除状态 0正常 1已删除
+	 */
+	@TableLogic
+	private Integer deleted;
+
 }

huimv-smart-management/src/main/java/com/huimv/management/entity/PastureAreaEntity.java

@@ -28,25 +28,8 @@ public class PastureAreaEntity implements Serializable {
 	 * 
 	 */
 	private String name;
-	/**
-	 * 
-	 */
-	private Integer parentId;
-	/**
-	 * 
-	 */
-	private Integer sort;
-	/**
-	 * 
-	 */
+
+
 	private Integer farmId;
-	/**
-	 * 
-	 */
-	private Integer attention;
-	/**
-	 * 
-	 */
-	private String remark;
 
 }

huimv-smart-management/src/main/java/com/huimv/management/entity/vo/PigBaseVo.java

@@ -63,4 +63,6 @@ public class PigBaseVo implements Serializable {
 
     private String fatherEartag;
 
+    private String farmName;
+
 }

huimv-smart-management/src/main/java/com/huimv/management/service/CameraInfoService.java

@@ -18,6 +18,8 @@ public interface CameraInfoService extends IService<CameraInfoEntity> {
 
     PageUtils queryPage(Map<String, Object> params);
 
-    List getCameraDetails(String areaIds,Integer formFarmId);
+    List getCameraDetails(Integer cameraId);
+
+    List getByAreaId(Integer areaId);
 }
 

huimv-smart-management/src/main/java/com/huimv/management/service/PastureAreaService.java

@@ -19,5 +19,7 @@ public interface PastureAreaService extends IService<PastureAreaEntity> {
     PageUtils queryPage(Map<String, Object> params);
 
     List findAll(Integer formFarmId);
+
+    Boolean findCamerInfoByAreaId(Integer[] ids);
 }
 

huimv-smart-management/src/main/java/com/huimv/management/service/PublicNetworkService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.common.utils.PageUtils;
 import com.huimv.management.entity.PublicNetworkEntity;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -16,5 +17,7 @@ import java.util.Map;
 public interface PublicNetworkService extends IService<PublicNetworkEntity> {
 
     PageUtils queryPage(Map<String, Object> params);
+
+    List findAll(Integer formFarmId);
 }
 

huimv-smart-management/src/main/java/com/huimv/management/service/impl/CameraInfoServiceImpl.java

@@ -4,11 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.huimv.management.dao.PastureAreaDao;
 import com.huimv.management.dao.PublicNetworkDao;
-import com.huimv.management.entity.HealthIsolationRecordEntity;
-import com.huimv.management.entity.PastureAreaEntity;
 import com.huimv.management.entity.PublicNetworkEntity;
 import org.apache.commons.lang.StringUtils;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -43,10 +40,22 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoDao, CameraInfo
     public PageUtils queryPage(Map<String, Object> params) {
 
         //根据牧场查询
-        String farmId = (String) params.get("farmId");
+        String farmId = (String) params.get("fromFarmId");
 
         QueryWrapper<CameraInfoEntity> wrapper = new QueryWrapper<CameraInfoEntity>();
         wrapper.eq(StringUtils.isNotBlank(farmId),"farm_id",farmId);
+
+        //关键词
+        String keyword = (String)params.get("keyword");
+        if (StringUtils.isNotBlank(keyword)){
+            wrapper.like("name",keyword);
+            wrapper.like("area_name",keyword);
+            wrapper.like("ip",keyword);
+            wrapper.like("camera_type",keyword);
+
+        }
+
+
         IPage<CameraInfoEntity> page = this.page(
                 new Query<CameraInfoEntity>().getPage(params),
                 wrapper
@@ -56,42 +65,36 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoDao, CameraInfo
     }
 
     @Override
-    public List getCameraDetails(String areaIds,Integer formFarmId) {
+    public List getCameraDetails(Integer cameraId) {
         List cameraDetailsList = new ArrayList();
-        String[] split = areaIds.split(",");
-
-        QueryWrapper<CameraInfoEntity> wrapper = new QueryWrapper<CameraInfoEntity>();
-
+        CameraInfoEntity cameraInfo  = cameraInfoDao.selectById(cameraId);
+        Integer farmId = cameraInfo.getFarmId();
         QueryWrapper<PublicNetworkEntity> urlWrapper = new QueryWrapper<PublicNetworkEntity>();
-        urlWrapper.eq("farm_id",formFarmId);
+        urlWrapper.eq("farm_id",farmId);
         String url = publicNetworkDao.selectOne(urlWrapper).getUrl();
 
+        Map map = new HashMap();
+        String cameraAccount =  cameraInfo.getAccount();
+        String cameraPassword =  cameraInfo.getPassword();
+        String camerIp = cameraInfo.getIp();
+        Integer areaId = cameraInfo.getAreaId();
+        String rtsp = cameraInfo.getRtsp();
+        map.put("wsUrl","ws://"+url+"/camera_relay?tcpaddr=" + cameraAccount + "%3A" + cameraPassword+"%40"+camerIp);
+        map.put("rtspUrl","rtsp://"+cameraAccount+":"+cameraPassword+"@"+camerIp+rtsp);
+        map.put("areaId",areaId);
 
-        for (String area : split) {
-            Integer areaId = Integer.parseInt(area);
-            wrapper.eq("area_id",areaId);
-            List<CameraInfoEntity> cameraList = cameraInfoDao.selectList(wrapper);
-
-            for (CameraInfoEntity cameraInfo : cameraList) {
+        cameraDetailsList.add(map);
 
-                PastureAreaEntity pastureArea = pastureAreaDao.selectById( cameraInfo.getAreaId());
-                PastureAreaEntity pastureArea1   = pastureAreaDao.selectById(pastureArea.getParentId());
-                Map map = new HashMap();
-                String cameraAccount =  cameraInfo.getAccount();
-                String cameraPassword =  cameraInfo.getPassword();
-                String camerIp = cameraInfo.getIp();
 
-//                map.put("wsUrl","ws://111.2.71.225:10080/camera_relay?tcpaddr=" + cameraAccount + "%3A" + cameraPassword+"%40"+camerIp);
-                map.put("wsUrl","ws://"+url+"/camera_relay?tcpaddr=" + cameraAccount + "%3A" + cameraPassword+"%40"+camerIp);
-                map.put("rtspUrl","rtsp://"+cameraAccount+":"+cameraPassword+"@"+camerIp+"/cam/realmonitor?channel=1&subtype=1");
-                map.put("areaId",areaId);
-                map.put("areaParentId",pastureArea.getParentId());
-                map.put("name",pastureArea1.getName() + " "+cameraInfo.getName());
+        return cameraDetailsList;
+    }
 
-                cameraDetailsList.add(map);
-            }
-        }
+    @Override
+    public List getByAreaId(Integer areaId) {
+        LambdaQueryWrapper<CameraInfoEntity> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(CameraInfoEntity::getAreaId,areaId);
 
-        return cameraDetailsList;
+        List<CameraInfoEntity> cameraInfoEntities = cameraInfoDao.selectList(wrapper);
+        return cameraInfoEntities;
     }
 }

huimv-smart-management/src/main/java/com/huimv/management/service/impl/PastureAreaServiceImpl.java

@@ -1,85 +1,74 @@
 package com.huimv.management.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huimv.common.utils.PageUtils;
+import com.huimv.common.utils.Query;
+import com.huimv.management.dao.CameraInfoDao;
+import com.huimv.management.entity.CameraInfoEntity;
 import com.huimv.management.entity.PastureAreaEntity;
+import com.huimv.management.entity.WaterTargetEntity;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huimv.common.utils.PageUtils;
-import com.huimv.common.utils.Query;
 
 import com.huimv.management.dao.PastureAreaDao;
-import com.huimv.management.entity.PastureAreaEntity;
 import com.huimv.management.service.PastureAreaService;
 
 
 @Service("pastureAreaService")
 public class PastureAreaServiceImpl extends ServiceImpl<PastureAreaDao, PastureAreaEntity> implements PastureAreaService {
     @Autowired
-    private PastureAreaDao pastureAreaDao ;
+    private PastureAreaDao pastureAreaDao;
+
+    @Autowired
+    private CameraInfoDao cameraInfoDao;
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
 
         //根据牧场查询
-        String farmId = (String) params.get("farmId");
+        String farmId = (String) params.get("formFarmId");
 
         QueryWrapper<PastureAreaEntity> wrapper = new QueryWrapper<PastureAreaEntity>();
-        wrapper.eq(StringUtils.isNotBlank(farmId),"farm_id",farmId);
+        wrapper.eq(StringUtils.isNotBlank(farmId), "farm_id", farmId);
         IPage<PastureAreaEntity> page = this.page(
                 new Query<PastureAreaEntity>().getPage(params),
                 wrapper
         );
 
         return new PageUtils(page);
-    }
 
+    }
 
     @Override
     public List findAll(Integer formFarmId) {
         QueryWrapper<PastureAreaEntity> wrapper = new QueryWrapper<PastureAreaEntity>();
 
-        wrapper.eq("farm_id",formFarmId);
+        wrapper.eq("farm_id", formFarmId);
         List<PastureAreaEntity> pastureAreaEntities = pastureAreaDao.selectList(wrapper);
 
-        return areaUtil(pastureAreaEntities);
+        return pastureAreaEntities;
     }
 
-    public List areaUtil(List<PastureAreaEntity> areaList){
-        List<Map> list = new ArrayList<>();
-        for (PastureAreaEntity pastureArea : areaList) {
-            if(pastureArea.getParentId() == null){
-                return null;
-            }
-            if (pastureArea.getParentId()==0){
-                Map map  = new HashMap();
-                map.put("id", pastureArea.getId());
-                map.put("name", pastureArea.getName());
-                map.put("parentId", pastureArea.getParentId());
-                map.put("remark", pastureArea.getRemark());
-                map.put("sort",pastureArea.getSort());
-
-                List list1 = new ArrayList();
-                for (PastureAreaEntity area : areaList) {
-                    if (pastureArea.getId().equals(area.getParentId())){
-                        list1.add(area);
-                    }
-                }
-                map.put("children",list1);
-
-                list.add(map);
+    @Override
+    public Boolean findCamerInfoByAreaId(Integer[] ids) {
+        LambdaQueryWrapper<CameraInfoEntity> wrapper = Wrappers.lambdaQuery();
+        for (Integer id : ids) {
+            wrapper.eq(CameraInfoEntity::getAreaId, id);
+            if (cameraInfoDao.selectCount(wrapper) > 0){
+                return true;
             }
-        }
 
-
-
-        return list;
+        }
+        return false;
     }
-}
+}
+

huimv-smart-management/src/main/java/com/huimv/management/service/impl/PublicNetworkServiceImpl.java

@@ -2,7 +2,11 @@ package com.huimv.management.service.impl;
 
 import com.huimv.management.entity.PublicNetworkEntity;
 import org.apache.commons.lang.StringUtils;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -18,14 +22,21 @@ import com.huimv.management.service.PublicNetworkService;
 @Service("publicNetworkService")
 public class PublicNetworkServiceImpl extends ServiceImpl<PublicNetworkDao, PublicNetworkEntity> implements PublicNetworkService {
 
+    @Autowired
+    private PublicNetworkDao publicNetworkDao;
+
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
 
         //根据牧场查询
-        String farmId = (String) params.get("farmId");
+        String farmId = (String) params.get("formFarmId");
 
         QueryWrapper<PublicNetworkEntity> wrapper = new QueryWrapper<PublicNetworkEntity>();
         wrapper.eq(StringUtils.isNotBlank(farmId),"farm_id",farmId);
+
+        String keyword =(String) params.get("keyword");
+        wrapper.like(StringUtils.isNotBlank(keyword),"name",keyword);
+
         IPage<PublicNetworkEntity> page = this.page(
                 new Query<PublicNetworkEntity>().getPage(params),
                 wrapper
@@ -34,4 +45,11 @@ public class PublicNetworkServiceImpl extends ServiceImpl<PublicNetworkDao, Publ
         return new PageUtils(page);
     }
 
+    @Override
+    public List findAll(Integer formFarmId) {
+        QueryWrapper<PublicNetworkEntity> wrapper = new QueryWrapper<PublicNetworkEntity>();
+        wrapper.eq("farm_id",formFarmId);
+
+        return   publicNetworkDao.selectList(wrapper);
+    }
 }

huimv-smart-management/src/main/resources/mapper/management/YearPigBaseDao.xml

@@ -61,12 +61,14 @@
           base.out_fence_time,
           base.out_fence_status,
           base.mother_eartag,
-          base.father_eartag
+          base.father_eartag,
+          farm.name farm_name
 
         from mgt_year_pig_base base
         LEFT JOIN mgt_period period on period.id = base.period_id
         JOIN mgt_pigsty pigsty on pigsty.id = base.pigsty_id
         JOIN mgt_unit unit on unit.id = base.unit_id
+        JOIN mgt_farm farm on farm.id = base.farm_id
         ${ew.customSqlSegment}
 
     </select>