From 561f290aaead4d00d76ca9e4e20196806496b194 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 28 八月 2023 14:13:03 +0800
Subject: [PATCH] 修复bug
---
h5_standard/src/views/children.vue | 1 +
server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java | 2 +-
h5_standard/.env.development | 4 ++--
server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java | 19 ++++++++++---------
server/src/main/resources/application.yml | 2 +-
server/README.md | 4 ++++
6 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/h5_standard/.env.development b/h5_standard/.env.development
index 3621622..e73b1db 100644
--- a/h5_standard/.env.development
+++ b/h5_standard/.env.development
@@ -10,13 +10,13 @@
# VUE_APP_API = 'https://106.14.220.133:10012/'
# 钀嶅鏈湴
-# VUE_APP_API = 'http://192.168.0.12:10012/'
+ VUE_APP_API = 'http://192.168.3.219:10021/'
# 浠诲悍鏈湴
# VUE_APP_API = 'http://192.168.0.15:10021/'
# VUE_APP_API = 'http://192.168.0.127:10021/'
-VUE_APP_API = 'https://dmtest.ahapp.net/doumeeplant_api/'
+#VUE_APP_API = 'https://dmtest.ahapp.net/doumeeplant_api/'
# VUE_APP_API = 'http://192.168.0.13:10012/'
diff --git a/h5_standard/src/views/children.vue b/h5_standard/src/views/children.vue
index bd66219..0b165b2 100644
--- a/h5_standard/src/views/children.vue
+++ b/h5_standard/src/views/children.vue
@@ -36,6 +36,7 @@
const title = ref<string>('')
+ alert(window.document.title)
const pathLists = reactive<string[]>([
'/index',
'/workbench',
diff --git a/server/README.md b/server/README.md
index 6b32a18..3be8fac 100644
--- a/server/README.md
+++ b/server/README.md
@@ -1,3 +1,7 @@
鍩虹宸ョ▼锛欵va v2.0
瀹樼綉锛歨ttp://eva.adjustrd.com/
鎶�鏈敮鎸丵Q缇わ細877957236
+
+
+鍚姩鍛戒护锛�
+nohup java -Xms512m -Xmx512m -Xmn512m -XX:MetaspaceSize=256m -XX:MaxMetaspaceSize=256m -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+UseCMSCompactAtFullCollection -XX:CMSInitiatingOccupancyFraction=10021 -jar /mnt/sdc/jars/dmmestest/doumeeplant.jar >/mnt/sdc/jars/dmmestest/doumeeplant.log 2>/mnt/sdc/jars/dmmestest/doumeeplanterr.log &
diff --git a/server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java b/server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java
index 709a3e6..2b32cbe 100644
--- a/server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java
+++ b/server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java
@@ -84,7 +84,7 @@
private String companyName;
@ApiModelProperty(value = "浼佷笟鐢ㄦ埛鍚嶇О")
- @ExcelColumn(name="浼佷笟鍚嶇О", color = IndexedColors.RED, width = 16)
+ @ExcelColumn(name="浼佷笟鐢ㄦ埛鍚嶇О", color = IndexedColors.RED, width = 16)
@TableField(exist = false)
private String companyUserName;
diff --git a/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
index c9fb3a3..bd42084 100644
--- a/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
@@ -293,8 +293,8 @@
}
List<String> departName = new ArrayList<>();
List<String> procedureName = new ArrayList<>();
- plansList.forEach(s->{
-
+ int num =0;
+ for(DeviceImportDTO s : plansList){
if (StringUtils.isBlank(s.getDeviceName())
|| s.getDeviceName().length() > 50
|| StringUtils.isBlank(s.getDepartName())
@@ -303,14 +303,13 @@
|| StringUtils.isBlank(s.getFinishWarehouseLocationName())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵煎叆鏁版嵁鍐呭鏈夎");
}
- if(isRepeatCode(s.getDeviceCode(),plansList)){
+ if(isRepeatCode(s,num,plansList)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏂囨。涓澶囧彿銆�"+s.getDeviceCode()+"銆戦噸澶嶏紒");
}
departName.add(s.getDepartName());
procedureName.add(s.getProcedureName());
- });
-
-
+ num++;
+ }
plansList.forEach(s->{
@@ -431,12 +430,14 @@
});
}
- private boolean isRepeatCode(String deviceCode, List<DeviceImportDTO> plansList) {
- if(StringUtils.isNotBlank(deviceCode)){
+ private boolean isRepeatCode(DeviceImportDTO s,int num,List<DeviceImportDTO> plansList) {
+ if(StringUtils.isNotBlank(s.getDeviceCode())){
+ int tNum = 0;
for(DeviceImportDTO d :plansList){
- if(StringUtils.equals(deviceCode, d.getDeviceCode())){
+ if(num != tNum && StringUtils.equals(s.getDeviceCode(), d.getDeviceCode())){
return true;
}
+ tNum++;
}
}
return false;
diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
index 72fcf23..dd0fac5 100644
--- a/server/src/main/resources/application.yml
+++ b/server/src/main/resources/application.yml
@@ -10,7 +10,7 @@
# application:
# name: doumeemes
profiles:
- active: standard
+ active: standardPro
# JSON杩斿洖閰嶇疆
jackson:
# 榛樿鏃跺尯
--
Gitblit v1.9.3