大屏企业信息管理、大屏企业列表接口 init

esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/ScreenCompanyDTO.java

@@ -21,6 +21,7 @@ import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
+import com.elink.esua.epdc.dto.result.ScreenCompanyImagesResultDTO;
 import lombok.Data;
 
 
@@ -123,6 +124,6 @@ public class ScreenCompanyDTO implements Serializable {
 	/**
 	 * 企业照片
 	 */
-	private List<String> images;
+	private List<ScreenCompanyImagesResultDTO> images;
 
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/ScreenCompanyImagesResultDTO.java

@@ -0,0 +1,13 @@
+package com.elink.esua.epdc.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ScreenCompanyImagesResultDTO implements Serializable {
+
+    private String name;
+
+    private String url;
+}

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/ScreenCompanyServiceImpl.java

@@ -28,6 +28,7 @@ import com.elink.esua.epdc.constant.CustomImageConstant;
 import com.elink.esua.epdc.dto.ScreenCompanyDTO;
 import com.elink.esua.epdc.dto.form.EpdcScreenCompanyListFormDTO;
 import com.elink.esua.epdc.dto.result.EpdcScreenCompanyListResultDTO;
+import com.elink.esua.epdc.dto.result.ScreenCompanyImagesResultDTO;
 import com.elink.esua.epdc.modules.epidemic.dao.ScreenCompanyDao;
 import com.elink.esua.epdc.modules.epidemic.entity.ScreenCompanyEntity;
 import com.elink.esua.epdc.modules.epidemic.service.ScreenCompanyService;
@@ -37,6 +38,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -89,7 +91,7 @@ public class ScreenCompanyServiceImpl extends BaseServiceImpl<ScreenCompanyDao,
         ScreenCompanyEntity entity = ConvertUtils.sourceToTarget(dto, ScreenCompanyEntity.class);
         insert(entity);
         // 保存图片
-        customImgService.saveImages(dto.getImages(), entity.getId(), CustomImageConstant.SCREEN_COMPANY_IMAGE);
+        this.saveImages(dto.getImages(), entity.getId());
     }
 
     @Override
@@ -100,7 +102,7 @@ public class ScreenCompanyServiceImpl extends BaseServiceImpl<ScreenCompanyDao,
         // 删除已有图片
         customImgService.modifyImagesByReferenceIdAndImgType(entity.getId(), CustomImageConstant.SCREEN_COMPANY_IMAGE);
         // 保存新图片
-        customImgService.saveImages(dto.getImages(), entity.getId(), CustomImageConstant.SCREEN_COMPANY_IMAGE);
+        this.saveImages(dto.getImages(), entity.getId());
     }
 
     @Override
@@ -117,4 +119,22 @@ public class ScreenCompanyServiceImpl extends BaseServiceImpl<ScreenCompanyDao,
         return baseDao.selectListOfCompanyListForScreen(formDto);
     }
 
+    /**
+     * 保存图片
+     *
+     * @param dto
+     * @param id
+     * @return void
+     * @author lc
+     * @since 2021/9/6 11:06
+     */
+    private void saveImages(List<ScreenCompanyImagesResultDTO> dto, String id) {
+        List<String> images = new ArrayList<>();
+        for (ScreenCompanyImagesResultDTO image:
+                dto) {
+            images.add(image.getUrl());
+        }
+        customImgService.saveImages(images, id, CustomImageConstant.SCREEN_COMPANY_IMAGE);
+    }
+
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/epidemic/ScreenCompanyDao.xml

@@ -15,8 +15,9 @@
         <result property="employedPopulation" column="EMPLOYED_POPULATION"/>
         <result property="longitude" column="LONGITUDE"/>
         <result property="latitude" column="LATITUDE"/>
-        <collection property="images" ofType="java.lang.String">
-            <result property="imgUrl" column="IMG_URL"/>
+        <collection property="images" ofType="com.elink.esua.epdc.dto.result.ScreenCompanyImagesResultDTO">
+            <result property="name" column="imageId"/>
+            <result property="url" column="IMG_URL"/>
         </collection>
     </resultMap>
     <select id="selectCompanyInfoById" resultMap="screenCompanyInfo">
@@ -32,7 +33,8 @@
             c.EMPLOYED_POPULATION,
             c.LONGITUDE,
             c.LATITUDE,
-            i.IMG_URL
+            i.IMG_URL,
+            i.ID as imageId
         FROM
             epdc_screen_company c
                 LEFT JOIN epdc_custom_img i ON i.REFERENCE_ID = c.ID AND i.DEL_FLAG = '0'

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/reportissue/CustomImgDao.xml

@@ -20,7 +20,7 @@
     </delete>
 
     <update id="modifyImagesByReferenceIdAndImgType">
-        update epdc_custom_img set del_flag = '1' where REFERENCE_ID = #{id} and IMG_TYPE = #{imgType}
+        update epdc_custom_img set del_flag = '1' where REFERENCE_ID = #{referenceId} and IMG_TYPE = #{imgType}
     </update>