From 09972e07645aaeb1e289355a3dbf7130d95d7a01 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Mon, 31 Mar 2025 10:06:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A3=80=E6=B5=8B=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=8F=82=E6=95=B0=E7=BB=84=E8=A3=85=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../script/controller/PqScriptController.java | 11 +++++- .../gather/script/pojo/param/ScriptParam.java | 21 +++++++++++ .../script/service/IPqScriptDtlsService.java | 8 +++++ .../service/impl/PqScriptDtlsServiceImpl.java | 35 ++++++++++++++++++- .../storage/pojo/vo/RawResultDataVO.java | 5 +++ 5 files changed, 78 insertions(+), 2 deletions(-) diff --git a/detection/src/main/java/com/njcn/gather/script/controller/PqScriptController.java b/detection/src/main/java/com/njcn/gather/script/controller/PqScriptController.java index e55cf12e..70488be6 100644 --- a/detection/src/main/java/com/njcn/gather/script/controller/PqScriptController.java +++ b/detection/src/main/java/com/njcn/gather/script/controller/PqScriptController.java @@ -27,7 +27,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; import java.util.List; import java.util.Map; @@ -208,5 +207,15 @@ public class PqScriptController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, checkData, methodDescribe); } + @OperateInfo + @PostMapping("/getScriptDtlsDesc") + @ApiOperation("通讯脚本回显") + @ApiImplicitParam(name = "param", value = "检测脚本", required = true) + public HttpResult getScriptDtlsDesc(@RequestBody @Validated ScriptParam.Desc param) { + String methodDescribe = getMethodDescribe("getScriptDtlsDesc"); + String checkData = pqScriptDtlsService.getScriptDtlsDesc(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, checkData, methodDescribe); + } + } diff --git a/detection/src/main/java/com/njcn/gather/script/pojo/param/ScriptParam.java b/detection/src/main/java/com/njcn/gather/script/pojo/param/ScriptParam.java index e3ef3af2..ebc6a0d8 100644 --- a/detection/src/main/java/com/njcn/gather/script/pojo/param/ScriptParam.java +++ b/detection/src/main/java/com/njcn/gather/script/pojo/param/ScriptParam.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.math.BigDecimal; /** * @author caozehui @@ -25,4 +27,23 @@ public class ScriptParam { @ApiModelProperty("是否启用脚本(状态：0-不启用 1-启用)") private Integer enable; + + @Data + public static class Desc{ + + @ApiModelProperty("检测脚本id") + @NotBlank(message = DetectionValidMessage.ID_FORMAT_ERROR) + private String scriptId; + + @ApiModelProperty("检测脚本序号") + @NotNull(message = "检测脚本序号错误，请检查参数是否为空") + private Integer index; + + @ApiModelProperty("额定电压") + private BigDecimal devVolt; + + @ApiModelProperty("额定电流") + private BigDecimal devCurr; + + } } diff --git a/detection/src/main/java/com/njcn/gather/script/service/IPqScriptDtlsService.java b/detection/src/main/java/com/njcn/gather/script/service/IPqScriptDtlsService.java index d99ce7e2..e784c8f1 100644 --- a/detection/src/main/java/com/njcn/gather/script/service/IPqScriptDtlsService.java +++ b/detection/src/main/java/com/njcn/gather/script/service/IPqScriptDtlsService.java @@ -113,4 +113,12 @@ public interface IPqScriptDtlsService extends IService { */ List checkDataList(ScriptParam param); + /** + * @Description: 获取脚本详情描述 + * @param param + * @return: java.lang.String + * @Author: wr + * @Date: 2025/3/31 9:40 + */ + String getScriptDtlsDesc(ScriptParam.Desc param); } diff --git a/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java b/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java index d08e7aee..1f1a943d 100644 --- a/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java @@ -192,7 +192,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl queryWrapper = new MPJLambdaWrapper<>(); + queryWrapper.selectAll(PqScriptDtls.class) + .selectAs(DictTree::getCode, PqScriptDtls::getScriptCode) + .leftJoin(DictTree.class, DictTree::getId, PqScriptDtls::getScriptType) + .in(PqScriptDtls::getScriptIndex, param.getIndex()) + .eq(PqScriptCheckData::getEnable, DataStateEnum.ENABLE.getCode()) + .orderByAsc(PqScriptCheckData::getScriptIndex) + .eq(PqScriptDtls::getScriptId, param.getScriptId()); + + //先获取检测脚本类型是否相对值 true相对值 false绝对值（相对值要乘额定值,绝对值不需要处理) + List pqScriptDtls = this.getBaseMapper().selectJoinList(PqScriptDtls.class, queryWrapper); + if (isValueType) { + for (PqScriptDtls pqScriptDtl : pqScriptDtls) { + if (VOL.equals(pqScriptDtl.getValueType())) { + BigDecimal volValue = new BigDecimal(pqScriptDtl.getValue()); + BigDecimal result = volValue.multiply(param.getDevVolt()) + .divide(new BigDecimal(100), 4, BigDecimal.ROUND_HALF_UP); + pqScriptDtl.setValue(result.doubleValue()); + } + if (CUR.equals(pqScriptDtl.getValueType())) { + BigDecimal volValue = new BigDecimal(pqScriptDtl.getValue()); + BigDecimal result = volValue.multiply(param.getDevCurr()) + .divide(new BigDecimal(100), 4, BigDecimal.ROUND_HALF_UP); + pqScriptDtl.setValue(result.doubleValue()); + } + } + } + return ScriptDtlsDesc.getStringBuffer(pqScriptDtls, true, isValueType).toString(); + } + private void unbanCheck(List info, PqScriptDtlsParam.CheckData channelListDTO, List list, diff --git a/storage/src/main/java/com/njcn/gather/storage/pojo/vo/RawResultDataVO.java b/storage/src/main/java/com/njcn/gather/storage/pojo/vo/RawResultDataVO.java index 726877d9..47aff71f 100644 --- a/storage/src/main/java/com/njcn/gather/storage/pojo/vo/RawResultDataVO.java +++ b/storage/src/main/java/com/njcn/gather/storage/pojo/vo/RawResultDataVO.java @@ -86,5 +86,10 @@ public class RawResultDataVO { * 误差值 */ private BigDecimal errorData; + + /** + * 单位 + */ + private String unit; } }