Merge pull request #2128 from scottsut/master

Release 1.0.0-RC.2

Author: scottsut

bin/datart.sql

@@ -37,3 +37,13 @@ DORIS:
   adapter-class: "datart.data.provider.jdbc.adapters.DorisDataProviderAdapter"
   url-prefix: "jdbc:mysql://"
 
+STARROCKS:
+  db-type: "starrocks"
+  name: "starrocks"
+  driver-class: "com.mysql.cj.jdbc.Driver"
+  literal-quote: "'"
+  identifier-quote: "`"
+  adapter-class: "datart.data.provider.jdbc.adapters.StarRocksDataProviderAdapter"
+  url-prefix: "jdbc:mysql://"
+
+

bin/migrations/migration.1.0.0-alpha.3.sql

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>datart-parent</artifactId>
         <groupId>datart</groupId>
-        <version>1.0.0-rc.1</version>
+        <version>1.0.0-rc.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -147,7 +147,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.73</version>
+            <version>1.2.83</version>
         </dependency>
         <dependency>
             <groupId>org.hibernate.validator</groupId>
@@ -219,4 +219,4 @@
     </build>
 
 
-</project>
+</project>

bin/migrations/migration.1.0.0-beta.0.sql

@@ -43,7 +43,7 @@ public String getDecimalPlaces() {
     }
 
     public Object parseValue(Object obj){
-        if (obj!=null && StringUtils.isNotBlank(this.unitKey)){
+        if (obj!=null && org.apache.commons.lang.math.NumberUtils.isNumber(obj.toString()) && StringUtils.isNotBlank(this.unitKey)){
             UnitKey unitKey = UnitKey.getUnitKeyByValue(this.unitKey);
             BigDecimal val = new BigDecimal(obj.toString()).divide(new BigDecimal(unitKey.getUnit()));
             obj = val.setScale(getDecimalPlacesNum(), BigDecimal.ROUND_HALF_UP);

bin/migrations/source.1.0.0-alpha.2.sql

@@ -85,6 +85,7 @@ public interface ShareMapper extends CRUDMapper {
           "viz_type = #{vizType,jdbcType=VARCHAR},",
           "viz_id = #{vizId,jdbcType=VARCHAR},",
           "authentication_mode = #{authenticationMode,jdbcType=VARCHAR},",
+          "roles = #{roles,jdbcType=VARCHAR},",
           "row_permission_by = #{rowPermissionBy,jdbcType=VARCHAR},",
           "authentication_code = #{authenticationCode,jdbcType=VARCHAR},",
           "expiry_date = #{expiryDate,jdbcType=TIMESTAMP},",
@@ -93,4 +94,4 @@ public interface ShareMapper extends CRUDMapper {
         "where id = #{id,jdbcType=VARCHAR}"
     })
     int updateByPrimaryKey(Share record);
-}
+}

config/jdbc-driver-ext.yml

@@ -15,6 +15,16 @@ public interface RelWidgetElementMapperExt extends RelWidgetElementMapper {
     })
     List<RelWidgetElement> listWidgetElements(String widgetId);
 
+    @Select({
+            "<script>",
+            "SELECT * FROM rel_widget_element WHERE widget_id IN " +
+                    "<foreach collection='widgetIds' item='item' index='index' open='(' close=')' separator=','> " +
+                    " #{item} " +
+                    "</foreach>",
+            "</script>"
+    })
+    List<RelWidgetElement> listWidgetElementsByIds(@Param("widgetIds") List<String> widgetId);
+
     @Insert({
             "<script>",
             "INSERT INTO rel_widget_element (id, widget_id, rel_type, rel_id) VALUES " +

core/pom.xml

@@ -1,7 +1,6 @@
 package datart.core.mappers.ext;
 
 import datart.core.entity.RelWidgetWidget;
-import datart.core.entity.Widget;
 import datart.core.mappers.RelWidgetWidgetMapper;
 import org.apache.ibatis.annotations.*;
 
@@ -60,4 +59,14 @@ public interface RelWidgetWidgetMapperExt extends RelWidgetWidgetMapper {
     })
     List<RelWidgetWidget> listTargetWidgets(String sourceId);
 
+    @Select({
+            "<script>",
+            "SELECT rww.* " +
+                    "FROM rel_widget_widget rww " +
+                    "WHERE rww.source_id IN " +
+                    "<foreach collection='sourceIds' item='item' index='index' open='(' close=')' separator=','>  #{item} </foreach> ;",
+            "</script>",
+    })
+    List<RelWidgetWidget> listTargetWidgetsByIds(List<String> sourceIds);
+
 }