wsr/orange-admin
1
0
Fork 0
mirror of https://gitee.com/orangeform/orange-admin.git synced 2026-01-17 18:46:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

commit：同步2.1版本

Browse Source
This commit is contained in:
Jerry
2021-12-16 21:51:40 +08:00
parent c76388f593
commit 7af7fe5dc2
553 changed files with 8366 additions and 4151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
orange-demo-flowable/orange-demo-flowable-service/common/common-online/pom.xml
View File

@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>common</artifactId>
<groupId>com.flow.demo</groupId>
<groupId>com.orangeforms</groupId>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -16,27 +16,27 @@
<dependencies>
<dependency>
<groupId>com.flow.demo</groupId>
<groupId>com.orangeforms</groupId>
<artifactId>common-core</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.flow.demo</groupId>
<groupId>com.orangeforms</groupId>
<artifactId>common-datafilter</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.flow.demo</groupId>
<groupId>com.orangeforms</groupId>
<artifactId>common-redis</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.flow.demo</groupId>
<groupId>com.orangeforms</groupId>
<artifactId>common-sequence</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.flow.demo</groupId>
<groupId>com.orangeforms</groupId>
<artifactId>common-log</artifactId>
<version>1.0.0</version>
</dependency>

2
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/config/OnlineAutoConfig.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/config/OnlineAutoConfig.java
View File

@@ -1,4 +1,4 @@
package com.flow.demo.common.online.config;
package com.orangeforms.common.online.config;
import org.springframework.boot.context.properties.EnableConfigurationProperties;

2
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/config/OnlineProperties.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/config/OnlineProperties.java
View File

@@ -1,4 +1,4 @@
package com.flow.demo.common.online.config;
package com.orangeforms.common.online.config;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;

30
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/controller/OnlineOperationController.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/controller/OnlineOperationController.java
View File

@@ -1,23 +1,23 @@
package com.flow.demo.common.online.controller;
package com.orangeforms.common.online.controller;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.CharUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.flow.demo.common.core.annotation.MyRequestBody;
import com.flow.demo.common.core.constant.ErrorCodeEnum;
import com.flow.demo.common.core.object.*;
import com.flow.demo.common.core.util.ContextUtil;
import com.flow.demo.common.core.util.MyCommonUtil;
import com.flow.demo.common.core.util.MyPageUtil;
import com.flow.demo.common.online.util.OnlineOperationHelper;
import com.flow.demo.common.online.dto.OnlineFilterDto;
import com.flow.demo.common.online.model.*;
import com.flow.demo.common.online.model.constant.DictType;
import com.flow.demo.common.online.model.constant.RelationType;
import com.flow.demo.common.online.object.ColumnData;
import com.flow.demo.common.online.service.*;
import com.flow.demo.common.online.util.OnlineConstant;
import com.orangeforms.common.core.annotation.MyRequestBody;
import com.orangeforms.common.core.constant.ErrorCodeEnum;
import com.orangeforms.common.core.object.*;
import com.orangeforms.common.core.util.ContextUtil;
import com.orangeforms.common.core.util.MyCommonUtil;
import com.orangeforms.common.core.util.MyPageUtil;
import com.orangeforms.common.online.util.OnlineOperationHelper;
import com.orangeforms.common.online.dto.OnlineFilterDto;
import com.orangeforms.common.online.model.*;
import com.orangeforms.common.online.model.constant.DictType;
import com.orangeforms.common.online.model.constant.RelationType;
import com.orangeforms.common.online.object.ColumnData;
import com.orangeforms.common.online.service.*;
import com.orangeforms.common.online.util.OnlineConstant;
import com.github.pagehelper.page.PageMethod;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

6
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineColumnMapper.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineColumnMapper.java
View File

@@ -1,7 +1,7 @@
package com.flow.demo.common.online.dao;
package com.orangeforms.common.online.dao;
import com.flow.demo.common.core.base.dao.BaseDaoMapper;
import com.flow.demo.common.online.model.OnlineColumn;
import com.orangeforms.common.core.base.dao.BaseDaoMapper;
import com.orangeforms.common.online.model.OnlineColumn;
import org.apache.ibatis.annotations.Param;
import java.util.List;

6
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineColumnRuleMapper.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineColumnRuleMapper.java
View File

@@ -1,7 +1,7 @@
package com.flow.demo.common.online.dao;
package com.orangeforms.common.online.dao;
import com.flow.demo.common.core.base.dao.BaseDaoMapper;
import com.flow.demo.common.online.model.OnlineColumnRule;
import com.orangeforms.common.core.base.dao.BaseDaoMapper;
import com.orangeforms.common.online.model.OnlineColumnRule;
import org.apache.ibatis.annotations.Param;
import java.util.List;

6
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineDatasourceMapper.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineDatasourceMapper.java
View File

@@ -1,7 +1,7 @@
package com.flow.demo.common.online.dao;
package com.orangeforms.common.online.dao;
import com.flow.demo.common.core.base.dao.BaseDaoMapper;
import com.flow.demo.common.online.model.OnlineDatasource;
import com.orangeforms.common.core.base.dao.BaseDaoMapper;
import com.orangeforms.common.online.model.OnlineDatasource;
import org.apache.ibatis.annotations.Param;
import java.util.List;

6
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineDatasourceRelationMapper.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineDatasourceRelationMapper.java
View File

@@ -1,7 +1,7 @@
package com.flow.demo.common.online.dao;
package com.orangeforms.common.online.dao;
import com.flow.demo.common.core.base.dao.BaseDaoMapper;
import com.flow.demo.common.online.model.OnlineDatasourceRelation;
import com.orangeforms.common.core.base.dao.BaseDaoMapper;
import com.orangeforms.common.online.model.OnlineDatasourceRelation;
import org.apache.ibatis.annotations.Param;
import java.util.List;

6
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineDatasourceTableMapper.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineDatasourceTableMapper.java
View File

@@ -1,7 +1,7 @@
package com.flow.demo.common.online.dao;
package com.orangeforms.common.online.dao;
import com.flow.demo.common.core.base.dao.BaseDaoMapper;
import com.flow.demo.common.online.model.OnlineDatasourceTable;
import com.orangeforms.common.core.base.dao.BaseDaoMapper;
import com.orangeforms.common.online.model.OnlineDatasourceTable;
/**
* 数据操作访问接口。

6
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineDblinkMapper.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineDblinkMapper.java
View File

@@ -1,7 +1,7 @@
package com.flow.demo.common.online.dao;
package com.orangeforms.common.online.dao;
import com.flow.demo.common.core.base.dao.BaseDaoMapper;
import com.flow.demo.common.online.model.OnlineDblink;
import com.orangeforms.common.core.base.dao.BaseDaoMapper;
import com.orangeforms.common.online.model.OnlineDblink;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

6
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineDictMapper.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineDictMapper.java
View File

@@ -1,7 +1,7 @@
package com.flow.demo.common.online.dao;
package com.orangeforms.common.online.dao;
import com.flow.demo.common.core.base.dao.BaseDaoMapper;
import com.flow.demo.common.online.model.OnlineDict;
import com.orangeforms.common.core.base.dao.BaseDaoMapper;
import com.orangeforms.common.online.model.OnlineDict;
import org.apache.ibatis.annotations.Param;
import java.util.List;

6
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineFormDatasourceMapper.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineFormDatasourceMapper.java
View File

@@ -1,7 +1,7 @@
package com.flow.demo.common.online.dao;
package com.orangeforms.common.online.dao;
import com.flow.demo.common.core.base.dao.BaseDaoMapper;
import com.flow.demo.common.online.model.OnlineFormDatasource;
import com.orangeforms.common.core.base.dao.BaseDaoMapper;
import com.orangeforms.common.online.model.OnlineFormDatasource;
/**
* 在线表单与数据源多对多关联的数据操作访问接口。

6
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineFormMapper.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineFormMapper.java
View File

@@ -1,7 +1,7 @@
package com.flow.demo.common.online.dao;
package com.orangeforms.common.online.dao;
import com.flow.demo.common.core.base.dao.BaseDaoMapper;
import com.flow.demo.common.online.model.OnlineForm;
import com.orangeforms.common.core.base.dao.BaseDaoMapper;
import com.orangeforms.common.online.model.OnlineForm;
import org.apache.ibatis.annotations.Param;
import java.util.List;

8
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineOperationMapper.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineOperationMapper.java
View File

@@ -1,8 +1,8 @@
package com.flow.demo.common.online.dao;
package com.orangeforms.common.online.dao;
import com.flow.demo.common.online.dto.OnlineFilterDto;
import com.flow.demo.common.online.object.ColumnData;
import com.flow.demo.common.online.object.JoinTableInfo;
import com.orangeforms.common.online.dto.OnlineFilterDto;
import com.orangeforms.common.online.object.ColumnData;
import com.orangeforms.common.online.object.JoinTableInfo;
import org.apache.ibatis.annotations.*;
import java.util.List;

6
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlinePageDatasourceMapper.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlinePageDatasourceMapper.java
View File

@@ -1,7 +1,7 @@
package com.flow.demo.common.online.dao;
package com.orangeforms.common.online.dao;
import com.flow.demo.common.core.base.dao.BaseDaoMapper;
import com.flow.demo.common.online.model.OnlinePageDatasource;
import com.orangeforms.common.core.base.dao.BaseDaoMapper;
import com.orangeforms.common.online.model.OnlinePageDatasource;
/**
* 在线表单页面和数据源关联对象的数据操作访问接口。

6
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlinePageMapper.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlinePageMapper.java
View File

@@ -1,7 +1,7 @@
package com.flow.demo.common.online.dao;
package com.orangeforms.common.online.dao;
import com.flow.demo.common.core.base.dao.BaseDaoMapper;
import com.flow.demo.common.online.model.OnlinePage;
import com.orangeforms.common.core.base.dao.BaseDaoMapper;
import com.orangeforms.common.online.model.OnlinePage;
import org.apache.ibatis.annotations.Param;
import java.util.List;

6
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineRuleMapper.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineRuleMapper.java
View File

@@ -1,7 +1,7 @@
package com.flow.demo.common.online.dao;
package com.orangeforms.common.online.dao;
import com.flow.demo.common.core.base.dao.BaseDaoMapper;
import com.flow.demo.common.online.model.OnlineRule;
import com.orangeforms.common.core.base.dao.BaseDaoMapper;
import com.orangeforms.common.online.model.OnlineRule;
import org.apache.ibatis.annotations.Param;
import java.util.List;

6
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineTableMapper.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineTableMapper.java
View File

@@ -1,7 +1,7 @@
package com.flow.demo.common.online.dao;
package com.orangeforms.common.online.dao;
import com.flow.demo.common.core.base.dao.BaseDaoMapper;
import com.flow.demo.common.online.model.OnlineTable;
import com.orangeforms.common.core.base.dao.BaseDaoMapper;
import com.orangeforms.common.online.model.OnlineTable;
import org.apache.ibatis.annotations.Param;
import java.util.List;

6
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/OnlineVirtualColumnMapper.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/OnlineVirtualColumnMapper.java
View File

@@ -1,7 +1,7 @@
package com.flow.demo.common.online.dao;
package com.orangeforms.common.online.dao;
import com.flow.demo.common.core.base.dao.BaseDaoMapper;
import com.flow.demo.common.online.model.OnlineVirtualColumn;
import com.orangeforms.common.core.base.dao.BaseDaoMapper;
import com.orangeforms.common.online.model.OnlineVirtualColumn;
import org.apache.ibatis.annotations.Param;
import java.util.*;

8
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineColumnMapper.xml → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineColumnMapper.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.flow.demo.common.online.dao.OnlineColumnMapper">
<resultMap id="BaseResultMap" type="com.flow.demo.common.online.model.OnlineColumn">
<mapper namespace="com.orangeforms.common.online.dao.OnlineColumnMapper">
<resultMap id="BaseResultMap" type="com.orangeforms.common.online.model.OnlineColumn">
<id column="column_id" jdbcType="BIGINT" property="columnId"/>
<result column="column_name" jdbcType="VARCHAR" property="columnName"/>
<result column="table_id" jdbcType="BIGINT" property="tableId"/>
@@ -29,7 +29,7 @@
<!-- 如果有逻辑删除字段过滤，请写到这里 -->
<sql id="filterRef">
<!-- 这里必须加上全包名，否则当filterRef被其他Mapper.xml包含引用的时候，就会调用Mapper.xml中的该SQL片段 -->
<include refid="com.flow.demo.common.online.dao.OnlineColumnMapper.inputFilterRef"/>
<include refid="com.orangeforms.common.online.dao.OnlineColumnMapper.inputFilterRef"/>
</sql>
<!-- 这里仅包含调用接口输入的主表过滤条件 -->
@@ -44,7 +44,7 @@
</if>
</sql>
<select id="getOnlineColumnList" resultMap="BaseResultMap" parameterType="com.flow.demo.common.online.model.OnlineColumn">
<select id="getOnlineColumnList" resultMap="BaseResultMap" parameterType="com.orangeforms.common.online.model.OnlineColumn">
SELECT * FROM zz_online_column
<where>
<include refid="filterRef"/>

8
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineColumnRuleMapper.xml → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineColumnRuleMapper.xml
View File

@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.flow.demo.common.online.dao.OnlineColumnRuleMapper">
<resultMap id="BaseResultMap" type="com.flow.demo.common.online.model.OnlineColumnRule">
<mapper namespace="com.orangeforms.common.online.dao.OnlineColumnRuleMapper">
<resultMap id="BaseResultMap" type="com.orangeforms.common.online.model.OnlineColumnRule">
<id column="column_id" jdbcType="BIGINT" property="columnId"/>
<id column="rule_id" jdbcType="BIGINT" property="ruleId"/>
<result column="prop_data_json" jdbcType="LONGVARCHAR" property="propDataJson"/>
</resultMap>
<resultMap id="BaseResultMapWithOnlineRule" type="com.flow.demo.common.online.model.OnlineColumnRule" extends="BaseResultMap">
<resultMap id="BaseResultMapWithOnlineRule" type="com.orangeforms.common.online.model.OnlineColumnRule" extends="BaseResultMap">
<association property="onlineRule" column="rule_id" foreignColumn="rule_id"
notNullColumn="rule_id" resultMap="com.flow.demo.common.online.dao.OnlineRuleMapper.BaseResultMap" />
notNullColumn="rule_id" resultMap="com.orangeforms.common.online.dao.OnlineRuleMapper.BaseResultMap" />
</resultMap>
<select id="getOnlineColumnRuleListByColumnIds" resultMap="BaseResultMapWithOnlineRule">

12
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineDatasourceMapper.xml → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineDatasourceMapper.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.flow.demo.common.online.dao.OnlineDatasourceMapper">
<resultMap id="BaseResultMap" type="com.flow.demo.common.online.model.OnlineDatasource">
<mapper namespace="com.orangeforms.common.online.dao.OnlineDatasourceMapper">
<resultMap id="BaseResultMap" type="com.orangeforms.common.online.model.OnlineDatasource">
<id column="datasource_id" jdbcType="BIGINT" property="datasourceId"/>
<result column="datasource_name" jdbcType="VARCHAR" property="datasourceName"/>
<result column="variable_name" jdbcType="VARCHAR" property="variableName"/>
@@ -11,15 +11,15 @@
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
</resultMap>
<resultMap id="BaseResultMapWithOnlinePageDatasource" type="com.flow.demo.common.online.model.OnlineDatasource" extends="BaseResultMap">
<resultMap id="BaseResultMapWithOnlinePageDatasource" type="com.orangeforms.common.online.model.OnlineDatasource" extends="BaseResultMap">
<association property="onlinePageDatasource" column="datasource_id" foreignColumn="datasource_id"
notNullColumn="datasource_id" resultMap="com.flow.demo.common.online.dao.OnlinePageDatasourceMapper.BaseResultMap" />
notNullColumn="datasource_id" resultMap="com.orangeforms.common.online.dao.OnlinePageDatasourceMapper.BaseResultMap" />
</resultMap>
<!-- 如果有逻辑删除字段过滤，请写到这里 -->
<sql id="filterRef">
<!-- 这里必须加上全包名，否则当filterRef被其他Mapper.xml包含引用的时候，就会调用Mapper.xml中的该SQL片段 -->
<include refid="com.flow.demo.common.online.dao.OnlineDatasourceMapper.inputFilterRef"/>
<include refid="com.orangeforms.common.online.dao.OnlineDatasourceMapper.inputFilterRef"/>
</sql>
<!-- 这里仅包含调用接口输入的主表过滤条件 -->
@@ -31,7 +31,7 @@
</if>
</sql>
<select id="getOnlineDatasourceList" resultMap="BaseResultMap" parameterType="com.flow.demo.common.online.model.OnlineDatasource">
<select id="getOnlineDatasourceList" resultMap="BaseResultMap" parameterType="com.orangeforms.common.online.model.OnlineDatasource">
SELECT * FROM zz_online_datasource
<where>
<include refid="filterRef"/>

8
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineDatasourceRelationMapper.xml → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineDatasourceRelationMapper.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.flow.demo.common.online.dao.OnlineDatasourceRelationMapper">
<resultMap id="BaseResultMap" type="com.flow.demo.common.online.model.OnlineDatasourceRelation">
<mapper namespace="com.orangeforms.common.online.dao.OnlineDatasourceRelationMapper">
<resultMap id="BaseResultMap" type="com.orangeforms.common.online.model.OnlineDatasourceRelation">
<id column="relation_id" jdbcType="BIGINT" property="relationId"/>
<result column="relation_name" jdbcType="VARCHAR" property="relationName"/>
<result column="variable_name" jdbcType="VARCHAR" property="variableName"/>
@@ -19,7 +19,7 @@
<!-- 如果有逻辑删除字段过滤，请写到这里 -->
<sql id="filterRef">
<!-- 这里必须加上全包名，否则当filterRef被其他Mapper.xml包含引用的时候，就会调用Mapper.xml中的该SQL片段 -->
<include refid="com.flow.demo.common.online.dao.OnlineDatasourceRelationMapper.inputFilterRef"/>
<include refid="com.orangeforms.common.online.dao.OnlineDatasourceRelationMapper.inputFilterRef"/>
</sql>
<!-- 这里仅包含调用接口输入的主表过滤条件 -->
@@ -35,7 +35,7 @@
</sql>
<select id="getOnlineDatasourceRelationList" resultMap="BaseResultMap"
parameterType="com.flow.demo.common.online.model.OnlineDatasourceRelation">
parameterType="com.orangeforms.common.online.model.OnlineDatasourceRelation">
SELECT * FROM zz_online_datasource_relation
<where>
<include refid="filterRef"/>

4
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineDatasourceTableMapper.xml → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineDatasourceTableMapper.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.flow.demo.common.online.dao.OnlineDatasourceTableMapper">
<resultMap id="BaseResultMap" type="com.flow.demo.common.online.model.OnlineDatasourceTable">
<mapper namespace="com.orangeforms.common.online.dao.OnlineDatasourceTableMapper">
<resultMap id="BaseResultMap" type="com.orangeforms.common.online.model.OnlineDatasourceTable">
<id column="id" jdbcType="BIGINT" property="id"/>
<result column="datasource_id" jdbcType="BIGINT" property="datasourceId"/>
<result column="relation_id" jdbcType="BIGINT" property="relationId"/>

8
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineDblinkMapper.xml → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineDblinkMapper.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.flow.demo.common.online.dao.OnlineDblinkMapper">
<resultMap id="BaseResultMap" type="com.flow.demo.common.online.model.OnlineDblink">
<mapper namespace="com.orangeforms.common.online.dao.OnlineDblinkMapper">
<resultMap id="BaseResultMap" type="com.orangeforms.common.online.model.OnlineDblink">
<id column="dblink_id" jdbcType="BIGINT" property="dblinkId"/>
<result column="dblink_name" jdbcType="VARCHAR" property="dblinkName"/>
<result column="variable_name" jdbcType="VARCHAR" property="variableName"/>
@@ -13,7 +13,7 @@
<!-- 如果有逻辑删除字段过滤，请写到这里 -->
<sql id="filterRef">
<!-- 这里必须加上全包名，否则当filterRef被其他Mapper.xml包含引用的时候，就会调用Mapper.xml中的该SQL片段 -->
<include refid="com.flow.demo.common.online.dao.OnlineDblinkMapper.inputFilterRef"/>
<include refid="com.orangeforms.common.online.dao.OnlineDblinkMapper.inputFilterRef"/>
</sql>
<!-- 这里仅包含调用接口输入的主表过滤条件 -->
@@ -22,7 +22,7 @@
</if>
</sql>
<select id="getOnlineDblinkList" resultMap="BaseResultMap" parameterType="com.flow.demo.common.online.model.OnlineDblink">
<select id="getOnlineDblinkList" resultMap="BaseResultMap" parameterType="com.orangeforms.common.online.model.OnlineDblink">
SELECT * FROM zz_online_dblink
<where>
<include refid="filterRef"/>

8
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineDictMapper.xml → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineDictMapper.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.flow.demo.common.online.dao.OnlineDictMapper">
<resultMap id="BaseResultMap" type="com.flow.demo.common.online.model.OnlineDict">
<mapper namespace="com.orangeforms.common.online.dao.OnlineDictMapper">
<resultMap id="BaseResultMap" type="com.orangeforms.common.online.model.OnlineDict">
<id column="dict_id" jdbcType="BIGINT" property="dictId"/>
<result column="dict_name" jdbcType="VARCHAR" property="dictName"/>
<result column="dict_type" jdbcType="INTEGER" property="dictType"/>
@@ -25,7 +25,7 @@
<!-- 如果有逻辑删除字段过滤，请写到这里 -->
<sql id="filterRef">
<!-- 这里必须加上全包名，否则当filterRef被其他Mapper.xml包含引用的时候，就会调用Mapper.xml中的该SQL片段 -->
<include refid="com.flow.demo.common.online.dao.OnlineDictMapper.inputFilterRef"/>
<include refid="com.orangeforms.common.online.dao.OnlineDictMapper.inputFilterRef"/>
</sql>
<!-- 这里仅包含调用接口输入的主表过滤条件 -->
@@ -40,7 +40,7 @@
</if>
</sql>
<select id="getOnlineDictList" resultMap="BaseResultMap" parameterType="com.flow.demo.common.online.model.OnlineDict">
<select id="getOnlineDictList" resultMap="BaseResultMap" parameterType="com.orangeforms.common.online.model.OnlineDict">
SELECT * FROM zz_online_dict
<where>
<include refid="filterRef"/>

4
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineFormDatasourceMapper.xml → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineFormDatasourceMapper.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.flow.demo.common.online.dao.OnlineFormDatasourceMapper">
<resultMap id="BaseResultMap" type="com.flow.demo.common.online.model.OnlineFormDatasource">
<mapper namespace="com.orangeforms.common.online.dao.OnlineFormDatasourceMapper">
<resultMap id="BaseResultMap" type="com.orangeforms.common.online.model.OnlineFormDatasource">
<id column="id" jdbcType="BIGINT" property="id"/>
<result column="form_id" jdbcType="BIGINT" property="formId"/>
<result column="datasource_id" jdbcType="BIGINT" property="datasourceId"/>

8
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineFormMapper.xml → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineFormMapper.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.flow.demo.common.online.dao.OnlineFormMapper">
<resultMap id="BaseResultMap" type="com.flow.demo.common.online.model.OnlineForm">
<mapper namespace="com.orangeforms.common.online.dao.OnlineFormMapper">
<resultMap id="BaseResultMap" type="com.orangeforms.common.online.model.OnlineForm">
<id column="form_id" jdbcType="BIGINT" property="formId"/>
<result column="page_id" jdbcType="BIGINT" property="pageId"/>
<result column="form_code" jdbcType="VARCHAR" property="formCode"/>
@@ -18,7 +18,7 @@
<!-- 如果有逻辑删除字段过滤，请写到这里 -->
<sql id="filterRef">
<!-- 这里必须加上全包名，否则当filterRef被其他Mapper.xml包含引用的时候，就会调用Mapper.xml中的该SQL片段 -->
<include refid="com.flow.demo.common.online.dao.OnlineFormMapper.inputFilterRef"/>
<include refid="com.orangeforms.common.online.dao.OnlineFormMapper.inputFilterRef"/>
</sql>
<!-- 这里仅包含调用接口输入的主表过滤条件 -->
@@ -39,7 +39,7 @@
</if>
</sql>
<select id="getOnlineFormList" resultMap="BaseResultMap" parameterType="com.flow.demo.common.online.model.OnlineForm">
<select id="getOnlineFormList" resultMap="BaseResultMap" parameterType="com.orangeforms.common.online.model.OnlineForm">
SELECT * FROM zz_online_form
<where>
<include refid="filterRef"/>

4
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlinePageDatasourceMapper.xml → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlinePageDatasourceMapper.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.flow.demo.common.online.dao.OnlinePageDatasourceMapper">
<resultMap id="BaseResultMap" type="com.flow.demo.common.online.model.OnlinePageDatasource">
<mapper namespace="com.orangeforms.common.online.dao.OnlinePageDatasourceMapper">
<resultMap id="BaseResultMap" type="com.orangeforms.common.online.model.OnlinePageDatasource">
<id column="id" jdbcType="BIGINT" property="id"/>
<result column="page_id" jdbcType="BIGINT" property="pageId"/>
<result column="datasource_id" jdbcType="BIGINT" property="datasourceId"/>

8
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlinePageMapper.xml → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlinePageMapper.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.flow.demo.common.online.dao.OnlinePageMapper">
<resultMap id="BaseResultMap" type="com.flow.demo.common.online.model.OnlinePage">
<mapper namespace="com.orangeforms.common.online.dao.OnlinePageMapper">
<resultMap id="BaseResultMap" type="com.orangeforms.common.online.model.OnlinePage">
<id column="page_id" jdbcType="BIGINT" property="pageId"/>
<result column="page_code" jdbcType="VARCHAR" property="pageCode"/>
<result column="page_name" jdbcType="VARCHAR" property="pageName"/>
@@ -15,7 +15,7 @@
<!-- 如果有逻辑删除字段过滤，请写到这里 -->
<sql id="filterRef">
<!-- 这里必须加上全包名，否则当filterRef被其他Mapper.xml包含引用的时候，就会调用Mapper.xml中的该SQL片段 -->
<include refid="com.flow.demo.common.online.dao.OnlinePageMapper.inputFilterRef"/>
<include refid="com.orangeforms.common.online.dao.OnlinePageMapper.inputFilterRef"/>
</sql>
<!-- 这里仅包含调用接口输入的主表过滤条件 -->
@@ -33,7 +33,7 @@
</if>
</sql>
<select id="getOnlinePageList" resultMap="BaseResultMap" parameterType="com.flow.demo.common.online.model.OnlinePage">
<select id="getOnlinePageList" resultMap="BaseResultMap" parameterType="com.orangeforms.common.online.model.OnlinePage">
SELECT * FROM zz_online_page
<where>
<include refid="filterRef"/>

12
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineRuleMapper.xml → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineRuleMapper.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.flow.demo.common.online.dao.OnlineRuleMapper">
<resultMap id="BaseResultMap" type="com.flow.demo.common.online.model.OnlineRule">
<mapper namespace="com.orangeforms.common.online.dao.OnlineRuleMapper">
<resultMap id="BaseResultMap" type="com.orangeforms.common.online.model.OnlineRule">
<id column="rule_id" jdbcType="BIGINT" property="ruleId"/>
<result column="rule_name" jdbcType="VARCHAR" property="ruleName"/>
<result column="rule_type" jdbcType="INTEGER" property="ruleType"/>
@@ -12,17 +12,17 @@
<result column="deleted_flag" jdbcType="INTEGER" property="deletedFlag"/>
</resultMap>
<resultMap id="BaseResultMapWithOnlineColumnRule" type="com.flow.demo.common.online.model.OnlineRule" extends="BaseResultMap">
<resultMap id="BaseResultMapWithOnlineColumnRule" type="com.orangeforms.common.online.model.OnlineRule" extends="BaseResultMap">
<association property="onlineColumnRule" column="rule_id" foreignColumn="rule_id"
notNullColumn="rule_id" resultMap="com.flow.demo.common.online.dao.OnlineColumnRuleMapper.BaseResultMap" />
notNullColumn="rule_id" resultMap="com.orangeforms.common.online.dao.OnlineColumnRuleMapper.BaseResultMap" />
</resultMap>
<!-- 如果有逻辑删除字段过滤，请写到这里 -->
<sql id="filterRef">
AND zz_online_rule.deleted_flag = ${@com.flow.demo.common.core.constant.GlobalDeletedFlag@NORMAL}
AND zz_online_rule.deleted_flag = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL}
</sql>
<select id="getOnlineRuleList" resultMap="BaseResultMap" parameterType="com.flow.demo.common.online.model.OnlineRule">
<select id="getOnlineRuleList" resultMap="BaseResultMap" parameterType="com.orangeforms.common.online.model.OnlineRule">
SELECT * FROM zz_online_rule
<where>
<include refid="filterRef"/>

8
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineTableMapper.xml → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineTableMapper.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.flow.demo.common.online.dao.OnlineTableMapper">
<resultMap id="BaseResultMap" type="com.flow.demo.common.online.model.OnlineTable">
<mapper namespace="com.orangeforms.common.online.dao.OnlineTableMapper">
<resultMap id="BaseResultMap" type="com.orangeforms.common.online.model.OnlineTable">
<id column="table_id" jdbcType="BIGINT" property="tableId"/>
<result column="table_name" jdbcType="VARCHAR" property="tableName"/>
<result column="model_name" jdbcType="VARCHAR" property="modelName"/>
@@ -13,7 +13,7 @@
<!-- 如果有逻辑删除字段过滤，请写到这里 -->
<sql id="filterRef">
<!-- 这里必须加上全包名，否则当filterRef被其他Mapper.xml包含引用的时候，就会调用Mapper.xml中的该SQL片段 -->
<include refid="com.flow.demo.common.online.dao.OnlineTableMapper.inputFilterRef"/>
<include refid="com.orangeforms.common.online.dao.OnlineTableMapper.inputFilterRef"/>
</sql>
<!-- 这里仅包含调用接口输入的主表过滤条件 -->
@@ -31,7 +31,7 @@
</if>
</sql>
<select id="getOnlineTableList" resultMap="BaseResultMap" parameterType="com.flow.demo.common.online.model.OnlineTable">
<select id="getOnlineTableList" resultMap="BaseResultMap" parameterType="com.orangeforms.common.online.model.OnlineTable">
SELECT * FROM zz_online_table
<where>
<include refid="filterRef"/>

8
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dao/mapper/OnlineVirtualColumnMapper.xml → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dao/mapper/OnlineVirtualColumnMapper.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.flow.demo.common.online.dao.OnlineVirtualColumnMapper">
<resultMap id="BaseResultMap" type="com.flow.demo.common.online.model.OnlineVirtualColumn">
<mapper namespace="com.orangeforms.common.online.dao.OnlineVirtualColumnMapper">
<resultMap id="BaseResultMap" type="com.orangeforms.common.online.model.OnlineVirtualColumn">
<id column="virtual_column_id" jdbcType="BIGINT" property="virtualColumnId"/>
<result column="table_id" jdbcType="BIGINT" property="tableId"/>
<result column="object_field_name" jdbcType="VARCHAR" property="objectFieldName"/>
@@ -19,7 +19,7 @@
<!-- 如果有逻辑删除字段过滤，请写到这里 -->
<sql id="filterRef">
<!-- 这里必须加上全包名，否则当filterRef被其他Mapper.xml包含引用的时候，就会调用Mapper.xml中的该SQL片段 -->
<include refid="com.flow.demo.common.online.dao.OnlineVirtualColumnMapper.inputFilterRef"/>
<include refid="com.orangeforms.common.online.dao.OnlineVirtualColumnMapper.inputFilterRef"/>
</sql>
<!-- 这里仅包含调用接口输入的主表过滤条件 -->
@@ -44,7 +44,7 @@
</sql>
<select id="getOnlineVirtualColumnList" resultMap="BaseResultMap"
parameterType="com.flow.demo.common.online.model.OnlineVirtualColumn">
parameterType="com.orangeforms.common.online.model.OnlineVirtualColumn">
SELECT * FROM zz_online_virtual_column
<where>
<include refid="filterRef"/>

10
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dto/OnlineColumnDto.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dto/OnlineColumnDto.java
View File

@@ -1,9 +1,9 @@
package com.flow.demo.common.online.dto;
package com.orangeforms.common.online.dto;
import com.flow.demo.common.core.validator.ConstDictRef;
import com.flow.demo.common.core.validator.UpdateGroup;
import com.flow.demo.common.online.model.constant.FieldFilterType;
import com.flow.demo.common.online.model.constant.FieldKind;
import com.orangeforms.common.core.validator.ConstDictRef;
import com.orangeforms.common.core.validator.UpdateGroup;
import com.orangeforms.common.online.model.constant.FieldFilterType;
import com.orangeforms.common.online.model.constant.FieldKind;
import lombok.Data;
import javax.validation.constraints.NotBlank;

4
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dto/OnlineColumnRuleDto.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dto/OnlineColumnRuleDto.java
View File

@@ -1,6 +1,6 @@
package com.flow.demo.common.online.dto;
package com.orangeforms.common.online.dto;
import com.flow.demo.common.core.validator.UpdateGroup;
import com.orangeforms.common.core.validator.UpdateGroup;
import lombok.Data;
import javax.validation.constraints.NotNull;

6
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dto/OnlineDatasourceDto.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dto/OnlineDatasourceDto.java
View File

@@ -1,7 +1,7 @@
package com.flow.demo.common.online.dto;
package com.orangeforms.common.online.dto;
import com.flow.demo.common.core.validator.AddGroup;
import com.flow.demo.common.core.validator.UpdateGroup;
import com.orangeforms.common.core.validator.AddGroup;
import com.orangeforms.common.core.validator.UpdateGroup;
import lombok.Data;
import javax.validation.constraints.NotBlank;

10
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dto/OnlineDatasourceRelationDto.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dto/OnlineDatasourceRelationDto.java
View File

@@ -1,9 +1,9 @@
package com.flow.demo.common.online.dto;
package com.orangeforms.common.online.dto;
import com.flow.demo.common.core.validator.AddGroup;
import com.flow.demo.common.core.validator.ConstDictRef;
import com.flow.demo.common.core.validator.UpdateGroup;
import com.flow.demo.common.online.model.constant.RelationType;
import com.orangeforms.common.core.validator.AddGroup;
import com.orangeforms.common.core.validator.ConstDictRef;
import com.orangeforms.common.core.validator.UpdateGroup;
import com.orangeforms.common.online.model.constant.RelationType;
import lombok.Data;
import javax.validation.constraints.NotBlank;

4
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dto/OnlineDblinkDto.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dto/OnlineDblinkDto.java
View File

@@ -1,6 +1,6 @@
package com.flow.demo.common.online.dto;
package com.orangeforms.common.online.dto;
import com.flow.demo.common.core.validator.UpdateGroup;
import com.orangeforms.common.core.validator.UpdateGroup;
import lombok.Data;
import javax.validation.constraints.NotBlank;

8
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dto/OnlineDictDto.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dto/OnlineDictDto.java
View File

@@ -1,8 +1,8 @@
package com.flow.demo.common.online.dto;
package com.orangeforms.common.online.dto;
import com.flow.demo.common.core.validator.ConstDictRef;
import com.flow.demo.common.core.validator.UpdateGroup;
import com.flow.demo.common.online.model.constant.DictType;
import com.orangeforms.common.core.validator.ConstDictRef;
import com.orangeforms.common.core.validator.UpdateGroup;
import com.orangeforms.common.online.model.constant.DictType;
import lombok.Data;
import javax.validation.constraints.NotBlank;

4
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dto/OnlineFilterDto.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dto/OnlineFilterDto.java
View File

@@ -1,6 +1,6 @@
package com.flow.demo.common.online.dto;
package com.orangeforms.common.online.dto;
import com.flow.demo.common.online.model.constant.FieldFilterType;
import com.orangeforms.common.online.model.constant.FieldFilterType;
import lombok.Data;
import java.util.Set;

10
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dto/OnlineFormDto.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dto/OnlineFormDto.java
View File

@@ -1,9 +1,9 @@
package com.flow.demo.common.online.dto;
package com.orangeforms.common.online.dto;
import com.flow.demo.common.core.validator.ConstDictRef;
import com.flow.demo.common.core.validator.UpdateGroup;
import com.flow.demo.common.online.model.constant.FormKind;
import com.flow.demo.common.online.model.constant.FormType;
import com.orangeforms.common.core.validator.ConstDictRef;
import com.orangeforms.common.core.validator.UpdateGroup;
import com.orangeforms.common.online.model.constant.FormKind;
import com.orangeforms.common.online.model.constant.FormType;
import lombok.Data;
import javax.validation.constraints.NotBlank;

4
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dto/OnlinePageDatasourceDto.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dto/OnlinePageDatasourceDto.java
View File

@@ -1,6 +1,6 @@
package com.flow.demo.common.online.dto;
package com.orangeforms.common.online.dto;
import com.flow.demo.common.core.validator.UpdateGroup;
import com.orangeforms.common.core.validator.UpdateGroup;
import lombok.Data;
import javax.validation.constraints.NotNull;

10
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dto/OnlinePageDto.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dto/OnlinePageDto.java
View File

@@ -1,9 +1,9 @@
package com.flow.demo.common.online.dto;
package com.orangeforms.common.online.dto;
import com.flow.demo.common.core.validator.ConstDictRef;
import com.flow.demo.common.core.validator.UpdateGroup;
import com.flow.demo.common.online.model.constant.PageStatus;
import com.flow.demo.common.online.model.constant.PageType;
import com.orangeforms.common.core.validator.ConstDictRef;
import com.orangeforms.common.core.validator.UpdateGroup;
import com.orangeforms.common.online.model.constant.PageStatus;
import com.orangeforms.common.online.model.constant.PageType;
import lombok.Data;
import javax.validation.constraints.NotBlank;

8
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dto/OnlineRuleDto.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dto/OnlineRuleDto.java
View File

@@ -1,8 +1,8 @@
package com.flow.demo.common.online.dto;
package com.orangeforms.common.online.dto;
import com.flow.demo.common.core.validator.ConstDictRef;
import com.flow.demo.common.core.validator.UpdateGroup;
import com.flow.demo.common.online.model.constant.RuleType;
import com.orangeforms.common.core.validator.ConstDictRef;
import com.orangeforms.common.core.validator.UpdateGroup;
import com.orangeforms.common.online.model.constant.RuleType;
import lombok.Data;
import javax.validation.constraints.NotBlank;

4
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dto/OnlineTableDto.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dto/OnlineTableDto.java
View File

@@ -1,6 +1,6 @@
package com.flow.demo.common.online.dto;
package com.orangeforms.common.online.dto;
import com.flow.demo.common.core.validator.UpdateGroup;
import com.orangeforms.common.core.validator.UpdateGroup;
import lombok.Data;
import javax.validation.constraints.NotBlank;

10
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/dto/OnlineVirtualColumnDto.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/dto/OnlineVirtualColumnDto.java
View File

@@ -1,10 +1,10 @@
package com.flow.demo.common.online.dto;
package com.orangeforms.common.online.dto;
import com.flow.demo.common.core.constant.AggregationType;
import com.flow.demo.common.core.validator.ConstDictRef;
import com.flow.demo.common.core.validator.UpdateGroup;
import com.orangeforms.common.core.constant.AggregationType;
import com.orangeforms.common.core.validator.ConstDictRef;
import com.orangeforms.common.core.validator.UpdateGroup;
import com.flow.demo.common.online.model.constant.VirtualType;
import com.orangeforms.common.online.model.constant.VirtualType;
import lombok.Data;
import javax.validation.constraints.*;

14
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/model/OnlineColumn.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/model/OnlineColumn.java
View File

@@ -1,11 +1,11 @@
package com.flow.demo.common.online.model;
package com.orangeforms.common.online.model;
import com.baomidou.mybatisplus.annotation.*;
import com.flow.demo.common.core.annotation.RelationConstDict;
import com.flow.demo.common.core.annotation.RelationOneToOne;
import com.flow.demo.common.core.base.mapper.BaseModelMapper;
import com.flow.demo.common.online.model.constant.FieldKind;
import com.flow.demo.common.online.vo.OnlineColumnVo;
import com.orangeforms.common.core.annotation.RelationConstDict;
import com.orangeforms.common.core.annotation.RelationOneToOne;
import com.orangeforms.common.core.base.mapper.BaseModelMapper;
import com.orangeforms.common.online.model.constant.FieldKind;
import com.orangeforms.common.online.vo.OnlineColumnVo;
import lombok.Data;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
@@ -179,7 +179,7 @@ public class OnlineColumn {
* @param onlineColumnVo 域对象。
* @return 实体对象。
*/
@Mapping(target = "dictInfo", expression = "java(mapToBean(onlineColumnVo.getDictInfo(), com.flow.demo.common.online.model.OnlineDict.class))")
@Mapping(target = "dictInfo", expression = "java(mapToBean(onlineColumnVo.getDictInfo(), com.orangeforms.common.online.model.OnlineDict.class))")
@Override
OnlineColumn toModel(OnlineColumnVo onlineColumnVo);
/**

2
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/model/OnlineColumnRule.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/model/OnlineColumnRule.java
View File

@@ -1,4 +1,4 @@
package com.flow.demo.common.online.model;
package com.orangeforms.common.online.model;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

10
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/model/OnlineDatasource.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/model/OnlineDatasource.java
View File

@@ -1,9 +1,9 @@
package com.flow.demo.common.online.model;
package com.orangeforms.common.online.model;
import com.baomidou.mybatisplus.annotation.*;
import com.flow.demo.common.core.annotation.RelationDict;
import com.flow.demo.common.core.base.mapper.BaseModelMapper;
import com.flow.demo.common.online.vo.OnlineDatasourceVo;
import com.orangeforms.common.core.annotation.RelationDict;
import com.orangeforms.common.core.base.mapper.BaseModelMapper;
import com.orangeforms.common.online.vo.OnlineDatasourceVo;
import lombok.Data;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
@@ -90,7 +90,7 @@ public class OnlineDatasource {
* @param onlineDatasourceVo 域对象。
* @return 实体对象。
*/
@Mapping(target = "onlinePageDatasource", expression = "java(mapToBean(onlineDatasourceVo.getOnlinePageDatasource(), com.flow.demo.common.online.model.OnlinePageDatasource.class))")
@Mapping(target = "onlinePageDatasource", expression = "java(mapToBean(onlineDatasourceVo.getOnlinePageDatasource(), com.orangeforms.common.online.model.OnlinePageDatasource.class))")
@Override
OnlineDatasource toModel(OnlineDatasourceVo onlineDatasourceVo);
/**

20
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/model/OnlineDatasourceRelation.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/model/OnlineDatasourceRelation.java
View File

@@ -1,12 +1,12 @@
package com.flow.demo.common.online.model;
package com.orangeforms.common.online.model;
import com.baomidou.mybatisplus.annotation.*;
import com.flow.demo.common.core.annotation.RelationConstDict;
import com.flow.demo.common.core.annotation.RelationDict;
import com.flow.demo.common.core.annotation.RelationOneToOne;
import com.flow.demo.common.core.base.mapper.BaseModelMapper;
import com.flow.demo.common.online.model.constant.RelationType;
import com.flow.demo.common.online.vo.OnlineDatasourceRelationVo;
import com.orangeforms.common.core.annotation.RelationConstDict;
import com.orangeforms.common.core.annotation.RelationDict;
import com.orangeforms.common.core.annotation.RelationOneToOne;
import com.orangeforms.common.core.base.mapper.BaseModelMapper;
import com.orangeforms.common.online.model.constant.RelationType;
import com.orangeforms.common.online.vo.OnlineDatasourceRelationVo;
import lombok.Data;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
@@ -166,9 +166,9 @@ public class OnlineDatasourceRelation {
* @param onlineDatasourceRelationVo 域对象。
* @return 实体对象。
*/
@Mapping(target = "masterColumn", expression = "java(mapToBean(onlineDatasourceRelationVo.getMasterColumn(), com.flow.demo.common.online.model.OnlineColumn.class))")
@Mapping(target = "slaveTable", expression = "java(mapToBean(onlineDatasourceRelationVo.getSlaveTable(), com.flow.demo.common.online.model.OnlineTable.class))")
@Mapping(target = "slaveColumn", expression = "java(mapToBean(onlineDatasourceRelationVo.getSlaveColumn(), com.flow.demo.common.online.model.OnlineColumn.class))")
@Mapping(target = "masterColumn", expression = "java(mapToBean(onlineDatasourceRelationVo.getMasterColumn(), com.orangeforms.common.online.model.OnlineColumn.class))")
@Mapping(target = "slaveTable", expression = "java(mapToBean(onlineDatasourceRelationVo.getSlaveTable(), com.orangeforms.common.online.model.OnlineTable.class))")
@Mapping(target = "slaveColumn", expression = "java(mapToBean(onlineDatasourceRelationVo.getSlaveColumn(), com.orangeforms.common.online.model.OnlineColumn.class))")
@Override
OnlineDatasourceRelation toModel(OnlineDatasourceRelationVo onlineDatasourceRelationVo);
/**

2
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/model/OnlineDatasourceTable.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/model/OnlineDatasourceTable.java
View File

@@ -1,4 +1,4 @@
package com.flow.demo.common.online.model;
package com.orangeforms.common.online.model;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

6
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/model/OnlineDblink.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/model/OnlineDblink.java
View File

@@ -1,8 +1,8 @@
package com.flow.demo.common.online.model;
package com.orangeforms.common.online.model;
import com.baomidou.mybatisplus.annotation.*;
import com.flow.demo.common.core.base.mapper.BaseModelMapper;
import com.flow.demo.common.online.vo.OnlineDblinkVo;
import com.orangeforms.common.core.base.mapper.BaseModelMapper;
import com.orangeforms.common.online.vo.OnlineDblinkVo;
import lombok.Data;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;

12
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/model/OnlineDict.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/model/OnlineDict.java
View File

@@ -1,11 +1,11 @@
package com.flow.demo.common.online.model;
package com.orangeforms.common.online.model;
import com.baomidou.mybatisplus.annotation.*;
import com.flow.demo.common.core.annotation.RelationConstDict;
import com.flow.demo.common.core.annotation.RelationDict;
import com.flow.demo.common.core.base.mapper.BaseModelMapper;
import com.flow.demo.common.online.model.constant.DictType;
import com.flow.demo.common.online.vo.OnlineDictVo;
import com.orangeforms.common.core.annotation.RelationConstDict;
import com.orangeforms.common.core.annotation.RelationDict;
import com.orangeforms.common.core.base.mapper.BaseModelMapper;
import com.orangeforms.common.online.model.constant.DictType;
import com.orangeforms.common.online.vo.OnlineDictVo;
import lombok.Data;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;

12
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/model/OnlineForm.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/model/OnlineForm.java
View File

@@ -1,10 +1,10 @@
package com.flow.demo.common.online.model;
package com.orangeforms.common.online.model;
import com.baomidou.mybatisplus.annotation.*;
import com.flow.demo.common.core.annotation.*;
import com.flow.demo.common.core.base.mapper.BaseModelMapper;
import com.flow.demo.common.online.model.constant.FormType;
import com.flow.demo.common.online.vo.OnlineFormVo;
import com.orangeforms.common.core.annotation.*;
import com.orangeforms.common.core.base.mapper.BaseModelMapper;
import com.orangeforms.common.online.model.constant.FormType;
import com.orangeforms.common.online.vo.OnlineFormVo;
import lombok.Data;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
@@ -121,7 +121,7 @@ public class OnlineForm {
* @param onlineFormVo 域对象。
* @return 实体对象。
*/
@Mapping(target = "onlineTable", expression = "java(mapToBean(onlineFormVo.getOnlineTable(), com.flow.demo.common.online.model.OnlineTable.class))")
@Mapping(target = "onlineTable", expression = "java(mapToBean(onlineFormVo.getOnlineTable(), com.orangeforms.common.online.model.OnlineTable.class))")
@Override
OnlineForm toModel(OnlineFormVo onlineFormVo);
/**

2
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/model/OnlineFormDatasource.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/model/OnlineFormDatasource.java
View File

@@ -1,4 +1,4 @@
package com.flow.demo.common.online.model;
package com.orangeforms.common.online.model;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

12
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/model/OnlinePage.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/model/OnlinePage.java
View File

@@ -1,11 +1,11 @@
package com.flow.demo.common.online.model;
package com.orangeforms.common.online.model;
import com.baomidou.mybatisplus.annotation.*;
import com.flow.demo.common.core.annotation.RelationConstDict;
import com.flow.demo.common.core.base.mapper.BaseModelMapper;
import com.flow.demo.common.online.model.constant.PageStatus;
import com.flow.demo.common.online.model.constant.PageType;
import com.flow.demo.common.online.vo.OnlinePageVo;
import com.orangeforms.common.core.annotation.RelationConstDict;
import com.orangeforms.common.core.base.mapper.BaseModelMapper;
import com.orangeforms.common.online.model.constant.PageStatus;
import com.orangeforms.common.online.model.constant.PageType;
import com.orangeforms.common.online.vo.OnlinePageVo;
import lombok.Data;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;

2
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/model/OnlinePageDatasource.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/model/OnlinePageDatasource.java
View File

@@ -1,4 +1,4 @@
package com.flow.demo.common.online.model;
package com.orangeforms.common.online.model;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

12
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/model/OnlineRule.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/model/OnlineRule.java
View File

@@ -1,10 +1,10 @@
package com.flow.demo.common.online.model;
package com.orangeforms.common.online.model;
import com.baomidou.mybatisplus.annotation.*;
import com.flow.demo.common.core.annotation.RelationConstDict;
import com.flow.demo.common.core.base.mapper.BaseModelMapper;
import com.flow.demo.common.online.model.constant.RuleType;
import com.flow.demo.common.online.vo.OnlineRuleVo;
import com.orangeforms.common.core.annotation.RelationConstDict;
import com.orangeforms.common.core.base.mapper.BaseModelMapper;
import com.orangeforms.common.online.model.constant.RuleType;
import com.orangeforms.common.online.vo.OnlineRuleVo;
import lombok.Data;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
@@ -92,7 +92,7 @@ public class OnlineRule {
* @param onlineRuleVo 域对象。
* @return 实体对象。
*/
@Mapping(target = "onlineColumnRule", expression = "java(mapToBean(onlineRuleVo.getOnlineColumnRule(), com.flow.demo.common.online.model.OnlineColumnRule.class))")
@Mapping(target = "onlineColumnRule", expression = "java(mapToBean(onlineRuleVo.getOnlineColumnRule(), com.orangeforms.common.online.model.OnlineColumnRule.class))")
@Override
OnlineRule toModel(OnlineRuleVo onlineRuleVo);
/**

8
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/model/OnlineTable.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/model/OnlineTable.java
View File

@@ -1,9 +1,9 @@
package com.flow.demo.common.online.model;
package com.orangeforms.common.online.model;
import com.baomidou.mybatisplus.annotation.*;
import com.flow.demo.common.core.annotation.RelationOneToMany;
import com.flow.demo.common.core.base.mapper.BaseModelMapper;
import com.flow.demo.common.online.vo.OnlineTableVo;
import com.orangeforms.common.core.annotation.RelationOneToMany;
import com.orangeforms.common.core.base.mapper.BaseModelMapper;
import com.orangeforms.common.online.vo.OnlineTableVo;
import lombok.Data;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;

6
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/model/OnlineVirtualColumn.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/model/OnlineVirtualColumn.java
View File

@@ -1,8 +1,8 @@
package com.flow.demo.common.online.model;
package com.orangeforms.common.online.model;
import com.baomidou.mybatisplus.annotation.*;
import com.flow.demo.common.core.base.mapper.BaseModelMapper;
import com.flow.demo.common.online.vo.OnlineVirtualColumnVo;
import com.orangeforms.common.core.base.mapper.BaseModelMapper;
import com.orangeforms.common.online.vo.OnlineVirtualColumnVo;
import lombok.Data;
import org.mapstruct.*;
import org.mapstruct.factory.Mappers;

2
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/model/constant/DictType.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/model/constant/DictType.java
View File

@@ -1,4 +1,4 @@
package com.flow.demo.common.online.model.constant;
package com.orangeforms.common.online.model.constant;
import java.util.HashMap;
import java.util.Map;

2
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/model/constant/FieldFilterType.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/model/constant/FieldFilterType.java
View File

@@ -1,4 +1,4 @@
package com.flow.demo.common.online.model.constant;
package com.orangeforms.common.online.model.constant;
import java.util.HashMap;
import java.util.Map;

2
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/model/constant/FieldKind.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/model/constant/FieldKind.java
View File

@@ -1,4 +1,4 @@
package com.flow.demo.common.online.model.constant;
package com.orangeforms.common.online.model.constant;
import java.util.HashMap;
import java.util.Map;

2
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/model/constant/FormKind.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/model/constant/FormKind.java
View File

@@ -1,4 +1,4 @@
package com.flow.demo.common.online.model.constant;
package com.orangeforms.common.online.model.constant;
import java.util.HashMap;
import java.util.Map;

2
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/model/constant/FormType.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/model/constant/FormType.java
View File

@@ -1,4 +1,4 @@
package com.flow.demo.common.online.model.constant;
package com.orangeforms.common.online.model.constant;
import java.util.HashMap;
import java.util.Map;

2
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/model/constant/PageStatus.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/model/constant/PageStatus.java
View File

@@ -1,4 +1,4 @@
package com.flow.demo.common.online.model.constant;
package com.orangeforms.common.online.model.constant;
import java.util.HashMap;
import java.util.Map;

2
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/model/constant/PageType.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/model/constant/PageType.java
View File

@@ -1,4 +1,4 @@
package com.flow.demo.common.online.model.constant;
package com.orangeforms.common.online.model.constant;
import java.util.HashMap;
import java.util.Map;

2
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/model/constant/RelationType.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/model/constant/RelationType.java
View File

@@ -1,4 +1,4 @@
package com.flow.demo.common.online.model.constant;
package com.orangeforms.common.online.model.constant;
import java.util.HashMap;
import java.util.Map;

2
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/model/constant/RuleType.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/model/constant/RuleType.java
View File

@@ -1,4 +1,4 @@
package com.flow.demo.common.online.model.constant;
package com.orangeforms.common.online.model.constant;
import java.util.HashMap;
import java.util.Map;

2
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/model/constant/VirtualType.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/model/constant/VirtualType.java
View File

@@ -1,4 +1,4 @@
package com.flow.demo.common.online.model.constant;
package com.orangeforms.common.online.model.constant;
import java.util.HashMap;
import java.util.Map;

4
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/object/ColumnData.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/object/ColumnData.java
View File

@@ -1,6 +1,6 @@
package com.flow.demo.common.online.object;
package com.orangeforms.common.online.object;
import com.flow.demo.common.online.model.OnlineColumn;
import com.orangeforms.common.online.model.OnlineColumn;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

2
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/object/JoinTableInfo.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/object/JoinTableInfo.java
View File

@@ -1,4 +1,4 @@
package com.flow.demo.common.online.object;
package com.orangeforms.common.online.object;
import lombok.Data;

2
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/object/SqlTable.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/object/SqlTable.java
View File

@@ -1,4 +1,4 @@
package com.flow.demo.common.online.object;
package com.orangeforms.common.online.object;
import lombok.Data;

2
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/object/SqlTableColumn.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/object/SqlTableColumn.java
View File

@@ -1,4 +1,4 @@
package com.flow.demo.common.online.object;
package com.orangeforms.common.online.object;
import lombok.Data;

21
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/service/OnlineColumnService.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/service/OnlineColumnService.java
View File

@@ -1,10 +1,10 @@
package com.flow.demo.common.online.service;
package com.orangeforms.common.online.service;
import com.flow.demo.common.core.base.service.IBaseService;
import com.flow.demo.common.core.object.CallResult;
import com.flow.demo.common.online.model.OnlineColumn;
import com.flow.demo.common.online.model.OnlineColumnRule;
import com.flow.demo.common.online.object.SqlTableColumn;
import com.orangeforms.common.core.base.service.IBaseService;
import com.orangeforms.common.core.object.CallResult;
import com.orangeforms.common.online.model.OnlineColumn;
import com.orangeforms.common.online.model.OnlineColumnRule;
import com.orangeforms.common.online.object.SqlTableColumn;
import java.util.List;
import java.util.Set;
@@ -138,13 +138,4 @@ public interface OnlineColumnService extends IBaseService<OnlineColumn, Long> {
* @return 查询出的字段对象。
*/
OnlineColumn getOnlineColumnByTableIdAndColumnName(Long tableId, String columnName);
/**
* 根据最新对象和原有对象的数据对比，判断关联的字典数据和多对一主表数据是否都是合法数据。
*
* @param onlineColumn 最新数据对象。
* @param originalOnlineColumn 原有数据对象。
* @return 数据全部正确返回true，否则false。
*/
CallResult verifyRelatedData(OnlineColumn onlineColumn, OnlineColumn originalOnlineColumn);
}

21
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/service/OnlineDatasourceRelationService.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/service/OnlineDatasourceRelationService.java
View File

@@ -1,10 +1,10 @@
package com.flow.demo.common.online.service;
package com.orangeforms.common.online.service;
import com.flow.demo.common.core.base.service.IBaseService;
import com.flow.demo.common.core.object.CallResult;
import com.flow.demo.common.online.model.OnlineDatasourceRelation;
import com.flow.demo.common.online.object.SqlTable;
import com.flow.demo.common.online.object.SqlTableColumn;
import com.orangeforms.common.core.base.service.IBaseService;
import com.orangeforms.common.core.object.CallResult;
import com.orangeforms.common.online.model.OnlineDatasourceRelation;
import com.orangeforms.common.online.object.SqlTable;
import com.orangeforms.common.online.object.SqlTableColumn;
import java.util.List;
import java.util.Set;
@@ -85,13 +85,4 @@ public interface OnlineDatasourceRelationService extends IBaseService<OnlineData
*/
List<OnlineDatasourceRelation> getOnlineDatasourceRelationListWithRelation(
OnlineDatasourceRelation filter, String orderBy);
/**
* 根据最新对象和原有对象的数据对比，判断关联的字典数据和多对一主表数据是否都是合法数据。
*
* @param relation 最新数据对象。
* @param originalRelation 原有数据对象。
* @return 数据全部正确返回true，否则false。
*/
CallResult verifyRelatedData(OnlineDatasourceRelation relation, OnlineDatasourceRelation originalRelation);
}

10
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/service/OnlineDatasourceService.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/service/OnlineDatasourceService.java
View File

@@ -1,9 +1,9 @@
package com.flow.demo.common.online.service;
package com.orangeforms.common.online.service;
import com.flow.demo.common.core.base.service.IBaseService;
import com.flow.demo.common.online.model.OnlineDatasource;
import com.flow.demo.common.online.model.OnlineDatasourceTable;
import com.flow.demo.common.online.object.SqlTable;
import com.orangeforms.common.core.base.service.IBaseService;
import com.orangeforms.common.online.model.OnlineDatasource;
import com.orangeforms.common.online.model.OnlineDatasourceTable;
import com.orangeforms.common.online.object.SqlTable;
import java.util.List;
import java.util.Set;

10
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/service/OnlineDblinkService.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/service/OnlineDblinkService.java
View File

@@ -1,9 +1,9 @@
package com.flow.demo.common.online.service;
package com.orangeforms.common.online.service;
import com.flow.demo.common.core.base.service.IBaseService;
import com.flow.demo.common.online.model.OnlineDblink;
import com.flow.demo.common.online.object.SqlTable;
import com.flow.demo.common.online.object.SqlTableColumn;
import com.orangeforms.common.core.base.service.IBaseService;
import com.orangeforms.common.online.model.OnlineDblink;
import com.orangeforms.common.online.object.SqlTable;
import com.orangeforms.common.online.object.SqlTableColumn;
import java.util.List;

17
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/service/OnlineDictService.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/service/OnlineDictService.java
View File

@@ -1,8 +1,8 @@
package com.flow.demo.common.online.service;
package com.orangeforms.common.online.service;
import com.flow.demo.common.core.base.service.IBaseService;
import com.flow.demo.common.core.object.CallResult;
import com.flow.demo.common.online.model.OnlineDict;
import com.orangeforms.common.core.base.service.IBaseService;
import com.orangeforms.common.core.object.CallResult;
import com.orangeforms.common.online.model.OnlineDict;
import java.util.List;
import java.util.Set;
@@ -68,13 +68,4 @@ public interface OnlineDictService extends IBaseService<OnlineDict, Long> {
* @return 查询结果集。
*/
List<OnlineDict> getOnlineDictListWithRelation(OnlineDict filter, String orderBy);
/**
* 根据最新对象和原有对象的数据对比，判断关联的字典数据和多对一主表数据是否都是合法数据。
*
* @param onlineDict 最新数据对象。
* @param originalOnlineDict 原有数据对象。
* @return 数据全部正确返回true，否则false。
*/
CallResult verifyRelatedData(OnlineDict onlineDict, OnlineDict originalOnlineDict);
}

19
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/service/OnlineFormService.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/service/OnlineFormService.java
View File

@@ -1,9 +1,9 @@
package com.flow.demo.common.online.service;
package com.orangeforms.common.online.service;
import com.flow.demo.common.core.base.service.IBaseService;
import com.flow.demo.common.core.object.CallResult;
import com.flow.demo.common.online.model.OnlineForm;
import com.flow.demo.common.online.model.OnlineFormDatasource;
import com.orangeforms.common.core.base.service.IBaseService;
import com.orangeforms.common.core.object.CallResult;
import com.orangeforms.common.online.model.OnlineForm;
import com.orangeforms.common.online.model.OnlineFormDatasource;
import java.util.List;
import java.util.Set;
@@ -103,13 +103,4 @@ public interface OnlineFormService extends IBaseService<OnlineForm, Long> {
* @return 在线表单集合。
*/
List<OnlineForm> getOnlineFormListByPageIds(Set<Long> pageIdSet);
/**
* 根据最新对象和原有对象的数据对比，判断关联的字典数据和多对一主表数据是否都是合法数据。
*
* @param onlineForm 最新数据对象。
* @param originalOnlineForm 原有数据对象。
* @return 数据全部正确返回true，否则false。
*/
CallResult verifyRelatedData(OnlineForm onlineForm, OnlineForm originalOnlineForm);
}

14
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/service/OnlineOperationService.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/service/OnlineOperationService.java
View File

@@ -1,11 +1,11 @@
package com.flow.demo.common.online.service;
package com.orangeforms.common.online.service;
import com.flow.demo.common.online.dto.OnlineFilterDto;
import com.flow.demo.common.online.model.OnlineColumn;
import com.flow.demo.common.online.model.OnlineDatasourceRelation;
import com.flow.demo.common.online.model.OnlineDict;
import com.flow.demo.common.online.model.OnlineTable;
import com.flow.demo.common.online.object.ColumnData;
import com.orangeforms.common.online.dto.OnlineFilterDto;
import com.orangeforms.common.online.model.OnlineColumn;
import com.orangeforms.common.online.model.OnlineDatasourceRelation;
import com.orangeforms.common.online.model.OnlineDict;
import com.orangeforms.common.online.model.OnlineTable;
import com.orangeforms.common.online.object.ColumnData;
import java.util.List;
import java.util.Map;

8
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/service/OnlinePageService.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/service/OnlinePageService.java
View File

@@ -1,8 +1,8 @@
package com.flow.demo.common.online.service;
package com.orangeforms.common.online.service;
import com.flow.demo.common.core.base.service.IBaseService;
import com.flow.demo.common.online.model.OnlinePage;
import com.flow.demo.common.online.model.OnlinePageDatasource;
import com.orangeforms.common.core.base.service.IBaseService;
import com.orangeforms.common.online.model.OnlinePage;
import com.orangeforms.common.online.model.OnlinePageDatasource;
import java.util.List;

8
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/service/OnlineRuleService.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/service/OnlineRuleService.java
View File

@@ -1,8 +1,8 @@
package com.flow.demo.common.online.service;
package com.orangeforms.common.online.service;
import com.flow.demo.common.core.base.service.IBaseService;
import com.flow.demo.common.online.model.OnlineColumnRule;
import com.flow.demo.common.online.model.OnlineRule;
import com.orangeforms.common.core.base.service.IBaseService;
import com.orangeforms.common.online.model.OnlineColumnRule;
import com.orangeforms.common.online.model.OnlineRule;
import java.util.List;
import java.util.Set;

8
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/service/OnlineTableService.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/service/OnlineTableService.java
View File

@@ -1,8 +1,8 @@
package com.flow.demo.common.online.service;
package com.orangeforms.common.online.service;
import com.flow.demo.common.core.base.service.IBaseService;
import com.flow.demo.common.online.model.OnlineTable;
import com.flow.demo.common.online.object.SqlTable;
import com.orangeforms.common.core.base.service.IBaseService;
import com.orangeforms.common.online.model.OnlineTable;
import com.orangeforms.common.online.object.SqlTable;
import java.util.List;
import java.util.Set;

17
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/service/OnlineVirtualColumnService.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/service/OnlineVirtualColumnService.java
View File

@@ -1,8 +1,8 @@
package com.flow.demo.common.online.service;
package com.orangeforms.common.online.service;
import com.flow.demo.common.core.base.service.IBaseService;
import com.flow.demo.common.core.object.CallResult;
import com.flow.demo.common.online.model.OnlineVirtualColumn;
import com.orangeforms.common.core.base.service.IBaseService;
import com.orangeforms.common.core.object.CallResult;
import com.orangeforms.common.online.model.OnlineVirtualColumn;
import java.util.*;
@@ -66,13 +66,4 @@ public interface OnlineVirtualColumnService extends IBaseService<OnlineVirtualCo
* @return 关联的虚拟字段数据列表。
*/
List<OnlineVirtualColumn> getOnlineVirtualColumnListByTableIds(Set<Long> tableIdSet);
/**
* 根据最新对象和原有对象的数据对比，判断关联的字典数据和多对一主表数据是否都是合法数据。
*
* @param virtualColumn 最新数据对象。
* @param originalVirtualColumn 原有数据对象。
* @return 数据全部正确返回true，否则false。
*/
CallResult verifyRelatedData(OnlineVirtualColumn virtualColumn, OnlineVirtualColumn originalVirtualColumn);
}

31
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/service/impl/OnlineColumnServiceImpl.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/service/impl/OnlineColumnServiceImpl.java
View File

@@ -1,23 +1,23 @@
package com.flow.demo.common.online.service.impl;
package com.orangeforms.common.online.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.flow.demo.common.core.base.dao.BaseDaoMapper;
import com.flow.demo.common.core.base.service.BaseService;
import com.flow.demo.common.core.object.CallResult;
import com.flow.demo.common.core.object.MyRelationParam;
import com.flow.demo.common.core.util.RedisKeyUtil;
import com.flow.demo.common.sequence.wrapper.IdGeneratorWrapper;
import com.flow.demo.common.online.dao.OnlineColumnMapper;
import com.flow.demo.common.online.dao.OnlineColumnRuleMapper;
import com.flow.demo.common.online.model.OnlineColumn;
import com.flow.demo.common.online.model.OnlineColumnRule;
import com.flow.demo.common.online.model.constant.FieldFilterType;
import com.flow.demo.common.online.object.SqlTableColumn;
import com.flow.demo.common.online.service.OnlineColumnService;
import com.flow.demo.common.online.service.OnlineTableService;
import com.orangeforms.common.core.base.dao.BaseDaoMapper;
import com.orangeforms.common.core.base.service.BaseService;
import com.orangeforms.common.core.object.CallResult;
import com.orangeforms.common.core.object.MyRelationParam;
import com.orangeforms.common.core.util.RedisKeyUtil;
import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper;
import com.orangeforms.common.online.dao.OnlineColumnMapper;
import com.orangeforms.common.online.dao.OnlineColumnRuleMapper;
import com.orangeforms.common.online.model.OnlineColumn;
import com.orangeforms.common.online.model.OnlineColumnRule;
import com.orangeforms.common.online.model.constant.FieldFilterType;
import com.orangeforms.common.online.object.SqlTableColumn;
import com.orangeforms.common.online.service.OnlineColumnService;
import com.orangeforms.common.online.service.OnlineTableService;
import com.github.pagehelper.Page;
import com.google.common.base.CaseFormat;
import lombok.extern.slf4j.Slf4j;
@@ -76,6 +76,7 @@ public class OnlineColumnServiceImpl extends BaseService<OnlineColumn, Long> imp
if (CollUtil.isEmpty(columnList)) {
return onlineColumnList;
}
this.evictTableCache(onlineTableId);
for (SqlTableColumn column : columnList) {
OnlineColumn onlineColumn = new OnlineColumn();
BeanUtil.copyProperties(column, onlineColumn, false);

36
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/service/impl/OnlineDatasourceRelationServiceImpl.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/service/impl/OnlineDatasourceRelationServiceImpl.java
View File

@@ -1,24 +1,24 @@
package com.flow.demo.common.online.service.impl;
package com.orangeforms.common.online.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.flow.demo.common.core.base.dao.BaseDaoMapper;
import com.flow.demo.common.core.base.service.BaseService;
import com.flow.demo.common.core.object.CallResult;
import com.flow.demo.common.core.object.MyRelationParam;
import com.flow.demo.common.sequence.wrapper.IdGeneratorWrapper;
import com.flow.demo.common.online.dao.OnlineDatasourceRelationMapper;
import com.flow.demo.common.online.dao.OnlineDatasourceTableMapper;
import com.flow.demo.common.online.model.OnlineColumn;
import com.flow.demo.common.online.model.OnlineDatasourceRelation;
import com.flow.demo.common.online.model.OnlineDatasourceTable;
import com.flow.demo.common.online.model.OnlineTable;
import com.flow.demo.common.online.object.SqlTable;
import com.flow.demo.common.online.object.SqlTableColumn;
import com.flow.demo.common.online.service.OnlineColumnService;
import com.flow.demo.common.online.service.OnlineDatasourceRelationService;
import com.flow.demo.common.online.service.OnlineDatasourceService;
import com.flow.demo.common.online.service.OnlineTableService;
import com.orangeforms.common.core.base.dao.BaseDaoMapper;
import com.orangeforms.common.core.base.service.BaseService;
import com.orangeforms.common.core.object.CallResult;
import com.orangeforms.common.core.object.MyRelationParam;
import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper;
import com.orangeforms.common.online.dao.OnlineDatasourceRelationMapper;
import com.orangeforms.common.online.dao.OnlineDatasourceTableMapper;
import com.orangeforms.common.online.model.OnlineColumn;
import com.orangeforms.common.online.model.OnlineDatasourceRelation;
import com.orangeforms.common.online.model.OnlineDatasourceTable;
import com.orangeforms.common.online.model.OnlineTable;
import com.orangeforms.common.online.object.SqlTable;
import com.orangeforms.common.online.object.SqlTableColumn;
import com.orangeforms.common.online.service.OnlineColumnService;
import com.orangeforms.common.online.service.OnlineDatasourceRelationService;
import com.orangeforms.common.online.service.OnlineDatasourceService;
import com.orangeforms.common.online.service.OnlineTableService;
import com.github.pagehelper.Page;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

32
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/service/impl/OnlineDatasourceServiceImpl.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/service/impl/OnlineDatasourceServiceImpl.java
View File

@@ -1,22 +1,22 @@
package com.flow.demo.common.online.service.impl;
package com.orangeforms.common.online.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.flow.demo.common.core.base.dao.BaseDaoMapper;
import com.flow.demo.common.core.base.service.BaseService;
import com.flow.demo.common.core.object.MyRelationParam;
import com.flow.demo.common.sequence.wrapper.IdGeneratorWrapper;
import com.flow.demo.common.online.dao.OnlineDatasourceMapper;
import com.flow.demo.common.online.dao.OnlineDatasourceTableMapper;
import com.flow.demo.common.online.dao.OnlinePageDatasourceMapper;
import com.flow.demo.common.online.model.OnlineDatasource;
import com.flow.demo.common.online.model.OnlineDatasourceTable;
import com.flow.demo.common.online.model.OnlinePageDatasource;
import com.flow.demo.common.online.model.OnlineTable;
import com.flow.demo.common.online.object.SqlTable;
import com.flow.demo.common.online.service.OnlineDatasourceRelationService;
import com.flow.demo.common.online.service.OnlineDatasourceService;
import com.flow.demo.common.online.service.OnlineTableService;
import com.orangeforms.common.core.base.dao.BaseDaoMapper;
import com.orangeforms.common.core.base.service.BaseService;
import com.orangeforms.common.core.object.MyRelationParam;
import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper;
import com.orangeforms.common.online.dao.OnlineDatasourceMapper;
import com.orangeforms.common.online.dao.OnlineDatasourceTableMapper;
import com.orangeforms.common.online.dao.OnlinePageDatasourceMapper;
import com.orangeforms.common.online.model.OnlineDatasource;
import com.orangeforms.common.online.model.OnlineDatasourceTable;
import com.orangeforms.common.online.model.OnlinePageDatasource;
import com.orangeforms.common.online.model.OnlineTable;
import com.orangeforms.common.online.object.SqlTable;
import com.orangeforms.common.online.service.OnlineDatasourceRelationService;
import com.orangeforms.common.online.service.OnlineDatasourceService;
import com.orangeforms.common.online.service.OnlineTableService;
import com.github.pagehelper.Page;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

24
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/service/impl/OnlineDblinkServiceImpl.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/service/impl/OnlineDblinkServiceImpl.java
View File

@@ -1,17 +1,17 @@
package com.flow.demo.common.online.service.impl;
package com.orangeforms.common.online.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.flow.demo.common.core.base.dao.BaseDaoMapper;
import com.flow.demo.common.core.base.service.BaseService;
import com.flow.demo.common.core.config.DataSourceContextHolder;
import com.flow.demo.common.core.object.MyRelationParam;
import com.flow.demo.common.sequence.wrapper.IdGeneratorWrapper;
import com.flow.demo.common.online.config.OnlineProperties;
import com.flow.demo.common.online.dao.OnlineDblinkMapper;
import com.flow.demo.common.online.model.OnlineDblink;
import com.flow.demo.common.online.object.SqlTable;
import com.flow.demo.common.online.object.SqlTableColumn;
import com.flow.demo.common.online.service.OnlineDblinkService;
import com.orangeforms.common.core.base.dao.BaseDaoMapper;
import com.orangeforms.common.core.base.service.BaseService;
import com.orangeforms.common.core.config.DataSourceContextHolder;
import com.orangeforms.common.core.object.MyRelationParam;
import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper;
import com.orangeforms.common.online.config.OnlineProperties;
import com.orangeforms.common.online.dao.OnlineDblinkMapper;
import com.orangeforms.common.online.model.OnlineDblink;
import com.orangeforms.common.online.object.SqlTable;
import com.orangeforms.common.online.object.SqlTableColumn;
import com.orangeforms.common.online.service.OnlineDblinkService;
import com.github.pagehelper.Page;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

20
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/service/impl/OnlineDictServiceImpl.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/service/impl/OnlineDictServiceImpl.java
View File

@@ -1,15 +1,15 @@
package com.flow.demo.common.online.service.impl;
package com.orangeforms.common.online.service.impl;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.flow.demo.common.core.base.dao.BaseDaoMapper;
import com.flow.demo.common.core.base.service.BaseService;
import com.flow.demo.common.core.object.CallResult;
import com.flow.demo.common.core.object.MyRelationParam;
import com.flow.demo.common.sequence.wrapper.IdGeneratorWrapper;
import com.flow.demo.common.online.dao.OnlineDictMapper;
import com.flow.demo.common.online.model.OnlineDict;
import com.flow.demo.common.online.service.OnlineDblinkService;
import com.flow.demo.common.online.service.OnlineDictService;
import com.orangeforms.common.core.base.dao.BaseDaoMapper;
import com.orangeforms.common.core.base.service.BaseService;
import com.orangeforms.common.core.object.CallResult;
import com.orangeforms.common.core.object.MyRelationParam;
import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper;
import com.orangeforms.common.online.dao.OnlineDictMapper;
import com.orangeforms.common.online.model.OnlineDict;
import com.orangeforms.common.online.service.OnlineDblinkService;
import com.orangeforms.common.online.service.OnlineDictService;
import com.github.pagehelper.Page;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

26
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/service/impl/OnlineFormServiceImpl.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/service/impl/OnlineFormServiceImpl.java
View File

@@ -1,21 +1,21 @@
package com.flow.demo.common.online.service.impl;
package com.orangeforms.common.online.service.impl;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.flow.demo.common.core.base.dao.BaseDaoMapper;
import com.flow.demo.common.core.base.service.BaseService;
import com.flow.demo.common.core.object.CallResult;
import com.flow.demo.common.core.object.MyRelationParam;
import com.flow.demo.common.sequence.wrapper.IdGeneratorWrapper;
import com.flow.demo.common.online.dao.OnlineFormDatasourceMapper;
import com.flow.demo.common.online.dao.OnlineFormMapper;
import com.flow.demo.common.online.model.OnlineForm;
import com.flow.demo.common.online.model.OnlineFormDatasource;
import com.flow.demo.common.online.service.OnlineFormService;
import com.flow.demo.common.online.service.OnlinePageService;
import com.flow.demo.common.online.service.OnlineTableService;
import com.orangeforms.common.core.base.dao.BaseDaoMapper;
import com.orangeforms.common.core.base.service.BaseService;
import com.orangeforms.common.core.object.CallResult;
import com.orangeforms.common.core.object.MyRelationParam;
import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper;
import com.orangeforms.common.online.dao.OnlineFormDatasourceMapper;
import com.orangeforms.common.online.dao.OnlineFormMapper;
import com.orangeforms.common.online.model.OnlineForm;
import com.orangeforms.common.online.model.OnlineFormDatasource;
import com.orangeforms.common.online.service.OnlineFormService;
import com.orangeforms.common.online.service.OnlinePageService;
import com.orangeforms.common.online.service.OnlineTableService;
import com.github.pagehelper.Page;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

54
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/service/impl/OnlineOperationServiceImpl.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/service/impl/OnlineOperationServiceImpl.java
View File

@@ -1,4 +1,4 @@
package com.flow.demo.common.online.service.impl;
package com.orangeforms.common.online.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
@@ -6,29 +6,29 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.core.map.MapUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.flow.demo.common.core.annotation.MyDataSourceResolver;
import com.flow.demo.common.core.constant.AggregationType;
import com.flow.demo.common.core.exception.NoDataPermException;
import com.flow.demo.common.core.constant.GlobalDeletedFlag;
import com.flow.demo.common.core.object.MyWhereCriteria;
import com.flow.demo.common.core.object.TokenData;
import com.flow.demo.common.core.object.Tuple2;
import com.flow.demo.common.core.util.RedisKeyUtil;
import com.flow.demo.common.datafilter.constant.DataPermRuleType;
import com.flow.demo.common.datafilter.config.DataFilterProperties;
import com.flow.demo.common.online.model.constant.*;
import com.flow.demo.common.online.service.OnlineVirtualColumnService;
import com.flow.demo.common.online.util.OnlineOperationHelper;
import com.flow.demo.common.sequence.wrapper.IdGeneratorWrapper;
import com.flow.demo.common.online.util.OnlineDataSourceResolver;
import com.flow.demo.common.online.util.OnlineConstant;
import com.flow.demo.common.online.dao.OnlineOperationMapper;
import com.flow.demo.common.online.dto.OnlineFilterDto;
import com.flow.demo.common.online.model.*;
import com.flow.demo.common.online.object.ColumnData;
import com.flow.demo.common.online.object.JoinTableInfo;
import com.flow.demo.common.online.service.OnlineDictService;
import com.flow.demo.common.online.service.OnlineOperationService;
import com.orangeforms.common.core.annotation.MyDataSourceResolver;
import com.orangeforms.common.core.constant.AggregationType;
import com.orangeforms.common.core.exception.NoDataPermException;
import com.orangeforms.common.core.constant.GlobalDeletedFlag;
import com.orangeforms.common.core.object.MyWhereCriteria;
import com.orangeforms.common.core.object.TokenData;
import com.orangeforms.common.core.object.Tuple2;
import com.orangeforms.common.core.util.RedisKeyUtil;
import com.orangeforms.common.datafilter.constant.DataPermRuleType;
import com.orangeforms.common.datafilter.config.DataFilterProperties;
import com.orangeforms.common.online.model.constant.*;
import com.orangeforms.common.online.service.OnlineVirtualColumnService;
import com.orangeforms.common.online.util.OnlineOperationHelper;
import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper;
import com.orangeforms.common.online.util.OnlineDataSourceResolver;
import com.orangeforms.common.online.util.OnlineConstant;
import com.orangeforms.common.online.dao.OnlineOperationMapper;
import com.orangeforms.common.online.dto.OnlineFilterDto;
import com.orangeforms.common.online.model.*;
import com.orangeforms.common.online.object.ColumnData;
import com.orangeforms.common.online.object.JoinTableInfo;
import com.orangeforms.common.online.service.OnlineDictService;
import com.orangeforms.common.online.service.OnlineOperationService;
import com.google.common.collect.LinkedHashMultimap;
import com.google.common.collect.Multimap;
import lombok.Data;
@@ -73,12 +73,12 @@ public class OnlineOperationServiceImpl implements OnlineOperationService {
* 聚合返回数据中，聚合键的常量字段名。
* 如select groupColumn groupedKey, max(aggregationColumn) aggregatedValue。
*/
public static final String KEY_NAME = "groupedKey";
private static final String KEY_NAME = "groupedKey";
/**
* 聚合返回数据中，聚合值的常量字段名。
* 如select groupColumn groupedKey, max(aggregationColumn) aggregatedValue。
*/
public static final String VALUE_NAME = "aggregatedValue";
private static final String VALUE_NAME = "aggregatedValue";
@Transactional(rollbackFor = Exception.class)
@Override
@@ -964,7 +964,7 @@ public class OnlineOperationServiceImpl implements OnlineOperationService {
}
@Data
static class VirtualColumnWhereClause {
private static class VirtualColumnWhereClause {
private Long tableId;
private Long columnId;
private Integer operatorType;

28
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/service/impl/OnlinePageServiceImpl.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/service/impl/OnlinePageServiceImpl.java
View File

@@ -1,21 +1,21 @@
package com.flow.demo.common.online.service.impl;
package com.orangeforms.common.online.service.impl;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.flow.demo.common.core.base.dao.BaseDaoMapper;
import com.flow.demo.common.core.base.service.BaseService;
import com.flow.demo.common.core.object.MyRelationParam;
import com.flow.demo.common.core.util.MyModelUtil;
import com.flow.demo.common.online.service.OnlineDatasourceService;
import com.flow.demo.common.sequence.wrapper.IdGeneratorWrapper;
import com.flow.demo.common.online.dao.OnlinePageDatasourceMapper;
import com.flow.demo.common.online.dao.OnlinePageMapper;
import com.flow.demo.common.online.model.OnlinePage;
import com.flow.demo.common.online.model.OnlinePageDatasource;
import com.flow.demo.common.online.model.constant.PageStatus;
import com.flow.demo.common.online.service.OnlineFormService;
import com.flow.demo.common.online.service.OnlinePageService;
import com.orangeforms.common.core.base.dao.BaseDaoMapper;
import com.orangeforms.common.core.base.service.BaseService;
import com.orangeforms.common.core.object.MyRelationParam;
import com.orangeforms.common.core.util.MyModelUtil;
import com.orangeforms.common.online.service.OnlineDatasourceService;
import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper;
import com.orangeforms.common.online.dao.OnlinePageDatasourceMapper;
import com.orangeforms.common.online.dao.OnlinePageMapper;
import com.orangeforms.common.online.model.OnlinePage;
import com.orangeforms.common.online.model.OnlinePageDatasource;
import com.orangeforms.common.online.model.constant.PageStatus;
import com.orangeforms.common.online.service.OnlineFormService;
import com.orangeforms.common.online.service.OnlinePageService;
import com.github.pagehelper.Page;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

24
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/service/impl/OnlineRuleServiceImpl.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/service/impl/OnlineRuleServiceImpl.java
View File

@@ -1,18 +1,18 @@
package com.flow.demo.common.online.service.impl;
package com.orangeforms.common.online.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.flow.demo.common.core.base.dao.BaseDaoMapper;
import com.flow.demo.common.core.base.service.BaseService;
import com.flow.demo.common.core.constant.GlobalDeletedFlag;
import com.flow.demo.common.core.object.MyRelationParam;
import com.flow.demo.common.core.util.MyModelUtil;
import com.flow.demo.common.sequence.wrapper.IdGeneratorWrapper;
import com.flow.demo.common.online.dao.OnlineColumnRuleMapper;
import com.flow.demo.common.online.dao.OnlineRuleMapper;
import com.flow.demo.common.online.model.OnlineColumnRule;
import com.flow.demo.common.online.model.OnlineRule;
import com.flow.demo.common.online.service.OnlineRuleService;
import com.orangeforms.common.core.base.dao.BaseDaoMapper;
import com.orangeforms.common.core.base.service.BaseService;
import com.orangeforms.common.core.constant.GlobalDeletedFlag;
import com.orangeforms.common.core.object.MyRelationParam;
import com.orangeforms.common.core.util.MyModelUtil;
import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper;
import com.orangeforms.common.online.dao.OnlineColumnRuleMapper;
import com.orangeforms.common.online.dao.OnlineRuleMapper;
import com.orangeforms.common.online.model.OnlineColumnRule;
import com.orangeforms.common.online.model.OnlineRule;
import com.orangeforms.common.online.service.OnlineRuleService;
import com.github.pagehelper.Page;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

26
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/service/impl/OnlineTableServiceImpl.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/service/impl/OnlineTableServiceImpl.java
View File

@@ -1,21 +1,21 @@
package com.flow.demo.common.online.service.impl;
package com.orangeforms.common.online.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.flow.demo.common.core.base.dao.BaseDaoMapper;
import com.flow.demo.common.core.base.service.BaseService;
import com.flow.demo.common.core.object.MyRelationParam;
import com.flow.demo.common.core.util.RedisKeyUtil;
import com.flow.demo.common.sequence.wrapper.IdGeneratorWrapper;
import com.flow.demo.common.online.dao.OnlineTableMapper;
import com.flow.demo.common.online.model.OnlineColumn;
import com.flow.demo.common.online.model.OnlineTable;
import com.flow.demo.common.online.model.constant.FieldKind;
import com.flow.demo.common.online.object.SqlTable;
import com.flow.demo.common.online.service.OnlineColumnService;
import com.flow.demo.common.online.service.OnlineTableService;
import com.orangeforms.common.core.base.dao.BaseDaoMapper;
import com.orangeforms.common.core.base.service.BaseService;
import com.orangeforms.common.core.object.MyRelationParam;
import com.orangeforms.common.core.util.RedisKeyUtil;
import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper;
import com.orangeforms.common.online.dao.OnlineTableMapper;
import com.orangeforms.common.online.model.OnlineColumn;
import com.orangeforms.common.online.model.OnlineTable;
import com.orangeforms.common.online.model.constant.FieldKind;
import com.orangeforms.common.online.object.SqlTable;
import com.orangeforms.common.online.service.OnlineColumnService;
import com.orangeforms.common.online.service.OnlineTableService;
import com.github.pagehelper.Page;
import com.google.common.base.CaseFormat;
import lombok.extern.slf4j.Slf4j;

28
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/service/impl/OnlineVirtualColumnServiceImpl.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/service/impl/OnlineVirtualColumnServiceImpl.java
View File

@@ -1,20 +1,20 @@
package com.flow.demo.common.online.service.impl;
package com.orangeforms.common.online.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.flow.demo.common.core.base.dao.BaseDaoMapper;
import com.flow.demo.common.core.object.CallResult;
import com.flow.demo.common.core.object.MyRelationParam;
import com.flow.demo.common.core.base.service.BaseService;
import com.flow.demo.common.online.dao.OnlineVirtualColumnMapper;
import com.flow.demo.common.online.model.OnlineDatasource;
import com.flow.demo.common.online.model.OnlineVirtualColumn;
import com.flow.demo.common.online.model.constant.VirtualType;
import com.flow.demo.common.online.service.OnlineColumnService;
import com.flow.demo.common.online.service.OnlineDatasourceRelationService;
import com.flow.demo.common.online.service.OnlineDatasourceService;
import com.flow.demo.common.online.service.OnlineVirtualColumnService;
import com.flow.demo.common.sequence.wrapper.IdGeneratorWrapper;
import com.orangeforms.common.core.base.dao.BaseDaoMapper;
import com.orangeforms.common.core.object.CallResult;
import com.orangeforms.common.core.object.MyRelationParam;
import com.orangeforms.common.core.base.service.BaseService;
import com.orangeforms.common.online.dao.OnlineVirtualColumnMapper;
import com.orangeforms.common.online.model.OnlineDatasource;
import com.orangeforms.common.online.model.OnlineVirtualColumn;
import com.orangeforms.common.online.model.constant.VirtualType;
import com.orangeforms.common.online.service.OnlineColumnService;
import com.orangeforms.common.online.service.OnlineDatasourceRelationService;
import com.orangeforms.common.online.service.OnlineDatasourceService;
import com.orangeforms.common.online.service.OnlineVirtualColumnService;
import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper;
import com.github.pagehelper.Page;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;

2
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/util/OnlineConstant.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/util/OnlineConstant.java
View File

@@ -1,4 +1,4 @@
package com.flow.demo.common.online.util;
package com.orangeforms.common.online.util;
/**
* 在线表单使用的常量数据。。

14
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/util/OnlineDataSourceResolver.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/util/OnlineDataSourceResolver.java
View File

@@ -1,11 +1,11 @@
package com.flow.demo.common.online.util;
package com.orangeforms.common.online.util;
import com.flow.demo.common.core.util.DataSourceResolver;
import com.flow.demo.common.online.model.OnlineDatasourceRelation;
import com.flow.demo.common.online.model.OnlineDblink;
import com.flow.demo.common.online.model.OnlineDict;
import com.flow.demo.common.online.model.OnlineTable;
import com.flow.demo.common.online.service.OnlineDblinkService;
import com.orangeforms.common.core.util.DataSourceResolver;
import com.orangeforms.common.online.model.OnlineDatasourceRelation;
import com.orangeforms.common.online.model.OnlineDblink;
import com.orangeforms.common.online.model.OnlineDict;
import com.orangeforms.common.online.model.OnlineTable;
import com.orangeforms.common.online.service.OnlineDblinkService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

41
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/util/OnlineOperationHelper.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/util/OnlineOperationHelper.java
View File

@@ -1,28 +1,28 @@
package com.flow.demo.common.online.util;
package com.orangeforms.common.online.util;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.flow.demo.common.core.constant.ErrorCodeEnum;
import com.flow.demo.common.core.object.ResponseResult;
import com.flow.demo.common.core.upload.BaseUpDownloader;
import com.flow.demo.common.core.upload.UpDownloaderFactory;
import com.flow.demo.common.core.upload.UploadResponseInfo;
import com.flow.demo.common.core.upload.UploadStoreTypeEnum;
import com.flow.demo.common.online.config.OnlineProperties;
import com.flow.demo.common.online.model.OnlineColumn;
import com.flow.demo.common.online.model.OnlineDatasource;
import com.flow.demo.common.online.model.OnlineDatasourceRelation;
import com.flow.demo.common.online.model.OnlineTable;
import com.flow.demo.common.online.model.constant.FieldKind;
import com.flow.demo.common.online.model.constant.RelationType;
import com.flow.demo.common.online.object.ColumnData;
import com.flow.demo.common.online.service.OnlineDatasourceRelationService;
import com.flow.demo.common.online.service.OnlineDatasourceService;
import com.flow.demo.common.online.service.OnlineOperationService;
import com.flow.demo.common.online.service.OnlineTableService;
import com.flow.demo.common.redis.cache.SessionCacheHelper;
import com.orangeforms.common.core.constant.ErrorCodeEnum;
import com.orangeforms.common.core.object.ResponseResult;
import com.orangeforms.common.core.upload.BaseUpDownloader;
import com.orangeforms.common.core.upload.UpDownloaderFactory;
import com.orangeforms.common.core.upload.UploadResponseInfo;
import com.orangeforms.common.core.upload.UploadStoreTypeEnum;
import com.orangeforms.common.online.config.OnlineProperties;
import com.orangeforms.common.online.model.OnlineColumn;
import com.orangeforms.common.online.model.OnlineDatasource;
import com.orangeforms.common.online.model.OnlineDatasourceRelation;
import com.orangeforms.common.online.model.OnlineTable;
import com.orangeforms.common.online.model.constant.FieldKind;
import com.orangeforms.common.online.model.constant.RelationType;
import com.orangeforms.common.online.object.ColumnData;
import com.orangeforms.common.online.service.OnlineDatasourceRelationService;
import com.orangeforms.common.online.service.OnlineDatasourceService;
import com.orangeforms.common.online.service.OnlineOperationService;
import com.orangeforms.common.online.service.OnlineTableService;
import com.orangeforms.common.redis.cache.SessionCacheHelper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -97,6 +97,7 @@ public class OnlineOperationHelper {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
relation.setSlaveTable(slaveTable);
relation.setSlaveColumn(slaveTable.getColumnMap().get(relation.getSlaveColumnId()));
return ResponseResult.success(relation);
}

2
orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/flow/demo/common/online/util/OnlineUtil.java → orange-demo-flowable/orange-demo-flowable-service/common/common-online/src/main/java/com/orangeforms/common/online/util/OnlineUtil.java
View File

@@ -1,4 +1,4 @@
package com.flow.demo.common.online.util;
package com.orangeforms.common.online.util;
/**
* 在线表单的工具类。

Some files were not shown because too many files have changed in this diff Show More