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-03-03 11:35:35 +08:00
parent 5d606673a6
commit bc20fc0705
7 changed files with 48 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
detection/src/main/java/com/njcn/gather/plan/controller/AdPlanController.java
View File

@@ -246,13 +246,13 @@ public class AdPlanController extends BaseController {
// } // }
@OperateInfo(info = LogEnum.BUSINESS_COMMON) @OperateInfo(info = LogEnum.BUSINESS_COMMON)
@GetMapping("/getBigTestItem") @PostMapping("/getBigTestItem")
@ApiOperation("获取检测大项数据") @ApiOperation("获取检测大项数据")
@ApiImplicitParam(name = "id", value = "检测计划id", required = true) @ApiImplicitParam(name = "id", value = "检测计划id", required = true)
public HttpResult<List<Map<String, String>>> getBigTestItem(@RequestParam("planId") String planId) { public HttpResult<List<Map<String, String>>> getBigTestItem(@RequestBody AdPlanParam.CheckParam checkParam) {
String methodDescribe = getMethodDescribe("getBigTestItem"); String methodDescribe = getMethodDescribe("getBigTestItem");
LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, planId); LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, checkParam);
List<Map<String, String>> result = adPlanService.getBigTestItem(planId); List<Map<String, String>> result = adPlanService.getBigTestItem(checkParam.getReCheckType(),checkParam.getPlanId(),checkParam.getDevId());
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
} }

8
detection/src/main/java/com/njcn/gather/plan/pojo/param/AdPlanParam.java
View File

@@ -6,6 +6,7 @@ import com.njcn.web.pojo.param.BaseParam;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.springframework.web.bind.annotation.RequestParam;
import javax.validation.constraints.*; import javax.validation.constraints.*;
import java.util.List; import java.util.List;
@@ -126,4 +127,11 @@ public class AdPlanParam {
// private Integer result; // private Integer result;
} }
@Data
public static class CheckParam{
// 0:不合格项复检 1:全部复检
private Integer reCheckType;
private String planId;
private String devId;
}
} }

9
detection/src/main/java/com/njcn/gather/plan/service/IAdPlanService.java
View File

@@ -3,9 +3,9 @@ package com.njcn.gather.plan.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.gather.plan.pojo.param.AdPlanParam; import com.njcn.gather.plan.pojo.param.AdPlanParam;
import com.njcn.gather.plan.pojo.vo.AdPlanVO;
import com.njcn.gather.plan.pojo.po.AdPlan; import com.njcn.gather.plan.pojo.po.AdPlan;
import com.njcn.gather.plan.pojo.vo.AdPlanExcel; import com.njcn.gather.plan.pojo.vo.AdPlanExcel;
import com.njcn.gather.plan.pojo.vo.AdPlanVO;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -70,6 +70,7 @@ public interface IAdPlanService extends IService<AdPlan> {
/** /**
* 二楼导入检测计划 * 二楼导入检测计划
*
* @param planExcelList * @param planExcelList
* @param patternId * @param patternId
*/ */
@@ -85,13 +86,16 @@ public interface IAdPlanService extends IService<AdPlan> {
/** /**
* 获取检测大项 * 获取检测大项
* *
* @param reCheckType 0:不合格项复检 1:全部复检
* @param planId 检测计划Id * @param planId 检测计划Id
* @param devId 设备Id
* @return * @return
*/ */
List<Map<String, String>> getBigTestItem(String planId); List<Map<String, String>> getBigTestItem(Integer reCheckType, String planId, String devId);
/** /**
* 修改计划状态 * 修改计划状态
*
* @param planId * @param planId
* @param devIds * @param devIds
* @return * @return
@@ -100,6 +104,7 @@ public interface IAdPlanService extends IService<AdPlan> {
/** /**
* 数据状态回退 * 数据状态回退
*
* @param planId * @param planId
* @param devIds * @param devIds
* @return * @return

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

@@ -37,6 +37,9 @@ import com.njcn.gather.script.service.IPqScriptDtlsService;
import com.njcn.gather.script.service.IPqScriptService; import com.njcn.gather.script.service.IPqScriptService;
import com.njcn.gather.source.pojo.po.PqSource; import com.njcn.gather.source.pojo.po.PqSource;
import com.njcn.gather.source.service.IPqSourceService; import com.njcn.gather.source.service.IPqSourceService;
import com.njcn.gather.storage.pojo.po.AdBaseResult;
import com.njcn.gather.storage.service.AdHarmonicService;
import com.njcn.gather.storage.service.AdNonHarmonicService;
import com.njcn.gather.storage.service.TableGenService; import com.njcn.gather.storage.service.TableGenService;
import com.njcn.gather.system.config.pojo.po.SysTestConfig; import com.njcn.gather.system.config.pojo.po.SysTestConfig;
import com.njcn.gather.system.config.service.ISysTestConfigService; import com.njcn.gather.system.config.service.ISysTestConfigService;
@@ -91,6 +94,8 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
private final ISysTestConfigService sysTestConfigService; private final ISysTestConfigService sysTestConfigService;
private final IDevTypeService devTypeService; private final IDevTypeService devTypeService;
private final IDictTypeService dictTypeService; private final IDictTypeService dictTypeService;
private final AdNonHarmonicService adNonHarmonicService;
private final AdHarmonicService adHarmonicService;
@Override @Override
public Page<AdPlanVO> listAdPlan(AdPlanParam.QueryParam queryParam) { public Page<AdPlanVO> listAdPlan(AdPlanParam.QueryParam queryParam) {
@@ -351,7 +356,7 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
} }
@Override @Override
public List<Map<String, String>> getBigTestItem(String planId) { public List<Map<String, String>> getBigTestItem(Integer reCheckType, String planId, String devId) {
List<Map<String, String>> result = new ArrayList<>(); List<Map<String, String>> result = new ArrayList<>();
AdPlan adPlan = this.getById(planId); AdPlan adPlan = this.getById(planId);
if (ObjectUtil.isNull(adPlan)) { if (ObjectUtil.isNull(adPlan)) {
@@ -361,6 +366,20 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
List<PqScriptDtls> scriptDtlsList = pqScriptDtlsService.listPqScriptDtlByScriptId(scriptId); List<PqScriptDtls> scriptDtlsList = pqScriptDtlsService.listPqScriptDtlByScriptId(scriptId);
// 不合格项复检
if (reCheckType == 0) {
List<AdBaseResult> allResultList = new ArrayList<>();
allResultList.addAll(adHarmonicService.get(scriptId, null, devId, "-1", adPlan.getCode()));
allResultList.addAll(adNonHarmonicService.get(scriptId, null, devId, "-1", adPlan.getCode()));
if (ObjectUtil.isNotEmpty(allResultList)) {
List<AdBaseResult> passList = allResultList.stream().filter(obj -> obj.getResultFlag() == 1).collect(Collectors.toList());
TreeSet<Integer> sortSet = passList.stream().map(AdBaseResult::getSort).collect(Collectors.toCollection(TreeSet::new));
scriptDtlsList = scriptDtlsList.stream().filter(obj -> !sortSet.contains(obj.getScriptIndex())).collect(Collectors.toList());
}
}
Map<String, List<PqScriptDtls>> collect = scriptDtlsList.stream() Map<String, List<PqScriptDtls>> collect = scriptDtlsList.stream()
.sorted(Comparator.comparing(PqScriptDtls::getScriptIndex)) .sorted(Comparator.comparing(PqScriptDtls::getScriptIndex))
.collect(Collectors.groupingBy(PqScriptDtls::getScriptType, LinkedHashMap::new, Collectors.toList())); .collect(Collectors.groupingBy(PqScriptDtls::getScriptType, LinkedHashMap::new, Collectors.toList()));

6
entrance/src/main/resources/application.yml
View File

@@ -6,7 +6,7 @@ spring:
datasource: datasource:
druid: druid:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.1.24:13306/pqs9100?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=CTT url: jdbc:mysql://192.168.1.24:13306/pqs91001?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=CTT
username: root username: root
password: njcnpqs password: njcnpqs
#初始化建立物理连接的个数、最小、最大连接数 #初始化建立物理连接的个数、最小、最大连接数
@@ -45,10 +45,10 @@ mybatis-plus:
socket: socket:
source: source:
ip: 192.168.1.138 ip: 192.168.1.24
port: 62000 port: 62000
device: device:
ip: 192.168.1.138 ip: 192.168.1.24
port: 61000 port: 61000
webSocket: webSocket:

4
storage/src/main/java/com/njcn/gather/storage/mapper/mapping/TableGenMapper.xml
View File

@@ -10,7 +10,7 @@
Sort int(4) NOT NULL COMMENT '总检测脚本中的测试项序号', Sort int(4) NOT NULL COMMENT '总检测脚本中的测试项序号',
AD_Type CHAR(32) NOT NULL COMMENT '检测指标，字典表', AD_Type CHAR(32) NOT NULL COMMENT '检测指标，字典表',
Data_Type CHAR(32) NOT NULL COMMENT '数据指标，只有数据源为分钟统计时候才会使用（最大、最小、平均、CP95，默认平均值），字典表', Data_Type CHAR(32) NOT NULL COMMENT '数据指标，只有数据源为分钟统计时候才会使用（最大、最小、平均、CP95，默认平均值），字典表',
Result_Flag int(1) NULL COMMENT '1不合格 2合格 4无法处理', Result_Flag int(1) NULL COMMENT '1合格 2不合格 4无法处理',
A_Value varchar(30) DEFAULT NULL COMMENT 'A相值', A_Value varchar(30) DEFAULT NULL COMMENT 'A相值',
B_Value varchar(30) DEFAULT NULL COMMENT 'B相值', B_Value varchar(30) DEFAULT NULL COMMENT 'B相值',
C_Value varchar(30) DEFAULT NULL COMMENT 'C相值', C_Value varchar(30) DEFAULT NULL COMMENT 'C相值',
@@ -33,7 +33,7 @@
Sort int(4) NOT NULL COMMENT '总检测脚本中的测试项序号', Sort int(4) NOT NULL COMMENT '总检测脚本中的测试项序号',
AD_Type CHAR(32) NOT NULL COMMENT '检测指标，字典表', AD_Type CHAR(32) NOT NULL COMMENT '检测指标，字典表',
Data_Type CHAR(32) NOT NULL COMMENT '数据指标，只有数据源为分钟统计时候才会使用（最大、最小、平均、CP95，默认平均值），字典表', Data_Type CHAR(32) NOT NULL COMMENT '数据指标，只有数据源为分钟统计时候才会使用（最大、最小、平均、CP95，默认平均值），字典表',
Result_Flag int(1) NOT NULL COMMENT '1不合格 2合格 4无法处理', Result_Flag int(1) NOT NULL COMMENT '1合格 2不合格 4无法处理',
A_Value json NULL COMMENT 'A相值', A_Value json NULL COMMENT 'A相值',
B_Value json NULL COMMENT 'B相值', B_Value json NULL COMMENT 'B相值',
C_Value json NULL COMMENT 'C相值', C_Value json NULL COMMENT 'C相值',

2
storage/src/main/java/com/njcn/gather/storage/service/impl/TableGenServiceImpl.java
View File

@@ -57,7 +57,7 @@ public class TableGenServiceImpl implements TableGenService {
" Sort int(5) NOT NULL COMMENT '总检测脚本中的测试项序号',\n" + " Sort int(5) NOT NULL COMMENT '总检测脚本中的测试项序号',\n" +
" AD_Type CHAR(32) NOT NULL COMMENT '检测指标，字典表',\n" + " AD_Type CHAR(32) NOT NULL COMMENT '检测指标，字典表',\n" +
" Data_Type CHAR(32) NOT NULL COMMENT '数据指标，只有数据源为分钟统计时候才会使用（最大、最小、平均、CP95，默认平均值），字典表',\n" + " Data_Type CHAR(32) NOT NULL COMMENT '数据指标，只有数据源为分钟统计时候才会使用（最大、最小、平均、CP95，默认平均值），字典表',\n" +
" Result_Flag int(1) NOT NULL COMMENT '1不合格 2合格 4无法处理',\n" + " Result_Flag int(1) NOT NULL COMMENT '1合格 2不合格 4无法处理',\n" +
A + B + C + A + B + C +
" PRIMARY KEY (Monitor_Id, Script_Id, Sort, AD_Type)\n" + " PRIMARY KEY (Monitor_Id, Script_Id, Sort, AD_Type)\n" +
") COMMENT='监测数据表';"; ") COMMENT='监测数据表';";