基础信息

huimv-goldpig/huimv-goldpig-admin/pom.xml

@@ -11,11 +11,7 @@
 
     <artifactId>huimv-goldpig-admin</artifactId>
     <dependencies>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <optional>true</optional>
-        </dependency>
+
         <dependency>
             <groupId>com.auth0</groupId>
             <artifactId>java-jwt</artifactId>

huimv-goldpig/huimv-goldpig-admin/src/main/java/com/huimv/admin/controller/LoginController.java

@@ -90,7 +90,7 @@ public class LoginController {
             accessToken.setAccountName(accountName);
             accessToken.setCode(result.getCode());
             accessToken.setMessage(result.getMessage());
-            String token = TokenSign.sign(accountName,id);
+            String token = TokenSign.sign(accountName,id,accountEntity.getFarmIds());
             accessToken.setToken(token);
 
             accessToken.setId(id);
@@ -103,7 +103,7 @@ public class LoginController {
     //测试-token
     @PostMapping(value = "/getToken")
     public String getToken(HttpServletRequest req)  {
-        String token =  TokenSign.sign("superadmin",1);
+        String token =  TokenSign.sign("superadmin",1,null);
         return  token;
     }
 

huimv-goldpig/huimv-goldpig-admin/src/main/java/com/huimv/admin/mapper/GroupMenuMapper.java

@@ -1,6 +1,9 @@
 package com.huimv.admin.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.admin.entity.GroupMenu;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -17,4 +20,5 @@ import org.springframework.stereotype.Repository;
 public interface GroupMenuMapper extends BaseMapper<GroupMenu> {
 
     void removeGroupMenu(@Param("groupId") String groupId);
+
 }

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

@@ -1,7 +1,9 @@
 package com.huimv.admin.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.admin.entity.AccountGroup;
 import com.huimv.admin.entity.GroupMenu;
 import com.huimv.admin.entity.Menu;
@@ -75,8 +77,10 @@ public class AuthorizeServiceImpl implements IAuthorizeService {
                 GroupMenu.setMenuId(Integer.parseInt(menuIdsArray[a]));
                 groupMenuMapper.insert(GroupMenu);
             }
+
         }
 
+
         return new Result(10001, "保存权限组关联菜单成功", true);
     }
 

huimv-goldpig/huimv-goldpig-admin/src/main/java/com/huimv/common/token/TokenSign.java

@@ -25,7 +25,7 @@ public class TokenSign {
      * 产生token
      * @return
      */
-    public static String sign(String userName,Integer id){
+    public static String sign(String userName,Integer id,String farmIds){
 
         String JwtToken = Jwts.builder()
                 //头部信息
@@ -38,6 +38,7 @@ public class TokenSign {
                 //token主体部分,存储用户信息
                 .claim("userName", userName)
                 .claim("id",id)
+                .claim("farmIds",farmIds)
                 .signWith(SignatureAlgorithm.HS256, APP_SECRET)
                 .compact();
 
@@ -82,6 +83,15 @@ public class TokenSign {
         return (Integer) claims.get("id");
     }
 
+    public static String getFarmIds(HttpServletRequest request) {
+        String jwtToken = request.getHeader("accessToken");
+        if (StringUtils.isEmpty(jwtToken)) {
+            return null;
+        }
+        Claims claims = getClaims(jwtToken);
+        return (String) claims.get("farmIds");
+    }
+
     /**
      * 获取claims对象
      *

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/config/MybatisPlusConfig.java

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

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/controller/BaseFarmInfoController.java

@@ -1,17 +1,21 @@
 package com.huimv.eartag.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.common.token.TokenSign;
 import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import com.huimv.eartag.entity.BaseFarmInfo;
 import com.huimv.eartag.service.IBaseFarmInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -56,4 +60,18 @@ public class BaseFarmInfoController {
         return baseFarmInfoService.pageAll(map);
 
     }
+
+    @GetMapping("/list")
+    public Result list(HttpServletRequest request){
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        if (userId !=null &&  1== userId) {
+            return new Result(ResultCode.SUCCESS,baseFarmInfoService.list());
+        }
+        String farmIds = TokenSign.getFarmIds(request);
+
+        List<Integer> idList = Arrays.stream(farmIds.split(",")).map(Integer::parseInt).collect(Collectors.toList());
+        return new Result(ResultCode.SUCCESS,baseFarmInfoService.listByIds(idList));
+
+
+    }
 }

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/controller/BasePigpenController.java

@@ -5,17 +5,18 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.common.token.TokenSign;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
+import com.huimv.eartag.entity.BaseFarmInfo;
 import com.huimv.eartag.entity.BasePigpen;
 import com.huimv.eartag.entity.CollectorRegister;
+import com.huimv.eartag.service.IBaseFarmInfoService;
 import com.huimv.eartag.service.IBasePigpenService;
 import com.huimv.eartag.service.ICollectorRegisterService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -34,13 +35,17 @@ public class BasePigpenController {
     @Autowired
     private ICollectorRegisterService collectorRegisterService;
 
+    @Autowired
+    private IBaseFarmInfoService baseFarmInfoService;
+
     @PostMapping("/add")
     public Result add(@RequestBody BasePigpen basePigpen, HttpServletRequest request){
 
         Integer userId = TokenSign.getMemberIdByJwtToken(request);
 
-        basePigpen.setCreateTime(new Date());
-        basePigpen.setCreateUser(userId);
+        basePigpen.setCreatTime(new Date());
+        basePigpen.setCreatUser(userId);
+        basePigpen.setFarmCode(basePigpen.getFarmId()+"");
         basePigpenService.save(basePigpen);
         return new Result(10000,"添加成功",true);
     }
@@ -70,13 +75,30 @@ public class BasePigpenController {
 
     @PostMapping("/page")
     public Result page(@RequestBody Map map){
+        //嵌套牧场
+        /*List<Integer> farmIds = new ArrayList<>();
+
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        if (userId == 1){
+            List<BaseFarmInfo> list = baseFarmInfoService.list();
+            for (BaseFarmInfo baseFarmInfo : list) {
+                farmIds.add(baseFarmInfo.getId());
+            }
+        }else {
+            String farmId = TokenSign.getFarmIds(request);
+            farmIds= Arrays.stream(farmId.split(",")).map(Integer::parseInt).collect(Collectors.toList());
+        }*/
+
         return basePigpenService.pageAll(map);
 
     }
 
     @GetMapping("/list")
     public Result page(@RequestParam(name = "farmId") Integer farmId){
-        List<BasePigpen> farmList = basePigpenService.list(new QueryWrapper<BasePigpen>().eq("farm_id", farmId));
+        List<BasePigpen> farmList = basePigpenService.list(new QueryWrapper<BasePigpen>().eq("farm_id", farmId).eq("type",1));
+        for (BasePigpen basePigpen : farmList) {
+            basePigpen.setChildren(basePigpenService.list(new QueryWrapper<BasePigpen>().eq("parent_id",basePigpen.getId())));
+        }
         return new Result(ResultCode.SUCCESS,farmList);
 
     }

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/entity/BaseFarmInfo.java

@@ -3,6 +3,7 @@ package com.huimv.eartag.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -23,6 +24,7 @@ public class BaseFarmInfo extends Model {
 
     private String farmName;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date createTime;
 
     private Integer createUser;

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/entity/BaseFloor.java

@@ -3,6 +3,7 @@ package com.huimv.eartag.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -33,7 +34,7 @@ public class BaseFloor extends Model {
     private Integer farmId;
 
     private String farmName;
-
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date createTime;
 
     private Integer createUser;

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/entity/BasePigpen.java

@@ -3,6 +3,7 @@ package com.huimv.eartag.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -28,19 +29,30 @@ public class BasePigpen extends Model {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+    private String orgId;
+
+    private String farmCode;
+
     private String pigpenName;
 
-    private Integer floorId;
+    private Integer parentId;
 
-    private String floorName;
+    private Integer type;
 
-    private Integer farmId;
+    private Double pigpenTemp;
 
-    private String farmName;
+    private Integer tempAnomaly;
 
-    private Integer createUser;
+    private Object children;
 
-    private Date createTime;
+    private Integer stage;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date creatTime;
+
+    private Integer creatUser;
+
+    private String farmName;
+    private Integer farmId;
 
 
 }

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/entity/CollectorRegister.java

@@ -3,6 +3,7 @@ package com.huimv.eartag.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -111,7 +112,8 @@ public class CollectorRegister extends Model {
     /**
      * 最后上传时间
      */
-    private LocalDateTime lastTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date lastTime;
 
     /**
      * 0:正常,1:网络异常,2:采集异常,3:注销

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/entity/dto/BasePigpenDto.java

@@ -0,0 +1,40 @@
+package com.huimv.eartag.entity.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class BasePigpenDto {
+    private Integer id;
+
+    private String orgId;
+
+    private String farmCode;
+
+    private String pigpenName;
+
+    private Integer parentId;
+
+    private Integer type;
+
+    private Double pigpenTemp;
+
+    private Integer tempAnomaly;
+
+    private Object children;
+
+    private Integer stage;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date creatTime;
+
+    private Integer creatUser;
+
+    private String farmName;
+    private Integer farmId;
+
+    private Integer grandId;
+}

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/mapper/BaseFarmInfoMapper.java

@@ -2,6 +2,7 @@ package com.huimv.eartag.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huimv.eartag.entity.BaseFarmInfo;
+import org.springframework.stereotype.Repository;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.huimv.eartag.entity.BaseFarmInfo;
  * @author astupidcoder
  * @since 2022-01-07
  */
+@Repository
 public interface BaseFarmInfoMapper extends BaseMapper<BaseFarmInfo> {
 
 }

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/service/IBasePigpenService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.common.utils.Result;
 import com.huimv.eartag.entity.BasePigpen;
 
+import java.util.List;
 import java.util.Map;
 
 /**

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/service/impl/BaseFarmInfoServiceImpl.java

@@ -30,8 +30,14 @@ public class BaseFarmInfoServiceImpl extends ServiceImpl<BaseFarmInfoMapper, Bas
         Integer current = (Integer)map.get("current");
         Integer size = (Integer) map.get("size");
         String farmName = (String) map.get("farmName");
+        String location = (String)map.get("location");
+        Integer type = (Integer)map.get("type");
         QueryWrapper<BaseFarmInfo> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(farmName),"farm_name",farmName);
+        wrapper.like(StringUtils.isNotBlank(location),"location",location);
+        if (type != null){
+            wrapper.eq("type",type);
+        }
         Page<BaseFarmInfo> page = page(new Page<>(current, size), wrapper);
 
         return new Result(ResultCode.SUCCESS,page);

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/service/impl/BasePigpenServiceImpl.java

@@ -1,16 +1,27 @@
 package com.huimv.eartag.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
+import com.huimv.eartag.entity.BaseFarmInfo;
 import com.huimv.eartag.entity.BasePigpen;
+import com.huimv.eartag.entity.dto.BasePigpenDto;
+import com.huimv.eartag.mapper.BaseFarmInfoMapper;
 import com.huimv.eartag.mapper.BasePigpenMapper;
 import com.huimv.eartag.service.IBasePigpenService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * <p>
@@ -23,15 +34,91 @@ import java.util.Map;
 @Service
 public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePigpen> implements IBasePigpenService {
 
+    @Autowired
+    private BaseFarmInfoMapper baseFarmInfoMapper;
+
+
+   /* @Override
+    public Result pageAll(Map map) {
+
+        String searchName = (String) map.get("searchName");
+        Map map1 = new HashMap();
+        List lista = new ArrayList();
+        for (Integer farmId : farmIds) {
+            BaseFarmInfo baseFarmInfo = baseFarmInfoMapper.selectById(farmId);
+            QueryWrapper<BasePigpen> wrapper = new QueryWrapper<>();
+
+            wrapper.eq("farm_id",farmId);
+            wrapper.like(StringUtils.isNotBlank(searchName),"pigpen_name",searchName);
+
+            List<BasePigpen> list = this.list(wrapper);
+            List<BasePigpen> collect = list.stream().filter(o -> o.getParentId() == 0)
+                    .peek(o -> o.setChildren(getChildBasePigpenList(o, list)))
+                    .collect(Collectors.toList());
+            Map map2 = new HashMap();
+            map2.put("farmName",baseFarmInfo.getFarmName());
+            map2.put("children",collect);
+            map2.put("farmId",farmId);
+            lista.add(map2);
+        }
+
+        map1.put("records",lista);
+
+//        wrapper.eq("type",1);
+
+//        Page<BasePigpen> page = page(new Page<>(current, size), wrapper);
+//        List<BasePigpen> records = page.getRecords();
+//        for (BasePigpen record : records) {
+//            record.setChildren(this.list(new QueryWrapper<BasePigpen>().eq("parent_id",record.getId())));
+//        }
+
+
+        return new Result(ResultCode.SUCCESS,map1);
+    }*/
+
     @Override
     public Result pageAll(Map map) {
-        Integer current = (Integer)map.get("current");
-        Integer size = (Integer) map.get("size");
+
         String searchName = (String) map.get("searchName");
+        Integer farmId = (Integer)map.get("farmId");
+
         QueryWrapper<BasePigpen> wrapper = new QueryWrapper<>();
-        wrapper.like("butcher_name",searchName);
-        Page<BasePigpen> page = page(new Page<>(current, size), wrapper);
 
-        return new Result(ResultCode.SUCCESS,page);
+        wrapper.like(StringUtils.isNotBlank(searchName),"pigpen_name",searchName);
+        wrapper.eq("farm_id",farmId);
+
+        List<BasePigpen> list = this.list(wrapper);
+
+        List<BasePigpenDto> basePigpenDtos = BeanUtil.copyToList(list, BasePigpenDto.class);
+
+        basePigpenDtos.stream().filter(o -> o.getType().equals(3))
+                .forEach(o -> o.setGrandId(getGrandId(o.getParentId(), basePigpenDtos)));
+
+
+        List<BasePigpenDto> collect = basePigpenDtos.stream().filter(o -> o.getParentId() == 0)
+                .peek(o -> o.setChildren(getChildBasePigpenList(o, basePigpenDtos)))
+                .collect(Collectors.toList());
+
+
+        Map map1 = new HashMap();
+        map1.put("records",collect);
+        return new Result(ResultCode.SUCCESS,map1);
+    }
+
+    private Integer getGrandId(Integer parentId, List<BasePigpenDto> basePigpenDtos) {
+        List<BasePigpenDto> collect = basePigpenDtos.stream().filter(o -> o.getId().equals(parentId))
+                .collect(Collectors.toList());
+        return collect.get(0).getParentId();
     }
+
+
+
+    private List<BasePigpenDto> getChildBasePigpenList(BasePigpenDto basePigpenDto, List<BasePigpenDto> list) {
+        return list.stream().filter(o -> o.getParentId().equals(basePigpenDto.getId()))
+                .peek(o -> o.setChildren(getChildBasePigpenList(o, list)))
+                .collect(Collectors.toList());
+
+    }
+
+
 }

huimv-goldpig/pom.xml

@@ -66,17 +66,12 @@
             <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>-->
-<!--            <exclusions>-->
-<!--                <exclusion>-->
-<!--                    <artifactId>mybatis-plus-extension</artifactId>-->
-<!--                    <groupId>com.baomidou</groupId>-->
-<!--                </exclusion>-->
-<!--            </exclusions>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+            <version>3.2.0</version>
+
+        </dependency>
     </dependencies>
 
     <build>