linkage
/
TTXH-MES
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

Browse Source
dev
杨世强 2 years ago
parent 0374a02f7c
commit f97c6d6262
7 changed files with 2453 additions and 23 deletions
Show Stats Download Patch File Download Diff File

10
linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/virsualachrate/controller/TtVirsualAchRateController.java
Unescape View File

@ -296,7 +296,7 @@ public class TtVirsualAchRateController extends JeecgController<TtVirsualAchRate
list4.add(virsualAchRate); list4.add(virsualAchRate);
} }
}else{ }else{
int randomIndex5 = 80;//随机数0到59 45 int randomIndex5 = 70;//随机数0到59 45
String[] dayKeyArr = dayKey.toString().split("_"); String[] dayKeyArr = dayKey.toString().split("_");
String outputQtys1 = ""; String outputQtys1 = "";
String outputQtys2 = ""; String outputQtys2 = "";
@ -306,7 +306,7 @@ public class TtVirsualAchRateController extends JeecgController<TtVirsualAchRate
TtVirsualAchRate virsualAchRate = new TtVirsualAchRate(); TtVirsualAchRate virsualAchRate = new TtVirsualAchRate();
virsualAchRate.setCompanyId(1); virsualAchRate.setCompanyId(1);
virsualAchRate.setDayName(sdf.parse(dayKeyArr[i])); virsualAchRate.setDayName(sdf.parse(dayKeyArr[i]));
randomIndex5 = generator.nextInt( 21 ) + 80;//随机数80到100 85 randomIndex5 = generator.nextInt( 21 ) + 75;//随机数80到100 85
virsualAchRate.setAchRate(randomIndex5); virsualAchRate.setAchRate(randomIndex5);
virsualAchRate.setPsName("CCD选别"); virsualAchRate.setPsName("CCD选别");
list1.add(virsualAchRate); list1.add(virsualAchRate);
@ -316,7 +316,7 @@ public class TtVirsualAchRateController extends JeecgController<TtVirsualAchRate
TtVirsualAchRate virsualAchRate = new TtVirsualAchRate(); TtVirsualAchRate virsualAchRate = new TtVirsualAchRate();
virsualAchRate.setCompanyId(1); virsualAchRate.setCompanyId(1);
virsualAchRate.setDayName(sdf.parse(dayKeyArr[i])); virsualAchRate.setDayName(sdf.parse(dayKeyArr[i]));
randomIndex5 = generator.nextInt( 21 ) + 80;//随机数80到100 85 randomIndex5 = generator.nextInt( 21 ) + 75;//随机数80到100 85
virsualAchRate.setAchRate(randomIndex5); virsualAchRate.setAchRate(randomIndex5);
virsualAchRate.setPsName("包装"); virsualAchRate.setPsName("包装");
list2.add(virsualAchRate); list2.add(virsualAchRate);
@ -326,7 +326,7 @@ public class TtVirsualAchRateController extends JeecgController<TtVirsualAchRate
TtVirsualAchRate virsualAchRate = new TtVirsualAchRate(); TtVirsualAchRate virsualAchRate = new TtVirsualAchRate();
virsualAchRate.setCompanyId(1); virsualAchRate.setCompanyId(1);
virsualAchRate.setDayName(sdf.parse(dayKeyArr[i])); virsualAchRate.setDayName(sdf.parse(dayKeyArr[i]));
randomIndex5 = generator.nextInt( 21 ) + 80;//随机数80到100 85 randomIndex5 = generator.nextInt( 21 ) + 75;//随机数80到100 85
virsualAchRate.setAchRate(randomIndex5); virsualAchRate.setAchRate(randomIndex5);
virsualAchRate.setPsName("修检"); virsualAchRate.setPsName("修检");
list2.add(virsualAchRate); list2.add(virsualAchRate);
@ -336,7 +336,7 @@ public class TtVirsualAchRateController extends JeecgController<TtVirsualAchRate
TtVirsualAchRate virsualAchRate = new TtVirsualAchRate(); TtVirsualAchRate virsualAchRate = new TtVirsualAchRate();
virsualAchRate.setCompanyId(1); virsualAchRate.setCompanyId(1);
virsualAchRate.setDayName(sdf.parse(dayKeyArr[i])); virsualAchRate.setDayName(sdf.parse(dayKeyArr[i]));
randomIndex5 = generator.nextInt( 21 ) + 80;//随机数80到100 85 randomIndex5 = generator.nextInt( 21 ) + 75;//随机数80到100 85
virsualAchRate.setAchRate(randomIndex5); virsualAchRate.setAchRate(randomIndex5);
virsualAchRate.setPsName("注塑"); virsualAchRate.setPsName("注塑");
list2.add(virsualAchRate); list2.add(virsualAchRate);

16
linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/virsualoutput/controller/TtVirsualOutputController.java
Unescape View File

@ -186,10 +186,10 @@ public class TtVirsualOutputController extends JeecgController<TtVirsualOutput,
StringBuilder dayKey = new StringBuilder();//redis日期的key 2023-02-13_2023-02-12_2023-02-11_2023-02-10_2023-02-09_2023-02-08_2023-02-07_1 _1代表 StringBuilder dayKey = new StringBuilder();//redis日期的key 2023-02-13_2023-02-12_2023-02-11_2023-02-10_2023-02-09_2023-02-08_2023-02-07_1 _1代表
//获取当前日期前一天的日期 //获取当前日期前一天的日期
LocalDate localDate = LocalDate.now().minusDays(1); LocalDate localDate = LocalDate.now().minusDays(1);
dayKey.append(localDate.toString() + "_"); // dayKey.append(localDate.toString() + "_");
localDate = localDate.minusDays(1); // localDate = localDate.minusDays(1);
dayKey.append(localDate.toString() + "_"); // dayKey.append(localDate.toString() + "_");
localDate = localDate.minusDays(1); // localDate = localDate.minusDays(1);
dayKey.append(localDate.toString() + "_"); dayKey.append(localDate.toString() + "_");
localDate = localDate.minusDays(1); localDate = localDate.minusDays(1);
dayKey.append(localDate.toString() + "_"); dayKey.append(localDate.toString() + "_");
@ -230,22 +230,22 @@ public class TtVirsualOutputController extends JeecgController<TtVirsualOutput,
String[] dayKeyArr = dayKey.toString().split("_"); String[] dayKeyArr = dayKey.toString().split("_");
String outputQtys1 = ""; String outputQtys1 = "";
String outputQtys2 = ""; String outputQtys2 = "";
for(int i=0;i<7;i++){ for(int i=0;i<5;i++){
TtVirsualOutput virsualOutput = new TtVirsualOutput(); TtVirsualOutput virsualOutput = new TtVirsualOutput();
virsualOutput.setCompanyId(1); virsualOutput.setCompanyId(1);
virsualOutput.setDayName(sdf.parse(dayKeyArr[i])); virsualOutput.setDayName(sdf.parse(dayKeyArr[i]));
randomIndex5 = generator.nextInt( 60 ) + 1;//随机数1到60 45 randomIndex5 = generator.nextInt( 60 ) + 1;//随机数1到60 45
virsualOutput.setOutputQty(800 + (randomIndex5 * 9)); virsualOutput.setOutputQty(700 + (randomIndex5 * 9));
virsualOutput.setTypeId(1);//底座 virsualOutput.setTypeId(1);//底座
list1.add(virsualOutput); list1.add(virsualOutput);
outputQtys1 = outputQtys1 + virsualOutput.getOutputQty() + "_"; outputQtys1 = outputQtys1 + virsualOutput.getOutputQty() + "_";
} }
for(int i=0;i<7;i++){ for(int i=0;i<5;i++){
TtVirsualOutput virsualOutput = new TtVirsualOutput(); TtVirsualOutput virsualOutput = new TtVirsualOutput();
virsualOutput.setCompanyId(1); virsualOutput.setCompanyId(1);
virsualOutput.setDayName(sdf.parse(dayKeyArr[i])); virsualOutput.setDayName(sdf.parse(dayKeyArr[i]));
randomIndex5 = generator.nextInt( 60 ) + 1;//随机数1到60 45 randomIndex5 = generator.nextInt( 60 ) + 1;//随机数1到60 45
virsualOutput.setOutputQty(800 + (randomIndex5 * 9)); virsualOutput.setOutputQty(700 + (randomIndex5 * 9));
virsualOutput.setTypeId(2);//底座 virsualOutput.setTypeId(2);//底座
list2.add(virsualOutput); list2.add(virsualOutput);
outputQtys2 = outputQtys2 + virsualOutput.getOutputQty() + "_"; outputQtys2 = outputQtys2 + virsualOutput.getOutputQty() + "_";

4
linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/virsualpassrate/controller/TtVirsualPassRateController.java
Unescape View File

@ -142,7 +142,7 @@ public class TtVirsualPassRateController extends JeecgController<TtVirsualPassRa
TtVirsualPassRate virsualPassRate = new TtVirsualPassRate(); TtVirsualPassRate virsualPassRate = new TtVirsualPassRate();
virsualPassRate.setCompanyId(1); virsualPassRate.setCompanyId(1);
virsualPassRate.setDayName(sdf.parse(dayKeyArr[i])); virsualPassRate.setDayName(sdf.parse(dayKeyArr[i]));
randomIndex5 = generator.nextInt( 21 ) + 80;//随机数80到100 85 randomIndex5 = generator.nextInt( 21 ) + 75;//随机数80到100 85
virsualPassRate.setPassRate(randomIndex5); virsualPassRate.setPassRate(randomIndex5);
virsualPassRate.setTypeId(1);//底座 virsualPassRate.setTypeId(1);//底座
list1.add(virsualPassRate); list1.add(virsualPassRate);
@ -152,7 +152,7 @@ public class TtVirsualPassRateController extends JeecgController<TtVirsualPassRa
TtVirsualPassRate virsualPassRate = new TtVirsualPassRate(); TtVirsualPassRate virsualPassRate = new TtVirsualPassRate();
virsualPassRate.setCompanyId(1); virsualPassRate.setCompanyId(1);
virsualPassRate.setDayName(sdf.parse(dayKeyArr[i])); virsualPassRate.setDayName(sdf.parse(dayKeyArr[i]));
randomIndex5 = generator.nextInt( 21 ) + 80;//随机数80到100 85 randomIndex5 = generator.nextInt( 21 ) + 75;//随机数80到100 85
virsualPassRate.setPassRate(randomIndex5); virsualPassRate.setPassRate(randomIndex5);
virsualPassRate.setTypeId(2);//底座 virsualPassRate.setTypeId(2);//底座
list2.add(virsualPassRate); list2.add(virsualPassRate);

16
linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/virsualshipping/controller/TtVirsualShippingController.java
Unescape View File

@ -177,10 +177,10 @@ public class TtVirsualShippingController extends JeecgController<TtVirsualShippi
StringBuilder dayKey = new StringBuilder();//redis日期的key 2023-02-13_2023-02-12_2023-02-11_2023-02-10_2023-02-09_2023-02-08_2023-02-07_1 _1代表 StringBuilder dayKey = new StringBuilder();//redis日期的key 2023-02-13_2023-02-12_2023-02-11_2023-02-10_2023-02-09_2023-02-08_2023-02-07_1 _1代表
//获取当前日期前一天的日期 //获取当前日期前一天的日期
LocalDate localDate = LocalDate.now().minusDays(1); LocalDate localDate = LocalDate.now().minusDays(1);
dayKey.append(localDate.toString() + "_"); // dayKey.append(localDate.toString() + "_");
localDate = localDate.minusDays(1); // localDate = localDate.minusDays(1);
dayKey.append(localDate.toString() + "_"); // dayKey.append(localDate.toString() + "_");
localDate = localDate.minusDays(1); // localDate = localDate.minusDays(1);
dayKey.append(localDate.toString() + "_"); dayKey.append(localDate.toString() + "_");
localDate = localDate.minusDays(1); localDate = localDate.minusDays(1);
dayKey.append(localDate.toString() + "_"); dayKey.append(localDate.toString() + "_");
@ -221,22 +221,22 @@ public class TtVirsualShippingController extends JeecgController<TtVirsualShippi
String[] dayKeyArr = dayKey.toString().split("_"); String[] dayKeyArr = dayKey.toString().split("_");
String outputQtys1 = ""; String outputQtys1 = "";
String outputQtys2 = ""; String outputQtys2 = "";
for(int i=0;i<7;i++){ for(int i=0;i<5;i++){
TtVirsualShipping virsualShipping = new TtVirsualShipping(); TtVirsualShipping virsualShipping = new TtVirsualShipping();
virsualShipping.setCompanyId(1); virsualShipping.setCompanyId(1);
virsualShipping.setDayName(sdf.parse(dayKeyArr[i])); virsualShipping.setDayName(sdf.parse(dayKeyArr[i]));
randomIndex5 = generator.nextInt( 60 ) + 1;//随机数1到60 45 randomIndex5 = generator.nextInt( 60 ) + 1;//随机数1到60 45
virsualShipping.setShippingQty(800 + (randomIndex5 * 9)); virsualShipping.setShippingQty(700 + (randomIndex5 * 9));
virsualShipping.setTypeId(1);//底座 virsualShipping.setTypeId(1);//底座
list1.add(virsualShipping); list1.add(virsualShipping);
outputQtys1 = outputQtys1 + virsualShipping.getShippingQty() + "_"; outputQtys1 = outputQtys1 + virsualShipping.getShippingQty() + "_";
} }
for(int i=0;i<7;i++){ for(int i=0;i<5;i++){
TtVirsualShipping virsualShipping = new TtVirsualShipping(); TtVirsualShipping virsualShipping = new TtVirsualShipping();
virsualShipping.setCompanyId(1); virsualShipping.setCompanyId(1);
virsualShipping.setDayName(sdf.parse(dayKeyArr[i])); virsualShipping.setDayName(sdf.parse(dayKeyArr[i]));
randomIndex5 = generator.nextInt( 60 ) + 1;//随机数1到60 45 randomIndex5 = generator.nextInt( 60 ) + 1;//随机数1到60 45
virsualShipping.setShippingQty(800 + (randomIndex5 * 9)); virsualShipping.setShippingQty(700 + (randomIndex5 * 9));
virsualShipping.setTypeId(2);//底座 virsualShipping.setTypeId(2);//底座
list2.add(virsualShipping); list2.add(virsualShipping);
outputQtys2 = outputQtys2 + virsualShipping.getShippingQty() + "_"; outputQtys2 = outputQtys2 + virsualShipping.getShippingQty() + "_";

63
linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/virsualwostatus/controller/TtVirsualWoStatusController.java
Unescape View File

@ -148,6 +148,69 @@ public class TtVirsualWoStatusController extends JeecgController<TtVirsualWoStat
return Result.OK(list); return Result.OK(list);
} }
//@AutoLog(value = "tt_virsual_wo_status-新总的看板2列表查询")
@ApiOperation(value="tt_virsual_wo_status-轨道扣件2列表查询", notes="tt_virsual_wo_status-轨道扣件2列表查询")
@GetMapping(value = "/queryList2")
public Result<List<TtVirsualWoStatus>> queryList2(TtVirsualWoStatus ttVirsualWoStatus) throws ParseException {
List<TtVirsualWoStatus> list = new ArrayList<>();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
Date date = new Date();
String nowDateString = sdf.format(date);//2023-02-08 11:23
for(int i=1;i<6;i++){
TtVirsualWoStatus virsualWoStatus = new TtVirsualWoStatus();
virsualWoStatus.setCompanyId(1);
virsualWoStatus.setWoStatus("正常");
virsualWoStatus.setTypeId(1);
Random generator = new Random();
int randomIndex5 = 0;
Object object = redisUtil.get("注塑机" + i);
if (object != null) {
randomIndex5 = Integer.parseInt(String.valueOf(object));
}else{
randomIndex5 = generator.nextInt( 60 );//随机数0到59 45
redisUtil.set("注塑机" + i, randomIndex5);
}
String openTimeParam = String.valueOf(randomIndex5);
if(randomIndex5 < 10){
openTimeParam = "0" + String.valueOf(randomIndex5);
}
String openDate = nowDateString.substring(0, 10) + " 08:" + openTimeParam;//开机时间8点到9点之间2023-02-08 08:45
long time = date.getTime();
long time2 = sdf.parse(openDate).getTime();
long time3 = (time-time2)*100/ (long) (1000 * 60 * 480);
int progress = (int) time3 ;
if(progress>0) {
virsualWoStatus.setProgress(new BigDecimal("0." + progress));
}else{
virsualWoStatus.setProgress(new BigDecimal("0"));
}
if(i == 1){
virsualWoStatus.setWoNo("G23020193");
virsualWoStatus.setPartNo("G5-10-16");
virsualWoStatus.setPartName("轨距块");
}else if(i==2){
virsualWoStatus.setWoNo("G23020205");
virsualWoStatus.setPartNo("G5-10-29");
virsualWoStatus.setPartName("轨距块");
}else if(i==3){
virsualWoStatus.setWoNo("G23020206");
virsualWoStatus.setPartNo("W7-58-06");
virsualWoStatus.setPartName("挡板座");
}else if(i==4){
virsualWoStatus.setWoNo("G23020212");
virsualWoStatus.setPartNo("W7-58-07");
virsualWoStatus.setPartName("挡板座");
}else if(i==5){
virsualWoStatus.setWoNo("G23020214");
virsualWoStatus.setPartNo("W7-51-32");
virsualWoStatus.setPartName("挡板座");
// virsualWoStatus.setWoStatus("超期");
}
list.add(virsualWoStatus);
}
return Result.OK(list);
}
/** /**
* 添加 * 添加
* *

68
logs/error-log.html
Unescape View File

@ -1864,3 +1864,71 @@ TD.Exception { background: #A2AEE8; font-family: courier, monospace;}
<td class="LineOfCaller">LineOfCaller</td> <td class="LineOfCaller">LineOfCaller</td>
</tr> </tr>
</table>
</body></html><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html>
<head>
<title>Logback Log Messages</title>
<style type="text/css">
table { margin-left: 2em; margin-right: 2em; border-left: 2px solid #AAA; }
TR.even { background: #FFFFFF; }
TR.odd { background: #EAEAEA; }
TR.warn TD.Level, TR.error TD.Level, TR.fatal TD.Level {font-weight: bold; color: #FF4040 }
TD { padding-right: 1ex; padding-left: 1ex; border-right: 2px solid #AAA; }
TD.Time, TD.Date { text-align: right; font-family: courier, monospace; font-size: smaller; }
TD.Thread { text-align: left; }
TD.Level { text-align: right; }
TD.Logger { text-align: left; }
TR.header { background: #596ED5; color: #FFF; font-weight: bold; font-size: larger; }
TD.Exception { background: #A2AEE8; font-family: courier, monospace;}
</style>
</head>
<body>
<hr/>
<p>Log session start time Thu Feb 16 17:37:53 CST 2023</p><p></p>
<table cellspacing="0">
<tr class="header">
<td class="Level">Level</td>
<td class="Date">Date</td>
<td class="Message">Message</td>
<td class="MethodOfCaller">MethodOfCaller</td>
<td class="FileOfCaller">FileOfCaller</td>
<td class="LineOfCaller">LineOfCaller</td>
</tr>
</table>
</body></html><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html>
<head>
<title>Logback Log Messages</title>
<style type="text/css">
table { margin-left: 2em; margin-right: 2em; border-left: 2px solid #AAA; }
TR.even { background: #FFFFFF; }
TR.odd { background: #EAEAEA; }
TR.warn TD.Level, TR.error TD.Level, TR.fatal TD.Level {font-weight: bold; color: #FF4040 }
TD { padding-right: 1ex; padding-left: 1ex; border-right: 2px solid #AAA; }
TD.Time, TD.Date { text-align: right; font-family: courier, monospace; font-size: smaller; }
TD.Thread { text-align: left; }
TD.Level { text-align: right; }
TD.Logger { text-align: left; }
TR.header { background: #596ED5; color: #FFF; font-weight: bold; font-size: larger; }
TD.Exception { background: #A2AEE8; font-family: courier, monospace;}
</style>
</head>
<body>
<hr/>
<p>Log session start time Thu Feb 16 17:44:41 CST 2023</p><p></p>
<table cellspacing="0">
<tr class="header">
<td class="Level">Level</td>
<td class="Date">Date</td>
<td class="Message">Message</td>
<td class="MethodOfCaller">MethodOfCaller</td>
<td class="FileOfCaller">FileOfCaller</td>
<td class="LineOfCaller">LineOfCaller</td>
</tr>

2299
logs/jeecgboot-2023-02-16.0.html
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save