修改交易接口

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

@@ -52,16 +52,8 @@ public class BillBuyInfoController {
     }
 
     @PostMapping("/saveTransaction")
-    public Result saveTransaction(HttpServletRequest httpServletRequest,
-                                 @RequestParam("image1") MultipartFile image1,
-                                 @RequestParam("image2") MultipartFile image2,
-                                 @RequestParam("image3") MultipartFile image3,
-                                 @RequestParam("inspectionNum") String inspectionNum,
-                                 @RequestParam("seller") String seller,
-                                 @RequestParam("buyer") String buyer,
-                                 @RequestParam("num") String num,
-                                 @RequestParam("eartags") String eartags){
-        return billBuyInfoService.saveTransaction(httpServletRequest,image1,image2,image3,inspectionNum,seller,buyer,num,eartags);
+    public Result saveTransaction(HttpServletRequest httpServletRequest,@RequestBody Map<String,String> paramsMap){
+        return billBuyInfoService.saveTransaction(httpServletRequest,paramsMap);
     }
 
     @PostMapping("/getLast")
@@ -69,6 +61,11 @@ public class BillBuyInfoController {
         return billBuyInfoService.getLast(httpServletRequest,paramsMap);
     }
 
+    @PostMapping("/listDetail")
+    public Result listDetail(HttpServletRequest httpServletRequest,@RequestBody Map<String,String> paramsMap){
+        return billBuyInfoService.listDetail(httpServletRequest,paramsMap);
+    }
+
 
 
 }

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

@@ -212,7 +212,7 @@ public class SysUserController {
     //测试-token
     @PostMapping(value = "/getToken")
     public String getToken(HttpServletRequest req) {
-        String token = TokenSign.sign("superadmin", "123456789",1L);
+        String token = TokenSign.sign("企业合作社测试", "13112341238",3L);
         return token;
     }
 

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

@@ -0,0 +1,15 @@
+package com.huimv.farm.damsubsidy.entity;
+
+import lombok.Data;
+
+@Data
+public class BillBuyInfoVo extends BillBuyInfo{
+    private String cargoOwner;
+    private String ownerPhone;
+    private Integer animalType;
+    private String animalNumberUp;
+    private String useTo;
+    private String startTran;
+    private String reachTran;
+    private String eartags;
+}

admin/src/main/java/com/huimv/farm/damsubsidy/mapper/BillBuyInfoMapper.java

@@ -2,6 +2,8 @@ package com.huimv.farm.damsubsidy.mapper;
 
 import com.huimv.farm.damsubsidy.entity.BillBuyInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.farm.damsubsidy.entity.BillBuyInfoVo;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -13,4 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface BillBuyInfoMapper extends BaseMapper<BillBuyInfo> {
 
+    BillBuyInfoVo listDetail(@Param("id") String id);
+
+    BillBuyInfoVo getLast(@Param("userName") String userName);
 }

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

@@ -20,7 +20,9 @@ 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);
 
-    Result saveTransaction(HttpServletRequest httpServletRequest, MultipartFile image1, MultipartFile image2, MultipartFile image3, String inspectionNum, String seller, String buyer, String num, String eartags);
+    Result saveTransaction(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
     Result getLast(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+
+    Result listDetail(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

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

@@ -11,6 +11,7 @@ import com.huimv.farm.damsubsidy.common.utils.ResultCode;
 import com.huimv.farm.damsubsidy.common.utils.UploadImage;
 import com.huimv.farm.damsubsidy.entity.BaseAnimal;
 import com.huimv.farm.damsubsidy.entity.BillBuyInfo;
+import com.huimv.farm.damsubsidy.entity.BillBuyInfoVo;
 import com.huimv.farm.damsubsidy.mapper.BaseAnimalMapper;
 import com.huimv.farm.damsubsidy.mapper.BillBuyInfoMapper;
 import com.huimv.farm.damsubsidy.service.IBillBuyInfoService;
@@ -121,6 +122,7 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
         BillBuyInfo billBuyInfo1 = billBuyInfoMapper.selectOne(new QueryWrapper<BillBuyInfo>().eq("create_user", TokenSign.getUserName(httpServletRequest)).eq("bill_buy_status",1));
         if (ObjectUtil.isEmpty(billBuyInfo1)){
             BillBuyInfo billBuyInfo = new BillBuyInfo();
+            billBuyInfo.setBuyName(seller+"和"+buyer+"的交易信息");
             billBuyInfo.setInspectionNum(inspectionNum);
             billBuyInfo.setBuyerName(buyer);
             billBuyInfo.setSellerName(seller);
@@ -134,6 +136,7 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
             billBuyInfo.setBillBuyStatus(2);
             this.save(billBuyInfo);
         }else {
+            billBuyInfo1.setBuyName(seller+"和"+buyer+"的交易信息");
             billBuyInfo1.setInspectionNum(inspectionNum);
             billBuyInfo1.setBuyerName(buyer);
             billBuyInfo1.setSellerName(seller);
@@ -227,101 +230,109 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
     }
 
     @Override
-    public Result saveTransaction(HttpServletRequest httpServletRequest, MultipartFile image1, MultipartFile image2, MultipartFile image3, String inspectionNum, String seller, String buyer, String num, String eartags) {
-        String imgname = "成功";
-        String originalFilename = image1.getOriginalFilename();
-        String filenameExtension = StringUtils.getFilenameExtension(originalFilename);
-        String path = DateUtil.format(new Date(),"yyyy-MM");
-        try {
-            InputStream inputStream = image1.getInputStream();
-            BufferedInputStream in = new BufferedInputStream(inputStream);
-            ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
-
-            byte[] temp = new byte[1024];
-            int size = 0;
-            while ((size = in.read(temp)) != -1) {
-                out.write(temp, 0, size);
-            }
-            in.close();
-            byte[] content = out.toByteArray();
-            imgname = UUID.randomUUID()+"."+filenameExtension;
-            UploadImage.sshSftp(content,path, imgname);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        String content = "http://139.9.167.178/images/"+path +"/"+imgname;
-
-        String imgname2 = "成功";
-        String originalFilename2 = image2.getOriginalFilename();
-        String filenameExtension2 = StringUtils.getFilenameExtension(originalFilename2);
-        String path2 = DateUtil.format(new Date(),"yyyy-MM");
-        try {
-            InputStream inputStream = image2.getInputStream();
-            BufferedInputStream in = new BufferedInputStream(inputStream);
-            ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
-
-            byte[] temp = new byte[1024];
-            int size = 0;
-            while ((size = in.read(temp)) != -1) {
-                out.write(temp, 0, size);
-            }
-            in.close();
-            byte[] content2 = out.toByteArray();
-            imgname2 = UUID.randomUUID()+"."+filenameExtension2;
-            UploadImage.sshSftp(content2,path2, imgname2);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        String content2 = "http://139.9.167.178/images/"+path2 +"/"+imgname2;
-
-        String imgname3 = "成功";
-        String originalFilename3 = image3.getOriginalFilename();
-        String filenameExtension3 = StringUtils.getFilenameExtension(originalFilename3);
-        String path3 = DateUtil.format(new Date(),"yyyy-MM");
-        try {
-            InputStream inputStream = image3.getInputStream();
-            BufferedInputStream in = new BufferedInputStream(inputStream);
-            ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
-
-            byte[] temp = new byte[1024];
-            int size = 0;
-            while ((size = in.read(temp)) != -1) {
-                out.write(temp, 0, size);
-            }
-            in.close();
-            byte[] content3 = out.toByteArray();
-            imgname3 = UUID.randomUUID()+"."+filenameExtension3;
-            UploadImage.sshSftp(content3,path3, imgname3);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        String content3 = "http://139.9.167.178/images/"+path3 +"/"+imgname3;
+    @Transactional
+    public Result saveTransaction(HttpServletRequest httpServletRequest,Map<String, String> paramsMap) {
+        String inspectionNum = paramsMap.get("inspectionNum");
+        String seller = paramsMap.get("seller");
+        String buyer = paramsMap.get("buyer");
+        String num = paramsMap.get("num");
+        String eartags = paramsMap.get("eartags");
+//        String imgname = "成功";
+//        String originalFilename = image1.getOriginalFilename();
+//        String filenameExtension = StringUtils.getFilenameExtension(originalFilename);
+//        String path = DateUtil.format(new Date(),"yyyy-MM");
+//        try {
+//            InputStream inputStream = image1.getInputStream();
+//            BufferedInputStream in = new BufferedInputStream(inputStream);
+//            ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
+//
+//            byte[] temp = new byte[1024];
+//            int size = 0;
+//            while ((size = in.read(temp)) != -1) {
+//                out.write(temp, 0, size);
+//            }
+//            in.close();
+//            byte[] content = out.toByteArray();
+//            imgname = UUID.randomUUID()+"."+filenameExtension;
+//            UploadImage.sshSftp(content,path, imgname);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        String content = "http://139.9.167.178/images/"+path +"/"+imgname;
+//
+//        String imgname2 = "成功";
+//        String originalFilename2 = image2.getOriginalFilename();
+//        String filenameExtension2 = StringUtils.getFilenameExtension(originalFilename2);
+//        String path2 = DateUtil.format(new Date(),"yyyy-MM");
+//        try {
+//            InputStream inputStream = image2.getInputStream();
+//            BufferedInputStream in = new BufferedInputStream(inputStream);
+//            ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
+//
+//            byte[] temp = new byte[1024];
+//            int size = 0;
+//            while ((size = in.read(temp)) != -1) {
+//                out.write(temp, 0, size);
+//            }
+//            in.close();
+//            byte[] content2 = out.toByteArray();
+//            imgname2 = UUID.randomUUID()+"."+filenameExtension2;
+//            UploadImage.sshSftp(content2,path2, imgname2);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        String content2 = "http://139.9.167.178/images/"+path2 +"/"+imgname2;
+//
+//        String imgname3 = "成功";
+//        String originalFilename3 = image3.getOriginalFilename();
+//        String filenameExtension3 = StringUtils.getFilenameExtension(originalFilename3);
+//        String path3 = DateUtil.format(new Date(),"yyyy-MM");
+//        try {
+//            InputStream inputStream = image3.getInputStream();
+//            BufferedInputStream in = new BufferedInputStream(inputStream);
+//            ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
+//
+//            byte[] temp = new byte[1024];
+//            int size = 0;
+//            while ((size = in.read(temp)) != -1) {
+//                out.write(temp, 0, size);
+//            }
+//            in.close();
+//            byte[] content3 = out.toByteArray();
+//            imgname3 = UUID.randomUUID()+"."+filenameExtension3;
+//            UploadImage.sshSftp(content3,path3, imgname3);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        String content3 = "http://139.9.167.178/images/"+path3 +"/"+imgname3;
 
         BillBuyInfo billBuyInfo1 = billBuyInfoMapper.selectOne(new QueryWrapper<BillBuyInfo>().eq("create_user", TokenSign.getUserName(httpServletRequest)).eq("bill_buy_status",1));
         if (ObjectUtil.isEmpty(billBuyInfo1)){
             BillBuyInfo billBuyInfo = new BillBuyInfo();
+            billBuyInfo.setBuyName(seller+"和"+buyer+"的交易信息");
             billBuyInfo.setInspectionNum(inspectionNum);
             billBuyInfo.setBuyerName(buyer);
             billBuyInfo.setSellerName(seller);
             billBuyInfo.setCreateUser(TokenSign.getUserName(httpServletRequest));
             billBuyInfo.setCreateTime(DateTime.now());
             billBuyInfo.setRealNumUp(num);
-            billBuyInfo.setBuyPicUrl(content);
-            billBuyInfo.setPayPicUrl(content2);
-            billBuyInfo.setBuyPayGoodsPicUrl(content3);
+//            billBuyInfo.setBuyPicUrl(content);
+//            billBuyInfo.setPayPicUrl(content2);
+//            billBuyInfo.setBuyPayGoodsPicUrl(content3);
             billBuyInfo.setRealEartag(eartags);
             billBuyInfo.setBillBuyStatus(1);
             this.save(billBuyInfo);
         }else {
+            billBuyInfo1.setBuyName(seller+"和"+buyer+"的交易信息");
             billBuyInfo1.setInspectionNum(inspectionNum);
             billBuyInfo1.setBuyerName(buyer);
             billBuyInfo1.setSellerName(seller);
             billBuyInfo1.setCreateUser(TokenSign.getUserName(httpServletRequest));
             billBuyInfo1.setCreateTime(DateTime.now());
             billBuyInfo1.setRealNumUp(num);
-            billBuyInfo1.setBuyPicUrl(content);
-            billBuyInfo1.setPayPicUrl(content2);
-            billBuyInfo1.setBuyPayGoodsPicUrl(content3);
+//            billBuyInfo1.setBuyPicUrl(content);
+//            billBuyInfo1.setPayPicUrl(content2);
+//            billBuyInfo1.setBuyPayGoodsPicUrl(content3);
             billBuyInfo1.setRealEartag(eartags);
             billBuyInfo1.setBillBuyStatus(1);
             this.updateById(billBuyInfo1);
@@ -331,13 +342,18 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
 
     @Override
     public Result getLast(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
-        BillBuyInfo billBuyInfo = billBuyInfoMapper.selectOne(new QueryWrapper<BillBuyInfo>()
-                .eq("bill_buy_status", 1)
-                .eq("create_user", TokenSign.getUserName(httpServletRequest)));
+        BillBuyInfoVo billBuyInfo = billBuyInfoMapper.getLast(TokenSign.getUserName(httpServletRequest));
         if (ObjectUtil.isEmpty(billBuyInfo)){
             return new Result(ResultCode.SUCCESS,null);
         }else {
             return new Result(ResultCode.SUCCESS,billBuyInfo);
         }
     }
+
+    @Override
+    public Result listDetail(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String id = paramsMap.get("id");
+        BillBuyInfoVo billBuyInfo= billBuyInfoMapper.listDetail(id);
+        return new Result(ResultCode.SUCCESS,billBuyInfo);
+    }
 }

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

@@ -18,6 +18,7 @@ import com.huimv.farm.damsubsidy.mapper.BillIsolatedMapper;
 import com.huimv.farm.damsubsidy.mapper.BillLandingInspectionMapper;
 import com.huimv.farm.damsubsidy.service.IBillIsolatedService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jdk.nashorn.internal.parser.Token;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
@@ -203,6 +204,8 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
         calendar.setTime(billIsolated.getEndIsolated());
         calendar.add(Calendar.DATE, Integer.valueOf(day));
         Date endTime = calendar.getTime();
+        billIsolated.setUpdateUser(TokenSign.getUserName(httpServletRequest));
+        billIsolated.setUpdateTime(DateTime.now());
         billIsolated.setEndIsolated(endTime);
         this.updateById(billIsolated);
         return Result.SUCCESS();
@@ -308,8 +311,12 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
             isolation.setIsDead(0);
         }
         BillLandingInspection billLandingInspection = landingInspectionMapper.selectOne(new QueryWrapper<BillLandingInspection>().eq("inspection_num", isolation.getInspectionNum()));
+        billLandingInspection.setUpdateTime(DateTime.now());
+        billLandingInspection.setUpdateUser(TokenSign.getUserName(httpServletRequest));
         billLandingInspection.setInspectionSch(4);
         landingInspectionMapper.updateById(billLandingInspection);
+        isolation.setUpdateTime(DateTime.now());
+        isolation.setUpdateUser(TokenSign.getUserName(httpServletRequest));
         this.updateById(isolation);
         return Result.SUCCESS();
     }

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

@@ -46,9 +46,9 @@ import java.util.Map;
 @Service
 public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillSubsidy> implements IBillSubsidyService {
 
-    @Autowired
+    @Resource
     private BillSubsidyMapper subsidyMapper;
-    @Autowired
+    @Resource
     private SysUserMapper sysUserMapper;
 
     @Override
@@ -274,8 +274,8 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         String pageNum = paramsMap.get("pageNum");
         String pageSize = paramsMap.get("pageSize");
         String subsidySch = paramsMap.get("subsidySch");
-        String startTime = paramsMap.get("startTime");
-        String endTime = paramsMap.get("endTime");
+//        String startTime = paramsMap.get("startTime");
+//        String endTime = paramsMap.get("endTime");
         String userName = TokenSign.getUserName(httpServletRequest);
         Integer userType = sysUserMapper.selectOne(new QueryWrapper<SysUser>().eq("user_name", userName)).getUserType();
 
@@ -284,14 +284,14 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         if (userType == 2 || userType == 3){
             subsidyQueryWrapper.eq("creat_user",userName);
         }
-        if (startTime != null) {
-            startTime = startTime + " 00:00:00";
-            subsidyQueryWrapper.ge("create_time",startTime);
-        }
-        if (endTime != null) {
-            endTime = endTime + " 23:59:59";
-            subsidyQueryWrapper.le("create_time",endTime);
-        }
+//        if (startTime != null) {
+//            startTime = startTime + " 00:00:00";
+//            subsidyQueryWrapper.ge("create_time",startTime);
+//        }
+//        if (endTime != null) {
+//            endTime = endTime + " 23:59:59";
+//            subsidyQueryWrapper.le("create_time",endTime);
+//        }
         if (ObjectUtil.isNotEmpty(subsidySch)){
             if (subsidySch.equals("1")){
                 subsidyQueryWrapper.eq("subsidy_sch",0);
@@ -313,6 +313,10 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
     @Override
     public Result getLast(HttpServletRequest httpServletRequest, Map<String, String> parasMap) {
         BillSubsidy billSubsidy = this.getOne(new QueryWrapper<BillSubsidy>().eq("creat_user", TokenSign.getUserName(httpServletRequest)).eq("subsidy_sch", 7));
-        return new Result(ResultCode.SUCCESS,billSubsidy);
+        if (ObjectUtil.isEmpty(billSubsidy)){
+            return new Result(ResultCode.SUCCESS,null);
+        }else {
+            return new Result(ResultCode.SUCCESS,billSubsidy);
+        }
     }
 }

admin/src/main/resources/com/huimv/farm/damsubsidy/mapper/BillBuyInfoMapper.xml

@@ -7,8 +7,6 @@
         <id column="id" property="id" />
         <result column="buy_name" property="buyName" />
         <result column="inspection_num" property="inspectionNum" />
-        <result column="buyer_id" property="buyerId" />
-        <result column="seller_id" property="sellerId" />
         <result column="buyer_name" property="buyerName" />
         <result column="seller_name" property="sellerName" />
         <result column="real_num_up" property="realNumUp" />
@@ -23,4 +21,13 @@
         <result column="is_delete" property="isDelete" />
     </resultMap>
 
+    <select id="listDetail" resultType="com.huimv.farm.damsubsidy.entity.BillBuyInfoVo">
+        SELECT l.inspection_num,l.cargo_owner,l.owner_phone,l.animal_type,l.animal_number_up,l.use_to,l.start_tran,l.reach_tran,l.eartags,b.buyer_name,b.seller_name,b.real_num_up,real_eartag
+ FROM `bill_buy_info` b LEFT JOIN `bill_landing_inspection` l ON b.inspection_num = l.inspection_num WHERE b.id = #{id}
+    </select>
+
+    <select id="getLast" resultType="com.huimv.farm.damsubsidy.entity.BillBuyInfoVo">
+        SELECT l.inspection_num,l.cargo_owner,l.owner_phone,l.animal_type,l.animal_number_up,l.use_to,l.start_tran,l.reach_tran,l.eartags,b.buyer_name,b.seller_name,b.real_num_up,real_eartag
+ FROM `bill_buy_info` b LEFT JOIN `bill_landing_inspection` l ON b.inspection_num = l.inspection_num WHERE b.create_user = #{userName} and b.bill_buy_status = 1
+    </select>
 </mapper>