移动代码

shicf

2024-08-29 ed09402ec0025eaae680d0bb15defcdec343661d

 src/main/java/com/product/mobile/device/controller/DeviceManagerController.java

@@ -119,12 +119,12 @@
                return this.error(MobileCoreCode.SYSTEM_FORM_NODATA);
            }
            System.out.println(fse.getString("device_number"));
            if (StringUtils.isEmpty(fse.getString("uuid")) && StringUtils.isEmpty(fse.getString("device_number"))  ) {
            if (StringUtils.isEmpty(fse.getString("uuid"))) {
                SpringMVCContextHolder.getSystemLogger().error(MobileCoreCode.SYSTEM_ACQUIRE_PARAM_FAIL.getValue(), MobileCoreCode.SYSTEM_ACQUIRE_PARAM_FAIL.getText());
                return this.error(MobileCoreCode.SYSTEM_ACQUIRE_PARAM_FAIL);
            }
            System.out.println(222222);
            String result=result_OK_List(deviceManagerService.findDeviceAndSub(fse.getString("uuid"),fse.getString("device_number")));
            String result=result_List_OK(deviceManagerService.findDeviceAndSub(fse.getString("uuid"),fse.getString("device_number")));
            System.out.println(result);
            return result;
        } catch (BaseException e) {
@@ -267,14 +267,16 @@
                SpringMVCContextHolder.getSystemLogger().error(String.valueOf(DeviceCode.SYSTEM_FORM_NODATA));
                return this.error(DeviceCode.SYSTEM_FORM_NODATA);
            }
            if (fse.getString(DeviceConst.DEVICE_NUMBER)==null && fse.getString(DeviceConst.UUID)==null) {
            if (fse.getString(DeviceConst.UUID)==null) {
                SpringMVCContextHolder.getSystemLogger().error(String.valueOf(DeviceCode.SYSTEM_FORM_NODATA));
                return this.error(DeviceCode.SYSTEM_FORM_NODATA);
            }
            String result=OK_List(deviceInspectionConfigService.findInspectionSettingForApp(fse));
            
//            String result=result_OK_List(commonInspectionService.findDeviceSetting(fse.getString(DeviceConst.UUID)));
            return result;
            fse=deviceInspectionConfigService.findInspectionSettingForApp(fse);
            if(FieldSetEntity.isEmpty(fse)) {
               return this.error(DeviceCode.COMMON_DATA_ERROR);
            }else {
               return result_List_OK(fse);
            }
        } catch (BaseException e) {
            e.printStackTrace();
            return error(e);
@@ -306,7 +308,7 @@
                SpringMVCContextHolder.getSystemLogger().error(String.valueOf(DeviceCode.SYSTEM_FORM_NODATA));
                return this.error(DeviceCode.SYSTEM_FORM_NODATA);
            }
            String result=OK_List(deviceInspectionConfigService.findInspectionSettingForApp(fse));
            String result=result_List_OK(deviceInspectionConfigService.findInspectionSettingForApp(fse));
            
//            String result=result_OK_List(commonInspectionService.findDeviceSetting(fse.getString(DeviceConst.UUID)));
            return result;
@@ -384,6 +386,41 @@
        }
    }
    /**
     * 设备点检信息详情
     * @throws IOException
     */
    @RequestMapping(value = "/find-inspection/{version}", method = RequestMethod.POST)
    @ApiVersion(1)
    public String findDevcieInspection(HttpServletRequest request)  {

        try {
            FieldSetEntity fse = null;
            Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
            if (bean != null) {
                RequestParameterEntity reqp = (RequestParameterEntity) bean;
                fse = reqp.getFormData();
            }
            if (bean == null || fse == null) {
                SpringMVCContextHolder.getSystemLogger().error(String.valueOf(DeviceCode.SYSTEM_FORM_NODATA));
                return this.error(DeviceCode.SYSTEM_FORM_NODATA);
            }
            IDeviceInspectionService Service = (IDeviceInspectionService) getProxyInstance(commonInspectionService);
            FieldSetEntity record=Service.findInspectionRecord(fse.getUUID());
            if(record!=null) {
               return this.result_List_OK(record);
            }else {
               return error(DeviceCode.COMMON_DATA_ERROR);
            }
            
        } catch (BaseException e) {
            e.printStackTrace();
            return error(e);
        } catch (Exception e) {
            e.printStackTrace();
            return error(new BaseException(e));
        }
    }
    /**
     * 设备保养信息保存
     * @throws IOException
     */
@@ -402,8 +439,8 @@
                SpringMVCContextHolder.getSystemLogger().error(String.valueOf(DeviceCode.SYSTEM_FORM_NODATA));
                return this.error(DeviceCode.SYSTEM_FORM_NODATA);
            }
            IDeviceMaintenanceRecordService Service = (IDeviceMaintenanceRecordService) getProxyInstance(deviceMaintenanceRecordService);
            String uuid=Service.saveMaintenanceDevice(fse);
            IDeviceMaintenanceRecordService service = (IDeviceMaintenanceRecordService) getProxyInstance(deviceMaintenanceRecordService);
            String uuid=service.saveMaintenanceDevice(fse);
            if(uuid!=null) {
               return this.OK_Add(uuid);
            }else {
@@ -418,5 +455,39 @@
            return error(DeviceCode.DEVICE_CREATE_INSPECTION_ERROR);
        }
    }
    
    /**
     * 设备保养信息详情
     * @throws IOException
     */
    @RequestMapping(value = "/find-maintenance/{version}", method = RequestMethod.POST)
    @ApiVersion(1)
    public String findDevcieMaintenance(HttpServletRequest request)  {

        try {
            FieldSetEntity fse = null;
            Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
            if (bean != null) {
                RequestParameterEntity reqp = (RequestParameterEntity) bean;
                fse = reqp.getFormData();
            }
            if (bean == null || fse == null) {
                SpringMVCContextHolder.getSystemLogger().error(String.valueOf(DeviceCode.SYSTEM_FORM_NODATA));
                return this.error(DeviceCode.SYSTEM_FORM_NODATA);
            }
            IDeviceMaintenanceRecordService service = (IDeviceMaintenanceRecordService) getProxyInstance(deviceMaintenanceRecordService);
            FieldSetEntity record=service.findMaintenanceRecord(fse.getUUID());
            if(record!=null) {
               return this.result_List_OK(record);
            }else {
               return error(DeviceCode.COMMON_DATA_ERROR);
            }
            
        } catch (BaseException e) {
            e.printStackTrace();
            return error(e);
        } catch (Exception e) {
            e.printStackTrace();
            return error(new BaseException(e));
        }
    }
}