From 51c720f29d8b0ff96d6bb4d70caba87c4f5517fa Mon Sep 17 00:00:00 2001 From: yj <913944315@qq.com> Date: Fri, 29 Mar 2024 15:34:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E7=BD=B2?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xr/device_car/config/utils/Files.java | 23 +++++++++++++++++++ .../FocalLengthConfigController.java | 8 ++----- .../src/main/resources/application.yml | 2 +- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/device_cars/src/main/java/com/xr/device_car/config/utils/Files.java b/device_cars/src/main/java/com/xr/device_car/config/utils/Files.java index 0a310fb..8064923 100644 --- a/device_cars/src/main/java/com/xr/device_car/config/utils/Files.java +++ b/device_cars/src/main/java/com/xr/device_car/config/utils/Files.java @@ -283,6 +283,29 @@ public class Files { return os.toByteArray(); } + public static BufferedImage bytesTobufferedImage(byte[] bytes){ + BufferedImage image = null; + + try { + // 利用ByteArrayInputStream将字节数据转换成InputStream + ByteArrayInputStream bais = new ByteArrayInputStream(bytes); + + // 使用ImageIO读取InputStream中的数据转换为BufferedImage + image = ImageIO.read(bais); + + // 关闭ByteArrayInputStream + bais.close(); + // 此时，image就是转换后的BufferedImage对象，可以进行显示或其他处理 + // 例如显示图像: + // ImageIcon icon=new ImageIcon(image); + // JOptionPane.showMessageDialog(null, icon); + + } catch (IOException e) { + e.printStackTrace(); + } + return image; + } + public static String uploadImage(BufferedImage bufferedImage,String imgPath,String rqImg) throws Exception{ File file =new File(imgPath+rqImg); if(!file.getParentFile().exists()){ diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/FocalLengthConfigController.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/FocalLengthConfigController.java index dbe93e6..0c8af8c 100644 --- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/FocalLengthConfigController.java +++ b/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/FocalLengthConfigController.java @@ -78,15 +78,11 @@ public class FocalLengthConfigController { QueryWrapper query1=new QueryWrapper<>(); query1.in("config_id",meters); List lists=focalLengthConfigService.list(query1); - File file1=new File("D:\\images\\images\\img_ori.jpg"); - if (!file1.getParentFile().exists()) { - file1.getParentFile().mkdirs(); - } + if(focalLengthConfig.getRotate() == null){ focalLengthConfig.setRotate(0); } - - BufferedImage bufferedImage=ImageIO.read(file1); + BufferedImage bufferedImage=Files.bytesTobufferedImage(config.getFocalPicture()); int width=bufferedImage.getWidth(); int height=bufferedImage.getHeight(); File file = new File("D:\\images\\path\\config"); diff --git a/device_iec61850clent/src/main/resources/application.yml b/device_iec61850clent/src/main/resources/application.yml index 81334fe..d378267 100644 --- a/device_iec61850clent/src/main/resources/application.yml +++ b/device_iec61850clent/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: prod #开发环境 + active: dev #开发环境 # active: test #测试环境5 #active: prod #生产环境 # active: prod #生产环境 From 2fbdac847fd221c3be80b3ea56bd290aa8761d77 Mon Sep 17 00:00:00 2001 From: Gaoby <15617898668@163.com> Date: Mon, 1 Apr 2024 11:40:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../analysis/controller/FocalLengthConfigController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/FocalLengthConfigController.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/FocalLengthConfigController.java index dbe93e6..90b50c4 100644 --- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/FocalLengthConfigController.java +++ b/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/FocalLengthConfigController.java @@ -183,7 +183,7 @@ public class FocalLengthConfigController { stringBuffer.append("\t\t\t\t").append("\"expected_len\":"+focalLengthConfig.getExpectedLen()+",\n"); stringBuffer.append("\t\t\t\t\"padding\":\"0\",\n"); stringBuffer.append("\t\t\t\t\"append_from\":\"head\",\n"); - stringBuffer.append("\t\t\t\t\"shorten_from\":\"tail\",\n"); + stringBuffer.append("\t\t\t\t\"shorten_from\":\"tail\"\n"); stringBuffer.append("\t\t\t},\n"); stringBuffer.append("\t\t\t\"scales\": [0.0,0.0,1.0,5.0]\n\t\t},"); } else if(config1.getConfigType().equals("5")){