#

yxFwq

2024-07-12 b46dc3bc339ed04f72b091c3880d20b9512b18c2

 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,6 +38,10 @@

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

    @PostMapping("/order/matSync/default/v1")
    @AppAuth(memo = "商品信息同步接口")
@@ -326,6 +336,24 @@
//        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);
    }
    /*...........................亳州煜星..............以上.............亳州煜星...........................*/

}