From e5c385b510c54107f9a4ab26d24603706c95cf9f Mon Sep 17 00:00:00 2001
From: zm <2369059705qq.com>
Date: 星期五, 26 七月 2024 18:22:33 +0800
Subject: [PATCH] 整体优化
---
src/main/java/com/product/contract/controller/ProjectInfoController.java | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/product/contract/controller/ProjectInfoController.java b/src/main/java/com/product/contract/controller/ProjectInfoController.java
index 80a5277..96ce8c7 100644
--- a/src/main/java/com/product/contract/controller/ProjectInfoController.java
+++ b/src/main/java/com/product/contract/controller/ProjectInfoController.java
@@ -1,5 +1,7 @@
package com.product.contract.controller;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
import com.product.common.lang.StringUtils;
import com.product.contract.config.CmnConst;
import com.product.contract.config.SystemCode;
@@ -7,12 +9,14 @@
import com.product.contract.service.ide.IProjectInfoService;
import com.product.core.config.CoreConst;
import com.product.core.controller.support.AbstractBaseController;
+import com.product.core.dao.BaseDao;
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.module.sys.version.ApiVersion;
+import com.product.util.BaseUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -35,6 +39,7 @@
@Autowired
public ProjectInfoService projectInfoService;
+
/**
* 鏍规嵁uuid鑾峰彇椤圭洰璇︽儏
* @param request
@@ -58,7 +63,7 @@
return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
}
// 鍒ゆ柇琛ㄥ悕鏄惁姝ｅ父
- if (!CmnConst.LX_PROJECT_INFO.equals(fse.getTableName())) {
+ if (!CmnConst.PRODUCT_PROJECT_BUSINESS.equals(fse.getTableName())) {
SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_TABLE_NODATA.getValue(),
SystemCode.SYSTEM_TABLE_NODATA.getText());
return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
@@ -105,7 +110,7 @@
return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
}
//鍒ゆ柇琛ㄥ悕鏄惁姝ｅ父
- if (!CmnConst.LX_PROJECT_INFO.equals(fse.getTableName())) {
+ if (!CmnConst.PRODUCT_PROJECT_BUSINESS.equals(fse.getTableName())) {
SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
}
@@ -147,7 +152,7 @@
return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
}
//鍒ゆ柇琛ㄥ悕鏄惁姝ｅ父
- if (!CmnConst.LX_PROJECT_INFO.equals(fse.getTableName())) {
+ if (!CmnConst.PRODUCT_PROJECT_BUSINESS.equals(fse.getTableName())) {
SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
}
@@ -195,7 +200,7 @@
return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
}
// 鍒ゆ柇琛ㄥ悕鏄惁姝ｅ父
- if (!CmnConst.LX_PROJECT_INFO.equals(fse.getTableName())) {
+ if (!CmnConst.PRODUCT_PROJECT_BUSINESS.equals(fse.getTableName())) {
SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_TABLE_NODATA.getValue(),
SystemCode.SYSTEM_TABLE_NODATA.getText());
return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
@@ -221,7 +226,33 @@
+ @RequestMapping(value = "/add-update-data-list/{version}", method = RequestMethod.POST)
+ @ApiVersion(1)
+ public String addUpdateDataList(HttpServletRequest request){
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+ if(ObjectUtil.isNotEmpty(fse)){
+ projectInfoService.saveOrUpdate(fse);
+ }
+ return OK();
+
+ }
+
+
+ @RequestMapping(value = "/get-data-list/{version}", method = RequestMethod.POST)
+ @ApiVersion(1)
+ public String getDataList(HttpServletRequest request){
+ FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
+ if(ObjectUtil.isNotEmpty(fse.getValues().get("dict_name"))){
+ String dic_name = fse.getValues().get("dict_name").toString();
+ JSONObject dataList = projectInfoService.getDataList(dic_name);
+ return OK(dataList);
+ }else {
+ return null;
+ }
+
+
+ }
--
Gitblit v1.9.2