Merge remote-tracking branch 'origin/main'

Author: welsir

otow-frame/springbootframe.zip

@@ -2,18 +2,15 @@
 
 import com.tml.otowbackend.core.anno.TokenRequire;
 import com.tml.otowbackend.engine.ai.result.FeaturePackage;
-import com.tml.otowbackend.engine.generator.funpack.FuncPackManager;
 import com.tml.otowbackend.engine.otow.SupportedLanguages;
 import com.tml.otowbackend.engine.tree.common.R;
 import com.tml.otowbackend.service.FeaturePackageService;
-import com.tml.otowbackend.service.Impl.IFeaturePackageService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/tml/otowbackend/controller/generate/SupportedController.java

@@ -1,4 +1,4 @@
-package com.tml.otowbackend.engine.generator.funpack;
+package com.tml.otowbackend.engine.generator.core;
 
 import com.tml.otowbackend.engine.ai.result.FeaturePackage;
 import com.tml.otowbackend.engine.generator.template.java.service.ControllerTemplate;
@@ -11,68 +11,49 @@
 
 @Component
 public abstract class AbstrateFunctionPack implements FunctionPack {
-    protected Map<String, Object> dataMap = new HashMap<>();
+
+    // 用于传递数据到功能包里面
+    protected Map<String, String> dataMap = new HashMap<>();
+    public void addParams(String key, String value) {
+        dataMap.put(key, value);
+    }
+    public String getParam(String key) {
+        return dataMap.get(key);
+    }
 
     protected abstract FeaturePackage getFeaturePackage();
 
-    // 生成controller类
     @Override
-    public Object generateController(Object object) {
+    public void handleController(Object object) {
         ControllerTemplate controller = (ControllerTemplate) object;
-        // 添加方法
         addMethodToController(controller);
-        return null;
     }
-
-    // 添加方法到controller中 可重写
     protected void addMethodToController(ControllerTemplate controller) {}
 
-    public void addParams(String key, Object value) {
-        dataMap.put(key, value);
-    }
-
-    public Object getParam(String key) {
-        return dataMap.get(key);
-    }
-    public String getParamString(String key) {
-        return (String)dataMap.get(key);
-    }
-
     @Override
-    public Object generateService(Object object) {
+    public void handleService(Object object) {
         ServiceTemplate service = (ServiceTemplate) object;
         addMethodToService(service);
-        return null;
     }
     protected void addMethodToService(ServiceTemplate service) {}
 
     @Override
-    public Object generateServiceImpl(Object object) {
-        ServiceImplTemplate serviceImplTemplate = (ServiceImplTemplate) object;
-        addMethodToServiceImpl(serviceImplTemplate);
-        return null;
+    public void handleServiceImpl(Object object) {
+        ServiceImplTemplate serviceImpl = (ServiceImplTemplate) object;
+        addMethodToServiceImpl(serviceImpl);
     }
-
-    protected void addMethodToServiceImpl(ServiceImplTemplate serviceImplTemplate) {
-    }
-
-    @Override
-    public Object generateMapper(Object object) {
-        return null;
+    protected void addMethodToServiceImpl(ServiceImplTemplate serviceImpl) {
     }
 
     @Override
-    public Object generateApplication(Object object) {
-        return null;
+    public void handleMapper(Object object) {
     }
 
     @Override
-    public Object generateApplicationConfig(Object object) {
-        return null;
+    public void handleApplicationConfig(Object object) {
     }
 
     @Override
-    public Object generatePomConfig(Object object) {
-        return null;
+    public void handlePomConfig(Object object) {
     }
 }

src/main/java/com/tml/otowbackend/engine/generator/OTOWGenerator.java

@@ -1,11 +1,9 @@
-package com.tml.otowbackend.engine.generator.template.java;
+package com.tml.otowbackend.engine.generator.core;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.tml.otowbackend.engine.generator.funpack.AbstrateFunctionPack;
-import com.tml.otowbackend.engine.generator.funpack.FuncPackManager;
 import com.tml.otowbackend.engine.generator.engine.VelocityCodeEngine;
 import com.tml.otowbackend.engine.generator.template.VelocityOTOWTemplate;
 import com.tml.otowbackend.engine.generator.template.java.model.EntityTemplate;
@@ -26,7 +24,7 @@
 import static com.tml.otowbackend.engine.generator.utils.MetalUtils.getDescribe;
 
 @NoArgsConstructor
-public class InitTemplate {
+public class ClassTemplateFactory {
 
     public static String entityPackagePath = "model.entity";
     public static String controllerPackagePath = "controller";
@@ -38,7 +36,7 @@ public class InitTemplate {
     public static VelocityCodeEngine engine = VelocityCodeEngine.getCodeEngine();
 
     public String prefix;
-    public FuncPackManager funcPackManager;
+    public FunctionPackManager functionPackManager;
     public String className;
     public String tableName;
     public String describe;
@@ -55,9 +53,9 @@ public class InitTemplate {
     private ReqTemplate entityReqTemplate;
     private VOTemplate entityVOTemplate;
 
-    public InitTemplate(String prefix, FuncPackManager funcPackManager, String className, String tableName, String describe, LinkedList<MetalField> fields, List<String> featureIds) {
+    public ClassTemplateFactory(String prefix, FunctionPackManager functionPackManager, String className, String tableName, String describe, LinkedList<MetalField> fields, List<String> featureIds) {
         this.prefix = prefix + ".";
-        this.funcPackManager = funcPackManager;
+        this.functionPackManager = functionPackManager;
         this.className = className;
         this.tableName = tableName;
         this.describe = describe;
@@ -66,13 +64,12 @@ public InitTemplate(String prefix, FuncPackManager funcPackManager, String class
     }
 
     public void initTemplate() {
-        //  将属性添加到新集合中 给req、VO使用
         for (MetalField field : fields) {
             MetalField clone = field.getClone();
             fieldsReq.add(clone);
             fieldsVO.add(clone);
         }
-        judgeMetalField();
+        enhanceMetalField(fields);
         entityTemplate = getEntityTemplate();
         entityReqTemplate = getEntityReqTemplate();
         entityVOTemplate = getEntityVOTemplate();
@@ -85,43 +82,47 @@ public void initTemplate() {
     private String generateStringWithTemplate(VelocityOTOWTemplate template) {
         return engine.generate(template);
     }
+
     public String generateEntity() {
         return generateStringWithTemplate(entityTemplate);
     }
-    public String generateEntityReq(){
+
+    public String generateEntityReq() {
         return generateStringWithTemplate(entityReqTemplate);
     }
-    public String generateEntityVO(){
+
+    public String generateEntityVO() {
         return generateStringWithTemplate(entityVOTemplate);
     }
+
     public String generateMapper() {
         return generateStringWithTemplate(mapperTemplate);
     }
+
     public String generateService() {
         return generateStringWithTemplate(serviceTemplate);
     }
+
     public String generateServiceImpl() {
         return generateStringWithTemplate(serviceImplTemplate);
     }
+
     public String generateController() {
         return generateStringWithTemplate(controllerTemplate);
     }
 
-    // 根据给定的实体类名、字段生成实体模板
     private EntityTemplate getEntityTemplate() {
         EntityTemplate entityTemplate = new EntityTemplate(prefix + entityPackagePath, className, tableName, describe);
         entityTemplate.addModelFields(fields);
         return entityTemplate;
     }
 
-    // 根据给定的实体类名、字段生成实体Req模板
     private ReqTemplate getEntityReqTemplate() {
-        ReqTemplate reqTemplate = new ReqTemplate(prefix + reqPackagePath,className);
+        ReqTemplate reqTemplate = new ReqTemplate(prefix + reqPackagePath, className);
         reqTemplate.addModelFields(fieldsReq);
         return reqTemplate;
     }
 
-    // 根据给定的实体类名、字段生成实体VO模板
     private VOTemplate getEntityVOTemplate() {
         VOTemplate voTemplate = new VOTemplate(prefix + voPackagePath, className);
         voTemplate.addModelFields(fieldsVO);
@@ -134,44 +135,43 @@ private MapperTemplate getMapperTemplate() {
 
     private ServiceTemplate getServiceTemplate() {
         ServiceTemplate userService = new ServiceTemplate(prefix + servicePackagePath, className);
-        for (String featureId : featureIds) {
-            AbstrateFunctionPack pack = funcPackManager.getFunctionPackById(featureId);
+        featureIds.forEach(featureId -> {
+            AbstrateFunctionPack pack = functionPackManager.getFunctionPackById(featureId);
             pack.addParams("prefix", prefix);
             pack.addParams("className", className);
-            pack.generateService(userService);
-        }
+            pack.handleService(userService);
+        });
         return userService;
     }
 
     private ServiceImplTemplate getServiceImplTemplate() {
         ServiceImplTemplate serviceImplTemplate = new ServiceImplTemplate(prefix + serviceImplPackagePath, className, serviceTemplate);
         serviceImplTemplate.addMapper(mapperTemplate);
-        for (String featureId : featureIds) {
-            AbstrateFunctionPack pack = funcPackManager.getFunctionPackById(featureId);
+        featureIds.forEach(featureId -> {
+            AbstrateFunctionPack pack = functionPackManager.getFunctionPackById(featureId);
             pack.addParams("className", className);
             pack.addParams("prefix", prefix);
-            pack.generateServiceImpl(serviceImplTemplate);
-        }
+            pack.handleServiceImpl(serviceImplTemplate);
+        });
         return serviceImplTemplate;
     }
 
     private ControllerTemplate getControllerTemplate() {
         ControllerTemplate userController = new ControllerTemplate(prefix + controllerPackagePath, className, "/" + StringUtils.firstToLowerCase(className));
         userController.addService(serviceTemplate);
-        String classLower = StringUtils.firstToLowerCase(serviceTemplate.getClassName());
-        for (String featureId : featureIds) {
-            AbstrateFunctionPack pack = funcPackManager.getFunctionPackById(featureId);
+        String serviceName = StringUtils.firstToLowerCase(serviceTemplate.getClassName());
+        featureIds.forEach(featureId -> {
+            AbstrateFunctionPack pack = functionPackManager.getFunctionPackById(featureId);
             pack.addParams("prefix", prefix);
             pack.addParams("className", className);
-            pack.addParams("classLower", classLower);
-            pack.generateController(userController);
-        }
+            pack.addParams("serviceName", serviceName);
+            pack.handleController(userController);
+        });
         return userController;
     }
 
     // 加强判断
-    private void judgeMetalField() {
-
+    private void enhanceMetalField(LinkedList<MetalField> fields) {
         // 判断id 加入时间
         MetaAnnotation tableId = new MetaAnnotation(TableId.class);
         for (MetalField metalField : fields) {

src/main/java/com/tml/otowbackend/engine/generator/OTOWResourceManager.java

@@ -0,0 +1,48 @@
+package com.tml.otowbackend.engine.generator.core;
+
+import com.tml.otowbackend.engine.generator.engine.VelocityCodeEngine;
+import com.tml.otowbackend.engine.generator.template.java.ApplicationYmlTemplate;
+import com.tml.otowbackend.engine.generator.template.java.PomConfigTemplate;
+import com.tml.otowbackend.engine.generator.template.java.service.ApplicationTemplate;
+import lombok.Data;
+
+import java.util.Map;
+
+@Data
+public class ConfigTemplateFactory {
+
+    private static VelocityCodeEngine engine = VelocityCodeEngine.getCodeEngine();
+
+    private ApplicationYmlTemplate ymlTemplate;
+    private PomConfigTemplate pomConfigTemplate;
+
+    public ConfigTemplateFactory(){
+        this.ymlTemplate = new ApplicationYmlTemplate();
+        this.pomConfigTemplate = new PomConfigTemplate();
+    }
+
+    public String generateApplication(String prefix, String systemName){
+        ApplicationTemplate applicationTemplate = new ApplicationTemplate(prefix, systemName);
+        return engine.generate(applicationTemplate);
+    }
+
+    public String generateApplicationYml(){
+        return engine.generate(ymlTemplate);
+    }
+
+    public void addYml(String key, Object value){
+        ymlTemplate.addYml(key, value);
+    }
+
+    public String generatePomConfig(){
+        return engine.generate(pomConfigTemplate);
+    }
+
+    public void addPomDependency(Map<String, Object> pomConfigDependency){
+        pomConfigTemplate.addDependency(pomConfigDependency);
+    }
+
+    public void addPomProperties(Map<String, Object> pomConfigProperty){
+        pomConfigTemplate.addDependency(pomConfigProperty);
+    }
+}

…erator/funpack/AbstrateFunctionPack.java …generator/core/AbstrateFunctionPack.javasrc/main/java/com/tml/otowbackend/engine/generator/funpack/AbstrateFunctionPack.java renamed to src/main/java/com/tml/otowbackend/engine/generator/core/AbstrateFunctionPack.java src/main/java/com/tml/otowbackend/engine/generator/funpack/AbstrateFunctionPack.java renamed to src/main/java/com/tml/otowbackend/engine/generator/core/AbstrateFunctionPack.java

@@ -0,0 +1,10 @@
+package com.tml.otowbackend.engine.generator.core;
+
+public interface FunctionPack {
+    void handleController(Object object);
+    void handleService(Object object);
+    void handleServiceImpl(Object object);
+    void handleMapper(Object object);
+    void handleApplicationConfig(Object object);
+    void handlePomConfig(Object object);
+}

…enerator/template/java/InitTemplate.java …generator/core/ClassTemplateFactory.javasrc/main/java/com/tml/otowbackend/engine/generator/template/java/InitTemplate.java renamed to src/main/java/com/tml/otowbackend/engine/generator/core/ClassTemplateFactory.java src/main/java/com/tml/otowbackend/engine/generator/template/java/InitTemplate.java renamed to src/main/java/com/tml/otowbackend/engine/generator/core/ClassTemplateFactory.java

@@ -1,23 +1,22 @@
-package com.tml.otowbackend.engine.generator.funpack;
+package com.tml.otowbackend.engine.generator.core;
 import com.tml.otowbackend.engine.ai.result.FeaturePackage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
 @Component
-public class FuncPackManager {
+public class FunctionPackManager {
 
     private final Map<String, AbstrateFunctionPack> functionPackMap = new HashMap<>();
     private final List<FeaturePackage> featurePackageList;
 
     @Autowired
-    public FuncPackManager(ApplicationContext applicationContext) {
+    public FunctionPackManager(ApplicationContext applicationContext) {
         applicationContext.getBeansOfType(AbstrateFunctionPack.class).forEach((name, bean) -> {
             functionPackMap.put(bean.getFeaturePackage().getId(), bean);
         });