|
|
@ -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);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|