From 05aebb26d1e2e1fbaebe0119876aa97caea1fef5 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期五, 06 九月 2024 09:58:08 +0800
Subject: [PATCH] 更新
---
src/main/java/com/whyc/mapper/BattRTStateMapper.java | 6 +++
src/main/java/com/whyc/controller/QRCodeController.java | 6 +++
src/main/resources/config/application-dev.yml | 15 +++++--
src/main/java/com/whyc/service/BattRTStateService.java | 14 +++++++
src/main/java/com/whyc/App.java | 29 ++++++++++++++
src/main/java/com/whyc/service/QRCodeService.java | 14 ++++++
src/main/resources/config/application-prod.yml | 4 +-
7 files changed, 81 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/whyc/App.java b/src/main/java/com/whyc/App.java
index 215147f..ce41089 100644
--- a/src/main/java/com/whyc/App.java
+++ b/src/main/java/com/whyc/App.java
@@ -1,9 +1,15 @@
package com.whyc;
+import org.apache.catalina.connector.Connector;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.boot.web.servlet.server.ServletWebServerFactory;
import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Bean;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
@@ -22,4 +28,27 @@
SpringApplication.run(App.class, args);
}
+ @Value("${http.port}")
+ private Integer httpPort;
+
+ @Bean
+ @ConditionalOnProperty(prefix = "spring.profiles",name = "active",havingValue = "prod-ssl")
+ public ServletWebServerFactory servletContainer() {
+ TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory();
+ // 娣诲姞http
+ tomcat.addAdditionalTomcatConnectors(createStandardConnector());
+ return tomcat;
+ }
+
+ /**
+ * 閰嶇疆http
+ *
+ * @return connector
+ */
+ private Connector createStandardConnector() {
+ Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
+ connector.setPort(httpPort);
+ return connector;
+ }
+
}
diff --git a/src/main/java/com/whyc/controller/QRCodeController.java b/src/main/java/com/whyc/controller/QRCodeController.java
index 2c588b5..573463f 100644
--- a/src/main/java/com/whyc/controller/QRCodeController.java
+++ b/src/main/java/com/whyc/controller/QRCodeController.java
@@ -4,6 +4,7 @@
import com.whyc.service.QRCodeService;
import org.springframework.beans.factory.annotation.Autowired;
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.RestController;
@@ -23,4 +24,9 @@
return new Response().set(1,res);
}
+ @PostMapping("extractAndGetData")
+ private Response extractAndGetData(@RequestBody byte[] data){
+ return service.extractAndGetData(data);
+ }
+
}
diff --git a/src/main/java/com/whyc/mapper/BattRTStateMapper.java b/src/main/java/com/whyc/mapper/BattRTStateMapper.java
new file mode 100644
index 0000000..d0d395f
--- /dev/null
+++ b/src/main/java/com/whyc/mapper/BattRTStateMapper.java
@@ -0,0 +1,6 @@
+package com.whyc.mapper;
+
+import com.whyc.pojo.BattRTState;
+
+public interface BattRTStateMapper extends CustomMapper<BattRTState>{
+}
diff --git a/src/main/java/com/whyc/service/BattRTStateService.java b/src/main/java/com/whyc/service/BattRTStateService.java
index 7af6eea..c8f5951 100644
--- a/src/main/java/com/whyc/service/BattRTStateService.java
+++ b/src/main/java/com/whyc/service/BattRTStateService.java
@@ -1,10 +1,24 @@
package com.whyc.service;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.whyc.dto.Response;
+import com.whyc.mapper.BattRTStateMapper;
+import com.whyc.pojo.BattRTState;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
@Service
public class BattRTStateService {
+ @Resource
+ private BattRTStateMapper mapper;
+ public Response getOneByBattGroupId(String battGroupId) {
+ QueryWrapper<BattRTState> query = Wrappers.query();
+ query.eq("batt_group_id", battGroupId);
+ query.last(" limit 1");
+ return new Response().set(1,mapper.selectOne(query));
+ }
}
diff --git a/src/main/java/com/whyc/service/QRCodeService.java b/src/main/java/com/whyc/service/QRCodeService.java
index 91ef7c5..e727279 100644
--- a/src/main/java/com/whyc/service/QRCodeService.java
+++ b/src/main/java/com/whyc/service/QRCodeService.java
@@ -5,6 +5,8 @@
import com.google.zxing.Result;
import com.google.zxing.client.j2se.BufferedImageLuminanceSource;
import com.google.zxing.common.HybridBinarizer;
+import com.whyc.dto.Response;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.imageio.ImageIO;
@@ -16,6 +18,9 @@
@Service
public class QRCodeService {
+
+ @Autowired
+ private BattRTStateService battRTStateService;
public String extract(byte[] data) {
try {
@@ -31,10 +36,15 @@
}
}
+ public Response extractAndGetData(byte[] data) {
+ String battGroupId = extract(data);
+ return battRTStateService.getOneByBattGroupId(battGroupId);
+ }
+
public static String test() {
try {
//InputStream inputStream = new ByteArrayInputStream(data);
- InputStream inputStream = new FileInputStream("C:\\code\\web\\InspectionSystem\\src\\main\\resources\\lib\\t5.jpg");
+ InputStream inputStream = new FileInputStream("C:\\code\\web\\InspectionSystem\\src\\main\\resources\\lib\\t11.jpg");
BufferedImage bufferedImage = ImageIO.read(inputStream);
BinaryBitmap binaryBitmap = new BinaryBitmap(new HybridBinarizer(new BufferedImageLuminanceSource(bufferedImage)));
Result result = new MultiFormatReader().decode(binaryBitmap);
@@ -49,4 +59,6 @@
public static void main(String[] args) {
System.out.println(test());
}
+
+
}
diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml
index 51b61ed..83f7d50 100644
--- a/src/main/resources/config/application-dev.yml
+++ b/src/main/resources/config/application-dev.yml
@@ -1,17 +1,24 @@
#鏈嶅姟绔彛鍙�
server:
- port: 8081
+ port: 8444
serverHeader:
servlet:
- context-path: /br
+ context-path: /is
session:
cookie:
- name: br
+ name: is
http-only: true
tomcat:
max-http-form-post-size: 102400000
+ ssl:
+ enabled: true
+ key-store: classpath:config/whyc.jks
+ key-store-type: JKS
+ key-store-password: office@whyc.com
+ enabled-protocols: TLSv1,TLSv1.1,TLSv1.2
+ ciphers: TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,TLS_RSA_WITH_AES_128_CBC_SHA256,TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA256,TLS_RSA_WITH_AES_256_CBC_SHA
http:
- port: -1
+ port: 8081
#鏁版嵁搴�
spring:
datasource:
diff --git a/src/main/resources/config/application-prod.yml b/src/main/resources/config/application-prod.yml
index b801158..9b15927 100644
--- a/src/main/resources/config/application-prod.yml
+++ b/src/main/resources/config/application-prod.yml
@@ -3,10 +3,10 @@
port: 8081
serverHeader:
servlet:
- context-path: /br
+ context-path: /is
session:
cookie:
- name: br
+ name: is
http-only: true
tomcat:
max-http-form-post-size: 102400000
--
Gitblit v1.9.1