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-11-17 16:32:52 +08:00
parent 5539cb2887
commit f81123c3f7
10 changed files with 138 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
detection/src/main/java/com/njcn/gather/script/controller/PqScriptController.java
View File

@@ -126,10 +126,10 @@ public class PqScriptController extends BaseController {
@GetMapping("/getAll")
@ApiOperation("获取指定模式下的所有检测脚本")
@ApiImplicitParam(name = "patternId", value = "模式Id", required = true)
public HttpResult<List<Map<String, Object>>> getAllPqScript(@RequestParam("patternId") String patternId) {
public HttpResult<List<PqScript>> getAllPqScript(@RequestParam("patternId") String patternId) {
String methodDescribe = getMethodDescribe("getAllPqScript");
LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, patternId);
List<Map<String, Object>> result = pqScriptService.listAllPqScript(patternId);
List<PqScript> result = pqScriptService.listAllPqScript(patternId);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}

3
detection/src/main/java/com/njcn/gather/script/pojo/param/PqScriptParam.java
View File

@@ -72,6 +72,9 @@ public class PqScriptParam {
@Max(value = 20, message = DetectionValidMessage.SCRIPT_CURR_FORMAT_ERROR)
private Double ratedCurr;
@ApiModelProperty("是否为Fluke专用脚本")
private Integer fluke;
@Data
@EqualsAndHashCode(callSuper = true)

5
detection/src/main/java/com/njcn/gather/script/pojo/po/PqScript.java
View File

@@ -73,6 +73,11 @@ public class PqScript extends BaseEntity implements Serializable {
*/
private Double ratedCurr;
/**
* 是否为福禄克专用脚本。0-否 1-是
*/
private Integer fluke;
/**
* 状态：0-删除 1-正常
*/

2
detection/src/main/java/com/njcn/gather/script/service/IPqScriptService.java
View File

@@ -68,7 +68,7 @@ public interface IPqScriptService extends IService<PqScript> {
* @param patternId 模式id
* @return 检测脚本列表
*/
List<Map<String, Object>> listAllPqScript(String patternId);
List<PqScript> listAllPqScript(String patternId);
/**
* 根据脚本名称查询脚本

18
detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptServiceImpl.java
View File

@@ -112,15 +112,15 @@ public class PqScriptServiceImpl extends ServiceImpl<PqScriptMapper, PqScript> i
}
@Override
public List<Map<String, Object>> listAllPqScript(String patternId) {
public List<PqScript> listAllPqScript(String patternId) {
List<PqScript> pqScriptList = this.lambdaQuery().eq(StrUtil.isNotBlank(patternId), PqScript::getPattern, patternId).eq(PqScript::getState, DataStateEnum.ENABLE.getCode()).list();
List<Map<String, Object>> result = pqScriptList.stream().map(pqScript -> {
Map<String, Object> map = new HashMap<>();
map.put("id", pqScript.getId());
map.put("name", pqScript.getName());
return map;
}).collect(Collectors.toList());
return result;
// List<Map<String, Object>> result = pqScriptList.stream().map(pqScript -> {
// Map<String, Object> map = new HashMap<>();
// map.put("id", pqScript.getId());
// map.put("name", pqScript.getName());
// return map;
// }).collect(Collectors.toList());
return pqScriptList;
}
@Override
@@ -139,7 +139,7 @@ public class PqScriptServiceImpl extends ServiceImpl<PqScriptMapper, PqScript> i
wrapper.eq("state", DataStateEnum.ENABLE.getCode());
wrapper.eq("name", param.getName());
if (isExcludeSelf) {
if(param instanceof PqScriptParam.UpdateParam){
if (param instanceof PqScriptParam.UpdateParam) {
wrapper.ne("id", ((PqScriptParam.UpdateParam) param).getId());
}
}