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

浙江报告与日志功能

Browse Source
This commit is contained in:
hongawen
2025-04-11 11:03:16 +08:00
parent 6727dee61e
commit 6f890daad6
50 changed files with 2703 additions and 544 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
detection/src/main/java/com/njcn/gather/script/mapper/PqScriptCheckDataMapper.java
View File

@@ -2,6 +2,10 @@ package com.njcn.gather.script.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.njcn.gather.script.pojo.po.PqScriptCheckData;
import com.njcn.gather.script.pojo.vo.PqScriptCheckDataVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @Description:

6
detection/src/main/java/com/njcn/gather/script/mapper/PqScriptDtlsMapper.java
View File

@@ -2,8 +2,12 @@ package com.njcn.gather.script.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.njcn.gather.script.pojo.po.PqScriptDtls;
import com.njcn.gather.script.pojo.vo.PqScriptCheckDataVO;
import com.njcn.gather.script.pojo.vo.PqScriptDtlDataVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @author caozehui
* @date 2024-11-18
@@ -17,5 +21,7 @@ public interface PqScriptDtlsMapper extends MPJBaseMapper<PqScriptDtls> {
* @return
*/
Integer selectMaxIndex(@Param("scriptId") String scriptId);
List<PqScriptDtlDataVO> getScriptDtlsDataList(@Param("scriptId")String scriptId);
}

1
detection/src/main/java/com/njcn/gather/script/mapper/mapping/PqScriptCheckDataMapper.xml
View File

@@ -2,6 +2,5 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.gather.script.mapper.PqScriptCheckDataMapper">
</mapper>

16
detection/src/main/java/com/njcn/gather/script/mapper/mapping/PqScriptDtlsMapper.xml
View File

@@ -10,5 +10,21 @@
WHERE Script_Id = #{scriptId}
</select>
<select id="getScriptDtlsDataList" resultType="com.njcn.gather.script.pojo.vo.PqScriptDtlDataVO" >
SELECT
t2.CODE scriptCode,
t2.NAME scriptName,
t1.*
FROM
pq_script_dtls t1,
sys_dict_tree t2
WHERE
t1.Script_Type = t2.Id
AND t1.Script_Id = #{scriptId}
AND t1.ENABLE = 1
ORDER BY
t1.Script_Index ASC,t1.HarmNum ASC
</select>
</mapper>

24
detection/src/main/java/com/njcn/gather/script/pojo/vo/PqScriptCheckDataVO.java Normal file
View File

@@ -0,0 +1,24 @@
package com.njcn.gather.script.pojo.vo;
import com.njcn.gather.script.pojo.po.PqScriptCheckData;
import lombok.Data;
/**
* @author hongawen
* @version 1.0
* @data 2025/3/26 14:45
*/
@Data
public class PqScriptCheckDataVO extends PqScriptCheckData {
/**
* 脚本项名称
*/
private String scriptName;
/**
* 脚本项Code
*/
private String scriptCode;
}

16
detection/src/main/java/com/njcn/gather/script/pojo/vo/PqScriptDtlDataVO.java
View File

@@ -1,23 +1,23 @@
package com.njcn.gather.script.pojo.vo;
import com.njcn.gather.script.pojo.po.PqScriptDtls;
import lombok.Data;
import java.io.Serializable;
@Data
public class PqScriptDtlDataVO implements Serializable {
public class PqScriptDtlDataVO extends PqScriptDtls implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 这条检测脚本的序号
* 脚本项名称
*/
private String index;
private String scriptName;
/**
* 脚本项Code
*/
private String scriptCode;
}

8
detection/src/main/java/com/njcn/gather/script/service/IPqScriptCheckDataService.java
View File

@@ -3,6 +3,7 @@ package com.njcn.gather.script.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.gather.script.pojo.param.PqScriptCheckDataParam;
import com.njcn.gather.script.pojo.po.PqScriptCheckData;
import com.njcn.gather.script.pojo.vo.PqScriptCheckDataVO;
import java.util.List;
import java.util.Map;
@@ -36,4 +37,11 @@ public interface IPqScriptCheckDataService extends IService<PqScriptCheckData> {
List<PqScriptCheckData> listCheckDataCode(PqScriptCheckDataParam param);
Double getCheckDataValue(PqScriptCheckDataParam param);
/**
* 查询条件范围内的参与比较的脚本详情
* @param scriptId 脚本id
* @param indexList 脚本下标集合
*/
List<PqScriptCheckData> listCheckData(String scriptId, List<Integer> indexList);
}

7
detection/src/main/java/com/njcn/gather/script/service/IPqScriptDtlsService.java
View File

@@ -9,6 +9,8 @@ import com.njcn.gather.script.pojo.param.ScriptParam;
import com.njcn.gather.script.pojo.po.PqScriptCheckData;
import com.njcn.gather.script.pojo.po.PqScriptDtls;
import com.njcn.gather.script.pojo.po.SourceIssue;
import com.njcn.gather.script.pojo.vo.PqScriptCheckDataVO;
import com.njcn.gather.script.pojo.vo.PqScriptDtlDataVO;
import java.util.List;
import java.util.Map;
@@ -139,4 +141,9 @@ public interface IPqScriptDtlsService extends IService<PqScriptDtls> {
* @return
*/
Map<String, Object> getScriptToIcdCheckInfo(PreDetectionParam param);
/**
* 根据脚本id获取脚本详情数据
* @param scriptId 脚本id
*/
List<PqScriptDtlDataVO> getScriptDtlsDataList(String scriptId);
}

13
detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptCheckDataServiceImpl.java
View File

@@ -13,6 +13,8 @@ import com.njcn.gather.detection.pojo.enums.DetectionResponseEnum;
import com.njcn.gather.script.mapper.PqScriptCheckDataMapper;
import com.njcn.gather.script.pojo.param.PqScriptCheckDataParam;
import com.njcn.gather.script.pojo.po.PqScriptCheckData;
import com.njcn.gather.script.pojo.po.PqScriptDtls;
import com.njcn.gather.script.pojo.vo.PqScriptCheckDataVO;
import com.njcn.gather.script.service.IPqScriptCheckDataService;
import com.njcn.gather.system.dictionary.mapper.DictTreeMapper;
import com.njcn.gather.system.dictionary.pojo.po.DictTree;
@@ -121,5 +123,16 @@ public class PqScriptCheckDataServiceImpl extends ServiceImpl<PqScriptCheckDataM
return null;
}
@Override
public List<PqScriptCheckData> listCheckData(String scriptId, List<Integer> indexList) {
LambdaQueryWrapper<PqScriptCheckData> queryWrapper = new LambdaQueryWrapper<PqScriptCheckData>()
.eq(PqScriptCheckData::getScriptId, scriptId)
.eq(PqScriptCheckData::getEnable, DataStateEnum.ENABLE.getCode())
.eq(PqScriptCheckData::getErrorFlag, 1)
.in(PqScriptCheckData::getScriptIndex, indexList)
.orderByAsc(PqScriptCheckData::getHarmNum);
return this.list(queryWrapper);
}
}

7
detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java
View File

@@ -29,6 +29,8 @@ import com.njcn.gather.script.pojo.po.PqScript;
import com.njcn.gather.script.pojo.po.PqScriptCheckData;
import com.njcn.gather.script.pojo.po.PqScriptDtls;
import com.njcn.gather.script.pojo.po.SourceIssue;
import com.njcn.gather.script.pojo.vo.PqScriptCheckDataVO;
import com.njcn.gather.script.pojo.vo.PqScriptDtlDataVO;
import com.njcn.gather.script.service.IPqScriptCheckDataService;
import com.njcn.gather.script.service.IPqScriptDtlsService;
import com.njcn.gather.script.util.ScriptDtlsDesc;
@@ -739,6 +741,11 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
return map;
}
@Override
public List<PqScriptDtlDataVO> getScriptDtlsDataList(String scriptId) {
return this.baseMapper.getScriptDtlsDataList(scriptId);
}
private void unbanCheck(List<PqScriptDtlsParam.CheckData> info,
PqScriptDtlsParam.CheckData channelListDTO,
List<PqScriptDtlsParam.ChannelListDTO> list,