From 9357d25721582bfc7291e5dd9cba7b79a19454f4 Mon Sep 17 00:00:00 2001
From: 354798ggg <1074825718@qq.com>
Date: 星期五, 08 九月 2023 14:47:41 +0800
Subject: [PATCH] BUG调整
---
product-server-project-base/src/main/java/com/product/base/controller/MaterialManagerController.java | 94 ++++++++++++----------------------------------
1 files changed, 25 insertions(+), 69 deletions(-)
diff --git a/product-server-project-base/src/main/java/com/product/base/controller/MaterialManagerController.java b/product-server-project-base/src/main/java/com/product/base/controller/MaterialManagerController.java
index b196a15..ed6ff1a 100644
--- a/product-server-project-base/src/main/java/com/product/base/controller/MaterialManagerController.java
+++ b/product-server-project-base/src/main/java/com/product/base/controller/MaterialManagerController.java
@@ -11,16 +11,16 @@
import com.product.base.config.BaseErrorCode;
import com.product.base.config.CmnConst;
import com.product.base.service.MaterialManagerService;
-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.module.sys.version.ApiVersion;
import com.product.util.BaseUtil;
/**
* 鏉愭枡淇℃伅
- * @author 86151
+ * 鍖呭惈鎺ュ彛锛氭潗鏂欑被鍨嬫爲鎺ュ彛銆佸垪琛ㄦ帴鍙ｃ�佷繚瀛樻帴鍙�
+ * 涓嶅寘鍚帴鍙ｏ細璇︽儏鎺ュ彛銆佸垹闄ゆ帴鍙�,閲囩敤閫氱敤鎺ュ彛
+ * @author
*
*/
@RequestMapping("/api/material")
@@ -31,7 +31,7 @@
MaterialManagerService materialManagerService;
/**
- * 鑾峰彇鎵�鏈夋潗鏂欎俊鎭�
+ * 鑾峰彇鎵�鏈夋潗鏂欑被鍨�
* @param request
* @param response
* @return
@@ -40,22 +40,28 @@
@ApiVersion(1)
public String getMaterialTypeTree(HttpServletRequest request, HttpServletResponse response) {
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) {
- return error(BaseErrorCode.SYSTEM_FORM_NODATA.getValue(), BaseErrorCode.SYSTEM_FORM_NODATA.getText());
- }
- //鍒ゆ柇琛ㄥ悕鏄惁姝ｇ‘
- if(!CmnConst.PRODUCT_PROJECT_BASE_MATERIAL.equals(fse.getTableName())) {
- return error(BaseErrorCode.SYSTEM_TABLE_NODATA.getValue(), BaseErrorCode.SYSTEM_TABLE_NODATA.getText());
- }
return OK_List(materialManagerService.getMaterialTypeTree());
+ } catch (Exception e) {
+ return this.error(BaseErrorCode.PROJECT_BASE_MATERIAL_OPERATE_FAIL.getValue(), BaseErrorCode.PROJECT_BASE_MATERIAL_OPERATE_FAIL.getText()+e.getMessage());
+ }
+ }
+
+ /**
+ * 淇濆瓨鏉愭枡绫诲瀷
+ * @param request
+ * @param response
+ * @return
+ */
+ @RequestMapping(value="/save-material-type/{version}", method = RequestMethod.POST)
+ @ApiVersion(1)
+ public String saveMaterialType(HttpServletRequest request, HttpServletResponse response) {
+ try {
+ //鑾峰彇鍙傛暟
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_PROJECT_BASE_MATERIAL_TYPE);
+ if (BaseUtil.strIsNull(fse.getString(CmnConst.MATERIAL_TYPE_NAME))) {
+ return error(BaseErrorCode.SYSTEM_FORM_COUNT.getValue(), BaseErrorCode.SYSTEM_FORM_COUNT.getText());
+ }
+ return OK_Add(materialManagerService.saveMaterialType(fse));
} catch (Exception e) {
return this.error(BaseErrorCode.PROJECT_BASE_MATERIAL_OPERATE_FAIL.getValue(), BaseErrorCode.PROJECT_BASE_MATERIAL_OPERATE_FAIL.getText()+e.getMessage());
}
@@ -84,28 +90,6 @@
}
}
- /**
- * 鑾峰彇鏉愭枡淇℃伅
- * @param request
- * @param response
- * @return
- */
- @RequestMapping(value="/get/{version}", method = RequestMethod.POST)
- @ApiVersion(1)
- public String getMaterialInfo(HttpServletRequest request, HttpServletResponse response) {
- try {
- //鑾峰彇鍙傛暟
- FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_PROJECT_BASE_MATERIAL);;
-
- //鍒ゆ柇uuid鏄惁涓虹┖
- if (BaseUtil.strIsNull(fse.getUUID())) {
- return error(BaseErrorCode.SYSTEM_FORM_COUNT.getValue(), BaseErrorCode.SYSTEM_FORM_COUNT.getValue());
- }
- return OK_List(materialManagerService.getMaterialInfo(fse.getUUID()));
- } catch (Exception e) {
- return this.error(BaseErrorCode.PROJECT_BASE_MATERIAL_OPERATE_FAIL.getValue(), BaseErrorCode.PROJECT_BASE_MATERIAL_OPERATE_FAIL.getText()+e.getMessage());
- }
- }
/**
* 淇濆瓨鏉愭枡淇℃伅
@@ -126,34 +110,6 @@
return OK();
}
return error(BaseErrorCode.PROJECT_BASE_MATERIAL_SAVE_FAIL.getValue(), BaseErrorCode.PROJECT_BASE_MATERIAL_DELETE_FAIL.getText());
- } catch (Exception e) {
- return this.error(BaseErrorCode.PROJECT_BASE_MATERIAL_OPERATE_FAIL.getValue(), BaseErrorCode.PROJECT_BASE_MATERIAL_OPERATE_FAIL.getText()+e.getMessage());
- }
- }
-
- /**
- * 鍒犻櫎鏉愭枡淇℃伅
- * @param request
- * @param response
- * @return
- */
- @RequestMapping(value="/delete/{version}",method = RequestMethod.POST)
- @ApiVersion(1)
- public String deleteWarehousrInfo(HttpServletRequest request, HttpServletResponse response) {
- try {
- //鑾峰彇鍙傛暟
- FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_PROJECT_BASE_MATERIAL);;
-
- //鍒ゆ柇uuid鏄惁涓虹┖
- if (BaseUtil.strIsNull(fse.getUUID())) {
- return error(BaseErrorCode.SYSTEM_FORM_COUNT.getValue(), BaseErrorCode.SYSTEM_FORM_COUNT.getValue());
- }
- //鍒犻櫎
- boolean succ = materialManagerService.deleteMaterialInfo(fse.getUUID());
- if (succ) {
- return OK();
- }
- return error(BaseErrorCode.PROJECT_BASE_MATERIAL_DELETE_FAIL.getValue(), BaseErrorCode.PROJECT_BASE_MATERIAL_DELETE_FAIL.getText());
} catch (Exception e) {
return this.error(BaseErrorCode.PROJECT_BASE_MATERIAL_OPERATE_FAIL.getValue(), BaseErrorCode.PROJECT_BASE_MATERIAL_OPERATE_FAIL.getText()+e.getMessage());
}
--
Gitblit v1.9.2