s

huimv-goldpig/huimv-goldpig-anquisition/pom.xml

@@ -17,58 +17,20 @@
 
     <dependencies>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-            <version>2.5.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <version>2.5.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <version>2.5.3</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <scope>runtime</scope>
-        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
             <version>2.5.3</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>spring-boot-starter</artifactId>
+                    <groupId>org.springframework.boot</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.4.2</version>
-        </dependency>
 
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>1.2.62</version>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -81,11 +43,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-            <version>2.5.3</version>
-        </dependency>
 
 
         <dependency>
@@ -94,17 +51,6 @@
             <version>LATEST</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-            <version>5.2.5.RELEASE</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
 
         <dependency>
             <groupId>commons-lang</groupId>

huimv-goldpig/huimv-goldpig-anquisition/src/main/java/com/huimv/acquisition/entity/RawDataEntity.java

@@ -24,7 +24,6 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意
  */
 package com.huimv.acquisition.entity;
 
-import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -52,13 +51,11 @@ public class RawDataEntity   {
     /**
      * 
      */
-    @Excel(name = "")
     private String detailData;
 
     /**
      * 
      */
-    @Excel(name = "")
     private Integer status;
 
 

huimv-goldpig/huimv-goldpig-anquisition/src/main/java/com/huimv/acquisition/param/CollectorRegisterParam.java

@@ -29,8 +29,6 @@ import com.huimv.acquisition.result.BaseParam;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 /**
@@ -60,13 +58,11 @@ public class CollectorRegisterParam extends BaseParam {
     /**
      * 设备编码
      */
-    @NotBlank(message = "设备编码不能为空，请检查deviceCode参数", groups = {add.class, edit.class})
     private String deviceCode;
 
     /**
      * 盒子的芯片编码
      */
-    @NotBlank(message = "盒子的芯片编码不能为空，请检查registeCode参数", groups = {add.class, edit.class})
     private String registeCode;
 
     /**
@@ -93,31 +89,26 @@ public class CollectorRegisterParam extends BaseParam {
     /**
      * 阶段
      */
-    @NotNull(message = "阶段不能为空，请检查stage参数", groups = {add.class, edit.class})
     private Integer stage;
 
     /**
      * 猪舍id
      */
-    @NotNull(message = "猪舍id不能为空，请检查pigpenId参数", groups = {add.class, edit.class})
     private Integer pigpenId;
 
     /**
      * 栋舍名称
      */
-    @NotBlank(message = "栋舍名称不能为空，请检查penName参数", groups = {add.class, edit.class})
     private String penName;
 
     /**
      * 单元id
      */
-    @NotNull(message = "单元id不能为空，请检查unitId参数", groups = {add.class, edit.class})
     private Integer unitId;
 
     /**
      * 单元名称
      */
-    @NotBlank(message = "单元名称不能为空，请检查unitName参数", groups = {add.class, edit.class})
     private String unitName;
 
     /**

huimv-goldpig/huimv-goldpig-anquisition/src/main/java/com/huimv/acquisition/service/impl/EartagDataServiceImpl.java

@@ -3,6 +3,7 @@ package com.huimv.acquisition.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.acquisition.entity.*;
@@ -15,7 +16,6 @@ import com.huimv.acquisition.socket.eartagrecive.util.DateUtilsPublic;
 import com.huimv.acquisition.socket.eartagrecive.util.StringUtilsWork;
 import com.huimv.acquisition.utils.PageUtils;
 import com.huimv.acquisition.utils.Query;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -69,7 +69,7 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
         //只要首页限制在第一页，其余的不需要的
 
         LambdaQueryWrapper<EartagDataEntity> wrapper = Wrappers.lambdaQuery();
-        if(StringUtils.isNotEmpty(farmID)){  //StringUtils.isNotEmpty(orderField) && StringUtils.isNotEmpty(order)
+        if(StringUtils.isNotBlank(farmID)){  //StringUtils.isNotEmpty(orderField) && StringUtils.isNotEmpty(order)
             wrapper.eq(EartagDataEntity::getFarmCode, farmID );
         }
         if(StringUtilsWork.isNotBlank(eartagNo)){

huimv-goldpig/huimv-goldpig-anquisition/src/main/java/com/huimv/acquisition/utils/Query.java

@@ -10,8 +10,8 @@ package com.huimv.acquisition.utils;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.commons.lang.StringUtils;
 
 import java.util.Map;
 
@@ -59,7 +59,7 @@ public class Query<T> {
 
 
         //前端字段排序
-        if(StringUtils.isNotEmpty(orderField) && StringUtils.isNotEmpty(order)){
+        if(StringUtils.isNotBlank(orderField) && StringUtils.isNotBlank(order)){
             if(Constant.ASC.equalsIgnoreCase(order)) {
                 return  page.addOrder(OrderItem.asc(orderField));
             }else {

huimv-goldpig/huimv-goldpig-anquisition/src/main/java/com/huimv/acquisition/utils/SQLFilter.java

@@ -9,8 +9,8 @@
 package com.huimv.acquisition.utils;
 
 
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.huimv.acquisition.result.RRException;
-import org.apache.commons.lang.StringUtils;
 
 /**
  * SQL过滤
@@ -28,10 +28,10 @@ public class SQLFilter {
             return null;
         }
         //去掉'|"|;|\字符
-        str = StringUtils.replace(str, "'", "");
-        str = StringUtils.replace(str, "\"", "");
-        str = StringUtils.replace(str, ";", "");
-        str = StringUtils.replace(str, "\\", "");
+//        str = StringUtils.replace(str, "'", "");
+//        str = StringUtils.replace(str, "\"", "");
+//        str = StringUtils.replace(str, ";", "");
+//        str = StringUtils.replace(str, "\\", "");
 
         //转换成小写
         str = str.toLowerCase();

huimv-goldpig/huimv-goldpig-eartag/pom.xml

@@ -16,11 +16,7 @@
             <artifactId>huimv-goldpig-admin</artifactId>
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <optional>true</optional>
-        </dependency>
+
     </dependencies>
 
 </project>

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

@@ -1,77 +0,0 @@
-/*
-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.eartag.controller;
-
-import com.huimv.common.utils.Result;
-import com.huimv.eartag.entity.BaseEquipment;
-import com.huimv.eartag.service.BaseEquipmentService;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 栋舍表控制器
- *
- * @author yinhao
- * @date 2021-08-17 14:00:42
- */
-@RestController
-public class BaseEquipmentController {
-
-    @Resource
-    private BaseEquipmentService baseEquipmentService;
-
-
-    @PostMapping("/add")
-    public Result add(@RequestBody BaseEquipment baseEquipment){
-        baseEquipmentService.save(baseEquipment);
-        return new Result(10000,"添加成功",true);
-    }
-
-    @PostMapping("/update")
-    public Result update(@RequestBody BaseEquipment baseEquipment){
-        baseEquipmentService.updateById(baseEquipment);
-        return new Result(10000,"修改成功",true);
-    }
-
-
-    @GetMapping("/remove")
-    public Result remove(@RequestParam(name = "ids") List<Integer> ids){
-        baseEquipmentService.removeByIds(ids);
-        return new Result(10000,"删除成功",true);
-    }
-
-
-    @PostMapping("/page")
-    public Result page(@RequestBody Map map){
-        return baseEquipmentService.pageAll(map);
-
-    }
-
-
-
-}

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

@@ -1,12 +1,15 @@
 package com.huimv.eartag.controller;
 
 
+import com.huimv.common.token.TokenSign;
 import com.huimv.common.utils.Result;
 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.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -25,7 +28,11 @@ public class BaseFarmInfoController {
     private IBaseFarmInfoService baseFarmInfoService;
 
     @PostMapping("/add")
-    public Result add(@RequestBody BaseFarmInfo baseFarmInfo){
+    public Result add(@RequestBody BaseFarmInfo baseFarmInfo, HttpServletRequest request){
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+
+        baseFarmInfo.setCreateTime(new Date());
+        baseFarmInfo.setCreateUser(userId);
         baseFarmInfoService.save(baseFarmInfo);
         return new Result(10000,"添加成功",true);
     }

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

@@ -2,12 +2,18 @@ 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.BaseFloor;
+import com.huimv.eartag.entity.BasePigpen;
 import com.huimv.eartag.service.IBaseFloorService;
+import com.huimv.eartag.service.IBasePigpenService;
 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;
 
@@ -20,13 +26,22 @@ import java.util.Map;
  * @since 2022-01-07
  */
 @RestController
-@RequestMapping("/base-floor")
+@RequestMapping("/baseFloor")
 public class BaseFloorController {
     @Autowired
     private IBaseFloorService baseFloorService;
 
+    @Autowired
+    private IBasePigpenService basePigpenService;
+
     @PostMapping("/add")
-    public Result add(@RequestBody BaseFloor baseFloor){
+    public Result add(@RequestBody BaseFloor baseFloor, HttpServletRequest request){
+
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+
+        baseFloor.setCreateTime(new Date());
+        baseFloor.setCreateUser(userId);
+
         baseFloorService.save(baseFloor);
         return new Result(10000,"添加成功",true);
     }
@@ -40,6 +55,12 @@ public class BaseFloorController {
 
     @GetMapping("/remove")
     public Result remove(@RequestParam(name = "ids") List<Integer> ids){
+
+        int sum = basePigpenService.count(new QueryWrapper<BasePigpen>().in("floor_id", ids));
+        if (sum > 0){
+            return new Result(10001,"栋舍下有房舍，删除失败",false);
+        }
+
         baseFloorService.removeByIds(ids);
         return new Result(10000,"删除成功",true);
     }
@@ -54,7 +75,7 @@ public class BaseFloorController {
     @GetMapping("/list")
     public Result page(@RequestParam(name = "farmId") Integer farmId){
         List<BaseFloor> farmList = baseFloorService.list(new QueryWrapper<BaseFloor>().eq("farm_id", farmId));
-        return new Result("")
+        return new Result(ResultCode.SUCCESS,farmList);
 
     }
 }

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

@@ -1,8 +1,21 @@
 package com.huimv.eartag.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+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.BasePigpen;
+import com.huimv.eartag.entity.CollectorRegister;
+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;
 
 /**
  * <p>
@@ -13,7 +26,58 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2022-01-07
  */
 @RestController
-@RequestMapping("/base-pigpen")
+@RequestMapping("/basePigpen")
 public class BasePigpenController {
+    @Autowired
+    private IBasePigpenService basePigpenService;
+
+    @Autowired
+    private ICollectorRegisterService collectorRegisterService;
+
+    @PostMapping("/add")
+    public Result add(@RequestBody BasePigpen basePigpen, HttpServletRequest request){
+
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+
+        basePigpen.setCreateTime(new Date());
+        basePigpen.setCreateUser(userId);
+        basePigpenService.save(basePigpen);
+        return new Result(10000,"添加成功",true);
+    }
+
+    @PostMapping("/update")
+    public Result update(@RequestBody BasePigpen basePigpen){
+
+        basePigpenService.updateById(basePigpen);
+        return new Result(10000,"修改成功",true);
+    }
+
+
+    @GetMapping("/remove")
+    public Result remove(@RequestParam(name = "ids") List<Integer> ids){
+
+        int sum = collectorRegisterService.count(new QueryWrapper<CollectorRegister>().in("pigpen_id", ids));
+        if (sum > 0){
+            return new Result(10001,"猪舍下有采集器，删除失败",false);
+        }
+
+        collectorRegisterService.removeByIds(ids);
+
+        basePigpenService.removeByIds(ids);
+        return new Result(10000,"删除成功",true);
+    }
+
+
+    @PostMapping("/page")
+    public Result page(@RequestBody Map map){
+        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));
+        return new Result(ResultCode.SUCCESS,farmList);
 
+    }
 }

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

@@ -0,0 +1,78 @@
+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.BasePigpen;
+import com.huimv.eartag.entity.CollectorRegister;
+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;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-01-07
+ */
+@RestController
+@RequestMapping("/collectorRegister")
+public class CollectorRegisterController {
+
+    @Autowired
+    private ICollectorRegisterService collectorRegisterService;
+
+    @PostMapping("/add")
+    public Result add(@RequestBody CollectorRegister collectorRegister){
+
+//        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+
+        collectorRegister.setRegisterTime(new Date());
+        collectorRegisterService.save(collectorRegister);
+        return new Result(10000,"添加成功",true);
+    }
+
+
+    @PostMapping("/update")
+    public Result update(@RequestBody  CollectorRegister collectorRegister){
+        collectorRegisterService.updateById(collectorRegister);
+        return new Result(10000,"修改成功",true);
+    }
+
+
+    @GetMapping("/remove")
+    public Result remove(@RequestParam(name = "ids") List<Integer> ids){
+        collectorRegisterService.removeByIds(ids);
+        return new Result(10000,"删除成功",true);
+    }
+
+
+    @PostMapping("/page")
+    public Result page(@RequestBody Map map){
+        return collectorRegisterService.pageAll(map);
+
+    }
+
+    @GetMapping("/list")
+    public Result page(@RequestParam(name = "farmId") Integer farmId){
+        List<CollectorRegister> farmList = collectorRegisterService.list(new QueryWrapper<CollectorRegister>().eq("farm_id", farmId));
+        return new Result(ResultCode.SUCCESS,farmList);
+
+    }
+
+    @GetMapping("/listCount")
+    public Result listCount(@RequestParam(name = "farmId") Integer farmId){
+
+        return collectorRegisterService.listCount(farmId);
+
+    }
+}

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

@@ -1,104 +0,0 @@
-/*
-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.eartag.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.sql.Date;
-
-/**
- * 栋舍表
- *
- * @author yinhao
- * @date 2021-08-17 14:00:42
- */
-@Data
-@TableName("base_equipment")
-public class BaseEquipment {
-
-    /**
-     * 主键
-     */
-    @TableId(type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 栋舍名称
-     */
-    private String equipmentName;
-
-    /**
-     * 牧场id
-     */
-    private Integer farmId;
-
-    /**
-     * 牧场名字
-     */
-    private Integer farmName;
-
-    /**
-     * 阶段
-     */
-    private String stage;
-
-    /**
-     * 猪舍温度
-     */
-    private Double equipmentTemp;
-
-    /**
-     * 注销
-     */
-    private Integer isLogout;
-
-    /**
-     * 异常
-     */
-    private Integer abnormal;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 创建人
-     */
-    private Integer createUser;
-
-
-
-
-
-
-
-}

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

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 
 
 @Data
@@ -22,12 +23,14 @@ public class BaseFarmInfo extends Model {
 
     private String farmName;
 
-    private LocalDateTime createTime;
+    private Date createTime;
 
     private Integer createUser;
 
     private String location;
 
+    private String frontLocation;
+
     //1屠宰，2养殖，3检疫
     private Integer type;
 

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

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -33,7 +34,7 @@ public class BaseFloor extends Model {
 
     private String farmName;
 
-    private LocalDateTime createTime;
+    private Date createTime;
 
     private Integer createUser;
 

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

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -39,7 +40,7 @@ public class BasePigpen extends Model {
 
     private Integer createUser;
 
-    private LocalDateTime createTime;
+    private Date createTime;
 
 
 }

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

@@ -0,0 +1,122 @@
+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-01-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class CollectorRegister extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录id(主键)
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 组织id
+     */
+    private Long orgId;
+
+    /**
+     * 组织名称
+     */
+    private String orgName;
+
+    private String countyCode;
+
+    /**
+     * 设备编码
+     */
+    private String deviceCode;
+
+    /**
+     * 盒子的芯片编码
+     */
+    private String registeCode;
+
+    /**
+     * 牧场编码
+     */
+    private String farmCode;
+
+    /**
+     * 牧场名称
+     */
+    private String farmName;
+
+    /**
+     * 动物种类
+     */
+    private Integer typeF;
+
+    /**
+     * 阶段
+     */
+    private Integer stage;
+
+    /**
+     * 猪舍id
+     */
+    private Integer pigpenId;
+
+    /**
+     * 栋舍名称
+     */
+    private String penName;
+
+    /**
+     * 单元id
+     */
+    private Integer unitId;
+
+    /**
+     * 单元名称
+     */
+    private String unitName;
+
+    /**
+     * 上传服务器地址
+     */
+    private String serverIp;
+
+    /**
+     * 端口
+     */
+    private Integer port;
+
+    /**
+     * 注册时间
+     */
+    private Date registerTime;
+
+    /**
+     * 最后上传时间
+     */
+    private LocalDateTime lastTime;
+
+    /**
+     * 0:正常,1:网络异常,2:采集异常,3:注销
+     */
+    private Integer canStatus;
+
+
+}

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

@@ -1,39 +0,0 @@
-/*
-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.eartag.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huimv.eartag.entity.BaseEquipment;
-import org.springframework.stereotype.Repository;
-
-/**
- * 栋舍表
- *
- * @author yinhao
- * @date 2021-08-17 14:00:42
- */
-@Repository
-public interface BaseEquipmentMapper extends BaseMapper<BaseEquipment> {
-}

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

@@ -0,0 +1,16 @@
+package com.huimv.eartag.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.eartag.entity.CollectorRegister;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-01-07
+ */
+public interface CollectorRegisterMapper extends BaseMapper<CollectorRegister> {
+
+}

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

@@ -1,43 +0,0 @@
-/*
-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.eartag.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.huimv.common.utils.Result;
-import com.huimv.eartag.entity.BaseEquipment;
-
-import java.util.Map;
-
-/**
- * 栋舍表service接口
- *
- * @author yinhao
- * @date 2021-08-17 14:00:42
- */
-public interface BaseEquipmentService extends IService<BaseEquipment> {
-
-
-    Result pageAll(Map map);
-}

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

@@ -1,8 +1,11 @@
 package com.huimv.eartag.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.common.utils.Result;
 import com.huimv.eartag.entity.BasePigpen;
 
+import java.util.Map;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +16,5 @@ import com.huimv.eartag.entity.BasePigpen;
  */
 public interface IBasePigpenService extends IService<BasePigpen> {
 
+    Result pageAll(Map map);
 }

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

@@ -0,0 +1,22 @@
+package com.huimv.eartag.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.common.utils.Result;
+import com.huimv.eartag.entity.CollectorRegister;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-01-07
+ */
+public interface ICollectorRegisterService extends IService<CollectorRegister> {
+
+    Result pageAll(Map map);
+
+    Result listCount(Integer farmId);
+}

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

@@ -1,60 +0,0 @@
-/*
-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.eartag.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.common.utils.Result;
-import com.huimv.common.utils.ResultCode;
-import com.huimv.eartag.entity.BaseEquipment;
-import com.huimv.eartag.mapper.BaseEquipmentMapper;
-import com.huimv.eartag.service.BaseEquipmentService;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-
-/**
- * 栋舍表service接口实现类
- *
- * @author yinhao
- * @date 2021-08-17 14:00:42
- */
-@Service
-public class BaseEquipmentServiceImpl extends ServiceImpl<BaseEquipmentMapper, BaseEquipment> implements BaseEquipmentService {
-
-
-    @Override
-    public Result pageAll(Map map) {
-        Integer current = (Integer)map.get("current");
-        Integer size = (Integer) map.get("size");
-        String searchName = (String) map.get("searchName");
-        QueryWrapper<BaseEquipment> wrapper = new QueryWrapper<>();
-        wrapper.like("butcher_name",searchName);
-        Page<BaseEquipment> 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/BaseFarmInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package com.huimv.eartag.service.impl;
 
 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;
@@ -28,9 +29,9 @@ public class BaseFarmInfoServiceImpl extends ServiceImpl<BaseFarmInfoMapper, Bas
     public Result pageAll(Map map) {
         Integer current = (Integer)map.get("current");
         Integer size = (Integer) map.get("size");
-        String searchName = (String) map.get("searchName");
+        String farmName = (String) map.get("farmName");
         QueryWrapper<BaseFarmInfo> wrapper = new QueryWrapper<>();
-        wrapper.like("butcher_name",searchName);
+        wrapper.like(StringUtils.isNotBlank(farmName),"farm_name",farmName);
         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,11 +1,17 @@
 package com.huimv.eartag.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.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import com.huimv.eartag.entity.BasePigpen;
 import com.huimv.eartag.mapper.BasePigpenMapper;
 import com.huimv.eartag.service.IBasePigpenService;
 import org.springframework.stereotype.Service;
 
+import java.util.Map;
+
 /**
  * <p>
  *  服务实现类
@@ -17,7 +23,15 @@ import org.springframework.stereotype.Service;
 @Service
 public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePigpen> implements IBasePigpenService {
 
-    
-    
-    
+    @Override
+    public Result pageAll(Map map) {
+        Integer current = (Integer)map.get("current");
+        Integer size = (Integer) map.get("size");
+        String searchName = (String) map.get("searchName");
+        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);
+    }
 }

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

@@ -0,0 +1,84 @@
+package com.huimv.eartag.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+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.BasePigpen;
+import com.huimv.eartag.entity.CollectorRegister;
+import com.huimv.eartag.mapper.CollectorRegisterMapper;
+import com.huimv.eartag.service.ICollectorRegisterService;
+import org.springframework.stereotype.Service;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2022-01-07
+ */
+@Service
+public class CollectorRegisterServiceImpl extends ServiceImpl<CollectorRegisterMapper, CollectorRegister> implements ICollectorRegisterService {
+
+
+    @Override
+    public Result pageAll(Map map) {
+        Integer current = (Integer)map.get("current");
+        Integer size = (Integer) map.get("size");
+        String searchName = (String) map.get("searchName");
+        String date =(String)map.get("registerTime");
+        String pigpenId =(String)map.get("pigpenId");
+        String stage =(String)map.get("stage");
+
+
+
+        QueryWrapper<CollectorRegister> wrapper = new QueryWrapper<>();
+        wrapper.like(StringUtils.isNotBlank(searchName),"device_code",searchName);
+        wrapper.eq("pigpen_id",pigpenId);
+        wrapper.eq("stage",stage);
+        //TODO 注册时间有BUG
+        wrapper.eq("register_time",date);
+
+
+        Page<CollectorRegister> page = page(new Page<>(current, size), wrapper);
+
+        return new Result(ResultCode.SUCCESS,page);
+    }
+
+    @Override
+    public Result listCount(Integer farmId) {
+
+
+        LambdaQueryWrapper<CollectorRegister> lambdaQuery = Wrappers.lambdaQuery();
+        lambdaQuery.in(CollectorRegister::getFarmCode, farmId);
+
+        Map<String, Integer> map = new LinkedHashMap<>();
+        map.put("total", count(lambdaQuery));
+
+        lambdaQuery.eq(CollectorRegister::getCanStatus, 0);
+        map.put("normal", count(lambdaQuery));
+
+        lambdaQuery.clear();
+        lambdaQuery.eq(CollectorRegister::getFarmCode, farmId);
+        lambdaQuery.ne(CollectorRegister::getCanStatus, 0);
+        map.put("abnormal", count(lambdaQuery));
+
+        lambdaQuery.clear();
+        lambdaQuery.eq(CollectorRegister::getFarmCode, farmId);
+        lambdaQuery.eq(CollectorRegister::getCanStatus, 3);
+        map.put("logout", count(lambdaQuery));
+
+        return  new Result(ResultCode.SUCCESS,map);
+
+    }
+}

huimv-goldpig/pom.xml

@@ -52,6 +52,11 @@
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
             <version>3.4.2</version>
@@ -61,11 +66,17 @@
             <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.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>-->
     </dependencies>
 
     <build>