2021/7/2 报警信息对接APP修改

huimv-smart-management/src/main/java/com/huimv/management/entity/WarningInfoEntity.java

@@ -91,4 +91,9 @@ public class WarningInfoEntity implements Serializable {
 	 */
 	private String verifyDescription;
 
+	/**
+	 * 确认时间
+	 */
+	private Date verifyTime;
+
 }

huimv-smart-management/src/main/java/com/huimv/management/entity/vo/WarningInfoVo.java

@@ -85,4 +85,9 @@ public class WarningInfoVo implements Serializable {
      * 确认描述
      */
     private String verifyDescription;
+
+    /**
+     * 确认时间
+     */
+    private Date verifyTime;
 }

huimv-smart-management/src/main/java/com/huimv/management/service/impl/HealthImmuneRecordServiceImpl.java

@@ -27,7 +27,7 @@ public class HealthImmuneRecordServiceImpl extends ServiceImpl<HealthImmuneRecor
         String eartag = (String)params.get("eartag");
 
         QueryWrapper<HealthImmuneRecordEntity> wrapper = new QueryWrapper<HealthImmuneRecordEntity>();
-        wrapper.eq(StringUtils.isNotBlank(farmId),"farm_id",farmId);
+        wrapper.eq(StringUtils.isNotBlank(farmId),"farm_id",Integer.parseInt(farmId));
         if (StringUtils.isNotBlank(eartag)){
             wrapper.like(StringUtils.isNotBlank(eartag),"pig_id",eartag);
         }

huimv-smart-management/src/main/java/com/huimv/management/service/impl/HealthIsolationRecordServiceImpl.java

@@ -24,7 +24,7 @@ public class HealthIsolationRecordServiceImpl extends ServiceImpl<HealthIsolatio
         String farmId = (String) params.get("formFarmId");
 
         QueryWrapper<HealthIsolationRecordEntity> wrapper = new QueryWrapper<HealthIsolationRecordEntity>();
-        wrapper.eq(StringUtils.isNotBlank(farmId),"farm_id",farmId);
+        wrapper.eq(StringUtils.isNotBlank(farmId),"farm_id",Integer.parseInt(farmId));
 
        String eartag = (String)params.get("eartag");
        wrapper.like(StringUtils.isNotBlank(eartag),"pig_code",eartag);

huimv-smart-management/src/main/java/com/huimv/management/service/impl/TestServiceImpl.java

@@ -23,6 +23,7 @@ public class TestServiceImpl extends ServiceImpl<TestDao, TestEntity> implements
                 new QueryWrapper<TestEntity>()
         );
 
+
         return new PageUtils(page);
     }
 

huimv-smart-management/src/main/java/com/huimv/management/service/impl/WarningInfoServiceImpl.java

@@ -9,6 +9,7 @@ import com.huimv.management.util.GetUserUtil;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 

huimv-smart-management/src/main/resources/mapper/management/WarningInfoDao.xml

@@ -35,7 +35,8 @@
           warn.now_value,
           warn.warning_time,
           warn.verify_user,
-          warn.verify_description
+          warn.verify_description,
+          warn.verify_time
         FROM mgt_warning_info warn
         LEFT JOIN mgt_farm farm ON warn.farm_id = farm.id
         LEFT JOIN mgt_pigsty pigsty ON warn.pigsty_id = pigsty.id