From 93c97d5894ce481a567b7fd8769436388f3897a8 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 27 九月 2023 10:23:42 +0800
Subject: [PATCH] 优化配置
---
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1202Rep.java | 2
src/main/resources/application-pro5322.yml | 57 ++++++++++++++++++++++++++++
src/main/java/com/fzzy/api/view/Api1111.view.xml | 9 ++++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java | 2
4 files changed, 68 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/fzzy/api/view/Api1111.view.xml b/src/main/java/com/fzzy/api/view/Api1111.view.xml
index fa078c0..a0c9e09 100644
--- a/src/main/java/com/fzzy/api/view/Api1111.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1111.view.xml
@@ -45,6 +45,10 @@
<Property></Property>
<Property name="label">澶囨敞</Property>
</PropertyDef>
+ <PropertyDef name="hkCameraIndexCode">
+ <Property></Property>
+ <Property name="label">娴峰悍璁惧鍞竴鏍囪瘑</Property>
+ </PropertyDef>
<PropertyDef name="czbz">
<Property></Property>
<Property name="label">鎿嶄綔鏍囧織</Property>
@@ -305,6 +309,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">hkCameraIndexCode</Property>
+ <Property name="property">hkCameraIndexCode</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">czbz</Property>
<Property name="property">czbz</Property>
<Editor/>
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
index 9aa6057..7607a98 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
@@ -154,7 +154,7 @@
apiData.setJyjg("1");
}
apiData.setJyrxm(sysData.getCheckUser());
- apiData.setJysj(DateUtils.addMinutes(sysData.getRegisterTime(), 90));
+ apiData.setJysj(DateUtils.addMinutes(sysData.getRegisterTime(), 30));
//绮鍝佺
String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1202Rep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1202Rep.java
index fb2fc99..95446b6 100644
--- a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1202Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1202Rep.java
@@ -25,7 +25,7 @@
* @param end
* @return
*/
- @Query("from Fz40InoutRecord where deptId=:deptId and type=:type and updateTime >=:start and updateTime <:end order by id ")
+ @Query("from Fz40InoutRecord where deptId=:deptId and type=:type and updateTime >=:start and updateTime <=:end order by id ")
List<Fz40InoutRecord> listInoutRecord(@Param("deptId") String deptId, @Param("type") String type, @Param("start") Date start, @Param("end") Date end);
/**
diff --git a/src/main/resources/application-pro5322.yml b/src/main/resources/application-pro5322.yml
new file mode 100644
index 0000000..cad01d7
--- /dev/null
+++ b/src/main/resources/application-pro5322.yml
@@ -0,0 +1,57 @@
+########################## 骞夸笢寰愰椈 ##########################
+server:
+ port: 8090
+ jetty:
+ max-http-post-size: 209715200
+ tomcat:
+ max-http-post-size: 209715200
+spring:
+ datasource:
+ #涓绘暟鎹簮
+ primary:
+ url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8
+ username: root
+ password: Abc123..
+ driver-class-name: com.mysql.jdbc.Driver
+ #娆℃暟鎹簮
+ secondary:
+ url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
+ username: root
+ password: Abc123..
+ driver-class-name: com.mysql.jdbc.Driver
+ jpa:
+ #涓籮pa閰嶇疆
+ primary:
+ show-sql: true
+ properties:
+ hibernate:
+ hbm2ddl:
+ auto: update
+ dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+ #娆pa閰嶇疆
+ secondary:
+ show-sql: true
+ properties:
+ hibernate:
+ hbm2ddl:
+ auto: none
+ dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+ # Redis鐩稿叧閰嶇疆
+ redis:
+ database: 0
+ host: 127.0.0.1
+ port: 6379
+ password: Abc123..
+ # 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
+ pool:
+ max-active: 200
+ max-wait: -1
+ max-idle: 10
+ min-idle: 0
+ timeout: 6000
+igds:
+ default:
+ companyId: 5322
+
+ file-path: D:/IGDS-API/FILE/
+ img-path: D:/IGDS/FILE/
\ No newline at end of file
--
Gitblit v1.9.3