Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

项目移动

Browse Source
This commit is contained in:
huangzj
2023-03-30 10:01:57 +08:00
parent 346530b0a0
commit d6489cc376
39 changed files with 270 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pom.xml
View File

@@ -19,7 +19,6 @@
<module>pqs-event</module>
<module>pqs-job</module>
<module>pqs-job/job-api</module>
<module>pqs-advance</module>
<module>pqs-prepare</module>
<module>pqs-process</module>
<module>pqs-algorithm</module>
@@ -42,17 +41,22 @@
</distributionManagement>
<properties>
<!--中间件目标地址-->
<middle.server.url>192.168.1.13</middle.server.url>
<!-- <middle.server.url>198.120.100.195</middle.server.url>-->
<middle.server.url>192.168.1.18</middle.server.url>
<!--微服务模块发布地址-->
<service.server.url>192.168.1.139</service.server.url>
<!-- <service.server.url>198.120.100.195</service.server.url>-->
<service.server.url>192.168.1.114</service.server.url>
<!--docker仓库地址-->
<docker.server.url>192.168.1.31</docker.server.url>
<docker.server.url>192.168.1.13</docker.server.url>
<!--nacos的ip:port-->
<nacos.url>${middle.server.url}:18848</nacos.url>
<!--服务器发布内容为空-->
<!-- <nacos.namespace></nacos.namespace>-->
<nacos.namespace>415a1c87-33aa-47bd-8e25-13cc456c87ed</nacos.namespace>
<!-- <nacos.namespace></nacos.namespace>-->
<!-- <nacos.namespace>fd74182b-1fce-4dba-afa7-2623b0376205</nacos.namespace>-->
<!-- <nacos.namespace>ba3ba5d1-3480-4755-8b87-6b1fce16201c</nacos.namespace>-->
<nacos.namespace>fe40a052-d787-48f4-940f-688cabdff26a</nacos.namespace>
<!--sentinel:port-->
<!-- <sentinel.url>192.168.1.14:8080</sentinel.url>-->
<sentinel.url>${middle.server.url}:8080</sentinel.url>
<!--网关地址，主要用于配置swagger中认证token-->
<gateway.url>${service.server.url}:10215</gateway.url>

24
pqs-advance/pom.xml
View File

@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>pqs</artifactId>
<groupId>com.njcn</groupId>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pqs-advance</artifactId>
<packaging>pom</packaging>
<modules>
<module>advance-api</module>
<module>advance-boot</module>
</modules>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>
</project>

6
pqs-advance/advance-api/main/java/com/njcn/advance/enums/AdvanceResponseEnum.java → pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/enums/AlgorithmResponseEnum.java
View File

@@ -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;
}

2
pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppProjectAddParm.java → pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppProjectAddParm.java
View File

@@ -1,4 +1,4 @@
package com.njcn.advance.pojo.param;
package com.njcn.algorithm.pojo.param;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

2
pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppProjectAuditParm.java → pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppProjectAuditParm.java
View File

@@ -1,4 +1,4 @@
package com.njcn.advance.pojo.param;
package com.njcn.algorithm.pojo.param;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

2
pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppProjectQueryParm.java → pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppProjectQueryParm.java
View File

@@ -1,4 +1,4 @@
package com.njcn.advance.pojo.param;
package com.njcn.algorithm.pojo.param;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

4
pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppTopologyDiagramAddParm.java → pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAddParm.java
View File

@@ -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;
/**

2
pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppTopologyDiagramAuditParm.java → pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramAuditParm.java
View File

@@ -1,4 +1,4 @@
package com.njcn.advance.pojo.param;
package com.njcn.algorithm.pojo.param;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

37
pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryPageParm.java Normal file
View File

@@ -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;
}

2
pqs-advance/advance-api/main/java/com/njcn/advance/pojo/param/AppTopologyDiagramQueryParm.java → pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/param/AppTopologyDiagramQueryParm.java
View File

@@ -1,4 +1,4 @@
package com.njcn.advance.pojo.param;
package com.njcn.algorithm.pojo.param;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

2
pqs-advance/advance-api/main/java/com/njcn/advance/pojo/po/AppLineTopologyDiagramPO.java → pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/AppLineTopologyDiagramPO.java
View File

@@ -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;

2
pqs-advance/advance-api/main/java/com/njcn/advance/pojo/po/AppProjectPO.java → pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/AppProjectPO.java
View File

@@ -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;

2
pqs-advance/advance-api/main/java/com/njcn/advance/pojo/po/AppTopologyDiagramPO.java → pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/po/AppTopologyDiagramPO.java
View File

@@ -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;

2
pqs-advance/advance-api/main/java/com/njcn/advance/pojo/vo/AppProjectVO.java → pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/vo/AppProjectVO.java
View File

@@ -1,4 +1,4 @@
package com.njcn.advance.pojo.vo;
package com.njcn.algorithm.pojo.vo;
import lombok.Data;

2
pqs-advance/advance-api/main/java/com/njcn/advance/pojo/vo/AppTopologyDiagramVO.java → pqs-algorithm/algorithm-api/main/java/com/njcn/algorithm/pojo/vo/AppTopologyDiagramVO.java
View File

@@ -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;

4
pqs-advance/advance-api/pom.xml → pqs-algorithm/algorithm-api/pom.xml
View File

@@ -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">
<parent>
<artifactId>pqs-advance</artifactId>
<artifactId>pqs-algorithm</artifactId>
<groupId>com.njcn</groupId>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>algorithm-api</artifactId>
<artifactId>advance-api</artifactId>
<dependencies>
<dependency>
<groupId>com.njcn</groupId>

8
pqs-advance/advance-boot/pom.xml → pqs-algorithm/algorithm-boot/pom.xml
View File

@@ -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">
<parent>
<artifactId>pqs-advance</artifactId>
<artifactId>pqs-algorithm</artifactId>
<groupId>com.njcn</groupId>
<version>1.0.0</version>
</parent>
@@ -48,7 +48,7 @@
</dependency>
<dependency>
<groupId>com.njcn</groupId>
<artifactId>advance-api</artifactId>
<artifactId>algorithm-api</artifactId>
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
@@ -60,7 +60,7 @@
</dependency>
</dependencies>
<artifactId>advance-boot</artifactId>
<artifactId>algorithm-boot</artifactId>
<properties>
<maven.compiler.source>8</maven.compiler.source>
@@ -68,7 +68,7 @@
</properties>
<build>
<finalName>advanceboot</finalName>
<finalName>algorithmboot</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>

6
pqs-advance/advance-boot/src/main/java/com/njcn/advance/AdvanceBootApplication.java → pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/AlgorithmBootApplication.java
View File

@@ -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);
}
}

12
pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/project/AppProjectController.java → pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/AppProjectController.java
View File

@@ -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;

31
pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/project/AppTopologyController.java → pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/AppTopologyController.java
View File

@@ -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<List<AppTopologyDiagramVO>> queryAppTopologyDiagram(@Validated @RequestBody AppTopologyDiagramQueryParm appTopologyDiagramAuditParm){
@ApiImplicitParam(name = "appTopologyDiagramQueryParm", value = "拓扑图查询参数", required = true)
public HttpResult<List<AppTopologyDiagramVO>> queryAppTopologyDiagram(@Validated @RequestBody AppTopologyDiagramQueryParm appTopologyDiagramQueryParm){
String methodDescribe = getMethodDescribe("queryAppTopologyDiagram");
List<AppTopologyDiagramVO> appTopologyDiagramVOList = appTopologyDiagramService.queryAppTopologyDiagram(appTopologyDiagramAuditParm);
List<AppTopologyDiagramVO> 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<IPage<AppTopologyDiagramVO>> queryTopologyDiagramPage(@Validated @RequestBody AppTopologyDiagramQueryPageParm appTopologyDiagramQueryPageParm){
String methodDescribe = getMethodDescribe("queryTopologyDiagramPage");
IPage<AppTopologyDiagramVO> appTopologyDiagramVOList = appTopologyDiagramService.queryTopologyDiagramPage(appTopologyDiagramQueryPageParm);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, appTopologyDiagramVOList, methodDescribe);
}

26
pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/LineTopologyDiagramController.java Normal file
View File

@@ -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 {
}

4
pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/AppLineTopologyDiagramMapper.java → pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppLineTopologyDiagramMapper.java
View File

@@ -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;
/**
*

8
pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/AppProjectMapper.java → pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppProjectMapper.java
View File

@@ -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;

4
pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/AppTopologyDiagramMapper.java → pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/AppTopologyDiagramMapper.java
View File

@@ -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;
/**
*

4
pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/mapping/AppLineTopologyDiagramMapper.xml → pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppLineTopologyDiagramMapper.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.advance.mapper.AppLineTopologyDiagramMapper">
<resultMap id="BaseResultMap" type="com.njcn.advance.pojo.po.AppLineTopologyDiagramPO">
<mapper namespace="com.njcn.algorithm.mapper.AppLineTopologyDiagramMapper">
<resultMap id="BaseResultMap" type="com.njcn.algorithm.pojo.po.AppLineTopologyDiagramPO">
<!--@mbg.generated-->
<!--@Table app_line_topology_diagram-->
<id column="id" jdbcType="VARCHAR" property="id" />

4
pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/mapping/AppProjectMapper.xml → pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppProjectMapper.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.advance.mapper.AppProjectMapper">
<resultMap id="BaseResultMap" type="com.njcn.advance.pojo.po.AppProjectPO">
<mapper namespace="com.njcn.algorithm.mapper.AppProjectMapper">
<resultMap id="BaseResultMap" type="com.njcn.algorithm.pojo.po.AppProjectPO">
<!--@mbg.generated-->
<!--@Table app_project-->
<id column="id" jdbcType="VARCHAR" property="id" />

4
pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/mapping/AppTopologyDiagramMapper.xml → pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/AppTopologyDiagramMapper.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.advance.mapper.AppTopologyDiagramMapper">
<resultMap id="BaseResultMap" type="com.njcn.advance.pojo.po.AppTopologyDiagramPO">
<mapper namespace="com.njcn.algorithm.mapper.AppTopologyDiagramMapper">
<resultMap id="BaseResultMap" type="com.njcn.algorithm.pojo.po.AppTopologyDiagramPO">
<!--@mbg.generated-->
<!--@Table app_topology_diagram-->
<id column="id" jdbcType="VARCHAR" property="id" />

4
pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/AppLineTopologyDiagramService.java → pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppLineTopologyDiagramService.java
View File

@@ -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:

12
pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/AppProjectService.java → pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppProjectService.java
View File

@@ -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;
/**
*

24
pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/AppTopologyDiagramService.java → pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/AppTopologyDiagramService.java
View File

@@ -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<AppTopologyDiagra
* @Date: 2023/3/29
*/
List<AppTopologyDiagramVO> queryAppTopologyDiagram(AppTopologyDiagramQueryParm appTopologyDiagramAuditParm);
}
/**
* @Description: queryTopologyDiagramPage
* @Param: [appTopologyDiagramQueryPageParm]
* @return: com.baomidou.mybatisplus.core.metadata.IPage<com.njcn.advance.pojo.vo.AppTopologyDiagramVO>
* @Author: clam
* @Date: 2023/3/29
*/
IPage<AppTopologyDiagramVO> queryTopologyDiagramPage(AppTopologyDiagramQueryPageParm appTopologyDiagramQueryPageParm);
}

8
pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/AppLineTopologyDiagramServiceImpl.java → pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppLineTopologyDiagramServiceImpl.java
View File

@@ -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;
/**

24
pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/AppProjectServiceImpl.java → pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppProjectServiceImpl.java
View File

@@ -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<AppProjectMapper, AppP
AppProjectPO appProjectPO = new AppProjectPO ( );
Boolean result = checkName (appProjectAddOrAuditParm.getUserId ( ), appProjectAddOrAuditParm.getName ( ));
if (result) {
throw new BusinessException (AdvanceResponseEnum.PROJECT_COMMON_ERROR);
throw new BusinessException (AlgorithmResponseEnum.PROJECT_COMMON_ERROR);
}
BeanUtils.copyProperties (appProjectAddOrAuditParm, appProjectPO);
appProjectPO.setStatus ("1");
@@ -85,7 +85,7 @@ public class AppProjectServiceImpl extends MppServiceImpl<AppProjectMapper, AppP
Boolean result = checkName (appProjectAuditParm.getUserId ( ) != null ? appProjectAuditParm.getUserId ( ) : appProjectPO1.getUserId ( ),
appProjectAuditParm.getName ( ) != null ? appProjectAuditParm.getName ( ) : appProjectPO1.getName ( ));
if (result) {
throw new BusinessException (AdvanceResponseEnum.PROJECT_COMMON_ERROR);
throw new BusinessException (AlgorithmResponseEnum.PROJECT_COMMON_ERROR);
}
}
@@ -96,7 +96,7 @@ public class AppProjectServiceImpl extends MppServiceImpl<AppProjectMapper, AppP
int i = appProjectMapper.update (appProjectPO, updateWrapper);
Boolean result = checkName (appProjectPO.getUserId ( ), appProjectPO.getName ( ));
if (result) {
throw new BusinessException (AdvanceResponseEnum.PROJECT_COMMON_ERROR);
throw new BusinessException (AlgorithmResponseEnum.PROJECT_COMMON_ERROR);
}
return i == 1 ? true : false;
}

48
pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/AppTopologyDiagramServiceImpl.java → pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/AppTopologyDiagramServiceImpl.java
View File

@@ -1,16 +1,19 @@
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.google.common.base.Objects;
import com.njcn.advance.mapper.AppTopologyDiagramMapper;
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.advance.service.AppTopologyDiagramService;
import com.njcn.algorithm.mapper.AppTopologyDiagramMapper;
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 com.njcn.algorithm.service.AppTopologyDiagramService;
import com.njcn.oss.constant.OssPath;
import com.njcn.oss.utils.FileStorageUtil;
import lombok.RequiredArgsConstructor;
@@ -38,6 +41,8 @@ public class AppTopologyDiagramServiceImpl extends MppServiceImpl<AppTopologyDia
private final FileStorageUtil fileStorageUtil;
private final AppTopologyDiagramMapper appTopologyDiagramMapper;
@Override
@Transactional(rollbackFor = {Exception.class})
public Boolean addAppTopologyDiagram(AppTopologyDiagramAddParm appTopologyDiagramAddParm) {
@@ -47,7 +52,7 @@ public class AppTopologyDiagramServiceImpl extends MppServiceImpl<AppTopologyDia
long size = file.getSize ( );
String filePath = fileStorageUtil.uploadMultipart (file, OssPath.TOPOLOGY);
appTopologyDiagramPO.setFilePath (filePath);
appTopologyDiagramPO.setProjectId (appTopologyDiagramAddParm.getProjectId ());
appTopologyDiagramPO.setProjectId (appTopologyDiagramAddParm.getProjectId ()==null?"":appTopologyDiagramAddParm.getProjectId ());
appTopologyDiagramPO.setName (appTopologyDiagramAddParm.getTopologyDiagramName ());
appTopologyDiagramPO.setFileSize (Integer.valueOf (size+""));
appTopologyDiagramPO.setStatus ("1");
@@ -74,7 +79,7 @@ public class AppTopologyDiagramServiceImpl extends MppServiceImpl<AppTopologyDia
if(appTopologyDiagramAuditParm.getStatus ()!=null&&appTopologyDiagramAuditParm.getTopologyDiagramName ()!=""){
appTopologyDiagramPO.setStatus (appTopologyDiagramAuditParm.getStatus ());
}
UpdateWrapper<AppTopologyDiagramPO> updateWrapper = new UpdateWrapper ();
UpdateWrapper<AppTopologyDiagramPO> 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<AppTopologyDia
@Override
public List<AppTopologyDiagramVO> queryAppTopologyDiagram(AppTopologyDiagramQueryParm appTopologyDiagramAuditParm) {
QueryWrapper<AppTopologyDiagramPO> queryWrapper = new QueryWrapper ();
QueryWrapper<AppTopologyDiagramPO> 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<AppTopologyDia
}).collect (Collectors.toList ( ));
return collect;
}
@Override
public IPage<AppTopologyDiagramVO> queryTopologyDiagramPage(AppTopologyDiagramQueryPageParm appTopologyDiagramQueryPageParm) {
Page<AppTopologyDiagramVO> returnpage = new Page<> (appTopologyDiagramQueryPageParm.getCurrentPage ( ), appTopologyDiagramQueryPageParm.getPageSize ( ));
Page<AppTopologyDiagramPO> tempPage = new Page<> (appTopologyDiagramQueryPageParm.getCurrentPage ( ), appTopologyDiagramQueryPageParm.getPageSize ( ));
QueryWrapper<AppTopologyDiagramPO> 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<AppTopologyDiagramVO> 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;
}
}

2
pqs-advance/advance-boot/src/main/resources/bootstrap.yml → pqs-algorithm/algorithm-boot/src/main/resources/bootstrap.yml
View File

@@ -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}

0
pqs-advance/advance-boot/src/main/resources/qvvr_balance.dll → pqs-algorithm/algorithm-boot/src/main/resources/qvvr_balance.dll
View File

0
pqs-advance/advance-boot/src/main/resources/qvvr_dll.dll → pqs-algorithm/algorithm-boot/src/main/resources/qvvr_dll.dll
View File

0
pqs-advance/advance-boot/src/main/resources/qvvr_dll_cause.dll → pqs-algorithm/algorithm-boot/src/main/resources/qvvr_dll_cause.dll
View File

46
pqs-algorithm/algorithm-boot/src/main/resources/sql20230227dll.sql Normal file
View File

@@ -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='项目拓扑图关系表';

6
pqs-algorithm/pom.xml
View File

@@ -10,11 +10,15 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>pqs-algorithm</artifactId>
<packaging>pom</packaging>
<modules>
<module>algorithm-api</module>
<module>algorithm-boot</module>
</modules>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
</project>