From 3472b68d306930629b425a51d305441727890c4d Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 11 七月 2025 10:31:08 +0800
Subject: [PATCH] 系统参数配置
---
lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml | 10 +++++-----
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamMaintenanceStandardRequest.java | 3 ---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java | 29 ++++++++++-------------------
3 files changed, 15 insertions(+), 27 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamMaintenanceStandardRequest.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamMaintenanceStandardRequest.java
index 544d7de..646bdc3 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamMaintenanceStandardRequest.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamMaintenanceStandardRequest.java
@@ -62,9 +62,6 @@
/**鍒楄〃 淇濆吇椤规槑缁�*/
@ApiModelProperty(value = "鍒楄〃 淇濆吇椤规槑缁�")
private List<EamMaintenanceStandardDetail> tableDetailList;
- /**鍒犻櫎 淇濆吇椤规槑缁�*/
- @ApiModelProperty(value = "鍒犻櫎 淇濆吇椤规槑缁�")
- private List<EamMaintenanceStandardDetail> removeDetailList;
/**
* Excel瀵煎叆鏃朵娇鐢�
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
index 73d7efd..356394f 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
@@ -209,27 +209,19 @@
entity.setMaintenancePeriod(standardRequest.getMaintenancePeriod());
eamMaintenanceStandardMapper.updateById(entity);
//澶勭悊璇︽儏
- if (CollectionUtil.isNotEmpty(standardRequest.getTableDetailList())) {
+ if(CollectionUtil.isNotEmpty(standardRequest.getTableDetailList())) {
List<EamMaintenanceStandardDetail> addList = new ArrayList<>();
- List<EamMaintenanceStandardDetail> updateList = new ArrayList<>();
+ //鍏堝垹闄ゅ師鏈�
+ LambdaQueryWrapper<EamMaintenanceStandardDetail> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EamMaintenanceStandardDetail::getStandardId, standardRequest.getId());
+ eamMaintenanceStandardDetailService.remove(queryWrapper);
standardRequest.getTableDetailList().forEach(tableDetail -> {
- tableDetail.setStandardId(entity.getId());
- if (tableDetail.getId() == null) {
- addList.add(tableDetail);
- } else {
- updateList.add(tableDetail);
- }
+ EamMaintenanceStandardDetail eamMaintenanceStandardDetail=new EamMaintenanceStandardDetail();
+ BeanUtils.copyProperties(tableDetail, eamMaintenanceStandardDetail);
+ eamMaintenanceStandardDetail.setStandardId(entity.getId());
+ addList.add(eamMaintenanceStandardDetail);
});
- if (CollectionUtil.isNotEmpty(addList)) {
- eamMaintenanceStandardDetailService.saveBatch(addList);
- }
- if (CollectionUtil.isNotEmpty(updateList)) {
- eamMaintenanceStandardDetailService.updateBatchById(updateList);
- }
- }
- if (CollectionUtil.isNotEmpty(standardRequest.getRemoveDetailList())) {
- List<String> ids = standardRequest.getRemoveDetailList().stream().map(EamMaintenanceStandardDetail::getId).collect(Collectors.toList());
- eamMaintenanceStandardDetailService.removeBatchByIds(ids);
+ eamMaintenanceStandardDetailService.saveBatch(addList);
}
return true;
}
@@ -1176,7 +1168,6 @@
// 鍒涘缓淇濆吇椤圭洰
EamMaintenanceStandardDetail item = new EamMaintenanceStandardDetail();
- item.setItemCategory("THIRD_MAINTENANCE");
item.setStandardId(standardId);
int colCount = row.getTableCells().size();
diff --git a/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml b/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
index fee63df..c357e78 100644
--- a/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
+++ b/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
@@ -89,7 +89,7 @@
- classpath:/templates
# 璁剧疆闈欐�佹枃浠惰矾寰勶紝js,css绛�
mvc:
- static-path-pattern: /**
+ static-path-pattern: C:\Users\root\Desktop\**
#Spring Boot 2.6+鍚庢槧灏勫尮閰嶇殑榛樿绛栫暐宸蹭粠AntPathMatcher鏇存敼涓篜athPatternParser,闇�瑕佹墜鍔ㄦ寚瀹氫负ant-path-matcher
pathmatch:
matching-strategy: ant_path_matcher
@@ -132,11 +132,11 @@
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource:
master:
- url: jdbc:sqlserver://192.168.1.118:1433;databasename=LXZN_TEST_430
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=LXZN_TEST_430_NEW
# url: jdbc:sqlserver://localhost:1433;databasename=LXZN_TEST_430
# url: jdbc:sqlserver://192.168.124.118:1433;databasename=EAM_430_TEST
username: sa
- password: 123
+ password:
driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
# 澶氭暟鎹簮閰嶇疆
#multi-datasource1:
@@ -149,7 +149,7 @@
database: 0
host: 127.0.0.1
port: 6379
- password:
+ password: "123456"
#mybatis plus 璁剧疆
mybatis-plus:
mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
@@ -304,4 +304,4 @@
url: http://localhost:8081/services/EquipmentService?wsdl
namespace: http://service.server.webservice.example.com
statusMethod: equipmentStatus
- rateMethod: equipmentRate
\ No newline at end of file
+ rateMethod: equipmentRate
--
Gitblit v1.9.3