From 32174429510dc5f2e816a6e217f515e37af07d9a Mon Sep 17 00:00:00 2001
From: shicf <shi_chongfu@163.com>
Date: 星期六, 08 二月 2025 11:09:20 +0800
Subject: [PATCH] 设备管理
---
src/main/java/com/product/mobile/device/controller/DeviceManagerController.java | 339 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 321 insertions(+), 18 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 448beec..d8cb67b 100644
--- a/src/main/java/com/product/mobile/device/controller/DeviceManagerController.java
+++ b/src/main/java/com/product/mobile/device/controller/DeviceManagerController.java
@@ -9,14 +9,21 @@
import com.product.core.exception.BaseException;
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.service.DeviceManagerService;
-import com.product.device.service.ide.IDeviceMainenanceService;
+import com.product.device.service.idel.IDeviceInspectionService;
+import com.product.device.service.idel.IDeviceMaintenanceRecordService;
+import com.product.device.service.idel.IDeviceRepairFaultService;
import com.product.mobile.core.config.MobileCoreCode;
import com.product.mobile.core.config.MobileCoreConst;
import com.product.module.sys.entity.SystemUser;
import com.product.module.sys.version.ApiVersion;
import com.product.task.device.service.DeviceManagerTaskService;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,6 +32,7 @@
import java.io.IOException;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
/**
@@ -43,6 +51,18 @@
DeviceManagerService deviceManagerService;
@Autowired
DeviceMainenanceService deviceMainenanceService;
+
+ @Autowired
+ CommonInspectionService commonInspectionService;
+
+ @Autowired
+ DeviceMaintenanceRecordService deviceMaintenanceRecordService;
+
+ @Autowired
+ DeviceInspectionConfigService deviceInspectionConfigService;
+
+ @Resource
+ IDeviceRepairFaultService deviceRepairFaultService;;
/**
* 浠诲姟鍒楄〃
*
@@ -70,7 +90,7 @@
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());
}
- String result=OK_List(deviceManagerTaskService.getsPersionNewTask(curUser));
+ String result=OK_List(deviceManagerTaskService.getPersionNewTask(curUser));
System.out.println(result);
return result;
} catch (BaseException e) {
@@ -81,7 +101,7 @@
return error(MobileCoreCode.GET_NAV_BAR_CONFIG_LIST_FAIL);
}
}
-
+
/**
* 璁惧淇℃伅
*
@@ -102,11 +122,13 @@
SpringMVCContextHolder.getSystemLogger().error(MobileCoreCode.SYSTEM_FORM_NODATA.getValue(), MobileCoreCode.SYSTEM_FORM_NODATA.getText());
return this.error(MobileCoreCode.SYSTEM_FORM_NODATA);
}
- if (StringUtils.isEmpty(fse.getString("uuid")) && StringUtils.isEmpty(fse.getString("asset_code")) ) {
+ System.out.println(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);
}
- String result=OK_List(deviceManagerService.findDeviceAndSub(fse.getString("uuid"),fse.getString("asset_code")));
+ System.out.println(222222);
+ String result=result_List_OK(deviceManagerService.findDeviceAndSub(fse.getString("uuid"),fse.getString("device_number")));
System.out.println(result);
return result;
} catch (BaseException e) {
@@ -126,7 +148,7 @@
@RequestMapping(value = "/failure/create/{version}", method = RequestMethod.POST)
@ApiVersion(1)
public String createFailure(HttpServletRequest request) throws IOException {
-
+
try {
FieldSetEntity fse = null;
Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
@@ -138,14 +160,15 @@
SpringMVCContextHolder.getSystemLogger().error(DeviceCode.SYSTEM_FORM_NODATA);
return this.error(DeviceCode.SYSTEM_FORM_NODATA);
}
- if (StringUtils.isEmpty(fse.getString("uuid")) && StringUtils.isEmpty(fse.getString("asset_code")) ) {
- SpringMVCContextHolder.getSystemLogger().error(DeviceCode.SYSTEM_FORM_NODATA);
- return this.error(DeviceCode.SYSTEM_FORM_NODATA);
- }
- IDeviceMainenanceService service = (IDeviceMainenanceService) getProxyInstance(deviceMainenanceService);
- String uuid=service.saveDeviceFailure(fse);
+// if (StringUtils.isEmpty(fse.getString("uuid")) && StringUtils.isEmpty(fse.getString("device_number")) ) {
+// SpringMVCContextHolder.getSystemLogger().error(DeviceCode.SYSTEM_FORM_NODATA);
+// return this.error(DeviceCode.SYSTEM_FORM_NODATA);
+// }
+ IDeviceRepairFaultService service = (IDeviceRepairFaultService) getProxyInstance(deviceRepairFaultService);
+// fse.remove("uuid");
+ String uuid=service.deviceFaultReview(fse);
System.out.println(uuid);
- return !StringUtils.isEmpty(uuid)? this.OK_Add(uuid):this.error(new BaseException(DeviceCode.DEVICE_CREATE_FAILURE_ERROR));
+ return !StringUtils.isEmpty(uuid)? this.OK_Add(uuid):this.error(new BaseException(DeviceCode.DEVICE_MAINTENANCE_CONTENT_DEL_FAIL));
} catch (BaseException e) {
e.printStackTrace();
return error(e);
@@ -163,7 +186,7 @@
@RequestMapping(value = "/persion/{version}", method = RequestMethod.POST)
@ApiVersion(1)
public String devicePersion(HttpServletRequest request) throws IOException {
-
+
try {
FieldSetEntity fse = null;
Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
@@ -179,8 +202,8 @@
SpringMVCContextHolder.getSystemLogger().error(DeviceCode.SYSTEM_FORM_NODATA);
return this.error(DeviceCode.SYSTEM_FORM_NODATA);
}
- DataTableEntity dt=deviceManagerService.findDevicePersion(fse.getString("asset_code"));
-
+ DataTableEntity dt=deviceManagerService.findDevicePersion(fse.getString("device_number"));
+
return this.OK_List( dt );
} catch (BaseException e) {
e.printStackTrace();
@@ -199,7 +222,7 @@
@RequestMapping(value = "/create/maintain/task/{version}", method = RequestMethod.POST)
@ApiVersion(1)
public String deviceMainTainTaskPersion(HttpServletRequest request) throws IOException {
-
+
try {
FieldSetEntity fse = null;
Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
@@ -211,7 +234,7 @@
SpringMVCContextHolder.getSystemLogger().error(DeviceCode.SYSTEM_FORM_NODATA);
return this.error(DeviceCode.SYSTEM_FORM_NODATA);
}
- if (StringUtils.isEmpty(fse.getString("asset_code")) ) {
+ if (StringUtils.isEmpty(fse.getString("device_number")) ) {
SpringMVCContextHolder.getSystemLogger().error(DeviceCode.SYSTEM_FORM_NODATA);
return this.error(DeviceCode.SYSTEM_FORM_NODATA);
}
@@ -229,4 +252,284 @@
return error(DeviceCode.DEVICE_CREATE_INSPECTION_ERROR);
}
}
+ /**
+ * 璁惧鐐规閰嶇疆
+ * @throws IOException
+ */
+ @RequestMapping(value = "/findDeviceSetting/{version}", method = RequestMethod.POST)
+ @ApiVersion(1)
+ public String findDevcieSetting(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);
+ }
+ if (fse.getString(DeviceConst.UUID)==null) {
+ SpringMVCContextHolder.getSystemLogger().error(String.valueOf(DeviceCode.SYSTEM_FORM_NODATA));
+ return this.error(DeviceCode.SYSTEM_FORM_NODATA);
+ }
+ 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);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return error(DeviceCode.DEVICE_CREATE_INSPECTION_ERROR);
+ }
+ }
+ /**
+ * 璁惧鐐规璁板綍
+ * @throws IOException
+ */
+ @RequestMapping(value = "/findDeviceInspection/{version}", method = RequestMethod.POST)
+ @ApiVersion(1)
+ public String findDevcInspection(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);
+ }
+ if (fse.getString(DeviceConst.DEVICE_NUMBER)==null && fse.getString(DeviceConst.UUID)==null) {
+ SpringMVCContextHolder.getSystemLogger().error(String.valueOf(DeviceCode.SYSTEM_FORM_NODATA));
+ return this.error(DeviceCode.SYSTEM_FORM_NODATA);
+ }
+ String result=result_List_OK(deviceInspectionConfigService.findInspectionSettingForApp(fse));
+
+// String result=result_OK_List(commonInspectionService.findDeviceSetting(fse.getString(DeviceConst.UUID)));
+ return result;
+ } catch (BaseException e) {
+ e.printStackTrace();
+ return error(e);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return error(DeviceCode.DEVICE_CREATE_INSPECTION_ERROR);
+ }
+ }
+ /**
+ * 璁惧淇濆吇閰嶇疆
+ * @throws IOException
+ */
+ @RequestMapping(value = "/findDeviceMaintenanceSetting/{version}", method = RequestMethod.POST)
+ @ApiVersion(1)
+ public String findDevcieMaintenancesSetting(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);
+ }
+
+ String result=result_OK_List(deviceMainenanceService.findDeviceMaintenanceSetting(fse.getString(DeviceConst.UUID),fse.getString("type")));
+ return result;
+ } catch (BaseException e) {
+ e.printStackTrace();
+ return error(e);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return error(DeviceCode.DEVICE_CREATE_INSPECTION_ERROR);
+ }
+ }
+ /**
+ * 璁惧鐐规淇℃伅淇濆瓨
+ * @throws IOException
+ */
+ @RequestMapping(value = "/save-inspection/{version}", method = RequestMethod.POST)
+ @ApiVersion(1)
+ public String saveDevcieInspection(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);
+ String uuid=Service.saveInspection(fse);
+ if(uuid!=null) {
+ return this.OK_Add(uuid);
+ }else {
+ return error(DeviceCode.DEVICE_CREATE_INSPECTION_ERROR);
+ }
+
+ } catch (BaseException e) {
+ e.printStackTrace();
+ return error(e);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return error(DeviceCode.DEVICE_CREATE_INSPECTION_ERROR);
+ }
+ }
+ /**
+ * 璁惧鐐规淇℃伅璇︽儏
+ * @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
+ */
+ @RequestMapping(value = "/save-maintenance/{version}", method = RequestMethod.POST)
+ @ApiVersion(1)
+ public String saveDevcieMaintenanceController(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);
+ String uuid=service.saveMaintenanceDevice(fse);
+ if(uuid!=null) {
+ return this.OK_Add(uuid);
+ }else {
+ return error(DeviceCode.DEVICE_CREATE_INSPECTION_ERROR);
+ }
+
+ } catch (BaseException e) {
+ e.printStackTrace();
+ return error(e);
+ } catch (Exception e) {
+ e.printStackTrace();
+ 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());
+ FieldSetEntity record=service.findMaintenanceRecordForMobile(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
+ */
+ @RequestMapping(value = "/list/{version}", method = RequestMethod.POST)
+ @ApiVersion(1)
+ public String listDevcie(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);
+ }
+ // 鍒ゆ柇鍒嗛〉鍙傛暟鏄惁姝ｅ父
+ 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());
+ }
+ return this.OK_List(deviceManagerService.deviceList(fse.getString("searchKey"),fse.getInteger(MobileCoreConst.PAGESIZE),fse.getInteger(MobileCoreConst.CPAGE)));
+
+ } catch (BaseException e) {
+ e.printStackTrace();
+ return error(e);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return error(new BaseException(e));
+ }
+ }
+
}
--
Gitblit v1.9.2