17602169347 2 years ago
parent b97cebb9ef
commit e79cf0dd15

@ -91,7 +91,7 @@ public class TtInjectDataController extends JeecgController<TtInjectData, ITtInj
//order by equip_no,day_name //order by equip_no,day_name
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
Date date = new Date(); 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<>(); List<TtInjectData> injectDataList = new ArrayList<>();
for(int i = 1; i<29;i++){ for(int i = 1; i<29;i++){
Random generator = new Random(); Random generator = new Random();
@ -100,7 +100,6 @@ public class TtInjectDataController extends JeecgController<TtInjectData, ITtInj
int randomIndex3 = generator.nextInt( 3 ) - 1;//随机数-1到1 int randomIndex3 = generator.nextInt( 3 ) - 1;//随机数-1到1
int randomIndex4 = generator.nextInt( 3 ) - 1;//随机数-1到1 int randomIndex4 = generator.nextInt( 3 ) - 1;//随机数-1到1
int randomIndex5 = 0; int randomIndex5 = 0;
String openTimeParam = String.valueOf(randomIndex5);
TtInjectData injectData = new TtInjectData(); TtInjectData injectData = new TtInjectData();
injectData.setEquipNo("注塑机" + i); injectData.setEquipNo("注塑机" + i);
Object object = redisUtil.get(injectData.getEquipNo()); Object object = redisUtil.get(injectData.getEquipNo());
@ -110,6 +109,7 @@ public class TtInjectDataController extends JeecgController<TtInjectData, ITtInj
randomIndex5 = generator.nextInt( 60 );//随机数0到59 45 randomIndex5 = generator.nextInt( 60 );//随机数0到59 45
redisUtil.set(injectData.getEquipNo(), randomIndex5); redisUtil.set(injectData.getEquipNo(), randomIndex5);
} }
String openTimeParam = String.valueOf(randomIndex5);
if(randomIndex5 < 10){ if(randomIndex5 < 10){
openTimeParam = "0" + String.valueOf(randomIndex5); openTimeParam = "0" + String.valueOf(randomIndex5);
} }

@ -1,8 +1,9 @@
package org.jeecg.modules.demo.virsualachrate.controller; 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.util.stream.Collectors;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
@ -11,6 +12,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.RedisUtil;
import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.demo.virsualachrate.entity.TtVirsualAchRate; import org.jeecg.modules.demo.virsualachrate.entity.TtVirsualAchRate;
import org.jeecg.modules.demo.virsualachrate.service.ITtVirsualAchRateService; 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 com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jeecg.modules.demo.virsualoutput.entity.TtVirsualOutput;
import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams; 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.jeecg.common.aspect.annotation.AutoLog;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
/** /**
* @Description: tt_virsual_ach_rate * @Description: tt_virsual_ach_rate
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2023-02-10 * @Date: 2023-02-10
@ -50,7 +53,8 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
public class TtVirsualAchRateController extends JeecgController<TtVirsualAchRate, ITtVirsualAchRateService> { public class TtVirsualAchRateController extends JeecgController<TtVirsualAchRate, ITtVirsualAchRateService> {
@Autowired @Autowired
private ITtVirsualAchRateService ttVirsualAchRateService; private ITtVirsualAchRateService ttVirsualAchRateService;
@Autowired
private RedisUtil redisUtil;
/** /**
* *
* *
@ -64,15 +68,109 @@ public class TtVirsualAchRateController extends JeecgController<TtVirsualAchRate
@ApiOperation(value="tt_virsual_ach_rate-分页列表查询", notes="tt_virsual_ach_rate-分页列表查询") @ApiOperation(value="tt_virsual_ach_rate-分页列表查询", notes="tt_virsual_ach_rate-分页列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<IPage<TtVirsualAchRate>> queryPageList(TtVirsualAchRate ttVirsualAchRate, public Result<IPage<TtVirsualAchRate>> queryPageList(TtVirsualAchRate ttVirsualAchRate,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<TtVirsualAchRate> queryWrapper = QueryGenerator.initQueryWrapper(ttVirsualAchRate, req.getParameterMap()); QueryWrapper<TtVirsualAchRate> queryWrapper = QueryGenerator.initQueryWrapper(ttVirsualAchRate, req.getParameterMap());
Page<TtVirsualAchRate> page = new Page<TtVirsualAchRate>(pageNo, pageSize); Page<TtVirsualAchRate> page = new Page<TtVirsualAchRate>(pageNo, pageSize);
IPage<TtVirsualAchRate> pageList = ttVirsualAchRateService.page(page, queryWrapper); IPage<TtVirsualAchRate> pageList = ttVirsualAchRateService.page(page, queryWrapper);
return Result.OK(pageList); 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);
}
/** /**
* *
* *
@ -87,7 +185,7 @@ public class TtVirsualAchRateController extends JeecgController<TtVirsualAchRate
ttVirsualAchRateService.save(ttVirsualAchRate); ttVirsualAchRateService.save(ttVirsualAchRate);
return Result.OK("添加成功!"); return Result.OK("添加成功!");
} }
/** /**
* *
* *
@ -102,7 +200,7 @@ public class TtVirsualAchRateController extends JeecgController<TtVirsualAchRate
ttVirsualAchRateService.updateById(ttVirsualAchRate); ttVirsualAchRateService.updateById(ttVirsualAchRate);
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
} }
/** /**
* id * id
* *
@ -117,7 +215,7 @@ public class TtVirsualAchRateController extends JeecgController<TtVirsualAchRate
ttVirsualAchRateService.removeById(id); ttVirsualAchRateService.removeById(id);
return Result.OK("删除成功!"); return Result.OK("删除成功!");
} }
/** /**
* *
* *
@ -132,7 +230,7 @@ public class TtVirsualAchRateController extends JeecgController<TtVirsualAchRate
this.ttVirsualAchRateService.removeByIds(Arrays.asList(ids.split(","))); this.ttVirsualAchRateService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!"); return Result.OK("批量删除成功!");
} }
/** /**
* id * id
* *
@ -150,29 +248,29 @@ public class TtVirsualAchRateController extends JeecgController<TtVirsualAchRate
return Result.OK(ttVirsualAchRate); return Result.OK(ttVirsualAchRate);
} }
/** /**
* excel * excel
* *
* @param request * @param request
* @param ttVirsualAchRate * @param ttVirsualAchRate
*/ */
//@RequiresPermissions("virsualachrate:tt_virsual_ach_rate:exportXls") //@RequiresPermissions("virsualachrate:tt_virsual_ach_rate:exportXls")
@RequestMapping(value = "/exportXls") @RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, TtVirsualAchRate ttVirsualAchRate) { public ModelAndView exportXls(HttpServletRequest request, TtVirsualAchRate ttVirsualAchRate) {
return super.exportXls(request, ttVirsualAchRate, TtVirsualAchRate.class, "tt_virsual_ach_rate"); return super.exportXls(request, ttVirsualAchRate, TtVirsualAchRate.class, "tt_virsual_ach_rate");
} }
/** /**
* excel * excel
* *
* @param request * @param request
* @param response * @param response
* @return * @return
*/ */
//@RequiresPermissions("virsualachrate:tt_virsual_ach_rate:importExcel") //@RequiresPermissions("virsualachrate:tt_virsual_ach_rate:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST) @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, TtVirsualAchRate.class); return super.importExcel(request, response, TtVirsualAchRate.class);
} }
} }

@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.RedisUtil;
import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.demo.inwhdata.entity.TtInWhData; import org.jeecg.modules.demo.inwhdata.entity.TtInWhData;
import org.jeecg.modules.demo.kanbanequiprate.entity.TtKanbanEquipRate; 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.jeecg.common.aspect.annotation.AutoLog;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
/** /**
* @Description: tt_virsual_output * @Description: tt_virsual_output
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2023-02-10 * @Date: 2023-02-10
@ -53,7 +54,8 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
public class TtVirsualOutputController extends JeecgController<TtVirsualOutput, ITtVirsualOutputService> { public class TtVirsualOutputController extends JeecgController<TtVirsualOutput, ITtVirsualOutputService> {
@Autowired @Autowired
private ITtVirsualOutputService ttVirsualOutputService; private ITtVirsualOutputService ttVirsualOutputService;
@Autowired
private RedisUtil redisUtil;
/** /**
* *
* *
@ -67,58 +69,104 @@ public class TtVirsualOutputController extends JeecgController<TtVirsualOutput,
@ApiOperation(value="tt_virsual_output-分页列表查询", notes="tt_virsual_output-分页列表查询") @ApiOperation(value="tt_virsual_output-分页列表查询", notes="tt_virsual_output-分页列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<IPage<TtVirsualOutput>> queryPageList(TtVirsualOutput ttVirsualOutput, public Result<IPage<TtVirsualOutput>> queryPageList(TtVirsualOutput ttVirsualOutput,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<TtVirsualOutput> queryWrapper = QueryGenerator.initQueryWrapper(ttVirsualOutput, req.getParameterMap()); QueryWrapper<TtVirsualOutput> queryWrapper = QueryGenerator.initQueryWrapper(ttVirsualOutput, req.getParameterMap());
Page<TtVirsualOutput> page = new Page<TtVirsualOutput>(pageNo, pageSize); Page<TtVirsualOutput> page = new Page<TtVirsualOutput>(pageNo, pageSize);
IPage<TtVirsualOutput> pageList = ttVirsualOutputService.page(page, queryWrapper); IPage<TtVirsualOutput> pageList = ttVirsualOutputService.page(page, queryWrapper);
return Result.OK(pageList); return Result.OK(pageList);
} }
/** /**
* 1 * 1
* *
* @param ttVirsualOutput * @param ttVirsualOutput
* @return * @return
*/ */
//@AutoLog(value = "tt_virsual_output-新总的看板1列表查询") //@AutoLog(value = "tt_virsual_output-新总的看板1列表查询")
@ApiOperation(value="tt_virsual_output-新总的看板1列表查询", notes="tt_virsual_output-新总的看板1列表查询") @ApiOperation(value="tt_virsual_output-新总的看板1列表查询", notes="tt_virsual_output-新总的看板1列表查询")
@GetMapping(value = "/queryList") @GetMapping(value = "/queryList")
public Result<Map<String, Object>> queryList(TtVirsualOutput ttVirsualOutput) throws ParseException { public Result<Map<String, Object>> queryList(TtVirsualOutput ttVirsualOutput) throws ParseException {
List<TtVirsualOutput> list1 = new ArrayList<>(); List<TtVirsualOutput> list1 = new ArrayList<>();
List<TtVirsualOutput> list2 = new ArrayList<>(); List<TtVirsualOutput> list2 = new ArrayList<>();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Random generator = new Random(); 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); LocalDate localDate = LocalDate.now().minusDays(1);
for(int i=0;i<7;i++){ dayKey.append(sdf.parse(localDate.toString()) + "_");
TtVirsualOutput virsualOutput = new TtVirsualOutput(); localDate = localDate.minusDays(1);
virsualOutput.setCompanyId(1); dayKey.append(sdf.parse(localDate.toString()) + "_");
virsualOutput.setDayName(sdf.parse(localDate.toString())); localDate = localDate.minusDays(1);
randomIndex5 = generator.nextInt( 60 ) + 1;//随机数1到60 45 dayKey.append(sdf.parse(localDate.toString()) + "_");
virsualOutput.setOutputQty(800 + (randomIndex5 * 9)); localDate = localDate.minusDays(1);
virsualOutput.setTypeId(1);//底座 dayKey.append(sdf.parse(localDate.toString()) + "_");
localDate = localDate.minusDays(1); localDate = localDate.minusDays(1);
list1.add(virsualOutput); dayKey.append(sdf.parse(localDate.toString()) + "_");
} localDate = localDate.minusDays(1);
localDate = LocalDate.now().minusDays(1); dayKey.append(sdf.parse(localDate.toString()) + "_");
for(int i=0;i<7;i++){ localDate = localDate.minusDays(1);
TtVirsualOutput virsualOutput = new TtVirsualOutput(); dayKey.append(sdf.parse(localDate.toString()));
virsualOutput.setCompanyId(1); String dayKey1 = dayKey.toString() + "_1";
virsualOutput.setDayName(sdf.parse(localDate.toString())); String dayKey2 = dayKey.toString() + "_2";
randomIndex5 = generator.nextInt( 60 ) + 1;//随机数1到60 45 Object object1 = redisUtil.get(dayKey1);
virsualOutput.setOutputQty(800 + (randomIndex5 * 9)); Object object2 = redisUtil.get(dayKey2);
virsualOutput.setTypeId(2);//底座 if (object1 != null) {
localDate = localDate.minusDays(1); String outputQtys1 = String.valueOf(object1);
list2.add(virsualOutput); String outputQtys2 = String.valueOf(object2);
} String[] outputQtyArr1 = outputQtys1.split("_");
Map<String, Object> map = new HashMap<>(); String[] outputQtyArr2 = outputQtys2.split("_");
map.put("dizuo", list1); String[] dayKeyArr = dayKey.toString().split("_");
map.put("jiaosai", list2); for(int i=0;i<outputQtyArr1.length;i++){
return Result.OK(map); 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(dayKeyArr[i]));
randomIndex5 = generator.nextInt( 60 ) + 1;//随机数1到60 45
virsualOutput.setOutputQty(800 + (randomIndex5 * 9));
virsualOutput.setTypeId(1);//底座
list1.add(virsualOutput);
outputQtys1 = outputQtys1 + virsualOutput.getOutputQty() + "_";
}
for(int i=0;i<7;i++){
TtVirsualOutput virsualOutput = new TtVirsualOutput();
virsualOutput.setCompanyId(1);
virsualOutput.setDayName(sdf.parse(dayKeyArr[i]));
randomIndex5 = generator.nextInt( 60 ) + 1;//随机数1到60 45
virsualOutput.setOutputQty(800 + (randomIndex5 * 9));
virsualOutput.setTypeId(2);//底座
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);
map.put("jiaosai", list2);
return Result.OK(map);
}
/** /**
* *
@ -134,7 +182,7 @@ public class TtVirsualOutputController extends JeecgController<TtVirsualOutput,
ttVirsualOutputService.save(ttVirsualOutput); ttVirsualOutputService.save(ttVirsualOutput);
return Result.OK("添加成功!"); return Result.OK("添加成功!");
} }
/** /**
* *
* *
@ -149,7 +197,7 @@ public class TtVirsualOutputController extends JeecgController<TtVirsualOutput,
ttVirsualOutputService.updateById(ttVirsualOutput); ttVirsualOutputService.updateById(ttVirsualOutput);
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
} }
/** /**
* id * id
* *
@ -164,7 +212,7 @@ public class TtVirsualOutputController extends JeecgController<TtVirsualOutput,
ttVirsualOutputService.removeById(id); ttVirsualOutputService.removeById(id);
return Result.OK("删除成功!"); return Result.OK("删除成功!");
} }
/** /**
* *
* *
@ -179,7 +227,7 @@ public class TtVirsualOutputController extends JeecgController<TtVirsualOutput,
this.ttVirsualOutputService.removeByIds(Arrays.asList(ids.split(","))); this.ttVirsualOutputService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!"); return Result.OK("批量删除成功!");
} }
/** /**
* id * id
* *
@ -197,29 +245,29 @@ public class TtVirsualOutputController extends JeecgController<TtVirsualOutput,
return Result.OK(ttVirsualOutput); return Result.OK(ttVirsualOutput);
} }
/** /**
* excel * excel
* *
* @param request * @param request
* @param ttVirsualOutput * @param ttVirsualOutput
*/ */
//@RequiresPermissions("virsualoutput:tt_virsual_output:exportXls") //@RequiresPermissions("virsualoutput:tt_virsual_output:exportXls")
@RequestMapping(value = "/exportXls") @RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, TtVirsualOutput ttVirsualOutput) { public ModelAndView exportXls(HttpServletRequest request, TtVirsualOutput ttVirsualOutput) {
return super.exportXls(request, ttVirsualOutput, TtVirsualOutput.class, "tt_virsual_output"); return super.exportXls(request, ttVirsualOutput, TtVirsualOutput.class, "tt_virsual_output");
} }
/** /**
* excel * excel
* *
* @param request * @param request
* @param response * @param response
* @return * @return
*/ */
//@RequiresPermissions("virsualoutput:tt_virsual_output:importExcel") //@RequiresPermissions("virsualoutput:tt_virsual_output:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST) @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, TtVirsualOutput.class); return super.importExcel(request, response, TtVirsualOutput.class);
} }
} }

@ -1,8 +1,9 @@
package org.jeecg.modules.demo.virsualpassrate.controller; 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.util.stream.Collectors;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
@ -11,7 +12,9 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.RedisUtil;
import org.jeecg.common.util.oConvertUtils; 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.entity.TtVirsualPassRate;
import org.jeecg.modules.demo.virsualpassrate.service.ITtVirsualPassRateService; 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.jeecg.common.aspect.annotation.AutoLog;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
/** /**
* @Description: tt_virsual_pass_rate * @Description: tt_virsual_pass_rate
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2023-02-10 * @Date: 2023-02-10
@ -50,7 +53,8 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
public class TtVirsualPassRateController extends JeecgController<TtVirsualPassRate, ITtVirsualPassRateService> { public class TtVirsualPassRateController extends JeecgController<TtVirsualPassRate, ITtVirsualPassRateService> {
@Autowired @Autowired
private ITtVirsualPassRateService ttVirsualPassRateService; private ITtVirsualPassRateService ttVirsualPassRateService;
@Autowired
private RedisUtil redisUtil;
/** /**
* *
* *
@ -64,15 +68,105 @@ public class TtVirsualPassRateController extends JeecgController<TtVirsualPassRa
@ApiOperation(value="tt_virsual_pass_rate-分页列表查询", notes="tt_virsual_pass_rate-分页列表查询") @ApiOperation(value="tt_virsual_pass_rate-分页列表查询", notes="tt_virsual_pass_rate-分页列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<IPage<TtVirsualPassRate>> queryPageList(TtVirsualPassRate ttVirsualPassRate, public Result<IPage<TtVirsualPassRate>> queryPageList(TtVirsualPassRate ttVirsualPassRate,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<TtVirsualPassRate> queryWrapper = QueryGenerator.initQueryWrapper(ttVirsualPassRate, req.getParameterMap()); QueryWrapper<TtVirsualPassRate> queryWrapper = QueryGenerator.initQueryWrapper(ttVirsualPassRate, req.getParameterMap());
Page<TtVirsualPassRate> page = new Page<TtVirsualPassRate>(pageNo, pageSize); Page<TtVirsualPassRate> page = new Page<TtVirsualPassRate>(pageNo, pageSize);
IPage<TtVirsualPassRate> pageList = ttVirsualPassRateService.page(page, queryWrapper); IPage<TtVirsualPassRate> pageList = ttVirsualPassRateService.page(page, queryWrapper);
return Result.OK(pageList); 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);
}
/** /**
* *
* *
@ -87,7 +181,7 @@ public class TtVirsualPassRateController extends JeecgController<TtVirsualPassRa
ttVirsualPassRateService.save(ttVirsualPassRate); ttVirsualPassRateService.save(ttVirsualPassRate);
return Result.OK("添加成功!"); return Result.OK("添加成功!");
} }
/** /**
* *
* *
@ -102,7 +196,7 @@ public class TtVirsualPassRateController extends JeecgController<TtVirsualPassRa
ttVirsualPassRateService.updateById(ttVirsualPassRate); ttVirsualPassRateService.updateById(ttVirsualPassRate);
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
} }
/** /**
* id * id
* *
@ -117,7 +211,7 @@ public class TtVirsualPassRateController extends JeecgController<TtVirsualPassRa
ttVirsualPassRateService.removeById(id); ttVirsualPassRateService.removeById(id);
return Result.OK("删除成功!"); return Result.OK("删除成功!");
} }
/** /**
* *
* *
@ -132,7 +226,7 @@ public class TtVirsualPassRateController extends JeecgController<TtVirsualPassRa
this.ttVirsualPassRateService.removeByIds(Arrays.asList(ids.split(","))); this.ttVirsualPassRateService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!"); return Result.OK("批量删除成功!");
} }
/** /**
* id * id
* *
@ -150,29 +244,29 @@ public class TtVirsualPassRateController extends JeecgController<TtVirsualPassRa
return Result.OK(ttVirsualPassRate); return Result.OK(ttVirsualPassRate);
} }
/** /**
* excel * excel
* *
* @param request * @param request
* @param ttVirsualPassRate * @param ttVirsualPassRate
*/ */
//@RequiresPermissions("virsualpassrate:tt_virsual_pass_rate:exportXls") //@RequiresPermissions("virsualpassrate:tt_virsual_pass_rate:exportXls")
@RequestMapping(value = "/exportXls") @RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, TtVirsualPassRate ttVirsualPassRate) { public ModelAndView exportXls(HttpServletRequest request, TtVirsualPassRate ttVirsualPassRate) {
return super.exportXls(request, ttVirsualPassRate, TtVirsualPassRate.class, "tt_virsual_pass_rate"); return super.exportXls(request, ttVirsualPassRate, TtVirsualPassRate.class, "tt_virsual_pass_rate");
} }
/** /**
* excel * excel
* *
* @param request * @param request
* @param response * @param response
* @return * @return
*/ */
//@RequiresPermissions("virsualpassrate:tt_virsual_pass_rate:importExcel") //@RequiresPermissions("virsualpassrate:tt_virsual_pass_rate:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST) @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, TtVirsualPassRate.class); return super.importExcel(request, response, TtVirsualPassRate.class);
} }
} }

@ -1,8 +1,9 @@
package org.jeecg.modules.demo.virsualshipping.controller; 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.util.stream.Collectors;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
@ -11,6 +12,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.RedisUtil;
import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.demo.virsualshipping.entity.TtVirsualShipping; import org.jeecg.modules.demo.virsualshipping.entity.TtVirsualShipping;
import org.jeecg.modules.demo.virsualshipping.service.ITtVirsualShippingService; 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.jeecg.common.aspect.annotation.AutoLog;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
/** /**
* @Description: tt_virsual_shipping * @Description: tt_virsual_shipping
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2023-02-10 * @Date: 2023-02-10
@ -50,7 +52,8 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
public class TtVirsualShippingController extends JeecgController<TtVirsualShipping, ITtVirsualShippingService> { public class TtVirsualShippingController extends JeecgController<TtVirsualShipping, ITtVirsualShippingService> {
@Autowired @Autowired
private ITtVirsualShippingService ttVirsualShippingService; private ITtVirsualShippingService ttVirsualShippingService;
@Autowired
private RedisUtil redisUtil;
/** /**
* *
* *
@ -64,15 +67,105 @@ public class TtVirsualShippingController extends JeecgController<TtVirsualShippi
@ApiOperation(value="tt_virsual_shipping-分页列表查询", notes="tt_virsual_shipping-分页列表查询") @ApiOperation(value="tt_virsual_shipping-分页列表查询", notes="tt_virsual_shipping-分页列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<IPage<TtVirsualShipping>> queryPageList(TtVirsualShipping ttVirsualShipping, public Result<IPage<TtVirsualShipping>> queryPageList(TtVirsualShipping ttVirsualShipping,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<TtVirsualShipping> queryWrapper = QueryGenerator.initQueryWrapper(ttVirsualShipping, req.getParameterMap()); QueryWrapper<TtVirsualShipping> queryWrapper = QueryGenerator.initQueryWrapper(ttVirsualShipping, req.getParameterMap());
Page<TtVirsualShipping> page = new Page<TtVirsualShipping>(pageNo, pageSize); Page<TtVirsualShipping> page = new Page<TtVirsualShipping>(pageNo, pageSize);
IPage<TtVirsualShipping> pageList = ttVirsualShippingService.page(page, queryWrapper); IPage<TtVirsualShipping> pageList = ttVirsualShippingService.page(page, queryWrapper);
return Result.OK(pageList); 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);
}
/** /**
* *
* *
@ -87,7 +180,7 @@ public class TtVirsualShippingController extends JeecgController<TtVirsualShippi
ttVirsualShippingService.save(ttVirsualShipping); ttVirsualShippingService.save(ttVirsualShipping);
return Result.OK("添加成功!"); return Result.OK("添加成功!");
} }
/** /**
* *
* *
@ -102,7 +195,7 @@ public class TtVirsualShippingController extends JeecgController<TtVirsualShippi
ttVirsualShippingService.updateById(ttVirsualShipping); ttVirsualShippingService.updateById(ttVirsualShipping);
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
} }
/** /**
* id * id
* *
@ -117,7 +210,7 @@ public class TtVirsualShippingController extends JeecgController<TtVirsualShippi
ttVirsualShippingService.removeById(id); ttVirsualShippingService.removeById(id);
return Result.OK("删除成功!"); return Result.OK("删除成功!");
} }
/** /**
* *
* *
@ -132,7 +225,7 @@ public class TtVirsualShippingController extends JeecgController<TtVirsualShippi
this.ttVirsualShippingService.removeByIds(Arrays.asList(ids.split(","))); this.ttVirsualShippingService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!"); return Result.OK("批量删除成功!");
} }
/** /**
* id * id
* *
@ -150,29 +243,29 @@ public class TtVirsualShippingController extends JeecgController<TtVirsualShippi
return Result.OK(ttVirsualShipping); return Result.OK(ttVirsualShipping);
} }
/** /**
* excel * excel
* *
* @param request * @param request
* @param ttVirsualShipping * @param ttVirsualShipping
*/ */
//@RequiresPermissions("virsualshipping:tt_virsual_shipping:exportXls") //@RequiresPermissions("virsualshipping:tt_virsual_shipping:exportXls")
@RequestMapping(value = "/exportXls") @RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, TtVirsualShipping ttVirsualShipping) { public ModelAndView exportXls(HttpServletRequest request, TtVirsualShipping ttVirsualShipping) {
return super.exportXls(request, ttVirsualShipping, TtVirsualShipping.class, "tt_virsual_shipping"); return super.exportXls(request, ttVirsualShipping, TtVirsualShipping.class, "tt_virsual_shipping");
} }
/** /**
* excel * excel
* *
* @param request * @param request
* @param response * @param response
* @return * @return
*/ */
//@RequiresPermissions("virsualshipping:tt_virsual_shipping:importExcel") //@RequiresPermissions("virsualshipping:tt_virsual_shipping:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST) @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, TtVirsualShipping.class); return super.importExcel(request, response, TtVirsualShipping.class);
} }
} }

@ -1,5 +1,6 @@
package org.jeecg.modules.demo.virsualwostatus.controller; package org.jeecg.modules.demo.virsualwostatus.controller;
import java.math.BigDecimal;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.LocalDate; import java.time.LocalDate;
@ -12,6 +13,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.RedisUtil;
import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.demo.virsualoutput.entity.TtVirsualOutput; import org.jeecg.modules.demo.virsualoutput.entity.TtVirsualOutput;
import org.jeecg.modules.demo.virsualwostatus.entity.TtVirsualWoStatus; 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.jeecg.common.aspect.annotation.AutoLog;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
/** /**
* @Description: tt_virsual_wo_status * @Description: tt_virsual_wo_status
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2023-02-10 * @Date: 2023-02-10
@ -52,7 +54,8 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
public class TtVirsualWoStatusController extends JeecgController<TtVirsualWoStatus, ITtVirsualWoStatusService> { public class TtVirsualWoStatusController extends JeecgController<TtVirsualWoStatus, ITtVirsualWoStatusService> {
@Autowired @Autowired
private ITtVirsualWoStatusService ttVirsualWoStatusService; private ITtVirsualWoStatusService ttVirsualWoStatusService;
@Autowired
private RedisUtil redisUtil;
/** /**
* *
* *
@ -66,57 +69,78 @@ public class TtVirsualWoStatusController extends JeecgController<TtVirsualWoStat
@ApiOperation(value="tt_virsual_wo_status-分页列表查询", notes="tt_virsual_wo_status-分页列表查询") @ApiOperation(value="tt_virsual_wo_status-分页列表查询", notes="tt_virsual_wo_status-分页列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<IPage<TtVirsualWoStatus>> queryPageList(TtVirsualWoStatus ttVirsualWoStatus, public Result<IPage<TtVirsualWoStatus>> queryPageList(TtVirsualWoStatus ttVirsualWoStatus,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<TtVirsualWoStatus> queryWrapper = QueryGenerator.initQueryWrapper(ttVirsualWoStatus, req.getParameterMap()); QueryWrapper<TtVirsualWoStatus> queryWrapper = QueryGenerator.initQueryWrapper(ttVirsualWoStatus, req.getParameterMap());
Page<TtVirsualWoStatus> page = new Page<TtVirsualWoStatus>(pageNo, pageSize); Page<TtVirsualWoStatus> page = new Page<TtVirsualWoStatus>(pageNo, pageSize);
IPage<TtVirsualWoStatus> pageList = ttVirsualWoStatusService.page(page, queryWrapper); IPage<TtVirsualWoStatus> pageList = ttVirsualWoStatusService.page(page, queryWrapper);
return Result.OK(pageList); return Result.OK(pageList);
} }
/** /**
* 2 * 2
* *
* @param ttVirsualWoStatus * @param ttVirsualWoStatus
* @return * @return
*/ */
//@AutoLog(value = "tt_virsual_wo_status-新总的看板2列表查询") //@AutoLog(value = "tt_virsual_wo_status-新总的看板2列表查询")
@ApiOperation(value="tt_virsual_wo_status-新总的看板2列表查询", notes="tt_virsual_wo_status-新总的看板2列表查询") @ApiOperation(value="tt_virsual_wo_status-新总的看板2列表查询", notes="tt_virsual_wo_status-新总的看板2列表查询")
@GetMapping(value = "/queryList") @GetMapping(value = "/queryList")
public Result<List<TtVirsualWoStatus>> queryList(TtVirsualWoStatus ttVirsualWoStatus) throws ParseException { public Result<List<TtVirsualWoStatus>> queryList(TtVirsualWoStatus ttVirsualWoStatus) throws ParseException {
List<TtVirsualWoStatus> list = new ArrayList<>(); List<TtVirsualWoStatus> list = new ArrayList<>();
for(int i=1;i<6;i++){ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
TtVirsualWoStatus virsualWoStatus = new TtVirsualWoStatus(); Date date = new Date();
virsualWoStatus.setCompanyId(1); String nowDateString = sdf.format(date);//2023-02-08 11:23
virsualWoStatus.setWoStatus("正常"); for(int i=1;i<6;i++){
if(i == 1){ TtVirsualWoStatus virsualWoStatus = new TtVirsualWoStatus();
virsualWoStatus.setWoNo("D23020071"); virsualWoStatus.setCompanyId(1);
virsualWoStatus.setPartNo("Q601-A"); virsualWoStatus.setWoStatus("正常");
virsualWoStatus.setPartName("V06615A"); virsualWoStatus.setTypeId(1);
}else if(i==2){ Random generator = new Random();
virsualWoStatus.setWoNo("D23020072"); int randomIndex5 = 0;
virsualWoStatus.setPartNo("Q806-A"); Object object = redisUtil.get("注塑机" + i);
virsualWoStatus.setPartName("产品名称"); if (object != null) {
}else if(i==3){ randomIndex5 = Integer.parseInt(String.valueOf(object));
virsualWoStatus.setWoNo("D23020075"); }else{
virsualWoStatus.setPartNo("1012-T"); randomIndex5 = generator.nextInt( 60 );//随机数0到59 45
virsualWoStatus.setPartName("产品名称"); redisUtil.set("注塑机" + i, randomIndex5);
}else if(i==4){ }
virsualWoStatus.setWoNo("D23020080"); String openTimeParam = String.valueOf(randomIndex5);
virsualWoStatus.setPartNo("807F-T"); if(randomIndex5 < 10){
virsualWoStatus.setPartName("产品名称"); openTimeParam = "0" + String.valueOf(randomIndex5);
}else if(i==5){ }
virsualWoStatus.setWoNo("D23020084"); String openDate = nowDateString.substring(0, 10) + " 08:" + openTimeParam;//开机时间8点到9点之间2023-02-08 08:45
virsualWoStatus.setPartNo("605F-A"); long time = date.getTime();
virsualWoStatus.setPartName("产品名称" + i); long time2 = sdf.parse(openDate).getTime();
virsualWoStatus.setWoStatus("超期"); int progress = (int)((time - time2) * 100) / (1000 * 60 * 480);
} virsualWoStatus.setProgress(new BigDecimal("0." + progress));
//virsualWoStatus.setProgress(0.5); 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); list.add(virsualWoStatus);
} }
return Result.OK(list); return Result.OK(list);
} }
/** /**
* *
@ -132,7 +156,7 @@ public class TtVirsualWoStatusController extends JeecgController<TtVirsualWoStat
ttVirsualWoStatusService.save(ttVirsualWoStatus); ttVirsualWoStatusService.save(ttVirsualWoStatus);
return Result.OK("添加成功!"); return Result.OK("添加成功!");
} }
/** /**
* *
* *
@ -147,7 +171,7 @@ public class TtVirsualWoStatusController extends JeecgController<TtVirsualWoStat
ttVirsualWoStatusService.updateById(ttVirsualWoStatus); ttVirsualWoStatusService.updateById(ttVirsualWoStatus);
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
} }
/** /**
* id * id
* *
@ -162,7 +186,7 @@ public class TtVirsualWoStatusController extends JeecgController<TtVirsualWoStat
ttVirsualWoStatusService.removeById(id); ttVirsualWoStatusService.removeById(id);
return Result.OK("删除成功!"); return Result.OK("删除成功!");
} }
/** /**
* *
* *
@ -177,7 +201,7 @@ public class TtVirsualWoStatusController extends JeecgController<TtVirsualWoStat
this.ttVirsualWoStatusService.removeByIds(Arrays.asList(ids.split(","))); this.ttVirsualWoStatusService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!"); return Result.OK("批量删除成功!");
} }
/** /**
* id * id
* *
@ -195,29 +219,29 @@ public class TtVirsualWoStatusController extends JeecgController<TtVirsualWoStat
return Result.OK(ttVirsualWoStatus); return Result.OK(ttVirsualWoStatus);
} }
/** /**
* excel * excel
* *
* @param request * @param request
* @param ttVirsualWoStatus * @param ttVirsualWoStatus
*/ */
//@RequiresPermissions("virsualwostatus:tt_virsual_wo_status:exportXls") //@RequiresPermissions("virsualwostatus:tt_virsual_wo_status:exportXls")
@RequestMapping(value = "/exportXls") @RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, TtVirsualWoStatus ttVirsualWoStatus) { public ModelAndView exportXls(HttpServletRequest request, TtVirsualWoStatus ttVirsualWoStatus) {
return super.exportXls(request, ttVirsualWoStatus, TtVirsualWoStatus.class, "tt_virsual_wo_status"); return super.exportXls(request, ttVirsualWoStatus, TtVirsualWoStatus.class, "tt_virsual_wo_status");
} }
/** /**
* excel * excel
* *
* @param request * @param request
* @param response * @param response
* @return * @return
*/ */
//@RequiresPermissions("virsualwostatus:tt_virsual_wo_status:importExcel") //@RequiresPermissions("virsualwostatus:tt_virsual_wo_status:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST) @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, TtVirsualWoStatus.class); return super.importExcel(request, response, TtVirsualWoStatus.class);
} }
} }

@ -1,8 +1,9 @@
package org.jeecg.modules.demo.virsualwsstatus.controller; 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.util.stream.Collectors;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
@ -11,7 +12,9 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.RedisUtil;
import org.jeecg.common.util.oConvertUtils; 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.entity.TtVirsualWsStatus;
import org.jeecg.modules.demo.virsualwsstatus.service.ITtVirsualWsStatusService; 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> { public class TtVirsualWsStatusController extends JeecgController<TtVirsualWsStatus, ITtVirsualWsStatusService> {
@Autowired @Autowired
private ITtVirsualWsStatusService ttVirsualWsStatusService; private ITtVirsualWsStatusService ttVirsualWsStatusService;
@Autowired
private RedisUtil redisUtil;
/** /**
* *
* *
@ -72,7 +76,56 @@ public class TtVirsualWsStatusController extends JeecgController<TtVirsualWsStat
IPage<TtVirsualWsStatus> pageList = ttVirsualWsStatusService.page(page, queryWrapper); IPage<TtVirsualWsStatus> pageList = ttVirsualWsStatusService.page(page, queryWrapper);
return Result.OK(pageList); 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);
}
/** /**
* *
* *

Loading…
Cancel
Save