添加视频功能

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

@@ -0,0 +1,102 @@
+ package com.huimv.management.controller;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.huimv.management.entity.CameraInfoEntity;
+import com.huimv.management.service.CameraInfoService;
+import com.huimv.common.utils.PageUtils;
+import com.huimv.common.utils.R;
+
+
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-06-24 09:55:37
+ */
+@RestController
+@RequestMapping("management/camerainfo")
+public class CameraInfoController {
+    @Autowired
+    private CameraInfoService cameraInfoService;
+
+    /**
+     * 列表
+     */
+    @RequestMapping("/list")
+    public R list(@RequestParam Map<String, Object> params){
+        PageUtils page = cameraInfoService.queryPage(params);
+
+        return R.ok().put("page", page);
+    }
+
+
+    /**
+     * 信息
+     */
+    @RequestMapping("/info/{id}")
+    public R info(@PathVariable("id") Integer id){
+		CameraInfoEntity cameraInfo = cameraInfoService.getById(id);
+
+        return R.ok().put("cameraInfo", cameraInfo);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    public R save(@RequestBody CameraInfoEntity cameraInfo){
+		cameraInfoService.save(cameraInfo);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    public R update(@RequestBody CameraInfoEntity cameraInfo){
+		cameraInfoService.updateById(cameraInfo);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    public R delete(@RequestBody Integer[] ids){
+		cameraInfoService.removeByIds(Arrays.asList(ids));
+
+        return R.ok();
+    }
+
+
+    @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)){
+            return R.error("请选择摄像头");
+        }
+
+
+        List list =  cameraInfoService.getCameraDetails(areaIds,Integer.parseInt(formFarmId));
+        return R.ok().put("all",list);
+    }
+}

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

@@ -0,0 +1,102 @@
+ package com.huimv.management.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.huimv.management.entity.PastureAreaEntity;
+import com.huimv.management.service.PastureAreaService;
+import com.huimv.common.utils.PageUtils;
+import com.huimv.common.utils.R;
+
+
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-06-24 09:55:37
+ */
+@RestController
+@RequestMapping("management/pasturearea")
+public class PastureAreaController {
+    @Autowired
+    private PastureAreaService pastureAreaService;
+
+    /**
+     * 列表
+     */
+    @RequestMapping("/list")
+    public R list(@RequestParam Map<String, Object> params){
+        PageUtils page = pastureAreaService.queryPage(params);
+
+        return R.ok().put("page", page);
+    }
+
+
+    /**
+     * 信息
+     */
+    @RequestMapping("/info/{id}")
+    public R info(@PathVariable("id") Integer id){
+		PastureAreaEntity pastureArea = pastureAreaService.getById(id);
+
+        return R.ok().put("pastureArea", pastureArea);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    public R save(@RequestBody PastureAreaEntity pastureArea){
+		pastureAreaService.save(pastureArea);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    public R update(@RequestBody PastureAreaEntity pastureArea){
+		pastureAreaService.updateById(pastureArea);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    public R delete(@RequestBody Integer[] ids){
+		pastureAreaService.removeByIds(Arrays.asList(ids));
+
+        return R.ok();
+    }
+
+    /**
+     * 查询所有
+     */
+    @RequestMapping("/findAll")
+    public R findAll(@RequestBody Integer formFarmId){
+        if (formFarmId == null){
+            return R.error("请先选择牧场");
+        }
+        List list = pastureAreaService.findAll(formFarmId);
+
+        return R.ok().put("all",list);
+    }
+
+
+
+
+
+}

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

@@ -0,0 +1,84 @@
+ package com.huimv.management.controller;
+
+import java.util.Arrays;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.huimv.management.entity.PublicNetworkEntity;
+import com.huimv.management.service.PublicNetworkService;
+import com.huimv.common.utils.PageUtils;
+import com.huimv.common.utils.R;
+
+
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-06-24 09:55:37
+ */
+@RestController
+@RequestMapping("management/publicnetwork")
+public class PublicNetworkController {
+    @Autowired
+    private PublicNetworkService publicNetworkService;
+
+    /**
+     * 列表
+     */
+    @RequestMapping("/list")
+    public R list(@RequestParam Map<String, Object> params){
+        PageUtils page = publicNetworkService.queryPage(params);
+
+        return R.ok().put("page", page);
+    }
+
+
+    /**
+     * 信息
+     */
+    @RequestMapping("/info/{id}")
+    public R info(@PathVariable("id") Integer id){
+		PublicNetworkEntity publicNetwork = publicNetworkService.getById(id);
+
+        return R.ok().put("publicNetwork", publicNetwork);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    public R save(@RequestBody PublicNetworkEntity publicNetwork){
+		publicNetworkService.save(publicNetwork);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    public R update(@RequestBody PublicNetworkEntity publicNetwork){
+		publicNetworkService.updateById(publicNetwork);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    public R delete(@RequestBody Integer[] ids){
+		publicNetworkService.removeByIds(Arrays.asList(ids));
+
+        return R.ok();
+    }
+
+}

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

@@ -3,7 +3,9 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.*;
 
+import com.huimv.management.entity.UnitEntity;
 import com.huimv.management.entity.vo.CountOut;
+import com.huimv.management.service.UnitService;
 import io.swagger.annotations.Api;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -101,10 +103,16 @@ public class YearPigBaseController {
 
         return R.ok();
     } */
+    @Autowired
+    private UnitService unitService;
     //批量入栏
     @RequestMapping("/batchLairage")
     public R batchLairage(@RequestBody YearPigBaseEntity yearPigBase){
-
+        Integer unitId = yearPigBase.getUnitId();
+        UnitEntity unitEntity = unitService.getById(unitId);
+        if (unitEntity != null){
+            yearPigBase.setPeriodId(unitEntity.getCurrentPeriodId());
+        }
         for (String eartage : yearPigBase.getEartag().split(",")) {
             yearPigBase.setEartag(eartage);
             yearPigBaseService.save(yearPigBase);

huimv-smart-management/src/main/java/com/huimv/management/dao/CameraInfoDao.java

@@ -0,0 +1,19 @@
+package com.huimv.management.dao;
+
+import com.huimv.management.entity.CameraInfoEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-06-24 09:55:37
+ */
+@Mapper
+@Repository
+public interface CameraInfoDao extends BaseMapper<CameraInfoEntity> {
+	
+}

huimv-smart-management/src/main/java/com/huimv/management/dao/PastureAreaDao.java

@@ -0,0 +1,19 @@
+package com.huimv.management.dao;
+
+import com.huimv.management.entity.PastureAreaEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-06-24 09:55:37
+ */
+@Mapper
+@Repository
+public interface PastureAreaDao extends BaseMapper<PastureAreaEntity> {
+	
+}

huimv-smart-management/src/main/java/com/huimv/management/dao/PublicNetworkDao.java

@@ -0,0 +1,19 @@
+package com.huimv.management.dao;
+
+import com.huimv.management.entity.PublicNetworkEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-06-24 09:55:37
+ */
+@Mapper
+@Repository
+public interface PublicNetworkDao extends BaseMapper<PublicNetworkEntity> {
+	
+}

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

@@ -0,0 +1,64 @@
+package com.huimv.management.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-06-24 09:55:37
+ */
+@Data
+@TableName("camera_info")
+public class CameraInfoEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 
+	 */
+	private String name;
+	/**
+	 * 
+	 */
+	private String account;
+	/**
+	 * 
+	 */
+	private String password;
+	/**
+	 * 
+	 */
+	private String areaName;
+	/**
+	 * 
+	 */
+	private String ip;
+	/**
+	 * 
+	 */
+	private Integer areaId;
+	/**
+	 * 
+	 */
+	private Integer farmId;
+	/**
+	 * 
+	 */
+	private String remark;
+	/**
+	 * 
+	 */
+	private Integer attention;
+
+}

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

@@ -0,0 +1,52 @@
+package com.huimv.management.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-06-24 09:55:37
+ */
+@Data
+@TableName("pasture_area")
+public class PastureAreaEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 
+	 */
+	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/PublicNetworkEntity.java

@@ -0,0 +1,44 @@
+package com.huimv.management.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-06-24 09:55:37
+ */
+@Data
+@TableName("public_network")
+public class PublicNetworkEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 
+	 */
+	private String url;
+	/**
+	 * 
+	 */
+	private Date creationTime;
+	/**
+	 * 
+	 */
+	private Integer farmId;
+	/**
+	 * 
+	 */
+	private String remark;
+
+}

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

@@ -0,0 +1,23 @@
+package com.huimv.management.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.common.utils.PageUtils;
+import com.huimv.management.entity.CameraInfoEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-06-24 09:55:37
+ */
+public interface CameraInfoService extends IService<CameraInfoEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+
+    List getCameraDetails(String areaIds,Integer formFarmId);
+}
+

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

@@ -0,0 +1,23 @@
+package com.huimv.management.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.common.utils.PageUtils;
+import com.huimv.management.entity.PastureAreaEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-06-24 09:55:37
+ */
+public interface PastureAreaService extends IService<PastureAreaEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+
+    List findAll(Integer formFarmId);
+}
+

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

@@ -0,0 +1,20 @@
+package com.huimv.management.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.common.utils.PageUtils;
+import com.huimv.management.entity.PublicNetworkEntity;
+
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-06-24 09:55:37
+ */
+public interface PublicNetworkService extends IService<PublicNetworkEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+

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

@@ -0,0 +1,97 @@
+package com.huimv.management.service.impl;
+
+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;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+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.CameraInfoDao;
+import com.huimv.management.entity.CameraInfoEntity;
+import com.huimv.management.service.CameraInfoService;
+
+
+@Service("cameraInfoService")
+public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoDao, CameraInfoEntity> implements CameraInfoService {
+    @Autowired
+    private CameraInfoDao cameraInfoDao;
+
+    @Autowired
+    private PublicNetworkDao publicNetworkDao;
+
+    @Autowired
+    private PastureAreaDao pastureAreaDao;
+
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+
+        //根据牧场查询
+        String farmId = (String) params.get("farmId");
+
+        QueryWrapper<CameraInfoEntity> wrapper = new QueryWrapper<CameraInfoEntity>();
+        wrapper.eq(StringUtils.isNotBlank(farmId),"farm_id",farmId);
+        IPage<CameraInfoEntity> page = this.page(
+                new Query<CameraInfoEntity>().getPage(params),
+                wrapper
+        );
+
+        return new PageUtils(page);
+    }
+
+    @Override
+    public List getCameraDetails(String areaIds,Integer formFarmId) {
+        List cameraDetailsList = new ArrayList();
+        String[] split = areaIds.split(",");
+
+        QueryWrapper<CameraInfoEntity> wrapper = new QueryWrapper<CameraInfoEntity>();
+
+        QueryWrapper<PublicNetworkEntity> urlWrapper = new QueryWrapper<PublicNetworkEntity>();
+        urlWrapper.eq("farm_id",formFarmId);
+        String url = publicNetworkDao.selectOne(urlWrapper).getUrl();
+
+
+        for (String area : split) {
+            Integer areaId = Integer.parseInt(area);
+            wrapper.eq("area_id",areaId);
+            List<CameraInfoEntity> cameraList = cameraInfoDao.selectList(wrapper);
+
+            for (CameraInfoEntity cameraInfo : cameraList) {
+
+                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());
+
+                cameraDetailsList.add(map);
+            }
+        }
+
+        return cameraDetailsList;
+    }
+}

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

@@ -0,0 +1,85 @@
+package com.huimv.management.service.impl;
+
+import com.huimv.management.entity.PastureAreaEntity;
+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 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 ;
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+
+        //根据牧场查询
+        String farmId = (String) params.get("farmId");
+
+        QueryWrapper<PastureAreaEntity> wrapper = new QueryWrapper<PastureAreaEntity>();
+        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);
+        List<PastureAreaEntity> pastureAreaEntities = pastureAreaDao.selectList(wrapper);
+
+        return areaUtil(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);
+            }
+        }
+
+
+
+        return list;
+    }
+}

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

@@ -0,0 +1,37 @@
+package com.huimv.management.service.impl;
+
+import com.huimv.management.entity.PublicNetworkEntity;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.stereotype.Service;
+import java.util.Map;
+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.PublicNetworkDao;
+import com.huimv.management.entity.PublicNetworkEntity;
+import com.huimv.management.service.PublicNetworkService;
+
+
+@Service("publicNetworkService")
+public class PublicNetworkServiceImpl extends ServiceImpl<PublicNetworkDao, PublicNetworkEntity> implements PublicNetworkService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+
+        //根据牧场查询
+        String farmId = (String) params.get("farmId");
+
+        QueryWrapper<PublicNetworkEntity> wrapper = new QueryWrapper<PublicNetworkEntity>();
+        wrapper.eq(StringUtils.isNotBlank(farmId),"farm_id",farmId);
+        IPage<PublicNetworkEntity> page = this.page(
+                new Query<PublicNetworkEntity>().getPage(params),
+                wrapper
+        );
+
+        return new PageUtils(page);
+    }
+
+}

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

@@ -140,7 +140,6 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
         if (StringUtils.isNotEmpty(farmId)) {
             queryWrapper.eq("base.farm_id",Integer.parseInt(farmId));
         }
-
         //排除逻辑删除
         queryWrapper.apply(" base.deleted = 0  AND pigsty.deleted = 0 ");
 
@@ -161,17 +160,11 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
         }
     }
 
-
-
     @Override
     public void such(Integer[] ids) {
         pigBaseDao.such(ids);
     }
 
-
-
-
-
     @Override
     public Integer findByoutFenceStatus(int i, Integer farmId) {
         LambdaQueryWrapper<YearPigBaseEntity> wrapper = Wrappers.lambdaQuery();
@@ -182,7 +175,6 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
     }
 
 
-
     @Override
     public   Map<String ,Object> queryPageByRelationship(Map<String, Object> params) throws IllegalAccessException, NoSuchMethodException, InvocationTargetException {
 
@@ -214,6 +206,8 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
         // result.put("motherfather", motherfather);
 
 
+
+
         Object[] intArr = new Object[7];
         Map<String, String> selfmap = BeanUtils.describe(self);
         selfmap.put("name","self");

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

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.huimv.management.dao.CameraInfoDao">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.huimv.management.entity.CameraInfoEntity" id="cameraInfoMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="account" column="account"/>
+        <result property="password" column="password"/>
+        <result property="areaName" column="area_name"/>
+        <result property="ip" column="ip"/>
+        <result property="areaId" column="area_id"/>
+        <result property="farmId" column="farm_id"/>
+        <result property="remark" column="remark"/>
+        <result property="attention" column="attention"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.huimv.management.dao.PastureAreaDao">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.huimv.management.entity.PastureAreaEntity" id="pastureAreaMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="sort" column="sort"/>
+        <result property="farmId" column="farm_id"/>
+        <result property="attention" column="attention"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.huimv.management.dao.PublicNetworkDao">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.huimv.management.entity.PublicNetworkEntity" id="publicNetworkMap">
+        <result property="id" column="id"/>
+        <result property="url" column="url"/>
+        <result property="creationTime" column="creation_time"/>
+        <result property="farmId" column="farm_id"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+
+</mapper>