From bb9a0f586f9d3b8dea7b12329baa77cabe7eeeb2 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Tue, 18 Feb 2025 15:38:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A3=80=E6=B5=8B=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E6=96=B0=E5=A2=9E=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=AE=BE?= =?UTF-8?q?=E5=AE=9A=E5=80=BC=E8=A1=A8=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../script/controller/PqScriptController.java | 24 ++++--- .../script/pojo/param/PqScriptIssueParam.java | 6 ++ .../script/pojo/po/PqScriptCheckData.java | 3 +- .../script/pojo/vo/PqScriptCheckDataVO.java | 34 ---------- .../script/pojo/vo/PqScriptDtlDataVO.java | 23 +++++++ .../script/service/IPqScriptDtlsService.java | 10 ++- .../service/impl/PqScriptDtlsServiceImpl.java | 67 +++++++++++++++---- 7 files changed, 109 insertions(+), 58 deletions(-) delete mode 100644 detection/src/main/java/com/njcn/gather/script/pojo/vo/PqScriptCheckDataVO.java create mode 100644 detection/src/main/java/com/njcn/gather/script/pojo/vo/PqScriptDtlDataVO.java 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 280186cb..0ea940e1 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 @@ -1,14 +1,13 @@ package com.njcn.gather.script.controller; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.serializer.SerializerFeature; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.constant.OperateType; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.LogUtil; +import com.njcn.gather.script.pojo.param.PqScriptDtlsParam; import com.njcn.gather.script.pojo.param.PqScriptIssueParam; import com.njcn.gather.script.pojo.param.PqScriptParam; import com.njcn.gather.script.pojo.po.PqScript; @@ -101,7 +100,7 @@ public class PqScriptController extends BaseController { } @OperateInfo - @GetMapping("getScriptDtlsByScriptId") + @GetMapping("/getScriptDtlsByScriptId") @ApiOperation("根据脚本id查询检测脚本详情") @ApiImplicitParam(name = "id", value = "检测脚本id", required = true) public HttpResult> getScriptDtlsByScriptId(@RequestParam("id") String id) { @@ -139,19 +138,26 @@ public class PqScriptController extends BaseController { @OperateInfo - @PostMapping("dls") + @PostMapping("/dlsDetails") @ApiOperation("根据脚本id查询检测脚本详情") @ApiImplicitParam(name = "id", value = "检测脚本id", required = true) public HttpResult> dls(@RequestBody PqScriptIssueParam param) { String methodDescribe = getMethodDescribe("list"); LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, param); List sourceIssues = pqScriptDtlsService.listSourceIssue(param); - for (SourceIssue sourceIssue : sourceIssues) { - String jsonString = JSON.toJSONString(sourceIssue,SerializerFeature.WriteNullStringAsEmpty); - System.out.println(); - } - String jsonString =JSON.toJSONString(sourceIssues); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, sourceIssues, methodDescribe); } + + + @OperateInfo + @PostMapping("/addScriptDtls") + @ApiOperation("添加检测脚本") + @ApiImplicitParam(name = "id", value = "检测脚本id", required = true) + public HttpResult addScriptDtls(@RequestBody PqScriptDtlsParam sourceIssue) { + String methodDescribe = getMethodDescribe("list"); + LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, sourceIssue); + Boolean b = pqScriptDtlsService.saveScriptDtls(sourceIssue); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe); + } } diff --git a/detection/src/main/java/com/njcn/gather/script/pojo/param/PqScriptIssueParam.java b/detection/src/main/java/com/njcn/gather/script/pojo/param/PqScriptIssueParam.java index eda404dd..d87b0015 100644 --- a/detection/src/main/java/com/njcn/gather/script/pojo/param/PqScriptIssueParam.java +++ b/detection/src/main/java/com/njcn/gather/script/pojo/param/PqScriptIssueParam.java @@ -30,4 +30,10 @@ public class PqScriptIssueParam { private String sourceId; private List indexList; + + @ApiModelProperty("检测脚本类型") + private String scriptType; + + @ApiModelProperty("表明指标类型（例如：Freq频率下的影响、Base额定下的影响、VOL电压下的影响）") + private String scriptSubType; } diff --git a/detection/src/main/java/com/njcn/gather/script/pojo/po/PqScriptCheckData.java b/detection/src/main/java/com/njcn/gather/script/pojo/po/PqScriptCheckData.java index 44fee7fb..278ca661 100644 --- a/detection/src/main/java/com/njcn/gather/script/pojo/po/PqScriptCheckData.java +++ b/detection/src/main/java/com/njcn/gather/script/pojo/po/PqScriptCheckData.java @@ -1,5 +1,6 @@ package com.njcn.gather.script.pojo.po; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -16,7 +17,7 @@ public class PqScriptCheckData implements Serializable { /** * 检测脚本参考设定值ID */ - @TableId + @TableId(value = "Id", type = IdType.ASSIGN_UUID) private String id; /** diff --git a/detection/src/main/java/com/njcn/gather/script/pojo/vo/PqScriptCheckDataVO.java b/detection/src/main/java/com/njcn/gather/script/pojo/vo/PqScriptCheckDataVO.java deleted file mode 100644 index d8c918b1..00000000 --- a/detection/src/main/java/com/njcn/gather/script/pojo/vo/PqScriptCheckDataVO.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.njcn.gather.script.pojo.vo; - -import lombok.Data; - -import java.io.Serializable; - -@Data -public class PqScriptCheckDataVO implements Serializable { - - - private static final long serialVersionUID = 1L; - - /** - * 总检测脚本中的测试项序号 - */ - private String valueTypeId; - - /** - * 检测指标类型，与数据字典关联（例如电压有效值、谐波电压含有率等） - */ - private String valueTypeCode; - - /** - * 数据类型，来源于字典表，包括实时数据(3s)、分钟统计数据(1min/3min/5min/10min)等 - */ - private String dataType; - - - - - - - -} \ No newline at end of file diff --git a/detection/src/main/java/com/njcn/gather/script/pojo/vo/PqScriptDtlDataVO.java b/detection/src/main/java/com/njcn/gather/script/pojo/vo/PqScriptDtlDataVO.java new file mode 100644 index 00000000..a9d3f507 --- /dev/null +++ b/detection/src/main/java/com/njcn/gather/script/pojo/vo/PqScriptDtlDataVO.java @@ -0,0 +1,23 @@ +package com.njcn.gather.script.pojo.vo; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class PqScriptDtlDataVO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 这条检测脚本的序号 + */ + private String index; + + + + + + + +} \ No newline at end of file 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 a519de71..6f8948cb 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 @@ -1,9 +1,11 @@ package com.njcn.gather.script.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.gather.script.pojo.param.PqScriptDtlsParam; import com.njcn.gather.script.pojo.param.PqScriptIssueParam; import com.njcn.gather.script.pojo.po.PqScriptDtls; import com.njcn.gather.script.pojo.po.SourceIssue; +import com.njcn.gather.script.pojo.vo.PqScriptDtlDataVO; import java.util.List; @@ -75,7 +77,13 @@ public interface IPqScriptDtlsService extends IService { * @param sourceIssue * @return */ - Boolean saveScriptDtls(SourceIssue sourceIssue); + Boolean saveScriptDtls(PqScriptDtlsParam sourceIssue); + + /** + * 查询当前检测小项的信息 + * @return + */ + List scriptDtlsList(); Boolean saveCheck(); } 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 d313e8fd..090a2392 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 @@ -2,6 +2,7 @@ package com.njcn.gather.script.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.NumberUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -13,11 +14,13 @@ import com.njcn.gather.device.pojo.enums.CommonEnum; import com.njcn.gather.script.mapper.PqScriptDtlsMapper; import com.njcn.gather.script.mapper.PqScriptMapper; import com.njcn.gather.script.pojo.param.PqScriptCheckDataParam; +import com.njcn.gather.script.pojo.param.PqScriptDtlsParam; import com.njcn.gather.script.pojo.param.PqScriptIssueParam; 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.PqScriptDtlDataVO; import com.njcn.gather.script.service.IPqScriptCheckDataService; import com.njcn.gather.script.service.IPqScriptDtlsService; import com.njcn.gather.script.util.ScriptDtlsDesc; @@ -131,7 +134,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl pqScriptDtls = this.pqScriptDtls(param.getScriptId(), param.getIsPhaseSequence(), volt, curr, param.getIndexList()); + List pqScriptDtls = this.pqScriptDtls(param, volt, curr); Boolean isValueType = pqScriptMapper.selectScriptIsValueType(param.getScriptId()); if (CollUtil.isNotEmpty(pqScriptDtls)) { /** @@ -222,9 +225,37 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl info = new ArrayList<>(); - Integer i = this.baseMapper.selectMaxIndex(sourceIssue.getScriptId()); + List checkList = new ArrayList<>(); + Integer i=sourceIssue.getIndex(); + if(ObjectUtil.isNotNull(sourceIssue.getIndex())){ + this.remove(new MPJLambdaWrapper() + .eq(PqScriptDtls::getScriptId,sourceIssue.getScriptId()) + .eq(PqScriptDtls::getIndex,sourceIssue.getIndex()) + ); + pqScriptCheckDataService.remove(new MPJLambdaWrapper() + .eq(PqScriptCheckData::getScriptId,sourceIssue.getScriptId()) + .eq(PqScriptCheckData::getIndex,sourceIssue.getIndex()) + ); + }else{ + i = this.baseMapper.selectMaxIndex(sourceIssue.getScriptId()); + } + List checkDataList = sourceIssue.getCheckDataList(); + PqScriptCheckData data; + for (PqScriptDtlsParam.CheckData checkData : checkDataList) { + data=new PqScriptCheckData(); + data.setScriptId(sourceIssue.getScriptId()); + data.setIndex(i); + data.setValueType(checkData.getValueType()); + data.setDataType(checkData.getDataType()); + data.setPhase(checkData.getPhase()); + data.setValue(checkData.getValue()); + data.setHarmNum(checkData.getHarmNum()); + data.setEnable(checkData.getEnable()); + data.setErrorFlag(checkData.getErrorFlag()); + checkList.add(data); + } //频率赋值 PqScriptDtls dtls = setScriptDtls(sourceIssue, i); dtls.setValueType(FREQ); @@ -310,7 +341,15 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl scriptDtlsList() { + return Collections.emptyList(); } @Override @@ -318,22 +357,24 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl pqScriptDtls(String scriptId, String isPhaseSequence, Double volt, Double curr, List indexList) { + public List pqScriptDtls(PqScriptIssueParam param, Double volt, Double curr) { List pqScriptDtls; MPJLambdaWrapper queryWrapper = new MPJLambdaWrapper<>(); queryWrapper.selectAll(PqScriptDtls.class) .selectAs(DictTree::getCode, PqScriptDtls::getScriptCode) .leftJoin(DictTree.class, DictTree::getId, PqScriptDtls::getScriptType) + .eq(StrUtil.isNotBlank(param.getScriptType()), PqScriptDtls::getScriptType, param.getScriptSubType()) + .eq(StrUtil.isNotBlank(param.getScriptSubType()), PqScriptDtls::getScriptSubType, param.getScriptSubType()) // .eq(PqScriptDtls::getIndex, 1) // .le(PqScriptDtls::getIndex, 30) // .in(PqScriptDtls::getIndex, Arrays.asList(1,7)) @@ -341,20 +382,20 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl