From 2fef20fe45a1fc901b51243bcc60682524447990 Mon Sep 17 00:00:00 2001
From: shicf <shi_chongfu@163.com>
Date: 星期五, 23 八月 2024 18:55:41 +0800
Subject: [PATCH] Merge branch '2.0.0-release' of http://nonxin.cn:8090/r/product/product-server/V2.0.0
---
product-server-device/src/main/java/com/product/device/controller/CommonInspectionController.java | 193 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 145 insertions(+), 48 deletions(-)
diff --git a/product-server-device/src/main/java/com/product/device/controller/CommonInspectionController.java b/product-server-device/src/main/java/com/product/device/controller/CommonInspectionController.java
index b56cf2f..1d88962 100644
--- a/product-server-device/src/main/java/com/product/device/controller/CommonInspectionController.java
+++ b/product-server-device/src/main/java/com/product/device/controller/CommonInspectionController.java
@@ -1,71 +1,168 @@
package com.product.device.controller;
-
+
+import com.product.device.config.DeviceCode;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import com.alibaba.druid.util.StringUtils;
import com.product.core.config.CoreConst;
import com.product.core.controller.support.AbstractBaseController;
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.service.CommonInspectionService;
-import com.product.device.service.DeviceManagerService;
-import com.product.device.service.QuickResponseService;
import com.product.module.sys.version.ApiVersion;
import java.io.IOException;
- /**
- * 璁惧鐐规
- */
+
+/**
+ * 璁惧鐐规
+ */
@RestController
@RequestMapping("/api/device/inspection")
-public class CommonInspectionController extends AbstractBaseController {
- @Autowired
- CommonInspectionService commonInspectionService;
+public class CommonInspectionController extends AbstractBaseController {
+ @Autowired
+ CommonInspectionService commonInspectionService;
- /**
- * 鍒涘缓璁惧鐐规
- * @param content
- * @param servletResponse
- * @throws IOException
- */
- @RequestMapping(value = "/init/{version}", method = RequestMethod.POST)
+ /**
+ * 璁惧宸℃鏈堝害灞曠ず
+ *
+ * @throws IOException
+ */
+ @RequestMapping(value = "/getPatrolMonthlViewy/{version}", method = RequestMethod.POST)
@ApiVersion(1)
- public String createInspection(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_sn")) ) {
- SpringMVCContextHolder.getSystemLogger().error(DeviceCode.SYSTEM_FORM_NODATA);
- return this.error(DeviceCode.SYSTEM_FORM_NODATA);
- }
- String result=OK_List(commonInspectionService.createInspection(fse.getString("device_sn")));
- System.out.println(result);
- return result;
- } catch (BaseException e) {
- e.printStackTrace();
- return error(e);
- } catch (Exception e) {
- e.printStackTrace();
- return error(DeviceCode.DEVICE_CREATE_INSPECTION_ERROR);
- }
- }
+ public String getPatrolMonthlViewy(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 = OK_List(commonInspectionService.getPatrolMonthlView(fse));
+ return result;
+ } catch (BaseException e) {
+ e.printStackTrace();
+ return error(e);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return e.getMessage();
+ }
+ }
+
+ /**
+ * 璁惧鐐规鎴栬�呭贰妫�閰嶇疆淇濆瓨
+ *
+ * @throws IOException
+ */
+ @RequestMapping(value = "/saveSetting/{version}", method = RequestMethod.POST)
+ @ApiVersion(1)
+ public String saveSetting(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);
+ }
+
+ boolean succ = commonInspectionService.saveSetting(fse);
+ if (succ) {
+ return OK();
+ }
+ SpringMVCContextHolder.getSystemLogger().error(DeviceCode.SAVE_PATROL_CONFIG_ERROR.getValue(),
+ DeviceCode.SAVE_PATROL_CONFIG_ERROR.getText());
+ return this.error(DeviceCode.SAVE_PATROL_CONFIG_ERROR);
+ } catch (BaseException e) {
+ SpringMVCContextHolder.getSystemLogger().error(e);
+ return this.error(e);
+ } catch (Exception e) {
+ SpringMVCContextHolder.getSystemLogger().error(e);
+ return this.error(DeviceCode.SAVE_PATROL_CONFIG_ERROR);
+ }
+ }
+
+ /**
+ * 璁惧鐐规鎴栬�呭贰妫�澶嶆牳
+ *
+ * @throws IOException
+ */
+ @RequestMapping(value = "/batchReview/{version}", method = RequestMethod.POST)
+ @ApiVersion(1)
+ public String batchReview(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);
+ }
+
+ boolean succ = commonInspectionService.batchReview(fse);
+ if (succ) {
+ return OK();
+ }
+ SpringMVCContextHolder.getSystemLogger().error(DeviceCode.SAVE_PATROL_CONFIG_ERROR.getValue(),
+ DeviceCode.SAVE_PATROL_CONFIG_ERROR.getText());
+ return error(DeviceCode.SAVE_PATROL_CONFIG_ERROR.getValue(), DeviceCode.SAVE_PATROL_CONFIG_ERROR.getText());
+ } catch (BaseException e) {
+ SpringMVCContextHolder.getSystemLogger().error(e);
+ return this.error(e);
+ } catch (Exception e) {
+ SpringMVCContextHolder.getSystemLogger().error(e);
+ return this.error(DeviceCode.SAVE_PATROL_CONFIG_ERROR.getValue(),
+ DeviceCode.SAVE_PATROL_CONFIG_ERROR.getText());
+ }
+ }
+
+ /**
+ * 璁惧宸℃閰嶇疆璇︽儏
+ *
+ * @throws IOException
+ */
+ @RequestMapping(value = "/findPatrolSetting/{version}", method = RequestMethod.POST)
+ @ApiVersion(1)
+ public String findPatrolSetting(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 = OK_List(commonInspectionService.findPatrolSetting());
+ return result;
+ } catch (BaseException e) {
+ e.printStackTrace();
+ return error(e);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return e.getMessage();
+ }
+ }
}
--
Gitblit v1.9.2