基础搭建添加

beeboxs/src/main/java/com/huimv/beeboxs/config/InterceptorConfig.java

@@ -21,6 +21,6 @@ public class InterceptorConfig implements WebMvcConfigurer {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(jwtInterceptor()).
-                excludePathPatterns("/admin/my/*");
+                excludePathPatterns("/admin/my/*","/hive/token");
     }
 }

beeboxs/src/main/java/com/huimv/beeboxs/controller/OpenCotroller.java

@@ -0,0 +1,64 @@
+package com.huimv.beeboxs.controller;
+
+import com.huimv.beeboxs.common.token.TokenSign;
+import com.huimv.beeboxs.common.utils.Result;
+import com.huimv.beeboxs.common.utils.ResultCode;
+import com.huimv.beeboxs.entity.SysAccountMultilevel;
+import com.huimv.beeboxs.service.ILoginService;
+import com.huimv.beeboxs.session.AccessToken;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+
+@RestController
+@RequestMapping("/hive")
+public class OpenCotroller {
+
+    @Autowired
+    ILoginService iLoginService;
+
+    @GetMapping("/token")
+    public  Result test(@RequestParam(name = "account") String account,
+                        @RequestParam(name = "password") String password,
+                        HttpServletRequest req){
+
+//        String code = map.get("code");
+
+        String remoteHost = req.getRemoteHost();
+        Result result = iLoginService.loginMultilevel(account, password);
+        if(result.getCode() == 10000){
+
+            SysAccountMultilevel accountEntity = (SysAccountMultilevel) result.getData();
+            Integer id = accountEntity.getId();
+
+
+            AccessToken accessToken = new AccessToken();
+            accessToken.setCreated(new Date());
+            accessToken.setAccountName(account);
+            accessToken.setCode(result.getCode());
+            accessToken.setMessage(result.getMessage());
+            accessToken.setFarmId(accountEntity.getFarmIds());
+            String token = TokenSign.sign(account,id,accountEntity.getFarmIds());
+            accessToken.setToken(token);
+
+            accessToken.setId(id);
+            accessToken.setLoginIp(remoteHost);
+            accessToken.setType(accountEntity.getType());
+            return new Result(ResultCode.SUCCESS,accessToken);
+        }
+        return  result;
+    }
+
+    @GetMapping("/station/list")
+    public  Result test(@RequestParam(name = "pageNo") String pageNo,
+                        @RequestParam(name = "pageSize") String pageSize,
+                        @RequestParam(name = "netstatus") String netstatus){
+
+return null;
+    }
+}

beeboxs/src/main/java/com/huimv/beeboxs/entity/HiveBeehiveOut.java

@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -76,7 +79,8 @@ public class HiveBeehiveOut implements Serializable {
     /**
      * 上传时间
      */
-    private LocalDateTime uploadTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date uploadTime;
 
     /**
      * 拓展字段 1
@@ -91,7 +95,8 @@ public class HiveBeehiveOut implements Serializable {
     /**
      * 日期
      */
-    private LocalDateTime createDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date createDate;
 
     /**
      * 牧场id

beeboxs/src/main/resources/com/huimv/admin/mapper/AccountGroupMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huimv.admin.mapper.AccountGroupMapper">
+<mapper namespace="com.huimv.beeboxs.mapper.AccountGroupMapper">
 
 
     <delete id="removeAccountGroup">

beeboxs/src/main/resources/com/huimv/admin/mapper/GroupMenuMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huimv.admin.mapper.GroupMenuMapper">
+<mapper namespace="com.huimv.beeboxs.mapper.GroupMenuMapper">
 
 
 

beeboxs/src/main/resources/com/huimv/admin/mapper/MenuMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huimv.admin.mapper.MenuMapper">
+<mapper namespace="com.huimv.beeboxs.mapper.MenuMapper">
 
 
-    <select id="getMyMenu" resultType="com.huimv.admin.entity.Menu">
+    <select id="getMyMenu" resultType="com.huimv.beeboxs.entity.Menu">
         SELECT * FROM sys_menu
         WHERE id IN
         (SELECT DISTINCT(menu_id) FROM sys_group_menu WHERE group_id IN

beeboxs/src/main/resources/com/huimv/admin/mapper/UserMapper.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huimv.admin.mapper.UserMapper">
-    <select id="findUserAndAccountByUserName" resultType="com.huimv.admin.entity.dto.UserAccountDto">
+<mapper namespace="com.huimv.beeboxs.mapper.UserMapper">
+    <select id="findUserAndAccountByUserName" resultType="com.huimv.beeboxs.entity.dto.UserAccountDto">
         SELECT user.*,account.account_name,account.account_status
         FROM sys_user user LEFT
         JOIN sys_account account ON user.user_id=account.user_id
         WHERE user.user_name=#{searchStr}  OR user.mobile=#{searchStr} order by id desc limit #{start},#{pageSize}
 
     </select>
-    <select id="findUserAndAccount" resultType="com.huimv.admin.entity.dto.UserAccountDto">
+    <select id="findUserAndAccount" resultType="com.huimv.beeboxs.entity.dto.UserAccountDto">
         SELECT
         user.*,account.account_name,account.account_status
         FROM sys_user user