From c98ddbd28fdd8dac1cede833c5a5479751a58ada Mon Sep 17 00:00:00 2001
From: ty <1577900710@qq.com>
Date: Tue, 12 Mar 2024 21:10:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=80=BC=E7=8F=AD=E6=97=A5=E5=BF=97=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BAbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operational/duty/service/impl/ImsDutyLogServiceImpl.java     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyLogServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyLogServiceImpl.java
index f6ace80..cfe22fc 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyLogServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyLogServiceImpl.java
@@ -14,6 +14,7 @@ import org.apache.commons.io.IOUtils;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.utils.Func;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import java.io.*;
 import java.net.HttpURLConnection;
@@ -30,6 +31,8 @@ import java.util.*;
 @Service
 public class ImsDutyLogServiceImpl extends BaseServiceImpl<ImsDutyLogMapper, ImsDutyLogEntity> implements IImsDutyLogService {
 
+    @Value("${hzims.duty.file-path}")
+    private String savePath;
     @Override
     public void exportDutyLog(String dutyId, HashMap<String, Object> map) {
         ImsDutyLogEntity res = this.baseMapper.selectOne(new LambdaQueryWrapper<ImsDutyLogEntity>() {{
@@ -107,12 +110,14 @@ public class ImsDutyLogServiceImpl extends BaseServiceImpl<ImsDutyLogMapper, Ims
             if (StringUtils.isNotBlank(res.getDutyPic())) {
                 String[] dutyPicSplit = res.getDutyPic().split(",");
                 for (String string : dutyPicSplit) {
-                    ImageEntity imageEntity = new ImageEntity(imgToByte("/template/img" + downloadFileByUrl(string, "/template/img")), 225, 163);
+                    ImageEntity imageEntity = new ImageEntity(imgToByte(savePath + downloadFileByUrl(string, savePath)), 225, 163);
                     imageEntity.setUrl(string);
                     imageEntityList.add(imageEntity);
                 }
-                map.put("dutyPic",imageEntityList);
+            }else {
+                imageEntityList.add(new ImageEntity());
             }
+            map.put("dutyPic",imageEntityList);
         }
 
     }