changes

liuhaonan

2022-10-10 3d34f39838f12fa69f088b229e91dfe3febe4185

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataNongGengController.java

@@ -10,12 +10,13 @@
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.manager.iot.amqp.processor.AirDataProcessor;
import com.sandu.ximon.admin.manager.iot.frame.A5Frame;
import com.sandu.ximon.admin.manager.iot.frame.inner.request.AirDataNewReqInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.request.AtmosphereNewReqInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.AirDataNongGengService;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.bo.AirDataNongGengBo;
import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
@@ -38,8 +39,8 @@

    @PostMapping("/updateAirEquipmentInfo")
    public ResponseVO<Object> updataAirEquipmentInfo(@RequestBody List<String> listMac) {
        AirDataNewReqInnerFrame airDataNewReqInnerFrame = new AirDataNewReqInnerFrame();
        A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_ATMOSPHERE_DATA.getCode(), airDataNewReqInnerFrame);
        AtmosphereNewReqInnerFrame atmosphereNewReqInnerFrame = new AtmosphereNewReqInnerFrame();
        A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_ATMOSPHERE_DATA.getCode(), atmosphereNewReqInnerFrame);
        System.out.println(a5Frame + "          --------a5Frame");

        List<String> success = new ArrayList<>();
@@ -48,6 +49,7 @@
            try {

                CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(macStr, a5Frame);
                StoreOperationRecordsUtils.storeInnerFrameData(macStr, "大气设备-心跳包", a5Frame, commonFrame);
                System.out.println(commonFrame + "         -----------commonFrame");
                AirDataProcessor.getInstance().process("a1JsfPG4iKW", macStr, commonFrame);
                if (commonFrame != null) {
@@ -72,12 +74,12 @@
     * @param keyword 关键字
     * @return
     */
    @GetMapping("/listAirData")
    public ResponseVO<Object> listAirDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(required = false) String keyword) {
        if (!permissionConfig.check(MenuEnum.AIR_DATA__NONG_GENG_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        List<AirDataNongGengBo> list = airDataNongGengService.listAirDataByKeyword(baseConditionVO, keyword);
        return ResponseUtil.successPage(list);
    }
//    @GetMapping("/listAirData")
//    public ResponseVO<Object> listAirDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
//        if (!permissionConfig.check(MenuEnum.AIR_DATA__NONG_GENG_LIST.getCode())) {
//            return ResponseUtil.fail("缺少对应用户权限");
//        }
//        List<AirDataNongGengBo> list = airDataNongGengService.listAirDataByKeyword(baseConditionVO, keyword);
//        return ResponseUtil.successPage(list);
//    }
}