看板

linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/injectdata/controller/TtInjectDataController.java

@@ -91,7 +91,7 @@ public class TtInjectDataController extends JeecgController<TtInjectData, ITtInj
 		 //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
+		 String nowDateString = sdf.format(date);//2023-02-08 11:23     2023-02-08 08:50
 		 List<TtInjectData> injectDataList = new ArrayList<>();
 		 for(int i = 1; i<29;i++){
 			 Random generator = new Random();
@@ -100,7 +100,6 @@ public class TtInjectDataController extends JeecgController<TtInjectData, ITtInj
 			 int randomIndex3 = generator.nextInt( 3 ) - 1;//随机数-1到1
 			 int randomIndex4 = generator.nextInt( 3 ) - 1;//随机数-1到1
 			 int randomIndex5 = 0;
-			 String openTimeParam = String.valueOf(randomIndex5);
 			 TtInjectData injectData = new TtInjectData();
 			 injectData.setEquipNo("注塑机" + i);
 			 Object object = redisUtil.get(injectData.getEquipNo());
@@ -110,6 +109,7 @@ public class TtInjectDataController extends JeecgController<TtInjectData, ITtInj
 				 randomIndex5 = generator.nextInt( 60 );//随机数0到59   45
 				 redisUtil.set(injectData.getEquipNo(), randomIndex5);
 			 }
+			 String openTimeParam = String.valueOf(randomIndex5);
 			 if(randomIndex5 < 10){
 				 openTimeParam = "0" + String.valueOf(randomIndex5);
 			 }

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

@@ -1,8 +1,9 @@
 package org.jeecg.modules.demo.virsualachrate.controller;
 
-import java.util.Arrays;
+import java.text.ParseException;
-import java.util.List;
+import java.text.SimpleDateFormat;
-import java.util.Map;
+import java.time.LocalDate;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -11,6 +12,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.demo.virsualachrate.entity.TtVirsualAchRate;
 import org.jeecg.modules.demo.virsualachrate.service.ITtVirsualAchRateService;
@@ -20,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.demo.virsualoutput.entity.TtVirsualOutput;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -37,7 +40,7 @@ import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 
- /**
+/**
  * @Description: tt_virsual_ach_rate
  * @Author: jeecg-boot
  * @Date:   2023-02-10
@@ -50,7 +53,8 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 public class TtVirsualAchRateController extends JeecgController<TtVirsualAchRate, ITtVirsualAchRateService> {
 	@Autowired
 	private ITtVirsualAchRateService ttVirsualAchRateService;
-	
+	@Autowired
+	private RedisUtil redisUtil;
 	/**
 	 * 分页列表查询
 	 *
@@ -73,6 +77,100 @@ public class TtVirsualAchRateController extends JeecgController<TtVirsualAchRate
 		return Result.OK(pageList);
 	}
 
+	/**
+	 * 新总的看板5列表查询
+	 *
+	 * @param ttVirsualAchRate
+	 * @return
+	 */
+	//@AutoLog(value = "tt_virsual_ach_rate-新总的看板5列表查询")
+	@ApiOperation(value="tt_virsual_ach_rate-新总的看板5列表查询", notes="tt_virsual_ach_rate-新总的看板5列表查询")
+	@GetMapping(value = "/queryList")
+	public Result<Map<String, Object>> queryList(TtVirsualAchRate ttVirsualAchRate) throws ParseException {
+		List<TtVirsualAchRate> list1 = new ArrayList<>();
+		List<TtVirsualAchRate> list2 = new ArrayList<>();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		Random generator = new Random();
+		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);
+		dayKey.append(sdf.parse(localDate.toString()) + "_");
+		localDate = localDate.minusDays(1);
+		dayKey.append(sdf.parse(localDate.toString()) + "_");
+		localDate = localDate.minusDays(1);
+		dayKey.append(sdf.parse(localDate.toString()) + "_");
+		localDate = localDate.minusDays(1);
+		dayKey.append(sdf.parse(localDate.toString()) + "_");
+		localDate = localDate.minusDays(1);
+		dayKey.append(sdf.parse(localDate.toString()) + "_");
+		localDate = localDate.minusDays(1);
+		dayKey.append(sdf.parse(localDate.toString()) + "_");
+		localDate = localDate.minusDays(1);
+		dayKey.append(sdf.parse(localDate.toString()));
+		String dayKey1 = dayKey.toString() + "_5";
+		String dayKey2 = dayKey.toString() + "_6";
+		Object object1 = redisUtil.get(dayKey1);
+		Object object2 = redisUtil.get(dayKey2);
+		if (object1 != null) {
+			String outputQtys1 = String.valueOf(object1);
+			String outputQtys2 = String.valueOf(object2);
+			String[] outputQtyArr1 = outputQtys1.split("_");
+			String[] outputQtyArr2 = outputQtys2.split("_");
+			String[] dayKeyArr = dayKey.toString().split("_");
+			for(int i=0;i<outputQtyArr1.length;i++){
+				TtVirsualAchRate virsualAchRate = new TtVirsualAchRate();
+				virsualAchRate.setCompanyId(1);
+				virsualAchRate.setDayName(sdf.parse(dayKeyArr[i]));
+				virsualAchRate.setAchRate(Integer.parseInt(outputQtyArr1[i]));
+				virsualAchRate.setTypeId(1);//底座
+				virsualAchRate.setPsName("底座");
+				list1.add(virsualAchRate);
+			}
+			for(int i=0;i<outputQtyArr2.length;i++){
+				TtVirsualAchRate virsualAchRate = new TtVirsualAchRate();
+				virsualAchRate.setCompanyId(1);
+				virsualAchRate.setDayName(sdf.parse(dayKeyArr[i]));
+				virsualAchRate.setAchRate(Integer.parseInt(outputQtyArr2[i]));
+				virsualAchRate.setTypeId(2);//底座
+				virsualAchRate.setPsName("胶塞");
+				list2.add(virsualAchRate);
+			}
+		}else{
+			int randomIndex5 = 80;//随机数0到59   45
+			String[] dayKeyArr = dayKey.toString().split("_");
+			String outputQtys1 = "";
+			String outputQtys2 = "";
+			for(int i=0;i<7;i++){
+				TtVirsualAchRate virsualAchRate = new TtVirsualAchRate();
+				virsualAchRate.setCompanyId(1);
+				virsualAchRate.setDayName(sdf.parse(dayKeyArr[i]));
+				randomIndex5 = generator.nextInt( 21 ) + 80;//随机数80到100   85
+				virsualAchRate.setAchRate(randomIndex5);
+				virsualAchRate.setTypeId(1);//底座
+				virsualAchRate.setPsName("底座");
+				list1.add(virsualAchRate);
+				outputQtys1 = outputQtys1 + virsualAchRate.getAchRate() + "_";
+			}
+			for(int i=0;i<7;i++){
+				TtVirsualAchRate virsualAchRate = new TtVirsualAchRate();
+				virsualAchRate.setCompanyId(1);
+				virsualAchRate.setDayName(sdf.parse(dayKeyArr[i]));
+				randomIndex5 = generator.nextInt( 21 ) + 80;//随机数80到100   85
+				virsualAchRate.setAchRate(randomIndex5);
+				virsualAchRate.setTypeId(2);//底座
+				virsualAchRate.setPsName("胶塞");
+				list2.add(virsualAchRate);
+				outputQtys2 = outputQtys2 + virsualAchRate.getAchRate() + "_";
+			}
+			redisUtil.set(dayKey1, outputQtys1.substring(0, outputQtys1.length() - 1));
+			redisUtil.set(dayKey2, outputQtys2.substring(0, outputQtys2.length() - 1));
+		}
+		Map<String, Object> map = new HashMap<>();
+		map.put("dizuo", list1);
+		map.put("jiaosai", list2);
+		return Result.OK(map);
+	}
+
 	/**
 	 *   添加
 	 *

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

@@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.demo.inwhdata.entity.TtInWhData;
 import org.jeecg.modules.demo.kanbanequiprate.entity.TtKanbanEquipRate;
@@ -40,7 +41,7 @@ import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 
- /**
+/**
  * @Description: tt_virsual_output
  * @Author: jeecg-boot
  * @Date:   2023-02-10
@@ -53,7 +54,8 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 public class TtVirsualOutputController extends JeecgController<TtVirsualOutput, ITtVirsualOutputService> {
 	@Autowired
 	private ITtVirsualOutputService ttVirsualOutputService;
-	
+	@Autowired
+	private RedisUtil redisUtil;
 	/**
 	 * 分页列表查询
 	 *
@@ -90,29 +92,75 @@ public class TtVirsualOutputController extends JeecgController<TtVirsualOutput,
 		List<TtVirsualOutput> list2 = new ArrayList<>();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		Random generator = new Random();
-		 int randomIndex5 = 0;//随机数0到59   45
+		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);
+		dayKey.append(sdf.parse(localDate.toString()) + "_");
+		localDate = localDate.minusDays(1);
+		dayKey.append(sdf.parse(localDate.toString()) + "_");
+		localDate = localDate.minusDays(1);
+		dayKey.append(sdf.parse(localDate.toString()) + "_");
+		localDate = localDate.minusDays(1);
+		dayKey.append(sdf.parse(localDate.toString()) + "_");
+		localDate = localDate.minusDays(1);
+		dayKey.append(sdf.parse(localDate.toString()) + "_");
+		localDate = localDate.minusDays(1);
+		dayKey.append(sdf.parse(localDate.toString()) + "_");
+		localDate = localDate.minusDays(1);
+		dayKey.append(sdf.parse(localDate.toString()));
+		String dayKey1 = dayKey.toString() + "_1";
+		String dayKey2 = dayKey.toString() + "_2";
+		Object object1 = redisUtil.get(dayKey1);
+		Object object2 = redisUtil.get(dayKey2);
+		if (object1 != null) {
+			String outputQtys1 = String.valueOf(object1);
+			String outputQtys2 = String.valueOf(object2);
+			String[] outputQtyArr1 = outputQtys1.split("_");
+			String[] outputQtyArr2 = outputQtys2.split("_");
+			String[] dayKeyArr = dayKey.toString().split("_");
+			for(int i=0;i<outputQtyArr1.length;i++){
+				TtVirsualOutput virsualOutput = new TtVirsualOutput();
+				virsualOutput.setCompanyId(1);
+				virsualOutput.setDayName(sdf.parse(dayKeyArr[i]));
+				virsualOutput.setOutputQty(Integer.parseInt(outputQtyArr1[i]));
+				virsualOutput.setTypeId(1);//底座
+				list1.add(virsualOutput);
+			}
+			for(int i=0;i<outputQtyArr2.length;i++){
+				TtVirsualOutput virsualOutput = new TtVirsualOutput();
+				virsualOutput.setCompanyId(1);
+				virsualOutput.setDayName(sdf.parse(dayKeyArr[i]));
+				virsualOutput.setOutputQty(Integer.parseInt(outputQtyArr2[i]));
+				virsualOutput.setTypeId(2);//底座
+				list2.add(virsualOutput);
+			}
+		}else{
+			int randomIndex5 = 0;//随机数0到59   45
+			String[] dayKeyArr = dayKey.toString().split("_");
+			String outputQtys1 = "";
+			String outputQtys2 = "";
 			for(int i=0;i<7;i++){
 				TtVirsualOutput virsualOutput = new TtVirsualOutput();
 				virsualOutput.setCompanyId(1);
-			 virsualOutput.setDayName(sdf.parse(localDate.toString()));
+				virsualOutput.setDayName(sdf.parse(dayKeyArr[i]));
 				randomIndex5 = generator.nextInt( 60 ) + 1;//随机数1到60   45
 				virsualOutput.setOutputQty(800 + (randomIndex5 * 9));
 				virsualOutput.setTypeId(1);//底座
-			 localDate = localDate.minusDays(1);
 				list1.add(virsualOutput);
+				outputQtys1 = outputQtys1 + virsualOutput.getOutputQty() + "_";
 			}
-		 localDate = LocalDate.now().minusDays(1);
 			for(int i=0;i<7;i++){
 				TtVirsualOutput virsualOutput = new TtVirsualOutput();
 				virsualOutput.setCompanyId(1);
-			 virsualOutput.setDayName(sdf.parse(localDate.toString()));
+				virsualOutput.setDayName(sdf.parse(dayKeyArr[i]));
 				randomIndex5 = generator.nextInt( 60 ) + 1;//随机数1到60   45
 				virsualOutput.setOutputQty(800 + (randomIndex5 * 9));
 				virsualOutput.setTypeId(2);//底座
-			 localDate = localDate.minusDays(1);
 				list2.add(virsualOutput);
+				outputQtys2 = outputQtys2 + virsualOutput.getOutputQty() + "_";
+			}
+			redisUtil.set(dayKey1, outputQtys1.substring(0, outputQtys1.length() - 1));
+			redisUtil.set(dayKey2, outputQtys2.substring(0, outputQtys2.length() - 1));
 		}
 		Map<String, Object> map = new HashMap<>();
 		map.put("dizuo", list1);

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

@@ -1,8 +1,9 @@
 package org.jeecg.modules.demo.virsualpassrate.controller;
 
-import java.util.Arrays;
+import java.text.ParseException;
-import java.util.List;
+import java.text.SimpleDateFormat;
-import java.util.Map;
+import java.time.LocalDate;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -11,7 +12,9 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.demo.virsualachrate.entity.TtVirsualAchRate;
 import org.jeecg.modules.demo.virsualpassrate.entity.TtVirsualPassRate;
 import org.jeecg.modules.demo.virsualpassrate.service.ITtVirsualPassRateService;
 
@@ -37,7 +40,7 @@ import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 
- /**
+/**
  * @Description: tt_virsual_pass_rate
  * @Author: jeecg-boot
  * @Date:   2023-02-10
@@ -50,7 +53,8 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 public class TtVirsualPassRateController extends JeecgController<TtVirsualPassRate, ITtVirsualPassRateService> {
 	@Autowired
 	private ITtVirsualPassRateService ttVirsualPassRateService;
-	
+	@Autowired
+	private RedisUtil redisUtil;
 	/**
 	 * 分页列表查询
 	 *
@@ -73,6 +77,96 @@ public class TtVirsualPassRateController extends JeecgController<TtVirsualPassRa
 		return Result.OK(pageList);
 	}
 
+	/**
+	 * 新总的看板6列表查询
+	 *
+	 * @param ttVirsualPassRate
+	 * @return
+	 */
+	//@AutoLog(value = "tt_virsual_pass_rate-新总的看板6列表查询")
+	@ApiOperation(value="tt_virsual_pass_rate-新总的看板6列表查询", notes="tt_virsual_pass_rate-新总的看板6列表查询")
+	@GetMapping(value = "/queryList")
+	public Result<Map<String, Object>> queryList(TtVirsualPassRate ttVirsualPassRate) throws ParseException {
+		List<TtVirsualPassRate> list1 = new ArrayList<>();
+		List<TtVirsualPassRate> list2 = new ArrayList<>();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		Random generator = new Random();
+		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);
+		dayKey.append(sdf.parse(localDate.toString()) + "_");
+		localDate = localDate.minusDays(1);
+		dayKey.append(sdf.parse(localDate.toString()) + "_");
+		localDate = localDate.minusDays(1);
+		dayKey.append(sdf.parse(localDate.toString()) + "_");
+		localDate = localDate.minusDays(1);
+		dayKey.append(sdf.parse(localDate.toString()) + "_");
+		localDate = localDate.minusDays(1);
+		dayKey.append(sdf.parse(localDate.toString()) + "_");
+		localDate = localDate.minusDays(1);
+		dayKey.append(sdf.parse(localDate.toString()) + "_");
+		localDate = localDate.minusDays(1);
+		dayKey.append(sdf.parse(localDate.toString()));
+		String dayKey1 = dayKey.toString() + "_7";
+		String dayKey2 = dayKey.toString() + "_8";
+		Object object1 = redisUtil.get(dayKey1);
+		Object object2 = redisUtil.get(dayKey2);
+		if (object1 != null) {
+			String outputQtys1 = String.valueOf(object1);
+			String outputQtys2 = String.valueOf(object2);
+			String[] outputQtyArr1 = outputQtys1.split("_");
+			String[] outputQtyArr2 = outputQtys2.split("_");
+			String[] dayKeyArr = dayKey.toString().split("_");
+			for(int i=0;i<outputQtyArr1.length;i++){
+				TtVirsualPassRate virsualPassRate = new TtVirsualPassRate();
+				virsualPassRate.setCompanyId(1);
+				virsualPassRate.setDayName(sdf.parse(dayKeyArr[i]));
+				virsualPassRate.setPassRate(Integer.parseInt(outputQtyArr1[i]));
+				virsualPassRate.setTypeId(1);//底座
+				list1.add(virsualPassRate);
+			}
+			for(int i=0;i<outputQtyArr2.length;i++){
+				TtVirsualPassRate virsualPassRate = new TtVirsualPassRate();
+				virsualPassRate.setCompanyId(1);
+				virsualPassRate.setDayName(sdf.parse(dayKeyArr[i]));
+				virsualPassRate.setPassRate(Integer.parseInt(outputQtyArr2[i]));
+				virsualPassRate.setTypeId(2);//底座
+				list2.add(virsualPassRate);
+			}
+		}else{
+			int randomIndex5 = 80;//随机数0到59   45
+			String[] dayKeyArr = dayKey.toString().split("_");
+			String outputQtys1 = "";
+			String outputQtys2 = "";
+			for(int i=0;i<7;i++){
+				TtVirsualPassRate virsualPassRate = new TtVirsualPassRate();
+				virsualPassRate.setCompanyId(1);
+				virsualPassRate.setDayName(sdf.parse(dayKeyArr[i]));
+				randomIndex5 = generator.nextInt( 21 ) + 80;//随机数80到100   85
+				virsualPassRate.setPassRate(randomIndex5);
+				virsualPassRate.setTypeId(1);//底座
+				list1.add(virsualPassRate);
+				outputQtys1 = outputQtys1 + virsualPassRate.getPassRate() + "_";
+			}
+			for(int i=0;i<7;i++){
+				TtVirsualPassRate virsualPassRate = new TtVirsualPassRate();
+				virsualPassRate.setCompanyId(1);
+				virsualPassRate.setDayName(sdf.parse(dayKeyArr[i]));
+				randomIndex5 = generator.nextInt( 21 ) + 80;//随机数80到100   85
+				virsualPassRate.setPassRate(randomIndex5);
+				virsualPassRate.setTypeId(2);//底座
+				list2.add(virsualPassRate);
+				outputQtys2 = outputQtys2 + virsualPassRate.getPassRate() + "_";
+			}
+			redisUtil.set(dayKey1, outputQtys1.substring(0, outputQtys1.length() - 1));
+			redisUtil.set(dayKey2, outputQtys2.substring(0, outputQtys2.length() - 1));
+		}
+		Map<String, Object> map = new HashMap<>();
+		map.put("dizuo", list1);
+		map.put("jiaosai", list2);
+		return Result.OK(map);
+	}
+
 	/**
 	 *   添加
 	 *

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

@@ -1,8 +1,9 @@
 package org.jeecg.modules.demo.virsualshipping.controller;
 
-import java.util.Arrays;
+import java.text.ParseException;
-import java.util.List;
+import java.text.SimpleDateFormat;
-import java.util.Map;
+import java.time.LocalDate;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -11,6 +12,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.demo.virsualshipping.entity.TtVirsualShipping;
 import org.jeecg.modules.demo.virsualshipping.service.ITtVirsualShippingService;
@@ -37,7 +39,7 @@ import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 
- /**
+/**
  * @Description: tt_virsual_shipping
  * @Author: jeecg-boot
  * @Date:   2023-02-10
@@ -50,7 +52,8 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 public class TtVirsualShippingController extends JeecgController<TtVirsualShipping, ITtVirsualShippingService> {
 	@Autowired
 	private ITtVirsualShippingService ttVirsualShippingService;
-	
+	@Autowired
+	private RedisUtil redisUtil;
 	/**
 	 * 分页列表查询
 	 *
@@ -73,6 +76,96 @@ public class TtVirsualShippingController extends JeecgController<TtVirsualShippi
 		return Result.OK(pageList);
 	}
 
+	/**
+	 * 新总的看板4列表查询
+	 *
+	 * @param ttVirsualShipping
+	 * @return
+	 */
+	//@AutoLog(value = "tt_virsual_shipping-新总的看板4列表查询")
+	@ApiOperation(value="tt_virsual_shipping-新总的看板4列表查询", notes="tt_virsual_shipping-新总的看板4列表查询")
+	@GetMapping(value = "/queryList")
+	public Result<Map<String, Object>> queryList(TtVirsualShipping ttVirsualShipping) throws ParseException {
+		List<TtVirsualShipping> list1 = new ArrayList<>();
+		List<TtVirsualShipping> list2 = new ArrayList<>();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		Random generator = new Random();
+		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);
+		dayKey.append(sdf.parse(localDate.toString()) + "_");
+		localDate = localDate.minusDays(1);
+		dayKey.append(sdf.parse(localDate.toString()) + "_");
+		localDate = localDate.minusDays(1);
+		dayKey.append(sdf.parse(localDate.toString()) + "_");
+		localDate = localDate.minusDays(1);
+		dayKey.append(sdf.parse(localDate.toString()) + "_");
+		localDate = localDate.minusDays(1);
+		dayKey.append(sdf.parse(localDate.toString()) + "_");
+		localDate = localDate.minusDays(1);
+		dayKey.append(sdf.parse(localDate.toString()) + "_");
+		localDate = localDate.minusDays(1);
+		dayKey.append(sdf.parse(localDate.toString()));
+		String dayKey1 = dayKey.toString() + "_3";
+		String dayKey2 = dayKey.toString() + "_4";
+		Object object1 = redisUtil.get(dayKey1);
+		Object object2 = redisUtil.get(dayKey2);
+		if (object1 != null) {
+			String outputQtys1 = String.valueOf(object1);
+			String outputQtys2 = String.valueOf(object2);
+			String[] outputQtyArr1 = outputQtys1.split("_");
+			String[] outputQtyArr2 = outputQtys2.split("_");
+			String[] dayKeyArr = dayKey.toString().split("_");
+			for(int i=0;i<outputQtyArr1.length;i++){
+				TtVirsualShipping virsualShipping = new TtVirsualShipping();
+				virsualShipping.setCompanyId(1);
+				virsualShipping.setDayName(sdf.parse(dayKeyArr[i]));
+				virsualShipping.setShippingQty(Integer.parseInt(outputQtyArr1[i]));
+				virsualShipping.setTypeId(1);//底座
+				list1.add(virsualShipping);
+			}
+			for(int i=0;i<outputQtyArr2.length;i++){
+				TtVirsualShipping virsualShipping = new TtVirsualShipping();
+				virsualShipping.setCompanyId(1);
+				virsualShipping.setDayName(sdf.parse(dayKeyArr[i]));
+				virsualShipping.setShippingQty(Integer.parseInt(outputQtyArr2[i]));
+				virsualShipping.setTypeId(2);//底座
+				list2.add(virsualShipping);
+			}
+		}else{
+			int randomIndex5 = 0;//随机数0到59   45
+			String[] dayKeyArr = dayKey.toString().split("_");
+			String outputQtys1 = "";
+			String outputQtys2 = "";
+			for(int i=0;i<7;i++){
+				TtVirsualShipping virsualShipping = new TtVirsualShipping();
+				virsualShipping.setCompanyId(1);
+				virsualShipping.setDayName(sdf.parse(dayKeyArr[i]));
+				randomIndex5 = generator.nextInt( 60 ) + 1;//随机数1到60   45
+				virsualShipping.setShippingQty(800 + (randomIndex5 * 9));
+				virsualShipping.setTypeId(1);//底座
+				list1.add(virsualShipping);
+				outputQtys1 = outputQtys1 + virsualShipping.getShippingQty() + "_";
+			}
+			for(int i=0;i<7;i++){
+				TtVirsualShipping virsualShipping = new TtVirsualShipping();
+				virsualShipping.setCompanyId(1);
+				virsualShipping.setDayName(sdf.parse(dayKeyArr[i]));
+				randomIndex5 = generator.nextInt( 60 ) + 1;//随机数1到60   45
+				virsualShipping.setShippingQty(800 + (randomIndex5 * 9));
+				virsualShipping.setTypeId(2);//底座
+				list2.add(virsualShipping);
+				outputQtys2 = outputQtys2 + virsualShipping.getShippingQty() + "_";
+			}
+			redisUtil.set(dayKey1, outputQtys1.substring(0, outputQtys1.length() - 1));
+			redisUtil.set(dayKey2, outputQtys2.substring(0, outputQtys2.length() - 1));
+		}
+		Map<String, Object> map = new HashMap<>();
+		map.put("dizuo", list1);
+		map.put("jiaosai", list2);
+		return Result.OK(map);
+	}
+
 	/**
 	 *   添加
 	 *

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.demo.virsualwostatus.controller;
 
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
@@ -12,6 +13,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.demo.virsualoutput.entity.TtVirsualOutput;
 import org.jeecg.modules.demo.virsualwostatus.entity.TtVirsualWoStatus;
@@ -39,7 +41,7 @@ import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 
- /**
+/**
  * @Description: tt_virsual_wo_status
  * @Author: jeecg-boot
  * @Date:   2023-02-10
@@ -52,7 +54,8 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 public class TtVirsualWoStatusController extends JeecgController<TtVirsualWoStatus, ITtVirsualWoStatusService> {
 	@Autowired
 	private ITtVirsualWoStatusService ttVirsualWoStatusService;
-
+	@Autowired
+	private RedisUtil redisUtil;
 	/**
 	 * 分页列表查询
 	 *
@@ -86,10 +89,32 @@ public class TtVirsualWoStatusController extends JeecgController<TtVirsualWoStat
 	@GetMapping(value = "/queryList")
 	public Result<List<TtVirsualWoStatus>> queryList(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();
+			int progress = (int)((time - time2) * 100) / (1000 * 60 * 480);
+			virsualWoStatus.setProgress(new BigDecimal("0." + progress));
 			if(i == 1){
 				virsualWoStatus.setWoNo("D23020071");
 				virsualWoStatus.setPartNo("Q601-A");
@@ -97,22 +122,21 @@ public class TtVirsualWoStatusController extends JeecgController<TtVirsualWoStat
 			}else if(i==2){
 				virsualWoStatus.setWoNo("D23020072");
 				virsualWoStatus.setPartNo("Q806-A");
-				 virsualWoStatus.setPartName("产品名称");
+				virsualWoStatus.setPartName("V08307A");
 			}else if(i==3){
 				virsualWoStatus.setWoNo("D23020075");
 				virsualWoStatus.setPartNo("1012-T");
-				 virsualWoStatus.setPartName("产品名称");
+				virsualWoStatus.setPartName("V10305T");
 			}else if(i==4){
 				virsualWoStatus.setWoNo("D23020080");
 				virsualWoStatus.setPartNo("807F-T");
-				 virsualWoStatus.setPartName("产品名称");
+				virsualWoStatus.setPartName("V08315T");
 			}else if(i==5){
 				virsualWoStatus.setWoNo("D23020084");
 				virsualWoStatus.setPartNo("605F-A");
-				 virsualWoStatus.setPartName("产品名称" + i);
+				virsualWoStatus.setPartName("V06614A");
 				virsualWoStatus.setWoStatus("超期");
 			}
-			//virsualWoStatus.setProgress(0.5);
 			list.add(virsualWoStatus);
 		}
 		return Result.OK(list);

linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/virsualwsstatus/controller/TtVirsualWsStatusController.java

@@ -1,8 +1,9 @@
 package org.jeecg.modules.demo.virsualwsstatus.controller;
 
-import java.util.Arrays;
+import java.math.BigDecimal;
-import java.util.List;
+import java.text.ParseException;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -11,7 +12,9 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.demo.virsualwostatus.entity.TtVirsualWoStatus;
 import org.jeecg.modules.demo.virsualwsstatus.entity.TtVirsualWsStatus;
 import org.jeecg.modules.demo.virsualwsstatus.service.ITtVirsualWsStatusService;
 
@@ -50,7 +53,8 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 public class TtVirsualWsStatusController extends JeecgController<TtVirsualWsStatus, ITtVirsualWsStatusService> {
 	@Autowired
 	private ITtVirsualWsStatusService ttVirsualWsStatusService;
-	
+	 @Autowired
+	 private RedisUtil redisUtil;
 	/**
 	 * 分页列表查询
 	 *
@@ -73,6 +77,55 @@ public class TtVirsualWsStatusController extends JeecgController<TtVirsualWsStat
 		return Result.OK(pageList);
 	}
 
+	 /**
+	  * 新总的看板3列表查询
+	  *
+	  * @param ttVirsualWsStatus
+	  * @return
+	  */
+	 //@AutoLog(value = "tt_virsual_ws_status-新总的看板3列表查询")
+	 @ApiOperation(value="tt_virsual_ws_status-新总的看板3列表查询", notes="tt_virsual_ws_status-新总的看板3列表查询")
+	 @GetMapping(value = "/queryList")
+	 public Result<List<TtVirsualWsStatus>> queryList(TtVirsualWsStatus ttVirsualWsStatus) throws ParseException {
+		 List<TtVirsualWsStatus> 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<3;i++){
+			 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();
+			 int minute = (int)(time - time2) / (1000 * 60);
+			 TtVirsualWsStatus virsualWsStatus = new TtVirsualWsStatus();
+			 virsualWsStatus.setCompanyId(1);
+			 virsualWsStatus.setTypeId(i);
+			 if(i == 1){
+				 virsualWsStatus.setWsName("注塑车间");
+				 virsualWsStatus.setPlanQty(82000);
+				 virsualWsStatus.setActQty(82000 * minute/480);
+			 } else {
+				 virsualWsStatus.setWsName("硫化车间");
+				 virsualWsStatus.setPlanQty(37500);
+				 virsualWsStatus.setActQty(37500 * minute/480);
+			 }
+			 list.add(virsualWsStatus);
+		 }
+		 return Result.OK(list);
+	 }
+
 	/**
 	 *   添加
 	 *