Merge remote-tracking branch 'origin/master'

pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppBaseInformationAddParm.java

@@ -0,0 +1,39 @@
+package com.njcn.algorithm.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/3  19:17【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+/**
+    * app基础信息表
+    */
+@Data
+public class AppBaseInformationAddParm {
+
+    /**
+     * 内容
+     */
+    @ApiModelProperty(value = "内容")
+    @NotBlank(message="内容不能为空！")
+    private String content;
+
+    /**
+     * 类型(字典数据)
+     */
+    @ApiModelProperty(value = "类型")
+    @NotBlank(message="类型不能为空！")
+    private String type;
+
+
+}

pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppPersonSetAddParm.java

@@ -0,0 +1,69 @@
+package com.njcn.algorithm.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/3  19:17【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+/**
+    * app个人中心-设置信息
+    */
+@Data
+public class AppPersonSetAddParm  {
+
+
+    /**
+     * 用户协议(基础信息id)
+     */
+    @ApiModelProperty(value = "用户协议(基础信息id)")
+    @NotBlank(message="用户协议不能为空！")
+    private String userAgreement;
+
+    /**
+     * 系统介绍(基础信息id)
+     */
+    @ApiModelProperty(value = "系统介绍(基础信息id)")
+    @NotBlank(message="系统介绍不能为空！")
+    private String systemIntroduction;
+
+    /**
+     * 使用手册(基础信息id)
+     */
+    @ApiModelProperty(value = "使用手册(基础信息id)")
+    @NotBlank(message="使用手册不能为空！")
+    private String userManual;
+
+    /**
+     * 资料库(基础信息id)
+     */
+    @ApiModelProperty(value = "资料库(基础信息id)")
+    @NotBlank(message="资料库不能为空！")
+    private String dataBase;
+
+    /**
+     * 公司介绍(基础信息id)
+     */
+    @ApiModelProperty(value = "公司介绍(基础信息id)")
+    @NotBlank(message="公司介绍不能为空！")
+    private String companyProfile;
+
+    /**
+     * 关于我们(基础信息id)
+     */
+    @ApiModelProperty(value = "关于我们(基础信息id)")
+    @NotBlank(message="关于我们id不能为空！")
+    private String aboutUs;
+
+
+
+}

pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppProjectAddParm.java

@@ -26,14 +26,9 @@ public class AppProjectAddParm {
     @NotBlank(message="项目名称不能为空！")
     private String name;
 
-    @NotBlank(message="项目类型不能为空！")
+    @NotBlank(message="工程id不能为空！")
-    private String projectType;
+    private String engineeringId;
-    /**
+
-     * 关联用户Id
-     */
-    @ApiModelProperty(value="关联用户Id")
-    @NotBlank(message="关联用户Id不能为空！")
-    private String userId;
 
     /**
      * 地市Id

pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppProjectAuditParm.java

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
 
 /**
  * Description:
@@ -23,11 +22,7 @@ public class AppProjectAuditParm {
     @ApiModelProperty(value="项目名称")
     private String name;
 
-    /**
+
-     * 关联用户Id
-     */
-    @ApiModelProperty(value="关联用户Id")
-    private String userId;
 
     /**
      * 地市Id
@@ -35,18 +30,6 @@ public class AppProjectAuditParm {
     @ApiModelProperty(value="地市")
     private String area;
 
-    /**
-     * 中心点经度
-     */
-    @ApiModelProperty(value="中心点经度")
-    private BigDecimal lng;
-
-    /**
-     * 中心点纬度
-     */
-    @ApiModelProperty(value="中心点纬度")
-    private BigDecimal lat;
-
     @ApiModelProperty(value="0：删除 1：正常")
     private String status;
 

pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsFeedbackAddParm.java

@@ -0,0 +1,55 @@
+package com.njcn.algorithm.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/6  11:39【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+
+@Data
+public class CsFeedbackAddParm {
+
+
+    /**
+     * 标题
+     */
+    @ApiModelProperty(value = "标题")
+    @NotNull(message="标题不能为空！")
+    private String title;
+
+    /**
+     * 描述
+     */
+    @ApiModelProperty(value = "描述")
+    @NotNull(message="描述不能为空！")
+    private String description;
+
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value = "用户id")
+    @NotNull(message="用户id不能为空！")
+    private String userId;
+
+    /**
+     * 问题类型(字典数据)
+     */
+    @ApiModelProperty(value = "问题类型")
+    @NotNull(message="问题类型不能为空！")
+    private String type;
+
+    @ApiModelProperty(value = "拓扑图文件")
+    @NotNull(message="拓扑图文件不能为空！")
+    private MultipartFile[] files;
+}

pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsFeedbackChatAddParm.java

@@ -0,0 +1,34 @@
+package com.njcn.algorithm.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/6  15:28【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+public class CsFeedbackChatAddParm  {
+    @ApiModelProperty(value = "反馈id")
+    @NotNull(message="反馈id不能为空！")
+    private String id;
+
+    @ApiModelProperty(value = "用户id")
+    @NotNull(message="用户id不能为空！")
+    private String userId;
+    /**
+     * 消息内容
+     */
+    @ApiModelProperty(value = "消息内容")
+    @NotNull(message="消息内容不能为空！")
+    private String chatContent;
+
+  
+}

pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsFeedbackChatCheckParm.java

@@ -0,0 +1,32 @@
+package com.njcn.algorithm.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/6  15:28【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+public class CsFeedbackChatCheckParm {
+
+
+
+    @ApiModelProperty(value = "反馈")
+    @NotNull(message="反馈不能为空！")
+    private String id;
+
+    @ApiModelProperty(value = "用户id")
+    @NotNull(message="用户id不能为空！")
+    private String userId;
+
+
+  
+}

pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsFeedbackQueryParm.java

@@ -0,0 +1,51 @@
+package com.njcn.algorithm.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/6  11:39【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+/**
+    * 信息反馈表
+    */
+@Data
+public class CsFeedbackQueryParm {
+
+    @NotNull(message="当前页不能为空！")
+    @Min(value = 1, message = "当前页不能为0")
+    @ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true)
+    private Integer currentPage;
+    /**显示条数*/
+    @NotNull(message="显示条数不能为空！")
+    @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)
+    private Integer pageSize;
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value = "用户id")
+    @NotNull(message="用户id不能为空！")
+    private String userId;
+
+    /**
+     * 问题类型(字典数据)
+     */
+    @ApiModelProperty(value = "问题类型")
+    private String type;
+
+    /**
+     * 问题状态(字典数据)
+     */
+    @ApiModelProperty(value = "问题状态")
+    private String status;
+}

pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppBaseInformationPO.java

@@ -0,0 +1,44 @@
+package com.njcn.algorithm.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 lombok.Data;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/3  19:17【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+/**
+    * app基础信息表
+    */
+@Data
+@TableName(value = "app_base_information")
+public class AppBaseInformationPO extends BaseEntity {
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
+    private String id;
+
+    /**
+     * 内容
+     */
+    @TableField(value = "content")
+    private String content;
+
+    /**
+     * 类型(字典数据)
+     */
+    @TableField(value = "type")
+    private String type;
+
+
+}

pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppPersonSetPO.java

@@ -0,0 +1,72 @@
+package com.njcn.algorithm.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import lombok.Data;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/3  19:17【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+/**
+    * app个人中心-设置信息
+    */
+@Data
+@TableName(value = "app_person_set")
+public class AppPersonSetPO  extends BaseEntity {
+    /**
+     * id
+     */
+    @TableField(value = "id")
+    private String id;
+
+    /**
+     * 用户协议(基础信息id)
+     */
+    @TableField(value = "user_agreement")
+    private String userAgreement;
+
+    /**
+     * 系统介绍(基础信息id)
+     */
+    @TableField(value = "system_introduction")
+    private String systemIntroduction;
+
+    /**
+     * 使用手册(基础信息id)
+     */
+    @TableField(value = "user_manual")
+    private String userManual;
+
+    /**
+     * 资料库(基础信息id)
+     */
+    @TableField(value = "data_base")
+    private String dataBase;
+
+    /**
+     * 公司介绍(基础信息id)
+     */
+    @TableField(value = "company_profile")
+    private String companyProfile;
+
+    /**
+     * 关于我们(基础信息id)
+     */
+    @TableField(value = "about_us")
+    private String aboutUs;
+
+    /**
+     * 状态(0：删除 1：正常)
+     */
+    @TableField(value = "status")
+    private String status;
+
+
+}

pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppProjectPO.java

@@ -6,8 +6,6 @@ import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import com.njcn.db.bo.BaseEntity;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 /**
  * 
  * Description:
@@ -28,11 +26,7 @@ public class AppProjectPO  extends BaseEntity {
      */
     @MppMultiId(value = "id")
     private String id;
-    /**
+
-     * 项目类型
-     */
-    @TableField(value = "project_type")
-    private String projectType;
 
     /**
      * 项目名称
@@ -40,11 +34,10 @@ public class AppProjectPO  extends BaseEntity {
     @TableField(value = "name")
     private String name;
 
-    /**
+    @TableField(value = "engineering_id")
-     * 关联用户Id
+    private String engineeringId;
-     */
+
-    @TableField(value = "user_id")
+
-    private String userId;
 
     /**
      * 地市Id
@@ -52,17 +45,7 @@ public class AppProjectPO  extends BaseEntity {
     @TableField(value = "area")
     private String area;
 
-    /**
-     * 中心点经度
-     */
-    @TableField(value = "lng")
-    private BigDecimal lng;
 
-    /**
-     * 中心点纬度
-     */
-    @TableField(value = "lat")
-    private BigDecimal lat;
 
     /**
      * 0：删除 1：正常

pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppTopologyDiagramPO.java

@@ -33,11 +33,6 @@ public class AppTopologyDiagramPO  extends BaseEntity {
     @TableField(value = "name")
     private String name;
 
-    /**
-     * 文件大小(kb)
-     */
-    @TableField(value = "file_size")
-    private Integer fileSize;
 
     /**
      * 项目Id

pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsEdDataPO.java

@@ -0,0 +1,80 @@
+package com.njcn.algorithm.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/3  19:12【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+/**
+    * 程序版本表
+    */
+@Data
+@TableName(value = "cs_ed_data")
+public class CsEdDataPO extends BaseEntity {
+    /**
+     * id
+     */
+    @TableField(value = "id")
+    private String id;
+
+    /**
+     * 装置型号(字典数据)
+     */
+    @TableField(value = "dev_type")
+    private String devType;
+
+    /**
+     * 版本号
+     */
+    @TableField(value = "version_no")
+    private String versionNo;
+
+    /**
+     * 版本协议
+     */
+    @TableField(value = "version_agree")
+    private String versionAgree;
+
+    /**
+     * 版本日期
+     */
+    @TableField(value = "version_date")
+    private Date versionDate;
+
+    /**
+     * 描述
+     */
+    @TableField(value = "describe")
+    private String describe;
+
+    /**
+     * 版本类型(字典数据)
+     */
+    @TableField(value = "version_type")
+    private String versionType;
+
+    /**
+     * 状态(0：删除 1：正常)
+     */
+    @TableField(value = "status")
+    private String status;
+
+    /**
+     * 程序版本文件路径
+     */
+    @TableField(value = "file_path")
+    private String filePath;
+
+
+}

pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsFeedbackChatPO.java

@@ -0,0 +1,43 @@
+package com.njcn.algorithm.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 lombok.Data;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/6  15:28【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+@TableName(value = "cs_feedback_chat")
+public class CsFeedbackChatPO  extends BaseEntity {
+    @TableId(value = "id", type = IdType.INPUT)
+    private String id;
+
+    @TableField(value = "user_id")
+    private String userId;
+    /**
+     * 消息内容
+     */
+    @TableField(value = "chat_content")
+    private String chatContent;
+    /**
+     * 消息状态消息状态（0-未读，1-已读)
+     */
+    @TableField(value = "chat_status")
+    private String chatStatus;
+
+    /**
+     * 状态(0：删除 1：正常)
+     */
+    @TableField(value = "status")
+    private String status;
+}

pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsFeedbackPO.java

@@ -0,0 +1,60 @@
+package com.njcn.algorithm.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 lombok.Data;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/6  11:39【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+/**
+    * 信息反馈表
+    */
+@Data
+@TableName(value = "cs_feedback")
+public class CsFeedbackPO extends BaseEntity {
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
+    private String id;
+
+    /**
+     * 标题
+     */
+    @TableField(value = "title")
+    private String title;
+
+    /**
+     * 描述
+     */
+    @TableField(value = "description")
+    private String description;
+
+    /**
+     * 用户id
+     */
+    @TableField(value = "user_id")
+    private String userId;
+
+    /**
+     * 问题类型(字典数据)
+     */
+    @TableField(value = "type")
+    private String type;
+
+    /**
+     * 问题状态(字典数据)
+     */
+    @TableField(value = "status")
+    private String status;
+}

pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsFilePathPO.java

@@ -0,0 +1,43 @@
+package com.njcn.algorithm.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/6  11:40【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+/**
+    * 文件路径表
+    */
+@Data
+@TableName(value = "cs_file_path")
+public class CsFilePathPO {
+    /**
+     * 关联数据id
+     */
+    @TableField(value = "id")
+    private String id;
+    /**
+     * 文件名
+     */
+    @TableField(value = "file_name")
+    private String fileName;
+    /**
+     * 文件路径
+     */
+    @TableField(value = "file_path")
+    private String filePath;
+
+    /**
+     * 状态(0：删除 1：正常)
+     */
+    @TableField(value = "status")
+    private String status;
+}

pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/AppBaseInformationVO.java

@@ -0,0 +1,41 @@
+package com.njcn.algorithm.pojo.vo;
+
+import com.njcn.db.bo.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/3  19:17【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+/**
+    * app基础信息表
+    */
+@Data
+public class AppBaseInformationVO extends BaseEntity {
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    /**
+     * 内容
+     */
+    @ApiModelProperty(value = "内容")
+    private String content;
+
+    /**
+     * 类型(字典数据)
+     */
+    @ApiModelProperty(value = "类型")
+    private String type;
+
+
+}

pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/AppProjectVO.java

@@ -23,16 +23,15 @@ public class AppProjectVO {
      * 项目Id
      */
     private String id;
-    private String projectType;
     /**
      * 项目名称
      */
     private String name;
 
-    /**
+    private String engineeringId;
-     * 关联用户Id
+
-     */
+    private String engineeringName;
-    private String userId;
+
     /**
      * 用户名称
      */

pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/AppTopologyDiagramVO.java

@@ -31,11 +31,7 @@ public class AppTopologyDiagramVO extends BaseEntity {
     @ApiModelProperty(value = "拓扑图名称")
     private String name;
 
-    /**
+
-     * 文件大小(kb)
-     */
-    @ApiModelProperty(value = "文件大小")
-    private Integer fileSize;
 
     /**
      * 项目Id

pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsFeedbackDetailVO.java

@@ -0,0 +1,74 @@
+package com.njcn.algorithm.pojo.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.njcn.algorithm.pojo.po.CsFeedbackChatPO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/6  11:39【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+/**
+    * 信息反馈列表
+    */
+@Data
+public class CsFeedbackDetailVO {
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    /**
+     * 标题
+     */
+    @ApiModelProperty(value = "标题")
+    private String title;
+
+    /**
+     * 描述
+     */
+    @ApiModelProperty(value = "描述")
+    private String description;
+
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value = "用户id")
+    private String userId;
+
+    /**
+     * 问题类型(字典数据)
+     */
+    @ApiModelProperty(value = "问题类型")
+    private String type;
+
+    /**
+     * 问题状态(字典数据)
+     */
+    @ApiModelProperty(value = "问题状态")
+    private String status;
+
+
+
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+    private List<String> imageUrls;
+
+    private List<CsFeedbackChatPO>  csFeedbackChatPOList;
+
+
+
+}

pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsFeedbackVO.java

@@ -0,0 +1,68 @@
+package com.njcn.algorithm.pojo.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/6  11:39【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+/**
+    * 信息反馈列表
+    */
+@Data
+public class CsFeedbackVO  {
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    /**
+     * 标题
+     */
+    @ApiModelProperty(value = "标题")
+    private String title;
+
+    /**
+     * 描述
+     */
+    @ApiModelProperty(value = "描述")
+    private String description;
+
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value = "用户id")
+    private String userId;
+
+    /**
+     * 问题类型(字典数据)
+     */
+    @ApiModelProperty(value = "问题类型")
+    private String type;
+
+    /**
+     * 问题状态(字典数据)
+     */
+    @ApiModelProperty(value = "问题状态")
+    private String status;
+
+
+    @ApiModelProperty(value = "未读消息条数")
+    private int chatCount;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+
+}

pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/feedback/FeedBackChatController.java

@@ -0,0 +1,65 @@
+package com.njcn.algorithm.controller.feedback;
+
+import com.njcn.algorithm.pojo.param.CsFeedbackChatAddParm;
+import com.njcn.algorithm.pojo.param.CsFeedbackChatCheckParm;
+import com.njcn.algorithm.service.CsFeedbackChatService;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+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 lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/3/27  10:54【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/feedbackChat")
+@Api(tags = "问题反馈聊天")
+@AllArgsConstructor
+public class FeedBackChatController extends BaseController {
+
+
+    private final CsFeedbackChatService csFeedbackChatService;
+
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/AddFeedbackChat")
+    @ApiOperation("新增反馈聊天")
+    @ApiImplicitParam(name = "csFeedbackAddParm", value = "新增反馈聊天参数", required = true)
+    public HttpResult<Boolean> AddFeedbackChat(@RequestBody @Validated CsFeedbackChatAddParm csFeedbackAddParm){
+        String methodDescribe = getMethodDescribe("AddFeedbackChat");
+
+        Boolean flag = csFeedbackChatService.AddFeedbackChat(csFeedbackAddParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+
+    }
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/updateChatStatus")
+    @ApiOperation("更新反馈聊天状态")
+    @ApiImplicitParam(name = "CsFeedbackChatCheckParm", value = "新增反馈聊天参数", required = true)
+    public HttpResult<Boolean> updateChatStatus(@RequestBody@Validated CsFeedbackChatCheckParm CsFeedbackChatCheckParm){
+        String methodDescribe = getMethodDescribe("updateChatStatus");
+
+        Boolean flag = csFeedbackChatService.updateChatStatus(CsFeedbackChatCheckParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+
+    }
+
+}

pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/feedback/FeedBackController.java

@@ -0,0 +1,73 @@
+package com.njcn.algorithm.controller.feedback;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.njcn.algorithm.pojo.param.CsFeedbackAddParm;
+import com.njcn.algorithm.pojo.param.CsFeedbackQueryParm;
+import com.njcn.algorithm.pojo.vo.CsFeedbackDetailVO;
+import com.njcn.algorithm.pojo.vo.CsFeedbackVO;
+import com.njcn.algorithm.service.CsFeedbackService;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+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 lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/3/27  10:54【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/feedback")
+@Api(tags = "问题反馈")
+@AllArgsConstructor
+public class FeedBackController extends BaseController {
+
+
+    private final CsFeedbackService csFeedbackService;
+
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/addFeedBack")
+    @ApiOperation("新增反馈")
+    public HttpResult<Boolean> addFeedBack(@Validated CsFeedbackAddParm csFeedbackAddParm){
+        String methodDescribe = getMethodDescribe("addFeedBack");
+
+        Boolean flag = csFeedbackService.addFeedBack(csFeedbackAddParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryFeedBackPage")
+    @ApiOperation("查询反馈列表")
+    @ApiImplicitParam(name = "csFeedbackQueryParm", value = "新增反馈聊天参数", required = true)
+    public HttpResult<IPage<CsFeedbackVO>> queryFeedBackPage(@Validated @RequestBody CsFeedbackQueryParm csFeedbackQueryParm){
+        String methodDescribe = getMethodDescribe("queryFeedBackPage");
+
+        IPage<CsFeedbackVO> csFeedbackVOIPage  = csFeedbackService.queryFeedBackPage(csFeedbackQueryParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, csFeedbackVOIPage, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryFeedBackDetail")
+    @ApiOperation("查询反馈详情")
+    public HttpResult<CsFeedbackDetailVO> queryFeedBackDetail(@RequestParam("id")String id){
+        String methodDescribe = getMethodDescribe("queryFeedBackDetail");
+
+        CsFeedbackDetailVO csFeedbackDetailVO  = csFeedbackService.queryFeedBackDetail(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, csFeedbackDetailVO, methodDescribe);
+    }
+
+}

pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/AppInfoController.java

@@ -0,0 +1,92 @@
+package com.njcn.algorithm.controller.project;
+
+import com.njcn.algorithm.pojo.param.AppBaseInformationAddParm;
+import com.njcn.algorithm.pojo.param.AppPersonSetAddParm;
+import com.njcn.algorithm.pojo.po.AppBaseInformationPO;
+import com.njcn.algorithm.pojo.po.AppPersonSetPO;
+import com.njcn.algorithm.pojo.vo.AppBaseInformationVO;
+import com.njcn.algorithm.service.AppBaseInformationService;
+import com.njcn.algorithm.service.AppPersonSetService;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+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 lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/4  9:02【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/appinfo")
+@Api(tags = "app信息")
+@AllArgsConstructor
+public class AppInfoController  extends BaseController {
+
+    private final AppBaseInformationService appBaseInformationService;
+    private final AppPersonSetService appPersonSetService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/addAppInfo")
+    @ApiOperation("新增app基础信息")
+    @ApiImplicitParam(name = "AppBaseInformationAddParm", value = "新增app基础信息参数", required = true)
+    public HttpResult<Boolean> addAppInfo(@RequestBody @Validated AppBaseInformationAddParm AppBaseInformationAddParm){
+        String methodDescribe = getMethodDescribe("addAppInfo");
+        AppBaseInformationPO appBaseInformationPO = new AppBaseInformationPO ();
+        BeanUtils.copyProperties (AppBaseInformationAddParm, appBaseInformationPO);
+        boolean save = appBaseInformationService.save (appBaseInformationPO);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, save, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/addPersonSet")
+    @ApiOperation("新增app个人中心信息")
+    @ApiImplicitParam(name = "appPersonSetAddParm", value = "新增apppp个人中心信参数", required = true)
+    public HttpResult<Boolean> addPersonSet(@RequestBody @Validated AppPersonSetAddParm appPersonSetAddParm){
+        String methodDescribe = getMethodDescribe("addPersonSet");
+        AppPersonSetPO appPersonSetPO = new AppPersonSetPO ();
+        BeanUtils.copyProperties (appPersonSetAddParm, appPersonSetPO);
+        appPersonSetPO.setStatus ("1");
+        boolean save = appPersonSetService.save (appPersonSetPO);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, save, methodDescribe);
+    }
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryPersonSet")
+    @ApiOperation("查询app个人中心信息")
+    public HttpResult<AppPersonSetPO> queryPersonSet(){
+        String methodDescribe = getMethodDescribe("queryPersonSet");
+
+        List<AppPersonSetPO> list = appPersonSetService.list ( );
+        AppPersonSetPO appPersonSetPO = list.stream ( ).filter (temp -> Objects.equals ("1", temp.getStatus ( ))).collect (Collectors.toList ( )).get (0);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, appPersonSetPO, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryAppInfo")
+    @ApiOperation("查询app个人中心信息详情")
+    public HttpResult<AppBaseInformationVO> queryPersonSet(@RequestParam("id")String id ){
+        String methodDescribe = getMethodDescribe("queryPersonSet");
+        AppBaseInformationVO appBaseInformationVO = new AppBaseInformationVO();
+        AppBaseInformationPO byId = appBaseInformationService.getById (id);
+        BeanUtils.copyProperties (byId,appBaseInformationVO);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, appBaseInformationVO, methodDescribe);
+    }
+}

pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppBaseInformationMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.algorithm.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.algorithm.pojo.po.AppBaseInformationPO;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/3  19:17【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface AppBaseInformationMapper extends BaseMapper<AppBaseInformationPO> {
+}

pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppPersonSetMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.algorithm.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.algorithm.pojo.po.AppPersonSetPO;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/3  19:17【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface AppPersonSetMapper extends BaseMapper<AppPersonSetPO> {
+}

pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppProjectMapper.java

@@ -23,12 +23,12 @@ public interface AppProjectMapper extends MppBaseMapper<AppProjectPO> {
             "SELECT\n" +
             "\ta.id id,\n" +
             "\ta.`name` name,\n" +
-            "\ta.user_id user_id,\n" +
+//            "\ta.user_id user_id,\n" +
-            "\t\"username\" user_name,\n" +
+//            "\t\"username\" user_name,\n" +
             "\ta.area area,\n" +
 //            "\tb.file_path topologyDiagramPath,\n" +
-            "\ta.lng lng,\n" +
+//            "\ta.lng lng,\n" +
-            "\ta.lat lat,\n" +
+//            "\ta.lat lat,\n" +
             "\ta.`status` STATUS,\n" +
             "\ta.create_by create_by,\n" +
             "\ta.create_time create_time,\n" +

pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsEdDataMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.algorithm.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.algorithm.pojo.po.CsEdDataPO;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/3  19:12【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface CsEdDataMapper extends BaseMapper<CsEdDataPO> {
+}

pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsFeedbackChatMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.algorithm.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.algorithm.pojo.po.CsFeedbackChatPO;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/6  15:28【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface CsFeedbackChatMapper extends BaseMapper<CsFeedbackChatPO> {
+}

pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsFeedbackMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.algorithm.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.algorithm.pojo.po.CsFeedbackPO;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/6  11:39【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface CsFeedbackMapper extends BaseMapper<CsFeedbackPO> {
+}

pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsFilePathMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.algorithm.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.algorithm.pojo.po.CsFilePathPO;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/6  11:40【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface CsFilePathMapper extends BaseMapper<CsFilePathPO> {
+}

pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppBaseInformationMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.algorithm.mapper.AppBaseInformationMapper">
+  <resultMap id="BaseResultMap" type="com.njcn.algorithm.pojo.po.AppBaseInformationPO">
+    <!--@mbg.generated-->
+    <!--@Table app_base_information-->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="content" jdbcType="LONGVARCHAR" property="content" />
+    <result column="type" jdbcType="VARCHAR" property="type" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, content, `type`, create_by, create_time, update_by, update_time
+  </sql>
+</mapper>

pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppPersonSetMapper.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.algorithm.mapper.AppPersonSetMapper">
+  <resultMap id="BaseResultMap" type="com.njcn.algorithm.pojo.po.AppPersonSetPO">
+    <!--@mbg.generated-->
+    <!--@Table app_person_set-->
+    <result column="id" jdbcType="VARCHAR" property="id" />
+    <result column="user_agreement" jdbcType="TINYINT" property="userAgreement" />
+    <result column="system_introduction" jdbcType="TINYINT" property="systemIntroduction" />
+    <result column="user_manual" jdbcType="TINYINT" property="userManual" />
+    <result column="data_base" jdbcType="TINYINT" property="dataBase" />
+    <result column="company_profile" jdbcType="TINYINT" property="companyProfile" />
+    <result column="about_us" jdbcType="TINYINT" property="aboutUs" />
+    <result column="status" jdbcType="BOOLEAN" property="status" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, user_agreement, system_introduction, user_manual, data_base, company_profile, 
+    about_us, `status`, create_by, create_time, update_by, update_time
+  </sql>
+</mapper>

pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsEdDataMapper.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.algorithm.mapper.CsEdDataMapper">
+  <resultMap id="BaseResultMap" type="com.njcn.algorithm.pojo.po.CsEdDataPO">
+    <!--@mbg.generated-->
+    <!--@Table cs_ed_data-->
+    <result column="id" jdbcType="VARCHAR" property="id" />
+    <result column="dev_type" jdbcType="VARCHAR" property="devType" />
+    <result column="version_no" jdbcType="VARCHAR" property="versionNo" />
+    <result column="version_agree" jdbcType="VARCHAR" property="versionAgree" />
+    <result column="version_date" jdbcType="TIMESTAMP" property="versionDate" />
+    <result column="describe" jdbcType="VARCHAR" property="describe" />
+    <result column="version_type" jdbcType="VARCHAR" property="versionType" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="file_path" jdbcType="VARCHAR" property="filePath" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, dev_type, version_no, version_agree, version_date, `describe`, version_type, 
+    `status`, file_path, create_by, create_time, update_by, update_time
+  </sql>
+</mapper>

pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsEquipmentDeliveryMapper.xml

@@ -34,7 +34,6 @@
         SELECT
         a.id projectId,
         a.name projectName,
-        a.project_type projectType,
         b.id equipmentId,
         b.name equipmentName
         FROM cs_project a,

pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsFeedbackChatMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.algorithm.mapper.CsFeedbackChatMapper">
+  <resultMap id="BaseResultMap" type="com.njcn.algorithm.pojo.po.CsFeedbackChatPO">
+    <!--@mbg.generated-->
+    <!--@Table cs_feedback_chat-->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="user_id" jdbcType="VARCHAR" property="userId" />
+    <result column="chat_content" jdbcType="VARCHAR" property="chatContent" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, user_id, chat_content, create_by, create_time, update_by, update_time
+  </sql>
+</mapper>

pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsFeedbackMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.algorithm.mapper.CsFeedbackMapper">
+  <resultMap id="BaseResultMap" type="com.njcn.algorithm.pojo.po.CsFeedbackPO">
+    <!--@mbg.generated-->
+    <!--@Table cs_feedback-->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="title" jdbcType="VARCHAR" property="title" />
+    <result column="describe" jdbcType="VARCHAR" property="describe" />
+    <result column="user_id" jdbcType="VARCHAR" property="userId" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="type" jdbcType="VARCHAR" property="type" />
+    <result column="status" jdbcType="VARCHAR" property="status" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, title, `describe`, user_id, create_by, create_time, update_by, update_time, `type`, 
+    `status`
+  </sql>
+</mapper>

pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsFilePathMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.algorithm.mapper.CsFilePathMapper">
+  <resultMap id="BaseResultMap" type="com.njcn.algorithm.pojo.po.CsFilePathPO">
+    <!--@mbg.generated-->
+    <!--@Table cs_file_path-->
+    <result column="id" jdbcType="VARCHAR" property="id" />
+    <result column="file_path" jdbcType="VARCHAR" property="filePath" />
+    <result column="status" jdbcType="BOOLEAN" property="status" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, file_path, `status`
+  </sql>
+</mapper>

pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppBaseInformationService.java

@@ -0,0 +1,17 @@
+package com.njcn.algorithm.service;
+
+import com.njcn.algorithm.pojo.po.AppBaseInformationPO;
+import com.baomidou.mybatisplus.extension.service.IService;
+    /**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/3  19:17【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface AppBaseInformationService extends IService<AppBaseInformationPO>{
+
+
+}

pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppPersonSetService.java

@@ -0,0 +1,17 @@
+package com.njcn.algorithm.service;
+
+import com.njcn.algorithm.pojo.po.AppPersonSetPO;
+import com.baomidou.mybatisplus.extension.service.IService;
+    /**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/3  19:17【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface AppPersonSetService extends IService<AppPersonSetPO>{
+
+
+}

pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsEdDataService.java

@@ -0,0 +1,17 @@
+package com.njcn.algorithm.service;
+
+import com.njcn.algorithm.pojo.po.CsEdDataPO;
+import com.baomidou.mybatisplus.extension.service.IService;
+    /**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/3  19:12【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface CsEdDataService extends IService<CsEdDataPO>{
+
+
+}

pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsFeedbackChatService.java

@@ -0,0 +1,28 @@
+package com.njcn.algorithm.service;
+
+import com.njcn.algorithm.pojo.param.CsFeedbackChatAddParm;
+import com.njcn.algorithm.pojo.param.CsFeedbackChatCheckParm;
+import com.njcn.algorithm.pojo.po.CsFeedbackChatPO;
+import com.baomidou.mybatisplus.extension.service.IService;
+    /**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/6  15:28【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface CsFeedbackChatService extends IService<CsFeedbackChatPO>{
+
+        /** 
+        * @Description: AddFeedbackChat
+        * @Param: [csFeedbackAddParm] 
+        * @return: java.lang.Boolean 
+        * @Author: clam
+        * @Date: 2023/4/6 
+        */ 
+        Boolean AddFeedbackChat(CsFeedbackChatAddParm csFeedbackAddParm);
+
+        Boolean updateChatStatus(CsFeedbackChatCheckParm csFeedbackChatCheckParm);
+    }

pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsFeedbackService.java

@@ -0,0 +1,46 @@
+package com.njcn.algorithm.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.njcn.algorithm.pojo.param.CsFeedbackAddParm;
+import com.njcn.algorithm.pojo.param.CsFeedbackQueryParm;
+import com.njcn.algorithm.pojo.po.CsFeedbackPO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.algorithm.pojo.vo.CsFeedbackDetailVO;
+import com.njcn.algorithm.pojo.vo.CsFeedbackVO;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/6  11:39【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface CsFeedbackService extends IService<CsFeedbackPO>{
+
+        /** 
+        * @Description: 新增反馈 
+        * @Param: [csFeedbackAddParm]
+        * @return: java.lang.Boolean 
+        * @Author: clam
+        * @Date: 2023/4/6 
+        */ 
+        Boolean addFeedBack(CsFeedbackAddParm csFeedbackAddParm);
+        /** 
+        * @Description: queryFeedBackPage 
+        * @Param: [csFeedbackQueryParm] 
+        * @return: com.baomidou.mybatisplus.core.metadata.IPage<com.njcn.algorithm.pojo.vo.CsFeedbackVO> 
+        * @Author: clam
+        * @Date: 2023/4/6 
+        */ 
+        IPage<CsFeedbackVO> queryFeedBackPage(CsFeedbackQueryParm csFeedbackQueryParm);
+    /** 
+    * @Description: queryFeedBackDetail 
+    * @Param: [id] 
+    * @return: com.njcn.algorithm.pojo.vo.CsFeedbackDetailVO 
+    * @Author: clam
+    * @Date: 2023/4/7 
+    */ 
+    CsFeedbackDetailVO queryFeedBackDetail(String id);
+}

pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsFilePathService.java

@@ -0,0 +1,17 @@
+package com.njcn.algorithm.service;
+
+import com.njcn.algorithm.pojo.po.CsFilePathPO;
+import com.baomidou.mybatisplus.extension.service.IService;
+    /**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/6  11:40【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface CsFilePathService extends IService<CsFilePathPO>{
+
+
+}

pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppBaseInformationServiceImpl.java

@@ -0,0 +1,22 @@
+package com.njcn.algorithm.service.impl;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.algorithm.pojo.po.AppBaseInformationPO;
+import com.njcn.algorithm.mapper.AppBaseInformationMapper;
+import com.njcn.algorithm.service.AppBaseInformationService;
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/3  19:17【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Service
+public class AppBaseInformationServiceImpl extends ServiceImpl<AppBaseInformationMapper, AppBaseInformationPO> implements AppBaseInformationService{
+
+}

pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppPersonSetServiceImpl.java

@@ -0,0 +1,22 @@
+package com.njcn.algorithm.service.impl;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.algorithm.mapper.AppPersonSetMapper;
+import com.njcn.algorithm.pojo.po.AppPersonSetPO;
+import com.njcn.algorithm.service.AppPersonSetService;
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/3  19:17【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Service
+public class AppPersonSetServiceImpl extends ServiceImpl<AppPersonSetMapper, AppPersonSetPO> implements AppPersonSetService{
+
+}

pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppProjectServiceImpl.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
-import com.njcn.algorithm.enums.AlgorithmResponseEnum;
 import com.njcn.algorithm.mapper.AppProjectMapper;
 import com.njcn.algorithm.pojo.param.*;
 import com.njcn.algorithm.pojo.po.AppProjectPO;
@@ -13,7 +12,6 @@ import com.njcn.algorithm.pojo.vo.AppProjectVO;
 import com.njcn.algorithm.pojo.vo.AppTopologyDiagramVO;
 import com.njcn.algorithm.service.AppProjectService;
 import com.njcn.algorithm.service.AppTopologyDiagramService;
-import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.oss.utils.FileStorageUtil;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang.StringUtils;
@@ -45,10 +43,10 @@ public class AppProjectServiceImpl extends MppServiceImpl<AppProjectMapper, AppP
     @Transactional(rollbackFor = Exception.class)
     public Boolean addAppProject(AppProjectAddParm appProjectAddOrAuditParm) {
         AppProjectPO appProjectPO = new AppProjectPO ( );
-        Boolean result = checkName (appProjectAddOrAuditParm.getUserId ( ), appProjectAddOrAuditParm.getName ( ));
+//        Boolean result = checkName (appProjectAddOrAuditParm.getUserId ( ), appProjectAddOrAuditParm.getName ( ));
-        if (result) {
+//        if (result) {
-            throw new BusinessException (AlgorithmResponseEnum.PROJECT_COMMON_ERROR);
+//            throw new BusinessException (AlgorithmResponseEnum.PROJECT_COMMON_ERROR);
-        }
+//        }
         BeanUtils.copyProperties (appProjectAddOrAuditParm, appProjectPO);
         appProjectPO.setStatus ("1");
         boolean save = this.save (appProjectPO);
@@ -81,23 +79,23 @@ public class AppProjectServiceImpl extends MppServiceImpl<AppProjectMapper, AppP
         QueryWrapper<AppProjectPO> queryWrapper = new QueryWrapper ( );
         queryWrapper.eq ("id", appProjectAuditParm.getId ( ));
         AppProjectPO appProjectPO1 = appProjectMapper.selectOne (queryWrapper);
-        if (appProjectAuditParm.getUserId ( ) != null || appProjectAuditParm.getName ( ) != null) {
+//        if (appProjectAuditParm.getUserId ( ) != null || appProjectAuditParm.getName ( ) != null) {
-            Boolean result = checkName (appProjectAuditParm.getUserId ( ) != null ? appProjectAuditParm.getUserId ( ) : appProjectPO1.getUserId ( ),
+//            Boolean result = checkName (appProjectAuditParm.getUserId ( ) != null ? appProjectAuditParm.getUserId ( ) : appProjectPO1.getUserId ( ),
-                    appProjectAuditParm.getName ( ) != null ? appProjectAuditParm.getName ( ) : appProjectPO1.getName ( ));
+//                    appProjectAuditParm.getName ( ) != null ? appProjectAuditParm.getName ( ) : appProjectPO1.getName ( ));
-            if (result) {
+//            if (result) {
-                throw new BusinessException (AlgorithmResponseEnum.PROJECT_COMMON_ERROR);
+//                throw new BusinessException (AlgorithmResponseEnum.PROJECT_COMMON_ERROR);
-            }
+//            }
-        }
+//        }
 
         BeanUtils.copyProperties (appProjectAuditParm, appProjectPO);
         UpdateWrapper<AppProjectPO> updateWrapper = new UpdateWrapper ( );
         updateWrapper.eq ("id", appProjectAuditParm.getId ( ));
 
         int i = appProjectMapper.update (appProjectPO, updateWrapper);
-        Boolean result = checkName (appProjectPO.getUserId ( ), appProjectPO.getName ( ));
+//        Boolean result = checkName (appProjectPO.getUserId ( ), appProjectPO.getName ( ));
-        if (result) {
+//        if (result) {
-            throw new BusinessException (AlgorithmResponseEnum.PROJECT_COMMON_ERROR);
+//            throw new BusinessException (AlgorithmResponseEnum.PROJECT_COMMON_ERROR);
-        }
+//        }
         return i == 1 ? true : false;
     }
 

pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppTopologyDiagramServiceImpl.java

@@ -49,12 +49,10 @@ public class AppTopologyDiagramServiceImpl extends MppServiceImpl<AppTopologyDia
         AppTopologyDiagramPO appTopologyDiagramPO = new AppTopologyDiagramPO();
 
         MultipartFile file = appTopologyDiagramAddParm.getFile ( );
-        long size = file.getSize ( );
         String filePath = fileStorageUtil.uploadMultipart (file, OssPath.TOPOLOGY);
         appTopologyDiagramPO.setFilePath (filePath);
         appTopologyDiagramPO.setProjectId (appTopologyDiagramAddParm.getProjectId ()==null?"":appTopologyDiagramAddParm.getProjectId ());
         appTopologyDiagramPO.setName (appTopologyDiagramAddParm.getTopologyDiagramName ());
-        appTopologyDiagramPO.setFileSize (Integer.valueOf (size+""));
         appTopologyDiagramPO.setStatus ("1");
         boolean save = this.save (appTopologyDiagramPO);
         return save;
@@ -68,7 +66,6 @@ public class AppTopologyDiagramServiceImpl extends MppServiceImpl<AppTopologyDia
             long size = file.getSize ( );
             String filePath = fileStorageUtil.uploadMultipart (file, OssPath.TOPOLOGY);
             appTopologyDiagramPO.setFilePath (filePath);
-            appTopologyDiagramPO.setFileSize (Integer.valueOf (size+""));
         }
         if(appTopologyDiagramAuditParm.getProjectId ()!=null&&appTopologyDiagramAuditParm.getProjectId ()!=""){
             appTopologyDiagramPO.setProjectId (appTopologyDiagramAuditParm.getProjectId ());

pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsEdDataServiceImpl.java

@@ -0,0 +1,20 @@
+package com.njcn.algorithm.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.algorithm.mapper.CsEdDataMapper;
+import com.njcn.algorithm.pojo.po.CsEdDataPO;
+import com.njcn.algorithm.service.CsEdDataService;
+import org.springframework.stereotype.Service;
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/3  19:12【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Service
+public class CsEdDataServiceImpl extends ServiceImpl<CsEdDataMapper, CsEdDataPO> implements CsEdDataService{
+
+}

pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsFeedbackChatServiceImpl.java

@@ -0,0 +1,50 @@
+package com.njcn.algorithm.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.algorithm.mapper.CsFeedbackChatMapper;
+import com.njcn.algorithm.pojo.param.CsFeedbackChatAddParm;
+import com.njcn.algorithm.pojo.param.CsFeedbackChatCheckParm;
+import com.njcn.algorithm.pojo.po.CsFeedbackChatPO;
+import com.njcn.algorithm.service.CsFeedbackChatService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/6  15:28【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Service
+public class CsFeedbackChatServiceImpl extends ServiceImpl<CsFeedbackChatMapper, CsFeedbackChatPO> implements CsFeedbackChatService{
+
+    @Override
+    @Transactional(rollbackFor = {Exception.class})
+    public Boolean AddFeedbackChat(CsFeedbackChatAddParm csFeedbackAddParm) {
+        CsFeedbackChatPO csFeedbackChatPO = new CsFeedbackChatPO ();
+        BeanUtils.copyProperties (csFeedbackAddParm, csFeedbackChatPO);
+        csFeedbackChatPO.setChatStatus ("0");
+        csFeedbackChatPO.setStatus ("1");
+        boolean save = this.save (csFeedbackChatPO);
+        return save;
+    }
+
+    @Override
+    public Boolean updateChatStatus(CsFeedbackChatCheckParm csFeedbackChatCheckParm) {
+        UpdateWrapper<CsFeedbackChatPO> updateWrapper = new UpdateWrapper<> ();
+
+
+        updateWrapper.clear ();
+        updateWrapper.eq ("id",csFeedbackChatCheckParm.getId ()).
+                ne ("user_id",csFeedbackChatCheckParm.getUserId ()).
+                set ("chat_status","1").
+                eq ("status", "1");
+        boolean update = this.update (updateWrapper);
+        return update;
+    }
+}

pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsFeedbackServiceImpl.java

@@ -0,0 +1,112 @@
+package com.njcn.algorithm.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.algorithm.mapper.CsFeedbackMapper;
+import com.njcn.algorithm.pojo.param.CsFeedbackAddParm;
+import com.njcn.algorithm.pojo.param.CsFeedbackQueryParm;
+import com.njcn.algorithm.pojo.po.CsFeedbackChatPO;
+import com.njcn.algorithm.pojo.po.CsFeedbackPO;
+import com.njcn.algorithm.pojo.po.CsFilePathPO;
+import com.njcn.algorithm.pojo.vo.CsFeedbackDetailVO;
+import com.njcn.algorithm.pojo.vo.CsFeedbackVO;
+import com.njcn.algorithm.service.CsFeedbackChatService;
+import com.njcn.algorithm.service.CsFeedbackService;
+import com.njcn.algorithm.service.CsFilePathService;
+import com.njcn.oss.constant.OssPath;
+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.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/6  11:39【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Service
+@RequiredArgsConstructor
+public class CsFeedbackServiceImpl extends ServiceImpl<CsFeedbackMapper, CsFeedbackPO> implements CsFeedbackService{
+
+    private final FileStorageUtil fileStorageUtil;
+    private final CsFilePathService csFilePathService;
+    private final CsFeedbackChatService csFeedbackChatService;
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean addFeedBack(CsFeedbackAddParm csFeedbackAddParm) {
+        CsFeedbackPO csFeedbackPO = new CsFeedbackPO ();
+        BeanUtils.copyProperties (csFeedbackAddParm, csFeedbackPO);
+        csFeedbackPO.setStatus ("1");
+        boolean save = this.save (csFeedbackPO);
+        List<CsFilePathPO> csFilePathPOS= new ArrayList<> ();
+        for (int i = 0; i < csFeedbackAddParm.getFiles ( ).length; i++) {
+
+            CsFilePathPO csFilePathPO = new CsFilePathPO ( );
+            csFilePathPO.setId (csFeedbackPO.getId ());
+            String filePath = fileStorageUtil.uploadMultipart (csFeedbackAddParm.getFiles ( )[i], OssPath.FEEDBACK);
+            csFilePathPO.setFileName (csFeedbackAddParm.getFiles ( )[i].getOriginalFilename ( ));
+            csFilePathPO.setFilePath (filePath);
+            csFilePathPO.setStatus ("1");
+            csFilePathPOS.add (csFilePathPO);
+        }
+        boolean b = csFilePathService.saveBatch (csFilePathPOS);
+
+        return save&&b;
+    }
+
+    @Override
+    public IPage<CsFeedbackVO> queryFeedBackPage(CsFeedbackQueryParm csFeedbackQueryParm) {
+        Page<CsFeedbackPO> page = new Page<> (csFeedbackQueryParm.getCurrentPage ( ), csFeedbackQueryParm.getPageSize ( ));
+        Page<CsFeedbackVO> returnpage = new Page<> (csFeedbackQueryParm.getCurrentPage ( ), csFeedbackQueryParm.getPageSize ( ));
+
+        QueryWrapper<CsFeedbackPO> queryWrapper = new QueryWrapper<> ();
+        queryWrapper.eq ("user_id",csFeedbackQueryParm.getUserId ()).
+                eq (StringUtils.isNotBlank (csFeedbackQueryParm.getType ()),"type",csFeedbackQueryParm.getType ()).
+                eq (StringUtils.isNotBlank (csFeedbackQueryParm.getStatus ()),"status",csFeedbackQueryParm.getStatus ());
+        Page<CsFeedbackPO> csFeedbackPOPage = this.getBaseMapper ( ).selectPage (page, queryWrapper);
+        QueryWrapper<CsFeedbackChatPO> csFeedbackChatPOQueryWrapper = new QueryWrapper<> ();
+        List<CsFeedbackVO> collect = csFeedbackPOPage.getRecords ( ).stream ( ).map (temp -> {
+            CsFeedbackVO csFeedbackVO = new CsFeedbackVO ( );
+            BeanUtils.copyProperties (temp, csFeedbackVO);
+            csFeedbackChatPOQueryWrapper.clear ();
+            csFeedbackChatPOQueryWrapper.eq ("id",temp.getId ()).
+                    ne ("user_id",temp.getUserId ()).
+                    eq ("chat_status","0").
+                    eq ("status", "1");
+            int count = csFeedbackChatService.count ( );
+            csFeedbackVO.setChatCount (count);
+            return csFeedbackVO;
+        }).collect (Collectors.toList ( ));
+        returnpage.setRecords (collect);
+        return returnpage;
+    }
+
+    @Override
+    public CsFeedbackDetailVO queryFeedBackDetail(String id) {
+        CsFeedbackDetailVO csFeedbackDetailVO = new CsFeedbackDetailVO();
+        CsFeedbackPO byId = this.getById (id);
+        BeanUtils.copyProperties (byId, csFeedbackDetailVO);
+        QueryWrapper<CsFilePathPO> queryWrapper = new QueryWrapper();
+        queryWrapper.eq ("id", id).eq ("status", "1");
+        List<CsFilePathPO> list = csFilePathService.list (queryWrapper);
+        List<String> collect = list.stream ( ).map (CsFilePathPO::getFilePath).collect (Collectors.toList ( ));
+        csFeedbackDetailVO.setImageUrls (collect);
+        QueryWrapper<CsFeedbackChatPO> csFeedbackChatPOQueryWrapper = new QueryWrapper();
+        csFeedbackChatPOQueryWrapper.eq ("id", id).eq ("status", "1").orderByAsc ("create_time");
+        List<CsFeedbackChatPO> list1 = csFeedbackChatService.list (csFeedbackChatPOQueryWrapper);
+        csFeedbackDetailVO.setCsFeedbackChatPOList (list1);
+        return csFeedbackDetailVO;
+    }
+}

pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsFilePathServiceImpl.java

@@ -0,0 +1,20 @@
+package com.njcn.algorithm.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.algorithm.mapper.CsFilePathMapper;
+import com.njcn.algorithm.pojo.po.CsFilePathPO;
+import com.njcn.algorithm.service.CsFilePathService;
+import org.springframework.stereotype.Service;
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/6  11:40【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Service
+public class CsFilePathServiceImpl extends ServiceImpl<CsFilePathMapper, CsFilePathPO> implements CsFilePathService{
+
+}

pqs-common/common-oss/src/main/java/com/njcn/oss/constant/OssPath.java

@@ -52,4 +52,9 @@ public interface OssPath {
      * app拓扑图文件
      */
     String TOPOLOGY = "topology/";
+
+    /***
+     * app反馈图片
+     */
+    String FEEDBACK = "feedBack/";
 }

pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimit.java

@@ -342,8 +342,9 @@ public class COverlimit {
 
     //处理基准容量
     public static float getStandShortCap(String voltageLevel){
-
+        if(DicDataEnum.KV01.getCode().equalsIgnoreCase(voltageLevel)){
-        if(DicDataEnum.KV038.getCode().equalsIgnoreCase(voltageLevel)){
+            return 10;
+        } else if(DicDataEnum.KV038.getCode().equalsIgnoreCase(voltageLevel)){
             return 10;
         }else if(DicDataEnum.V380.getCode().equalsIgnoreCase(voltageLevel)){
             return 10;

pqs-device/device-boot/src/main/resources/bootstrap.yml

@@ -9,6 +9,7 @@ microservice:
     url: @gateway.url@
 server:
   port: 10202
+  max-http-header-size: 1048576
 #feign接口开启服务熔断降级处理
 feign:
   sentinel:

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingIndexY.java

@@ -7,10 +7,10 @@ import java.util.Date;
 
 /**
  * 配网运行指标统计-年表,配网监测指标数据质量统计-年表
- * @TableName r_dn_operating_y
+ * @TableName r_dn_operating_index_y
  */
 @Data
-public class RDnOperatingY implements Serializable {
+public class RDnOperatingIndexY implements Serializable {
     /**
      * 单位ID
      */

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/RDnOperatingYMapper.java

@@ -1,7 +1,7 @@
 package com.njcn.device.pms.mapper.distribution;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.device.pms.pojo.po.RDnOperatingY;
+import com.njcn.device.pms.pojo.po.RDnOperatingIndexY;
 import com.njcn.device.pms.pojo.vo.PwRDnOperatingIndexCommonVO;
 
 import java.util.List;
@@ -9,11 +9,11 @@ import java.util.Map;
 
 /**
 * @author jianghf
-* @description 针对表【r_dn_operating_y(配网运行指标统计-年表,配网监测指标数据质量统计-年表)】的数据库操作Mapper
+* @description 针对表【r_dn_operating_index_y(配网运行指标统计-年表,配网监测指标数据质量统计-年表)】的数据库操作Mapper
 * @createDate 2022-11-10 10:21:46
 * @Entity com.njcn.device.pms.pojo.po.RDnOperatingY
 */
-public interface RDnOperatingYMapper extends BaseMapper<RDnOperatingY> {
+public interface RDnOperatingYMapper extends BaseMapper<RDnOperatingIndexY> {
 
     List<PwRDnOperatingIndexCommonVO> getOperatingList(Map<String, Object> condMap);
 }

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwROperatingIndexMapper.xml

@@ -35,7 +35,7 @@
             TRUNCATE ( sum( index_integrity_rate ) / count( index_integrity_rate ), 2 ) iir,
             is_unusual
             FROM
-            r_dn_operating_y t
+            r_dn_operating_index_y t
             <where>
                 t.org_no IN
                 <foreach collection="deptIdList" item="item" open="(" close=")" separator=",">
@@ -61,7 +61,7 @@
             TRUNCATE ( sum( index_integrity_rate ) / count( index_integrity_rate ), 2 ) iir,
             is_unusual
             FROM
-            r_dn_operating_y t
+            r_dn_operating_index_y t
             <where>
                 t.org_no IN
                 <foreach collection="deptIdList" item="item" open="(" close=")" separator=",">
@@ -90,7 +90,7 @@
             TRUNCATE ( sum( index_integrity_rate ) / count( index_integrity_rate ), 2 ) iir,
             is_unusual
             FROM
-            r_dn_operating_y t
+            r_dn_operating_index_y t
             <where>
                 t.org_no IN
                 <foreach collection="deptIdList" item="item" open="(" close=")" separator=",">
@@ -153,7 +153,7 @@
         TRUNCATE ( sum( index_integrity_rate ) / count( index_integrity_rate ), 2 ) iir,
         is_unusual
         FROM
-        r_dn_operating_q t
+        r_dn_operating_index_q t
         <where>
             t.org_no IN
             <foreach collection="deptIdList" item="item" open="(" close=")" separator=",">
@@ -179,7 +179,7 @@
         TRUNCATE ( sum( index_integrity_rate ) / count( index_integrity_rate ), 2 ) iir,
         is_unusual
         FROM
-        r_dn_operating_q t
+        r_dn_operating_index_q t
         <where>
             t.org_no IN
             <foreach collection="deptIdList" item="item" open="(" close=")" separator=",">
@@ -208,7 +208,7 @@
         TRUNCATE ( sum( index_integrity_rate ) / count( index_integrity_rate ), 2 ) iir,
         is_unusual
         FROM
-        r_dn_operating_q t
+        r_dn_operating_index_q t
         <where>
             t.org_no IN
             <foreach collection="deptIdList" item="item" open="(" close=")" separator=",">

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/RDnOperatingYMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njcn.device.pms.mapper.distribution.RDnOperatingYMapper">
 
-    <resultMap id="BaseResultMap" type="com.njcn.device.pms.pojo.po.RDnOperatingY">
+    <resultMap id="BaseResultMap" type="com.njcn.device.pms.pojo.po.RDnOperatingIndexY">
             <id property="orgNo" column="org_no" jdbcType="VARCHAR"/>
             <id property="dataDate" column="data_date" jdbcType="DATE"/>
             <id property="measurementPointType" column="measurement_point_type" jdbcType="VARCHAR"/>
@@ -55,11 +55,11 @@
         -- 数据准确率
         truncate((rdim1.data_right_rate + rdim2.data_right_rate + rdim3.data_right_rate) / 3, 2) as dataRightRate
 
-        from r_dn_operating_y  rdim1
+        from r_dn_operating_index_y  rdim1
 
-        left join r_dn_operating_y  rdim2
+        left join r_dn_operating_index_y  rdim2
         on rdim1.org_no = rdim2.org_no
-        left join r_dn_operating_y rdim3
+        left join r_dn_operating_index_y rdim3
         on rdim1.org_no = rdim3.org_no
         where  1 = 1
         <if test="startTime != null and startTime != ''">

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/RDnOperatingYService.java

@@ -1,7 +1,7 @@
 package com.njcn.device.pms.service.distribution;
 
 import com.njcn.device.pms.pojo.param.PwRDnOperatingParam;
-import com.njcn.device.pms.pojo.po.RDnOperatingY;
+import com.njcn.device.pms.pojo.po.RDnOperatingIndexY;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.device.pms.pojo.vo.PwRDnOperatingIndexCommonVO;
 
@@ -9,10 +9,10 @@ import java.util.List;
 
 /**
 * @author jianghf
-* @description 针对表【r_dn_operating_y(配网运行指标统计-年表,配网监测指标数据质量统计-年表)】的数据库操作Service
+* @description 针对表【r_dn_operating_index_y(配网运行指标统计-年表,配网监测指标数据质量统计-年表)】的数据库操作Service
 * @createDate 2022-11-10 10:21:46
 */
-public interface RDnOperatingYService extends IService<RDnOperatingY> {
+public interface RDnOperatingYService extends IService<RDnOperatingIndexY> {
 
     List<PwRDnOperatingIndexCommonVO> getOperatingList(PwRDnOperatingParam pwRDnOperatingParam);
 }

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RDnOperatingYServiceImpl.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.device.pms.pojo.param.PwRDnOperatingParam;
-import com.njcn.device.pms.pojo.po.RDnOperatingY;
+import com.njcn.device.pms.pojo.po.RDnOperatingIndexY;
 import com.njcn.device.pms.pojo.vo.PwRDnOperatingIndexCommonVO;
 import com.njcn.device.pms.service.distribution.RDnOperatingYService;
 import com.njcn.device.pms.mapper.distribution.RDnOperatingYMapper;
@@ -13,7 +13,6 @@ import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataEnum;
 import com.njcn.user.api.DeptFeignClient;
 import com.njcn.user.pojo.dto.DeptDTO;
-import com.njcn.web.utils.WebUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -24,12 +23,12 @@ import java.util.stream.Collectors;
 
 /**
 * @author jianghf
-* @description 针对表【r_dn_operating_y(配网运行指标统计-年表,配网监测指标数据质量统计-年表)】的数据库操作Service实现
+* @description 针对表【r_dn_operating_index_y(配网运行指标统计-年表,配网监测指标数据质量统计-年表)】的数据库操作Service实现
 * @createDate 2022-11-10 10:21:46
 */
 @Service
 @RequiredArgsConstructor
-public class RDnOperatingYServiceImpl extends ServiceImpl<RDnOperatingYMapper, RDnOperatingY>
+public class RDnOperatingYServiceImpl extends ServiceImpl<RDnOperatingYMapper, RDnOperatingIndexY>
     implements RDnOperatingYService{
 
     private final DicDataFeignClient dicDataFeignClient;

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/GeneralDeviceInfoClient.java

@@ -24,7 +24,11 @@ import java.util.List;
  * @version 1.0.0
  * @date 2022年02月14日 14:02
  */
-@FeignClient(value = ServerInfo.DEVICE, path = "/deviceInfo", fallbackFactory = GeneralDeviceInfoClientFallbackFactory.class, contextId = "deviceInfo")
+@FeignClient(
+        value = ServerInfo.DEVICE,
+        path = "/deviceInfo",
+        fallbackFactory = GeneralDeviceInfoClientFallbackFactory.class,
+        contextId = "deviceInfo")
 public interface GeneralDeviceInfoClient {
 
 

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/LineFeignClient.java

@@ -22,7 +22,11 @@ import java.util.Map;
  * @author denghuajun
  * @date 2022/2/28
  */
-@FeignClient(value = ServerInfo.DEVICE, path = "/line", fallbackFactory = LineFeignClientFallbackFactory.class, contextId = "line")
+@FeignClient(
+        value = ServerInfo.DEVICE,
+        path = "/line",
+        fallbackFactory = LineFeignClientFallbackFactory.class,
+        contextId = "line")
 public interface LineFeignClient {
 
     /**
@@ -92,7 +96,7 @@ public interface LineFeignClient {
      * @return 结果
      */
     @PostMapping("getSubstationData")
-    HttpResult<List<SubstationDetailVO>> getSubstationData(@RequestParam("id") List<String> id);
+    HttpResult<List<SubstationDetailVO>> getSubstationData(@RequestBody List<String> id);
 
     /**
      * 根据变电站id获取子节数据
@@ -304,4 +308,7 @@ public interface LineFeignClient {
      */
     @PostMapping("/getOnIntegrityByIds")
     HttpResult<List<RStatIntegrityVO>> getOnIntegrityByIds(@RequestBody OnlineRateParam param);
+
+    @PostMapping("getOnIntegrityByIdsAndTime")
+    HttpResult<List<RStatIntegrityVO>> getOnIntegrityByIdsAndTime(@RequestBody LineBaseQueryParam param);
 }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/LineFeignClientFallbackFactory.java

@@ -224,10 +224,13 @@ public class LineFeignClientFallbackFactory implements FallbackFactory<LineFeign
             public HttpResult<List<RStatIntegrityVO>> getOnIntegrityByIds(OnlineRateParam param) {
                 log.error("{}异常，降级处理，异常为：{}", "获取监测点数据完整率（谐波专用）:  ", throwable.toString());
                 throw new BusinessException(finalExceptionEnum);
-
             }
 
-
+            @Override
+            public HttpResult<List<RStatIntegrityVO>> getOnIntegrityByIdsAndTime(LineBaseQueryParam param) {
+                log.error("{}异常，降级处理，异常为：{}", "获取监测点数据完整率:  ", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
         };
     }
 }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/LineBaseQueryParam.java

@@ -25,4 +25,10 @@ public class LineBaseQueryParam {
 
     @ApiModelProperty(name = "searchValue",value = "关键字搜索值")
     private String searchValue;
+
+    @ApiModelProperty(name = "startTime", value = "开始时间")
+    private String startTime;
+
+    @ApiModelProperty(name = "endTime", value = "结束时间")
+    private String endTime;
 }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/DevVersion.java

@@ -67,5 +67,8 @@ public class DevVersion extends BaseEntity {
      */
     private LocalDateTime updateTime;
 
+    private String devType;
+    private String devTypeName;
+
 
 }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Version.java

@@ -57,6 +57,8 @@ public class Version extends BaseEntity {
      */
     private byte[] file;
 
+    private String fileName;
+
     /**
      * 终端程序版本状态（0-停用 1-启用）
      */

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/AllDataVO.java

@@ -21,6 +21,18 @@ public class AllDataVO implements Serializable {
     @ApiModelProperty("部门名称")
     private String areaName;
 
+    /**
+     * 部门id
+     */
+    @ApiModelProperty("部门id")
+    private String index;
+
+    /**
+     * 监测点数量
+     */
+    @ApiModelProperty("监测点数量")
+    private Integer num;
+
     /**
      * 暂降事件次数
      */
@@ -62,4 +74,10 @@ public class AllDataVO implements Serializable {
      */
     @ApiModelProperty("中断")
     private String breakdown;
+
+    /**
+     * 综合评估
+     */
+    @ApiModelProperty("综合评估")
+    private String data;
 }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/VersionVO.java

@@ -77,6 +77,7 @@ public class VersionVO implements Serializable {
     @ApiModelProperty("终端程序版本状态（0-停用 1-启用）")
     private Integer versionFlag;
 
-
+    @ApiModelProperty("文件名称")
+    private String fileName;
 
 }

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/DeviceController.java

@@ -0,0 +1,28 @@
+package com.njcn.device.pq.controller;
+
+import com.njcn.device.pq.service.IDeviceService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * pqs
+ * 设备相关
+ * @author cdf
+ * @date 2023/4/4
+ */
+@Slf4j
+@Api(tags = "台账-设备相关")
+@RestController
+@RequestMapping("/dev")
+@RequiredArgsConstructor
+public class DeviceController extends BaseController {
+
+    private final IDeviceService iDeviceService;
+
+
+
+}

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/GeneralDeviceInfoController.java

@@ -6,12 +6,15 @@ import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.device.pq.mapper.RStatOnlinerateDMapper;
 import com.njcn.device.pq.pojo.bo.BaseLineInfo;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;
+import com.njcn.device.pq.pojo.param.OnlineRateParam;
 import com.njcn.device.pq.pojo.vo.DeptDeviceDetailVO;
 import com.njcn.device.pq.pojo.vo.DeptSubstationDetailVO;
 import com.njcn.device.pq.pojo.vo.ExceptionDeviceInfoVO;
+import com.njcn.device.pq.pojo.vo.RStatOnlinerateVO;
 import com.njcn.device.pq.service.TerminalBaseService;
 import com.njcn.device.pq.service.impl.GeneralDeviceService;
 import com.njcn.web.controller.BaseController;
@@ -48,6 +51,7 @@ public class GeneralDeviceInfoController extends BaseController {
 
     private final TerminalBaseService terminalBaseService;
 
+    private final RStatOnlinerateDMapper onlineRateMapper;
     /**
      * 获取按部门分类的实际运行终端综合信息
      */
@@ -266,4 +270,14 @@ public class GeneralDeviceInfoController extends BaseController {
 
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getOnlineRateByDevIds")
+    @ApiOperation("终端在线率（谐波专用）")
+    @ApiImplicitParam(name = "param", value = "参数实体", required = true)
+    public HttpResult<List<RStatOnlinerateVO>> getOnlineRateByDevIds(@RequestBody OnlineRateParam param) {
+        String methodDescribe = getMethodDescribe("getOnlineRateByDevIds");
+        List<RStatOnlinerateVO> onlineRateByDevIds = onlineRateMapper.getOnlineRateByDevIds(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,onlineRateByDevIds,methodDescribe);
+    }
+
 }

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineController.java

@@ -45,18 +45,15 @@ public class LineController extends BaseController {
 
     private final LineService lineService;
 
-    private final GeneralDeviceService generalDeviceService;
-
     private final DeviceMapper deviceMapper;
 
     private final LineMapper lineMapper;
 
     private final LineDetailMapper lineDetailMapper;
 
-    private final DeptFeignClient deptFeignClient;
-
     private final RStatIntegrityDMapper integrityDMapper;
 
+
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getLineDetailData")
     @ApiOperation("根据监测点id获取监测点详情")
@@ -81,7 +78,7 @@ public class LineController extends BaseController {
     @PostMapping("/getSubstationData")
     @ApiOperation("根据变电站id获取变电站详情")
     @ApiImplicitParam(name = "id", value = "监测点id", required = true)
-    public HttpResult<List<SubstationDetailVO>> getSubstationData(@RequestParam("id") List<String> id) {
+    public HttpResult<List<SubstationDetailVO>> getSubstationData(@RequestBody List<String> id) {
         String methodDescribe = getMethodDescribe("getSubstationData");
         List<SubstationDetailVO> result = lineService.getSubstationData(id);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
@@ -421,4 +418,14 @@ public class LineController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,onIntegrityByIds,methodDescribe);
     }
 
+
+    @PostMapping("/getOnIntegrityByIdsAndTime")
+    @ApiOperation("监测点数据完整率")
+    @ApiImplicitParam(name = "param", value = "参数实体", required = true)
+    public HttpResult<List<RStatIntegrityVO>> getOnIntegrityByIdsAndTime(@RequestBody LineBaseQueryParam param) {
+        String methodDescribe = getMethodDescribe("getOnIntegrityByIdsAndTime");
+        List<RStatIntegrityVO> onIntegrityByIds = integrityDMapper.getOnIntegrityByIdsAndTime (param.getLineIds(),param.getStartTime(),param.getEndTime());
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,onIntegrityByIds,methodDescribe);
+    }
+
 }

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ProgramVersionController.java

@@ -57,9 +57,10 @@ public class ProgramVersionController extends BaseController {
                                         @RequestParam("devType") String devType,
                                         @RequestParam("remark") String remark,
                                         @RequestParam(value = "versionType",required = false) String versionType,
+                                        @RequestParam("filename") String fileName,
                                         @ApiParam(value = "文件", required = true) @RequestPart("file") MultipartFile file) {
         String methodDescribe = getMethodDescribe("addProgramVersion");
-        boolean res = programService.addProgramVersion(name,protocol,date,devType,remark,versionType,file);
+        boolean res = programService.addProgramVersion(name,protocol,date,devType,remark,versionType,fileName,file);
         if (res) {
             return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
         } else {
@@ -91,9 +92,10 @@ public class ProgramVersionController extends BaseController {
                                            @RequestParam("devType") String devType,
                                            @RequestParam("remark") String remark,
                                            @RequestParam(value = "versionType",required = false) String versionType,
+                                           @RequestParam("filename") String fileName,
                                            @ApiParam(value = "文件", required = true) @RequestPart("file") MultipartFile file) {
         String methodDescribe = getMethodDescribe("updateProgramVersion");
-        boolean res = programService.updateProgramVersion(id,name,protocol,date,devType,remark,versionType,file);
+        boolean res = programService.updateProgramVersion(id,name,protocol,date,devType,remark,versionType,fileName,file);
         if (res) {
             return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
         } else {
@@ -105,9 +107,9 @@ public class ProgramVersionController extends BaseController {
     @PostMapping("/updateVersionFlag")
     @ApiOperation("修改程序版本状态")
     @ApiImplicitParam(name = "id", value = "终端版本id", required = true)
-    public HttpResult updateVersionFlag(@RequestParam("id") String id) {
+    public HttpResult updateVersionFlag(@RequestParam("id") String id, @RequestParam("versionFlag") Integer flag) {
         String methodDescribe = getMethodDescribe("updateVersionFlag");
-        boolean res = programService.updateVersionFlag(id);
+        boolean res = programService.updateVersionFlag(id,flag);
         if (res) {
             return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
         } else {

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/ProgramVersionMapper.java

@@ -2,6 +2,7 @@ package com.njcn.device.pq.mapper;
 
 import com.njcn.device.pq.pojo.vo.ShowVersionVO;
 import com.njcn.device.pq.pojo.vo.VersionVO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -23,7 +24,7 @@ public interface ProgramVersionMapper {
     /**
      * 修改程序版本状态
      */
-    void updateVersionFlag(String id);
+    void updateVersionFlag(Integer flag,String id);
     /**
      * 修改程序版本状态
      */

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/RStatIntegrityDMapper.java

@@ -2,6 +2,7 @@ package com.njcn.device.pq.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.pq.pojo.param.LineBaseQueryParam;
 import com.njcn.device.pq.pojo.param.OnlineRateParam;
 import com.njcn.device.pq.pojo.po.LineDataIntegrity;
 import com.njcn.device.pq.pojo.po.RStatIntegrityD;
@@ -36,4 +37,6 @@ public interface RStatIntegrityDMapper extends BaseMapper<RStatIntegrityD> {
      * @return List<OnlineRate>
      */
     List<RStatIntegrityVO> getOnIntegrityByIds(@Param("param") OnlineRateParam param);
+
+    List<RStatIntegrityVO> getOnIntegrityByIdsAndTime (@Param("list")List<String> lineIds,@Param("startTime")String startTime,@Param("endTime")String endTime);
 }

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TerminalVersionMapper.java

@@ -1,6 +1,7 @@
 package com.njcn.device.pq.mapper;
 
 import com.njcn.device.pq.pojo.param.TerminalMainQueryParam;
+import com.njcn.device.pq.pojo.po.DevVersion;
 import com.njcn.device.pq.pojo.vo.TerminalMaintainVO;
 import com.njcn.device.pq.pojo.vo.TerminalVersionVO;
 import org.apache.ibatis.annotations.Param;
@@ -51,8 +52,5 @@ public interface TerminalVersionMapper {
     List<TerminalVersionVO> getPqLineGdAndSubList(@Param("ids") List<String> ids);
 
 
-
+    List<DevVersion> selectListById(String id);
-
-
-
 }

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml

@@ -486,7 +486,6 @@
         substation.`Name` subName,
         subscale.name subScale,
         pqdevice.IP ip,
-        pqdevice.Com_Flag comFlag,
         factory.`Name` manufacturer,
         voltage.`Name` voltageName,
         scale.`Name` voltageScale,
@@ -788,7 +787,7 @@
         INNER JOIN pq_device b ON vol.pid = b.id
         INNER JOIN pq_line sub ON dev.pid = sub.id
         INNER JOIN pq_line elc ON sub.pid = elc.id
-        LEFT JOIN  cld_month_flow  m ON b.id = m.Line_Id
+        LEFT JOIN  cld_month_flow  m ON b.id = m.Dev_Id
         LEFT JOIN cld_dev_meal c ON b.id = c.line_id
         LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id
         LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id
@@ -826,7 +825,7 @@
         INNER JOIN pq_device b ON vol.pid = b.id
         INNER JOIN pq_line sub ON dev.pid = sub.id
         INNER JOIN pq_line elc ON sub.pid = elc.id
-        LEFT JOIN  cld_month_flow  m ON b.id = m.Line_Id
+        LEFT JOIN  cld_month_flow  m ON b.id = m.Dev_Id
         LEFT JOIN cld_dev_meal c ON b.id = c.line_id
         LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id
         LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id
@@ -855,7 +854,7 @@
         ifnull(m.Actual_Value,0) statisValue
         FROM pq_line a
         INNER JOIN pq_device b ON a.id = b.id
-        LEFT JOIN  cld_month_flow  m ON b.id = m.Line_Id
+        LEFT JOIN  cld_month_flow  m ON b.id = m.Dev_Id
         LEFT JOIN cld_dev_meal c ON b.id = c.line_id
         LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id
         LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ProgramVersionMapper.xml

@@ -14,7 +14,8 @@
         A.`Update_Time` updateTime,
         A.`Remark` remark,
         A.`Version_Type` versionType,
-        A.`Version_Flag` versionFlag
+        A.`Version_Flag` versionFlag,
+        A.`File_Name` fileName
         FROM
         cld_version A,
         sys_dict_data B,
@@ -40,7 +41,7 @@
         UPDATE
         cld_version
         SET
-        Version_Flag = 0
+        Version_Flag = #{flag}
         WHERE Id = #{id}
     </update>
 

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RStatIntegrityDMapper.xml

@@ -24,7 +24,7 @@
         r_stat_integrity_d
         <where>
             <if test="param!=null and param.ids != null and param.ids.size > 0">
-                AND Dev_Id IN
+                AND line_index IN
                 <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
                     #{item}
                 </foreach>
@@ -38,4 +38,29 @@
         </where>
         group by line_index ;
     </select>
+
+
+
+    <select id="getOnIntegrityByIdsAndTime" resultType="com.njcn.device.pq.pojo.vo.RStatIntegrityVO">
+        SELECT
+        line_index AS lineIndex,
+        sum( real_time )/ sum( due_time )* 100 AS integrityRate
+        FROM
+        r_stat_integrity_d
+        <where>
+            <if test="list.size > 0">
+                AND line_index IN
+                <foreach collection='list' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test="startTime != null and startTime !=''">
+                AND  time_id >= #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND  time_id &lt;= #{endTime}
+            </if>
+        </where>
+        group by line_index ;
+    </select>
 </mapper>

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RStatOnlinerateDMapper.xml

@@ -8,7 +8,7 @@
         from r_stat_onlinerate_d
         <where>
             <if test="param!=null and param.ids != null and param.ids.size > 0">
-                AND Dev_Id IN
+                AND dev_index IN
                 <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
                     #{item}
                 </foreach>

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml

@@ -25,7 +25,7 @@ FROM
 	LEFT JOIN cld_dev_version f on a.id = f.line_id and f.flag = 1 and f.state = 1
 	LEFT JOIN cld_version g on f.version_id = g.id
 	LEFT JOIN
-	(select * from cld_month_flow where date_format(time_id,'%Y-%m' ) = date_format(CURRENT_TIME(),'%Y-%m')) mo on a.id = mo.line_id
+	(select * from cld_month_flow where date_format(time_id,'%Y-%m' ) = date_format(CURRENT_TIME(),'%Y-%m')) mo on a.id = mo.Dev_Id
     where a.id in
         <foreach collection="devIds" item="item" open="(" close=")" separator=",">
             #{item}

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalVersionMapper.xml

@@ -69,5 +69,15 @@
         </foreach>
         order by a.sort
     </select>
+    <select id="selectListById" resultType="com.njcn.device.pq.pojo.po.DevVersion">
+        SELECT
+        cdv.*,
+        pd.Dev_Type AS devType,
+        sdd.Name AS devTypeName
+        FROM cld_dev_version cdv
+        LEFT JOIN pq_device pd ON cdv.Line_Id = pd.Id
+        LEFT JOIN sys_dict_data sdd ON pd.Dev_Type = sdd.Id
+        WHERE cdv.Line_Id = #{id}
+    </select>
 
 </mapper>

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ProgramVersionService.java

@@ -22,7 +22,7 @@ public interface ProgramVersionService {
      * 新增程序版本管理信息
      * @return
      */
-    boolean addProgramVersion(String name, String protocol, LocalDate date, String devType, String remark, String versionType, MultipartFile file);
+    boolean addProgramVersion(String name, String protocol, LocalDate date, String devType, String remark, String versionType,String fileName, MultipartFile file);
     /**
      * 版本文件是否存在
      * @return
@@ -32,12 +32,12 @@ public interface ProgramVersionService {
      * 修改程序版本管理信息
      * @return
      */
-    boolean updateProgramVersion(String id, String name, String protocol, LocalDate date, String devType, String remark, String versionType, MultipartFile file);
+    boolean updateProgramVersion(String id, String name, String protocol, LocalDate date, String devType, String remark, String versionType,String fileName, MultipartFile file);
     /**
      * 修改程序版本状态
      * @return
      */
-    boolean updateVersionFlag(String id);
+    boolean updateVersionFlag(String id, Integer flag);
     /**
      * 删除版本
      * @return

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalVersionService.java

@@ -26,6 +26,7 @@ public interface TerminalVersionService {
      * 查询装置升级日志
      * @author cdf
      * @date 2022/5/17
+     * @return
      */
     List<DevVersion> getTerminalUpLog(String id);
 }

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ProgramVersionServiceImpl.java

@@ -66,7 +66,7 @@ public class ProgramVersionServiceImpl extends ServiceImpl<VersionMapper, Versio
     }
 
     @Override
-    public boolean addProgramVersion(String name, String protocol, LocalDate date, String devType, String remark, String versionType, MultipartFile file) {
+    public boolean addProgramVersion(String name, String protocol, LocalDate date, String devType, String remark, String versionType, String fileName,MultipartFile file) {
         check(null,name,false);
         Version version = new Version();
         version.setName(name);
@@ -90,7 +90,7 @@ public class ProgramVersionServiceImpl extends ServiceImpl<VersionMapper, Versio
             e.printStackTrace();
         }
         version.setFile(b);
-
+        version.setFileName(fileName);
         version.setVersionFlag(DataStateEnum.ENABLE.getCode());
         version.setState(DataStateEnum.ENABLE.getCode());
         version.setCreateBy(RequestUtil.getUserIndex());
@@ -108,7 +108,7 @@ public class ProgramVersionServiceImpl extends ServiceImpl<VersionMapper, Versio
     }
 
     @Override
-    public boolean updateProgramVersion(String id, String name, String protocol, LocalDate date, String devType, String remark, String versionType, MultipartFile file) {
+    public boolean updateProgramVersion(String id, String name, String protocol, LocalDate date, String devType, String remark, String versionType, String fileName,MultipartFile file) {
         check(id,name,true);
         Version version = new Version();
         version.setId(id);
@@ -129,17 +129,20 @@ public class ProgramVersionServiceImpl extends ServiceImpl<VersionMapper, Versio
             e.printStackTrace();
         }
         version.setFile(b);
+        version.setFileName(fileName);
         version.setUpdateBy(RequestUtil.getUserIndex());
         version.setUpdateTime(LocalDateTime.now());
-
         versionMapper.updateById(version);
         return true;
     }
 
 
     @Override
-    public boolean updateVersionFlag(String id) {
+    public boolean updateVersionFlag(String id, Integer flag) {
-        programVersionMapper.updateVersionFlag(id);
+        Version version = new Version();
+        version.setId(id);
+        version.setVersionFlag(flag);
+        versionMapper.updateById(version);
         return true;
     }
 

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java

@@ -147,7 +147,7 @@ public class RunManageServiceImpl implements RunManageService {
      */
     private TerminalLedgerVO.TemData filterScale(GeneralDeviceDTO generalDeviceDTO, List<SimpleDTO> scales) {
         TerminalLedgerVO.TemData temData = new TerminalLedgerVO.TemData();
-        temData.setName(DicDataTypeEnum.DEV_VOLTAGE.getName());
+        temData.setName(DicDataTypeEnum.DEV_VOLTAGE_STAND.getName());
         //如果电压等级集合为空，则查询所有的电压等级
         if (CollectionUtil.isEmpty(scales)) {
             List<DictData> scaleDictData = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.DEV_VOLTAGE.getName()).getData();

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java

@@ -1416,7 +1416,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
         List<DictData> manufacturerList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.DEV_MANUFACTURER.getName()).getData();
         List<DictData> devTypeList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.DEV_TYPE.getName()).getData();
         List<DictData> frontList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.FRONT_TYPE.getName()).getData();
-        List<DictData> scaleList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.DEV_VOLTAGE.getName()).getData();
+        List<DictData> scaleList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.DEV_VOLTAGE_STAND.getName()).getData();
         List<Node> nodeList = nodeService.nodeAllList();
 
 

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalVersionServiceImpl.java

@@ -64,9 +64,7 @@ public class TerminalVersionServiceImpl implements TerminalVersionService {
 
     @Override
     public List<DevVersion> getTerminalUpLog(String id) {
-        LambdaQueryWrapper<DevVersion> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        return terminalVersionMapper.selectListById(id);
-        lambdaQueryWrapper.eq(DevVersion::getLineId,id);
-        return devVersionMapper.selectList(lambdaQueryWrapper);
     }
 
 

pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/DetailVO.java

@@ -18,17 +18,17 @@ import java.io.Serializable;
 @NoArgsConstructor
 public class DetailVO extends AreaLineInfoVO implements Serializable {
 
-    @ApiModelProperty(name = "persistTime",value = "持续时间")
+    @ApiModelProperty(name = "duration",value = "持续时间")
-    private Double persistTime;
+    private Double duration;
 
-    @ApiModelProperty(name = "eventType",value = "暂态类型")
+    @ApiModelProperty(name = "advanceType",value = "暂降类型（Event_Type）")
-    private String eventType;
+    private String advanceType;
 
-    @ApiModelProperty(name = "eventValue",value = "特征幅值")
+    @ApiModelProperty(name = "featureAmplitude",value = "特征幅值")
-    private Double eventValue;
+    private Double featureAmplitude;
 
-    @ApiModelProperty(name = "time",value = "发生时间")
+    @ApiModelProperty(name = "startTime",value = "发生时间")
-    private String timeId;
+    private String startTime;
 
     @ApiModelProperty(name = "times",value = "次数")
     private Integer times;

pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/WaveTypeVO.java

@@ -14,7 +14,6 @@ import java.math.BigDecimal;
  */
 
 @Data
-@Measurement(name = "pqs_eventdetail")
 public class WaveTypeVO{
 
 
@@ -124,25 +123,28 @@ public class WaveTypeVO{
     private String lineId;
 
     @Column(name = "time")
-    private String timeId;
+    private String startTime;
 
     @Column(name = "event_describe")
     private String eventDescribe;
 
     @Column(name = "wave_type")
-    private String waveType;
+    @ApiModelProperty(value = "统计类型")
+    private String eventType;
 
-    @Column(name = "persist_time")
+    @ApiModelProperty(value = "持续时间，单位秒")
-    private Double persistTime;
+    private Double duration;
 
-    @Column(name = "event_value")
+    @ApiModelProperty(value = "特征幅值")
-    private Double eventValue;
+    private Double featureAmplitude;
 
     @Column(name = "event_reason")
-    private String eventReason;
+    @ApiModelProperty(value = "暂降原因（Event_Reason）")
+    private String advanceReason;
 
     @Column(name = "event_type")
-    private String eventType;
+    @ApiModelProperty(value = "暂降类型（Event_Type）")
+    private String advanceType;
 
     @Column(name = "eventass_index")
     private String eventassIndex;

pqs-event/event-boot/pom.xml

@@ -83,6 +83,12 @@
             <artifactId>okio</artifactId>
             <version>2.8.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>harmonic-api</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/LargeScreenMapper.java

@@ -3,6 +3,7 @@ package com.njcn.event.mapper.majornetwork;
 import com.njcn.device.pq.pojo.vo.AllDataVO;
 import com.njcn.device.pq.pojo.vo.EventVO;
 import com.njcn.device.pq.pojo.vo.MiddleLimitRateVO;
+import com.njcn.harmonic.pojo.po.PQSComAssesPO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -32,4 +33,17 @@ public interface LargeScreenMapper {
     List<Map<String, Object>> getMiddleTerminal (@Param("deviceIds") List<String> deviceIds, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
     List<MiddleLimitRateVO> getMiddleLimitRate (@Param("lineIds") List<String> deviceIds, @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+    List<Map<String,Object>> getHomeostasisArea (@Param("indexIds") List<String> indexIds, @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+    /**
+     * 统计综合评估平均值
+     * @param lineIndexes
+     * @param searchBeginTime
+     * @param searchEndTime
+     * @return
+     */
+    List<PQSComAssesPO> getAvgCount(@Param("ids") List<String> lineIndexes,
+                                    @Param("statTime") String searchBeginTime,
+                                    @Param("endTime") String searchEndTime);
 }

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml

@@ -195,5 +195,76 @@
             left join pq_line pl3 on pl2.Pid = pl3.Id
     </select>
 
+    <select id="getHomeostasisArea" resultType="java.util.Map">
+        select
+        rshom.org_no "id",
+        round(avg(rshom.over_limit_measurement_ratio_accrued),2) avg
+        from r_stat_harmonic_org_m rshom
+        left join sys_dict_data sdd on rshom.data_type = sdd.Id and sdd.`Code` = 'Mainnet_Point'
+        WHERE
+        rshom.org_no IN
+        <foreach collection="indexIds" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        <if test="startTime != null and startTime != ''">
+            and date_format(rshom.data_date,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and date_format(rshom.data_date,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
+        </if>
+        group by rshom.org_no
+    </select>
 
+    <select id="getAvgCount" resultType="com.njcn.harmonic.pojo.po.PQSComAssesPO">
+        SELECT
+        line_id,
+        AVG ( vu_dev1 ) AS vu_dev1,
+        AVG ( vu_dev2 ) AS vu_dev2,
+        AVG ( vu_dev3 ) AS vu_dev3,
+        AVG ( vu_dev4 ) AS vu_dev4,
+        AVG ( vu_dev5 ) AS vu_dev5,
+        AVG ( freq_dev1 ) AS freq_dev1,
+        AVG ( freq_dev2 ) AS freq_dev2,
+        AVG ( freq_dev3 ) AS freq_dev3,
+        AVG ( freq_dev4 ) AS freq_dev4,
+        AVG ( freq_dev5 ) AS freq_dev5,
+        AVG ( data_plt1 ) AS data_plt1,
+        AVG ( data_plt2 ) AS data_plt2,
+        AVG ( data_plt3 ) AS data_plt3,
+        AVG ( data_plt4 ) AS data_plt4,
+        AVG ( data_plt5 ) AS data_plt5,
+        AVG ( v_unbalance1 ) AS v_unbalance1,
+        AVG ( v_unbalance2 ) AS v_unbalance2,
+        AVG ( v_unbalance3 ) AS v_unbalance3,
+        AVG ( v_unbalance4 ) AS v_unbalance4,
+        AVG ( v_unbalance5 ) AS v_unbalance5,
+        AVG ( v_thd1 ) AS v_thd1,
+        AVG ( v_thd2 ) AS v_thd2,
+        AVG ( v_thd3 ) AS v_thd3,
+        AVG ( v_thd4 ) AS v_thd4,
+        AVG ( v_thd5 ) AS v_thd5,
+        AVG ( event1 ) AS event1,
+        AVG ( event2 ) AS event2,
+        AVG ( event3 ) AS event3,
+        AVG ( event4 ) AS event4,
+        AVG ( event5 ) AS event5
+        FROM
+        r_stat_comasses_d
+        <where>
+            <if test=" ids != null and ids.size > 0">
+                AND line_id IN
+                <foreach collection='ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test=" statTime != null and statTime !=''">
+                AND  time_id >= #{statTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND  time_id &lt;= #{endTime}
+            </if>
+        </where>
+        GROUP BY line_id
+
+    </select>
 </mapper>

pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java

@@ -116,7 +116,7 @@ public class AreaInfoServiceImpl implements AreaInfoService {
 
             //查询监测点未处理暂态事件
             List<RmpEventDetailPO> eventDetails = eventDetailService.list(new LambdaQueryWrapper<RmpEventDetailPO>()
-                    .in(RmpEventDetailPO::getMeasurementPointId, lineIds));
+                    .in(RmpEventDetailPO::getMeasurementPointId, lineIds).orderByDesc(RmpEventDetailPO::getStartTime));
             EventDetailNew eventDetailNew;
             for (RmpEventDetailPO eventDetail : eventDetails) {
                 eventDetailNew= BeanUtil.copyProperties(eventDetail,EventDetailNew.class);

pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaStatisticalServiceImpl.java

@@ -88,7 +88,7 @@ public class AreaStatisticalServiceImpl implements AreaStatisticalService {
         List<RmpEventDetailPO> info = eventDetailService.list(new LambdaQueryWrapper<RmpEventDetailPO>()
                 .in(RmpEventDetailPO::getMeasurementPointId, lineIds)
                 //todo 是否缺少录波
-                .eq(RmpEventDetailPO::getEventType, data.getId())
+                .ne(RmpEventDetailPO::getEventType, data.getId())
                 .ge(StrUtil.isNotBlank(deviceInfoParam.getSearchBeginTime()), RmpEventDetailPO::getStartTime,DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime())))
                 .le(StrUtil.isNotBlank(deviceInfoParam.getSearchEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(deviceInfoParam.getSearchEndTime())))
         );

pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java

@@ -999,7 +999,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
             );
 
             Map<String, List<RmpEventDetailPO>> map = eventDetailList.stream().filter(x -> data.getId().equals(x.getEventType()))
-                    .collect(Collectors.groupingBy(s -> s.getStartTime().substring(0, 10)));
+                    .collect(Collectors.groupingBy(s -> s.getStartTime().toString()));
             Set<String> keySet = map.keySet();
 
             LocalDate parse1 = LocalDate.parse(startTime);
@@ -1488,6 +1488,8 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
      */
     @Override
     public Page<WaveTypeVO> getMonitorEventAnalyseQuery(EventBaseParam eventBaseParam) {
+        List<DictData> eventReasonList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.EVENT_REASON.getName()).getData();
+        List<DictData> eventTypeList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.EVENT_TYPE.getName()).getData();
 
         //数据暂降查询
         Page<RmpEventDetailPO> pageInfo = eventDetailService.page(new Page<>(eventBaseParam.getPageNum(), eventBaseParam.getPageSize()), new LambdaQueryWrapper<RmpEventDetailPO>()
@@ -1498,7 +1500,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
         );
         //获取关于监测点发电站相关信息
         List<AreaLineInfoVO> areaLineList = lineFeignClient.getBaseLineAreaInfo(Arrays.asList(eventBaseParam.getLineId())).getData();
-        if(CollectionUtil.isNotEmpty(areaLineList)){
+        if(CollectionUtil.isEmpty(areaLineList)){
             throw new BusinessException(EventResponseEnum.NOT_FOUND);
         }
         List<WaveTypeVO> waveTypeVOS = new ArrayList<>();
@@ -1529,6 +1531,30 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
                         waveTypeVO.setLng(lineInfoVO.getLng());
                         waveTypeVO.setManufacturer(lineInfoVO.getManufacturer());
                         waveTypeVO.setVoltageScale(lineInfoVO.getVoltageScale());
+                        //查询字典表替换事件原因与事件类型的字符串
+                        if (waveTypeVO.getAdvanceReason() != null) {
+                            for (DictData dictData : eventReasonList) {
+                                //将字典数据id与VO中属性eventReason对应的字符串进行比较
+                                if (waveTypeVO.getAdvanceReason().equals(dictData.getId())) {
+                                    waveTypeVO.setAdvanceReason(dictData.getName());
+                                }
+                            }
+                        } else {
+                            //抛出异常,当前暂态原因为空
+                            throw new BusinessException(EventResponseEnum.EVENT_REASON_NOT_FOUND);
+                        }
+
+                        if (waveTypeVO.getAdvanceType() != null) {
+                            for (DictData dictData : eventTypeList) {
+                                //将字典数据id与VO中属性eventType对应的字符串进行比较
+                                if (waveTypeVO.getAdvanceType().equals(dictData.getId())) {
+                                    waveTypeVO.setAdvanceType(dictData.getName());
+                                }
+                            }
+                        } else {
+                            //抛出异常,当前暂态类型为空
+                            throw new BusinessException(EventResponseEnum.EVENT_TYPE_NOT_FOUND);
+                        }
                         waveTypeVOS.add(waveTypeVO);
                     }
                 }

pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java

@@ -1,5 +1,7 @@
 package com.njcn.event.service.majornetwork.Impl;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import com.njcn.common.pojo.dto.SimpleDTO;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;
@@ -8,21 +10,24 @@ import com.njcn.device.pq.pojo.param.MonitoringPointScaleParam;
 import com.njcn.device.pq.pojo.vo.*;
 import com.njcn.event.mapper.majornetwork.LargeScreenMapper;
 import com.njcn.event.service.majornetwork.LargeScreenService;
+import com.njcn.harmonic.pojo.dto.ComAssessDTO;
+import com.njcn.harmonic.pojo.po.PQSComAssesPO;
+import com.njcn.harmonic.utils.HarmonicComAssesUtil;
 import com.njcn.system.pojo.enums.StatisticsEnum;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.map.HashedMap;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 import com.njcn.device.pq.api.GeneralDeviceInfoClient;
+import org.springframework.util.CollectionUtils;
 
+import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.NumberFormat;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -39,6 +44,8 @@ public class LargeScreenServiceImpl implements LargeScreenService {
 
     private final LargeScreenMapper largeScreenMapper;
 
+    private final HarmonicComAssesUtil comAssesUtil;
+
     /**
      * 暂降事件区域
      */
@@ -274,6 +281,9 @@ public class LargeScreenServiceImpl implements LargeScreenService {
             if (generalDeviceDTO.getDeviceIndexes().size() > 0) {
                 AllDataVO allDataVO = largeScreenMapper.getFlagCount(generalDeviceDTO.getDeviceIndexes());
                 allDataVO.setAreaName(generalDeviceDTO.getName());
+                allDataVO.setIndex(generalDeviceDTO.getIndex());
+                allDataVO.setNum(generalDeviceDTO.getLineIndexes().size());
+                allDataVO.setSteadyLoad("0.0");
                 if (generalDeviceDTO.getLineIndexes().size() > 0) {
                     Map<String, Object> map = largeScreenMapper.getDownCount(generalDeviceDTO.getLineIndexes(), largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime());
                     allDataVO.setEventCounts(map.get("count").toString());
@@ -284,11 +294,14 @@ public class LargeScreenServiceImpl implements LargeScreenService {
             } else {
                 AllDataVO allDataVO = new AllDataVO();
                 allDataVO.setAreaName(generalDeviceDTO.getName());
+                allDataVO.setIndex(generalDeviceDTO.getIndex());
+                allDataVO.setNum(generalDeviceDTO.getLineIndexes().size());
                 allDataVO.setRunning("0");
                 allDataVO.setHotSpare("0");
                 allDataVO.setShutdown("0");
                 allDataVO.setNormal("0");
                 allDataVO.setBreakdown("0");
+                allDataVO.setSteadyLoad("0.0");
                 if (generalDeviceDTO.getLineIndexes().size() > 0) {
                     Map<String, Object> map = largeScreenMapper.getDownCount(generalDeviceDTO.getLineIndexes(), largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime());
                     allDataVO.setEventCounts(map.get("count").toString());
@@ -298,7 +311,39 @@ public class LargeScreenServiceImpl implements LargeScreenService {
                 result.add(allDataVO);
             }
         }
-        //todo 该接口部分功能未完成 1.稳态符合性 2.综合评估
+        //部门id集合
+        List<String> indexIds = generalDeviceDTOList.stream().map(GeneralDeviceDTO::getIndex).collect(Collectors.toList());
+        List<Map<String, Object>> homeostasisArea = largeScreenMapper.getHomeostasisArea(indexIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime());
+        float f = 0.0f;
+        for (AllDataVO allDataVO : result) {
+            for (Map<String, Object> map : homeostasisArea) {
+                if (Objects.equals(map.get("id"), allDataVO.getIndex())) {
+                    f = Float.parseFloat(map.get("avg").toString());
+                    allDataVO.setSteadyLoad(String.valueOf((1 - f) * 100));
+                }
+            }
+        }
+        List<ComAssessDTO> comAssessDTOS = new ArrayList<>();
+        for (GeneralDeviceDTO generalDeviceDTO : generalDeviceDTOList) {
+            if (!CollectionUtils.isEmpty(generalDeviceDTO.getLineIndexes())) {
+                List<PQSComAssesPO> pqsComAssesPOS = getComAccessData(generalDeviceDTO.getLineIndexes(), largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime());
+                setResults(pqsComAssesPOS, comAssessDTOS);
+                float allComAss = comAssesUtil.getAllComAss(comAssessDTOS);
+                /*String lv = getLevel(allComAss);*/
+                /*comAssessVO.setData(allComAss);*/
+                for (AllDataVO allDataVO : result) {
+                    if (Objects.equals(generalDeviceDTO.getIndex(), allDataVO.getIndex())) {
+                        allDataVO.setData(String.valueOf(allComAss));
+                    }
+                }
+            }
+            /*comAssessVO.setLevel(lv);*/
+        }
+        for (AllDataVO allDataVO : result) {
+            if (Objects.isNull(allDataVO.getData())){
+                allDataVO.setData("-1");
+            }
+        }
         return result;
     }
 
@@ -367,7 +412,7 @@ public class LargeScreenServiceImpl implements LargeScreenService {
             vo.setIp(stringObjectMap.get("ip").toString());
             vo.setPort(stringObjectMap.get("port").toString());
             vo.setComFlag(stringObjectMap.get("comFlag").toString());
-            vo.setProportion(s + "%");
+            vo.setProportion(s);
             result.add(vo);
         }
         return result;
@@ -377,7 +422,8 @@ public class LargeScreenServiceImpl implements LargeScreenService {
         NumberFormat nf = NumberFormat.getNumberInstance();
         nf.setMaximumFractionDigits(2);//保留两位小数，即四舍五入到小数点后两位
         nf.setRoundingMode(RoundingMode.HALF_UP);//设置四舍五入模式为四舍五入
-        return nf.format(value);
+        float v = Float.parseFloat(nf.format(value));
+        return String.valueOf(v * 100);
     }
 
     /**
@@ -403,4 +449,90 @@ public class LargeScreenServiceImpl implements LargeScreenService {
         return largeScreenMapper.getMiddleLimitRate(lineIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime());
 
     }
+
+    //设置保留四位小数
+    private void setResults(List<PQSComAssesPO> pqsComAssesPOS, List<ComAssessDTO> comAssessDTOS) {
+        for (int i = 0; i < pqsComAssesPOS.size(); i++) {
+            float v1 = new BigDecimal(pqsComAssesPOS.get(i).getVuDev1()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
+            ComAssessDTO comAssessDTO = new ComAssessDTO();
+            comAssessDTO.setVuDev1(v1);
+            float v2 = new BigDecimal(pqsComAssesPOS.get(i).getVuDev2()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
+            comAssessDTO.setVuDev2(v2);
+            float v3 = new BigDecimal(pqsComAssesPOS.get(i).getVuDev3()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
+            comAssessDTO.setVuDev3(v3);
+            float v4 = new BigDecimal(pqsComAssesPOS.get(i).getVuDev4()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
+            comAssessDTO.setVuDev4(v4);
+            float v5 = new BigDecimal(pqsComAssesPOS.get(i).getVuDev5()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
+            comAssessDTO.setVuDev5(v5);
+            float f1 = new BigDecimal(pqsComAssesPOS.get(i).getFreqDev1()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
+            comAssessDTO.setFreqDev1(f1);
+            float f2 = new BigDecimal(pqsComAssesPOS.get(i).getFreqDev2()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
+            comAssessDTO.setFreqDev2(f2);
+            float f3 = new BigDecimal(pqsComAssesPOS.get(i).getFreqDev3()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
+            comAssessDTO.setFreqDev3(f3);
+            float f4 = new BigDecimal(pqsComAssesPOS.get(i).getFreqDev4()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
+            comAssessDTO.setFreqDev4(f4);
+            float f5 = new BigDecimal(pqsComAssesPOS.get(i).getFreqDev5()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
+            comAssessDTO.setFreqDev5(f5);
+            float d1 = new BigDecimal(pqsComAssesPOS.get(i).getDataPlt1()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
+            comAssessDTO.setDataPlT1(d1);
+            float d2 = new BigDecimal(pqsComAssesPOS.get(i).getDataPlt2()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
+            comAssessDTO.setDataPlT2(d2);
+            float d3 = new BigDecimal(pqsComAssesPOS.get(i).getDataPlt3()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
+            comAssessDTO.setDataPlT3(d3);
+            float d4 = new BigDecimal(pqsComAssesPOS.get(i).getDataPlt4()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
+            comAssessDTO.setDataPlT4(d4);
+            float d5 = new BigDecimal(pqsComAssesPOS.get(i).getDataPlt5()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
+            comAssessDTO.setDataPlT5(d5);
+            float vu1 = new BigDecimal(pqsComAssesPOS.get(i).getVUnbalance1()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
+            comAssessDTO.setVUnbalance1(vu1);
+            float vu2 = new BigDecimal(pqsComAssesPOS.get(i).getVUnbalance2()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
+            comAssessDTO.setVUnbalance2(vu2);
+            float vu3 = new BigDecimal(pqsComAssesPOS.get(i).getVUnbalance3()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
+            comAssessDTO.setVUnbalance3(vu3);
+            float vu4 = new BigDecimal(pqsComAssesPOS.get(i).getVUnbalance4()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
+            comAssessDTO.setVUnbalance4(vu4);
+            float vu5 = new BigDecimal(pqsComAssesPOS.get(i).getVUnbalance5()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
+            comAssessDTO.setVUnbalance5(vu5);
+            float vt1 = new BigDecimal(pqsComAssesPOS.get(i).getVThd1()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
+            comAssessDTO.setVTHD1(vt1);
+            float vt2 = new BigDecimal(pqsComAssesPOS.get(i).getVThd2()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
+            comAssessDTO.setVTHD2(vt2);
+            float vt3 = new BigDecimal(pqsComAssesPOS.get(i).getVThd3()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
+            comAssessDTO.setVTHD3(vt3);
+            float vt4 = new BigDecimal(pqsComAssesPOS.get(i).getVThd4()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
+            comAssessDTO.setVTHD4(vt4);
+            float vt5 = new BigDecimal(pqsComAssesPOS.get(i).getVThd5()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
+            comAssessDTO.setVTHD5(vt5);
+            float e1 = new BigDecimal(pqsComAssesPOS.get(i).getEvent1()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
+            comAssessDTO.setEvent1(e1);
+            float e2 = new BigDecimal(pqsComAssesPOS.get(i).getEvent2()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
+            comAssessDTO.setEvent2(e2);
+            float e3 = new BigDecimal(pqsComAssesPOS.get(i).getEvent3()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
+            comAssessDTO.setEvent3(e3);
+            float e4 = new BigDecimal(pqsComAssesPOS.get(i).getEvent4()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
+            comAssessDTO.setEvent4(e4);
+            float e5 = new BigDecimal(pqsComAssesPOS.get(i).getEvent5()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
+            comAssessDTO.setEvent5(e5);
+            comAssessDTOS.add(comAssessDTO);
+        }
+    }
+
+    /**
+     * influxDB查询综合评估相关信息
+     * 返回每个监测点在时间段的各指标平均数
+     *
+     * @param lineIndexes
+     * @param searchBeginTime
+     * @param searchEndTime
+     */
+    private List<PQSComAssesPO> getComAccessData(List<String> lineIndexes, String searchBeginTime, String searchEndTime) {
+        List<PQSComAssesPO> avgCount = largeScreenMapper.getAvgCount(lineIndexes,
+                DateUtil.beginOfDay(DateUtil.parse(searchBeginTime)).toString(),
+                DateUtil.beginOfDay(DateUtil.parse(searchEndTime)).toString());
+        if (CollUtil.isNotEmpty(avgCount)) {
+            return avgCount;
+        }
+        return new ArrayList<>();
+    }
 }

pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java

@@ -377,28 +377,30 @@ public class ReportServiceImpl implements ReportService {
     @Override
     public List<WaveTypeVO> getSeverity(DeviceInfoParam.BusinessParam businessParam) {
         List<WaveTypeVO> result = new ArrayList<>();
-        List<EventDetailNew> info = getED2(businessParam);
+        List<GeneralDeviceDTO> deviceDTOList = generalDeviceInfoClient.getPracticalAllDeviceInfo(businessParam).getData();
+        List<String> lineIds = deviceDTOList.stream().flatMap(dto -> dto.getLineIndexes().stream()).collect(Collectors.toList());
+        List<EventDetailNew> info = new ArrayList<>();
+        if(CollectionUtil.isNotEmpty(lineIds)){
+            //数据暂降查询
+            List<RmpEventDetailPO> eventDetails = eventDetailService.list(new LambdaQueryWrapper<RmpEventDetailPO>()
+                    .in(RmpEventDetailPO::getMeasurementPointId, lineIds)
+                    .ge(StrUtil.isNotBlank(businessParam.getSearchBeginTime()), RmpEventDetailPO::getStartTime,DateUtil.beginOfDay(DateUtil.parse(businessParam.getSearchBeginTime())))
+                    .le(StrUtil.isNotBlank(businessParam.getSearchEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(businessParam.getSearchEndTime())))
+                    .orderByDesc(RmpEventDetailPO::getSeverity).last(" limit 20")
+            );
+            info = BeanUtil.copyToList(eventDetails, EventDetailNew.class);
+        }else{
+            throw new BusinessException(DeviceResponseEnum.DEPT_LINE_EMPTY);
+        }
         if (CollectionUtil.isNotEmpty(info)) {
-            List<String> idlist = new ArrayList<>();
-            //根据严重度进行排序并取前二十个数据
-            info.sort(((o1, o2) -> o1.getSeverity().compareTo(o2.getSeverity())));
-            Collections.reverse(info);
-            List<EventDetailNew> details=new ArrayList<>();
-            if(info.size()>20){
-                details = info.subList(0, 20);
-            }else{
-                details=info;
-            }
 
-            //遍历集合得到id集合
+            List<String> idlist = info.stream().map(EventDetailNew::getLineId).distinct().collect(Collectors.toList());
-            for (EventDetailNew detail : details) {
+
-                idlist.add(detail.getLineId());
-            }
             //得到对应的监测点信息
             HttpResult<List<AreaLineInfoVO>> AreaInfo = lineFeignClient.getBaseLineAreaInfo(idlist);
             List<AreaLineInfoVO> data = AreaInfo.getData();
             //遍历集合比较id得到最终数据
-            for (EventDetailNew detail : details) {
+            for (EventDetailNew detail : info) {
                 WaveTypeVO waveTypeVO = new WaveTypeVO();
                 for (AreaLineInfoVO vo : data) {
                     if (detail.getLineId().equals(vo.getLineId())) {
@@ -508,8 +510,8 @@ public class ReportServiceImpl implements ReportService {
             List<DictData> type = reason.getData();
             for (DetailVO detailVO : result) {
                 for (DictData dictData : type) {
-                    if (dictData.getId().equals(detailVO.getEventType())) {
+                    if (dictData.getId().equals(detailVO.getAdvanceType())) {
-                        detailVO.setEventType(dictData.getName());
+                        detailVO.setAdvanceType(dictData.getName());
                     }
                 }
             }
@@ -2009,11 +2011,11 @@ public class ReportServiceImpl implements ReportService {
             List<DictData> eventTypeList = type.getData();
 
             for (WaveTypeVO waveTypeVO : eventDetailList) {
-                if (waveTypeVO.getEventReason() != null) {
+                if (waveTypeVO.getAdvanceReason() != null) {
                     for (DictData dictData : eventReasonList) {
                         //将字典数据id与VO中属性eventReason对应的字符串进行比较
-                        if (waveTypeVO.getEventReason().equals(dictData.getId())) {
+                        if (waveTypeVO.getAdvanceReason().equals(dictData.getId())) {
-                            waveTypeVO.setEventReason(dictData.getName());
+                            waveTypeVO.setAdvanceReason(dictData.getName());
                         }
                     }
                 } else {
@@ -2023,11 +2025,11 @@ public class ReportServiceImpl implements ReportService {
             }
 
             for (WaveTypeVO waveTypeVO : eventDetailList) {
-                if (waveTypeVO.getEventType() != null) {
+                if (waveTypeVO.getAdvanceType() != null) {
                     for (DictData dictData : eventTypeList) {
                         //将字典数据id与VO中属性eventType对应的字符串进行比较
-                        if (waveTypeVO.getEventType().equals(dictData.getId())) {
+                        if (waveTypeVO.getAdvanceType().equals(dictData.getId())) {
-                            waveTypeVO.setEventType(dictData.getName());
+                            waveTypeVO.setAdvanceType(dictData.getName());
                         }
                     }
                 } else {

pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java

@@ -349,17 +349,21 @@ public class TransientServiceImpl implements TransientService {
                             }
                         }
 
-                        for (DictData dictData : reasonList) {
+                        if(StrUtil.isNotBlank(eventDetail.getAdvanceReason())) {
-                            if (eventDetail.getAdvanceReason().equals(dictData.getId())) {
+                            for (DictData dictData : reasonList) {
-                                eventDetail.setAdvanceReason(dictData.getName());
+                                if (eventDetail.getAdvanceReason().equals(dictData.getId())) {
-                                break;
+                                    eventDetail.setAdvanceReason(dictData.getName());
+                                    break;
+                                }
                             }
                         }
 
-                        for (DictData dictData : typeList) {
+                        if(StrUtil.isNotBlank(eventDetail.getAdvanceType())) {
-                            if (eventDetail.getAdvanceType().equals(dictData.getId())) {
+                            for (DictData dictData : typeList) {
-                                eventDetail.setAdvanceType(dictData.getName());
+                                if (eventDetail.getAdvanceType().equals(dictData.getId())) {
-                                break;
+                                    eventDetail.setAdvanceType(dictData.getName());
+                                    break;
+                                }
                             }
                         }
                     }
@@ -371,68 +375,6 @@ public class TransientServiceImpl implements TransientService {
 
             }
 
-
-
-
-
-
-
-//            if (!CollectionUtils.isEmpty(lineList)) {
-//                StringBuilder stringBuilder = InfluxDBCommUtils.assToInfluxParam(lineList);
-//                //influxDB查询待分页数据总量
-//                Long total = getTransientDetail(stringBuilder, transientParam);
-//                page.setTotal(total);
-//                //分页总页数
-//                int pages = (int) Math.ceil(transientParam.getPageNum() * 1.0 / transientParam.getPageSize());
-//                page.setPages(pages);
-//                //influxDB分页查询
-//                List<EventDetailNew> eventDetailData = getTransientDetailLimit(lineList, transientParam);
-//
-//                if (CollUtil.isNotEmpty(eventDetailData)) {
-//                    List<String> lineIds = eventDetailData.stream().map(EventDetailNew::getLineId).collect(Collectors.toList());
-//                    lineIds = lineIds.stream().distinct().collect(Collectors.toList());
-//
-//                    List<AreaLineInfoVO> r = lineFeignClient.getBaseLineAreaInfo(lineIds).getData();
-//                    List<DictData> reasonList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.EVENT_REASON.getName()).getData();
-//                    List<DictData> typeList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.EVENT_TYPE.getName()).getData();
-//
-//
-//                    for (EventDetailNew eventDetail : eventDetailData) {
-//                        for (AreaLineInfoVO areaLineInfoVO : r) {
-//                            if (eventDetail.getLineId().equals(areaLineInfoVO.getLineId())) {
-//                                eventDetail.setLineId(areaLineInfoVO.getLineId());
-//                                eventDetail.setLineName(areaLineInfoVO.getLineName());
-//                                eventDetail.setGdName(areaLineInfoVO.getGdName());
-//                                eventDetail.setSubName(areaLineInfoVO.getSubName());
-//                                eventDetail.setIp(areaLineInfoVO.getIp());
-//                                eventDetail.setScale(areaLineInfoVO.getVoltageScale());
-//                                eventDetail.setIp(areaLineInfoVO.getIp());
-//                                break;
-//                            }
-//                        }
-//
-//                        for (DictData dictData : reasonList) {
-//                            if (eventDetail.getEventReason().equals(dictData.getId())) {
-//                                eventDetail.setEventReason(dictData.getName());
-//                                break;
-//                            }
-//                        }
-//
-//                        for (DictData dictData : typeList) {
-//                            if (eventDetail.getEventType().equals(dictData.getId())) {
-//                                eventDetail.setEventType(dictData.getName());
-//                                break;
-//                            }
-//                        }
-//                    }
-//
-//
-//                    //当前页数据
-//                    page.setRecords(eventDetailData);
-//                }
-//
-//            }
-
         }
         return page;
     }

pqs-event/event-boot/src/main/resources/bootstrap.yml

@@ -9,6 +9,7 @@ microservice:
     url: @gateway.url@
 server:
   port: 10203
+  max-http-header-size: 1048576
 #feign接口开启服务熔断降级处理
 feign:
   sentinel: