Merge remote-tracking branch 'origin/master'

admin/src/main/java/com/huimv/farm/damsubsidy/common/utils/BuyImageUtil.java

@@ -0,0 +1,23 @@
+package com.huimv.farm.damsubsidy.common.utils;
+
+import cn.hutool.core.util.ObjectUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+
+public class BuyImageUtil {
+    @Autowired
+    private static UploadImage uploadImage;
+
+    public static String getUrl(String content, MultipartFile image) throws IOException {
+        if (ObjectUtil.isNotEmpty(image)){
+            if (ObjectUtil.isNotNull(content)){
+                content = content +","+uploadImage.getImageCom(image);
+            }else {
+                content = content + uploadImage.getImageCom(image);
+            }
+        }
+        return content;
+    }
+}

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

@@ -1,11 +1,15 @@
 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.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.common.utils.ResultCode;
 import com.huimv.farm.damsubsidy.entity.BillBuyInfo;
+import com.huimv.farm.damsubsidy.entity.vo.BillBuyInfoImageVo;
+import com.huimv.farm.damsubsidy.entity.vo.BillBuyInfoVo;
 import com.huimv.farm.damsubsidy.service.IBillBuyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -13,6 +17,8 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -35,12 +41,25 @@ public class BillBuyInfoController {
         String pageNum = paramsMap.get("pageNum");
         String pageSize = paramsMap.get("pageSize");
         Page<BillBuyInfo> page = new Page(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
-        return new Result(ResultCode.SUCCESS,billBuyInfoService.page(page,new QueryWrapper<BillBuyInfo>().orderByDesc("create_time").eq("bill_buy_status",2)));
+        Page<BillBuyInfo> billBuyInfoPage = billBuyInfoService.page(page, new QueryWrapper<BillBuyInfo>().orderByDesc("create_time").eq("bill_buy_status", 2));
+        Page<BillBuyInfoImageVo> billBuyInfoVoPage = new Page<>();
+        BeanUtil.copyProperties(billBuyInfoPage,billBuyInfoVoPage);
+        for (BillBuyInfoImageVo record : billBuyInfoVoPage.getRecords()) {
+            if (ObjectUtil.isNotEmpty(record.getBuyPicUrl())){
+                String[] split = record.getBuyPicUrl().split(",");
+                record.setPages(split);
+            }
+        }
+        return new Result(ResultCode.SUCCESS, billBuyInfoVoPage);
     }
 
     @PostMapping("/addTransaction")
     public Result addTransaction(HttpServletRequest httpServletRequest,
-                                 @RequestParam("image1") MultipartFile image1,
+                                 @RequestParam(value = "buyImage1", required = false) MultipartFile buyImage1,
+                                 @RequestParam(value = "buyImage2", required = false) MultipartFile buyImage2,
+                                 @RequestParam(value = "buyImage3", required = false) MultipartFile buyImage3,
+                                 @RequestParam(value = "buyImage4", required = false) MultipartFile buyImage4,
+                                 @RequestParam(value = "buyImage5", required = false) MultipartFile buyImage5,
                                  @RequestParam("image2") MultipartFile image2,
                                  @RequestParam("image3") MultipartFile image3,
                                  @RequestParam("inspectionNum") String inspectionNum,
@@ -49,7 +68,7 @@ public class BillBuyInfoController {
                                  @RequestParam("num") String num,
                                  @RequestParam("eartags") String eartags,
                                  @RequestParam("buyerPhone")String buyerPhone) throws IOException {
-        return billBuyInfoService.addTransaction(httpServletRequest,image1,image2,image3,inspectionNum,seller,buyer,num,eartags,buyerPhone);
+        return billBuyInfoService.addTransaction(httpServletRequest,buyImage1,buyImage2,buyImage3,buyImage4,buyImage5,image2,image3,inspectionNum,seller,buyer,num,eartags,buyerPhone);
     }
 
     @PostMapping("/saveTransaction")

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

@@ -58,8 +58,12 @@ public class BillLandingInspectionController {
                                  @RequestParam("reachTran") String reachTran,
                                  @RequestParam("veterId") String veter,
                                  @RequestParam("eartags") String eartags,
-                                 @RequestParam("image") MultipartFile image) throws IOException {
-        return iBillLandingInspectionService.addApplication(httpServletRequest,inspectionNum,cargoOwner,ownerPhone,animalType,animalNumberUp,useTo,startTran,reachTran,veter,eartags,image);
+                                 @RequestParam(value = "image1", required = false) MultipartFile image1,
+                                 @RequestParam(value ="image2", required = false) MultipartFile image2,
+                                 @RequestParam(value ="image3", required = false) MultipartFile image3,
+                                 @RequestParam(value ="image4", required = false) MultipartFile image4,
+                                 @RequestParam(value ="image5", required = false) MultipartFile image5) throws IOException {
+        return iBillLandingInspectionService.addApplication(httpServletRequest,inspectionNum,cargoOwner,ownerPhone,animalType,animalNumberUp,useTo,startTran,reachTran,veter,eartags,image1,image2,image3,image4,image5);
     }
 
     @PostMapping("/cancelApplication")

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

@@ -218,7 +218,6 @@ public class SysUserController {
         System.out.println(userName);
         String content = uploadImage.getImageCom(idCordFrontUrl);
 
-
         String content2 ="" ;
         if (!"2".equals(type)){
              content2 = uploadImage.getImageCom(idCordBackUrl);

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

@@ -0,0 +1,11 @@
+package com.huimv.farm.damsubsidy.entity.vo;
+
+import com.huimv.farm.damsubsidy.entity.BillBuyInfo;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class BillBuyInfoImageVo extends BillBuyInfo {
+    private String[] pages;
+}

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

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

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

@@ -19,7 +19,7 @@ import java.util.Map;
  */
 public interface IBillBuyInfoService extends IService<BillBuyInfo> {
 
-    Result addTransaction(HttpServletRequest httpServletRequest, MultipartFile image1, MultipartFile image2, MultipartFile image3, String inspectionNum, String seller, String buyer, String num, String eartags,String buyerPhone) throws IOException;
+    Result addTransaction(HttpServletRequest httpServletRequest, MultipartFile buyImage1, MultipartFile buyImage2, MultipartFile buyImage3, MultipartFile buyImage4, MultipartFile buyImage5, MultipartFile image2, MultipartFile image3, String inspectionNum, String seller, String buyer, String num, String eartags,String buyerPhone) throws IOException;
 
     Result saveTransaction(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 

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

@@ -34,5 +34,5 @@ public interface IBillLandingInspectionService extends IService<BillLandingInspe
 
     Result getEartagNoBy(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
-    Result addApplication(HttpServletRequest httpServletRequest, String inspectionNum, String cargoOwner, String ownerPhone, String animalType, String animalNumberUp, String useTo, String startTran, String reachTran, String veter, String eartags, MultipartFile image) throws IOException;
+    Result addApplication(HttpServletRequest httpServletRequest, String inspectionNum, String cargoOwner, String ownerPhone, String animalType, String animalNumberUp, String useTo, String startTran, String reachTran, String veter, String eartags, MultipartFile image1,MultipartFile image2,MultipartFile image3,MultipartFile image4,MultipartFile image5) throws IOException;
 }

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

@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.farm.damsubsidy.common.token.TokenSign;
+import com.huimv.farm.damsubsidy.common.utils.BuyImageUtil;
 import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.common.utils.ResultCode;
 import com.huimv.farm.damsubsidy.common.utils.UploadImage;
@@ -51,13 +52,12 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
     private UploadImage uploadImage;
     @Override
     @Transactional(rollbackFor = RuntimeException.class)
-    public synchronized Result addTransaction(HttpServletRequest httpServletRequest, MultipartFile image1, MultipartFile image2, MultipartFile image3, String inspectionNum, String seller, String buyer, String num, String eartags,String buyerPhone) throws IOException {
+    public synchronized Result addTransaction(HttpServletRequest httpServletRequest, MultipartFile buyImage1, MultipartFile buyImage2, MultipartFile buyImage3, MultipartFile buyImage4, MultipartFile buyImage5, MultipartFile image2, MultipartFile image3, String inspectionNum, String seller, String buyer, String num, String eartags,String buyerPhone) throws IOException {
         BillBuyInfo billBuyInfo1 = billBuyInfoMapper.selectOne(new QueryWrapper<BillBuyInfo>().eq("create_user", TokenSign.getMemberIdByJwtToken(httpServletRequest)).eq("bill_buy_status",1));
         SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().eq("phone", buyerPhone));
         BillLandingInspection billLandingInspection = billLandingInspectionMapper.selectOne(new QueryWrapper<BillLandingInspection>().eq("inspection_num", inspectionNum));
-
         int total = Integer.parseInt(num);
-
+        String content = null;
         if (ObjectUtil.isNotEmpty(sysUser)){
             if (!sysUser.getUserName().equals(buyer)){
                 return new Result(10001,"买家手机号和姓名不匹配",false);
@@ -89,7 +89,11 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
             baseAnimal.setBuyTime(DateTime.now());
             baseAnimalMapper.updateById(baseAnimal);
         }
-        String content = uploadImage.getImageCom(image1);
+        content = BuyImageUtil.getUrl(content,buyImage1);
+        content = BuyImageUtil.getUrl(content,buyImage2);
+        content = BuyImageUtil.getUrl(content,buyImage3);
+        content = BuyImageUtil.getUrl(content,buyImage4);
+        content = BuyImageUtil.getUrl(content,buyImage5);
         String content2 = uploadImage.getImageCom(image2);
         String content3 = uploadImage.getImageCom(image3);
 

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

@@ -1,5 +1,6 @@
 package com.huimv.farm.damsubsidy.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONObject;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.ObjectUtil;
@@ -7,12 +8,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.farm.damsubsidy.common.token.TokenSign;
-import com.huimv.farm.damsubsidy.common.utils.IntegerUtil;
-import com.huimv.farm.damsubsidy.common.utils.Result;
-import com.huimv.farm.damsubsidy.common.utils.ResultCode;
-import com.huimv.farm.damsubsidy.common.utils.UploadImage;
+import com.huimv.farm.damsubsidy.common.utils.*;
 import com.huimv.farm.damsubsidy.entity.*;
 import com.huimv.farm.damsubsidy.entity.BillLandingInspection;
+import com.huimv.farm.damsubsidy.entity.vo.BillLandingImageVo;
 import com.huimv.farm.damsubsidy.mapper.*;
 import com.huimv.farm.damsubsidy.service.IBillLandingInspectionService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -157,7 +156,7 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
     }
 
     @Override
-    public Result addApplication(HttpServletRequest httpServletRequest, String inspectionNum, String cargoOwner, String ownerPhone, String animalType, String animalNumberUp, String useTo, String startTran, String reachTran, String veter, String eartags, MultipartFile image) throws IOException {
+    public Result addApplication(HttpServletRequest httpServletRequest, String inspectionNum, String cargoOwner, String ownerPhone, String animalType, String animalNumberUp, String useTo, String startTran, String reachTran, String veter, String eartags, MultipartFile image1,MultipartFile image2,MultipartFile image3,MultipartFile image4,MultipartFile image5) throws IOException {
         QueryWrapper<BillLandingInspection> landingInspectionQueryWrapper = new QueryWrapper<>();
         landingInspectionQueryWrapper.eq("inspection_num", inspectionNum);
         if (this.count(landingInspectionQueryWrapper) != 0) {
@@ -169,6 +168,7 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
         if (!IntegerUtil.isInteger(animalNumberUp)){
             return new Result(10001, "头数应为整数！", false);
         }
+        String content = null;
         int total = Integer.parseInt(animalNumberUp);
         int sum = 0;
         eartags = eartags.replace("，",",");
@@ -230,7 +230,12 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
         if (sum != total){
             return new Result(10001,"实际耳标数量和填写数量不符!",false);
         }
-        String content = uploadImage.getImageCom(image);
+        content = BuyImageUtil.getUrl(content,image1);
+        content = BuyImageUtil.getUrl(content,image2);
+        content = BuyImageUtil.getUrl(content,image3);
+        content = BuyImageUtil.getUrl(content,image4);
+        content = BuyImageUtil.getUrl(content,image5);
+
         BillLandingInspection billLandingInspection = new BillLandingInspection();
         billLandingInspection.setInspectionNum(inspectionNum);
         billLandingInspection.setCargoOwner(cargoOwner);
@@ -290,7 +295,15 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
         }
         landingInspectionQueryWrapper.orderByDesc("create_time");
         Page<BillLandingInspection> page = new Page(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
-        return new Result(ResultCode.SUCCESS,billLandingInspectionMapper.selectPage(page,landingInspectionQueryWrapper));
+        Page<BillLandingInspection> billLandingInspectionPage = billLandingInspectionMapper.selectPage(page, landingInspectionQueryWrapper);
+        Page<BillLandingImageVo> billLandingImageVoPage = new Page<>();
+        BeanUtil.copyProperties(billLandingInspectionPage,billLandingImageVoPage);
+        for (BillLandingImageVo record : billLandingImageVoPage.getRecords()) {
+            if (ObjectUtil.isNotEmpty(record.getJcbgImgUrl())){
+                record.setPages(record.getJcbgImgUrl().split(","));
+            }
+        }
+        return new Result(ResultCode.SUCCESS, billLandingImageVoPage);
     }
 
     @Override

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

@@ -513,10 +513,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             return new Result(10001, "该账号已经存在，请重新创建", false);
 
         }
-
         SysUser byId = this.getById(userId);
 
-
         sysUser.setPid(userId);
         sysUser.setPids(byId.getPids() + "," + userId);
         userMapper.insert(sysUser);