上传一户一档二维码-格式调整

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

@@ -895,11 +895,11 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
 
             //BufferedImage 转化为 ByteArrayOutputStream
             ByteArrayOutputStream out = new ByteArrayOutputStream();
-            ImageIO.write(image, "jpg", out);
+            ImageIO.write(image, "png", out);
             //ByteArrayOutputStream 转化为 byte[]
             byte[] imageByte = out.toByteArray();
             //将 byte[] 转为 MultipartFile
-            MultipartFile multipartFile = new ConvertToMultipartFile(imageByte, "newNamepic", "pic1", "jpg", imageByte.length);
+            MultipartFile multipartFile = new ConvertToMultipartFile(imageByte, "newNamepic", "pic1", "png", imageByte.length);
             Result<UploadImgResultDTO> uploadResult = ossFeignClient.uploadImportTaskDescFile(multipartFile);
             if (uploadResult == null || !uploadResult.success()) {
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "上传一户一档二维码失败", "上传一户一档二维码失败");

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java

@@ -58,6 +58,7 @@ import com.epmet.dto.result.UploadImgResultDTO;
 import com.epmet.entity.*;
 import com.epmet.excel.IcNeighborHoodExcel;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
+import com.epmet.feign.OssFeignClient;
 import com.epmet.model.ImportNeighborHoodInfoListener;
 import com.epmet.model.NeighborHoodInfoModel;
 import com.epmet.redis.IcHouseRedis;
@@ -117,7 +118,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
     @Autowired
     private EpmetCommonServiceOpenFeignClient epmetCommonServiceOpenFeignClient;
     @Autowired
-    private OssFeignClient1 ossFeignClient;
+    private OssFeignClient ossFeignClient;
     @Autowired
     private ExecutorService executorService;