From 9b60d9da7a5b6c771b0b2653e5cbb484f3974eb8 Mon Sep 17 00:00:00 2001
From: ccongli <1441652193@qq.com>
Date: Tue, 18 Apr 2023 10:20:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A9=E5=8F=B0=E7=A5=A5=E5=92=8C=E6=B3=A8?=
 =?UTF-8?q?=E5=A1=91=E6=9C=BA=E5=A4=A7=E5=B1=8F=E5=81=87=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/dashboard/Analysis.vue          |  31 +--
 .../org/jeecg/config/shiro/ShiroConfig.java   |   1 +
 .../controller/TtInjectEquipController.java   | 199 +-----------------
 .../mapper/xml/TtSulfEquipMapper.xml          |   4 +-
 4 files changed, 24 insertions(+), 211 deletions(-)

diff --git a/ant-design-vue/src/views/dashboard/Analysis.vue b/ant-design-vue/src/views/dashboard/Analysis.vue
index 65487cb..06ef689 100644
--- a/ant-design-vue/src/views/dashboard/Analysis.vue
+++ b/ant-design-vue/src/views/dashboard/Analysis.vue
@@ -1,18 +1,19 @@
-<!--<template>-->
-<!--  <div>-->
-<!--    <index-chart v-if="indexStyle==1"></index-chart>-->
-<!--    <index-bdc v-if="indexStyle==2"></index-bdc>-->
-<!--    <index-task v-if="indexStyle==3"></index-task>-->
-<!--    <div style="width: 100%;text-align: right;margin-top: 20px">-->
-<!--      请选择首页样式：-->
-<!--      <a-radio-group v-model="indexStyle">-->
-<!--        <a-radio :value="1">统计图表</a-radio>-->
-<!--        <a-radio :value="2">统计图表2</a-radio>-->
-<!--        <a-radio :value="3">任务表格</a-radio>-->
-<!--      </a-radio-group>-->
-<!--    </div>-->
-<!--  </div>-->
-<!--</template>-->
+<template>
+ <div>
+   <!-- <index-chart v-if="indexStyle==1"></index-chart>
+   <index-bdc v-if="indexStyle==2"></index-bdc>
+   <index-task v-if="indexStyle==3"></index-task>
+   <div style="width: 100%;text-align: right;margin-top: 20px">
+     请选择首页样式：
+     <a-radio-group v-model="indexStyle">
+       <a-radio :value="1">统计图表</a-radio>
+       <a-radio :value="2">统计图表2</a-radio>
+       <a-radio :value="3">任务表格</a-radio>
+     </a-radio-group> -->
+   <!-- </div> -->
+   <h1> 欢迎登录天台祥和设备管理系统！</h1>
+ </div>
+</template>
 
 <script>
   import IndexChart from './IndexChart'
diff --git a/linkage-boot/linkage-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/linkage-boot/linkage-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
index 701bfb9..78c7482 100644
--- a/linkage-boot/linkage-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
+++ b/linkage-boot/linkage-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
@@ -142,6 +142,7 @@ public class ShiroConfig {
         // 大屏看板不需要权限认证
         filterChainDefinitionMap.put("/ttpouringequip/ttPouringEquip/pouringScreen", "anon");
         filterChainDefinitionMap.put("/ttsulfequip/ttSulfEquip/sulfScreen", "anon");
+        filterChainDefinitionMap.put("/ttinjectequip/ttInjectEquip/injectScreen", "anon");
 
         //websocket排除
         filterChainDefinitionMap.put("/websocket/**", "anon");//系统通知和公告
diff --git a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttinjectequip/controller/TtInjectEquipController.java b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttinjectequip/controller/TtInjectEquipController.java
index 0f8ea0d..d60befe 100644
--- a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttinjectequip/controller/TtInjectEquipController.java
+++ b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttinjectequip/controller/TtInjectEquipController.java
@@ -83,17 +83,13 @@ public class TtInjectEquipController extends JeecgController<TtInjectEquip, ITtI
 
 
 	 /**
-	  * 注塑机看板列表查询
-	  *
-	  * @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 = "/queryList")
-	 public Result<List<TtInjectEquip>> queryList(TtInjectEquip ttInjectEquip) throws ParseException {
-		 //select * from tt_inject_data
-		 //order by equip_no,day_name
+	 @ApiOperation(value="注塑机看板数据查询（假）", notes="注塑机看板数据查询（假）")
+	 @GetMapping(value = "/injectScreen")
+	 public Result<List<TtInjectEquip>> injectScreen() 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
@@ -265,191 +261,6 @@ public class TtInjectEquipController extends JeecgController<TtInjectEquip, ITtI
 		 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.setOutputQty(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.setOutputQty(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.setOutputQty(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.setOutputQty(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);
-                            injectEquip.setOutputQty(1200);
-						}
-
-					}
-				}
-			}
-			injectDataList.add(injectEquip);
-		}
-		return Result.OK(injectDataList);
-	}
-
-	
 	/**
 	 *   添加
 	 *
diff --git a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttsulfequip/mapper/xml/TtSulfEquipMapper.xml b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttsulfequip/mapper/xml/TtSulfEquipMapper.xml
index a149ee5..616aa4f 100644
--- a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttsulfequip/mapper/xml/TtSulfEquipMapper.xml
+++ b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttsulfequip/mapper/xml/TtSulfEquipMapper.xml
@@ -21,8 +21,8 @@
             b.utilize_rate
         FROM
             tt_sulf_equip t1
-                INNER JOIN ( SELECT MAX(id) AS id FROM tt_sulf_equip GROUP BY eqt_no ) t2 ON t1.id = t2.id
-                LEFT JOIN tt_eqt_base b ON t1.eqt_no = b.eqt_no AND b.eqt_type = 3;
+            INNER JOIN ( SELECT MAX(id) AS id FROM tt_sulf_equip GROUP BY eqt_no ) t2 ON t1.id = t2.id
+            LEFT JOIN tt_eqt_base b ON t1.eqt_no = b.eqt_no where b.eqt_type = 3 ORDER BY eqt_no;
     </select>