523096025 hace 1 año
padre
commit
1c3dd09309

+ 1 - 1
huimv-eartag2-eartag/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 spring:
   application:
-    name: huimv-eartag2-eartag
+    name: huimv-eartag2-eartag2
   profiles:
     active: dev
   cloud:

+ 20 - 0
huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/controller/EartarFarmAllStatusController.java

@@ -0,0 +1,20 @@
+package com.huimv.eartag2.manage2.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-31
+ */
+@RestController
+@RequestMapping("/eartar-farm-all-status")
+public class EartarFarmAllStatusController {
+
+}

+ 16 - 0
huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/mapper/EartarFarmAllStatusMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag2.manage2.mapper;
+
+import com.huimv.eartag2.manage2.pojo.EartarFarmAllStatus;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-31
+ */
+public interface EartarFarmAllStatusMapper extends BaseMapper<EartarFarmAllStatus> {
+
+}

+ 61 - 0
huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/pojo/EartarFarmAllStatus.java

@@ -0,0 +1,61 @@
+package com.huimv.eartag2.manage2.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+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 java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("eartar_farm_all_status")
+public class EartarFarmAllStatus implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private Integer deviceTotal;
+
+    private Integer deviceOnline;
+
+    private Integer deviceOffline;
+
+    private Double deviceRate;
+
+    private Integer deviceCancel;
+
+    private Integer eartagTotal;
+
+    private Integer eartagOnline;
+
+    private Double eartagRate;
+
+    private String farmId;
+
+    private Date updateTime;
+
+    private LocalDate createDate;
+
+    @TableLogic
+    private Integer isDeleted;
+
+
+}

+ 16 - 0
huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/IEartarFarmAllStatusService.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag2.manage2.service;
+
+import com.huimv.eartag2.manage2.pojo.EartarFarmAllStatus;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-31
+ */
+public interface IEartarFarmAllStatusService extends IService<EartarFarmAllStatus> {
+
+}

+ 1 - 1
huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/EartagServiceImpl.java

@@ -70,7 +70,7 @@ public class EartagServiceImpl implements IEartagService {
             DateTime eartagOffTime = DateUtil.offsetMinute(now, -eartagOff);
             DateTime deviceOffTime = DateUtil.offsetMinute(now, -deviceOff);
             List<EartagEartagRegister2> eartagEartagRegister2s = eartagEartagRegister2Mapper.selectList(new QueryWrapper<EartagEartagRegister2>().eq("farm_id", farmCode).eq("live_status", 1).le("active_time", eartagOffTime));
-            List<EartagDeviceRegister> eartagDeviceRegisters = eartagDeviceRegisterMapper.selectList(new QueryWrapper<EartagDeviceRegister>().eq("farm_id", farmCode).eq("live_status", 1).le("active_time", deviceOffTime));
+            List<EartagDeviceRegister> eartagDeviceRegisters = eartagDeviceRegisterMapper.selectList(new QueryWrapper<EartagDeviceRegister>().eq("farm_id", farmCode).eq("active_status", 1).le("active_time", deviceOffTime));
             for (EartagEartagRegister2 eartagEartagRegister2 : eartagEartagRegister2s) {
                 //生成报警,并且设置为离线状态
 

+ 20 - 0
huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/EartarFarmAllStatusServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.eartag2.manage2.service.impl;
+
+import com.huimv.eartag2.manage2.pojo.EartarFarmAllStatus;
+import com.huimv.eartag2.manage2.mapper.EartarFarmAllStatusMapper;
+import com.huimv.eartag2.manage2.service.IEartarFarmAllStatusService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-31
+ */
+@Service
+public class EartarFarmAllStatusServiceImpl extends ServiceImpl<EartarFarmAllStatusMapper, EartarFarmAllStatus> implements IEartarFarmAllStatusService {
+
+}

+ 22 - 0
huimv-eartag2-manage2/src/main/resources/mapper/EartarFarmAllStatusMapper.xml

@@ -0,0 +1,22 @@
+<?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.EartarFarmAllStatusMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.manage2.pojo.EartarFarmAllStatus">
+        <id column="id" property="id" />
+        <result column="device_total" property="deviceTotal" />
+        <result column="device_online" property="deviceOnline" />
+        <result column="device_offline" property="deviceOffline" />
+        <result column="device_rate" property="deviceRate" />
+        <result column="device_cancel" property="deviceCancel" />
+        <result column="eartag_total" property="eartagTotal" />
+        <result column="eartag_online" property="eartagOnline" />
+        <result column="eartag_rate" property="eartagRate" />
+        <result column="farm_id" property="farmId" />
+        <result column="update_time" property="updateTime" />
+        <result column="create_date" property="createDate" />
+        <result column="is_deleted" property="isDeleted" />
+    </resultMap>
+
+</mapper>