金猪售猪记录

huimv-goldpig/huimv-goldpig-admin/src/main/java/com/huimv/admin/config/InterceptorConfig.java

@@ -21,6 +21,6 @@ public class InterceptorConfig implements WebMvcConfigurer {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(jwtInterceptor()).
-                excludePathPatterns("/my/*");
+                excludePathPatterns("/my/*","/imagedpig-huimv/img/*");
     }
 }

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/controller/BasePigpenController.java

@@ -49,7 +49,7 @@ public class BasePigpenController {
 
         BaseFarmInfo byId = baseFarmInfoService.getById(farmId);
 
-        basePigpen.setType(byId.getType());
+        basePigpen.setTypeF(byId.getType());
         basePigpenService.save(basePigpen);
         return new Result(10000,"添加成功",true);
     }

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/controller/BizFirstInspecEartagController.java

@@ -5,14 +5,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author astupidcoder
- * @since 2022-03-03
- */
+
 @RestController
 @RequestMapping("/bizFirstInspecEartag")
 public class BizFirstInspecEartagController {

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/controller/BizInspectionPhotoController.java

@@ -29,15 +29,28 @@ public class BizInspectionPhotoController {
     private IBizInspectionPhotoService bizInspectionPhotoService;
 
     @PostMapping("/addInspection")
-    public Result addInspection( HttpServletRequest request, MultipartFile[] files,
+    public Result addInspection( HttpServletRequest request, @RequestParam(name = "failes",required = false) MultipartFile[] files,
                                  @RequestParam(name ="farmId") String farmId,
                                  @RequestParam(name ="batchNo") String batchNo,
-                                 @RequestParam(name = "eartagNos")String eartagNos,
-                                 @RequestParam(name = "inspecStatus") Integer inspecStatus){
+                                 @RequestParam(name = "inspecStatus") Integer inspecStatus,
+                                 @RequestParam(name = "inspecRremark",required = false) String inspecRremark,
+                                 @RequestParam(name = "inspecRealNum") Integer inspecRealNum){
 
 
+        return bizInspectionPhotoService.addInspection(request,files,farmId,batchNo,inspecStatus,inspecRremark,inspecRealNum);
 
-        return bizInspectionPhotoService.addInspection(request,files,farmId,batchNo,eartagNos,inspecStatus);
+    }
+
+    @PostMapping("/addBatch")
+    public Result addBatch( HttpServletRequest request, @RequestParam(name = "failes",required = false) MultipartFile[] files,
+                            @RequestParam(name ="farmId") String farmId,
+                            @RequestParam(name ="batchNo") String batchNo,
+                            @RequestParam(name = "inspecStatus") Integer inspecStatus,
+                            @RequestParam(name = "inspecRremark",required = false) String inspecRremark,
+                            @RequestParam(name = "inspecRealNum") Integer inspecRealNum){
+
+
+        return bizInspectionPhotoService.addBatch(request,files,farmId,batchNo,inspecStatus,inspecRremark,inspecRealNum);
 
     }
 

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/controller/BizNspectionController.java

@@ -5,14 +5,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author astupidcoder
- * @since 2022-03-03
- */
+
 @RestController
 @RequestMapping("/bizNspection")
 public class BizNspectionController {

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/controller/BizSellPigApplyController.java

@@ -65,5 +65,24 @@ public class BizSellPigApplyController {
     }
 
 
+    //屠宰
+    @GetMapping("/getBatchCollect")
+    public Result getBatchCollect(@RequestParam(name = "farmId") String farmId){
+        return   iBizSellPigApplyService.getBatchCollect(farmId);
+    }
+
+    @PostMapping("/getBatchRecord")
+    public Result getBatchRecord(@RequestBody Map<String,String> map){
+        return   iBizSellPigApplyService.getBatchRecord(map);
+    }
+
+
+    @PostMapping("/batchCheck")
+    public Result batchCheck(@RequestBody Map<String,String> map){
+        return   iBizSellPigApplyService.batchCheck(map);
+    }
+
+
+
 
 }

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/entity/BasePigpen.java

@@ -43,6 +43,8 @@ public class BasePigpen extends Model {
 
     private Integer tempAnomaly;
 
+    private Integer typeF;
+
     private Object children;
 
     private Integer stage;

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/entity/BizFirstInspecEartag.java

@@ -1,5 +1,7 @@
 package com.huimv.eartag.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.time.LocalDateTime;
 import java.util.Date;
@@ -23,6 +25,7 @@ public class BizFirstInspecEartag extends Model {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     private String farmId;

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/entity/BizSecondInspecEartag.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -36,7 +38,7 @@ public class BizSecondInspecEartag extends Model {
     /**
      * 添加时间
      */
-    private LocalDateTime createTime;
+    private Date createTime;
 
     /**
      * 批次编号

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/entity/BizSellPigApply.java

@@ -123,4 +123,23 @@ public class BizSellPigApply extends Model {
     private Date butcherTime;
 
 
+
+    private Integer inspecRealNum;
+
+
+    private Integer inspecAutoNum;
+
+
+    private String inspecRemark;
+
+
+    private Integer butcherRealNum;
+
+
+    private Integer butcherAutoNum;
+
+
+    private String butcherRemark;
+
+
 }

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/mapper/BizSecondInspecEartagMapper.java

@@ -2,15 +2,10 @@ package com.huimv.eartag.mapper;
 
 import com.huimv.eartag.entity.BizSecondInspecEartag;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
 
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author astupidcoder
- * @since 2022-03-03
- */
+
+@Repository
 public interface BizSecondInspecEartagMapper extends BaseMapper<BizSecondInspecEartag> {
 
 }

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/service/IBizInspectionPhotoService.java

@@ -19,5 +19,7 @@ import java.util.Map;
 public interface IBizInspectionPhotoService extends IService<BizInspectionPhoto> {
 
 
-    Result addInspection(HttpServletRequest request, MultipartFile[] files, String farmId,String batchNo,String eartagNos,Integer inspecStatus);
+    Result addInspection(HttpServletRequest request, MultipartFile[] files, String farmId,String batchNo,Integer inspecStatus,String inspecRremark,Integer inspecRealNum);
+
+    Result addBatch(HttpServletRequest request, MultipartFile[] files, String farmId,String batchNo,Integer inspecStatus,String inspecRremark,Integer inspecRealNum);
 }

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/service/IBizSellPigApplyService.java

@@ -28,4 +28,10 @@ public interface IBizSellPigApplyService extends IService<BizSellPigApply> {
     Result getInspecRecord(Map<String,String> map);
 
     Result inspecCheck(Map<String,String> map);
+
+    Result getBatchCollect(String farmId);
+
+    Result getBatchRecord(Map<String, String> map);
+
+    Result batchCheck(Map<String, String> map);
 }

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/service/impl/BizInspectionPhotoServiceImpl.java

@@ -2,18 +2,13 @@ package com.huimv.eartag.service.impl;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
-import com.huimv.eartag.entity.BizFirstInspecEartag;
-import com.huimv.eartag.entity.BizInspectionPhoto;
-import com.huimv.eartag.entity.BizSellPigApply;
-import com.huimv.eartag.entity.EartagRegisterEntity;
-import com.huimv.eartag.mapper.BizFirstInspecEartagMapper;
-import com.huimv.eartag.mapper.BizInspectionPhotoMapper;
-import com.huimv.eartag.mapper.BizSellPigApplyMapper;
-import com.huimv.eartag.mapper.EartagRegisterMapper;
+import com.huimv.eartag.entity.*;
+import com.huimv.eartag.mapper.*;
 import com.huimv.eartag.service.EartagRegisterService;
 import com.huimv.eartag.service.IBizInspectionPhotoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -27,6 +22,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -41,43 +37,37 @@ public class BizInspectionPhotoServiceImpl extends ServiceImpl<BizInspectionPhot
 
    private static final String PICURL = "/opt/goldpig-huimv/img";
 
-   @Autowired
-    private BizInspectionPhotoMapper bizInspectionPhotoMapper;
 
 
     @Autowired
     private BizFirstInspecEartagMapper bizFirstInspecEartagMapper;
 
     @Autowired
+    private BizSecondInspecEartagMapper bizSecondInspecEartagMapper;
+
+    @Autowired
     private BizSellPigApplyMapper bizSellPigApplyMapper;
 
     @Autowired
     private EartagRegisterMapper eartagRegisterMapper;
 
+    @Autowired
+    private BizSellPigApplyEartagMapper bizSellPigApplyEartagMapper;
+
     @Override
     @Transactional
-    public Result addInspection(HttpServletRequest request, MultipartFile[] files, String farmId,String batchNo,String eartagNos,Integer inspecStatus) {
+    public Result addInspection(HttpServletRequest request, MultipartFile[] files, String farmId,String batchNo,Integer inspecStatus,String inspecRremark,Integer inspecRealNum) {
+
+
+        List<BizSellPigApplyEartag> bizSellPigApplyEartags = bizSellPigApplyEartagMapper.selectList(new QueryWrapper<BizSellPigApplyEartag>().eq("batch_no", batchNo));
+        List<String> eartagNos = bizSellPigApplyEartags.stream().map(BizSellPigApplyEartag::getEarmark).collect(Collectors.toList());
 
         DateTime date = DateUtil.date();
-        //图片存储
-        List<BizInspectionPhoto> bizInspectionPhotos = new ArrayList<>();
-        String s = UpImage.uploadImgs(files, PICURL, request);
-        String[] imgUrls = s.split(",");
-        for (String imgUrl : imgUrls) {
-            BizInspectionPhoto bizInspectionPhoto = new BizInspectionPhoto();
-            bizInspectionPhoto.setPhotoName(imgUrl.substring(imgUrl.lastIndexOf("/")));
-            bizInspectionPhoto.setBatchNo(batchNo);
-            bizInspectionPhoto.setPhotoPath(imgUrl);
-            bizInspectionPhoto.setPhotoType(1);
-
-            bizInspectionPhotos.add(bizInspectionPhoto);
-        }
-        this.saveBatch(bizInspectionPhotos);
 
-        //检疫明细
 
-        String[] eartagNo = eartagNos.split(",");
-        for (String eartag : eartagNo) {
+
+        //检疫明细
+        for (String eartag : eartagNos) {
             BizFirstInspecEartag bizFirstInspecEartag = new BizFirstInspecEartag();
             bizFirstInspecEartag.setBatchNo(batchNo);
             bizFirstInspecEartag.setCreateTime(date);
@@ -89,6 +79,9 @@ public class BizInspectionPhotoServiceImpl extends ServiceImpl<BizInspectionPhot
         //修改卖猪记录状态
         BizSellPigApply bizSellPigApply = bizSellPigApplyMapper.selectOne(new QueryWrapper<BizSellPigApply>().eq("batch_no", batchNo));
         bizSellPigApply.setInspecFlowStatus(1);
+        bizSellPigApply.setInspecRemark(inspecRremark);
+        bizSellPigApply.setInspecRealNum(inspecRealNum);
+
         bizSellPigApply.setInspecTime(date);
         if (inspecStatus == 0){
             bizSellPigApply.setRecordStatus(4);
@@ -99,10 +92,86 @@ public class BizInspectionPhotoServiceImpl extends ServiceImpl<BizInspectionPhot
         EartagRegisterEntity eartagRegisterEntity =new EartagRegisterEntity();
         eartagRegisterEntity.setStage(12);
         UpdateWrapper<EartagRegisterEntity> updateWrapper =new UpdateWrapper<>();
-        updateWrapper.in("eartag_no", eartagNo);
+        updateWrapper.in("eartag_no", eartagNos);
+        eartagRegisterMapper.update(eartagRegisterEntity,updateWrapper);
+
+        if (ObjectUtil.isNotEmpty(files)) {
+
+            //图片存储
+            List<BizInspectionPhoto> bizInspectionPhotos = new ArrayList<>();
+            String s = UpImage.uploadImgs(files, PICURL, request);
+            String[] imgUrls = s.split(",");
+            for (String imgUrl : imgUrls) {
+                BizInspectionPhoto bizInspectionPhoto = new BizInspectionPhoto();
+                bizInspectionPhoto.setPhotoName(imgUrl.substring(imgUrl.lastIndexOf("/")));
+                bizInspectionPhoto.setBatchNo(batchNo);
+                bizInspectionPhoto.setPhotoPath(imgUrl);
+                bizInspectionPhoto.setPhotoType(1);
+
+                bizInspectionPhotos.add(bizInspectionPhoto);
+            }
+            this.saveBatch(bizInspectionPhotos);
+        }
+
+        return new Result(ResultCode.SUCCESS,"上传成功");
+    }
+
+    @Override
+    public Result addBatch(HttpServletRequest request, MultipartFile[] files, String farmId,String batchNo,Integer inspecStatus,String inspecRremark,Integer inspecRealNum) {
+        List<BizFirstInspecEartag> bizSellPigApplyEartags = bizFirstInspecEartagMapper.selectList(new QueryWrapper<BizFirstInspecEartag>().eq("batch_no", batchNo));
+        List<String> eartagNos = bizSellPigApplyEartags.stream().map(BizFirstInspecEartag::getEarmark).collect(Collectors.toList());
+
+        DateTime date = DateUtil.date();
+
+
+
+        //检疫明细
+        for (String eartag : eartagNos) {
+            BizSecondInspecEartag bizSecondInspecEartag = new BizSecondInspecEartag();
+            bizSecondInspecEartag.setBatchNo(batchNo);
+            bizSecondInspecEartag.setCreateTime(date);
+            bizSecondInspecEartag.setEarmark(eartag);
+            bizSecondInspecEartag.setFarmId(farmId);
+            bizSecondInspecEartagMapper.insert(bizSecondInspecEartag);
+        }
+
+        //修改卖猪记录状态
+        BizSellPigApply bizSellPigApply = bizSellPigApplyMapper.selectOne(new QueryWrapper<BizSellPigApply>().eq("batch_no", batchNo));
+        bizSellPigApply.setInspecFlowStatus(2);
+        bizSellPigApply.setButcherRemark(inspecRremark);
+        bizSellPigApply.setButcherRealNum(inspecRealNum);
+        bizSellPigApply.setRecordStatus(3);
+        bizSellPigApply.setButcherTime(date);
+        if (inspecStatus == 0){
+            bizSellPigApply.setRecordStatus(5);
+        }
+        bizSellPigApplyMapper.updateById(bizSellPigApply);
+
+        //修改耳标注册记录状态
+        EartagRegisterEntity eartagRegisterEntity =new EartagRegisterEntity();
+        eartagRegisterEntity.setStage(13);
+        UpdateWrapper<EartagRegisterEntity> updateWrapper =new UpdateWrapper<>();
+        updateWrapper.in("eartag_no", eartagNos);
         eartagRegisterMapper.update(eartagRegisterEntity,updateWrapper);
 
+        if (ObjectUtil.isNotEmpty(files)) {
+
+            //图片存储
+            List<BizInspectionPhoto> bizInspectionPhotos = new ArrayList<>();
+            String s = UpImage.uploadImgs(files, PICURL, request);
+            String[] imgUrls = s.split(",");
+            for (String imgUrl : imgUrls) {
+                BizInspectionPhoto bizInspectionPhoto = new BizInspectionPhoto();
+                bizInspectionPhoto.setPhotoName(imgUrl.substring(imgUrl.lastIndexOf("/")));
+                bizInspectionPhoto.setBatchNo(batchNo);
+                bizInspectionPhoto.setPhotoPath(imgUrl);
+                bizInspectionPhoto.setPhotoType(2);
+
+                bizInspectionPhotos.add(bizInspectionPhoto);
+            }
+            this.saveBatch(bizInspectionPhotos);
+        }
 
-        return new Result(ResultCode.SUCCESS,"上传");
+        return new Result(ResultCode.SUCCESS,"上传成功");
     }
 }

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/service/impl/BizSellPigApplyServiceImpl.java

@@ -10,12 +10,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
+import com.huimv.eartag.entity.BizFirstInspecEartag;
 import com.huimv.eartag.entity.BizSellPigApply;
 import com.huimv.eartag.entity.BizSellPigApplyEartag;
 import com.huimv.eartag.entity.EartagRegisterEntity;
 import com.huimv.eartag.entity.vo.BizSellPigApplyVo;
 import com.huimv.eartag.entity.vo.EartagNoVo;
 import com.huimv.eartag.entity.vo.InspecVo;
+import com.huimv.eartag.mapper.BizFirstInspecEartagMapper;
 import com.huimv.eartag.mapper.BizSellPigApplyEartagMapper;
 import com.huimv.eartag.mapper.BizSellPigApplyMapper;
 import com.huimv.eartag.mapper.EartagRegisterMapper;
@@ -51,6 +53,9 @@ public class BizSellPigApplyServiceImpl extends ServiceImpl<BizSellPigApplyMappe
     @Autowired
     private EartagRegisterMapper eartagRegisterMapper;
 
+    @Autowired
+    private BizFirstInspecEartagMapper bizFirstInspecEartagMapper;
+
     @Override
     public Result sellPigRecord(Map<String,String>  map) {
         String farmId = map.get("farmId");
@@ -222,12 +227,19 @@ public class BizSellPigApplyServiceImpl extends ServiceImpl<BizSellPigApplyMappe
         inspecVo.setAccomplishNum(count);
 
 
-        wrapper.eq("real_eartag_num",4);
+
+        wrapper.clear();
+        wrapper.eq("inspec_org_id",farmId);
+        wrapper.eq("inspec_flow_status",1);
+        int count2 = this.count(wrapper);
+
+
+        wrapper.eq("record_status",4);
         int count1 = this.count(wrapper);
         inspecVo.setUnQualifiedNum(count1);
 
 
-        inspecVo.setQualifiedNum(count -count);
+        inspecVo.setQualifiedNum(count2 - count1);
 
         return new Result(ResultCode.SUCCESS,inspecVo);
     }
@@ -291,39 +303,158 @@ public class BizSellPigApplyServiceImpl extends ServiceImpl<BizSellPigApplyMappe
         List<String> inspecNos1 = inspecNos.stream().map(BizSellPigApplyEartag::getEarmark).collect(Collectors.toList());
         List<String> eartagRegister1 = eartagRegisterEntities.stream().map(EartagRegisterEntity::getEartagNo).collect(Collectors.toList());
         int inspecNos1Size = inspecNos1.size();
-        int artagRegister1Size = eartagRegister1.size();
 
         List<EartagNoVo> list = new ArrayList<>();
         inspecNos1.stream().forEach( s -> list.add(new EartagNoVo(s,0)));
         endMap.put("total",inspecNos1Size);
-        if (inspecNos1Size == artagRegister1Size){
-
 
-            endMap.put("abnormal",0);
+       inspecNos1.removeAll(eartagRegister1);
 
-        }else if (inspecNos1Size > artagRegister1Size){
-            List<String> inspecNos2 = ObjectUtil.clone(inspecNos1);
-            inspecNos2.removeAll(eartagRegister1);
-            for (String s : inspecNos2) {
+        endMap.put("eartagNos",list);
+        BizSellPigApply bizSellPigApply = this.getOne(new QueryWrapper<BizSellPigApply>().eq("batch_no", batchNo));
 
-                list.stream().filter( o -> o.getEartagNo().equals(s)).forEach( e ->e.setStatus(1));
+        endMap.put("realEartagNum",bizSellPigApply.getRealEartagNum());
+        endMap.put("autoEartagNum",bizSellPigApply.getAutoEartagNum());
+        if (inspecNos1.size() == 0){
+            for (String s : inspecNos1) {
+                list.stream().filter(o -> o.getEartagNo().equals(s)).forEach(eartagNoVo ->  eartagNoVo.setStatus(1));
             }
+            endMap.put("inspecAutoNum",inspecNos1Size);
+        }else {
+            inspecNos1Size =  inspecNos1Size - inspecNos1.size();
+            endMap.put("inspecAutoNum", inspecNos1Size);
 
-            endMap.put("abnormal",inspecNos2.size());
-        } else{
+        }
 
-            List<String> eartagRegister2 = ObjectUtil.clone(eartagRegister1);
-            eartagRegister2.removeAll(inspecNos1);
-            for (String s : eartagRegister2) {
 
-                list.stream().filter( o -> o.getEartagNo().equals(s)).forEach( e ->e.setStatus(1));
-            }
+        bizSellPigApply.setInspecAutoNum(inspecNos1Size);
+
+        this.updateById(bizSellPigApply);
+        return new Result(ResultCode.SUCCESS,endMap);
+    }
+
+
+
+    //屠宰检疫
+    @Override
+    public Result getBatchCollect(String farmId) {
+        InspecVo inspecVo = new InspecVo();
+        QueryWrapper<BizSellPigApply> wrapper = new QueryWrapper<>();
+        wrapper.eq("butcher_org_id",farmId);
+        wrapper.in("inspec_flow_status",1,2);
+        inspecVo.setInspecNum(this.count(wrapper));
+
+
+        wrapper.clear();
+        wrapper.eq("butcher_org_id",farmId);
+        wrapper.eq("inspec_flow_status",1);
+        int count = this.count(wrapper);
+        inspecVo.setAccomplishNum(count);
+
+
+        wrapper.clear();
+        wrapper.eq("butcher_org_id",farmId);
+        wrapper.eq("inspec_flow_status",2);
+        int count2 = this.count(wrapper);
+
+        wrapper.eq("inspec_flow_status",5);
+        int count1 = this.count(wrapper);
+        inspecVo.setUnQualifiedNum(count1);
+
+
+        inspecVo.setQualifiedNum(count2 -count1);
+
+        return new Result(ResultCode.SUCCESS,inspecVo);
+    }
+
+    @Override
+    public Result getBatchRecord(Map<String, String> map) {
+        String farmId = map.get("farmId");
+        String type = map.get("type");
+
+        String current = map.get("current");
+        String size =  map.get("size");
+        Page<BizSellPigApply> bizSellPigApplyPage ;
+        if (StringUtils.isBlank(current) || StringUtils.isBlank(size)){
+            bizSellPigApplyPage = new Page<>(1, 10);
+        }else {
+            bizSellPigApplyPage =new Page<>(Integer.parseInt(current), Integer.parseInt(size));
+        }
 
-            endMap.put("abnormal",eartagRegister2.size());
+
+        QueryWrapper<BizSellPigApply> wrapper = new QueryWrapper<>();
+        wrapper.eq("butcher_org_id",farmId);
+        wrapper.orderByDesc("sell_time");
+        wrapper.ne("record_status",4);
+        //未审批
+        if ("1".equals(type)){
+            wrapper.eq("inspec_flow_status",1);
+
+        }
+        //合格
+        else if ("2".equals(type)){
+            wrapper.eq("inspec_flow_status",2);
+            wrapper.ne("record_status",5);
+        }
+
+        //不合格
+        else if ("3".equals(type)){
+            wrapper.eq("inspec_flow_status",2);
+            wrapper.eq("record_status",5);
+        }
+        //全部
+        else {
+            wrapper.in("inspec_flow_status",1,2);
         }
 
 
+
+        Page<BizSellPigApply> page = this.page(bizSellPigApplyPage, wrapper);
+        return new Result(ResultCode.SUCCESS,page);
+    }
+
+    @Override
+    public Result batchCheck(Map<String, String> map) {
+        Map endMap = new HashMap();
+
+        String batchNo = map.get("batchNo");
+        String farmId = map.get("farmId");
+        List<BizFirstInspecEartag> inspecNos = bizFirstInspecEartagMapper.selectList(new QueryWrapper<BizFirstInspecEartag>().eq("batch_no", batchNo));
+        // DOTO
+        List<EartagRegisterEntity> eartagRegisterEntities = eartagRegisterMapper.selectList(new QueryWrapper<EartagRegisterEntity>().eq("stage", 12).eq("butcher_id", farmId));
+
+        List<String> inspecNos1 = inspecNos.stream().map(BizFirstInspecEartag::getEarmark).collect(Collectors.toList());
+        List<String> eartagRegister1 = eartagRegisterEntities.stream().map(EartagRegisterEntity::getEartagNo).collect(Collectors.toList());
+        int inspecNos1Size = inspecNos1.size();
+
+        List<EartagNoVo> list = new ArrayList<>();
+        inspecNos1.stream().forEach( s -> list.add(new EartagNoVo(s,0)));
+        endMap.put("total",inspecNos1Size);
+
+        inspecNos1.removeAll(eartagRegister1);
+
         endMap.put("eartagNos",list);
+        BizSellPigApply bizSellPigApply = this.getOne(new QueryWrapper<BizSellPigApply>().eq("batch_no", batchNo));
+
+        endMap.put("realEartagNum",bizSellPigApply.getInspecRealNum());
+        endMap.put("autoEartagNum",bizSellPigApply.getInspecAutoNum());
+
+
+        if (inspecNos1.size() == 0){
+            endMap.put("inspecAutoNum",inspecNos1Size);
+        }else {
+            for (String s : inspecNos1) {
+                list.stream().filter(o -> o.getEartagNo().equals(s)).forEach(eartagNoVo ->  eartagNoVo.setStatus(1));
+            }
+            inspecNos1Size =  inspecNos1Size - inspecNos1.size();
+            endMap.put("inspecAutoNum", inspecNos1Size);
+
+        }
+
+
+        bizSellPigApply.setButcherAutoNum(inspecNos1Size);
+
+        this.updateById(bizSellPigApply);
         return new Result(ResultCode.SUCCESS,endMap);
     }
 }

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/utils/MyMvcConfig.java

@@ -12,7 +12,7 @@ public class MyMvcConfig implements WebMvcConfigurer {
         //配置静态资源访问路径
 
         //图片存放地址
-        String path = "d:/imgupload/";
+        String path = "/opt/goldpig-huimv/img";
 //      String path = "/home/imgupload/";
         registry.addResourceHandler("/image/**")
                 .addResourceLocations("file:"+path);

huimv-goldpig/huimv-goldpig-eartag/src/main/java/com/huimv/eartag/utils/UpImage.java

@@ -64,7 +64,8 @@ public class UpImage {
      */
     public static String uploadImgs(MultipartFile[] files, String path, HttpServletRequest request){
 
-        String paths = path.substring(path.indexOf("imgupload")+9);
+
+        String paths = path.substring(path.indexOf("/opt/goldpig-huimv/img")+18);
 
         if(files.length>0){
 //                System.out.println("进来了"+identity.length);
@@ -85,7 +86,7 @@ public class UpImage {
                     try {
                         //开始上传
                         multipartFile.transferTo(new File(path,filename));
-                        String s = ServerAddress.GetServerAddress(request)+"image"+paths+"/"+filename;
+                        String s = "/image"+paths+"/"+filename;
                         list.add(s);
                     } catch (IOException e) {
                         e.printStackTrace();