commit for pull
This commit is contained in:
parent
a16cd349cc
commit
391b52b23a
@ -2,14 +2,14 @@ spring:
|
|||||||
datasource:
|
datasource:
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
#MySQL-local
|
#MySQL-local
|
||||||
# url: jdbc:mysql://10.0.1.249:3306/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
|
url: jdbc:mysql://10.0.1.249:3306/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
|
||||||
# username: cigs4
|
username: cigs4
|
||||||
# password: 1qazxsw2
|
password: 1qazxsw2
|
||||||
|
|
||||||
#MySQL-remote
|
#MySQL-remote
|
||||||
url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
|
# url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
|
||||||
username: root
|
# username: root
|
||||||
password: 1qaz@WSX3edc$RFV
|
# password: 1qaz@WSX3edc$RFV
|
||||||
# #Oracle
|
# #Oracle
|
||||||
# driver-class-name: oracle.jdbc.OracleDriver
|
# driver-class-name: oracle.jdbc.OracleDriver
|
||||||
# url: jdbc:oracle:thin:@192.168.10.10:1521:xe
|
# url: jdbc:oracle:thin:@192.168.10.10:1521:xe
|
||||||
@ -66,15 +66,15 @@ dynamic:
|
|||||||
# username: root
|
# username: root
|
||||||
# password: 1qaz@WSX3edc$RFV
|
# password: 1qaz@WSX3edc$RFV
|
||||||
## camline系统 - remote
|
## camline系统 - remote
|
||||||
camline:
|
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
|
||||||
url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
|
|
||||||
username: root
|
|
||||||
password: 1qaz@WSX3edc$RFV
|
|
||||||
#
|
|
||||||
#camline系统 - local
|
|
||||||
# camline:
|
# camline:
|
||||||
# driver-class-name: com.mysql.cj.jdbc.Driver
|
# driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
# url: jdbc:mysql://10.0.1.23:3306/synapse?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
|
# url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
|
||||||
# username: offline_data
|
# username: root
|
||||||
# password: tpvmfab4
|
# password: 1qaz@WSX3edc$RFV
|
||||||
|
#
|
||||||
|
#camline系统 - local
|
||||||
|
camline:
|
||||||
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
|
url: jdbc:mysql://10.0.1.23:3306/synapse?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
|
||||||
|
username: offline_data
|
||||||
|
password: tpvmfab4
|
@ -350,6 +350,7 @@ public class KukaJoinThread implements ApplicationRunner {
|
|||||||
//出现混档
|
//出现混档
|
||||||
boxId = getBoxId(bySubId.getSapMaterial());
|
boxId = getBoxId(bySubId.getSapMaterial());
|
||||||
}else {
|
}else {
|
||||||
|
//正常情况
|
||||||
boxId = getBoxId(bySubId.getSapMaterial());
|
boxId = getBoxId(bySubId.getSapMaterial());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -130,7 +130,7 @@ public class WoPackagingBoxSubstrateController {
|
|||||||
@PostMapping("/powerReport")
|
@PostMapping("/powerReport")
|
||||||
public Result<PowerReportVo> powerReport(@RequestBody PowerReportQueryParam queryParam){
|
public Result<PowerReportVo> powerReport(@RequestBody PowerReportQueryParam queryParam){
|
||||||
List<PowerReportDTO> powerReportDTOS = boxServiceBiz.powerReport(queryParam);
|
List<PowerReportDTO> powerReportDTOS = boxServiceBiz.powerReport(queryParam);
|
||||||
|
System.out.println(powerReportDTOS.toString());
|
||||||
PowerReportVo powerReportVo = new PowerReportVo();
|
PowerReportVo powerReportVo = new PowerReportVo();
|
||||||
Float totalLevelPower = new Float(0);
|
Float totalLevelPower = new Float(0);
|
||||||
Float totalCompensatePower = new Float(0);
|
Float totalCompensatePower = new Float(0);
|
||||||
|
Loading…
Reference in New Issue
Block a user