Browse Source

上传图片

anderx 3 years ago
parent
commit
a29facdc34

+ 42 - 31
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -2,13 +2,8 @@ package com.goafanti.admin.controller;
 
 import java.math.BigDecimal;
 import java.text.ParseException;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.UUID;
+import java.util.*;
+import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -16,6 +11,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
 import com.goafanti.ambSystem.service.AmbPaymentService;
+import com.goafanti.common.model.*;
 import com.goafanti.order.enums.OrderImgEnums;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -94,27 +90,6 @@ import com.goafanti.common.enums.UserFields;
 import com.goafanti.common.enums.UserIdentityFields;
 import com.goafanti.common.enums.UserLevel;
 import com.goafanti.common.enums.UserType;
-import com.goafanti.common.model.Admin;
-import com.goafanti.common.model.OrgActivity;
-import com.goafanti.common.model.OrgActivityCost;
-import com.goafanti.common.model.OrgAnnualReport;
-import com.goafanti.common.model.OrgCognizance;
-import com.goafanti.common.model.OrgCognizanceProportion;
-import com.goafanti.common.model.OrgFinance;
-import com.goafanti.common.model.OrgHonorDatum;
-import com.goafanti.common.model.OrgHumanResource;
-import com.goafanti.common.model.OrgIntellectualProperty;
-import com.goafanti.common.model.OrgRatepay;
-import com.goafanti.common.model.OrgStandard;
-import com.goafanti.common.model.OrgTechAchievement;
-import com.goafanti.common.model.OrgTechCenter;
-import com.goafanti.common.model.OrgTechCenterDetail;
-import com.goafanti.common.model.OrgTechProduct;
-import com.goafanti.common.model.OrganizationIdentity;
-import com.goafanti.common.model.PatentInfo;
-import com.goafanti.common.model.User;
-import com.goafanti.common.model.UserAbility;
-import com.goafanti.common.model.UserIdentity;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.HttpUtils;
 import com.goafanti.common.utils.LoggerUtils;
@@ -3085,10 +3060,14 @@ public class AdminApiController extends CertifyApiController {
 			return  res;
 		}
 		if (sign.equals(OrderImgEnums.AMBPAYMENT.getCode())){
-
 			String imageUrl=uploadFile(res, "/amb_payment/", req,id, sign);
 			Long idL=Long.valueOf(id);
-			ambPaymentService.pushUploadImg(imageUrl,idL);
+			AmbPaymentApplication bo = ambPaymentService.selectByid(idL);
+			String newURL=pushUploadURL(bo.getAnnexUrl(),imageUrl);
+			AmbPaymentApplication newBo=new AmbPaymentApplication();
+			newBo.setId(idL);
+			newBo.setAnnexUrl(newURL);
+			ambPaymentService.updateById(newBo);
 			res.setData(imageUrl);
 		}else {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"sign","sign"));
@@ -3098,6 +3077,16 @@ public class AdminApiController extends CertifyApiController {
 		return res;
 	}
 
+	private String pushUploadURL(String annexUrl,String imageUrl) {
+		StringBuffer str=new StringBuffer();
+		if (StringUtils.isNotBlank(annexUrl)){
+			str=str.append(annexUrl).append(",").append(imageUrl);
+		}else {
+			str=str.append(imageUrl);
+		}
+		return str.substring(0,str.length()-1);
+	}
+
 	@RequestMapping(value = "/deleteImg", method = RequestMethod.POST)
 	public Result deleteOrderImg(String fileName,String id,String sign){
 		Result res = new Result();
@@ -3108,7 +3097,12 @@ public class AdminApiController extends CertifyApiController {
 		if (sign.equals(OrderImgEnums.AMBPAYMENT.getCode())){
 			deleteFile(res,fileName);
 			Long idL=Long.valueOf(id);
-			res.setData(ambPaymentService.deleteImg(fileName,idL));
+			AmbPaymentApplication bo = ambPaymentService.selectByid(idL);
+			String newURL=pushDeleteURL(bo.getAnnexUrl(),fileName);
+			AmbPaymentApplication newBo=new AmbPaymentApplication();
+			newBo.setId(idL);
+			newBo.setAnnexUrl(newURL);
+			res.setData(ambPaymentService.updateById(newBo));
 		}else {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"sign","sign"));
 			return  res;
@@ -3116,4 +3110,21 @@ public class AdminApiController extends CertifyApiController {
 
 		return res;
 	}
+
+	private String pushDeleteURL(String annexUrl, String fileName) {
+		List<String > list=new ArrayList<>();
+		StringBuffer str=new StringBuffer();
+		if (StringUtils.isNotBlank(annexUrl)){
+			String[] ss=annexUrl.split(",");
+			list= Arrays.stream(ss).filter(e ->!e.equals(fileName)).collect(Collectors.toList());
+		}
+		if (list.size()<1){
+			return "";
+		}else {
+			for (String s : list) {
+				str=str.append(s).append(",");
+			}
+			return str.substring(0,str.length()-1);
+		}
+	}
 }

+ 5 - 2
src/main/java/com/goafanti/ambSystem/service/AmbPaymentService.java

@@ -1,12 +1,15 @@
 package com.goafanti.ambSystem.service;
 
 import com.goafanti.ambSystem.bo.InputAmbPayment;
+import com.goafanti.common.model.AmbPaymentApplication;
 
 public interface AmbPaymentService {
 
     int add(InputAmbPayment in);
 
-    void pushUploadImg(String imageUrl, Long id);
 
-    int deleteImg(String fileName, Long id);
+
+    AmbPaymentApplication selectByid(Long id);
+
+    int updateById(AmbPaymentApplication newBo);
 }

+ 7 - 30
src/main/java/com/goafanti/ambSystem/service/Impl/AmbPaymentServiceImpl.java

@@ -32,40 +32,17 @@ public class AmbPaymentServiceImpl extends BaseMybatisDao<AmbPaymentApplicationM
         return ambPaymentApplicationMapper.insertSelective(in);
     }
 
+
+
+
+
     @Override
-    public void pushUploadImg(String imageUrl, Long id) {
-        AmbPaymentApplication bo = ambPaymentApplicationMapper.selectByPrimaryKey(id);
-        StringBuffer str=new StringBuffer();
-        if (StringUtils.isNotBlank(bo.getAnnexUrl())){
-            str=str.append(bo.getAnnexUrl()).append(",").append(imageUrl);
-        }else {
-            str=str.append(imageUrl);
-        }
-        AmbPaymentApplication newBo=new AmbPaymentApplication();
-        newBo.setId(bo.getId());
-        newBo.setAnnexUrl(str.substring(0,str.length()-1));
-        ambPaymentApplicationMapper.updateByPrimaryKeySelective(newBo);
+    public AmbPaymentApplication selectByid(Long id) {
+        return ambPaymentApplicationMapper.selectByPrimaryKey(id);
     }
 
     @Override
-    public int deleteImg(String fileName, Long id) {
-        AmbPaymentApplication bo = ambPaymentApplicationMapper.selectByPrimaryKey(id);
-        List<String > list=new ArrayList<>();
-        StringBuffer str=new StringBuffer();
-        if (StringUtils.isNotBlank(bo.getAnnexUrl())){
-            String[] ss=bo.getAnnexUrl().split(",");
-            list= Arrays.stream(ss).filter(e ->!e.equals(fileName)).collect(Collectors.toList());
-        }
-        if (list.size()<1){
-            bo.setAnnexUrl("");
-        }else {
-            for (String s : list) {
-                str=str.append(s).append(",");
-            }
-        }
-        AmbPaymentApplication newBo=new AmbPaymentApplication();
-        newBo.setId(bo.getId());
-        newBo.setAnnexUrl(str.substring(0,str.length()-1));
+    public int updateById(AmbPaymentApplication newBo) {
         return ambPaymentApplicationMapper.updateByPrimaryKeySelective(newBo);
     }
 }