From bc0e6504f935fe54a3a68160db313f6d4f089b17 Mon Sep 17 00:00:00 2001
From: shichongfu <shi_chongfu@163.com>
Date: 星期五, 02 六月 2023 21:22:44 +0800
Subject: [PATCH] Merge branch 'master' of http://nonxin.cn:8090/r/product/product-server-administration/V2.0.0
---
src/main/java/com/product/administration/controller/CooperateController.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
src/main/java/com/product/administration/service/ide/ICooperatesService.java | 1 +
src/main/java/com/product/administration/service/CooperatesService.java | 5 +++++
3 files changed, 58 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/product/administration/controller/CooperateController.java b/src/main/java/com/product/administration/controller/CooperateController.java
index 71b2cd1..f992756 100644
--- a/src/main/java/com/product/administration/controller/CooperateController.java
+++ b/src/main/java/com/product/administration/controller/CooperateController.java
@@ -14,6 +14,7 @@
import com.product.core.spring.context.SpringMVCContextHolder;
import com.product.module.sys.version.ApiVersion;
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;
@@ -21,7 +22,7 @@
/**
* Copyright LX
- *
+ *
* @Title: CooperateController
* @Project: product-server
* @date: 2021骞�03鏈�23鏃� 14:53
@@ -359,7 +360,7 @@
return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
}
cooperatesService.sendCooperate(fse);
-
+
return OK();
} catch (BaseException e) {
e.printStackTrace();
@@ -461,6 +462,55 @@
}
}
/**
+ * @description: 鍗忓悓琛ュ厖姝ｆ枃鍒犻櫎
+ * @author: ZhouJie
+ * @date: 2021-06-02 17:23
+ */
+ @PostMapping("/delete-supply/{version}")
+ @ApiVersion(1)
+ public String delSupplyText(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(SystemCode.SYSTEM_FORM_NODATA.getValue(),
+ SystemCode.SYSTEM_FORM_NODATA.getText());
+ return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
+ }
+ // 鍒ゆ柇琛ㄥ悕鏄惁姝ｅ父
+ if (!CmnConst.PRODUCT_OA_COOPERATE_SUB.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());
+ }
+ ICooperatesService service = (ICooperatesService) getProxyInstance(
+ cooperatesService);
+ boolean success = service.delSupplyText(fse);
+ if (success) {
+ return OK();
+ }
+ SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_AND_COOPERATE_SUPPLY_FAIL.getValue(),
+ SystemCode.SYSTEM_AND_COOPERATE_SUPPLY_FAIL.getText());
+ return error(SystemCode.SYSTEM_AND_COOPERATE_SUPPLY_FAIL.getValue(),
+ SystemCode.SYSTEM_AND_COOPERATE_SUPPLY_FAIL.getText());
+ } catch (BaseException e) {
+ e.printStackTrace();
+ SpringMVCContextHolder.getSystemLogger().error(e);
+ return this.error(e);
+ } catch (Exception e) {
+ e.printStackTrace();
+ SpringMVCContextHolder.getSystemLogger().error(e);
+ return this.error(SystemCode.SYSTEM_AND_COOPERATE_SUPPLY_FAIL.getValue(),
+ SystemCode.SYSTEM_AND_COOPERATE_SUPPLY_FAIL.getText());
+ }
+ }
+ /**
* @description: 鍗忓悓鍔炲叕鍌姙
* @author: ZhouJie
* @date: 2021-06-03 17:03
diff --git a/src/main/java/com/product/administration/service/CooperatesService.java b/src/main/java/com/product/administration/service/CooperatesService.java
index a27cfb8..ce0262d 100644
--- a/src/main/java/com/product/administration/service/CooperatesService.java
+++ b/src/main/java/com/product/administration/service/CooperatesService.java
@@ -268,6 +268,11 @@
return baseDao.add(fs);
}
+ @Override
+ public boolean delSupplyText(FieldSetEntity fs) {
+ return baseDao.delete(fs.getTableName(),new String[]{fs.getUUID()});
+ }
+
/**
* @description: 鍗忓悓鍔炲叕鍌姙
* @author: ZhouJie
diff --git a/src/main/java/com/product/administration/service/ide/ICooperatesService.java b/src/main/java/com/product/administration/service/ide/ICooperatesService.java
index c78e391..41ae9ac 100644
--- a/src/main/java/com/product/administration/service/ide/ICooperatesService.java
+++ b/src/main/java/com/product/administration/service/ide/ICooperatesService.java
@@ -6,6 +6,7 @@
String addCooperate(FieldSetEntity fs);
String addSupplyText(FieldSetEntity fs);
+ boolean delSupplyText(FieldSetEntity fs);
boolean updateCooperate(FieldSetEntity fs);
--
Gitblit v1.9.2