Merge remote-tracking branch 'origin/master'

wu

2024-08-06 6f88e39b13f09decfdac0d31887a4e7c34629fc6

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java

@@ -1,7 +1,19 @@
package com.mes.taskcache.controller;

import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
import com.mes.edgstoragecage.service.EdgStorageCageService;
import com.mes.taskcache.entity.TaskCache;
import com.mes.taskcache.service.TaskCacheService;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.Map;

import static com.mes.job.CacheGlassTask.engineerId;

/**
 * <p>
@@ -11,9 +23,54 @@
 * @author zhoush
 * @since 2024-04-07
 */
@Api(description = "识别显示")
@RestController
@RequestMapping("/taskCache")
public class TaskCacheController {

    @Autowired
    private EdgStorageCageDetailsService edgStorageCageDetailsService;

    @Autowired
    private EdgStorageCageService edgStorageCageService;
    @Autowired
    private TaskCacheService taskCacheService;

    @ApiOperation("查询切割版图信息-根据 工程号   参数(工程号)")
    @PostMapping("/cutTerritory")
    @ResponseBody
    public Result cutTerritory(String current) {
        //engineerId=current;
        List<List<Map<String, Object>>> h = edgStorageCageDetailsService.selectCurrentCutTerritory(current);
        return Result.build(200,"成功",h);
    }
    @ApiOperation("识别显示  当前版图   参数()")
    @PostMapping("/currentCutTerritory")
    @ResponseBody
    public Result currentCutTerritory() {
        List<Map<String, Object>> h = edgStorageCageDetailsService.selectCutTerritory();
        return Result.build(200,"成功",h);
    }
    @ApiOperation("识别操作：   破损/拿走     参数（ID,功能[200：拿走，201:破损]）")
    @PostMapping("/identControls")
    @ResponseBody
    public Result identControls(@RequestBody Map<String, String> arguments) {
       /* arguments.put("glassId","玻璃ID");
        arguments.put("controlsId","功能号[200拿走/201破损]");*/
        /*arguments.put("line","1001");
        arguments.put("machine","识别");*/
        boolean issucess = edgStorageCageDetailsService.identWorn(arguments);
        return Result.build(200,"成功",issucess);
    }

    @ApiOperation("磨边任务 参数()")
    @PostMapping("/selectEdgTask")
    @ResponseBody
    public Result selectEdgTask(@RequestBody Map<String, String> arguments) {
        String line=arguments.get("line");
        List<Map<String,Object>> EdgTasks = taskCacheService.selectEdgInfo(line);
        return Result.build(200,"成功",EdgTasks);
    }

}