监控模块

huimv-huyang-admin/src/main/java/com/huimv/admin/common/utils/IpUtil.java

@@ -0,0 +1,53 @@
+package com.huimv.admin.common.utils;
+
+import javax.servlet.http.HttpServletRequest;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+/**
+     * @Project : huimv.shiwan
+     * @Package : com.huimv.video.util
+     * @Description : 获取ip地址工具类
+     * @Author : yuxuexuan
+     * @Create : 2021/3/4 0006 14:28
+     **/
+    public class IpUtil {
+        public static String getIpAddr(HttpServletRequest request) {
+            String ipAddress = null;
+            try {
+                ipAddress = request.getHeader("x-forwarded-for");
+                if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+                    ipAddress = request.getHeader("Proxy-Client-IP");
+                }
+                if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+                    ipAddress = request.getHeader("WL-Proxy-Client-IP");
+                }
+                if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+                    ipAddress = request.getRemoteAddr();
+                    if (ipAddress.equals("127.0.0.1")) {
+                        // 根据网卡取本机配置的IP
+                        InetAddress inet = null;
+                        try {
+                            inet = InetAddress.getLocalHost();
+                        } catch (UnknownHostException e) {
+                            e.printStackTrace();
+                        }
+                        ipAddress = inet.getHostAddress();
+                    }
+                }
+                // 对于通过多个代理的情况，第一个IP为客户端真实IP,多个IP按照','分割
+                if (ipAddress != null && ipAddress.length() > 15) { // "***.***.***.***".length()
+                    // = 15
+                    if (ipAddress.indexOf(",") > 0) {
+                        ipAddress = ipAddress.substring(0, ipAddress.indexOf(","));
+                    }
+                }
+            } catch (Exception e) {
+                ipAddress = "";
+            }
+            // ipAddress = this.getRequest().getRemoteAddr();
+
+            return ipAddress;
+        }
+
+    }

huimv-huyang-admin/src/main/java/com/huimv/admin/controller/SysCameraAreaController.java

@@ -0,0 +1,125 @@
+package com.huimv.admin.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.huimv.admin.common.utils.IpUtil;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
+import com.huimv.admin.entity.SysCamera;
+import com.huimv.admin.entity.SysCameraArea;
+import com.huimv.admin.service.ISysCameraAreaService;
+import com.huimv.admin.service.ISysCameraService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-01
+ */
+@RestController
+@RequestMapping("/admin/cameraArea")
+@CrossOrigin
+public class SysCameraAreaController {
+    @Autowired
+    private ISysCameraAreaService cameraAreaService;
+
+    @Autowired
+    private ISysCameraService cameraService;
+
+
+    @PostMapping("/list")
+    public Result list(@RequestBody Map<String, Object> params) {
+        return cameraAreaService.cameraList(params);
+    }
+
+    @PostMapping("/add")
+    public Result add(@RequestBody SysCameraArea cameraArea) {
+        int brandName = cameraAreaService.count(new QueryWrapper<SysCameraArea>().eq("area_name", cameraArea.getAreaName()).eq("farm_id", cameraArea.getFarmId()));
+        if (brandName > 0) {
+            return new Result(100001, "区域名称重复", false);
+        }
+        cameraAreaService.save(cameraArea);
+        return new Result(10000, "添加成功", true);
+    }
+
+    @PostMapping("/update")
+    public Result update(@RequestBody SysCameraArea cameraArea) {
+        cameraAreaService.updateById(cameraArea);
+        int brandName = cameraAreaService.count(new QueryWrapper<SysCameraArea>().eq("area_name", cameraArea.getAreaName()).eq("farm_id",cameraArea.getFarmId()));
+        if (brandName > 1) {
+            return new Result(100001, "区域名称重复", false);
+        }
+
+        String areaName = cameraArea.getAreaName();
+        SysCamera camera = new SysCamera();
+        if (StringUtils.isNotBlank(areaName)) {
+            camera.setAreaName(areaName);
+        }
+        UpdateWrapper<SysCamera> wrapper = new UpdateWrapper<>();
+        wrapper.eq("area_id", cameraArea.getId());
+        cameraService.update(camera, wrapper);
+
+
+        return new Result(10000, "修改成功", true);
+    }
+
+    @PostMapping("/updateStatus")
+    public Result updateStatus(@RequestBody Map<String, String> paramsMap) {
+        String id = paramsMap.get("id");
+        SysCameraArea sysCameraArea = cameraAreaService.getById(id);
+        sysCameraArea.setRunStatus(Math.abs(1-sysCameraArea.getRunStatus()));
+        cameraAreaService.updateById(sysCameraArea);
+        return new Result(10000, "修改成功", true);
+    }
+
+    @GetMapping("/remove")
+    public Result remove(@RequestParam(value = "ids") List<Integer> ids, @RequestParam(value = "farmId") String farmId) {
+
+        return cameraAreaService.removeIds(ids,farmId);
+
+    }
+
+
+    @GetMapping("/lsitAndCamera")
+    public Result lsitAndCamera(@RequestParam(value = "farmId") Integer farmId) {
+        return cameraAreaService.lsitAndCamera(farmId);
+
+    }
+
+    @PostMapping("/listCameraByArea")
+    public Result listCameraByArea(@RequestBody Map<String, String> paramsMap) {
+        String areaId = paramsMap.get("areaId");
+        List<SysCamera> list = cameraService.list(new QueryWrapper<SysCamera>().lambda().eq(SysCamera::getAreaId, areaId).eq(SysCamera::getRunStatus, 1).orderByAsc(SysCamera::getSort));
+        return new Result(ResultCode.SUCCESS,list);
+
+    }
+
+    @GetMapping("/listScreenCamera")
+    public Result listScreenCamera(@RequestParam(value = "farmId") Integer farmId) {
+        return cameraAreaService.listScreenCamera(farmId);
+
+    }
+
+
+    @GetMapping("/getUrl")
+    public void getUrl(HttpServletRequest request, @RequestParam(value = "farmId") Integer farmId) {
+        String ipAddr = IpUtil.getIpAddr(request);
+        QueryWrapper<SysCameraArea> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+        List<SysCameraArea> areas = cameraAreaService.list(queryWrapper);
+        for (SysCameraArea area : areas) {
+            area.setPublicUrl(ipAddr+":9080");
+            cameraAreaService.updateById(area);
+        }
+    }
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/controller/SysCameraBrandController.java

@@ -0,0 +1,76 @@
+package com.huimv.admin.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
+import com.huimv.admin.entity.SysCamera;
+import com.huimv.admin.entity.SysCameraBrand;
+import com.huimv.admin.service.ISysCameraBrandService;
+import com.huimv.admin.service.ISysCameraService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-01
+ */
+@RestController
+@RequestMapping("/cameraBrand")
+@CrossOrigin
+public class SysCameraBrandController {
+    @Autowired
+    private ISysCameraBrandService cameraBrandService;
+    @Autowired
+    private ISysCameraService cameraService;
+
+    @PostMapping("/list")
+    public Result list(@RequestBody Map<String, Object> params) {
+        return cameraBrandService.listPage(params);
+    }
+
+    @PostMapping("/add")
+    public Result add(@RequestBody SysCameraBrand cameraBrand) {
+        int brandName = cameraBrandService.count(new QueryWrapper<SysCameraBrand>().eq("brand_name", cameraBrand.getBrandName()).eq("farm_id", cameraBrand.getFarmId()));
+        if (brandName > 0) {
+            return new Result(10001, "品牌名称重复", false);
+        }
+
+        cameraBrandService.save(cameraBrand);
+        return new Result(10000, "添加成功", true);
+    }
+
+    @PostMapping("/update")
+    public Result update(@RequestBody SysCameraBrand cameraArea) {
+        cameraBrandService.updateById(cameraArea);
+        int brandName = cameraBrandService.count(new QueryWrapper<SysCameraBrand>().eq("brand_name", cameraArea.getBrandName()).eq("farm_id", cameraArea.getFarmId()));
+        if (brandName > 1) {
+            return new Result(10001, "品牌名称重复", false);
+        }
+        String areaName = cameraArea.getBrandName();
+        SysCamera camera = new SysCamera();
+        if (StringUtils.isNotBlank(areaName)) {
+            camera.setBrandName(areaName);
+        }
+        UpdateWrapper<SysCamera> wrapper = new UpdateWrapper<>();
+        wrapper.eq("brand_id", cameraArea.getId());
+        cameraService.update(camera, wrapper);
+
+        return new Result(ResultCode.SUCCESS, "修改成功");
+    }
+
+    @GetMapping("/remove")
+    public Result remove(@RequestParam(value = "ids") List<Integer> ids,@RequestParam(value = "farmId") String farmId) {
+        return cameraBrandService.removeIds(ids,farmId);
+    }
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/controller/SysCameraController.java

@@ -0,0 +1,81 @@
+package com.huimv.admin.controller;
+
+
+import com.huimv.admin.common.token.TokenSign;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
+import com.huimv.admin.entity.SysCamera;
+import com.huimv.admin.entity.vo.CameraListVo;
+import com.huimv.admin.entity.vo.CameraListsVo;
+import com.huimv.admin.service.ISysCameraService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-01
+ */
+@RestController
+@RequestMapping("/admin/cameraBase")
+@CrossOrigin
+public class SysCameraController {
+    @Autowired
+    private ISysCameraService cameraService;
+
+    @PostMapping("/list")
+    public Result list(@RequestBody CameraListVo cameraListVo) {
+        return cameraService.listPage(cameraListVo);
+    }
+
+    @PostMapping("/add")
+    public Result add(@RequestBody SysCamera camera) {
+        if (camera == null) {
+            return new Result(ResultCode.FAIL, "添加失败");
+        }
+        return cameraService.add(camera);
+
+    }
+
+    @PostMapping("/update")
+    public Result update(@RequestBody SysCamera camera) {
+        return cameraService.updates(camera);
+
+    }
+
+    @PostMapping("/updateStatus")
+    public Result updateStatus(@RequestBody Map<String, String> paramsMap) {
+        String id = paramsMap.get("id");
+        SysCamera sysCamera = cameraService.getById(id);
+        sysCamera.setRunStatus(Math.abs(1-sysCamera.getRunStatus()));
+        cameraService.updateById(sysCamera);
+        return new Result(10000, "修改成功", true);
+    }
+
+    @GetMapping("/remove")
+    public Result remove(@RequestParam(value = "ids") List<Integer> ids) {
+        cameraService.removeByIds(ids);
+        return new Result(ResultCode.SUCCESS, "删除成功");
+    }
+
+    @PostMapping("/getCameraDetails")
+    private Result getCameraDetails(@RequestBody CameraListsVo cameraListsVo) throws InterruptedException {
+
+        List list = cameraService.getCameraDetails(cameraListsVo);
+        return new Result(ResultCode.SUCCESS, list);
+    }
+
+//    @GetMapping("/initCamera")
+//    private Result initCamera(@RequestParam(name = "farmId") Integer farmId, HttpServletRequest request) {
+//        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+//
+//        return cameraService.initCamera(farmId, userId);
+//    }
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/entity/SysCamera.java

@@ -0,0 +1,108 @@
+package com.huimv.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fhs.core.trans.vo.TransPojo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sys_camera")
+public class SysCamera implements Serializable, TransPojo {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 摄像头名字
+     */
+    private String cameraName;
+
+    /**
+     * 账号
+     */
+    private String account;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+    /**
+     * 区域名字
+     */
+    private String areaName;
+
+    /**
+     * 区域id
+     */
+    private Integer areaId;
+
+    @TableField(exist = false)
+    private String publicUrl;
+
+    /**
+     * 摄像头ip
+     */
+    private String cameraIp;
+
+    /**
+     * 0未关注，1关注
+     */
+    private Integer attention;
+
+    /**
+     * 品牌()
+     */
+    private String brandName;
+
+    /**
+     * 品牌id
+     */
+    private Integer brandId;
+
+    /**
+     * 1正常   0停用
+     */
+    private Integer runStatus;
+
+    private Integer sort;
+
+    private Integer farmId;
+
+    private Integer roomId;
+
+    /**
+     * icc 通道
+     */
+    private String iccChannel;
+
+    /**
+     * 功能点id
+     */
+    private Integer functionId;
+
+    /**
+     * 1在线  0离线
+     */
+    private Boolean isOnline;
+
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/entity/SysCameraArea.java

@@ -0,0 +1,47 @@
+package com.huimv.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fhs.core.trans.vo.TransPojo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sys_camera_area")
+public class SysCameraArea implements TransPojo {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 区域(单元)名称
+     */
+    private String areaName;
+
+    private Integer sort;
+
+    private Integer runStatus;
+
+    /**
+     * 不用管
+     */
+    private String remark;
+
+    private Integer farmId;
+
+    private String publicUrl;
+
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/entity/SysCameraBrand.java

@@ -0,0 +1,54 @@
+package com.huimv.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sys_camera_brand")
+public class SysCameraBrand implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 品牌名称
+     */
+    private String brandName;
+
+    /**
+     * 主
+     */
+    private String mainStream;
+
+    /**
+     * 辅
+     */
+    private String assistStream;
+
+    /**
+     * 0主码流，1辅码流
+     */
+    private Integer streamType;
+
+    private Integer farmId;
+
+
+}

huimv-huyang-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.SysCamera;
+import lombok.Data;
+
+@Data
+public class CameraBaseVo extends SysCamera {
+    private String ip;
+}

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

@@ -0,0 +1,17 @@
+package com.huimv.admin.entity.vo;
+
+
+import lombok.Data;
+
+@Data
+public class CameraListVo {
+    private Integer current;
+    private Integer size;
+    private String strchStr;
+    private Integer areaId;
+    private Integer brandId;
+    private Integer sort;
+    private Integer farmId;
+    private Integer isOnline;
+    private Integer functionId;
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/entity/vo/CameraListsVo.java

@@ -0,0 +1,19 @@
+package com.huimv.admin.entity.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.video.video.entity.vo
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/9/29 0029 13:54
+ **/
+@Data
+public class CameraListsVo extends CameraListVo {
+
+
+    List<Integer> cameraIds;
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/entity/vo/CameraVo.java

@@ -0,0 +1,23 @@
+package com.huimv.admin.entity.vo;
+
+import lombok.Data;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.video.video.entity
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/9/26 0026 14:56
+ **/
+@Data
+public class CameraVo {
+    private String wsUrl;
+    private Integer id;
+    private String rtspUrl;
+    private Integer areaId;
+    private String cameraName;
+    private Integer lastId;
+    private Integer nextId;
+    private String httpUrl;
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/mapper/SysCameraAreaMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.admin.entity.SysCameraArea;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-01
+ */
+public interface SysCameraAreaMapper extends BaseMapper<SysCameraArea> {
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/mapper/SysCameraBrandMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.admin.entity.SysCameraBrand;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-01
+ */
+public interface SysCameraBrandMapper extends BaseMapper<SysCameraBrand> {
+
+}

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

@@ -0,0 +1,24 @@
+package com.huimv.admin.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+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.SysCamera;
+import com.huimv.admin.entity.vo.CameraBaseVo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-01
+ */
+public interface SysCameraMapper extends BaseMapper<SysCamera> {
+
+    IPage<CameraBaseVo> listPage(Page<SysCamera> page, @Param(Constants.WRAPPER) QueryWrapper<SysCamera> wrapper);
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/service/ISysCameraAreaService.java

@@ -0,0 +1,30 @@
+package com.huimv.admin.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.entity.SysCameraArea;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-01
+ */
+public interface ISysCameraAreaService extends IService<SysCameraArea> {
+    Result cameraList(Map<String, Object> params);
+
+    Result removeIds(List<Integer> ids, String farmId);
+
+    Result lsitAndCamera(Integer farmId);
+
+    Result listScreenCamera(Integer farmId);
+/*
+    void sync(Map<String, Integer> params,List<UnitDto1> list);
+
+    void NewSync(Map<String, Integer> params, List<RegionDetailDto> regionDetailDto);*/
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/service/ISysCameraBrandService.java

@@ -0,0 +1,22 @@
+package com.huimv.admin.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.entity.SysCameraBrand;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-01
+ */
+public interface ISysCameraBrandService extends IService<SysCameraBrand> {
+    Result listPage(Map<String, Object> params);
+
+    Result removeIds(List<Integer> ids, String farmId);
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/service/ISysCameraService.java

@@ -0,0 +1,29 @@
+package com.huimv.admin.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.entity.SysCamera;
+import com.huimv.admin.entity.vo.CameraListVo;
+import com.huimv.admin.entity.vo.CameraListsVo;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-01
+ */
+public interface ISysCameraService extends IService<SysCamera> {
+    Result listPage(CameraListVo cameraListVo);
+
+    List getCameraDetails(CameraListsVo cameraListsVo) throws InterruptedException;
+
+    Result add(SysCamera camera);
+
+    Result updates(SysCamera camera);
+
+//    Result initCamera(Integer farmId, Integer userId);
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/service/impl/SysCameraAreaServiceImpl.java

@@ -0,0 +1,95 @@
+package com.huimv.admin.service.impl;
+
+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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
+import com.huimv.admin.entity.SysCamera;
+import com.huimv.admin.entity.SysCameraArea;
+import com.huimv.admin.mapper.SysCameraAreaMapper;
+import com.huimv.admin.mapper.SysCameraMapper;
+import com.huimv.admin.service.ISysCameraAreaService;
+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;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-01
+ */
+@Service
+public class SysCameraAreaServiceImpl extends ServiceImpl<SysCameraAreaMapper, SysCameraArea> implements ISysCameraAreaService {
+    @Autowired
+    private SysCameraMapper cameraMapper;
+
+
+    @Override
+    public Result cameraList(Map<String, Object> params) {
+
+        Integer current = (Integer) params.get("current");
+        Integer size = (Integer) params.get("size");
+        String areaName = (String) params.get("areaName");
+        String  farmId = (String) params.get("farmId");
+
+        IPage<SysCameraArea> list = page(new Page<>(current, size), new QueryWrapper<SysCameraArea>().like(StringUtils.isNotBlank(areaName), "area_name", areaName).eq("farm_id", farmId).orderByAsc("sort"));
+        return new Result(ResultCode.SUCCESS, list);
+    }
+
+    @Override
+    public Result removeIds(List<Integer> ids,String farmId) {
+        for (Integer id : ids) {
+            SysCameraArea byId = this.getById(id);
+
+            Integer areaId = cameraMapper.selectCount(new QueryWrapper<SysCamera>().eq("area_id", id).eq("farm_id", farmId));
+            if (areaId > 0) {
+                return new Result(10001, "删除失败,区域" + byId.getAreaName() + "仍然存在摄像头", false);
+            }
+        }
+        this.removeByIds(ids);
+        return new Result(10000, "删除成功", true);
+    }
+
+    @Override
+    public Result lsitAndCamera(Integer farmId) {
+        List endList = new ArrayList();
+
+        List<SysCameraArea> cameraAreaList = this.list(new QueryWrapper<SysCameraArea>().eq("farm_id", farmId).orderByAsc("sort"));
+
+        for (SysCameraArea cameraArea : cameraAreaList) {
+            Map map = new HashMap();
+            map.put("cameraName", cameraArea.getAreaName());
+            map.put("id", cameraArea.getId());
+            map.put("cameraList", cameraMapper.selectList(new QueryWrapper<SysCamera>().eq("area_id", cameraArea.getId()).orderByAsc("sort")));
+            endList.add(map);
+        }
+        return new Result(ResultCode.SUCCESS, endList);
+    }
+
+    @Override
+    public Result listScreenCamera(Integer farmId) {
+        List endList = new ArrayList();
+        List<SysCameraArea> cameraAreaList = this.list(new QueryWrapper<SysCameraArea>().eq("farm_id", farmId).eq("run_status",1).orderByAsc("sort"));
+
+        for (SysCameraArea cameraArea : cameraAreaList) {
+            Map map = new HashMap();
+            map.put("cameraName", cameraArea.getAreaName());
+            map.put("id", cameraArea.getId());
+            map.put("cameraList", cameraMapper.selectList(new QueryWrapper<SysCamera>().eq("area_id", cameraArea.getId()).eq("run_status",1).orderByAsc("sort")));
+            endList.add(map);
+        }
+        return new Result(ResultCode.SUCCESS, endList);
+    }
+
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/service/impl/SysCameraBrandServiceImpl.java

@@ -0,0 +1,57 @@
+package com.huimv.admin.service.impl;
+
+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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
+import com.huimv.admin.entity.SysCamera;
+import com.huimv.admin.entity.SysCameraBrand;
+import com.huimv.admin.mapper.SysCameraBrandMapper;
+import com.huimv.admin.mapper.SysCameraMapper;
+import com.huimv.admin.service.ISysCameraBrandService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-01
+ */
+@Service
+public class SysCameraBrandServiceImpl extends ServiceImpl<SysCameraBrandMapper, SysCameraBrand> implements ISysCameraBrandService {
+    @Autowired
+    private SysCameraMapper cameraMapper;
+
+    @Override
+    public Result listPage(Map<String, Object> params) {
+        Integer current = (Integer) params.get("current");
+        Integer size = (Integer) params.get("size");
+        String brandName = (String) params.get("brandName");
+        Integer farmId = Integer.parseInt(params.get("farmId").toString());
+        IPage<SysCameraBrand> list = page(new Page<>(current, size), new QueryWrapper<SysCameraBrand>().like(StringUtils.isNotBlank(brandName), "brand_name", brandName).eq("farm_id", farmId));
+        return new Result(ResultCode.SUCCESS, list);
+    }
+
+    @Override
+    public Result removeIds(List<Integer> ids,String farmId) {
+        for (Integer id : ids) {
+            Integer integer = cameraMapper.selectCount(new QueryWrapper<SysCamera>().eq("brand_id", id).eq("farm_id",farmId));
+            SysCameraBrand byId = this.getById(id);
+            if (integer != 0) {
+                return new Result(ResultCode.FAIL, "有" + byId.getBrandName() + "的摄像头在使用,删除失败");
+            }
+        }
+        this.removeByIds(ids);
+        return new Result(ResultCode.SUCCESS, "删除成功");
+    }
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/service/impl/SysCameraServiceImpl.java

@@ -0,0 +1,246 @@
+package com.huimv.admin.service.impl;
+
+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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
+import com.huimv.admin.entity.SysCamera;
+import com.huimv.admin.entity.SysCameraBrand;
+import com.huimv.admin.entity.vo.*;
+import com.huimv.admin.mapper.SysCameraAreaMapper;
+import com.huimv.admin.mapper.SysCameraBrandMapper;
+import com.huimv.admin.mapper.SysCameraMapper;
+import com.huimv.admin.service.ISysCameraService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-01
+ */
+@Service
+public class SysCameraServiceImpl extends ServiceImpl<SysCameraMapper, SysCamera> implements ISysCameraService {
+
+    @Autowired
+    private SysCameraMapper cameraBaseMapper;
+    @Autowired
+    private SysCameraAreaMapper cameraAreaMapper;
+    @Autowired
+    private SysCameraBrandMapper cameraBrandMapper;
+
+//    @Autowired
+//    private BaseScreenCameraAccountMapper cameraAccountMapper;
+
+    @Override
+    public Result listPage(CameraListVo cameraListVo) {
+        Integer current = cameraListVo.getCurrent();
+        String strchStr = cameraListVo.getStrchStr();
+        Integer size = cameraListVo.getSize();
+        Integer areaId = cameraListVo.getAreaId();
+        Integer brandId = cameraListVo.getBrandId();
+        Integer sort = cameraListVo.getSort();
+        Integer farmId = cameraListVo.getFarmId();
+        Integer isOnline = cameraListVo.getIsOnline();
+
+        QueryWrapper<SysCamera> wrapper = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(strchStr)) {
+            wrapper.and(i -> i.like("camera_name", strchStr)
+                    .or().like("camera_ip", strchStr));
+        }
+
+        if (farmId != null) {
+            wrapper.eq("farm_id", farmId);
+        }
+
+        if (areaId != null) {
+            wrapper.eq("area_id", areaId);
+        }
+
+        if (brandId != null) {
+            wrapper.eq("brand_id", brandId);
+        }
+
+        if (isOnline != null) {
+            wrapper.eq("is_online", isOnline);
+        }
+
+        if (sort == null) {
+            wrapper.orderByDesc("id");
+        } else if (sort == 1) {
+            wrapper.orderByDesc("sort");
+        } else {
+            wrapper.orderByAsc("sort");
+        }
+//        wrapper.orderByDesc("id");
+        return new Result(ResultCode.SUCCESS, page(new Page<>(current, size), wrapper));
+    }
+
+    @Override
+    public List getCameraDetails(CameraListsVo cameraListsVo) throws InterruptedException {
+        List<Integer> cameraIds = cameraListsVo.getCameraIds();
+        CameraListVo cameraListVo = new CameraListsVo();
+        cameraListVo.setCurrent(1);
+        cameraListVo.setSize(10000);
+        cameraListVo.setStrchStr(cameraListsVo.getStrchStr());
+        cameraListVo.setAreaId(cameraListsVo.getAreaId());
+        cameraListVo.setBrandId(cameraListsVo.getBrandId());
+        cameraListVo.setSort(cameraListsVo.getSort());
+
+        if (cameraIds == null || cameraIds.size() == 0) {
+            return null;
+        }
+        List cameraDetailsList = new ArrayList();
+        IPage<SysCamera> page = (IPage<SysCamera>) this.listPage(cameraListVo).getData();
+        List<SysCamera> list = page.getRecords();
+        int i = 0;
+        final String farmAppPort = "8081";
+        final String farmVideoApp = "/appleVideo/play?";
+        final String hlsMediaPort = "85";
+        for (Integer cameraId : cameraIds) {
+            for (SysCamera camera : list) {
+                if (cameraId.equals(camera.getId())) {
+
+                    String cameraAccount = camera.getAccount();
+                    String cameraPassword = camera.getPassword();
+                    String camerIp = camera.getCameraIp();
+                    String cameraName = camera.getCameraName();
+                    Integer areaId = camera.getAreaId();
+                    String url = cameraAreaMapper.selectById(areaId).getPublicUrl();
+                    String rtsp;
+                    SysCameraBrand cameraBrand = cameraBrandMapper.selectById(camera.getBrandId());
+                    Integer type = cameraBrand.getStreamType();
+                    if (type == 0) {
+                        rtsp = cameraBrand.getMainStream();
+                    } else {
+                        rtsp = cameraBrand.getAssistStream();
+                    }
+                    CameraVo cameraVo = new CameraVo();
+                    cameraVo.setId(camera.getId());
+                    cameraVo.setAreaId(areaId);
+
+                    cameraVo.setWsUrl("ws://" + url + "/camera_relay?tcpaddr=" + cameraAccount + "%3A" + cameraPassword + "%40" + camerIp /*+ "/h265/ch1/main/av_stream"*/);
+                    cameraVo.setRtspUrl("rtsp://" + cameraAccount + ":" + cameraPassword + "@" + camerIp + rtsp);
+
+                    cameraVo.setCameraName(cameraName);
+                    cameraVo.setHttpUrl(handleHlsHttpUrl(url,cameraAccount,cameraPassword,camerIp,farmAppPort,farmVideoApp,hlsMediaPort));
+                    if (i > 0) {
+                        cameraVo.setLastId(list.get(i - 1).getId());
+                    }
+                    if (i < list.size() - 1) {
+                        cameraVo.setNextId(list.get(i + 1).getId());
+                    }
+                    cameraDetailsList.add(cameraVo);
+                }
+            }
+            i++;
+        }
+        return cameraDetailsList;
+    }
+
+    //构造HlsHttp地址
+    private String handleHlsHttpUrl(String url, String cameraAccount, String cameraPassword, String camerIp, String farmAppPort, String farmVideoApp, String hlsMediaPort) {
+        url = url.substring(0, url.indexOf(":"));
+        url = "http://" + url;
+        //return url+":"+farmAppPort+farmVideoApp+"url="+cameraAccount + ":" + cameraPassword + "@" + camerIp+"&name="+"&dt=3000&targetUrl="+url+":"+hlsMediaPort;
+        return url + ":" + farmAppPort + farmVideoApp + "url=" + cameraAccount + ":" + cameraPassword + "@" + camerIp + "&dt=3000&targetUrl=" + url + ":" + hlsMediaPort;
+    }
+
+    @Override
+    public Result add(SysCamera camera) {
+        Integer areaId = camera.getAreaId();
+        Integer brandId = camera.getBrandId();
+
+        int brandName = this.count(new QueryWrapper<SysCamera>().eq("camera_name", camera.getCameraName()).eq("farm_id", camera.getFarmId()));
+        if (brandName > 0) {
+            return new Result(10001, "摄像头名称重复", false);
+        }
+        if (areaId != null) {
+            camera.setAreaName(cameraAreaMapper.selectById(areaId).getAreaName());
+        }
+        if (brandId != null) {
+            camera.setBrandName(cameraBrandMapper.selectById(brandId).getBrandName());
+        }
+        this.save(camera);
+
+        return new Result(10000, "添加成功", true);
+    }
+
+    @Override
+    public Result updates(SysCamera camera) {
+        Integer areaId = camera.getAreaId();
+        Integer brandId = camera.getBrandId();
+        this.updateById(camera);
+        int brandName = this.count(new QueryWrapper<SysCamera>().eq("camera_name", camera.getCameraName()));
+        if (brandName > 1) {
+            return new Result(10001, "摄像头名称重复", false);
+        }
+        if (areaId != null) {
+            camera.setAreaName(cameraAreaMapper.selectById(areaId).getAreaName());
+        }
+        if (brandId != null) {
+            camera.setBrandName(cameraBrandMapper.selectById(brandId).getBrandName());
+        }
+        this.updateById(camera);
+        return new Result(10000, "修改成功", true);
+    }
+
+//    @Override
+//    public Result initCamera(Integer farmId, Integer userId) {
+//        BaseScreenCameraAccount cameraAccount = cameraAccountMapper.selectOne(new QueryWrapper<BaseScreenCameraAccount>().eq("farm_id", farmId).eq("account_id", userId));
+//        Integer cameraId;
+//        if (ObjectUtil.isEmpty(cameraAccount)) {
+//            cameraId = this.getOne(new QueryWrapper<SysCamera>().eq("run_status", 1).eq("farm_id", farmId).last("limit 1")).getId();
+//        } else {
+//            cameraId = cameraAccount.getCameraId();
+//        }
+//
+//
+//        SysCamera camera = this.getById(cameraId);
+//        if (camera.getRunStatus() == 0) {
+//            return new Result(10001, "该摄像头已经被禁用", false);
+//        }
+//
+//        return new Result(ResultCode.SUCCESS, getCameraVo(camera));
+//    }
+
+    public CameraVo getCameraVo(SysCamera camera) {
+
+        String cameraAccount = camera.getAccount();
+        String cameraPassword = camera.getPassword();
+        String camerIp = camera.getCameraIp();
+        String cameraName = camera.getCameraName();
+        Integer areaId = camera.getAreaId();
+        String url = cameraAreaMapper.selectById(areaId).getPublicUrl();
+
+        String rtsp;
+        SysCameraBrand cameraBrand = cameraBrandMapper.selectById(camera.getBrandId());
+        Integer type = cameraBrand.getStreamType();
+        if (type == 0) {
+            rtsp = cameraBrand.getMainStream();
+        } else {
+            rtsp = cameraBrand.getAssistStream();
+        }
+
+
+        CameraVo cameraVo = new CameraVo();
+        cameraVo.setAreaId(areaId);
+
+        cameraVo.setWsUrl("ws://" + url + "/camera_relay?tcpaddr=" + cameraAccount + "%3A" + cameraPassword + "%40" + camerIp);
+        cameraVo.setRtspUrl("rtsp://" + cameraAccount + ":" + cameraPassword + "@" + camerIp + rtsp);
+        cameraVo.setCameraName(cameraName);
+        return cameraVo;
+    }
+
+
+}

huimv-huyang-admin/src/main/resources/mapper/AccountGroupMapper.xml

@@ -0,0 +1,9 @@
+<?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.admin.mapper.AccountGroupMapper">
+
+
+    <delete id="removeAccountGroup">
+        DELETE FROM sys_account_group WHERE account_id=#{accountId}
+    </delete>
+</mapper>

huimv-huyang-admin/src/main/resources/mapper/GroupMenuMapper.xml

@@ -0,0 +1,10 @@
+<?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.admin.mapper.GroupMenuMapper">
+
+
+
+    <delete id="removeGroupMenu">
+        DELETE FROM sys_group_menu WHERE group_id=#{groupId}
+    </delete>
+</mapper>

huimv-huyang-admin/src/main/resources/mapper/MenuMapper.xml

@@ -0,0 +1,32 @@
+<?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.admin.mapper.MenuMapper">
+
+
+    <select id="getMyMenu" resultType="com.huimv.admin.entity.Menu">
+        SELECT * FROM sys_menu
+        WHERE id IN
+        (SELECT DISTINCT(menu_id) FROM sys_group_menu WHERE group_id IN
+        (SELECT group_id FROM sys_account_group WHERE account_id=#{accountName} ))
+         AND id IN
+         <foreach collection="array"   item="farmMenu"  open="(" separator=","   close=")">
+            #{farmMenu}
+        </foreach>
+        ORDER BY sort ASC
+    </select>
+
+
+    <select id="getMyButton" resultType="string">
+        SELECT permission FROM sys_menu
+        WHERE id IN
+        (SELECT DISTINCT(menu_id) FROM sys_group_menu WHERE group_id IN
+        (SELECT group_id FROM sys_account_group WHEGroupMenuMapper.xmlRE
+        account_id=#{userId}))
+        AND id IN
+        <foreach collection="array"   item="farmMenu"  open="(" separator=","   close=")">
+            #{farmMenu}
+        </foreach>
+        and weight =2
+        ORDER BY sort ASC
+    </select>
+</mapper>

huimv-huyang-admin/src/main/resources/mapper/SysAccountGroupMapper.xml

@@ -1,10 +0,0 @@
-<?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.admin.mapper.SysAccountGroupMapper">
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, account_id, group_id
-    </sql>
-
-</mapper>

huimv-huyang-admin/src/main/resources/mapper/SysAccountMultilevelMapper.xml

@@ -0,0 +1,9 @@
+<?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.admin.mapper.SysAccountMultilevelMapper">
+
+
+    <select id="getLowerLevel" resultType="java.lang.Integer">
+        SELECT id FROM sys_account_multilevel WHERE  pids  LIKE  concat('%',#{userId},'%')   AND  farm_ids LIKE concat('%', #{farmId},'%')
+    </select>
+</mapper>

huimv-huyang-admin/src/main/resources/mapper/SysCameraMapper.xml

@@ -0,0 +1,30 @@
+<?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.admin.mapper.SysCameraMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.admin.entity.SysCamera">
+        <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 sys_camera cb left join sys_camera_area ca on cb.region_uuid =ca.region_uuid
+        ${ew.customSqlSegment}
+    </select>
+</mapper>

huimv-huyang-admin/src/main/resources/mapper/SysGroupMapper.xml

@@ -1,10 +0,0 @@
-<?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.admin.mapper.SysGroupMapper">
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, group_name, remark, account_id
-    </sql>
-
-</mapper>

huimv-huyang-admin/src/main/resources/mapper/SysGroupMenuMapper.xml

@@ -1,10 +0,0 @@
-<?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.admin.mapper.SysGroupMenuMapper">
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, group_id, menu_id, is_all
-    </sql>
-
-</mapper>

huimv-huyang-admin/src/main/resources/mapper/SysMenuMapper.xml

@@ -1,10 +0,0 @@
-<?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.admin.mapper.SysMenuMapper">
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, title, url, remark, parent_id, sort, weight, permission, if_show
-    </sql>
-
-</mapper>