Merge remote-tracking branch 'remotes/origin/dev' into test

yun-zuoyi
曾贞一 6 years ago
commit eb035aeaf6

@ -31,6 +31,10 @@ public class BsSuitCaseParam extends BaseBean {
@ApiParam(value = "套件id")
private long suitCaseId;
@Column(name = "SUIT_CASE_CODE_RDD")
@ApiParam(value = "套件代码")
private String suitCaseCodeRdd;
@Column(name = "PARAM_TYPE_ID")
@ApiParam(value = "参数类型,枚举(出,入)")
private int paramTypeId;

@ -1,7 +1,8 @@
package cn.estsh.i3plus.pojo.softswitch.repository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSource;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSource;
import org.springframework.stereotype.Repository;
/**
* @Description :
@ -9,7 +10,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
* @Author : yunhao
* @CreateDate : 2019-08-13 9:21
* @Modify:
*/
*/
@Repository
public interface BsDataSourceRepository extends BaseRepository<BsDataSource,Long> {
}

@ -1,7 +1,8 @@
package cn.estsh.i3plus.pojo.softswitch.repository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSourceSuitCase;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSourceSuitCase;
import org.springframework.stereotype.Repository;
/**
* @Description :
@ -9,7 +10,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
* @Author : yunhao
* @CreateDate : 2019-08-13 9:21
* @Modify:
*/
*/
@Repository
public interface BsDataSourceSuitCaseRepository extends BaseRepository<BsDataSourceSuitCase,Long> {
}

@ -1,7 +1,8 @@
package cn.estsh.i3plus.pojo.softswitch.repository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSourceSuitCaseTable;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSourceSuitCaseTable;
import org.springframework.stereotype.Repository;
/**
* @Description :
@ -9,7 +10,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
* @Author : yunhao
* @CreateDate : 2019-08-13 9:21
* @Modify:
*/
*/
@Repository
public interface BsDataSourceSuitCaseTableRepository extends BaseRepository<BsDataSourceSuitCaseTable,Long> {
}

@ -1,7 +1,8 @@
package cn.estsh.i3plus.pojo.softswitch.repository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsMessageQueue;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsMessageQueue;
import org.springframework.stereotype.Repository;
/**
* @Description : MQ
@ -9,7 +10,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
* @Author : yunhao
* @CreateDate : 2019-08-13 9:21
* @Modify:
*/
*/
@Repository
public interface BsMessageQueueRepository extends BaseRepository<BsMessageQueue,Long> {
}

@ -1,7 +1,9 @@
package cn.estsh.i3plus.pojo.softswitch.repository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsParamAdapter;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsParamAdapter;
import org.springframework.stereotype.Repository;
/**
* @Description :
@ -9,7 +11,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
* @Author : yunhao
* @CreateDate : 2019-08-13 9:21
* @Modify:
*/
*/
@Repository
public interface BsParamAdapterRepository extends BaseRepository<BsParamAdapter,Long> {
}

@ -1,7 +1,8 @@
package cn.estsh.i3plus.pojo.softswitch.repository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSocketSuitCase;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSocketSuitCase;
import org.springframework.stereotype.Repository;
/**
* @Description : socket
@ -9,7 +10,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
* @Author : yunhao
* @CreateDate : 2019-08-13 9:21
* @Modify:
*/
*/
@Repository
public interface BsSocketSuitCaseRepository extends BaseRepository<BsSocketSuitCase,Long> {
}

@ -1,7 +1,8 @@
package cn.estsh.i3plus.pojo.softswitch.repository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKey;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKey;
import org.springframework.stereotype.Repository;
/**
* @Description :
@ -9,7 +10,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
* @Author : yunhao
* @CreateDate : 2019-08-13 9:21
* @Modify:
*/
*/
@Repository
public interface BsSslKeyRepository extends BaseRepository<BsSslKey,Long> {
}

@ -1,7 +1,8 @@
package cn.estsh.i3plus.pojo.softswitch.repository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam;
import org.springframework.stereotype.Repository;
/**
* @Description :
@ -9,7 +10,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
* @Author : yunhao
* @CreateDate : 2019-08-13 9:21
* @Modify:
*/
*/
@Repository
public interface BsSuitCaseParamRepository extends BaseRepository<BsSuitCaseParam,Long> {
}

@ -1,7 +1,8 @@
package cn.estsh.i3plus.pojo.softswitch.repository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase;
import org.springframework.stereotype.Repository;
/**
* @Description :
@ -9,7 +10,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
* @Author : yunhao
* @CreateDate : 2019-08-13 9:21
* @Modify:
*/
*/
@Repository
public interface BsSuitCaseRepository extends BaseRepository<BsSuitCase,Long> {
}

@ -1,7 +1,8 @@
package cn.estsh.i3plus.pojo.softswitch.repository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitDataDetail;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitDataDetail;
import org.springframework.stereotype.Repository;
/**
* @Description :
@ -9,7 +10,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
* @Author : yunhao
* @CreateDate : 2019-08-13 9:21
* @Modify:
*/
*/
@Repository
public interface BsSuitDataDetailRepository extends BaseRepository<BsSuitDataDetail,Long> {
}

@ -1,7 +1,8 @@
package cn.estsh.i3plus.pojo.softswitch.repository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord;
import org.springframework.stereotype.Repository;
/**
* @Description :
@ -9,7 +10,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
* @Author : yunhao
* @CreateDate : 2019-08-13 9:21
* @Modify:
*/
*/
@Repository
public interface BsSuitRecordRepository extends BaseRepository<BsSuitRecord,Long> {
}

@ -1,7 +1,8 @@
package cn.estsh.i3plus.pojo.softswitch.repository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRequestRecord;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRequestRecord;
import org.springframework.stereotype.Repository;
/**
* @Description :
@ -9,7 +10,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
* @Author : yunhao
* @CreateDate : 2019-08-13 9:21
* @Modify:
*/
*/
@Repository
public interface BsSuitRequestRecordRepository extends BaseRepository<BsSuitRequestRecord,Long> {
}

@ -1,7 +1,8 @@
package cn.estsh.i3plus.pojo.softswitch.repository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitSchedule;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitSchedule;
import org.springframework.stereotype.Repository;
/**
* @Description :
@ -9,7 +10,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
* @Author : yunhao
* @CreateDate : 2019-08-13 9:21
* @Modify:
*/
*/
@Repository
public interface BsSuitScheduleRepository extends BaseRepository<BsSuitSchedule,Long> {
}

@ -1,7 +1,8 @@
package cn.estsh.i3plus.pojo.softswitch.repository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitType;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitType;
import org.springframework.stereotype.Repository;
/**
* @Description :
@ -9,7 +10,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
* @Author : yunhao
* @CreateDate : 2019-08-13 9:21
* @Modify:
*/
*/
@Repository
public interface BsSuitTypeRepository extends BaseRepository<BsSuitType,Long> {
}

@ -1,7 +1,8 @@
package cn.estsh.i3plus.pojo.softswitch.repository;
import cn.estsh.i3plus.pojo.softswitch.bean.SuitRecordParam;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.softswitch.bean.SuitRecordParam;
import org.springframework.stereotype.Repository;
/**
* @Description :
@ -9,7 +10,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
* @Author : yunhao
* @CreateDate : 2019-08-13 9:21
* @Modify:
*/
*/
@Repository
public interface SuitRecordParamRepository extends BaseRepository<SuitRecordParam,Long> {
}

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.softswitch.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.softswitch.bean.TestDataBase;
import org.springframework.stereotype.Repository;
/**
* @Description :
@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.softswitch.bean.TestDataBase;
* @CreateDate : 2019-02-28 15:48
* @Modify:
**/
@Repository
public interface TestDataBaseRepository extends BaseRepository<TestDataBase,Long> {
}

@ -1,6 +1,9 @@
package cn.estsh.i3plus.pojo.softswitch.sqlpack;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam;
import cn.estsh.i3plus.pojo.softswitch.bean.TestDataBase;
import org.apache.commons.lang3.StringUtils;
@ -13,7 +16,6 @@ import org.apache.commons.lang3.StringUtils;
**/
public class SoftSwitchHqlPack {
/**
* In
* @param columnName
@ -41,4 +43,20 @@ public class SoftSwitchHqlPack {
return result.toString();
}
/**
*
* @param bsSuitCaseParam
* @return
*/
public static DdlPackBean packHqlBsSuitCaseParam(BsSuitCaseParam bsSuitCaseParam){
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(bsSuitCaseParam.getParamName(),"paramName",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSuitCaseParam.getParamTypeId(), "paramTypeId", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSuitCaseParam.getSuitCaseId(), "suitCaseId", ddlPackBean);
DdlPreparedPack.getStringEqualPack(bsSuitCaseParam.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean);
return ddlPackBean;
}
}

Loading…
Cancel
Save