Bladeren bron

feat: heic 2 jpg 1

shc 5 maanden geleden
bovenliggende
commit
c9a3de3216

+ 86 - 6
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/init/InitController.java

@@ -3,13 +3,13 @@ package com.qunzhixinxi.hnqz.admin.controller.init;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.text.StrPool;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.google.common.collect.Lists;
-import com.pig4cloud.plugin.excel.annotation.RequestExcel;
 import com.pig4cloud.plugin.excel.annotation.ResponseExcel;
 import com.pig4cloud.plugin.excel.annotation.Sheet;
 import com.qunzhixinxi.hnqz.admin.api.constant.UpmsState;
@@ -19,6 +19,7 @@ import com.qunzhixinxi.hnqz.admin.api.entity.SysAreaEntity;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysCheckChainNodeCheckHistory;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRelation;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysFile;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysLog;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUserArea;
@@ -29,7 +30,6 @@ import com.qunzhixinxi.hnqz.admin.api.entity.WmPackageTaskTypeQty;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackage;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTask;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskContent;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskContentConfig;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskType;
 import com.qunzhixinxi.hnqz.admin.api.model.excel.TaskCheckExcelModel;
 import com.qunzhixinxi.hnqz.admin.api.model.excel.TaskCheckHistoryExcelModel;
@@ -44,6 +44,7 @@ import com.qunzhixinxi.hnqz.admin.mapper.WmPackageTaskTypeQtyMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.WmTaskTypeMapper;
 import com.qunzhixinxi.hnqz.admin.service.SysAreaEntityService;
 import com.qunzhixinxi.hnqz.admin.service.SysCheckChainNodeCheckHistoryService;
+import com.qunzhixinxi.hnqz.admin.service.SysFileService;
 import com.qunzhixinxi.hnqz.admin.service.SysLogService;
 import com.qunzhixinxi.hnqz.admin.service.SysUserAreaService;
 import com.qunzhixinxi.hnqz.admin.service.SysUserService;
@@ -51,27 +52,40 @@ import com.qunzhixinxi.hnqz.admin.service.WmPackageTaskTypeQtyService;
 import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskContentService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskService;
+import com.qunzhixinxi.hnqz.admin.util.OsEnvUtils;
+import com.qunzhixinxi.hnqz.admin.util.OsEnvUtils.EnvType;
+import com.qunzhixinxi.hnqz.admin.util.OsEnvUtils.TargetFile;
 import com.qunzhixinxi.hnqz.common.core.constant.CacheConstants;
-import com.qunzhixinxi.hnqz.common.core.constant.CommonConstants;
 import com.qunzhixinxi.hnqz.common.core.exception.BizException;
 import com.qunzhixinxi.hnqz.common.core.util.R;
+import com.qunzhixinxi.hnqz.common.oss.OssProperties;
+import com.qunzhixinxi.hnqz.common.oss.service.OssTemplate;
 import com.qunzhixinxi.hnqz.common.security.annotation.Inner;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
 import java.time.format.DateTimeFormatter;
-import java.util.IntSummaryStatistics;
 import java.util.TreeMap;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import net.coobird.thumbnailator.Thumbnails;
+import org.apache.http.entity.ContentType;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.data.redis.core.ListOperations;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.http.MediaType;
+import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.time.Duration;
@@ -91,6 +105,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 初始化控制器
@@ -104,6 +119,9 @@ import java.util.stream.Collectors;
 @RequestMapping(value = "/init", produces = MediaType.APPLICATION_JSON_VALUE)
 public class InitController {
 
+  private static final String LOCAL_TEMP_PATH =
+      OsEnvUtils.getEachEnvPaths().get(TargetFile.TEMP.getName());
+
   private final InitMapper initMapper;
   private final WmTaskContentService taskContentService;
   private final WmTaskService taskService;
@@ -121,6 +139,9 @@ public class InitController {
   private final WmPackageTaskTypeQtyService packageTaskTypeQtyService;
   private final WmPackageTaskTypeQtyMapper wmPackageTaskTypeQtyMapper;
   private final WmScorePackageService wmScorePackageService;
+  private final SysFileService fileService;
+  private final OssProperties ossProperties;
+  private final OssTemplate minioTemplate;
   private final SysCheckChainNodeCheckHistoryService checkChainNodeCheckHistoryService;
 
   @Inner(value = false)
@@ -1594,7 +1615,7 @@ public class InitController {
             .collect(Collectors.joining(StrPool.COMMA));
     String result =
         v.stream()
-//            .map(h -> h.getCheckResult() ? "通过" : "拒绝")
+            //            .map(h -> h.getCheckResult() ? "通过" : "拒绝")
             .map(h -> h.getCheckResult() ? "1" : "0")
             .collect(Collectors.joining(StrPool.COMMA));
     String msg =
@@ -1609,4 +1630,63 @@ public class InitController {
 
     return map;
   }
+
+  @Inner(false)
+  @Transactional(rollbackFor = Exception.class)
+  @GetMapping(value = "/cnbg/init/file/covert")
+  public void heic2jpg(@RequestParam(value = "env") String env) throws Exception {
+
+    List<SysFile> list =
+        fileService.list(
+            Wrappers.<SysFile>lambdaQuery()
+                .likeLeft(SysFile::getFileName, ".HEIC")
+                .or()
+                .likeRight(SysFile::getFileName, ".heic"));
+
+    if (CollUtil.isEmpty(list)) {
+      throw new BizException("没有要转换的图片");
+    }
+
+    String url = EnvType.getEnvType(env).getUrl();
+
+    for (SysFile sysFile : list) {
+
+      String newFileName = sysFile.getFileName() + ".jpg";
+
+      // 获取图片
+      String path = url + sysFile.getPath();
+      URL url1 = new URL(path);
+      URLConnection urlConnection = url1.openConnection();
+      InputStream inputStream = urlConnection.getInputStream();
+
+      InputStream inputStream1 = heic2jpg(inputStream, newFileName);
+      minioTemplate.putObject(ossProperties.getBucketName(), newFileName, inputStream1);
+
+
+      inputStream1.close();
+      inputStream.close();
+
+      sysFile.setFileName(newFileName);
+      sysFile.setPath(sysFile.getPath() + ".jpg");
+      sysFile.setUpdateTime(LocalDateTime.now());
+      sysFile.setUpdateUser("admin");
+
+      fileService.updateById(sysFile);
+    }
+  }
+
+  private InputStream heic2jpg(InputStream inputStream, String fileName) throws IOException {
+
+    String tempFileName =
+        LOCAL_TEMP_PATH
+            + "/img/"
+            + DateTimeFormatter.ofPattern(DatePattern.PURE_DATE_PATTERN).format(LocalDateTime.now())
+            + "/"
+            + fileName;
+
+    Thumbnails.of(inputStream).scale(1.0f).outputQuality(1.0f).toFile(tempFileName);
+
+    File tempFile = new File(tempFileName);
+    return new FileInputStream(tempFile);
+  }
 }

+ 67 - 48
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/util/OsEnvUtils.java

@@ -19,59 +19,78 @@ import java.util.Properties;
 @UtilityClass
 public final class OsEnvUtils {
 
-    @Getter
-    @AllArgsConstructor
-    public enum TargetFile {
+  @Getter
+  @AllArgsConstructor
+  public enum EnvType {
+    LOCAL("local", "http://localhost:9999/"),
+    TEST("test", "https://t-mic.cnbg.com.cn/"),
+    PROD("prod", "https://mic.cnbg.com.cn/");
 
-        TEMP("temp"),
-        FONT("font"),
-        TEMPLATE("tmpl"),
-        EXCEL("EXCEL_FILE_PATH"),
-        CONTRACT("pkg_cont");
+    private final String type;
+    private final String url;
 
-        private final String name;
-    }
+    public static EnvType getEnvType(String env) {
 
-    /**
-     * 获取系统名称
-     *
-     * @return 系统名称
-     */
-    public static String getOSName() {
-        Properties props = System.getProperties(); // 获得系统属性集
-        return props.getProperty("os.name").toLowerCase();
+      for (EnvType envType : EnvType.values()) {
+        if (envType.type.equals(env)) {
+          return envType;
+        }
+      }
+      return null;
     }
+  }
 
+  @Getter
+  @AllArgsConstructor
+  public enum TargetFile {
+    TEMP("temp"),
+    FONT("font"),
+    TEMPLATE("tmpl"),
+    EXCEL("EXCEL_FILE_PATH"),
+    CONTRACT("pkg_cont");
 
-    /**
-     * 根据环境获取不用的路径
-     *
-     * @return 路径map
-     */
-    public static Map<String, String> getEachEnvPaths() {
-        String osName = getOSName();
-        Map<String, String> pathMap = new HashMap<>(5);
-        if (osName.contains("linux") || osName.contains("unix")) {
-            pathMap.put(TargetFile.EXCEL.getName(), "/serving/server/cso_prod/excel/");
-            pathMap.put(TargetFile.FONT.getName(), "/serving/server/cso_prod/font/");
-            pathMap.put(TargetFile.CONTRACT.getName(), "/serving/server/cso_prod/contract/");
-            pathMap.put(TargetFile.TEMPLATE.getName(), "/serving/server/cso_prod/template/");
-            pathMap.put(TargetFile.TEMP.getName(), "/serving/server/cso_prod/temp/");
-        }
-        if (osName.contains("mac")) {
-            pathMap.put(TargetFile.EXCEL.getName(), "~/");
-            pathMap.put(TargetFile.FONT.getName(), "~/");
-            pathMap.put(TargetFile.CONTRACT.getName(), "~/");
-            pathMap.put(TargetFile.TEMPLATE.getName(), "~/");
-            pathMap.put(TargetFile.TEMP.getName(), "~/");
-        }
-        if (osName.contains("windows")) {
-            pathMap.put(TargetFile.EXCEL.getName(), "D:\\");
-            pathMap.put(TargetFile.FONT.getName(), "D:\\");
-            pathMap.put(TargetFile.CONTRACT.getName(), "D:\\");
-            pathMap.put(TargetFile.TEMPLATE.getName(), "D:\\");
-            pathMap.put(TargetFile.TEMP.getName(), "D:\\");
-        }
-        return pathMap;
+    private final String name;
+  }
+
+  /**
+   * 获取系统名称
+   *
+   * @return 系统名称
+   */
+  public static String getOSName() {
+    Properties props = System.getProperties(); // 获得系统属性集
+    return props.getProperty("os.name").toLowerCase();
+  }
+
+  /**
+   * 根据环境获取不用的路径
+   *
+   * @return 路径map
+   */
+  public static Map<String, String> getEachEnvPaths() {
+    String osName = getOSName();
+    Map<String, String> pathMap = new HashMap<>(5);
+    if (osName.contains("linux") || osName.contains("unix")) {
+      pathMap.put(TargetFile.EXCEL.getName(), "/serving/server/cso_prod/excel/");
+      pathMap.put(TargetFile.FONT.getName(), "/serving/server/cso_prod/font/");
+      pathMap.put(TargetFile.CONTRACT.getName(), "/serving/server/cso_prod/contract/");
+      pathMap.put(TargetFile.TEMPLATE.getName(), "/serving/server/cso_prod/template/");
+      pathMap.put(TargetFile.TEMP.getName(), "/serving/server/cso_prod/temp/");
+    }
+    if (osName.contains("mac")) {
+      pathMap.put(TargetFile.EXCEL.getName(), "~/");
+      pathMap.put(TargetFile.FONT.getName(), "~/");
+      pathMap.put(TargetFile.CONTRACT.getName(), "~/");
+      pathMap.put(TargetFile.TEMPLATE.getName(), "~/");
+      pathMap.put(TargetFile.TEMP.getName(), "~/");
+    }
+    if (osName.contains("windows")) {
+      pathMap.put(TargetFile.EXCEL.getName(), "D:\\");
+      pathMap.put(TargetFile.FONT.getName(), "D:\\");
+      pathMap.put(TargetFile.CONTRACT.getName(), "D:\\");
+      pathMap.put(TargetFile.TEMPLATE.getName(), "D:\\");
+      pathMap.put(TargetFile.TEMP.getName(), "D:\\");
     }
+    return pathMap;
+  }
 }