Merge branch 'dev' into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java

@@ -221,6 +221,8 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
 
     List<T> findByProperty(String[] propertyNames, Object[] values,String orderByStuff);
 
+    T getByProperty(DdlPackBean packBean);
+
     T getByProperty(String propertyName, Object value);
 
     T getByProperty(String[] propertyNames, Object[] values);

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java

@@ -477,6 +477,21 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     }
 
     @Override
+    public T getByProperty(DdlPackBean packBean) {
+
+        try {
+            List<T> list = findByHqlWhere(packBean);
+            return list.size() != 0 ? list.get(0) : null;
+        }catch(NoResultException ne){
+            LOGGER.error("数据不存在，DdlPackBean：{}",packBean);
+            return null;
+        }catch(NonUniqueResultException ex){
+            LOGGER.error("查询单条记录，但出现多条。packBean：{}",packBean);
+            throw new RuntimeException("存在多条记录：" + ex.getMessage());
+        }
+    }
+
+    @Override
     public T getByProperty(String propertyName, Object value) {
         String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName;
         try {

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java

@@ -321,7 +321,7 @@ public final class FormHqlPack {
      * @return DdlPackBean
      */
     public static DdlPackBean packHqlBfDataSource(BfDataSource source){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getStringLikerPack(source.getSourceHost(), "sourceHost", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(source.getSourceType(), "sourceType", ddlPackBean);

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java

@@ -15,7 +15,7 @@ import lombok.Data;
 @Data
 public class TemplateModel {
 
-    @ApiParam("模板ID")
+    @ApiParam("数据源ID")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long sourceId;
 

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrTemplate.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.report.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -29,6 +31,11 @@ import java.util.List;
 @Api(value="报表模板",description = "报表模板")
 public class BrTemplate extends BaseBean {
 
+    @Column(name = "DATA_SOURCE_ID")
+    @ApiParam(value = "数据源ID", example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long dataSourceId = 0L;
+
     @Column(name="NAME")
     @ApiParam(value ="模板名称" , access ="模板名称")
     private String name;