project_boditech_vidas_a8000_v3
/
a8k_app
7
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

update

tags/v0
zhaohe 8 months ago
parent
a951eddf38
commit
e3452db034
11 changed files with 52 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      appresource/static/engineer/css/app.61c78ac9.css
  2. 2
      appresource/static/engineer/index.html
  3. 2
      appresource/static/engineer/js/app.07292ad6.js
  4. 1
      appresource/static/engineer/js/app.07292ad6.js.map
  5. 2
      appresource/static/engineer/js/app.549fa95b.js
  6. 1
      appresource/static/engineer/js/app.549fa95b.js.map
  7. 6
      src/main/java/a8k/app/a8ktype/type/ConsumablesScanReport.java
  8. 9
      src/main/java/a8k/app/controler/api/v1/app/state/AppTubeSettingMgrControler.java
  9. 40
      src/main/java/a8k/app/service/mainctrl/AppConsumablesScanService.java
  10. 20
      src/main/java/a8k/extui/service/test/MainflowCtrlTestService.java

2
appresource/static/engineer/css/app.07ca5d39.css → appresource/static/engineer/css/app.61c78ac9.css
View File

@ -1,4 +1,4 @@
.action-param-label[data-v-7e7aa82e]{font-size:.6rem;top:-8px;position:absolute;z-index:9;left:5px;padding:0 5px;color:#7b7b7b}
.action-param-label[data-v-38b7b772]{font-size:.6rem;top:-8px;position:absolute;z-index:9;left:5px;padding:0 5px;color:#7b7b7b}
/*
! tailwindcss v3.4.4 | MIT License | https://tailwindcss.com

2
appresource/static/engineer/index.html
View File

@ -1 +1 @@
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>a8k_webui</title><script defer="defer" src="js/chunk-vendors.ce3623b2.js"></script><script defer="defer" src="js/app.07292ad6.js"></script><link href="css/app.07ca5d39.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but a8k_webui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>a8k_webui</title><script defer="defer" src="js/chunk-vendors.ce3623b2.js"></script><script defer="defer" src="js/app.549fa95b.js"></script><link href="css/app.61c78ac9.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but a8k_webui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>

2
appresource/static/engineer/js/app.07292ad6.js
File diff suppressed because it is too large
View File

1
appresource/static/engineer/js/app.07292ad6.js.map
File diff suppressed because it is too large
View File

2
appresource/static/engineer/js/app.549fa95b.js
File diff suppressed because it is too large
View File

1
appresource/static/engineer/js/app.549fa95b.js.map
File diff suppressed because it is too large
View File

6
src/main/java/a8k/app/a8ktype/type/ConsumablesScanReport.java
View File

@ -8,9 +8,13 @@ public class ConsumablesScanReport {
@Schema(description = "通道号(0->5)")
public Integer chNum;
@Schema(description = "扫描结果")
public ConsumablesScanReportErrorType report;
public ConsumablesScanReportErrorType state;
@Schema(description = "项目ID")
public Integer projId;
@Schema(description = "批次号")
public String lotId;
@Schema(description = "项目名称")
public String projName;
@Schema(description = "项目简称")
public String projShortName;
}

9
src/main/java/a8k/app/controler/api/v1/app/state/AppTubeSettingMgrControler.java
View File

@ -40,10 +40,15 @@ public class AppTubeSettingMgrControler {
return ApiRet.success(appTubeSettingMgrService.getTubeHolderSettings());
}
public static class TubeSettingVal {
public String uuid;
public TubeSetting setting;
}
@Operation(summary = "配置试管")
@PostMapping("/updateTubeSetting")
public ApiRet<Void> updateTubeSetting(@RequestBody String uuid, @RequestBody TubeSetting setting) throws AppException {
appTubeSettingMgrService.updateTubeSetting(uuid, setting);
public ApiRet<Void> updateTubeSetting(@RequestBody TubeSettingVal model) throws AppException {
appTubeSettingMgrService.updateTubeSetting(model.uuid, model.setting);
return ApiRet.success();
}

40
src/main/java/a8k/app/service/mainctrl/AppConsumablesScanService.java
View File

@ -32,9 +32,9 @@ public class AppConsumablesScanService {
@Resource
ConsumablesScanCtrlService scanCtrlService;
@Resource
ConsumablesMgrService consumablesMgrService;
ConsumablesMgrService consumablesMgrService;
@Resource
GStateMgrService gstate;
GStateMgrService gstate;
@Resource
ProjInfoMgrService projInfoMgrService;
@ -52,20 +52,20 @@ public class AppConsumablesScanService {
ret.chNum = ch;
if (rawResult == null) {
ret.report = ConsumablesScanReportErrorType.EMPTY;
ret.state = ConsumablesScanReportErrorType.EMPTY;
return ret;
}
if (ZStringUtils.isNullOrEmpty(rawResult.larBSScanResult) &&
ZStringUtils.isNullOrEmpty(rawResult.littBSScanResult) &&
ZStringUtils.isNullOrEmpty(rawResult.PBScanResult)) {
ret.report = ConsumablesScanReportErrorType.EMPTY;
ret.state = ConsumablesScanReportErrorType.EMPTY;
return ret;
}
if (ZStringUtils.isNullOrEmpty(rawResult.PBScanResult)) {
ret.report = ConsumablesScanReportErrorType.MISS_REACTION_PLATE;
ret.state = ConsumablesScanReportErrorType.MISS_REACTION_PLATE;
return ret;
}
@ -73,19 +73,19 @@ public class AppConsumablesScanService {
//解析板夹二维码
ReactionPlate2DCode rp2dcode = ReactionPlate2DCodeHelper.parse(rawResult.PBScanResult);
if (rp2dcode == null) {
ret.report = ConsumablesScanReportErrorType.REACTION_PLATE_2D_CODE_FORMATE_ERROR;
ret.state = ConsumablesScanReportErrorType.REACTION_PLATE_2D_CODE_FORMATE_ERROR;
return ret;
}
var projExtInfoCard = projInfoMgrService.getProjExtInfoCard(rp2dcode.lotId);
if (projExtInfoCard == null) {
logger.warn("未找到匹配的项目ID卡，LotID:{}", rp2dcode.lotId);
ret.report = ConsumablesScanReportErrorType.MISS_IDCARD;
ret.state = ConsumablesScanReportErrorType.MISS_IDCARD;
return ret;
}
if (projExtInfoCard.expiryDate.before(new Date())) {
logger.warn("耗材过期，LotID:{}", rp2dcode.lotId);
ret.report = ConsumablesScanReportErrorType.EXPIRED;
ret.state = ConsumablesScanReportErrorType.EXPIRED;
return ret;
}
@ -93,7 +93,7 @@ public class AppConsumablesScanService {
try {
projBuildinInfo = projInfoMgrService.getProjBuildInInfo(projExtInfoCard.projId);
} catch (AppException e) {
ret.report = ConsumablesScanReportErrorType.UN_SUPPORT_PROJ;
ret.state = ConsumablesScanReportErrorType.UN_SUPPORT_PROJ;
return ret;
}
@ -105,24 +105,24 @@ public class AppConsumablesScanService {
if (reactionType.equals(A8kReactionFlowType.SampleAndBS)) {
//校验小瓶缓冲液,小瓶缓冲液+样本
if (ZStringUtils.isNullOrEmpty(rawResult.littBSScanResult)) {
ret.report = ConsumablesScanReportErrorType.MISS_LITTSB;
ret.state = ConsumablesScanReportErrorType.MISS_LITTSB;
return ret;
}
if (!rawResult.littBSScanResult.equals(rp2dcode.lotId)) {
ret.report = ConsumablesScanReportErrorType.LITTSB_LOTID_MISMATCH;
ret.state = ConsumablesScanReportErrorType.LITTSB_LOTID_MISMATCH;
return ret;
}
} else if (reactionType.equals(A8kReactionFlowType.SampleAndBSAndProbeSubstance)) {
// 校验大瓶缓冲液,大瓶缓冲液+小瓶缓冲液+样本
if (ZStringUtils.isNullOrEmpty(rawResult.larBSScanResult)) {
ret.report = ConsumablesScanReportErrorType.MISS_LARBS;
ret.state = ConsumablesScanReportErrorType.MISS_LARBS;
return ret;
}
if (!rawResult.larBSScanResult.equals(rp2dcode.lotId)) {
ret.report = ConsumablesScanReportErrorType.LARBS_LOTID_MISMATCH;
ret.state = ConsumablesScanReportErrorType.LARBS_LOTID_MISMATCH;
return ret;
}
@ -131,14 +131,16 @@ public class AppConsumablesScanService {
throw new RuntimeException("未知的反应流程类型");
}
ret.lotId = rp2dcode.lotId;
ret.projId = projId;
ret.report = ConsumablesScanReportErrorType.PASS;
ret.lotId = rp2dcode.lotId;
ret.projId = projId;
ret.state = ConsumablesScanReportErrorType.PASS;
ret.projName = projExtInfoCard.projName;
ret.projShortName = projExtInfoCard.projShortName;
return ret;
}
void LoadingConsumables(Integer ch, ConsumablesScanReport result) {
if (result.report != ConsumablesScanReportErrorType.PASS) {
if (result.state != ConsumablesScanReportErrorType.PASS) {
return;
}
@ -202,7 +204,7 @@ public class AppConsumablesScanService {
//加载耗材
for (int i = 0; i < AppConstant.CONSUMABLE_CHANNEL_NUM; i++) {
if (scanReport.get(i).report == ConsumablesScanReportErrorType.PASS) {
if (scanReport.get(i).state == ConsumablesScanReportErrorType.PASS) {
LoadingConsumables(i, scanReport.get(i));
}
}
@ -225,7 +227,7 @@ public class AppConsumablesScanService {
scanResult = scanCtrlService.doScanOneCh(chNum);
var scanReport = parseScanResult(chNum, scanResult);
if (scanReport.report != ConsumablesScanReportErrorType.PASS) {
if (scanReport.state != ConsumablesScanReportErrorType.PASS) {
LoadingConsumables(chNum, scanReport);
}

20
src/main/java/a8k/extui/service/test/MainflowCtrlTestService.java
View File

@ -72,16 +72,16 @@ public class MainflowCtrlTestService {
@Resource
OptScanModuleStateMgrService optScanModuleStateMgrService;
@Resource
PublicAreaResourceMgr publicAreaResourceMgr;
PublicAreaResourceMgr publicAreaResourceMgr;
//
// DB
//
@Resource
A8kProjExtInfoCardDao a8KProjExtInfoCardDao;
A8kProjExtInfoCardDao a8KProjExtInfoCardDao;
@Resource
ProjectBaseInfoDao projectBaseInfoDao;
ProjectBaseInfoDao projectBaseInfoDao;
@Resource
ProjOptInfoDao projOptInfoDao;
ProjOptInfoDao projOptInfoDao;
//
// Ctrl
@ -114,10 +114,11 @@ public class MainflowCtrlTestService {
void LoadingConsumablesDirectly(ConsumableGroup group, FakeProjInfo fake) {
var result = new ConsumablesScanReport();
result.lotId = fake.lotId;
result.chNum = group.off;
result.projId = fake.projId;
result.report = ConsumablesScanReportErrorType.PASS;
result.lotId = fake.lotId;
result.chNum = group.off;
result.projId = fake.projId;
result.state = ConsumablesScanReportErrorType.PASS;
result.projName = fake.projName;
appConsumablesScanService.LoadingConsumablesDirectly(result);
consumablesMgrService.setTipNum(TipGroup.TipG1, AppConstant.TIP_NUM);
}
@ -220,7 +221,7 @@ public class MainflowCtrlTestService {
@ExtApiFn(name = "获取所有资源状态", group = "设备控制", order = 408)
public List<PublicAreaResource> readAllResourceState() {
return publicAreaResourceMgr.getResources();
return publicAreaResourceMgr.getResources();
}
// getResources
@ -387,5 +388,4 @@ public class MainflowCtrlTestService {
}
}
Write Preview
Loading…
Cancel
Save