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/DeviceMaintenanceController.java | 133 ++++++++++++++++++++++++++++++++++----------
1 files changed, 102 insertions(+), 31 deletions(-)
diff --git a/product-server-device/src/main/java/com/product/device/controller/DeviceMaintenanceController.java b/product-server-device/src/main/java/com/product/device/controller/DeviceMaintenanceController.java
index f7c9bb3..9c9db87 100644
--- a/product-server-device/src/main/java/com/product/device/controller/DeviceMaintenanceController.java
+++ b/product-server-device/src/main/java/com/product/device/controller/DeviceMaintenanceController.java
@@ -1,42 +1,113 @@
package com.product.device.controller;
-
+
+import com.product.core.entity.FieldSetEntity;
+import com.product.core.exception.BaseException;
+import com.product.device.config.DeviceCode;
+import com.product.module.sys.version.ApiVersion;
+import com.product.util.BaseUtil;
+import com.product.util.support.AbstractBaseController;
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 net.bytebuddy.asm.Advice.This;
+
+import com.product.device.service.DeviceMainenanceService;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import com.alibaba.druid.util.StringUtils;
-import com.product.admin.service.idel.ISystemMenusService;
-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.DeviceMainenanceService;
-import com.product.device.service.DeviceManagerService;
-import com.product.device.service.QuickResponseService;
-import com.product.device.service.ide.IDeviceMainenanceService;
-import com.product.module.sys.version.ApiVersion;
-
-import java.io.IOException;
- /**
- * 璁惧缁翠慨
- */
+/**
+ * 璁惧淇濆吇
+ */
@RestController
@RequestMapping("/api/device/maintenance")
-public class DeviceMaintenanceController extends AbstractBaseController {
- @Autowired
- DeviceMainenanceService deviceMainenanceService;
-
-
-
+public class DeviceMaintenanceController extends AbstractBaseController {
+ @Autowired
+ DeviceMainenanceService deviceMainenanceService;
+
+
+ @PostMapping("/{version}")
+ @ApiVersion(1)
+ public String getMaintainByCurrentYear(HttpServletRequest request) {
+ try {
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+ return OK_List(deviceMainenanceService.getMaintainByCurrentYear(fse));
+ } catch (BaseException e) {
+ return error(e);
+ } catch (Exception e) {
+ return error(DeviceCode.COMMON_DATA_ERROR, e);
+ }
+ }
+
+ @PostMapping("/month/{version}")
+ @ApiVersion(1)
+ public String getMaintainMonth(HttpServletRequest request) {
+ try {
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+ return OK_List(deviceMainenanceService.getMaintainMonth(fse));
+ } catch (BaseException e) {
+ return error(e);
+ } catch (Exception e) {
+ return error(DeviceCode.COMMON_DATA_ERROR, e);
+ }
+ }
+
+ /**
+ * 澶嶆牳缁翠繚璁板綍
+ *
+ * @param request
+ * @return
+ */
+ @PostMapping("/review/{version}")
+ @ApiVersion(1)
+ public String reviewRecord(HttpServletRequest request) {
+ try {
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+ if (!deviceMainenanceService.maintenanceReview(fse)) {
+ //鏇存柊澶辫触
+ return error(DeviceCode.DEVICE_MAINTENANCE_REVIEW_FAIL);
+ }
+ return OK();
+ } catch (BaseException e) {
+ return error(e);
+ } catch (Exception e) {
+ return error(DeviceCode.COMMON_DATA_ERROR, e);
+ }
+ }
+
+ /**
+ * 缁翠繚鍗曚綅骞村害缁翠繚缁熻
+ * @param request
+ * @return
+ */
+ @PostMapping("/year-maintenance/{version}")
+ @ApiVersion(1)
+ public String yearMaintenance(HttpServletRequest request) {
+ try {
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+ return OK_List(deviceMainenanceService.yearMaintenance(fse));
+ } catch (BaseException e) {
+ return error(e);
+ } catch (Exception e) {
+ return error(DeviceCode.DEVICE_MAINTENANCE_YEAR_FAIL, e);
+ }
+ }
+
+ /**
+ * 缁翠繚鍗曚綅骞村害缁翠繚浠诲姟瀹屾垚鎯呭喌
+ * @param request
+ * @return
+ */
+ @PostMapping("/year-maintenance-finish/{version}")
+ @ApiVersion(1)
+ public String yearMaintenanceFinish(HttpServletRequest request) {
+ try {
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+ return OK_List(deviceMainenanceService.yearMaintenanceFinish(fse));
+ } catch (BaseException e) {
+ return error(e);
+ } catch (Exception e) {
+ return error(DeviceCode.DEVICE_MAINTENANCE_YEAR_FINISH_FAIL, e);
+ }
+ }
}
--
Gitblit v1.9.2