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

1.台账模块新增字段迁移微服务

Browse Source
This commit is contained in:
雨木c
2023-08-28 16:28:32 +08:00
parent 04960a3911
commit e52c123d2a
13 changed files with 321 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceParam.java
View File

@@ -117,6 +117,18 @@ public class DeviceParam {
@ApiModelProperty(name = "sim",value = "装置sim卡号")
private String sim;
@ApiModelProperty(name = "devSeries",value = "装置系列")
private String devSeries;
@ApiModelProperty(name = "devLocation",value = "监测装置安装位置")
private String devLocation;
@ApiModelProperty(name = "devNo",value = "监测厂家设备编号")
private String devNo;
@ApiModelProperty(name = "isAlarm",value = "告警功能 0:关闭 null、1:开启")
private Integer isAlarm;
@ApiModelProperty(name = "sort",value = "排序",required = true)
@NotNull(message = "排序不可为空")
@Min(value = 0,message = "排序格式有误")

5
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/LineParam.java
View File

@@ -142,14 +142,12 @@ public class LineParam {
* 电压上偏差限值
*/
@ApiModelProperty(name = "voltageDev",value = "电压上偏差限值",required = true)
@NotNull(message = "电压上偏差限值不能为空")
private Float voltageDev;
/**
* 电压下偏差限值
*/
@ApiModelProperty(name = "uvoltageDev",value = "电压下偏差限值",required = true)
@NotNull(message = "电压下偏差限值不能为空")
private Float uvoltageDev;
@ApiModelProperty(name = "powerSubstationName",value = "电网侧变电站")
@@ -164,6 +162,9 @@ public class LineParam {
@ApiModelProperty(name = "superiorsSubstation",value = "上级电站")
private String superiorsSubstation;
@ApiModelProperty(name = "statFlag",value = "是否参与报告统计 0.不参与 1.参与")
private Integer statFlag;
@ApiModelProperty(name = "hangLine",value = "挂接线路")
private String hangLine;

25
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Device.java
View File

@@ -1,6 +1,7 @@
package com.njcn.device.pq.pojo.po;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@@ -136,4 +137,28 @@ public class Device implements Serializable{
*/
private String sim;
/**
* 装置系列
*/
private String devSeries;
/**
* 监测装置安装位置
*/
private String devLocation;
/**
* 监测厂家设备编号
*/
private String devNo;
/**
* 告警功能 0:关闭 null、1:开启
*/
private Integer isAlarm;
}

1
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/LineDetail.java
View File

@@ -125,6 +125,7 @@ public class LineDetail{
private String remark;
/**
* 电网侧变电站
*/

13
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DeviceVO.java
View File

@@ -109,6 +109,19 @@ public class DeviceVO implements Serializable {
@ApiModelProperty(name = "sim",value = "装置sim卡")
private String sim;
@ApiModelProperty(name = "devSeries",value = "装置系列")
private String devSeries;
@ApiModelProperty(name = "devLocation",value = "监测装置安装位置")
private String devLocation;
@ApiModelProperty(name = "devNo",value = "监测厂家设备编号")
private String devNo;
@ApiModelProperty(name = "isAlarm",value = "告警功能 0:关闭 null、1:开启")
private Integer isAlarm;
@ApiModelProperty(name = "sort",value = "排序",required = true)
private Integer sort;

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

@@ -12,6 +12,7 @@ import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.common.config.GeneralInfo;
import com.njcn.common.pojo.dto.SimpleDTO;
import com.njcn.common.pojo.enums.common.DataStateEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
@@ -107,6 +108,8 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
private final FileStorageUtil fileStorageUtil;
private final GeneralInfo generalInfo;
/**
* 终端新增操作
@@ -254,6 +257,9 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
deviceDetail.setNextTimeCheck(PubUtils.localDateFormat(deviceParam.getNextTimeCheck()));
deviceDetail.setLoginTime(PubUtils.localDateFormat(deviceParam.getNextTimeCheck()));
deviceDetail.setUpdateTime(LocalDateTime.now());
//处理装置识别码秘钥
deviceMapper.insert(deviceDetail);
//装置功能
List<DictData> funList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.DEV_FUN.getName()).getData();

72
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/utils/DeviceUtil.java
View File

@@ -1,5 +1,9 @@
package com.njcn.device.pq.utils;
import com.njcn.common.utils.sm.Sm4Utils;
import com.njcn.common.utils.sm.ThreeDesUtil;
import org.apache.commons.codec.binary.Base64;
/**
* pqs
*
@@ -8,35 +12,51 @@ package com.njcn.device.pq.utils;
*/
public class DeviceUtil {
/**
* 根据电压大小获取基准容量
*
* cd 系统配置的解密方式
* content 需要解密的内容
* 解密对应内容
* @author cdf
* @date 2021/7/19
* @date 2021/10/12
*/
public static Float getJCAPByScale(String sacleName) {
if (sacleName.equals("6kV") || sacleName.equals("10kV")) {
return 100f;
} else if (sacleName.equals("20kV")) {
return 200f;
} else if (sacleName.equals("35kV")) {
return 250f;
} else if (sacleName.equals("66kV")) {
return 500f;
} else if (sacleName.equals("110kV")) {
return 750f;
} else if (sacleName.equals("220kV")) {
return 2000f;
} else if (sacleName.equals("330kV")) {
return 3000f;
} else if (sacleName.equals("500kV")) {
return 4500f;
} else if (sacleName.equals("750kV")) {
return 7000f;
} else if (sacleName.equals("1000kV")) {
return 9000f;
} else {
return 10f;
public static String decoderString(Integer cd,String content){
String seriesTmp = null;
if (cd == 0) {
seriesTmp = Base64.decodeBase64(content).toString();
} else if (cd == 1) {
seriesTmp = ThreeDesUtil.decryptThreeDes(content);
} else if (cd == 2) {
//SM4加密密码
String secretkey = Sm4Utils.globalSecretKey;
Sm4Utils sm4 = new Sm4Utils(secretkey);
seriesTmp = sm4.decryptData_ECB(content);
}
return seriesTmp;
}
/**
*
* cd 系统配置的加密方式
* content 需要加密的内容
* 加密对应内容
* @author cdf
* @date 2021/10/12
*/
public static String encodeString(Integer cd,String content){
String key = null;
if (cd == 0) {
key = Base64.encodeBase64String(content.getBytes());
} else if (cd == 1) {
key = ThreeDesUtil.encryptThreeDes(content);
} else if (cd == 2) {
//SM4加密密码
String secretkey = Sm4Utils.globalSecretKey;
Sm4Utils sm4 = new Sm4Utils(secretkey);
key = sm4.encryptData_ECB(content);
}
return key;
}
}