隔离上传照片

admin/src/main/java/com/huimv/farm/damsubsidy/controller/BillIsolatedController.java

@@ -1,10 +1,13 @@
 package com.huimv.farm.damsubsidy.controller;
 
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.common.utils.ResultCode;
 import com.huimv.farm.damsubsidy.entity.BillIsolated;
+import com.huimv.farm.damsubsidy.entity.vo.BillIsolatedVo;
 import com.huimv.farm.damsubsidy.service.IBillIsolatedService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -32,8 +35,13 @@ public class BillIsolatedController {
     private IBillIsolatedService iBillIsolatedService;
 
     @PostMapping("/addIsolation")
-    public Result  addIsolation(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
-        return iBillIsolatedService.addIsolation(httpServletRequest,paramsMap);
+    public Result  addIsolation(HttpServletRequest httpServletRequest,
+                                @RequestParam("observeImage") MultipartFile observeImage,
+                                @RequestParam("inspectionNum") String inspectionNum,
+                                @RequestParam("isolatedPosition") String isolatedPosition,
+                                @RequestParam("strIsolated") String strIsolated,
+                                @RequestParam("dayIsolated") String dayIsolated) throws ParseException, IOException {
+        return iBillIsolatedService.addIsolation(httpServletRequest,observeImage,inspectionNum,isolatedPosition,strIsolated,dayIsolated);
     }
 
     @PostMapping("/listIsolation")
@@ -48,17 +56,25 @@ public class BillIsolatedController {
 
     @PostMapping("/cancelIsolation")
     public Result cancelIsolation(HttpServletRequest httpServletRequest,
-                                  @RequestParam("image") MultipartFile image,
+                                  @RequestParam(value = "isolatedImage1",required = false) MultipartFile isolatedImage1,
+                                  @RequestParam(value = "isolatedImage2",required = false) MultipartFile isolatedImage2,
+                                  @RequestParam(value = "isolatedImage3",required = false) MultipartFile isolatedImage3,
+                                  @RequestParam("observeSecureImage") MultipartFile observeSecureImage,
                                   @RequestParam("id") String id,
                                   @RequestParam("isDead") String isDead,
                                   @RequestParam("deaths") String deaths) throws IOException {
-        return iBillIsolatedService.cancelIsolation(httpServletRequest,image,id,isDead,deaths);
+        return iBillIsolatedService.cancelIsolation(httpServletRequest,isolatedImage1,isolatedImage2,isolatedImage3,observeSecureImage,id,isDead,deaths);
     }
 
     @PostMapping("/listDetail")
     public Result listDetail(@RequestBody Map<String, String> paramsMap){
         String inspectionNum = paramsMap.get("inspectionNum");
-        // TODO
-        return new Result(ResultCode.SUCCESS,iBillIsolatedService.getOne(new QueryWrapper<BillIsolated>().eq("inspection_num",inspectionNum)));
+        BillIsolated inspection = iBillIsolatedService.getOne(new QueryWrapper<BillIsolated>().eq("inspection_num", inspectionNum));
+        BillIsolatedVo billIsolatedVo = new BillIsolatedVo();
+        BeanUtil.copyProperties(inspection,billIsolatedVo);
+        if (ObjectUtil.isNotEmpty(inspection.getIsolatedPicUrl())){
+            billIsolatedVo.setPages(inspection.getIsolatedPicUrl().split(","));
+        }
+        return new Result(ResultCode.SUCCESS, billIsolatedVo);
     }
 }

admin/src/main/java/com/huimv/farm/damsubsidy/entity/BillIsolated.java

@@ -84,6 +84,13 @@ public class BillIsolated extends BaseEntity implements Serializable {
     private String isolatedPicUrl;
 
     /**
+     * 解除隔离观察通知书
+     */
+    private String observeSecurePicUrl;
+
+
+
+    /**
      * 0正常 ，1该批次有死淘
      */
     private Integer isDead;

admin/src/main/java/com/huimv/farm/damsubsidy/entity/BillLandingInspection.java

@@ -128,6 +128,11 @@ public class BillLandingInspection extends BaseEntity implements Serializable {
      */
     private String  jcbgImgUrl;
 
+    /**
+     * 隔离观察通知书
+     */
+    private String observePicUrl;
+
 
 
 }

admin/src/main/java/com/huimv/farm/damsubsidy/entity/vo/BillIsolatedVo.java

@@ -0,0 +1,9 @@
+package com.huimv.farm.damsubsidy.entity.vo;
+
+import com.huimv.farm.damsubsidy.entity.BillIsolated;
+import lombok.Data;
+
+@Data
+public class BillIsolatedVo extends BillIsolated {
+    private String[] pages;
+}

admin/src/main/java/com/huimv/farm/damsubsidy/service/IBillIsolatedService.java

@@ -20,11 +20,12 @@ import java.util.Map;
  */
 public interface IBillIsolatedService extends IService<BillIsolated> {
 
-    Result addIsolation(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) throws ParseException;
+    Result addIsolation(HttpServletRequest httpServletRequest, MultipartFile observeImage, String inspectionNum, String isolatedPosition, String strIsolated, String dayIsolated) throws ParseException, IOException;
 
     Result listIsolation(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
     Result delayedIsolation(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
-    Result cancelIsolation(HttpServletRequest httpServletRequest, MultipartFile image, String id, String idDead, String deaths) throws IOException;
+    Result cancelIsolation(HttpServletRequest httpServletRequest,MultipartFile isolatedImage1,MultipartFile isolatedImage2,MultipartFile isolatedImage3 ,MultipartFile observeSecureImage, String id, String idDead, String deaths) throws IOException;
+
 }

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillIsolatedServiceImpl.java

@@ -59,11 +59,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
 
     @Override
     @Transactional(rollbackFor = RuntimeException.class)
-    public synchronized Result addIsolation(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) throws ParseException {
-        String inspectionNum = paramsMap.get("inspectionNum");
-        String isolatedPosition = paramsMap.get("isolatedPosition");
-        String strIsolated = paramsMap.get("strIsolated");
-        String dayIsolated = paramsMap.get("dayIsolated");
+    public synchronized Result addIsolation(HttpServletRequest httpServletRequest, MultipartFile observeImage, String inspectionNum, String isolatedPosition, String strIsolated, String dayIsolated) throws ParseException, IOException {
         int dayIsolate = Integer.parseInt(dayIsolated);
         if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(inspectionNum) || inspectionNum.length()!=10){
             return new Result(10001,"检疫证号不符合规范！",false);
@@ -115,7 +111,8 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
             baseAnimal.setCreateTime(new Date());
             baseAnimalMapper.insert(baseAnimal);
         }
-
+        String imageCom = uploadImage.getImageCom(observeImage);
+        billLandingInspection.setObservePicUrl(imageCom);
         billLandingInspection.setInspectionSch(3);
         billLandingInspection.setReviewed(TokenSign.getUserName(httpServletRequest));
         billLandingInspection.setReviewedTime(DateTime.now());
@@ -125,25 +122,17 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
 
     }
 
-    private String getEndEartag(String substring, int i) {
-        StringBuilder endEartag = new StringBuilder(i + "");
-        int lenth = String.valueOf(i).length();
-        if (lenth ==3) {
-            return substring+i;
-        }else {
-            for (int i1 = 0; i1 < 2; i1++) {
-                endEartag.insert(0, "0");
-                if (endEartag.length() ==3){
-                    return substring+endEartag;
-                }
+    public String getUrl(String content, MultipartFile image) throws IOException {
+        if (ObjectUtil.isNotEmpty(image)){
+            if ( !"".equals(content)){
+                content = content +","+uploadImage.getImageCom(image);
+            }else {
+                content =   content +uploadImage.getImageCom(image);
             }
         }
-
-        return substring+i;
+        return content;
     }
 
-
-
     @Override
     public Result listIsolation(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String pageNum = paramsMap.get("pageNum");
@@ -179,9 +168,14 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
 
     @Override
     @Transactional(rollbackFor = RuntimeException.class)
-    public Result cancelIsolation(HttpServletRequest httpServletRequest, MultipartFile image, String id, String isDead, String deaths) throws IOException {
-        String content = uploadImage.getImageCom(image);
+    public Result cancelIsolation(HttpServletRequest httpServletRequest,MultipartFile isolatedImage1,MultipartFile isolatedImage2,MultipartFile isolatedImage3 ,MultipartFile observeSecureImage, String id, String isDead, String deaths) throws IOException {
+        String content = "";
+        content = getUrl(content,isolatedImage1);
+        content = getUrl(content,isolatedImage2);
+        content = getUrl(content,isolatedImage3);
+        String observeImage = uploadImage.getImageCom(observeSecureImage);
         BillIsolated isolation = this.getById(id);
+        isolation.setObserveSecurePicUrl(observeImage);
         isolation.setIsolatedPicUrl(content);
         isolation.setIsolatedSch(2);
         if ("1".equals(isDead)){

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillLandingInspectionServiceImpl.java

@@ -341,11 +341,12 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
         }else if (userType == 1){
             landingInspectionQueryWrapper.eq("veter_id",user.getVeterId()).eq("inspection_type",0);
         }
-
         if ("4".equals(inspectionSch)){
             landingInspectionQueryWrapper.in("inspection_sch",4,5);
         } else if (ObjectUtil.isNotEmpty(inspectionSch)){
             landingInspectionQueryWrapper.eq("inspection_sch",inspectionSch);
+        }else if(ObjectUtil.isEmpty(inspectionSch)){
+            landingInspectionQueryWrapper.ne("inspection_sch",6);
         }
         landingInspectionQueryWrapper.orderByDesc("create_time");
         Page<BillLandingInspection> page = new Page(Integer.parseInt(pageNum),Integer.parseInt(pageSize));