From d5e17ecf9a804992c3e352d64a37cecbabd57d74 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期三, 12 三月 2025 16:23:23 +0800
Subject: [PATCH] 辨识上传图片
---
src/main/java/com/gkhy/labRiskManage/config/authorization/TokenCheckWhiteListEnum.java | 2 +
src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlanIdentificationPha.java | 10 +++++
src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanIdentificationSclServiceImpl.java | 1
src/main/java/com/gkhy/labRiskManage/application/riskReport/dto/bo/RiskAssessPlanIdentificationAppUpdateBO.java | 10 +++++
src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlanIdentificationAnalogy.java | 10 +++++
src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanIdentificationPhaServiceImpl.java | 1
src/main/java/com/gkhy/labRiskManage/api/controller/riskReport/dto/repDto/RiskAssessPlanIdentificationInsertReqBO.java | 1
src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanIdentificationAnalogyServiceImpl.java | 1
src/main/resources/config/application-gslab.yaml | 5 +-
src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/AnalogyQueryDTO.java | 2 +
src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/HazopQueryDTO.java | 2 +
src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanIdentificationHazopServiceImpl.java | 1
src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/JhaQueryDTO.java | 1
src/main/java/com/gkhy/labRiskManage/application/riskReport/dto/bo/RiskAssessPlanAppIdentificationBO.java | 2 +
src/main/java/com/gkhy/labRiskManage/config/authorization/MyWebMvcConfigurerAdapter.java | 2
src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlanIdentificationJha.java | 10 +++++
src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlanIdentificationHazop.java | 10 +++++
src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/FactorQueryDTO.java | 2 +
src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanIdentificationJhaServiceImpl.java | 1
src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/SclQueryDTO.java | 2 +
src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/PhaQueryDTO.java | 2
src/main/java/com/gkhy/labRiskManage/api/controller/riskReport/dto/repDto/RiskAssessPlanIdentificationUpdateReqBO.java | 2 +
src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlanIdentificationScl.java | 10 +++++
23 files changed, 86 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/gkhy/labRiskManage/api/controller/riskReport/dto/repDto/RiskAssessPlanIdentificationInsertReqBO.java b/src/main/java/com/gkhy/labRiskManage/api/controller/riskReport/dto/repDto/RiskAssessPlanIdentificationInsertReqBO.java
index 2f06e8f..0a18407 100644
--- a/src/main/java/com/gkhy/labRiskManage/api/controller/riskReport/dto/repDto/RiskAssessPlanIdentificationInsertReqBO.java
+++ b/src/main/java/com/gkhy/labRiskManage/api/controller/riskReport/dto/repDto/RiskAssessPlanIdentificationInsertReqBO.java
@@ -132,4 +132,5 @@
*/
private String sclCheckResult;
+ private String fileData;
}
diff --git a/src/main/java/com/gkhy/labRiskManage/api/controller/riskReport/dto/repDto/RiskAssessPlanIdentificationUpdateReqBO.java b/src/main/java/com/gkhy/labRiskManage/api/controller/riskReport/dto/repDto/RiskAssessPlanIdentificationUpdateReqBO.java
index 9b96f95..94ea56a 100644
--- a/src/main/java/com/gkhy/labRiskManage/api/controller/riskReport/dto/repDto/RiskAssessPlanIdentificationUpdateReqBO.java
+++ b/src/main/java/com/gkhy/labRiskManage/api/controller/riskReport/dto/repDto/RiskAssessPlanIdentificationUpdateReqBO.java
@@ -138,5 +138,7 @@
*/
private String sclCheckResult;
+ private String fileData;
+
}
diff --git a/src/main/java/com/gkhy/labRiskManage/application/riskReport/dto/bo/RiskAssessPlanAppIdentificationBO.java b/src/main/java/com/gkhy/labRiskManage/application/riskReport/dto/bo/RiskAssessPlanAppIdentificationBO.java
index 1d69669..455c77d 100644
--- a/src/main/java/com/gkhy/labRiskManage/application/riskReport/dto/bo/RiskAssessPlanAppIdentificationBO.java
+++ b/src/main/java/com/gkhy/labRiskManage/application/riskReport/dto/bo/RiskAssessPlanAppIdentificationBO.java
@@ -134,4 +134,6 @@
*/
private String identificationDesc;
+ private String fileData;
+
}
diff --git a/src/main/java/com/gkhy/labRiskManage/application/riskReport/dto/bo/RiskAssessPlanIdentificationAppUpdateBO.java b/src/main/java/com/gkhy/labRiskManage/application/riskReport/dto/bo/RiskAssessPlanIdentificationAppUpdateBO.java
index e3ce40e..dcc240b 100644
--- a/src/main/java/com/gkhy/labRiskManage/application/riskReport/dto/bo/RiskAssessPlanIdentificationAppUpdateBO.java
+++ b/src/main/java/com/gkhy/labRiskManage/application/riskReport/dto/bo/RiskAssessPlanIdentificationAppUpdateBO.java
@@ -135,6 +135,8 @@
*/
private String identificationDesc;
+ private String fileData;
+
public String getIdentificationDesc() {
return identificationDesc;
}
@@ -412,4 +414,12 @@
public void setSclCheckResult(String sclCheckResult) {
this.sclCheckResult = sclCheckResult;
}
+
+ public String getFileData() {
+ return fileData;
+ }
+
+ public void setFileData(String fileData) {
+ this.fileData = fileData;
+ }
}
diff --git a/src/main/java/com/gkhy/labRiskManage/config/authorization/MyWebMvcConfigurerAdapter.java b/src/main/java/com/gkhy/labRiskManage/config/authorization/MyWebMvcConfigurerAdapter.java
index b458bff..00916f3 100644
--- a/src/main/java/com/gkhy/labRiskManage/config/authorization/MyWebMvcConfigurerAdapter.java
+++ b/src/main/java/com/gkhy/labRiskManage/config/authorization/MyWebMvcConfigurerAdapter.java
@@ -20,7 +20,7 @@
public void addResourceHandlers(ResourceHandlerRegistry registry) {
registry.addResourceHandler("/uploadtest/**").addResourceLocations("file:E:/file/gkhy/test/");
//registry.addResourceHandler("/upload/**").addResourceLocations("file:/home/upload/laboratoryRiskManage/");
- registry.addResourceHandler("/upload/**").addResourceLocations("file:/home/gkhy/upload/laboratoryRiskManage/");
+ registry.addResourceHandler("/uploadLab/**").addResourceLocations("file:/home/upload/laboratoryRiskManage/");
super.addResourceHandlers(registry);
}
diff --git a/src/main/java/com/gkhy/labRiskManage/config/authorization/TokenCheckWhiteListEnum.java b/src/main/java/com/gkhy/labRiskManage/config/authorization/TokenCheckWhiteListEnum.java
index 3f96fe1..9c03710 100644
--- a/src/main/java/com/gkhy/labRiskManage/config/authorization/TokenCheckWhiteListEnum.java
+++ b/src/main/java/com/gkhy/labRiskManage/config/authorization/TokenCheckWhiteListEnum.java
@@ -11,6 +11,8 @@
PATH_FORGET_PASSWORD("/account/auth/pwd/forget/reset","忘记密码重置密码接口",true),
PATH_LICENSE("/sys/lic/**","授权证书查看",true),
PATH_ACCOUNT_AUTH("/account/auth/**","用户认证",true),
+ PIC_AUTH_TEST("/uploadtest/**","图片测试",true),
+ PIC_AUTH("/uploadLab/**","图片",true),
/*PATH_TEST_ACCOUNT("/account/user/**","账号测试接口",true),
//basic部分测试接口
PATH_TEST_BASIC("/basic/**","账号测试接口",true),
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlanIdentificationAnalogy.java b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlanIdentificationAnalogy.java
index 93ed876..88b391c 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlanIdentificationAnalogy.java
+++ b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlanIdentificationAnalogy.java
@@ -76,6 +76,8 @@
*/
private String identificationDesc;
+ private String fileData;
+
public String getIdentificationDesc() {
return identificationDesc;
}
@@ -202,5 +204,13 @@
public void setDeleteStatus(Byte deleteStatus) {
this.deleteStatus = deleteStatus;
}
+
+ public String getFileData() {
+ return fileData;
+ }
+
+ public void setFileData(String fileData) {
+ this.fileData = fileData;
+ }
}
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlanIdentificationHazop.java b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlanIdentificationHazop.java
index f4188ec..59c1c4e 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlanIdentificationHazop.java
+++ b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlanIdentificationHazop.java
@@ -88,6 +88,8 @@
*/
private String identificationDesc;
+ private String fileData;
+
public String getIdentificationDesc() {
return identificationDesc;
}
@@ -237,5 +239,13 @@
public void setDeleteStatus(Byte deleteStatus) {
this.deleteStatus = deleteStatus;
}
+
+ public String getFileData() {
+ return fileData;
+ }
+
+ public void setFileData(String fileData) {
+ this.fileData = fileData;
+ }
}
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlanIdentificationJha.java b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlanIdentificationJha.java
index c081a31..6384e73 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlanIdentificationJha.java
+++ b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlanIdentificationJha.java
@@ -72,6 +72,8 @@
*/
private String identificationDesc;
+ private String fileData;
+
public String getIdentificationDesc() {
return identificationDesc;
}
@@ -189,5 +191,13 @@
public void setDeleteStatus(Byte deleteStatus) {
this.deleteStatus = deleteStatus;
}
+
+ public String getFileData() {
+ return fileData;
+ }
+
+ public void setFileData(String fileData) {
+ this.fileData = fileData;
+ }
}
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlanIdentificationPha.java b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlanIdentificationPha.java
index 6fd4237..6ba19f5 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlanIdentificationPha.java
+++ b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlanIdentificationPha.java
@@ -72,6 +72,8 @@
*/
private String identificationDesc;
+ private String fileData;
+
public String getIdentificationDesc() {
return identificationDesc;
}
@@ -189,5 +191,13 @@
public void setDeleteStatus(Byte deleteStatus) {
this.deleteStatus = deleteStatus;
}
+
+ public String getFileData() {
+ return fileData;
+ }
+
+ public void setFileData(String fileData) {
+ this.fileData = fileData;
+ }
}
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlanIdentificationScl.java b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlanIdentificationScl.java
index 8cba8ce..f97681d 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlanIdentificationScl.java
+++ b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlanIdentificationScl.java
@@ -76,6 +76,8 @@
*/
private String identificationDesc;
+ private String fileData;
+
public String getIdentificationDesc() {
return identificationDesc;
}
@@ -202,5 +204,13 @@
public void setDeleteStatus(Byte deleteStatus) {
this.deleteStatus = deleteStatus;
}
+
+ public String getFileData() {
+ return fileData;
+ }
+
+ public void setFileData(String fileData) {
+ this.fileData = fileData;
+ }
}
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/AnalogyQueryDTO.java b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/AnalogyQueryDTO.java
index 53033df..805abcc 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/AnalogyQueryDTO.java
+++ b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/AnalogyQueryDTO.java
@@ -45,4 +45,6 @@
*/
private LocalDateTime updateTime;
+ private String fileData;
+
}
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/FactorQueryDTO.java b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/FactorQueryDTO.java
index 2a9b8f1..e3a5289 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/FactorQueryDTO.java
+++ b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/FactorQueryDTO.java
@@ -326,4 +326,6 @@
* 安全风险分析
*/
private String safeRiskAnalysis;
+
+ private String fileData;
}
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/HazopQueryDTO.java b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/HazopQueryDTO.java
index 22831e5..67ea6fe 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/HazopQueryDTO.java
+++ b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/HazopQueryDTO.java
@@ -62,6 +62,8 @@
*/
private LocalDateTime updateTime;
+ private String fileData;
+
}
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/JhaQueryDTO.java b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/JhaQueryDTO.java
index afca3b3..8e62092 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/JhaQueryDTO.java
+++ b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/JhaQueryDTO.java
@@ -40,4 +40,5 @@
* 修改时间
*/
private LocalDateTime updateTime;
+ private String fileData;
}
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/PhaQueryDTO.java b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/PhaQueryDTO.java
index 63a652b..7e9cc3b 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/PhaQueryDTO.java
+++ b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/PhaQueryDTO.java
@@ -44,6 +44,6 @@
*/
private LocalDateTime updateTime;
-
+ private String fileData;
}
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/SclQueryDTO.java b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/SclQueryDTO.java
index 02e2d3a..8a2dc6d 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/SclQueryDTO.java
+++ b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/dto/SclQueryDTO.java
@@ -46,4 +46,6 @@
*/
private LocalDateTime updateTime;
+ private String fileData;
+
}
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanIdentificationAnalogyServiceImpl.java b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanIdentificationAnalogyServiceImpl.java
index f8248b7..cd9e36b 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanIdentificationAnalogyServiceImpl.java
+++ b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanIdentificationAnalogyServiceImpl.java
@@ -109,6 +109,7 @@
analogyById.setAnalogyCheckItem(analogy.getAnalogyCheckItem());
analogyById.setAnalogyResult(analogy.getAnalogyResult());
analogyById.setAnalogyRiskFactor(analogy.getAnalogyRiskFactor());
+ analogyById.setFileData(analogy.getFileData());
// analogyById.setEducationMeasure(analogy.getEducationMeasure());
// analogyById.setManageMeasure(analogy.getManageMeasure());
// analogyById.setEmergencyMeasure(analogy.getEmergencyMeasure());
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanIdentificationHazopServiceImpl.java b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanIdentificationHazopServiceImpl.java
index 84f591a..1813bbd 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanIdentificationHazopServiceImpl.java
+++ b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanIdentificationHazopServiceImpl.java
@@ -130,6 +130,7 @@
hazopById.setHazopResult(hazop.getHazopResult());
hazopById.setHazopPossibleCauses(hazop.getHazopPossibleCauses());
hazopById.setHazopParamDesc(hazop.getHazopParamDesc());
+ hazopById.setFileData(hazop.getFileData());
// hazopById.setEducationMeasure(hazop.getEducationMeasure());
// hazopById.setManageMeasure(hazop.getManageMeasure());
// hazopById.setEmergencyMeasure(hazop.getEmergencyMeasure());
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanIdentificationJhaServiceImpl.java b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanIdentificationJhaServiceImpl.java
index 5c2d2bb..8333865 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanIdentificationJhaServiceImpl.java
+++ b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanIdentificationJhaServiceImpl.java
@@ -102,6 +102,7 @@
jhaById.setJhaResult(jha.getJhaResult());
jhaById.setJhaRiskFactor(jha.getJhaRiskFactor());
jhaById.setJhaCheckItem(jha.getJhaCheckItem());
+ jhaById.setFileData(jha.getFileData());
// jhaById.setEducationMeasure(jha.getEducationMeasure());
// jhaById.setManageMeasure(jha.getManageMeasure());
// jhaById.setEmergencyMeasure(jha.getEmergencyMeasure());
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanIdentificationPhaServiceImpl.java b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanIdentificationPhaServiceImpl.java
index ad70153..bf8a1b1 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanIdentificationPhaServiceImpl.java
+++ b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanIdentificationPhaServiceImpl.java
@@ -101,6 +101,7 @@
phaById.setPhaResult(pha.getPhaResult());
phaById.setPhaRiskFactor(pha.getPhaRiskFactor());
phaById.setPhaCheckItem(pha.getPhaCheckItem());
+ phaById.setFileData(pha.getFileData());
// phaById.setEducationMeasure(pha.getEducationMeasure());
// phaById.setManageMeasure(pha.getManageMeasure());
// phaById.setEmergencyMeasure(pha.getEmergencyMeasure());
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanIdentificationSclServiceImpl.java b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanIdentificationSclServiceImpl.java
index e5baea5..b5a251a 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanIdentificationSclServiceImpl.java
+++ b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanIdentificationSclServiceImpl.java
@@ -114,6 +114,7 @@
sclById.setSclCheckResult(scl.getSclCheckResult());
sclById.setSclCheckStandard(scl.getSclCheckStandard());
sclById.setSclCheckUnstandard(scl.getSclCheckUnstandard());
+ sclById.setFileData(scl.getFileData());
// sclById.setEducationMeasure(scl.getEducationMeasure());
// sclById.setManageMeasure(scl.getManageMeasure());
// sclById.setEmergencyMeasure(scl.getEmergencyMeasure());
diff --git a/src/main/resources/config/application-gslab.yaml b/src/main/resources/config/application-gslab.yaml
index 315b498..ae2b06a 100644
--- a/src/main/resources/config/application-gslab.yaml
+++ b/src/main/resources/config/application-gslab.yaml
@@ -60,9 +60,10 @@
path:
#基础路径
dcPath: /home/upload/laboratoryRiskManage/
- urlRootPath: /upload/
+ urlRootPath: /uploadLab/
module:
#用户模块
accountPath: /account/user/
-
+ #辨识模块
+ identification: /identification/
--
Gitblit v1.9.2