From 153f2187046f2b5d640cb937e0a385def8dd4648 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期四, 28 十一月 2024 17:37:15 +0800
Subject: [PATCH] 故障上报 设备台账
---
src/main/java/com/product/mobile/device/controller/DeviceManagerController.java | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 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 4935a4e..b663a7c 100644
--- a/src/main/java/com/product/mobile/device/controller/DeviceManagerController.java
+++ b/src/main/java/com/product/mobile/device/controller/DeviceManagerController.java
@@ -16,8 +16,8 @@
import com.product.device.service.DeviceMaintenanceRecordService;
import com.product.device.service.DeviceManagerService;
import com.product.device.service.idel.IDeviceInspectionService;
-import com.product.device.service.idel.IDeviceMainenanceService;
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;
@@ -32,6 +32,7 @@
import java.io.IOException;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
/**
@@ -50,15 +51,18 @@
DeviceManagerService deviceManagerService;
@Autowired
DeviceMainenanceService deviceMainenanceService;
-
+
@Autowired
CommonInspectionService commonInspectionService;
-
+
@Autowired
DeviceMaintenanceRecordService deviceMaintenanceRecordService;
-
+
@Autowired
DeviceInspectionConfigService deviceInspectionConfigService;
+
+ @Resource
+ IDeviceRepairFaultService deviceRepairFaultService;;
/**
* 浠诲姟鍒楄〃
*
@@ -97,7 +101,7 @@
return error(MobileCoreCode.GET_NAV_BAR_CONFIG_LIST_FAIL);
}
}
-
+
/**
* 璁惧淇℃伅
*
@@ -144,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);
@@ -160,9 +164,9 @@
SpringMVCContextHolder.getSystemLogger().error(DeviceCode.SYSTEM_FORM_NODATA);
return this.error(DeviceCode.SYSTEM_FORM_NODATA);
}
- IDeviceMainenanceService service = (IDeviceMainenanceService) getProxyInstance(deviceMainenanceService);
+ IDeviceRepairFaultService service = (IDeviceRepairFaultService) getProxyInstance(deviceRepairFaultService);
fse.remove("uuid");
- String uuid=service.saveDeviceFailure(fse);
+ String uuid=service.deviceFaultReview(fse);
System.out.println(uuid);
return !StringUtils.isEmpty(uuid)? this.OK_Add(uuid):this.error(new BaseException(DeviceCode.DEVICE_MAINTENANCE_CONTENT_DEL_FAIL));
} catch (BaseException e) {
@@ -182,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);
@@ -199,7 +203,7 @@
return this.error(DeviceCode.SYSTEM_FORM_NODATA);
}
DataTableEntity dt=deviceManagerService.findDevicePersion(fse.getString("device_number"));
-
+
return this.OK_List( dt );
} catch (BaseException e) {
e.printStackTrace();
@@ -218,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);
@@ -309,7 +313,7 @@
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) {
@@ -376,7 +380,7 @@
}else {
return error(DeviceCode.DEVICE_CREATE_INSPECTION_ERROR);
}
-
+
} catch (BaseException e) {
e.printStackTrace();
return error(e);
@@ -411,7 +415,7 @@
}else {
return error(DeviceCode.COMMON_DATA_ERROR);
}
-
+
} catch (BaseException e) {
e.printStackTrace();
return error(e);
@@ -446,7 +450,7 @@
}else {
return error(DeviceCode.DEVICE_CREATE_INSPECTION_ERROR);
}
-
+
} catch (BaseException e) {
e.printStackTrace();
return error(e);
@@ -482,7 +486,7 @@
}else {
return error(DeviceCode.COMMON_DATA_ERROR);
}
-
+
} catch (BaseException e) {
e.printStackTrace();
return error(e);
--
Gitblit v1.9.2