From 9fc717ae162697c0f80902528c434e478e265b35 Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期一, 21 八月 2023 10:12:09 +0800
Subject: [PATCH] 利用率走势分析数据修正
---
lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml | 9 ++++-----
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java | 2 +-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java | 3 +++
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
index ea4a22a..c1803fa 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
@@ -1246,6 +1246,9 @@
dto.setColor(mdcUtilizationRate.getRateParameterColor());
}
}
+ if (StringUtils.isBlank(dto.getColor())) {
+ dto.setColor(mdcUtilizationRateList.get(mdcUtilizationRateList.size() - 1).getRateParameterColor());
+ }
return dto;
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java
index 744dc2e..7e33d94 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java
@@ -463,7 +463,7 @@
* 璁惧杩愯鐘舵�佺偣鏃堕棿杞负娈垫椂闂�
*/
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public void runningAllEquipmentTraceProcess() {
//鑾峰彇鎵�鏈夎澶�
List<Equipment> equipmentList = equipmentService.list();
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 8e154cd..c23eb74 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
@@ -1,5 +1,5 @@
server:
- port: 8080
+ port: 9999
tomcat:
max-swallow-size: -1
error:
@@ -132,11 +132,10 @@
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource:
master:
-# url: jdbc:sqlserver://192.168.0.29:1433;databasename=LXZN_TEST_430
- url: jdbc:sqlserver://30036q420j.yicp.fun:11047;databasename=LXZN_TEST_430
+ url: jdbc:sqlserver://192.168.0.118:1433;databasename=LXZN_TEST_430
username: sa
-# password: LXZN@1688
password: 123
+ #password: 123
driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
#url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
#username: root
@@ -153,7 +152,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
--
Gitblit v1.9.3