From e79cf0dd15dfbc62421ab404e23805d99c89531a Mon Sep 17 00:00:00 2001 From: 17602169347 Date: Mon, 13 Feb 2023 16:04:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TtInjectDataController.java | 4 +- .../TtVirsualAchRateController.java | 170 +++++++++++---- .../controller/TtVirsualOutputController.java | 198 +++++++++++------- .../TtVirsualPassRateController.java | 166 +++++++++++---- .../TtVirsualShippingController.java | 165 +++++++++++---- .../TtVirsualWoStatusController.java | 170 ++++++++------- .../TtVirsualWsStatusController.java | 63 +++++- 7 files changed, 673 insertions(+), 263 deletions(-) diff --git a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/injectdata/controller/TtInjectDataController.java b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/injectdata/controller/TtInjectDataController.java index 5f8ab24..30ac055 100644 --- a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/injectdata/controller/TtInjectDataController.java +++ b/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 injectDataList = new ArrayList<>(); for(int i = 1; i<29;i++){ Random generator = new Random(); @@ -100,7 +100,6 @@ public class TtInjectDataController extends JeecgController { @Autowired private ITtVirsualAchRateService ttVirsualAchRateService; - + @Autowired + private RedisUtil redisUtil; /** * 分页列表查询 * @@ -64,15 +68,109 @@ public class TtVirsualAchRateController extends JeecgController> queryPageList(TtVirsualAchRate ttVirsualAchRate, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(ttVirsualAchRate, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = ttVirsualAchRateService.page(page, queryWrapper); 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> queryList(TtVirsualAchRate ttVirsualAchRate) throws ParseException { + List list1 = new ArrayList<>(); + List 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 map = new HashMap<>(); + map.put("dizuo", list1); + map.put("jiaosai", list2); + return Result.OK(map); + } + /** * 添加 * @@ -87,7 +185,7 @@ public class TtVirsualAchRateController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, TtVirsualAchRate.class); - } + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + //@RequiresPermissions("virsualachrate:tt_virsual_ach_rate:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, TtVirsualAchRate.class); + } } diff --git a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/virsualoutput/controller/TtVirsualOutputController.java b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/virsualoutput/controller/TtVirsualOutputController.java index c369523..20cbfb7 100644 --- a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/virsualoutput/controller/TtVirsualOutputController.java +++ b/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 { @Autowired private ITtVirsualOutputService ttVirsualOutputService; - + @Autowired + private RedisUtil redisUtil; /** * 分页列表查询 * @@ -67,58 +69,104 @@ public class TtVirsualOutputController extends JeecgController> queryPageList(TtVirsualOutput ttVirsualOutput, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(ttVirsualOutput, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = ttVirsualOutputService.page(page, queryWrapper); return Result.OK(pageList); } - /** - * 新总的看板1列表查询 - * - * @param ttVirsualOutput - * @return - */ - //@AutoLog(value = "tt_virsual_output-新总的看板1列表查询") - @ApiOperation(value="tt_virsual_output-新总的看板1列表查询", notes="tt_virsual_output-新总的看板1列表查询") - @GetMapping(value = "/queryList") - public Result> queryList(TtVirsualOutput ttVirsualOutput) throws ParseException { - List list1 = new ArrayList<>(); - List list2 = new ArrayList<>(); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - Random generator = new Random(); - int randomIndex5 = 0;//随机数0到59 45 - //获取当前日期前一天的日期 - LocalDate 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())); - randomIndex5 = generator.nextInt( 60 ) + 1;//随机数1到60 45 - virsualOutput.setOutputQty(800 + (randomIndex5 * 9)); - virsualOutput.setTypeId(1);//底座 - localDate = localDate.minusDays(1); - list1.add(virsualOutput); - } - 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())); - randomIndex5 = generator.nextInt( 60 ) + 1;//随机数1到60 45 - virsualOutput.setOutputQty(800 + (randomIndex5 * 9)); - virsualOutput.setTypeId(2);//底座 - localDate = localDate.minusDays(1); - list2.add(virsualOutput); - } - Map map = new HashMap<>(); - map.put("dizuo", list1); - map.put("jiaosai", list2); - return Result.OK(map); - } + /** + * 新总的看板1列表查询 + * + * @param ttVirsualOutput + * @return + */ + //@AutoLog(value = "tt_virsual_output-新总的看板1列表查询") + @ApiOperation(value="tt_virsual_output-新总的看板1列表查询", notes="tt_virsual_output-新总的看板1列表查询") + @GetMapping(value = "/queryList") + public Result> queryList(TtVirsualOutput ttVirsualOutput) throws ParseException { + List list1 = new ArrayList<>(); + List 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() + "_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 map = new HashMap<>(); + map.put("dizuo", list1); + map.put("jiaosai", list2); + return Result.OK(map); + } /** * 添加 @@ -134,7 +182,7 @@ public class TtVirsualOutputController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, TtVirsualOutput.class); - } + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + //@RequiresPermissions("virsualoutput:tt_virsual_output:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, TtVirsualOutput.class); + } } diff --git a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/virsualpassrate/controller/TtVirsualPassRateController.java b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/virsualpassrate/controller/TtVirsualPassRateController.java index 9f7fdb3..829c1a4 100644 --- a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/virsualpassrate/controller/TtVirsualPassRateController.java +++ b/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.util.List; -import java.util.Map; +import java.text.ParseException; +import java.text.SimpleDateFormat; +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 { @Autowired private ITtVirsualPassRateService ttVirsualPassRateService; - + @Autowired + private RedisUtil redisUtil; /** * 分页列表查询 * @@ -64,15 +68,105 @@ public class TtVirsualPassRateController extends JeecgController> queryPageList(TtVirsualPassRate ttVirsualPassRate, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(ttVirsualPassRate, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = ttVirsualPassRateService.page(page, queryWrapper); 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> queryList(TtVirsualPassRate ttVirsualPassRate) throws ParseException { + List list1 = new ArrayList<>(); + List 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 map = new HashMap<>(); + map.put("dizuo", list1); + map.put("jiaosai", list2); + return Result.OK(map); + } + /** * 添加 * @@ -87,7 +181,7 @@ public class TtVirsualPassRateController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, TtVirsualPassRate.class); - } + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + //@RequiresPermissions("virsualpassrate:tt_virsual_pass_rate:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, TtVirsualPassRate.class); + } } diff --git a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/virsualshipping/controller/TtVirsualShippingController.java b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/virsualshipping/controller/TtVirsualShippingController.java index 8086686..f6efaee 100644 --- a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/virsualshipping/controller/TtVirsualShippingController.java +++ b/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.util.List; -import java.util.Map; +import java.text.ParseException; +import java.text.SimpleDateFormat; +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 { @Autowired private ITtVirsualShippingService ttVirsualShippingService; - + @Autowired + private RedisUtil redisUtil; /** * 分页列表查询 * @@ -64,15 +67,105 @@ public class TtVirsualShippingController extends JeecgController> queryPageList(TtVirsualShipping ttVirsualShipping, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(ttVirsualShipping, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = ttVirsualShippingService.page(page, queryWrapper); 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> queryList(TtVirsualShipping ttVirsualShipping) throws ParseException { + List list1 = new ArrayList<>(); + List 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 map = new HashMap<>(); + map.put("dizuo", list1); + map.put("jiaosai", list2); + return Result.OK(map); + } + /** * 添加 * @@ -87,7 +180,7 @@ public class TtVirsualShippingController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, TtVirsualShipping.class); - } + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + //@RequiresPermissions("virsualshipping:tt_virsual_shipping:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, TtVirsualShipping.class); + } } diff --git a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/virsualwostatus/controller/TtVirsualWoStatusController.java b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/virsualwostatus/controller/TtVirsualWoStatusController.java index a67996c..195bc9e 100644 --- a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/virsualwostatus/controller/TtVirsualWoStatusController.java +++ b/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 { @Autowired private ITtVirsualWoStatusService ttVirsualWoStatusService; - + @Autowired + private RedisUtil redisUtil; /** * 分页列表查询 * @@ -66,57 +69,78 @@ public class TtVirsualWoStatusController extends JeecgController> queryPageList(TtVirsualWoStatus ttVirsualWoStatus, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(ttVirsualWoStatus, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = ttVirsualWoStatusService.page(page, queryWrapper); return Result.OK(pageList); } - /** - * 新总的看板2列表查询 - * - * @param ttVirsualWoStatus - * @return - */ - //@AutoLog(value = "tt_virsual_wo_status-新总的看板2列表查询") - @ApiOperation(value="tt_virsual_wo_status-新总的看板2列表查询", notes="tt_virsual_wo_status-新总的看板2列表查询") - @GetMapping(value = "/queryList") - public Result> queryList(TtVirsualWoStatus ttVirsualWoStatus) throws ParseException { - List list = new ArrayList<>(); - for(int i=1;i<6;i++){ - TtVirsualWoStatus virsualWoStatus = new TtVirsualWoStatus(); - virsualWoStatus.setCompanyId(1); - virsualWoStatus.setWoStatus("正常"); - if(i == 1){ - virsualWoStatus.setWoNo("D23020071"); - virsualWoStatus.setPartNo("Q601-A"); - virsualWoStatus.setPartName("V06615A"); - }else if(i==2){ - virsualWoStatus.setWoNo("D23020072"); - virsualWoStatus.setPartNo("Q806-A"); - virsualWoStatus.setPartName("产品名称"); - }else if(i==3){ - virsualWoStatus.setWoNo("D23020075"); - virsualWoStatus.setPartNo("1012-T"); - virsualWoStatus.setPartName("产品名称"); - }else if(i==4){ - virsualWoStatus.setWoNo("D23020080"); - virsualWoStatus.setPartNo("807F-T"); - virsualWoStatus.setPartName("产品名称"); - }else if(i==5){ - virsualWoStatus.setWoNo("D23020084"); - virsualWoStatus.setPartNo("605F-A"); - virsualWoStatus.setPartName("产品名称" + i); - virsualWoStatus.setWoStatus("超期"); - } - //virsualWoStatus.setProgress(0.5); + /** + * 新总的看板2列表查询 + * + * @param ttVirsualWoStatus + * @return + */ + //@AutoLog(value = "tt_virsual_wo_status-新总的看板2列表查询") + @ApiOperation(value="tt_virsual_wo_status-新总的看板2列表查询", notes="tt_virsual_wo_status-新总的看板2列表查询") + @GetMapping(value = "/queryList") + public Result> queryList(TtVirsualWoStatus ttVirsualWoStatus) throws ParseException { + List 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"); + virsualWoStatus.setPartName("V06615A"); + }else if(i==2){ + virsualWoStatus.setWoNo("D23020072"); + virsualWoStatus.setPartNo("Q806-A"); + virsualWoStatus.setPartName("V08307A"); + }else if(i==3){ + virsualWoStatus.setWoNo("D23020075"); + virsualWoStatus.setPartNo("1012-T"); + virsualWoStatus.setPartName("V10305T"); + }else if(i==4){ + virsualWoStatus.setWoNo("D23020080"); + virsualWoStatus.setPartNo("807F-T"); + virsualWoStatus.setPartName("V08315T"); + }else if(i==5){ + virsualWoStatus.setWoNo("D23020084"); + virsualWoStatus.setPartNo("605F-A"); + virsualWoStatus.setPartName("V06614A"); + virsualWoStatus.setWoStatus("超期"); + } list.add(virsualWoStatus); - } - return Result.OK(list); - } + } + return Result.OK(list); + } /** * 添加 @@ -132,7 +156,7 @@ public class TtVirsualWoStatusController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, TtVirsualWoStatus.class); - } + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + //@RequiresPermissions("virsualwostatus:tt_virsual_wo_status:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, TtVirsualWoStatus.class); + } } diff --git a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/virsualwsstatus/controller/TtVirsualWsStatusController.java b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/virsualwsstatus/controller/TtVirsualWsStatusController.java index a57260d..7d389a6 100644 --- a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/virsualwsstatus/controller/TtVirsualWsStatusController.java +++ b/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.util.List; -import java.util.Map; +import java.math.BigDecimal; +import java.text.ParseException; +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 { @Autowired private ITtVirsualWsStatusService ttVirsualWsStatusService; - + @Autowired + private RedisUtil redisUtil; /** * 分页列表查询 * @@ -72,7 +76,56 @@ public class TtVirsualWsStatusController extends JeecgController pageList = ttVirsualWsStatusService.page(page, queryWrapper); 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> queryList(TtVirsualWsStatus ttVirsualWsStatus) throws ParseException { + List 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); + } + /** * 添加 *