修改耳标bug

huimv-smart-management/src/main/java/com/huimv/management/controller/EartagDateController.java

@@ -9,8 +9,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.huimv.management.entity.EartagDateEntity;
-import com.huimv.management.service.EartagDateService;
+import com.huimv.management.entity.EartagDataEntity;
+import com.huimv.management.service.EartagDataService;
 import com.huimv.common.utils.PageUtils;
 import com.huimv.common.utils.R;
 
@@ -26,23 +26,23 @@ import static java.lang.Thread.sleep;
  */
 @RestController
 @RequestMapping("management/eartagdate")
-public class EartagDateController {
+public class EartagDataController {
     @Autowired
-    private EartagDateService eartagDateService;
+    private EartagDataService eartagDataService;
 
     /**
      * 列表
      */
     @RequestMapping("/list")
     public R list(@RequestParam Map<String, Object> params) throws InterruptedException {
-        PageUtils page = eartagDateService.queryPage(params);
+        PageUtils page = eartagDataService.queryPage(params);
         return R.ok().put("page", page);
     }
 
 
      @RequestMapping("/searchDateByCondition")
      public R listby(@RequestParam Map<String, Object> params) throws InterruptedException {
-         Map ResultMap = eartagDateService.queryPageBytimeAndEartag(params);
+         Map ResultMap = eartagDataService.queryPageBytimeAndEartag(params);
          return R.ok().put("page", ResultMap);
      }
 
@@ -54,7 +54,7 @@ public class EartagDateController {
      */
     @RequestMapping("/info/{id}")
     public R info(@PathVariable("id") Integer id){
-		EartagDateEntity eartagDate = eartagDateService.getById(id);
+		EartagDataEntity eartagDate = eartagDataService.getById(id);
 
         return R.ok().put("eartagDate", eartagDate);
     }
@@ -63,8 +63,8 @@ public class EartagDateController {
      * 保存
      */
     @RequestMapping("/save")
-    public R save(@RequestBody EartagDateEntity eartagDate){
-		eartagDateService.save(eartagDate);
+    public R save(@RequestBody EartagDataEntity eartagDate){
+        eartagDataService.save(eartagDate);
 
         return R.ok();
     }
@@ -73,8 +73,8 @@ public class EartagDateController {
      * 修改
      */
     @RequestMapping("/update")
-    public R update(@RequestBody EartagDateEntity eartagDate){
-		eartagDateService.updateById(eartagDate);
+    public R update(@RequestBody EartagDataEntity eartagDate){
+        eartagDataService.updateById(eartagDate);
 
         return R.ok();
     }
@@ -84,7 +84,7 @@ public class EartagDateController {
      */
     @RequestMapping("/delete")
     public R delete(@RequestBody Integer[] ids){
-		eartagDateService.removeByIds(Arrays.asList(ids));
+        eartagDataService.removeByIds(Arrays.asList(ids));
 
         return R.ok();
     }
@@ -93,7 +93,7 @@ public class EartagDateController {
      @RequestMapping("/getTemperatureCurve")
      public R getTemperatureCurve(@RequestParam Map<String, Object> params){
 
-         return R.ok().put("data", eartagDateService.getTemperatureCurve(params));
+         return R.ok().put("data", eartagDataService.getTemperatureCurve(params));
      }
 
 }

huimv-smart-management/src/main/java/com/huimv/management/controller/HealthMedicalRecordController.java

@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.huimv.common.exception.RRException;
@@ -82,7 +83,16 @@ public class HealthMedicalRecordController {
         if (yearPigBaseEntity == null) {
             throw new RRException("耳标号为：" + earTag + " 的耳标信息不存在，请检查输入的耳标号是否有误！");
         }
-		healthMedicalRecordService.save(healthMedicalRecord);
+
+        String eartag = healthMedicalRecord.getPigId();
+        LambdaUpdateWrapper<YearPigBaseEntity> wrapper = Wrappers.lambdaUpdate();
+
+        wrapper.eq(YearPigBaseEntity::getEartag,eartag);
+        wrapper.set(YearPigBaseEntity::getHealthStatus,false);
+        yearPigBaseService.update(wrapper);
+
+
+        healthMedicalRecordService.save(healthMedicalRecord);
 
         return R.ok();
     }

huimv-smart-management/src/main/java/com/huimv/management/controller/YearPigBaseController.java

@@ -4,6 +4,8 @@ import java.lang.reflect.InvocationTargetException;
 import java.text.NumberFormat;
 import java.util.*;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huimv.common.exception.RRException;
 import com.huimv.management.entity.UnitEntity;
 import com.huimv.management.entity.vo.CountOut;
 import com.huimv.management.service.UnitService;
@@ -130,14 +132,26 @@ public class YearPigBaseController {
     //批量出栏
     @RequestMapping("/such")
     public R such(@RequestBody Integer[] ids){
+//        for (Integer id : ids) {
+//            YearPigBaseEntity yearPigBaseEntity = yearPigBaseService.getOne(Wrappers.<YearPigBaseEntity>lambdaQuery().eq(YearPigBaseEntity::getId, id));
+//            if (yearPigBaseEntity == null) {
+//                throw new RRException("耳标号为：" + id + " 的耳标信息不存在，请检查输入的耳标号是否有误！");
+//            }
+//        }
 
         yearPigBaseService.such(ids);
         return R.ok();
     }
 
-     //批量出栏
      @RequestMapping("/suchApp")
      public R suchApp(String[] ids){
+         for (String id : ids) {
+             YearPigBaseEntity yearPigBaseEntity = yearPigBaseService.getOne(Wrappers.<YearPigBaseEntity>lambdaQuery().eq(YearPigBaseEntity::getEartag, id));
+             if (yearPigBaseEntity == null) {
+                 throw new RRException("耳标号为：" + id + " 的耳标信息不存在，请检查输入的耳标号是否有误！");
+             }
+         }
+
          yearPigBaseService.suchApp(ids);
          return R.ok();
      }
@@ -263,4 +277,20 @@ public class YearPigBaseController {
          return R.ok();
      }
 
+     /**
+      * 根据耳标查询
+      */
+     @RequestMapping("/findByEartag")
+     public R findByEartag(@RequestBody Map<String,String> map){
+         String eartag = map.get("eartag");
+         String[] split = eartag.split(",");
+         String farmId = map.get("farmId");
+         if (StringUtils.isBlank(farmId)){
+             throw new RRException("请选择牧场");
+         }
+         List list = yearPigBaseService.findByEartag(split,Integer.parseInt(farmId));
+
+         return R.ok().put("data",list);
+     }
+
  }

huimv-smart-management/src/main/java/com/huimv/management/dao/EartagDateDao.java

@@ -1,11 +1,8 @@
 package com.huimv.management.dao;
 
-import com.huimv.management.entity.EartagDateEntity;
+import com.huimv.management.entity.EartagDataEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
 
 /**
  * 
@@ -15,7 +12,7 @@ import java.util.List;
  * @date 2021-06-21 10:00:18
  */
 @Mapper
-public interface EartagDateDao extends BaseMapper<EartagDateEntity> {
+public interface EartagDataDao extends BaseMapper<EartagDataEntity> {
 
 
 

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

@@ -15,8 +15,8 @@ import lombok.Data;
  * @date 2021-06-21 10:00:18
  */
 @Data
-@TableName("eartag_date")
-public class EartagDateEntity implements Serializable {
+@TableName("eartag_data")
+public class EartagDataEntity implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	/**

huimv-smart-management/src/main/java/com/huimv/management/service/EartagDateService.java

@@ -2,10 +2,8 @@ package com.huimv.management.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.common.utils.PageUtils;
-import com.huimv.management.entity.EartagDateEntity;
+import com.huimv.management.entity.EartagDataEntity;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -15,7 +13,7 @@ import java.util.Map;
  * @email yinhao@163.com
  * @date 2021-06-21 10:00:18
  */
-public interface EartagDateService extends IService<EartagDateEntity> {
+public interface EartagDataService extends IService<EartagDataEntity> {
 
     PageUtils queryPage(Map<String, Object> params);
 

huimv-smart-management/src/main/java/com/huimv/management/service/YearPigBaseService.java

@@ -75,5 +75,7 @@ public interface YearPigBaseService extends IService<YearPigBaseEntity> {
     PageUtils listLairage(Map<String, Object> params);
 
     void deleteLairage(List<Integer> asList);
+
+    List findByEartag(String[] ids,Integer id);
 }
 

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

@@ -3,7 +3,6 @@ package com.huimv.management.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -18,22 +17,22 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.common.utils.PageUtils;
 import com.huimv.common.utils.Query;
 
-import com.huimv.management.dao.EartagDateDao;
-import com.huimv.management.entity.EartagDateEntity;
-import com.huimv.management.service.EartagDateService;
+import com.huimv.management.dao.EartagDataDao;
+import com.huimv.management.entity.EartagDataEntity;
+import com.huimv.management.service.EartagDataService;
 
 
-@Service("eartagDateService")
-public class EartagDateServiceImpl extends ServiceImpl<EartagDateDao, EartagDateEntity> implements EartagDateService {
+@Service("eartagDataService")
+public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagDataEntity> implements EartagDataService {
 
     @Autowired
-    private EartagDateDao eartagDateDao;
+    private EartagDataDao eartagDataDao;
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
-        IPage<EartagDateEntity> page = this.page(
-                new Query<EartagDateEntity>().getPage(params),
-                new QueryWrapper<EartagDateEntity>()
+        IPage<EartagDataEntity> page = this.page(
+                new Query<EartagDataEntity>().getPage(params),
+                new QueryWrapper<EartagDataEntity>()
         );
 
         return new PageUtils(page);
@@ -63,15 +62,15 @@ public class EartagDateServiceImpl extends ServiceImpl<EartagDateDao, EartagDate
             e.printStackTrace();
         }
 
-          LambdaQueryWrapper<EartagDateEntity> lambdaQuery = Wrappers.lambdaQuery();
-          lambdaQuery.eq(EartagDateEntity::getEartagId,eartag);
+          LambdaQueryWrapper<EartagDataEntity> lambdaQuery = Wrappers.lambdaQuery();
+          lambdaQuery.eq(EartagDataEntity::getEartagId,eartag);
            //过滤时间
-          lambdaQuery.between(EartagDateEntity::getCreateTime,startTime, endTime);
+          lambdaQuery.between(EartagDataEntity::getCreateTime,startTime, endTime);
 
-          List<EartagDateEntity> eartagDateEntities = baseMapper.selectList(lambdaQuery);
+          List<EartagDataEntity> eartagDateEntities = baseMapper.selectList(lambdaQuery);
 
-        List<EartagDateEntity> list = new ArrayList();
-        for (EartagDateEntity data : eartagDateEntities) {
+        List<EartagDataEntity> list = new ArrayList();
+        for (EartagDataEntity data : eartagDateEntities) {
 
             Date times = data.getCreateTime();
             if (startTime.before(times) && endTime.after(times)){
@@ -85,7 +84,7 @@ public class EartagDateServiceImpl extends ServiceImpl<EartagDateDao, EartagDate
         List environmenttempList = new ArrayList();
         List sleeptime = new ArrayList();
 
-        for (EartagDateEntity data : list) {
+        for (EartagDataEntity data : list) {
             timeList.add(fmt.format(data.getCreateTime()));
             tempList.add(data.getEartagTemp());
             if (data.getBoxId() == null) {
@@ -113,17 +112,17 @@ public class EartagDateServiceImpl extends ServiceImpl<EartagDateDao, EartagDate
         String startTime = (String)params.get("startTime");
         String endTime = (String)params.get("endTime");
 
-        LambdaQueryWrapper<EartagDateEntity> lambdaQuery = Wrappers.lambdaQuery();
+        LambdaQueryWrapper<EartagDataEntity> lambdaQuery = Wrappers.lambdaQuery();
 
-        lambdaQuery.eq(StringUtils.isNotBlank(eartag),EartagDateEntity::getEartagId,eartag);
-        lambdaQuery.le(StringUtils.isNotBlank(endTime),EartagDateEntity::getCreateTime,endTime);
-        lambdaQuery.ge(StringUtils.isNotBlank(startTime),EartagDateEntity::getCreateTime,startTime);
+        lambdaQuery.eq(StringUtils.isNotBlank(eartag), EartagDataEntity::getEartagId,eartag);
+        lambdaQuery.le(StringUtils.isNotBlank(endTime), EartagDataEntity::getCreateTime,endTime);
+        lambdaQuery.ge(StringUtils.isNotBlank(startTime), EartagDataEntity::getCreateTime,startTime);
 
-        List<EartagDateEntity> eartagDateEntities = baseMapper.selectList(lambdaQuery);
+        List<EartagDataEntity> eartagDateEntities = baseMapper.selectList(lambdaQuery);
 
         List timeList = new ArrayList();
         List dataList = new ArrayList();
-        for (EartagDateEntity eartagDateEntity : eartagDateEntities) {
+        for (EartagDataEntity eartagDateEntity : eartagDateEntities) {
             timeList.add(eartagDateEntity.getCreateTime());
             dataList.add(eartagDateEntity.getEartagTemp());
         }

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

@@ -386,7 +386,7 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
             entity.setOperatorUsername(username);
             logEntityList.add(entity);
 
-            yearPigBaseEntity.setId(oldEntity.getPigstyId());
+            yearPigBaseEntity.setId(oldEntity.getId());
             yearPigBaseEntity.setUnitId(unitId);
             yearPigBaseEntity.setPigstyId(unitEntity.getPigstyId());
             yearPigBaseEntity.setPeriodId(unitEntity.getCurrentPeriodId());
@@ -583,4 +583,16 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
 
         pigBaseDao.deleteBatchIds(asList);
     }
+
+    @Override
+    public List findByEartag(String[] ids,Integer farmId) {
+        LambdaQueryWrapper<YearPigBaseEntity> wrapper = Wrappers.lambdaQuery();
+        if(ids != null && ids.length > 0){
+            wrapper.in(YearPigBaseEntity::getEartag,ids);
+        }
+        wrapper.eq(YearPigBaseEntity::getFarmId,farmId);
+
+
+        return pigBaseDao.selectList(wrapper);
+    }
 }

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

@@ -1,10 +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.management.dao.EartagDateDao">
+<mapper namespace="com.huimv.management.dao.EartagDataDao">
 
 	<!-- 可根据自己的需求，是否要使用 -->
-    <resultMap type="com.huimv.management.entity.EartagDateEntity" id="eartagDateMap">
+    <resultMap type="com.huimv.management.entity.EartagDataEntity" id="eartagDataMap">
         <result property="id" column="id"/>
         <result property="messageHead" column="message_head"/>
         <result property="boxId" column="box_id"/>