| | |
|---|
| | | |
|---|
| | | |
|---|
| | | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|---|
| | | import com.mes.md.entity.KBBTJPDrawingBP; |
|---|
| | | import com.mes.md.entity.PrimitiveTask; |
|---|
| | | import com.mes.md.entity.TaskingLog; |
|---|
| | | import com.mes.md.entity.*; |
|---|
| | | import com.mes.md.mapper.KBBTJPDrawingBPMapper; |
|---|
| | | import com.mes.md.mapper.TaskingLogMapper; |
|---|
| | | import com.mes.md.service.KBBTJPDrawingBPService; |
|---|
| | | import com.mes.md.service.LineConfigurationService; |
|---|
| | | import com.mes.md.service.PrimitiveTaskService; |
|---|
| | | import com.mes.md.service.TaskingLogService; |
|---|
| | | import com.mes.utils.Result; |
|---|
| | |
|---|
| | | TaskingLogService taskingLogService; |
|---|
| | | @Autowired |
|---|
| | | TaskingLogMapper taskingLogMapper; |
|---|
| | | @Autowired |
|---|
| | | LineConfigurationService lineConfigurationService; |
|---|
| | | |
|---|
| | | @ApiOperation("查询当前设备，未完工状态的线上任务") |
|---|
| | | @PostMapping("/selectPrimitiveTask") |
|---|
| | | @PostMapping("/findMachineTask") |
|---|
| | | @ResponseBody |
|---|
| | | public Result findMachineTask(@RequestBody PrimitiveTask primitiveTask) { |
|---|
| | | List<PrimitiveTask> list =primitiveTaskService.selectPrimitiveTask(primitiveTask); |
|---|
| | | public Result findMachineTask(@RequestBody Machine machine) { |
|---|
| | | LineConfiguration lineConfiguration = lineConfigurationService.machineLineConfiguration(machine); |
|---|
| | | List<PrimitiveTask> list =primitiveTaskService.findPrimitiveTasking(machine,lineConfiguration.getLineId()); |
|---|
| | | return Result.build(200,"成功",list); |
|---|
| | | } |
|---|
| | | |
|---|
| | |
|---|
| | | int dayCount = lastDayCal.get(Calendar.DAY_OF_MONTH); |
|---|
| | | |
|---|
| | | QueryWrapper<TaskingLog> queryWrapper = new QueryWrapper<>(); |
|---|
| | | queryWrapper.select("CAST(operation_record_time AS DATE) AS CreateDate,ifNull(sum(task_quantity),0) as task_quantity_sum,ifNull(sum(length*width*task_quantity)/1000000,0) as area_sum") |
|---|
| | | .ge("operation_record_time",startDate).le("operation_record_time",endDate).eq("work_state","完工").groupBy("CAST(operation_record_time AS DATE)") |
|---|
| | | .orderByAsc("CAST(operation_record_time AS DATE)");; |
|---|
| | | queryWrapper.select("CAST(operation_record_time AS DATE) AS CreateDate,ifNull(sum(task_quantity),0) as task_quantity_sum,ifNull(sum(length*width)/1000000,0) as area_sum") |
|---|
| | | .ge("operation_record_time",startDate).le("operation_record_time",endDate) |
|---|
| | | .in("operation_record","旋转1","旋转2") |
|---|
| | | .eq("operation_mode","结束") |
|---|
| | | .eq("work_state","完工") |
|---|
| | | .groupBy("CAST(operation_record_time AS DATE)") |
|---|
| | | .orderByAsc("CAST(operation_record_time AS DATE)"); |
|---|
| | | List<Map> list=taskingLogMapper.selectMaps((QueryWrapper)queryWrapper); |
|---|
| | | List<Map> resultDate=new ArrayList<>(); |
|---|
| | | |
|---|
