更新最新代码，上片页面领取任务传递固定值修改为动态获取线路

huang

2025-06-30 935275e79de8415ee3ca0b9a45da548aa6a2ee34

 JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/PrimitiveTaskController.java

@@ -4,7 +4,9 @@
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.mapper.KBBTJPDrawingBPMapper;
import com.mes.md.mapper.TaskingLogMapper;
import com.mes.md.service.KBBTJPDrawingBPService;
import com.mes.md.service.PrimitiveTaskService;
import com.mes.md.service.TaskingLogService;
@@ -38,6 +40,8 @@
    KBBTJPDrawingBPMapper kBBTJPDrawingBPMapper;
    @Autowired
    TaskingLogService taskingLogService;
    @Autowired
    TaskingLogMapper taskingLogMapper;

    @ApiOperation("查询当前设备，未完工状态的线上任务")
    @PostMapping("/selectPrimitiveTask")
@@ -161,5 +165,68 @@
        }
        return Result.build(200,"成功",resultDate);
    }

    @ApiOperation("查询 完成量 m² 片数")
    @PostMapping("/findFinishQuantity")
    @ResponseBody
    public Result findFinishQuantity(@RequestBody Map<String, String> map) {

        Calendar cal = Calendar.getInstance();
        //设置当前时间
        cal.setTime(new Date());
        cal.set(Calendar.HOUR_OF_DAY, 0);
        cal.set(Calendar.MINUTE, 0);
        cal.set(Calendar.SECOND, 0);
        cal.set(Calendar.MILLISECOND, 0);

        //cal.add(Calendar.DATE, 1-dayCount);
        cal.set(Calendar.DAY_OF_MONTH, 1);
        Date startDate = cal.getTime();

        // 获取当月最后一天
        Calendar lastDayCal = (Calendar) cal.clone();
        lastDayCal.add(Calendar.MONTH, 1);
        lastDayCal.add(Calendar.DATE, -1);
        Date endDate = lastDayCal.getTime();

        // 获取当月天数
        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)");;
        List<Map> list=taskingLogMapper.selectMaps((QueryWrapper)queryWrapper);
        List<Map> resultDate=new ArrayList<>();

        // 重置日历到当月第一天
        cal.setTime(startDate);

         for (int i=0;i<dayCount;i++){
            Date thisdate=cal.getTime();
            cal.add(Calendar.DATE, 1);
            Map thisMap=new HashMap<>();

            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
            String dateString = sdf.format(thisdate);
            thisMap.put("CreateDate",dateString);
//            if(list.size()>0){
//                log.info("对比:{},{},{}",list.get(0).get("CreateDate"),dateString,list.get(0).get("CreateDate").toString().equals(dateString));
//            }

            if (list.size()>0&&list.get(0).get("CreateDate").toString().equals(dateString)){
                thisMap.put("task_quantity_sum",list.get(0).get("task_quantity_sum"));
                thisMap.put("area_sum",list.get(0).get("area_sum"));
                list.remove(0);
            }else{
                thisMap.put("task_quantity_sum",0);
                thisMap.put("area_sum",0);
            }
            resultDate.add(thisMap);
        }

        return Result.build(200,"成功",resultDate);

    }
}