From befb138068d056c32c2fe5fd9cd337f1815f32dd Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Fri, 2 Jun 2023 15:55:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E6=80=81=E5=8A=9F=E8=83=BD=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/HarmonicConstant.java | 2 +- .../param/CsConfigurationParm.java | 2 +- .../pojo => harmonic}/param/CsPageParm.java | 3 +- .../param/ThdDataQueryParm.java | 2 +- .../pojo/po/CsConfigurationPO.java | 4 +- .../pojo/po/CsNetDevPO.java | 5 +- .../pojo/po/CsPagePO.java | 5 +- .../njcn/harmonic/pojo/vo/ConditionVO.java | 23 ++++++++ .../pojo/vo/CsConfigurationVO.java | 2 +- .../pojo/vo/CsPageVO.java | 2 +- .../com/njcn/harmonic/pojo/vo/ElementsVO.java | 52 +++++++++++++++++++ .../harmonic}/pojo/vo/TargetDetailVO.java | 3 +- .../pojo/vo/ThdDataVO.java | 2 +- .../com/njcn/harmonic/pojo/vo/ZuTaiVo.java | 25 +++++++++ .../controller/CsConfigurationController.java | 4 +- .../controller/CsPagePOController.java | 6 +-- .../controller/LineTargetController.java | 12 ++++- .../controller/StableDataController.java | 4 +- .../mapper/CsConfigurationMapper.java | 2 +- .../harmonic/mapper/CsNetDevPOMapper.java | 2 +- .../njcn/harmonic/mapper/CsPagePOMapper.java | 2 +- .../mapper/mapping/CsConfigurationMapper.xml | 2 +- .../mapper/mapping/CsNetDevPOMapper.xml | 2 +- .../mapper/mapping/CsPagePOMapper.xml | 2 +- .../service/CsConfigurationService.java | 8 +-- .../harmonic/service/CsNetDevPOService.java | 5 +- .../harmonic/service/CsPagePOService.java | 14 +++-- .../harmonic/service/ILineTargetService.java | 8 ++- .../harmonic/service/StableDataService.java | 4 +- .../impl/CsConfigurationServiceImpl.java | 15 +++--- .../service/impl/CsNetDevPOServiceImpl.java | 4 +- .../service/impl/CsPagePOServiceImpl.java | 25 +++++---- .../service/impl/LineTargetServiceImpl.java | 41 +++++++++++++-- .../service/impl/StableDataServiceImpl.java | 7 +-- 34 files changed, 225 insertions(+), 76 deletions(-) rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{haronic/pojo => harmonic}/constant/HarmonicConstant.java (91%) rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{haronic/pojo => harmonic}/param/CsConfigurationParm.java (96%) rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{haronic/pojo => harmonic}/param/CsPageParm.java (93%) rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{haronic/pojo => harmonic}/param/ThdDataQueryParm.java (96%) rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{haronic => harmonic}/pojo/po/CsConfigurationPO.java (95%) rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{haronic => harmonic}/pojo/po/CsNetDevPO.java (98%) rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{haronic => harmonic}/pojo/po/CsPagePO.java (91%) create mode 100644 cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ConditionVO.java rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{haronic => harmonic}/pojo/vo/CsConfigurationVO.java (95%) rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{haronic => harmonic}/pojo/vo/CsPageVO.java (97%) create mode 100644 cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ElementsVO.java rename cs-harmonic/cs-harmonic-api/src/main/java/{ => com/njcn/harmonic}/pojo/vo/TargetDetailVO.java (91%) rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{haronic => harmonic}/pojo/vo/ThdDataVO.java (95%) create mode 100644 cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ZuTaiVo.java diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/haronic/pojo/constant/HarmonicConstant.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/constant/HarmonicConstant.java similarity index 91% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/haronic/pojo/constant/HarmonicConstant.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/constant/HarmonicConstant.java index 967fc45..01a5751 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/haronic/pojo/constant/HarmonicConstant.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/constant/HarmonicConstant.java @@ -1,4 +1,4 @@ -package com.njcn.haronic.pojo.constant; +package com.njcn.harmonic.constant; import java.util.List; diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/haronic/pojo/param/CsConfigurationParm.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/param/CsConfigurationParm.java similarity index 96% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/haronic/pojo/param/CsConfigurationParm.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/param/CsConfigurationParm.java index 4c8ff11..0d80419 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/haronic/pojo/param/CsConfigurationParm.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/param/CsConfigurationParm.java @@ -1,4 +1,4 @@ -package com.njcn.haronic.pojo.param; +package com.njcn.harmonic.param; import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.ApiModelProperty; diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/haronic/pojo/param/CsPageParm.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/param/CsPageParm.java similarity index 93% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/haronic/pojo/param/CsPageParm.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/param/CsPageParm.java index ec54507..6a7a55b 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/haronic/pojo/param/CsPageParm.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/param/CsPageParm.java @@ -1,4 +1,4 @@ -package com.njcn.haronic.pojo.param; +package com.njcn.harmonic.param; import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.ApiModelProperty; @@ -7,7 +7,6 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; /** * diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/haronic/pojo/param/ThdDataQueryParm.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/param/ThdDataQueryParm.java similarity index 96% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/haronic/pojo/param/ThdDataQueryParm.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/param/ThdDataQueryParm.java index fe20e41..dcd4840 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/haronic/pojo/param/ThdDataQueryParm.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/param/ThdDataQueryParm.java @@ -1,4 +1,4 @@ -package com.njcn.haronic.pojo.param; +package com.njcn.harmonic.param; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/haronic/pojo/po/CsConfigurationPO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/CsConfigurationPO.java similarity index 95% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/haronic/pojo/po/CsConfigurationPO.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/CsConfigurationPO.java index 3897ded..75c0c93 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/haronic/pojo/po/CsConfigurationPO.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/CsConfigurationPO.java @@ -1,11 +1,9 @@ -package com.njcn.haronic.pojo.po; +package com.njcn.harmonic.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; -import java.util.Date; - import com.njcn.db.bo.BaseEntity; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/haronic/pojo/po/CsNetDevPO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/CsNetDevPO.java similarity index 98% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/haronic/pojo/po/CsNetDevPO.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/CsNetDevPO.java index 5314312..4603fb2 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/haronic/pojo/po/CsNetDevPO.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/CsNetDevPO.java @@ -1,4 +1,4 @@ -package com.njcn.haronic.pojo.po; +package com.njcn.harmonic.pojo.po; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -6,10 +6,11 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.Date; + /** * Description: * Date: 2023/5/31 14:13【需求编号】 diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/haronic/pojo/po/CsPagePO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/CsPagePO.java similarity index 91% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/haronic/pojo/po/CsPagePO.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/CsPagePO.java index fca9a37..acdfdc3 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/haronic/pojo/po/CsPagePO.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/CsPagePO.java @@ -1,13 +1,10 @@ -package com.njcn.haronic.pojo.po; +package com.njcn.harmonic.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; import com.njcn.db.bo.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import java.util.Date; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ConditionVO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ConditionVO.java new file mode 100644 index 0000000..3f089ef --- /dev/null +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ConditionVO.java @@ -0,0 +1,23 @@ +package com.njcn.harmonic.pojo.vo; + +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; +import lombok.Data; + +import java.io.Serializable; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/6/2 15:30 + */ +@Data +public class ConditionVO implements Serializable { + + @SerializedName("pic") + private String pic; + + @SerializedName("value") + private String value; +} diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/haronic/pojo/vo/CsConfigurationVO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/CsConfigurationVO.java similarity index 95% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/haronic/pojo/vo/CsConfigurationVO.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/CsConfigurationVO.java index 22a27cb..025b21b 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/haronic/pojo/vo/CsConfigurationVO.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/CsConfigurationVO.java @@ -1,4 +1,4 @@ -package com.njcn.haronic.pojo.vo; +package com.njcn.harmonic.pojo.vo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/haronic/pojo/vo/CsPageVO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/CsPageVO.java similarity index 97% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/haronic/pojo/vo/CsPageVO.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/CsPageVO.java index 49f752b..4ab5e35 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/haronic/pojo/vo/CsPageVO.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/CsPageVO.java @@ -1,4 +1,4 @@ -package com.njcn.haronic.pojo.vo; +package com.njcn.harmonic.pojo.vo; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ElementsVO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ElementsVO.java new file mode 100644 index 0000000..ecd2190 --- /dev/null +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ElementsVO.java @@ -0,0 +1,52 @@ +package com.njcn.harmonic.pojo.vo; + +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/6/2 15:26 + */ +@Data +public class ElementsVO implements Serializable { + + @SerializedName("type") + private String type; + + @SerializedName("pointId") + private String pointId; + + @SerializedName("pointName") + private String pointName; + + @SerializedName("targetId") + private String targetId; + + @SerializedName("targetName") + private String targetName; + + @SerializedName("defaultPic") + private String defaultPic; + + @SerializedName("width") + private Integer width; + + @SerializedName("height") + private Integer height; + + @SerializedName("top") + private Integer top; + + @SerializedName("left") + private Integer left; + + @SerializedName("condition") + private List condition; + +} diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/pojo/vo/TargetDetailVO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/TargetDetailVO.java similarity index 91% rename from cs-harmonic/cs-harmonic-api/src/main/java/pojo/vo/TargetDetailVO.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/TargetDetailVO.java index ab070dd..1f5ff0b 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/pojo/vo/TargetDetailVO.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/TargetDetailVO.java @@ -1,11 +1,10 @@ -package pojo.vo; +package com.njcn.harmonic.pojo.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.util.List; -import java.util.Map; /** * 类的介绍： diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/haronic/pojo/vo/ThdDataVO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ThdDataVO.java similarity index 95% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/haronic/pojo/vo/ThdDataVO.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ThdDataVO.java index 39a03e7..c9fb14b 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/haronic/pojo/vo/ThdDataVO.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ThdDataVO.java @@ -1,4 +1,4 @@ -package com.njcn.haronic.pojo.vo; +package com.njcn.harmonic.pojo.vo; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ZuTaiVo.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ZuTaiVo.java new file mode 100644 index 0000000..1c0b092 --- /dev/null +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ZuTaiVo.java @@ -0,0 +1,25 @@ +package com.njcn.harmonic.pojo.vo; + +import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/6/2 15:39 + */ +@Data +public class ZuTaiVo implements Serializable { + + @SerializedName("background") + private String background; + + @SerializedName("elements") + private List elements; + +} diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/controller/CsConfigurationController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/controller/CsConfigurationController.java index 93271b4..9efb7e1 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/controller/CsConfigurationController.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/controller/CsConfigurationController.java @@ -16,8 +16,8 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import com.njcn.haronic.pojo.param.CsConfigurationParm; -import com.njcn.haronic.pojo.vo.CsConfigurationVO; +import com.njcn.harmonic.param.CsConfigurationParm; +import com.njcn.harmonic.pojo.vo.CsConfigurationVO; import org.springframework.web.multipart.MultipartFile; /** diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/controller/CsPagePOController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/controller/CsPagePOController.java index e500261..198ca58 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/controller/CsPagePOController.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/controller/CsPagePOController.java @@ -6,17 +6,15 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.harmonic.service.CsPagePOService; -import com.njcn.haronic.pojo.vo.CsPageVO; +import com.njcn.harmonic.pojo.vo.CsPageVO; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.validation.annotation.Validated; -import com.njcn.haronic.pojo.param.CsConfigurationParm; -import com.njcn.haronic.pojo.param.CsPageParm; +import com.njcn.harmonic.param.CsPageParm; import org.springframework.web.bind.annotation.*; -import com.njcn.haronic.pojo.vo.CsConfigurationVO; /** * (cs_page)表控制层 diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/controller/LineTargetController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/controller/LineTargetController.java index 1e89166..7913a73 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/controller/LineTargetController.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/controller/LineTargetController.java @@ -6,6 +6,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.csdevice.pojo.vo.LineTargetVO; +import com.njcn.harmonic.pojo.vo.TargetDetailVO; import com.njcn.harmonic.service.ILineTargetService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; @@ -18,7 +19,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import pojo.vo.TargetDetailVO; import java.util.List; @@ -61,4 +61,14 @@ public class LineTargetController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/lineData") + @ApiOperation("获取指标数据") + @ApiImplicitParam(name = "id", value = "组态页面id", required = true) + public HttpResult getLineData(@RequestParam("id") String id) { + String methodDescribe = getMethodDescribe("getLineData"); + lineTargetService.getLineData(id); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } + } diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/controller/StableDataController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/controller/StableDataController.java index 3a5f53b..fc3ce66 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/controller/StableDataController.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/controller/StableDataController.java @@ -15,8 +15,8 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import com.njcn.haronic.pojo.param.ThdDataQueryParm; -import com.njcn.haronic.pojo.vo.ThdDataVO; +import com.njcn.harmonic.param.ThdDataQueryParm; +import com.njcn.harmonic.pojo.vo.ThdDataVO; import java.util.List; diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/CsConfigurationMapper.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/CsConfigurationMapper.java index 8aa6b6c..05c53cb 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/CsConfigurationMapper.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/CsConfigurationMapper.java @@ -1,7 +1,7 @@ package com.njcn.harmonic.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.haronic.pojo.po.CsConfigurationPO; +import com.njcn.harmonic.pojo.po.CsConfigurationPO; /** * Description: diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/CsNetDevPOMapper.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/CsNetDevPOMapper.java index 73c8b17..3db2e2d 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/CsNetDevPOMapper.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/CsNetDevPOMapper.java @@ -1,7 +1,7 @@ package com.njcn.harmonic.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.haronic.pojo.po.CsNetDevPO; +import com.njcn.harmonic.pojo.po.CsNetDevPO; /** * Description: diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/CsPagePOMapper.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/CsPagePOMapper.java index 06975ca..a3d6ee2 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/CsPagePOMapper.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/CsPagePOMapper.java @@ -1,7 +1,7 @@ package com.njcn.harmonic.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.haronic.pojo.po.CsPagePO; +import com.njcn.harmonic.pojo.po.CsPagePO; /** * diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/CsConfigurationMapper.xml b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/CsConfigurationMapper.xml index 09f2803..48cba75 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/CsConfigurationMapper.xml +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/CsConfigurationMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/CsNetDevPOMapper.xml b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/CsNetDevPOMapper.xml index 3596f3e..2ccb6a5 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/CsNetDevPOMapper.xml +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/CsNetDevPOMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/CsPagePOMapper.xml b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/CsPagePOMapper.xml index 1b57ce0..05aef33 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/CsPagePOMapper.xml +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/CsPagePOMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/CsConfigurationService.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/CsConfigurationService.java index 18a9603..def52bb 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/CsConfigurationService.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/CsConfigurationService.java @@ -1,10 +1,10 @@ package com.njcn.harmonic.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.njcn.haronic.pojo.param.CsConfigurationParm; import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.haronic.pojo.po.CsConfigurationPO; -import com.njcn.haronic.pojo.vo.CsConfigurationVO; +import com.njcn.harmonic.param.CsConfigurationParm; +import com.njcn.harmonic.pojo.po.CsConfigurationPO; +import com.njcn.harmonic.pojo.vo.CsConfigurationVO; import org.springframework.web.multipart.MultipartFile; /** @@ -18,7 +18,7 @@ import org.springframework.web.multipart.MultipartFile; public interface CsConfigurationService extends IService{ - boolean add(CsConfigurationParm csConfigurationParm); + boolean add(CsConfigurationParm csConfigurationParm); boolean audit(CsConfigurationParm.CsConfigurationAuditParam auditParm); diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/CsNetDevPOService.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/CsNetDevPOService.java index 6c8d358..77d5ea1 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/CsNetDevPOService.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/CsNetDevPOService.java @@ -1,8 +1,9 @@ package com.njcn.harmonic.service; -import com.njcn.haronic.pojo.po.CsNetDevPO; import com.baomidou.mybatisplus.extension.service.IService; - /** +import com.njcn.harmonic.pojo.po.CsNetDevPO; + +/** * * Description: * Date: 2023/5/31 14:12【需求编号】 diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/CsPagePOService.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/CsPagePOService.java index 22a6c1e..b7b791a 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/CsPagePOService.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/CsPagePOService.java @@ -1,10 +1,10 @@ package com.njcn.harmonic.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.njcn.haronic.pojo.param.CsPageParm; -import com.njcn.haronic.pojo.po.CsPagePO; import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.haronic.pojo.vo.CsPageVO; +import com.njcn.harmonic.param.CsPageParm; +import com.njcn.harmonic.pojo.po.CsPagePO; +import com.njcn.harmonic.pojo.vo.CsPageVO; /** * @@ -22,4 +22,12 @@ public interface CsPagePOService extends IService{ boolean audit(CsPageParm.CsPageParmAuditParam auditParm); IPage queryPage(CsPageParm.CsPageParmQueryParam csPageParam); + + /** + * 根据id获取组态页面数据 + * @param id + * @return + */ + CsPagePO queryById(String id); + } diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/ILineTargetService.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/ILineTargetService.java index b4cd68b..224dfa4 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/ILineTargetService.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/ILineTargetService.java @@ -1,7 +1,7 @@ package com.njcn.harmonic.service; import com.njcn.csdevice.pojo.vo.LineTargetVO; -import pojo.vo.TargetDetailVO; +import com.njcn.harmonic.pojo.vo.TargetDetailVO; import java.util.List; @@ -25,5 +25,11 @@ public interface ILineTargetService { */ TargetDetailVO getTargetDetail(String pid, String name); + /** + * 获取绑定指标的数据 + * @param id + */ + void getLineData(String id); + } diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/StableDataService.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/StableDataService.java index 48b2644..eba4ec7 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/StableDataService.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/StableDataService.java @@ -2,8 +2,8 @@ package com.njcn.harmonic.service; -import com.njcn.haronic.pojo.param.ThdDataQueryParm; -import com.njcn.haronic.pojo.vo.ThdDataVO; +import com.njcn.harmonic.param.ThdDataQueryParm; +import com.njcn.harmonic.pojo.vo.ThdDataVO; import java.util.List; diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CsConfigurationServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CsConfigurationServiceImpl.java index b3857a1..04bd7a2 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CsConfigurationServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CsConfigurationServiceImpl.java @@ -3,21 +3,20 @@ package com.njcn.harmonic.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.utils.NjcnBeanUtil; -import com.njcn.haronic.pojo.constant.HarmonicConstant; -import com.njcn.oss.constant.OssPath; +import com.njcn.harmonic.constant.HarmonicConstant; +import com.njcn.harmonic.mapper.CsConfigurationMapper; +import com.njcn.harmonic.param.CsConfigurationParm; +import com.njcn.harmonic.pojo.po.CsConfigurationPO; +import com.njcn.harmonic.pojo.vo.CsConfigurationVO; +import com.njcn.harmonic.service.CsConfigurationService; import com.njcn.oss.utils.FileStorageUtil; import lombok.RequiredArgsConstructor; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.harmonic.mapper.CsConfigurationMapper; import org.springframework.transaction.annotation.Transactional; -import com.njcn.haronic.pojo.param.CsConfigurationParm; -import com.njcn.harmonic.service.CsConfigurationService; -import com.njcn.haronic.pojo.po.CsConfigurationPO; -import com.njcn.haronic.pojo.vo.CsConfigurationVO; import org.springframework.web.multipart.MultipartFile; import java.util.List; diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CsNetDevPOServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CsNetDevPOServiceImpl.java index 16c7f12..a37c42d 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CsNetDevPOServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CsNetDevPOServiceImpl.java @@ -1,10 +1,10 @@ package com.njcn.harmonic.service.impl; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.haronic.pojo.po.CsNetDevPO; import com.njcn.harmonic.mapper.CsNetDevPOMapper; +import com.njcn.harmonic.pojo.po.CsNetDevPO; import com.njcn.harmonic.service.CsNetDevPOService; +import org.springframework.stereotype.Service; /** * * Description: diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CsPagePOServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CsPagePOServiceImpl.java index 2b38ceb..6ce5242 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CsPagePOServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CsPagePOServiceImpl.java @@ -3,16 +3,21 @@ package com.njcn.harmonic.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.harmonic.constant.HarmonicConstant; import com.njcn.harmonic.mapper.CsConfigurationMapper; -import com.njcn.haronic.pojo.constant.HarmonicConstant; -import com.njcn.haronic.pojo.po.CsConfigurationPO; -import com.njcn.haronic.pojo.vo.CsConfigurationVO; -import com.njcn.haronic.pojo.vo.CsPageVO; +import com.njcn.harmonic.mapper.CsPagePOMapper; +import com.njcn.harmonic.param.CsPageParm; +import com.njcn.harmonic.pojo.po.CsConfigurationPO; +import com.njcn.harmonic.pojo.po.CsPagePO; +import com.njcn.harmonic.pojo.vo.CsPageVO; +import com.njcn.harmonic.service.CsPagePOService; import com.njcn.oss.utils.FileStorageUtil; import lombok.RequiredArgsConstructor; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.io.BufferedReader; import java.io.ByteArrayInputStream; @@ -21,13 +26,6 @@ import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; import java.util.List; import java.util.stream.Collectors; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.harmonic.mapper.CsPagePOMapper; -import org.springframework.transaction.annotation.Transactional; -import com.njcn.haronic.pojo.param.CsPageParm; -import com.njcn.haronic.pojo.po.CsPagePO; -import com.njcn.harmonic.service.CsPagePOService; /** * * Description: @@ -112,6 +110,11 @@ public class CsPagePOServiceImpl extends ServiceImpl i return returnpage; } + @Override + public CsPagePO queryById(String id) { + return this.lambdaQuery().eq(CsPagePO::getId,id).one(); + } + /*将strin写入Json文件，返回一个InputStream*/ public InputStream writeJsonStringToInputStream(String jsonString) { diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/LineTargetServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/LineTargetServiceImpl.java index 7929d64..10c7f61 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/LineTargetServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/LineTargetServiceImpl.java @@ -1,20 +1,26 @@ package com.njcn.harmonic.service.impl; +import com.alibaba.nacos.shaded.com.google.gson.Gson; import com.njcn.csdevice.api.*; import com.njcn.csdevice.pojo.po.CsDataArray; -import com.njcn.csdevice.pojo.po.CsDataSet; import com.njcn.csdevice.pojo.po.CsDevModelPO; import com.njcn.csdevice.pojo.po.CsDevModelRelationPO; -import com.njcn.csdevice.pojo.vo.CsLedgerVO; import com.njcn.csdevice.pojo.vo.LineTargetVO; +import com.njcn.harmonic.pojo.vo.ElementsVO; +import com.njcn.harmonic.pojo.vo.TargetDetailVO; +import com.njcn.harmonic.pojo.vo.ZuTaiVo; +import com.njcn.harmonic.service.CsPagePOService; import com.njcn.harmonic.service.ILineTargetService; +import com.njcn.oss.utils.FileStorageUtil; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; -import pojo.vo.TargetDetailVO; +import java.io.BufferedReader; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; @@ -39,6 +45,10 @@ public class LineTargetServiceImpl implements ILineTargetService { private final DataArrayFeignClient dataArrayFeignClient; + private final FileStorageUtil fileStorageUtil; + + private final CsPagePOService csPagePOService; + @Override public List getLineTarget(String lineId) { List list = new ArrayList<>(); @@ -66,10 +76,33 @@ public class LineTargetServiceImpl implements ILineTargetService { return vo; } + @Override + public void getLineData(String id) { + String path = csPagePOService.queryById(id).getPath(); + InputStream inputStream = fileStorageUtil.getFileStream(path); + List list = analysisJson(inputStream); + System.out.println("list==:" + list); + + } + /** * 获取子节点 */ public List getChildren(LineTargetVO item, List all) { return all.stream().filter(allItem -> allItem.getPid().equals(item.getId())).collect(Collectors.toList()); } + + /** + * 解析json文件 + */ + public List analysisJson(InputStream inputStream) { + Gson gson = new Gson(); + String text = new BufferedReader( + new InputStreamReader(inputStream, StandardCharsets.UTF_8)) + .lines() + .collect(Collectors.joining("\n")); + ZuTaiVo zuTai = gson.fromJson(text, ZuTaiVo.class); + return zuTai.getElements(); + } + } diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/StableDataServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/StableDataServiceImpl.java index 0b89b74..e8aeb31 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/StableDataServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/StableDataServiceImpl.java @@ -1,10 +1,7 @@ package com.njcn.harmonic.service.impl; -import com.alibaba.nacos.client.naming.utils.CollectionUtils; - import com.njcn.common.pojo.exception.BusinessException; import com.njcn.csdevice.api.CsLineFeignClient; -import com.njcn.csdevice.constant.DataParam; import com.njcn.csdevice.enums.AlgorithmResponseEnum; import com.njcn.csdevice.pojo.po.CsLinePO; import com.njcn.csdevice.utils.ReflectUtils; @@ -13,8 +10,8 @@ import com.njcn.harmonic.service.StableDataService; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import com.njcn.haronic.pojo.param.ThdDataQueryParm; -import com.njcn.haronic.pojo.vo.ThdDataVO; +import com.njcn.harmonic.param.ThdDataQueryParm; +import com.njcn.harmonic.pojo.vo.ThdDataVO; import com.njcn.influx.pojo.po.HarmonicRatioData; import com.njcn.influx.pojo.po.PowerQualityData; import com.njcn.influx.service.HaronicRatioService;