feat：支持新项目模版colaSingleMvp

Author: Shimmernight

build.gradle.kts

@@ -39,7 +39,7 @@ repositories {
 }
 
 dependencies {
-    implementation("com.wd.paas:wd-generator-core:4.0.1-RC05") {
+    implementation("com.wd.paas:wd-generator-core:4.1.0-RC01") {
         exclude(group = "org.apache.velocity", module = "velocity")
         exclude(group = "org.apache.velocity", module = "velocity-engine-core")
     }

src/main/java/com/wk/paas/service/GenerateCodeService.java

@@ -18,7 +18,6 @@
 import com.wk.paas.window.setting.BindAppInfoSettings;
 import com.wk.paas.window.setting.CodeGenerateConfiguration;
 import com.wk.paas.window.setting.LoginAccountInfoSettings;
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.swing.*;
@@ -61,7 +60,6 @@ public void execute() {
 
         String outputPathText = config.getOutPath();
         boolean isInitCode = config.isInitCodeRadioButton();
-        boolean isColaSingle = config.isColaSingleRadioButton();
         boolean isInitProjectStruct = config.isInitProjectStructCheckBox();
 
         // 重写应用信息
@@ -73,7 +71,7 @@ public void execute() {
         GenerateOperationTypeEnum executeType = isInitCode ? GenerateOperationTypeEnum.INIT_CODE : GenerateOperationTypeEnum.UPDATE_CODE;
 
         // 项目架构
-        ProjectTemplateType projectType = isColaSingle ? ProjectTemplateType.COLA_SINGLE : ProjectTemplateType.COLA;
+        ProjectTemplateType projectType = getProjectTemplateType(config);
 
         // 实时解析DSL
         AppDSLBuilder appDSLBuilder = new AppDSLBuilder();
@@ -98,6 +96,18 @@ public void execute() {
         }
     }
 
+    private static ProjectTemplateType getProjectTemplateType(CodeGenerateConfiguration config) {
+        if (config.isColaRadioButton()) {
+            return ProjectTemplateType.COLA;
+        } else if (config.isColaSingleRadioButton()) {
+            return ProjectTemplateType.COLA_SINGLE;
+        } else if (config.isColaSingleMvpRadioButton()) {
+            return ProjectTemplateType.COLA_SINGLE_MVP;
+        } else {
+            throw new IllegalArgumentException("未知的项目架构类型");
+        }
+    }
+
     private String buildAppDSLJson(JSONObject applicationJson, CodeGenerateConfiguration config) {
 
         LoginAccountInfoSettings instance = LoginAccountInfoSettings.getInstance();

src/main/java/com/wk/paas/window/SelectElementDialog.form

@@ -306,7 +306,7 @@
               </hspacer>
             </children>
           </grid>
-          <grid id="ec92e" layout-manager="GridLayoutManager" row-count="1" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+          <grid id="ec92e" layout-manager="GridLayoutManager" row-count="1" column-count="5" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
             <margin top="0" left="0" bottom="0" right="0"/>
             <constraints>
               <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -341,9 +341,17 @@
                   <text value="COLA-单体架构"/>
                 </properties>
               </component>
-              <hspacer id="d2792">
+              <component id="3208a" class="javax.swing.JRadioButton" binding="colaSingleMvpRadioButton">
                 <constraints>
-                  <grid row="0" column="3" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                  <grid row="0" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <text value="COLA-单体架构-MVP"/>
+                </properties>
+              </component>
+              <hspacer id="7e6e2">
+                <constraints>
+                  <grid row="0" column="4" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
               </hspacer>
             </children>

src/main/java/com/wk/paas/window/SelectElementDialog.java

@@ -61,6 +61,7 @@ public class SelectElementDialog extends JDialog {
     private JCheckBox isInitProjectStructCheckBox;
     private JRadioButton colaRadioButton;
     private JRadioButton colaSingleRadioButton;
+    private JRadioButton colaSingleMvpRadioButton;
     private JButton saveButton;
     private JButton bindProjectButton;
 
@@ -181,6 +182,7 @@ public SelectElementDialog(Project project) {
         ButtonGroup buttonGroup2 = new ButtonGroup();
         buttonGroup2.add(colaRadioButton);
         buttonGroup2.add(colaSingleRadioButton);
+        buttonGroup2.add(colaSingleMvpRadioButton);
 
         buttonOK.addActionListener(e -> onOK());
         buttonCancel.addActionListener(e -> onCancel());
@@ -293,6 +295,7 @@ private void displayConfig(Project project) {
         updateCodeRadioButton.setSelected(config.isUpdateCodeRadioButton());
         colaRadioButton.setSelected(config.isColaRadioButton());
         colaSingleRadioButton.setSelected(config.isColaSingleRadioButton());
+        colaSingleMvpRadioButton.setSelected(config.isColaSingleMvpRadioButton());
         Optional.of(config.isInitProjectStructCheckBox()).ifPresent(x -> isInitProjectStructCheckBox.setSelected(x));
         Optional.ofNullable(config.getOutPath()).ifPresent(x -> textFieldOutputPath.setText(x));
 
@@ -405,6 +408,7 @@ private void onSave() {
         config.setUpdateCodeRadioButton(updateCodeRadioButton.isSelected());
         config.setColaRadioButton(colaRadioButton.isSelected());
         config.setColaSingleRadioButton(colaSingleRadioButton.isSelected());
+        config.setColaSingleMvpRadioButton(colaSingleMvpRadioButton.isSelected());
         config.setInitProjectStructCheckBox(isInitProjectStructCheckBox.isSelected());
         config.setOutPath(textFieldOutputPath.getText());
 

src/main/java/com/wk/paas/window/setting/CodeGenerateConfiguration.java

@@ -20,6 +20,7 @@ public class CodeGenerateConfiguration implements PersistentStateComponent<CodeG
     private boolean updateCodeRadioButton;
     private boolean colaRadioButton;
     private boolean colaSingleRadioButton;
+    private boolean colaSingleMvpRadioButton;
     private boolean isInitProjectStructCheckBox;
     private String outPath;