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

终端统计及appbug修改

Browse Source
This commit is contained in:
huangzj
2023-05-16 08:47:49 +08:00
parent 40339b22f8
commit 1ff7080bc9
36 changed files with 686 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEdDataAddParm.java
View File

@@ -31,7 +31,8 @@ public class CsEdDataAddParm {
@ApiModelProperty(value = "装置型号")
@NotBlank(message="装置型号不能为空！")
private String devType;
@ApiModelProperty(value = "装置类型")
private String type;
/**
* 版本号
*/

9
pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEdDataAuditParm.java
View File

@@ -8,6 +8,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.validation.constraints.NotNull;
import java.time.LocalDate;
import java.util.Date;
/**
*
@@ -30,7 +31,8 @@ public class CsEdDataAuditParm {
*/
@ApiModelProperty(value = "装置型号")
private String devType;
@ApiModelProperty(value = "装置类型")
private String type;
/**
* 版本号
*/
@@ -49,7 +51,7 @@ public class CsEdDataAuditParm {
@ApiModelProperty(value = "版本日期")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDate versionDate;
private Date versionDate;
/**
* 描述
@@ -65,7 +67,8 @@ public class CsEdDataAuditParm {
@ApiModelProperty(value = "crc信息")
private String crcInfo;
@ApiModelProperty(value="0：删除 1：正常")
private String status;
@ApiModelProperty(value = ".bin文件")
private MultipartFile file;

12
pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEquipmentDeliveryAddParm.java
View File

@@ -50,12 +50,12 @@ public class CsEquipmentDeliveryAddParm{
@NotBlank(message="装置用途不能为空！")
private String devUse;
/**
* 装置类型(直连设备、网关设备)
*/
@ApiModelProperty(value="装置类型")
@NotBlank(message="装置类型不能为空！")
private String devType;
// /**
// * 装置类型(直连设备、网关设备)
// */
// @ApiModelProperty(value="装置类型")
// @NotBlank(message="装置类型不能为空！")
// private String devType;
/**
* 装置型号（pqs588、pqs680...）

10
pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEquipmentDeliveryAuditParm.java
View File

@@ -48,11 +48,11 @@ public class CsEquipmentDeliveryAuditParm {
@ApiModelProperty(value="装置用途")
private String devUse;
/**
* 装置类型(直连设备、网关设备)
*/
@ApiModelProperty(value="装置类型")
private String devType;
// /**
// * 装置类型(直连设备、网关设备)
// */
// @ApiModelProperty(value="装置类型")
// private String devType;
/**
* 装置型号（pqs588、pqs680...）

10
pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsEquipmentDeliveryQueryParm.java
View File

@@ -44,11 +44,11 @@ public class CsEquipmentDeliveryQueryParm {
@ApiModelProperty(value="装置用途")
private String devUse;
/**
* 装置类型(直连设备、网关设备)
*/
@ApiModelProperty(value="装置类型")
private String devType;
// /**
// * 装置类型(直连设备、网关设备)
// */
// @ApiModelProperty(value="装置类型")
// private String devType;
/**
* 装置型号（pqs588、pqs680...）

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

@@ -4,6 +4,7 @@ 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 io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@@ -35,7 +36,11 @@ public class CsEdDataPO extends BaseEntity {
*/
@TableField(value = "dev_type")
private String devType;
/**
* 装置类型(直连设备、网关设备)
*/
@TableField(value = "type")
private String type;
/**
* 版本号
*/

10
pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsEquipmentDeliveryPO.java
View File

@@ -52,11 +52,11 @@ public class CsEquipmentDeliveryPO extends BaseEntity {
@TableField(value = "dev_use")
private String devUse;
/**
* 装置类型(直连设备、网关设备)
*/
@TableField(value = "dev_type")
private String devType;
// /**
// * 装置类型(直连设备、网关设备)
// */
// @TableField(value = "dev_type")
// private String devType;
/**
* 装置型号（pqs588、pqs680...）

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

@@ -37,6 +37,9 @@ public class AppTopologyDiagramVO extends BaseEntity {
@ApiModelProperty(value = "项目Id")
private String projectId;
@ApiModelProperty(value = "项目名称")
private String projectName;
/**
* 拓扑图文件路径
*/

8
pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsDevModelPageVO.java
View File

@@ -1,10 +1,14 @@
package com.njcn.algorithm.pojo.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.njcn.db.bo.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;
/**
*
@@ -46,7 +50,9 @@ public class CsDevModelPageVO extends BaseEntity {
* 版本日期
*/
@ApiModelProperty(value = "版本日期")
private LocalDate versionDate;
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date versionDate;
/**
* 装置模板文件路径

13
pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsEdDataVO.java
View File

@@ -1,10 +1,13 @@
package com.njcn.algorithm.pojo.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.njcn.db.bo.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDate;
import java.util.Date;
/**
*
@@ -30,7 +33,8 @@ public class CsEdDataVO extends BaseEntity {
private String devType;
@ApiModelProperty(value = "装置名称")
private String devName;
@ApiModelProperty(value = "装置类型")
private String type;
/**
* 版本号
@@ -47,8 +51,10 @@ public class CsEdDataVO extends BaseEntity {
/**
* 版本日期
*/
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty(value = "版本日期")
private LocalDate versionDate;
private Date versionDate;
/**
* 描述
@@ -56,6 +62,9 @@ public class CsEdDataVO extends BaseEntity {
@ApiModelProperty(value = "描述")
private String description;
@ApiModelProperty(value = "状态")
private String status;
/**
* 版本类型
*/

10
pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsEquipmentDeliveryVO.java
View File

@@ -51,11 +51,11 @@ public class CsEquipmentDeliveryVO extends BaseEntity {
@ApiModelProperty(value="装置用途")
private String devUse;
/**
* 装置类型(直连设备、网关设备)
*/
@ApiModelProperty(value="装置类型")
private String devType;
// /**
// * 装置类型(直连设备、网关设备)
// */
// @ApiModelProperty(value="装置类型")
// private String devType;
/**
* 装置型号（pqs588、pqs680...）

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

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.njcn.algorithm.pojo.po.CsFeedbackChatPO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import java.util.List;
@@ -60,7 +61,8 @@ public class CsFeedbackDetailVO {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime createTime;
private List<String> imageUrls;

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

@@ -3,6 +3,7 @@ package com.njcn.algorithm.pojo.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
@@ -59,7 +60,8 @@ public class CsFeedbackVO {
@ApiModelProperty(value = "未读消息条数")
private int chatCount;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime createTime;

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

@@ -29,7 +29,7 @@
FROM cs_ed_data a
LEFT JOIN sys_dict_data b ON a.dev_type = b.id
WHERE
1 = 1 And a.`status`='1'
1 = 1
<if test="csEdDataQueryParm.versionStartDate != null and csEdDataQueryParm.versionStartDate != ''">
AND a.version_date &gt;= #{csEdDataQueryParm.versionStartDate }
</if>

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

@@ -6,13 +6,16 @@ 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.algorithm.mapper.AppProjectMapper;
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.AppProjectPO;
import com.njcn.algorithm.pojo.po.AppTopologyDiagramPO;
import com.njcn.algorithm.pojo.vo.AppTopologyDiagramVO;
import com.njcn.algorithm.service.AppProjectService;
import com.njcn.algorithm.service.AppTopologyDiagramService;
import com.njcn.oss.constant.OssPath;
import com.njcn.oss.utils.FileStorageUtil;
@@ -41,6 +44,7 @@ public class AppTopologyDiagramServiceImpl extends MppServiceImpl<AppTopologyDia
private final FileStorageUtil fileStorageUtil;
private final AppProjectMapper appServiceMapper;
private final AppTopologyDiagramMapper appTopologyDiagramMapper;
@Override
@@ -91,9 +95,13 @@ public class AppTopologyDiagramServiceImpl extends MppServiceImpl<AppTopologyDia
eq (StringUtils.isNotBlank (appTopologyDiagramAuditParm.getProjectId ()),"project_id",appTopologyDiagramAuditParm.getProjectId ()).
like (StringUtils.isNotBlank (appTopologyDiagramAuditParm.getName ()),"name", appTopologyDiagramAuditParm.getName ());
List<AppTopologyDiagramPO> list = this.list (queryWrapper);
List<AppTopologyDiagramVO> collect = list.stream ( ).map (temp -> {
AppTopologyDiagramVO vo = new AppTopologyDiagramVO ( );
BeanUtils.copyProperties (temp, vo);
AppProjectPO appProjectPO = appServiceMapper.selectById(vo.getProjectId());
vo.setProjectName(appProjectPO.getName());
vo.setFilePath (fileStorageUtil.getFileUrl (vo.getFilePath ()));
return vo;
}).collect (Collectors.toList ( ));
@@ -114,6 +122,9 @@ public class AppTopologyDiagramServiceImpl extends MppServiceImpl<AppTopologyDia
List<AppTopologyDiagramVO> collect = tempPage.getRecords ( ).stream ( ).map (temp -> {
AppTopologyDiagramVO vo = new AppTopologyDiagramVO ( );
BeanUtils.copyProperties (temp, vo);
AppProjectPO appProjectPO = appServiceMapper.selectById(vo.getProjectId());
vo.setProjectName(appProjectPO.getName());
vo.setFilePath (fileStorageUtil.getFileUrl (temp.getFilePath ( )));
return vo;
}).collect (Collectors.toList ( ));

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

@@ -31,7 +31,7 @@ spring:
shared-configs:
- data-id: share-config.yaml
refresh: true
- data-Id: share-config-datasource-db.yaml
- data-Id: algorithm-config.yaml
refresh: true
main:
allow-bean-definition-overriding: true