From 9b00b80c926b3d1b38b7ef9b682ee097345dde3f Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 17 四月 2025 11:09:31 +0800 Subject: [PATCH] 代码初始化 --- server/src/main/java/com/doumee/api/common/PublicCloudController.java | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/server/src/main/java/com/doumee/api/common/PublicCloudController.java b/server/src/main/java/com/doumee/api/common/PublicCloudController.java index 4ecc8da..e787119 100644 --- a/server/src/main/java/com/doumee/api/common/PublicCloudController.java +++ b/server/src/main/java/com/doumee/api/common/PublicCloudController.java @@ -11,15 +11,13 @@ import com.doumee.core.utils.DateUtil; import com.doumee.core.utils.FtpUtil; import com.doumee.dao.system.model.SystemDictData; +import com.doumee.service.common.EmailService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.multipart.commons.CommonsMultipartResolver; @@ -44,10 +42,27 @@ public class PublicCloudController extends BaseController { @Autowired private SystemDictDataBiz systemDictDataBiz; + @Autowired + private EmailService emailService; public static FtpUtil ftp = null; + @ApiOperation(value = "娴嬭瘯閭欢鍙戦��") + @RequestMapping(method= RequestMethod.POST,value="/testEmail") + @ResponseBody + public void test( @RequestParam(required = false) String id, @RequestParam(required = false) String email) throws Exception { +// sendEmailWithImages(String toEmail, String title, Map<String,String> contentForm, List<String> imgList) + Map<String,String> content = new HashMap<>(); + content.put("鏍囬","杩欐槸鏍囬"); + content.put("绠�浠�","杩欐槸绠�浠�"); + List<String> list = new ArrayList<>(); + list.add("https://dmtest.ahapp.net/file/workorder/20250410/1.jpg"); + list.add("https://dmtest.ahapp.net/file/workorder/20250410/2.png"); + list.add("https://dmtest.ahapp.net/file/workorder/20250410/4.png"); + emailService.sendEmailWithImages(StringUtils.defaultString(email,"jp@doumee.com"),"鏉ヨ嚜韫勮箘鐨勯偖浠�"+DateUtil.getPlusTime2(new Date()),content,list); + + } @ApiOperation(value = "鎵归噺涓婁紶鏂囦欢鍒癋TP") @RequestMapping(method= RequestMethod.POST,value="/uploadBatch") @ResponseBody @@ -151,7 +166,11 @@ // folder = systemDictDataBiz.queryByCode(Constants.FTP,folder).getCode(); Date d1 = new Date(); log.error("鎬诲緱涓婁紶鏂囦欢鎴愬姛=============寮�濮�========="+DateUtil.getPlusTime2(d1)); - folder =StringUtils.defaultString(folder).replace("/", ""); + SystemDictData folderData = systemDictDataBiz.queryByCode(Constants.FTP,folder); + if(Objects.isNull(folderData)||StringUtils.isBlank(folderData.getCode())){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐩爣鏂囦欢澶归敊璇�"); + } + folder =folderData.getCode().replace("/", ""); String prefixPath = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode(); InputStream is = null; response.setCharacterEncoding("UTF-8"); @@ -173,6 +192,7 @@ Iterator<String> it = multipartRequest.getFileNames(); while (it.hasNext()) { MultipartFile file = multipartRequest.getFile(it.next()); + System.out.println(file.getSize()); String originname = file.getOriginalFilename(); is = file.getInputStream(); String endType = ".jpg"; -- Gitblit v1.9.3