From 907adc5cf77296204a48ff19e55f1d02a30087ec Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Tue, 11 Feb 2025 13:15:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0-44248?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/base/MesMediaFileCfgController.java | 38 +++++++++++++++++++++- .../serviceimpl/base/MesMediaFileCfgService.java | 13 +++++++- 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMediaFileCfgController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMediaFileCfgController.java index 95f8749..18e9044 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMediaFileCfgController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMediaFileCfgController.java @@ -1,18 +1,28 @@ package cn.estsh.i3plus.ext.mes.apiservice.controller.base; import cn.estsh.i3plus.ext.mes.api.base.IMesMediaFileCfgService; +import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base.MesConfigService; import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; import cn.estsh.i3plus.icloud.core.sdk.ICoreSysFileCloud; import cn.estsh.i3plus.pojo.mes.bean.MesMediaFileCfg; import cn.estsh.i3plus.pojo.mes.repository.MesMediaFileCfgRepository; import cn.estsh.impp.framework.boot.fileservice.ImppFileService; +import cn.hutool.http.HttpRequest; +import cn.hutool.http.HttpResponse; import io.swagger.annotations.Api; +import jodd.io.FileUtil; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.io.File; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + /** * @Description: 媒体文件维护 * @CreateDate 2024/6/6 @@ -34,6 +44,9 @@ public class MesMediaFileCfgController extends BaseMesController implements IMesMediaFileCfgService { - + @Autowired + private MesConfigService mesConfigService; protected void setPackQueryBean(MesMediaFileCfg bean, DdlPackBean packBean) { DdlPreparedPack.getStringLikerPack(bean.getFileName(), "fileName", packBean); DdlPreparedPack.getNumEqualPack(bean.getFileType(), "fileType", packBean); } + + @Override + protected void onInsertBean(MesMediaFileCfg item) { + String localAddr = mesConfigService.getCfgValue(item.getOrganizeCode(), "LOCAL_PCN_PICTURE_ADDR"); + String fileUrl = item.getFileUrl(); + int index = fileUrl.lastIndexOf("/"); + String fileName = fileUrl.substring(index + 1); + item.setLocalFileUrl(localAddr + "/"+ fileName); + } } From eb5df895d2dd7cc1ca66f3ece78ee96e285362b9 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Wed, 12 Feb 2025 17:55:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=2044248=20https?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/base/MesMediaFileCfgController.java | 18 +++++++++++++++--- .../serviceimpl/base/MesMediaFileCfgService.java | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMediaFileCfgController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMediaFileCfgController.java index 18e9044..1c59c71 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMediaFileCfgController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMediaFileCfgController.java @@ -7,8 +7,10 @@ import cn.estsh.i3plus.icloud.core.sdk.ICoreSysFileCloud; import cn.estsh.i3plus.pojo.mes.bean.MesMediaFileCfg; import cn.estsh.i3plus.pojo.mes.repository.MesMediaFileCfgRepository; import cn.estsh.impp.framework.boot.fileservice.ImppFileService; +import cn.hutool.core.codec.Base64; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; +import cn.hutool.json.JSONUtil; import io.swagger.annotations.Api; import jodd.io.FileUtil; import org.apache.commons.lang3.StringUtils; @@ -59,14 +61,24 @@ public class MesMediaFileCfgController extends BaseMesController params = new HashMap<>(); + params.put("file", Base64.encode(bytes)); + params.put("fileName", fileName); + params.put("organizeCode",mesMediaFileCfg.getOrganizeCode()); + HttpResponse response = HttpRequest.post(localUrl + ":" + localUrlPort + localPcnUrlInterface).body(JSONUtil.toJsonStr(params)).timeout(60000).execute(); + String body1 = response.body(); + System.out.println(body1); } } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMediaFileCfgService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMediaFileCfgService.java index 80b068e..1f0e03e 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMediaFileCfgService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMediaFileCfgService.java @@ -28,6 +28,6 @@ public class MesMediaFileCfgService extends BaseMesService impl String fileUrl = item.getFileUrl(); int index = fileUrl.lastIndexOf("/"); String fileName = fileUrl.substring(index + 1); - item.setLocalFileUrl(localAddr + "/"+ fileName); + item.setLocalFileUrl(localAddr + fileName); } } From 22948b56fbfc4f008a087db5989bb24c76e6b690 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Thu, 13 Feb 2025 18:12:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=2044248=20https?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/base/MesMediaFileCfgController.java | 59 +++++++++++++--------- 1 file changed, 34 insertions(+), 25 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMediaFileCfgController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMediaFileCfgController.java index 1c59c71..b288e1a 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMediaFileCfgController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMediaFileCfgController.java @@ -12,7 +12,6 @@ import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; import cn.hutool.json.JSONUtil; import io.swagger.annotations.Api; -import jodd.io.FileUtil; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -20,10 +19,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.io.File; -import java.io.IOException; import java.util.HashMap; import java.util.Map; +import java.util.concurrent.CompletableFuture; /** * @Description: 媒体文件维护 @@ -59,33 +57,44 @@ public class MesMediaFileCfgController extends BaseMesController params = new HashMap<>(); - params.put("file", Base64.encode(bytes)); - params.put("fileName", fileName); - params.put("organizeCode",mesMediaFileCfg.getOrganizeCode()); - HttpResponse response = HttpRequest.post(localUrl + ":" + localUrlPort + localPcnUrlInterface).body(JSONUtil.toJsonStr(params)).timeout(60000).execute(); - String body1 = response.body(); - System.out.println(body1); - } - } + uploadPng(mesMediaFileCfg); } @Override public void afterUpdate(MesMediaFileCfg mesMediaFileCfg) { //1.如果localFileUrl不为空，需要下发到本地url + uploadPng(mesMediaFileCfg); + } + + private void uploadPng(MesMediaFileCfg mesMediaFileCfg){ +// CompletableFuture.runAsync(()->{ + //1.如果localFileUrl不为空，需要下发到本地url + if (!StringUtils.isBlank(mesMediaFileCfg.getLocalFileUrl())){ + String fileUrl = mesMediaFileCfg.getFileUrl(); + HttpRequest httpRequest = HttpRequest.get(mesMediaFileCfg.getFileUrl()).timeout(10000); + byte[] bytes = httpRequest.execute().bodyBytes(); + + int index = fileUrl.lastIndexOf("/"); + String fileName = fileUrl.substring(index + 1); + //获取pcn的地址 + String localUrl = mesConfigService.getCfgValue(mesMediaFileCfg.getOrganizeCode(), "LOCAL_PCN_URL"); + String localUrlPort = mesConfigService.getCfgValue(mesMediaFileCfg.getOrganizeCode(), "LOCAL_PCN_URL_PORT"); + String localPcnUrlInterface = mesConfigService.getCfgValue(mesMediaFileCfg.getOrganizeCode(), "LOCAL_PCN_URL_INTERFACE"); + String remoteNginxUrl = mesConfigService.getCfgValue(mesMediaFileCfg.getOrganizeCode(), "REMOTE_NGINX_URL"); + String remoteUserName = mesConfigService.getCfgValue(mesMediaFileCfg.getOrganizeCode(), "REMOTE_USER_NAME"); + String remotePort = mesConfigService.getCfgValue(mesMediaFileCfg.getOrganizeCode(), "REMOTE_PORT"); + if (!StringUtils.isBlank(localUrl) && !StringUtils.isBlank(localUrlPort) && !StringUtils.isBlank(localPcnUrlInterface)){ + Map params = new HashMap<>(); + params.put("file", Base64.encode(bytes)); + params.put("fileName", fileName); + params.put("organizeCode",mesMediaFileCfg.getOrganizeCode()); + params.put("remoteNginxUrl",remoteNginxUrl); + params.put("remoteUserName",remoteUserName); + params.put("remotePort",remotePort); + HttpResponse response = HttpRequest.post(localUrl + ":" + localUrlPort + localPcnUrlInterface).body(JSONUtil.toJsonStr(params)).timeout(10000).execute(); + } + } +// }); }