From 613a8a85059fbe2b45582dc2d58caa2b48ca6b7a Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Fri, 7 Apr 2023 10:48:03 +0800 Subject: [PATCH] =?UTF-8?q?app=E5=8F=8D=E9=A6=88=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/param/AppBaseInformationAddParm.java | 39 ++++++ .../pojo/param/AppPersonSetAddParm.java | 69 +++++++++++ .../pojo/param/AppProjectAddParm.java | 11 +- .../pojo/param/AppProjectAuditParm.java | 19 +-- .../pojo/param/CsFeedbackAddParm.java | 55 +++++++++ .../pojo/param/CsFeedbackChatAddParm.java | 34 ++++++ .../pojo/param/CsFeedbackChatCheckParm.java | 32 +++++ .../pojo/param/CsFeedbackQueryParm.java | 51 ++++++++ .../pojo/po/AppBaseInformationPO.java | 44 +++++++ .../algorithm/pojo/po/AppPersonSetPO.java | 72 +++++++++++ .../njcn/algorithm/pojo/po/AppProjectPO.java | 27 +---- .../pojo/po/AppTopologyDiagramPO.java | 5 - .../njcn/algorithm/pojo/po/CsEdDataPO.java | 80 +++++++++++++ .../algorithm/pojo/po/CsFeedbackChatPO.java | 43 +++++++ .../njcn/algorithm/pojo/po/CsFeedbackPO.java | 60 ++++++++++ .../njcn/algorithm/pojo/po/CsFilePathPO.java | 43 +++++++ .../pojo/vo/AppBaseInformationVO.java | 41 +++++++ .../njcn/algorithm/pojo/vo/AppProjectVO.java | 9 +- .../pojo/vo/AppTopologyDiagramVO.java | 6 +- .../algorithm/pojo/vo/CsFeedbackDetailVO.java | 74 ++++++++++++ .../njcn/algorithm/pojo/vo/CsFeedbackVO.java | 68 +++++++++++ .../feedback/FeedBackChatController.java | 65 ++++++++++ .../feedback/FeedBackController.java | 73 ++++++++++++ .../controller/project/AppInfoController.java | 92 ++++++++++++++ .../mapper/AppBaseInformationMapper.java | 16 +++ .../algorithm/mapper/AppPersonSetMapper.java | 16 +++ .../algorithm/mapper/AppProjectMapper.java | 8 +- .../njcn/algorithm/mapper/CsEdDataMapper.java | 16 +++ .../mapper/CsFeedbackChatMapper.java | 16 +++ .../algorithm/mapper/CsFeedbackMapper.java | 16 +++ .../algorithm/mapper/CsFilePathMapper.java | 16 +++ .../mapping/AppBaseInformationMapper.xml | 19 +++ .../mapper/mapping/AppPersonSetMapper.xml | 25 ++++ .../mapper/mapping/CsEdDataMapper.xml | 26 ++++ .../mapping/CsEquipmentDeliveryMapper.xml | 1 - .../mapper/mapping/CsFeedbackChatMapper.xml | 19 +++ .../mapper/mapping/CsFeedbackMapper.xml | 23 ++++ .../mapper/mapping/CsFilePathMapper.xml | 15 +++ .../service/AppBaseInformationService.java | 17 +++ .../service/AppPersonSetService.java | 17 +++ .../algorithm/service/CsEdDataService.java | 17 +++ .../service/CsFeedbackChatService.java | 28 +++++ .../algorithm/service/CsFeedbackService.java | 46 +++++++ .../algorithm/service/CsFilePathService.java | 17 +++ .../impl/AppBaseInformationServiceImpl.java | 22 ++++ .../service/impl/AppPersonSetServiceImpl.java | 22 ++++ .../service/impl/AppProjectServiceImpl.java | 32 +++-- .../impl/AppTopologyDiagramServiceImpl.java | 3 - .../service/impl/CsEdDataServiceImpl.java | 20 ++++ .../impl/CsFeedbackChatServiceImpl.java | 50 ++++++++ .../service/impl/CsFeedbackServiceImpl.java | 112 ++++++++++++++++++ .../service/impl/CsFilePathServiceImpl.java | 20 ++++ 52 files changed, 1679 insertions(+), 88 deletions(-) create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppBaseInformationAddParm.java create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppPersonSetAddParm.java create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsFeedbackAddParm.java create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsFeedbackChatAddParm.java create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsFeedbackChatCheckParm.java create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsFeedbackQueryParm.java create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppBaseInformationPO.java create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppPersonSetPO.java create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsEdDataPO.java create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsFeedbackChatPO.java create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsFeedbackPO.java create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsFilePathPO.java create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/AppBaseInformationVO.java create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsFeedbackDetailVO.java create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsFeedbackVO.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/feedback/FeedBackChatController.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/feedback/FeedBackController.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/AppInfoController.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppBaseInformationMapper.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppPersonSetMapper.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsEdDataMapper.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsFeedbackChatMapper.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsFeedbackMapper.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsFilePathMapper.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppBaseInformationMapper.xml create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppPersonSetMapper.xml create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsEdDataMapper.xml create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsFeedbackChatMapper.xml create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsFeedbackMapper.xml create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsFilePathMapper.xml create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppBaseInformationService.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppPersonSetService.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsEdDataService.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsFeedbackChatService.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsFeedbackService.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsFilePathService.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppBaseInformationServiceImpl.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppPersonSetServiceImpl.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsEdDataServiceImpl.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsFeedbackChatServiceImpl.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsFeedbackServiceImpl.java create mode 100644 pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsFilePathServiceImpl.java diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppBaseInformationAddParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppBaseInformationAddParm.java new file mode 100644 index 000000000..c1a03eb0b --- /dev/null +++ b/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; + + +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppPersonSetAddParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppPersonSetAddParm.java new file mode 100644 index 000000000..3f880c7bc --- /dev/null +++ b/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; + + + +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppProjectAddParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppProjectAddParm.java index 079a83d61..013a74069 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppProjectAddParm.java +++ b/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="项目类型不能为空！") - private String projectType; - /** - * 关联用户Id - */ - @ApiModelProperty(value="关联用户Id") - @NotBlank(message="关联用户Id不能为空！") - private String userId; + @NotBlank(message="工程id不能为空！") + private String engineeringId; + /** * 地市Id diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppProjectAuditParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppProjectAuditParm.java index 574af0de4..9686c770b 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/AppProjectAuditParm.java +++ b/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; diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsFeedbackAddParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsFeedbackAddParm.java new file mode 100644 index 000000000..91d9f474a --- /dev/null +++ b/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; +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsFeedbackChatAddParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsFeedbackChatAddParm.java new file mode 100644 index 000000000..dc82209f2 --- /dev/null +++ b/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; + + +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsFeedbackChatCheckParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsFeedbackChatCheckParm.java new file mode 100644 index 000000000..049ea94cd --- /dev/null +++ b/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; + + + +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsFeedbackQueryParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsFeedbackQueryParm.java new file mode 100644 index 000000000..67e3946e0 --- /dev/null +++ b/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; +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppBaseInformationPO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppBaseInformationPO.java new file mode 100644 index 000000000..8c9c66e3b --- /dev/null +++ b/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; + + +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppPersonSetPO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppPersonSetPO.java new file mode 100644 index 000000000..71fe15075 --- /dev/null +++ b/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; + + +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppProjectPO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppProjectPO.java index b95ba6148..31d5066bf 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppProjectPO.java +++ b/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; - /** - * 关联用户Id - */ - @TableField(value = "user_id") - private String userId; + @TableField(value = "engineering_id") + private String engineeringId; + + /** * 地市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：正常 diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppTopologyDiagramPO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppTopologyDiagramPO.java index f15fbd57b..16de33ae4 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/AppTopologyDiagramPO.java +++ b/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 diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsEdDataPO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsEdDataPO.java new file mode 100644 index 000000000..9141ec48e --- /dev/null +++ b/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; + + +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsFeedbackChatPO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsFeedbackChatPO.java new file mode 100644 index 000000000..f54889a58 --- /dev/null +++ b/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; +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsFeedbackPO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsFeedbackPO.java new file mode 100644 index 000000000..6f2386dc9 --- /dev/null +++ b/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; +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsFilePathPO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsFilePathPO.java new file mode 100644 index 000000000..63f582ec6 --- /dev/null +++ b/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; +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/AppBaseInformationVO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/AppBaseInformationVO.java new file mode 100644 index 000000000..f5ac07de3 --- /dev/null +++ b/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; + + +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/AppProjectVO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/AppProjectVO.java index 31a4e5a16..825f41808 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/AppProjectVO.java +++ b/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; - /** - * 关联用户Id - */ - private String userId; + private String engineeringId; + + private String engineeringName; + /** * 用户名称 */ diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/AppTopologyDiagramVO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/AppTopologyDiagramVO.java index 1bd78898f..581323679 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/AppTopologyDiagramVO.java +++ b/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 diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsFeedbackDetailVO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsFeedbackDetailVO.java new file mode 100644 index 000000000..9dbb4ab0a --- /dev/null +++ b/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 imageUrls; + + private List csFeedbackChatPOList; + + + +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsFeedbackVO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsFeedbackVO.java new file mode 100644 index 000000000..233c4ccc6 --- /dev/null +++ b/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; + + +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/feedback/FeedBackChatController.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/feedback/FeedBackChatController.java new file mode 100644 index 000000000..673f6bcaa --- /dev/null +++ b/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 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 updateChatStatus(@RequestBody@Validated CsFeedbackChatCheckParm CsFeedbackChatCheckParm){ + String methodDescribe = getMethodDescribe("updateChatStatus"); + + Boolean flag = csFeedbackChatService.updateChatStatus(CsFeedbackChatCheckParm); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe); + + } + +} diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/feedback/FeedBackController.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/feedback/FeedBackController.java new file mode 100644 index 000000000..2995eaa99 --- /dev/null +++ b/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 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> queryFeedBackPage(@Validated @RequestBody CsFeedbackQueryParm csFeedbackQueryParm){ + String methodDescribe = getMethodDescribe("queryFeedBackPage"); + + IPage csFeedbackVOIPage = csFeedbackService.queryFeedBackPage(csFeedbackQueryParm); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, csFeedbackVOIPage, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/queryFeedBackDetail") + @ApiOperation("查询反馈详情") + public HttpResult queryFeedBackDetail(@RequestParam("id")String id){ + String methodDescribe = getMethodDescribe("queryFeedBackDetail"); + + CsFeedbackDetailVO csFeedbackDetailVO = csFeedbackService.queryFeedBackDetail(id); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, csFeedbackDetailVO, methodDescribe); + } + +} diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/AppInfoController.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/AppInfoController.java new file mode 100644 index 000000000..8db24954d --- /dev/null +++ b/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 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 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 queryPersonSet(){ + String methodDescribe = getMethodDescribe("queryPersonSet"); + + List 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 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); + } +} diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppBaseInformationMapper.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppBaseInformationMapper.java new file mode 100644 index 000000000..cbff15a29 --- /dev/null +++ b/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 { +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppPersonSetMapper.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppPersonSetMapper.java new file mode 100644 index 000000000..b765d817a --- /dev/null +++ b/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 { +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppProjectMapper.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppProjectMapper.java index 815515ab0..be54c6397 100644 --- a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppProjectMapper.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppProjectMapper.java @@ -23,12 +23,12 @@ public interface AppProjectMapper extends MppBaseMapper { "SELECT\n" + "\ta.id id,\n" + "\ta.`name` name,\n" + - "\ta.user_id user_id,\n" + - "\t\"username\" user_name,\n" + +// "\ta.user_id user_id,\n" + +// "\t\"username\" user_name,\n" + "\ta.area area,\n" + // "\tb.file_path topologyDiagramPath,\n" + - "\ta.lng lng,\n" + - "\ta.lat lat,\n" + +// "\ta.lng lng,\n" + +// "\ta.lat lat,\n" + "\ta.`status` STATUS,\n" + "\ta.create_by create_by,\n" + "\ta.create_time create_time,\n" + diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsEdDataMapper.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsEdDataMapper.java new file mode 100644 index 000000000..7ca6b4a94 --- /dev/null +++ b/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 { +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsFeedbackChatMapper.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsFeedbackChatMapper.java new file mode 100644 index 000000000..bebf5d05c --- /dev/null +++ b/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 { +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsFeedbackMapper.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsFeedbackMapper.java new file mode 100644 index 000000000..d45bd7de7 --- /dev/null +++ b/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 { +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsFilePathMapper.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsFilePathMapper.java new file mode 100644 index 000000000..c358d001e --- /dev/null +++ b/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 { +} \ No newline at end of file diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppBaseInformationMapper.xml b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppBaseInformationMapper.xml new file mode 100644 index 000000000..511422916 --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppBaseInformationMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + id, content, `type`, create_by, create_time, update_by, update_time + + \ No newline at end of file diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppPersonSetMapper.xml b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppPersonSetMapper.xml new file mode 100644 index 000000000..7f433e500 --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppPersonSetMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + id, user_agreement, system_introduction, user_manual, data_base, company_profile, + about_us, `status`, create_by, create_time, update_by, update_time + + \ No newline at end of file diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsEdDataMapper.xml b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsEdDataMapper.xml new file mode 100644 index 000000000..920dea6b6 --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsEdDataMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + id, dev_type, version_no, version_agree, version_date, `describe`, version_type, + `status`, file_path, create_by, create_time, update_by, update_time + + \ No newline at end of file diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsEquipmentDeliveryMapper.xml b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsEquipmentDeliveryMapper.xml index 4649f5c03..ad4ba21eb 100644 --- a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsEquipmentDeliveryMapper.xml +++ b/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, diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsFeedbackChatMapper.xml b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsFeedbackChatMapper.xml new file mode 100644 index 000000000..99bd7c3d8 --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsFeedbackChatMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + id, user_id, chat_content, create_by, create_time, update_by, update_time + + \ No newline at end of file diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsFeedbackMapper.xml b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsFeedbackMapper.xml new file mode 100644 index 000000000..6409560aa --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsFeedbackMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + id, title, `describe`, user_id, create_by, create_time, update_by, update_time, `type`, + `status` + + \ No newline at end of file diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsFilePathMapper.xml b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsFilePathMapper.xml new file mode 100644 index 000000000..4f478bcf4 --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsFilePathMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + id, file_path, `status` + + \ No newline at end of file diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppBaseInformationService.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppBaseInformationService.java new file mode 100644 index 000000000..66fb50487 --- /dev/null +++ b/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{ + + +} diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppPersonSetService.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppPersonSetService.java new file mode 100644 index 000000000..d31341cbe --- /dev/null +++ b/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{ + + +} diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsEdDataService.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsEdDataService.java new file mode 100644 index 000000000..6c75bf149 --- /dev/null +++ b/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{ + + +} diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsFeedbackChatService.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsFeedbackChatService.java new file mode 100644 index 000000000..1e4c36bca --- /dev/null +++ b/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{ + + /** + * @Description: AddFeedbackChat + * @Param: [csFeedbackAddParm] + * @return: java.lang.Boolean + * @Author: clam + * @Date: 2023/4/6 + */ + Boolean AddFeedbackChat(CsFeedbackChatAddParm csFeedbackAddParm); + + Boolean updateChatStatus(CsFeedbackChatCheckParm csFeedbackChatCheckParm); + } diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsFeedbackService.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsFeedbackService.java new file mode 100644 index 000000000..2abb2286c --- /dev/null +++ b/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{ + + /** + * @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 + * @Author: clam + * @Date: 2023/4/6 + */ + IPage queryFeedBackPage(CsFeedbackQueryParm csFeedbackQueryParm); + /** + * @Description: queryFeedBackDetail + * @Param: [id] + * @return: com.njcn.algorithm.pojo.vo.CsFeedbackDetailVO + * @Author: clam + * @Date: 2023/4/7 + */ + CsFeedbackDetailVO queryFeedBackDetail(String id); +} diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsFilePathService.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsFilePathService.java new file mode 100644 index 000000000..5fd34d65a --- /dev/null +++ b/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{ + + +} diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppBaseInformationServiceImpl.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppBaseInformationServiceImpl.java new file mode 100644 index 000000000..e90c656ee --- /dev/null +++ b/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 implements AppBaseInformationService{ + +} diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppPersonSetServiceImpl.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppPersonSetServiceImpl.java new file mode 100644 index 000000000..5966b29fe --- /dev/null +++ b/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 implements AppPersonSetService{ + +} diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppProjectServiceImpl.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppProjectServiceImpl.java index f8b53898e..c313d1201 100644 --- a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppProjectServiceImpl.java +++ b/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 queryWrapper = new QueryWrapper ( ); queryWrapper.eq ("id", appProjectAuditParm.getId ( )); AppProjectPO appProjectPO1 = appProjectMapper.selectOne (queryWrapper); - if (appProjectAuditParm.getUserId ( ) != null || appProjectAuditParm.getName ( ) != null) { - Boolean result = checkName (appProjectAuditParm.getUserId ( ) != null ? appProjectAuditParm.getUserId ( ) : appProjectPO1.getUserId ( ), - appProjectAuditParm.getName ( ) != null ? appProjectAuditParm.getName ( ) : appProjectPO1.getName ( )); - if (result) { - throw new BusinessException (AlgorithmResponseEnum.PROJECT_COMMON_ERROR); - } - } +// if (appProjectAuditParm.getUserId ( ) != null || appProjectAuditParm.getName ( ) != null) { +// Boolean result = checkName (appProjectAuditParm.getUserId ( ) != null ? appProjectAuditParm.getUserId ( ) : appProjectPO1.getUserId ( ), +// appProjectAuditParm.getName ( ) != null ? appProjectAuditParm.getName ( ) : appProjectPO1.getName ( )); +// if (result) { +// throw new BusinessException (AlgorithmResponseEnum.PROJECT_COMMON_ERROR); +// } +// } BeanUtils.copyProperties (appProjectAuditParm, appProjectPO); UpdateWrapper updateWrapper = new UpdateWrapper ( ); updateWrapper.eq ("id", appProjectAuditParm.getId ( )); int i = appProjectMapper.update (appProjectPO, updateWrapper); - Boolean result = checkName (appProjectPO.getUserId ( ), appProjectPO.getName ( )); - if (result) { - throw new BusinessException (AlgorithmResponseEnum.PROJECT_COMMON_ERROR); - } +// Boolean result = checkName (appProjectPO.getUserId ( ), appProjectPO.getName ( )); +// if (result) { +// throw new BusinessException (AlgorithmResponseEnum.PROJECT_COMMON_ERROR); +// } return i == 1 ? true : false; } diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppTopologyDiagramServiceImpl.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppTopologyDiagramServiceImpl.java index bc83df7cc..d00b94012 100644 --- a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppTopologyDiagramServiceImpl.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppTopologyDiagramServiceImpl.java @@ -49,12 +49,10 @@ public class AppTopologyDiagramServiceImpl extends MppServiceImpl implements CsEdDataService{ + +} diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsFeedbackChatServiceImpl.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsFeedbackChatServiceImpl.java new file mode 100644 index 000000000..240830dae --- /dev/null +++ b/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 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 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; + } +} diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsFeedbackServiceImpl.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsFeedbackServiceImpl.java new file mode 100644 index 000000000..ca17f763e --- /dev/null +++ b/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 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 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 queryFeedBackPage(CsFeedbackQueryParm csFeedbackQueryParm) { + Page page = new Page<> (csFeedbackQueryParm.getCurrentPage ( ), csFeedbackQueryParm.getPageSize ( )); + Page returnpage = new Page<> (csFeedbackQueryParm.getCurrentPage ( ), csFeedbackQueryParm.getPageSize ( )); + + QueryWrapper 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 csFeedbackPOPage = this.getBaseMapper ( ).selectPage (page, queryWrapper); + QueryWrapper csFeedbackChatPOQueryWrapper = new QueryWrapper<> (); + List 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 queryWrapper = new QueryWrapper(); + queryWrapper.eq ("id", id).eq ("status", "1"); + List list = csFilePathService.list (queryWrapper); + List collect = list.stream ( ).map (CsFilePathPO::getFilePath).collect (Collectors.toList ( )); + csFeedbackDetailVO.setImageUrls (collect); + QueryWrapper csFeedbackChatPOQueryWrapper = new QueryWrapper(); + csFeedbackChatPOQueryWrapper.eq ("id", id).eq ("status", "1").orderByAsc ("create_time"); + List list1 = csFeedbackChatService.list (csFeedbackChatPOQueryWrapper); + csFeedbackDetailVO.setCsFeedbackChatPOList (list1); + return csFeedbackDetailVO; + } +} diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsFilePathServiceImpl.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsFilePathServiceImpl.java new file mode 100644 index 000000000..a3ab8a6ef --- /dev/null +++ b/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 implements CsFilePathService{ + +}