From b45ba6f3b79f1ecc0b16beb428b1424b1912955c Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Wed, 11 Sep 2024 11:05:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B2=BB=E7=90=86=E5=AD=97=E5=85=B8=E5=AD=98?= =?UTF-8?q?=E5=82=A8redis?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/mq/message/AppAutoDataMessage.java | 56 +++++++++++++++++++ .../java/com/njcn/system/init/InitEpdPqd.java | 24 ++++++++ .../system/service/IEleEpdPqdService.java | 8 ++- .../service/impl/EleEpdPqdServiceImpl.java | 34 +++++++++-- 4 files changed, 116 insertions(+), 6 deletions(-) create mode 100644 pqs-system/system-boot/src/main/java/com/njcn/system/init/InitEpdPqd.java diff --git a/pqs-common/common-mq/src/main/java/com/njcn/mq/message/AppAutoDataMessage.java b/pqs-common/common-mq/src/main/java/com/njcn/mq/message/AppAutoDataMessage.java index d466cee31..0e055143e 100644 --- a/pqs-common/common-mq/src/main/java/com/njcn/mq/message/AppAutoDataMessage.java +++ b/pqs-common/common-mq/src/main/java/com/njcn/mq/message/AppAutoDataMessage.java @@ -66,6 +66,62 @@ public class AppAutoDataMessage extends BaseMessage { private Integer dataTag; private String data; + + @ApiModelProperty("工程名称") + private String prjName; + + @ApiModelProperty("装置启动时间") + private Long prjTimeStart; + + @ApiModelProperty("装置结束时间") + private Long prjTimeEnd; + + @ApiModelProperty("装置数据路径") + private String prjDataPath; + + @ApiModelProperty("装置型号") + private String devType; + + @ApiModelProperty("装置mac地址") + private String devMac; + + @ApiModelProperty("装置程序版本") + private String appVersion; + + @ApiModelProperty("逻辑子设备id") + private Integer clDid; + + @ApiModelProperty("统计间隔") + private Integer statCycle; + + @ApiModelProperty("电压等级") + private Float volGrade; + + @ApiModelProperty("电压接线方式（0-星型, 1-角型, 2-V型）") + private Integer volConType; + + @ApiModelProperty("电流接线方式（0-正常, 1-合成IB, 2-合成IC）") + private Integer curConSel; + + @ApiModelProperty("PT变比") + private Integer ptRatio; + + @ApiModelProperty("ct变比") + private Integer ctRatio; + + @ApiModelProperty("基准短路容量") + private Float capacitySscb; + + @ApiModelProperty("最小短路容量") + private Float capacitySscmin; + + @ApiModelProperty("供电设备容量") + private Float capacitySt; + + @ApiModelProperty("用户协议容量") + private Float capacitySi; + + } } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/init/InitEpdPqd.java b/pqs-system/system-boot/src/main/java/com/njcn/system/init/InitEpdPqd.java new file mode 100644 index 000000000..187ddbace --- /dev/null +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/init/InitEpdPqd.java @@ -0,0 +1,24 @@ +package com.njcn.system.init; + +import com.njcn.system.service.IEleEpdPqdService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.CommandLineRunner; +import org.springframework.stereotype.Component; + + +/** + * @author xy + */ +@Slf4j +@Component +@AllArgsConstructor +public class InitEpdPqd implements CommandLineRunner { + + private final IEleEpdPqdService epdPqdService; + + @Override + public void run(String... args) { + epdPqdService.refreshEpdPqdDataCache(); + } +} diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/IEleEpdPqdService.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/IEleEpdPqdService.java index be9c4d7fd..2bee4685c 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/IEleEpdPqdService.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/IEleEpdPqdService.java @@ -7,8 +7,6 @@ import com.njcn.system.pojo.param.EleEpdPqdParam; import com.njcn.system.pojo.po.EleEpdPqd; import com.njcn.system.pojo.vo.EleEpdPqdListVO; import com.njcn.system.pojo.vo.EleEpdPqdVO; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.RequestBody; import java.util.List; import java.util.Map; @@ -23,6 +21,12 @@ import java.util.Map; */ public interface IEleEpdPqdService extends IService { + /** + * 刷新epd内容 + */ + void refreshEpdPqdDataCache(); + + /** * 存储模板的字典数据 * @param eleEpdPqdParam diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EleEpdPqdServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EleEpdPqdServiceImpl.java index 99895c0d5..2a9f08fb6 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EleEpdPqdServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EleEpdPqdServiceImpl.java @@ -9,6 +9,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.db.constant.DbConstant; +import com.njcn.redis.pojo.enums.AppRedisKey; +import com.njcn.redis.utils.RedisUtil; import com.njcn.system.enums.SystemResponseEnum; import com.njcn.system.mapper.EleEpdPqdMapper; import com.njcn.system.pojo.dto.EpdDTO; @@ -43,6 +45,18 @@ public class EleEpdPqdServiceImpl extends ServiceImpl map = new HashMap<>(); + List list = findAll(); + list.forEach(item->{ + map.put(item.getDictName(),item.getTableName()); + }); + redisUtil.saveByKey(AppRedisKey.ELE_EPD_PQD,map); + } + @Override public void saveData(List eleEpdPqdParam) { List list = eleEpdPqdParam.stream().map(item->{ @@ -58,7 +72,10 @@ public class EleEpdPqdServiceImpl extends ServiceImpl