add AMES设备结果回传

wujian

2024-04-17 8c05d8c9715a26e1b7a01db431d1262730d8c408

 jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/controller/EmInspectionPlanItemsProjectController.java

@@ -1,9 +1,19 @@
package com.jcdm.main.em.inspectionPlanItemsProject.controller;

import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jcdm.common.exception.ServiceException;
import com.jcdm.framework.websocket.WebSocketUsers;
import com.jcdm.main.em.inspectionPlanTask.domain.EmInspectionPlanTask;
import com.jcdm.main.em.inspectionPlanTask.service.IEmInspectionPlanTaskService;
import org.aspectj.weaver.loadtime.Aj;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,13 +40,56 @@
    @Autowired
    private IEmInspectionPlanItemsProjectService emInspectionPlanItemsProjectService;

    @RequestMapping("/findPlanItemsProjectByPlanId")
    public AjaxResult list(@RequestParam String planId)
    @Autowired
    private IEmInspectionPlanTaskService emInspectionPlanTaskService;

    @GetMapping("/findPlanItemsProjectByPlanId")
    public AjaxResult list2(EmInspectionPlanItemsProject emInspectionPlanItemsProject)
    {
        List<EmInspectionPlanItemsProject> planTaskIdList = emInspectionPlanItemsProjectService.list(new QueryWrapper<EmInspectionPlanItemsProject>().eq("plan_task_id", planId));
        return AjaxResult.success(planTaskIdList);
        if (StrUtil.isBlank(emInspectionPlanItemsProject.getPlanTaskCode())){
            throw new ServiceException("未获取到计划编号，请重试!");
        }
        Map<String,Object> resultMap = new HashMap<>();
        List<EmInspectionPlanTask> list = emInspectionPlanTaskService.list(new LambdaQueryWrapper<EmInspectionPlanTask>()
                .eq(EmInspectionPlanTask::getPlanCode, emInspectionPlanItemsProject.getPlanTaskCode()));
        if (CollUtil.isNotEmpty(list)){
            EmInspectionPlanTask byId = list.get(0);
            List<EmInspectionPlanItemsProject> planTaskIdList = emInspectionPlanItemsProjectService
                    .list(new LambdaQueryWrapper<EmInspectionPlanItemsProject>()
                            .eq(EmInspectionPlanItemsProject::getPlanTaskId,byId.getId())
                            .eq(EmInspectionPlanItemsProject::getItemsType,emInspectionPlanItemsProject.getItemsType()));

            resultMap.put("planItemsProject", planTaskIdList);
            resultMap.put("planTask",byId);
        }else {
            throw new ServiceException("未获取到计划数据!");
        }
        return AjaxResult.success(resultMap);
    }

    @PostMapping("/updateItemsProjectResults")
    public AjaxResult updateItemsProjectResults(@RequestBody EmInspectionPlanItemsProject emInspectionPlanItemsProject)
    {
        EmInspectionPlanItemsProject itemsProject = emInspectionPlanItemsProjectService.getById(emInspectionPlanItemsProject.getId());
        itemsProject.setResults(emInspectionPlanItemsProject.getResults());
        emInspectionPlanItemsProjectService.saveOrUpdate(itemsProject);

        List<EmInspectionPlanItemsProject> list = emInspectionPlanItemsProjectService.list(new LambdaQueryWrapper<EmInspectionPlanItemsProject>()
                .eq(EmInspectionPlanItemsProject::getPlanTaskId, itemsProject.getPlanTaskId()));

        List<String> collect = list.stream()
                .map(EmInspectionPlanItemsProject::getResults)
                .filter(x-> !"1".equals(x)).collect(Collectors.toList());
        if(CollUtil.isEmpty(collect)){
            EmInspectionPlanTask planTaskById = emInspectionPlanTaskService.getById(itemsProject.getPlanTaskId());
            planTaskById.setState("1");
            emInspectionPlanTaskService.saveOrUpdate(planTaskById);
        }
        return AjaxResult.success();
    }



    /**
     * 查询点检任务-项目列表
     */