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

台账识别码修改

Browse Source
This commit is contained in:
chendaofei
2025-01-06 09:38:32 +08:00
parent 417b36c884
commit 1b169830f9
2 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/utils/DeviceUtil.java
View File

@@ -23,7 +23,7 @@ public class DeviceUtil {
public static String decoderString(Integer cd,String content){ public static String decoderString(Integer cd,String content){
String seriesTmp = null; String seriesTmp = null;
if (cd == 0) { if (cd == 0) {
seriesTmp = Base64.decodeBase64(content).toString(); seriesTmp = new String(Base64.decodeBase64(content));
} else if (cd == 1) { } else if (cd == 1) {
seriesTmp = ThreeDesUtil.decryptThreeDes(content); seriesTmp = ThreeDesUtil.decryptThreeDes(content);
} else if (cd == 2) { } else if (cd == 2) {

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

@@ -274,7 +274,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
deviceDetail.setUpdateTime(LocalDateTime.now()); deviceDetail.setUpdateTime(LocalDateTime.now());
//处理装置识别码秘钥 //处理装置识别码秘钥
coderM3d(deviceDetail); coderM3d(deviceDetail,false);
deviceMapper.insert(deviceDetail); deviceMapper.insert(deviceDetail);
//装置功能 //装置功能
List<DictData> funList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.DEV_FUN.getName()).getData(); List<DictData> funList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.DEV_FUN.getName()).getData();
@@ -633,7 +633,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
Device deviceDetail = new Device(); Device deviceDetail = new Device();
BeanUtils.copyProperties(updateDeviceParam, deviceDetail); BeanUtils.copyProperties(updateDeviceParam, deviceDetail);
deviceDetail.setId(updateDeviceParam.getDevIndex()); deviceDetail.setId(updateDeviceParam.getDevIndex());
coderM3d(deviceDetail); coderM3d(deviceDetail,true);
this.updateById(device); this.updateById(device);
deviceMapper.updateById(deviceDetail); deviceMapper.updateById(deviceDetail);
} }
@@ -813,13 +813,25 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
return true; return true;
} }
private void coderM3d(Device deviceDetail){ private void coderM3d(Device deviceDetail,Boolean updateFlag){
if(StrUtil.isNotBlank(deviceDetail.getDevKey())){ if(updateFlag){
deviceDetail.setDevKey(DeviceUtil.encodeString(devCD,deviceDetail.getDevKey())); Device deviceRes = deviceMapper.selectById(deviceDetail.getId());
} if(StrUtil.isNotBlank(deviceDetail.getDevKey()) && !deviceRes.getSeries().equals(deviceDetail.getDevKey())){
if(StrUtil.isNotBlank(deviceDetail.getSeries())){ deviceDetail.setDevKey(DeviceUtil.encodeString(devCD,deviceDetail.getDevKey()));
deviceDetail.setSeries(DeviceUtil.encodeString(devCD,deviceDetail.getSeries())); }
if(StrUtil.isNotBlank(deviceDetail.getSeries()) && !deviceRes.getSeries().equals(deviceDetail.getSeries())){
deviceDetail.setSeries(DeviceUtil.encodeString(devCD,deviceDetail.getSeries()));
}
}else {
if(StrUtil.isNotBlank(deviceDetail.getDevKey())){
deviceDetail.setDevKey(DeviceUtil.encodeString(devCD,deviceDetail.getDevKey()));
}
if(StrUtil.isNotBlank(deviceDetail.getSeries())){
deviceDetail.setSeries(DeviceUtil.encodeString(devCD,deviceDetail.getSeries()));
}
} }
} }
private void decoderM3d(Device deviceDetail){ private void decoderM3d(Device deviceDetail){
if(StrUtil.isNotBlank(deviceDetail.getDevKey())){ if(StrUtil.isNotBlank(deviceDetail.getDevKey())){
@@ -951,7 +963,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
Device deviceDetail = deviceMapper.selectById(device.getId()); Device deviceDetail = deviceMapper.selectById(device.getId());
//解密 //解密
decoderM3d(deviceDetail); //decoderM3d(deviceDetail);
BeanUtils.copyProperties(deviceDetail, deviceVO); BeanUtils.copyProperties(deviceDetail, deviceVO);
deviceVO.setDevIndex(device.getId()); deviceVO.setDevIndex(device.getId());
//母线 //母线
@@ -1011,7 +1023,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
Device deviceDetail = deviceMapper.selectById(obj.getId()); Device deviceDetail = deviceMapper.selectById(obj.getId());
//解密 //解密
decoderM3d(deviceDetail); //decoderM3d(deviceDetail);
BeanUtils.copyProperties(deviceDetail, deviceVO); BeanUtils.copyProperties(deviceDetail, deviceVO);
deviceVO.setDevIndex(obj.getId()); deviceVO.setDevIndex(obj.getId());
@@ -1107,7 +1119,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
deviceVO.setSort(device.getSort()); deviceVO.setSort(device.getSort());
Device deviceDetail = deviceMapper.selectById(device.getId()); Device deviceDetail = deviceMapper.selectById(device.getId());
//解密 //解密
decoderM3d(deviceDetail); //decoderM3d(deviceDetail);
BeanUtils.copyProperties(deviceDetail, deviceVO); BeanUtils.copyProperties(deviceDetail, deviceVO);
deviceVO.setDevIndex(device.getId()); deviceVO.setDevIndex(device.getId());
@@ -1158,7 +1170,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
Device deviceDetail = deviceMapper.selectById(device.getId()); Device deviceDetail = deviceMapper.selectById(device.getId());
//解密 //解密
decoderM3d(deviceDetail); //decoderM3d(deviceDetail);
BeanUtils.copyProperties(deviceDetail, deviceVO); BeanUtils.copyProperties(deviceDetail, deviceVO);
deviceVO.setDevIndex(device.getId()); deviceVO.setDevIndex(device.getId());