From 3b64c5a6f50b671ec9da90667f125d8fc0a53cb7 Mon Sep 17 00:00:00 2001
From: shicf <shi_chongfu@163.com>
Date: 星期五, 30 五月 2025 10:57:06 +0800
Subject: [PATCH] Merge branch 'dev' of http://nonxin.cn:8090/r/product/product-server-mobile-core/V2.0.0 into dev

---
 src/main/java/com/product/mobile/device/controller/DeviceManagerController.java |  599 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 599 insertions(+), 0 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
new file mode 100644
index 0000000..4758b5f
--- /dev/null
+++ b/src/main/java/com/product/mobile/device/controller/DeviceManagerController.java
@@ -0,0 +1,599 @@
+package com.product.mobile.device.controller;
+
+import com.alibaba.druid.util.StringUtils;
+import com.product.core.config.CoreConst;
+import com.product.core.controller.support.AbstractBaseController;
+import com.product.core.entity.DataTableEntity;
+import com.product.core.entity.FieldSetEntity;
+import com.product.core.entity.RequestParameterEntity;
+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.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;
+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;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.IOException;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @Author cheng
+ * @Date 2022/2/22 15:59
+ * @Desc 瀵艰埅鏍忕鐞�
+ */
+@RestController
+@RequestMapping("/api/mobile/device")
+public class DeviceManagerController extends AbstractBaseController {
+	@Autowired
+    DeviceMaintenancePlanService deviceMaintenancePlanService;
+    @Autowired
+    DeviceManagerTaskService deviceManagerTaskService;
+    @Autowired
+    DeviceManagerService  deviceManagerService;
+    @Autowired
+    DeviceMainenanceService deviceMainenanceService;
+
+    @Autowired
+    CommonInspectionService commonInspectionService;
+
+    @Autowired
+    DeviceMaintenanceRecordService deviceMaintenanceRecordService;
+
+    @Autowired
+    DeviceInspectionConfigService deviceInspectionConfigService;
+
+    @Resource
+    IDeviceRepairFaultService deviceRepairFaultService;;
+    /**
+     * 浠诲姟鍒楄〃
+     *
+     * @param request
+     * @return
+     */
+    @PostMapping("/list-new-task/{version}")
+    @ApiVersion(1)
+    public String listConfig(HttpServletRequest request) {
+        try {
+        	 SystemUser curUser = SpringMVCContextHolder.getCurrentUser();
+            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(MobileCoreCode.SYSTEM_FORM_NODATA.getValue(), MobileCoreCode.SYSTEM_FORM_NODATA.getText());
+                return this.error(MobileCoreCode.SYSTEM_FORM_NODATA.getValue(), MobileCoreCode.SYSTEM_FORM_NODATA.getText());
+            }
+            // 鍒ゆ柇鍒嗛〉鍙傛暟鏄惁姝e父
+            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());
+            }
+            String result=OK_List(deviceManagerTaskService.getPersionNewTask(curUser));
+            System.out.println(result);
+            return result;
+        } catch (BaseException e) {
+            e.printStackTrace();
+            return error(e);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return error(MobileCoreCode.APP_COMMON_ERROR_CODE);
+        }
+    }
+
+    /**
+     * 璁惧淇℃伅
+     *
+     * @param request
+     * @return
+     */
+    @PostMapping("/find-device/{version}")
+    @ApiVersion(1)
+    public String findDevice(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(MobileCoreCode.SYSTEM_FORM_NODATA.getValue(), MobileCoreCode.SYSTEM_FORM_NODATA.getText());
+                return this.error(MobileCoreCode.SYSTEM_FORM_NODATA);
+            }
+            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);
+            }
+            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) {
+            e.printStackTrace();
+            return error(e);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return error(MobileCoreCode.APP_COMMON_ERROR_CODE);
+        }
+    }
+    /**
+     * 鍒涘缓璁惧鏁呴殰鐢虫姤
+     * @param content
+     * @param servletResponse
+     * @throws IOException
+     */
+    @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);
+             if (bean != null) {
+                 RequestParameterEntity reqp = (RequestParameterEntity) bean;
+                 fse = reqp.getFormData();
+             }
+             if (bean == null || fse == null) {
+                 SpringMVCContextHolder.getSystemLogger().error(DeviceCode.SYSTEM_FORM_NODATA);
+                 return this.error(DeviceCode.SYSTEM_FORM_NODATA);
+             }
+//             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_MAINTENANCE_CONTENT_DEL_FAIL));
+         } catch (BaseException e) {
+             e.printStackTrace();
+             return error(e);
+         } catch (Exception e) {
+             e.printStackTrace();
+             return error(MobileCoreCode.APP_COMMON_ERROR_CODE);
+         }
+    }
+    /**
+     * 璁惧鐨勭浉鍏充汉鍛樹俊鎭�
+     * @param content
+     * @param servletResponse
+     * @throws IOException
+     */
+    @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);
+             if (bean != null) {
+                 RequestParameterEntity reqp = (RequestParameterEntity) bean;
+                 fse = reqp.getFormData();
+             }
+             if (bean == null || fse == null) {
+                 SpringMVCContextHolder.getSystemLogger().error(DeviceCode.SYSTEM_FORM_NODATA);
+                 return this.error(DeviceCode.SYSTEM_FORM_NODATA);
+             }
+             if (StringUtils.isEmpty(fse.getString("asset_code"))  ) {
+            	 SpringMVCContextHolder.getSystemLogger().error(DeviceCode.SYSTEM_FORM_NODATA);
+                 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();
+             return error(e);
+         } catch (Exception e) {
+             e.printStackTrace();
+             return error(MobileCoreCode.APP_COMMON_ERROR_CODE);
+         }
+    }
+    /**
+     * 璁惧鐨勭浉鍏充汉鍛樹俊鎭�
+     * @param content
+     * @param servletResponse
+     * @throws IOException
+     */
+    @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);
+             if (bean != null) {
+                 RequestParameterEntity reqp = (RequestParameterEntity) bean;
+                 fse = reqp.getFormData();
+             }
+             if (bean == null || fse == null) {
+                 SpringMVCContextHolder.getSystemLogger().error(DeviceCode.SYSTEM_FORM_NODATA);
+                 return this.error(DeviceCode.SYSTEM_FORM_NODATA);
+             }
+             if (StringUtils.isEmpty(fse.getString("device_number"))  ) {
+            	 SpringMVCContextHolder.getSystemLogger().error(DeviceCode.SYSTEM_FORM_NODATA);
+                 return this.error(DeviceCode.SYSTEM_FORM_NODATA);
+             }
+             if (StringUtils.isEmpty(fse.getString("uuid"))  ) {
+            	 SpringMVCContextHolder.getSystemLogger().error(DeviceCode.SYSTEM_FORM_NODATA);
+                 return this.error(DeviceCode.SYSTEM_FORM_NODATA);
+             }
+             deviceMainenanceService.createMaintainTask(fse);
+             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 = "/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(MobileCoreCode.APP_COMMON_ERROR_CODE);
+        }
+    }
+    /**
+     * 璁惧鐐规璁板綍
+     * @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(MobileCoreCode.APP_COMMON_ERROR_CODE);
+        }
+    }
+    /**
+     * 璁惧淇濆吇閰嶇疆
+     * @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.DEVICE_UUID),fse.getString("type"),fse.getString("plan_uuid")));
+            return result;
+        } catch (BaseException e) {
+            e.printStackTrace();
+            return error(e);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return error(MobileCoreCode.APP_COMMON_ERROR_CODE);
+        }
+    }
+    /**
+     * 璁惧鐐规淇℃伅淇濆瓨
+     * @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(MobileCoreCode.APP_COMMON_ERROR_CODE);
+        }
+    }
+    /**
+     * 璁惧鐐规淇℃伅璇︽儏
+     * @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(MobileCoreCode.APP_COMMON_ERROR_CODE);
+        }
+    }
+    /**
+     * 璁惧淇濆吇淇℃伅淇濆瓨
+     * @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(MobileCoreCode.APP_COMMON_ERROR_CODE);
+        }
+    }
+    /**
+     * 璁惧淇濆吇淇℃伅璇︽儏
+     * @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(MobileCoreCode.APP_COMMON_ERROR_CODE);
+        }
+    }
+    /**
+     * 璁惧鍙拌处
+     * @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);
+            }
+         // 鍒ゆ柇鍒嗛〉鍙傛暟鏄惁姝e父
+            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(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