From 1ae0b0d88f6818e13e322597f6d4065e4effd8bf Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期四, 29 五月 2025 10:16:57 +0800
Subject: [PATCH] 更新
---
src/main/java/com/product/mobile/device/controller/DeviceManagerController.java | 108 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 86 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/product/mobile/device/controller/DeviceManagerController.java b/src/main/java/com/product/mobile/device/controller/DeviceManagerController.java
index 1382414..4758b5f 100644
--- a/src/main/java/com/product/mobile/device/controller/DeviceManagerController.java
+++ b/src/main/java/com/product/mobile/device/controller/DeviceManagerController.java
@@ -10,10 +10,11 @@
import com.product.core.spring.context.SpringMVCContextHolder;
import com.product.device.config.DeviceCode;
import com.product.device.config.DeviceConst;
-import com.product.device.service.CommonInspectionService;
-import com.product.device.service.DeviceInspectionConfigService;
-import com.product.device.service.DeviceMainenanceService;
-import com.product.device.service.DeviceMaintenanceRecordService;
+import com.product.device.inspection.service.CommonInspectionService;
+import com.product.device.inspection.service.DeviceInspectionConfigService;
+import com.product.device.maintenance.service.DeviceMainenanceService;
+import com.product.device.maintenance.service.DeviceMaintenancePlanService;
+import com.product.device.maintenance.service.DeviceMaintenanceRecordService;
import com.product.device.service.DeviceManagerService;
import com.product.device.service.idel.IDeviceInspectionService;
import com.product.device.service.idel.IDeviceMaintenanceRecordService;
@@ -43,8 +44,8 @@
@RestController
@RequestMapping("/api/mobile/device")
public class DeviceManagerController extends AbstractBaseController {
-
-
+ @Autowired
+ DeviceMaintenancePlanService deviceMaintenancePlanService;
@Autowired
DeviceManagerTaskService deviceManagerTaskService;
@Autowired
@@ -59,7 +60,7 @@
DeviceMaintenanceRecordService deviceMaintenanceRecordService;
@Autowired
- DeviceInspectionConfigService deviceInspectionConfigService;
+ DeviceInspectionConfigService deviceInspectionConfigService;
@Resource
IDeviceRepairFaultService deviceRepairFaultService;;
@@ -98,7 +99,7 @@
return error(e);
} catch (Exception e) {
e.printStackTrace();
- return error(MobileCoreCode.GET_NAV_BAR_CONFIG_LIST_FAIL);
+ return error(MobileCoreCode.APP_COMMON_ERROR_CODE);
}
}
@@ -136,7 +137,7 @@
return error(e);
} catch (Exception e) {
e.printStackTrace();
- return error(MobileCoreCode.GET_NAV_BAR_CONFIG_LIST_FAIL);
+ return error(MobileCoreCode.APP_COMMON_ERROR_CODE);
}
}
/**
@@ -174,7 +175,7 @@
return error(e);
} catch (Exception e) {
e.printStackTrace();
- return error(DeviceCode.DEVICE_CREATE_INSPECTION_ERROR);
+ return error(MobileCoreCode.APP_COMMON_ERROR_CODE);
}
}
/**
@@ -210,7 +211,7 @@
return error(e);
} catch (Exception e) {
e.printStackTrace();
- return error(DeviceCode.DEVICE_CREATE_INSPECTION_ERROR);
+ return error(MobileCoreCode.APP_COMMON_ERROR_CODE);
}
}
/**
@@ -249,7 +250,7 @@
return error(e);
} catch (Exception e) {
e.printStackTrace();
- return error(DeviceCode.DEVICE_CREATE_INSPECTION_ERROR);
+ return error(MobileCoreCode.APP_COMMON_ERROR_CODE);
}
}
/**
@@ -286,7 +287,7 @@
return error(e);
} catch (Exception e) {
e.printStackTrace();
- return error(DeviceCode.DEVICE_CREATE_INSPECTION_ERROR);
+ return error(MobileCoreCode.APP_COMMON_ERROR_CODE);
}
}
/**
@@ -321,7 +322,7 @@
return error(e);
} catch (Exception e) {
e.printStackTrace();
- return error(DeviceCode.DEVICE_CREATE_INSPECTION_ERROR);
+ return error(MobileCoreCode.APP_COMMON_ERROR_CODE);
}
}
/**
@@ -351,7 +352,7 @@
return error(e);
} catch (Exception e) {
e.printStackTrace();
- return error(DeviceCode.DEVICE_CREATE_INSPECTION_ERROR);
+ return error(MobileCoreCode.APP_COMMON_ERROR_CODE);
}
}
/**
@@ -386,7 +387,7 @@
return error(e);
} catch (Exception e) {
e.printStackTrace();
- return error(DeviceCode.DEVICE_CREATE_INSPECTION_ERROR);
+ return error(MobileCoreCode.APP_COMMON_ERROR_CODE);
}
}
/**
@@ -421,7 +422,7 @@
return error(e);
} catch (Exception e) {
e.printStackTrace();
- return error(new BaseException(e));
+ return error(MobileCoreCode.APP_COMMON_ERROR_CODE);
}
}
/**
@@ -456,7 +457,7 @@
return error(e);
} catch (Exception e) {
e.printStackTrace();
- return error(DeviceCode.DEVICE_CREATE_INSPECTION_ERROR);
+ return error(MobileCoreCode.APP_COMMON_ERROR_CODE);
}
}
/**
@@ -492,7 +493,7 @@
return error(e);
} catch (Exception e) {
e.printStackTrace();
- return error(new BaseException(e));
+ return error(MobileCoreCode.APP_COMMON_ERROR_CODE);
}
}
/**
@@ -517,7 +518,7 @@
// 鍒ゆ柇鍒嗛〉鍙傛暟鏄惁姝ｅ父
if (StringUtils.isEmpty(fse.getString(MobileCoreConst.PAGESIZE))
|| StringUtils.isEmpty(fse.getString(MobileCoreConst.CPAGE))) {
-
+
SpringMVCContextHolder.getSystemLogger().error(MobileCoreCode.SYSTEM_FORM_COUNT.getValue(), MobileCoreCode.SYSTEM_FORM_COUNT.getText());
return this.error(MobileCoreCode.SYSTEM_FORM_COUNT.getValue(), MobileCoreCode.SYSTEM_FORM_COUNT.getText());
}
@@ -528,8 +529,71 @@
return error(e);
} catch (Exception e) {
e.printStackTrace();
- return error(new BaseException(e));
+ return error(MobileCoreCode.APP_COMMON_ERROR_CODE);
}
}
-
+ /**
+ * 淇濆吇浜哄憳棰嗗彇淇濆吇浠诲姟
+ * @throws IOException
+ */
+ @RequestMapping(value = "/receive-task/{version}", method = RequestMethod.POST)
+ @ApiVersion(1)
+ public String receiveTask(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 || fse.getObject("plan_uuid")==null) {
+ SpringMVCContextHolder.getSystemLogger().error(String.valueOf(DeviceCode.SYSTEM_FORM_NODATA));
+ return this.error(DeviceCode.SYSTEM_FORM_NODATA);
+ }
+ Object b= deviceMaintenancePlanService.receivePlanTask(fse.getString("plan_uuid"));
+
+ return this.OK();
+
+ } catch (BaseException e) {
+ e.printStackTrace();
+ return error(e);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return error(MobileCoreCode.APP_COMMON_ERROR_CODE);
+ }
+ }
+ /**
+ * 淇濆吇浜哄憳寮�濮嬩繚鍏绘墦鍗★紝鏇存柊璁″垝浠诲姟鐘舵�佸拰鐢垫鐘舵��
+ *
+ * @throws IOException
+ */
+ @RequestMapping(value = "/status-update/{version}", method = RequestMethod.POST)
+ @ApiVersion(1)
+ public String statusUpdate(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 || (fse.getObject("plan_uuid")==null && fse.getObject("device_uuid")==null)) {
+ SpringMVCContextHolder.getSystemLogger().error(String.valueOf(DeviceCode.SYSTEM_FORM_NODATA));
+ return this.error(DeviceCode.SYSTEM_FORM_NODATA);
+ }
+
+ deviceMaintenancePlanService.statusUpdate(fse.getString("plan_uuid"),fse.getString("device_uuid"),fse.getString("maintenance_type"));
+
+ return this.OK();
+
+ } catch (BaseException e) {
+ e.printStackTrace();
+ return error(e);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return error(MobileCoreCode.APP_COMMON_ERROR_CODE);
+ }
+ }
}
--
Gitblit v1.9.2