bug 2403 队伍未显示图片

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireBrigadeResourceDto.java

@@ -26,6 +26,10 @@ public class FireBrigadeResourceDto extends BaseDto {
     @ApiModelProperty(value = "资源图片")
     private List<String> image;
 
+
+    /*2403 队伍未显示图片 陈召 2021-09-23*/
+    private String pic;
+
     @ApiModelProperty(value = "资源类型")
     private String type;
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferServiceImpl.java

@@ -49,10 +49,7 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -147,7 +144,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
             //通知实战指挥页面发送mqtt 默认发送 String 类型 0, 新警情 1 警情状态变化
             emqKeeper.getMqttClient().publish(topic, "0".getBytes(), RuleConfig.DEFAULT_QOS, true);
         } catch (MqttException e) {
-            throw new  RuntimeException();
+            throw new RuntimeException();
         }
 
         return true;
@@ -209,6 +206,20 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 
         // 3.消防队伍-监控大队
         List<FireBrigadeResourceDto> monitorFireBrigadeList = fireTeamService.listMonitorFireBrigade();
+        /*bug 2403 队伍未显示图片 2021-09-23 陈召开始 */
+        for (FireBrigadeResourceDto fireBrigadeResourceDto : monitorFireBrigadeList) {
+            if (fireBrigadeResourceDto.getPic() != null) {
+                String[] split = fireBrigadeResourceDto.getPic().split(",");
+                if (split.length > 1) {
+                    fireBrigadeResourceDto.setImage(Arrays.asList(split));
+                } else {
+                    List<String> objects = new ArrayList<>();
+                    objects.add(fireBrigadeResourceDto.getPic());
+                    fireBrigadeResourceDto.setImage(objects);
+                }
+            }
+        }
+        /*bug 2403 队伍未显示图片 2021-09-23 陈召结束 */
         FireBrigadeResourceDto monitorResourceDto = new FireBrigadeResourceDto();
         monitorResourceDto.setId("0");
         monitorResourceDto.setName(FireBrigadeTypeEnum.监控大队.getName());
@@ -223,7 +234,6 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
     }
 
 
-
     private List<PowerTransferCompanyResources> DtoEntityBatchConvert(List<PowerTransferCompanyResourcesDto> powerTransferCompanyResourcesDtoList, Long powerTransferCompanySequenceNbr) {
         ArrayList<PowerTransferCompanyResources> powerTransferCompanyResourcesList = new ArrayList<>();
         PowerTransferCompanyResources powerTransferCompanyResources;
@@ -352,7 +362,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
             transferDetail.deleteCharAt(transferDetail.length() - 1);
             String transferDetails = templateContent.replace("departmentName-type-resourcesNum",
                     transferDetail.toString()).replace("rescueGrid", rescueGrid == null ? "" : rescueGrid).replace(
-                            "taskStatus", "");
+                    "taskStatus", "");
 
             transferContent.add(transferDetails);
         });
@@ -363,10 +373,10 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 
     @Override
     public List<PowerCompanyCountDto> getPowerCompanyCountDtocount(Long id) {
-        List<PowerCompanyCountDto> list= powerTransferMapper.getPowerCompanyCountDtocount(id);
-        if(list!=null&&list.size()>0){
-            list.stream().forEach(powerCompanyCountDto->{
-                List<PowerCarCountDto> li= powerTransferMapper.getPowerCarCountDtocount(id,powerCompanyCountDto.getCompanyId());
+        List<PowerCompanyCountDto> list = powerTransferMapper.getPowerCompanyCountDtocount(id);
+        if (list != null && list.size() > 0) {
+            list.stream().forEach(powerCompanyCountDto -> {
+                List<PowerCarCountDto> li = powerTransferMapper.getPowerCarCountDtocount(id, powerCompanyCountDto.getCompanyId());
                 powerCompanyCountDto.setPowerCarCountDto(li);
             });
         }