Skip to content

A
amos-boot-biz
Commit cc2528d3 authored by tangwei's avatar tangwei
Browse files
Options

解决冲突

parents bce11421 8b023b1b
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 0 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java
View file @ cc2528d3
...@@ -48,6 +48,7 @@ import org.springframework.util.CollectionUtils; ...@@ -48,6 +48,7 @@ import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil; import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest; import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
...@@ -1648,6 +1649,10 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste ...@@ -1648,6 +1649,10 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
try { try {
filepdf = instance.getWordFileItem(DataMap, null, WordTemplateTypeEum.iotMonthReport.getTemplateFile()); filepdf = instance.getWordFileItem(DataMap, null, WordTemplateTypeEum.iotMonthReport.getTemplateFile());
filepdf.getAbsolutePath(); filepdf.getAbsolutePath();
Token token = remoteSecurityService.getServerToken();
RequestContext.setToken(token.getToke());
RequestContext.setProduct(token.getProduct());
RequestContext.setAppKey(token.getAppKey());
MultipartFile multipartFile = new MyByteArrayMultipartFile("file", "file.pdf", "application/pdf", file2byte(filepdf)); MultipartFile multipartFile = new MyByteArrayMultipartFile("file", "file.pdf", "application/pdf", file2byte(filepdf));
FeignClientResult<Map<String, String>> result = Systemctl.fileStorageClient.updateCommonFile(multipartFile); FeignClientResult<Map<String, String>> result = Systemctl.fileStorageClient.updateCommonFile(multipartFile);
if (result != null) { if (result != null) {
...@@ -1841,6 +1846,10 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste ...@@ -1841,6 +1846,10 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
try { try {
filepdf = instance.getWordFileItem(dataMap, null, WordTemplateTypeEum.iotWeekReport.getTemplateFile()); filepdf = instance.getWordFileItem(dataMap, null, WordTemplateTypeEum.iotWeekReport.getTemplateFile());
filepdf.getAbsolutePath(); filepdf.getAbsolutePath();
Token token = remoteSecurityService.getServerToken();
RequestContext.setToken(token.getToke());
RequestContext.setProduct(token.getProduct());
RequestContext.setAppKey(token.getAppKey());
MultipartFile multipartFile = new MyByteArrayMultipartFile("file", "file.pdf", "application/pdf", file2byte(filepdf)); MultipartFile multipartFile = new MyByteArrayMultipartFile("file", "file.pdf", "application/pdf", file2byte(filepdf));
FeignClientResult<Map<String, String>> result = Systemctl.fileStorageClient.updateCommonFile(multipartFile); FeignClientResult<Map<String, String>> result = Systemctl.fileStorageClient.updateCommonFile(multipartFile);
if (result != null) { if (result != null) {
...@@ -2015,6 +2024,10 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste ...@@ -2015,6 +2024,10 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
try { try {
filepdf = instance.getWordFileItem(dataMap, null, WordTemplateTypeEum.iotDayReport.getTemplateFile()); filepdf = instance.getWordFileItem(dataMap, null, WordTemplateTypeEum.iotDayReport.getTemplateFile());
filepdf.getAbsolutePath(); filepdf.getAbsolutePath();
Token token = remoteSecurityService.getServerToken();
RequestContext.setToken(token.getToke());
RequestContext.setProduct(token.getProduct());
RequestContext.setAppKey(token.getAppKey());
MultipartFile multipartFile = new MyByteArrayMultipartFile("file", "file.pdf", "application/pdf", file2byte(filepdf)); MultipartFile multipartFile = new MyByteArrayMultipartFile("file", "file.pdf", "application/pdf", file2byte(filepdf));
FeignClientResult<Map<String, String>> result = Systemctl.fileStorageClient.updateCommonFile(multipartFile); FeignClientResult<Map<String, String>> result = Systemctl.fileStorageClient.updateCommonFile(multipartFile);
if (result != null) { if (result != null) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment