增加了报警记录

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/controller/DeviceOffLineAlarmController.java

@@ -0,0 +1,84 @@
+ package com.huimv.acquisition.controller;
+
+import java.util.Arrays;
+import java.util.Map;
+
+import com.huimv.acquisition.entity.DeviceOffLineAlarmEntity;
+import com.huimv.acquisition.result.R;
+import com.huimv.acquisition.service.DeviceOffLineAlarmService;
+import com.huimv.acquisition.utils.PageUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+
+
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+@RestController
+@RequestMapping("management/deviceofflinealarm")
+public class DeviceOffLineAlarmController {
+    @Autowired
+    private DeviceOffLineAlarmService deviceOffLineAlarmService;
+
+    /**
+     * 列表
+     */
+    @RequestMapping("/list")
+    public R list(@RequestParam Map<String, Object> params){
+        PageUtils page = deviceOffLineAlarmService.queryPage(params);
+
+        return R.ok().put("page", page);
+    }
+
+
+    /**
+     * 信息
+     */
+    @RequestMapping("/info/{id}")
+    public R info(@PathVariable("id") Integer id){
+		DeviceOffLineAlarmEntity deviceOffLineAlarm = deviceOffLineAlarmService.getById(id);
+
+        return R.ok().put("deviceOffLineAlarm", deviceOffLineAlarm);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    public R save(@RequestBody DeviceOffLineAlarmEntity deviceOffLineAlarm){
+		deviceOffLineAlarmService.save(deviceOffLineAlarm);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    public R update(@RequestBody DeviceOffLineAlarmEntity deviceOffLineAlarm){
+		deviceOffLineAlarmService.updateById(deviceOffLineAlarm);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    public R delete(@RequestBody Integer[] ids){
+		deviceOffLineAlarmService.removeByIds(Arrays.asList(ids));
+
+        return R.ok();
+    }
+
+}

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/controller/DeviceSendMessageAlarmController.java

@@ -0,0 +1,84 @@
+ package com.huimv.acquisition.controller;
+
+import java.util.Arrays;
+import java.util.Map;
+
+import com.huimv.acquisition.entity.DeviceSendMessageAlarmEntity;
+import com.huimv.acquisition.result.R;
+import com.huimv.acquisition.service.DeviceSendMessageAlarmService;
+import com.huimv.acquisition.utils.PageUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+
+
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+@RestController
+@RequestMapping("management/devicesendmessagealarm")
+public class DeviceSendMessageAlarmController {
+    @Autowired
+    private DeviceSendMessageAlarmService deviceSendMessageAlarmService;
+
+    /**
+     * 列表
+     */
+    @RequestMapping("/list")
+    public R list(@RequestParam Map<String, Object> params){
+        PageUtils page = deviceSendMessageAlarmService.queryPage(params);
+
+        return R.ok().put("page", page);
+    }
+
+
+    /**
+     * 信息
+     */
+    @RequestMapping("/info/{id}")
+    public R info(@PathVariable("id") Integer id){
+		DeviceSendMessageAlarmEntity deviceSendMessageAlarm = deviceSendMessageAlarmService.getById(id);
+
+        return R.ok().put("deviceSendMessageAlarm", deviceSendMessageAlarm);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    public R save(@RequestBody DeviceSendMessageAlarmEntity deviceSendMessageAlarm){
+		deviceSendMessageAlarmService.save(deviceSendMessageAlarm);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    public R update(@RequestBody DeviceSendMessageAlarmEntity deviceSendMessageAlarm){
+		deviceSendMessageAlarmService.updateById(deviceSendMessageAlarm);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    public R delete(@RequestBody Integer[] ids){
+		deviceSendMessageAlarmService.removeByIds(Arrays.asList(ids));
+
+        return R.ok();
+    }
+
+}

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/controller/EartagTempAlamController.java

@@ -0,0 +1,84 @@
+ package com.huimv.acquisition.controller;
+
+import java.util.Arrays;
+import java.util.Map;
+
+import com.huimv.acquisition.entity.EartagTempAlamEntity;
+import com.huimv.acquisition.result.R;
+import com.huimv.acquisition.service.EartagTempAlamService;
+import com.huimv.acquisition.utils.PageUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+
+
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+@RestController
+@RequestMapping("management/eartagtempalarm")
+public class EartagTempAlamController {
+    @Autowired
+    private EartagTempAlamService eartagTempAlamService;
+
+    /**
+     * 列表
+     */
+    @RequestMapping("/list")
+    public R list(@RequestParam Map<String, Object> params){
+        PageUtils page = eartagTempAlamService.queryPage(params);
+
+        return R.ok().put("page", page);
+    }
+
+
+    /**
+     * 信息
+     */
+    @RequestMapping("/info/{id}")
+    public R info(@PathVariable("id") Integer id){
+		EartagTempAlamEntity eartagTempAlam = eartagTempAlamService.getById(id);
+
+        return R.ok().put("eartagTempAlam", eartagTempAlam);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    public R save(@RequestBody EartagTempAlamEntity eartagTempAlam){
+		eartagTempAlamService.save(eartagTempAlam);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    public R update(@RequestBody EartagTempAlamEntity eartagTempAlam){
+		eartagTempAlamService.updateById(eartagTempAlam);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    public R delete(@RequestBody Integer[] ids){
+		eartagTempAlamService.removeByIds(Arrays.asList(ids));
+
+        return R.ok();
+    }
+
+}

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/controller/EnvTempAlarmController.java

@@ -0,0 +1,83 @@
+ package com.huimv.acquisition.controller;
+
+import java.util.Arrays;
+import java.util.Map;
+
+import com.huimv.acquisition.entity.EnvTempAlarmEntity;
+import com.huimv.acquisition.result.R;
+import com.huimv.acquisition.service.EnvTempAlarmService;
+import com.huimv.acquisition.utils.PageUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+@RestController
+@RequestMapping("management/envtempalarm")
+public class EnvTempAlarmController {
+    @Autowired
+    private EnvTempAlarmService envTempAlarmService;
+
+    /**
+     * 列表
+     */
+    @RequestMapping("/list")
+    public R list(@RequestParam Map<String, Object> params){
+        PageUtils page = envTempAlarmService.queryPage(params);
+
+        return R.ok().put("page", page);
+    }
+
+
+    /**
+     * 信息
+     */
+    @RequestMapping("/info/{id}")
+    public R info(@PathVariable("id") Integer id){
+		EnvTempAlarmEntity envTempAlarm = envTempAlarmService.getById(id);
+
+        return R.ok().put("envTempAlarm", envTempAlarm);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    public R save(@RequestBody EnvTempAlarmEntity envTempAlarm){
+		envTempAlarmService.save(envTempAlarm);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    public R update(@RequestBody EnvTempAlarmEntity envTempAlarm){
+		envTempAlarmService.updateById(envTempAlarm);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    public R delete(@RequestBody Integer[] ids){
+		envTempAlarmService.removeByIds(Arrays.asList(ids));
+
+        return R.ok();
+    }
+
+}

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/entity/DeviceOffLineAlarmEntity.java

@@ -0,0 +1,72 @@
+package com.huimv.acquisition.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+@Data
+@TableName("device_off_line_alarm")
+public class DeviceOffLineAlarmEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 
+	 */
+	private String deviceCode;
+	/**
+	 * 
+	 */
+	private Integer deviceSignalValue;
+	/**
+	 * 
+	 */
+	private String farmCode;
+	/**
+	 * 
+	 */
+	private String farmName;
+	/**
+	 * 
+	 */
+	private Integer pigpenId;
+	/**
+	 * 
+	 */
+	private String pigpenName;
+	/**
+	 * 
+	 */
+	private Integer unitId;
+	/**
+	 * 
+	 */
+	private String unitName;
+	/**
+	 * 
+	 */
+	private String remark;
+	/**
+	 * 
+	 */
+	private Date createTime;
+	/**
+	 * 
+	 */
+	private Integer alarmKind;
+
+}

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/entity/DeviceSendMessageAlarmEntity.java

@@ -0,0 +1,68 @@
+package com.huimv.acquisition.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+@Data
+@TableName("device_send_message_alarm")
+public class DeviceSendMessageAlarmEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 
+	 */
+	private String deviceSendMessageAlarm;
+	/**
+	 * 
+	 */
+	private Integer alarmKind;
+	/**
+	 * 
+	 */
+	private String farmCode;
+	/**
+	 * 
+	 */
+	private String deviceCoed;
+	/**
+	 * 
+	 */
+	private String farmName;
+	/**
+	 * 
+	 */
+	private Integer pigpenId;
+	/**
+	 * 
+	 */
+	private String pigpenName;
+	/**
+	 * 
+	 */
+	private Integer unitId;
+	/**
+	 * 
+	 */
+	private String unitName;
+	/**
+	 * 
+	 */
+	private String remark;
+
+}

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/entity/EartagTempAlamEntity.java

@@ -0,0 +1,76 @@
+package com.huimv.acquisition.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+@Data
+@TableName("eartag_temp_alam")
+public class EartagTempAlamEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 
+	 */
+	private Double eartagTempValue;
+	/**
+	 * 
+	 */
+	private Integer alarmKind;
+	/**
+	 * 
+	 */
+	private Date createTime;
+	/**
+	 * 
+	 */
+	private String farmCode;
+	/**
+	 * 
+	 */
+	private String deviceCoed;
+	/**
+	 * 
+	 */
+	private String farmName;
+	/**
+	 * 
+	 */
+	private Integer farmId;
+	/**
+	 * 
+	 */
+	private Integer pigpenId;
+	/**
+	 * 
+	 */
+	private String pigpenName;
+	/**
+	 * 
+	 */
+	private Integer unitId;
+	/**
+	 * 
+	 */
+	private String unitName;
+	/**
+	 * 
+	 */
+	private String remark;
+
+}

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/entity/EnvTempAlarmEntity.java

@@ -0,0 +1,76 @@
+package com.huimv.acquisition.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+@Data
+@TableName("env_temp_alarm")
+public class EnvTempAlarmEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 
+	 */
+	private Double envTempValue;
+	/**
+	 * 
+	 */
+	private Integer alarmKind;
+	/**
+	 * 
+	 */
+	private Date createTime;
+	/**
+	 * 
+	 */
+	private String farmCode;
+	/**
+	 * 
+	 */
+	private String deviceCoed;
+	/**
+	 * 
+	 */
+	private String farmName;
+	/**
+	 * 
+	 */
+	private Integer farmId;
+	/**
+	 * 
+	 */
+	private Integer pigpenId;
+	/**
+	 * 
+	 */
+	private String pigpenName;
+	/**
+	 * 
+	 */
+	private Integer unitId;
+	/**
+	 * 
+	 */
+	private String unitName;
+	/**
+	 * 
+	 */
+	private String remark;
+
+}

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/entity/SowRankTableEntity.java

@@ -52,7 +52,7 @@ public class SowRankTableEntity implements Serializable {
 	/**
 	 * 母猪msy
 	 */
-	private Integer sowMsy;
+	private Double sowMsy;
 	/**
 	 * 排名
 	 */
@@ -72,7 +72,7 @@ public class SowRankTableEntity implements Serializable {
 	/**
 	 * 完成度
 	 */
-	private Integer finishPercent;
+	private String finishPercent;
 	/**
 	 * 备注
 	 */

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/mapper/DeviceOffLineAlarmDao.java

@@ -0,0 +1,18 @@
+package com.huimv.acquisition.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.acquisition.entity.DeviceOffLineAlarmEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+@Mapper
+
+public interface DeviceOffLineAlarmDao extends BaseMapper<DeviceOffLineAlarmEntity> {
+	
+}

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/mapper/DeviceSendMessageAlarmDao.java

@@ -0,0 +1,18 @@
+package com.huimv.acquisition.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.acquisition.entity.DeviceSendMessageAlarmEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+@Mapper
+public interface DeviceSendMessageAlarmDao extends BaseMapper<DeviceSendMessageAlarmEntity> {
+	
+}

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/mapper/EartagTempAlamDao.java

@@ -0,0 +1,18 @@
+package com.huimv.acquisition.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.acquisition.entity.EartagTempAlamEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+@Mapper
+public interface EartagTempAlamDao extends BaseMapper<EartagTempAlamEntity> {
+	
+}

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/mapper/EnvTempAlarmDao.java

@@ -0,0 +1,17 @@
+package com.huimv.acquisition.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.acquisition.entity.EnvTempAlarmEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+@Mapper
+public interface EnvTempAlarmDao extends BaseMapper<EnvTempAlarmEntity> {
+	
+}

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/service/DeviceOffLineAlarmService.java

@@ -0,0 +1,24 @@
+package com.huimv.acquisition.service;
+
+
+
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.acquisition.entity.DeviceOffLineAlarmEntity;
+import com.huimv.acquisition.utils.PageUtils;
+
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+public interface DeviceOffLineAlarmService extends IService<DeviceOffLineAlarmEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/service/DeviceSendMessageAlarmService.java

@@ -0,0 +1,22 @@
+package com.huimv.acquisition.service;
+
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.acquisition.entity.DeviceSendMessageAlarmEntity;
+import com.huimv.acquisition.utils.PageUtils;
+
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+public interface DeviceSendMessageAlarmService extends IService<DeviceSendMessageAlarmEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/service/EartagTempAlamService.java

@@ -0,0 +1,22 @@
+package com.huimv.acquisition.service;
+
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.acquisition.entity.EartagTempAlamEntity;
+import com.huimv.acquisition.utils.PageUtils;
+
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+public interface EartagTempAlamService extends IService<EartagTempAlamEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/service/EnvTempAlarmService.java

@@ -0,0 +1,21 @@
+package com.huimv.acquisition.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.acquisition.entity.EnvTempAlarmEntity;
+import com.huimv.acquisition.utils.PageUtils;
+
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+public interface EnvTempAlarmService extends IService<EnvTempAlarmEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/service/impl/DeviceOffLineAlarmServiceImpl.java

@@ -0,0 +1,34 @@
+package com.huimv.acquisition.service.impl;
+
+import com.huimv.acquisition.entity.DeviceOffLineAlarmEntity;
+import com.huimv.acquisition.mapper.DeviceOffLineAlarmDao;
+import com.huimv.acquisition.service.DeviceOffLineAlarmService;
+import com.huimv.acquisition.utils.PageUtils;
+import com.huimv.acquisition.utils.Query;
+import org.springframework.stereotype.Service;
+import java.util.Map;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+@Service("deviceOffLineAlarmService")
+public class DeviceOffLineAlarmServiceImpl extends ServiceImpl<DeviceOffLineAlarmDao, DeviceOffLineAlarmEntity> implements DeviceOffLineAlarmService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        IPage<DeviceOffLineAlarmEntity> page = this.page(
+                new Query<DeviceOffLineAlarmEntity>().getPage(params),
+                new QueryWrapper<DeviceOffLineAlarmEntity>()
+        );
+
+        return new PageUtils(page);
+    }
+
+}

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/service/impl/DeviceSendMessageAlarmServiceImpl.java

@@ -0,0 +1,35 @@
+package com.huimv.acquisition.service.impl;
+
+import com.huimv.acquisition.entity.DeviceSendMessageAlarmEntity;
+import com.huimv.acquisition.mapper.DeviceSendMessageAlarmDao;
+import com.huimv.acquisition.service.DeviceSendMessageAlarmService;
+import com.huimv.acquisition.utils.PageUtils;
+import com.huimv.acquisition.utils.Query;
+import org.springframework.stereotype.Service;
+import java.util.Map;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+@Service("deviceSendMessageAlarmService")
+public class DeviceSendMessageAlarmServiceImpl extends ServiceImpl<DeviceSendMessageAlarmDao, DeviceSendMessageAlarmEntity> implements DeviceSendMessageAlarmService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        IPage<DeviceSendMessageAlarmEntity> page = this.page(
+                new Query<DeviceSendMessageAlarmEntity>().getPage(params),
+                new QueryWrapper<DeviceSendMessageAlarmEntity>()
+        );
+
+        return new PageUtils(page);
+    }
+
+}

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/service/impl/EartagTempAlamServiceImpl.java

@@ -0,0 +1,34 @@
+package com.huimv.acquisition.service.impl;
+
+import com.huimv.acquisition.entity.EartagTempAlamEntity;
+import com.huimv.acquisition.mapper.EartagTempAlamDao;
+import com.huimv.acquisition.service.EartagTempAlamService;
+import com.huimv.acquisition.utils.PageUtils;
+import com.huimv.acquisition.utils.Query;
+import org.springframework.stereotype.Service;
+import java.util.Map;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+@Service("eartagTempAlamService")
+public class EartagTempAlamServiceImpl extends ServiceImpl<EartagTempAlamDao, EartagTempAlamEntity> implements EartagTempAlamService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        IPage<EartagTempAlamEntity> page = this.page(
+                new Query<EartagTempAlamEntity>().getPage(params),
+                new QueryWrapper<EartagTempAlamEntity>()
+        );
+
+        return new PageUtils(page);
+    }
+
+}

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/service/impl/EnvTempAlarmServiceImpl.java

@@ -0,0 +1,34 @@
+package com.huimv.acquisition.service.impl;
+
+import com.huimv.acquisition.entity.EnvTempAlarmEntity;
+import com.huimv.acquisition.mapper.EnvTempAlarmDao;
+import com.huimv.acquisition.service.EnvTempAlarmService;
+import com.huimv.acquisition.utils.PageUtils;
+import com.huimv.acquisition.utils.Query;
+import org.springframework.stereotype.Service;
+import java.util.Map;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+@Service("envTempAlarmService")
+public class EnvTempAlarmServiceImpl extends ServiceImpl<EnvTempAlarmDao, EnvTempAlarmEntity> implements EnvTempAlarmService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        IPage<EnvTempAlarmEntity> page = this.page(
+                new Query<EnvTempAlarmEntity>().getPage(params),
+                new QueryWrapper<EnvTempAlarmEntity>()
+        );
+
+        return new PageUtils(page);
+    }
+
+}

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/socket/eartagrecive/service/impl/ReceivePackageSerivce.java

@@ -1,8 +1,6 @@
 package com.huimv.acquisition.socket.eartagrecive.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.conditions.query.LambdaQueryWrapper;;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.huimv.acquisition.entity.*;
 import com.huimv.acquisition.mapper.CollectorRegisterDao;
@@ -14,6 +12,7 @@ import com.huimv.acquisition.service.EartagRegisterService;
 import com.huimv.acquisition.service.MovePigpenService;
 import com.huimv.acquisition.socket.eartagrecive.util.DateUtil;
 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 lombok.extern.slf4j.Slf4j;
@@ -158,7 +157,6 @@ public class ReceivePackageSerivce {
                eartagRegisterEntity2.setStage(null);
                eartagRegisterService.save(eartagRegisterEntity2);//存储一条还没有处理的数据
            }
-
            //第一次上传的数据----注册表肯定没有这只耳标的信息
            eartagDataEntity.setDayAge (0);  //佩标日龄----默认值，第一次有数据上传就是默认值
            eartagDataEntity.setDayAge2(50); //日龄----默认第50天佩戴耳标
@@ -173,12 +171,13 @@ public class ReceivePackageSerivce {
         if(!lastEarTagDate.getDeviceCode().equals(device_code)){
             LambdaQueryWrapper<EartagRegisterEntity> wrapper4 = Wrappers.lambdaQuery();
             wrapper4.eq(EartagRegisterEntity::getEartagNo, eartag_no );
-            EartagRegisterEntity eartagRegisterEntity1 = eartagRegisterDao.selectOne(wrapper4);//查到注册信息
-            if ( eartagRegisterEntity1.getDeviceCode().equals(null)  ) {//如果耳标注册表的绑定机器ID为空就不存储转舍信息
+            EartagRegisterEntity eartagRegisterEntity1 = eartagRegisterDao.selectOne(wrapper4);//查到注册信息--有可能为空的
+            String deviceCode = eartagRegisterEntity1.getDeviceCode();
+            if ( StringUtilsWork.isNotBlank(deviceCode) ) {//如果耳标注册表的绑定机器ID为空就不存储转舍信息
                 System.out.println("之前=" + lastEarTagDate.getDeviceCode() + "现在" + device_code);
                 System.out.println(lastEarTagDate.getDeviceCode().equals(device_code));
                  //上一阶段的
-                if( lastEarTagDate.getStage() != collectorRegisterEntity.getStage()  ) {  //不相等，---判断阶段是否相同--阶段也不相同--增加转舍信息
+                if(!lastEarTagDate.getStage().equals(collectorRegisterEntity.getStage())) {  //不相等，---判断阶段是否相同--阶段也不相同--增加转舍信息
 
                     MovePigpenEntity movePigpenEntity = new MovePigpenEntity();
                     movePigpenEntity.setDeviceCode(device_code);

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/timmertask/provideNewRankData.java

@@ -99,7 +99,7 @@ public class provideNewRankData {
         lambdaQuery3.orderByDesc(SowRankTableEntity::getId).last("limit 1");
         SowRankTableEntity sowRankTableEntity1 = sowRankTableDao.selectOne(lambdaQuery3);
 
-        Map map = new HashMap<>(    );
+        Map<String ,Object> map = new HashMap<>(   );
         for (DailyTabulateDataEntity dailyTabulateDataEnt : dailyTabulateDataEntit) {
             b++;
             map.put(dailyTabulateDataEnt.getFarmCode(),b);
@@ -114,8 +114,8 @@ public class provideNewRankData {
                 sowRankTableEntity.setCreate_time(new Date());
                 a++;
                 sowRankTableEntity.setRank(String.valueOf(a));
-                sowRankTableEntity.setSowLivestock(dailyTabulateDataEnt.getSowStock());//总存栏量
-                sowRankTableEntity.setOutStockCount(1);
+                sowRankTableEntity.setSowLivestock(dailyTabulateDataEnt.getStockTotal());//总存栏量--
+                sowRankTableEntity.setOutStockCount(1);//
                 sowRankTableService.save(sowRankTableEntity);
                 //if(data.getTime().after(startTime)&data.getTime().before(DateUtilsPublic.addDateHour(startTime,1))){
             }
@@ -139,10 +139,41 @@ public class provideNewRankData {
 
                     sowRankTableEntity.setCreate_time(new Date());
                     sowRankTableService.updateById(sowRankTableEntity );
-                    System.out.println("新相互据为"+sowRankTableEntity);
+                    System.out.println("新的排名数据为"+sowRankTableEntity);
+                    map.remove(sowRankTableEntity.getFarmCode());
                    // sowRankTableService.save();
                 }
+                //如果不包含，说明猪舍不参与排名，，删除
+                //sowRankTableService.removeById(sowRankTableEntity.getId());
             }
+           if(!map.isEmpty()){
+               //操作结束。如果Map还有数据，就进行新增操作
+               for (Map.Entry<String , Object> entry : map.entrySet()) {
+
+                   SowRankTableEntity sowRankTableEntity = new SowRankTableEntity();
+                   sowRankTableEntity.setFarmCode(entry.getKey());
+                   sowRankTableEntity.setCreate_time(new Date());
+                   a++;
+                   sowRankTableEntity.setRank(String.valueOf(a));
+                   for (DailyTabulateDataEntity dailyTabulateDataEntity : dailyTabulateDataEntit) {
+                       if(dailyTabulateDataEntity.getFarmCode().equals(entry.getKey()));
+                       sowRankTableEntity.setSowLivestock(dailyTabulateDataEntity.getSowStock());//总存栏量
+                   }
+
+                   sowRankTableEntity.setOutStockCount(1);
+                   sowRankTableService.save(sowRankTableEntity);
+
+
+                   System.out.println("Key = " + entry.getKey() + ", Value = " + entry.getValue());
+               }
+
+
+           }
+
+
+
+
+
 
         }
         //对于新增的如何处理，不包括的有如何处理