523096025 il y a 10 mois
commit
5b85a627b6
100 fichiers modifiés avec 6620 ajouts et 0 suppressions
  1. 33 0
      musk/.gitignore
  2. 117 0
      musk/pom.xml
  3. 15 0
      musk/src/main/java/com/huimv/farm/musk/MuskApplication.java
  4. 34 0
      musk/src/main/java/com/huimv/farm/musk/common/exception/ExceptionEnum.java
  5. 6 0
      musk/src/main/java/com/huimv/farm/musk/common/exception/MExceptionEnum.java
  6. 20 0
      musk/src/main/java/com/huimv/farm/musk/common/exception/MiException.java
  7. 20 0
      musk/src/main/java/com/huimv/farm/musk/common/token/TokenConstant.java
  8. 154 0
      musk/src/main/java/com/huimv/farm/musk/common/token/TokenSign.java
  9. 87 0
      musk/src/main/java/com/huimv/farm/musk/common/utils/ConstUtil.java
  10. 215 0
      musk/src/main/java/com/huimv/farm/musk/common/utils/DataUill.java
  11. 328 0
      musk/src/main/java/com/huimv/farm/musk/common/utils/DateUtil.java
  12. 142 0
      musk/src/main/java/com/huimv/farm/musk/common/utils/Digests.java
  13. 27 0
      musk/src/main/java/com/huimv/farm/musk/common/utils/GeneratorCodeConfig.java
  14. 27 0
      musk/src/main/java/com/huimv/farm/musk/common/utils/GetMD5Str.java
  15. 161 0
      musk/src/main/java/com/huimv/farm/musk/common/utils/HttpClientSSLUtils.java
  16. 58 0
      musk/src/main/java/com/huimv/farm/musk/common/utils/HttpUtils.java
  17. 56 0
      musk/src/main/java/com/huimv/farm/musk/common/utils/IDCardValidator.java
  18. 27 0
      musk/src/main/java/com/huimv/farm/musk/common/utils/IpTools.java
  19. 53 0
      musk/src/main/java/com/huimv/farm/musk/common/utils/IpUtil.java
  20. 45 0
      musk/src/main/java/com/huimv/farm/musk/common/utils/NumberUtils.java
  21. 89 0
      musk/src/main/java/com/huimv/farm/musk/common/utils/OpenapiUtil.java
  22. 79 0
      musk/src/main/java/com/huimv/farm/musk/common/utils/PageFactory.java
  23. 8 0
      musk/src/main/java/com/huimv/farm/musk/common/utils/PageResult.java
  24. 344 0
      musk/src/main/java/com/huimv/farm/musk/common/utils/PdfUtil.java
  25. 29 0
      musk/src/main/java/com/huimv/farm/musk/common/utils/PercentUtil.java
  26. 25 0
      musk/src/main/java/com/huimv/farm/musk/common/utils/PhoneNumberValidator.java
  27. 97 0
      musk/src/main/java/com/huimv/farm/musk/common/utils/Result.java
  28. 41 0
      musk/src/main/java/com/huimv/farm/musk/common/utils/ResultCode.java
  29. 71 0
      musk/src/main/java/com/huimv/farm/musk/common/utils/ResultUtil.java
  30. 120 0
      musk/src/main/java/com/huimv/farm/musk/common/utils/SendSMS.java
  31. 191 0
      musk/src/main/java/com/huimv/farm/musk/common/utils/SnowflakeSequence.java
  32. 44 0
      musk/src/main/java/com/huimv/farm/musk/common/utils/StringUtilsWork.java
  33. 120 0
      musk/src/main/java/com/huimv/farm/musk/common/utils/VerifyUtil.java
  34. 14 0
      musk/src/main/java/com/huimv/farm/musk/config/ApiPrefixAutoConfiguration.java
  35. 26 0
      musk/src/main/java/com/huimv/farm/musk/config/InterceptorConfig.java
  36. 83 0
      musk/src/main/java/com/huimv/farm/musk/config/JWTInterceptor.java
  37. 26 0
      musk/src/main/java/com/huimv/farm/musk/config/MybatisPlusConfig.java
  38. 107 0
      musk/src/main/java/com/huimv/farm/musk/controller/AuthorizeController.java
  39. 50 0
      musk/src/main/java/com/huimv/farm/musk/controller/BaseBuildingController.java
  40. 94 0
      musk/src/main/java/com/huimv/farm/musk/controller/FarmController.java
  41. 198 0
      musk/src/main/java/com/huimv/farm/musk/controller/LoginController.java
  42. 47 0
      musk/src/main/java/com/huimv/farm/musk/controller/MenuController.java
  43. 142 0
      musk/src/main/java/com/huimv/farm/musk/controller/SysAccountMultilevelController.java
  44. 125 0
      musk/src/main/java/com/huimv/farm/musk/controller/SysCameraAreaController.java
  45. 76 0
      musk/src/main/java/com/huimv/farm/musk/controller/SysCameraBrandController.java
  46. 79 0
      musk/src/main/java/com/huimv/farm/musk/controller/SysCameraController.java
  47. 62 0
      musk/src/main/java/com/huimv/farm/musk/controller/SysGroupController.java
  48. 35 0
      musk/src/main/java/com/huimv/farm/musk/entity/AccountGroup.java
  49. 70 0
      musk/src/main/java/com/huimv/farm/musk/entity/BaseBuilding.java
  50. 42 0
      musk/src/main/java/com/huimv/farm/musk/entity/Farm.java
  51. 37 0
      musk/src/main/java/com/huimv/farm/musk/entity/Group.java
  52. 36 0
      musk/src/main/java/com/huimv/farm/musk/entity/GroupMenu.java
  53. 49 0
      musk/src/main/java/com/huimv/farm/musk/entity/Menu.java
  54. 53 0
      musk/src/main/java/com/huimv/farm/musk/entity/SysAccountMultilevel.java
  55. 107 0
      musk/src/main/java/com/huimv/farm/musk/entity/SysCamera.java
  56. 47 0
      musk/src/main/java/com/huimv/farm/musk/entity/SysCameraArea.java
  57. 54 0
      musk/src/main/java/com/huimv/farm/musk/entity/SysCameraBrand.java
  58. 9 0
      musk/src/main/java/com/huimv/farm/musk/entity/vo/CameraBaseVo.java
  59. 17 0
      musk/src/main/java/com/huimv/farm/musk/entity/vo/CameraListVo.java
  60. 19 0
      musk/src/main/java/com/huimv/farm/musk/entity/vo/CameraListsVo.java
  61. 23 0
      musk/src/main/java/com/huimv/farm/musk/entity/vo/CameraVo.java
  62. 38 0
      musk/src/main/java/com/huimv/farm/musk/entity/vo/TreeBaseBuilding.java
  63. 20 0
      musk/src/main/java/com/huimv/farm/musk/mapper/AccountGroupMapper.java
  64. 20 0
      musk/src/main/java/com/huimv/farm/musk/mapper/BaseBuildingMapper.java
  65. 18 0
      musk/src/main/java/com/huimv/farm/musk/mapper/FarmMapper.java
  66. 18 0
      musk/src/main/java/com/huimv/farm/musk/mapper/GroupMapper.java
  67. 21 0
      musk/src/main/java/com/huimv/farm/musk/mapper/GroupMenuMapper.java
  68. 24 0
      musk/src/main/java/com/huimv/farm/musk/mapper/MenuMapper.java
  69. 22 0
      musk/src/main/java/com/huimv/farm/musk/mapper/SysAccountMultilevelMapper.java
  70. 16 0
      musk/src/main/java/com/huimv/farm/musk/mapper/SysCameraAreaMapper.java
  71. 16 0
      musk/src/main/java/com/huimv/farm/musk/mapper/SysCameraBrandMapper.java
  72. 25 0
      musk/src/main/java/com/huimv/farm/musk/mapper/SysCameraMapper.java
  73. 16 0
      musk/src/main/java/com/huimv/farm/musk/service/IAccountGroupService.java
  74. 30 0
      musk/src/main/java/com/huimv/farm/musk/service/IAuthorizeService.java
  75. 29 0
      musk/src/main/java/com/huimv/farm/musk/service/IBaseBuildingService.java
  76. 26 0
      musk/src/main/java/com/huimv/farm/musk/service/IFarmService.java
  77. 16 0
      musk/src/main/java/com/huimv/farm/musk/service/IGroupMenuService.java
  78. 29 0
      musk/src/main/java/com/huimv/farm/musk/service/IGroupService.java
  79. 12 0
      musk/src/main/java/com/huimv/farm/musk/service/ILoginService.java
  80. 35 0
      musk/src/main/java/com/huimv/farm/musk/service/IMenuService.java
  81. 37 0
      musk/src/main/java/com/huimv/farm/musk/service/ISysAccountMultilevelService.java
  82. 30 0
      musk/src/main/java/com/huimv/farm/musk/service/ISysCameraAreaService.java
  83. 22 0
      musk/src/main/java/com/huimv/farm/musk/service/ISysCameraBrandService.java
  84. 29 0
      musk/src/main/java/com/huimv/farm/musk/service/ISysCameraService.java
  85. 19 0
      musk/src/main/java/com/huimv/farm/musk/service/impl/AccountGroupServiceImpl.java
  86. 241 0
      musk/src/main/java/com/huimv/farm/musk/service/impl/AuthorizeServiceImpl.java
  87. 95 0
      musk/src/main/java/com/huimv/farm/musk/service/impl/BaseBuildingServiceImpl.java
  88. 97 0
      musk/src/main/java/com/huimv/farm/musk/service/impl/FarmServiceImpl.java
  89. 20 0
      musk/src/main/java/com/huimv/farm/musk/service/impl/GroupMenuServiceImpl.java
  90. 97 0
      musk/src/main/java/com/huimv/farm/musk/service/impl/GroupServiceImpl.java
  91. 42 0
      musk/src/main/java/com/huimv/farm/musk/service/impl/LoginServiceImpl.java
  92. 157 0
      musk/src/main/java/com/huimv/farm/musk/service/impl/MenuServiceImpl.java
  93. 145 0
      musk/src/main/java/com/huimv/farm/musk/service/impl/SysAccountMultilevelServiceImpl.java
  94. 95 0
      musk/src/main/java/com/huimv/farm/musk/service/impl/SysCameraAreaServiceImpl.java
  95. 57 0
      musk/src/main/java/com/huimv/farm/musk/service/impl/SysCameraBrandServiceImpl.java
  96. 245 0
      musk/src/main/java/com/huimv/farm/musk/service/impl/SysCameraServiceImpl.java
  97. 127 0
      musk/src/main/java/com/huimv/farm/musk/session/AccessToken.java
  98. 21 0
      musk/src/main/resources/application-dev.yml
  99. 3 0
      musk/src/main/resources/application.properties
  100. 0 0
      musk/src/main/resources/com/huimv/farm/musk/mapper/AccountGroupMapper.xml

+ 33 - 0
musk/.gitignore

@@ -0,0 +1,33 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/

+ 117 - 0
musk/pom.xml

@@ -0,0 +1,117 @@
+<?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.4.1</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+    <groupId>com.huimv.farm</groupId>
+    <artifactId>musk</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>musk</name>
+    <description>Demo project for Spring Boot</description>
+    <url/>
+    <licenses>
+        <license/>
+    </licenses>
+    <developers>
+        <developer/>
+    </developers>
+    <scm>
+        <connection/>
+        <developerConnection/>
+        <tag/>
+        <url/>
+    </scm>
+    <properties>
+        <java.version>8</java.version>
+    </properties>
+    <dependencies>
+        <!-- easy-trans -->
+        <dependency>
+            <groupId>com.fhs-opensource</groupId>
+            <artifactId>easy-trans-spring-boot-starter</artifactId>
+            <version>2.1.7</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.auth0</groupId>
+            <artifactId>java-jwt</artifactId>
+            <version>3.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.7.11</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.28</version>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+            <version>0.9.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.hkvs</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.4.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-extension</artifactId>
+            <version>3.4.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+            <version>3.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fhs-opensource</groupId>
+            <artifactId>easy-trans-mybatis-plus-extend</artifactId>
+            <version>2.1.7</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

+ 15 - 0
musk/src/main/java/com/huimv/farm/musk/MuskApplication.java

@@ -0,0 +1,15 @@
+package com.huimv.farm.musk;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+@MapperScan("com.huimv.farm.musk.mapper")
+public class MuskApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(MuskApplication.class, args);
+    }
+
+}

+ 34 - 0
musk/src/main/java/com/huimv/farm/musk/common/exception/ExceptionEnum.java

@@ -0,0 +1,34 @@
+package com.huimv.farm.musk.common.exception;
+
+public enum ExceptionEnum implements MExceptionEnum{
+   //自定义的状态码
+   TOKEN_NULL("401","token为空"),
+   TOKEN_OVERDUE("403","token过期"),
+   VERIFCATION_FAID("410","验证码获取失败"),
+   VERIFCATION_OVERDUE("411","验证码获取失败");
+
+
+   //错误码
+   public String code;
+   //提示信息
+   public String message;
+
+   //构造函数
+   ExceptionEnum(String code, String message){
+      this.code = code;
+      this.message = message;
+   }
+
+   //获取状态码
+   @Override
+   public String getCode(){
+      return code;
+   }
+   
+   //获取提示信息
+   @Override
+   public String getMessage(){
+      return message;
+   }
+ 
+}

+ 6 - 0
musk/src/main/java/com/huimv/farm/musk/common/exception/MExceptionEnum.java

@@ -0,0 +1,6 @@
+package com.huimv.farm.musk.common.exception;
+
+public interface MExceptionEnum{
+    public String getCode();
+    public String getMessage();
+}

+ 20 - 0
musk/src/main/java/com/huimv/farm/musk/common/exception/MiException.java

@@ -0,0 +1,20 @@
+package com.huimv.farm.musk.common.exception;
+
+
+public class MiException extends RuntimeException {
+    private ExceptionEnum exceptionEnum;
+
+    public MiException(ExceptionEnum exceptionEnum){
+        this.exceptionEnum = exceptionEnum;
+    }
+
+    public ExceptionEnum getExceptionEnum(){
+        return exceptionEnum;
+    }
+
+    //用来输出异常信息和状态码
+    public void printException(MiException e){
+        ExceptionEnum exceptionEnum = e.getExceptionEnum();
+        System.out.println("异常代码:" + exceptionEnum.getCode() + ",异常信息:" + exceptionEnum.getMessage());
+    }
+}

+ 20 - 0
musk/src/main/java/com/huimv/farm/musk/common/token/TokenConstant.java

@@ -0,0 +1,20 @@
+package com.huimv.farm.musk.common.token;
+ 
+import java.util.HashMap;
+import java.util.Map;
+
+public class TokenConstant {
+ 
+    private static Map<String, String> map=new HashMap();
+ 
+ 
+    public static String getToken(){
+            return map.get("token");
+    }
+ 
+    public static void updateTokenMap(String token){
+        map.put("token",token);
+    }
+ 
+ 
+}

+ 154 - 0
musk/src/main/java/com/huimv/farm/musk/common/token/TokenSign.java

@@ -0,0 +1,154 @@
+package com.huimv.farm.musk.common.token;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import io.jsonwebtoken.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+
+public class TokenSign {
+
+    /**
+     * 过期时间7天
+     */
+    private static final long EXPIRE_TIME = 7 * 24 * 60 * 60 * 1000;
+
+    /**
+     * 私钥,使用它生成token,最好进行下加密
+     */
+    private static final String TOKEN_SECRET = "Token";
+    private static final String APP_SECRET = "ukc8BDbRigUDaY6pZFfWus2jZWLPHO";
+    private static final int REFRESH_TIME = 300;
+
+
+    /**
+     * 产生token
+     *
+     * @return
+     */
+    public static String sign(String userName, Integer id, String farmIds) {
+
+        String JwtToken = Jwts.builder()
+                //头部信息
+                .setHeaderParam("typ", "JWT")
+                .setHeaderParam("alg", "HS256")
+                .setSubject("hm-user")
+                .setIssuedAt(new Date())
+                //过期时间
+                .setExpiration(new Date(System.currentTimeMillis() + EXPIRE_TIME))
+                //token主体部分,存储用户信息
+                .claim("userName", userName)
+                .claim("id", id)
+                .claim("farmIds", farmIds)
+                .signWith(SignatureAlgorithm.HS256, APP_SECRET)
+                .compact();
+
+        return JwtToken;
+    }
+
+
+    /**
+     * token校验是否正确
+     *
+     * @param token
+     * @return
+     */
+
+    public static boolean verify(String token) {
+
+        if (StringUtils.isBlank(token)) {
+            return false;
+        }
+        try {
+            Jwts.parser().setSigningKey(APP_SECRET).parseClaimsJws(token);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+        return true;
+
+    }
+
+
+    /**
+     * 根据token获取会员id
+     *
+     * @param request
+     * @return
+     */
+    public static Integer getMemberIdByJwtToken(HttpServletRequest request) {
+        String jwtToken = request.getHeader("accessToken");
+        if (StringUtils.isBlank(jwtToken)) {
+            return null;
+        }
+        Claims claims = getClaims(jwtToken);
+        if (ObjectUtil.isEmpty(claims) || ObjectUtil.isEmpty(claims.get("id"))) {
+
+        }
+        return (Integer) claims.get("id");
+    }
+
+    public static String getFarmIds(HttpServletRequest request) {
+        String jwtToken = request.getHeader("accessToken");
+        if (StringUtils.isBlank(jwtToken)) {
+            return null;
+        }
+        Claims claims = getClaims(jwtToken);
+        return (String) claims.get("farmIds");
+    }
+
+    public static String getUserNameByJwtToken(HttpServletRequest request) {
+        String jwtToken = request.getHeader("accessToken");
+        if (StringUtils.isBlank(jwtToken)) {
+            return null;
+        }
+        Claims claims = getClaims(jwtToken);
+        return (String) claims.get("userName");
+    }
+
+    /**
+     * 获取claims对象
+     *
+     * @param jwtToken
+     * @return
+     */
+    public static Claims getClaims(String jwtToken) {
+        try {
+            Jws<Claims> claimsJws = Jwts.parser().setSigningKey(APP_SECRET).parseClaimsJws(jwtToken);
+            return claimsJws.getBody();
+        } catch (Exception e) {
+            return null;
+        }
+
+
+    }
+
+    /**
+     * 是否过期
+     *
+     * @param claims
+     * @return -1:有效,0:有效,1:过期,2:被篡改
+     */
+    public static int verifyToken(Claims claims) {
+        if (claims == null) {
+            return 1;
+        }
+        try {
+            claims.getExpiration()
+                    .before(new Date());
+            // 需要自动刷新TOKEN
+            if ((claims.getExpiration().getTime() - System.currentTimeMillis()) < REFRESH_TIME * 1000) {
+                return -1;
+            } else {
+                return 0;
+            }
+        } catch (ExpiredJwtException ex) {
+            return 1;
+        } catch (Exception e) {
+            return 2;
+        }
+    }
+
+
+}

+ 87 - 0
musk/src/main/java/com/huimv/farm/musk/common/utils/ConstUtil.java

@@ -0,0 +1,87 @@
+package com.huimv.farm.musk.common.utils;
+
+/**
+ * @Project : huimv-breed
+ * @Package : IntelliJ IDEA
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2022/9/27
+ **/
+public class ConstUtil {
+   public static final String SECRET_KEY = "huimvkeji";
+   public final static Integer ERR_NOFOUND_CODE = 10004;
+   public final static String ERR_NOFOUND_INFO = "暂无数据.";
+
+   public final static Integer ERR_CHILDMENU_CODE = 10005;
+   public final static String ERR_CHILDMENU_INFO = "存在下级菜单,请先删除下级菜单.";
+
+   public final static Integer ERR_NO_EXIST_CODE = 10006;
+   public final static String ERR_NO_EXIST_INFO = "账号或密码错误.";
+
+   public final static Integer ERR_FARM_TIMEOUT_CODE = 10007;
+   public final static String ERR_FARM_TIMEOUT_INFO = "牧场已经中止服务.";
+
+   public final static Integer ERR_FARM_CANCEL_CODE = 10008;
+   public final static String ERR_FARM_CANCEL_INFO = "牧场已经注销.";
+
+   public final static Integer ERR_MYMENU_EMPTY_CODE = 10009;
+   public final static String ERR_MYMENU_EMPTY_INFO = "该用户无任何授权菜单.";
+
+   public final static Integer ERR_MYGROUP_EMPTY_CODE = 10010;
+   public final static String ERR_MYGROUP_EMPTY_INFO = "该用户无任何授权权限组.";
+
+   public final static Integer ERR_NO_DELETE_farm_musk_CODE = 10011;
+   public final static String ERR_NO_DELETE_farm_musk_INFO = "平台管理员账户不能删除.";
+
+   public final static Integer ERR_FARM_OVERDUE_CODE = 10012;
+   public final static String ERR_FARM_OVERDUE_INFO = "该牧场未在服务有效期";
+
+   public final static Integer ERR_SERVICE_SAME_CODE = 10013;
+   public final static String ERR_SERVICE_SAME_INFO = "当前服务周期时间不能和已经存在的服务时间重合.";
+
+   public final static Integer ERR_ACCOUNT_SAME_CODE = 10014;
+   public final static String ERR_ACCOUNT_SAME_INFO = "当前填写的账号名称已经存在,请重命名.";
+
+   public final static Integer ERR_RECORD_EMPTY_CODE = 10015;
+   public final static String ERR_RECORD_EMPTY_INFO = "暂无数据.";
+
+   public final static Integer ERR_SALE_LESS_CODE = 10016;
+   public final static String ERR_SALE_LESS_INFO = "本批次剩余数量不足,不满足销售数量.";
+
+   public final static Integer ERR_ELIMINATE_LESS_CODE = 10017;
+   public final static String ERR_ELIMINATE_LESS_INFO = "本批次剩余数量不足,不满足淘汰数量.";
+
+   public static final Integer ERR_EARTAG_NOT_EXIST_CODE = 10018;
+   public static final String ERR_EARTAG_NOT_EXIST_INFO = "耳标号不存在.";
+
+   public static final Integer ERR_NOT_BOAR_CODE = 10019;
+   public static final String ERR_NOT_BOAR_INFO = "你当前输入的是母猪耳标号,不能采精。只有公猪才能采精.";
+
+   public static final Integer ERR_SAME_GENDER_CODE = 10020;
+   public static final String ERR_SAME_GENDE_INFO = "配种对象为同一性别类型.";
+
+   public static final Integer ERR_GESTATION_CHECK_OBJECT_CODE = 10021;
+   public static final String ERR_GESTATION_CHECK_OBJECT_INFO = "妊检对象只能是雌性(母).";
+
+   public static final Integer ERR_BIRTH_OBJECT_CODE = 10022;
+   public static final String ERR_BIRTH_OBJECT_INFO = "分娩对象只能是雌性(母).";
+
+   public static final Integer ERR_ABLACTATION_CODE = 10023;
+   public static final String ERR_ABLACTATION_INFO = "断奶对象只能是雌性(母).";
+
+   public static final Integer ERR_INVALID_EARMARK_CODE = 10024;
+   public static final String ERR_INVALID_EARMARK_INFO = "该耳标所属对象已经销售或淘汰.";
+
+   public static final Integer ERR_SAME_EARMARK_CODE = 10025;
+   public static final String ERR_SAME_EARMARK_INFO = "该耳标号与其他记录存在耳标重名.";
+
+   public static final Integer ERR_SAME_BATCH_CODE = 10026;
+   public static final String ERR_SAME_BATCH_INFO = "该批次号与其他记录存在批次号重名.";
+
+   public static final Integer ERR_UPDATE_PASSWORD_CODE = 10027;
+   public static final String ERR_UPDATE_PASSWORD_INFO = "更新密码出错.";
+
+   public static final Integer ERR_PASSWORD_ERROR_CODE = 10028;
+   public static final String ERR_PASSWORD_ERROR_INFO = "密码输入错误.";
+}

+ 215 - 0
musk/src/main/java/com/huimv/farm/musk/common/utils/DataUill.java

@@ -0,0 +1,215 @@
+package com.huimv.farm.musk.common.utils;
+  
+import com.alibaba.fastjson.JSONObject;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+public class DataUill {
+  
+
+  
+    // 获得当天0点时间
+    public static Date getTimesmorning() {
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.HOUR_OF_DAY, 0);
+        cal.set(Calendar.SECOND, 0);
+        cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.MILLISECOND, 0);
+        return cal.getTime();
+  
+  
+    }
+    // 获得昨天0点时间
+    public static Date getYesterdaymorning() {
+        Calendar cal = Calendar.getInstance();
+        cal.setTimeInMillis(getTimesmorning().getTime()-3600*24*1000);
+        return cal.getTime();
+    }
+    // 获得当天近7天时间
+    public static Date getWeekFromNow() {
+        Calendar cal = Calendar.getInstance();
+        cal.setTimeInMillis( getTimesmorning().getTime()-3600*24*1000*7);
+        return cal.getTime();
+    }
+  
+    // 获得当天24点时间
+    public static Date getTimesnight() {
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.HOUR_OF_DAY, 24);
+        cal.set(Calendar.SECOND, 0);
+        cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.MILLISECOND, 0);
+        return cal.getTime();
+    }
+  
+    // 获得本周一0点时间
+    public static Date getTimesWeekmorning() {
+        Calendar cal = Calendar.getInstance();
+        cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONDAY), cal.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
+        cal.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
+        return cal.getTime();
+    }
+  
+    // 获得本周日24点时间
+    public static Date getTimesWeeknight() {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(getTimesWeekmorning());
+        cal.add(Calendar.DAY_OF_WEEK, 7);
+        return cal.getTime();
+    }
+  
+    // 获得本月第一天0点时间
+    public static Date getTimesMonthmorning() {
+        Calendar cal = Calendar.getInstance();
+        cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONDAY), cal.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
+        cal.set(Calendar.DAY_OF_MONTH, cal.getActualMinimum(Calendar.DAY_OF_MONTH));
+        return cal.getTime();
+    }
+  
+    // 获得本月最后一天24点时间
+    public static Date getTimesMonthnight() {
+        Calendar cal = Calendar.getInstance();
+        cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONDAY), cal.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
+        cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
+        cal.set(Calendar.HOUR_OF_DAY, 24);
+        return cal.getTime();
+    }
+  
+    public static Date getLastMonthStartMorning() {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(getTimesMonthmorning());
+        cal.add(Calendar.MONTH, -1);
+        return cal.getTime();
+    }
+
+    public static Date getTwoLastMonthStartMorning() {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(getTimesMonthmorning());
+        cal.add(Calendar.MONTH, -2);
+        return cal.getTime();
+    }
+  
+    public static Date getCurrentQuarterStartTime() {
+        Calendar c = Calendar.getInstance();
+        int currentMonth = c.get(Calendar.MONTH) + 1;
+        SimpleDateFormat longSdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat shortSdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date now = null;
+        try {
+            if (currentMonth >= 1 && currentMonth <= 3)
+                c.set(Calendar.MONTH, 0);
+            else if (currentMonth >= 4 && currentMonth <= 6)
+                c.set(Calendar.MONTH, 3);
+            else if (currentMonth >= 7 && currentMonth <= 9)
+                c.set(Calendar.MONTH, 4);
+            else if (currentMonth >= 10 && currentMonth <= 12)
+                c.set(Calendar.MONTH, 9);
+            c.set(Calendar.DATE, 1);
+            now = longSdf.parse(shortSdf.format(c.getTime()) + " 00:00:00");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return now;
+    }
+  
+    /**
+     * 当前季度的结束时间,即2012-03-31 23:59:59
+     *
+     * @return
+     */
+    public static Date getCurrentQuarterEndTime() {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(getCurrentQuarterStartTime());
+        cal.add(Calendar.MONTH, 3);
+        return cal.getTime();
+    }
+  
+  
+    public static Date getCurrentYearStartTime() {
+        Calendar cal = Calendar.getInstance();
+        cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONDAY), cal.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
+        cal.set(Calendar.DAY_OF_MONTH, cal.getActualMinimum(Calendar.YEAR));
+        return cal.getTime();
+    }
+  
+    public static Date getCurrentYearEndTime() {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(getCurrentYearStartTime());
+        cal.add(Calendar.YEAR, 1);
+        return cal.getTime();
+    }
+  
+    public static Date getLastYearStartTime() {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(getCurrentYearStartTime());
+        cal.add(Calendar.YEAR, -1);
+        return cal.getTime();
+    }
+    public static Date getNextDay(Date date, Integer num) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.DAY_OF_MONTH, +num);//+1今天的时间加一天
+        date = calendar.getTime();
+        return date;
+    }
+    /**
+     * 获取上周开始时间和结束时间
+     */
+    public static JSONObject getLastWeekRange() {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
+        calendar.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
+        calendar.add(Calendar.DAY_OF_WEEK, -7);
+        Date startTime = calendar.getTime();
+        calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH), 23, 59, 59);
+        calendar.add(Calendar.DAY_OF_WEEK, 6);
+        Date stopTime = calendar.getTime();
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("startTime", startTime);
+        jsonObject.put("stopTime", stopTime);
+        return jsonObject;
+    }
+
+    /**
+     * 获取上月开始时间和结束时间
+     */
+    public static JSONObject getLastMonthRange() {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
+        calendar.add(Calendar.MONTH, -1);
+        calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMinimum(Calendar.DAY_OF_MONTH));
+        Date startTime = calendar.getTime();
+        calendar.add(Calendar.DAY_OF_WEEK, 7);
+        calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
+        //calendar.set(Calendar.HOUR_OF_DAY, 24);
+        calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH), 23, 59, 59);
+        Date stopTime = calendar.getTime();
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("startTime", startTime);
+        jsonObject.put("stopTime", stopTime);
+        return jsonObject;
+    }
+
+    /**
+     * 获取昨天开始时间和结束时间
+     */
+    public static JSONObject getYesterdayRange() {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.MILLISECOND, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.HOUR_OF_DAY, -24);
+        Date startTime = calendar.getTime();
+        calendar.set(Calendar.MILLISECOND, 0);
+        calendar.set(Calendar.SECOND, 59);
+        calendar.set(Calendar.MINUTE, 59);
+        calendar.set(Calendar.HOUR_OF_DAY, 23);
+        Date stopTime = calendar.getTime();
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("startTime", startTime);
+        jsonObject.put("stopTime", stopTime);
+        return jsonObject;
+    }
+}

+ 328 - 0
musk/src/main/java/com/huimv/farm/musk/common/utils/DateUtil.java

@@ -0,0 +1,328 @@
+package com.huimv.farm.musk.common.utils;
+
+import cn.hutool.core.date.DateTime;
+import org.springframework.stereotype.Component;
+
+import java.sql.Timestamp;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@Component
+//@Slf4j
+public class DateUtil {
+
+    public int getNowHour(){
+        Calendar cal = Calendar.getInstance();
+        return cal.get(Calendar.HOUR_OF_DAY);
+    }
+
+    public int setCalendarNewTime(String newTime) throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(sdf.parse(newTime));
+        return cal.get(Calendar.HOUR_OF_DAY);
+    }
+
+    public int setCalendarNewTime(Timestamp newTime) throws ParseException {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(newTime);
+        return cal.get(Calendar.HOUR_OF_DAY);
+    }
+
+    //格式化日期(Long --> Date)
+    public String formatLongToDate(Long longDate){
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date date= new Date(longDate);
+        return df.format(date);
+    }
+
+    //格式化本年
+    public String getThisYear(){
+        Calendar cal = Calendar.getInstance();
+        int year = cal.get(Calendar.YEAR);
+        return String.valueOf(year);
+    }
+
+    //格式化本月
+    public String getThisMonth(){
+        Calendar cal = Calendar.getInstance();
+        int month = cal.get(Calendar.MONTH) + 1;
+        if(String.valueOf(month).length()==1)
+        {
+            return "0"+ String.valueOf(month);
+        }else{
+            return String.valueOf(month);
+        }
+    }
+
+    //格式化日期时间
+    public String formatDateTime(String dateText) throws ParseException {
+        if(dateText.indexOf("T") != -1){
+            dateText = dateText.replace("T"," ");
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date date = sdf.parse(dateText);
+        return sdf.format(date);
+    }
+
+    //格式化日期时间
+    public String formatDateText(String dateText) throws ParseException {
+        if(dateText.indexOf("T") != -1){
+            dateText = dateText.replace("T"," ");
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date date = sdf.parse(dateText);
+        return sdf.format(date);
+    }
+//    public String formatDateText(Date date) throws ParseException {
+//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+//        return sdf.format(date);
+//    }
+
+    public Date parseDateTime(String dateText) throws ParseException {
+        if(dateText.indexOf("T") != -1){
+            dateText = dateText.replace("T"," ");
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        return sdf.parse(dateText);
+    }
+
+    public Date parseDate(String dateText) throws ParseException {
+        if(dateText.indexOf("T") != -1){
+            dateText = dateText.replace("T"," ");
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.parse(dateText);
+    }
+
+    public Long parseDateTimeTextToLong(String dateText) throws ParseException {
+        if(dateText.indexOf("T") != -1){
+            dateText = dateText.replace("T"," ");
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date date = sdf.parse(dateText);
+        return date.getTime();
+    }
+
+    public Long parseDateTextToLong(String dateText) throws ParseException {
+        if(dateText.indexOf("T") != -1){
+            dateText = dateText.replace("T"," ");
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date date = sdf.parse(dateText);
+        return date.getTime();
+    }
+
+    //
+    public Date getTodayDate() throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.parse(sdf.format(new Date()));
+    }
+
+    public Date getTodayDatetime() throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        return sdf.parse(sdf.format(new Date()));
+    }
+
+    public String getTodayDateText() throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(new Date());
+    }
+
+    public java.sql.Date getTodayMySQLDate(){
+        java.sql.Date todayDate = new java.sql.Date(new Date().getTime());
+        return todayDate;
+    }
+
+    public Timestamp getTimestamp(){
+        Timestamp nowTimestamp = new Timestamp(new Date().getTime());
+        return nowTimestamp;
+    }
+
+    public String getTodayText() throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        return sdf.format(new Date());
+    }
+
+    public String formatDateText(Date date) throws ParseException {
+        if(date == null){
+            return "";
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(date);
+    }
+
+    public String formatDatetimeText(Date date) throws ParseException {
+        if(date == null || date.toString().length()==0){
+            return "";
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        return sdf.format(date);
+    }
+
+    public String getNowText() throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+        return sdf.format(new Date());
+    }
+
+    public String getTodayMissionText() throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
+        return sdf.format(new Date());
+    }
+
+    public String getStartDateInThisMonth(){
+        DateTime date = cn.hutool.core.date.DateUtil.date();
+        return (cn.hutool.core.date.DateUtil.beginOfMonth(date) + "").substring(0, 10);
+    }
+
+    public String getEndDateInThisMonth(){
+        DateTime date = cn.hutool.core.date.DateUtil.date();
+        return (date + "").substring(0, 10);
+    }
+
+    /**
+     * 获取过去或者未来 任意天内的日期数组
+     * @param intervals      intervals天内
+     * @return              日期数组
+     */
+    public ArrayList<String> test(int intervals ) {
+        ArrayList<String> pastDaysList = new ArrayList<>();
+        ArrayList<String> fetureDaysList = new ArrayList<>();
+        for (int i = 0; i <intervals; i++) {
+            pastDaysList.add(getPastDate(i));
+            fetureDaysList.add(getFetureDate(i));
+        }
+        return pastDaysList;
+    }
+
+    /**
+     * @Method      : getPastIntervals
+     * @Description : 返回过去N天日期(倒排序)
+     * @Params      : [intervals]
+     * @Return      : java.util.ArrayList<java.lang.String>
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/3/7       
+     * @Time        : 15:27
+     */
+    public ArrayList<String> getPastIntervals(int intervals ) {
+        ArrayList<String> pastDaysList = new ArrayList<>();
+        for (int i = 0; i <intervals; i++) {
+            pastDaysList.add(getPastDate(i));
+        }
+        return pastDaysList;
+    }
+
+    /**
+     * @Method      : getPastIntervalsASC
+     * @Description : 正排序
+     * @Params      : [intervals]
+     * @Return      : java.util.ArrayList<java.lang.String>
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/3/7       
+     * @Time        : 16:33
+     */
+    public ArrayList<String> getPastIntervalsASC(int intervals ) {
+        ArrayList<String> pastDaysList = new ArrayList<>();
+        for (int i = intervals-1; i >=0; i--) {
+            pastDaysList.add(getPastDate(i));
+        }
+        return pastDaysList;
+    }
+
+    /**
+     * @Method      : getFetureIntervals
+     * @Description : 获取未来N天日期
+     * @Params      : [intervals]
+     * @Return      : java.util.ArrayList<java.lang.String>
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/3/7       
+     * @Time        : 15:28
+     */
+    public ArrayList<String> getFetureIntervals(int intervals ) {
+        ArrayList<String> fetureDaysList = new ArrayList<>();
+        for (int i = 0; i <intervals; i++) {
+            fetureDaysList.add(getFetureDate(i));
+        }
+        return fetureDaysList;
+    }
+
+
+    /**
+     * 获取过去第几天的日期
+     *
+     * @param past
+     * @return
+     */
+    public String getPastDate(int past) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - past);
+        Date today = calendar.getTime();
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        String result = format.format(today);
+        return result;
+    }
+
+    /**
+     * 获取未来 第 past 天的日期
+     * @param past
+     * @return
+     */
+    public String getFetureDate(int past) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + past);
+        Date today = calendar.getTime();
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        String result = format.format(today);
+        return result;
+    }
+
+    //重新构建日期
+    public String rebuildDateTime(String text){
+        return text.substring(0,4)+"-"+text.substring(4,6)+"-"+text.substring(6,8)+" "+text.substring(8,10)+":"+text.substring(10,12)+":"+text.substring(12,14);
+    }
+
+    public static void main(String[] args){
+        DateUtil du = new DateUtil();
+        //
+//        du.test1();
+        List<String> pastList = du.getPastIntervalsASC(5);
+        for(String pastDate:pastList){
+            System.out.println("pastDate>>"+pastDate);
+        }
+
+        List<String> fetureList = du.getFetureIntervals(5);
+        for(String fetureDate:fetureList){
+            System.out.println("fetureDate>>"+fetureDate);
+        }
+
+    }
+
+    private void test1() {
+        String text = "20211201104300";
+//        String text = "1234567890abcd";
+        String date = text.substring(0,4)+"-"+text.substring(4,6)+"-"+text.substring(6,8)+" "+text.substring(8,10)+":"+text.substring(10,12)+":"+text.substring(12,14);
+        System.out.println("date="+date);
+    }
+
+    //获取long时间
+    public Long getNowLong(){
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(calendar.get(Calendar.YEAR),calendar.get(Calendar.MONTH),calendar.get(Calendar.DAY_OF_MONTH)-1,0,0,0);
+        return calendar.getTime().getTime();
+    }
+}

+ 142 - 0
musk/src/main/java/com/huimv/farm/musk/common/utils/Digests.java

@@ -0,0 +1,142 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by Fernflower decompiler)
+//
+
+package com.huimv.farm.musk.common.utils;
+
+import org.apache.commons.lang3.Validate;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.security.GeneralSecurityException;
+import java.security.MessageDigest;
+import java.security.SecureRandom;
+
+public class Digests {
+    private static final String SHA1 = "SHA-1";
+    private static final String MD5 = "MD5";
+    private static SecureRandom random = new SecureRandom();
+
+    public Digests() {
+    }
+
+    public static byte[] md5(byte[] input) {
+        return digest(input, "MD5", (byte[])null, 1);
+    }
+
+    public static byte[] md5(byte[] input, int iterations) {
+        return digest(input, "MD5", (byte[])null, iterations);
+    }
+
+    public static byte[] sha1(byte[] input) {
+        return digest(input, "SHA-1", (byte[])null, 1);
+    }
+
+    public static byte[] sha1(byte[] input, byte[] salt) {
+        return digest(input, "SHA-1", salt, 1);
+    }
+
+    public static byte[] sha1(byte[] input, byte[] salt, int iterations) {
+        return digest(input, "SHA-1", salt, iterations);
+    }
+
+    private static byte[] digest(byte[] input, String algorithm, byte[] salt, int iterations) {
+        try {
+            MessageDigest digest = MessageDigest.getInstance(algorithm);
+            if (salt != null) {
+                digest.update(salt);
+            }
+
+            byte[] result = digest.digest(input);
+
+            for(int i = 1; i < iterations; ++i) {
+                digest.reset();
+                result = digest.digest(result);
+            }
+
+            return result;
+        } catch (GeneralSecurityException var7) {
+            throw new RuntimeException(var7);
+        }
+    }
+
+    public static byte[] generateSalt(int numBytes) {
+        Validate.isTrue(numBytes > 0, "numBytes argument must be a positive integer (1 or larger)", (long)numBytes);
+        byte[] bytes = new byte[numBytes];
+        random.nextBytes(bytes);
+        return bytes;
+    }
+
+    public static byte[] md5(InputStream input) throws IOException {
+        return digest(input, "MD5");
+    }
+
+    public static byte[] sha1(InputStream input) throws IOException {
+        return digest(input, "SHA-1");
+    }
+
+    private static byte[] digest(InputStream input, String algorithm) throws IOException {
+        try {
+            MessageDigest messageDigest = MessageDigest.getInstance(algorithm);
+            int bufferLength = 8192;
+            byte[] buffer = new byte[bufferLength];
+
+            for(int read = input.read(buffer, 0, bufferLength); read > -1; read = input.read(buffer, 0, bufferLength)) {
+                messageDigest.update(buffer, 0, read);
+            }
+
+            return messageDigest.digest();
+        } catch (GeneralSecurityException var6) {
+            throw new RuntimeException(var6);
+        }
+    }
+
+    public static final String md5(String s) {
+        char[] hexDigits = new char[]{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+
+        try {
+            MessageDigest mdTemp = MessageDigest.getInstance("MD5");
+
+            try {
+                mdTemp.update(s.getBytes("UTF-8"));
+            } catch (UnsupportedEncodingException var9) {
+                mdTemp.update(s.getBytes());
+            }
+
+            byte[] md = mdTemp.digest();
+            int j = md.length;
+            char[] str = new char[j * 2];
+            int k = 0;
+
+            for(int i = 0; i < j; ++i) {
+                byte byte0 = md[i];
+                str[k++] = hexDigits[byte0 >>> 4 & 15];
+                str[k++] = hexDigits[byte0 & 15];
+            }
+
+            return (new String(str)).toUpperCase();
+        } catch (Exception var10) {
+            return null;
+        }
+    }
+
+    public static final String buildToken(String url, String paramJson, String secret) {
+        String tempUrl = null;
+        if (url.contains("https://")) {
+            tempUrl = url.substring("https://".length());
+        } else {
+            tempUrl = url.substring("http://".length());
+        }
+
+        int index = tempUrl.indexOf("/");
+        String URI = tempUrl.substring(index);
+        String[] ss = URI.split("\\?");
+        return ss.length > 1 ? md5(ss[0] + ss[1] + secret) : md5(ss[0] + paramJson + secret);
+    }
+
+    public static void main(String[] args) {
+        System.out.println(md5("abc"));
+    }
+}

+ 27 - 0
musk/src/main/java/com/huimv/farm/musk/common/utils/GeneratorCodeConfig.java

@@ -0,0 +1,27 @@
+package com.huimv.farm.musk.common.utils;
+
+import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+
+import java.util.Scanner;
+
+/**
+ * 自动生成mybatisplus的相关代码
+ */
+public class GeneratorCodeConfig {
+
+    public static String scanner(String tip) {
+        Scanner scanner = new Scanner(System.in);
+        StringBuilder help = new StringBuilder();
+        help.append("请输入" + tip + ":");
+        System.out.println(help.toString());
+        if (scanner.hasNext()) {
+            String ipt = scanner.next();
+            if (StringUtils.isNotBlank(ipt)) {
+                return ipt;
+            }
+        }
+        throw new MybatisPlusException("请输入正确的" + tip + "!");
+    }
+
+}

+ 27 - 0
musk/src/main/java/com/huimv/farm/musk/common/utils/GetMD5Str.java

@@ -0,0 +1,27 @@
+package com.huimv.farm.musk.common.utils;
+
+import java.math.BigInteger;
+import java.security.MessageDigest;
+
+public class GetMD5Str {
+    /**
+     * 对字符串md5加密
+     *
+     * @param str
+     * @return
+     * @throws Exception
+     */
+    public static String getMD5Str(String str) throws Exception {
+        try {
+            // 生成一个MD5加密计算摘要
+            MessageDigest md = MessageDigest.getInstance("MD5");
+            // 计算md5函数
+            md.update(str.getBytes());
+            // digest()最后确定返回md5 hash值,返回值为8为字符串。因为md5 hash值是16位的hex值,实际上就是8位的字符
+            // BigInteger函数则将8位的字符串转换成16位hex值,用字符串来表示;得到字符串形式的hash值
+            return new BigInteger(1, md.digest()).toString(16);
+        } catch (Exception e) {
+            throw new Exception("MD5加密出现错误,"+e.toString());
+        }
+    }
+}

+ 161 - 0
musk/src/main/java/com/huimv/farm/musk/common/utils/HttpClientSSLUtils.java

@@ -0,0 +1,161 @@
+////
+//// Source code recreated from a .class file by IntelliJ IDEA
+//// (powered by Fernflower decompiler)
+////
+//
+//package com.huimv.farm.musk.common.utils;
+//
+//import org.apache.commons.io.IOUtils;
+//import org.apache.http.HttpResponse;
+//import org.apache.http.client.HttpClient;
+//import org.apache.http.client.config.RequestConfig;
+//import org.apache.http.client.config.RequestConfig.Builder;
+//import org.apache.http.client.methods.HttpGet;
+//import org.apache.http.client.methods.HttpPost;
+//import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+//import org.apache.http.conn.ssl.TrustStrategy;
+//import org.apache.http.entity.ContentType;
+//import org.apache.http.entity.StringEntity;
+//import org.apache.http.impl.client.CloseableHttpClient;
+//import org.apache.http.impl.client.HttpClients;
+//import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+//import org.apache.http.ssl.SSLContextBuilder;
+//
+//import javax.net.ssl.HostnameVerifier;
+//import javax.net.ssl.SSLContext;
+//import javax.net.ssl.SSLSession;
+//import java.security.GeneralSecurityException;
+//import java.security.KeyStore;
+//import java.security.cert.CertificateException;
+//import java.security.cert.X509Certificate;
+//
+//public class HttpClientSSLUtils {
+//    private static HttpClient client = null;
+//    protected static final Integer DEFAULT_CONNECTION_TIME_OUT = 100000;
+//    protected static final Integer DEFAULT_SOCKET_TIME_OUT = 200000;
+//    protected static final String DEFAULT_CHAR_SET = "UTF-8";
+//
+//    public HttpClientSSLUtils() {
+//    }
+//
+//    public static String doPost(String url, String jsonText) throws Exception {
+//        HttpClient client = null;
+//        HttpPost post = new HttpPost(url);
+//
+//        String var6;
+//        try {
+//            if (jsonText != null && !jsonText.isEmpty()) {
+//                StringEntity entity = new StringEntity(jsonText, ContentType.APPLICATION_JSON);
+//                post.setEntity(entity);
+//            }
+//
+//            Builder customReqConf = RequestConfig.custom();
+//            customReqConf.setConnectTimeout(DEFAULT_CONNECTION_TIME_OUT);
+//            customReqConf.setSocketTimeout(DEFAULT_CONNECTION_TIME_OUT);
+//            post.setConfig(customReqConf.build());
+//            HttpResponse res = null;
+//            if (url.startsWith("https")) {
+//                client = createSSLInsecureClient();
+//                res = ((HttpClient)client).execute(post);
+//            } else {
+//                client = HttpClientSSLUtils.client;
+//                res = ((HttpClient)client).execute(post);
+//            }
+//
+//            var6 = IOUtils.toString(res.getEntity().getContent(), "UTF-8");
+//        } finally {
+//            post.releaseConnection();
+//            if (url.startsWith("https") && client != null && client instanceof CloseableHttpClient) {
+//                ((CloseableHttpClient)client).close();
+//            }
+//
+//        }
+//
+//        return var6;
+//    }
+//
+//    public static String doGet(String url) throws Exception {
+//        HttpClient client = null;
+//        HttpGet get = new HttpGet(url);
+//        String result = "";
+//
+//        try {
+//            Builder customReqConf = RequestConfig.custom();
+//            customReqConf.setConnectTimeout(DEFAULT_CONNECTION_TIME_OUT);
+//            customReqConf.setSocketTimeout(DEFAULT_CONNECTION_TIME_OUT);
+//            get.setConfig(customReqConf.build());
+//            HttpResponse res = null;
+//            if (url.startsWith("https")) {
+//                client = createSSLInsecureClient();
+//                res = ((HttpClient)client).execute(get);
+//            } else {
+//                client = HttpClientSSLUtils.client;
+//                res = ((HttpClient)client).execute(get);
+//            }
+//
+//            result = IOUtils.toString(res.getEntity().getContent(), "UTF-8");
+//        } finally {
+//            get.releaseConnection();
+//            if (url.startsWith("https") && client != null && client instanceof CloseableHttpClient) {
+//                ((CloseableHttpClient)client).close();
+//            }
+//
+//        }
+//
+//        return result;
+//    }
+//
+//    private static CloseableHttpClient createSSLInsecureClient() throws GeneralSecurityException {
+//        try {
+//            SSLContext sslContext = (new SSLContextBuilder()).loadTrustMaterial((KeyStore)null, new TrustStrategy() {
+//                public boolean isTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+//                    return true;
+//                }
+//            }).build();
+//            SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslContext, new HostnameVerifier() {
+//                public boolean verify(String hostname, SSLSession session) {
+//                    return true;
+//                }
+//            });
+//            return HttpClients.custom().setSSLSocketFactory(sslsf).build();
+//        } catch (GeneralSecurityException var2) {
+//            throw var2;
+//        }
+//    }
+//
+////    public static void main(String[] args) {
+////        String url = "https://10.33.39.8/webapi/service/base/getPlatAuthSubSystemList";
+////        String params = "appkey=f8524632&time=" + System.currentTimeMillis() + "&pageNo=1&pageSize=10";
+////        String urlString = url + "?" + params + "&token=" + Digests.buildToken(url + "?" + params, (String)null, "0a5a6558a06546088da645b5f9248a3a");
+////
+////        try {
+////            String output = new String(doGet(urlString));
+////            System.out.println(output);
+////        } catch (Exception var7) {
+////            var7.printStackTrace();
+////        }
+////
+////        url = "https://10.20.134.21/webapi/service/base/addPlatCard";
+////        Map<String, Object> map = new HashMap();
+////        map.put("appkey", "f8524632");
+////        map.put("time", System.currentTimeMillis());
+////        map.put("startCardNo", "16000");
+////        map.put("endCardNo", "16010");
+//////        params = JsonUtils.object2Json(map);
+////        url = url + "?token=" + Digests.buildToken(url + "?" + params, (String)null, "0a5a6558a06546088da645b5f9248a3a");
+////
+////        try {
+////            System.out.println(doPost(url, params));
+////        } catch (Exception var6) {
+////            var6.printStackTrace();
+////        }
+////
+////    }
+//
+//    static {
+//        PoolingHttpClientConnectionManager cm = new PoolingHttpClientConnectionManager();
+//        cm.setMaxTotal(128);
+//        cm.setDefaultMaxPerRoute(128);
+//        client = HttpClients.custom().setConnectionManager(cm).build();
+//    }
+//}

+ 58 - 0
musk/src/main/java/com/huimv/farm/musk/common/utils/HttpUtils.java

@@ -0,0 +1,58 @@
+package com.huimv.farm.musk.common.utils;
+
+import java.io.BufferedReader;
+import java.io.DataOutputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * http 工具类
+ */
+public class HttpUtils {
+
+    public static String post(String requestUrl, String accessToken, String params) throws Exception {
+        String generalUrl = requestUrl + "?access_token=" + accessToken;
+        URL url = new URL(generalUrl);
+        // 打开和URL之间的连接
+        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+        connection.setRequestMethod("POST");
+        // 设置通用的请求属性
+        connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+        connection.setRequestProperty("Connection", "Keep-Alive");
+        connection.setUseCaches(false);
+        connection.setDoOutput(true);
+        connection.setDoInput(true);
+
+        // 得到请求的输出流对象
+        DataOutputStream out = new DataOutputStream(connection.getOutputStream());
+        out.writeBytes(params);
+        out.flush();
+        out.close();
+
+        // 建立实际的连接
+        connection.connect();
+        // 获取所有响应头字段
+        Map<String, List<String>> headers = connection.getHeaderFields();
+        // 遍历所有的响应头字段
+        for (String key : headers.keySet()) {
+            System.out.println(key + "--->" + headers.get(key));
+        }
+        // 定义 BufferedReader输入流来读取URL的响应
+        BufferedReader in = null;
+        if (requestUrl.contains("nlp"))
+            in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "GBK"));
+        else
+            in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8"));
+        String result = "";
+        String getLine;
+        while ((getLine = in.readLine()) != null) {
+            result += getLine;
+        }
+        in.close();
+        System.out.println("result:" + result);
+        return result;
+    }
+}

+ 56 - 0
musk/src/main/java/com/huimv/farm/musk/common/utils/IDCardValidator.java

@@ -0,0 +1,56 @@
+package com.huimv.farm.musk.common.utils;
+
+import java.util.regex.Pattern;
+
+public class IDCardValidator {
+
+    public static boolean isValidIDCard(String idCardNumber) {
+        // 正则表达式用于验证身份证号
+        String pattern = "\\d{17}[0-9Xx]";
+
+        // 判断输入的身份证号是否符合规则
+        if (!Pattern.matches(pattern, idCardNumber)) {
+            return false;
+        }
+
+        // 获取身份证号的前17位
+        String idCardDigits = idCardNumber.substring(0, 17);
+
+        // 验证身份证号的前17位是否为数字
+        if (!isNumeric(idCardDigits)) {
+            return false;
+        }
+
+        // 验证身份证号的最后一位是否为合法校验位
+        return isValidCheckDigit(idCardNumber);
+    }
+
+    // 判断字符串是否为纯数字
+    private static boolean isNumeric(String str) {
+        return str.matches("\\d+");
+    }
+
+    // 验证身份证号的校验位是否合法
+    private static boolean isValidCheckDigit(String idCardNumber) {
+        String checkDigit = idCardNumber.substring(17);
+        String[] checkCodes = {"1", "0", "X", "9", "8", "7", "6", "5", "4", "3", "2"};
+        int sum = 0;
+        for (int i = 0; i < 17; i++) {
+            int coefficient = Integer.parseInt(idCardNumber.substring(i, i + 1));
+            int weight = (int) Math.pow(2, 17 - i) % 11;
+            sum += coefficient * weight;
+        }
+        return checkDigit.equalsIgnoreCase(checkCodes[sum % 11]);
+    }
+
+    public static void main(String[] args) {
+        String idCardNumber = "身份证号"; // 替换为要验证的身份证号
+        boolean isValid = isValidIDCard(idCardNumber);
+        if (isValid) {
+            System.out.println("身份证号正确!");
+        } else {
+            System.out.println("身份证号错误!");
+        }
+    }
+}
+

+ 27 - 0
musk/src/main/java/com/huimv/farm/musk/common/utils/IpTools.java

@@ -0,0 +1,27 @@
+package com.huimv.farm.musk.common.utils;
+
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author yejijie
+ * @created 2020年7月17日 上午11:24:20
+*/
+@Component
+public class IpTools {
+
+    public static String getRemoteHost(HttpServletRequest request){
+        String ip = request.getHeader("x-forwarded-for");
+        if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)){
+            ip = request.getHeader("Proxy-Client-IP");
+        }
+        if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)){
+            ip = request.getHeader("WL-Proxy-Client-IP");
+        }
+        if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)){
+            ip = request.getRemoteAddr();
+        }
+        return ip.equals("0:0:0:0:0:0:0:1")?"127.0.0.1":ip;
+    }
+}

+ 53 - 0
musk/src/main/java/com/huimv/farm/musk/common/utils/IpUtil.java

@@ -0,0 +1,53 @@
+package com.huimv.farm.musk.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;
+        }
+
+    }

+ 45 - 0
musk/src/main/java/com/huimv/farm/musk/common/utils/NumberUtils.java

@@ -0,0 +1,45 @@
+package com.huimv.farm.musk.common.utils;
+
+
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+
+import java.text.DecimalFormat;
+import java.util.Random;
+
+public class NumberUtils {
+
+    public static DecimalFormat df = new DecimalFormat("#,##0.00");
+    public static String format(String str) {
+        if (StringUtils.isBlank(str)){
+            return "0.00";
+        }
+        return df.format(Double.valueOf(str));
+    }
+    //num 是小数位数
+    public static String getNum(Integer min, Integer max, Integer num) {
+        Random rand = new Random();
+        int result = rand.nextInt(max - min ) +min;
+        if (num >0){
+            return result+"."+(rand.nextInt((int) Math.pow(10,num)));
+        }
+        return  result+"";
+    }
+    // 是小数位数
+    public static String getNumFloat(Double min, Double max) {
+        double v = Math.random() * (max - min) + min;
+        DecimalFormat df = new DecimalFormat("0.0");
+        return df.format(v);
+    }
+
+    public static String getNumFloat2(Double min, Double max) {
+        double v = Math.random() * (max - min) + min;
+        DecimalFormat df = new DecimalFormat("0.00");
+        return df.format(v);
+    }
+
+    public static String getNumFloat3(Double min, Double max) {
+        double v = Math.random() * (max - min) + min;
+        DecimalFormat df = new DecimalFormat("0.000");
+        return df.format(v);
+    }
+}

+ 89 - 0
musk/src/main/java/com/huimv/farm/musk/common/utils/OpenapiUtil.java

@@ -0,0 +1,89 @@
+package com.huimv.farm.musk.common.utils;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Base64;
+import java.util.Base64.Decoder;
+import java.util.Base64.Encoder;
+
+/**
+ * Openapi接口调用过程中会用到的一些工具方法
+ * @author shengyiling
+ *
+ */
+public class OpenapiUtil {
+
+	/**
+	 * BASE64加密网络图片,返回加密之后的字符串
+	 * @param imageUrl 图片的绝对地址
+	 * @param extensioName 图片的扩展名,例如 jpg、bmp等
+	 * @return 加密之后的字符串
+	 */
+	public static String encodeImage2Base64(URL imageUrl, String extensioName){
+		ByteArrayOutputStream outputStream = null;
+        try {  
+            BufferedImage bufferedImage = ImageIO.read(imageUrl);  //读取网络图片
+            outputStream = new ByteArrayOutputStream();  //文件输出流
+            ImageIO.write(bufferedImage, extensioName, outputStream);
+        } catch (MalformedURLException e1) {
+            e1.printStackTrace();  
+        } catch (IOException e) {
+            e.printStackTrace();  
+        }  
+        Encoder encoder = Base64.getEncoder();
+        
+        return encoder.encodeToString(outputStream.toByteArray());// 返回Base64编码过的字节数组字符串  
+	}
+	
+	/** 
+     * 将本地图片进行Base64位编码 
+     *  
+     * @param imgUrl 
+     *            图片的url路径,如http://.....xx.jpg 
+     * @param extensioName 图片的扩展名
+     * @return 加密之后的字符串
+     */  
+    public static String encodeImgageToBase64(File imageFile, String extensioName) {// 将图片文件转化为字节数组字符串,并对其进行Base64编码处理
+        ByteArrayOutputStream outputStream = null;
+        try {  
+            BufferedImage bufferedImage = ImageIO.read(imageFile);
+            outputStream = new ByteArrayOutputStream();
+            ImageIO.write(bufferedImage, extensioName, outputStream);
+        } catch (MalformedURLException e1) {
+            e1.printStackTrace();  
+        } catch (IOException e) {
+            e.printStackTrace();  
+        }  
+        // 对字节数组Base64编码  
+        Encoder encoder = Base64.getEncoder();
+        
+        return encoder.encodeToString(outputStream.toByteArray());// 返回Base64编码过的字节数组字符串  
+    }
+    
+    
+    /**
+     * 将Base64位编码的图片进行解码,并保存到指定目录
+     * @param base64Str 利用base64加密之后的字符串
+     * @param path 文件解密之后存放的地址 例如:D://
+     * @param imgName 文件解密之后命名的名称 例如: test.jpg
+     */
+    public static void decodeBase64ToImage(String base64Str, String path,
+                                           String imgName) {
+        Decoder decoder = Base64.getDecoder();
+        try {  
+            FileOutputStream write = new FileOutputStream(new File(path
+                    + imgName));  
+            byte[] decoderBytes = decoder.decode(base64Str);  
+            write.write(decoderBytes);  
+            write.close();  
+        } catch (IOException e) {
+            e.printStackTrace();  
+        }  
+    }  
+}

+ 79 - 0
musk/src/main/java/com/huimv/farm/musk/common/utils/PageFactory.java

@@ -0,0 +1,79 @@
+/*
+Copyright [2020] [https://www.xiaonuo.vip]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Snowy采用APACHE LICENSE 2.0开源协议,您在使用过程中,需要注意以下几点:
+
+1.请不要删除和修改根目录下的LICENSE文件。
+2.请不要删除和修改Snowy源码头部的版权声明。
+3.请保留源码和相关描述文件的项目出处,作者声明等。
+4.分发源码时候,请注明软件出处 https://gitee.com/xiaonuobase/snowy
+5.在修改包名,模块名称,项目代码等时,请注明软件出处 https://gitee.com/xiaonuobase/snowy
+6.若您的项目无法满足以上几点,可申请商业授权,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
+ */
+package com.huimv.farm.musk.common.utils;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+
+/**
+ * 默认分页参数构建
+ *
+ * @author yubaoshan
+ * @date 2017/11/15 13:52
+ */
+public class PageFactory {
+
+    /**
+     * 每页大小(默认20)
+     */
+    private static final String PAGE_SIZE_PARAM_NAME = "pageSize";
+
+    /**
+     * 第几页(从1开始)
+     */
+    private static final String PAGE_NO_PARAM_NAME = "pageNo";
+
+    /**
+     * 默认分页,在使用时PageFactory.defaultPage会自动获取pageSize和pageNo参数
+     *
+     * @author xuyuxiang
+     * @date 2020/3/30 16:42
+     */
+    public static <T> Page<T> defaultPage() {
+
+        int pageSize = 20;
+        int pageNo = 1;
+
+
+        return new Page<>(pageNo, pageSize);
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+ 8 - 0
musk/src/main/java/com/huimv/farm/musk/common/utils/PageResult.java

@@ -0,0 +1,8 @@
+package com.huimv.farm.musk.common.utils;
+
+import java.util.List;
+
+public class PageResult<T> {
+    private Long total;
+    private List<T> rows;
+}

+ 344 - 0
musk/src/main/java/com/huimv/farm/musk/common/utils/PdfUtil.java

@@ -0,0 +1,344 @@
+package com.huimv.farm.musk.common.utils;
+
+//import cn.bt.common.utils.StringUtils;
+//import cn.bt.modules.process.instance.enums.InstanceStatusEnum;
+//import com.itextpdf.text.*;
+//import com.itextpdf.text.pdf.*;
+
+import cn.hutool.core.io.IoUtil;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+
+/**
+ * @Author: xp
+ * @Date: 2021/7/14
+ */
+public class PdfUtil {
+
+    /**
+     * 返回PDF流
+     *
+     * @param response 相应设置
+     * @param pathName 水印文件路径和名称
+     * @throws Exception 异常
+     */
+    /*public static void returnPdfStream(HttpServletResponse response, String pathName) throws Exception {
+        response.setContentType("application/pdf");
+
+        File file = new File(pathName);
+        if (file.exists()) {
+            FileInputStream in = new FileInputStream(file);
+            OutputStream out = response.getOutputStream();
+            byte[] b = new byte[1024 * 4];
+            int n;
+            while ((n = in.read(b)) > -1) {
+                out.write(b, 0, n);
+            }
+            out.flush();
+            in.close();
+            out.close();
+        }
+    }*/
+    public static void returnPdfStream2(HttpServletResponse response, String pathName, String subsidyNane) throws Exception {
+        InputStream in = null;
+        try {
+            File file = new File(pathName);
+             in = new BufferedInputStream(new FileInputStream(file));
+            String filename = new String((subsidyNane+".pdf").getBytes(), "ISO8859_1");
+            response.setContentType("application/binary;charset=ISO8859_1");
+            response.setHeader("Content-disposition", "attachment; filename=" + filename);// 组装附件名称和格式
+            IoUtil.copy(in, response.getOutputStream());
+        } catch (Exception e) {
+            System.out.println("------------ 这里除了问题!!!-----------");
+            System.out.println(e);
+        }finally {
+            if (in != null) {
+                in.close();
+            }
+        }
+    }
+
+    public static void returnPdfStream3(HttpServletResponse response, String pathName, String subsidyNane) throws Exception {
+        InputStream in = null;
+        try {
+            File file = new File(pathName);
+            in = new BufferedInputStream(new FileInputStream(file));
+            String filename = new String((subsidyNane+".xls").getBytes(), "ISO8859_1");
+            response.setContentType("application/binary;charset=ISO8859_1");
+            response.setHeader("Content-disposition", "attachment; filename=" + filename);// 组装附件名称和格式
+            IoUtil.copy(in, response.getOutputStream());
+        } catch (Exception e) {
+            System.out.println("------------ 这里除了问题!!!-----------");
+            System.out.println(e);
+        }finally {
+            if (in != null) {
+                in.close();
+            }
+        }
+    }
+
+    /**
+     * 返回水印图片路径
+     *
+     * @param instanceStatus 流程状态
+     * @return 水印图片路径
+     */
+//    public static String returnWatermarkPath(int instanceStatus) {
+//        String watermarkPath = "ioffice-api/src/main/resources/static/watermark";
+//        if (InstanceStatusEnum.E_0.getCode().equals(instanceStatus)) {
+//            watermarkPath = watermarkPath + "/已作废.png";
+//
+//        } else if (InstanceStatusEnum.E_2.getCode().equals(instanceStatus)) {
+//            watermarkPath = watermarkPath + "/审批通过.png";
+//
+//        } else {
+//            watermarkPath = watermarkPath + "/审批中.png";
+//        }
+//        return watermarkPath;
+//    }
+//
+//    /**
+//     * 建立一个书写器(Writer)与document对象关联,通过书写器(Writer)可以将文档写入到磁盘中。
+//     *
+//     * @param pdfPath     保存路径
+//     * @param document    文档
+//     * @param pdfPathName 文件保存路径和名称
+//     * @return 书写器(Writer)
+//     * @throws Exception
+//     */
+//    public static PdfWriter createPdfWriter(String pdfPath, Document document, String pdfPathName) throws Exception {
+//
+//        //判断文件夹是否存在
+//        File file = new File(pdfPath);
+//        if (!file.exists()) {
+//            file.mkdir();
+//        }
+//        file = new File(pdfPathName);
+//
+//        PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream(file));
+//        writer.setViewerPreferences(PdfWriter.PageModeUseThumbs);
+//
+//        return writer;
+//    }
+//
+//    /**
+//     * 设置第一标题内容
+//     *
+//     * @param title    第一标题
+//     * @param document 文档
+//     * @throws Exception 异常
+//     */
+//    public static void setPdfFirstTitle(String title, Document document) throws Exception {
+//        Paragraph paragraph = new Paragraph(title, getPdfChineseFont(0));
+//        paragraph.setAlignment(Element.ALIGN_CENTER);
+//        paragraph.setSpacingAfter(2);
+//        document.add(paragraph);
+//    }
+//
+//    /**
+//     * 设置第二标题内容
+//     *
+//     * @param title           第二标题
+//     * @param document        文档
+//     * @param alignment       对齐方式
+//     * @param firstLineIndent 第一行缩进
+//     * @param spacingAfter    之后间隔
+//     * @throws Exception
+//     */
+//    public static void setPdfSecondTitle(String title, Document document, int alignment, int firstLineIndent, int spacingAfter) throws Exception {
+//        Paragraph lsh = new Paragraph(title, getPdfChineseFont(1));
+//        lsh.setAlignment(alignment);
+//        lsh.setFirstLineIndent(firstLineIndent);
+//        lsh.setSpacingAfter(spacingAfter);
+//        document.add(lsh);
+//    }
+//
+//    /**
+//     * 设置表格内容 并将表格加入文档中
+//     *
+//     * @param dates    数据
+//     * @param document 文档
+//     * @param table    表格
+//     * @throws Exception 异常
+//     */
+//    public static void setPdfTableContent(Object[][] dates, Document document, PdfPTable table) throws Exception {
+//        for (int i = 0; i < dates.length; i++) {
+//            for (int j = 0; j < dates[i].length; j++) {
+//                //表格的单元格
+//                PdfPCell pdfCell = new PdfPCell();
+//                //设置表格行高
+//                if (i > 0 && i < 3) {
+//                    pdfCell.setMinimumHeight(50);
+//                } else {
+//                    pdfCell.setMinimumHeight(25);
+//                }
+//                Paragraph paragraph = new Paragraph(dates[i][j] + "", getPdfChineseFont(1));
+//                pdfCell.setPhrase(paragraph);
+//
+//                setCellStyle(pdfCell);
+//                table.addCell(pdfCell);
+//            }
+//        }
+//
+//        document.add(table);
+//    }
+//
+//    /**
+//     * 设置水印
+//     *
+//     * @param inputFile 要这设置水印的文件路径
+//     * @param imageFile 水印图片路径
+//     * @param tag       标记
+//     * @return 生成水印文件的路径
+//     */
+//    public static String imageWaterMark(String inputFile, String imageFile, String tag) throws Exception {
+//        String[] spe = separatePath(inputFile);
+//        String outputFile = spe[0] + tag + "." + spe[1];
+//
+//        PdfReader reader = new PdfReader(inputFile);
+//        PdfStamper stamper = new PdfStamper(reader, new FileOutputStream(outputFile));
+//
+//        int total = reader.getNumberOfPages() + 1;
+//
+//        Image image = Image.getInstance(imageFile);
+//        //坐标
+//        image.setAbsolutePosition(389, 730);
+//        //自定义大小
+//        image.scaleAbsolute(80, 80);
+//        //旋转 弧度
+//        image.setRotation(-55);
+//
+//        //旋转 角度
+//        image.setRotationDegrees(0);
+//        //依照比例缩放
+//        image.scalePercent(50);
+//
+//        PdfGState gs = new PdfGState();
+//        // 设置透明度为0.2
+//        gs.setFillOpacity(0.2f);
+//
+//
+//        PdfContentByte under;
+//        //给每一页加水印
+//        for (int i = 1; i < total; i++) {
+//            under = stamper.getUnderContent(i);
+//            under.beginText();
+//            // 添加水印图片
+//            under.addImage(image);
+//            under.setGState(gs);
+//        }
+//        stamper.close();
+//        reader.close();
+//        return outputFile;
+//    }
+//
+//    /**
+//     * 拆分原文件路径
+//     *
+//     * @param path 原文件路径
+//     * @return 拆分原路径的数组
+//     */
+//    public static String[] separatePath(String path) {
+//        if (StringUtils.isBlank(path)) {
+//            return null;
+//        }
+//        String[] sep = path.split("\\.");
+//        return new String[]{sep[0], sep[1]};
+//    }
+//
+//    /**
+//     * 设置表格单元格样式
+//     *
+//     * @param pdfCell 单元格对象
+//     */
+//    public static void setCellStyle(PdfPCell pdfCell) {
+//        pdfCell.setHorizontalAlignment(Element.ALIGN_CENTER);
+//        pdfCell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+//        pdfCell.setBackgroundColor(new BaseColor(0xdd7e6b));
+//        pdfCell.setBorderWidthTop(0.1f);
+//        pdfCell.setBorderWidthBottom(0.1f);
+//        pdfCell.setBorderWidthLeft(0.1f);
+//        pdfCell.setBorderWidthRight(0.1f);
+//    }
+//
+//    /**
+//     * 设置pdf字体及大小
+//     *
+//     * @param type 标题或者内容 0-内容 1-标题
+//     * @return 字体
+//     * @throws Exception 异常
+//     */
+//    public static Font getPdfChineseFont(int type) throws Exception {
+//        // 使用系统字体
+//        BaseFont bfChinese = BaseFont.createFont("STSong-Light", "UniGB-UCS2-H", BaseFont.NOT_EMBEDDED);
+//        Font font;
+//        if (type == 1) {
+//            font = new Font(bfChinese);
+//        } else {
+//            font = new Font(bfChinese, 18, Font.BOLD);
+//        }
+//
+//        return font;
+//    }
+//
+//    /**
+//     * 删除文件夹
+//     *
+//     * @param folderPath 文件路基
+//     */
+//    public static void delFolder(String folderPath) {
+//        // 删除完里面所有内容
+//        delAllFile(folderPath);
+//        String filePath = folderPath;
+//        filePath = filePath.toString();
+//        java.io.File myFilePath = new java.io.File(filePath);
+//        // 删除空文件夹
+//        myFilePath.delete();
+//    }
+//
+//    /**
+//     * 删除指定文件夹下所有文件
+//     *
+//     * @param path 文件路基
+//     * @return 是否成功
+//     */
+//    public static boolean delAllFile(String path) {
+//        boolean flag = false;
+//        File file = new File(path);
+//        String[] tempList = file.list();
+//        File temp = null;
+//        for (int i = 0; i < tempList.length; i++) {
+//            if (path.endsWith(File.separator)) {
+//                temp = new File(path + tempList[i]);
+//            } else {
+//                temp = new File(path + File.separator + tempList[i]);
+//            }
+//            if (temp.isFile()) {
+//                temp.delete();
+//            }
+//            if (temp.isDirectory()) {
+//                // 先删除文件夹里面的文件
+//                delAllFile(path + "/" + tempList[i]);
+//                // 再删除空文件夹
+//                delFolder(path + "/" + tempList[i]);
+//                flag = true;
+//            }
+//        }
+//        return flag;
+//    }
+//    public static boolean delAllFile(String path) {
+//        boolean flag = false;
+//        File file = new File(path);
+//        File temp = null;
+//
+//            if (temp.isFile()) {
+//                temp.delete();
+//            }
+//        return flag;
+//    }
+}
+

+ 29 - 0
musk/src/main/java/com/huimv/farm/musk/common/utils/PercentUtil.java

@@ -0,0 +1,29 @@
+package com.huimv.farm.musk.common.utils;
+
+import java.text.DecimalFormat;
+
+/**
+ * @Author : yuxuexuan
+ * @Create : 2021/11/29 0029 10:52
+ **/
+public class PercentUtil {
+
+    public static String getGrowth(Double lastMonth, Double lastTwoMonth){
+        if (lastMonth.equals( lastTwoMonth)){
+            return "0";
+        }
+        if (lastMonth == 0.0){
+            return "-100";
+        }
+
+        if (lastTwoMonth == 0.0){
+            return "100";
+        }
+        DecimalFormat df = new DecimalFormat("0.00");
+
+        return df.format((lastMonth - lastTwoMonth)/ lastTwoMonth *100);
+    }
+
+
+
+}

+ 25 - 0
musk/src/main/java/com/huimv/farm/musk/common/utils/PhoneNumberValidator.java

@@ -0,0 +1,25 @@
+package com.huimv.farm.musk.common.utils;
+
+import java.util.regex.Pattern;
+
+public class PhoneNumberValidator {
+
+    public static boolean isValidPhoneNumber(String phoneNumber) {
+        // 正则表达式用于验证手机号
+        String pattern = "1[3456789]\\d{9}";
+
+        // 判断输入的手机号是否符合规则
+        return Pattern.matches(pattern, phoneNumber);
+    }
+
+    public static void main(String[] args) {
+        String phoneNumber = "手机号"; // 替换为要验证的手机号
+        boolean isValid = isValidPhoneNumber(phoneNumber);
+        if (isValid) {
+            System.out.println("手机号正确!");
+        } else {
+            System.out.println("手机号错误!");
+        }
+    }
+}
+

+ 97 - 0
musk/src/main/java/com/huimv/farm/musk/common/utils/Result.java

@@ -0,0 +1,97 @@
+package com.huimv.farm.musk.common.utils;
+
+import java.io.Serializable;
+
+public class Result implements Serializable {
+
+    private boolean success;
+    private Integer code;
+    private String message;
+
+    public boolean isSuccess() {
+        return success;
+    }
+
+    public void setSuccess(boolean success) {
+        this.success = success;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public Object getData() {
+        return data;
+    }
+
+    public void setData(Object data) {
+        this.data = data;
+    }
+
+    private Object data;
+
+    public Object getData2() {
+        return data2;
+    }
+
+    public void setData2(Object data2) {
+        this.data2 = data2;
+    }
+
+    private Object data2;
+
+    //不需要返回数据时使用
+    public Result(ResultCode code) {
+        this.success = code.success;
+        this.code = code.code;
+        this.message = code.message;
+    }
+
+    public Result(ResultCode code, Object data) {
+        this.success = code.success;
+        this.code = code.code;
+        this.message = code.message;
+        this.data = data;
+    }
+    public Result(ResultCode code, Object data, Object data2) {
+        this.success = code.success;
+        this.code = code.code;
+        this.message = code.message;
+        this.data = data;
+        this.data2 = data2;
+
+    }
+
+    public Result(Integer code, String message, boolean success) {
+        this.code = code;
+        this.message = message;
+        this.success = success;
+    }
+
+    /*
+     * 调用ResultCode类封装常用的返回数据
+     */
+    public static Result SUCCESS(){
+        return new Result(ResultCode.SUCCESS);
+    }
+
+    public static Result ERROR(){
+        return new Result(ResultCode.SERVER_ERROR);
+    }
+
+    public static Result FAIL(){
+        return new Result(ResultCode.FAIL);
+    }
+}

+ 41 - 0
musk/src/main/java/com/huimv/farm/musk/common/utils/ResultCode.java

@@ -0,0 +1,41 @@
+package com.huimv.farm.musk.common.utils;
+
+public enum ResultCode {
+    SUCCESS(true,10000,"操作成功!"),
+    //---系统错误返回码-----
+    FAIL(false,10001,"操作失败"),
+    UNAUTHENTICATED(false,10002,"您还未登录"),
+    UNAUTHORISE(false,10003,"权限不足"),
+    SERVER_ERROR(false,99999,"抱歉,系统繁忙,请稍后重试!"),
+    DATA_NULL(false,10004,"数据为空"),
+    //---用户操作返回码  2xxxx----
+    MOBILEORPASSWORDERROR(false,20001,"用户名或密码错误");
+    //---企业操作返回码  3xxxx----
+    //---权限操作返回码----
+    //---其他操作返回码----
+
+    //操作是否成功
+    boolean success;
+    //操作代码
+    int code;
+    //提示信息
+    String message;
+
+    ResultCode(boolean success,int code, String message){
+        this.success = success;
+        this.code = code;
+        this.message = message;
+    }
+
+    public boolean success() {
+        return success;
+    }
+
+    public int code() {
+        return code;
+    }
+
+    public String message() {
+        return message;
+    }
+}

+ 71 - 0
musk/src/main/java/com/huimv/farm/musk/common/utils/ResultUtil.java

@@ -0,0 +1,71 @@
+package com.huimv.farm.musk.common.utils;
+
+import cn.hutool.core.util.ObjectUtil;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Project : huimv-breed
+ * @Package : IntelliJ IDEA
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2022/9/27
+ **/
+@Component
+public class ResultUtil {
+
+    public static Result result(int rows){
+        if(rows == 0){
+            return new Result(ResultCode.FAIL,"处理失败.");
+        }else{
+            return new Result(ResultCode.SUCCESS,"处理成功.");
+        }
+    }
+
+    public static Result list(List o){
+        if(ObjectUtil.isNotEmpty(o) ){
+            return new Result(ResultCode.SUCCESS,o);
+        }else{
+            return new Result(ResultCode.FAIL,new ArrayList<>());
+        }
+    }
+    public static Result getResult(Integer rows){
+        if(rows > 0){
+            return new Result(ResultCode.SUCCESS);
+        }else{
+            return new Result(ResultCode.FAIL);
+        }
+    }
+
+    public static Result addResult(Integer rows){
+        if(rows > 0){
+            return new Result(10000, "添加成功",true);
+        }else{
+            return new Result(10001, "添加失败",false);
+        }
+    }
+    public static Result updateResult(Integer rows){
+        if(rows > 0){
+            return new Result(10000, "修改成功",true);
+        }else{
+            return new Result(10001, "修改失败",false);
+        }
+    }
+    public static Result deleteResult(Integer rows){
+        if(rows > 0){
+            return new Result(10000, "删除成功",true);
+        }else{
+            return new Result(10001, "删除失败",false);
+        }
+    }
+
+    public static Result exist(){
+       return new Result(10001, "该数据已存在",false);
+    }
+    public static Result isNull(){
+        return new Result(ResultCode.DATA_NULL);
+    }
+}

+ 120 - 0
musk/src/main/java/com/huimv/farm/musk/common/utils/SendSMS.java

@@ -0,0 +1,120 @@
+package com.huimv.farm.musk.common.utils;
+
+
+import cn.hutool.crypto.SecureUtil;
+import cn.hutool.crypto.digest.MD5;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+public class SendSMS {
+
+
+    static String httpUrl = "http://121.41.41.182:8001/sms";
+    static String userNmae = "6085";
+    static String passWord = "huimu@6085";
+
+    //短信内容不能出现空格,换行,百分号等特殊字符.相同两条短信之间内容不能相同
+    public static void main(String[] args) {
+        /**
+         *发送给报警器
+         *//*
+		String content = "003C0043004C0045004100520030003000310039003E";
+		String mobile = "18767100452";//多个用英文逗号隔开 如18767100452,1388888888
+		content = UnicodeTool.decodeUnicode(UnicodeTool.addUnicodeU(content.toString()));*/
+
+        /**
+         * 发送给用户
+         */
+        ArrayList<String> phoneList = new ArrayList<>();
+        phoneList.add("15869188386");
+        String content ="测试结果";
+        sendSMS(phoneList,content);
+
+    }
+
+    public static void sendSMS(ArrayList<String> mobiles, String content) {
+        RestTemplate restTemplate = new RestTemplate();
+
+        // 设置请求头
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
+
+        // 设置请求参数
+        Map params = new HashMap();
+//        ArrayList<String> phoneList = new ArrayList<>();
+//        phoneList.add("13140429955");
+//        String content ="【慧牧科技】测试结果";
+        content =   "【慧牧科技】"+content;
+        long timestamp = System.currentTimeMillis();
+        params.put("userName", userNmae);
+        params.put("content", content);
+        params.put("phoneList", mobiles);
+        params.put("timestamp", timestamp);
+        MD5 md5 = SecureUtil.md5();
+        String md5PassWord = md5.digestHex(passWord);
+        String sign = md5.digestHex(userNmae+content+timestamp+md5PassWord);
+
+        params.put("sign", sign);
+
+        System.out.println(params.toString());
+        // 创建HttpEntity对象,封装请求头和请求参数
+        HttpEntity requestEntity = new HttpEntity<>(params, headers);
+        // 发送POST请求
+        ResponseEntity<String> responseEntity = restTemplate.postForEntity(httpUrl+"/api/sendMessage", requestEntity, String.class);
+
+        // 获取响应结果
+        String responseBody = responseEntity.getBody();
+        System.out.println(responseBody);
+
+    }
+//    public static void sendSMS(String[] mobiles, String content) {
+//        for (String mobile : mobiles) {
+//            String httpArg = "accesskey=5493&secretkey=7e6f0b6e9d12d2c750cbf1932a4b9cc53e36509b&mobile=" + mobile + "&content=" + content + "通知【慧牧科技】";
+//            System.out.println(httpArg);
+//            String jsonResult = request(httpUrl, httpArg);
+//            System.out.println(jsonResult);//返回码
+//        }
+//    }
+
+
+    public static String request(String httpUrl, String httpArg) {
+        BufferedReader reader = null;
+        String result = null;
+        StringBuffer sbf = new StringBuffer();
+        httpUrl = httpUrl + "?" + httpArg;
+        try {
+            URL url = new URL(httpUrl);
+            HttpURLConnection connection = (HttpURLConnection) url
+                    .openConnection();
+            connection.setRequestMethod("GET");
+            connection.connect();
+            InputStream is = connection.getInputStream();
+            reader = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+            String strRead = null;
+            while ((strRead = reader.readLine()) != null) {
+                sbf.append(strRead);
+                sbf.append("\r\n");
+            }
+            reader.close();
+            result = sbf.toString();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+}
+

+ 191 - 0
musk/src/main/java/com/huimv/farm/musk/common/utils/SnowflakeSequence.java

@@ -0,0 +1,191 @@
+package com.huimv.farm.musk.common.utils;
+
+import java.lang.management.ManagementFactory;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+
+/**
+ * Twitter_Snowflake<br>
+ * SnowFlake的结构如下(每部分用-分开):<br>
+ * 0 - 0000000000 0000000000 0000000000 0000000000 0 - 00000 - 00000 - 000000000000 <br>
+ * 1位标识,由于long基本类型在Java中是带符号的,最高位是符号位,正数是0,负数是1,所以id一般是正数,最高位是0<br>
+ * 41位时间截(毫秒级),注意,41位时间截不是存储当前时间的时间截,而是存储时间截的差值(当前时间截 - 开始时间截)
+ * 得到的值),这里的的开始时间截,一般是我们的id生成器开始使用的时间,由我们程序来指定的(如下下面程序IdWorker类的startTime属性)。41位的时间截,可以使用69年,年T = (1L << 41) / (1000L * 60 * 60 * 24 * 365) = 69<br>
+ * 10位的数据机器位,可以部署在1024个节点,包括5位datacenterId和5位workerId<br>
+ * 12位序列,毫秒内的计数,12位的计数顺序号支持每个节点每毫秒(同一机器,同一时间截)产生4096个ID序号<br>
+ * 加起来刚好64位,为一个Long型。<br>
+ * SnowFlake的优点是,整体上按照时间自增排序,并且整个分布式系统内不会产生ID碰撞(由数据中心ID和机器ID作区分),并且效率较高,经测试,SnowFlake每秒能够产生26万ID左右。
+ */
+public class SnowflakeSequence {
+    // ==============================Fields===========================================
+    /** 开始时间截 (2017/11/29 18:25:29) */
+    private final long twepoch = 1511951129000L;
+
+    /** 机器id所占的位数 */
+    private final long workerIdBits = 5L;
+
+    /** 数据标识id所占的位数 */
+    private final long datacenterIdBits = 5L;
+
+    /** 支持的最大机器id,结果是31 (这个移位算法可以很快的计算出几位二进制数所能表示的最大十进制数) */
+    private final long maxWorkerId = -1L ^ (-1L << workerIdBits);
+
+    /** 支持的最大数据标识id,结果是31 */
+    private final long maxDatacenterId = -1L ^ (-1L << datacenterIdBits);
+
+    /** 序列在id中占的位数 */
+    private final long sequenceBits = 12L;
+
+    /** 机器ID向左移12位 */
+    private final long workerIdShift = sequenceBits;
+
+    /** 数据标识id向左移17位(12+5) */
+    private final long datacenterIdShift = sequenceBits + workerIdBits;
+
+    /** 时间截向左移22位(5+5+12) */
+    private final long timestampLeftShift = sequenceBits + workerIdBits + datacenterIdBits;
+
+    /** 生成序列的掩码,这里为4095 (0b111111111111=0xfff=4095) */
+    private final long sequenceMask = -1L ^ (-1L << sequenceBits);
+
+    /** 工作机器ID(0~31) */
+    private long workerId;
+
+    /** 数据中心ID(0~31) */
+    private long datacenterId;
+
+    /** 毫秒内序列(0~4095) */
+    private long sequence = 0L;
+
+    /** 上次生成ID的时间截 */
+    private long lastTimestamp = -1L;
+
+    //==============================构造函数=====================================
+    //根据mac地址产生datacenterid
+    public SnowflakeSequence() {
+        datacenterId = getDatacenterId(maxDatacenterId);
+        workerId = getMaxWorkerId(datacenterId, maxWorkerId);
+//        System.out.println("datacenterId:" + datacenterId + ",workerId:" + workerId);
+    }
+
+    /**
+     * 构造函数
+     * @param workerId 工作ID (0~31)
+     * @param datacenterId 数据中心ID (0~31)
+     */
+    public SnowflakeSequence(long workerId, long datacenterId) {
+        if (workerId > maxWorkerId || workerId < 0) {
+            throw new IllegalArgumentException(String.format("worker Id can't be greater than %d or less than 0", maxWorkerId));
+        }
+        if (datacenterId > maxDatacenterId || datacenterId < 0) {
+            throw new IllegalArgumentException(String.format("datacenter Id can't be greater than %d or less than 0", maxDatacenterId));
+        }
+        this.workerId = workerId;
+        this.datacenterId = datacenterId;
+    }
+
+    // ==============================Methods==========================================
+    /**
+     * 获得下一个ID (该方法是线程安全的)
+     * @return SnowflakeId
+     */
+    public synchronized long nextId() {
+        long timestamp = timeGen();
+
+        //如果当前时间小于上一次ID生成的时间戳,说明系统时钟回退过这个时候应当抛出异常
+        if (timestamp < lastTimestamp) {
+            throw new RuntimeException(
+                    String.format("Clock moved backwards.  Refusing to generate id for %d milliseconds", lastTimestamp - timestamp));
+        }
+
+        //如果是同一时间生成的,则进行毫秒内序列
+        if (lastTimestamp == timestamp) {
+            sequence = (sequence + 1) & sequenceMask;
+            //毫秒内序列溢出
+            if (sequence == 0) {
+                //阻塞到下一个毫秒,获得新的时间戳
+                timestamp = tilNextMillis(lastTimestamp);
+            }
+        }
+        //时间戳改变,毫秒内序列重置
+        else {
+            sequence = 0L;
+        }
+
+        //上次生成ID的时间截
+        lastTimestamp = timestamp;
+
+        //移位并通过或运算拼到一起组成64位的ID
+        return ((timestamp - twepoch) << timestampLeftShift) //
+                | (datacenterId << datacenterIdShift) //
+                | (workerId << workerIdShift) //
+                | sequence;
+    }
+
+    /**
+     * 阻塞到下一个毫秒,直到获得新的时间戳
+     * @param lastTimestamp 上次生成ID的时间截
+     * @return 当前时间戳
+     */
+    protected long tilNextMillis(long lastTimestamp) {
+        long timestamp = timeGen();
+        while (timestamp <= lastTimestamp) {
+            timestamp = timeGen();
+        }
+        return timestamp;
+    }
+
+    /**
+     * 返回以毫秒为单位的当前时间
+     * @return 当前时间(毫秒)
+     */
+    protected long timeGen() {
+        return System.currentTimeMillis();
+    }
+
+    /**
+     * <p>
+     * 数据标识id部分
+     * </p>
+     * @param maxDatacenterId
+     * @return
+     */
+    protected static long getDatacenterId(long maxDatacenterId) {
+        long id = 0L;
+        try {
+            InetAddress ip = InetAddress.getLocalHost();
+            NetworkInterface network = NetworkInterface.getByInetAddress(ip);
+            if (network == null) {
+                id = 1L;
+            } else {
+                byte[] mac = network.getHardwareAddress();
+                if (null != mac) {
+                    id = ((0x000000FF & (long) mac[mac.length - 1]) | (0x0000FF00 & (((long) mac[mac.length - 2]) << 8))) >> 6;
+                    id = id % (maxDatacenterId + 1);
+                }
+            }
+        } catch (Exception e) {
+            System.err.println(" getDatacenterId: " + e.getMessage());
+        }
+        return id;
+    }
+
+    /**
+     * 获取 maxWorkerId
+     * @param datacenterId   数据中心id
+     * @param maxWorkerId    机器id
+     * @return  maxWorkerId
+     */
+    protected static long getMaxWorkerId(long datacenterId, long maxWorkerId) {
+        StringBuilder mpid = new StringBuilder();
+        mpid.append(datacenterId);
+        String name = ManagementFactory.getRuntimeMXBean().getName();
+        if (name != null && "".equals(name)) {
+            // GET jvmPid
+            mpid.append(name.split("@")[0]);
+        }
+        //MAC + PID 的 hashcode 获取16个低位
+        return (mpid.toString().hashCode() & 0xffff) % (maxWorkerId + 1);
+    }
+
+}

+ 44 - 0
musk/src/main/java/com/huimv/farm/musk/common/utils/StringUtilsWork.java

@@ -0,0 +1,44 @@
+package com.huimv.farm.musk.common.utils;
+
+/**
+ * @Author Anchor
+ * @Date 2021/7/30 13:17
+ * @Version 1.0.1
+ */
+public class StringUtilsWork {
+
+
+    public static boolean isEmpty(String str) {
+        return str == null || str.length() == 0;
+    }
+
+    public static boolean isNotEmpty(String str) {
+        return !isEmpty(str);
+    }
+
+    public static boolean isBlank(String str) {
+        int strLen;
+        if (str != null && (strLen = str.length()) != 0) {
+            for(int i = 0; i < strLen; ++i) {
+                if (!Character.isWhitespace(str.charAt(i))) {
+                    return false;
+                }
+            }
+
+            return true;
+        } else {
+            return true;
+        }
+    }
+
+    public static boolean isNotBlank(String str) {
+        return !isBlank(str);
+    }
+
+
+}
+
+
+
+
+

+ 120 - 0
musk/src/main/java/com/huimv/farm/musk/common/utils/VerifyUtil.java

@@ -0,0 +1,120 @@
+package com.huimv.farm.musk.common.utils;
+
+
+import com.huimv.farm.musk.common.exception.ExceptionEnum;
+import com.huimv.farm.musk.common.exception.MiException;
+
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.util.Random;
+
+
+public class VerifyUtil {
+//    public static final String RANDOMCODEKEY = "RANDOMREDISKEY";//放到session中的key
+    private String randString = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";//随机产生数字与字母组合的字符串
+    private int width = 95;// 图片宽
+    private int height = 50;// 图片高
+    private int lineSize = 40;// 干扰线数量
+    private int stringNum = 4;// 随机产生字符数量
+
+    private Random random = new Random();
+
+    /**
+     * 获得字体
+     */
+    private Font getFont() {
+        return new Font("Fixedsys", Font.CENTER_BASELINE, 25);
+    }
+
+    /**
+     * 获得颜色
+     */
+    private Color getRandColor(int fc, int bc) {
+        if (fc > 255) {
+            fc = 255;
+        }
+        if (bc > 255) {
+            bc = 255;
+        }
+        int r = fc + random.nextInt(bc - fc - 16);
+        int g = fc + random.nextInt(bc - fc - 14);
+        int b = fc + random.nextInt(bc - fc - 18);
+        return new Color(r, g, b);
+    }
+
+    /**
+     * 生成随机图片
+     */
+    public String getRandcode(HttpServletRequest request, HttpServletResponse response) {
+        // BufferedImage类是具有缓冲区的Image类,Image类是用于描述图像信息的类
+        BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_BGR);
+        // 产生Image对象的Graphics对象,改对象可以在图像上进行各种绘制操作
+        Graphics g = image.getGraphics();
+        //图片大小
+        g.fillRect(0, 0, width, height);
+        //字体大小
+        g.setFont(new Font("Times New Roman", Font.ROMAN_BASELINE, 50));
+        //字体颜色
+        g.setColor(getRandColor(110, 133));
+        // 绘制干扰线
+        for (int i = 0; i <= lineSize; i++) {
+            drowLine(g);
+        }
+        // 绘制随机字符
+        String randomString = "";
+        for (int i = 1; i <= stringNum; i++) {
+            randomString = drowString(g, randomString, i);
+        }
+        //将生成的随机字符串保存到session中
+//        session.removeAttribute(RANDOMCODEKEY);
+//        session.setAttribute(RANDOMCODEKEY, randomString);
+        //设置失效时间1分钟
+//        session.setMaxInactiveInterval(60);
+        g.dispose();
+        try {
+            // 将内存中的图片通过流动形式输出到客户端
+            ImageIO.write(image, "JPEG", response.getOutputStream());
+            return randomString;
+        } catch (Exception e) {
+            throw new MiException(ExceptionEnum.VERIFCATION_FAID);
+        }
+
+    }
+
+    /**
+     * 绘制字符串
+     */
+    private String drowString(Graphics g, String randomString, int i) {
+        g.setFont(getFont());
+        g.setColor(new Color(random.nextInt(101), random.nextInt(111), random
+                .nextInt(121)));
+        String rand = String.valueOf(getRandomString(random.nextInt(randString
+                .length())));
+        randomString += rand;
+        g.translate(random.nextInt(3), random.nextInt(3));
+        g.drawString(rand, 13 * i, 33);
+        return randomString;
+    }
+
+    /**
+     * 绘制干扰线
+     */
+    private void drowLine(Graphics g) {
+        int x = random.nextInt(width);
+        int y = random.nextInt(height);
+        int xl = random.nextInt(13);
+        int yl = random.nextInt(15);
+        g.drawLine(x, y, x + xl, y + yl);
+    }
+
+    /**
+     * 获取随机的字符
+     */
+    public String getRandomString(int num) {
+        return String.valueOf(randString.charAt(num));
+    }
+}
+ 

+ 14 - 0
musk/src/main/java/com/huimv/farm/musk/config/ApiPrefixAutoConfiguration.java

@@ -0,0 +1,14 @@
+package com.huimv.farm.musk.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class ApiPrefixAutoConfiguration implements WebMvcConfigurer {
+
+//    @Override
+//    public void configurePathMatch(PathMatchConfigurer configurer) {
+//        configurer.addPathPrefix("/huatongApi",  c -> c.isAnnotationPresent(RestController.class));
+//    }
+
+}

+ 26 - 0
musk/src/main/java/com/huimv/farm/musk/config/InterceptorConfig.java

@@ -0,0 +1,26 @@
+package com.huimv.farm.musk.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * @Description: 注册验证tocken的拦截器
+ * @Author
+ * @Date 2021/4/19 20:41
+ * @Version V1.0
+ */
+@Configuration
+public class InterceptorConfig implements WebMvcConfigurer {
+    @Bean
+    public JWTInterceptor jwtInterceptor(){
+        return new JWTInterceptor();
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(jwtInterceptor()).
+                excludePathPatterns("/admin/my/*");
+    }
+}

+ 83 - 0
musk/src/main/java/com/huimv/farm/musk/config/JWTInterceptor.java

@@ -0,0 +1,83 @@
+package com.huimv.farm.musk.config;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.huimv.farm.musk.common.token.TokenConstant;
+import com.huimv.farm.musk.common.token.TokenSign;
+import io.jsonwebtoken.Claims;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>
+ * jwt拦截器
+ * </p>
+ *wo
+ * @since 2021/4/19
+ */
+public class JWTInterceptor implements HandlerInterceptor {
+
+//
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        // 如果不是映射到方法,则直接通过
+        if (!(handler instanceof HandlerMethod)) {
+            return true;
+        }
+
+        response.setContentType("application/json;charset=utf-8");
+        // 获取token
+        String token = request.getHeader("accessToken");
+
+
+        if (null == token) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("data", "token is null");
+            map.put("code", "401");
+            response.setStatus(401);
+            response.getWriter().write(JSONObject.toJSONString(map));
+            return false;
+        } else {
+            Claims claims = TokenSign.getClaims(token);
+            if (claims == null) {
+                Map<String, Object> map = new HashMap<>();
+                map.put("data", "token is overdue");
+                map.put("code", "403");
+                response.setStatus(403);
+                response.getWriter().write(JSONObject.toJSONString(map));
+                return false;
+            }
+
+            boolean result = TokenSign.verify(token);
+            if (result) {
+                //更新存储的token信息
+                TokenConstant.updateTokenMap(token);
+                return true;
+            }
+            Map<String, Object> map = new HashMap<>();
+            map.put("data", "token is null");
+            map.put("code", "401");
+            response.setStatus(401);
+            response.getWriter().write(JSONObject.toJSONString(map));
+            return false;
+
+        }
+    }
+
+
+    @Override
+    public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
+
+    }
+
+    @Override
+    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
+
+    }
+}

+ 26 - 0
musk/src/main/java/com/huimv/farm/musk/config/MybatisPlusConfig.java

@@ -0,0 +1,26 @@
+package com.huimv.farm.musk.config;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class MybatisPlusConfig {
+
+    /**
+     * 分页插件
+     */
+//    @Bean
+//    public PaginationInterceptor paginationInterceptor() {
+//        return new PaginationInterceptor();
+//    }
+
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        return interceptor;
+    }
+}

+ 107 - 0
musk/src/main/java/com/huimv/farm/musk/controller/AuthorizeController.java

@@ -0,0 +1,107 @@
+package com.huimv.farm.musk.controller;
+
+import com.huimv.farm.musk.common.utils.Result;
+import com.huimv.farm.musk.common.utils.ResultCode;
+import com.huimv.farm.musk.entity.Menu;
+import com.huimv.farm.musk.service.IAuthorizeService;
+import com.huimv.farm.musk.service.IMenuService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping(value = "/admin/auth")
+@CrossOrigin
+public class AuthorizeController {
+
+    @Autowired
+    IAuthorizeService iAuthorizeService;
+    @Autowired
+    IMenuService iMenuService;
+
+    @PostMapping("/saveAccountGroup")
+    public Result saveAccountGroup(@RequestBody Map<String, String> map){
+        /*
+         * 保存账号关联权限组数据
+         */
+        String accountId = map.get("accountId");
+        String groupIds = map.get("groupIds");
+        return iAuthorizeService.saveAccountGroup(accountId,groupIds);
+    }
+
+    @PostMapping("/saveGroupMenu")
+    public Result saveGroupMenu(@RequestBody Map<String, String> map){
+        /*
+         * 保存权限组关联菜单数据
+         */
+        String groupId = map.get("groupId");
+        String menuIds = map.get("menuIds");
+        String isAll = map.get("isAll");
+        return iAuthorizeService.saveGroupMenu(groupId,menuIds,isAll);
+    }
+
+    @RequestMapping("/getGroupByAccount")
+    public Result getGroupByAccount(@RequestParam(name = "accountId", required = true) String accountId){
+        /*
+         * 根据账号获取权限组
+         */
+        return iAuthorizeService.getGroupByAccount (accountId);
+    }
+
+    @PostMapping("/getMenuByGroup")
+    public Result getMenuByGroup(@RequestBody Map<String, String> map){
+        /*
+         * 根据权限组获取菜单
+         */
+        return iAuthorizeService.getMenuByGroup(map);
+    }
+
+    @PostMapping("/getMenuByGroupAndFarm")
+    public Result getMenuByGroupAndFarm(@RequestBody Map<String, String> map){
+        /*
+         * 根据权限组获取菜单
+         */
+        return iAuthorizeService.getMenuByGroupAndFarm(map);
+    }
+
+    @PostMapping("/getMyMenu")
+    public Result getMyMenuAndButton(@RequestBody Map<String, String> map){
+        /*
+         * 获取用户的菜单数据
+         */
+        String userId = map.get("userId");
+        String farmId = map.get("farmId");
+        List<Menu> myMenu = iAuthorizeService.getMyMenuAll(userId,farmId);
+
+        List<Map> list = iMenuService.optimizeListUtil(0,myMenu);
+        return new Result(ResultCode.SUCCESS,list);
+    }
+//    //获取菜单-多级
+//    @RequestMapping("/getMyMenuMultilevel")
+//    public Result getMyMenuMultilevel(@RequestParam(name = "userId", required = true) String userId){
+//        return new Result(ResultCode.SUCCESS,iAuthorizeService.getMyMenuMultilevel(userId));
+//    }
+
+
+    @PostMapping("/getMyButton")
+    public Result getMyButton(@RequestBody Map<String, Integer> map){
+        /*
+         * 获取用户的菜单数据
+         */
+        Integer userId = map.get("userId");
+        Integer farmId = map.get("farmId");
+        List list = iAuthorizeService.getMyButton(userId,farmId);
+        return new Result(ResultCode.SUCCESS,list);
+    }
+
+
+    @GetMapping("/getAcountByGroup")
+    public Result getAccountByGroup(String groupId){
+        /*
+         * 根据权限组获取菜单
+         */
+        return iAuthorizeService.getAccountByGroup(groupId);
+    }
+}

+ 50 - 0
musk/src/main/java/com/huimv/farm/musk/controller/BaseBuildingController.java

@@ -0,0 +1,50 @@
+package com.huimv.farm.musk.controller;
+
+
+import com.huimv.farm.musk.common.utils.Result;
+import com.huimv.farm.musk.entity.BaseBuilding;
+import com.huimv.farm.musk.service.IBaseBuildingService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-15
+ */
+@RestController
+@RequestMapping("/base-building")
+@CrossOrigin
+public class BaseBuildingController {
+    @Autowired
+    private IBaseBuildingService baseBuildingService;
+
+    @PostMapping("/addBuilding")
+    public Result addBuilding(@RequestBody BaseBuilding baseBuilding) {
+        return baseBuildingService.addBuilding(baseBuilding);
+    }
+    @PostMapping("/updateBuilding")
+    public Result updateBuilding(@RequestBody BaseBuilding baseBuilding) {
+        return  baseBuildingService.updateBuilding(baseBuilding);
+    }
+
+    @PostMapping("/deleteBuilding")
+    public Result deleteBuilding(@RequestBody Map<String, Integer> map) {
+        return  baseBuildingService.deleteBuilding(map);
+    }
+
+    @PostMapping("/listBuilding")
+    public Result listBuilding(@RequestBody Map<String, String> map){
+        return baseBuildingService.listBuilding(map);
+    }
+
+    @PostMapping("/listTreeBuilding")
+    public Result listTreeBuilding(@RequestBody Map<String, String> map){
+        return baseBuildingService.listTreeBuilding(map);
+    }
+}

+ 94 - 0
musk/src/main/java/com/huimv/farm/musk/controller/FarmController.java

@@ -0,0 +1,94 @@
+package com.huimv.farm.musk.controller;
+
+
+
+import com.huimv.farm.musk.common.token.TokenSign;
+import com.huimv.farm.musk.common.utils.Result;
+import com.huimv.farm.musk.common.utils.ResultCode;
+import com.huimv.farm.musk.entity.Farm;
+import com.huimv.farm.musk.service.IFarmService;
+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 astupidcoder
+ * @since 2021-10-14
+ */
+@CrossOrigin
+@RestController
+@RequestMapping("/admin/farm")
+public class FarmController {
+
+
+    @Autowired
+    private IFarmService farmService;
+
+    @GetMapping("/getFarm")
+    public Result getFarm(HttpServletRequest request){
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        return  farmService.getFarm(userId);
+    }
+
+    @GetMapping("/getFarm2")
+    public Result getFarm2(HttpServletRequest request){
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        return  farmService.getFarm2(userId);
+    }
+    @PostMapping("/list")
+    public Result list(HttpServletRequest request , @RequestBody Map paramMap){
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        return  farmService.listPage(userId,paramMap);
+    }
+
+    @PostMapping("/add")
+    public Result add(@RequestBody Farm farm, HttpServletRequest request){
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        if (userId != 1){
+            return new Result(10001,"该账号不能操作牧场",false);
+        }
+        return  farmService.add(farm);
+    }
+
+    @PostMapping("/edit")
+    public Result edit(@RequestBody Farm farm, HttpServletRequest request){
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        if (userId != 1){
+            return new Result(10001,"该账号不能操作牧场",false);
+        }
+        farm.setLocation(farm.getFrontLocation());
+        farmService.updateById(farm);
+        return new Result(10000,"修改成功",true);
+    }
+
+    @GetMapping("/remove")
+    public Result remove(@RequestParam(name = "ids") List<Integer> ids, HttpServletRequest request){
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        if (userId != 1){
+            return new Result(10001,"该账号不能操作牧场",false);
+        }
+        farmService.removeByIds(ids);
+        return new Result(10000,"删除成功",true);
+    }
+
+//    @PostMapping("/getWeather")
+//    public Result getWeather(@RequestBody Map<String, Integer> map) {
+//        int farmId =  map.get("farmId");
+//        Farm byId = farmService.getById(farmId);
+//        String cityCode = byId.getLocation();
+//        if (ObjectUtil.isEmpty(cityCode)){
+//            cityCode = "330782";
+//        }
+//        String url="https://restapi.amap.com/v3/weather/weatherInfo?parameters&key=c1d8179ed2dda7ed48c56bed06c0c86e&city="+cityCode+"&extensions=base&output=JSON";
+//        String result = HttpUtil.get(url);
+//        WeatherDto weatherDto = JSONUtil.toBean(result, WeatherDto.class);
+//        return new Result(ResultCode.SUCCESS,weatherDto);
+//    }
+}

+ 198 - 0
musk/src/main/java/com/huimv/farm/musk/controller/LoginController.java

@@ -0,0 +1,198 @@
+package com.huimv.farm.musk.controller;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.farm.musk.common.exception.ExceptionEnum;
+import com.huimv.farm.musk.common.exception.MiException;
+import com.huimv.farm.musk.common.token.TokenSign;
+import com.huimv.farm.musk.common.utils.*;
+import com.huimv.farm.musk.entity.SysAccountMultilevel;
+import com.huimv.farm.musk.service.ILoginService;
+import com.huimv.farm.musk.service.ISysAccountMultilevelService;
+import com.huimv.farm.musk.session.AccessToken;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Date;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+@RestController
+@RequestMapping(value = "/admin/my")
+@CrossOrigin
+public class LoginController {
+
+    @Autowired
+    ILoginService iLoginService;
+    @Autowired
+    private ISysAccountMultilevelService accountMultilevelService;
+
+    @RequestMapping("/test")
+    public String logout() {
+        return "线上服务器1";
+    }
+
+    @RequestMapping("/logout")
+    public Result logout(@RequestParam(name = "accountName", required = true) String accountName, @RequestParam(name = "password", required = true) String password) {
+        return iLoginService.logout();
+    }
+
+
+
+    @GetMapping("/send")
+    public void createImg(HttpServletRequest request, HttpServletResponse response) {
+        try {
+            //设置响应类型,告诉浏览器输出的内容为图片
+            response.setContentType("image/jpeg");
+            //设置响应头信息,告诉浏览器不要缓存此内容
+            response.setHeader("Pragma", "No-cache");
+            response.setHeader("Cache-Control", "no-cache");
+            response.setDateHeader("Expire", 0);
+            VerifyUtil randomValidateCode = new VerifyUtil();
+            //输出验证码图片
+            String code = randomValidateCode.getRandcode(request, response);
+            System.out.println(code);
+            //将生成的随机验证码存放到redis中
+//            String remoteHost = request.getRemoteHost();
+//            redisTemplate.opsForValue().set(remoteHost, code, 300, TimeUnit.SECONDS);
+        } catch (Exception e) {
+            System.out.println("获取验证码异常:" + e);
+            throw new MiException(ExceptionEnum.VERIFCATION_FAID);
+        }
+    }
+
+    //登录-多牧场
+    @PostMapping(value = "/loginMultilevel")
+    public Result loginMultilevel(HttpServletRequest req, @RequestBody Map<String, String> map) {
+
+
+        String accountName = map.get("accountName");
+        String password = map.get("password");
+
+        String remoteHost = req.getRemoteHost();
+
+        // 未对密码加密
+        Result result = iLoginService.loginMultilevel(accountName, password);
+        if (result.getCode() == 10000) {
+
+            SysAccountMultilevel accountEntity = (SysAccountMultilevel) result.getData();
+            Integer id = accountEntity.getId();
+            IpTools.getRemoteHost(req);
+            AccessToken accessToken = new AccessToken();
+            accessToken.setCreated(new Date());
+            accessToken.setAccountName(accountName);
+            accessToken.setFarmId(accountEntity.getFarmIds());
+            String token = TokenSign.sign(accountName, id, accountEntity.getFarmIds());
+            accessToken.setToken(token);
+
+            accessToken.setId(id);
+            accessToken.setLoginIp(remoteHost);
+            Integer lastFarmId = accountEntity.getLastFarmId();
+            if (ObjectUtil.isEmpty(lastFarmId)) {
+                lastFarmId = Integer.parseInt(accountEntity.getFarmIds().split(",")[0]);
+            }
+            accessToken.setLastFarmId(lastFarmId);
+            accessToken.setUserName(accountEntity.getUserName());
+
+            return new Result(ResultCode.SUCCESS, accessToken);
+        }
+        return result;
+    }
+
+    //测试-token
+    @PostMapping(value = "/getToken")
+    public String getToken(HttpServletRequest req) {
+        String token = TokenSign.sign("superfarm.musk", 1, null);
+        return token;
+    }
+
+    @RequestMapping("/logoutClient")
+    public Result logoutClient(HttpServletRequest req, @RequestBody Map<String, String> map) {
+        String accountName = map.get("accountName");
+        String password = map.get("password");
+        String remoteHost = req.getRemoteHost();
+        Result result = iLoginService.loginMultilevel(accountName, password);
+        if (result.getCode() == 10000) {
+            SysAccountMultilevel data = (SysAccountMultilevel) result.getData();
+            AccessToken accessToken = new AccessToken();
+            accessToken.setSysAccountMultilevel(data);
+            accessToken.setAccountName(accountName);
+            accessToken.setUserName(data.getUserName());
+            accessToken.setFarmId(data.getFarmIds());
+            accessToken.setId(data.getId());
+            String token = TokenSign.sign(data.getUserName(), data.getId(), data.getFarmIds());
+            accessToken.setToken(token);
+            Integer lastFarmId = data.getLastFarmId();
+            if (ObjectUtil.isEmpty(lastFarmId)) {
+                lastFarmId = Integer.parseInt(data.getFarmIds().split(",")[0]);
+            }
+            accessToken.setLastFarmId(lastFarmId);
+            accessToken.setLoginIp(remoteHost);
+            return new Result(ResultCode.SUCCESS, accessToken);
+        } else {
+            return result;
+        }
+    }
+
+    @RequestMapping("/logoutOne")
+    public Result logoutOne(HttpServletRequest req, @RequestBody Map<String, String> map) {
+        String accountName = map.get("accountName");
+        String password = map.get("password");
+        Result result = iLoginService.loginMultilevel(accountName, password);
+        if (result.getCode() == 10000) {
+            SysAccountMultilevel data = (SysAccountMultilevel) result.getData();
+            AccessToken accessToken = new AccessToken();
+            String token = TokenSign.sign(data.getUserName(), data.getId(), data.getFarmIds());
+            accessToken.setToken(token);
+            return new Result(ResultCode.SUCCESS, token);
+        } else {
+            return result;
+        }
+    }
+
+    @PostMapping("/register")
+    public Result addAdmission(HttpServletRequest req, @RequestParam("userName") String userName,
+                               @RequestParam("phone") String phone,
+                               @RequestParam(value = "imgUrl", required = false) MultipartFile imgUrl,
+                               @RequestParam("openId") String openId) throws IOException {
+        String remoteHost = req.getRemoteHost();
+        QueryWrapper<SysAccountMultilevel> queryWrapper = new QueryWrapper<>();
+        if (ObjectUtil.isNotEmpty(accountMultilevelService.getOne(queryWrapper))) {
+            return new Result(10001, "该手机号或身份证号已被使用!", false);
+        }
+        if (!PhoneNumberValidator.isValidPhoneNumber(phone)) {
+            return new Result(10001, "手机号格式错误!", false);
+        }
+        SysAccountMultilevel sysAccountMultilevel = new SysAccountMultilevel();
+        sysAccountMultilevel.setUserName(userName);
+        sysAccountMultilevel.setPhone(phone);
+        sysAccountMultilevel.setAccount(phone);
+        sysAccountMultilevel.setPid(0);
+        sysAccountMultilevel.setPids("0");
+        sysAccountMultilevel.setPassword("123456");
+        sysAccountMultilevel.setAccountStatus(1);
+        sysAccountMultilevel.setFarmIds("25");
+        sysAccountMultilevel.setLastFarmId(25);
+        accountMultilevelService.save(sysAccountMultilevel);
+        AccessToken accessToken = new AccessToken();
+        accessToken.setSysAccountMultilevel(sysAccountMultilevel);
+        accessToken.setAccountName(sysAccountMultilevel.getAccount());
+        accessToken.setUserName(sysAccountMultilevel.getUserName());
+        accessToken.setFarmId(sysAccountMultilevel.getFarmIds());
+        accessToken.setId(sysAccountMultilevel.getId());
+        String token = TokenSign.sign(sysAccountMultilevel.getUserName(), sysAccountMultilevel.getId(), sysAccountMultilevel.getFarmIds());
+        accessToken.setToken(token);
+        Integer lastFarmId = sysAccountMultilevel.getLastFarmId();
+        if (ObjectUtil.isEmpty(lastFarmId)) {
+            lastFarmId = Integer.parseInt(sysAccountMultilevel.getFarmIds().split(",")[0]);
+        }
+        accessToken.setLastFarmId(lastFarmId);
+        accessToken.setLoginIp(remoteHost);
+        return new Result(ResultCode.SUCCESS, accessToken);
+    }
+}

+ 47 - 0
musk/src/main/java/com/huimv/farm/musk/controller/MenuController.java

@@ -0,0 +1,47 @@
+package com.huimv.farm.musk.controller;
+
+import com.huimv.farm.musk.common.token.TokenSign;
+import com.huimv.farm.musk.common.utils.Result;
+import com.huimv.farm.musk.entity.Menu;
+import com.huimv.farm.musk.service.IMenuService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+@RestController
+@RequestMapping("/admin/menu")
+@CrossOrigin
+public class MenuController {
+    @Autowired
+    private IMenuService menuService;
+
+    @PostMapping("/add")
+    public Result addMenu(@RequestBody Menu menu , HttpServletRequest request){
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+
+        return menuService.addMenu(menu,userId);
+    }
+
+
+    @PostMapping("/edit")
+    public Result editMenu(@RequestBody Menu menu){
+        return menuService.editMenu(menu);
+    }
+
+
+    @RequestMapping("/remove")
+    public Result removeMenu(@RequestParam(name = "menuId") Integer menuId){
+        return menuService.removeMenu(menuId);
+    }
+
+    @PostMapping("/list")
+    public Result optimizeList() {
+        return menuService.optimizeList();
+    }
+
+    @PostMapping("/list1")
+    public Result list1() {
+        return menuService.list1();
+    }
+}

+ 142 - 0
musk/src/main/java/com/huimv/farm/musk/controller/SysAccountMultilevelController.java

@@ -0,0 +1,142 @@
+package com.huimv.farm.musk.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.farm.musk.common.token.TokenSign;
+import com.huimv.farm.musk.common.utils.Result;
+import com.huimv.farm.musk.common.utils.ResultCode;
+
+import com.huimv.farm.musk.entity.AccountGroup;
+import com.huimv.farm.musk.entity.SysAccountMultilevel;
+import com.huimv.farm.musk.service.IAccountGroupService;
+import com.huimv.farm.musk.service.ISysAccountMultilevelService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-10-14
+ */
+@CrossOrigin
+@RestController
+@RequestMapping("/admin/accountMultilevel")
+public class SysAccountMultilevelController {
+    @Autowired
+    private ISysAccountMultilevelService accountMultilevelService;
+
+    @Autowired
+    private IAccountGroupService accountGroupService;
+
+
+    @PostMapping("/list")
+    public Result list(@RequestBody Map map , HttpServletRequest request){
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        int pageNum = (Integer)map.get("pageNum");
+        int pageSize = (Integer)map.get("pageSize");
+        String searchStr = (String)map.get("searchStr");
+
+        return accountMultilevelService.findUserAccount(searchStr,pageNum,pageSize,userId);
+
+    }
+
+    @PostMapping("/listSubordinate")
+    public Result listSubordinate(@RequestBody Map map , HttpServletRequest request){
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        int pageNum = (Integer)map.get("pageNum");
+        int pageSize = (Integer)map.get("pageSize");
+        String searchStr = (String)map.get("searchStr");
+        return accountMultilevelService.listSubordinate(searchStr,pageNum,pageSize,userId);
+    }
+
+    @PostMapping("/listSubordinateByFarm")
+    public Result listSubordinateByFarm(@RequestBody Map map , HttpServletRequest request){
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        String farmId = (String)map.get("farmId");
+        return accountMultilevelService.listSubordinateByFarm(farmId,userId);
+    }
+
+    @PostMapping("/add")
+    public Result add(@RequestBody SysAccountMultilevel sysAccountMultilevel , HttpServletRequest request){
+
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        return accountMultilevelService.add(sysAccountMultilevel,userId);
+
+    }
+
+    @PostMapping("/update")
+    public Result update(@RequestBody SysAccountMultilevel sysAccountMultilevel){
+        accountMultilevelService.updateById(sysAccountMultilevel);
+
+        return new Result(10000,"修改成功",true);
+
+    }
+
+    @GetMapping("/remove")
+    public Result remove(@RequestParam(name ="userIds") List<Integer> userIds){
+
+        accountGroupService.remove(new QueryWrapper<AccountGroup>().in("account_id",userIds));
+        accountMultilevelService.removeByIds(userIds);
+
+        return new Result(10000,"删除成功",true);
+
+    }
+
+    @GetMapping("/setAccountStatus")
+    public Result setAccountStatus(@RequestParam(name = "ids") List<Integer> ids, @RequestParam(name = "status") Integer status){
+        /* 设置账号状态 */
+        return accountMultilevelService.setAccountStatus(ids,status);
+    }
+
+    @GetMapping("/findOne")
+    public Result findOne(Integer id){
+        return new Result(ResultCode.SUCCESS, accountMultilevelService.getById(id));
+    }
+
+
+    @GetMapping("/getLastFarmId")
+    public Result getLastFarmId(HttpServletRequest request){
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        return  accountMultilevelService.getLastFarmId(userId);
+    }
+
+    @PostMapping("/editImg")
+    @Transactional(rollbackFor = Exception.class)
+    public Result editImg(HttpServletRequest httpServletRequest, @RequestParam("img") MultipartFile img) throws IOException {
+        SysAccountMultilevel sysAccountMultilevel = accountMultilevelService.getById(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+        accountMultilevelService.updateById(sysAccountMultilevel);
+        return Result.SUCCESS();
+    }
+
+    @PostMapping("/updateUserName")
+    public Result updateUserName(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
+        SysAccountMultilevel sysAccountMultilevel = accountMultilevelService.getById(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+        sysAccountMultilevel.setUserName(paramsMap.get("userName"));
+        accountMultilevelService.updateById(sysAccountMultilevel);
+        return Result.SUCCESS();
+    }
+
+    @PostMapping("/updateUser")
+    public Result updateUser(HttpServletRequest httpServletRequest,
+                             @RequestParam(value = "img", required = false) MultipartFile img,
+                             @RequestParam(value = "userName", required = false) String userName,
+                             @RequestParam(value = "phone", required = false) String phone) throws IOException {
+        return accountMultilevelService.updateUser(httpServletRequest,img,userName,phone);
+    }
+
+    @PostMapping("/getDetail")
+    public Result getDetail(HttpServletRequest httpServletRequest){
+        return new Result(ResultCode.SUCCESS,accountMultilevelService.getById(TokenSign.getMemberIdByJwtToken(httpServletRequest)));
+    }
+}

+ 125 - 0
musk/src/main/java/com/huimv/farm/musk/controller/SysCameraAreaController.java

@@ -0,0 +1,125 @@
+package com.huimv.farm.musk.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.farm.musk.common.utils.IpUtil;
+import com.huimv.farm.musk.common.utils.Result;
+import com.huimv.farm.musk.common.utils.ResultCode;
+import com.huimv.farm.musk.entity.SysCamera;
+import com.huimv.farm.musk.entity.SysCameraArea;
+import com.huimv.farm.musk.service.ISysCameraAreaService;
+import com.huimv.farm.musk.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);
+        }
+    }
+}

+ 76 - 0
musk/src/main/java/com/huimv/farm/musk/controller/SysCameraBrandController.java

@@ -0,0 +1,76 @@
+package com.huimv.farm.musk.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.farm.musk.common.utils.Result;
+import com.huimv.farm.musk.common.utils.ResultCode;
+import com.huimv.farm.musk.entity.SysCamera;
+import com.huimv.farm.musk.entity.SysCameraBrand;
+import com.huimv.farm.musk.service.ISysCameraBrandService;
+import com.huimv.farm.musk.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);
+    }
+
+}

+ 79 - 0
musk/src/main/java/com/huimv/farm/musk/controller/SysCameraController.java

@@ -0,0 +1,79 @@
+package com.huimv.farm.musk.controller;
+
+
+import com.huimv.farm.musk.common.utils.Result;
+import com.huimv.farm.musk.common.utils.ResultCode;
+import com.huimv.farm.musk.entity.SysCamera;
+import com.huimv.farm.musk.entity.vo.CameraListVo;
+import com.huimv.farm.musk.entity.vo.CameraListsVo;
+import com.huimv.farm.musk.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("/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);
+//    }
+}

+ 62 - 0
musk/src/main/java/com/huimv/farm/musk/controller/SysGroupController.java

@@ -0,0 +1,62 @@
+package com.huimv.farm.musk.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.farm.musk.common.token.TokenSign;
+import com.huimv.farm.musk.common.utils.Result;
+import com.huimv.farm.musk.entity.AccountGroup;
+import com.huimv.farm.musk.entity.Group;
+import com.huimv.farm.musk.service.IAccountGroupService;
+import com.huimv.farm.musk.service.IGroupService;
+import com.huimv.farm.musk.service.ISysAccountMultilevelService;
+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;
+
+
+@RestController
+@RequestMapping("/admin/group")
+@CrossOrigin
+public class SysGroupController {
+
+    @Autowired
+    private IGroupService groupService;
+
+    @Autowired
+    private IAccountGroupService accountGroupService;
+    @Autowired
+    private ISysAccountMultilevelService accountMultilevelService;
+
+    @PostMapping("/add")
+    public Result addGroup (@RequestBody Group group, HttpServletRequest request){
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        return groupService.addGroup(group,userId);
+    }
+
+    @PostMapping("/edit")
+    public Result updateGroup(@RequestBody Group group ){
+        return groupService.updateGroup( group);
+    }
+
+    @RequestMapping("/remove")
+    public Result removeGroup(@RequestParam("groupId") Integer groupId) {
+        accountGroupService.remove(new QueryWrapper<AccountGroup>().in("group_id",groupId));
+        return groupService.removeGroup(groupId);
+    }
+
+    @PostMapping("/list")
+    public Result listGroup(@RequestBody Map map , HttpServletRequest request) {
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        List<Integer> allChildId = accountMultilevelService.getAllChildId(userId);
+        return groupService.listGroup(map,allChildId);
+    }
+
+    //根据角色查权限组
+    @PostMapping("/getGroupByUserId")
+    public Result getGroupByUserId(@RequestBody Map map){
+        Integer userId  =  (Integer) map.get("userId");
+        return  groupService.getGroupByUserId(userId);
+    }
+}

+ 35 - 0
musk/src/main/java/com/huimv/farm/musk/entity/AccountGroup.java

@@ -0,0 +1,35 @@
+package com.huimv.farm.musk.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;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-09-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("sys_account_group")
+public class AccountGroup extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private Integer accountId;
+
+    private Integer groupId;
+
+
+}

+ 70 - 0
musk/src/main/java/com/huimv/farm/musk/entity/BaseBuilding.java

@@ -0,0 +1,70 @@
+package com.huimv.farm.musk.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 2024-08-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("base_building")
+public class BaseBuilding implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 栋舍名字
+     */
+    private String buildName;
+
+    /**
+     * 父级
+     */
+    private Integer parentId;
+
+    /**
+     * 1栋 2舍
+     */
+    private Integer fType;
+
+    /**
+     * 栋舍数量
+     */
+    private Integer cageNum;
+
+    /**
+     * 阶段
+     */
+    private Integer stageCode;
+
+    private Integer farmId;
+
+    private Integer sort;
+
+    /**
+     * 栋舍名字
+     */
+    private String cageName;
+
+    private String other2;
+
+    private String other3;
+
+
+}

+ 42 - 0
musk/src/main/java/com/huimv/farm/musk/entity/Farm.java

@@ -0,0 +1,42 @@
+package com.huimv.farm.musk.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;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("base_farm")
+public class Farm extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String farmName;
+
+    private String location;
+
+    private String frontLocation;
+
+
+    private Boolean rowStatus;
+    private String farmMenu;
+    private String farmTopMenu;
+    private Integer isShow;
+    
+}

+ 37 - 0
musk/src/main/java/com/huimv/farm/musk/entity/Group.java

@@ -0,0 +1,37 @@
+package com.huimv.farm.musk.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;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-09-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("sys_group")
+public class Group extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String groupName;
+
+    private String remark;
+
+    private Integer accountId;
+
+
+}

+ 36 - 0
musk/src/main/java/com/huimv/farm/musk/entity/GroupMenu.java

@@ -0,0 +1,36 @@
+package com.huimv.farm.musk.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;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-09-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("sys_group_menu")
+public class GroupMenu extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private Integer groupId;
+
+    private Integer menuId;
+    private Integer isAll;
+
+
+}

+ 49 - 0
musk/src/main/java/com/huimv/farm/musk/entity/Menu.java

@@ -0,0 +1,49 @@
+package com.huimv.farm.musk.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;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-09-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("sys_menu")
+public class Menu extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String title;
+
+    private String url;
+
+    private String remark;
+
+    private Integer parentId;
+
+    private Integer sort;
+
+    private Integer weight;
+
+    private String permission;
+
+    private Boolean ifShow;
+
+//    private List<Menu> children;
+
+
+}

+ 53 - 0
musk/src/main/java/com/huimv/farm/musk/entity/SysAccountMultilevel.java

@@ -0,0 +1,53 @@
+package com.huimv.farm.musk.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;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("sys_account_multilevel")
+public class SysAccountMultilevel extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String account;
+
+    private String password;
+
+    private Integer pid;
+
+    private String pids;
+
+    private Integer accountStatus;
+
+    private String farmIds;
+
+    private String color;
+
+    private Boolean mode;
+
+    private Integer lastFarmId;
+
+    private String userName;
+    private String farmNames;
+
+    private String phone;
+    private String imgUrl;
+}

+ 107 - 0
musk/src/main/java/com/huimv/farm/musk/entity/SysCamera.java

@@ -0,0 +1,107 @@
+package com.huimv.farm.musk.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 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 {
+
+    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;
+
+
+}

+ 47 - 0
musk/src/main/java/com/huimv/farm/musk/entity/SysCameraArea.java

@@ -0,0 +1,47 @@
+package com.huimv.farm.musk.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;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sys_camera_area")
+public class SysCameraArea   {
+
+    @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;
+
+
+}

+ 54 - 0
musk/src/main/java/com/huimv/farm/musk/entity/SysCameraBrand.java

@@ -0,0 +1,54 @@
+package com.huimv.farm.musk.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;
+
+
+}

+ 9 - 0
musk/src/main/java/com/huimv/farm/musk/entity/vo/CameraBaseVo.java

@@ -0,0 +1,9 @@
+package com.huimv.farm.musk.entity.vo;
+
+import com.huimv.farm.musk.entity.SysCamera;
+import lombok.Data;
+
+@Data
+public class CameraBaseVo extends SysCamera {
+    private String ip;
+}

+ 17 - 0
musk/src/main/java/com/huimv/farm/musk/entity/vo/CameraListVo.java

@@ -0,0 +1,17 @@
+package com.huimv.farm.musk.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;
+}

+ 19 - 0
musk/src/main/java/com/huimv/farm/musk/entity/vo/CameraListsVo.java

@@ -0,0 +1,19 @@
+package com.huimv.farm.musk.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;
+}

+ 23 - 0
musk/src/main/java/com/huimv/farm/musk/entity/vo/CameraVo.java

@@ -0,0 +1,23 @@
+package com.huimv.farm.musk.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;
+
+}

+ 38 - 0
musk/src/main/java/com/huimv/farm/musk/entity/vo/TreeBaseBuilding.java

@@ -0,0 +1,38 @@
+package com.huimv.farm.musk.entity.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TreeBaseBuilding implements Comparable<TreeBaseBuilding> {
+
+    private static final long serialVersionUID=1L;
+
+    private String id;
+
+    private String buildName;
+
+    private Integer parentId;
+
+    private Integer fType;
+
+    private Integer farmCode;
+
+    private Integer stageCode;
+
+    private Integer sort;
+
+    private List<TreeBaseBuilding> childNode;
+
+    @Override
+    public int compareTo(TreeBaseBuilding o) {
+        // 根据年龄进行升序排序
+        return Integer.compare(Integer.valueOf(this.id), Integer.valueOf(o.id));
+    }
+}

+ 20 - 0
musk/src/main/java/com/huimv/farm/musk/mapper/AccountGroupMapper.java

@@ -0,0 +1,20 @@
+package com.huimv.farm.musk.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.farm.musk.entity.AccountGroup;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-09-09
+ */
+@Repository
+public interface AccountGroupMapper extends BaseMapper<AccountGroup> {
+
+    void removeAccountGroup(@Param("accountId") String accountId);
+}

+ 20 - 0
musk/src/main/java/com/huimv/farm/musk/mapper/BaseBuildingMapper.java

@@ -0,0 +1,20 @@
+package com.huimv.farm.musk.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.farm.musk.entity.BaseBuilding;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-15
+ */
+public interface BaseBuildingMapper extends BaseMapper<BaseBuilding> {
+
+    List<Integer> getCageById(@Param("id") Integer id);
+}

+ 18 - 0
musk/src/main/java/com/huimv/farm/musk/mapper/FarmMapper.java

@@ -0,0 +1,18 @@
+package com.huimv.farm.musk.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.farm.musk.entity.Farm;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-10-14
+ */
+@Repository
+public interface FarmMapper extends BaseMapper<Farm> {
+
+}

+ 18 - 0
musk/src/main/java/com/huimv/farm/musk/mapper/GroupMapper.java

@@ -0,0 +1,18 @@
+package com.huimv.farm.musk.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.farm.musk.entity.Group;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-09-09
+ */
+@Repository
+public interface GroupMapper extends BaseMapper<Group> {
+
+}

+ 21 - 0
musk/src/main/java/com/huimv/farm/musk/mapper/GroupMenuMapper.java

@@ -0,0 +1,21 @@
+package com.huimv.farm.musk.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.farm.musk.entity.GroupMenu;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-09-09
+ */
+@Repository
+public interface GroupMenuMapper extends BaseMapper<GroupMenu> {
+
+    void removeGroupMenu(@Param("groupId") String groupId);
+
+}

+ 24 - 0
musk/src/main/java/com/huimv/farm/musk/mapper/MenuMapper.java

@@ -0,0 +1,24 @@
+package com.huimv.farm.musk.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.farm.musk.entity.Menu;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-09-09
+ */
+@Repository
+public interface MenuMapper extends BaseMapper<Menu> {
+
+    List<Menu> getMyMenu(@Param("accountName") String accountName, String[] array);
+
+    List<String> getMyButton(@Param("userId") Integer userId, String[] array);
+}

+ 22 - 0
musk/src/main/java/com/huimv/farm/musk/mapper/SysAccountMultilevelMapper.java

@@ -0,0 +1,22 @@
+package com.huimv.farm.musk.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.farm.musk.entity.SysAccountMultilevel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-10-14
+ */
+@Repository
+public interface SysAccountMultilevelMapper extends BaseMapper<SysAccountMultilevel> {
+
+    List<Integer> getLowerLevel(@Param("userId") Integer userId, @Param("farmId") String farmId);
+}

+ 16 - 0
musk/src/main/java/com/huimv/farm/musk/mapper/SysCameraAreaMapper.java

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

+ 16 - 0
musk/src/main/java/com/huimv/farm/musk/mapper/SysCameraBrandMapper.java

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

+ 25 - 0
musk/src/main/java/com/huimv/farm/musk/mapper/SysCameraMapper.java

@@ -0,0 +1,25 @@
+package com.huimv.farm.musk.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.farm.musk.entity.SysCamera;
+import com.huimv.farm.musk.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);
+
+}

+ 16 - 0
musk/src/main/java/com/huimv/farm/musk/service/IAccountGroupService.java

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

+ 30 - 0
musk/src/main/java/com/huimv/farm/musk/service/IAuthorizeService.java

@@ -0,0 +1,30 @@
+package com.huimv.farm.musk.service;
+
+
+import com.huimv.farm.musk.common.utils.Result;
+
+import java.util.List;
+import java.util.Map;
+
+public interface IAuthorizeService {
+
+    Result saveAccountGroup(String accountId, String groupIds);
+
+    Result saveGroupMenu(String groupId, String menuIds, String isAll);
+
+
+    Result getMenuByGroup(Map map);
+
+    Result getGroupByAccount(String accountId);
+
+    Result getAccountByGroup(String groupId);
+
+
+    List getMyMenuAll(String accountName, String farmId);
+
+    List getMyButton(Integer userId, Integer farmId);
+
+    List getMyMenuMultilevel(String userId);
+
+    Result getMenuByGroupAndFarm(Map<String, String> map);
+}

+ 29 - 0
musk/src/main/java/com/huimv/farm/musk/service/IBaseBuildingService.java

@@ -0,0 +1,29 @@
+package com.huimv.farm.musk.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.farm.musk.common.utils.Result;
+import com.huimv.farm.musk.entity.BaseBuilding;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-15
+ */
+public interface IBaseBuildingService extends IService<BaseBuilding> {
+
+    Result addBuilding(BaseBuilding baseBuilding);
+
+    Result updateBuilding(BaseBuilding baseBuilding);
+
+    Result deleteBuilding(Map<String, Integer> map);
+
+    //给其他地方使用的栋舍列表
+    Result listBuilding(Map<String, String> map);
+
+    Result listTreeBuilding(Map<String, String> map);
+}

+ 26 - 0
musk/src/main/java/com/huimv/farm/musk/service/IFarmService.java

@@ -0,0 +1,26 @@
+package com.huimv.farm.musk.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.farm.musk.common.utils.Result;
+import com.huimv.farm.musk.entity.Farm;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-10-14
+ */
+public interface IFarmService extends IService<Farm> {
+
+    Result getFarm(Integer userId);
+
+    Result add(Farm farm);
+
+    Result getFarm2(Integer userId);
+
+    Result listPage(Integer userId, Map paramMap);
+}

+ 16 - 0
musk/src/main/java/com/huimv/farm/musk/service/IGroupMenuService.java

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

+ 29 - 0
musk/src/main/java/com/huimv/farm/musk/service/IGroupService.java

@@ -0,0 +1,29 @@
+package com.huimv.farm.musk.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.farm.musk.common.utils.Result;
+import com.huimv.farm.musk.entity.Group;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-09-09
+ */
+public interface IGroupService extends IService<Group> {
+
+    Result updateGroup(Group group);
+
+    Result removeGroup(Integer groupId);
+
+    Result listGroup(Map map, List<Integer> allChildId);
+
+    Result addGroup(Group group, Integer userId);
+
+    Result getGroupByUserId(Integer userId);
+}

+ 12 - 0
musk/src/main/java/com/huimv/farm/musk/service/ILoginService.java

@@ -0,0 +1,12 @@
+package com.huimv.farm.musk.service;
+
+
+import com.huimv.farm.musk.common.utils.Result;
+
+public interface ILoginService {
+
+
+    Result logout();
+
+    Result loginMultilevel(String accountName, String password);
+}

+ 35 - 0
musk/src/main/java/com/huimv/farm/musk/service/IMenuService.java

@@ -0,0 +1,35 @@
+package com.huimv.farm.musk.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.farm.musk.common.utils.Result;
+import com.huimv.farm.musk.entity.Menu;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-09-09
+ */
+public interface IMenuService extends IService<Menu> {
+    Result addMenu(Menu menu, Integer userId);
+    //修改菜单
+    Result editMenu(Menu menu);
+    //删除菜单(批量)
+    Result removeMenu(Integer menuId);
+   /* //查询所有
+    List<Map> listMenu();
+    //菜单递归
+    List listMenuUtil(List<Menu> list);*/
+
+    //优化查询所有
+    Result optimizeList();
+    //优化菜单递归
+    List<Map> optimizeListUtil(int parentId, List<Menu> menuEntityList);
+
+    Result list1();
+}

+ 37 - 0
musk/src/main/java/com/huimv/farm/musk/service/ISysAccountMultilevelService.java

@@ -0,0 +1,37 @@
+package com.huimv.farm.musk.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.farm.musk.common.utils.Result;
+import com.huimv.farm.musk.entity.SysAccountMultilevel;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-10-14
+ */
+public interface ISysAccountMultilevelService extends IService<SysAccountMultilevel> {
+
+    Result findUserAccount(String searchStr, int pageNum, int pageSize, Integer userId);
+
+    Result add(SysAccountMultilevel sysAccountMultilevel, Integer userId);
+
+    Result setAccountStatus(List<Integer> ids, Integer status);
+
+    List<Integer> getAllChildId(Integer userId);
+
+    Result listSubordinate(String searchStr, int pageNum, int pageSize, Integer userId);
+
+    Result getLastFarmId(Integer userId);
+
+    Result listSubordinateByFarm(String farmId, Integer userId);
+
+    Result updateUser(HttpServletRequest httpServletRequest, MultipartFile img, String userName, String phone) throws IOException;
+}

+ 30 - 0
musk/src/main/java/com/huimv/farm/musk/service/ISysCameraAreaService.java

@@ -0,0 +1,30 @@
+package com.huimv.farm.musk.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.farm.musk.common.utils.Result;
+import com.huimv.farm.musk.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);*/
+}

+ 22 - 0
musk/src/main/java/com/huimv/farm/musk/service/ISysCameraBrandService.java

@@ -0,0 +1,22 @@
+package com.huimv.farm.musk.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.farm.musk.common.utils.Result;
+import com.huimv.farm.musk.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);
+}

+ 29 - 0
musk/src/main/java/com/huimv/farm/musk/service/ISysCameraService.java

@@ -0,0 +1,29 @@
+package com.huimv.farm.musk.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.farm.musk.common.utils.Result;
+import com.huimv.farm.musk.entity.SysCamera;
+import com.huimv.farm.musk.entity.vo.CameraListVo;
+import com.huimv.farm.musk.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);
+}

+ 19 - 0
musk/src/main/java/com/huimv/farm/musk/service/impl/AccountGroupServiceImpl.java

@@ -0,0 +1,19 @@
+package com.huimv.farm.musk.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.farm.musk.entity.AccountGroup;
+import com.huimv.farm.musk.mapper.AccountGroupMapper;
+import com.huimv.farm.musk.service.IAccountGroupService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-09-09 */
+@Service
+public class AccountGroupServiceImpl extends ServiceImpl<AccountGroupMapper, AccountGroup> implements IAccountGroupService {
+
+}

+ 241 - 0
musk/src/main/java/com/huimv/farm/musk/service/impl/AuthorizeServiceImpl.java

@@ -0,0 +1,241 @@
+package com.huimv.farm.musk.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.huimv.farm.musk.common.utils.ConstUtil;
+import com.huimv.farm.musk.common.utils.Result;
+import com.huimv.farm.musk.common.utils.ResultCode;
+import com.huimv.farm.musk.entity.AccountGroup;
+import com.huimv.farm.musk.entity.Farm;
+import com.huimv.farm.musk.entity.GroupMenu;
+import com.huimv.farm.musk.entity.Menu;
+import com.huimv.farm.musk.mapper.AccountGroupMapper;
+import com.huimv.farm.musk.mapper.FarmMapper;
+import com.huimv.farm.musk.mapper.GroupMenuMapper;
+import com.huimv.farm.musk.mapper.MenuMapper;
+import com.huimv.farm.musk.service.IAuthorizeService;
+import com.huimv.farm.musk.service.IGroupMenuService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class AuthorizeServiceImpl implements IAuthorizeService {
+
+    @Autowired
+    AccountGroupMapper accountGroupMapper;
+    @Autowired
+    GroupMenuMapper groupMenuMapper;
+    @Autowired
+    IGroupMenuService groupMenuService;
+    @Autowired
+    private MenuMapper menuMapper;
+    @Autowired
+    private FarmMapper farmMapper;
+    
+    @Override
+    @Transactional
+    public Result saveAccountGroup(String accountId, String groupIds) {
+        /**
+         * Step1:先删除原先的账号关联权限组数据;
+         * Step2:再添加新的账号关联权限组数据;
+         */
+        if (accountId == null||"".equals(accountId)){
+
+            accountGroupMapper.removeAccountGroup(groupIds);
+            return new Result(10000, "保存账号关联权限组成功", true);
+        }else {
+            String[] groupIdArray = accountId.split(",");
+            accountGroupMapper.removeAccountGroup(accountId);
+//        for (int a = 0; a < groupIdArray.length; a++) {
+//            accountGroupMapper.removeAccountGroup(accountId,groupIdArray[a]);
+//        }
+            for (int a = 0; a < groupIdArray.length; a++) {
+                AccountGroup accountGroupEntity = new AccountGroup();
+                accountGroupEntity.setAccountId(Integer.parseInt(groupIdArray[a]));
+                accountGroupEntity.setGroupId(Integer.parseInt(groupIds));
+                accountGroupMapper.insert(accountGroupEntity);
+//            accountGroupMapper.insert(Integer.parseInt(accountId),Integer.parseInt(groupIdArray[a]));
+            }
+            return new Result(10000, "保存账号关联权限组成功", true);
+        }
+
+
+    }
+
+    @Override
+    @Transactional
+    public Result saveGroupMenu(String groupId, String menuIds, String isAll) {
+        /**
+         * Step1:先删除原先的权限组关联菜单数据;
+         * Step2:再添加新的账号权限组关联菜单数据;
+         */
+        groupMenuMapper.removeGroupMenu(groupId);
+        if (StringUtils.isNotBlank(menuIds)){
+            String[] menuIdsArray = menuIds.split(",");
+            String[] split = isAll.split(",");
+
+            List<GroupMenu> list = new ArrayList();
+            for (int a = 0; a < menuIdsArray.length; a++) {
+                GroupMenu groupMenu = new GroupMenu();
+                groupMenu.setGroupId(Integer.parseInt(groupId));
+                groupMenu.setMenuId(Integer.parseInt(menuIdsArray[a]));
+                list.add(groupMenu);
+            }
+            if (StringUtils.isNotBlank(isAll)){
+                for (GroupMenu groupMenu : list) {
+                    for (String s : split) {
+                        if (groupMenu.getMenuId()== Integer.parseInt(s)){
+                            groupMenu.setIsAll(1);
+                        }
+                    }
+                }
+            }
+            groupMenuService.saveBatch(list);
+        }
+
+
+        return new Result(10000, "保存权限组关联菜单成功", true);
+    }
+
+
+    @Override
+    public Result getMenuByGroup(Map paramsMap) {
+        String groupId  =  (String)paramsMap.get("groupId");
+        QueryWrapper<GroupMenu> groupMenuQueryWrapper = new QueryWrapper<>();
+        groupMenuQueryWrapper.eq("group_id",groupId);
+        groupMenuQueryWrapper.eq("is_all",0);
+        List<GroupMenu> groupMenuEntityList = groupMenuMapper.selectList(groupMenuQueryWrapper);
+        if (groupMenuEntityList.size() == 0) {
+            return new Result(10005, "当前权限组暂未关联任何菜单.", false);
+        }
+        StringBuilder stringBuffer = new StringBuilder();
+
+        for (GroupMenu groupMenu : groupMenuEntityList) {
+
+            stringBuffer.append(groupMenu.getMenuId());
+            stringBuffer.append(",");
+
+        }
+        stringBuffer.deleteCharAt(stringBuffer.length()-1);
+        return new Result(ResultCode.SUCCESS, stringBuffer.toString());
+    }
+
+    @Override
+    public Result getMenuByGroupAndFarm(Map<String, String> map) {
+        String groupId = (String) map.get("groupId");
+        String farmId = (String) map.get("farmId");
+        Farm farm = farmMapper.selectById(farmId);
+        String farmMenu = farm.getFarmMenu();
+        if (StringUtils.isNotBlank(farmMenu)){
+            return new Result(ConstUtil.ERR_MYMENU_EMPTY_CODE,"该牧场无任何授权菜单",false);
+        }
+        List<String> list = Arrays.asList(farmMenu);
+        QueryWrapper<GroupMenu> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StringUtils.isNotBlank(groupId),"group_id",groupId);
+        queryWrapper.in("menu_id",list);
+//        queryWrapper.eq("is_all",0);
+        List<GroupMenu> groupMenuEntityList = groupMenuMapper.selectList(queryWrapper);
+        if (groupMenuEntityList.size() == 0) {
+            return new Result(10005, "当前权限组暂未关联任何菜单.", false);
+        }
+        StringBuilder stringBuffer = new StringBuilder();
+
+        for (GroupMenu groupMenu : groupMenuEntityList) {
+
+            stringBuffer.append(groupMenu.getMenuId());
+            stringBuffer.append(",");
+
+        }
+        stringBuffer.deleteCharAt(stringBuffer.length()-1);
+        return new Result(ResultCode.SUCCESS, stringBuffer.toString());
+    }
+
+    /**
+     * @param accountId
+     * @return
+     */
+    @Override
+    public Result getGroupByAccount(String accountId) {
+        /* 根据账号id读取已关联权限组 */
+        QueryWrapper<AccountGroup> accountGroupQueryWrapper = new QueryWrapper<>();
+        accountGroupQueryWrapper.eq("account_id",accountId);
+        List<AccountGroup> accountGroupEntityList = accountGroupMapper.selectList(accountGroupQueryWrapper);
+        if (accountGroupEntityList.size() == 0) {
+            return new Result(10006, "当前用户账号暂未关联任何权限组.", false);
+        }
+        StringBuilder idSb = new StringBuilder();
+        for (AccountGroup accountGroupEntity : accountGroupEntityList) {
+            if (idSb.length() > 0) {
+                idSb.append(",");
+            }
+            idSb.append(accountGroupEntity.getGroupId());
+        }
+        return new Result(ResultCode.SUCCESS, idSb.toString());
+    }
+
+
+    @Override
+    public Result getAccountByGroup(String groupId) {
+        /* 根据账号id读取已关联权限组 */
+        QueryWrapper<AccountGroup> accountGroupQueryWrapper = new QueryWrapper<>();
+        accountGroupQueryWrapper.eq("group_id",groupId);
+        List<AccountGroup> accountGroupEntityList = accountGroupMapper.selectList(accountGroupQueryWrapper);
+        if (accountGroupEntityList.size() == 0) {
+            return new Result(10006, "当前权限组暂未关联任何用户账号.", false);
+        }
+        StringBuilder idSb = new StringBuilder();
+        for (AccountGroup accountGroupEntity : accountGroupEntityList) {
+            if (idSb.length() > 0) {
+                idSb.append(",");
+            }
+            idSb.append(accountGroupEntity.getAccountId());
+        }
+        return new Result(ResultCode.SUCCESS, idSb.toString());
+    }
+
+    @Override
+    public List getMyMenuAll(String accountName, String farmId) {
+        if ("1".equals(accountName)){
+            List<Menu> menus = menuMapper.selectList(new QueryWrapper<Menu>().orderByAsc("sort"));
+            return menus;
+        }
+        Farm farm = farmMapper.selectById(farmId);
+        String farmMenu = farm.getFarmMenu();
+        String[] farmMenus = farmMenu.split(",");
+//        List<String> farmMenus = Arrays.asList(farmMenu);
+        return menuMapper.getMyMenu(accountName,farmMenus);
+    }
+
+    @Override
+    public List<String> getMyButton(Integer userId, Integer farmId) {
+        Farm farm = farmMapper.selectById(farmId);
+        String farmMenu = "";
+        if (ObjectUtil.isNotEmpty(farm)) {
+            farmMenu = farm.getFarmMenu();
+        }
+        if (userId == 1){
+            List<Menu> menus = menuMapper.selectList(null);
+            List<String> list = new ArrayList<>();
+            for (Menu menu : menus) {
+                list.add(menu.getPermission());
+            }
+            return list;
+        }
+        String[] menus = farmMenu.split(",");
+        return menuMapper.getMyButton(userId,menus);
+    }
+
+    @Override
+    public List getMyMenuMultilevel(String userId) {
+        return null;
+    }
+
+
+}

+ 95 - 0
musk/src/main/java/com/huimv/farm/musk/service/impl/BaseBuildingServiceImpl.java

@@ -0,0 +1,95 @@
+package com.huimv.farm.musk.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.farm.musk.common.utils.Result;
+import com.huimv.farm.musk.common.utils.ResultCode;
+import com.huimv.farm.musk.common.utils.ResultUtil;
+import com.huimv.farm.musk.entity.BaseBuilding;
+import com.huimv.farm.musk.mapper.BaseBuildingMapper;
+import com.huimv.farm.musk.service.IBaseBuildingService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-15
+ */
+@Service
+public class BaseBuildingServiceImpl extends ServiceImpl<BaseBuildingMapper, BaseBuilding> implements IBaseBuildingService {
+
+    @Autowired
+    private BaseBuildingMapper baseBuildingMapper;
+
+
+    @Override
+    @Transactional
+    public Result addBuilding(BaseBuilding baseBuilding) {
+        if (this.count(new QueryWrapper<BaseBuilding>().eq("build_name", baseBuilding.getBuildName())) != 0) {
+            return new Result(10001, "栋舍名已存在", false);
+        }
+        baseBuilding.setParentId(0);
+        baseBuilding.setFType(1);
+        this.save(baseBuilding);
+        return Result.SUCCESS();
+    }
+
+    @Override
+    @Transactional
+    public Result updateBuilding(BaseBuilding baseBuilding) {
+        if (this.count(new QueryWrapper<BaseBuilding>().eq("build_name", baseBuilding.getBuildName()).ne("id", baseBuilding.getId())) != 0) {
+            return new Result(10001, "栋舍名已存在", false);
+        }
+        //TODO:后面补充羊只和设备的名称修改
+        baseBuildingMapper.updateById(baseBuilding);
+        return ResultUtil.updateResult(1);
+    }
+
+    @Override
+    @Transactional
+    public Result deleteBuilding(Map<String, Integer> map) {
+        Integer id = map.get("id");
+        //TODO:后面再进行补充羊只和设备情况
+//        if (ObjectUtil.isNotEmpty(cageIds)){
+//            if (ObjectUtil.isNotEmpty(baseDuckInfoMapper.selectList(new QueryWrapper<BaseDuckInfo>().in("unit_id",cageIds)))) {
+//                return new Result(10001,"删除失败,该栋舍下属笼中存在鸭只",false);
+//            }
+//            if (ObjectUtil.isNotEmpty(envDeviceMapper.selectList(new QueryWrapper<EnvDevice>().in("unit_id",cageIds)))) {
+//                return new Result(10001,"删除失败,该栋舍下属笼中存在设备",false);
+//            }
+//        }
+//        if (ObjectUtil.isNotEmpty(envDeviceMapper.selectList(new QueryWrapper<EnvDevice>().eq("unit_id",id)))) {
+//            return new Result(10001,"删除失败,该栋舍存在设备",false);
+//        }
+        this.removeById(id);
+        return new Result(10000, "删除成功", true);
+
+    }
+
+    @Override
+    public Result listBuilding(Map<String, String> map) {
+        String farmId = map.get("farmId");
+        QueryWrapper<BaseBuilding> queryWrapper = new QueryWrapper<BaseBuilding>()
+                .eq("farm_id", farmId)
+                .eq("f_type", 1);
+        return new Result(ResultCode.SUCCESS, baseBuildingMapper.selectList(queryWrapper));
+    }
+
+    @Override
+    public Result listTreeBuilding(Map<String, String> map) {
+        String farmId = map.get("farmId");
+        List<BaseBuilding> baseBuildings = this.list(new QueryWrapper<BaseBuilding>()
+                .eq("farm_id", farmId)
+                .orderByAsc("id"));
+        return new Result(ResultCode.SUCCESS, baseBuildings);
+    }
+
+}

+ 97 - 0
musk/src/main/java/com/huimv/farm/musk/service/impl/FarmServiceImpl.java

@@ -0,0 +1,97 @@
+package com.huimv.farm.musk.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.farm.musk.common.utils.Result;
+import com.huimv.farm.musk.common.utils.ResultCode;
+import com.huimv.farm.musk.entity.Farm;
+import com.huimv.farm.musk.entity.SysAccountMultilevel;
+import com.huimv.farm.musk.mapper.FarmMapper;
+import com.huimv.farm.musk.mapper.SysAccountMultilevelMapper;
+import com.huimv.farm.musk.service.IFarmService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-10-14
+ */
+@Service
+public class FarmServiceImpl extends ServiceImpl<FarmMapper, Farm> implements IFarmService {
+
+    @Autowired
+    private SysAccountMultilevelMapper accountMultilevelMapper;
+    @Override
+    public Result getFarm(Integer userId) {
+        SysAccountMultilevel sysAccountMultilevel = accountMultilevelMapper.selectById(userId);
+        String farmIds = sysAccountMultilevel.getFarmIds();
+        List list ;
+        if (userId == 1){
+            list = this.list();
+        }else {
+            List<String> list1 = Arrays.asList(farmIds.split(","));
+           list = (List)this.listByIds(list1);
+        }
+        return new Result(ResultCode.SUCCESS,list);
+    }
+
+    @Override
+    public Result add(Farm farm) {
+        farm.setLocation(farm.getFrontLocation());
+        this.save(farm);
+        return new Result(10000,"添加成功",true);
+    }
+
+    @Override
+    public Result getFarm2(Integer userId) {
+        SysAccountMultilevel sysAccountMultilevel = accountMultilevelMapper.selectById(userId);
+        String farmIds = sysAccountMultilevel.getFarmIds();
+        List<Farm> list ;
+        if (userId == 1){
+            list = this.list();
+        }else {
+            List<String> list1 = Arrays.asList(farmIds.split(","));
+            list = this.listByIds(list1);
+        }
+        String str = "A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q";
+        String[] split = str.split(",");
+        Integer i = 0;
+        for (Farm farm : list) {
+            farm.setFarmName(split[i]+"牧场");
+            i++;
+        }
+        return new Result(ResultCode.SUCCESS,list);
+    }
+
+    @Override
+    public Result listPage(Integer userId, Map paramMap) {
+        int pageNum = (Integer)paramMap.get("pageNum");
+        int pageSize = (Integer)paramMap.get("pageSize");
+        String farmName = (String)paramMap.get("farmName");
+        QueryWrapper<Farm> wrapper= new QueryWrapper<>();
+        wrapper.like("farm_name",farmName);
+        SysAccountMultilevel sysAccountMultilevel = accountMultilevelMapper.selectById(userId);
+        String farmIds = sysAccountMultilevel.getFarmIds();
+        if (StringUtils.isBlank(farmIds)){
+            return new Result(10001,"未绑定牧场",false);
+        }
+        if (userId != 1){
+            List<String> list1 = Arrays.asList(farmIds.split(","));
+            wrapper.in("id",list1);
+        }
+        IPage<Farm> page = this.page(new Page<>(pageNum, pageSize), wrapper);
+        return new Result(ResultCode.SUCCESS,page);
+    }
+}

+ 20 - 0
musk/src/main/java/com/huimv/farm/musk/service/impl/GroupMenuServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.farm.musk.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.farm.musk.entity.GroupMenu;
+import com.huimv.farm.musk.mapper.GroupMenuMapper;
+import com.huimv.farm.musk.service.IGroupMenuService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-09-09
+ */
+@Service
+public class GroupMenuServiceImpl extends ServiceImpl<GroupMenuMapper, GroupMenu> implements IGroupMenuService {
+
+}

+ 97 - 0
musk/src/main/java/com/huimv/farm/musk/service/impl/GroupServiceImpl.java

@@ -0,0 +1,97 @@
+package com.huimv.farm.musk.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.farm.musk.common.utils.Result;
+import com.huimv.farm.musk.common.utils.ResultCode;
+import com.huimv.farm.musk.entity.AccountGroup;
+import com.huimv.farm.musk.entity.Group;
+import com.huimv.farm.musk.entity.GroupMenu;
+import com.huimv.farm.musk.mapper.AccountGroupMapper;
+import com.huimv.farm.musk.mapper.GroupMapper;
+import com.huimv.farm.musk.mapper.GroupMenuMapper;
+import com.huimv.farm.musk.service.IGroupService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-09-09
+ */
+@Service
+public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements IGroupService {
+    @Autowired
+    private GroupMapper groupMapper;
+    @Autowired
+    private GroupMenuMapper groupMenuMapper;
+    @Autowired
+    private AccountGroupMapper accountGroupMapper;
+
+    @Override
+    public Result updateGroup(@RequestBody Group group) {
+        try {
+            groupMapper.updateById(group);
+            return new Result(10000,"修改成功",true);
+        }catch (Exception e){
+            return new Result(10001,"修改失败",false);
+        }
+    }
+
+    @Override
+    @Transactional
+    public Result removeGroup(Integer groupId) {
+        try {
+            Group group = this.groupMapper.selectById(groupId);
+            if (group == null) {
+                return new Result(10002,"请选择数据",false);
+            }
+            // 删除权限组
+            this.groupMapper.deleteById(groupId);
+            // 删除权限组关联菜单
+            QueryWrapper<GroupMenu> groupMenuQueryWrapper = new QueryWrapper<>();
+            groupMenuQueryWrapper.eq("group_id",groupId);
+            groupMenuMapper.delete(groupMenuQueryWrapper);
+            return new Result(10000,"删除成功",true);
+        }catch (Exception e){
+            return new Result(10001,"删除失败",false);
+        }
+    }
+
+    @Override
+    public Result listGroup(Map map, List<Integer> allChildId) {
+        Integer pageNum = (Integer)map.get("pageNum");
+        Integer pageSize = (Integer)map.get("pageSize");
+        Page<Group> page = this.page(new Page<>(pageNum, pageSize), new QueryWrapper<Group>().in("account_id", allChildId).orderByDesc("id"));
+        return new Result(ResultCode.SUCCESS,page);
+    }
+
+    @Override
+    public Result addGroup(Group group, Integer userId) {
+        try {
+            group.setAccountId(userId);
+            groupMapper.insert(group);
+            return new Result(10000,"添加成功",true);
+        }catch (Exception e){
+            return new Result(10001,"添加失败",false);
+        }
+    }
+
+    @Override
+    public Result getGroupByUserId(Integer userId) {
+        List<AccountGroup> accountId = accountGroupMapper.selectList(new QueryWrapper<AccountGroup>().eq("account_id", userId));
+        List<Integer> collect = accountId.stream().map(AccountGroup::getGroupId).collect(Collectors.toList());
+
+        return new Result(ResultCode.SUCCESS,collect);
+    }
+}

+ 42 - 0
musk/src/main/java/com/huimv/farm/musk/service/impl/LoginServiceImpl.java

@@ -0,0 +1,42 @@
+package com.huimv.farm.musk.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.farm.musk.common.utils.Result;
+import com.huimv.farm.musk.common.utils.ResultCode;
+import com.huimv.farm.musk.entity.SysAccountMultilevel;
+import com.huimv.farm.musk.mapper.SysAccountMultilevelMapper;
+import com.huimv.farm.musk.service.ILoginService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class LoginServiceImpl implements ILoginService {
+
+
+    @Override
+    public Result logout() {
+        return null;
+    }
+
+    @Autowired
+    private SysAccountMultilevelMapper accountMultilevelMapper;
+
+    @Override
+    public Result loginMultilevel(String accountName, String password) {
+
+        QueryWrapper<SysAccountMultilevel> wrapper = new QueryWrapper<>();
+        wrapper.eq("account",accountName).eq("password",password);
+        SysAccountMultilevel accountMultilevel = accountMultilevelMapper.selectOne(wrapper);
+
+        if (ObjectUtil.isEmpty(accountMultilevel)){
+            return new Result(10001, "账号不存在或密码错误.", false);
+        }
+
+
+        if (accountMultilevel.getAccountStatus() == 0){
+            return new Result(10002, "账号未启用.", false);
+        }
+        return new Result(ResultCode.SUCCESS,accountMultilevel);
+    }
+}

+ 157 - 0
musk/src/main/java/com/huimv/farm/musk/service/impl/MenuServiceImpl.java

@@ -0,0 +1,157 @@
+package com.huimv.farm.musk.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.farm.musk.common.utils.Result;
+import com.huimv.farm.musk.common.utils.ResultCode;
+import com.huimv.farm.musk.entity.AccountGroup;
+import com.huimv.farm.musk.entity.GroupMenu;
+import com.huimv.farm.musk.entity.Menu;
+import com.huimv.farm.musk.mapper.AccountGroupMapper;
+import com.huimv.farm.musk.mapper.GroupMenuMapper;
+import com.huimv.farm.musk.mapper.MenuMapper;
+import com.huimv.farm.musk.service.IMenuService;
+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 astupidcoder
+ * @since 2021-09-09
+ */
+@Service
+public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IMenuService {
+    @Autowired
+    private MenuMapper menuMapper;
+
+    @Autowired
+    private AccountGroupMapper accountGroupMapper;
+
+    @Autowired
+    private GroupMenuMapper groupMenuMapper;
+
+    @Override
+    public Result addMenu(Menu menu, Integer userId) {
+
+        try {
+            if (menu == null){
+                return  new Result(10002,"参数错误",false);
+            }
+
+             menuMapper.insert(menu);
+            Integer id = menu.getId();
+            List<AccountGroup> accounts = accountGroupMapper.selectList(new QueryWrapper<AccountGroup>().eq("account_id", userId));
+            for (AccountGroup account : accounts) {
+                GroupMenu groupMenu = new GroupMenu();
+                groupMenu.setGroupId(account.getGroupId());
+                groupMenu.setMenuId(id);
+                groupMenuMapper.insert(groupMenu);
+            }
+
+            return new Result(10000,"添加成功",true);
+        }catch (Exception e){
+            return new Result(10001,"添加失败",false);
+        }
+    }
+
+    @Override
+    public Result editMenu(Menu menu) {
+        try {
+            if (menu.getId() == null){
+                return new Result(10002,"请选择要修改的菜单",false);
+            }
+            menuMapper.updateById(menu);
+            return new Result(10000,"修改成功",true);
+        }catch (Exception e){
+            return new Result(10001,"修改失败",false);
+        }
+
+    }
+
+    @Override
+    public Result removeMenu(Integer menuId) {
+        try {
+            QueryWrapper<Menu> menuQueryWrapper = new QueryWrapper<>();
+            menuQueryWrapper.eq("parent_id",menuId);
+            List<Menu> lists = menuMapper.selectList(menuQueryWrapper);
+            if (lists != null && lists.size()>0){
+                for (Menu menu : lists) {
+                    removeMenu(menu.getId());
+                    menuMapper.deleteById(menu);
+                }
+            }
+            menuMapper.deleteById(menuId);
+        }catch (Exception e){
+            return new Result(10001,"删除失败",false);
+        }
+        return new Result(10000,"删除成功",true);
+    }
+
+    //查询菜单,只查一次数据库
+    @Override
+    public Result optimizeList() {
+        QueryWrapper<Menu> menuQueryWrapper = new QueryWrapper<>();
+        menuQueryWrapper.orderByAsc("sort");
+
+        List<Menu> all = menuMapper.selectList(menuQueryWrapper);
+        List list = optimizeListUtil(0,all);
+        return new Result(ResultCode.SUCCESS,list);
+    }
+
+    @Override
+    public Result list1() {
+        QueryWrapper<Menu> menuQueryWrapper = new QueryWrapper<>();
+        menuQueryWrapper.orderByAsc("sort");
+        menuQueryWrapper.eq("weight",0);
+        List<Menu> all = menuMapper.selectList(menuQueryWrapper);
+        List list = optimizeListUtil(0,all);
+        return new Result(ResultCode.SUCCESS,list);
+    }
+
+    @Override
+    public List<Map> optimizeListUtil(int parentId, List<Menu> menuEntityList){
+        List<Map> list = new ArrayList<>();
+        for (Menu menuEntity : menuEntityList) {
+            if (menuEntity.getParentId() == parentId){
+                Map map = new HashMap();
+                map.put("id", menuEntity.getId());
+                map.put("title", menuEntity.getTitle());
+                map.put("parentId", menuEntity.getParentId());
+                map.put("url", menuEntity.getUrl());
+                map.put("sort", menuEntity.getSort());
+                map.put("value", menuEntity.getId());
+                map.put("pid", menuEntity.getParentId());
+                map.put("permission", menuEntity.getPermission());
+                map.put("weight", menuEntity.getWeight());
+                map.put("ifShow", menuEntity.getIfShow());
+                if (menuEntityIsChildren(menuEntity,menuEntityList) ){
+                    map.put("children",optimizeListUtil(menuEntity.getId(),menuEntityList));
+                }else {
+                    map.put("children",new ArrayList<>());
+                }
+                list.add(map);
+            }
+        }
+        return list;
+    }
+
+
+
+    //判断是否有children
+    private boolean menuEntityIsChildren(Menu menuEntity, List<Menu> menuEntityList) {
+        for (com.huimv.farm.musk.entity.Menu Menu : menuEntityList) {
+            if (menuEntity.getId().equals(Menu.getParentId()) ){
+                return true;
+            }
+        }
+        return false;
+    }
+}

+ 145 - 0
musk/src/main/java/com/huimv/farm/musk/service/impl/SysAccountMultilevelServiceImpl.java

@@ -0,0 +1,145 @@
+package com.huimv.farm.musk.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.farm.musk.common.token.TokenSign;
+import com.huimv.farm.musk.common.utils.*;
+import com.huimv.farm.musk.entity.SysAccountMultilevel;
+import com.huimv.farm.musk.mapper.SysAccountMultilevelMapper;
+import com.huimv.farm.musk.service.ISysAccountMultilevelService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-10-14
+ */
+@Service
+public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMultilevelMapper, SysAccountMultilevel> implements ISysAccountMultilevelService {
+
+    @Autowired
+    private SysAccountMultilevelMapper accountMultilevelMapper;
+
+
+    @Override
+    public Result findUserAccount(String searchStr, int pageNum, int pageSize, Integer userId) {
+
+        QueryWrapper<SysAccountMultilevel> wrapper = new QueryWrapper<>();
+        wrapper.like("pids",userId).or().eq("id",userId);
+        IPage<SysAccountMultilevel> page = this.page(new Page<>(pageNum, pageSize), wrapper);
+        return new Result(ResultCode.SUCCESS,page);
+    }
+
+    @Override
+    public Result add(SysAccountMultilevel sysAccountMultilevel, Integer userId) {
+        int account = this.count(new QueryWrapper<SysAccountMultilevel>().eq("account", sysAccountMultilevel.getAccount()));
+        if (account > 0 ){
+            return new Result(10001,"该账号已经存在,请重新创建",false);
+        }
+        SysAccountMultilevel byId = this.getById(userId);
+        sysAccountMultilevel.setPid(userId);
+        sysAccountMultilevel.setPids(byId.getPids()+","+userId);
+        accountMultilevelMapper.insert(sysAccountMultilevel);
+        return  new Result( 10000,"添加成功",true);
+    }
+
+    @Override
+    public Result setAccountStatus(List<Integer> ids, Integer status) {
+        try {
+            for (Integer id : ids) {
+                SysAccountMultilevel account= new SysAccountMultilevel();
+                account.setId(id);
+                account.setAccountStatus(status);
+                this.updateById(account);
+            }
+        }catch (Exception e){
+            return new Result(10001,"插入失败",false);
+        }
+        String message = "";
+        if(status == 1){
+            message = "你选择的账号已经启用。";
+        }else{
+            message = "你选择的账号已经暂停启用。";
+        }
+        return new Result(10000,message,true);
+    }
+
+    @Override
+    public List<Integer> getAllChildId(Integer userId) {
+        List<SysAccountMultilevel> pids = this.list(new QueryWrapper<SysAccountMultilevel>().eq("pid", userId ));
+        List<Integer> list = new ArrayList<>();
+        for (SysAccountMultilevel pid : pids) {
+            list.add(pid.getId());
+        }
+        list.add(userId);
+        return list;
+    }
+
+    @Override
+    public Result listSubordinate(String searchStr, int pageNum, int pageSize, Integer userId) {
+        QueryWrapper<SysAccountMultilevel> wrapper = new QueryWrapper<>();
+        wrapper.like("pids",userId);
+        if (StringUtils.isNotBlank(searchStr)){
+            wrapper.like("user_name",searchStr);
+        }
+        IPage<SysAccountMultilevel> page = this.page(new Page<>(pageNum, pageSize), wrapper);
+        return new Result(ResultCode.SUCCESS,page);
+    }
+
+    @Override
+    public Result getLastFarmId(Integer userId) {
+        SysAccountMultilevel sysAccountMultilevel = accountMultilevelMapper.selectById(userId);
+        Integer lastFarmId = sysAccountMultilevel.getLastFarmId();
+        String farmIds = sysAccountMultilevel.getFarmIds();
+        if (farmIds == null){
+            return new Result(10001,"该账号没有绑定牧场",true);
+        }
+        if (lastFarmId == null){
+            String[] split = farmIds.split(",");
+            String s = split[0];
+            sysAccountMultilevel.setLastFarmId(Integer.valueOf(s));
+            accountMultilevelMapper.updateById(sysAccountMultilevel);
+            return new Result(ResultCode.SUCCESS,s);
+        }
+        return new Result(ResultCode.SUCCESS,lastFarmId);
+    }
+
+    @Override
+    public Result listSubordinateByFarm(String farmId, Integer userId) {
+        QueryWrapper<SysAccountMultilevel> wrapper = new QueryWrapper<>();
+        wrapper.like("pids",userId);
+        wrapper.like("farm_ids",farmId);
+        List<SysAccountMultilevel> page = this.list( wrapper);
+        return new Result(ResultCode.SUCCESS,page);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result updateUser(HttpServletRequest httpServletRequest, MultipartFile img, String userName, String phone) throws IOException {
+        SysAccountMultilevel sysAccountMultilevel = accountMultilevelMapper.selectById(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+
+        if (ObjectUtil.isNotEmpty(userName)){
+            sysAccountMultilevel.setUserName(userName);
+        }
+
+        accountMultilevelMapper.updateById(sysAccountMultilevel);
+        return new Result(ResultCode.SUCCESS,sysAccountMultilevel);
+    }
+
+}

+ 95 - 0
musk/src/main/java/com/huimv/farm/musk/service/impl/SysCameraAreaServiceImpl.java

@@ -0,0 +1,95 @@
+package com.huimv.farm.musk.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.farm.musk.common.utils.Result;
+import com.huimv.farm.musk.common.utils.ResultCode;
+import com.huimv.farm.musk.entity.SysCamera;
+import com.huimv.farm.musk.entity.SysCameraArea;
+import com.huimv.farm.musk.mapper.SysCameraAreaMapper;
+import com.huimv.farm.musk.mapper.SysCameraMapper;
+import com.huimv.farm.musk.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);
+    }
+
+
+}

+ 57 - 0
musk/src/main/java/com/huimv/farm/musk/service/impl/SysCameraBrandServiceImpl.java

@@ -0,0 +1,57 @@
+package com.huimv.farm.musk.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.farm.musk.common.utils.Result;
+import com.huimv.farm.musk.common.utils.ResultCode;
+import com.huimv.farm.musk.entity.SysCamera;
+import com.huimv.farm.musk.entity.SysCameraBrand;
+import com.huimv.farm.musk.mapper.SysCameraBrandMapper;
+import com.huimv.farm.musk.mapper.SysCameraMapper;
+import com.huimv.farm.musk.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, "删除成功");
+    }
+
+}

+ 245 - 0
musk/src/main/java/com/huimv/farm/musk/service/impl/SysCameraServiceImpl.java

@@ -0,0 +1,245 @@
+package com.huimv.farm.musk.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.farm.musk.common.utils.Result;
+import com.huimv.farm.musk.common.utils.ResultCode;
+import com.huimv.farm.musk.entity.SysCamera;
+import com.huimv.farm.musk.entity.SysCameraBrand;
+import com.huimv.farm.musk.entity.vo.*;
+import com.huimv.farm.musk.mapper.SysCameraAreaMapper;
+import com.huimv.farm.musk.mapper.SysCameraBrandMapper;
+import com.huimv.farm.musk.mapper.SysCameraMapper;
+import com.huimv.farm.musk.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;
+    }
+
+
+}

+ 127 - 0
musk/src/main/java/com/huimv/farm/musk/session/AccessToken.java

@@ -0,0 +1,127 @@
+package com.huimv.farm.musk.session;
+
+import com.huimv.farm.musk.entity.SysAccountMultilevel;
+
+import java.util.Date;
+
+/**
+ * 登录的token信息
+ * @author guojian
+ */
+public class AccessToken {
+    private String token;
+    private String loginIp;
+    private Date created;
+    private String accountName;
+    private Integer code;
+    private Integer id;
+    private String farmId;
+    private String message;
+    private Integer lastFarmId;
+    private String userName;
+
+    public SysAccountMultilevel getSysAccountMultilevel() {
+        return sysAccountMultilevel;
+    }
+
+    public void setSysAccountMultilevel(SysAccountMultilevel sysAccountMultilevel) {
+        this.sysAccountMultilevel = sysAccountMultilevel;
+    }
+
+    private SysAccountMultilevel sysAccountMultilevel;
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public Integer getLastFarmId() {
+        return lastFarmId;
+    }
+
+    public void setLastFarmId(Integer lastFarmId) {
+        this.lastFarmId = lastFarmId;
+    }
+
+    public AccessToken() {
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public String getLoginIp() {
+        return loginIp;
+    }
+
+    public void setLoginIp(String loginIp) {
+        this.loginIp = loginIp;
+    }
+
+    public Date getCreated() {
+        return created;
+    }
+
+    public void setCreated(Date created) {
+        this.created = created;
+    }
+
+    public String getAccountName() {
+        return accountName;
+    }
+
+    public void setAccountName(String accountName) {
+        this.accountName = accountName;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getFarmId() {
+        return farmId;
+    }
+
+    public void setFarmId(String farmId) {
+        this.farmId = farmId;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public AccessToken(String token, String loginIp, Date created, String accountName, Integer code, Integer id, Integer type, String farmId, String message, SysAccountMultilevel sysAccountMultilevel) {
+        this.token = token;
+        this.loginIp = loginIp;
+        this.created = created;
+        this.accountName = accountName;
+        this.code = code;
+        this.id = id;
+        this.farmId = farmId;
+        this.message = message;
+        this.sysAccountMultilevel = sysAccountMultilevel;
+    }
+}

+ 21 - 0
musk/src/main/resources/application-dev.yml

@@ -0,0 +1,21 @@
+server:
+  port: 8050
+
+spring:
+  application:
+    name: huimv-huyang-farm.musk
+
+
+  datasource:
+    url: jdbc:mysql://122.112.219.87:3306/huimv_farm_musk?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: ?root@huimv_farm!
+    driver-class-name: com.mysql.cj.jdbc.Driver
+
+
+
+mybatis-plus:
+  configuration:
+#    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+

+ 3 - 0
musk/src/main/resources/application.properties

@@ -0,0 +1,3 @@
+spring.application.name=musk
+
+spring.profiles.active=dev

+ 0 - 0
musk/src/main/resources/com/huimv/farm/musk/mapper/AccountGroupMapper.xml


Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff