Browse Source

update

tags/v0
zhaohe 8 months ago
parent
commit
604f4235a4
  1. 6
      pom.xml
  2. 17
      src/main/java/a8k/service/dao/ProjectBaseInfoDao.java
  3. 19
      src/main/java/a8k/service/dao/type/ProjectBaseInfo.java
  4. 6
      src/main/java/a8k/utils/ZSqliteJdbcHelper.java
  5. 2
      src/main/resources/a8k/db/zapp_a8k_project_info.csv
  6. 2
      src/main/resources/zapp_a8k_proj_info.csv

6
pom.xml

@ -93,6 +93,12 @@
<artifactId>hutool-all</artifactId>
<version>5.8.16</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>3.17</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>

17
src/main/java/a8k/service/dao/ProjectBaseInfoDao.java

@ -33,6 +33,8 @@ public class ProjectBaseInfoDao extends ZSqlite<ProjectBaseInfo> {
log.info("{}", ZJsonHelper.objectToJson(val));
val.id = val.projId;
add(val);
val = findByProjId(val.projId);
checkVal(val);
}
}
@ -52,4 +54,19 @@ public class ProjectBaseInfoDao extends ZSqlite<ProjectBaseInfo> {
}
private void checkVal(ProjectBaseInfo val) {
for (var field : val.getClass().getDeclaredFields()) {
try {
field.setAccessible(true);
if (field.get(val) == null) {
log.error("field {} is null,{}", field.getName(), val);
System.exit(1);
}
} catch (IllegalAccessException e) {
e.printStackTrace();
}
}
}
}

19
src/main/java/a8k/service/dao/type/ProjectBaseInfo.java

@ -38,4 +38,23 @@ public class ProjectBaseInfo implements Serializable {
public Integer reactionPlateIncubationTimeMin; //反应板孵育时间Min
@JsonIgnore
public Integer reactionPlateDropletVolUl; //反应板滴样量ul
public String toString() {
return "ProjectBaseInfo{" +
"id=" + id +
", projId=" + projId +
", projName='" + projName + '\'' +
", projShortName='" + projShortName + '\'' +
", subProjNum=" + subProjNum +
", reactionTemperature=" + reactionTemperature +
", color='" + color + '\'' +
", reactionFlowType=" + reactionFlowType +
", wBloodSampleVolUl=" + wBloodSampleVolUl +
", serumSampleVolUl=" + serumSampleVolUl +
", shakeTimes=" + shakeTimes +
", bigBufferSampleUl=" + bigBufferSampleUl +
", reactionPlateIncubationTimeMin=" + reactionPlateIncubationTimeMin +
", reactionPlateDropletVolUl=" + reactionPlateDropletVolUl +
'}';
}
}

6
src/main/java/a8k/utils/ZSqliteJdbcHelper.java

@ -83,7 +83,13 @@ public class ZSqliteJdbcHelper {
Object obj = tClass.newInstance();
for (java.lang.reflect.Field field : tClass.getDeclaredFields()) {
if (!field.getName().equals("id") &&rs.getObject(field.getName()) == null) {
field.set(obj, null);
continue;
}
if (field.getType().equals(Integer.class)) {
field.set(obj, rs.getInt(field.getName()));
} else if (field.getType().equals(int.class)) {
field.set(obj, rs.getInt(field.getName()));

2
src/main/resources/a8k/db/zapp_a8k_project_info.csv

@ -1,5 +1,5 @@
projId,projName,projShortName,subProjNum,reactionTemperature,color,reactionFlowType,wBloodSampleVolUl,serumSampleVolUl,shakeTimes,bigBufferSampleUl,reactionPlateIncubationTimeMin,reactionPlateDropletVolUl,
1,hsCRP,CA,1,25,#FFC0CB,SampleAndBS,10,10,3,0,3,75,
1,hsCRP,CA,1,25,#FFC0CB,SampleAndBS,10,10,3,0,3,75
2,PCT,PC,1,25,#DC143C,SampleAndBS,150,150,3,0,12,75,
3,TSH,TS,1,25,#DB7093,SampleAndBSAndProbeSubstance,150,150,3,75,12,75,
4,PRL,PL,1,25,#FF69B4,SampleAndBS,75,75,3,0,10,75,

2
src/main/resources/zapp_a8k_proj_info.csv

@ -1,2 +0,0 @@
projIndex,projName,projShortName,projNum,reactionTemperature,color,reactionFlowType,wBloodSampleVolUl,serumSampleVolUl,shakeTimes,bigBufferSampleUl,mixLiquidAspirMixingCnt,reactionPlateIncubationTime,reactionPlateDropletVolUl,subProj1_name,subProj1_shortName,subProj1_optType,subProj1_scanRange,subProj1_scanDirection,subProj1_peakNum,subProj1_peakNames,subProj1_peakPos,subProj1_optLaserAmplFactor,subProj1_optScanFactor,subProj2_name,subProj2_shortName,subProj2_optType,subProj2_scanRange,subProj2_scanDirection,subProj2_peakNum,subProj2_peakNames,subProj2_peakPos,subProj2_optLaserAmplFactor,subProj2_optScanFactor,subProj3_name,subProj3_shortName,subProj3_optType,subProj3_scanRange,subProj3_scanDirection,subProj3_peakNum,subProj3_peakNames,subProj3_peakPos,subProj3_optLaserAmplFactor,subProj3_optScanFactor
项目index,项目名称,项目缩写词,是否是多联卡,反应温度,项目颜色,反应流程,全血样本量ul,血清/血浆样本量ul,摇匀次数,大瓶缓冲液取样量ul,混合混匀次数,反应板孵育时间Min,反应板滴样量ul,子项目1_名称,子项目1_缩写名称,子项目1_光学类型,子项目1_扫描范围,子项目1_扫描方向,子项目1_峰的数量,子项目1_峰的名称,子项目1_峰的位置,子项目1_发射放大系数,子项目1_扫描放大系数,子项目2_名称,子项目1_缩写名称,子项目2_光学类型,子项目2_扫描范围,子项目2_扫描方向,子项目2_峰的数量,子项目2_峰的名称,子项目2_峰的位置,子项目2_发射放大系数,子项目2_扫描放大系数,子项目3_名称,子项目1_缩写名称,子项目3_光学类型,子项目3_扫描范围,子项目3_扫描方向,子项目3_峰的数量,子项目3_峰的名称,子项目3_峰的位置,子项目3_发射放大系数,子项目3_扫描放大系数
Loading…
Cancel
Save