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

两个看板

Browse Source
dev
tengxi 2 years ago
parent 6bad6acf7b
commit 677857fb5a
3 changed files with 25678 additions and 12 deletions
Show Stats Download Patch File Download Diff File

256
linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttinjectequip/controller/TtInjectEquipController.java
Unescape View File

@ -107,7 +107,7 @@ public class TtInjectEquipController extends JeecgController<TtInjectEquip, ITtI
int randomIndex5 = 0; int randomIndex5 = 0;
int currentpressure=generator.nextInt(3)-1; int currentpressure=generator.nextInt(3)-1;
int passrate = generator.nextInt(3)-2; int passrate = generator.nextInt(3)-1;
int currenttemp=generator.nextInt(4)-2; int currenttemp=generator.nextInt(4)-2;
int clyle=generator.nextInt(11)-10; int clyle=generator.nextInt(11)-10;
TtInjectEquip injectEquip = new TtInjectEquip(); TtInjectEquip injectEquip = new TtInjectEquip();
@ -185,16 +185,72 @@ public class TtInjectEquipController extends JeecgController<TtInjectEquip, ITtI
injectEquip.setCycleTime(0); injectEquip.setCycleTime(0);
injectEquip.setOutputQty(0); injectEquip.setOutputQty(0);
}else{ }else{
injectEquip.setOpenTime(Minutes);//开机时长分钟 if (i == 1 || i==3) {
injectEquip.setCycleTime(cycletime); injectEquip.setOpenTime(Minutes);//开机时长分钟
injectEquip.setTodayQty((int)Math.round(Minutes * 2.5));//现在产量，每分钟3个 injectEquip.setCycleTime(cycletime);
injectEquip.setOutputQty((int)Math.round(Minutes * 2.5)); injectEquip.setTodayQty((int) Math.round(Minutes * 2.5));//现在产量，每分钟3个
injectEquip.setTodayProgress(injectEquip.getTodayQty()/12); injectEquip.setOutputQty((int) Math.round(Minutes * 2.5));
if(injectEquip.getTodayProgress() >= 100){//生产完成关机 injectEquip.setTodayProgress(injectEquip.getTodayQty() / 12);
injectEquip.setEquipStatus(4); if (injectEquip.getTodayProgress() >= 100) {//生产完成关机
injectEquip.setOpenTime(480); injectEquip.setEquipStatus(4);
injectEquip.setTodayProgress(100); injectEquip.setOpenTime(480);
injectEquip.setTodayQty(1200); injectEquip.setTodayProgress(100);
injectEquip.setTodayQty(1200);
injectEquip.setPassRate(valueOf(93 + passrate));
}
} else if (i == 4 || i==5) {
injectEquip.setOpenTime(Minutes);//开机时长分钟
injectEquip.setCycleTime(cycletime);
injectEquip.setTodayQty((int) Math.round(Minutes * 2.5));//现在产量，每分钟3个
injectEquip.setOutputQty((int) Math.round(Minutes * 2.5));
injectEquip.setTodayProgress(injectEquip.getTodayQty() / 12);
if (injectEquip.getTodayProgress() >= 100) {//生产完成关机
injectEquip.setEquipStatus(4);
injectEquip.setOpenTime(480);
injectEquip.setTodayProgress(100);
injectEquip.setTodayQty(1200);
injectEquip.setPassRate(valueOf(94 + passrate));
}
}
else if (i == 13 || i==15) {
injectEquip.setOpenTime(Minutes);//开机时长分钟
injectEquip.setCycleTime(cycletime);
injectEquip.setTodayQty((int) Math.round(Minutes * 2.5));//现在产量，每分钟3个
injectEquip.setOutputQty((int) Math.round(Minutes * 2.5));
injectEquip.setTodayProgress(injectEquip.getTodayQty() / 12);
if (injectEquip.getTodayProgress() >= 100) {//生产完成关机
injectEquip.setEquipStatus(4);
injectEquip.setOpenTime(480);
injectEquip.setTodayProgress(100);
injectEquip.setTodayQty(1200);
injectEquip.setPassRate(valueOf(92 + passrate));
}
}
else if (i == 17 || i==18) {
injectEquip.setOpenTime(Minutes);//开机时长分钟
injectEquip.setCycleTime(cycletime);
injectEquip.setTodayQty((int) Math.round(Minutes * 2.5));//现在产量，每分钟3个
injectEquip.setOutputQty((int) Math.round(Minutes * 2.5));
injectEquip.setTodayProgress(injectEquip.getTodayQty() / 12);
if (injectEquip.getTodayProgress() >= 100) {//生产完成关机
injectEquip.setEquipStatus(4);
injectEquip.setOpenTime(480);
injectEquip.setTodayProgress(100);
injectEquip.setTodayQty(1200);
injectEquip.setPassRate(valueOf(91 + passrate));
}
} else {
injectEquip.setOpenTime(Minutes);//开机时长分钟
injectEquip.setCycleTime(cycletime);
injectEquip.setTodayQty((int)Math.round(Minutes * 2.5));//现在产量，每分钟3个
injectEquip.setOutputQty((int)Math.round(Minutes * 2.5));
injectEquip.setTodayProgress(injectEquip.getTodayQty()/12);
if(injectEquip.getTodayProgress() >= 100){//生产完成关机
injectEquip.setEquipStatus(4);
injectEquip.setOpenTime(480);
injectEquip.setTodayProgress(100);
injectEquip.setTodayQty(1200);
}
} }
} }
@ -204,6 +260,184 @@ public class TtInjectEquipController extends JeecgController<TtInjectEquip, ITtI
return Result.OK(injectDataList); return Result.OK(injectDataList);
} }
/**
* 注塑机看板列表查询
*
* @param ttInjectEquip
* @return
*/
//@AutoLog(value = "tt_inject_equip-2.8注塑机看板列表查询(轨道扣件)")
@ApiOperation(value="tt_inject_equip-2.8注塑机看板列表查询(轨道扣件)", notes="tt_inject_equip-2.8注塑机看板列表查询(轨道扣件)")
@GetMapping(value = "/queryListSecondZhu")
public Result<List<TtInjectEquip>> queryListSecondZhu(TtInjectEquip ttInjectEquip) throws ParseException {
//select * from tt_inject_data
//order by equip_no,day_name
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
Date date = new Date();
String nowDateString = sdf.format(date);//2023-02-08 11:23 2023-02-08 08:50
List<TtInjectEquip> injectDataList = new ArrayList<>();
for(int i = 1; i<18;i++){
Random generator = new Random(); //温度随机数
int randomIndex1 = generator.nextInt( 3 ) - 1;//随机数-1到1
int randomIndex2 = generator.nextInt( 3 ) - 1;//随机数-1到1
int randomIndex3 = generator.nextInt( 3 ) - 1;//随机数-1到1
int randomIndex4 = generator.nextInt( 3 ) - 1;//随机数-1到1
int randomIndex5 = 0;
int currentpressure=generator.nextInt(3)-1;
int passrate = generator.nextInt(3)-1;
int currenttemp=generator.nextInt(4)-2;
int clyle=generator.nextInt(11)-10;
TtInjectEquip injectEquip = new TtInjectEquip();
injectEquip.setEqtNo("注塑机" + i); //注塑机编号
Object object = redisUtil.get(injectEquip.getEqtNo());
if (object != null) {
randomIndex5 = Integer.parseInt(String.valueOf(object));
}else{
randomIndex5 = generator.nextInt( 60 );//随机数0到59 45
redisUtil.set(injectEquip.getEqtNo(), randomIndex5);
}
String openTimeParam = String.valueOf(randomIndex5);
if(randomIndex5 < 10){
openTimeParam = "0" + String.valueOf(randomIndex5);
}
injectEquip.setDayName(date);
injectEquip.setDynamicMoldActTemp(String.valueOf(136 + randomIndex1)); //动模温度
injectEquip.setDynamicMoldCfgTemp(String.valueOf(136 + randomIndex2));
injectEquip.setFixedMoldActTemp(String.valueOf(136 + randomIndex3)); //定模温度
injectEquip.setFixedMoldCfgTemp(String.valueOf(136 + randomIndex4));
injectEquip.setCurrentPressure(valueOf(72+currentpressure));
injectEquip.setPassRate(valueOf(94 + passrate));
injectEquip.setCurrentTemp(valueOf(126+currenttemp));
if(i == 6 || i == 8){ //注塑机定义四种状态
injectEquip.setEquipStatus(2);
injectEquip.setOpenTime(0);
injectEquip.setTodayProgress(0);
injectEquip.setTodayQty(0);
injectEquip.setCurrentPressure(valueOf(0));
injectEquip.setCurrentTemp(valueOf(0));
injectEquip.setPassRate(valueOf(0));
injectEquip.setCycleTime(0);
injectEquip.setOutputQty(0);
}else if(i == 11 || i == 12){
injectEquip.setEquipStatus(3);
injectEquip.setOpenTime(0);
injectEquip.setTodayProgress(0);
injectEquip.setTodayQty(0);
injectEquip.setCurrentPressure(valueOf(0));
injectEquip.setCurrentTemp(valueOf(0));
injectEquip.setPassRate(valueOf(0));
injectEquip.setCycleTime(0);
injectEquip.setOutputQty(0);
}else if(i == 19){
injectEquip.setEquipStatus(4);
injectEquip.setOpenTime(0);
injectEquip.setTodayProgress(0);
injectEquip.setTodayQty(0);
injectEquip.setCurrentPressure(valueOf(0));
injectEquip.setCurrentTemp(valueOf(0));
injectEquip.setPassRate(valueOf(0));
injectEquip.setCycleTime(0);
injectEquip.setOutputQty(0);
} else{
injectEquip.setEquipStatus(1);
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();
int Minutes = (int)(time - time2) / (1000 * 60 );
int cycletime = (int)(time - time2) / (1000-clyle ); //生产节拍
if(Minutes < 0){//未到开机时间
injectEquip.setOpenTime(0);//开机时长分钟
injectEquip.setEquipStatus(4);
injectEquip.setTodayProgress(0);
injectEquip.setTodayQty(0);
injectEquip.setCurrentPressure(valueOf(0));
injectEquip.setCurrentTemp(valueOf(0));
injectEquip.setPassRate(valueOf(0));
injectEquip.setCycleTime(0);
injectEquip.setOutputQty(0);
}else{
if (i == 1 || i==3) {
injectEquip.setOpenTime(Minutes);//开机时长分钟
injectEquip.setCycleTime(cycletime);
injectEquip.setTodayQty((int) Math.round(Minutes * 2.5));//现在产量，每分钟3个
injectEquip.setOutputQty((int) Math.round(Minutes * 2.5));
injectEquip.setTodayProgress(injectEquip.getTodayQty() / 12);
if (injectEquip.getTodayProgress() >= 100) {//生产完成关机
injectEquip.setEquipStatus(4);
injectEquip.setOpenTime(480);
injectEquip.setTodayProgress(100);
injectEquip.setTodayQty(1200);
injectEquip.setPassRate(valueOf(93 + passrate));
}
} else if (i == 4 || i==5) {
injectEquip.setOpenTime(Minutes);//开机时长分钟
injectEquip.setCycleTime(cycletime);
injectEquip.setTodayQty((int) Math.round(Minutes * 2.5));//现在产量，每分钟3个
injectEquip.setOutputQty((int) Math.round(Minutes * 2.5));
injectEquip.setTodayProgress(injectEquip.getTodayQty() / 12);
if (injectEquip.getTodayProgress() >= 100) {//生产完成关机
injectEquip.setEquipStatus(4);
injectEquip.setOpenTime(480);
injectEquip.setTodayProgress(100);
injectEquip.setTodayQty(1200);
injectEquip.setPassRate(valueOf(94 + passrate));
}
}
else if (i == 13 || i==15) {
injectEquip.setOpenTime(Minutes);//开机时长分钟
injectEquip.setCycleTime(cycletime);
injectEquip.setTodayQty((int) Math.round(Minutes * 2.5));//现在产量，每分钟3个
injectEquip.setOutputQty((int) Math.round(Minutes * 2.5));
injectEquip.setTodayProgress(injectEquip.getTodayQty() / 12);
if (injectEquip.getTodayProgress() >= 100) {//生产完成关机
injectEquip.setEquipStatus(4);
injectEquip.setOpenTime(480);
injectEquip.setTodayProgress(100);
injectEquip.setTodayQty(1200);
injectEquip.setPassRate(valueOf(92 + passrate));
}
}
else if (i == 17 || i==18) {
injectEquip.setOpenTime(Minutes);//开机时长分钟
injectEquip.setCycleTime(cycletime);
injectEquip.setTodayQty((int) Math.round(Minutes * 2.5));//现在产量，每分钟3个
injectEquip.setOutputQty((int) Math.round(Minutes * 2.5));
injectEquip.setTodayProgress(injectEquip.getTodayQty() / 12);
if (injectEquip.getTodayProgress() >= 100) {//生产完成关机
injectEquip.setEquipStatus(4);
injectEquip.setOpenTime(480);
injectEquip.setTodayProgress(100);
injectEquip.setTodayQty(1200);
injectEquip.setPassRate(valueOf(91 + passrate));
}
} else {
injectEquip.setOpenTime(Minutes);//开机时长分钟
injectEquip.setCycleTime(cycletime);
injectEquip.setTodayQty((int)Math.round(Minutes * 2.5));//现在产量，每分钟3个
injectEquip.setOutputQty((int)Math.round(Minutes * 2.5));
injectEquip.setTodayProgress(injectEquip.getTodayQty()/12);
if(injectEquip.getTodayProgress() >= 100){//生产完成关机
injectEquip.setEquipStatus(4);
injectEquip.setOpenTime(480);
injectEquip.setTodayProgress(100);
injectEquip.setTodayQty(1200);
}
}
}
}
injectDataList.add(injectEquip);
}
return Result.OK(injectDataList);
}
/** /**
* 添加 * 添加

61
linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttsulfequip/controller/TtSulfEquipController.java
Unescape View File

@ -155,7 +155,66 @@ public class TtSulfEquipController extends JeecgController<TtSulfEquip, ITtSulfE
} }
return Result.OK(sulfEquipList); return Result.OK(sulfEquipList);
} }
/**
* 硫化机看板列表查询
*
* @param ttSulfEquip
* @return
*/
//@AutoLog(value = "tt_inject_data-硫化机看板列表查询")
@ApiOperation(value="tt_inject_data-硫化机看板列表查询(轨道扣件)", notes="tt_inject_data-硫化机看板列表查询(轨道扣件)")
@GetMapping(value = "/queryListSecond")
public Result<List<TtSulfEquip>> queryListSecond(TtSulfEquip ttSulfEquip) throws ParseException {
//select * from tt_inject_data
//order by equip_no,day_name
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
Date date = new Date();
String nowDateString = sdf.format(date);//2023-02-08 11:23 2023-02-08 08:50
List<TtSulfEquip> sulfEquipList = new ArrayList<>();
for(int i = 1; i<24;i++){
Random generator = new Random();
int randomIndex1 = generator.nextInt( 7 ) - 3;//随机数-1到1
int randomIndex2 = generator.nextInt( 5 ) - 2;//随机数-1到1
int randomIndex3 = generator.nextInt( 5 ) - 2;//随机数-1到1
int randomIndex4 = generator.nextInt( 5 ) - 2;//随机数-1到1
int randomIndex5 = 0;
// int randomIndex6 = generator.nextInt(201) + 300;
int[] arr = {360,420,480};
int randomIndex6 = arr[(int) (Math.random() * 3)];
TtSulfEquip sulfEquip = new TtSulfEquip();
sulfEquip.setEqtNo("硫化机" + i);
Object object = redisUtil.get(sulfEquip.getEqtNo());
if (object != null) {
randomIndex5 = Integer.parseInt(String.valueOf(object));
}else{
randomIndex5 = generator.nextInt( 60 );//随机数0到59 45
redisUtil.set(sulfEquip.getEqtNo(), randomIndex5);
}
String openTimeParam = String.valueOf(randomIndex5);
if(randomIndex5 < 10){
openTimeParam = "0" + String.valueOf(randomIndex5);
}
sulfEquip.setSulfPressure(71 + randomIndex1);
sulfEquip.setSulfTempUpper(125 + randomIndex2);
sulfEquip.setSulfTempMiddle(125 + randomIndex3);
sulfEquip.setSulfTempLower(125 + randomIndex4);
sulfEquip.setSulfTime(randomIndex6);
String openDate = nowDateString.substring(0, 10) + " 08:" + openTimeParam;//开机时间8点到9点之间2023-02-08 08:45
// sulfEquip.setOpenDate(date);
String openTime = "08:"+openTimeParam;
long time = sdf.parse(nowDateString).getTime();
long time2 = sdf.parse(openDate).getTime();
int Second = (int)(time - time2) / (1000);
sulfEquipList.add(sulfEquip);
}
return Result.OK(sulfEquipList);
}
/** /**
* 分页列表查询 * 分页列表查询
* *

25373
logs/jeecgboot-2023-02-15.0.html
View File

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