配置

huimv-eartag2-common/src/main/java/com/huimv/eartag2/common/dao/repo/EartarFarmAllStatusRepo.java

@@ -1,7 +1,8 @@
 package com.huimv.eartag2.common.dao.repo;
 
-import com.huimv.eartag2.common.dao.entity.EartagEartagRegisterEntity;
+
 import com.huimv.eartag2.common.dao.entity.EartarFarmAllStatusEntity;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;

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

@@ -0,0 +1,16 @@
+package com.huimv.eartag2.manage.mapper;
+
+import com.huimv.eartag2.manage.pojo.EartagData;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author newspaper
+ * @since 2024-03-28
+ */
+public interface EartagDataMapper extends BaseMapper<EartagData> {
+
+}

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

@@ -0,0 +1,142 @@
+package com.huimv.eartag2.manage.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author newspaper
+ * @since 2024-03-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("eartag_data")
+public class EartagData implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 命令头
+     */
+    @TableField("cmd_header")
+    private String cmdHeader;
+
+    /**
+     * 采集器ID
+     */
+    @TableField("device")
+    private String device;
+
+    /**
+     * 耳标号
+     */
+    @TableField("earmark")
+    private String earmark;
+
+    /**
+     * 电池电量
+     */
+    @TableField("bat")
+    private Integer bat;
+
+    /**
+     * 耳标温度
+     */
+    @TableField("ear_temp")
+    private Integer earTemp;
+
+    /**
+     * 耳标温度
+     */
+    @TableField("ear_temp1")
+    private Float earTemp1;
+
+    /**
+     * 环境温度
+     */
+    @TableField("env_temp")
+    private Integer envTemp;
+
+    /**
+     * 环境温度
+     */
+    @TableField("env_temp1")
+    private Float envTemp1;
+
+    /**
+     * 运动量
+     */
+    @TableField("act")
+    private Integer act;
+
+    /**
+     * 运动量
+     */
+    @TableField("act1")
+    private Integer act1;
+
+    /**
+     * 信号强度
+     */
+    @TableField("signal1")
+    private Integer signal1;
+
+    /**
+     * 采集时间
+     */
+    @TableField("ask_time")
+    private String askTime;
+
+    /**
+     * 预留字段
+     */
+    @TableField("other")
+    private String other;
+
+    /**
+     * 入库时间
+     */
+    @TableField("add_time")
+    private LocalDateTime addTime;
+
+    /**
+     * 牧场ID
+     */
+    @TableField("create_date")
+    private LocalDate createDate;
+
+    /**
+     * 创建日期
+     */
+    @TableField("farm_id")
+    private String farmId;
+
+    /**
+     * 采集日期
+     */
+    @TableField("ask_date")
+    private LocalDate askDate;
+
+    /**
+     * 耳面温度
+     */
+    @TableField("ear_temp2")
+    private Float earTemp2;
+
+
+}

huimv-eartag2-manage/src/main/java/com/huimv/eartag2/manage/service/IEartagDataService.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag2.manage.service;
+
+import com.huimv.eartag2.manage.pojo.EartagData;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author newspaper
+ * @since 2024-03-28
+ */
+public interface IEartagDataService extends IService<EartagData> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.huimv.eartag2.manage.service.impl;
+
+import com.huimv.eartag2.manage.pojo.EartagData;
+import com.huimv.eartag2.manage.mapper.EartagDataMapper;
+import com.huimv.eartag2.manage.service.IEartagDataService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author newspaper
+ * @since 2024-03-28
+ */
+@Service
+public class EartagDataServiceImpl extends ServiceImpl<EartagDataMapper, EartagData> implements IEartagDataService {
+
+}

huimv-eartag2-manage/src/main/java/com/huimv/eartag2/manage/service/impl/EartagServiceImpl.java

@@ -3,9 +3,13 @@ package com.huimv.eartag2.manage.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.huimv.eartag2.common.dao.entity.*;
 import com.huimv.eartag2.common.dao.repo.*;
 import com.huimv.eartag2.common.utils.*;
+import com.huimv.eartag2.manage.mapper.EartagDataMapper;
+import com.huimv.eartag2.manage.pojo.EartagData;
 import com.huimv.eartag2.manage.service.IEartagService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +48,8 @@ public class EartagServiceImpl implements IEartagService {
     private EartarFarmAllStatusRepo farmAllStatusRepo;
     @Autowired
     private EartagDeviceEartagCountRepo deviceEartagCountRepo;
+    @Autowired
+    private EartagDataMapper eartagDataMapper;
 
     /**
      * @Method : listAllEartagFlow
@@ -580,83 +586,14 @@ public class EartagServiceImpl implements IEartagService {
      */
     @Override
     public Result listEartagFlowByEarmarkAndTodayInPager(String earmark, Integer pageNo, Integer pageSize, String createDate, String deviceCode) throws ParseException {
-        System.out.println("earmark>>" + earmark);
-        System.out.println("pageNo>>" + pageNo);
-        System.out.println("pageSize>>" + pageSize);
-        System.out.println("createDate>>" + createDate);
-        System.out.println("deviceCode>>" + deviceCode);
-        //
-        Specification<EartagDataEntity> sf = (Specification<EartagDataEntity>) (root, criteriaQuery, criteriaBuilder) -> {
-            //
-            List<Predicate> predList = new ArrayList<>();
-            //earmark
-            if (null != earmark && earmark.trim().length() > 0) {
-                predList.add(criteriaBuilder.equal(root.get("earmark").as(String.class), earmark));
-            }
-            //createDate
-            if (null != createDate && createDate.trim().length() > 0) {
-                try {
-                    predList.add(criteriaBuilder.equal(root.get("createDate").as(Date.class), new Date(new DateUtil().parseDateTextToLong(createDate))));
-                } catch (ParseException e) {
-                    e.printStackTrace();
-                }
-            }
-            //deviceCode
-            if (null != deviceCode && deviceCode.trim().length() > 0) {
-                predList.add(criteriaBuilder.equal(root.get("device").as(String.class), deviceCode));
-            }
-            Predicate[] pred = new Predicate[predList.size()];
-            Predicate and = criteriaBuilder.and(predList.toArray(pred));
-            criteriaQuery.where(and);
-            List<Order> orders = new ArrayList<>();
-            orders.add(criteriaBuilder.desc(root.get("id")));
-            return criteriaQuery.orderBy(orders).getRestriction();
-        };
-        Pageable pageable = PageRequest.of(pageNo - 1, pageSize);
-        Page<EartagDataEntity> pageEartagData = eartagDataRepo.findAll(sf, pageable);
-        JSONObject outDataJo = new JSONObject();
-        outDataJo.put("pageable", pageEartagData.getPageable());
-        outDataJo.put("last", pageEartagData.isLast());
-        outDataJo.put("totalElements", pageEartagData.getTotalElements());
-        outDataJo.put("totalPages", pageEartagData.getTotalPages());
-        outDataJo.put("number", pageEartagData.getNumber());
-        outDataJo.put("size", pageEartagData.getSize());
-        outDataJo.put("sort", pageEartagData.getSort());
-        outDataJo.put("numberOfElements", pageEartagData.getNumberOfElements());
-        outDataJo.put("first", pageEartagData.isFirst());
-        outDataJo.put("empty", pageEartagData.isEmpty());
-        List<EartagDataEntity> dataEntityList = pageEartagData.getContent();
-        System.out.println("## dataEntityList.size>>" + dataEntityList.size());
-        JSONArray outJa = new JSONArray();
-        outDataJo.put("content", outJa);
-        DateUtil dateUtil = new DateUtil();
-        for (EartagDataEntity eartagDataEntity : dataEntityList) {
-//            System.out.println(">>"+deviceRegisterEntity.toString());
-//            Map map = JSON.parseObject(JSONObject.toJSONString(deviceRegisterEntity),Map.class);
-//            System.out.println("map>>"+map.toString());
-            JSONObject outJo = new JSONObject();
-            outJa.add(outJo);
-            outJo.put("id", eartagDataEntity.getId());
-            outJo.put("cmdHeader", eartagDataEntity.getCmdHeader());
-            outJo.put("device", eartagDataEntity.getDevice());
-            outJo.put("earmark", eartagDataEntity.getEarmark());
-            outJo.put("bat", eartagDataEntity.getBat());
-            outJo.put("earTemp", eartagDataEntity.getEarTemp());
-            outJo.put("earTemp1", eartagDataEntity.getEarTemp1());
-            outJo.put("envTemp", eartagDataEntity.getEnvTemp());
-            outJo.put("envTemp1", eartagDataEntity.getEnvTemp1());
-            outJo.put("act", eartagDataEntity.getAct());
-            outJo.put("act1", eartagDataEntity.getAct1());
-            outJo.put("signal1", eartagDataEntity.getSignal1());
-            outJo.put("askTime", eartagDataEntity.getAskTime());
-            outJo.put("other", eartagDataEntity.getOther());
-            outJo.put("addTime", dateUtil.formatDatetimeText(eartagDataEntity.getAddTime()));
-            outJo.put("createDate", eartagDataEntity.getCreateDate());
-            outJo.put("farmId", eartagDataEntity.getFarmId());
-        }
-
-        return new Result(ResultCode.SUCCESS, outDataJo);
-//        return new Result(ResultCode.SUCCESS, pageEartagData);
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<EartagData> page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(pageNo,pageSize);
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<EartagData> eartagDataPage = eartagDataMapper.selectPage(page,
+                new QueryWrapper<EartagData>().lambda()
+                        .eq(EartagData::getEarmark, earmark)
+                        .eq(EartagData::getCreateDate, createDate)
+                        .eq(StringUtils.isNotBlank(deviceCode), EartagData::getDevice, deviceCode)
+                        .orderByDesc(EartagData::getAskTime));
+        return new Result(ResultCode.SUCCESS, eartagDataPage);
     }
 
     /**

huimv-eartag2-manage/src/main/resources/mapper/EartagDataMapper.xml

@@ -0,0 +1,10 @@
+<?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.manage.mapper.EartagDataMapper">
+
+    <!-- 通用查询结果列 -->
+    <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, ear_temp2
+    </sql>
+
+</mapper>