From 9514ea221c8d07473761feb8f5cdbc6a14a2f183 Mon Sep 17 00:00:00 2001 From: yuan <1363654894@qq.com> Date: Tue, 10 Sep 2024 01:41:05 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=BA=93=E4=B8=8B=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/common/domain/DataRecord.java | 2 - .../java/com/muyu/common/domain/DataSet.java | 2 - .../com/muyu/common/domain/ValueData.java | 2 - .../domain/req/RuleVersionUpdCodeReq.java | 5 +++ cloud-rule-server/pom.xml | 9 ---- .../controller/RuleVersionController.java | 4 +- .../com/muyu/servier/RuleVersionService.java | 2 + .../servier/impl/RuleVersionServiceImpl.java | 42 ++++--------------- 8 files changed, 17 insertions(+), 51 deletions(-) diff --git a/cloud-rule-common/src/main/java/com/muyu/common/domain/DataRecord.java b/cloud-rule-common/src/main/java/com/muyu/common/domain/DataRecord.java index f3d5ae5..b248160 100644 --- a/cloud-rule-common/src/main/java/com/muyu/common/domain/DataRecord.java +++ b/cloud-rule-common/src/main/java/com/muyu/common/domain/DataRecord.java @@ -20,8 +20,6 @@ public class DataRecord { private String ruleVersionType; - private String ruleVersionText; - private DataValue[] dataValues; } diff --git a/cloud-rule-common/src/main/java/com/muyu/common/domain/DataSet.java b/cloud-rule-common/src/main/java/com/muyu/common/domain/DataSet.java index 4ff7d63..6eedb71 100644 --- a/cloud-rule-common/src/main/java/com/muyu/common/domain/DataSet.java +++ b/cloud-rule-common/src/main/java/com/muyu/common/domain/DataSet.java @@ -20,8 +20,6 @@ public class DataSet { private String ruleVersionType; - private String ruleVersionText; - private DataValue[][] dataValue; } diff --git a/cloud-rule-common/src/main/java/com/muyu/common/domain/ValueData.java b/cloud-rule-common/src/main/java/com/muyu/common/domain/ValueData.java index 484e5d3..41e1941 100644 --- a/cloud-rule-common/src/main/java/com/muyu/common/domain/ValueData.java +++ b/cloud-rule-common/src/main/java/com/muyu/common/domain/ValueData.java @@ -20,8 +20,6 @@ public class ValueData { private String ruleVersionType; - private String ruleVersionText; - private DataValue dataValue; } diff --git a/cloud-rule-common/src/main/java/com/muyu/common/domain/req/RuleVersionUpdCodeReq.java b/cloud-rule-common/src/main/java/com/muyu/common/domain/req/RuleVersionUpdCodeReq.java index f74dff7..329645a 100644 --- a/cloud-rule-common/src/main/java/com/muyu/common/domain/req/RuleVersionUpdCodeReq.java +++ b/cloud-rule-common/src/main/java/com/muyu/common/domain/req/RuleVersionUpdCodeReq.java @@ -28,6 +28,11 @@ public class RuleVersionUpdCodeReq { @NotNull(message = "规则ID不可为空") @Schema(title = "版本ID",type = "Long") private Long ruleVersionId ; + /** + * 版本类 + */ + @Schema(title = "版本类名",type = "String") + private String ruleVersionType ; /** * 代码 */ diff --git a/cloud-rule-server/pom.xml b/cloud-rule-server/pom.xml index 1b2b7bf..42c39d3 100644 --- a/cloud-rule-server/pom.xml +++ b/cloud-rule-server/pom.xml @@ -112,15 +112,6 @@ - - - org.apache.maven.plugins - maven-deploy-plugin - 3.1.1 - - true - - diff --git a/cloud-rule-server/src/main/java/com/muyu/controller/RuleVersionController.java b/cloud-rule-server/src/main/java/com/muyu/controller/RuleVersionController.java index 76e82e3..421e9f6 100644 --- a/cloud-rule-server/src/main/java/com/muyu/controller/RuleVersionController.java +++ b/cloud-rule-server/src/main/java/com/muyu/controller/RuleVersionController.java @@ -58,6 +58,7 @@ public class RuleVersionController { public Result add( @Validated @RequestBody RuleVersionAddReq ruleVersionAddReq ){ + ruleVersionService.uploadOSSJava(ruleVersionAddReq.getRuleVersionType(),ruleVersionAddReq.getRuleVersionText()); ruleVersionService.save(RuleVersion.addBuild(ruleVersionAddReq)); return Result.success(null,"操作成功"); } @@ -141,6 +142,7 @@ public class RuleVersionController { ){ System.out.println(ruleVersionUpdCodeReq); boolean b = ruleVersionService.updateById(RuleVersion.updCodeBuild(ruleVersionUpdCodeReq, () -> ruleVersionId)); + ruleVersionService.uploadOSSJava(ruleVersionUpdCodeReq.getRuleVersionType(),ruleVersionUpdCodeReq.getRuleVersionText()); System.out.println(b); return Result.success(null,"保存成功"); } @@ -152,7 +154,7 @@ public class RuleVersionController { * @throws IOException */ @PostMapping("/compileLoad") - @Operation(summary = "版本测试",description = "版本测试") + @Operation(summary = "字段测试",description = "版本测试") public Result compileLoad( @Validated @RequestBody ValueData valueData ) throws IOException { diff --git a/cloud-rule-server/src/main/java/com/muyu/servier/RuleVersionService.java b/cloud-rule-server/src/main/java/com/muyu/servier/RuleVersionService.java index 856d403..da3a5c1 100644 --- a/cloud-rule-server/src/main/java/com/muyu/servier/RuleVersionService.java +++ b/cloud-rule-server/src/main/java/com/muyu/servier/RuleVersionService.java @@ -40,4 +40,6 @@ public interface RuleVersionService extends IService { List selectDatabase(); List selectTableShow(String dataTableName); + + void uploadOSSJava(String ruleVersionType, String ruleVersionText); } diff --git a/cloud-rule-server/src/main/java/com/muyu/servier/impl/RuleVersionServiceImpl.java b/cloud-rule-server/src/main/java/com/muyu/servier/impl/RuleVersionServiceImpl.java index b2011d8..c5185ae 100644 --- a/cloud-rule-server/src/main/java/com/muyu/servier/impl/RuleVersionServiceImpl.java +++ b/cloud-rule-server/src/main/java/com/muyu/servier/impl/RuleVersionServiceImpl.java @@ -103,11 +103,6 @@ public class RuleVersionServiceImpl @Override public void valueTest(ValueData valueData) { - //上传java文件 - log.info("上传OSS:java文件"); - Result objectResult = ALiYunUpload.uploadJavaFiles(valueData.getRuleVersionText(), valueData.getRuleVersionType()); - log.info(objectResult.getData()); - try { OSSFileLoad.streamingJavaDownload(valueData.getRuleVersionType()); } catch (IOException e) { @@ -166,12 +161,15 @@ public class RuleVersionServiceImpl } @Override - public void rowTest(DataRecord dataRecord) { - + public void uploadOSSJava(String ruleVersionType, String ruleVersionText) { //上传java文件 log.info("上传OSS:java文件"); - Result objectResult = ALiYunUpload.uploadJavaFiles(dataRecord.getRuleVersionText(), dataRecord.getRuleVersionType()); + Result objectResult = ALiYunUpload.uploadJavaFiles(ruleVersionText, ruleVersionType); log.info(objectResult.getData()); + } + + @Override + public void rowTest(DataRecord dataRecord) { try { OSSFileLoad.streamingJavaDownload(dataRecord.getRuleVersionType()); @@ -210,32 +208,11 @@ public class RuleVersionServiceImpl } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { throw new RuntimeException(e); } - DataValue[] dataValues = new DataValue[3]; - - // 初始化每个DataValue对象 - for (int i = 0; i < dataValues.length; i++) { - dataValues[i] = new DataValue(); - } - - dataValues[0].setKey("id"); - dataValues[0].setType("bigint"); - dataValues[0].setLabel("主键ID"); - dataValues[0].setValue("1"); - dataValues[1].setKey("name"); - dataValues[1].setType("string"); - dataValues[1].setLabel("名字"); - dataValues[1].setValue(null); - dataValues[2].setKey("age"); - dataValues[2].setType("int"); - dataValues[2].setLabel("年龄"); - dataValues[2].setValue("20"); - System.out.println("l"+dataValues); - dataRecord.setDataValues(dataValues); System.out.println("测试数据"+dataRecord); log.info("测试数据:[{}]",dataRecord.getDataValues()); - detection(dataRecord.getRuleVersionType(),dataValues); + detection(dataRecord.getRuleVersionType(),dataRecord.getDataValues()); } @@ -244,11 +221,6 @@ public class RuleVersionServiceImpl @Override public void setTest(DataSet dataSet) { - //上传java文件 - log.info("上传OSS:java文件"); - Result objectResult = ALiYunUpload.uploadJavaFiles(dataSet.getRuleVersionText(), dataSet.getRuleVersionType()); - log.info(objectResult.getData()); - try { OSSFileLoad.streamingJavaDownload(dataSet.getRuleVersionType()); } catch (IOException e) {