调整

cs_system/cs_system_api/pom.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>cs_system</artifactId>
+        <groupId>com.njcn</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>cs_system-api</artifactId>
+
+    <name>cs_system-api</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>common-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>common-db</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>common-microservice</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>common-poi</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.jeffreyning</groupId>
+            <artifactId>mybatisplus-plus</artifactId>
+            <version>${mybatis-plus.jeffreyning.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>

cs_system/cs_system_api/src/main/java/com/njcn/system/api/EpdFeignClient.java

@@ -0,0 +1,24 @@
+package com.njcn.system.api;
+
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.system.api.fallback.EpdFeignClientFallbackFactory;
+import com.njcn.system.pojo.param.EleEpdPqdParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @author hongawen
+ * @version 1.0.0
+ * @date 2021年05月08日 15:11
+ */
+@FeignClient(value = ServerInfo.CS_SYSTEM_BOOT,path = "/csDictData",fallbackFactory = EpdFeignClientFallbackFactory.class,contextId = "csDictData")
+public interface EpdFeignClient {
+
+    @PostMapping("/addByModel")
+    HttpResult<String> addByModel(@RequestBody List<EleEpdPqdParam> eleEpdPqdParam);
+
+}

cs_system/cs_system_api/src/main/java/com/njcn/system/api/fallback/EpdFeignClientFallbackFactory.java

@@ -0,0 +1,42 @@
+package com.njcn.system.api.fallback;
+
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.system.api.EpdFeignClient;
+import com.njcn.system.pojo.param.EleEpdPqdParam;
+import com.njcn.system.utils.CsSystemEnumUtil;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2023/5/24 18:46
+ */
+@Slf4j
+@Component
+public class EpdFeignClientFallbackFactory implements FallbackFactory<EpdFeignClient> {
+    @Override
+    public EpdFeignClient create(Throwable cause) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if(cause.getCause() instanceof BusinessException){
+            BusinessException businessException = (BusinessException) cause.getCause();
+            exceptionEnum = CsSystemEnumUtil.getExceptionEnum(businessException.getResult());
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new EpdFeignClient() {
+            @Override
+            public HttpResult<String> addByModel(List<EleEpdPqdParam> eleEpdPqdParam) {
+                log.error("{}异常，降级处理，异常为：{}","通过模板录入字典数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}

cs_system/cs_system_api/src/main/java/com/njcn/system/enums/CsSystemResponseEnum.java

@@ -0,0 +1,32 @@
+package com.njcn.system.enums;
+
+import lombok.Getter;
+
+/**
+ * @author xuyang
+ * @version 1.0.0
+ * @date 2023年04月17日 10:50
+ */
+@Getter
+public enum CsSystemResponseEnum {
+
+    /**
+     * A0301 ~ A0399 用于治理系统模块的枚举
+     * <p>
+     */
+    DICT_REPEAT("A0301","字典数据重复!"),
+
+    CS_SYSTEM_COMMON_ERROR("A00302","治理系统模块异常"),
+
+    ;
+
+    private final String code;
+
+    private final String message;
+
+    CsSystemResponseEnum(String code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+}

cs_system/cs_system_api/src/main/java/com/njcn/system/pojo/param/EleEpdPqdParam.java

@@ -0,0 +1,118 @@
+package com.njcn.system.pojo.param;
+
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2023/5/24 14:37
+ */
+@Data
+public class EleEpdPqdParam {
+
+    @ApiModelProperty(value = "数据名称")
+    @NotBlank(message="数据名称不能为空！")
+    private String name;
+
+    @ApiModelProperty(value = "别名")
+    private String otherName;
+
+    @ApiModelProperty(value = "展示名称")
+    private String showName;
+
+    @ApiModelProperty(value = "序号")
+    @NotNull(message="序号不能为空！")
+    private Integer sort;
+
+    @ApiModelProperty(value = "基础数据类型")
+    private String type;
+
+    @ApiModelProperty(value = "相别")
+    @NotBlank(message="相别不能为空！")
+    private String phase;
+
+    @ApiModelProperty(value = "单位")
+    private String unit;
+
+    @ApiModelProperty(value = "数据开始谐波次数")
+    private Integer harmStart;
+
+    @ApiModelProperty(value = "数据结束谐波次数")
+    private Integer harmEnd;
+
+    @ApiModelProperty(value = "数据分类")
+    @NotBlank(message="数据分类不能为空！")
+    private String classId;
+
+    @ApiModelProperty(value = "数据统计方法")
+    private String statMethod;
+
+    @ApiModelProperty(value = "系统类别")
+    private String systemType;
+
+    @ApiModelProperty(value = "数据模型")
+    @NotBlank(message="数据模型不能为空！")
+    private String dataType;
+
+    @ApiModelProperty(value = "数据是否上送")
+    private Integer tranFlag;
+
+    @ApiModelProperty(value = "上送规则")
+    private String tranRule;
+
+    @ApiModelProperty(value = "事件类别||参数类别||定值数据类型")
+    private String eventType;
+
+    @ApiModelProperty(value = "是否存储||是否加密")
+    private Integer storeFlag;
+
+    @ApiModelProperty(value = "是否需遥控校验")
+    private Integer curSts;
+
+    @ApiModelProperty(value = "是否可远程控制||是否可修改||是否支持自动控制")
+    private String ctlSts;
+
+    @ApiModelProperty(value = "设置最大值")
+    private Integer maxNum;
+
+    @ApiModelProperty(value = "设置最小值")
+    private Integer minNum;
+
+    @ApiModelProperty(value = "参数为enum可设置的所有值序列")
+    private String setValue;
+
+    @ApiModelProperty(value = "参数string可设置字符串的长度上限")
+    private Integer strlen;
+
+    @ApiModelProperty(value = "参数缺省值")
+    private String defaultValue;
+
+    @ApiModelProperty(value = "报表数据来源(mysql表名)")
+    private String resourcesId;
+
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class EleEpdPqdUpdateParam extends EleEpdPqdParam {
+        @ApiModelProperty("Id")
+        @NotBlank(message = "id不为空")
+        private String id;
+    }
+
+    /**
+     * 分页查询实体
+     */
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class EleEpdPqdQueryParam extends BaseParam {
+
+    }
+
+}

cs_system/cs_system_api/src/main/java/com/njcn/system/pojo/po/EleEpdPqd.java

@@ -0,0 +1,156 @@
+package com.njcn.system.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author xuyang
+ * @since 2023-05-24
+ */
+@Data
+@TableName("ele_epd_pqd")
+public class EleEpdPqd {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Id
+     */
+    private String id;
+
+    /**
+     * 数据名称
+     */
+    @MppMultiId(value = "name")
+    private String name;
+
+    /**
+     * 别名
+     */
+    private String otherName;
+
+    /**
+     * 展示
+     */
+    private String showName;
+
+    /**
+     * 数据编号
+     */
+    private Integer sort;
+
+    /**
+     * 数据类型
+     */
+    private String type;
+
+    /**
+     * 相别
+     */
+    @MppMultiId(value = "phase")
+    private String phase;
+
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * 数据开始谐波次数
+     */
+    private Integer harmStart;
+
+    /**
+     * 数据结束谐波次数
+     */
+    private Integer harmEnd;
+
+    /**
+     * 数据分类，唯一类别
+     */
+    @MppMultiId(value = "class_id")
+    private String classId;
+
+    /**
+     * 数据统计方法，“max”“min”“avg”“cp95”
+     */
+    private String statMethod;
+
+    /**
+     * 系统类别（区分用能/电能）
+     */
+    private String systemType;
+
+    /**
+     * 数据类型(epd、pqd...)
+     */
+    @MppMultiId(value = "data_type")
+    private String dataType;
+
+    /**
+     * 数据是否上送 0:不上送 1:上送
+     */
+    private Integer tranFlag;
+
+    /**
+     * 上送规则 变化:“change”周期:“period”
+     */
+    private String tranRule;
+
+    /**
+     * evt的事件类别 "1"、"2"；	parm的参数类别	系统参数：“sys”，运行参数：“run”，功能参数:“fun”；	set的定值数据类型 “hex”“number”
+     */
+    private String eventType;
+
+    /**
+     * sts、di的是否存储 1:存储 0:不存储；	ctrl的是否加密 1:加密 0:不加密
+     */
+    private Integer storeFlag;
+
+    /**
+     * sts、do的当前值；	ctrl的是否需遥控校验 1：需要 0：不需要
+     */
+    private Integer curSts;
+
+    /**
+     * do的是否可远程控制 1:是 0:否；	parm的是否可修改 1:是 0:否；	ctrl的是否支持自动控制 1:是 0:否	
+     */
+    private String ctlSts;
+
+    /**
+     * 设置最大值
+     */
+    private Integer maxNum;
+
+    /**
+     * 设置最小值
+     */
+    private Integer minNum;
+
+    /**
+     * 参数为enum可设置的所有值序列
+     */
+    private String setValue;
+
+    /**
+     * 参数string可设置字符串的长度上限
+     */
+    private Integer strlen;
+
+    /**
+     * 参数缺省值
+     */
+    private String defaultValue;
+
+
+}

cs_system/cs_system_api/src/main/java/com/njcn/system/pojo/vo/EleEpdPqdVO.java

@@ -0,0 +1,57 @@
+package com.njcn.system.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2023/5/24 15:30
+ */
+@Data
+public class EleEpdPqdVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "数据名称")
+    private String name;
+
+    @ApiModelProperty(value = "别名")
+    private String otherName;
+
+    @ApiModelProperty(value = "展示名称")
+    private String showName;
+
+    @ApiModelProperty(value = "序号")
+    private Integer sort;
+
+    @ApiModelProperty(value = "基础数据类型")
+    private String type;
+
+    @ApiModelProperty(value = "相别")
+    private String phase;
+
+    @ApiModelProperty(value = "单位")
+    private String unit;
+
+    @ApiModelProperty(value = "数据开始谐波次数")
+    private Integer harmStart;
+
+    @ApiModelProperty(value = "数据结束谐波次数")
+    private Integer harmEnd;
+
+    @ApiModelProperty(value = "数据分类(influxDB表名)")
+    private String classId;
+
+    @ApiModelProperty(value = "数据模型")
+    private String dataType;
+
+    @ApiModelProperty(value = "报表数据来源(mysql表名)")
+    private String resourcesId;
+
+}

cs_system/cs_system_api/src/main/java/com/njcn/system/utils/CsSystemEnumUtil.java

@@ -0,0 +1,46 @@
+package com.njcn.system.utils;
+
+import cn.hutool.core.util.StrUtil;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.EnumUtils;
+import com.njcn.system.enums.CsSystemResponseEnum;
+
+import javax.validation.constraints.NotNull;
+import java.util.Objects;
+
+/**
+ * @author hongawen
+ * @version 1.0.0
+ * @date 2021年12月20日 10:03
+ */
+public class CsSystemEnumUtil {
+
+    public static CsSystemResponseEnum getDeviceEnumResponseEnumByMessage(@NotNull Object value) {
+        CsSystemResponseEnum deviceResponseEnum;
+        try {
+            String message = value.toString();
+            if(message.indexOf(StrUtil.C_COMMA)>0){
+                value = message.substring(message.indexOf(StrUtil.C_COMMA)+1);
+            }
+            deviceResponseEnum = EnumUtils.valueOf(CsSystemResponseEnum.class, value, CsSystemResponseEnum.class.getMethod(BusinessException.GET_MESSAGE_METHOD));
+            return Objects.isNull(deviceResponseEnum) ? CsSystemResponseEnum.CS_SYSTEM_COMMON_ERROR : deviceResponseEnum;
+        } catch (NoSuchMethodException e) {
+            throw new BusinessException(CommonResponseEnum.INTERNAL_ERROR);
+        }
+    }
+
+    public static Enum<?> getExceptionEnum(HttpResult<Object> result){
+        //如果返回错误，且为内部错误，则直接抛出异常
+        CommonResponseEnum commonResponseEnum = EnumUtils.getCommonResponseEnumByCode(result.getCode());
+        if (commonResponseEnum == CommonResponseEnum.SYSTEM_RESPONSE_ENUM) {
+            return getDeviceEnumResponseEnumByMessage(result.getMessage());
+        }
+        return commonResponseEnum;
+    }
+
+
+
+
+}