#

lsh

2024-07-25 a7c9e410db03f9ffd6eb8ccda9b295844302fe32

 src/main/java/com/zy/asrs/controller/OpenController.java

@@ -1,15 +1,21 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.OpenService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
@@ -32,8 +38,12 @@

    @Autowired
    private OpenService openService;
    @Autowired
    private BasDevpService basDevpService;
    @Autowired
    private BasCrnpService basCrnpService;

    /*@PostMapping("/order/matSync/default/v1")
    @PostMapping("/order/matSync/default/v1")
    @AppAuth(memo = "商品信息同步接口")
    public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
                                      @RequestBody(required = false) MatSyncParam param,
@@ -44,7 +54,7 @@
        }
        openService.syncMat(param);
        return R.ok();
    }*/
    }

    /**
     * 添加入库单
@@ -197,7 +207,7 @@
     * 贴标机申请获取货物信息
     */
    @PostMapping("/labeller/mat/auth/v1")
    @AppAuth(memo = "贴标机申请获取货物信息")
    @AppAuth(memo = "贴标机申请获取货物信息") //old需要修改
    public synchronized R labellerMat(@RequestHeader(required = false) String appkey,
                                      @RequestBody LabellerMatParam param,
                                      HttpServletRequest request) {
@@ -209,25 +219,51 @@
     * 贴标机贴标完成
     */
    @PostMapping("/labeller/complete/auth/v1")
    @AppAuth(memo = "贴标机贴标完成")
    @AppAuth(memo = "贴标机贴标完成") //old需要修改
    public synchronized R labellerComplete(@RequestHeader(required = false) String appkey,
                                           @RequestBody LabellerCompleteParam param,
                                           HttpServletRequest request) {
        auth(appkey, param, request);
        openService.labellerComplete(param);
        return R.ok(param);
        return R.ok();
    }

//    /**
//     * 中控(2楼)：码垛完成下发入库信息
//     */
//    @PostMapping("/palletizing/complete/auth/v1")
//    @AppAuth(memo = "中控(2楼)：码垛完成下发入库信息")
//    public synchronized R PalletizingCompleteTwoFloorParam(@RequestHeader(required = false) String appkey,
//                                           @RequestBody PalletizingCompleteTwoFloorParam param,
//                                           HttpServletRequest request) {
//        auth(appkey, param, request);
//        openService.PalletizingCompleteTwoFloorParam(param);
//        return R.ok(param);
//    }

    /**
     * 松盛(1楼)：码垛完成下发入库信息
     */
    @PostMapping("/palletizing/complete/auth/v2")
    @AppAuth(memo = "松盛(1楼)：码垛完成下发确认信号")
    public synchronized R palletizingCompleteS(@RequestHeader(required = false) String appkey,
                                              @RequestBody PalletizingCompleteParam param,
                                              HttpServletRequest request) {
        auth(appkey, param, request);
        openService.palletizingCompleteS(param);
        return R.ok();
    }

    /**
     * 中控：码垛完成下发入库信息
     * 中控：出库完成月台相关
     */
    @PostMapping("/palletizing/complete/auth/v1")
    @AppAuth(memo = "中控：码垛完成下发入库信息")
    public synchronized R palletizingComplete(@RequestHeader(required = false) String appkey,
                                           @RequestBody PalletizingCompleteParam param,
                                           HttpServletRequest request) {
    @PostMapping("/balcony/complete/auth/v1")
    @AppAuth(memo = "中控：出库完成月台相关") //old需要修改
    public synchronized R balconyComplete(@RequestHeader(required = false) String appkey,
                                              @RequestBody LabellerMatParam param,
                                              HttpServletRequest request) {
        auth(appkey, param, request);
        openService.palletizingComplete(param);
        openService.balconyComplete(param);
        return R.ok(param);
    }

@@ -258,9 +294,66 @@
        return R.ok(param);
    }




    /*...........................上饶江铜..............以上.............徐工汉云...........................*/
    /*...........................亳州煜星..............以上.............亳州煜星...........................*/

    /**
     * 亳州煜星任务下发  //  小料箱投料完成组托
     */
    @PostMapping("/small/containers/auth/v1")
    @AppAuth(memo = "MES任务下发")
    public synchronized R smallContainers(@RequestHeader(required = false) String appkey,
                                          @RequestBody SmallCompleteParam param,
                                          HttpServletRequest request) {
        auth(appkey, param, request);
        openService.smallContainers(param);
        return R.ok().add("成功");
    }
//
//    /**
//     * 亳州煜星任务下发
//     */
//    @PostMapping("/small/containers/auth/v1")
//    @AppAuth(memo = "贴标机贴标完成") //old需要修改
//    public synchronized R smallContainers(@RequestHeader(required = false) String appkey,
//                                          @RequestBody LabellerCompleteParam param,
//                                          HttpServletRequest request) {
//        auth(appkey, param, request);
//        openService.labellerComplete(param);
//        return R.ok();
//    }
//
//    /**
//     * 亳州煜星任务下发
//     */
//    @PostMapping("/small/containers/auth/v1")
//    @AppAuth(memo = "贴标机贴标完成") //old需要修改
//    public synchronized R smallContainers(@RequestHeader(required = false) String appkey,
//                                          @RequestBody LabellerCompleteParam param,
//                                          HttpServletRequest request) {
//        auth(appkey, param, request);
//        openService.labellerComplete(param);
//        return R.ok();
//    }

    //设备状态查询接口
    @PostMapping("/deviceStatus")
    @AppAuth(memo = "设备状态查询接口")
    @Transactional
    public R deviceStatus(@RequestHeader String appkey,
                          HttpServletRequest request) {
        auth(appkey, "设备状态查询接口", request);
        List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
        List<Object> list = new ArrayList<>();
        for (BasDevp basDevp:basDevps){
            list.add(basDevp);
        }
        List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
        for (BasCrnp basCrnp:basCrnps){
            list.add(basCrnp);
        }
        return R.ok(list);
    }
    /*...........................亳州煜星..............以上.............亳州煜星...........................*/

}