Просмотр исходного кода

自测新增集团及集团方案和更新集团及集团方案接口

lijie 3 лет назад
Родитель
Сommit
c9c21fa629

+ 4 - 1
dmp-dic/src/main/resources/config/config.sql

@@ -33,4 +33,7 @@ INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LA
 INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'persagy.redis.max-idle', '30', 'dmp-dic', 'dev2', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='persagy.redis.max-idle' AND APPLICATION="dmp-dic");
 INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'persagy.redis.min-idle', '10', 'dmp-dic', 'dev2', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='persagy.redis.min-idle' AND APPLICATION="dmp-dic");
 INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'persagy.log.path', '.', 'dmp-dic', 'dev2', 'master', 1, 'DMP', '日志文件所在路径' FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='persagy.log.path' AND APPLICATION="dmp-dic");
-INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'persagy.dmp.dic.queue', 'queue-dmp-dic', 'dmp-dic', 'dev2', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='persagy.dmp.dic.queue' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`) SELECT 'persagy.dmp.dic.queue', 'queue-dmp-dic', 'dmp-dic', 'dev2', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS(SELECT PKEY FROM integrated_config WHERE PKEY='persagy.dmp.dic.queue' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`)  SELECT 'spring.cloud.config.allowOverride', 'true', 'dmp-dic', 'default', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS (SELECT PKEY FROM integrated_config WHERE PKEY='spring.cloud.config.allowOverride' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`)  SELECT 'spring.cloud.config.overrideNone', 'true', 'dmp-dic', 'default', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS (SELECT PKEY FROM integrated_config WHERE PKEY='spring.cloud.config.overrideNone' AND APPLICATION="dmp-dic");
+INSERT INTO `integrated_config`(`PKEY`, `PVALUE`, `APPLICATION`, `PPROFILE`, `LABLE`, `ISUPDATE`, `BELONGTO`, `DESCRIPTION`)  SELECT 'spring.cloud.config.overrideSystemProperties', 'false', 'dmp-dic', 'default', 'master', 1, 'DMP', NULL FROM DUAL WHERE NOT EXISTS (SELECT PKEY FROM integrated_config WHERE PKEY='spring.cloud.config.overrideSystemProperties' AND APPLICATION="dmp-dic");

+ 0 - 4
dmp-rwd/src/main/java/com/persagy/dmp/rwd/service/impl/GroupAndSchemaServiceImpl.java

@@ -1,10 +1,7 @@
 package com.persagy.dmp.rwd.service.impl;
 
 import cn.hutool.core.util.StrUtil;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.persagy.common.criteria.JacksonCriteria;
 import com.persagy.common.web.MapResponse;
-import com.persagy.common.web.PagedResponse;
 import com.persagy.dmp.config.DmpParameterStorage;
 import com.persagy.dmp.rwd.config.JpaSqlExecuteContext;
 import com.persagy.dmp.rwd.config.RwdConstants;
@@ -20,7 +17,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Map;
 @Service
 @Slf4j
 public class GroupAndSchemaServiceImpl extends BaseService implements GroupAndSchemaService {