common-frame/hcframe
17
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

新增select key select Value方法，可编辑基表自动及值

Browse Source
This commit is contained in:
lhc
2021-04-01 09:07:33 +08:00
parent 1e32b137e2
commit 7c37b88f4f
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/entity/OsSysField.java
View File

@@ -75,6 +75,8 @@ public class OsSysField implements Serializable {
private Integer sign;
private Integer logic;
private String fkKey;
private String fkValue;
private List<OsSysSelect> selectList;
}

2
hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/service/impl/TableConfigServiceImpl.java
View File

@@ -235,7 +235,7 @@ public class TableConfigServiceImpl implements TableConfigService {
stringBuilder.append(osSysSelect.getFieldId()).append(",");
}
if (selects.size() > 0) {
List<String> list = osSysFieldDao.getTableAlise(stringBuilder.substring(0,stringBuilder.length()));
List<String> list = osSysFieldDao.getTableAlise(stringBuilder.substring(0,stringBuilder.length()-1));
for (String tableAlise : list) {
tableCache.delete(tableAlise);
}

2
hcframe-parent/hcframe-base/src/main/resources/mapping/tableconfig/OsSysFieldMapper.xml
View File

@@ -17,6 +17,8 @@
<result column="LOGIC" jdbcType="VARCHAR" property="logic" />
<result column="SIGN" jdbcType="VARCHAR" property="sign" />
<result column="IS_SEARCH" jdbcType="VARCHAR" property="isSearch" />
<result column="FK_KEY" jdbcType="VARCHAR" property="fkKey" />
<result column="FK_VALUE" jdbcType="VARCHAR" property="fkValue" />
<collection property="selectList" resultMap="com.hcframe.base.module.tableconfig.dao.OsSysSelectDao.OsSysSelectMap"/>
</resultMap>
<select id="getTableAlise" resultType="java.lang.String">

2
hcframe-parent/hcframe-base/src/main/resources/mapping/tableconfig/OsSysTableMapper.xml
View File

@@ -16,7 +16,7 @@
from OS_SYS_TABLE
left join OS_SYS_FIELD on OS_SYS_TABLE.TABLE_ID = OS_SYS_FIELD.TABLE_ID
left join OS_SYS_SELECT on OS_SYS_FIELD.FIELD_ID = OS_SYS_SELECT.FIELD_ID
where OS_SYS_TABLE.TABLE_ALIAS = #{typeName} order by OS_SYS_FIELD.FIELD_ID
where OS_SYS_TABLE.TABLE_ALIAS = #{typeName} order by OS_SYS_FIELD.FIELD_ID,OS_SYS_SELECT.SELECT_ID
</select>
</mapper>

4
hcframe-parent/hcframe-gateway/src/main/resources/application-prod.yml
View File

@@ -2,10 +2,6 @@ server:
port: 8084
spring:
cloud:
nacos:
discovery:
server-addr: 192.168.1.131:8848
namespace: 2e9f0148-751e-4da2-83ec-cb00ffe0d83a
gateway:
discovery:
locator:

16
hcframe-parent/pom.xml
View File

@@ -204,7 +204,7 @@
<!--当前环境-->
<profile.name>prod</profile.name>
<!--Nacos配置中心地址-->
<config.server-addr>127.0.0.1:8848</config.server-addr>
<config.server-addr>192.168.100.98:8848</config.server-addr>
<!--Nacos配置中心命名空间,用于支持多环境.这里必须使用ID，不能使用名称,默认为空-->
<config.namespace>2e9f0148-751e-4da2-83ec-cb00ffe0d83a</config.namespace>
<!--Nacos配置分组名称-->
@@ -212,21 +212,21 @@
<config.username>dev</config.username>
<config.password>123456</config.password>
<!-- Nacos服务发现地址-->
<discovery.server-addr>127.0.0.1:8848</discovery.server-addr>
<discovery.server-addr>192.168.100.98:8848</discovery.server-addr>
<!-- redis 配置-->
<redis.database>0</redis.database>
<redis.host>192.168.4.119</redis.host>
<redis.host>192.168.100.98</redis.host>
<redis.port>6379</redis.port>
<redis.password/>
<!-- cas配置 -->
<cas.enabled>true</cas.enabled>
<cas.cas-service-url>http://192.168.1.131:8080</cas.cas-service-url>
<cas.client-context-path>/user/cas/valid</cas.client-context-path>
<cas.cas-service-url>http://192.168.100.98:8080</cas.cas-service-url>
<cas.cas-context-path>/cas</cas.cas-context-path>
<cas.white-url>^(.*(/logout?))|(/user/cas/url)$</cas.white-url>
<cas.service-url>http://192.168.1.130:9527</cas.service-url>
<cas.white-url>^.*(/logout?)$</cas.white-url>
<cas.service-url>http://192.168.100.98:8084</cas.service-url>
<cas.cookie-holder-pattern>com.hcframe.gateway.config.MyDataStorage</cas.cookie-holder-pattern>
<cas.login-url>/login</cas.login-url>
<cas.logout-url>/logout</cas.logout-url>
<cas.client-context-path>/user/cas/valid</cas.client-context-path>
</properties>
</profile>
</profiles>