ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
caozehui
2025-05-27 15:54:31 +08:00
parent bf661b5c1c
commit 708b40880e
5 changed files with 41 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
detection/src/main/java/com/njcn/gather/plan/pojo/vo/AdPlanExcel.java
View File

@@ -48,15 +48,15 @@ public class AdPlanExcel {
@Excel(name = "报告模版（当关联报告模版为是时必填）", width = 40, needMerge = true, orderNum = "8") @Excel(name = "报告模版（当关联报告模版为是时必填）", width = 40, needMerge = true, orderNum = "8")
private String reportTemplateId; private String reportTemplateId;
@Excel(name = "检测状态*", width = 10, replace = {"未检_0", "检测中_1", "检测完成_2"}, needMerge = true, orderNum = "9") // @Excel(name = "检测状态*", width = 10, replace = {"未检_0", "检测中_1", "检测完成_2"}, needMerge = true, orderNum = "9")
@NotNull(message = DetectionValidMessage.TEST_STATE_NOT_NULL) // @NotNull(message = DetectionValidMessage.TEST_STATE_NOT_NULL)
private Integer testState; // private Integer testState;
//
@Excel(name = "报告生成状态*", width = 15, replace = {"未生成_0", "部分生成_1", "全部生成_2"}, needMerge = true, orderNum = "10") // @Excel(name = "报告生成状态*", width = 15, replace = {"未生成_0", "部分生成_1", "全部生成_2"}, needMerge = true, orderNum = "10")
@NotNull(message = DetectionValidMessage.REPORT_STATE_NOT_NULL) // @NotNull(message = DetectionValidMessage.REPORT_STATE_NOT_NULL)
private Integer reportState; // private Integer reportState;
//
@Excel(name = "检测结果*", width = 10, replace = {"不符合_0", "符合_1", "未检_2"}, needMerge = true, orderNum = "11") // @Excel(name = "检测结果*", width = 10, replace = {"不符合_0", "符合_1", "未检_2"}, needMerge = true, orderNum = "11")
@NotNull(message = DetectionValidMessage.CHECK_RESULT_STATE_NOT_NULL) // @NotNull(message = DetectionValidMessage.CHECK_RESULT_STATE_NOT_NULL)
private Integer result; // private Integer result;
} }

2
detection/src/main/java/com/njcn/gather/plan/pojo/vo/CNPlanExcel.java
View File

@@ -14,6 +14,6 @@ import java.util.List;
public class CNPlanExcel extends AdPlanExcel { public class CNPlanExcel extends AdPlanExcel {
@ExcelCollection(name = "绑定的设备", orderNum = "12") @ExcelCollection(name = "绑定的设备", orderNum = "9")
private List<CNDevExcel> devices; private List<CNDevExcel> devices;
} }

2
detection/src/main/java/com/njcn/gather/plan/pojo/vo/ProvincePlanExcel.java
View File

@@ -14,6 +14,6 @@ import java.util.List;
@Data @Data
public class ProvincePlanExcel extends AdPlanExcel { public class ProvincePlanExcel extends AdPlanExcel {
@ExcelCollection(name = "绑定的设备", orderNum = "12") @ExcelCollection(name = "绑定的设备", orderNum = "9")
private List<ProvinceDevExcel> devices; private List<ProvinceDevExcel> devices;
} }

45
detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java
View File

@@ -729,6 +729,10 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
adPlanSourceService.addAdPlanSource(planId, sourceIds); adPlanSourceService.addAdPlanSource(planId, sourceIds);
List<ProvinceDevExcel> cnDevExcelList = planExcel.getDevices(); List<ProvinceDevExcel> cnDevExcelList = planExcel.getDevices();
ProvinceDevExcel provinceDevExcel = cnDevExcelList.get(0);
if (ObjectUtil.isNull(provinceDevExcel.getName())) {
cnDevExcelList.remove(0);
}
pqDevService.importProvinceDev(cnDevExcelList, patternId, planId); pqDevService.importProvinceDev(cnDevExcelList, patternId, planId);
} }
// 逆向可视化 // 逆向可视化
@@ -867,8 +871,9 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
} else { } else {
adPlan.setDataRule(dataRuleDictData.getId()); adPlan.setDataRule(dataRuleDictData.getId());
} }
if (adPlan.getAssociateReport().equals(0)) {
if (StrUtil.isNotBlank(adPlan.getReportTemplateId())) { adPlan.setReportTemplateId(null);
}else if (StrUtil.isNotBlank(adPlan.getReportTemplateId())) {
String[] split = adPlan.getReportTemplateId().split("_"); String[] split = adPlan.getReportTemplateId().split("_");
String reportId = this.baseMapper.getReportIdByNameAndVersion(split[0], split[1]); String reportId = this.baseMapper.getReportIdByNameAndVersion(split[0], split[1]);
if (ObjectUtil.isNull(reportId)) { if (ObjectUtil.isNull(reportId)) {
@@ -876,6 +881,8 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
} else { } else {
adPlan.setReportTemplateId(reportId); adPlan.setReportTemplateId(reportId);
} }
} else {
throw new BusinessException(DetectionResponseEnum.LACK_REPORT_TEMPLATE_ID);
} }
adPlan.setCode(this.generateCode()); adPlan.setCode(this.generateCode());
adPlan.setState(DataStateEnum.ENABLE.getCode()); adPlan.setState(DataStateEnum.ENABLE.getCode());
@@ -1150,33 +1157,33 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
pullDowns.add(pullDown); pullDowns.add(pullDown);
// 检测状态 // 检测状态
pullDown = new PullDown(); // pullDown = new PullDown();
pullDown.setFirstCol(9); // pullDown.setFirstCol(9);
pullDown.setLastCol(9); // pullDown.setLastCol(9);
pullDown.setStrings(Arrays.asList(CheckStateEnum.UNCHECKED.getMsg(), CheckStateEnum.CHECKING.getMsg(), CheckStateEnum.CHECKED.getMsg())); // pullDown.setStrings(Arrays.asList(CheckStateEnum.UNCHECKED.getMsg(), CheckStateEnum.CHECKING.getMsg(), CheckStateEnum.CHECKED.getMsg()));
pullDowns.add(pullDown); // pullDowns.add(pullDown);
// 报告生成状态 // 报告生成状态
pullDown = new PullDown(); // pullDown = new PullDown();
pullDown.setFirstCol(10); // pullDown.setFirstCol(10);
pullDown.setLastCol(10); // pullDown.setLastCol(10);
pullDown.setStrings(Arrays.asList(PlanReportStateEnum.REPORT_STATE_NOT_GENERATED.getMsg(), PlanReportStateEnum.REPORT_STATE_PARTIALLY_GENERATED.getMsg(), PlanReportStateEnum.REPORT_STATE_ALL_GENERATED.getMsg())); // pullDown.setStrings(Arrays.asList(PlanReportStateEnum.REPORT_STATE_NOT_GENERATED.getMsg(), PlanReportStateEnum.REPORT_STATE_PARTIALLY_GENERATED.getMsg(), PlanReportStateEnum.REPORT_STATE_ALL_GENERATED.getMsg()));
pullDowns.add(pullDown); // pullDowns.add(pullDown);
//检测结果 //检测结果
pullDown = new PullDown(); // pullDown = new PullDown();
pullDown.setFirstCol(11); // pullDown.setFirstCol(11);
pullDown.setLastCol(11); // pullDown.setLastCol(11);
pullDown.setStrings(Arrays.asList(CheckResultEnum.UNCHECKED.getMsg(), CheckResultEnum.ACCORD.getMsg(), CheckResultEnum.UNCHECKED.getMsg())); // pullDown.setStrings(Arrays.asList(CheckResultEnum.UNCHECKED.getMsg(), CheckResultEnum.ACCORD.getMsg(), CheckResultEnum.UNCHECKED.getMsg()));
pullDowns.add(pullDown); // pullDowns.add(pullDown);
switch (scene) { switch (scene) {
case PROVINCE_PLATFORM: case PROVINCE_PLATFORM:
List<PullDown> provinceDevPullDownList = pqDevService.getProvinceDevPullDownList(12); List<PullDown> provinceDevPullDownList = pqDevService.getProvinceDevPullDownList(9);
pullDowns.addAll(provinceDevPullDownList); pullDowns.addAll(provinceDevPullDownList);
break; break;
case LEAVE_FACTORY_TEST: case LEAVE_FACTORY_TEST:
List<PullDown> cnDevPullDownList = pqDevService.getCNDevPullDownList(12); List<PullDown> cnDevPullDownList = pqDevService.getCNDevPullDownList(9);
pullDowns.addAll(cnDevPullDownList); pullDowns.addAll(cnDevPullDownList);
break; break;
case SELF_TEST: case SELF_TEST:

3
detection/src/main/java/com/njcn/gather/pojo/enums/DetectionResponseEnum.java
View File

@@ -60,7 +60,8 @@ public enum DetectionResponseEnum {
SCRIPT_NOT_EXIST("A02068", "该脚本不存在，请先添加该脚本"), SCRIPT_NOT_EXIST("A02068", "该脚本不存在，请先添加该脚本"),
ERROR_SYSTEM_NOT_EXIST("A02069", "该误差体系不存在，请先添加该误差体系"), ERROR_SYSTEM_NOT_EXIST("A02069", "该误差体系不存在，请先添加该误差体系"),
DATA_RULE_NOT_EXIST("A02070", "该数据处理原则不存在，请先在\"数据处理原则\"字典中添加"), DATA_RULE_NOT_EXIST("A02070", "该数据处理原则不存在，请先在\"数据处理原则\"字典中添加"),
REPORT_TEMPLATE_NOT_EXIST("A02071", "该报告模板不存在，请先添加该报告模板"); REPORT_TEMPLATE_NOT_EXIST("A02071", "该报告模板不存在，请先添加该报告模板"),
LACK_REPORT_TEMPLATE_ID("A02072","当关联报告模板为\"是\"时，报告模板不能为空" );
private final String code; private final String code;