diff --git a/04.系统编码/Backend/pom.xml b/04.系统编码/Backend/pom.xml index 992203d..d2aa623 100644 --- a/04.系统编码/Backend/pom.xml +++ b/04.系统编码/Backend/pom.xml @@ -51,6 +51,12 @@ 1.0.29 + + + com.madgag + animated-gif-lib + 1.4 + diff --git a/04.系统编码/Backend/src/main/java/com/userinformation/backend/controller/ImageController.java b/04.系统编码/Backend/src/main/java/com/userinformation/backend/controller/ImageController.java index 18bd322..19af178 100644 --- a/04.系统编码/Backend/src/main/java/com/userinformation/backend/controller/ImageController.java +++ b/04.系统编码/Backend/src/main/java/com/userinformation/backend/controller/ImageController.java @@ -1,6 +1,7 @@ package com.userinformation.backend.controller; import java.io.IOException; +import java.util.List; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -26,4 +27,9 @@ public class ImageController { public RequestResult convert(String url) throws IOException { return RequestResult.success(imageService.convert(url)); } + + @PostMapping("createGif") + public RequestResult createGif(List files) throws IOException { + return RequestResult.success(imageService.createGif(files)); + } } diff --git a/04.系统编码/Backend/src/main/java/com/userinformation/backend/service/ImageService.java b/04.系统编码/Backend/src/main/java/com/userinformation/backend/service/ImageService.java index 3b979fa..7b2bf0a 100644 --- a/04.系统编码/Backend/src/main/java/com/userinformation/backend/service/ImageService.java +++ b/04.系统编码/Backend/src/main/java/com/userinformation/backend/service/ImageService.java @@ -4,11 +4,13 @@ import javax.imageio.ImageIO; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; +import java.util.List; import java.util.Locale; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.util.Assert; +import com.madgag.gif.fmsware.AnimatedGifEncoder; /** * @describe: 图片处理 逻辑层 @@ -40,4 +42,32 @@ public class ImageService { } return targetFilePath.replace(imagePath, imageUrl); } + + public String createGif(List files) { + try { + AnimatedGifEncoder e = new AnimatedGifEncoder(); + e.setRepeat(0); + e.start("C:/Users/xiaowuler/Desktop/test1.gif"); + String pic[] = new String[] { + "d:\\Pictures\\1.jpg", + "d:\\Pictures\\2.jpg", + "d:\\Pictures\\6.jpg", + "d:\\Pictures\\8.jpg"}; +// BufferedImage src[] = new BufferedImage[pic.length]; + for(String filepath : files){ + e.setDelay(200); //设置播放的延迟时间 + BufferedImage bufferedImage = ImageIO.read(new File(filepath)); // 读入需要播放的jpg文件 + e.addFrame(bufferedImage); //添加到帧中 + } +// for (int i = 0; i < src.length; i++) { +// e.setDelay(200); //设置播放的延迟时间 +// src[i] = ImageIO.read(new File(pic[i])); // 读入需要播放的jpg文件 +// e.addFrame(src[i]); //添加到帧中 +// } + e.finish(); + } catch (IOException e) { + e.printStackTrace(); + } + return null; + } } diff --git a/04.系统编码/Backend/src/main/resources/application.yml b/04.系统编码/Backend/src/main/resources/application.yml index 69c8ccb..6604633 100644 --- a/04.系统编码/Backend/src/main/resources/application.yml +++ b/04.系统编码/Backend/src/main/resources/application.yml @@ -2,11 +2,17 @@ server: port: 8002 spring: datasource: - url: jdbc:mysql://112.124.40.88:33306/user_information?useUnicode=true&characteEncoding=utf-8 +# url: jdbc:mysql://${custom.parent-url}:33306/user_information?useUnicode=true&characteEncoding=utf-8 +# username: root +# password: 3cqscbr@only1 + url: jdbc:mysql://10.124.102.10:3306/user_information?useUnicode=true&characteEncoding=utf-8 username: root - password: 3cqscbr@only1 + password: Njsqxj_sthj@2021 driver-class-name: com.mysql.cj.jdbc.Driver custom: image: - url: http://112.124.40.88:8002/product - path: D:/Deployments/LamanRadar/product + url: ${custom.parent-url}:8002/product +# path: D:/Deployments/LamanRadar/product + path: /home/project/NJEnvironmentPlatform/html/product +# parent-url: http://112.124.40.88 + parent-url: http://10.124.102.10 diff --git a/04.系统编码/Backend/src/test/java/com/userinformation/backend/UserInformationApplicationTests.java b/04.系统编码/Backend/src/test/java/com/userinformation/backend/UserInformationApplicationTests.java index 6d25383..0f00839 100644 --- a/04.系统编码/Backend/src/test/java/com/userinformation/backend/UserInformationApplicationTests.java +++ b/04.系统编码/Backend/src/test/java/com/userinformation/backend/UserInformationApplicationTests.java @@ -5,19 +5,36 @@ import javax.imageio.ImageIO; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; +import java.util.ArrayList; +import java.util.List; import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import com.userinformation.backend.controller.ImageController; @SpringBootTest class UserInformationApplicationTests { + @Autowired + private ImageController imageController; + @Test void contextLoads() throws IOException { - File inputFile = new File("C:\\Users\\xiaowuler\\Desktop\\images\\decision-support\\plan-advice\\control-experiment\\TFLD_Q2.tif"); - File outputFile = new File("C:\\Users\\xiaowuler\\Desktop\\output.png"); - BufferedImage image = ImageIO.read(inputFile); - ImageIO.write(image, "png", outputFile); + + List files = new ArrayList<>(){{ + add("C:\\Users\\xiaowuler\\Desktop\\images (2)\\TFLD_RAIN.png"); + add("C:\\Users\\xiaowuler\\Desktop\\images (2)\\TFLD_Q2.png"); + add("C:\\Users\\xiaowuler\\Desktop\\images (2)\\TFLD_T2.png"); + add("C:\\Users\\xiaowuler\\Desktop\\images (2)\\TFLD_TN.png"); + add("C:\\Users\\xiaowuler\\Desktop\\images (2)\\TFLD_TX.png"); + }}; + + imageController.createGif(files); +// File inputFile = new File("C:\\Users\\xiaowuler\\Desktop\\images\\decision-support\\plan-advice\\control-experiment\\TFLD_Q2.tif"); +// File outputFile = new File("C:\\Users\\xiaowuler\\Desktop\\output.png"); +// BufferedImage image = ImageIO.read(inputFile); +// ImageIO.write(image, "png", outputFile); } } diff --git a/04.系统编码/Backend/部署.md b/04.系统编码/Backend/部署.md new file mode 100644 index 0000000..6452b9d --- /dev/null +++ b/04.系统编码/Backend/部署.md @@ -0,0 +1,6 @@ +部署 + +``` +nohup /usr/local/java/jdk-15/bin/java -jar UserInformation-0.0.1-SNAPSHOT.jar & +``` + diff --git a/04.系统编码/Frontend/src/uilts/Config.ts b/04.系统编码/Frontend/src/uilts/Config.ts index 6422b3c..7b1c10d 100644 --- a/04.系统编码/Frontend/src/uilts/Config.ts +++ b/04.系统编码/Frontend/src/uilts/Config.ts @@ -2,7 +2,8 @@ import { Moment } from "moment"; import { format } from "./String"; export class Config { - public static parentUrl: string = "http://112.124.40.88:8002/product/picture"; + // public static parentUrl: string = "http://112.124.40.88:8002/product/picture"; + public static parentUrl: string = "http://10.124.102.10:8002/product/picture"; } export class MicrowaveRadiationConfig { diff --git a/04.系统编码/Frontend/src/uilts/axios.ts b/04.系统编码/Frontend/src/uilts/axios.ts index 173a6f9..2785d47 100644 --- a/04.系统编码/Frontend/src/uilts/axios.ts +++ b/04.系统编码/Frontend/src/uilts/axios.ts @@ -5,8 +5,8 @@ import { ElLoading } from 'element-plus' let loading = null; const service = axios.create({ - baseURL:"http://112.124.40.88:8002", - // baseURL:"", + // baseURL:"http://112.124.40.88:8002", + baseURL:"", timeout: 500000 })