diff --git a/pom.xml b/pom.xml index 331adc19f..4afc1017a 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,6 @@ pqs-event pqs-job pqs-job/job-api - pqs-advance pqs-prepare pqs-process pqs-algorithm @@ -42,17 +41,22 @@ - 192.168.1.13 + + 192.168.1.18 - 192.168.1.139 + + 192.168.1.114 - 192.168.1.31 + 192.168.1.13 ${middle.server.url}:18848 - - 415a1c87-33aa-47bd-8e25-13cc456c87ed + + + + fe40a052-d787-48f4-940f-688cabdff26a + ${middle.server.url}:8080 ${service.server.url}:10215 diff --git a/pqs-advance/pom.xml b/pqs-advance/pom.xml deleted file mode 100644 index 8bca4d039..000000000 --- a/pqs-advance/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - pqs - com.njcn - 1.0.0 - - 4.0.0 - - pqs-advance - pom - - advance-api - advance-boot - - - - 8 - 8 - - - \ No newline at end of file diff --git a/pqs-advance/advance-api/main/java/com/njcn/advance/enums/AdvanceResponseEnum.java b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/enums/AlgorithmResponseEnum.java similarity index 75% rename from pqs-advance/advance-api/main/java/com/njcn/advance/enums/AdvanceResponseEnum.java rename to pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/enums/AlgorithmResponseEnum.java index 6967791b6..e3ebb1cd4 100644 --- a/pqs-advance/advance-api/main/java/com/njcn/advance/enums/AdvanceResponseEnum.java +++ b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/enums/AlgorithmResponseEnum.java @@ -1,4 +1,4 @@ -package com.njcn.advance.enums; +package com.njcn.algorithm.enums; import lombok.Getter; @@ -9,7 +9,7 @@ import lombok.Getter; * @date 2021/6/21 */ @Getter -public enum AdvanceResponseEnum { +public enum AlgorithmResponseEnum { /** * A00500 ~ A01550 用于终端模块的枚举 @@ -22,7 +22,7 @@ public enum AdvanceResponseEnum { private final String message; - AdvanceResponseEnum(String code, String message) { + AlgorithmResponseEnum(String code, String message) { this.code = code; this.message = message; } diff --git a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppProjectAddParm.java b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppProjectAddParm.java similarity index 97% rename from pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppProjectAddParm.java rename to pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppProjectAddParm.java index 256011c42..079a83d61 100644 --- a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppProjectAddParm.java +++ b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppProjectAddParm.java @@ -1,4 +1,4 @@ -package com.njcn.advance.pojo.param; +package com.njcn.algorithm.pojo.param; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppProjectAuditParm.java b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppProjectAuditParm.java similarity index 96% rename from pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppProjectAuditParm.java rename to pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppProjectAuditParm.java index 391014461..574af0de4 100644 --- a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppProjectAuditParm.java +++ b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppProjectAuditParm.java @@ -1,4 +1,4 @@ -package com.njcn.advance.pojo.param; +package com.njcn.algorithm.pojo.param; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppProjectQueryParm.java b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppProjectQueryParm.java similarity index 96% rename from pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppProjectQueryParm.java rename to pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppProjectQueryParm.java index dadb886e8..39eae6958 100644 --- a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppProjectQueryParm.java +++ b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppProjectQueryParm.java @@ -1,4 +1,4 @@ -package com.njcn.advance.pojo.param; +package com.njcn.algorithm.pojo.param; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppTopologyDiagramAddParm.java b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAddParm.java similarity index 91% rename from pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppTopologyDiagramAddParm.java rename to pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAddParm.java index ba0448738..d8e853320 100644 --- a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppTopologyDiagramAddParm.java +++ b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAddParm.java @@ -1,4 +1,4 @@ -package com.njcn.advance.pojo.param; +package com.njcn.algorithm.pojo.param; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -35,7 +35,7 @@ public class AppTopologyDiagramAddParm { * 项目Id */ @ApiModelProperty(value = "项目Id") - @NotBlank(message="项目Id不能为空！") +// @NotBlank(message="项目Id不能为空！") private String projectId; /** diff --git a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppTopologyDiagramAuditParm.java b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAuditParm.java similarity index 96% rename from pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppTopologyDiagramAuditParm.java rename to pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAuditParm.java index bed15da71..d663ba333 100644 --- a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppTopologyDiagramAuditParm.java +++ b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAuditParm.java @@ -1,4 +1,4 @@ -package com.njcn.advance.pojo.param; +package com.njcn.algorithm.pojo.param; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryPageParm.java b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryPageParm.java new file mode 100644 index 000000000..4d38c352f --- /dev/null +++ b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryPageParm.java @@ -0,0 +1,37 @@ +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: 2022/11/11 15:20【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Data +public class AppTopologyDiagramQueryPageParm { + + @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; + + + @ApiModelProperty(value="拓扑图名称") + private String searchValue; + + + @ApiModelProperty(value="项目Id") + private String projectId; + +} diff --git a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppTopologyDiagramQueryParm.java b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryParm.java similarity index 92% rename from pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppTopologyDiagramQueryParm.java rename to pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryParm.java index 77783eb8b..c7bbe37b9 100644 --- a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppTopologyDiagramQueryParm.java +++ b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryParm.java @@ -1,4 +1,4 @@ -package com.njcn.advance.pojo.param; +package com.njcn.algorithm.pojo.param; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/po/AppLineTopologyDiagramPO.java b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/AppLineTopologyDiagramPO.java similarity index 95% rename from pqs-advance/advance-api/main/java/com/njcn/advance/pojo/po/AppLineTopologyDiagramPO.java rename to pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/AppLineTopologyDiagramPO.java index f7b132599..aff6173ea 100644 --- a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/po/AppLineTopologyDiagramPO.java +++ b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/AppLineTopologyDiagramPO.java @@ -1,4 +1,4 @@ -package com.njcn.advance.pojo.po; +package com.njcn.algorithm.pojo.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/po/AppProjectPO.java b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/AppProjectPO.java similarity index 97% rename from pqs-advance/advance-api/main/java/com/njcn/advance/pojo/po/AppProjectPO.java rename to pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/AppProjectPO.java index 909a2f27e..b95ba6148 100644 --- a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/po/AppProjectPO.java +++ b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/AppProjectPO.java @@ -1,4 +1,4 @@ -package com.njcn.advance.pojo.po; +package com.njcn.algorithm.pojo.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/po/AppTopologyDiagramPO.java b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/AppTopologyDiagramPO.java similarity index 96% rename from pqs-advance/advance-api/main/java/com/njcn/advance/pojo/po/AppTopologyDiagramPO.java rename to pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/AppTopologyDiagramPO.java index c5c649928..f15fbd57b 100644 --- a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/po/AppTopologyDiagramPO.java +++ b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/AppTopologyDiagramPO.java @@ -1,4 +1,4 @@ -package com.njcn.advance.pojo.po; +package com.njcn.algorithm.pojo.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/vo/AppProjectVO.java b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/vo/AppProjectVO.java similarity index 97% rename from pqs-advance/advance-api/main/java/com/njcn/advance/pojo/vo/AppProjectVO.java rename to pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/vo/AppProjectVO.java index 67b87e3e6..31a4e5a16 100644 --- a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/vo/AppProjectVO.java +++ b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/vo/AppProjectVO.java @@ -1,4 +1,4 @@ -package com.njcn.advance.pojo.vo; +package com.njcn.algorithm.pojo.vo; import lombok.Data; diff --git a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/vo/AppTopologyDiagramVO.java b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/vo/AppTopologyDiagramVO.java similarity index 96% rename from pqs-advance/advance-api/main/java/com/njcn/advance/pojo/vo/AppTopologyDiagramVO.java rename to pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/vo/AppTopologyDiagramVO.java index 4d4aed41e..1bd78898f 100644 --- a/pqs-advance/advance-api/main/java/com/njcn/advance/pojo/vo/AppTopologyDiagramVO.java +++ b/pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/vo/AppTopologyDiagramVO.java @@ -1,4 +1,4 @@ -package com.njcn.advance.pojo.vo; +package com.njcn.algorithm.pojo.vo; import com.njcn.db.bo.BaseEntity; import io.swagger.annotations.ApiModelProperty; diff --git a/pqs-advance/advance-api/pom.xml b/pqs-algorithm/algorithm-api/pom.xml similarity index 94% rename from pqs-advance/advance-api/pom.xml rename to pqs-algorithm/algorithm-api/pom.xml index 959bb63cf..ea461c39d 100644 --- a/pqs-advance/advance-api/pom.xml +++ b/pqs-algorithm/algorithm-api/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - pqs-advance + pqs-algorithm com.njcn 1.0.0 4.0.0 + algorithm-api - advance-api com.njcn diff --git a/pqs-advance/advance-boot/pom.xml b/pqs-algorithm/algorithm-boot/pom.xml similarity index 96% rename from pqs-advance/advance-boot/pom.xml rename to pqs-algorithm/algorithm-boot/pom.xml index 9c6f5d867..5afd48a32 100644 --- a/pqs-advance/advance-boot/pom.xml +++ b/pqs-algorithm/algorithm-boot/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - pqs-advance + pqs-algorithm com.njcn 1.0.0 @@ -48,7 +48,7 @@ com.njcn - advance-api + algorithm-api 1.0.0 compile @@ -60,7 +60,7 @@ - advance-boot + algorithm-boot 8 @@ -68,7 +68,7 @@ - advanceboot + algorithmboot org.apache.maven.plugins diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/AdvanceBootApplication.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/AlgorithmBootApplication.java similarity index 81% rename from pqs-advance/advance-boot/src/main/java/com/njcn/advance/AdvanceBootApplication.java rename to pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/AlgorithmBootApplication.java index dcfd58792..fa54819fd 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/AdvanceBootApplication.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/AlgorithmBootApplication.java @@ -1,4 +1,4 @@ -package com.njcn.advance; +package com.njcn.algorithm; /** * @author denghuajun * @version 1.0.0 @@ -15,8 +15,8 @@ import org.springframework.cloud.openfeign.EnableFeignClients; @EnableFeignClients(basePackages = "com.njcn") @SpringBootApplication(scanBasePackages = "com.njcn") public class -AdvanceBootApplication { +AlgorithmBootApplication { public static void main(String[] args) { - SpringApplication.run(AdvanceBootApplication.class, args); + SpringApplication.run(AlgorithmBootApplication.class, args); } } diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/project/AppProjectController.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/AppProjectController.java similarity index 90% rename from pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/project/AppProjectController.java rename to pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/AppProjectController.java index aed525617..542b68616 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/project/AppProjectController.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/AppProjectController.java @@ -1,11 +1,11 @@ -package com.njcn.advance.controller.project; +package com.njcn.algorithm.controller.project; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.njcn.advance.pojo.param.AppProjectAddParm; -import com.njcn.advance.pojo.param.AppProjectAuditParm; -import com.njcn.advance.pojo.param.AppProjectQueryParm; -import com.njcn.advance.pojo.vo.AppProjectVO; -import com.njcn.advance.service.AppProjectService; +import com.njcn.algorithm.pojo.param.AppProjectAddParm; +import com.njcn.algorithm.pojo.param.AppProjectAuditParm; +import com.njcn.algorithm.pojo.param.AppProjectQueryParm; +import com.njcn.algorithm.pojo.vo.AppProjectVO; +import com.njcn.algorithm.service.AppProjectService; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/project/AppTopologyController.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/AppTopologyController.java similarity index 67% rename from pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/project/AppTopologyController.java rename to pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/AppTopologyController.java index a4adae33b..838e3684c 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/project/AppTopologyController.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/AppTopologyController.java @@ -1,10 +1,12 @@ -package com.njcn.advance.controller.project; +package com.njcn.algorithm.controller.project; -import com.njcn.advance.pojo.param.AppTopologyDiagramAddParm; -import com.njcn.advance.pojo.param.AppTopologyDiagramAuditParm; -import com.njcn.advance.pojo.param.AppTopologyDiagramQueryParm; -import com.njcn.advance.pojo.vo.AppTopologyDiagramVO; -import com.njcn.advance.service.AppTopologyDiagramService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.njcn.algorithm.pojo.param.AppTopologyDiagramAddParm; +import com.njcn.algorithm.pojo.param.AppTopologyDiagramAuditParm; +import com.njcn.algorithm.pojo.param.AppTopologyDiagramQueryPageParm; +import com.njcn.algorithm.pojo.param.AppTopologyDiagramQueryParm; +import com.njcn.algorithm.pojo.vo.AppTopologyDiagramVO; +import com.njcn.algorithm.service.AppTopologyDiagramService; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; @@ -12,6 +14,7 @@ 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; @@ -65,10 +68,22 @@ public class AppTopologyController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/queryAppTopologyDiagram") @ApiOperation("查询拓扑图") - public HttpResult> queryAppTopologyDiagram(@Validated @RequestBody AppTopologyDiagramQueryParm appTopologyDiagramAuditParm){ + @ApiImplicitParam(name = "appTopologyDiagramQueryParm", value = "拓扑图查询参数", required = true) + public HttpResult> queryAppTopologyDiagram(@Validated @RequestBody AppTopologyDiagramQueryParm appTopologyDiagramQueryParm){ String methodDescribe = getMethodDescribe("queryAppTopologyDiagram"); - List appTopologyDiagramVOList = appTopologyDiagramService.queryAppTopologyDiagram(appTopologyDiagramAuditParm); + List appTopologyDiagramVOList = appTopologyDiagramService.queryAppTopologyDiagram(appTopologyDiagramQueryParm); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, appTopologyDiagramVOList, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/queryTopologyDiagramPage") + @ApiOperation("查询拓扑图分页") + @ApiImplicitParam(name = "appTopologyDiagramQueryPageParm", value = "拓扑图查询参数", required = true) + public HttpResult> queryTopologyDiagramPage(@Validated @RequestBody AppTopologyDiagramQueryPageParm appTopologyDiagramQueryPageParm){ + String methodDescribe = getMethodDescribe("queryTopologyDiagramPage"); + + IPage appTopologyDiagramVOList = appTopologyDiagramService.queryTopologyDiagramPage(appTopologyDiagramQueryPageParm); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, appTopologyDiagramVOList, methodDescribe); } diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/LineTopologyDiagramController.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/LineTopologyDiagramController.java new file mode 100644 index 000000000..a812f5958 --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/LineTopologyDiagramController.java @@ -0,0 +1,26 @@ +package com.njcn.algorithm.controller.project; + +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/3/30 9:02【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Slf4j +@RestController +@RequestMapping("/lineTopologyDiagram") +@Api(tags = " 拓扑图-监测点") +@AllArgsConstructor +public class LineTopologyDiagramController extends BaseController { + + +} diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/AppLineTopologyDiagramMapper.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppLineTopologyDiagramMapper.java similarity index 78% rename from pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/AppLineTopologyDiagramMapper.java rename to pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppLineTopologyDiagramMapper.java index 74da788c9..63c007e74 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/AppLineTopologyDiagramMapper.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppLineTopologyDiagramMapper.java @@ -1,7 +1,7 @@ -package com.njcn.advance.mapper; +package com.njcn.algorithm.mapper; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; -import com.njcn.advance.pojo.po.AppLineTopologyDiagramPO; +import com.njcn.algorithm.pojo.po.AppLineTopologyDiagramPO; /** * diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/AppProjectMapper.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppProjectMapper.java similarity index 91% rename from pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/AppProjectMapper.java rename to pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppProjectMapper.java index 4a9d25ca1..815515ab0 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/AppProjectMapper.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppProjectMapper.java @@ -1,10 +1,10 @@ -package com.njcn.advance.mapper; +package com.njcn.algorithm.mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; -import com.njcn.advance.pojo.param.AppProjectQueryParm; -import com.njcn.advance.pojo.po.AppProjectPO; -import com.njcn.advance.pojo.vo.AppProjectVO; +import com.njcn.algorithm.pojo.param.AppProjectQueryParm; +import com.njcn.algorithm.pojo.po.AppProjectPO; +import com.njcn.algorithm.pojo.vo.AppProjectVO; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/AppTopologyDiagramMapper.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppTopologyDiagramMapper.java similarity index 78% rename from pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/AppTopologyDiagramMapper.java rename to pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppTopologyDiagramMapper.java index 37bbea397..7d9d4056f 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/AppTopologyDiagramMapper.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppTopologyDiagramMapper.java @@ -1,7 +1,7 @@ -package com.njcn.advance.mapper; +package com.njcn.algorithm.mapper; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; -import com.njcn.advance.pojo.po.AppTopologyDiagramPO; +import com.njcn.algorithm.pojo.po.AppTopologyDiagramPO; /** * diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/mapping/AppLineTopologyDiagramMapper.xml b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppLineTopologyDiagramMapper.xml similarity index 83% rename from pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/mapping/AppLineTopologyDiagramMapper.xml rename to pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppLineTopologyDiagramMapper.xml index 0ce444a3d..ec8c56fbc 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/mapping/AppLineTopologyDiagramMapper.xml +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppLineTopologyDiagramMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/mapping/AppProjectMapper.xml b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppProjectMapper.xml similarity index 88% rename from pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/mapping/AppProjectMapper.xml rename to pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppProjectMapper.xml index e668a176f..c006323ec 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/mapping/AppProjectMapper.xml +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppProjectMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/mapping/AppTopologyDiagramMapper.xml b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppTopologyDiagramMapper.xml similarity index 87% rename from pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/mapping/AppTopologyDiagramMapper.xml rename to pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppTopologyDiagramMapper.xml index 8e0d3bdbc..780d11322 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/mapping/AppTopologyDiagramMapper.xml +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppTopologyDiagramMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/AppLineTopologyDiagramService.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppLineTopologyDiagramService.java similarity index 78% rename from pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/AppLineTopologyDiagramService.java rename to pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppLineTopologyDiagramService.java index 4755e3a3a..8f067121c 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/AppLineTopologyDiagramService.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppLineTopologyDiagramService.java @@ -1,7 +1,7 @@ -package com.njcn.advance.service; +package com.njcn.algorithm.service; import com.github.jeffreyning.mybatisplus.service.IMppService; -import com.njcn.advance.pojo.po.AppLineTopologyDiagramPO; +import com.njcn.algorithm.pojo.po.AppLineTopologyDiagramPO; /** * * Description: diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/AppProjectService.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppProjectService.java similarity index 80% rename from pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/AppProjectService.java rename to pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppProjectService.java index 5a40d0cb5..4ca8c8fd2 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/AppProjectService.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppProjectService.java @@ -1,12 +1,12 @@ -package com.njcn.advance.service; +package com.njcn.algorithm.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.jeffreyning.mybatisplus.service.IMppService; -import com.njcn.advance.pojo.param.AppProjectAddParm; -import com.njcn.advance.pojo.param.AppProjectAuditParm; -import com.njcn.advance.pojo.param.AppProjectQueryParm; -import com.njcn.advance.pojo.po.AppProjectPO; -import com.njcn.advance.pojo.vo.AppProjectVO; +import com.njcn.algorithm.pojo.param.AppProjectAddParm; +import com.njcn.algorithm.pojo.param.AppProjectAuditParm; +import com.njcn.algorithm.pojo.param.AppProjectQueryParm; +import com.njcn.algorithm.pojo.po.AppProjectPO; +import com.njcn.algorithm.pojo.vo.AppProjectVO; /** * diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/AppTopologyDiagramService.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppTopologyDiagramService.java similarity index 60% rename from pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/AppTopologyDiagramService.java rename to pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppTopologyDiagramService.java index 452f26150..efd0ffcb1 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/AppTopologyDiagramService.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppTopologyDiagramService.java @@ -1,11 +1,13 @@ -package com.njcn.advance.service; +package com.njcn.algorithm.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.jeffreyning.mybatisplus.service.IMppService; -import com.njcn.advance.pojo.param.AppTopologyDiagramAddParm; -import com.njcn.advance.pojo.param.AppTopologyDiagramAuditParm; -import com.njcn.advance.pojo.param.AppTopologyDiagramQueryParm; -import com.njcn.advance.pojo.po.AppTopologyDiagramPO; -import com.njcn.advance.pojo.vo.AppTopologyDiagramVO; +import com.njcn.algorithm.pojo.param.AppTopologyDiagramAddParm; +import com.njcn.algorithm.pojo.param.AppTopologyDiagramAuditParm; +import com.njcn.algorithm.pojo.param.AppTopologyDiagramQueryPageParm; +import com.njcn.algorithm.pojo.param.AppTopologyDiagramQueryParm; +import com.njcn.algorithm.pojo.po.AppTopologyDiagramPO; +import com.njcn.algorithm.pojo.vo.AppTopologyDiagramVO; import java.util.List; @@ -44,4 +46,12 @@ public interface AppTopologyDiagramService extends IMppService queryAppTopologyDiagram(AppTopologyDiagramQueryParm appTopologyDiagramAuditParm); - } + /** + * @Description: queryTopologyDiagramPage + * @Param: [appTopologyDiagramQueryPageParm] + * @return: com.baomidou.mybatisplus.core.metadata.IPage + * @Author: clam + * @Date: 2023/3/29 + */ + IPage queryTopologyDiagramPage(AppTopologyDiagramQueryPageParm appTopologyDiagramQueryPageParm); +} diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/AppLineTopologyDiagramServiceImpl.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppLineTopologyDiagramServiceImpl.java similarity index 67% rename from pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/AppLineTopologyDiagramServiceImpl.java rename to pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppLineTopologyDiagramServiceImpl.java index 4798a4e60..f3224e154 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/AppLineTopologyDiagramServiceImpl.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppLineTopologyDiagramServiceImpl.java @@ -1,9 +1,9 @@ -package com.njcn.advance.service.impl; +package com.njcn.algorithm.service.impl; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; -import com.njcn.advance.mapper.AppLineTopologyDiagramMapper; -import com.njcn.advance.pojo.po.AppLineTopologyDiagramPO; -import com.njcn.advance.service.AppLineTopologyDiagramService; +import com.njcn.algorithm.mapper.AppLineTopologyDiagramMapper; +import com.njcn.algorithm.pojo.po.AppLineTopologyDiagramPO; +import com.njcn.algorithm.service.AppLineTopologyDiagramService; import org.springframework.stereotype.Service; /** diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/AppProjectServiceImpl.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppProjectServiceImpl.java similarity index 89% rename from pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/AppProjectServiceImpl.java rename to pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppProjectServiceImpl.java index cd6aa71b8..f8b53898e 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/AppProjectServiceImpl.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppProjectServiceImpl.java @@ -1,18 +1,18 @@ -package com.njcn.advance.service.impl; +package com.njcn.algorithm.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.advance.enums.AdvanceResponseEnum; -import com.njcn.advance.mapper.AppProjectMapper; -import com.njcn.advance.pojo.param.*; -import com.njcn.advance.pojo.po.AppProjectPO; -import com.njcn.advance.pojo.vo.AppProjectVO; -import com.njcn.advance.pojo.vo.AppTopologyDiagramVO; -import com.njcn.advance.service.AppProjectService; -import com.njcn.advance.service.AppTopologyDiagramService; +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; +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; @@ -47,7 +47,7 @@ public class AppProjectServiceImpl extends MppServiceImpl updateWrapper = new UpdateWrapper (); + UpdateWrapper updateWrapper = new UpdateWrapper<> (); updateWrapper.eq ("id",appTopologyDiagramAuditParm.getId ()); boolean update = this.update (appTopologyDiagramPO, updateWrapper); return update; @@ -82,7 +87,7 @@ public class AppTopologyDiagramServiceImpl extends MppServiceImpl queryAppTopologyDiagram(AppTopologyDiagramQueryParm appTopologyDiagramAuditParm) { - QueryWrapper queryWrapper = new QueryWrapper (); + QueryWrapper queryWrapper = new QueryWrapper<> (); queryWrapper.eq ("status","1"). eq (StringUtils.isNotBlank (appTopologyDiagramAuditParm.getId ()),"id",appTopologyDiagramAuditParm.getId ()). eq (StringUtils.isNotBlank (appTopologyDiagramAuditParm.getProjectId ()),"project_id",appTopologyDiagramAuditParm.getProjectId ()). @@ -96,4 +101,25 @@ public class AppTopologyDiagramServiceImpl extends MppServiceImpl queryTopologyDiagramPage(AppTopologyDiagramQueryPageParm appTopologyDiagramQueryPageParm) { + + Page returnpage = new Page<> (appTopologyDiagramQueryPageParm.getCurrentPage ( ), appTopologyDiagramQueryPageParm.getPageSize ( )); + Page tempPage = new Page<> (appTopologyDiagramQueryPageParm.getCurrentPage ( ), appTopologyDiagramQueryPageParm.getPageSize ( )); + + QueryWrapper queryWrapper = new QueryWrapper<> (); + queryWrapper.eq ("status","1"). + eq (StringUtils.isNotBlank (appTopologyDiagramQueryPageParm.getProjectId ()),"project_id",appTopologyDiagramQueryPageParm.getProjectId ()). + like (StringUtils.isNotBlank (appTopologyDiagramQueryPageParm.getSearchValue ()),"name", appTopologyDiagramQueryPageParm.getSearchValue ()); + tempPage = appTopologyDiagramMapper.selectPage (tempPage, queryWrapper); + List collect = tempPage.getRecords ( ).stream ( ).map (temp -> { + AppTopologyDiagramVO vo = new AppTopologyDiagramVO ( ); + BeanUtils.copyProperties (temp, vo); + vo.setFilePath (fileStorageUtil.getFileUrl (temp.getFilePath ( ))); + return vo; + }).collect (Collectors.toList ( )); + returnpage.setRecords (collect); + return returnpage; + } } diff --git a/pqs-advance/advance-boot/src/main/resources/bootstrap.yml b/pqs-algorithm/algorithm-boot/src/main/resources/bootstrap.yml similarity index 95% rename from pqs-advance/advance-boot/src/main/resources/bootstrap.yml rename to pqs-algorithm/algorithm-boot/src/main/resources/bootstrap.yml index d112d0ad1..9000aeee6 100644 --- a/pqs-advance/advance-boot/src/main/resources/bootstrap.yml +++ b/pqs-algorithm/algorithm-boot/src/main/resources/bootstrap.yml @@ -47,7 +47,7 @@ logging: #mybatis配置信息 mybatis-plus: #别名扫描 - type-aliases-package: com.njcn.advance.pojo + type-aliases-package: com.njcn.algorithm.pojo mqtt: client-id: @artifactId@${random.value} diff --git a/pqs-advance/advance-boot/src/main/resources/qvvr_balance.dll b/pqs-algorithm/algorithm-boot/src/main/resources/qvvr_balance.dll similarity index 100% rename from pqs-advance/advance-boot/src/main/resources/qvvr_balance.dll rename to pqs-algorithm/algorithm-boot/src/main/resources/qvvr_balance.dll diff --git a/pqs-advance/advance-boot/src/main/resources/qvvr_dll.dll b/pqs-algorithm/algorithm-boot/src/main/resources/qvvr_dll.dll similarity index 100% rename from pqs-advance/advance-boot/src/main/resources/qvvr_dll.dll rename to pqs-algorithm/algorithm-boot/src/main/resources/qvvr_dll.dll diff --git a/pqs-advance/advance-boot/src/main/resources/qvvr_dll_cause.dll b/pqs-algorithm/algorithm-boot/src/main/resources/qvvr_dll_cause.dll similarity index 100% rename from pqs-advance/advance-boot/src/main/resources/qvvr_dll_cause.dll rename to pqs-algorithm/algorithm-boot/src/main/resources/qvvr_dll_cause.dll diff --git a/pqs-algorithm/algorithm-boot/src/main/resources/sql20230227dll.sql b/pqs-algorithm/algorithm-boot/src/main/resources/sql20230227dll.sql new file mode 100644 index 000000000..c60e22105 --- /dev/null +++ b/pqs-algorithm/algorithm-boot/src/main/resources/sql20230227dll.sql @@ -0,0 +1,46 @@ +DROP TABLE IF EXISTS `app_project`; +CREATE TABLE `app_project` ( + `id` varchar(36) NOT NULL COMMENT '项目Id', + `name` varchar(200) NOT NULL COMMENT '项目名称', + `user_id` varchar(100) NOT NULL COMMENT '关联用户Id', + `area_id` varchar(100) NOT NULL COMMENT '地市Id', + `lng` decimal(10,6) NULL COMMENT '中心点经度', + `lat` decimal(10,6) NULL COMMENT '中心点纬度', + `status` tinyint(1) NOT NULL COMMENT '0：删除 1：正常', + `create_by` char(32) NULL COMMENT '创建用户', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_by` char(32) NULL COMMENT '更新用户', + `update_time` datetime NULL COMMENT '更新时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='项目表'; + + + +DROP TABLE IF EXISTS `app_topology_diagram`; +CREATE TABLE `app_topology_diagram` ( + `id` varchar(36) Not NULL COMMENT '拓扑图Id' , + `name` varchar(200) Not NULL COMMENT '拓扑图名称' , + `file_size` int Not NULL COMMENT '文件大小(kb)' , + `project_id` varchar(36) NULL COMMENT '项目Id' , + `file_path` varchar(200) Not NULL COMMENT '拓扑图文件路径' , + `status` tinyint(1) NOT NULL COMMENT '0：删除 1：正常', + `create_by` char(32) NULL COMMENT '创建用户', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_by` char(32) NULL COMMENT '更新用户', + `update_time` datetime NULL COMMENT '更新时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='项目拓扑图关系表'; + +DROP TABLE IF EXISTS `app_line_topology_diagram`; +CREATE TABLE `app_line_topology_diagram` ( + `id` varchar(36) Not NULL COMMENT '拓扑图Id' , + `line_id` varchar(200) Not NULL COMMENT '拓扑图名称' , + `status` tinyint(1) NOT NULL COMMENT '0：删除 1：正常', + `create_by` char(32) NULL COMMENT '创建用户', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_by` char(32) NULL COMMENT '更新用户', + `update_time` datetime NULL COMMENT '更新时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='项目拓扑图关系表'; + + diff --git a/pqs-algorithm/pom.xml b/pqs-algorithm/pom.xml index 8608b4337..1f2277c66 100644 --- a/pqs-algorithm/pom.xml +++ b/pqs-algorithm/pom.xml @@ -10,11 +10,15 @@ 4.0.0 pqs-algorithm + pom + + algorithm-api + algorithm-boot + 8 8 - UTF-8 \ No newline at end of file diff --git a/pqs-common/common-web/src/main/java/com/njcn/web/utils/PqsComasses.java b/pqs-common/common-web/src/main/java/com/njcn/web/utils/PqsComasses.java index af6684087..e611b01a5 100644 --- a/pqs-common/common-web/src/main/java/com/njcn/web/utils/PqsComasses.java +++ b/pqs-common/common-web/src/main/java/com/njcn/web/utils/PqsComasses.java @@ -50,16 +50,16 @@ public class PqsComasses implements Serializable { @Column(name = "data_plt1") private Double dataPlt1; - + //电压闪变等级2 @Column(name = "data_plt2") private Double dataPlt2; - + //电压闪变等级3 @Column(name = "data_plt3") private Double dataPlt3; - + //电压闪变等级4 @Column(name = "data_plt4") private Double dataPlt4; - + //电压闪变等级5 @Column(name = "data_plt5") private Double dataPlt5; diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java index 6a551fc6e..378ae81df 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java @@ -146,6 +146,7 @@ public class DeviceInfoParam implements Serializable { private String searchEndTime; @ApiModelProperty("时间范围标志 0.查询展示天 1.查询展示月") + @Deprecated private Integer timeFlag; @ApiModelProperty("统计类型 1.年 2.季 3.月 4.周 5.天") diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java index 8b5451802..54de9cf04 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java @@ -146,7 +146,7 @@ public class OperationContrController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getDailyDeviceAbnormalStatistics") @ApiOperation("获取终端异常统计") - @ApiImplicitParam(name = "conditionBusinessParam", value = "实体", required = true) + @ApiImplicitParam(name = "param", value = "实体", required = true) public HttpResult> dailyDeviceAbnormalStatistics(@RequestBody PqsParam param) { String methodDescribe = getMethodDescribe("dailyDeviceAbnormalStatistics"); Page result = lineService.dailyDeviceAbnormalStatistics(param); diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TopMsgMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TopMsgMapper.java index 72894ae91..b64d07155 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TopMsgMapper.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TopMsgMapper.java @@ -10,9 +10,9 @@ import org.apache.ibatis.annotations.Param; import java.util.List; public interface TopMsgMapper { - Page getTopMsg(Page page,@Param("lineGrade") String lineGrade, @Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime); - List getTopMsgDetail(@Param("lineGrade") String lineGrade,@Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime); + + List getTopMsgDetail(@Param("lineGrade") String lineGrade,@Param("startTime") DateTime startTime); diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml index 55653e41d..504cbf416 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml @@ -864,7 +864,9 @@ #{item} and - a.Create_Time between #{startTime} and #{endTime} + a.Create_Time between #{startTime} and #{endTime} + and + b.Run_Flag != 2 ) t ORDER BY flowProportion DESC diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TopMagMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TopMagMapper.xml index f25d347ba..922ec093b 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TopMagMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TopMagMapper.xml @@ -5,12 +5,12 @@ SELECT t.*, (t.statisValue)/t.flowMeal flowProportion - FROM - ( - SELECT device.Id AS Id, - device.id AS deviceId, - COUNT(ca.Id) AS alarmCount, - GROUP_CONCAT(ca.Remark) AS alarmDesc, - IFNULL(d.flow, (select flow from cld_flow_meal where type = 0 and flag = 1)) + ifnull(d1.flow, 0) flowMeal, - IFNULL(pmf.Actual_Value,0) statisValue - FROM pq_line line - INNER JOIN pq_line vol ON line.pid=vol.id - INNER JOIN pq_line device ON vol.pid=device.id - LEFT JOIN pq_device pd ON device.id=pd.id - LEFT JOIN pq_line_detail pld ON pld.id=line.id - LEFT JOIN cld_alarm ca ON ca.Line_Id=device.id - LEFT JOIN pqs_month_flow pmf ON pmf.Dev_Id=device.id - LEFT JOIN cld_dev_meal c ON device.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 - WHERE - pd.Dev_Model = 1 - AND - pd.Run_Flag = 0 - AND - pld.Line_Grade is NOT NULL - AND - ca.Occurred_Time between #{startTime} and #{endTime} - GROUP BY deviceId - ) t + FROM + ( + SELECT device.Id AS Id, + device.id AS deviceId, + COUNT(ca.Id) AS alarmCount, + GROUP_CONCAT(ca.Remark) AS alarmDesc, + IFNULL(d.flow, (select flow from cld_flow_meal where type = 0 and flag = 1)) + ifnull(d1.flow, 0) flowMeal, + IFNULL(ANY_VALUE(pmf.Actual_Value),0) statisValue, + ANY_VALUE(device.Update_Time) AS updateTime + FROM pq_line line + INNER JOIN pq_line vol ON line.pid=vol.id + INNER JOIN pq_line device ON vol.pid=device.id + LEFT JOIN pq_device pd ON device.id=pd.id + LEFT JOIN pq_line_detail pld ON pld.id=line.id + LEFT JOIN cld_alarm ca ON ca.Line_Id=device.id + LEFT JOIN pqs_month_flow pmf ON pmf.Dev_Id=device.id + LEFT JOIN cld_dev_meal c ON device.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 + WHERE + pd.Dev_Model = 1 + AND + pd.Run_Flag = 0 + AND + pld.Line_Grade is NOT NULL + AND + ca.Occurred_Time between #{startTime} and #{endTime} + GROUP BY deviceId + ) t ORDER BY flowProportion DESC diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java index 18055bc52..488beef46 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java @@ -2,23 +2,20 @@ package com.njcn.prepare.harmonic.service.mysql.Impl.device; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; -import com.njcn.device.pq.pojo.po.Communicate; import com.njcn.influxdb.param.InfluxDBPublicParam; import com.njcn.influxdb.utils.InfluxDbUtils; import com.njcn.prepare.harmonic.mapper.mysql.device.DeviceAbnormaStatisticsMapper; +import com.njcn.prepare.harmonic.pojo.influxdb.po.Communicate; import com.njcn.prepare.harmonic.pojo.mysql.po.line.AlarmPO; import com.njcn.prepare.harmonic.pojo.mysql.po.line.AlarmStrategyVO; -import com.njcn.prepare.harmonic.pojo.mysql.po.line.LinePO; import com.njcn.prepare.harmonic.pojo.mysql.po.line.TopMsgPO; import com.njcn.prepare.harmonic.pojo.param.DeviceAbnormaStatisticsParam; import com.njcn.prepare.harmonic.service.mysql.device.DeviceAbnormalStatisticsService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; import org.influxdb.dto.QueryResult; import org.influxdb.impl.InfluxDBResultMapper; import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; import java.math.BigDecimal; import java.util.*; @@ -37,33 +34,31 @@ public class DeviceAbnormaStatisticsServiceImpl implements DeviceAbnormalStatist private final InfluxDbUtils influxDbUtils; @Override public boolean dailyDeviceAbnormaStatistics(DeviceAbnormaStatisticsParam param) { + Map> comMap = new HashMap<>();Map> devLineMap = new HashMap<>(); // 获取监测点告警 List lineAlarms = deviceAbnormaStatisticsMapper.getAlarmByLines( DateUtil.beginOfDay(DateUtil.parse(param.getBeginTime())), - DateUtil.beginOfDay(DateUtil.parse(param.getEndTime()))); - Map> lineMap = new HashMap<>(); + DateUtil.endOfDay(DateUtil.parse(param.getEndTime()))); if (CollectionUtil.isNotEmpty(lineAlarms)){ // 根据装置分组 - lineMap = lineAlarms.stream().collect(Collectors.groupingBy(AlarmPO::getDeviceId)); + devLineMap = lineAlarms.stream().collect(Collectors.groupingBy(AlarmPO::getDeviceId)); } - // 获取设备流量 List deviceAlarms = deviceAbnormaStatisticsMapper.getAlarmByDevice( DateUtil.beginOfDay(DateUtil.parse(param.getBeginTime())), - DateUtil.beginOfDay(DateUtil.parse(param.getEndTime()))); + DateUtil.endOfDay(DateUtil.parse(param.getEndTime()))); List devs = deviceAlarms.stream().map(AlarmPO::getId).collect(Collectors.toList()); - devs.add("6469e77fda42db12c7ca6620a092f03c"); - Map> comMap = new HashMap<>(); // 获取通信中断信息 - List communicate = getCommunicate(devs, param.getBeginTime(), param.getEndTime()); - if (CollectionUtil.isNotEmpty(communicate)){ - comMap = communicate.stream().collect(Collectors.groupingBy(Communicate::getId)); + List comMsgs = getCommunicate(devs, param.getBeginTime(), param.getEndTime()); + if (CollectionUtil.isNotEmpty(comMsgs)){ + comMap = comMsgs.stream().collect(Collectors.groupingBy(TopMsgPO::getDevId)); } + // 整合监测点告警信息、数据完整性以及监测点等级为设备信息 for (AlarmPO deviceAlarm : deviceAlarms) { - if (!lineMap.containsKey(deviceAlarm.getId())) { + if (!devLineMap.containsKey(deviceAlarm.getId())) { continue; } - AlarmPO lineAlarm = lineMap.get(deviceAlarm.getId()).get(0); + AlarmPO lineAlarm = devLineMap.get(deviceAlarm.getId()).get(0); deviceAlarm.setAlarmCount(deviceAlarm.getAlarmCount() + lineAlarm.getAlarmCount()); if (lineAlarm.getDue().compareTo(BigDecimal.ZERO) == 0) { deviceAlarm.setIntegrity(BigDecimal.ZERO); @@ -73,15 +68,14 @@ public class DeviceAbnormaStatisticsServiceImpl implements DeviceAbnormalStatist if (lineAlarm.getLevel() != null) { deviceAlarm.setLevel(lineAlarm.getLevel()); } - if (CollectionUtil.isNotEmpty(comMap)) { - List communicates = comMap.get(deviceAlarm.getId()); - int comOut = communicates.stream().filter(t -> t.getType() == 0).collect(Collectors.toList()).size(); - deviceAlarm.setComOutNum(comOut); - } + TopMsgPO topMsgPO = comMap.get(deviceAlarm.getId()).get(0); + deviceAlarm.setComOutNum(topMsgPO.getComOutCount()); + deviceAlarm.setComOutDesc(String.join(",",topMsgPO.getComOutDesc())); } - Map> levelMap = deviceAlarms.stream().collect(Collectors.groupingBy(AlarmPO::getLevel)); + // 比对告警策略并落表 List alarmStrategyVOS = deviceAbnormaStatisticsMapper.selectAlarmStrategy(); List alarmExceptions = new ArrayList<>(); + Map> levelMap = deviceAlarms.stream().collect(Collectors.groupingBy(AlarmPO::getLevel)); for (AlarmStrategyVO strategyVO : alarmStrategyVOS) { if (!levelMap.containsKey(strategyVO.getAlgoDesc())){ continue; @@ -91,7 +85,7 @@ public class DeviceAbnormaStatisticsServiceImpl implements DeviceAbnormalStatist TopMsgPO topMsg = new TopMsgPO(); topMsg.setDevId(alarmPO.getId()); topMsg.setFlowFlag(1); - topMsg.setComOutCount(alarmPO.getComOutNum() == 0 ? 0 : alarmPO.getComOutNum()); + topMsg.setComOutCount(alarmPO.getComOutNum() == null ? 0 : alarmPO.getComOutNum()); if (alarmPO.getIntegrity().intValue() getCommunicate(List devs, String startTime, String endTime) { + public List getCommunicate(List devs, String startTime, String endTime) { //组装sql语句 StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append("time >= '").append(DateUtil.beginOfDay(DateUtil.parse(startTime))).append("' and ").append("time <= '").append(DateUtil.endOfDay(DateUtil.parse(endTime))).append("' and "); @@ -126,7 +120,55 @@ public class DeviceAbnormaStatisticsServiceImpl implements DeviceAbnormalStatist //获取暂降事件 QueryResult result = influxDbUtils.query(sql); InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper(); - List communicateList = influxDBResultMapper.toPOJO(result, Communicate.class); - return communicateList; + List communicates = influxDBResultMapper.toPOJO(result, Communicate.class); + List comMsgs = new ArrayList<>(); + if (CollectionUtil.isEmpty(communicates)) { + return comMsgs; + } + Map> comMap = communicates.stream().collect(Collectors.groupingBy(Communicate::getDevId)); + for (Map.Entry> comEntry : comMap.entrySet()) { + TopMsgPO topMsgPO = new TopMsgPO(); List comOutDesc = new ArrayList<>(); + topMsgPO.setDevId(comEntry.getKey()); + // 根据日期排序 + List sortedList = comEntry.getValue().stream().sorted(Comparator.comparing(Communicate::getUpdateTime)).collect(Collectors.toList()); + if (sortedList.size() == 1) { + if (sortedList.get(0).getType() == 0) { + comOutDesc.add(sortedList.get(0).getUpdateTime()+"至"+DateUtil.endOfDay(DateUtil.parse(endTime))); + } else { + comOutDesc.add((DateUtil.beginOfDay(DateUtil.parse(startTime)))+"至"+sortedList.get(0).getUpdateTime()); + } + } else { + switch (sortedList.get(0).getType()) { + case 0: + for (int i = 0; i a.getType() == 0).collect(Collectors.toList()).size()); + comMsgs.add(topMsgPO); + } + return comMsgs; } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java index 6337f840d..600323826 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java @@ -30,6 +30,7 @@ import org.springframework.util.CollectionUtils; import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.Instant; +import java.time.LocalDateTime; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -532,6 +533,7 @@ public class DayDataServiceImpl implements DayDataService { } + log.info(LocalDateTime.now()+"dayDataJobHandler执行完成!"); } @Override diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicGeneralServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicGeneralServiceImpl.java index 78d68a6c6..4bd29fa33 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicGeneralServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicGeneralServiceImpl.java @@ -152,6 +152,12 @@ public class HarmonicGeneralServiceImpl extends MppServiceImpl lambdaQuery = new LambdaQueryWrapper<>(); @@ -279,6 +275,10 @@ public class PollutionServiceImpl implements PollutionService { map.put("pollutionType",dictData.getId()); map.put("value",pollution.getVInharm()); } + if ("V_Harmonic".equals(dictData.getCode())){ + map.put("pollutionType",dictData.getId()); + map.put("value",pollution.getVHarmonic()); + } } private void processData(DictData dictData, List processList, Map map){