Browse Source

优化template

zhouhao 7 years ago
parent
commit
e170451e22

+ 3 - 1
hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-simple/src/main/java/org/hswebframework/web/service/form/simple/SimpleDynamicFormColumnService.java

@@ -18,10 +18,12 @@ public class SimpleDynamicFormColumnService extends GenericEntityService<Dynamic
         implements DynamicFormColumnService {
     @Autowired
     private DynamicFormColumnDao dynamicFormColumnDao;
-   @Override
+
+    @Override
     protected IDGenerator<String> getIDGenerator() {
         return IDGenerator.MD5;
     }
+
     @Override
     public DynamicFormColumnDao getDao() {
         return dynamicFormColumnDao;

+ 0 - 1
hsweb-system/hsweb-system-template/hsweb-system-template-entity/src/main/java/org/hswebframework/web/entity/template/TemplateEntity.java

@@ -65,7 +65,6 @@ public interface TemplateEntity extends GenericEntity<String> {
     /**
      * @return 模板内容
      */
-    @NotBlank(groups = CreateGroup.class)
     String getTemplate();
 
     /**

+ 9 - 0
hsweb-system/hsweb-system-template/hsweb-system-template-service/hsweb-system-template-service-simple/src/main/java/org/hswebframework/web/service/template/simple/SimpleTemplateService.java

@@ -9,6 +9,9 @@ import org.hswebframework.web.service.template.TemplateService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.stereotype.Service;
+import org.springframework.util.AntPathMatcher;
+
+import java.util.regex.Pattern;
 
 /**
  * 默认的服务实现
@@ -39,4 +42,10 @@ public class SimpleTemplateService extends EnableCacheGenericEntityService<Templ
         entity.setVersion(old.getVersion() + 1);
         return super.updateByPk(id, entity);
     }
+
+    @Override
+    public String insert(TemplateEntity entity) {
+        entity.setVersion(1L);
+        return super.insert(entity);
+    }
 }