430/mdc_430.git

			@@ -1246,6 +1246,9 @@
			dto.setColor(mdcUtilizationRate.getRateParameterColor());
			}
			}
			if (StringUtils.isBlank(dto.getColor())) {
			dto.setColor(mdcUtilizationRateList.get(mdcUtilizationRateList.size() - 1).getRateParameterColor());
			}
			return dto;
			}

			@@ -463,7 +463,7 @@
			* 设备运行状态点时间转为段时间
			*/
			@Override
			@Transactional
			@Transactional(rollbackFor = Exception.class)
			public void runningAllEquipmentTraceProcess() {
			//获取所有设备
			List<Equipment> equipmentList = equipmentService.list();

			@@ -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

	lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史