耳标平台

huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/controller/BaseFarmController.java

@@ -6,7 +6,7 @@ import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.manage2.pojo.BaseFarm;
 import com.huimv.eartag2.manage2.pojo.EartagData;
 import com.huimv.eartag2.manage2.service.BaseFarmService;
-import com.huimv.eartag2.manage2.service.EartagDataService;
+import com.huimv.eartag2.manage2.service.IEartagData2Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -69,7 +69,7 @@ public class BaseFarmController {
         return baseFarmService.list(httpServletRequest,paramsMap);
     }
     @Autowired
-    EartagDataService eartagData;
+    IEartagData2Service eartagData;
 
     @PostMapping("/listAll")
     public List<EartagData> listAll(HttpServletRequest httpServletRequest, @RequestBody Map<String,Integer> paramsMap){

huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/controller/EartagDataController.java

@@ -2,7 +2,7 @@ package com.huimv.eartag2.manage2.controller;
 
 
 import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.manage2.service.EartagDataService;
+import com.huimv.eartag2.manage2.service.IEartagData2Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -24,7 +24,7 @@ import java.util.Map;
 @RequestMapping("/eartagData2")
 public class EartagDataController {
     @Autowired
-    private EartagDataService eartagDataService;
+    private IEartagData2Service eartagDataService;
 
     @PostMapping("getEnvByTime")
     public Result getEnvByTime(@RequestBody Map<String,String> map){

huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/mapper/EartagData2Mapper.java

@@ -1,15 +1,16 @@
 package com.huimv.eartag2.manage2.mapper;
 
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.huimv.eartag2.manage2.pojo.EartagData;
-import com.huimv.eartag2.manage2.pojo.EartagData2;
 import com.huimv.eartag2.manage2.pojo.pojovo.EartagDataDto;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
+
 /**
  * <p>
  *  Mapper 接口
@@ -19,8 +20,8 @@ import java.util.List;
  * @since 2022-07-29
  */
 public interface EartagData2Mapper extends BaseMapper<EartagData> {
-    //
     List<EartagData> getEartagDataByEarmark(@Param("earmark") String earmark, @Param("recordCount") String recordCount);
 
     List<EartagDataDto> getAct(@Param(Constants.WRAPPER) QueryWrapper<EartagData> wrapper);
+
 }

huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/mapper/EartagDataMapper.java

@@ -1,16 +0,0 @@
-package com.huimv.eartag2.manage2.mapper;
-
-import com.huimv.eartag2.manage2.pojo.EartagData;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zn
- * @since 2022-07-18
- */
-public interface EartagDataMapper extends BaseMapper<EartagData> {
-
-}

huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/mapper/xml/EartagData2Mapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huimv.eartag2.manage2.mapper.EartagData2Mapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.eartag2.manage2.pojo.EartagData2">
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.manage2.pojo.EartagData">
         <id column="id" property="id" />
         <result column="cmd_header" property="cmdHeader" />
         <result column="device" property="device" />

huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/mapper/xml/EartagDataMapper.xml

@@ -1,32 +0,0 @@
-<?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.eartag2.manage2.mapper.EartagDataMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.eartag2.manage2.pojo.EartagData">
-        <id column="id" property="id" />
-        <result column="cmd_header" property="cmdHeader" />
-        <result column="device" property="device" />
-        <result column="earmark" property="earmark" />
-        <result column="bat" property="bat" />
-        <result column="ear_temp" property="earTemp" />
-        <result column="ear_temp1" property="earTemp1" />
-        <result column="env_temp" property="envTemp" />
-        <result column="env_temp1" property="envTemp1" />
-        <result column="act" property="act" />
-        <result column="act1" property="act1" />
-        <result column="signal1" property="signal1" />
-        <result column="ask_time" property="askTime" />
-        <result column="other" property="other" />
-        <result column="add_time" property="addTime" />
-        <result column="create_date" property="createDate" />
-        <result column="farm_id" property="farmId" />
-        <result column="ask_date" property="askDate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, cmd_header, device, earmark, bat, ear_temp, ear_temp1, env_temp, env_temp1, act, act1, signal1, ask_time, other, add_time, create_date, farm_id, ask_date
-    </sql>
-
-</mapper>

huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/pojo/EartagData.java

@@ -1,31 +1,33 @@
 package com.huimv.eartag2.manage2.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
  * 
  * </p>
  *
- * @author zn
- * @since 2022-07-18
+ * @author author
+ * @since 2022-07-29
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+//@TableName("eartag_data")
 public class EartagData implements Serializable {
 
-    private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
-      @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
      private Integer id;
 
     @TableLogic
@@ -42,6 +44,7 @@ public class EartagData implements Serializable {
     private Integer earTemp;
 
     private Float earTemp1;
+    private Float earTemp2;
 
     private Integer envTemp;
 
@@ -53,19 +56,20 @@ public class EartagData implements Serializable {
 
     private Integer signal1;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private Date askTime;
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private String  askTime;
 
     private String other;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date addTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date createDate;
 
     private String farmId;
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date askDate;
 
 

huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/pojo/EartagData2.java

@@ -1,79 +0,0 @@
-package com.huimv.eartag2.manage2.pojo;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author author
- * @since 2022-07-29
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eartag_data2")
-public class EartagData2 implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-     private Integer id;
-
-    @TableLogic
-    private  byte isDeleted;
-
-    private String cmdHeader;
-
-    private String device;
-
-    private String earmark;
-
-    private Integer bat;
-
-    private Integer earTemp;
-
-    private Float earTemp1;
-    private Float earTemp2;
-
-    private Integer envTemp;
-
-    private Float envTemp1;
-
-    private Long act;
-
-    private Long act1;
-
-    private Integer signal1;
-
-//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private String  askTime;
-
-    private String other;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private Date addTime;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private Date createDate;
-
-    private String farmId;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private Date askDate;
-
-
-}

huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/EartagDataService.java

@@ -1,20 +1,20 @@
-package com.huimv.eartag2.manage2.service;
-
-import com.huimv.eartag2.manage2.pojo.EartagData;
-import com.huimv.eartag2.common.utils.Result;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.Map;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zn
- * @since 2022-07-18
- */
-public interface EartagDataService extends IService<EartagData> {
-
-    Result getEnvByTime(Map<String, String> map);
-}
+//package com.huimv.eartag2.manage2.service;
+//
+//import com.huimv.eartag2.manage2.pojo.EartagData;
+//import com.huimv.eartag2.common.utils.Result;
+//import com.baomidou.mybatisplus.extension.service.IService;
+//
+//import java.util.Map;
+//
+///**
+// * <p>
+// *  服务类
+// * </p>
+// *
+// * @author zn
+// * @since 2022-07-18
+// */
+//public interface EartagDataService extends IService<EartagData> {
+//
+//    Result getEnvByTime(Map<String, String> map);
+//}

huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/IEartagData2Service.java

@@ -1,7 +1,7 @@
 package com.huimv.eartag2.manage2.service;
 
+
 import com.huimv.eartag2.manage2.pojo.EartagData;
-import com.huimv.eartag2.manage2.pojo.EartagData2;
 import com.huimv.eartag2.common.utils.Result;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -9,6 +9,7 @@ import java.text.ParseException;
 import java.util.List;
 import java.util.Map;
 
+
 /**
  * <p>
  *  服务类
@@ -18,7 +19,6 @@ import java.util.Map;
  * @since 2022-07-29
  */
 public interface IEartagData2Service extends IService<EartagData> {
-
     List<EartagData> getEartagData(String earmark) throws ParseException;
 
     Result getEnvByTime(Map<String, String> map);
@@ -36,4 +36,5 @@ public interface IEartagData2Service extends IService<EartagData> {
     Result getEnvByTimePanan(Map<String, String> map);
 
     Result getEnvLast(Map<String, String> map);
+
 }

huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/EartagData2ServiceImpl.java

@@ -4,9 +4,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.huimv.eartag2.manage2.mapper.EartagDataMapper;
 import com.huimv.eartag2.manage2.pojo.EartagData;
-import com.huimv.eartag2.manage2.pojo.EartagData2;
 import com.huimv.eartag2.manage2.pojo.pojovo.EartagDataDto;
 import com.huimv.eartag2.manage2.pojo.pojovo.QingShanData;
 import com.huimv.eartag2.common.utils.Result;
@@ -34,7 +32,7 @@ import java.util.*;
  * @since 2022-07-29
  */
 @Service
-public class EartagData2ServiceImpl extends ServiceImpl<EartagDataMapper, EartagData> implements IEartagData2Service {
+public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, EartagData> implements IEartagData2Service {
 
     @Resource
     private EartagData2Mapper eartagData2Mapper;
@@ -88,7 +86,8 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagDataMapper, Eartag
             wrapper.between("add_time", startDate, endDate);
         }
         wrapper.orderByAsc("add_time");
-        List<EartagData> list = this.list(wrapper);
+
+        List<EartagData> list = eartagData2Mapper.selectList(wrapper);
         return new Result(ResultCode.SUCCESS, list);
     }
 
@@ -112,20 +111,6 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagDataMapper, Eartag
         }
         wrapper.orderByAsc("add_time");
         List<EartagData> list = this.list(wrapper);
-        //用户数据
-//        if (user.getIsUser() == 0) {
-//            for (EartagData2 eartagData2 : list) {
-//                Float earTemp1 = eartagData2.getEarTemp1();
-//                if (earTemp1 > 40) {
-//                    eartagData2.setEarTemp1(40F);
-//                }
-//
-//                if (earTemp1 < 30) {
-//                    eartagData2.setEarTemp1(30F);
-//                }
-//
-//            }
-//        }
         return new Result(ResultCode.SUCCESS, list);
     }
 
@@ -138,15 +123,10 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagDataMapper, Eartag
 //        List<EartagData2> eartagData2List = eartagData2Mapper.getEartagDataByEarmark(earmark, recordCount);
         QueryWrapper<EartagData> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("earmark",earmark);
-        queryWrapper.between("add_time",startDate +" 00:00:00",endDate+" 23:59:59");
+        queryWrapper.between("add_time",startDate,endDate);
         queryWrapper.orderByDesc("add_time");
         List<EartagData> eartagData2List = eartagData2Mapper.selectList(queryWrapper);
-
         if (eartagData2List.size() == 0) {
-            boolean earmark1 = eartagEartagRegister2Mapper.exists(new QueryWrapper<EartagEartagRegister2>().eq("earmark", earmark));
-            if (earmark1){
-                return new Result(ResultCode.SUCCESS, new ArrayList());
-            }
             return new Result(10009, "数据为空", false);
         } else {
             List<EartagData> newList = new ArrayList();
@@ -240,4 +220,6 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagDataMapper, Eartag
         List<EartagData> eartagData2List = this.list(new QueryWrapper<EartagData>().eq("earmark", earmark).orderByDesc("add_time").last(String.format("limit %s", quantity)));
         return new Result(ResultCode.SUCCESS,eartagData2List);
     }
+
+
 }

huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/EartagDataServiceImpl.java

@@ -1,56 +0,0 @@
-package com.huimv.eartag2.manage2.service.impl;
-
-import cn.hutool.core.date.DateUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.huimv.eartag2.manage2.pojo.EartagData;
-import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.common.utils.ResultCode;
-import com.huimv.eartag2.manage2.mapper.EartagDataMapper;
-import com.huimv.eartag2.manage2.service.EartagDataService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author zn
- * @since 2022-07-18
- */
-@Service
-public class EartagDataServiceImpl extends ServiceImpl<EartagDataMapper, EartagData> implements EartagDataService {
-
-    @Override
-    public Result getEnvByTime(Map<String, String> map) {
-        String earmark = map.get("earmark");
-        String startDate = map.get("startDate");
-        String endDate = map.get("endDate");
-        Date now = new Date();
-
-        if (StringUtils.isBlank(earmark)){
-            return new Result(10001,"请选择耳标",false);
-        }
-        QueryWrapper<EartagData> wrapper = new QueryWrapper<>();
-        wrapper.eq("earmark",earmark);
-        if (StringUtils.isBlank(startDate)){
-//            wrapper.ge("ask_time", DateUtil.beginOfDay(now));
-            wrapper.ge("add_time", DateUtil.beginOfDay(now));
-        }else {
-//            wrapper.between("ask_time",startDate,endDate);
-            wrapper.between("add_time",startDate,endDate);
-        }
-
-        wrapper.orderByAsc("add_time");
-        List<EartagData> list = this.list(wrapper);
-
-        return new Result(ResultCode.SUCCESS,list);
-    }
-
-
-}

huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/EartagEartagRegisterServiceImpl.java

@@ -5,13 +5,13 @@ import cn.hutool.core.util.ObjectUtil;
 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.huimv.eartag2.manage2.mapper.EartagData2Mapper;
 import com.huimv.eartag2.manage2.pojo.EartagData;
 import com.huimv.eartag2.manage2.pojo.EartagDeviceRegister;
 import com.huimv.eartag2.manage2.pojo.EartagEartagRegister;
 import com.huimv.eartag2.manage2.pojo.pojovo.EartagEartagRegisterVo;
 import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.common.utils.ResultCode;
-import com.huimv.eartag2.manage2.mapper.EartagDataMapper;
 import com.huimv.eartag2.manage2.mapper.EartagDeviceRegisterMapper;
 import com.huimv.eartag2.manage2.mapper.EartagEartagRegisterMapper;
 import com.huimv.eartag2.manage2.service.IEartagEartagRegisterService;
@@ -39,7 +39,7 @@ public class EartagEartagRegisterServiceImpl extends ServiceImpl<EartagEartagReg
     private EartagDeviceRegisterMapper eartagDeviceRegisterMapper;
 
     @Autowired
-    private EartagDataMapper eartagDataMapper;
+    private EartagData2Mapper eartagDataMapper;
 
 
     @Override