更新摄像头等功能

huimv-farm-v2/huimv-admin/pom.xml

@@ -12,15 +12,17 @@
     <artifactId>huimv-admin</artifactId>
     <dependencies>
         <dependency>
-            <groupId>com.auth0</groupId>
-            <artifactId>java-jwt</artifactId>
-            <version>3.3.0</version>
+            <groupId>cn.dustlight.captcha</groupId>
+            <artifactId>redis-store</artifactId>
+            <version>0.0.6</version>
         </dependency>
         <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt</artifactId>
-            <version>0.9.1</version>
+            <groupId>com.huimv</groupId>
+            <artifactId>huimv-common</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
+
+
         <dependency>
             <groupId>cn.dustlight.captcha</groupId>
             <artifactId>captcha-core</artifactId>

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/HuimvAdminApplication.java

@@ -1,14 +1,14 @@
 package com.huimv.admin;
 
+import com.huimv.common.config.InterceptorConfig;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.ApplicationContext;
-import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.context.annotation.Import;
 
 @SpringBootApplication
-@EnableScheduling
 @MapperScan("com.huimv.admin.mapper")
+@Import(InterceptorConfig.class)
 public class HuimvAdminApplication {
 
     public static void main(String[] args) {

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/controller/AccountController.java

@@ -3,8 +3,8 @@ package com.huimv.admin.controller;
 
 import com.huimv.admin.entity.Account;
 import com.huimv.admin.service.IAccountService;
-import com.huimv.admin.utils.Result;
-import com.huimv.admin.utils.ResultCode;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -15,7 +15,6 @@ import java.util.List;
  * @since 2021-09-09
  */
 @RestController
-@CrossOrigin
 @RequestMapping("/account")
 public class AccountController {
     @Autowired

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/controller/AuthorizeController.java

@@ -3,15 +3,14 @@ package com.huimv.admin.controller;
 import com.huimv.admin.entity.Menu;
 import com.huimv.admin.service.IAuthorizeService;
 import com.huimv.admin.service.IMenuService;
-import com.huimv.admin.utils.Result;
-import com.huimv.admin.utils.ResultCode;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Map;
 
-@CrossOrigin
 @RestController
 @RequestMapping(value = "/auth")
 public class AuthorizeController {

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/controller/LoginController.java

@@ -1,14 +1,14 @@
 package com.huimv.admin.controller;
 
 import com.huimv.admin.entity.Account;
-import com.huimv.admin.exception.ExceptionEnum;
-import com.huimv.admin.exception.MiException;
+import com.huimv.common.exception.ExceptionEnum;
+import com.huimv.common.exception.MiException;
 import com.huimv.admin.service.ILoginService;
 import com.huimv.admin.session.AccessToken;
-import com.huimv.admin.token.TokenSign;
-import com.huimv.admin.utils.Result;
-import com.huimv.admin.utils.ResultCode;
-import com.huimv.admin.utils.VerifyUtil;
+import com.huimv.common.token.TokenSign;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import com.huimv.common.utils.VerifyUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
@@ -19,7 +19,6 @@ import java.util.Date;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-@CrossOrigin
 @RestController
 @RequestMapping(value = "/my")
 public class LoginController {

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/controller/MenuController.java

@@ -2,11 +2,10 @@ package com.huimv.admin.controller;
 
 import com.huimv.admin.entity.Menu;
 import com.huimv.admin.service.IMenuService;
-import com.huimv.admin.utils.Result;
+import com.huimv.common.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-@CrossOrigin
 @RestController
 @RequestMapping("/menu")
 public class MenuController {

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/controller/SysGroupController.java

@@ -3,14 +3,13 @@ package com.huimv.admin.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huimv.admin.entity.Group;
 import com.huimv.admin.service.IGroupService;
-import com.huimv.admin.utils.Result;
+import com.huimv.common.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
 
 
-@CrossOrigin
 @RestController
 @RequestMapping("/group")
 public class SysGroupController {

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/controller/SysUserController.java

@@ -4,14 +4,13 @@ package com.huimv.admin.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.huimv.admin.entity.User;
 import com.huimv.admin.service.IUserService;
-import com.huimv.admin.utils.Result;
+import com.huimv.common.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Map;
 
-@CrossOrigin
 @RestController
 @RequestMapping("/user")
 public class SysUserController {

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/entity/Account.java

@@ -35,7 +35,7 @@ public class Account extends Model {
 
     private String remark;
 
-    private Long userId;
+    private String userId;
 
     private String mobile;
 

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/entity/User.java

@@ -41,7 +41,7 @@ public class User extends Model {
 
     private String remark;
 
-    private Long userId;
+    private String userId;
 
 
 }

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/entity/dto/UserAccountDto.java

@@ -21,7 +21,7 @@ public class UserAccountDto {
 
      private  String remark;
 
-     private  Long userId;
+     private  String userId;
 
      private  String accountName;
 

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/service/IAccountService.java

@@ -2,7 +2,7 @@ package com.huimv.admin.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.admin.entity.Account;
-import com.huimv.admin.utils.Result;
+import com.huimv.common.utils.Result;
 
 import java.util.List;
 

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/service/IAuthorizeService.java

@@ -1,7 +1,7 @@
 package com.huimv.admin.service;
 
 
-import com.huimv.admin.utils.Result;
+import com.huimv.common.utils.Result;
 
 import java.util.List;
 

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/service/IGroupService.java

@@ -3,7 +3,7 @@ package com.huimv.admin.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.admin.entity.Group;
-import com.huimv.admin.utils.Result;
+import com.huimv.common.utils.Result;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.Map;

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/service/ILoginService.java

@@ -1,7 +1,7 @@
 package com.huimv.admin.service;
 
 
-import com.huimv.admin.utils.Result;
+import com.huimv.common.utils.Result;
 
 public interface ILoginService {
 

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/service/IMenuService.java

@@ -2,7 +2,7 @@ package com.huimv.admin.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.admin.entity.Menu;
-import com.huimv.admin.utils.Result;
+import com.huimv.common.utils.Result;
 
 import java.util.List;
 import java.util.Map;

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/service/IUserService.java

@@ -3,7 +3,7 @@ package com.huimv.admin.service;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.admin.entity.User;
-import com.huimv.admin.utils.Result;
+import com.huimv.common.utils.Result;
 
 import java.util.List;
 

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/service/impl/AccountServiceImpl.java

@@ -6,9 +6,9 @@ import com.huimv.admin.entity.User;
 import com.huimv.admin.mapper.AccountMapper;
 import com.huimv.admin.mapper.UserMapper;
 import com.huimv.admin.service.IAccountService;
-import com.huimv.admin.utils.GetMD5Str;
-import com.huimv.admin.utils.Result;
-import com.huimv.admin.utils.ResultCode;
+import com.huimv.common.utils.GetMD5Str;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/service/impl/AuthorizeServiceImpl.java

@@ -9,8 +9,8 @@ import com.huimv.admin.mapper.AccountGroupMapper;
 import com.huimv.admin.mapper.GroupMenuMapper;
 import com.huimv.admin.mapper.MenuMapper;
 import com.huimv.admin.service.IAuthorizeService;
-import com.huimv.admin.utils.Result;
-import com.huimv.admin.utils.ResultCode;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/service/impl/GroupServiceImpl.java

@@ -9,7 +9,7 @@ import com.huimv.admin.entity.GroupMenu;
 import com.huimv.admin.mapper.GroupMapper;
 import com.huimv.admin.mapper.GroupMenuMapper;
 import com.huimv.admin.service.IGroupService;
-import com.huimv.admin.utils.Result;
+import com.huimv.common.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -28,14 +28,14 @@ import java.util.Map;
 @Service
 public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements IGroupService {
     @Autowired
-    private GroupMapper GroupMapper;
+    private GroupMapper groupMapper;
     @Autowired
     private GroupMenuMapper groupMenuMapper;
 
     @Override
     public Result updateGroup(@RequestBody Group group) {
         try {
-            GroupMapper.updateById(group);
+            groupMapper.updateById(group);
             return new Result(10000,"修改成功",true);
         }catch (Exception e){
             return new Result(10001,"修改失败",false);
@@ -46,12 +46,12 @@ public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements
     @Transactional
     public Result removeGroup(Integer groupId) {
         try {
-            Group group = this.GroupMapper.selectById(groupId);
+            Group group = this.groupMapper.selectById(groupId);
             if (group == null) {
                 return new Result(10002,"请选择数据",false);
             }
             // 删除权限组
-            this.GroupMapper.deleteById(groupId);
+            this.groupMapper.deleteById(groupId);
             // 删除权限组关联菜单
             QueryWrapper<GroupMenu> groupMenuQueryWrapper = new QueryWrapper<>();
             groupMenuQueryWrapper.eq("group_id",groupId);
@@ -73,7 +73,7 @@ public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements
     @Override
     public Result addGroup(Group group) {
         try {
-            GroupMapper.insert(group);
+            groupMapper.insert(group);
             return new Result(10000,"添加成功",true);
         }catch (Exception e){
             return new Result(10001,"添加失败",false);

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/service/impl/LoginServiceImpl.java

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.admin.entity.Account;
 import com.huimv.admin.mapper.AccountMapper;
 import com.huimv.admin.service.ILoginService;
-import com.huimv.admin.utils.Result;
-import com.huimv.admin.utils.ResultCode;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/service/impl/MenuServiceImpl.java

@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.admin.entity.Menu;
 import com.huimv.admin.mapper.MenuMapper;
 import com.huimv.admin.service.IMenuService;
-import com.huimv.admin.utils.Result;
-import com.huimv.admin.utils.ResultCode;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/service/impl/UserServiceImpl.java

@@ -9,9 +9,9 @@ import com.huimv.admin.entity.dto.UserAccountDto;
 import com.huimv.admin.mapper.AccountMapper;
 import com.huimv.admin.mapper.UserMapper;
 import com.huimv.admin.service.IUserService;
-import com.huimv.admin.utils.Result;
-import com.huimv.admin.utils.ResultCode;
-import com.huimv.admin.utils.SnowflakeSequence;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import com.huimv.common.utils.SnowflakeSequence;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -130,7 +130,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             SnowflakeSequence idWorker = new SnowflakeSequence();
             long userId = idWorker.nextId();
             // 添加用户信息
-            user.setUserId(userId);
+            user.setUserId(userId+"");
             userMapper.insert(user);
 
             // 添加账号信息
@@ -145,7 +145,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             Account.setAccountStatus(0);
             Account.setRemark("");
             Account.setPassword("123456");
-            Account.setUserId(userId);
+            Account.setUserId(userId+"");
             Account.setMobile(mobile);
             accountMapper.insert(Account);
             return new Result(10000,"添加成功",true);

huimv-farm-v2/huimv-admin/src/main/resources/application-dev.yml

@@ -5,12 +5,16 @@ spring:
   application:
     name: location
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv_farm_v2?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-    username: root
-    password: hm123456
+    url: jdbc:mysql://rm-bp1sz356vk48i43x64o.mysql.rds.aliyuncs.com/huimv_farm_v2?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    username: yxx_test
+    password: yxx123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
     hibernate:
       ddl-auto: update
     database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
-    show-sql: true
+    show-sql: true
+  redis:
+    host: 122.112.224.199
+    port: 6379
+    password: hm123456

huimv-farm-v2/huimv-common/pom.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>farm</artifactId>
+        <groupId>com.huimv</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>huimv-common</artifactId>
+    <description>每一个微服务公共的依赖,bean,工具类等</description>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>com.auth0</groupId>
+            <artifactId>java-jwt</artifactId>
+            <version>3.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+            <version>0.9.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+            <version>3.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.28</version>
+        </dependency>
+
+
+    </dependencies>
+
+
+
+
+</project>

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/config/InterceptorConfig.java

@@ -1,4 +1,4 @@
-package com.huimv.admin.config;
+package com.huimv.common.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/config/JWTInterceptor.java

@@ -1,8 +1,8 @@
-package com.huimv.admin.config;
+package com.huimv.common.config;
 
 import com.alibaba.fastjson.JSONObject;
-import com.huimv.admin.token.TokenConstant;
-import com.huimv.admin.token.TokenSign;
+import com.huimv.common.token.TokenConstant;
+import com.huimv.common.token.TokenSign;
 import io.jsonwebtoken.Claims;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerInterceptor;

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/config/MybatisPlusConfig.java

@@ -1,4 +1,4 @@
-package com.huimv.admin.config;
+package com.huimv.common.config;
 
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import org.springframework.context.annotation.Bean;

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/exception/ExceptionEnum.java

@@ -1,4 +1,4 @@
-package com.huimv.admin.exception;
+package com.huimv.common.exception;
 
 public enum ExceptionEnum implements MExceptionEnum{
    //自定义的状态码

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/exception/MExceptionEnum.java

@@ -1,4 +1,4 @@
-package com.huimv.admin.exception;
+package com.huimv.common.exception;
 
 public interface MExceptionEnum{
     public String getCode();

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/exception/MiException.java

@@ -1,4 +1,4 @@
-package com.huimv.admin.exception;
+package com.huimv.common.exception;
 
 
 public class MiException extends RuntimeException{

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/token/TokenConstant.java

@@ -1,4 +1,4 @@
-package com.huimv.admin.token;
+package com.huimv.common.token;
  
 import java.util.HashMap;
 import java.util.Map;

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/token/TokenSign.java

@@ -1,5 +1,5 @@
-package com.huimv.admin.token;
- 
+package com.huimv.common.token;
+
 import io.jsonwebtoken.*;
 import org.springframework.util.StringUtils;
 
@@ -11,7 +11,7 @@ public class TokenSign {
     /**
      * 过期时间60分钟
      */
-    private static final long EXPIRE_TIME= 60 *1000;
+    private static final long EXPIRE_TIME= 60 * 60 * 1000;
 
     /**
      * 私钥，使用它生成token，最好进行下加密

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/config/GeneratorCodeConfig.java

@@ -1,4 +1,4 @@
-package com.huimv.admin.config;
+package com.huimv.common.utils;
 
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/utils/GetMD5Str.java

@@ -1,4 +1,4 @@
-package com.huimv.admin.utils;
+package com.huimv.common.utils;
 
 import java.math.BigInteger;
 import java.security.MessageDigest;

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/utils/HttpUtils.java

@@ -1,4 +1,4 @@
-package com.huimv.admin.utils;
+package com.huimv.common.utils;
 
 import java.io.BufferedReader;
 import java.io.DataOutputStream;

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/utils/IpTools.java

@@ -1,4 +1,4 @@
-package com.huimv.admin.utils;
+package com.huimv.common.utils;
 
 import org.springframework.stereotype.Component;
 

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/utils/PageFactory.java

@@ -22,7 +22,7 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意
 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/xiaonuobase/snowy
 6.若您的项目无法满足以上几点，可申请商业授权，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package com.huimv.admin.utils;
+package com.huimv.common.utils;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/utils/PageResult.java

@@ -1,4 +1,4 @@
-package com.huimv.admin.utils;
+package com.huimv.common.utils;
 
 import java.util.List;
 

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/utils/PlatformException.java

@@ -7,7 +7,7 @@
  * @Version: V1.0
  * @Description:
  */
-package com.huimv.admin.utils;
+package com.huimv.common.utils;
 
 /**
  * @author yejijie

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/utils/Result.java

@@ -1,4 +1,4 @@
-package com.huimv.admin.utils;
+package com.huimv.common.utils;
 
 import java.io.Serializable;
 

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/utils/ResultCode.java

@@ -1,4 +1,4 @@
-package com.huimv.admin.utils;
+package com.huimv.common.utils;
 
 public enum ResultCode {
     SUCCESS(true,10000,"操作成功！"),

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/utils/SnowflakeSequence.java

@@ -1,4 +1,4 @@
-package com.huimv.admin.utils;
+package com.huimv.common.utils;
 
 import java.lang.management.ManagementFactory;
 import java.net.InetAddress;

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/utils/VerifyUtil.java

@@ -1,7 +1,7 @@
-package com.huimv.admin.utils;
+package com.huimv.common.utils;
 
-import com.huimv.admin.exception.ExceptionEnum;
-import com.huimv.admin.exception.MiException;
+import com.huimv.common.exception.ExceptionEnum;
+import com.huimv.common.exception.MiException;
 
 import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletRequest;

huimv-farm-v2/huimv-gateway/pom.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.4.1</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>huimv-gateway</artifactId>
+
+    <properties>
+        <java.version>1.8</java.version>
+        <spring-cloud.version>2020.0.0</spring-cloud.version>
+    </properties>
+
+    <dependencies>
+<!--        <dependency>-->
+<!--            <groupId>com.huimv</groupId>-->
+<!--            <artifactId>huimv-common</artifactId>-->
+<!--            <version>0.0.1-SNAPSHOT</version>-->
+<!--        </dependency>-->
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-gateway</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+            <version>0.9.1</version>
+        </dependency>
+
+<!--       限流-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis-reactive</artifactId>
+            <!--如果父项目中限定了版本的话，这里不需要再具体制定-->
+            <version>2.1.3.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
+            <version>2.2.1.RELEASE</version>
+        </dependency>
+
+    </dependencies>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>

huimv-farm-v2/huimv-gateway/src/main/java/com/farm/gateway/GatewayApplication.java

@@ -0,0 +1,42 @@
+package com.farm.gateway;
+
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.gateway.filter.ratelimit.KeyResolver;
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Mono;
+
+//@EnableDiscoveryClient
+@SpringBootApplication
+public class GatewayApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(GatewayApplication.class, args);
+    }
+
+    /**
+     * @Method      : tokenFilter
+     * @Description : 启动全局过滤器，如果全局过滤器不加@Component注解，就必须要在这里加配置。
+     * @Params      : []
+     * @Return      : com.znsoft.gateway2.filter.TokenFilter
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/1/9       
+     * @Time        : 11:11
+     */
+//    @Bean
+//    public TokenFilter tokenFilter(){
+//        return new TokenFilter();
+//    }
+
+    //注入bean
+    @Bean
+    public KeyResolver ipKeyResolver() {
+        return exchange -> Mono.just(exchange.getRequest().getRemoteAddress().getHostName());
+    }
+
+
+
+}

huimv-farm-v2/huimv-gateway/src/main/java/com/farm/gateway/config/CorsConfig.java

@@ -0,0 +1,67 @@
+package com.farm.gateway.config;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.server.reactive.ServerHttpRequest;
+import org.springframework.http.server.reactive.ServerHttpResponse;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.reactive.CorsUtils;
+import org.springframework.web.cors.reactive.CorsWebFilter;
+import org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource;
+import org.springframework.web.server.ServerWebExchange;
+import org.springframework.web.server.WebFilter;
+import org.springframework.web.server.WebFilterChain;
+import org.springframework.web.util.pattern.PathPatternParser;
+import reactor.core.publisher.Mono;
+
+/**
+ * 跨域配置
+ * @author chengwenbing
+ */
+@Configuration
+public class CorsConfig {
+//    @Bean
+//    public WebFilter corsFilter() {
+//        return (ServerWebExchange ctx, WebFilterChain chain) -> {
+//            ServerHttpRequest request = ctx.getRequest();
+//            if (CorsUtils.isCorsRequest(request)) {
+//                ServerHttpResponse response = ctx.getResponse();
+//                HttpHeaders headers = response.getHeaders();
+//                headers.set(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN, request.getHeaders().getOrigin());
+//                headers.add(HttpHeaders.ACCESS_CONTROL_ALLOW_HEADERS, "X-Token,Authorization,x-requested-with,Content-Type");
+//                headers.add(HttpHeaders.ACCESS_CONTROL_ALLOW_METHODS, "PUT,POST, GET, OPTIONS, DELETE");
+//                headers.add(HttpHeaders.ACCESS_CONTROL_ALLOW_CREDENTIALS, "true");
+//                headers.add(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, "*");
+//                headers.add(HttpHeaders.ACCESS_CONTROL_MAX_AGE, "3600");
+//                if (request.getMethod() == HttpMethod.OPTIONS) {
+//                    response.setStatusCode(HttpStatus.OK);
+//                    return Mono.empty();
+//                }
+//            }
+//            return chain.filter(ctx);
+//        };
+//    }
+@Bean
+public CorsWebFilter corsFilter() {
+    CorsConfiguration config = new CorsConfiguration();
+    config.addAllowedMethod("*");
+    config.addAllowedOrigin("*");
+    config.addAllowedHeader("*");
+    UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(new PathPatternParser());
+    source.registerCorsConfiguration("/**", config);
+    return new CorsWebFilter(source);
+}
+
+}

huimv-farm-v2/huimv-gateway/src/main/java/com/farm/gateway/filter/TokenFilter.java

@@ -0,0 +1,54 @@
+package com.farm.gateway.filter;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.gateway.filter.GatewayFilterChain;
+import org.springframework.cloud.gateway.filter.GlobalFilter;
+import org.springframework.core.Ordered;
+import org.springframework.http.server.reactive.ServerHttpRequest;
+import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Mono;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+// 注释该注解，过滤器就时效
+//@Component
+public class TokenFilter implements GlobalFilter, Ordered {
+    Logger logger = LoggerFactory.getLogger(TokenFilter.class);
+
+    @Override
+    public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
+        logger.info("========> 开始进行转发前过滤工作 ========>");
+        ServerHttpRequest request = exchange.getRequest();
+        logger.info("Path:"+request.getPath().value());
+        logger.info("HostName:"+request.getLocalAddress().getHostName());
+        logger.info("Port:"+request.getLocalAddress().getPort());
+        logger.info("Address:"+request.getLocalAddress().getAddress());
+        logger.info("QueryParams:"+request.getQueryParams().toString());
+        logger.info("URI:"+request.getURI().toString());
+        logger.info("<======== 转发前结束过滤工作 <========");
+//
+//        logger.info("StatusCode:"+exchange.getResponse().getStatusCode().toString());
+
+        // --过滤token--
+//        String token = exchange.getRequest().getQueryParams().getFirst("token");
+//        if (token == null || token.isEmpty()) {
+//            logger.info("StatusCode:"+exchange.getResponse().getStatusCode().toString());
+//            logger.info("token is empty...");
+//            exchange.getResponse().setStatusCode(HttpStatus.UNAUTHORIZED);
+//            return exchange.getResponse().setComplete();
+//        }
+        return chain.filter(exchange);
+    }
+
+    @Override
+    public int getOrder() {
+        return 1;
+    }
+}

huimv-farm-v2/huimv-gateway/src/main/resources/application-dev.yml

@@ -0,0 +1,28 @@
+server:
+  port: 8010
+
+spring:
+  application:
+    name: gateway
+  cloud:
+    gateway:
+      enabled: true
+      routes:
+        - id: admin
+          uri: http://127.0.0.1:8082
+          predicates:
+            - Path=/admin/**
+          filters:
+            - StripPrefix=1
+        - id: admin
+          uri: http://127.0.0.1:8092
+          predicates:
+            - Path=/video/**
+          filters:
+            - StripPrefix=1
+
+logging:
+  level:
+    org.springframework.cloud.gateway: debug  # Gateway调试模式
+
+

huimv-farm-v2/huimv-gateway/src/main/resources/application.properties

@@ -0,0 +1 @@
+spring.profiles.active=dev

huimv-farm-v2/huimv-video/pom.xml

@@ -13,11 +13,13 @@
     <dependencies>
         <dependency>
             <groupId>com.huimv</groupId>
-            <artifactId>huimv-admin</artifactId>
+            <artifactId>huimv-common</artifactId>
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
+
     </dependencies>
 
 
 
+
 </project>

huimv-farm-v2/huimv-video/src/main/java/com/huimv/video/HuimvVideoApplication.java

@@ -1,13 +1,14 @@
 package com.huimv.video;
 
+import com.huimv.common.config.InterceptorConfig;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.ApplicationContext;
-import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.context.annotation.Import;
+
 
 @SpringBootApplication
-@EnableScheduling
+@Import(InterceptorConfig.class)
 @MapperScan("com.huimv.video.mapper")
 public class HuimvVideoApplication {
 

huimv-farm-v2/huimv-video/src/main/java/com/huimv/video/controller/CameraAreaController.java

@@ -1,13 +1,16 @@
 package com.huimv.video.controller;
 
 
-import com.huimv.admin.utils.Result;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import com.huimv.video.entity.CameraArea;
 import com.huimv.video.service.ICameraAreaService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,20 +20,23 @@ import java.util.List;
  * @author astupidcoder
  * @since 2021-09-13
  */
-@CrossOrigin
 @RestController
 @RequestMapping("/cameraArea")
 public class CameraAreaController {
     @Autowired
     private ICameraAreaService cameraAreaService;
 
-    @GetMapping("/list")
-    public Result list(){
-      return   cameraAreaService.cameraList();
+    @PostMapping("/list")
+    public Result list(@RequestBody Map<String, Object> params){
+      return   cameraAreaService.cameraList(params);
     }
 
     @PostMapping("/add")
     public Result add(@RequestBody CameraArea cameraArea){
+        int brandName = cameraAreaService.count(new QueryWrapper<CameraArea>().eq("area_name", cameraArea.getAreaName()));
+        if (brandName >0){
+            return new Result(ResultCode.FAIL,"该区域已经存在");
+        }
         cameraAreaService.save(cameraArea);
         return new Result(10000,"添加成功",true);
     }
@@ -43,6 +49,7 @@ public class CameraAreaController {
 
     @GetMapping("/remove")
     public Result remove( @RequestParam(value = "ids") List<Integer> ids){
+
         return cameraAreaService.removeIds(ids);
 
     }

huimv-farm-v2/huimv-video/src/main/java/com/huimv/video/controller/CameraBrandController.java

@@ -1,10 +1,11 @@
 package com.huimv.video.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.video.entity.CameraBrand;
 import com.huimv.video.service.ICameraBrandService;
-import com.huimv.admin.utils.Result;
-import com.huimv.admin.utils.ResultCode;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -19,7 +20,6 @@ import java.util.Map;
  * @author astupidcoder
  * @since 2021-09-13
  */
-@CrossOrigin
 @RestController
 @RequestMapping("/cameraBrand")
 public class CameraBrandController {
@@ -34,6 +34,11 @@ public class CameraBrandController {
 
     @PostMapping("/add")
     public Result add(@RequestBody CameraBrand cameraBrand){
+        int brandName = cameraBrandService.count(new QueryWrapper<CameraBrand>().eq("brand_name", cameraBrand.getBrandName()));
+        if (brandName >0){
+            return new Result(ResultCode.FAIL,"该品牌名称已经存在");
+        }
+
         cameraBrandService.save(cameraBrand);
         return new Result(ResultCode.SUCCESS,"添加成功");
     }
@@ -45,7 +50,7 @@ public class CameraBrandController {
     }
 
     @GetMapping("/remove")
-    public Result remove(List<Integer> ids){
+    public Result remove(@RequestParam(value = "ids") List<Integer> ids){
         return cameraBrandService.removeIds(ids);
     }
 

huimv-farm-v2/huimv-video/src/main/java/com/huimv/video/controller/CameraController.java

@@ -2,47 +2,78 @@ package com.huimv.video.controller;
 
 
 import com.huimv.video.entity.Camera;
+import com.huimv.video.entity.vo.CameraListVo;
+import com.huimv.video.entity.vo.CameraListsVo;
 import com.huimv.video.service.ICameraService;
-import com.huimv.admin.utils.Result;
-import com.huimv.admin.utils.ResultCode;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 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;
 
 /**
  * @author astupidcoder
  * @since 2021-09-13
- */@CrossOrigin
+ */
 @RestController
 @RequestMapping("/camera")
 public class CameraController {
     @Autowired
     private ICameraService cameraService;
 
+
+
     @PostMapping("/list")
-    public Result list(@RequestBody Map<String, Object> params){
-        return   cameraService.listPage(params);
+    public Result list(@RequestBody CameraListVo cameraListVo){
+        return   cameraService.listPage(cameraListVo);
     }
 
     @PostMapping("/add")
-    public Result add(@RequestBody Camera Camera){
-        cameraService.save(Camera);
-        return new Result(ResultCode.SUCCESS,"添加成功");
+    public Result add(@RequestBody Camera camera){
+
+        if (camera == null){
+            return new Result(ResultCode.FAIL,"添加失败");
+        }
+
+        return    cameraService.add(camera);
+
     }
 
     @PostMapping("/update")
-    public Result update(@RequestBody Camera cameraArea){
-        cameraService.updateById(cameraArea);
-        return new Result(ResultCode.SUCCESS,"修改成功");
+    public Result update(@RequestBody Camera camera){
+        return   cameraService.updates(camera);
+
     }
 
     @GetMapping("/remove")
-    public Result remove(List<Integer> ids){
+    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){
+
+        List list =  cameraService.getCameraDetails(cameraListsVo);
+        return new Result(ResultCode.SUCCESS,list);
+    }
+
+    @GetMapping("/updateStatus")
+    private Result updateStatus(@RequestParam(value = "id")Integer id){
+
+        return  cameraService.updateStatus(id);
+    }
+
+
+
+    @RequestMapping("/getByAreaId")
+    private Result getByAreaId(Integer areaId, HttpServletRequest request){
+
+        List list = cameraService.getByAreaId(areaId);
+        return new Result(ResultCode.SUCCESS,list);
+    }
+
 }

huimv-farm-v2/huimv-video/src/main/java/com/huimv/video/entity/Camera.java

@@ -30,7 +30,7 @@ public class Camera extends Model {
     /**
      * 摄像头名字
      */
-    private String name;
+    private String cameraName;
 
     /**
      * 账号
@@ -55,7 +55,7 @@ public class Camera extends Model {
     /**
      * 摄像头ip
      */
-    private String ip;
+    private String cameraIp;
 
     /**
      * 0未关注，1关注
@@ -63,14 +63,24 @@ public class Camera extends Model {
     private Integer attention;
 
     /**
-     * 品牌()
+     * 品牌名字
      */
-    private String carmeraBrand;
+    private String brandName;
 
     /**
      * 品牌id
      */
-    private Integer carmeraId;
+    private Integer brandId;
+
+    /**
+     * 0正常   1停用
+     */
+    private Boolean runStatus;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
 
 
 }

huimv-farm-v2/huimv-video/src/main/java/com/huimv/video/entity/CameraArea.java

@@ -29,11 +29,10 @@ public class CameraArea extends Model {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    private String name;
+    private String areaName;
 
-    private Integer parentId;
 
-    private List children;
+    private String remark;
 
 
 }

huimv-farm-v2/huimv-video/src/main/java/com/huimv/video/entity/CameraBrand.java

@@ -1,5 +1,7 @@
 package com.huimv.video.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
@@ -22,6 +24,7 @@ public class CameraBrand extends Model {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     /**
@@ -42,7 +45,7 @@ public class CameraBrand extends Model {
     /**
      * 0主码流，1辅码流
      */
-    private Integer streamTpye;
+    private Integer streamType;
 
 
 }

huimv-farm-v2/huimv-video/src/main/java/com/huimv/video/entity/PublicNetwork.java

@@ -0,0 +1,35 @@
+package com.huimv.video.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.video.entity
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/9/26 0026 14:13
+ **/
+@Data
+@Accessors(chain = true)
+@TableName("public_network")
+public class PublicNetwork {
+
+    @TableId(value = "id")
+    private Integer id;
+
+    private String url;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date creationTime;
+
+    private  String remark;
+}

huimv-farm-v2/huimv-video/src/main/java/com/huimv/video/entity/vo/CameraListVo.java

@@ -0,0 +1,14 @@
+package com.huimv.video.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;
+}

huimv-farm-v2/huimv-video/src/main/java/com/huimv/video/entity/vo/CameraListsVo.java

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

huimv-farm-v2/huimv-video/src/main/java/com/huimv/video/entity/vo/CameraVo.java

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

huimv-farm-v2/huimv-video/src/main/java/com/huimv/video/mapper/CameraAreaMapper.java

@@ -2,6 +2,7 @@ package com.huimv.video.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huimv.video.entity.CameraArea;
+import org.springframework.stereotype.Repository;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.huimv.video.entity.CameraArea;
  * @author astupidcoder
  * @since 2021-09-13
  */
+@Repository
 public interface CameraAreaMapper extends BaseMapper<CameraArea> {
 
 }

huimv-farm-v2/huimv-video/src/main/java/com/huimv/video/mapper/CameraBrandMapper.java

@@ -2,6 +2,7 @@ package com.huimv.video.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huimv.video.entity.CameraBrand;
+import org.springframework.stereotype.Repository;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.huimv.video.entity.CameraBrand;
  * @author astupidcoder
  * @since 2021-09-13
  */
+@Repository
 public interface CameraBrandMapper extends BaseMapper<CameraBrand> {
 
 }

huimv-farm-v2/huimv-video/src/main/java/com/huimv/video/mapper/PublicNetworkMapper.java

@@ -0,0 +1,19 @@
+package com.huimv.video.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.video.entity.Camera;
+import com.huimv.video.entity.PublicNetwork;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-09-13
+ */
+@Repository
+public interface PublicNetworkMapper extends BaseMapper<PublicNetwork> {
+
+}

huimv-farm-v2/huimv-video/src/main/java/com/huimv/video/service/ICameraAreaService.java

@@ -2,9 +2,10 @@ package com.huimv.video.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.video.entity.CameraArea;
-import com.huimv.admin.utils.Result;
+import com.huimv.common.utils.Result;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -16,7 +17,7 @@ import java.util.List;
  */
 public interface ICameraAreaService extends IService<CameraArea> {
 
-    Result cameraList();
+    Result cameraList(Map<String, Object> params);
 
     Result removeIds(List<Integer> ids);
 }

huimv-farm-v2/huimv-video/src/main/java/com/huimv/video/service/ICameraBrandService.java

@@ -2,7 +2,7 @@ package com.huimv.video.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.video.entity.CameraBrand;
-import com.huimv.admin.utils.Result;
+import com.huimv.common.utils.Result;
 
 import java.util.List;
 import java.util.Map;

huimv-farm-v2/huimv-video/src/main/java/com/huimv/video/service/ICameraService.java

@@ -1,10 +1,12 @@
 package com.huimv.video.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.huimv.admin.utils.Result;
+import com.huimv.common.utils.Result;
 import com.huimv.video.entity.Camera;
+import com.huimv.video.entity.vo.CameraListVo;
+import com.huimv.video.entity.vo.CameraListsVo;
 
-import java.util.Map;
+import java.util.List;
 
 /**
  * <p>
@@ -16,5 +18,15 @@ import java.util.Map;
  */
 public interface ICameraService extends IService<Camera> {
 
-    Result listPage(Map<String, Object> params);
+    Result listPage(CameraListVo cameraListVo);
+
+    List getCameraDetails(CameraListsVo cameraListsVo);
+
+    List getByAreaId(Integer areaId);
+
+    Result updateStatus(Integer id);
+
+    Result add(Camera camera);
+
+    Result updates(Camera camera);
 }

huimv-farm-v2/huimv-video/src/main/java/com/huimv/video/service/PublicNetworkService.java

@@ -0,0 +1,16 @@
+package com.huimv.video.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.video.entity.PublicNetwork;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-09-13
+ */
+public interface PublicNetworkService extends IService<PublicNetwork> {
+
+}

huimv-farm-v2/huimv-video/src/main/java/com/huimv/video/service/impl/CameraAreaServiceImpl.java

@@ -1,17 +1,22 @@
 package com.huimv.video.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.video.entity.Camera;
 import com.huimv.video.entity.CameraArea;
 import com.huimv.video.mapper.CameraAreaMapper;
+import com.huimv.video.mapper.CameraMapper;
 import com.huimv.video.service.ICameraAreaService;
-import com.huimv.admin.utils.Result;
-import com.huimv.admin.utils.ResultCode;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Comparator;
 import java.util.List;
-import java.util.stream.Collectors;
+import java.util.Map;
 
 /**
  * <p>
@@ -24,34 +29,33 @@ import java.util.stream.Collectors;
 @Service
 public class CameraAreaServiceImpl extends ServiceImpl<CameraAreaMapper, CameraArea> implements ICameraAreaService {
 
+    @Autowired
+    private CameraMapper cameraMapper;
+
     @Override
-    public Result cameraList() {
-        List<CameraArea> list = this.list();
-        return new Result(ResultCode.SUCCESS, list.stream()
-                .filter(o -> o.getParentId() == 0)
-                .peek(o -> o.setChildren(getChildCategoryList(o, list)))
-                .collect(Collectors.toList()));
+    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");
+
+        IPage<CameraArea> list = page(new Page<>(current, size), new QueryWrapper<CameraArea>().like(StringUtils.isNotEmpty(areaName),"area_name", areaName));
+        return new Result(ResultCode.SUCCESS,list);
     }
 
     @Override
     public Result removeIds(List<Integer> ids) {
         for (Integer id : ids) {
-            CameraArea cameraArea = this.getById(id);
-            if (cameraArea.getParentId() == 0 ){
-                if (this.count(new QueryWrapper<CameraArea>().eq("parent_id",id))!=0){
-                    return new Result(10001,"删除失败,区域"+cameraArea.getName()+"下有未清理单元",false);
-                }
+            CameraArea byId = this.getById(id);
+
+            Integer areaId = cameraMapper.selectCount(new QueryWrapper<Camera>().eq("area_id", id));
+            if (areaId > 0){
+                return new Result(10001,"删除失败,区域"+byId.getAreaName()+"仍然存在摄像头",false);
             }
         }
         this.removeByIds(ids);
         return new Result(10000,"删除成功",true);
     }
 
-    private List<CameraArea> getChildCategoryList(CameraArea currMenu, List<CameraArea> categories) {
-        return categories.stream().filter(o -> o.getParentId().equals(currMenu.getId()))
-                .peek(o -> o.setChildren(getChildCategoryList(o, categories)))
-                .sorted(Comparator.comparingInt(CameraArea::getId))
-                .collect(Collectors.toList());
-    }
 
 }

huimv-farm-v2/huimv-video/src/main/java/com/huimv/video/service/impl/CameraBrandServiceImpl.java

@@ -9,8 +9,8 @@ import com.huimv.video.entity.CameraBrand;
 import com.huimv.video.mapper.CameraBrandMapper;
 import com.huimv.video.mapper.CameraMapper;
 import com.huimv.video.service.ICameraBrandService;
-import com.huimv.admin.utils.Result;
-import com.huimv.admin.utils.ResultCode;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -33,8 +33,8 @@ public class CameraBrandServiceImpl extends ServiceImpl<CameraBrandMapper, Camer
 
     @Override
     public Result listPage(Map<String, Object> params) {
-        Long current = (Long)params.get("current");
-        Long size = (Long) params.get("size");
+        Integer current = (Integer)params.get("current");
+        Integer size = (Integer) params.get("size");
         String brandName = (String) params.get("brandName");
         IPage<CameraBrand> list = page(new Page<>(current, size), new QueryWrapper<CameraBrand>().like("brand_name", brandName));
         return new Result(ResultCode.SUCCESS,list);
@@ -43,7 +43,7 @@ public class CameraBrandServiceImpl extends ServiceImpl<CameraBrandMapper, Camer
     @Override
     public Result removeIds(List<Integer> ids) {
         for (Integer id : ids) {
-            Integer integer = cameraMapper.selectCount(new QueryWrapper<Camera>().eq("carmera_id", id));
+            Integer integer = cameraMapper.selectCount(new QueryWrapper<Camera>().eq("brand_id", id));
             CameraBrand byId = this.getById(id);
             if (integer != 0){
                 return new Result(ResultCode.FAIL,"有"+byId.getBrandName()+"的摄像头在使用,删除失败");

huimv-farm-v2/huimv-video/src/main/java/com/huimv/video/service/impl/CameraServiceImpl.java

@@ -1,17 +1,27 @@
 package com.huimv.video.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.video.entity.Camera;
+import com.huimv.video.entity.CameraBrand;
+import com.huimv.video.entity.vo.CameraListVo;
+import com.huimv.video.entity.vo.CameraListsVo;
+import com.huimv.video.entity.vo.CameraVo;
+import com.huimv.video.mapper.CameraAreaMapper;
+import com.huimv.video.mapper.CameraBrandMapper;
 import com.huimv.video.mapper.CameraMapper;
+import com.huimv.video.mapper.PublicNetworkMapper;
 import com.huimv.video.service.ICameraService;
-import com.huimv.admin.utils.Result;
-import com.huimv.admin.utils.ResultCode;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Map;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
@@ -24,19 +34,170 @@ import java.util.Map;
 @Service
 public class CameraServiceImpl extends ServiceImpl<CameraMapper, Camera> implements ICameraService {
 
+    @Autowired
+    private PublicNetworkMapper publicNetworkMapper;
+
+    @Autowired
+    private CameraBrandMapper cameraBrandMapper;
+
+    @Autowired
+    private CameraAreaMapper cameraAreaMapper;
+
+
+
     @Override
-    public Result listPage(Map<String, Object> params) {
-        Long current = (Long)params.get("current");
-        Long size = (Long) params.get("size");
-        String strchStr = (String) params.get("strchStr");
+    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();
+
         QueryWrapper<Camera> wrapper = new QueryWrapper<>();
+        if (areaId!=null){
+            wrapper.eq("area_id",areaId);
+        }
+
+        if(brandId != null ){
+            wrapper.eq("brand_id",brandId);
+        }
         if (StringUtils.isNotEmpty(strchStr)){
-            wrapper.like("area_name",strchStr)
-                    .or().like("camera_name",strchStr)
-                    .or().like("area_name",strchStr);
+            wrapper.like("camera_name",strchStr)
+                    .or().like("camera_ip",strchStr);
+        }
+        if (sort == null){
+            wrapper.orderByDesc("id");
+        }else if (sort == 1){
+            wrapper.orderByDesc("sort");
+        }else {
+            wrapper.orderByAsc("sort");
         }
 
 
         return new Result(ResultCode.SUCCESS,page(new Page<>(current, size), wrapper));
     }
+
+    @Override
+    public List getCameraDetails(CameraListsVo cameraListsVo) {
+        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<Camera> page = (IPage<Camera>)this.listPage(cameraListVo).getData();
+        List<Camera> list = page.getRecords();
+        int i = 0;
+        for (Camera camera : list) {
+            for (Integer cameraId : cameraIds) {
+                if (cameraId.equals( camera.getId())){
+                    String url = publicNetworkMapper.selectOne(null).getUrl();
+
+                    String cameraAccount = camera.getAccount();
+                    String cameraPassword = camera.getPassword();
+                    String camerIp = camera.getCameraIp();
+                    String cameraName = camera.getCameraName();
+                    Integer areaId = camera.getAreaId();
+
+
+                    String rtsp ;
+                    CameraBrand 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);
+                    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;
+    }
+
+    @Override
+    public Result updateStatus(Integer id) {
+        Camera byId = this.getById(id);
+
+        if (byId.getRunStatus()) {
+            byId.setRunStatus(false);
+            this.updateById(byId);
+            return new Result(10000,"已停用",true);
+        } else {
+            byId.setRunStatus(true);
+            this.updateById(byId);
+            return new Result(10000,"已启用",true);
+        }
+
+
+    }
+
+    @Override
+    public Result add(Camera camera) {
+        Integer areaId = camera.getAreaId();
+        Integer brandId = camera.getBrandId();
+
+        int brandName = this.count(new QueryWrapper<Camera>().eq("camera_name", camera.getCameraName()));
+        if (brandName >0){
+            return new Result(ResultCode.FAIL,"该摄像头已经存在");
+        }
+        if (areaId != null){
+            camera.setAreaName(cameraAreaMapper.selectById(areaId).getAreaName());
+        }
+        if ( brandId!= null){
+            camera.setBrandName(cameraBrandMapper.selectById(brandId).getBrandName());
+        }
+        this.save(camera);
+
+        return new Result(ResultCode.SUCCESS,"添加成功");
+    }
+
+    @Override
+    public Result updates(Camera camera) {
+        Integer areaId = camera.getAreaId();
+        Integer brandId = camera.getBrandId();
+
+        if (areaId != null){
+            camera.setAreaName(cameraAreaMapper.selectById(areaId).getAreaName());
+        }
+        if ( brandId!= null){
+            camera.setBrandName(cameraBrandMapper.selectById(brandId).getBrandName());
+        }
+        this.updateById(camera);
+
+        return new Result(ResultCode.SUCCESS,"修改成功");
+    }
+
+
+    @Override
+    public List getByAreaId(Integer areaId) {
+        return null;
+    }
+
 }

huimv-farm-v2/huimv-video/src/main/java/com/huimv/video/service/impl/PublicNetworkServiceImpl.java

@@ -0,0 +1,26 @@
+package com.huimv.video.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.video.entity.PublicNetwork;
+import com.huimv.video.mapper.PublicNetworkMapper;
+import com.huimv.video.service.PublicNetworkService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-09-13
+ */
+@Service
+public class PublicNetworkServiceImpl extends ServiceImpl<PublicNetworkMapper, PublicNetwork> implements PublicNetworkService {
+
+
+
+}

huimv-farm-v2/huimv-video/src/main/resources/application-dev.yml

@@ -3,14 +3,18 @@ server:
 
 spring:
   application:
-    name: location
+    name: video
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv_farm_v2?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-    username: root
-    password: hm123456
+    url: jdbc:mysql://rm-bp1sz356vk48i43x64o.mysql.rds.aliyuncs.com/huimv_farm_v2?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    username: yxx_test
+    password: yxx123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
     hibernate:
       ddl-auto: update
     database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
-    show-sql: true
+    show-sql: true
+  redis:
+    host: 122.112.224.199
+    port: 6379
+    password: hm123456

huimv-farm-v2/pom.xml

@@ -47,27 +47,13 @@
             <artifactId>hutool-all</artifactId>
             <version>5.7.11</version>
         </dependency>
-        <dependency>
-            <groupId>cn.dustlight.captcha</groupId>
-            <artifactId>redis-store</artifactId>
-            <version>0.0.6</version>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>1.2.28</version>
-        </dependency>
 
         <dependency>
             <groupId>org.freemarker</groupId>
             <artifactId>freemarker</artifactId>
             <version>2.3.28</version>
         </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-generator</artifactId>
-            <version>3.2.0</version>
-        </dependency>
+
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
@@ -98,6 +84,9 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <classifier>execute</classifier>
+                </configuration>
             </plugin>
         </plugins>
     </build>