Skip to content

A
AnchorCollect_p
Commit e0d1879c authored by hywang's avatar hywang
Browse files
Options

1.修改登录后获取信息接口，增加了冻精数据获取； 

2.基础信息保存后，自动查找父冻精的信息添加到系谱里；
3.修改保存数据库只能操作一个表，现在可以多表一起 操作。
parent e65e4db2
Hide whitespace changes
Inline Side-by-side
Showing with 1169 additions and 441 deletions
app/build.gradle
View file @ e0d1879c
......@@ -9,8 +9,8 @@ android {
applicationId "com.phlx.anchorcollect_p"
minSdkVersion 21
targetSdkVersion 29
versionCode 20
versionName "2.2.0"
versionCode 21
versionName "2.2.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
......
app/src/main/java/com/phlx/anchorcollect_p/Configs.java
View file @ e0d1879c
......@@ -8,6 +8,7 @@ import android.graphics.Typeface;
import com.phlx.anchorcollect_p.entity.CattleResumeEntity;
import com.phlx.anchorcollect_p.entity.DictEntity;
import com.phlx.anchorcollect_p.entity.FrozenSemenEntity;
import com.phlx.anchorcollect_p.entity.GenTableColumn;
import java.util.ArrayList;
......@@ -119,6 +120,8 @@ public class Configs {
//字典项
public static List<DictEntity> dictList = new ArrayList<>();
public static List<FrozenSemenEntity> frozenSemenList = new ArrayList<>();
//临时存放列表查询可视耳标
public static String tempTag = "";
//临时存放列表查询电子耳标
......
app/src/main/java/com/phlx/anchorcollect_p/data/Repository.java
View file @ e0d1879c
......@@ -16,6 +16,7 @@ import com.phlx.anchorcollect_p.entity.ImmuneBatchDetailEntity;
import com.phlx.anchorcollect_p.entity.ImmuneBatchEntity;
import com.phlx.anchorcollect_p.entity.InspectEntity;
import com.phlx.anchorcollect_p.entity.LoginData;
import com.phlx.anchorcollect_p.entity.LoginInfoData;
import com.phlx.anchorcollect_p.entity.MedicalRecordEntity;
import com.phlx.anchorcollect_p.entity.PerformanceEntity;
import com.phlx.anchorcollect_p.entity.WeightManEntity;
......@@ -96,7 +97,7 @@ public class Repository extends BaseModel implements HttpDataSource, LocalDataSo
}
@Override
public Observable<ListResponse<DictEntity>> downloadDict() {
public Observable<CollectResponse<LoginInfoData>> downloadDict() {
return mHttpDataSource.downloadDict();
}
......
app/src/main/java/com/phlx/anchorcollect_p/data/http/ApiService.java
View file @ e0d1879c
......@@ -12,6 +12,7 @@ import com.phlx.anchorcollect_p.entity.ImmuneBatchDetailEntity;
import com.phlx.anchorcollect_p.entity.ImmuneBatchEntity;
import com.phlx.anchorcollect_p.entity.InspectEntity;
import com.phlx.anchorcollect_p.entity.LoginData;
import com.phlx.anchorcollect_p.entity.LoginInfoData;
import com.phlx.anchorcollect_p.entity.MedicalRecordEntity;
import com.phlx.anchorcollect_p.entity.PerformanceEntity;
import com.phlx.anchorcollect_p.entity.WeightManEntity;
......@@ -67,7 +68,7 @@ public interface ApiService {
* 获取字典项列表
*/
@POST("/api/dict/data/list")
Observable<ListResponse<DictEntity>> downloadDict();
Observable<CollectResponse<LoginInfoData>> downloadDict();
/**
* 获取基础信息列表
......
app/src/main/java/com/phlx/anchorcollect_p/data/http/HttpDataSource.java
View file @ e0d1879c
......@@ -12,6 +12,7 @@ import com.phlx.anchorcollect_p.entity.ImmuneBatchDetailEntity;
import com.phlx.anchorcollect_p.entity.ImmuneBatchEntity;
import com.phlx.anchorcollect_p.entity.InspectEntity;
import com.phlx.anchorcollect_p.entity.LoginData;
import com.phlx.anchorcollect_p.entity.LoginInfoData;
import com.phlx.anchorcollect_p.entity.MedicalRecordEntity;
import com.phlx.anchorcollect_p.entity.PerformanceEntity;
import com.phlx.anchorcollect_p.entity.WeightManEntity;
......@@ -73,7 +74,7 @@ public interface HttpDataSource {
/**
* 获取字典项列表
*/
Observable<ListResponse<DictEntity>> downloadDict();
Observable<CollectResponse<LoginInfoData>> downloadDict();
/**
* 获取性能测定列表
......
app/src/main/java/com/phlx/anchorcollect_p/data/http/HttpDataSourceImpl.java
View file @ e0d1879c
......@@ -12,6 +12,7 @@ import com.phlx.anchorcollect_p.entity.ImmuneBatchDetailEntity;
import com.phlx.anchorcollect_p.entity.ImmuneBatchEntity;
import com.phlx.anchorcollect_p.entity.InspectEntity;
import com.phlx.anchorcollect_p.entity.LoginData;
import com.phlx.anchorcollect_p.entity.LoginInfoData;
import com.phlx.anchorcollect_p.entity.MedicalRecordEntity;
import com.phlx.anchorcollect_p.entity.PerformanceEntity;
import com.phlx.anchorcollect_p.entity.WeightManEntity;
......@@ -88,7 +89,7 @@ public class HttpDataSourceImpl implements HttpDataSource {
}
@Override
public Observable<ListResponse<DictEntity>> downloadDict() {
public Observable<CollectResponse<LoginInfoData>> downloadDict() {
return apiService.downloadDict();
}
......
app/src/main/java/com/phlx/anchorcollect_p/db/DbUtil.java
View file @ e0d1879c
......@@ -32,13 +32,13 @@ import java.util.List;
*/
public class DbUtil {
private static final String DEFAULT_DATABASE_NAME = "AnchorCollect.db";
private static final String DEFAULT_DATABASE_NAME = "BstManager.db";
private static final String DEFAULT_DATABASE_PASSWORD = "phx123456";
private DaoSession mDaoSession;
private DaoMaster mDaoMaster;
private AbstractDao mAbstractDao;
private static DbUtil mDbUtils;
private MyOpenHelper mHelper;
private DaoMaster.DevOpenHelper mHelper;
private DbQueryCallBack mQueryCallBack;
private DbIDUCallBack mIDUCallBack;
......@@ -47,11 +47,9 @@ public class DbUtil {
mHelper = new MyOpenHelper(application, dbName, null);
}
if (passWord == null || passWord.isEmpty()) {
mDaoMaster = new DaoMaster(mHelper.getWritableDatabase());
// mDaoMaster = new DaoMaster(mHelper.getWritableDb());
mDaoMaster = new DaoMaster(mHelper.getWritableDb());
} else {
mDaoMaster = new DaoMaster(mHelper.getEncryptedReadableDb(passWord));
// mDaoMaster = new DaoMaster(mHelper.getEncryptedReadableDb(passWord));
}
mDaoSession = mDaoMaster.newSession();
......@@ -79,6 +77,21 @@ public class DbUtil {
return mDbUtils;
}
/**
* 用于获取当前dao
* @param entityClass
* @return
*/
private AbstractDao getCurDao(Class entityClass){
AbstractDao curDao ;
if (mHelper == null) {
throw new NullPointerException("You need to init mHelper first!");
}
curDao = mDaoSession.getDao(entityClass);
return curDao;
}
public <T> Query<T> getQuery(Class<T> claz) {
return getQueryBuilder(claz).build();
}
......@@ -93,8 +106,8 @@ public class DbUtil {
* @return
*/
public <T> Long count(Class<T> entityClaz) {
setCurrentDao(entityClaz);
return mAbstractDao.count();
// setCurrentDao(entityClaz);
return getCurDao(entityClaz).count();
}
/**
......@@ -103,8 +116,8 @@ public class DbUtil {
* @param dbEntity
*/
public <T> void insert(T dbEntity) {
setCurrentDao(dbEntity.getClass());
mAbstractDao.insert(dbEntity);
// setCurrentDao(dbEntity.getClass());
getCurDao(dbEntity.getClass()).insert(dbEntity);
}
/**
......@@ -113,8 +126,8 @@ public class DbUtil {
* @param dbEntity
*/
public <T> long insertOrReplace(T dbEntity) {
setCurrentDao(dbEntity.getClass());
return mAbstractDao.insertOrReplace(dbEntity);
// setCurrentDao(dbEntity.getClass());
return getCurDao(dbEntity.getClass()).insertOrReplace(dbEntity);
}
/**
......@@ -127,16 +140,22 @@ public class DbUtil {
if (entities == null || entities.size() < 1) {
return;
}
setCurrentDaoOfList(entities);
mAbstractDao.insertInTx(entities);
// setCurrentDaoOfList(entities);
if(entities!=null && entities.size()>0) {
Iterator<T> iterator = entities.iterator();
T next = iterator.next();
getCurDao(next.getClass()).insertInTx(entities);
}
}
public <T> void insertOrReplaceInTx(List<T> entities) {
if (entities == null || entities.size() < 1) {
return;
}
setCurrentDaoOfList(entities);
mAbstractDao.insertOrReplaceInTx(entities);
// setCurrentDaoOfList(entities);
Iterator<T> iterator = entities.iterator();
T next = iterator.next();
getCurDao(next.getClass()).insertOrReplaceInTx(entities);
}
/**
......@@ -145,8 +164,8 @@ public class DbUtil {
* @param entity
*/
public <T> void delete(T entity) {
setCurrentDao(entity.getClass());
mAbstractDao.delete(entity);
// setCurrentDao(entity.getClass());
getCurDao(entity.getClass()).delete(entity);
}
/**
......@@ -155,8 +174,8 @@ public class DbUtil {
* @param id
*/
public <T> void deleteById(Class<T> entityClaz, long id) {
setCurrentDao(entityClaz);
mAbstractDao.deleteByKey(id);
// setCurrentDao(entityClaz);
getCurDao(entityClaz).deleteByKey(id);
}
/**
......@@ -165,16 +184,18 @@ public class DbUtil {
* @param entities
*/
public <T> void deleteList(List<T> entities) {
setCurrentDaoOfList(entities);
mAbstractDao.deleteInTx(entities);
// setCurrentDaoOfList(entities);
Iterator<T> iterator = entities.iterator();
T next = iterator.next();
getCurDao(next.getClass()).deleteInTx(entities);
}
/**
* 全部删除
*/
public <T> void deleteAll(Class<T> claz) {
setCurrentDao(claz);
mAbstractDao.deleteAll();
// setCurrentDao(claz);
getCurDao(claz).deleteAll();
}
/**
......@@ -183,8 +204,8 @@ public class DbUtil {
* @param entity
*/
public <T> void updateData(final T entity) {
setCurrentDao(entity.getClass());
mAbstractDao.update(entity);
// setCurrentDao(entity.getClass());
getCurDao(entity.getClass()).update(entity);
}
/**
......@@ -193,8 +214,10 @@ public class DbUtil {
* @param entities
*/
public <T> void updateListData(Collection<T> entities) {
setCurrentDaoOfList(entities);
mAbstractDao.updateInTx(entities);
// setCurrentDaoOfList(entities);
Iterator<T> iterator = entities.iterator();
T next = iterator.next();
getCurDao(next.getClass()).updateInTx(entities);
}
/**
......@@ -204,8 +227,8 @@ public class DbUtil {
* @return
*/
public <T> T queryById(Class<T> claz, long id) {
setCurrentDao(claz);
return (T) mAbstractDao.load(id);
// setCurrentDao(claz);
return (T) getCurDao(claz).load(id);
}
/**
......@@ -214,24 +237,24 @@ public class DbUtil {
* @return
*/
public <T> List<T> queryAll(Class<T> claz) {
setCurrentDao(claz);
return mAbstractDao.loadAll();
// setCurrentDao(claz);
return getCurDao(claz).loadAll();
}
public <T> List<T> queryAll(Class<T> claz, WhereCondition whereCondition) {
setCurrentDao(claz);
// setCurrentDao(claz);
return mDaoSession.queryBuilder(claz)
.where(whereCondition)
.list();
}
public <T> List<T> queryAll(Class<T> claz, QueryBuilder<T> queryBuilder) {
setCurrentDao(claz);
// setCurrentDao(claz);
return queryBuilder.list();
}
public <T> List<T> queryAll(Class<T> claz, Query<T> query) {
setCurrentDao(claz);
// setCurrentDao(claz);
return query.list();
}
......@@ -246,8 +269,8 @@ public class DbUtil {
* @return
*/
public <T> List<T> queryRaw(Class<T> claz, String whereString, String[] params) {
setCurrentDao(claz);
return mAbstractDao.queryRaw(whereString, params);
// setCurrentDao(claz);
return getCurDao(claz).queryRaw(whereString, params);
}
/**
......@@ -280,17 +303,17 @@ public class DbUtil {
* @param cls
* @return
*/
public <T> void queryAsync(Class<T> cls, WhereCondition whereCondition) {
setCurrentDao(cls);
public <T> void queryAsync(Class<T> cls, WhereCondition whereCondition, DbQueryCallBack mCallBack) {
// setCurrentDao(cls);
AsyncSession asyncSession = mDaoSession.startAsyncSession();
asyncSession.setListenerMainThread(new AsyncOperationListener() {
@Override
public void onAsyncOperationCompleted(AsyncOperation operation) {
if (operation.isCompleted() && mQueryCallBack != null) {
if (operation.isCompleted() && mCallBack != null) {
List<T> result = (List<T>) operation.getResult();
mQueryCallBack.onSuccess(result);
} else if (operation.isFailed() && mQueryCallBack != null) {
mQueryCallBack.onFailed();
mCallBack.onSuccess(result);
} else if (operation.isFailed() && mCallBack != null) {
mCallBack.onFailed();
}
}
});
......@@ -305,17 +328,17 @@ public class DbUtil {
* @param offset
* @return
*/
public <T> void queryAsyncOffset(Class<T> cls, int offset) {
setCurrentDao(cls);
public <T> void queryAsyncOffset(Class<T> cls, int offset, DbQueryCallBack mCallBack) {
// setCurrentDao(cls);
AsyncSession asyncSession = mDaoSession.startAsyncSession();
asyncSession.setListenerMainThread(new AsyncOperationListener() {
@Override
public void onAsyncOperationCompleted(AsyncOperation operation) {
if (operation.isCompleted() && mQueryCallBack != null) {
if (operation.isCompleted() && mCallBack != null) {
List<T> result = (List<T>) operation.getResult();
mQueryCallBack.onSuccess(result);
} else if (operation.isFailed() && mQueryCallBack != null) {
mQueryCallBack.onFailed();
mCallBack.onSuccess(result);
} else if (operation.isFailed() && mCallBack != null) {
mCallBack.onFailed();
}
}
});
......@@ -330,17 +353,17 @@ public class DbUtil {
* @param builder
* @param <T>
*/
public <T> void queryAsyncAll(Class<T> claz, QueryBuilder<T> builder) {
setCurrentDao(claz);
public <T> void queryAsyncAll(Class<T> claz, QueryBuilder<T> builder, DbQueryCallBack mCallBack) {
// setCurrentDao(claz);
AsyncSession asyncSession = mDaoSession.startAsyncSession();
asyncSession.setListenerMainThread(new AsyncOperationListener() {
@Override
public void onAsyncOperationCompleted(AsyncOperation operation) {
if (operation.isCompleted() && mQueryCallBack != null) {
if (operation.isCompleted() && mCallBack != null) {
List<T> result = (List<T>) operation.getResult();
mQueryCallBack.onSuccess(result);
} else if (operation.isFailed() && mQueryCallBack != null) {
mQueryCallBack.onFailed();
mCallBack.onSuccess(result);
} else if (operation.isFailed() && mCallBack != null) {
mCallBack.onFailed();
}
}
});
......@@ -354,16 +377,16 @@ public class DbUtil {
/**
* 删除
*/
public <T> void deleteAsyncSingle(T entry) {
setCurrentDao(entry.getClass());
public <T> void deleteAsyncSingle(T entry, DbIDUCallBack mCallBack) {
// setCurrentDao(entry.getClass());
AsyncSession asyncSession = mDaoSession.startAsyncSession();
asyncSession.setListenerMainThread(new AsyncOperationListener() {
@Override
public void onAsyncOperationCompleted(AsyncOperation operation) {
if (operation.isCompletedSucessfully() && mIDUCallBack != null) {
mIDUCallBack.onNotification(true);
} else if (operation.isFailed() && mIDUCallBack != null) {
mIDUCallBack.onNotification(false);
if (operation.isCompletedSucessfully() && mCallBack != null) {
mCallBack.onNotification(true);
} else if (operation.isFailed() && mCallBack != null) {
mCallBack.onNotification(false);
}
}
});
......@@ -373,16 +396,16 @@ public class DbUtil {
/**
* 批量删除
*/
public <T> void deleteAsyncBatch(Class<T> cls, final List<T> list) {
setCurrentDao(cls);
public <T> void deleteAsyncBatch(Class<T> cls, final List<T> list,DbIDUCallBack mCallBack) {
// setCurrentDao(cls);
AsyncSession asyncSession = mDaoSession.startAsyncSession();
asyncSession.setListenerMainThread(new AsyncOperationListener() {
@Override
public void onAsyncOperationCompleted(AsyncOperation operation) {
if (operation.isCompletedSucessfully() && mIDUCallBack != null) {
mIDUCallBack.onNotification(true);
} else if (operation.isFailed() && mIDUCallBack != null) {
mIDUCallBack.onNotification(false);
if (operation.isCompletedSucessfully() && mCallBack != null) {
mCallBack.onNotification(true);
} else if (operation.isFailed() && mCallBack != null) {
mCallBack.onNotification(false);
}
}
});
......@@ -394,23 +417,23 @@ public class DbUtil {
* 根据Id批量删除
*/
public <T> void deleteByIdBatch(Class<T> claz, List<Long> longList) {
setCurrentDao(claz);
mAbstractDao.deleteByKeyInTx(longList);
// setCurrentDao(claz);
getCurDao(claz).deleteByKeyInTx(longList);
}
/**
* 删除所有数据
*/
public <T> void deleteAsyncAll(Class<T> cls) {
setCurrentDao(cls);
public <T> void deleteAsyncAll(Class<T> cls, DbIDUCallBack mCallBack) {
// setCurrentDao(cls);
final AsyncSession asyncSession = mDaoSession.startAsyncSession();
asyncSession.setListenerMainThread(new AsyncOperationListener() {
@Override
public void onAsyncOperationCompleted(AsyncOperation operation) {
if (operation.isCompletedSucessfully() && mIDUCallBack != null) {
mIDUCallBack.onNotification(true);
} else if (operation.isFailed() && mIDUCallBack != null) {
mIDUCallBack.onNotification(false);
if (operation.isCompletedSucessfully() && mCallBack != null) {
mCallBack.onNotification(true);
} else if (operation.isFailed() && mCallBack != null) {
mCallBack.onNotification(false);
}
}
});
......@@ -420,16 +443,16 @@ public class DbUtil {
/**
* 插入一条数据
*/
public <T> void insertAsyncSingle(final T entity) {
setCurrentDao(entity.getClass());
public <T> void insertAsyncSingle(final T entity, DbIDUCallBack mCallBack) {
// setCurrentDao(entity.getClass());
AsyncSession asyncSession = mDaoSession.startAsyncSession();
asyncSession.setListenerMainThread(new AsyncOperationListener() {
@Override
public void onAsyncOperationCompleted(AsyncOperation operation) {
if (operation.isCompletedSucessfully() && mIDUCallBack != null) {
mIDUCallBack.onNotification(true);
} else if (operation.isFailed() && mIDUCallBack != null) {
mIDUCallBack.onNotification(false);
if (operation.isCompletedSucessfully() && mCallBack != null) {
mCallBack.onNotification(true);
} else if (operation.isFailed() && mCallBack != null) {
mCallBack.onNotification(false);
}
}
});
......@@ -444,24 +467,24 @@ public class DbUtil {
/**
* 批量插入
*/
public <T> void insertAsyncBatch(final Class<T> cls, final List<T> list) {
setCurrentDao(cls);
public <T> void insertAsyncBatch(final Class<T> cls, final List<T> list,DbIDUCallBack mCallBack) {
// setCurrentDao(cls);
AsyncSession asyncSession = mDaoSession.startAsyncSession();
asyncSession.setListenerMainThread(new AsyncOperationListener() {
@Override
public void onAsyncOperationCompleted(AsyncOperation operation) {
if (operation.isCompletedSucessfully() && mIDUCallBack != null) {
mIDUCallBack.onNotification(true);
} else if (operation.isFailed() && mIDUCallBack != null) {
mIDUCallBack.onNotification(false);
if (operation.isCompletedSucessfully() && mCallBack != null) {
mCallBack.onNotification(true);
} else if (operation.isFailed() && mCallBack != null) {
mCallBack.onNotification(false);
}
}
});
asyncSession.runInTx(new Runnable() {
@Override
public void run() {
mAbstractDao.insertOrReplaceInTx(list);
mAbstractDao.detachAll();
getCurDao(cls).insertOrReplaceInTx(list);
getCurDao(cls).detachAll();
}
});
}
......@@ -469,16 +492,16 @@ public class DbUtil {
/**
* 更新一个数据
*/
public <T> void updateAsyncSingle(Class<T> cls, T entry) {
setCurrentDao(cls);
public <T> void updateAsyncSingle(Class<T> cls, T entry, DbIDUCallBack mCallBack) {
// setCurrentDao(cls);
AsyncSession asyncSession = mDaoSession.startAsyncSession();
asyncSession.setListenerMainThread(new AsyncOperationListener() {
@Override
public void onAsyncOperationCompleted(AsyncOperation operation) {
if (operation.isCompletedSucessfully() && mIDUCallBack != null) {
mIDUCallBack.onNotification(true);
} else if (operation.isFailed() && mIDUCallBack != null) {
mIDUCallBack.onNotification(false);
if (operation.isCompletedSucessfully() && mCallBack != null) {
mCallBack.onNotification(true);
} else if (operation.isFailed() && mCallBack != null) {
mCallBack.onNotification(false);
}
}
});
......@@ -488,16 +511,16 @@ public class DbUtil {
/**
* 批量更新数据
*/
public <T> void updateAsyncBatch(final Class<T> cls, final List<T> tList) {
setCurrentDao(cls);
public <T> void updateAsyncBatch(final Class<T> cls, final List<T> tList, DbIDUCallBack mCallBack) {
// setCurrentDao(cls);
AsyncSession asyncSession = mDaoSession.startAsyncSession();
asyncSession.setListenerMainThread(new AsyncOperationListener() {
@Override
public void onAsyncOperationCompleted(AsyncOperation operation) {
if (operation.isCompletedSucessfully() && mIDUCallBack != null) {
mIDUCallBack.onNotification(true);
} else if (operation.isFailed() && mIDUCallBack != null) {
mIDUCallBack.onNotification(false);
if (operation.isCompletedSucessfully() && mCallBack != null) {
mCallBack.onNotification(true);
} else if (operation.isFailed() && mCallBack != null) {
mCallBack.onNotification(false);
}
}
});
......@@ -557,7 +580,7 @@ public class DbUtil {
}
private <T> void setCurrentDaoOfList(Collection<T> entities) {
if (entities != null && entities.size() >= 1) {
if (entities != null && entities.size() > 1) {
Iterator<T> iterator = entities.iterator();
T next = iterator.next();
setCurrentDao(next.getClass());
......
app/src/main/java/com/phlx/anchorcollect_p/db/gen/CattleResumeEntityDao.java
View file @ e0d1879c
......@@ -39,25 +39,37 @@ public class CattleResumeEntityDao extends AbstractDao<CattleResumeEntity, Long>
public final static Property Grade = new Property(12, String.class, "grade", false, "GRADE");
public final static Property FatherReg = new Property(13, String.class, "fatherReg", false, "FATHER_REG");
public final static Property MotherReg = new Property(14, String.class, "motherReg", false, "MOTHER_REG");
public final static Property FromMilkHeavy = new Property(15, Double.class, "fromMilkHeavy", false, "FROM_MILK_HEAVY");
public final static Property Health = new Property(16, String.class, "health", false, "HEALTH");
public final static Property JunHeavy = new Property(17, String.class, "junHeavy", false, "JUN_HEAVY");
public final static Property DecAppScore = new Property(18, String.class, "decAppScore", false, "DEC_APP_SCORE");
public final static Property Photo = new Property(19, String.class, "photo", false, "PHOTO");
public final static Property PhotoPath = new Property(20, String.class, "photoPath", false, "PHOTO_PATH");
public final static Property Status = new Property(21, String.class, "status", false, "STATUS");
public final static Property IsOut = new Property(22, Long.class, "isOut", false, "IS_OUT");
public final static Property Age = new Property(23, Integer.class, "age", false, "AGE");
public final static Property Colour = new Property(24, String.class, "colour", false, "COLOUR");
public final static Property InputTime = new Property(25, String.class, "inputTime", false, "INPUT_TIME");
public final static Property DeptId = new Property(26, Long.class, "deptId", false, "DEPT_ID");
public final static Property UploadStatus = new Property(27, String.class, "uploadStatus", false, "UPLOAD_STATUS");
public final static Property UploadTime = new Property(28, String.class, "uploadTime", false, "UPLOAD_TIME");
public final static Property CreateBy = new Property(29, String.class, "createBy", false, "CREATE_BY");
public final static Property CreateTime = new Property(30, String.class, "createTime", false, "CREATE_TIME");
public final static Property UpdateBy = new Property(31, String.class, "updateBy", false, "UPDATE_BY");
public final static Property UpdateTime = new Property(32, String.class, "updateTime", false, "UPDATE_TIME");
public final static Property Remark = new Property(33, String.class, "remark", false, "REMARK");
public final static Property FfNum = new Property(15, String.class, "ffNum", false, "FF_NUM");
public final static Property FmNum = new Property(16, String.class, "fmNum", false, "FM_NUM");
public final static Property MfNum = new Property(17, String.class, "mfNum", false, "MF_NUM");
public final static Property MmNum = new Property(18, String.class, "mmNum", false, "MM_NUM");
public final static Property FffNum = new Property(19, String.class, "fffNum", false, "FFF_NUM");
public final static Property FfmNum = new Property(20, String.class, "ffmNum", false, "FFM_NUM");
public final static Property FmfNum = new Property(21, String.class, "fmfNum", false, "FMF_NUM");
public final static Property FmmNum = new Property(22, String.class, "fmmNum", false, "FMM_NUM");
public final static Property MffNum = new Property(23, String.class, "mffNum", false, "MFF_NUM");
public final static Property MfmNum = new Property(24, String.class, "mfmNum", false, "MFM_NUM");
public final static Property MmfNum = new Property(25, String.class, "mmfNum", false, "MMF_NUM");
public final static Property MmmNum = new Property(26, String.class, "mmmNum", false, "MMM_NUM");
public final static Property FromMilkHeavy = new Property(27, Double.class, "fromMilkHeavy", false, "FROM_MILK_HEAVY");
public final static Property Health = new Property(28, String.class, "health", false, "HEALTH");
public final static Property JunHeavy = new Property(29, String.class, "junHeavy", false, "JUN_HEAVY");
public final static Property DecAppScore = new Property(30, String.class, "decAppScore", false, "DEC_APP_SCORE");
public final static Property Photo = new Property(31, String.class, "photo", false, "PHOTO");
public final static Property PhotoPath = new Property(32, String.class, "photoPath", false, "PHOTO_PATH");
public final static Property Status = new Property(33, String.class, "status", false, "STATUS");
public final static Property IsOut = new Property(34, Long.class, "isOut", false, "IS_OUT");
public final static Property Age = new Property(35, Integer.class, "age", false, "AGE");
public final static Property Colour = new Property(36, String.class, "colour", false, "COLOUR");
public final static Property InputTime = new Property(37, String.class, "inputTime", false, "INPUT_TIME");
public final static Property DeptId = new Property(38, Long.class, "deptId", false, "DEPT_ID");
public final static Property UploadStatus = new Property(39, String.class, "uploadStatus", false, "UPLOAD_STATUS");
public final static Property UploadTime = new Property(40, String.class, "uploadTime", false, "UPLOAD_TIME");
public final static Property CreateBy = new Property(41, String.class, "createBy", false, "CREATE_BY");
public final static Property CreateTime = new Property(42, String.class, "createTime", false, "CREATE_TIME");
public final static Property UpdateBy = new Property(43, String.class, "updateBy", false, "UPDATE_BY");
public final static Property UpdateTime = new Property(44, String.class, "updateTime", false, "UPDATE_TIME");
public final static Property Remark = new Property(45, String.class, "remark", false, "REMARK");
}
......@@ -88,25 +100,37 @@ public class CattleResumeEntityDao extends AbstractDao<CattleResumeEntity, Long>
"\"GRADE\" TEXT," + // 12: grade
"\"FATHER_REG\" TEXT," + // 13: fatherReg
"\"MOTHER_REG\" TEXT," + // 14: motherReg
"\"FROM_MILK_HEAVY\" REAL," + // 15: fromMilkHeavy
"\"HEALTH\" TEXT," + // 16: health
"\"JUN_HEAVY\" TEXT," + // 17: junHeavy
"\"DEC_APP_SCORE\" TEXT," + // 18: decAppScore
"\"PHOTO\" TEXT," + // 19: photo
"\"PHOTO_PATH\" TEXT," + // 20: photoPath
"\"STATUS\" TEXT," + // 21: status
"\"IS_OUT\" INTEGER," + // 22: isOut
"\"AGE\" INTEGER," + // 23: age
"\"COLOUR\" TEXT," + // 24: colour
"\"INPUT_TIME\" TEXT," + // 25: inputTime
"\"DEPT_ID\" INTEGER," + // 26: deptId
"\"UPLOAD_STATUS\" TEXT," + // 27: uploadStatus
"\"UPLOAD_TIME\" TEXT," + // 28: uploadTime
"\"CREATE_BY\" TEXT," + // 29: createBy
"\"CREATE_TIME\" TEXT," + // 30: createTime
"\"UPDATE_BY\" TEXT," + // 31: updateBy
"\"UPDATE_TIME\" TEXT," + // 32: updateTime
"\"REMARK\" TEXT);"); // 33: remark
"\"FF_NUM\" TEXT," + // 15: ffNum
"\"FM_NUM\" TEXT," + // 16: fmNum
"\"MF_NUM\" TEXT," + // 17: mfNum
"\"MM_NUM\" TEXT," + // 18: mmNum
"\"FFF_NUM\" TEXT," + // 19: fffNum
"\"FFM_NUM\" TEXT," + // 20: ffmNum
"\"FMF_NUM\" TEXT," + // 21: fmfNum
"\"FMM_NUM\" TEXT," + // 22: fmmNum
"\"MFF_NUM\" TEXT," + // 23: mffNum
"\"MFM_NUM\" TEXT," + // 24: mfmNum
"\"MMF_NUM\" TEXT," + // 25: mmfNum
"\"MMM_NUM\" TEXT," + // 26: mmmNum
"\"FROM_MILK_HEAVY\" REAL," + // 27: fromMilkHeavy
"\"HEALTH\" TEXT," + // 28: health
"\"JUN_HEAVY\" TEXT," + // 29: junHeavy
"\"DEC_APP_SCORE\" TEXT," + // 30: decAppScore
"\"PHOTO\" TEXT," + // 31: photo
"\"PHOTO_PATH\" TEXT," + // 32: photoPath
"\"STATUS\" TEXT," + // 33: status
"\"IS_OUT\" INTEGER," + // 34: isOut
"\"AGE\" INTEGER," + // 35: age
"\"COLOUR\" TEXT," + // 36: colour
"\"INPUT_TIME\" TEXT," + // 37: inputTime
"\"DEPT_ID\" INTEGER," + // 38: deptId
"\"UPLOAD_STATUS\" TEXT," + // 39: uploadStatus
"\"UPLOAD_TIME\" TEXT," + // 40: uploadTime
"\"CREATE_BY\" TEXT," + // 41: createBy
"\"CREATE_TIME\" TEXT," + // 42: createTime
"\"UPDATE_BY\" TEXT," + // 43: updateBy
"\"UPDATE_TIME\" TEXT," + // 44: updateTime
"\"REMARK\" TEXT);"); // 45: remark
}
/** Drops the underlying database table. */
......@@ -194,99 +218,159 @@ public class CattleResumeEntityDao extends AbstractDao<CattleResumeEntity, Long>
stmt.bindString(15, motherReg);
}
String ffNum = entity.getFfNum();
if (ffNum != null) {
stmt.bindString(16, ffNum);
}
String fmNum = entity.getFmNum();
if (fmNum != null) {
stmt.bindString(17, fmNum);
}
String mfNum = entity.getMfNum();
if (mfNum != null) {
stmt.bindString(18, mfNum);
}
String mmNum = entity.getMmNum();
if (mmNum != null) {
stmt.bindString(19, mmNum);
}
String fffNum = entity.getFffNum();
if (fffNum != null) {
stmt.bindString(20, fffNum);
}
String ffmNum = entity.getFfmNum();
if (ffmNum != null) {
stmt.bindString(21, ffmNum);
}
String fmfNum = entity.getFmfNum();
if (fmfNum != null) {
stmt.bindString(22, fmfNum);
}
String fmmNum = entity.getFmmNum();
if (fmmNum != null) {
stmt.bindString(23, fmmNum);
}
String mffNum = entity.getMffNum();
if (mffNum != null) {
stmt.bindString(24, mffNum);
}
String mfmNum = entity.getMfmNum();
if (mfmNum != null) {
stmt.bindString(25, mfmNum);
}
String mmfNum = entity.getMmfNum();
if (mmfNum != null) {
stmt.bindString(26, mmfNum);
}
String mmmNum = entity.getMmmNum();
if (mmmNum != null) {
stmt.bindString(27, mmmNum);
}
Double fromMilkHeavy = entity.getFromMilkHeavy();
if (fromMilkHeavy != null) {
stmt.bindDouble(16, fromMilkHeavy);
stmt.bindDouble(28, fromMilkHeavy);
}
String health = entity.getHealth();
if (health != null) {
stmt.bindString(17, health);
stmt.bindString(29, health);
}
String junHeavy = entity.getJunHeavy();
if (junHeavy != null) {
stmt.bindString(18, junHeavy);
stmt.bindString(30, junHeavy);
}
String decAppScore = entity.getDecAppScore();
if (decAppScore != null) {
stmt.bindString(19, decAppScore);
stmt.bindString(31, decAppScore);
}
String photo = entity.getPhoto();
if (photo != null) {
stmt.bindString(20, photo);
stmt.bindString(32, photo);
}
String photoPath = entity.getPhotoPath();
if (photoPath != null) {
stmt.bindString(21, photoPath);
stmt.bindString(33, photoPath);
}
String status = entity.getStatus();
if (status != null) {
stmt.bindString(22, status);
stmt.bindString(34, status);
}
Long isOut = entity.getIsOut();
if (isOut != null) {
stmt.bindLong(23, isOut);
stmt.bindLong(35, isOut);
}
Integer age = entity.getAge();
if (age != null) {
stmt.bindLong(24, age);
stmt.bindLong(36, age);
}
String colour = entity.getColour();
if (colour != null) {
stmt.bindString(25, colour);
stmt.bindString(37, colour);
}
String inputTime = entity.getInputTime();
if (inputTime != null) {
stmt.bindString(26, inputTime);
stmt.bindString(38, inputTime);
}
Long deptId = entity.getDeptId();
if (deptId != null) {
stmt.bindLong(27, deptId);
stmt.bindLong(39, deptId);
}
String uploadStatus = entity.getUploadStatus();
if (uploadStatus != null) {
stmt.bindString(28, uploadStatus);
stmt.bindString(40, uploadStatus);
}
String uploadTime = entity.getUploadTime();
if (uploadTime != null) {
stmt.bindString(29, uploadTime);
stmt.bindString(41, uploadTime);
}
String createBy = entity.getCreateBy();
if (createBy != null) {
stmt.bindString(30, createBy);
stmt.bindString(42, createBy);
}
String createTime = entity.getCreateTime();
if (createTime != null) {
stmt.bindString(31, createTime);
stmt.bindString(43, createTime);
}
String updateBy = entity.getUpdateBy();
if (updateBy != null) {
stmt.bindString(32, updateBy);
stmt.bindString(44, updateBy);
}
String updateTime = entity.getUpdateTime();
if (updateTime != null) {
stmt.bindString(33, updateTime);
stmt.bindString(45, updateTime);
}
String remark = entity.getRemark();
if (remark != null) {
stmt.bindString(34, remark);
stmt.bindString(46, remark);
}
}
......@@ -369,99 +453,159 @@ public class CattleResumeEntityDao extends AbstractDao<CattleResumeEntity, Long>
stmt.bindString(15, motherReg);
}
String ffNum = entity.getFfNum();
if (ffNum != null) {
stmt.bindString(16, ffNum);
}
String fmNum = entity.getFmNum();
if (fmNum != null) {
stmt.bindString(17, fmNum);
}
String mfNum = entity.getMfNum();
if (mfNum != null) {
stmt.bindString(18, mfNum);
}
String mmNum = entity.getMmNum();
if (mmNum != null) {
stmt.bindString(19, mmNum);
}
String fffNum = entity.getFffNum();
if (fffNum != null) {
stmt.bindString(20, fffNum);
}
String ffmNum = entity.getFfmNum();
if (ffmNum != null) {
stmt.bindString(21, ffmNum);
}
String fmfNum = entity.getFmfNum();
if (fmfNum != null) {
stmt.bindString(22, fmfNum);
}
String fmmNum = entity.getFmmNum();
if (fmmNum != null) {
stmt.bindString(23, fmmNum);
}
String mffNum = entity.getMffNum();
if (mffNum != null) {
stmt.bindString(24, mffNum);
}
String mfmNum = entity.getMfmNum();
if (mfmNum != null) {
stmt.bindString(25, mfmNum);
}
String mmfNum = entity.getMmfNum();
if (mmfNum != null) {
stmt.bindString(26, mmfNum);
}
String mmmNum = entity.getMmmNum();
if (mmmNum != null) {
stmt.bindString(27, mmmNum);
}
Double fromMilkHeavy = entity.getFromMilkHeavy();
if (fromMilkHeavy != null) {
stmt.bindDouble(16, fromMilkHeavy);
stmt.bindDouble(28, fromMilkHeavy);
}
String health = entity.getHealth();
if (health != null) {
stmt.bindString(17, health);
stmt.bindString(29, health);
}
String junHeavy = entity.getJunHeavy();
if (junHeavy != null) {
stmt.bindString(18, junHeavy);
stmt.bindString(30, junHeavy);
}
String decAppScore = entity.getDecAppScore();
if (decAppScore != null) {
stmt.bindString(19, decAppScore);
stmt.bindString(31, decAppScore);
}
String photo = entity.getPhoto();
if (photo != null) {
stmt.bindString(20, photo);
stmt.bindString(32, photo);
}
String photoPath = entity.getPhotoPath();
if (photoPath != null) {
stmt.bindString(21, photoPath);
stmt.bindString(33, photoPath);
}
String status = entity.getStatus();
if (status != null) {
stmt.bindString(22, status);
stmt.bindString(34, status);
}
Long isOut = entity.getIsOut();
if (isOut != null) {
stmt.bindLong(23, isOut);
stmt.bindLong(35, isOut);
}
Integer age = entity.getAge();
if (age != null) {
stmt.bindLong(24, age);
stmt.bindLong(36, age);
}
String colour = entity.getColour();
if (colour != null) {
stmt.bindString(25, colour);
stmt.bindString(37, colour);
}
String inputTime = entity.getInputTime();
if (inputTime != null) {
stmt.bindString(26, inputTime);
stmt.bindString(38, inputTime);
}
Long deptId = entity.getDeptId();
if (deptId != null) {
stmt.bindLong(27, deptId);
stmt.bindLong(39, deptId);
}
String uploadStatus = entity.getUploadStatus();
if (uploadStatus != null) {
stmt.bindString(28, uploadStatus);
stmt.bindString(40, uploadStatus);
}
String uploadTime = entity.getUploadTime();
if (uploadTime != null) {
stmt.bindString(29, uploadTime);
stmt.bindString(41, uploadTime);
}
String createBy = entity.getCreateBy();
if (createBy != null) {
stmt.bindString(30, createBy);
stmt.bindString(42, createBy);
}
String createTime = entity.getCreateTime();
if (createTime != null) {
stmt.bindString(31, createTime);
stmt.bindString(43, createTime);
}
String updateBy = entity.getUpdateBy();
if (updateBy != null) {
stmt.bindString(32, updateBy);
stmt.bindString(44, updateBy);
}
String updateTime = entity.getUpdateTime();
if (updateTime != null) {
stmt.bindString(33, updateTime);
stmt.bindString(45, updateTime);
}
String remark = entity.getRemark();
if (remark != null) {
stmt.bindString(34, remark);
stmt.bindString(46, remark);
}
}
......@@ -488,25 +632,37 @@ public class CattleResumeEntityDao extends AbstractDao<CattleResumeEntity, Long>
cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12), // grade
cursor.isNull(offset + 13) ? null : cursor.getString(offset + 13), // fatherReg
cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14), // motherReg
cursor.isNull(offset + 15) ? null : cursor.getDouble(offset + 15), // fromMilkHeavy
cursor.isNull(offset + 16) ? null : cursor.getString(offset + 16), // health
cursor.isNull(offset + 17) ? null : cursor.getString(offset + 17), // junHeavy
cursor.isNull(offset + 18) ? null : cursor.getString(offset + 18), // decAppScore
cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19), // photo
cursor.isNull(offset + 20) ? null : cursor.getString(offset + 20), // photoPath
cursor.isNull(offset + 21) ? null : cursor.getString(offset + 21), // status
cursor.isNull(offset + 22) ? null : cursor.getLong(offset + 22), // isOut
cursor.isNull(offset + 23) ? null : cursor.getInt(offset + 23), // age
cursor.isNull(offset + 24) ? null : cursor.getString(offset + 24), // colour
cursor.isNull(offset + 25) ? null : cursor.getString(offset + 25), // inputTime
cursor.isNull(offset + 26) ? null : cursor.getLong(offset + 26), // deptId
cursor.isNull(offset + 27) ? null : cursor.getString(offset + 27), // uploadStatus
cursor.isNull(offset + 28) ? null : cursor.getString(offset + 28), // uploadTime
cursor.isNull(offset + 29) ? null : cursor.getString(offset + 29), // createBy
cursor.isNull(offset + 30) ? null : cursor.getString(offset + 30), // createTime
cursor.isNull(offset + 31) ? null : cursor.getString(offset + 31), // updateBy
cursor.isNull(offset + 32) ? null : cursor.getString(offset + 32), // updateTime
cursor.isNull(offset + 33) ? null : cursor.getString(offset + 33) // remark
cursor.isNull(offset + 15) ? null : cursor.getString(offset + 15), // ffNum
cursor.isNull(offset + 16) ? null : cursor.getString(offset + 16), // fmNum
cursor.isNull(offset + 17) ? null : cursor.getString(offset + 17), // mfNum
cursor.isNull(offset + 18) ? null : cursor.getString(offset + 18), // mmNum
cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19), // fffNum
cursor.isNull(offset + 20) ? null : cursor.getString(offset + 20), // ffmNum
cursor.isNull(offset + 21) ? null : cursor.getString(offset + 21), // fmfNum
cursor.isNull(offset + 22) ? null : cursor.getString(offset + 22), // fmmNum
cursor.isNull(offset + 23) ? null : cursor.getString(offset + 23), // mffNum
cursor.isNull(offset + 24) ? null : cursor.getString(offset + 24), // mfmNum
cursor.isNull(offset + 25) ? null : cursor.getString(offset + 25), // mmfNum
cursor.isNull(offset + 26) ? null : cursor.getString(offset + 26), // mmmNum
cursor.isNull(offset + 27) ? null : cursor.getDouble(offset + 27), // fromMilkHeavy
cursor.isNull(offset + 28) ? null : cursor.getString(offset + 28), // health
cursor.isNull(offset + 29) ? null : cursor.getString(offset + 29), // junHeavy
cursor.isNull(offset + 30) ? null : cursor.getString(offset + 30), // decAppScore
cursor.isNull(offset + 31) ? null : cursor.getString(offset + 31), // photo
cursor.isNull(offset + 32) ? null : cursor.getString(offset + 32), // photoPath
cursor.isNull(offset + 33) ? null : cursor.getString(offset + 33), // status
cursor.isNull(offset + 34) ? null : cursor.getLong(offset + 34), // isOut
cursor.isNull(offset + 35) ? null : cursor.getInt(offset + 35), // age
cursor.isNull(offset + 36) ? null : cursor.getString(offset + 36), // colour
cursor.isNull(offset + 37) ? null : cursor.getString(offset + 37), // inputTime
cursor.isNull(offset + 38) ? null : cursor.getLong(offset + 38), // deptId
cursor.isNull(offset + 39) ? null : cursor.getString(offset + 39), // uploadStatus
cursor.isNull(offset + 40) ? null : cursor.getString(offset + 40), // uploadTime
cursor.isNull(offset + 41) ? null : cursor.getString(offset + 41), // createBy
cursor.isNull(offset + 42) ? null : cursor.getString(offset + 42), // createTime
cursor.isNull(offset + 43) ? null : cursor.getString(offset + 43), // updateBy
cursor.isNull(offset + 44) ? null : cursor.getString(offset + 44), // updateTime
cursor.isNull(offset + 45) ? null : cursor.getString(offset + 45) // remark
);
return entity;
}
......@@ -528,25 +684,37 @@ public class CattleResumeEntityDao extends AbstractDao<CattleResumeEntity, Long>
entity.setGrade(cursor.isNull(offset + 12) ? null : cursor.getString(offset + 12));
entity.setFatherReg(cursor.isNull(offset + 13) ? null : cursor.getString(offset + 13));
entity.setMotherReg(cursor.isNull(offset + 14) ? null : cursor.getString(offset + 14));
entity.setFromMilkHeavy(cursor.isNull(offset + 15) ? null : cursor.getDouble(offset + 15));
entity.setHealth(cursor.isNull(offset + 16) ? null : cursor.getString(offset + 16));
entity.setJunHeavy(cursor.isNull(offset + 17) ? null : cursor.getString(offset + 17));
entity.setDecAppScore(cursor.isNull(offset + 18) ? null : cursor.getString(offset + 18));
entity.setPhoto(cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19));
entity.setPhotoPath(cursor.isNull(offset + 20) ? null : cursor.getString(offset + 20));
entity.setStatus(cursor.isNull(offset + 21) ? null : cursor.getString(offset + 21));
entity.setIsOut(cursor.isNull(offset + 22) ? null : cursor.getLong(offset + 22));
entity.setAge(cursor.isNull(offset + 23) ? null : cursor.getInt(offset + 23));
entity.setColour(cursor.isNull(offset + 24) ? null : cursor.getString(offset + 24));
entity.setInputTime(cursor.isNull(offset + 25) ? null : cursor.getString(offset + 25));
entity.setDeptId(cursor.isNull(offset + 26) ? null : cursor.getLong(offset + 26));
entity.setUploadStatus(cursor.isNull(offset + 27) ? null : cursor.getString(offset + 27));
entity.setUploadTime(cursor.isNull(offset + 28) ? null : cursor.getString(offset + 28));
entity.setCreateBy(cursor.isNull(offset + 29) ? null : cursor.getString(offset + 29));
entity.setCreateTime(cursor.isNull(offset + 30) ? null : cursor.getString(offset + 30));
entity.setUpdateBy(cursor.isNull(offset + 31) ? null : cursor.getString(offset + 31));
entity.setUpdateTime(cursor.isNull(offset + 32) ? null : cursor.getString(offset + 32));
entity.setRemark(cursor.isNull(offset + 33) ? null : cursor.getString(offset + 33));
entity.setFfNum(cursor.isNull(offset + 15) ? null : cursor.getString(offset + 15));
entity.setFmNum(cursor.isNull(offset + 16) ? null : cursor.getString(offset + 16));
entity.setMfNum(cursor.isNull(offset + 17) ? null : cursor.getString(offset + 17));
entity.setMmNum(cursor.isNull(offset + 18) ? null : cursor.getString(offset + 18));
entity.setFffNum(cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19));
entity.setFfmNum(cursor.isNull(offset + 20) ? null : cursor.getString(offset + 20));
entity.setFmfNum(cursor.isNull(offset + 21) ? null : cursor.getString(offset + 21));
entity.setFmmNum(cursor.isNull(offset + 22) ? null : cursor.getString(offset + 22));
entity.setMffNum(cursor.isNull(offset + 23) ? null : cursor.getString(offset + 23));
entity.setMfmNum(cursor.isNull(offset + 24) ? null : cursor.getString(offset + 24));
entity.setMmfNum(cursor.isNull(offset + 25) ? null : cursor.getString(offset + 25));
entity.setMmmNum(cursor.isNull(offset + 26) ? null : cursor.getString(offset + 26));
entity.setFromMilkHeavy(cursor.isNull(offset + 27) ? null : cursor.getDouble(offset + 27));
entity.setHealth(cursor.isNull(offset + 28) ? null : cursor.getString(offset + 28));
entity.setJunHeavy(cursor.isNull(offset + 29) ? null : cursor.getString(offset + 29));
entity.setDecAppScore(cursor.isNull(offset + 30) ? null : cursor.getString(offset + 30));
entity.setPhoto(cursor.isNull(offset + 31) ? null : cursor.getString(offset + 31));
entity.setPhotoPath(cursor.isNull(offset + 32) ? null : cursor.getString(offset + 32));
entity.setStatus(cursor.isNull(offset + 33) ? null : cursor.getString(offset + 33));
entity.setIsOut(cursor.isNull(offset + 34) ? null : cursor.getLong(offset + 34));
entity.setAge(cursor.isNull(offset + 35) ? null : cursor.getInt(offset + 35));
entity.setColour(cursor.isNull(offset + 36) ? null : cursor.getString(offset + 36));
entity.setInputTime(cursor.isNull(offset + 37) ? null : cursor.getString(offset + 37));
entity.setDeptId(cursor.isNull(offset + 38) ? null : cursor.getLong(offset + 38));
entity.setUploadStatus(cursor.isNull(offset + 39) ? null : cursor.getString(offset + 39));
entity.setUploadTime(cursor.isNull(offset + 40) ? null : cursor.getString(offset + 40));
entity.setCreateBy(cursor.isNull(offset + 41) ? null : cursor.getString(offset + 41));
entity.setCreateTime(cursor.isNull(offset + 42) ? null : cursor.getString(offset + 42));
entity.setUpdateBy(cursor.isNull(offset + 43) ? null : cursor.getString(offset + 43));
entity.setUpdateTime(cursor.isNull(offset + 44) ? null : cursor.getString(offset + 44));
entity.setRemark(cursor.isNull(offset + 45) ? null : cursor.getString(offset + 45));
}
@Override
......
app/src/main/java/com/phlx/anchorcollect_p/db/gen/DaoMaster.java
View file @ e0d1879c
......@@ -26,6 +26,7 @@ public class DaoMaster extends AbstractDaoMaster {
BreedingRecordEntityDao.createTable(db, ifNotExists);
CattleResumeEntityDao.createTable(db, ifNotExists);
DictEntityDao.createTable(db, ifNotExists);
FrozenSemenEntityDao.createTable(db, ifNotExists);
GenTableDao.createTable(db, ifNotExists);
GenTableColumnDao.createTable(db, ifNotExists);
ImmuneBatchDetailEntityDao.createTable(db, ifNotExists);
......@@ -43,6 +44,7 @@ public class DaoMaster extends AbstractDaoMaster {
BreedingRecordEntityDao.dropTable(db, ifExists);
CattleResumeEntityDao.dropTable(db, ifExists);
DictEntityDao.dropTable(db, ifExists);
FrozenSemenEntityDao.dropTable(db, ifExists);
GenTableDao.dropTable(db, ifExists);
GenTableColumnDao.dropTable(db, ifExists);
ImmuneBatchDetailEntityDao.dropTable(db, ifExists);
......@@ -74,6 +76,7 @@ public class DaoMaster extends AbstractDaoMaster {
registerDaoClass(BreedingRecordEntityDao.class);
registerDaoClass(CattleResumeEntityDao.class);
registerDaoClass(DictEntityDao.class);
registerDaoClass(FrozenSemenEntityDao.class);
registerDaoClass(GenTableDao.class);
registerDaoClass(GenTableColumnDao.class);
registerDaoClass(ImmuneBatchDetailEntityDao.class);
......
app/src/main/java/com/phlx/anchorcollect_p/db/gen/DaoSession.java
View file @ e0d1879c
......@@ -13,6 +13,7 @@ import com.phlx.anchorcollect_p.entity.BreedingRecordDetailEntity;
import com.phlx.anchorcollect_p.entity.BreedingRecordEntity;
import com.phlx.anchorcollect_p.entity.CattleResumeEntity;
import com.phlx.anchorcollect_p.entity.DictEntity;
import com.phlx.anchorcollect_p.entity.FrozenSemenEntity;
import com.phlx.anchorcollect_p.entity.GenTable;
import com.phlx.anchorcollect_p.entity.GenTableColumn;
import com.phlx.anchorcollect_p.entity.ImmuneBatchDetailEntity;
......@@ -27,6 +28,7 @@ import com.phlx.anchorcollect_p.db.gen.BreedingRecordDetailEntityDao;
import com.phlx.anchorcollect_p.db.gen.BreedingRecordEntityDao;
import com.phlx.anchorcollect_p.db.gen.CattleResumeEntityDao;
import com.phlx.anchorcollect_p.db.gen.DictEntityDao;
import com.phlx.anchorcollect_p.db.gen.FrozenSemenEntityDao;
import com.phlx.anchorcollect_p.db.gen.GenTableDao;
import com.phlx.anchorcollect_p.db.gen.GenTableColumnDao;
import com.phlx.anchorcollect_p.db.gen.ImmuneBatchDetailEntityDao;
......@@ -50,6 +52,7 @@ public class DaoSession extends AbstractDaoSession {
private final DaoConfig breedingRecordEntityDaoConfig;
private final DaoConfig cattleResumeEntityDaoConfig;
private final DaoConfig dictEntityDaoConfig;
private final DaoConfig frozenSemenEntityDaoConfig;
private final DaoConfig genTableDaoConfig;
private final DaoConfig genTableColumnDaoConfig;
private final DaoConfig immuneBatchDetailEntityDaoConfig;
......@@ -64,6 +67,7 @@ public class DaoSession extends AbstractDaoSession {
private final BreedingRecordEntityDao breedingRecordEntityDao;
private final CattleResumeEntityDao cattleResumeEntityDao;
private final DictEntityDao dictEntityDao;
private final FrozenSemenEntityDao frozenSemenEntityDao;
private final GenTableDao genTableDao;
private final GenTableColumnDao genTableColumnDao;
private final ImmuneBatchDetailEntityDao immuneBatchDetailEntityDao;
......@@ -92,6 +96,9 @@ public class DaoSession extends AbstractDaoSession {
dictEntityDaoConfig = daoConfigMap.get(DictEntityDao.class).clone();
dictEntityDaoConfig.initIdentityScope(type);
frozenSemenEntityDaoConfig = daoConfigMap.get(FrozenSemenEntityDao.class).clone();
frozenSemenEntityDaoConfig.initIdentityScope(type);
genTableDaoConfig = daoConfigMap.get(GenTableDao.class).clone();
genTableDaoConfig.initIdentityScope(type);
......@@ -121,6 +128,7 @@ public class DaoSession extends AbstractDaoSession {
breedingRecordEntityDao = new BreedingRecordEntityDao(breedingRecordEntityDaoConfig, this);
cattleResumeEntityDao = new CattleResumeEntityDao(cattleResumeEntityDaoConfig, this);
dictEntityDao = new DictEntityDao(dictEntityDaoConfig, this);
frozenSemenEntityDao = new FrozenSemenEntityDao(frozenSemenEntityDaoConfig, this);
genTableDao = new GenTableDao(genTableDaoConfig, this);
genTableColumnDao = new GenTableColumnDao(genTableColumnDaoConfig, this);
immuneBatchDetailEntityDao = new ImmuneBatchDetailEntityDao(immuneBatchDetailEntityDaoConfig, this);
......@@ -135,6 +143,7 @@ public class DaoSession extends AbstractDaoSession {
registerDao(BreedingRecordEntity.class, breedingRecordEntityDao);
registerDao(CattleResumeEntity.class, cattleResumeEntityDao);
registerDao(DictEntity.class, dictEntityDao);
registerDao(FrozenSemenEntity.class, frozenSemenEntityDao);
registerDao(GenTable.class, genTableDao);
registerDao(GenTableColumn.class, genTableColumnDao);
registerDao(ImmuneBatchDetailEntity.class, immuneBatchDetailEntityDao);
......@@ -151,6 +160,7 @@ public class DaoSession extends AbstractDaoSession {
breedingRecordEntityDaoConfig.clearIdentityScope();
cattleResumeEntityDaoConfig.clearIdentityScope();
dictEntityDaoConfig.clearIdentityScope();
frozenSemenEntityDaoConfig.clearIdentityScope();
genTableDaoConfig.clearIdentityScope();
genTableColumnDaoConfig.clearIdentityScope();
immuneBatchDetailEntityDaoConfig.clearIdentityScope();
......@@ -181,6 +191,10 @@ public class DaoSession extends AbstractDaoSession {
return dictEntityDao;
}
public FrozenSemenEntityDao getFrozenSemenEntityDao() {
return frozenSemenEntityDao;
}
public GenTableDao getGenTableDao() {
return genTableDao;
}
......
app/src/main/java/com/phlx/anchorcollect_p/entity/CattleResumeEntity.java
View file @ e0d1879c
......@@ -66,6 +66,43 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
/** 母登记号 */
private String motherReg;
/** 祖父号 */
private String ffNum;
/** 祖母号 */
private String fmNum;
/** 外祖父号 */
private String mfNum;
/** 外祖母号 */
private String mmNum;
/** 曾祖父 */
private String fffNum;
/** 曾祖母 */
private String ffmNum;
/** 曾外祖父 */
private String fmfNum;
/** 曾外祖母 */
private String fmmNum;
/** 外曾祖父 */
private String mffNum;
/** 外曾祖母 */
private String mfmNum;
/** 外曾外祖父 */
private String mmfNum;
/** 外曾外祖母 */
private String mmmNum;
/** 离乳重 */
private Double fromMilkHeavy;
......@@ -153,6 +190,18 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
grade = in.readString();
fatherReg = in.readString();
motherReg = in.readString();
ffNum = in.readString();
fmNum = in.readString();
mfNum = in.readString();
mmNum = in.readString();
fffNum = in.readString();
ffmNum = in.readString();
fmfNum = in.readString();
fmmNum = in.readString();
mffNum = in.readString();
mfmNum = in.readString();
mmfNum = in.readString();
mmmNum = in.readString();
if (in.readByte() == 0) {
fromMilkHeavy = null;
} else {
......@@ -190,11 +239,13 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
remark = in.readString();
}
@Generated(hash = 1369241841)
@Generated(hash = 748489987)
public CattleResumeEntity(Long unid, String registrationNo, String individualNo, String circleNo,
String raiseType, String raiseVarieties, String birthdate, Double birthHeavy, String sex,
String birthDifficulty, String isTwins, String childTime, String grade, String fatherReg,
String motherReg, Double fromMilkHeavy, String health, String junHeavy, String decAppScore,
String motherReg, String ffNum, String fmNum, String mfNum, String mmNum, String fffNum,
String ffmNum, String fmfNum, String fmmNum, String mffNum, String mfmNum, String mmfNum,
String mmmNum, Double fromMilkHeavy, String health, String junHeavy, String decAppScore,
String photo, String photoPath, String status, Long isOut, Integer age, String colour,
String inputTime, Long deptId, String uploadStatus, String uploadTime, String createBy,
String createTime, String updateBy, String updateTime, String remark) {
......@@ -213,6 +264,18 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
this.grade = grade;
this.fatherReg = fatherReg;
this.motherReg = motherReg;
this.ffNum = ffNum;
this.fmNum = fmNum;
this.mfNum = mfNum;
this.mmNum = mmNum;
this.fffNum = fffNum;
this.ffmNum = ffmNum;
this.fmfNum = fmfNum;
this.fmmNum = fmmNum;
this.mffNum = mffNum;
this.mfmNum = mfmNum;
this.mmfNum = mmfNum;
this.mmmNum = mmmNum;
this.fromMilkHeavy = fromMilkHeavy;
this.health = health;
this.junHeavy = junHeavy;
......@@ -261,6 +324,18 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
dest.writeString(grade);
dest.writeString(fatherReg);
dest.writeString(motherReg);
dest.writeString(ffNum);
dest.writeString(fmNum);
dest.writeString(mfNum);
dest.writeString(mmNum);
dest.writeString(fffNum);
dest.writeString(ffmNum);
dest.writeString(fmfNum);
dest.writeString(fmmNum);
dest.writeString(mffNum);
dest.writeString(mfmNum);
dest.writeString(mmfNum);
dest.writeString(mmmNum);
if (fromMilkHeavy == null) {
dest.writeByte((byte) 0);
} else {
......@@ -319,10 +394,6 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
}
};
public static long getSerialVersionUID() {
return serialVersionUID;
}
public Long getUnid() {
return unid;
}
......@@ -443,6 +514,102 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
this.motherReg = motherReg;
}
public String getFfNum() {
return ffNum;
}
public void setFfNum(String ffNum) {
this.ffNum = ffNum;
}
public String getFmNum() {
return fmNum;
}
public void setFmNum(String fmNum) {
this.fmNum = fmNum;
}
public String getMfNum() {
return mfNum;
}
public void setMfNum(String mfNum) {
this.mfNum = mfNum;
}
public String getMmNum() {
return mmNum;
}
public void setMmNum(String mmNum) {
this.mmNum = mmNum;
}
public String getFffNum() {
return fffNum;
}
public void setFffNum(String fffNum) {
this.fffNum = fffNum;
}
public String getFfmNum() {
return ffmNum;
}
public void setFfmNum(String ffmNum) {
this.ffmNum = ffmNum;
}
public String getFmfNum() {
return fmfNum;
}
public void setFmfNum(String fmfNum) {
this.fmfNum = fmfNum;
}
public String getFmmNum() {
return fmmNum;
}
public void setFmmNum(String fmmNum) {
this.fmmNum = fmmNum;
}
public String getMffNum() {
return mffNum;
}
public void setMffNum(String mffNum) {
this.mffNum = mffNum;
}
public String getMfmNum() {
return mfmNum;
}
public void setMfmNum(String mfmNum) {
this.mfmNum = mfmNum;
}
public String getMmfNum() {
return mmfNum;
}
public void setMmfNum(String mmfNum) {
this.mmfNum = mmfNum;
}
public String getMmmNum() {
return mmmNum;
}
public void setMmmNum(String mmmNum) {
this.mmmNum = mmmNum;
}
public Double getFromMilkHeavy() {
return fromMilkHeavy;
}
......@@ -613,6 +780,18 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
", grade='" + grade + '\'' +
", fatherReg='" + fatherReg + '\'' +
", motherReg='" + motherReg + '\'' +
", ffNum='" + ffNum + '\'' +
", fmNum='" + fmNum + '\'' +
", mfNum='" + mfNum + '\'' +
", mmNum='" + mmNum + '\'' +
", fffNum='" + fffNum + '\'' +
", ffmNum='" + ffmNum + '\'' +
", fmfNum='" + fmfNum + '\'' +
", fmmNum='" + fmmNum + '\'' +
", mffNum='" + mffNum + '\'' +
", mfmNum='" + mfmNum + '\'' +
", mmfNum='" + mmfNum + '\'' +
", mmmNum='" + mmmNum + '\'' +
", fromMilkHeavy=" + fromMilkHeavy +
", health='" + health + '\'' +
", junHeavy='" + junHeavy + '\'' +
......@@ -635,7 +814,6 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
'}';
}
public void copyEntity(CattleResumeEntity cre) {
this.unid= cre.getUnid();
......@@ -653,6 +831,18 @@ public class CattleResumeEntity extends BaseObservable implements Parcelable {
this.grade= cre.getGrade();
this.fatherReg= cre.getFatherReg();
this.motherReg= cre.getMotherReg();
this.ffNum= cre.getFfNum();
this.fmNum= cre.getFmNum();
this.mfNum= cre.getMfNum();
this.mmNum= cre.getMmNum();
this.fffNum= cre.getFffNum();
this.ffmNum= cre.getFfmNum();
this.fmfNum= cre.getFmfNum();
this.fmmNum= cre.getFmmNum();
this.mffNum= cre.getMffNum();
this.mfmNum= cre.getMfmNum();
this.mmfNum= cre.getMmfNum();
this.mmmNum= cre.getMmmNum();
this.fromMilkHeavy= cre.getFromMilkHeavy();
this.health= cre.getHealth();
this.junHeavy= cre.getJunHeavy();
......
app/src/main/java/com/phlx/anchorcollect_p/entity/FrozenSemenEntity.java 0 → 100644
View file @ e0d1879c
package com.phlx.anchorcollect_p.entity;
import android.os.Parcel;
import android.os.Parcelable;
import androidx.databinding.BaseObservable;
import org.greenrobot.greendao.annotation.Entity;
import org.greenrobot.greendao.annotation.Generated;
import org.greenrobot.greendao.annotation.Id;
/**
* 冻精bean
*/
@Entity
public class FrozenSemenEntity extends BaseObservable implements Parcelable {
/** 主键 */
@Id(autoincrement = false)
private Long id;
/** 注册号 */
private String code;
/** 父本 */
private String fuCode;
/** 母本 */
private String muCode;
/** 祖父 */
private String zfCode;
/** 祖母 */
private String zmCode;
/** 外祖父 */
private String wzfCode;
/** 外祖母 */
private String wzmCode;
/** 照片 */
private String img;
/** 冻精信息 */
private String info;
/** 部门id */
private Long deptId;
public FrozenSemenEntity() {
}
protected FrozenSemenEntity(Parcel in) {
if (in.readByte() == 0) {
id = null;
} else {
id = in.readLong();
}
code = in.readString();
fuCode = in.readString();
muCode = in.readString();
zfCode = in.readString();
zmCode = in.readString();
wzfCode = in.readString();
wzmCode = in.readString();
img = in.readString();
info = in.readString();
if (in.readByte() == 0) {
deptId = null;
} else {
deptId = in.readLong();
}
}
@Generated(hash = 1187217824)
public FrozenSemenEntity(Long id, String code, String fuCode, String muCode, String zfCode,
String zmCode, String wzfCode, String wzmCode, String img, String info, Long deptId) {
this.id = id;
this.code = code;
this.fuCode = fuCode;
this.muCode = muCode;
this.zfCode = zfCode;
this.zmCode = zmCode;
this.wzfCode = wzfCode;
this.wzmCode = wzmCode;
this.img = img;
this.info = info;
this.deptId = deptId;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
if (id == null) {
dest.writeByte((byte) 0);
} else {
dest.writeByte((byte) 1);
dest.writeLong(id);
}
dest.writeString(code);
dest.writeString(fuCode);
dest.writeString(muCode);
dest.writeString(zfCode);
dest.writeString(zmCode);
dest.writeString(wzfCode);
dest.writeString(wzmCode);
dest.writeString(img);
dest.writeString(info);
if (deptId == null) {
dest.writeByte((byte) 0);
} else {
dest.writeByte((byte) 1);
dest.writeLong(deptId);
}
}
@Override
public int describeContents() {
return 0;
}
public static final Creator<FrozenSemenEntity> CREATOR = new Creator<FrozenSemenEntity>() {
@Override
public FrozenSemenEntity createFromParcel(Parcel in) {
return new FrozenSemenEntity(in);
}
@Override
public FrozenSemenEntity[] newArray(int size) {
return new FrozenSemenEntity[size];
}
};
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getFuCode() {
return fuCode;
}
public void setFuCode(String fuCode) {
this.fuCode = fuCode;
}
public String getMuCode() {
return muCode;
}
public void setMuCode(String muCode) {
this.muCode = muCode;
}
public String getZfCode() {
return zfCode;
}
public void setZfCode(String zfCode) {
this.zfCode = zfCode;
}
public String getZmCode() {
return zmCode;
}
public void setZmCode(String zmCode) {
this.zmCode = zmCode;
}
public String getWzfCode() {
return wzfCode;
}
public void setWzfCode(String wzfCode) {
this.wzfCode = wzfCode;
}
public String getWzmCode() {
return wzmCode;
}
public void setWzmCode(String wzmCode) {
this.wzmCode = wzmCode;
}
public String getImg() {
return img;
}
public void setImg(String img) {
this.img = img;
}
public String getInfo() {
return info;
}
public void setInfo(String info) {
this.info = info;
}
public Long getDeptId() {
return deptId;
}
public void setDeptId(Long deptId) {
this.deptId = deptId;
}
@Override
public String toString() {
return "FrozenSemenEntity{" +
"id=" + id +
", code='" + code + '\'' +
", fuCode='" + fuCode + '\'' +
", muCode='" + muCode + '\'' +
", zfCode='" + zfCode + '\'' +
", zmCode='" + zmCode + '\'' +
", wzfCode='" + wzfCode + '\'' +
", wzmCode='" + wzmCode + '\'' +
", img='" + img + '\'' +
", info='" + info + '\'' +
", deptId=" + deptId +
'}';
}
}
app/src/main/java/com/phlx/anchorcollect_p/entity/LoginInfoData.java 0 → 100644
View file @ e0d1879c
package com.phlx.anchorcollect_p.entity;
import java.util.List;
public class LoginInfoData {
private List<DictEntity> dictList;
private List<FrozenSemenEntity> frozenSemenList;
public LoginInfoData() {
}
public List<DictEntity> getDictList() {
return dictList;
}
public void setDictList(List<DictEntity> dictList) {
this.dictList = dictList;
}
public List<FrozenSemenEntity> getFrozenSemenList() {
return frozenSemenList;
}
public void setFrozenSemenList(List<FrozenSemenEntity> frozenSemenList) {
this.frozenSemenList = frozenSemenList;
}
@Override
public String toString() {
return "LoginInfoData{" +
"dictList=" + dictList +
", frozenSemenList=" + frozenSemenList +
'}';
}
}
app/src/main/java/com/phlx/anchorcollect_p/ui/bind/BindVM.java
View file @ e0d1879c
......@@ -103,7 +103,7 @@ public class BindVM extends BackBarVM<Repository> implements OnInventoryListener
QueryBuilder<CattleResumeEntity> builder0 =
DbUtil.getInstance().getQueryBuilder(CattleResumeEntity.class)
.where(CattleResumeEntityDao.Properties.RegistrationNo.eq(""));
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<CattleResumeEntity>() {
DbUtil.getInstance().queryAsyncAll(CattleResumeEntity.class, builder0, new DbQueryCallBack<CattleResumeEntity>() {
@Override
public void onSuccess(List<CattleResumeEntity> result) {
......@@ -120,7 +120,7 @@ public class BindVM extends BackBarVM<Repository> implements OnInventoryListener
ToastUtils.showShort("查询基础数据数量失败！");
dismissDialog();
}
}).queryAsyncAll(CattleResumeEntity.class, builder0);
});
}
......@@ -148,11 +148,11 @@ public class BindVM extends BackBarVM<Repository> implements OnInventoryListener
return;
}
//判断是否已经绑定过高频耳标
//判断是否已经绑定过电子耳标
QueryBuilder<CattleResumeEntity> builder0 =
DbUtil.getInstance().getQueryBuilder(CattleResumeEntity.class)
.where(CattleResumeEntityDao.Properties.RegistrationNo.eq(registrationNo.get()));
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<CattleResumeEntity>() {
DbUtil.getInstance().queryAsyncAll(CattleResumeEntity.class, builder0, new DbQueryCallBack<CattleResumeEntity>() {
@Override
public void onSuccess(List<CattleResumeEntity> result) {
......@@ -169,7 +169,7 @@ public class BindVM extends BackBarVM<Repository> implements OnInventoryListener
ToastUtils.showShort("查询基础数据数量失败！");
dismissDialog();
}
}).queryAsyncAll(CattleResumeEntity.class, builder0);
});
}
private void bindRfid() {
......
app/src/main/java/com/phlx/anchorcollect_p/ui/fragment/BasicsCollectFragment.java
View file @ e0d1879c
......@@ -45,9 +45,8 @@ import com.phlx.anchorcollect_p.entity.GenTableColumn;
import com.phlx.anchorcollect_p.event.EventTag;
import com.phlx.anchorcollect_p.ui.fragment.vm.BasicsCollectVM;
import com.phlx.anchorcollect_p.ui.info.CattleActivity;
import com.phlx.anchorcollect_p.ui.main.MainActivity;
import com.phlx.anchorcollect_p.util.BaseImageUtils;
import com.phlx.anchorcollect_p.util.DictUtils;
import com.phlx.anchorcollect_p.util.LoginInfoUtils;
import com.phlx.anchorcollect_p.util.ImagePicker;
import com.phlx.anchorcollect_p.widget.SpaceItemDecoration;
import com.tbruyelle.rxpermissions2.RxPermissions;
......@@ -306,7 +305,7 @@ public class BasicsCollectFragment extends BaseFragment<FragmentBasicsCollectBin
// .iconRes(R.drawable.ic_logo)
.canceledOnTouchOutside(false)
.autoDismiss(false)
// .content("高频耳标")
// .content("电子耳标")
// .widgetColor(Color.BLUE)//输入框光标的颜色
//前2个一个是hint一个是预输入的文字
.input("可视耳标", "", new MaterialDialog.InputCallback() {
......@@ -337,7 +336,7 @@ public class BasicsCollectFragment extends BaseFragment<FragmentBasicsCollectBin
return;
}
if (!StringUtils.isEmpty(registrationNo) && registrationNo.length() > 50) {
ToastUtils.showShort("高频耳标长度非法，请重新扫描!");
ToastUtils.showShort("电子耳标长度非法，请重新扫描!");
return;
}
if (!StringUtils.isEmpty(individualNo) && individualNo.length() > 25) {
......@@ -374,13 +373,13 @@ public class BasicsCollectFragment extends BaseFragment<FragmentBasicsCollectBin
.title(uiParamEntity.getColumnComment())
// .positiveText("确认")
// .negativeText("取消")
.items(DictUtils.getDistNameList(uiParamEntity.getDictType()))
.items(LoginInfoUtils.getDistNameList(uiParamEntity.getDictType()))
.itemsCallback(new MaterialDialog.ListCallback() {
@Override
public void onSelection(MaterialDialog dialog, View view, int which, CharSequence text) {
Toast.makeText(getActivity(), which + ":" + text.toString(), Toast.LENGTH_SHORT).show();
viewModel.currentParamEntity.setShowName(text.toString());
List<DictEntity> distTypeList = DictUtils.getDistList(uiParamEntity.getDictType());
List<DictEntity> distTypeList = LoginInfoUtils.getDistList(uiParamEntity.getDictType());
viewModel.currentParamEntity.setContent(distTypeList.get(which).getDictValue());
viewModel.currentParamEntity.notifyChange();
}
......@@ -394,14 +393,14 @@ public class BasicsCollectFragment extends BaseFragment<FragmentBasicsCollectBin
new MaterialDialog.Builder(getActivity()).title("系统信息").content("请选择!!!")
// .cancelable(false).canceledOnTouchOutside(false)
.positiveText("确定")
.items(DictUtils.getDistNameList(uiParamEntity.getDictType()))
.items(LoginInfoUtils.getDistNameList(uiParamEntity.getDictType()))
.itemsCallbackMultiChoice(null, new MaterialDialog.ListCallbackMultiChoice() {
@Override
public boolean onSelection(MaterialDialog dialog, Integer[] which, CharSequence[] text) {
String showName = "";
String content = "";
List<DictEntity> distTypeList = DictUtils.getDistList(uiParamEntity.getDictType());
List<DictEntity> distTypeList = LoginInfoUtils.getDistList(uiParamEntity.getDictType());
if (which != null && which.length > 0) {
for (Integer i : which) {
showName += distTypeList.get(i).getDictLabel();
......
app/src/main/java/com/phlx/anchorcollect_p/ui/fragment/BreedingRecordFragment.java
View file @ e0d1879c
......@@ -35,7 +35,7 @@ import com.phlx.anchorcollect_p.entity.BreedingRecordDetailEntity;
import com.phlx.anchorcollect_p.entity.DictEntity;
import com.phlx.anchorcollect_p.entity.GenTableColumn;
import com.phlx.anchorcollect_p.ui.fragment.vm.BreedingRecordVM;
import com.phlx.anchorcollect_p.util.DictUtils;
import com.phlx.anchorcollect_p.util.LoginInfoUtils;
import com.phlx.anchorcollect_p.util.ImagePicker;
import com.phlx.anchorcollect_p.util.StringUtil;
import com.phlx.anchorcollect_p.widget.SpaceItemDecoration;
......@@ -186,13 +186,13 @@ public class BreedingRecordFragment extends BaseFragment<FragmentBreedingRecordB
.title(uiParamEntity.getColumnComment())
// .positiveText("确认")
// .negativeText("取消")
.items(DictUtils.getDistNameList(uiParamEntity.getDictType()))
.items(LoginInfoUtils.getDistNameList(uiParamEntity.getDictType()))
.itemsCallback(new MaterialDialog.ListCallback() {
@Override
public void onSelection(MaterialDialog dialog, View view, int which, CharSequence text) {
Toast.makeText(getActivity(), which + ":" + text.toString(), Toast.LENGTH_SHORT).show();
viewModel.currentParamEntity.setShowName(text.toString());
List<DictEntity> distTypeList = DictUtils.getDistList(uiParamEntity.getDictType());
List<DictEntity> distTypeList = LoginInfoUtils.getDistList(uiParamEntity.getDictType());
viewModel.currentParamEntity.setContent(distTypeList.get(which).getDictValue());
viewModel.currentParamEntity.notifyChange();
}
......@@ -206,14 +206,14 @@ public class BreedingRecordFragment extends BaseFragment<FragmentBreedingRecordB
new MaterialDialog.Builder(getActivity()).title("系统信息").content("请选择!!!")
// .cancelable(false).canceledOnTouchOutside(false)
.positiveText("确定")
.items(DictUtils.getDistNameList(uiParamEntity.getDictType()))
.items(LoginInfoUtils.getDistNameList(uiParamEntity.getDictType()))
.itemsCallbackMultiChoice(null, new MaterialDialog.ListCallbackMultiChoice() {
@Override
public boolean onSelection(MaterialDialog dialog, Integer[] which, CharSequence[] text) {
String showName = "";
String content = "";
List<DictEntity> distTypeList = DictUtils.getDistList(uiParamEntity.getDictType());
List<DictEntity> distTypeList = LoginInfoUtils.getDistList(uiParamEntity.getDictType());
if (which != null && which.length > 0) {
for (Integer i : which) {
showName += distTypeList.get(i).getDictLabel();
......
app/src/main/java/com/phlx/anchorcollect_p/ui/fragment/ImmunRecordFragment.java
View file @ e0d1879c
......@@ -32,7 +32,7 @@ import com.phlx.anchorcollect_p.databinding.FragmentImmunRecordBinding;
import com.phlx.anchorcollect_p.entity.DictEntity;
import com.phlx.anchorcollect_p.entity.GenTableColumn;
import com.phlx.anchorcollect_p.ui.fragment.vm.ImmunRecordVM;
import com.phlx.anchorcollect_p.util.DictUtils;
import com.phlx.anchorcollect_p.util.LoginInfoUtils;
import com.phlx.anchorcollect_p.util.ImagePicker;
import com.phlx.anchorcollect_p.widget.SpaceItemDecoration;
import com.tbruyelle.rxpermissions2.RxPermissions;
......@@ -169,13 +169,13 @@ public class ImmunRecordFragment extends BaseFragment<FragmentImmunRecordBinding
.title(uiParamEntity.getColumnComment())
// .positiveText("确认")
// .negativeText("取消")
.items(DictUtils.getDistNameList(uiParamEntity.getDictType()))
.items(LoginInfoUtils.getDistNameList(uiParamEntity.getDictType()))
.itemsCallback(new MaterialDialog.ListCallback() {
@Override
public void onSelection(MaterialDialog dialog, View view, int which, CharSequence text) {
Toast.makeText(getActivity(), which + ":" + text.toString(), Toast.LENGTH_SHORT).show();
viewModel.currentParamEntity.setShowName(text.toString());
List<DictEntity> distTypeList = DictUtils.getDistList(uiParamEntity.getDictType());
List<DictEntity> distTypeList = LoginInfoUtils.getDistList(uiParamEntity.getDictType());
viewModel.currentParamEntity.setContent(distTypeList.get(which).getDictValue());
viewModel.currentParamEntity.notifyChange();
}
......@@ -189,14 +189,14 @@ public class ImmunRecordFragment extends BaseFragment<FragmentImmunRecordBinding
new MaterialDialog.Builder(getActivity()).title("系统信息").content("请选择!!!")
// .cancelable(false).canceledOnTouchOutside(false)
.positiveText("确定")
.items(DictUtils.getDistNameList(uiParamEntity.getDictType()))
.items(LoginInfoUtils.getDistNameList(uiParamEntity.getDictType()))
.itemsCallbackMultiChoice(null, new MaterialDialog.ListCallbackMultiChoice() {
@Override
public boolean onSelection(MaterialDialog dialog, Integer[] which, CharSequence[] text) {
String showName = "";
String content = "";
List<DictEntity> distTypeList = DictUtils.getDistList(uiParamEntity.getDictType());
List<DictEntity> distTypeList = LoginInfoUtils.getDistList(uiParamEntity.getDictType());
if (which != null && which.length > 0) {
for (Integer i : which) {
showName += distTypeList.get(i).getDictLabel();
......
app/src/main/java/com/phlx/anchorcollect_p/ui/fragment/MedicalRecordFragment.java
View file @ e0d1879c
......@@ -31,7 +31,7 @@ import com.phlx.anchorcollect_p.databinding.FragmentMedicalRecordBinding;
import com.phlx.anchorcollect_p.entity.DictEntity;
import com.phlx.anchorcollect_p.entity.GenTableColumn;
import com.phlx.anchorcollect_p.ui.fragment.vm.MedicalRecordVM;
import com.phlx.anchorcollect_p.util.DictUtils;
import com.phlx.anchorcollect_p.util.LoginInfoUtils;
import com.phlx.anchorcollect_p.util.ImagePicker;
import com.phlx.anchorcollect_p.widget.SpaceItemDecoration;
import com.tbruyelle.rxpermissions2.RxPermissions;
......@@ -168,13 +168,13 @@ public class MedicalRecordFragment extends BaseFragment<FragmentMedicalRecordBin
.title(uiParamEntity.getColumnComment())
// .positiveText("确认")
// .negativeText("取消")
.items(DictUtils.getDistNameList(uiParamEntity.getDictType()))
.items(LoginInfoUtils.getDistNameList(uiParamEntity.getDictType()))
.itemsCallback(new MaterialDialog.ListCallback() {
@Override
public void onSelection(MaterialDialog dialog, View view, int which, CharSequence text) {
Toast.makeText(getActivity(), which + ":" + text.toString(), Toast.LENGTH_SHORT).show();
viewModel.currentParamEntity.setShowName(text.toString());
List<DictEntity> distTypeList = DictUtils.getDistList(uiParamEntity.getDictType());
List<DictEntity> distTypeList = LoginInfoUtils.getDistList(uiParamEntity.getDictType());
viewModel.currentParamEntity.setContent(distTypeList.get(which).getDictValue());
viewModel.currentParamEntity.notifyChange();
}
......@@ -188,14 +188,14 @@ public class MedicalRecordFragment extends BaseFragment<FragmentMedicalRecordBin
new MaterialDialog.Builder(getActivity()).title("系统信息").content("请选择!!!")
// .cancelable(false).canceledOnTouchOutside(false)
.positiveText("确定")
.items(DictUtils.getDistNameList(uiParamEntity.getDictType()))
.items(LoginInfoUtils.getDistNameList(uiParamEntity.getDictType()))
.itemsCallbackMultiChoice(null, new MaterialDialog.ListCallbackMultiChoice() {
@Override
public boolean onSelection(MaterialDialog dialog, Integer[] which, CharSequence[] text) {
String showName = "";
String content = "";
List<DictEntity> distTypeList = DictUtils.getDistList(uiParamEntity.getDictType());
List<DictEntity> distTypeList = LoginInfoUtils.getDistList(uiParamEntity.getDictType());
if (which != null && which.length > 0) {
for (Integer i : which) {
showName += distTypeList.get(i).getDictLabel();
......
app/src/main/java/com/phlx/anchorcollect_p/ui/fragment/PerformanceFragment.java
View file @ e0d1879c
......@@ -32,7 +32,7 @@ import com.phlx.anchorcollect_p.databinding.FragmentPerformanceBinding;
import com.phlx.anchorcollect_p.entity.DictEntity;
import com.phlx.anchorcollect_p.entity.GenTableColumn;
import com.phlx.anchorcollect_p.ui.fragment.vm.PerformanceVM;
import com.phlx.anchorcollect_p.util.DictUtils;
import com.phlx.anchorcollect_p.util.LoginInfoUtils;
import com.phlx.anchorcollect_p.util.ImagePicker;
import com.phlx.anchorcollect_p.widget.SpaceItemDecoration;
import com.tbruyelle.rxpermissions2.RxPermissions;
......@@ -169,13 +169,13 @@ public class PerformanceFragment extends BaseFragment<FragmentPerformanceBinding
.title(uiParamEntity.getColumnComment())
// .positiveText("确认")
// .negativeText("取消")
.items(DictUtils.getDistNameList(uiParamEntity.getDictType()))
.items(LoginInfoUtils.getDistNameList(uiParamEntity.getDictType()))
.itemsCallback(new MaterialDialog.ListCallback() {
@Override
public void onSelection(MaterialDialog dialog, View view, int which, CharSequence text) {
Toast.makeText(getActivity(), which + ":" + text.toString(), Toast.LENGTH_SHORT).show();
viewModel.currentParamEntity.setShowName(text.toString());
List<DictEntity> distTypeList = DictUtils.getDistList(uiParamEntity.getDictType());
List<DictEntity> distTypeList = LoginInfoUtils.getDistList(uiParamEntity.getDictType());
viewModel.currentParamEntity.setContent(distTypeList.get(which).getDictValue());
viewModel.currentParamEntity.notifyChange();
}
......@@ -189,14 +189,14 @@ public class PerformanceFragment extends BaseFragment<FragmentPerformanceBinding
new MaterialDialog.Builder(getActivity()).title("系统信息").content("请选择!!!")
// .cancelable(false).canceledOnTouchOutside(false)
.positiveText("确定")
.items(DictUtils.getDistNameList(uiParamEntity.getDictType()))
.items(LoginInfoUtils.getDistNameList(uiParamEntity.getDictType()))
.itemsCallbackMultiChoice(null, new MaterialDialog.ListCallbackMultiChoice() {
@Override
public boolean onSelection(MaterialDialog dialog, Integer[] which, CharSequence[] text) {
String showName = "";
String content = "";
List<DictEntity> distTypeList = DictUtils.getDistList(uiParamEntity.getDictType());
List<DictEntity> distTypeList = LoginInfoUtils.getDistList(uiParamEntity.getDictType());
if (which != null && which.length > 0) {
for (Integer i : which) {
showName += distTypeList.get(i).getDictLabel();
......
app/src/main/java/com/phlx/anchorcollect_p/ui/fragment/WeightManFragment.java
View file @ e0d1879c
......@@ -45,7 +45,7 @@ import com.phlx.anchorcollect_p.entity.WeightManEntity;
import com.phlx.anchorcollect_p.event.EventTag;
import com.phlx.anchorcollect_p.ui.fragment.vm.WeightManVM;
import com.phlx.anchorcollect_p.ui.info.CattleActivity;
import com.phlx.anchorcollect_p.util.DictUtils;
import com.phlx.anchorcollect_p.util.LoginInfoUtils;
import com.phlx.anchorcollect_p.util.ImagePicker;
import com.phlx.anchorcollect_p.util.TextUtil;
import com.phlx.anchorcollect_p.widget.SpaceItemDecoration;
......@@ -282,13 +282,13 @@ public class WeightManFragment extends BaseFragment<FragmentWeightmanBinding, We
.title(uiParamEntity.getColumnComment())
// .positiveText("确认")
// .negativeText("取消")
.items(DictUtils.getDistNameList(uiParamEntity.getDictType()))
.items(LoginInfoUtils.getDistNameList(uiParamEntity.getDictType()))
.itemsCallback(new MaterialDialog.ListCallback() {
@Override
public void onSelection(MaterialDialog dialog, View view, int which, CharSequence text) {
Toast.makeText(getActivity(), which + ":" + text.toString(), Toast.LENGTH_SHORT).show();
viewModel.currentParamEntity.setShowName(text.toString());
List<DictEntity> distTypeList = DictUtils.getDistList(uiParamEntity.getDictType());
List<DictEntity> distTypeList = LoginInfoUtils.getDistList(uiParamEntity.getDictType());
viewModel.currentParamEntity.setContent(distTypeList.get(which).getDictValue());
viewModel.currentParamEntity.notifyChange();
}
......@@ -302,14 +302,14 @@ public class WeightManFragment extends BaseFragment<FragmentWeightmanBinding, We
new MaterialDialog.Builder(getActivity()).title("系统信息").content("请选择!!!")
// .cancelable(false).canceledOnTouchOutside(false)
.positiveText("确定")
.items(DictUtils.getDistNameList(uiParamEntity.getDictType()))
.items(LoginInfoUtils.getDistNameList(uiParamEntity.getDictType()))
.itemsCallbackMultiChoice(null, new MaterialDialog.ListCallbackMultiChoice() {
@Override
public boolean onSelection(MaterialDialog dialog, Integer[] which, CharSequence[] text) {
String showName = "";
String content = "";
List<DictEntity> distTypeList = DictUtils.getDistList(uiParamEntity.getDictType());
List<DictEntity> distTypeList = LoginInfoUtils.getDistList(uiParamEntity.getDictType());
if (which != null && which.length > 0) {
for (Integer i : which) {
showName += distTypeList.get(i).getDictLabel();
......
app/src/main/java/com/phlx/anchorcollect_p/ui/fragment/vm/BasicsCollectVM.java
View file @ e0d1879c
......@@ -34,6 +34,7 @@ import com.phlx.anchorcollect_p.db.interf.DbIDUCallBack;
import com.phlx.anchorcollect_p.db.interf.DbQueryCallBack;
import com.phlx.anchorcollect_p.entity.CattleResumeEntity;
import com.phlx.anchorcollect_p.entity.DictEntity;
import com.phlx.anchorcollect_p.entity.FrozenSemenEntity;
import com.phlx.anchorcollect_p.entity.GenTableColumn;
import com.phlx.anchorcollect_p.entity.PerformanceEntity;
import com.phlx.anchorcollect_p.entity.WeightManEntity;
......@@ -46,6 +47,7 @@ import com.phlx.anchorcollect_p.ui.setting.SettingActivity;
import com.phlx.anchorcollect_p.ui.setting.SyncActivity;
import com.phlx.anchorcollect_p.util.BaseImageUtils;
import com.phlx.anchorcollect_p.util.EntityUtils;
import com.phlx.anchorcollect_p.util.LoginInfoUtils;
import com.phlx.anchorcollect_p.util.TextUtil;
import com.uhf.structures.InventoryData;
import com.uhf.structures.OnInventoryListener;
......@@ -394,7 +396,7 @@ public class BasicsCollectVM extends BaseViewModel<Repository> implements OnInve
private void queryCattleResume(QueryBuilder<CattleResumeEntity> builder) {
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<CattleResumeEntity>() {
DbUtil.getInstance().queryAsyncAll(CattleResumeEntity.class, builder, new DbQueryCallBack<CattleResumeEntity>() {
@Override
public void onSuccess(List<CattleResumeEntity> result) {
......@@ -464,7 +466,7 @@ public class BasicsCollectVM extends BaseViewModel<Repository> implements OnInve
onNotifyAllEvent.setValue(true);
ToastUtils.showShort("基础档案数据库查询失败");
}
}).queryAsyncAll(CattleResumeEntity.class, builder);
});
}
private void saveCattleresume() {
......@@ -514,11 +516,23 @@ public class BasicsCollectVM extends BaseViewModel<Repository> implements OnInve
cattleResumeEntity.setRemark(remarkParamEntity.getContent());
cattleResumeEntity.setUploadStatus("0");
//添加冻精系谱到牛只系谱
if(!StringUtils.isEmpty(cattleResumeEntity.getFatherReg())){
FrozenSemenEntity frozenSemenEntity = LoginInfoUtils.getFrozenSemenForName(cattleResumeEntity.getFatherReg());
if(frozenSemenEntity!=null){
cattleResumeEntity.setFfNum(frozenSemenEntity.getFuCode());
cattleResumeEntity.setFmNum(frozenSemenEntity.getMuCode());
cattleResumeEntity.setFffNum(frozenSemenEntity.getZfCode());
cattleResumeEntity.setFfmNum(frozenSemenEntity.getZmCode());
cattleResumeEntity.setFmfNum(frozenSemenEntity.getWzfCode());
cattleResumeEntity.setFmmNum(frozenSemenEntity.getWzmCode());
}
}
uploadData = new ArrayList<>();
uploadData.add(cattleResumeEntity);
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().insertAsyncBatch(CattleResumeEntity.class, uploadData, new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
dismissDialog();
......@@ -531,7 +545,7 @@ public class BasicsCollectVM extends BaseViewModel<Repository> implements OnInve
ToastUtils.showShort("保存基础信息失败");
}
}
}).insertAsyncBatch(CattleResumeEntity.class, uploadData);
});
}
......
app/src/main/java/com/phlx/anchorcollect_p/ui/fragment/vm/BreedingRecordVM.java
View file @ e0d1879c
......@@ -136,7 +136,7 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
QueryBuilder<CattleResumeEntity> builder1 =
DbUtil.getInstance().getQueryBuilder(CattleResumeEntity.class)
.where(CattleResumeEntityDao.Properties.Unid.eq(Configs.tempUnid));
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<CattleResumeEntity>() {
DbUtil.getInstance().queryAsyncAll(CattleResumeEntity.class, builder1, new DbQueryCallBack<CattleResumeEntity>() {
@Override
public void onSuccess(List<CattleResumeEntity> result) {
......@@ -163,7 +163,7 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
onNotifyAllEvent.setValue(true);
ToastUtils.showShort("种蓄品种于所属种蓄站-数据库查询失败");
}
}).queryAsyncAll(CattleResumeEntity.class, builder1);
});
}
public void queryBreedingRecord() {
......@@ -174,7 +174,7 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
// , BreedingRecordEntityDao.Properties.CreateTime.like(DateUtils.getYear() + "%")
)
.orderDesc(BreedingRecordEntityDao.Properties.CreateTime);
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<BreedingRecordEntity>() {
DbUtil.getInstance().queryAsyncAll(BreedingRecordEntity.class, builder, new DbQueryCallBack<BreedingRecordEntity>() {
@Override
public void onSuccess(List<BreedingRecordEntity> result) {
......@@ -194,7 +194,7 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
onNotifyAllEvent.setValue(false);
ToastUtils.showShort("配种记录主表-数据库查询失败");
}
}).queryAsyncAll(BreedingRecordEntity.class, builder);
});
}
......@@ -256,7 +256,7 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
QueryBuilder<BreedingRecordDetailEntity> builder = DbUtil.getInstance().getQueryBuilder(BreedingRecordDetailEntity.class)
.where(BreedingRecordDetailEntityDao.Properties.Unid.eq(clikeUnid));
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<BreedingRecordDetailEntity>() {
DbUtil.getInstance().queryAsyncAll(BreedingRecordDetailEntity.class, builder, new DbQueryCallBack<BreedingRecordDetailEntity>() {
@Override
public void onSuccess(List<BreedingRecordDetailEntity> result) {
if (result != null && result.size() > 0)
......@@ -269,7 +269,7 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
onNotifyAllEvent.setValue(false);
ToastUtils.showShort("配种记录子表-数据库查询失败");
}
}).queryAsyncAll(BreedingRecordDetailEntity.class, builder);
});
}
......@@ -327,7 +327,7 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
// , BreedingRecordDetailEntityDao.Properties.CreateTime.like(DateUtils.getYear() + "%")
)
.orderDesc(BreedingRecordDetailEntityDao.Properties.CreateTime);
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<BreedingRecordDetailEntity>() {
DbUtil.getInstance().queryAsyncAll(BreedingRecordDetailEntity.class, builder, new DbQueryCallBack<BreedingRecordDetailEntity>() {
@Override
public void onSuccess(List<BreedingRecordDetailEntity> result) {
......@@ -344,7 +344,7 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
onNotifyAllEvent.setValue(true);
ToastUtils.showShort("配种记录子表-数据库查询失败");
}
}).queryAsyncAll(BreedingRecordDetailEntity.class, builder);
});
}
//回显列表的数据
......@@ -523,7 +523,7 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
uploadData = new ArrayList<>();
uploadData.add(breedingRecordEntity);
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().insertAsyncBatch(BreedingRecordEntity.class, uploadData, new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
dismissDialog();
......@@ -535,7 +535,7 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
ToastUtils.showShort("保存-配种记录主表-失败");
}
}
}).insertAsyncBatch(BreedingRecordEntity.class, uploadData);
});
}
//保存子表
......@@ -599,7 +599,7 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
detailUploadData = new ArrayList<>();
detailUploadData.add(breedingRecordDetailEntity);
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().insertAsyncBatch(BreedingRecordDetailEntity.class, detailUploadData, new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
dismissDialog();
......@@ -610,7 +610,7 @@ public class BreedingRecordVM extends BaseViewModel<Repository> {
ToastUtils.showShort("保存-配种记录子表-失败");
}
}
}).insertAsyncBatch(BreedingRecordDetailEntity.class, detailUploadData);
});
}
//清空数据源
......
app/src/main/java/com/phlx/anchorcollect_p/ui/fragment/vm/ImmunRecordVM.java
View file @ e0d1879c
......@@ -157,7 +157,7 @@ public class ImmunRecordVM extends BaseViewModel<Repository> {
QueryBuilder<ImmuneBatchEntity> builder =
DbUtil.getInstance().getQueryBuilder(ImmuneBatchEntity.class)
.where(ImmuneBatchEntityDao.Properties.Unid.eq(Configs.resumeId));
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<ImmuneBatchEntity>() {
DbUtil.getInstance().queryAsyncAll(ImmuneBatchEntity.class, builder, new DbQueryCallBack<ImmuneBatchEntity>() {
@Override
public void onSuccess(List<ImmuneBatchEntity> result) {
......@@ -173,7 +173,7 @@ public class ImmunRecordVM extends BaseViewModel<Repository> {
onNotifyAllEvent.setValue(true);
ToastUtils.showShort("免疫记录-数据库查询失败");
}
}).queryAsyncAll(ImmuneBatchEntity.class, builder);
});
}
......@@ -282,7 +282,7 @@ public class ImmunRecordVM extends BaseViewModel<Repository> {
, CattleResumeEntityDao.Properties.DeptId.eq(Long.parseLong(SPUtils.getInstance().getString(Configs.SP_DEPT_ID)))
);
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<CattleResumeEntity>() {
DbUtil.getInstance().queryAsyncAll(CattleResumeEntity.class, builder, new DbQueryCallBack<CattleResumeEntity>() {
@Override
public void onSuccess(List<CattleResumeEntity> result) {
//查询圈舍内的牲畜
......@@ -301,13 +301,13 @@ public class ImmunRecordVM extends BaseViewModel<Repository> {
}
//保存免疫主、子表
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().insertAsyncBatch(ImmuneBatchEntity.class, uploadData, new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
dismissDialog();
if (result) {
if (!isModify) {
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().insertAsyncBatch(ImmuneBatchDetailEntity.class, detailUploadData, new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
dismissDialog();
......@@ -318,7 +318,7 @@ public class ImmunRecordVM extends BaseViewModel<Repository> {
ToastUtils.showShort("保存免疫记录子表失败");
}
}
}).insertAsyncBatch(ImmuneBatchDetailEntity.class, detailUploadData);
});
} else {
onNotifyAllEvent.setValue(true);
onShowDialogEvent.setValue("修改免疫记录成功!");
......@@ -327,7 +327,7 @@ public class ImmunRecordVM extends BaseViewModel<Repository> {
ToastUtils.showShort("保存免疫记录失败");
}
}
}).insertAsyncBatch(ImmuneBatchEntity.class, uploadData);
});
}
@Override
......@@ -335,7 +335,7 @@ public class ImmunRecordVM extends BaseViewModel<Repository> {
cn.wandersnail.commons.util.ToastUtils.showShort("查询-圈舍牲畜-失败！");
dismissDialog();
}
}).queryAsyncAll(CattleResumeEntity.class, builder);
});
} else {
ToastUtils.showShort("无法对已生成的免疫记录做修改！");
......
app/src/main/java/com/phlx/anchorcollect_p/ui/fragment/vm/MedicalRecordVM.java
View file @ e0d1879c
......@@ -154,7 +154,7 @@ public class MedicalRecordVM extends BaseViewModel<Repository> {
QueryBuilder<MedicalRecordEntity> builder =
DbUtil.getInstance().getQueryBuilder(MedicalRecordEntity.class)
.where(MedicalRecordEntityDao.Properties.Unid.eq(Configs.resumeId));
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<MedicalRecordEntity>() {
DbUtil.getInstance().queryAsyncAll(MedicalRecordEntity.class, builder, new DbQueryCallBack<MedicalRecordEntity>() {
@Override
public void onSuccess(List<MedicalRecordEntity> result) {
......@@ -171,7 +171,7 @@ public class MedicalRecordVM extends BaseViewModel<Repository> {
onNotifyAllEvent.setValue(true);
ToastUtils.showShort("诊疗记录-数据库查询失败");
}
}).queryAsyncAll(MedicalRecordEntity.class, builder);
});
}
......@@ -272,7 +272,7 @@ public class MedicalRecordVM extends BaseViewModel<Repository> {
uploadData = new ArrayList<>();
uploadData.add(medicalRecordEntity);
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().insertAsyncBatch(MedicalRecordEntity.class, uploadData, new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
dismissDialog();
......@@ -283,7 +283,7 @@ public class MedicalRecordVM extends BaseViewModel<Repository> {
ToastUtils.showShort("保存诊疗记录失败");
}
}
}).insertAsyncBatch(MedicalRecordEntity.class, uploadData);
});
}
......
app/src/main/java/com/phlx/anchorcollect_p/ui/fragment/vm/PerformanceVM.java
View file @ e0d1879c
......@@ -155,7 +155,7 @@ public class PerformanceVM extends BaseViewModel<Repository> {
QueryBuilder<PerformanceEntity> builder =
DbUtil.getInstance().getQueryBuilder(PerformanceEntity.class)
.where(PerformanceEntityDao.Properties.Unid.eq(Configs.resumeId));
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<PerformanceEntity>() {
DbUtil.getInstance().queryAsyncAll(PerformanceEntity.class, builder, new DbQueryCallBack<PerformanceEntity>() {
@Override
public void onSuccess(List<PerformanceEntity> result) {
......@@ -172,7 +172,7 @@ public class PerformanceVM extends BaseViewModel<Repository> {
onNotifyAllEvent.setValue(true);
ToastUtils.showShort("性能测定-数据库查询失败");
}
}).queryAsyncAll(PerformanceEntity.class, builder);
});
}
......@@ -256,7 +256,7 @@ public class PerformanceVM extends BaseViewModel<Repository> {
.where(PerformanceEntityDao.Properties.Age.eq(performanceEntity.getAge())
, PerformanceEntityDao.Properties.CattleresumeId.eq(Configs.tempUnid)
);
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<PerformanceEntity>() {
DbUtil.getInstance().queryAsyncAll(PerformanceEntity.class, builder, new DbQueryCallBack<PerformanceEntity>() {
@Override
public void onSuccess(List<PerformanceEntity> result) {
......@@ -276,7 +276,7 @@ public class PerformanceVM extends BaseViewModel<Repository> {
public void onFailed() {
ToastUtils.showShort("性能测定月龄数据-数据库查询失败");
}
}).queryAsyncAll(PerformanceEntity.class, builder);
});
}
......@@ -305,7 +305,7 @@ public class PerformanceVM extends BaseViewModel<Repository> {
uploadData = new ArrayList<>();
uploadData.add(performanceEntity);
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().insertAsyncBatch(PerformanceEntity.class, uploadData, new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
dismissDialog();
......@@ -316,7 +316,7 @@ public class PerformanceVM extends BaseViewModel<Repository> {
ToastUtils.showShort("保存性能测定失败");
}
}
}).insertAsyncBatch(PerformanceEntity.class, uploadData);
});
}
......
app/src/main/java/com/phlx/anchorcollect_p/ui/fragment/vm/WeightManVM.java
View file @ e0d1879c
......@@ -264,7 +264,7 @@ public class WeightManVM extends BaseViewModel<Repository> implements OnInventor
DbUtil.getInstance().getQueryBuilder(WeightManEntity.class)
.where(WeightManEntityDao.Properties.CattleresumeId.eq(Configs.tempUnid))
.orderDesc(WeightManEntityDao.Properties.WTime);
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<WeightManEntity>() {
DbUtil.getInstance().queryAsyncAll(WeightManEntity.class, builder3, new DbQueryCallBack<WeightManEntity>() {
@Override
public void onSuccess(List<WeightManEntity> result) {
......@@ -314,7 +314,7 @@ public class WeightManVM extends BaseViewModel<Repository> implements OnInventor
cn.wandersnail.commons.util.ToastUtils.showShort("查询称重记录失败！");
dismissDialog();
}
}).queryAsyncAll(WeightManEntity.class, builder3);
});
}
......@@ -404,7 +404,7 @@ public class WeightManVM extends BaseViewModel<Repository> implements OnInventor
.where(WeightManEntityDao.Properties.CattleresumeId.eq(Configs.tempUnid)
, WeightManEntityDao.Properties.WTime.eq(weightManEntity.getWTime())
);
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<WeightManEntity>() {
DbUtil.getInstance().queryAsyncAll(WeightManEntity.class, builder3, new DbQueryCallBack<WeightManEntity>() {
@Override
public void onSuccess(List<WeightManEntity> result) {
......@@ -442,7 +442,7 @@ public class WeightManVM extends BaseViewModel<Repository> implements OnInventor
cn.wandersnail.commons.util.ToastUtils.showShort("查询称重记录失败！");
dismissDialog();
}
}).queryAsyncAll(WeightManEntity.class, builder3);
});
}
});
......@@ -457,7 +457,7 @@ public class WeightManVM extends BaseViewModel<Repository> implements OnInventor
private void queryCattleResume(QueryBuilder<CattleResumeEntity> builder) {
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<CattleResumeEntity>() {
DbUtil.getInstance().queryAsyncAll(CattleResumeEntity.class, builder, new DbQueryCallBack<CattleResumeEntity>() {
@Override
public void onSuccess(List<CattleResumeEntity> result) {
......@@ -522,7 +522,7 @@ public class WeightManVM extends BaseViewModel<Repository> implements OnInventor
onNotifyAllEvent.setValue(true);
ToastUtils.showShort("基础档案数据库查询失败");
}
}).queryAsyncAll(CattleResumeEntity.class, builder);
});
}
public void saveWeightMan(WeightManEntity weightManEntity) {
......@@ -530,7 +530,7 @@ public class WeightManVM extends BaseViewModel<Repository> implements OnInventor
uploadData = new ArrayList<>();
uploadData.add(weightManEntity);
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().insertAsyncBatch(WeightManEntity.class, uploadData, new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
dismissDialog();
......@@ -547,7 +547,7 @@ public class WeightManVM extends BaseViewModel<Repository> implements OnInventor
ToastUtils.showShort("保存称重记录失败");
}
}
}).insertAsyncBatch(WeightManEntity.class, uploadData);
});
}
......
app/src/main/java/com/phlx/anchorcollect_p/ui/info/CattleVM.java
View file @ e0d1879c
......@@ -73,7 +73,7 @@ public class CattleVM extends BackBarVM<Repository> {
DbUtil.getInstance().getQueryBuilder(PerformanceEntity.class)
.where(PerformanceEntityDao.Properties.CattleresumeId.eq(Configs.tempUnid))
.orderDesc(PerformanceEntityDao.Properties.CreateTime);
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<PerformanceEntity>() {
DbUtil.getInstance().queryAsyncAll(PerformanceEntity.class, builder, new DbQueryCallBack<PerformanceEntity>() {
@Override
public void onSuccess(List<PerformanceEntity> result) {
......@@ -88,7 +88,7 @@ public class CattleVM extends BackBarVM<Repository> {
public void onFailed() {
ToastUtils.showShort("性能测定-数据库查询失败");
}
}).queryAsyncAll(PerformanceEntity.class, builder);
});
}
public void queryMedicalRecordList() {
......@@ -97,7 +97,7 @@ public class CattleVM extends BackBarVM<Repository> {
DbUtil.getInstance().getQueryBuilder(MedicalRecordEntity.class)
.where(MedicalRecordEntityDao.Properties.CattleresumeId.eq(Configs.tempUnid))
.orderDesc(MedicalRecordEntityDao.Properties.CreateTime);
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<MedicalRecordEntity>() {
DbUtil.getInstance().queryAsyncAll(MedicalRecordEntity.class, builder, new DbQueryCallBack<MedicalRecordEntity>() {
@Override
public void onSuccess(List<MedicalRecordEntity> result) {
......@@ -112,7 +112,7 @@ public class CattleVM extends BackBarVM<Repository> {
public void onFailed() {
ToastUtils.showShort("诊疗记录-数据库查询失败");
}
}).queryAsyncAll(MedicalRecordEntity.class, builder);
});
}
public void queryImmunRecordList() {
......@@ -120,7 +120,7 @@ public class CattleVM extends BackBarVM<Repository> {
QueryBuilder<ImmuneBatchDetailEntity> detailBuilder =
DbUtil.getInstance().getQueryBuilder(ImmuneBatchDetailEntity.class)
.where(ImmuneBatchDetailEntityDao.Properties.CattleresumeUnid.eq(Configs.tempUnid));
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<ImmuneBatchDetailEntity>() {
DbUtil.getInstance().queryAsyncAll(ImmuneBatchDetailEntity.class, detailBuilder, new DbQueryCallBack<ImmuneBatchDetailEntity>() {
@Override
public void onSuccess(List<ImmuneBatchDetailEntity> result) {
......@@ -136,7 +136,7 @@ public class CattleVM extends BackBarVM<Repository> {
DbUtil.getInstance().getQueryBuilder(ImmuneBatchEntity.class)
.where(ImmuneBatchEntityDao.Properties.Unid.in(immuneIds))
.orderDesc(ImmuneBatchEntityDao.Properties.CreateTime);
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<ImmuneBatchEntity>() {
DbUtil.getInstance().queryAsyncAll(ImmuneBatchEntity.class, builder, new DbQueryCallBack<ImmuneBatchEntity>() {
@Override
public void onSuccess(List<ImmuneBatchEntity> result) {
......@@ -151,7 +151,7 @@ public class CattleVM extends BackBarVM<Repository> {
public void onFailed() {
ToastUtils.showShort("免疫记录-数据库查询失败");
}
}).queryAsyncAll(ImmuneBatchEntity.class, builder);
});
}
}
}
......@@ -160,7 +160,7 @@ public class CattleVM extends BackBarVM<Repository> {
public void onFailed() {
ToastUtils.showShort("免疫记录-子表-数据库查询失败");
}
}).queryAsyncAll(ImmuneBatchDetailEntity.class, detailBuilder);
});
}
......@@ -170,7 +170,7 @@ public class CattleVM extends BackBarVM<Repository> {
DbUtil.getInstance().getQueryBuilder(BreedingRecordEntity.class)
.where(BreedingRecordEntityDao.Properties.CattleresumeId.eq(Configs.tempUnid))
.orderDesc(BreedingRecordEntityDao.Properties.CreateTime);
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<BreedingRecordEntity>() {
DbUtil.getInstance().queryAsyncAll(BreedingRecordEntity.class, builder, new DbQueryCallBack<BreedingRecordEntity>() {
@Override
public void onSuccess(List<BreedingRecordEntity> result) {
......@@ -185,7 +185,7 @@ public class CattleVM extends BackBarVM<Repository> {
public void onFailed() {
ToastUtils.showShort("配种记录主表-数据库查询失败");
}
}).queryAsyncAll(BreedingRecordEntity.class, builder);
});
}
......
app/src/main/java/com/phlx/anchorcollect_p/ui/labelchange/LabelChangeVM.java
View file @ e0d1879c
......@@ -138,7 +138,7 @@ public class LabelChangeVM extends BackBarVM<Repository> implements OnInventoryL
return;
}
if (!StringUtils.isEmpty(epc.get()) && epc.get().length() > 50) {
ToastUtils.showShort("高频耳标长度非法，请重新扫描!");
ToastUtils.showShort("电子耳标长度非法，请重新扫描!");
return;
}
if (!StringUtils.isEmpty(noticeNo.get()) && noticeNo.get().length() > 25) {
......@@ -151,7 +151,7 @@ public class LabelChangeVM extends BackBarVM<Repository> implements OnInventoryL
if (checkResult != 0) {
switch (checkResult) {
case 1:
ToastUtils.showShort("高频耳标已存在，请重新扫描！");
ToastUtils.showShort("电子耳标已存在，请重新扫描！");
return;
case 3:
ToastUtils.showShort("可视耳标已存在，请重新填写！");
......@@ -171,7 +171,7 @@ public class LabelChangeVM extends BackBarVM<Repository> implements OnInventoryL
entity.setDeptId(Long.parseLong(SPUtils.getInstance().getString(Configs.SP_DEPT_ID)));
uploadData.add(entity);
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().insertAsyncBatch(CattleResumeEntity.class, uploadData, new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
if (result) {
......@@ -181,7 +181,7 @@ public class LabelChangeVM extends BackBarVM<Repository> implements OnInventoryL
ToastUtils.showShort("保存" + getApplication().getResources().getString(R.string.label_change) + "失败！");
}
}
}).insertAsyncBatch(CattleResumeEntity.class, uploadData);
});
}
......@@ -273,7 +273,7 @@ public class LabelChangeVM extends BackBarVM<Repository> implements OnInventoryL
String sql = sbf.toString();
WhereCondition.StringCondition stringCondition = new WhereCondition.StringCondition(sql);
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<CattleResumeEntity>() {
DbUtil.getInstance().queryAsync(CattleResumeEntity.class, stringCondition, new DbQueryCallBack<CattleResumeEntity>() {
@Override
public void onSuccess(List<CattleResumeEntity> result) {
if (result != null && result.size() > 0) {
......@@ -290,7 +290,7 @@ public class LabelChangeVM extends BackBarVM<Repository> implements OnInventoryL
ToastUtils.showShort("查询数据库失败");
finish();
}
}).queryAsync(CattleResumeEntity.class, stringCondition);
});
}
......
app/src/main/java/com/phlx/anchorcollect_p/ui/labelchange/list/ExchangeListVM.java
View file @ e0d1879c
......@@ -69,7 +69,7 @@ public class ExchangeListVM extends BackBarVM<Repository> {
DbUtil.getInstance().getQueryBuilder(CattleResumeEntity.class)
.where(CattleResumeEntityDao.Properties.Unid.eq(inspectEntities.get(position).getUnid()));
int finalI = position;
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<CattleResumeEntity>() {
DbUtil.getInstance().queryAsyncAll(CattleResumeEntity.class, builder, new DbQueryCallBack<CattleResumeEntity>() {
@Override
public void onSuccess(List<CattleResumeEntity> result) {
if (result != null && result.size() > 0) {
......@@ -89,6 +89,6 @@ public class ExchangeListVM extends BackBarVM<Repository> {
cn.wandersnail.commons.util.ToastUtils.showShort("查询基础信息失败！");
dismissDialog();
}
}).queryAsyncAll(CattleResumeEntity.class, builder);
});
}
}
app/src/main/java/com/phlx/anchorcollect_p/ui/login/LoginVM.java
View file @ e0d1879c
......@@ -81,8 +81,8 @@ public class LoginVM extends BaseViewModel<Repository> {
userName.set(model.getUserName());
password.set(model.getPassword());
// userName.set("13664793087");
// password.set("Abgq3087@");
userName.set("13664793087");
password.set("Abgq3087@");
// userName.set("15047917803");
// password.set("Tpsq7803*");
......
app/src/main/java/com/phlx/anchorcollect_p/ui/main/MainVM.java
View file @ e0d1879c
......@@ -13,6 +13,7 @@ import com.phlx.anchorcollect_p.db.gen.CattleResumeEntityDao;
import com.phlx.anchorcollect_p.db.interf.DbQueryCallBack;
import com.phlx.anchorcollect_p.entity.CattleResumeEntity;
import com.phlx.anchorcollect_p.entity.DictEntity;
import com.phlx.anchorcollect_p.entity.FrozenSemenEntity;
import com.phlx.anchorcollect_p.ui.base.MainBarVM;
import org.greenrobot.greendao.query.QueryBuilder;
......@@ -36,6 +37,7 @@ public class MainVM extends MainBarVM<Repository> {
public void init() {
Configs.dictList = DbUtil.getInstance().queryAll(DictEntity.class);
Configs.frozenSemenList = DbUtil.getInstance().queryAll(FrozenSemenEntity.class);
}
......@@ -115,7 +117,7 @@ public class MainVM extends MainBarVM<Repository> {
QueryBuilder<CattleResumeEntity> builder =
DbUtil.getInstance().getQueryBuilder(CattleResumeEntity.class)
.where(CattleResumeEntityDao.Properties.Unid.eq(Configs.tempUnid));
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<CattleResumeEntity>() {
DbUtil.getInstance().queryAsyncAll(CattleResumeEntity.class, builder, new DbQueryCallBack<CattleResumeEntity>() {
@Override
public void onSuccess(List<CattleResumeEntity> result) {
......@@ -133,7 +135,7 @@ public class MainVM extends MainBarVM<Repository> {
public void onFailed() {
ToastUtils.showShort("基础档案数据库查询失败");
}
}).queryAsyncAll(CattleResumeEntity.class, builder);
});
}
});
......
app/src/main/java/com/phlx/anchorcollect_p/ui/setting/SyncVM.java
View file @ e0d1879c
......@@ -248,7 +248,7 @@ public class SyncVM extends BaseViewModel<Repository> {
cre.setPhoto("");
}
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().insertAsyncBatch(CattleResumeEntity.class, response.getData(), new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
if (result) {
......@@ -258,7 +258,7 @@ public class SyncVM extends BaseViewModel<Repository> {
errorEvent.setValue("保存基础数据失败！");
}
}
}).insertAsyncBatch(CattleResumeEntity.class, response.getData());
});
} else {
me.goldze.mvvmhabit.utils.ToastUtils.showShort("同步基础数据成功！");
queryCattleResumeUploadCount(false, "0");
......@@ -329,7 +329,7 @@ public class SyncVM extends BaseViewModel<Repository> {
DbUtil.getInstance().getQueryBuilder(CattleResumeEntity.class)
.where(CattleResumeEntityDao.Properties.UploadStatus.eq("0"))
.limit(10);
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<CattleResumeEntity>() {
DbUtil.getInstance().queryAsyncAll(CattleResumeEntity.class, builder, new DbQueryCallBack<CattleResumeEntity>() {
@Override
public void onSuccess(List<CattleResumeEntity> result) {
if (result != null && result.size() > 0) {
......@@ -344,7 +344,7 @@ public class SyncVM extends BaseViewModel<Repository> {
ToastUtils.showShort("查询基础信息失败！");
dismissDialog();
}
}).queryAsyncAll(CattleResumeEntity.class, builder);
});
}
/**
......@@ -400,7 +400,7 @@ public class SyncVM extends BaseViewModel<Repository> {
}
}
}
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().updateAsyncBatch(CattleResumeEntity.class, cattleResumeEntities, new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
if (result) {
......@@ -411,7 +411,7 @@ public class SyncVM extends BaseViewModel<Repository> {
me.goldze.mvvmhabit.utils.ToastUtils.showShort("修改基础信息数据失败");
}
}
}).updateAsyncBatch(CattleResumeEntity.class, cattleResumeEntities);
});
}else if(response.getCode() == 301){
inspectEvent.setValue((ArrayList<InspectEntity>)response.getData());
} else if (response.getCode() == 401) {
......@@ -471,7 +471,7 @@ public class SyncVM extends BaseViewModel<Repository> {
ids.add(cre.getUnid());
}
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().insertAsyncBatch(PerformanceEntity.class, response.getData(), new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
if (result) {
......@@ -481,7 +481,7 @@ public class SyncVM extends BaseViewModel<Repository> {
errorEvent.setValue("保存性能测定数据失败！");
}
}
}).insertAsyncBatch(PerformanceEntity.class, response.getData());
});
} else {
// dismissDialog();
ToastUtils.showShort("性能测定数据同步完成！");
......@@ -554,7 +554,7 @@ public class SyncVM extends BaseViewModel<Repository> {
DbUtil.getInstance().getQueryBuilder(PerformanceEntity.class)
.where(PerformanceEntityDao.Properties.UploadStatus.eq("0"))
.limit(10);
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<PerformanceEntity>() {
DbUtil.getInstance().queryAsyncAll(PerformanceEntity.class, builder, new DbQueryCallBack<PerformanceEntity>() {
@Override
public void onSuccess(List<PerformanceEntity> result) {
if (result != null && result.size() > 0) {
......@@ -569,7 +569,7 @@ public class SyncVM extends BaseViewModel<Repository> {
ToastUtils.showShort("查询性能测定失败！");
dismissDialog();
}
}).queryAsyncAll(PerformanceEntity.class, builder);
});
}
/**
......@@ -605,7 +605,7 @@ public class SyncVM extends BaseViewModel<Repository> {
}
}
}
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().updateAsyncBatch(PerformanceEntity.class, performanceEntities, new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
if (result) {
......@@ -616,7 +616,7 @@ public class SyncVM extends BaseViewModel<Repository> {
me.goldze.mvvmhabit.utils.ToastUtils.showShort("修改性能测定数据失败");
}
}
}).updateAsyncBatch(PerformanceEntity.class, performanceEntities);
});
} else if (response.getCode() == 401) {
dismissDialog();
Bundle bundle = new Bundle();
......@@ -674,7 +674,7 @@ public class SyncVM extends BaseViewModel<Repository> {
ids.add(cre.getUnid());
}
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().insertAsyncBatch(BreedingRecordEntity.class, response.getData(), new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
if (result) {
......@@ -684,7 +684,7 @@ public class SyncVM extends BaseViewModel<Repository> {
errorEvent.setValue("保存配种记录主表数据失败！");
}
}
}).insertAsyncBatch(BreedingRecordEntity.class, response.getData());
});
} else {
// dismissDialog();
me.goldze.mvvmhabit.utils.ToastUtils.showShort("同步配种主表数据成功！");
......@@ -755,7 +755,7 @@ public class SyncVM extends BaseViewModel<Repository> {
DbUtil.getInstance().getQueryBuilder(BreedingRecordEntity.class)
.where(BreedingRecordEntityDao.Properties.UploadStatus.eq("0"))
.limit(10);
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<BreedingRecordEntity>() {
DbUtil.getInstance().queryAsyncAll(BreedingRecordEntity.class, builder, new DbQueryCallBack<BreedingRecordEntity>() {
@Override
public void onSuccess(List<BreedingRecordEntity> result) {
if (result != null && result.size() > 0) {
......@@ -770,7 +770,7 @@ public class SyncVM extends BaseViewModel<Repository> {
ToastUtils.showShort("查询-配种记录主表-失败！");
dismissDialog();
}
}).queryAsyncAll(BreedingRecordEntity.class, builder);
});
}
/**
......@@ -804,7 +804,7 @@ public class SyncVM extends BaseViewModel<Repository> {
}
}
}
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().updateAsyncBatch(BreedingRecordEntity.class, breedingRecordEntities, new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
if (result) {
......@@ -814,7 +814,7 @@ public class SyncVM extends BaseViewModel<Repository> {
me.goldze.mvvmhabit.utils.ToastUtils.showShort("修改-配种记录主表-数据失败");
}
}
}).updateAsyncBatch(BreedingRecordEntity.class, breedingRecordEntities);
});
} else if (response.getCode() == 401) {
dismissDialog();
Bundle bundle = new Bundle();
......@@ -873,7 +873,7 @@ public class SyncVM extends BaseViewModel<Repository> {
ids.add(cre.getUnid());
}
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().insertAsyncBatch(BreedingRecordDetailEntity.class, response.getData(), new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
if (result) {
......@@ -883,7 +883,7 @@ public class SyncVM extends BaseViewModel<Repository> {
errorEvent.setValue("保存配种记录子表数据失败！");
}
}
}).insertAsyncBatch(BreedingRecordDetailEntity.class, response.getData());
});
} else {
// dismissDialog();
me.goldze.mvvmhabit.utils.ToastUtils.showShort("同步配种记录子表数据成功！");
......@@ -954,7 +954,7 @@ public class SyncVM extends BaseViewModel<Repository> {
DbUtil.getInstance().getQueryBuilder(BreedingRecordDetailEntity.class)
.where(BreedingRecordDetailEntityDao.Properties.UploadStatus.eq("0"))
.limit(10);
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<BreedingRecordDetailEntity>() {
DbUtil.getInstance().queryAsyncAll(BreedingRecordDetailEntity.class, builder, new DbQueryCallBack<BreedingRecordDetailEntity>() {
@Override
public void onSuccess(List<BreedingRecordDetailEntity> result) {
if (result != null && result.size() > 0) {
......@@ -969,7 +969,7 @@ public class SyncVM extends BaseViewModel<Repository> {
ToastUtils.showShort("查询-配种记录子表-失败！");
dismissDialog();
}
}).queryAsyncAll(BreedingRecordDetailEntity.class, builder);
});
}
/**
......@@ -1003,7 +1003,7 @@ new Gson().toJson(breedingRecordDetailEntities));
}
}
}
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().updateAsyncBatch(BreedingRecordDetailEntity.class, breedingRecordDetailEntities, new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
if (result) {
......@@ -1013,7 +1013,7 @@ new Gson().toJson(breedingRecordDetailEntities));
me.goldze.mvvmhabit.utils.ToastUtils.showShort("修改-配种记录子表-数据失败");
}
}
}).updateAsyncBatch(BreedingRecordDetailEntity.class, breedingRecordDetailEntities);
});
} else if (response.getCode() == 401) {
dismissDialog();
Bundle bundle = new Bundle();
......@@ -1073,7 +1073,7 @@ new Gson().toJson(breedingRecordDetailEntities));
ids.add(cre.getUnid());
}
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().insertAsyncBatch(WeightManEntity.class, response.getData(), new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
if (result) {
......@@ -1083,7 +1083,7 @@ new Gson().toJson(breedingRecordDetailEntities));
errorEvent.setValue("保存称重管理数据失败！");
}
}
}).insertAsyncBatch(WeightManEntity.class, response.getData());
});
} else {
me.goldze.mvvmhabit.utils.ToastUtils.showShort("同步称重管理数据成功！");
// dismissDialog();
......@@ -1154,7 +1154,7 @@ new Gson().toJson(breedingRecordDetailEntities));
DbUtil.getInstance().getQueryBuilder(WeightManEntity.class)
.where(WeightManEntityDao.Properties.UploadStatus.eq("0"))
.limit(10);
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<WeightManEntity>() {
DbUtil.getInstance().queryAsyncAll(WeightManEntity.class, builder, new DbQueryCallBack<WeightManEntity>() {
@Override
public void onSuccess(List<WeightManEntity> result) {
if (result != null && result.size() > 0) {
......@@ -1169,7 +1169,7 @@ new Gson().toJson(breedingRecordDetailEntities));
ToastUtils.showShort("查询-称重管理-失败！");
dismissDialog();
}
}).queryAsyncAll(WeightManEntity.class, builder);
});
}
/**
......@@ -1203,7 +1203,7 @@ new Gson().toJson(breedingRecordDetailEntities));
}
}
}
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().updateAsyncBatch(WeightManEntity.class, weightManEntities, new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
if (result) {
......@@ -1214,7 +1214,7 @@ new Gson().toJson(breedingRecordDetailEntities));
dismissDialog();
}
}
}).updateAsyncBatch(WeightManEntity.class, weightManEntities);
});
} else if (response.getCode() == 401) {
dismissDialog();
Bundle bundle = new Bundle();
......@@ -1273,7 +1273,7 @@ new Gson().toJson(breedingRecordDetailEntities));
ids.add(cre.getUnid());
}
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().insertAsyncBatch(MedicalRecordEntity.class, response.getData(), new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
if (result) {
......@@ -1283,7 +1283,7 @@ new Gson().toJson(breedingRecordDetailEntities));
errorEvent.setValue("保存诊疗记录数据失败！");
}
}
}).insertAsyncBatch(MedicalRecordEntity.class, response.getData());
});
} else {
// dismissDialog();
me.goldze.mvvmhabit.utils.ToastUtils.showShort("同步诊疗记录数据成功！");
......@@ -1354,7 +1354,7 @@ new Gson().toJson(breedingRecordDetailEntities));
DbUtil.getInstance().getQueryBuilder(MedicalRecordEntity.class)
.where(MedicalRecordEntityDao.Properties.UploadStatus.eq("0"))
.limit(10);
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<MedicalRecordEntity>() {
DbUtil.getInstance().queryAsyncAll(MedicalRecordEntity.class, builder, new DbQueryCallBack<MedicalRecordEntity>() {
@Override
public void onSuccess(List<MedicalRecordEntity> result) {
if (result != null && result.size() > 0) {
......@@ -1369,7 +1369,7 @@ new Gson().toJson(breedingRecordDetailEntities));
ToastUtils.showShort("查询-诊疗记录-失败！");
dismissDialog();
}
}).queryAsyncAll(MedicalRecordEntity.class, builder);
});
}
/**
......@@ -1403,7 +1403,7 @@ new Gson().toJson(breedingRecordDetailEntities));
}
}
}
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().updateAsyncBatch(MedicalRecordEntity.class, medicalRecordEntities, new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
if (result) {
......@@ -1414,7 +1414,7 @@ new Gson().toJson(breedingRecordDetailEntities));
dismissDialog();
}
}
}).updateAsyncBatch(MedicalRecordEntity.class, medicalRecordEntities);
});
} else if (response.getCode() == 401) {
dismissDialog();
Bundle bundle = new Bundle();
......@@ -1474,7 +1474,7 @@ new Gson().toJson(breedingRecordDetailEntities));
ids.add(cre.getUnid());
}
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().insertAsyncBatch(ImmuneBatchEntity.class, response.getData(), new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
if (result) {
......@@ -1484,7 +1484,7 @@ new Gson().toJson(breedingRecordDetailEntities));
errorEvent.setValue("保存免疫记录-主表数据失败！");
}
}
}).insertAsyncBatch(ImmuneBatchEntity.class, response.getData());
});
} else {
// dismissDialog();
me.goldze.mvvmhabit.utils.ToastUtils.showShort("同步免疫记录-主表数据成功！");
......@@ -1557,7 +1557,7 @@ new Gson().toJson(breedingRecordDetailEntities));
DbUtil.getInstance().getQueryBuilder(ImmuneBatchEntity.class)
.where(ImmuneBatchEntityDao.Properties.UploadStatus.eq("0"))
.limit(10);
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<ImmuneBatchEntity>() {
DbUtil.getInstance().queryAsyncAll(ImmuneBatchEntity.class, builder, new DbQueryCallBack<ImmuneBatchEntity>() {
@Override
public void onSuccess(List<ImmuneBatchEntity> result) {
if (result != null && result.size() > 0) {
......@@ -1572,7 +1572,7 @@ new Gson().toJson(breedingRecordDetailEntities));
ToastUtils.showShort("查询-免疫记录-主表-失败！");
dismissDialog();
}
}).queryAsyncAll(ImmuneBatchEntity.class, builder);
});
}
/**
......@@ -1606,7 +1606,7 @@ new Gson().toJson(breedingRecordDetailEntities));
}
}
}
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().updateAsyncBatch(ImmuneBatchEntity.class, immuneBatchEntities, new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
if (result) {
......@@ -1617,7 +1617,7 @@ new Gson().toJson(breedingRecordDetailEntities));
dismissDialog();
}
}
}).updateAsyncBatch(ImmuneBatchEntity.class, immuneBatchEntities);
});
} else if (response.getCode() == 401) {
dismissDialog();
Bundle bundle = new Bundle();
......@@ -1677,7 +1677,7 @@ new Gson().toJson(breedingRecordDetailEntities));
ids.add(cre.getUnid());
}
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().insertAsyncBatch(ImmuneBatchDetailEntity.class, response.getData(), new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
if (result) {
......@@ -1687,7 +1687,7 @@ new Gson().toJson(breedingRecordDetailEntities));
errorEvent.setValue("保存免疫记录-子表数据失败！");
}
}
}).insertAsyncBatch(ImmuneBatchDetailEntity.class, response.getData());
});
} else {
// dismissDialog();
me.goldze.mvvmhabit.utils.ToastUtils.showShort("同步免疫记录-子表数据成功！");
......@@ -1758,7 +1758,7 @@ new Gson().toJson(breedingRecordDetailEntities));
DbUtil.getInstance().getQueryBuilder(ImmuneBatchDetailEntity.class)
.where(ImmuneBatchDetailEntityDao.Properties.UploadStatus.eq("0"))
.limit(10);
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<ImmuneBatchDetailEntity>() {
DbUtil.getInstance().queryAsyncAll(ImmuneBatchDetailEntity.class, builder, new DbQueryCallBack<ImmuneBatchDetailEntity>() {
@Override
public void onSuccess(List<ImmuneBatchDetailEntity> result) {
if (result != null && result.size() > 0) {
......@@ -1773,7 +1773,7 @@ new Gson().toJson(breedingRecordDetailEntities));
ToastUtils.showShort("查询-免疫记录-子表-失败！");
dismissDialog();
}
}).queryAsyncAll(ImmuneBatchDetailEntity.class, builder);
});
}
/**
......@@ -1807,7 +1807,7 @@ new Gson().toJson(breedingRecordDetailEntities));
}
}
}
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().updateAsyncBatch(ImmuneBatchDetailEntity.class, immuneBatchEntities, new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
if (result) {
......@@ -1818,7 +1818,7 @@ new Gson().toJson(breedingRecordDetailEntities));
dismissDialog();
}
}
}).updateAsyncBatch(ImmuneBatchDetailEntity.class, immuneBatchEntities);
});
} else if (response.getCode() == 401) {
dismissDialog();
Bundle bundle = new Bundle();
......@@ -1863,7 +1863,7 @@ new Gson().toJson(breedingRecordDetailEntities));
QueryBuilder<CattleResumeEntity> builder0 =
DbUtil.getInstance().getQueryBuilder(CattleResumeEntity.class)
.where(CattleResumeEntityDao.Properties.UploadStatus.eq(uploadType));
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<CattleResumeEntity>() {
DbUtil.getInstance().queryAsyncAll(CattleResumeEntity.class, builder0, new DbQueryCallBack<CattleResumeEntity>() {
@Override
public void onSuccess(List<CattleResumeEntity> result) {
if (result != null) {
......@@ -1891,7 +1891,7 @@ new Gson().toJson(breedingRecordDetailEntities));
ToastUtils.showShort("查询基础数据数量失败！");
dismissDialog();
}
}).queryAsyncAll(CattleResumeEntity.class, builder0);
});
}
......@@ -1902,7 +1902,7 @@ new Gson().toJson(breedingRecordDetailEntities));
QueryBuilder<PerformanceEntity> builder1 =
DbUtil.getInstance().getQueryBuilder(PerformanceEntity.class)
.where(PerformanceEntityDao.Properties.UploadStatus.eq(uploadType));
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<PerformanceEntity>() {
DbUtil.getInstance().queryAsyncAll(PerformanceEntity.class, builder1, new DbQueryCallBack<PerformanceEntity>() {
@Override
public void onSuccess(List<PerformanceEntity> result) {
if (result != null) {
......@@ -1931,7 +1931,7 @@ new Gson().toJson(breedingRecordDetailEntities));
ToastUtils.showShort("查询性能测定数量失败！");
dismissDialog();
}
}).queryAsyncAll(PerformanceEntity.class, builder1);
});
}
......@@ -1942,7 +1942,7 @@ new Gson().toJson(breedingRecordDetailEntities));
QueryBuilder<WeightManEntity> builder2 =
DbUtil.getInstance().getQueryBuilder(WeightManEntity.class)
.where(WeightManEntityDao.Properties.UploadStatus.eq(uploadType));
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<WeightManEntity>() {
DbUtil.getInstance().queryAsyncAll(WeightManEntity.class, builder2, new DbQueryCallBack<WeightManEntity>() {
@Override
public void onSuccess(List<WeightManEntity> result) {
if (result != null) {
......@@ -1971,7 +1971,7 @@ new Gson().toJson(breedingRecordDetailEntities));
ToastUtils.showShort("查询称重管理数量失败！");
dismissDialog();
}
}).queryAsyncAll(WeightManEntity.class, builder2);
});
}
......@@ -1982,7 +1982,7 @@ new Gson().toJson(breedingRecordDetailEntities));
QueryBuilder<MedicalRecordEntity> builder3 =
DbUtil.getInstance().getQueryBuilder(MedicalRecordEntity.class)
.where(MedicalRecordEntityDao.Properties.UploadStatus.eq(uploadType));
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<MedicalRecordEntity>() {
DbUtil.getInstance().queryAsyncAll(MedicalRecordEntity.class, builder3, new DbQueryCallBack<MedicalRecordEntity>() {
@Override
public void onSuccess(List<MedicalRecordEntity> result) {
if (result != null) {
......@@ -2011,7 +2011,7 @@ new Gson().toJson(breedingRecordDetailEntities));
ToastUtils.showShort("查询诊疗记录数量失败！");
dismissDialog();
}
}).queryAsyncAll(MedicalRecordEntity.class, builder3);
});
}
......@@ -2022,7 +2022,7 @@ new Gson().toJson(breedingRecordDetailEntities));
QueryBuilder<ImmuneBatchEntity> builder4 =
DbUtil.getInstance().getQueryBuilder(ImmuneBatchEntity.class)
.where(ImmuneBatchEntityDao.Properties.UploadStatus.eq(uploadType));
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<ImmuneBatchEntity>() {
DbUtil.getInstance().queryAsyncAll(ImmuneBatchEntity.class, builder4, new DbQueryCallBack<ImmuneBatchEntity>() {
@Override
public void onSuccess(List<ImmuneBatchEntity> result) {
if (result != null) {
......@@ -2051,7 +2051,7 @@ new Gson().toJson(breedingRecordDetailEntities));
ToastUtils.showShort("查询免疫记录-主表数量失败！");
dismissDialog();
}
}).queryAsyncAll(ImmuneBatchEntity.class, builder4);
});
}
......@@ -2062,7 +2062,7 @@ new Gson().toJson(breedingRecordDetailEntities));
QueryBuilder<ImmuneBatchDetailEntity> builder5 =
DbUtil.getInstance().getQueryBuilder(ImmuneBatchDetailEntity.class)
.where(ImmuneBatchDetailEntityDao.Properties.UploadStatus.eq(uploadType));
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<ImmuneBatchDetailEntity>() {
DbUtil.getInstance().queryAsyncAll(ImmuneBatchDetailEntity.class, builder5, new DbQueryCallBack<ImmuneBatchDetailEntity>() {
@Override
public void onSuccess(List<ImmuneBatchDetailEntity> result) {
if (result != null) {
......@@ -2091,7 +2091,7 @@ new Gson().toJson(breedingRecordDetailEntities));
ToastUtils.showShort("查询免疫记录-子表数量失败！");
dismissDialog();
}
}).queryAsyncAll(ImmuneBatchDetailEntity.class, builder5);
});
}
......@@ -2102,7 +2102,7 @@ new Gson().toJson(breedingRecordDetailEntities));
QueryBuilder<BreedingRecordEntity> builder6 =
DbUtil.getInstance().getQueryBuilder(BreedingRecordEntity.class)
.where(BreedingRecordEntityDao.Properties.UploadStatus.eq(uploadType));
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<BreedingRecordEntity>() {
DbUtil.getInstance().queryAsyncAll(BreedingRecordEntity.class, builder6, new DbQueryCallBack<BreedingRecordEntity>() {
@Override
public void onSuccess(List<BreedingRecordEntity> result) {
if (result != null) {
......@@ -2131,7 +2131,7 @@ new Gson().toJson(breedingRecordDetailEntities));
ToastUtils.showShort("查询配种记录-主表数量失败！");
dismissDialog();
}
}).queryAsyncAll(BreedingRecordEntity.class, builder6);
});
}
......@@ -2142,7 +2142,7 @@ new Gson().toJson(breedingRecordDetailEntities));
QueryBuilder<BreedingRecordDetailEntity> builder7 =
DbUtil.getInstance().getQueryBuilder(BreedingRecordDetailEntity.class)
.where(BreedingRecordDetailEntityDao.Properties.UploadStatus.eq(uploadType));
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<BreedingRecordDetailEntity>() {
DbUtil.getInstance().queryAsyncAll(BreedingRecordDetailEntity.class, builder7, new DbQueryCallBack<BreedingRecordDetailEntity>() {
@Override
public void onSuccess(List<BreedingRecordDetailEntity> result) {
if (result != null) {
......@@ -2171,7 +2171,7 @@ new Gson().toJson(breedingRecordDetailEntities));
ToastUtils.showShort("查询配种记录-子表数量失败！");
dismissDialog();
}
}).queryAsyncAll(BreedingRecordDetailEntity.class, builder7);
});
}
/**
......@@ -2186,7 +2186,7 @@ new Gson().toJson(breedingRecordDetailEntities));
QueryBuilder<CattleResumeEntity> builder =
DbUtil.getInstance().getQueryBuilder(CattleResumeEntity.class)
.where(CattleResumeEntityDao.Properties.UploadStatus.eq(UPLOAD_STATUS_ERROR)).limit(1);
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<CattleResumeEntity>() {
DbUtil.getInstance().queryAsyncAll(CattleResumeEntity.class, builder, new DbQueryCallBack<CattleResumeEntity>() {
@Override
public void onSuccess(List<CattleResumeEntity> result) {
if (result != null && result.size() > 0) {
......@@ -2211,7 +2211,7 @@ new Gson().toJson(breedingRecordDetailEntities));
if (response.getCode() == 0) {
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().deleteAsyncBatch(CattleResumeEntity.class, result, new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
if (result) {
......@@ -2220,7 +2220,7 @@ new Gson().toJson(breedingRecordDetailEntities));
uploadPerformanceError();
}
}
}).deleteAsyncBatch(CattleResumeEntity.class, result);
});
} else if (response.getCode() == 401) {
dismissDialog();
......@@ -2249,7 +2249,7 @@ new Gson().toJson(breedingRecordDetailEntities));
ToastUtils.showShort("查询基础数据错误数据失败！");
uploadPerformanceError();
}
}).queryAsyncAll(CattleResumeEntity.class, builder);
});
}
private void uploadPerformanceError() {
......@@ -2257,7 +2257,7 @@ new Gson().toJson(breedingRecordDetailEntities));
QueryBuilder<PerformanceEntity> builder =
DbUtil.getInstance().getQueryBuilder(PerformanceEntity.class)
.where(PerformanceEntityDao.Properties.UploadStatus.eq(UPLOAD_STATUS_ERROR)).limit(1);
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<PerformanceEntity>() {
DbUtil.getInstance().queryAsyncAll(PerformanceEntity.class, builder, new DbQueryCallBack<PerformanceEntity>() {
@Override
public void onSuccess(List<PerformanceEntity> result) {
if (result != null && result.size() > 0) {
......@@ -2282,7 +2282,7 @@ new Gson().toJson(breedingRecordDetailEntities));
if (response.getCode() == 0) {
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().deleteAsyncBatch(PerformanceEntity.class, result, new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
if (result) {
......@@ -2291,7 +2291,7 @@ new Gson().toJson(breedingRecordDetailEntities));
uploadWeightManError();
}
}
}).deleteAsyncBatch(PerformanceEntity.class, result);
});
} else if (response.getCode() == 401) {
dismissDialog();
......@@ -2320,7 +2320,7 @@ new Gson().toJson(breedingRecordDetailEntities));
ToastUtils.showShort("查询性能测定错误数据失败！");
uploadWeightManError();
}
}).queryAsyncAll(PerformanceEntity.class, builder);
});
}
......@@ -2329,7 +2329,7 @@ new Gson().toJson(breedingRecordDetailEntities));
QueryBuilder<WeightManEntity> builder =
DbUtil.getInstance().getQueryBuilder(WeightManEntity.class)
.where(WeightManEntityDao.Properties.UploadStatus.eq(UPLOAD_STATUS_ERROR)).limit(1);
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<WeightManEntity>() {
DbUtil.getInstance().queryAsyncAll(WeightManEntity.class, builder, new DbQueryCallBack<WeightManEntity>() {
@Override
public void onSuccess(List<WeightManEntity> result) {
if (result != null && result.size() > 0) {
......@@ -2354,7 +2354,7 @@ new Gson().toJson(breedingRecordDetailEntities));
if (response.getCode() == 0) {
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().deleteAsyncBatch(WeightManEntity.class, result, new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
if (result) {
......@@ -2363,7 +2363,7 @@ new Gson().toJson(breedingRecordDetailEntities));
uploadMedicalRecordError();
}
}
}).deleteAsyncBatch(WeightManEntity.class, result);
});
} else if (response.getCode() == 401) {
dismissDialog();
......@@ -2392,7 +2392,7 @@ new Gson().toJson(breedingRecordDetailEntities));
ToastUtils.showShort("查询称重错误数据失败！");
uploadMedicalRecordError();
}
}).queryAsyncAll(WeightManEntity.class, builder);
});
}
private void uploadMedicalRecordError() {
......@@ -2400,7 +2400,7 @@ new Gson().toJson(breedingRecordDetailEntities));
QueryBuilder<MedicalRecordEntity> builder =
DbUtil.getInstance().getQueryBuilder(MedicalRecordEntity.class)
.where(MedicalRecordEntityDao.Properties.UploadStatus.eq(UPLOAD_STATUS_ERROR)).limit(1);
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<MedicalRecordEntity>() {
DbUtil.getInstance().queryAsyncAll(MedicalRecordEntity.class, builder, new DbQueryCallBack<MedicalRecordEntity>() {
@Override
public void onSuccess(List<MedicalRecordEntity> result) {
if (result != null && result.size() > 0) {
......@@ -2425,7 +2425,7 @@ new Gson().toJson(breedingRecordDetailEntities));
if (response.getCode() == 0) {
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().deleteAsyncBatch(MedicalRecordEntity.class, result, new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
if (result) {
......@@ -2434,7 +2434,7 @@ new Gson().toJson(breedingRecordDetailEntities));
uploadImmuneBatchError();
}
}
}).deleteAsyncBatch(MedicalRecordEntity.class, result);
});
} else if (response.getCode() == 401) {
dismissDialog();
......@@ -2463,7 +2463,7 @@ new Gson().toJson(breedingRecordDetailEntities));
ToastUtils.showShort("查询诊疗记录错误数据失败！");
uploadImmuneBatchError();
}
}).queryAsyncAll(MedicalRecordEntity.class, builder);
});
}
......@@ -2473,7 +2473,7 @@ new Gson().toJson(breedingRecordDetailEntities));
QueryBuilder<ImmuneBatchEntity> builder =
DbUtil.getInstance().getQueryBuilder(ImmuneBatchEntity.class)
.where(ImmuneBatchEntityDao.Properties.UploadStatus.eq(UPLOAD_STATUS_ERROR)).limit(1);
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<ImmuneBatchEntity>() {
DbUtil.getInstance().queryAsyncAll(ImmuneBatchEntity.class, builder, new DbQueryCallBack<ImmuneBatchEntity>() {
@Override
public void onSuccess(List<ImmuneBatchEntity> result) {
if (result != null && result.size() > 0) {
......@@ -2498,7 +2498,7 @@ new Gson().toJson(breedingRecordDetailEntities));
if (response.getCode() == 0) {
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().deleteAsyncBatch(ImmuneBatchEntity.class, result, new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
if (result) {
......@@ -2507,7 +2507,7 @@ new Gson().toJson(breedingRecordDetailEntities));
uploadImmuneBatchDetailError();
}
}
}).deleteAsyncBatch(ImmuneBatchEntity.class, result);
});
} else if (response.getCode() == 401) {
dismissDialog();
......@@ -2536,7 +2536,7 @@ new Gson().toJson(breedingRecordDetailEntities));
ToastUtils.showShort("查询免疫记录错误数据失败！");
uploadImmuneBatchDetailError();
}
}).queryAsyncAll(ImmuneBatchEntity.class, builder);
});
}
......@@ -2547,7 +2547,7 @@ new Gson().toJson(breedingRecordDetailEntities));
QueryBuilder<ImmuneBatchDetailEntity> builder =
DbUtil.getInstance().getQueryBuilder(ImmuneBatchDetailEntity.class)
.where(ImmuneBatchDetailEntityDao.Properties.UploadStatus.eq(UPLOAD_STATUS_ERROR)).limit(1);
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<ImmuneBatchDetailEntity>() {
DbUtil.getInstance().queryAsyncAll(ImmuneBatchDetailEntity.class, builder, new DbQueryCallBack<ImmuneBatchDetailEntity>() {
@Override
public void onSuccess(List<ImmuneBatchDetailEntity> result) {
if (result != null && result.size() > 0) {
......@@ -2572,7 +2572,7 @@ new Gson().toJson(breedingRecordDetailEntities));
if (response.getCode() == 0) {
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().deleteAsyncBatch(ImmuneBatchDetailEntity.class, result, new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
if (result) {
......@@ -2581,7 +2581,7 @@ new Gson().toJson(breedingRecordDetailEntities));
uploadBreedingRecordError();
}
}
}).deleteAsyncBatch(ImmuneBatchDetailEntity.class, result);
});
} else if (response.getCode() == 401) {
dismissDialog();
......@@ -2610,7 +2610,7 @@ new Gson().toJson(breedingRecordDetailEntities));
ToastUtils.showShort("查询免疫记录-子表错误数据失败！");
uploadBreedingRecordError();
}
}).queryAsyncAll(ImmuneBatchDetailEntity.class, builder);
});
}
......@@ -2620,7 +2620,7 @@ new Gson().toJson(breedingRecordDetailEntities));
QueryBuilder<BreedingRecordEntity> builder =
DbUtil.getInstance().getQueryBuilder(BreedingRecordEntity.class)
.where(BreedingRecordEntityDao.Properties.UploadStatus.eq(UPLOAD_STATUS_ERROR)).limit(1);
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<BreedingRecordEntity>() {
DbUtil.getInstance().queryAsyncAll(BreedingRecordEntity.class, builder, new DbQueryCallBack<BreedingRecordEntity>() {
@Override
public void onSuccess(List<BreedingRecordEntity> result) {
if (result != null && result.size() > 0) {
......@@ -2645,7 +2645,7 @@ new Gson().toJson(breedingRecordDetailEntities));
if (response.getCode() == 0) {
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().deleteAsyncBatch(BreedingRecordEntity.class, result, new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
if (result) {
......@@ -2654,7 +2654,7 @@ new Gson().toJson(breedingRecordDetailEntities));
uploadBreedingRecordDetailError();
}
}
}).deleteAsyncBatch(BreedingRecordEntity.class, result);
});
} else if (response.getCode() == 401) {
dismissDialog();
......@@ -2683,7 +2683,7 @@ new Gson().toJson(breedingRecordDetailEntities));
ToastUtils.showShort("查询配种记录错误数据失败！");
uploadBreedingRecordDetailError();
}
}).queryAsyncAll(BreedingRecordEntity.class, builder);
});
}
......@@ -2693,7 +2693,7 @@ new Gson().toJson(breedingRecordDetailEntities));
QueryBuilder<BreedingRecordDetailEntity> builder =
DbUtil.getInstance().getQueryBuilder(BreedingRecordDetailEntity.class)
.where(BreedingRecordDetailEntityDao.Properties.UploadStatus.eq(UPLOAD_STATUS_ERROR)).limit(1);
DbUtil.getInstance().setDbQueryCallBack(new DbQueryCallBack<BreedingRecordDetailEntity>() {
DbUtil.getInstance().queryAsyncAll(BreedingRecordDetailEntity.class, builder, new DbQueryCallBack<BreedingRecordDetailEntity>() {
@Override
public void onSuccess(List<BreedingRecordDetailEntity> result) {
if (result != null && result.size() > 0) {
......@@ -2718,7 +2718,7 @@ new Gson().toJson(breedingRecordDetailEntities));
if (response.getCode() == 0) {
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().deleteAsyncBatch(BreedingRecordDetailEntity.class, result, new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
if (result) {
......@@ -2728,7 +2728,7 @@ new Gson().toJson(breedingRecordDetailEntities));
queryCattleResumeUploadCount(true, UPLOAD_STATUS_HAVE_NOT);
}
}
}).deleteAsyncBatch(BreedingRecordDetailEntity.class, result);
});
} else if (response.getCode() == 401) {
dismissDialog();
......@@ -2760,7 +2760,7 @@ new Gson().toJson(breedingRecordDetailEntities));
dismissDialog();
queryCattleResumeUploadCount(true, UPLOAD_STATUS_HAVE_NOT);
}
}).queryAsyncAll(BreedingRecordDetailEntity.class, builder);
});
}
......
app/src/main/java/com/phlx/anchorcollect_p/ui/splash/SplashVM.java
View file @ e0d1879c
......@@ -12,9 +12,11 @@ import com.phlx.anchorcollect_p.db.gen.GenTableColumnDao;
import com.phlx.anchorcollect_p.db.gen.GenTableDao;
import com.phlx.anchorcollect_p.db.interf.DbIDUCallBack;
import com.phlx.anchorcollect_p.entity.DictEntity;
import com.phlx.anchorcollect_p.entity.FrozenSemenEntity;
import com.phlx.anchorcollect_p.entity.GenData;
import com.phlx.anchorcollect_p.entity.GenTable;
import com.phlx.anchorcollect_p.entity.GenTableColumn;
import com.phlx.anchorcollect_p.entity.LoginInfoData;
import com.phlx.anchorcollect_p.params.CollectResponse;
import com.phlx.anchorcollect_p.params.ListResponse;
import com.phlx.anchorcollect_p.params.PostParams;
......@@ -59,35 +61,49 @@ public class SplashVM extends MainBarVM<Repository> {
.compose(RxUtils.exceptionTransformer())
.doOnSubscribe(disposable -> {
})
.subscribe((Consumer<ListResponse<DictEntity>>) response -> {
.subscribe((Consumer<CollectResponse<LoginInfoData>>) response -> {
if (response.getCode() == 0) {
//清除之前的页面配置
DbUtil.getInstance().deleteAll(DictEntity.class);
DbUtil.getInstance().deleteAll(FrozenSemenEntity.class);
if (response.getData() != null && response.getData().size() > 0) {
KLog.e(response.getData().size());
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
if (response.getData() != null && !response.getData().getDictList().isEmpty()) {
KLog.e(response.getData().getDictList().size());
DbUtil.getInstance().insertAsyncBatch(DictEntity.class, response.getData().getDictList(), new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
if (result) {
ToastUtils.showShort("字典项数据同步完成！");
if (response.getData() != null && !response.getData().getFrozenSemenList().isEmpty()) {
KLog.e("getFrozenSemenList:"+response.getData().getFrozenSemenList().size());
DbUtil.getInstance().insertAsyncBatch(FrozenSemenEntity.class, response.getData().getFrozenSemenList(), new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
if (result) {
ToastUtils.showShort("冻精数据同步完成！");
} else {
errorEvent.setValue("保存冻精数据失败");
}
}
});
}
} else {
errorEvent.setValue("保存字典项数据失败");
}
}
}).insertAsyncBatch(DictEntity.class, response.getData());
} else {
});
}
requestGen();
} else {
errorEvent.setValue("同步字典项数据错误 :" + response.getMsg());
errorEvent.setValue("同步登陆信息数据错误 :" + response.getMsg());
}
}, (Consumer<ResponseThrowable>) throwable -> {
dismissDialog();
KLog.e(throwable.message);
errorEvent.setValue("同步字典项数据失败");
errorEvent.setValue("同步登陆信息数据失败");
})
);
......@@ -114,11 +130,11 @@ public class SplashVM extends MainBarVM<Repository> {
if (response.getData().getGenTableColumns() != null && response.getData().getGenTables() != null) {
KLog.e(response.getData().getGenTables().size() + "|" + response.getData().getGenTableColumns().size());
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().insertAsyncBatch(GenTable.class, response.getData().getGenTables(), new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
if (result) {
DbUtil.getInstance().setDbIDUCallBack(new DbIDUCallBack() {
DbUtil.getInstance().insertAsyncBatch(GenTableColumn.class, response.getData().getGenTableColumns(), new DbIDUCallBack() {
@Override
public void onNotification(boolean result) {
if (result) {
......@@ -127,12 +143,12 @@ public class SplashVM extends MainBarVM<Repository> {
errorEvent.setValue("保存页面配置详情数据失败");
}
}
}).insertAsyncBatch(GenTableColumn.class, response.getData().getGenTableColumns());
});
} else {
errorEvent.setValue("保存页面配置数据失败");
}
}
}).insertAsyncBatch(GenTable.class, response.getData().getGenTables());
});
} else {
dismissDialog();
}
......
app/src/main/java/com/phlx/anchorcollect_p/util/DictUtils.java → app/src/main/java/com/phlx/anchorcollect_p/util/LoginInfoUtils.java
View file @ e0d1879c
......@@ -3,11 +3,12 @@ package com.phlx.anchorcollect_p.util;
import com.phlx.anchorcollect_p.Configs;
import com.phlx.anchorcollect_p.entity.DictEntity;
import com.phlx.anchorcollect_p.entity.FrozenSemenEntity;
import java.util.ArrayList;
import java.util.List;
public class DictUtils {
public class LoginInfoUtils {
public static List<String> getDistNameList(String type){
......@@ -34,4 +35,18 @@ public class DictUtils {
}
public static FrozenSemenEntity getFrozenSemenForName(String code) {
for (FrozenSemenEntity frozenSemenEntity : Configs.frozenSemenList) {
String[] infos = frozenSemenEntity.getInfo().split("/");
if (infos != null && infos.length > 0) {
for (int i = 0; i < infos.length; i++) {
if (infos[i].equals(code)) {
return frozenSemenEntity;
}
}
}
}
return null;
}
}
app/src/main/res/layout/activity_label_change.xml
View file @ e0d1879c
......@@ -69,7 +69,7 @@
android:layout_height="@dimen/dp_40"
android:gravity="center_vertical"
android:layout_marginTop="@dimen/dp_5"
android:text="高频耳标"
android:text="电子耳标"
android:textColor="@color/black"
android:textSize="@dimen/desc_text_size" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment