删除mongo依赖 merge test

yun-zuoyi
wynne1005 4 years ago
commit 8b1e28c893

@ -39,7 +39,7 @@ import java.io.Serializable;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("去去去去去去去去去安灯记录")
@Api("安灯记录")
public class AndonManageRecord extends BaseManageQueue implements Serializable {
private static final long serialVersionUID = 4667499369694353351L;

@ -1,30 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-PROD-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-base-mongo</artifactId>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-mongodb</artifactId>
</dependency>
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-base</artifactId>
</dependency>
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-platform</artifactId>
</dependency>
</dependencies>
</project>

@ -1,52 +0,0 @@
package cn.estsh.i3plus.pojo.base.jpa.dao;
import cn.estsh.i3plus.pojo.base.common.Pager;
import org.bson.conversions.Bson;
import org.springframework.data.mongodb.repository.MongoRepository;
import org.springframework.data.repository.NoRepositoryBean;
import java.io.Serializable;
import java.util.List;
/**
* @Description : Repository
* @Reference : MongoRepository
* @Author : alwaysfrin
* @CreateDate : 2018-09-13 10:34
* @Modify:
**/
@NoRepositoryBean
public interface BaseMongoRepository<T, ID extends Serializable> extends MongoRepository<T, ID> {
T getById(long id);
List<T> findByProperty(String propertyName, Object value);
List<T> findByProperty(String propertyName, Object value,String orderByParam, int ascOrDesc);
List<T> findByPropertyLike(String propertyName, Object value);
List<T> findByPropertyLike(String propertyName, Object value,String orderByParam, int ascOrDesc);
T getByProperty(String propertyName, Object value);
List<T> findByBson(Bson bson);
List<T> findByBson(Bson bson,String orderByParam, int ascOrDesc);
int findByBsonCount(Bson bson);
List<T> findByBsonPager(Bson bson,Pager pager);
List<T> findByBsonPager(Bson bson,Pager pager,String orderByParam, int ascOrDesc);
int listCount();
List<T> listPager(Pager pager);
List<T> listPager(Pager pager,String orderByParam, int ascOrDesc);
long deleteByProperty(Bson bson);
long deleteByPropertyIn(String propName, Object[] propValues);
long deleteByIds(ID[] ids);
}

@ -1,352 +0,0 @@
package cn.estsh.i3plus.pojo.base.jpa.daoimpl;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository;
import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker;
import com.alibaba.fastjson.JSONObject;
import com.mongodb.BasicDBObject;
import com.mongodb.Block;
import com.mongodb.client.FindIterable;
import com.mongodb.client.model.CountOptions;
import com.mongodb.client.model.Filters;
import com.mongodb.client.model.Sorts;
import org.apache.commons.lang3.StringUtils;
import org.bson.Document;
import org.bson.conversions.Bson;
import org.bson.json.JsonMode;
import org.bson.json.JsonWriterSettings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.data.mapping.context.MappingContext;
import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
import org.springframework.data.mongodb.repository.support.SimpleMongoRepository;
import javax.persistence.Id;
import java.io.Serializable;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.UUID;
/**
* @Description : mongodb
* @Reference :
* @Author : alwaysfrin
* @CreateDate : 2018-09-13 11:24
* @Modify:
**/
public class BaseMongoRepositoryImpl<T, ID extends Serializable> extends SimpleMongoRepository<T, ID>
implements BaseMongoRepository<T, ID> {
public static final Logger LOGGER = LoggerFactory.getLogger(BaseMongoRepositoryImpl.class);
/**
*
*/
private final MongoOperations mongoOperations;
private final MongoEntityInformation<T, ID> entityInformation;
private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mongoContext;
private final Class<T> entityClass;
private SnowflakeIdMaker snowflakeIdMaker;
public BaseMongoRepositoryImpl(MongoEntityInformation<T, ID> metadata, MongoOperations mongoOperations,SnowflakeIdMaker snowflakeIdMaker) {
super(metadata, mongoOperations);
this.entityInformation = metadata;
this.mongoOperations = mongoOperations;
this.entityClass = this.entityInformation.getJavaType();
mongoContext = mongoOperations.getConverter().getMappingContext();
this.snowflakeIdMaker = snowflakeIdMaker;
}
/**
*
* @param entity
* @param <S>
* @return
*/
@Override
public <S extends T> S insert(S entity) {
innerSave(entity);
return entity;
}
/**
*
* @param item
* @return
*/
private T innerSave(T item) {
try {
if(item==null)return null;
Class<?> clazz = item.getClass();
//获取主键
Field idField = clazz.getField("id");
if(idField == null){
idField = clazz.getField("primaryKey");
}
if(idField == null){
// 遍历所有属性,以@Id声明确认主键
Field[] fields = clazz.getFields();
for(Field f : fields){
if(f.getAnnotation(Id.class) != null){
idField = f;
break;
}
}
}
if(idField != null){
Class<?> type = idField.getType();
Object val = idField.get(item);
if((type == long.class || type == Long.class) && (val == null || Long.parseLong(val.toString()) == 0)){
// long类型主键以snowflake为主键
idField.set(item, snowflakeIdMaker.nextId() + System.currentTimeMillis());
} else if(type == String.class && (val==null || "".equals(val))){
// String类型主键以UUID为主键
idField.set(item, UUID.randomUUID().toString().replace("-", "").toLowerCase());
}
}
// try {
this.mongoOperations.insert(item, this.entityInformation.getCollectionName());
// }catch (DuplicateKeyException dke){
// LOGGER.error("【出现重复主键】");
// //出现重复主键,再次插入
// if(idField != null){
// Class<?> type = idField.getType();
// Object val = idField.get(item);
// if((type == long.class || type == Long.class) && (val == null || Long.parseLong(val.toString()) == 0)){
// // long类型主键以snowflake为主键
// idField.set(item, snowflakeIdMaker.nextId());
// } else if(type == String.class && (val==null || "".equals(val))){
// // String类型主键以UUID为主键
// idField.set(item, UUID.randomUUID().toString().replace("-", "").toLowerCase());
// }
// }
//
// this.mongoOperations.insert(item, this.entityInformation.getCollectionName());
// }
if(idField != null){
return item;
}else {
return null;
}
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException(e);
}
}
@Override
public Optional<T> findById(ID id) {
T entity = this.mongoOperations.findById(id, this.entityInformation.getJavaType(), this.entityInformation.getCollectionName());
if(entity != null) {
return Optional.of(entity);
}else{
return null;
}
}
@Override
public T getById(long id) {
return this.mongoOperations.findById(id, this.entityInformation.getJavaType(), this.entityInformation.getCollectionName());
}
@Override
public List<T> findByProperty(String propertyName, Object value) {
return findByProperty(propertyName,value,null,0);
}
@Override
public List<T> findByProperty(String propertyName, Object value, String orderByParam, int ascOrDesc) {
Bson bson = Filters.and(
Filters.eq(propertyName, value)
);
return findByBson(bson,orderByParam,ascOrDesc);
}
@Override
public List<T> findByPropertyLike(String propertyName, Object value) {
return findByPropertyLike(propertyName,value,null,0);
}
@Override
public List<T> findByPropertyLike(String propertyName, Object value, String orderByParam, int ascOrDesc) {
Bson bson = Filters.and(
Filters.regex(propertyName, value.toString())
);
return findByBson(bson,orderByParam,ascOrDesc);
}
@Override
public T getByProperty(String propertyName, Object value) {
List<T> tList = this.findByProperty(propertyName,value);
if(tList.size() > 0){
return tList.iterator().next();
}else{
return null;
}
}
/**
* bson
* @param bson
* @return
*/
public List<T> findByBson(Bson bson) {
return findByBson(bson,null,0);
}
@Override
public List<T> findByBson(Bson bson, String orderByParam, int ascOrDesc) {
List<Document> dList = new ArrayList<>();
Block<Document> saveBlock = new Block<Document>() {
@Override
public void apply(final Document document) {
dList.add(document);
}
};
FindIterable findIter = null;
if(bson != null) {
findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find(bson);
}else{
findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find();
}
if(StringUtils.isNotBlank(orderByParam) && ascOrDesc != 0){
//排序
if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()){
findIter.sort(Sorts.ascending(orderByParam));
}else{
findIter.sort(Sorts.descending(orderByParam));
}
}
findIter.forEach(saveBlock);
return packObjectListFromDocument(dList);
}
@Override
public int findByBsonCount(Bson bson) {
if(bson == null){
return (int) mongoOperations.getCollection(this.entityInformation.getCollectionName()).count();
}else {
return (int) mongoOperations.getCollection(this.entityInformation.getCollectionName()).count(bson);
}
}
private List<T> packObjectListFromDocument(List<Document> dList) {
//将获取的document转为对象
List<T> resultList = new ArrayList<>();
// 设置为宽松模式
JsonWriterSettings jsonWriterSettings = JsonWriterSettings.builder().outputMode(JsonMode.RELAXED).build();
for(Document d : dList){
resultList.add(JSONObject.parseObject(d.toJson(jsonWriterSettings), entityClass));
}
return resultList;
}
@Override
public List<T> findByBsonPager(Bson bson, Pager pager) {
return findByBsonPager(bson,pager,null,0);
}
@Override
public List<T> findByBsonPager(Bson bson, Pager pager, String orderByParam, int ascOrDesc) {
List<Document> dList = new ArrayList<>();
Block<Document> saveBlock = new Block<Document>() {
@Override
public void apply(final Document document) {
dList.add(document);
}
};
FindIterable findIter = null;
if(bson == null) {
findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find();
}else{
findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find(bson);
}
if(StringUtils.isNotBlank(orderByParam) && ascOrDesc != 0){
//排序
if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()){
findIter.sort(Sorts.ascending(orderByParam));
}else{
findIter.sort(Sorts.descending(orderByParam));
}
}else{
//根据id排序
findIter.sort(new BasicDBObject("_id", 1));
}
findIter.skip(pager.getStartRow()).limit(pager.getPageSize());
findIter.forEach(saveBlock);
return packObjectListFromDocument(dList);
}
@Override
public int listCount() {
return (int) mongoOperations.getCollection(this.entityInformation.getCollectionName()).count();
}
@Override
public List<T> listPager(Pager pager) {
return listPager(pager,null,0);
}
@Override
public List<T> listPager(Pager pager, String orderByParam, int ascOrDesc) {
List<Document> dList = new ArrayList<>();
Block<Document> saveBlock = new Block<Document>() {
@Override
public void apply(final Document document) {
dList.add(document);
}
};
FindIterable findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find();
if(StringUtils.isNotBlank(orderByParam) && ascOrDesc != 0){
//排序
if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()){
findIter.sort(Sorts.ascending(orderByParam));
}else{
findIter.sort(Sorts.descending(orderByParam));
}
}else{
//根据id排序
findIter.sort(new BasicDBObject("_id", 1));
}
findIter.skip(pager.getStartRow()).limit(pager.getPageSize());
findIter.forEach(saveBlock);
return packObjectListFromDocument(dList);
}
@Override
public long deleteByProperty(Bson bson) {
return mongoOperations.getCollection(this.entityInformation.getCollectionName()).deleteMany(bson).getDeletedCount();
}
@Override
public long deleteByPropertyIn(String propName, Object[] propValues) {
Bson bson = Filters.and(
Filters.in(propName, propValues)
);
return deleteByProperty(bson);
}
@Override
public long deleteByIds(ID[] ids) {
return deleteByPropertyIn("_id",ids);
}
}

@ -1,69 +0,0 @@
package cn.estsh.i3plus.pojo.base.jpa.factory;
import cn.estsh.i3plus.pojo.base.jpa.daoimpl.BaseMongoRepositoryImpl;
import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.data.mongodb.repository.MongoRepository;
import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
import org.springframework.data.mongodb.repository.support.MongoRepositoryFactory;
import org.springframework.data.mongodb.repository.support.MongoRepositoryFactoryBean;
import org.springframework.data.repository.core.RepositoryInformation;
import org.springframework.data.repository.core.RepositoryMetadata;
import org.springframework.data.repository.core.support.RepositoryFactorySupport;
import java.io.Serializable;
/**
* @Description : mongodb
* @Reference :
* @Author : alwaysfrin
* @CreateDate : 2018-09-13 14:55
* @Modify:
**/
public class BaseMongoRepositoryFactoryBean<R extends MongoRepository<T, I>, T, I extends Serializable> extends MongoRepositoryFactoryBean<R, T, I> {
public static final Logger LOGGER = LoggerFactory.getLogger(BaseMongoRepositoryFactoryBean.class);
@Autowired
public SnowflakeIdMaker snowflakeIdMaker;
public BaseMongoRepositoryFactoryBean(Class<? extends R> repositoryInterface) {
super(repositoryInterface);
}
@Override
protected RepositoryFactorySupport getFactoryInstance(MongoOperations operations) {
//LOGGER.info("【初始mongo持久仓】");
//生成持久mongo仓库实例
return new BaseMongoRepositoryFactory(operations,snowflakeIdMaker);
}
//创建一个内部类,该类不用在外部访问
private static class BaseMongoRepositoryFactory<T, I extends Serializable> extends MongoRepositoryFactory {
private final MongoOperations mongoOperations;
//private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
private final SnowflakeIdMaker snowflakeIdMaker;
public BaseMongoRepositoryFactory(MongoOperations mongoOperations,SnowflakeIdMaker snowflakeIdMaker) {
super(mongoOperations);
this.mongoOperations = mongoOperations;
this.snowflakeIdMaker = snowflakeIdMaker;
//this.mappingContext = mongoOperations.getConverter().getMappingContext();
}
//设置具体的实现类是BaseRepositoryImpl
@Override
protected Object getTargetRepository(RepositoryInformation information) {
MongoEntityInformation<?, Serializable> entityInformation = getEntityInformation(information.getDomainType());
return new BaseMongoRepositoryImpl(entityInformation, mongoOperations,snowflakeIdMaker);
}
//设置具体的实现类的class
@Override
protected Class<?> getRepositoryBaseClass(RepositoryMetadata metadata) {
return BaseMongoRepositoryImpl.class;
}
}
}

@ -1,816 +0,0 @@
package cn.estsh.i3plus.pojo.base.tool;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import com.alibaba.fastjson.JSONObject;
import com.mongodb.Block;
import com.mongodb.client.MongoCollection;
import com.mongodb.client.model.Filters;
import com.mongodb.client.model.Sorts;
import org.apache.commons.lang3.StringUtils;
import org.bson.Document;
import org.bson.conversions.Bson;
import org.springframework.data.mongodb.core.MongoOperations;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.regex.Pattern;
/**
* @Description :
* @Reference :
* @Author : alwaysfrin
* @CreateDate : 2018-11-01 16:26
* @Modify:
*
* (>) - $gt
* (<) - $lt
* (>=) - $gte
* (<= ) - $lte
* $ne ----------- not equal !=
* $eq -------- equal =
*
* title "库"
* db.col.find({title://})
*
* title "教"
* db.col.find({title:/^/})
*
* titl e"教"
* db.col.find({title:/$/})
**/
public class BsonPackTool {
/**
* sql
* @param data
* @return
*/
public static String getSafeParam(Object data){
return data.toString().replaceAll(";","")
.replaceAll("'","")
.replaceAll("\"","")
.replaceAll("/","")
.replaceAll("\\\\","")
.replaceAll("delete","")
.replaceAll("update","")
.replaceAll("insert","");
}
/**
* document
* @param mongoOperations
* @param tableName
* @param bson
* @param skip
* @param limit
* @return document
*/
public static List<Document> query(MongoOperations mongoOperations, String tableName, Bson bson, int skip, int limit) {
List<Document> newLins = new ArrayList<>();
Block<Document> saveBlock = new Block<Document>() {
@Override
public void apply(final Document document) {
newLins.add(document);
}
};
//查询
MongoCollection<Document> collection = mongoOperations.getCollection(tableName);
if(bson == null) {
collection.count();
collection.find().skip(skip).limit(limit).forEach(saveBlock);
}else {
collection.count(bson);
collection.find(bson).skip(skip).limit(limit).forEach(saveBlock);
}
return newLins;
}
/**
*
* @param mongoOperations
* @param tableName
* @param bson
* @param pageSize
* @return
*/
public static List<Document> queryPages(MongoOperations mongoOperations, String tableName, Bson bson, int pageSize) {
//分页查询
List<Document> list = new ArrayList<>();
long count = mongoOperations.getCollection(tableName).count(bson);
int loops = (int)((count + pageSize - 1) / pageSize);
List<Document> newFinds = null;
for(int i = 0; i < loops; i++) {
newFinds = query(mongoOperations, tableName, bson, i * pageSize, pageSize);
list.addAll(newFinds);
}
return list;
}
/**
*
* @param startDate
* @param endDate
* @param columnName HQL
* @param bson bson
* @param isShowTime
*/
public static Bson timeBuilder( String startDate,String endDate, String columnName, Bson bson, boolean isShowTime) {
if (startDate == null || startDate.trim().length() == 0) {
startDate = "1900-01-01";
} else {
startDate = getSafeParam(startDate);
startDate = startDate.trim();
}
if (isShowTime && startDate.trim().length()<=11) {
startDate+= " 00:00:00";
}
if (endDate == null || endDate.trim().length() == 0) {
endDate = "2100-01-01";
} else {
endDate = getSafeParam(endDate);
endDate = endDate.trim();
}
if (isShowTime&& endDate.trim().length()<=11) {
endDate+= " 23:59:59";
}
if(bson == null) {
bson = Filters.and(
Filters.gte(columnName, startDate), //大于等于开始日期
Filters.lte(columnName, endDate) //小于等于结束日期
);
}else{
bson = Filters.and(
bson,
Filters.gte(columnName, startDate), //大于等于开始日期
Filters.lte(columnName, endDate) //小于等于结束日期
);
}
return bson;
}
/**
*
* @param date
* @param columnName HQL
* @param bson bson
* @param showToday true:false:
* @param isShowTime
*/
public static Bson timeBuilder( String date, String columnName, Bson bson, boolean showToday,boolean isShowTime) {
if(date != null && !"null".equals(date) && date.trim().length() > 0){
date = getSafeParam(date);
String today = (new SimpleDateFormat("yyyy-MM-dd")).format(new Date());
if(date.length() == 1 || ",".equals(date)){
//只有一个逗号
date = "";
}
String[] time = date.split(",");
if(time.length == 1){
//只有开始日期,没有结束日期
if(bson == null){
bson = Filters.and(
Filters.regex(columnName, "^" + time[0]) //like 日期%^
);
}else {
bson = Filters.and(
bson,
Filters.regex(columnName, "^" + time[0]) //like 日期%^
);
}
}else if (time.length == 2 && ((time[0] != null && time[0].trim().length() > 0) || (time[1] != null & time[1].trim().length() > 0))) {
if (time[0] == null || time[0].trim().length() == 0) {
time[0] = "1900-01-01";
} else {
time[0] = time[0].trim();
}
if (isShowTime && time[0].trim().length()<=11) {
time[0]+= " 00:00:00";
}
if (time[1] == null || time[1].trim().length() == 0) {
time[1] = "2100-01-01";
} else {
time[1] = time[1].trim();
}
if (isShowTime&& time[1].trim().length()<=11) {
time[1]+= " 23:59:59";
}
if(bson == null) {
bson = Filters.and(
Filters.gte(columnName, time[0]), //大于等于开始日期
Filters.lte(columnName, time[1]) //小于等于结束日期
);
}else{
bson = Filters.and(
bson,
Filters.gte(columnName, time[0]), //大于等于开始日期
Filters.lte(columnName, time[1]) //小于等于结束日期
);
}
} else {
if (showToday) {
if (isShowTime) {
if(bson == null) {
bson = Filters.and(
Filters.gte(columnName, time[0] + " 00:00:00"), //大于等于开始日期
Filters.lte(columnName, time[1] + " 23:59:59") //小于等于结束日期
);
}else{
bson = Filters.and(
bson,
Filters.gte(columnName, time[0] + " 00:00:00"), //大于等于开始日期
Filters.lte(columnName, time[1] + " 23:59:59") //小于等于结束日期
);
}
}else{
if(bson == null) {
bson = Filters.and(
Filters.gte(columnName, time[0]), //大于等于开始日期
Filters.lte(columnName, time[1]) //小于等于结束日期
);
}else{
bson = Filters.and(
bson,
Filters.gte(columnName, time[0]), //大于等于开始日期
Filters.lte(columnName, time[1]) //小于等于结束日期
);
}
}
}
}
}
return bson;
}
/**
*
* @param columnName
* @param bson
* @param startTime
* @param endTime
* @return
*/
public static Bson timeBuilder(String columnName, Bson bson, String startTime,String endTime) {
if( Objects.nonNull(bson) && StringUtils.isNotBlank(columnName) &&StringUtils.isNotBlank(startTime)&& StringUtils.isNotBlank(endTime)){
bson = Filters.and(
bson,
Filters.gte(columnName, startTime), //大于等于开始日期
Filters.lte(columnName, endTime) //小于等于结束日期
);
}
return bson;
}
/**
*
* @param dateTime
* @param columnName HQL
* @param bson bson
* @param isShowTime
*/
public static Bson timeMore( String dateTime, String columnName, Bson bson, boolean isShowTime) {
if (dateTime == null || dateTime.trim().length() == 0) {
dateTime = "1900-01-01";
} else {
dateTime = getSafeParam(dateTime);
dateTime = dateTime.trim();
}
if (isShowTime && dateTime.trim().length()<=11) {
dateTime+= " 00:00:00";
}
if(bson == null) {
bson = Filters.and(
Filters.gte(columnName, dateTime) //大于等于开始日期
);
}else{
bson = Filters.and(
bson,
Filters.gte(columnName, dateTime) //大于等于开始日期
);
}
return bson;
}
/**
*
* @param dateTime
* @param columnName HQL
* @param bson bson
* @param isShowTime
*/
public static Bson timeLess( String dateTime, String columnName, Bson bson, boolean isShowTime) {
if (dateTime == null || dateTime.trim().length() == 0) {
dateTime = "2100-01-01";
} else {
dateTime = getSafeParam(dateTime);
dateTime = dateTime.trim();
}
if (isShowTime&& dateTime.trim().length()<=11) {
dateTime+= " 23:59:59";
}
if(bson == null) {
bson = Filters.and(
Filters.lte(columnName, dateTime) //小于等于结束日期
);
}else{
bson = Filters.and(
bson,
Filters.lte(columnName, dateTime) //小于等于结束日期
);
}
return bson;
}
/**
* Stringlike
* @param str
* @param columnName
* @param bson
*/
public static Bson getStringLikerPack(String str,String columnName, Bson bson) {
if (str != null && str.trim().length() > 0) {
str = getSafeParam(str);
if(bson == null) {
bson = Filters.and(
Filters.regex(columnName, str) //like
);
}else{
bson = Filters.and(
bson,
Filters.regex(columnName, str)//like
);
}
}
return bson;
}
/**
* Stringlike
* @param str
* @param columnName
* @param bson
*/
public static Bson getStringLikerPackOr(String str,String columnName, Bson bson) {
if (str != null && str.trim().length() > 0) {
str = getSafeParam(str);
if(bson == null) {
bson = Filters.or(
Filters.regex(columnName, str) //like
);
}else {
bson = Filters.and(
bson,
Filters.or(
Filters.regex(columnName, str) //like
)
);
}
}
return bson;
}
/**
* Stringlike()
* @param str
* @param columnName
* @param bson
*/
public static Bson getStringRightLikerPack(String str,String columnName, Bson bson) {
if (str != null && str.trim().length() > 0) {
str = getSafeParam(str);
if(bson == null) {
bson = Filters.and(
Filters.regex(columnName, str + "^") //like
);
}else{
bson = Filters.and(
bson,
Filters.regex(columnName, str + "^") //like
);
}
}
return bson;
}
/**
* Stringlike()
* @param str
* @param columnName
* @param bson
*/
public static Bson getStringLeftLikerPack(String str,String columnName, Bson bson) {
if (str != null && str.trim().length() > 0) {
str = getSafeParam(str);
if(bson == null) {
bson = Filters.and(
Filters.regex(columnName, "^" + str) //like
);
}else{
bson = Filters.and(
bson,
Filters.regex(columnName, "^" + str) //like
);
}
}
return bson;
}
/**
* Stringequal
* @param columnName
* @param bson
*/
public static Bson getStringEqualPack(String data,String columnName, Bson bson) {
if(data != null && data.trim().length() > 0){
data = getSafeParam(data);
if(bson == null) {
bson = Filters.and(
Filters.eq(columnName, data)
);
}else{
bson = Filters.and(
bson,
Filters.eq(columnName, data)
);
}
}
return bson;
}
/**
* longintequal
* @param columnName
* @param bson
*/
public static Bson getNumEqualPack(Object data,String columnName, Bson bson) {
if(data!=null&&Long.parseLong(data.toString()) > 0){
if(bson == null) {
bson = Filters.and(
Filters.eq(columnName, data)
);
}else{
bson = Filters.and(
bson,
Filters.eq(columnName, data)
);
}
}
return bson;
}
/**
* longintequal
* @param columnName
* @param bson
*/
public static Bson getNumEqualPackForZero(Object data,String columnName, Bson bson) {
if(data!=null&&Long.parseLong(data.toString()) >= 0){
if(bson == null) {
bson = Filters.and(
Filters.eq(columnName, data)
);
}else{
bson = Filters.and(
bson,
Filters.eq(columnName, data)
);
}
}
return bson;
}
/**
* longintequal
* @param columnName
* @param bson
*/
public static Bson getNumWithZeroEqualPack(Object data,String columnName, Bson bson) {
if(data!=null&&Long.parseLong(data.toString()) >= 0){
if(bson == null) {
bson = Filters.and(
Filters.eq(columnName, data)
);
}else{
bson = Filters.and(
bson,
Filters.eq(columnName, data)
);
}
}
return bson;
}
/**
* longint
* @param columnName
* @param bson
*/
public static Bson getNumBiggerPack(Object data,String columnName, Bson bson) {
if(data!=null&&Long.parseLong(data.toString()) > 0){
if(bson == null) {
bson = Filters.and(
Filters.gt(columnName, data)
);
}else{
bson = Filters.and(
bson,
Filters.gt(columnName, data)
);
}
}
return bson;
}
/**
* longint
* @param columnName
* @param bson
*/
public static Bson getNumSmallerPack(Object data,String columnName, Bson bson) {
if(data!=null&&Long.parseLong(data.toString()) > 0){
if(bson == null) {
bson = Filters.and(
Filters.lt(columnName, data)
);
}else{
bson = Filters.and(
bson,
Filters.lt(columnName, data)
);
}
}
return bson;
}
/**
* double
* @param columnName
* @param bson
*/
public static Bson getDoubleBiggerPack(Object data,String columnName, Bson bson) {
if(data!=null&&Double.parseDouble(data.toString()) > 0){
if(bson == null) {
bson = Filters.and(
Filters.gt(columnName, data)
);
}else{
bson = Filters.and(
bson,
Filters.gt(columnName, data)
);
}
}
return bson;
}
/**
* double
* @param columnName
* @param bson
*/
public static Bson getDoubleSmallerPack(Object data,String columnName, Bson bson) {
if(data!=null&&Double.parseDouble(data.toString()) > 0){
if(bson == null) {
bson = Filters.and(
Filters.lt(columnName, data)
);
}else{
bson = Filters.and(
bson,
Filters.lt(columnName, data)
);
}
}
return bson;
}
/**
* longintequal
* @param columnName
* @param bson
*/
public static Bson getNumEqualPack(Object data,String columnName, Bson bson,Integer expvalue) {
if(data!=null&&Long.parseLong(data.toString()) > (long)expvalue){
if(bson == null) {
bson = Filters.and(
Filters.eq(columnName, data)
);
}else{
bson = Filters.and(
bson,
Filters.eq(columnName, data)
);
}
}
return bson;
}
/**
* doubleequal
* @param columnName
* @param bson
*/
public static Bson getNumEqualPackDouble(Object data,String columnName, Bson bson) {
if(data!=null&&Double.parseDouble(data.toString()) > 0){
if(bson == null) {
bson = Filters.and(
Filters.eq(columnName, data)
);
}else{
bson = Filters.and(
bson,
Filters.eq(columnName, data)
);
}
}
return bson;
}
/**
* longintequal
* @param columnName
* @param bson
*/
public static Bson getNumEqualPackDouble(Object data,String columnName, Bson bson,Integer expvalue) {
if(data!=null&&Double.parseDouble(data.toString()) > (double)expvalue){
if(bson == null) {
bson = Filters.and(
Filters.eq(columnName, data)
);
}else{
bson = Filters.and(
bson,
Filters.eq(columnName, data)
);
}
}
return bson;
}
/**
* longintequal()
* @param columnName
* @param bson
*/
public static Bson getNumNOEqualPack(Object data,String columnName, Bson bson) {
if(data!=null){
if(bson == null) {
bson = Filters.and(
Filters.ne(columnName, data)
);
}else{
bson = Filters.and(
bson,
Filters.ne(columnName, data)
);
}
}
return bson;
}
/**
* in
* @param data
* @param columnName
* @param bson
*/
public static Bson getInPack(String data,String columnName, Bson bson){
if (data!=null&&data.trim().length()>0) {
data = getSafeParam(data);
if(bson == null) {
bson = Filters.and(
Filters.in(columnName, data)
);
}else{
bson = Filters.and(
bson,
Filters.in(columnName, data)
);
}
}
return bson;
}
/**
* in String
* @param data
* @param columnName
* @param bson
*/
public static Bson getInPackString(String data,String columnName, Bson bson){
if (data != null && data.trim().length()>0) {
data = getSafeParam(data);
//判断最后一位是不是逗号
if(data.lastIndexOf(",") != (data.length()-1)){
data += ",";
}
String[] dataArray = data.substring(0, data.length()-1).split(",");
data = "";
for (int i = 0 ; i < dataArray.length ;i++) {
if(i == dataArray.length -1){
data += "'" + dataArray[i] + "'";
}else{
data += "'" + dataArray[i] + "',";
}
}
if(bson == null) {
bson = Filters.and(
Filters.in(columnName, data)
);
}else{
bson = Filters.and(
bson,
Filters.in(columnName, data)
);
}
}
return bson;
}
/**
* in String
* @param data
* @param columnName
* @param bson
*/
public static Bson getNotInPackString(String data,String columnName, Bson bson){
if (data != null && data.trim().length()>0) {
data = getSafeParam(data);
//判断最后一位是不是逗号
if(data.lastIndexOf(",") != (data.length()-1)){
data += ",";
}
String[] dataArray = data.substring(0, data.length()-1).split(",");
data = "";
for (int i = 0 ; i < dataArray.length ;i++) {
if(i == dataArray.length -1){
data += "'" + dataArray[i] + "'";
}else{
data += "'" + dataArray[i] + "',";
}
}
if(bson == null) {
bson = Filters.and(
Filters.nin(columnName, data)
);
}else{
bson = Filters.and(
bson,
Filters.nin(columnName, data)
);
}
}
return bson;
}
/**
* not in
* @param data
* @param columnName
* @param bson
*/
public static Bson getNotInPack(String data,String columnName, Bson bson){
if (data!=null&&data.trim().length()>0) {
data = getSafeParam(data);
if(bson == null) {
bson = Filters.and(
Filters.nin(columnName, data)
);
}else{
bson = Filters.and(
bson,
Filters.nin(columnName, data)
);
}
}
return bson;
}
/**
* MONGODBBSON
* @param dList
* @param entityClass
* @return
*/
public List<?> packDocumentToObjectList(List<Document> dList,Class entityClass){
//将获取的document转为对象
List resultList = new ArrayList();
for(Document d : dList){
resultList.add(JSONObject.parseObject(d.toJson(), entityClass));
}
return resultList;
}
}

@ -1,14 +0,0 @@
package cn.estsh.i3plus.pojo.platform.platrepositorymongo;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository;
import cn.estsh.i3plus.pojo.platform.platbean.SysLogException;
/**
* @Description : (使Mongodb)
* @Reference :
* @Author : frin
* @Date : 2018-11-8 12:03:00
* @Modify :
**/
public interface SysLogExceptionRepository extends BaseMongoRepository<SysLogException, Long> {
}

@ -1,14 +0,0 @@
package cn.estsh.i3plus.pojo.platform.platrepositorymongo;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository;
import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate;
/**
* @Description : (使Mongodb)
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-22 12:03:00.118
* @Modify :
**/
public interface SysLogOperateRepository extends BaseMongoRepository<SysLogOperate, Long> {
}

@ -1,14 +0,0 @@
package cn.estsh.i3plus.pojo.platform.platrepositorymongo;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository;
import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-22 12:03:00.158
* @Modify :
**/
public interface SysLogSystemRepository extends BaseMongoRepository<SysLogSystem, Long> {
}

@ -1,14 +0,0 @@
package cn.estsh.i3plus.pojo.platform.platrepositorymongo;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository;
import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2018-12-20 22:35
* @Modify:
**/
public interface SysLogTaskTimeRepository extends BaseMongoRepository<SysLogTaskTime, Long> {
}

@ -337,6 +337,7 @@ public class BlockFormEnumUtil {
return tmp;
}
}
/**
*
*/
@ -988,7 +989,6 @@ public class BlockFormEnumUtil {
}
/**
*
*/
@ -1209,19 +1209,19 @@ public class BlockFormEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PROPERTY_VIRTUAL_OPERATE_TYPE {
STRING_SPLICE(10, "SPLICE", "字符串拼接",String.class),
NUM_ADD(20, "ADD", "加法计算",Double.class),
NUM_LESS(30, "MIN", "减法计算",Double.class),
NUM_MAKE(40, "MUL", "乘法计算",Double.class),
NUM_DIVISION(50, "DIVISION", "除法计算",Double.class),
JOIN_TABLE(60, "JOIN_TABLE", "连表查询",String.class);
STRING_SPLICE(10, "SPLICE", "字符串拼接", String.class),
NUM_ADD(20, "ADD", "加法计算", Double.class),
NUM_LESS(30, "MIN", "减法计算", Double.class),
NUM_MAKE(40, "MUL", "乘法计算", Double.class),
NUM_DIVISION(50, "DIVISION", "除法计算", Double.class),
JOIN_TABLE(60, "JOIN_TABLE", "连表查询", String.class);
private int value;
private String code;
private String description;
private Class clzFullName;
private PROPERTY_VIRTUAL_OPERATE_TYPE(int value, String code, String description,Class clzFullName) {
private PROPERTY_VIRTUAL_OPERATE_TYPE(int value, String code, String description, Class clzFullName) {
this.value = value;
this.code = code;
this.description = description;
@ -1298,23 +1298,23 @@ public class BlockFormEnumUtil {
return tmp;
}
public Object getPropertyVirtual(Object ... objs){
if(this.getValue() == STRING_SPLICE.getValue()){
public Object getPropertyVirtual(Object... objs) {
if (this.getValue() == STRING_SPLICE.getValue()) {
return getPropertyVirtualString(objs);
}else if(this.getValue() == NUM_ADD.getValue()){
} else if (this.getValue() == NUM_ADD.getValue()) {
return getPropertyVirtualDoubleAdd(objs);
}else if(this.getValue() == NUM_LESS.getValue()){
} else if (this.getValue() == NUM_LESS.getValue()) {
return getPropertyVirtualDoubleLess(objs);
}else if(this.getValue() == NUM_MAKE.getValue()){
} else if (this.getValue() == NUM_MAKE.getValue()) {
return getPropertyVirtualDoubleMake(objs);
}else if(this.getValue() == NUM_DIVISION.getValue()){
} else if (this.getValue() == NUM_DIVISION.getValue()) {
return getPropertyVirtualDoubleDivision(objs);
}
return objs;
}
private String getPropertyVirtualString(Object ... objs){
if(objs != null && objs.length > 0){
private String getPropertyVirtualString(Object... objs) {
if (objs != null && objs.length > 0) {
StringBuffer result = new StringBuffer();
for (Object o : objs) {
result.append(o == null ? "" : o.toString());
@ -1324,15 +1324,15 @@ public class BlockFormEnumUtil {
return null;
}
private Double getPropertyVirtualDoubleAdd(Object ... objs){
if(objs != null && objs.length > 0){
private Double getPropertyVirtualDoubleAdd(Object... objs) {
if (objs != null && objs.length > 0) {
Double result = Double.valueOf(0);
for (Object o : objs) {
try {
if(o != null){
if (o != null) {
result += Double.parseDouble(o.toString());
}
}catch (Exception e){
} catch (Exception e) {
e.printStackTrace();
}
}
@ -1341,15 +1341,15 @@ public class BlockFormEnumUtil {
return null;
}
private Double getPropertyVirtualDoubleLess(Object ... objs){
if(objs != null && objs.length > 0){
private Double getPropertyVirtualDoubleLess(Object... objs) {
if (objs != null && objs.length > 0) {
Double result = Double.valueOf(0);
for (Object o : objs) {
try {
if(o != null){
if (o != null) {
result -= Double.parseDouble(o.toString());
}
}catch (Exception e){
} catch (Exception e) {
e.printStackTrace();
}
}
@ -1358,15 +1358,15 @@ public class BlockFormEnumUtil {
return null;
}
private Double getPropertyVirtualDoubleMake(Object ... objs){
if(objs != null && objs.length > 0){
private Double getPropertyVirtualDoubleMake(Object... objs) {
if (objs != null && objs.length > 0) {
Double result = Double.valueOf(0);
for (Object o : objs) {
try {
if(o != null){
if (o != null) {
result *= Double.parseDouble(o.toString());
}
}catch (Exception e){
} catch (Exception e) {
e.printStackTrace();
}
}
@ -1375,15 +1375,15 @@ public class BlockFormEnumUtil {
return null;
}
private Double getPropertyVirtualDoubleDivision(Object ... objs){
if(objs != null && objs.length > 0){
private Double getPropertyVirtualDoubleDivision(Object... objs) {
if (objs != null && objs.length > 0) {
Double result = Double.valueOf(0);
for (Object o : objs) {
try {
if(o != null){
if (o != null) {
result /= Double.parseDouble(o.toString());
}
}catch (Exception e){
} catch (Exception e) {
e.printStackTrace();
}
}
@ -1394,7 +1394,6 @@ public class BlockFormEnumUtil {
}
/**
*
*/
@ -1751,8 +1750,8 @@ public class BlockFormEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TRIGGER_EVENT {
CLICK(10, "CLICK", "单击");
// DB_LCLICK(20, "DB_LCLICK", "双击"),
CLICK(10, "CLICK", "单击"),
DOUBLE_CLICK(20, "DOUBLE_CLICK", "双击");
// MOUSE_OUT(30, "MOUSE_OUT", "鼠标指针移出"),
// MOUSE_OVER(40, "MOUSE_OVER", "鼠标指针移入");
@ -1830,6 +1829,88 @@ public class BlockFormEnumUtil {
}
/**
*
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TRIGGER_ACTION {
REFRESH(10, "REFRESH", "刷新元素"),
SHOW_METHOD(20, "SHOW_METHOD", "展示其他功能明细");
private int value;
private String code;
private String description;
private TRIGGER_ACTION(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].code;
}
}
return tmp;
}
public static int codeOfValue(String code) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static TRIGGER_ACTION valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
public static String codeOfDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -2105,7 +2186,7 @@ public class BlockFormEnumUtil {
private String code;
private String description;
private ELEMENT_TREE_DIRECTION (int value, String code, String description) {
private ELEMENT_TREE_DIRECTION(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
@ -2185,7 +2266,7 @@ public class BlockFormEnumUtil {
private String code;
private String description;
private DATA_SOURCE_STATUS (int value, String code, String description) {
private DATA_SOURCE_STATUS(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
@ -2204,7 +2285,6 @@ public class BlockFormEnumUtil {
}
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -2268,7 +2348,7 @@ public class BlockFormEnumUtil {
private int value;
private String description;
private ELEMENT_CONSTRAINT_TYPE (int value, String description) {
private ELEMENT_CONSTRAINT_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
@ -2314,7 +2394,7 @@ public class BlockFormEnumUtil {
private int value;
private String description;
private FORM_TRIGGER_SOURCE (int value, String description) {
private FORM_TRIGGER_SOURCE(int value, String description) {
this.value = value;
this.description = description;
}
@ -2356,14 +2436,14 @@ public class BlockFormEnumUtil {
public enum PROCEDURE_COL_TYPE {
IN_PARAM(1, "入参"),
INOUT_PARAM(2, "出入参"),
// ?(3, "按钮"),
// ?(3, "按钮"),
OUT_PARAM(4, "出参"),
RETURN_PARAM(5, "返回值");
private int value;
private String description;
private PROCEDURE_COL_TYPE (int value, String description) {
private PROCEDURE_COL_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
@ -2405,7 +2485,6 @@ public class BlockFormEnumUtil {
* PROCEDURE_INOUT_PARAM30-sqlserver
* PROCEDURE_OUT_PARAM40-
* PROCEDURE_RETURN50-mysqlsqlserver
*
*/
public enum ORIGIN_PROPERTY_TYPE {
NORMAL_PROPERTY(10, "正常属性"),
@ -2417,7 +2496,7 @@ public class BlockFormEnumUtil {
private final int value;
private final String description;
private ORIGIN_PROPERTY_TYPE (int value, String description) {
private ORIGIN_PROPERTY_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
@ -2452,7 +2531,7 @@ public class BlockFormEnumUtil {
public static ORIGIN_PROPERTY_TYPE procColTypeValOf(int procColTypeVal) {
ORIGIN_PROPERTY_TYPE result = NORMAL_PROPERTY;
switch (Objects.requireNonNull(PROCEDURE_COL_TYPE.valueOf(procColTypeVal))){
switch (Objects.requireNonNull(PROCEDURE_COL_TYPE.valueOf(procColTypeVal))) {
case IN_PARAM:
result = PROCEDURE_IN_PARAM;
break;

@ -26,7 +26,8 @@ public class BlockSoftSwitchEnumUtil {
WEB_SERVICE(40,"WebService套件"),
MQ(50,"消息队列套件"),
WEB_SOCKET(60,"WebSocket套件"),
FTP(70,"FTP套件");
FTP(70,"FTP套件"),
SAP(80,"SAP套件");
private int value;
private String description;
@ -145,7 +146,10 @@ public class BlockSoftSwitchEnumUtil {
/* FTP */
CLIENT_FTP_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.FTP,160001,"Client FTP客户端适配器"),
SERVER_FTP_IMPP(SUIT_MODE.SERVER,CASE_TYPE.FTP,260001,"Client FTP服务端适配器");
SERVER_FTP_IMPP(SUIT_MODE.SERVER,CASE_TYPE.FTP,260001,"Client FTP服务端适配器"),
/* SAP */
CLIENT_SAP_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.SAP,170001,"Client FTP客户端适配器");
private int value;
private String description;

@ -1082,7 +1082,8 @@ public class ImppEnumUtil {
CONFIG(6, "系统配置"),
LOG(7, "日志配置"),
WORK_WECHAT(8, "企业微信配置"),
SMS(9, "短信配置");
SMS(9, "短信配置"),
SSO(10, "单点登录配置");
private final int value;
private final String description;

@ -160,14 +160,14 @@ public class BfElement extends BaseBean {
@ApiParam(value ="默认排序规则")
private Integer elementSortAttrType;
@Lob
// @Lob
@Column(name="ELEMENT_CSS_STYLE")
@ApiParam(value ="元素样式")
private String elementCssStyle;
@Lob
// @Lob
@Column(name="ELEMENT_FORMATTER")
@ApiParam(value ="元素样式")
@ApiParam(value ="元素格式化")
private String elementFormatter;
@Column(name="ELEMENT_DESCRIPTION")

@ -28,59 +28,64 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="BF_METHOD_DETAIL_PROPERTY")
@Api(value="表单功能明细关联属性",description = "表单功能明细关联属性")
@Table(name = "BF_METHOD_DETAIL_PROPERTY")
@Api(value = "表单功能明细关联属性", description = "表单功能明细关联属性")
public class BfMethodDetailProperty extends BaseBean {
private static final long serialVersionUID = -7541677357317732343L;
@Column(name="METHOD_ID")
@ApiParam(value ="功能id")
@Column(name = "METHOD_ID")
@ApiParam(value = "功能id")
@JsonSerialize(using = ToStringSerializer.class)
private Long methodId;
// 关联功能明细表id
@Column(name="PRI_METHOD_DETAIL_ID")
@ApiParam(value ="主功能明细id")
@Column(name = "PRI_METHOD_DETAIL_ID")
@ApiParam(value = "主功能明细id")
@JsonSerialize(using = ToStringSerializer.class)
private Long priMethodDetailId;
@Column(name="PRI_METHOD_DETAIL_NAME_RDD")
@ApiParam(value ="主功能明细名称")
@Column(name = "PRI_METHOD_DETAIL_NAME_RDD")
@ApiParam(value = "主功能明细名称")
private String priMethodDetailNameRdd;
@Column(name="PRI_ELEMENT_ID")
@ApiParam(value ="主对象元素id")
@Column(name = "PRI_ELEMENT_ID")
@ApiParam(value = "主对象元素id")
@JsonSerialize(using = ToStringSerializer.class)
private Long priElementId;
@Column(name="PRI_ELEMENT_NAME_RDD")
@ApiParam(value ="主对象元素名称")
@Column(name = "PRI_ELEMENT_NAME_RDD")
@ApiParam(value = "主对象元素名称")
private String priElementNameRdd;
// 枚举:BlockFormEnumUtil.TRIGGER_EVENT
@Column(name="PRI_ELEMENT_EVENT")
@ApiParam(value ="主对象元素事件")
@Column(name = "PRI_ELEMENT_EVENT")
@ApiParam(value = "主对象元素事件")
private Integer priElementEvent;
@Column(name="SEC_METHOD_DETAIL_ID")
@ApiParam(value ="关联功能明细id")
// 枚举:BlockFormEnumUtil.TRIGGER_ACTION
@Column(name = "PRI_ELEMENT_ACTION")
@ApiParam(value = "主对象元素动作")
private Integer priElementAction;
@Column(name = "SEC_METHOD_DETAIL_ID")
@ApiParam(value = "关联功能明细id")
@JsonSerialize(using = ToStringSerializer.class)
private Long secMethodDetailId;
@Column(name="SEC_METHOD_DETAIL_NAME_RDD")
@ApiParam(value ="关联功能明细名称")
@Column(name = "SEC_METHOD_DETAIL_NAME_RDD")
@ApiParam(value = "关联功能明细名称")
private String secMethodDetailNameRdd;
@Column(name="SEC_ELEMENT_ID")
@ApiParam(value ="关联对象元素id")
@Column(name = "SEC_ELEMENT_ID")
@ApiParam(value = "关联对象元素id")
@JsonSerialize(using = ToStringSerializer.class)
private Long secElementId;
@Column(name="SEC_ELEMENT_NAME_RDD")
@ApiParam(value ="关联对象元素名称")
@Column(name = "SEC_ELEMENT_NAME_RDD")
@ApiParam(value = "关联对象元素名称")
private String secElementNameRdd;
@Transient
@ApiParam(value ="表单功能明细关联属性")
@ApiParam(value = "表单功能明细关联属性")
private List<BfMethodDetailPropertyRef> refList;
}

@ -26,7 +26,7 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="BF_METHOD_DETAIL_PROPERTY")
@Table(name="BF_METHOD_DETAIL_PROPERTY_REF")
@Api(value="表单功能明细关联属性",description = "表单功能明细关联属性")
public class BfMethodDetailPropertyRef extends BaseBean {

@ -71,11 +71,11 @@ public class MdmBusiModelRepositoryImpl<T extends BaseMdmBusiModelBean<M, B>, M
value = propValue[i];
if (value != null) {
if ((value instanceof Object[])) {
query.setParameter(name.replace(".", ""), (Object[]) value);
query.setParameter(name.replace("_", ""), (Object[]) value);
} else if ((value instanceof Collection)) {
query.setParameter(name.replace(".", ""), (Collection) value);
query.setParameter(name.replace("_", ""), (Collection) value);
} else {
query.setParameter(name.replace(".", ""), value);
query.setParameter(name.replace("_", ""), value);
}
}
}
@ -90,12 +90,12 @@ public class MdmBusiModelRepositoryImpl<T extends BaseMdmBusiModelBean<M, B>, M
if (((value instanceof Object[])) || ((value instanceof Collection))) {
Object[] arraySerializable = (Object[]) value;
if ((arraySerializable != null) && (arraySerializable.length > 0)) {
sb.append(" and model." + name + " in (:" + name.replace(".", "") + ")");
sb.append(" and model." + name + " in (:" + name.replace("_", "") + ")");
}
} else if (value == null) {
sb.append(" and model." + name + " is null ");
} else {
sb.append(" and model." + name + "=:" + name.replace(".", ""));
sb.append(" and model." + name + "=:" + name.replace("_", ""));
}
}
}
@ -148,7 +148,7 @@ public class MdmBusiModelRepositoryImpl<T extends BaseMdmBusiModelBean<M, B>, M
for (int i = 0; i < packBean.getKeyList().size(); i++) {
query.setParameter(
packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i),
packBean.getEntityTypeList().get(i).getAlias() + "_" + packBean.getKeyList().get(i),
packBean.getValueList().get(i)
);
}
@ -272,7 +272,7 @@ public class MdmBusiModelRepositoryImpl<T extends BaseMdmBusiModelBean<M, B>, M
@Override
public T getByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value) {
String queryString =
selectAll + " where " + entityType.getAlias() + "." + propertyName + "= :" + entityType.getAlias() + "_" + propertyName;
selectAll + " where " + entityType.getAlias() + "_" + propertyName + "= :" + entityType.getAlias() + "_" + propertyName;
try {
List<T> list = entityManager.createQuery(queryString)
.setParameter(entityType.getAlias() + "_" + propertyName, value)
@ -345,7 +345,7 @@ public class MdmBusiModelRepositoryImpl<T extends BaseMdmBusiModelBean<M, B>, M
@Override
public int findByPropertyCount(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value) {
try {
String queryString = selectCount + " where " + entityType.getAlias() + "." + propertyName
String queryString = selectCount + " where " + entityType.getAlias() + "_" + propertyName
+ "= :" + entityType.getAlias() + "_" + propertyName;
Long count = entityManager.createQuery(queryString, Long.class)
.setParameter(entityType.getAlias() + "_" + propertyName, value)
@ -400,7 +400,7 @@ public class MdmBusiModelRepositoryImpl<T extends BaseMdmBusiModelBean<M, B>, M
@Override
public List<T> findByPropertyPage(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value, String orderByStuff, Pager pager) {
if (pager.getTotalRows() > 0) {
String queryString = selectAll + " where " + entityType.getAlias() + "." + propertyName + "= :" + entityType.getAlias() + "_" + propertyName + " " + orderByStuff;
String queryString = selectAll + " where " + entityType.getAlias() + "_" + propertyName + "= :" + entityType.getAlias() + "_" + propertyName + " " + orderByStuff;
return entityManager.createQuery(queryString)
.setParameter(entityType.getAlias() + "_" + propertyName, value)
.getResultList();
@ -592,7 +592,7 @@ public class MdmBusiModelRepositoryImpl<T extends BaseMdmBusiModelBean<M, B>, M
for (int i = 0; i < packBean.getKeyList().size(); i++) {
query.setParameter(
packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i),
packBean.getEntityTypeList().get(i).getAlias() + "_" + packBean.getKeyList().get(i),
packBean.getValueList().get(i)
);
}
@ -613,7 +613,7 @@ public class MdmBusiModelRepositoryImpl<T extends BaseMdmBusiModelBean<M, B>, M
Query query = entityManager.createQuery(queryString.toString(), Long.class);
for (int i = 0; i < packBean.getKeyList().size(); i++) {
query.setParameter(
packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i),
packBean.getEntityTypeList().get(i).getAlias() + "_" + packBean.getKeyList().get(i),
packBean.getValueList().get(i)
);
}
@ -657,7 +657,7 @@ public class MdmBusiModelRepositoryImpl<T extends BaseMdmBusiModelBean<M, B>, M
for (int i = 0; i < packBean.getKeyList().size(); i++) {
query.setParameter(
packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i),
packBean.getEntityTypeList().get(i).getAlias() + "_" + packBean.getKeyList().get(i),
packBean.getValueList().get(i)
);
}
@ -695,7 +695,7 @@ public class MdmBusiModelRepositoryImpl<T extends BaseMdmBusiModelBean<M, B>, M
for (int i = 0; i < packBean.getKeyList().size(); i++) {
query.setParameter(
packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i),
packBean.getEntityTypeList().get(i).getAlias() + "_" + packBean.getKeyList().get(i),
packBean.getValueList().get(i)
);
}
@ -714,7 +714,7 @@ public class MdmBusiModelRepositoryImpl<T extends BaseMdmBusiModelBean<M, B>, M
for (int i = 0; i < packBean.getKeyList().size(); i++) {
query.setParameter(
packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i),
packBean.getEntityTypeList().get(i).getAlias() + "_" + packBean.getKeyList().get(i),
packBean.getValueList().get(i)
);
}
@ -731,7 +731,7 @@ public class MdmBusiModelRepositoryImpl<T extends BaseMdmBusiModelBean<M, B>, M
for (int i = 0; i < packBean.getKeyList().size(); i++) {
query.setParameter(
packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i),
packBean.getEntityTypeList().get(i).getAlias() + "_" + packBean.getKeyList().get(i),
packBean.getValueList().get(i)
);
}

@ -0,0 +1,499 @@
package cn.estsh.i3plus.pojo.mdm.sqlpack;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil;
import cn.estsh.i3plus.pojo.mdm.bean.base.DdlPackMdmModelBean;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2020-11-22 20:37
* @Modify:
**/
public final class DdlMdmBusiPreparedPack extends DdlMdmModelPreparedPack {
protected static MdmEnumUtil.HQL_ENTITY_TYPE entityType = MdmEnumUtil.HQL_ENTITY_TYPE.BUSI;
/**
*
*
* @param startDate
* @param endDate
* @param columnName HQL
* @param packBean HQL
* @param isShowTime
*/
public static void timeBuilder(String startDate, String endDate, String columnName, DdlPackMdmModelBean packBean, boolean isShowTime) {
timeBuilder(entityType, startDate, endDate, columnName, packBean, isShowTime);
}
/**
*
*
* @param startDate
* @param endDate
* @param columnName
* @param isLeftContain
* @param isRightContain
* @param packBean HQL
*/
public static void timeBuilder(String startDate, String endDate, String columnName, boolean isLeftContain, boolean isRightContain, DdlPackMdmModelBean packBean) {
timeBuilder(entityType, startDate, endDate, columnName, isLeftContain, isRightContain, packBean);
}
/**
*
*
* @param date
* @param columnName HQL
* @param packBean HQL
* @param showTaday true:false:
* @param isShowTime
*/
public static void timeBuilder(String date, String columnName, DdlPackMdmModelBean packBean, Boolean showTaday, boolean isShowTime) {
timeBuilder(entityType, date, columnName, packBean, showTaday, isShowTime);
}
/**
*
*
* @param date
* @param startColumnName HQL
* @param endColumnName HQL
* @param packBean HQL
* @param isShowTime
*/
public static void getTimeBetweenCol(String date, String startColumnName, String endColumnName, DdlPackMdmModelBean packBean, boolean isShowTime) {
getTimeBetweenCol(entityType, date, startColumnName, endColumnName, packBean, isShowTime);
}
/**
* Stringorder by
*s
* @param order
* @param columnName
* @param packBean
*/
public static void getOrderByPack(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, Object[] order, String[] columnName, DdlPackMdmModelBean packBean) {
getOrderByPack(entityTypes, order, columnName, packBean);
}
/**
*
*
* @param bean
*/
public static void getOrderDefault(BaseBean bean) {
getOrderDefault(bean);
}
/**
* Stringlike
*
* @param val
* @param columnName
* @param packBean
*/
public static void getStringLikerPack(String val, String columnName, DdlPackMdmModelBean packBean) {
getStringLikerPack(entityType, val, columnName, packBean);
}
/**
* Stringlike
*
* @param val
* @param columnName
* @param packBean
*/
public static void getStringLikerPackOr(String val, String columnName, DdlPackMdmModelBean packBean) {
getStringLikerPackOr(entityType, val, columnName, packBean);
}
/**
* Stringlike()
*
* @param val
* @param columnName
* @param packBean
*/
public static void getStringRightLikerPack(String val, String columnName, DdlPackMdmModelBean packBean) {
getStringRightLikerPack(entityType, val, columnName, packBean);
}
/**
* Stringlike()
*
* @param val
* @param columnName
* @param packBean
*/
public static void getStringLeftLikerPack(String val, String columnName, DdlPackMdmModelBean packBean) {
getStringLeftLikerPack(entityType, val, columnName, packBean);
}
/**
* Stringequal
*
* @param val
* @param columnName
* @param packBean
*/
public static void getStringEqualPack(String val, String columnName, DdlPackMdmModelBean packBean) {
getStringEqualPack(entityType, val, columnName, packBean);
}
/**
* Stringequal
*
* @param val
* @param columnName
* @param packBean
*/
public static void getStringLikePack(String val, String columnName, DdlPackMdmModelBean packBean) {
getStringLikePack(entityType, val, columnName, packBean);
}
/**
* String
*
* @param val
* @param columnName
* @param packBean
*/
public static void getStringNoEqualPack(String val, String columnName, DdlPackMdmModelBean packBean) {
getStringNoEqualPack(entityType, val, columnName, packBean);
}
/**
* Stringequal
*
* @param columnName
* @param packBean
*/
public static void getStringNotNullPack(String columnName, DdlPackMdmModelBean packBean) {
getStringNotNullPack(entityType, columnName, packBean);
}
/**
* Stringequal
*
* @param columnName
* @param packBean
*/
public static void getStringNotBlanklPack(String columnName, DdlPackMdmModelBean packBean) {
getStringNotBlanklPack(entityType, columnName, packBean);
}
/**
* Stringequal
*
* @param val
* @param columnName
* @param packBean
*/
public static void getStringEqualPackOr(String val, String columnName, DdlPackMdmModelBean packBean) {
getStringEqualPackOr(entityType, val, columnName, packBean);
}
/**
* longintequal
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNumEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) {
getNumEqualPack(entityType, data, columnName, packBean);
}
/**
*
*
* @param firstColumnName
* @param twoColumnName
* @param packBean
*/
public static void getNotEqueals(String firstColumnName, String twoColumnName, DdlPackMdmModelBean packBean) {
getNotEqueals(entityType, firstColumnName, twoColumnName, packBean);
}
/**
* longintequal
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNegativeNumEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) {
getNegativeNumEqualPack(entityType, data, columnName, packBean);
}
/**
* longintequal
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNumEqualPackOr(Object data, String columnName, DdlPackMdmModelBean packBean) {
getNumEqualPackOr(entityType, data, columnName, packBean);
}
/**
* longintequal
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNumEqualPackOverZero(Object data, String columnName, DdlPackMdmModelBean packBean) {
getNumEqualPackOverZero(entityType, data, columnName, packBean);
}
/**
* longintequal
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNumWithZeroEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) {
getNumWithZeroEqualPack(entityType, data, columnName, packBean);
}
/**
* String
*
* @param data
* @param columnName
* @param packBean
*/
public static void getStringBiggerPack(Object data, String columnName, DdlPackMdmModelBean packBean) {
getStringBiggerPack(entityType, data, columnName, packBean);
}
/**
* String
*
* @param data
* @param columnName
* @param packBean
*/
public static void getStringBiggerNotEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) {
getStringBiggerNotEqualPack(entityType, data, columnName, packBean);
}
/**
* String
*
* @param data
* @param columnName
* @param packBean
*/
public static void getStringSmallerPack(Object data, String columnName, DdlPackMdmModelBean packBean) {
getStringSmallerPack(entityType, data, columnName, packBean);
}
/**
* String
*
* @param data
* @param columnName
* @param packBean
*/
public static void getStringSmallerNotEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) {
getStringSmallerNotEqualPack(entityType, data, columnName, packBean);
}
/**
* double
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNumberBiggerPack(Object data, String columnName, DdlPackMdmModelBean packBean) {
getNumberBiggerPack(entityType, data, columnName, packBean);
}
/**
* double
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNumberBiggerPackContainsZero(Object data, String columnName, DdlPackMdmModelBean packBean) {
getNumberBiggerPackContainsZero(entityType, data, columnName, packBean);
}
/**
* double
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNumberBiggerEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) {
getNumberBiggerEqualPack(entityType, data, columnName, packBean);
}
/**
* double
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNumberSmallerPack(Object data, String columnName, DdlPackMdmModelBean packBean) {
getNumberSmallerPack(entityType, data, columnName, packBean);
}
/**
* double
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNumberSmallerEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) {
getNumberSmallerEqualPack(entityType, data, columnName, packBean);
}
/**
* longintequal()
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNumNOEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) {
getNumNOEqualPack(entityType, data, columnName, packBean);
}
/**
* in
*
* @param data
* @param columnName
* @param packBean
*/
public static void getInPack(Object data, String columnName, DdlPackMdmModelBean packBean) {
getInPack(entityType, data, columnName, packBean);
}
/**
* or
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNotOrIsNull(Object data, String columnName, DdlPackMdmModelBean packBean) {
getNotOrIsNull(entityType, data, columnName, packBean);
}
/**
* in
*
* @param data
* @param columnName
* @param packBean
*/
public static void getOrInPack(String data, String columnName, DdlPackMdmModelBean packBean) {
getOrInPack(entityType, data, columnName, packBean);
}
/**
* in String
*
* @param data
* @param columnName
* @param packBean
*/
public static void getInPackArray(Object[] data, String columnName, DdlPackMdmModelBean packBean) {
getInPackArray(entityType, data, columnName, packBean);
}
/**
* not in String
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNotInPackArray(Object[] data, String columnName, DdlPackMdmModelBean packBean) {
getNotInPackArray(entityType, data, columnName, packBean);
}
/**
* in String
*
* @param data
* @param columnName
* @param packBean
*/
public static void getInPackList(List<?> data, String columnName, DdlPackMdmModelBean packBean) {
getInPackList(entityType, data, columnName, packBean);
}
/**
* not in List
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNotInPackList(List<?> data, String columnName, DdlPackMdmModelBean packBean) {
getNotInPackList(entityType, data, columnName, packBean);
}
/**
* in String
*
* @param data
* @param columnName
* @param packBean
*/
public static void getInOrPackString(String data, String columnName, DdlPackMdmModelBean packBean) {
getInOrPackString(entityType, data, columnName, packBean);
}
/**
* in String
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNotInPackString(String data, String columnName, DdlPackMdmModelBean packBean) {
getNotInPackString(entityType, data, columnName, packBean);
}
/**
* not in
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNotInPack(Object data, String columnName, DdlPackMdmModelBean packBean) {
getNotInPack(entityType, data, columnName, packBean);
}
/**
*
*
* @param columnName
* @param basisType
* @return
* @see CommonEnumUtil.BASIS_TYPE
*/
public static String getOrderColConvertType(String columnName, int basisType) {
return getOrderColConvertType(entityType, columnName, basisType);
}
}

@ -0,0 +1,499 @@
package cn.estsh.i3plus.pojo.mdm.sqlpack;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil;
import cn.estsh.i3plus.pojo.mdm.bean.base.DdlPackMdmModelBean;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2020-11-22 20:37
* @Modify:
**/
public final class DdlMdmMasterPreparedPack extends DdlMdmModelPreparedPack {
protected static MdmEnumUtil.HQL_ENTITY_TYPE entityType = MdmEnumUtil.HQL_ENTITY_TYPE.MASTER;
/**
*
*
* @param startDate
* @param endDate
* @param columnName HQL
* @param packBean HQL
* @param isShowTime
*/
public static void timeBuilder(String startDate, String endDate, String columnName, DdlPackMdmModelBean packBean, boolean isShowTime) {
timeBuilder(entityType, startDate, endDate, columnName, packBean, isShowTime);
}
/**
*
*
* @param startDate
* @param endDate
* @param columnName
* @param isLeftContain
* @param isRightContain
* @param packBean HQL
*/
public static void timeBuilder(String startDate, String endDate, String columnName, boolean isLeftContain, boolean isRightContain, DdlPackMdmModelBean packBean) {
timeBuilder(entityType, startDate, endDate, columnName, isLeftContain, isRightContain, packBean);
}
/**
*
*
* @param date
* @param columnName HQL
* @param packBean HQL
* @param showTaday true:false:
* @param isShowTime
*/
public static void timeBuilder(String date, String columnName, DdlPackMdmModelBean packBean, Boolean showTaday, boolean isShowTime) {
timeBuilder(entityType, date, columnName, packBean, showTaday, isShowTime);
}
/**
*
*
* @param date
* @param startColumnName HQL
* @param endColumnName HQL
* @param packBean HQL
* @param isShowTime
*/
public static void getTimeBetweenCol(String date, String startColumnName, String endColumnName, DdlPackMdmModelBean packBean, boolean isShowTime) {
getTimeBetweenCol(entityType, date, startColumnName, endColumnName, packBean, isShowTime);
}
/**
* Stringorder by
*s
* @param order
* @param columnName
* @param packBean
*/
public static void getOrderByPack(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, Object[] order, String[] columnName, DdlPackMdmModelBean packBean) {
getOrderByPack(entityTypes, order, columnName, packBean);
}
/**
*
*
* @param bean
*/
public static void getOrderDefault(BaseBean bean) {
getOrderDefault(bean);
}
/**
* Stringlike
*
* @param val
* @param columnName
* @param packBean
*/
public static void getStringLikerPack(String val, String columnName, DdlPackMdmModelBean packBean) {
getStringLikerPack(entityType, val, columnName, packBean);
}
/**
* Stringlike
*
* @param val
* @param columnName
* @param packBean
*/
public static void getStringLikerPackOr(String val, String columnName, DdlPackMdmModelBean packBean) {
getStringLikerPackOr(entityType, val, columnName, packBean);
}
/**
* Stringlike()
*
* @param val
* @param columnName
* @param packBean
*/
public static void getStringRightLikerPack(String val, String columnName, DdlPackMdmModelBean packBean) {
getStringRightLikerPack(entityType, val, columnName, packBean);
}
/**
* Stringlike()
*
* @param val
* @param columnName
* @param packBean
*/
public static void getStringLeftLikerPack(String val, String columnName, DdlPackMdmModelBean packBean) {
getStringLeftLikerPack(entityType, val, columnName, packBean);
}
/**
* Stringequal
*
* @param val
* @param columnName
* @param packBean
*/
public static void getStringEqualPack(String val, String columnName, DdlPackMdmModelBean packBean) {
getStringEqualPack(entityType, val, columnName, packBean);
}
/**
* Stringequal
*
* @param val
* @param columnName
* @param packBean
*/
public static void getStringLikePack(String val, String columnName, DdlPackMdmModelBean packBean) {
getStringLikePack(entityType, val, columnName, packBean);
}
/**
* String
*
* @param val
* @param columnName
* @param packBean
*/
public static void getStringNoEqualPack(String val, String columnName, DdlPackMdmModelBean packBean) {
getStringNoEqualPack(entityType, val, columnName, packBean);
}
/**
* Stringequal
*
* @param columnName
* @param packBean
*/
public static void getStringNotNullPack(String columnName, DdlPackMdmModelBean packBean) {
getStringNotNullPack(entityType, columnName, packBean);
}
/**
* Stringequal
*
* @param columnName
* @param packBean
*/
public static void getStringNotBlanklPack(String columnName, DdlPackMdmModelBean packBean) {
getStringNotBlanklPack(entityType, columnName, packBean);
}
/**
* Stringequal
*
* @param val
* @param columnName
* @param packBean
*/
public static void getStringEqualPackOr(String val, String columnName, DdlPackMdmModelBean packBean) {
getStringEqualPackOr(entityType, val, columnName, packBean);
}
/**
* longintequal
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNumEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) {
getNumEqualPack(entityType, data, columnName, packBean);
}
/**
*
*
* @param firstColumnName
* @param twoColumnName
* @param packBean
*/
public static void getNotEqueals(String firstColumnName, String twoColumnName, DdlPackMdmModelBean packBean) {
getNotEqueals(entityType, firstColumnName, twoColumnName, packBean);
}
/**
* longintequal
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNegativeNumEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) {
getNegativeNumEqualPack(entityType, data, columnName, packBean);
}
/**
* longintequal
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNumEqualPackOr(Object data, String columnName, DdlPackMdmModelBean packBean) {
getNumEqualPackOr(entityType, data, columnName, packBean);
}
/**
* longintequal
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNumEqualPackOverZero(Object data, String columnName, DdlPackMdmModelBean packBean) {
getNumEqualPackOverZero(entityType, data, columnName, packBean);
}
/**
* longintequal
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNumWithZeroEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) {
getNumWithZeroEqualPack(entityType, data, columnName, packBean);
}
/**
* String
*
* @param data
* @param columnName
* @param packBean
*/
public static void getStringBiggerPack(Object data, String columnName, DdlPackMdmModelBean packBean) {
getStringBiggerPack(entityType, data, columnName, packBean);
}
/**
* String
*
* @param data
* @param columnName
* @param packBean
*/
public static void getStringBiggerNotEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) {
getStringBiggerNotEqualPack(entityType, data, columnName, packBean);
}
/**
* String
*
* @param data
* @param columnName
* @param packBean
*/
public static void getStringSmallerPack(Object data, String columnName, DdlPackMdmModelBean packBean) {
getStringSmallerPack(entityType, data, columnName, packBean);
}
/**
* String
*
* @param data
* @param columnName
* @param packBean
*/
public static void getStringSmallerNotEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) {
getStringSmallerNotEqualPack(entityType, data, columnName, packBean);
}
/**
* double
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNumberBiggerPack(Object data, String columnName, DdlPackMdmModelBean packBean) {
getNumberBiggerPack(entityType, data, columnName, packBean);
}
/**
* double
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNumberBiggerPackContainsZero(Object data, String columnName, DdlPackMdmModelBean packBean) {
getNumberBiggerPackContainsZero(entityType, data, columnName, packBean);
}
/**
* double
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNumberBiggerEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) {
getNumberBiggerEqualPack(entityType, data, columnName, packBean);
}
/**
* double
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNumberSmallerPack(Object data, String columnName, DdlPackMdmModelBean packBean) {
getNumberSmallerPack(entityType, data, columnName, packBean);
}
/**
* double
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNumberSmallerEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) {
getNumberSmallerEqualPack(entityType, data, columnName, packBean);
}
/**
* longintequal()
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNumNOEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) {
getNumNOEqualPack(entityType, data, columnName, packBean);
}
/**
* in
*
* @param data
* @param columnName
* @param packBean
*/
public static void getInPack(Object data, String columnName, DdlPackMdmModelBean packBean) {
getInPack(entityType, data, columnName, packBean);
}
/**
* or
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNotOrIsNull(Object data, String columnName, DdlPackMdmModelBean packBean) {
getNotOrIsNull(entityType, data, columnName, packBean);
}
/**
* in
*
* @param data
* @param columnName
* @param packBean
*/
public static void getOrInPack(String data, String columnName, DdlPackMdmModelBean packBean) {
getOrInPack(entityType, data, columnName, packBean);
}
/**
* in String
*
* @param data
* @param columnName
* @param packBean
*/
public static void getInPackArray(Object[] data, String columnName, DdlPackMdmModelBean packBean) {
getInPackArray(entityType, data, columnName, packBean);
}
/**
* not in String
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNotInPackArray(Object[] data, String columnName, DdlPackMdmModelBean packBean) {
getNotInPackArray(entityType, data, columnName, packBean);
}
/**
* in String
*
* @param data
* @param columnName
* @param packBean
*/
public static void getInPackList(List<?> data, String columnName, DdlPackMdmModelBean packBean) {
getInPackList(entityType, data, columnName, packBean);
}
/**
* not in List
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNotInPackList(List<?> data, String columnName, DdlPackMdmModelBean packBean) {
getNotInPackList(entityType, data, columnName, packBean);
}
/**
* in String
*
* @param data
* @param columnName
* @param packBean
*/
public static void getInOrPackString(String data, String columnName, DdlPackMdmModelBean packBean) {
getInOrPackString(entityType, data, columnName, packBean);
}
/**
* in String
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNotInPackString(String data, String columnName, DdlPackMdmModelBean packBean) {
getNotInPackString(entityType, data, columnName, packBean);
}
/**
* not in
*
* @param data
* @param columnName
* @param packBean
*/
public static void getNotInPack(Object data, String columnName, DdlPackMdmModelBean packBean) {
getNotInPack(entityType, data, columnName, packBean);
}
/**
*
*
* @param columnName
* @param basisType
* @return
* @see CommonEnumUtil.BASIS_TYPE
*/
public static String getOrderColConvertType(String columnName, int basisType) {
return getOrderColConvertType(entityType, columnName, basisType);
}
}

@ -180,5 +180,5 @@ public class MesPart extends BaseBean implements Serializable {
@Transient
@ApiParam("是否绑定关键件")
private Integer isBingKey;
private Integer isBindKey;
}

@ -47,6 +47,14 @@ public class MesProdCfgDetail extends BaseBean implements Serializable {
@ApiParam("是否虚零件")
private Integer isVirtual;
@Column(name = "IS_LEFT_PART")
@ApiParam("是否左零件")
private Integer isLeftPart;
@Column(name = "PRINTER_NAME")
@ApiParam("打印机名称")
private String printerName;
@Transient
@ApiParam("零件名称")
private String partName;

@ -190,6 +190,10 @@ public class MesProduceSnTravel extends BaseBean implements Serializable {
@ApiParam("条码类型名称")
private String snTypeName;
@Transient
@ApiParam("节拍时间")
private Integer cycleTime;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}

@ -0,0 +1,76 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
/**
* @Description:
* @Author: jokelin
* @Date: 2021/3/4 7:16 PM
* @Modify:
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Table(name = "MES_QUARANTINE_RECORD", indexes = {
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "PART_NO")
})
@Api("隔离记录表")
public class MesQuarantineRecord extends BaseBean {
private static final long serialVersionUID = -4667731056014803186L;
@Column(name = "SERIAL_NUMBER")
@ApiParam("过程条码")
private String serialNumber;
@Column(name = "PART_NO")
@ApiParam("零件号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("零件名称")
private String partName;
@Column(name = "QTY")
@ApiParam("用量")
private Integer qty;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name = "DEFECT_CODE")
@ApiParam("缺陷代码")
private String defectCode;
@Column(name = "DC_CODE")
@ApiParam("缺陷原因代码")
private String dcCode;
@Column(name = "REPAIR_CODE")
@ApiParam("维修代码")
private String repairCode;
@Column(name = "QUARANTINE_NO")
@ApiParam("隔离单号")
private String quarantineNo;
@Column(name = "SCRAP_No")
@ApiParam("报废单号")
private String scrapNo;
}

@ -35,6 +35,9 @@ public class BypassModel {
@ApiParam("状态")
private String status;
@ApiParam("检测结果")
private Integer result;
@ApiParam("颜色")
private String color;

@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Transient;
/**
@ -147,4 +148,15 @@ public class StepPrintSnModel extends MesProduceSn {
private String tgPartDesc;
@ApiParam("泰国过程条码截取前11位")
private String snTop11;
@ApiParam("缺陷代码")
private String defectCode;
@ApiParam("缺陷原因代码")
private String dcCode;
@ApiParam("维修代码")
private String repairCode;
@ApiParam("质量代码")
private String qcCode;
@ApiParam("打印机名称")
private String printerName;
}

@ -0,0 +1,13 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesQuarantineRecord;
/**
* @Description:
* @Author: jokelin
* @Date: 2021/3/4 7:38 PM
* @Modify:
*/
public interface MesQuarantineRecordRepository extends BaseRepository<MesQuarantineRecord, Long> {
}

@ -0,0 +1,39 @@
package cn.estsh.i3plus.pojo.model.platform;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2021/2/20 4:39
* @desc
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Api("日志字段模型")
public class LogFieldModel implements Serializable {
private static final long serialVersionUID = 6303989757683476327L;
@ApiParam("日志时间")
private String time;
@ApiParam("线程")
private String thread;
@ApiParam("日志等级")
private String level;
@ApiParam("执行堆栈")
private String stack;
@ApiParam("日志信息")
private String message;
}

@ -0,0 +1,57 @@
package cn.estsh.i3plus.pojo.model.platform;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.List;
/**
* @author Wynne.Lu
* @date 2021/2/20 12:55
* @desc
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Api("系统日志模型")
public class SysLogModel implements Serializable {
private static final long serialVersionUID = -2982120258911167575L;
@ApiParam("查询日期")
private String queryDate;
@ApiParam("查询开始时间")
private String queryBeginTime;
@ApiParam("查询结束时间")
private String queryEndTime;
@ApiParam("索引名称")
private String indexName;
@ApiParam("索引类型")
private Integer indexType;
@ApiParam("聚合时间")
private Integer aggsDuration;
@ApiParam("日志等级")
private Integer level;
@ApiParam("执行线程")
private String thread;
@ApiParam("服务器环境变量HostId")
private String hostId;
@ApiParam("日志信息")
private List<LogFieldModel> logs;
}

@ -17,7 +17,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@AllArgsConstructor
@Api("系统登录模型")
public class SystemLoginModel {
public class SysLoginModel {
@ApiParam(value = "登录名")
private String loginName;

@ -1,7 +1,6 @@
package cn.estsh.i3plus.pojo.model.softswitch;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.softswitch.bean.*;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiParam;
@ -46,6 +45,9 @@ public class BsSuitCaseModel implements Serializable {
@ApiParam(value = "FTP 适配器")
private BsSuitCaseFTP bsSuitCaseFTP;
@ApiParam(value = "Sap 适配器")
private BsSuitCaseSap bsSuitCaseSap;
@ApiParam(value = "分页数据")
private Pager pager;

@ -26,46 +26,50 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_LOG_OPERATE")
@Api(value="操作日志表",description = "操作日志表")
@Table(name = "SYS_LOG_OPERATE")
@Api(value = "操作日志表", description = "操作日志表")
public class SysLogOperate extends BaseBean {
private static final long serialVersionUID = 1515035521283176727L;
@ApiParam(value ="系统模块(枚举)", example = "1")
@AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description")
@ApiParam(value = "系统模块(枚举)", example = "1")
@AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class, refForeignKey = "value", value = "description")
private Integer softType;
public String getSoftTypeTxt() {
return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
}
@ApiParam(value ="操作类型" , example = "-1")
@AnnoOutputColumn(refClass = ImppEnumUtil.OPERATE_TYPE.class,refForeignKey = "value",value = "description")
@ApiParam(value = "操作类型", example = "-1")
@AnnoOutputColumn(refClass = ImppEnumUtil.OPERATE_TYPE.class, refForeignKey = "value", value = "description")
private Integer operateType;
public String getOperateTypeTxt(){
public String getOperateTypeTxt() {
return operateType == null ? null : ImppEnumUtil.OPERATE_TYPE.valueOfDescription(operateType);
}
@ApiParam(value ="操作信息" , access ="操作信息")
@ApiParam(value = "操作信息", access = "操作信息")
private String operateMessage;
@ApiParam(value ="登录用户名称" , access ="登录用户名称")
@ApiParam(value = "登录用户名称", access = "登录用户名称")
private String userLoginName;
@ApiParam(value ="请求IP" , access ="请求IP")
@ApiParam(value = "请求IP", access = "请求IP")
private String remoteIp;
@ApiParam(value ="请求路径" , access ="请求路径")
@ApiParam(value = "本机名/Ip", access = "本机名/Ip")
private String serverHost;
@ApiParam(value = "请求路径", access = "请求路径")
private String requestUrl;
// @Column(name="HTTP_METHOD")
// @ApiParam(value ="http请求方法" , access ="http请求方法")
// private String httpMethod;
@ApiParam(value ="方法入参" , access ="方法入参")
@ApiParam(value = "方法入参", access = "方法入参")
private String logArgs;
@ApiParam(value ="执行耗时")
@ApiParam(value = "执行耗时")
@JsonSerialize(using = ToStringSerializer.class)
private Long executeTime;
}

@ -0,0 +1,69 @@
package cn.estsh.i3plus.pojo.softswitch.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2021-01-15 15:40
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "BS_SAP_CONN")
@Api(value = "SAP连接信息", description = "SAP连接信息")
public class BsSapConn extends BaseBean {
private static final long serialVersionUID = -8590500564480743293L;
@Column(name = "SAP_CONN_NAME")
@ApiParam(value = "sap连接名称")
private String sapConnName;
@Column(name = "SAP_CONN_CODE")
@ApiParam(value = "sap连接代码")
private String sapConnCode;
@Column(name = "SAP_HOST")
@ApiParam(value = "SAP 应用服务器")
private String sapHost;
@Column(name = "SAP_ROUTER")
@ApiParam(value = "SAP 路由")
private String sapRouter;
@Column(name = "SAP_SYS_NO")
@ApiParam(value = "sap系统编号")
private String sapSysNo;
@Column(name = "SAP_CLIENT")
@ApiParam(value = "sap集团")
private String sapClient;
@Column(name = "SAP_USER")
@ApiParam(value = "sap用户名")
private String sapUser;
@Column(name = "SAP_PWD")
@ApiParam(value = "sap密码")
private String sapPwd;
@Column(name = "SAP_LANG")
@ApiParam(value = "sap登录语言")
private String sapLang;
}

@ -0,0 +1,60 @@
package cn.estsh.i3plus.pojo.softswitch.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2021-01-18 17:34
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "BS_SUIT_CASE_SAP")
@Api(value = "SAP适配器", description = "SAP适配器")
public class BsSuitCaseSap extends BaseBean {
private static final long serialVersionUID = -2019771592688281243L;
@Column(name = "SUIT_CASE_ID")
@ApiParam(value = "套件id")
@JsonSerialize(using = ToStringSerializer.class)
private Long suitCaseId;
@Column(name = "SAP_CONN_ID")
@ApiParam(value = "sap连接id")
@JsonSerialize(using = ToStringSerializer.class)
private Long sapConnId;
@Column(name = "SAP_CONN_CODE")
@ApiParam(value = "sap连接代码")
private String sapConnCode;
@Column(name = "SAP_CONN_NAME")
@ApiParam(value = "sap连接代码")
private String sapConnName;
@Column(name = "BUSI_FUNC_NAME")
@ApiParam(value = "业务方法")
private String busiFuncName;
@Column(name = "COMMIT_FUNC_NAME")
@ApiParam(value = "提交方法名")
private String commitFuncName;
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.softswitch.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSapConn;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2021-01-19 13:50
* @Modify:
**/
@Repository
public interface BsSapConnRepository extends BaseRepository<BsSapConn,Long> {
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.softswitch.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseSap;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2021-01-19 13:50
* @Modify:
**/
@Repository
public interface BsSuitCaseSapRepository extends BaseRepository<BsSuitCaseSap, Long> {
}

@ -442,4 +442,36 @@ public class SoftSwitchHqlPack {
DdlPreparedPack.getNumNOEqualPack(bsSuitFile.getId(),"id",ddlPackBean);
return ddlPackBean;
}
/**
* sap
* @param bsSapConn
* @return
*/
public static DdlPackBean packHqlBsSapConn(BsSapConn bsSapConn){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringLikerPack(bsSapConn.getSapConnName(), "sapConnName", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bsSapConn.getSapConnCode(), "sapConnCode", ddlPackBean);
ddlPackBean.setOrderByStr(bsSapConn.orderBy());
return ddlPackBean;
}
/**
* sap
* @param bsSapConn
* @return
*/
public static DdlPackBean packHqlCheckBsSapConnOnly(BsSapConn bsSapConn){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getNumNOEqualPack(bsSapConn.getId(), "id", ddlPackBean);
DdlPreparedPack.getStringEqualPack(bsSapConn.getSapConnCode(), "sapConnCode", ddlPackBean);
ddlPackBean.setOrderByStr(bsSapConn.orderBy());
return ddlPackBean;
}
}

@ -77,4 +77,15 @@ public class SwebProcurementPlanOrder extends BaseBean {
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
private Integer consignment=2;
@Column(name = "EXP_DATE")
@ApiParam(value = "过期日期")
private String expDate;
@Column(name = "ITEM")
@ApiParam("行号")
private Integer item;
@Column(name = "START_DATE")
@ApiParam(value = "起始日期")
private String startDate;
}

@ -1,8 +1,10 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -53,5 +55,6 @@ public class WmsBhChildDetectionItem extends BaseBean {
@Column(name = "VALUE_TYPE")
@ApiParam("值类型")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_VALUE_TYPE")
@AnnoOutputColumn(refClass = WmsEnumUtil.BH_VALUE_TYPE.class)
private Integer valueType;
}

@ -1,8 +1,10 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -62,11 +64,13 @@ public class WmsPartItemCheck extends BaseBean {
@Column(name = "VALUE_TYPE")
@ApiParam("子检测箱值类型")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_VALUE_TYPE")
@AnnoOutputColumn(refClass = WmsEnumUtil.BH_VALUE_TYPE.class)
private Integer valueType;
@Column(name = "STANDARD")
@ApiParam("标准值")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "BH_PART_CHECK_STD")
@AnnoOutputColumn(refClass = WmsEnumUtil.BH_PART_CHECK_STD.class)
private Integer standard;
@Column(name = "MAX")

@ -35,7 +35,6 @@
<module>modules/i3plus-pojo-ptl</module>
<module>modules/i3plus-pojo-ics</module>
<module>modules/i3plus-pojo-mdm</module>
<module>modules/i3plus-pojo-base-mongo</module>
</modules>
<dependencies>

Loading…
Cancel
Save