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

修改定版bug

Browse Source
This commit is contained in:
hzj
2026-02-02 16:36:30 +08:00
parent 996ec87ea8
commit c772c9cd81
6 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/PatternRegex.java
View File

@@ -258,7 +258,7 @@ public interface PatternRegex {
/** /**
* 任意字符，长度在1-20位，常用于名称、编码等常规录入 * 任意字符，长度在1-20位，常用于名称、编码等常规录入
*/ */
String ALL_CHAR_1_20 = "^[-_A-Za-z0-9\\u4e00-\\u9fa5]{1,20}$"; String ALL_CHAR_1_20 = "^[-_A-Za-z0-9\\u4e00-\\u9fa5]{1,32}$";
String SPECIALCHARACTER ="[<>%'%;()&+/\\\\-\\\\\\\\_|@*?#$!,.]|html"; String SPECIALCHARACTER ="[<>%'%;()&+/\\\\-\\\\\\\\_|@*?#$!,.]|html";

3
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/PqsTransformerMapper.xml
View File

@@ -15,6 +15,7 @@
STATUS = 1 STATUS = 1
</select> </select>
<select id="sortTransformer" resultType="java.lang.Integer"> <select id="sortTransformer" resultType="java.lang.Integer">
select IFNULL(max(pqs_transformer.sort),0) from pqs_transformer order by update_time desc select IFNULL(max(pqs_transformer.sort),0) from pqs_transformer
<!-- order by update_time desc-->
</select> </select>
</mapper> </mapper>

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

@@ -119,7 +119,7 @@ public class PqsTflgployServiceImpl extends ServiceImpl<PqsTflgployMapper, PqsTf
} }
private void addList(TflgployParam param, PqsTflgploy tflgploy, boolean save, List<PqsTflgployass> info) { private void addList(TflgployParam param, PqsTflgploy tflgploy, boolean save, List<PqsTflgployass> info) {
if(save){ // if(save){
List<String> tfIndexs = param.getTfIndexs(); List<String> tfIndexs = param.getTfIndexs();
if(CollUtil.isNotEmpty(tfIndexs)){ if(CollUtil.isNotEmpty(tfIndexs)){
PqsTflgployass ass; PqsTflgployass ass;
@@ -129,7 +129,7 @@ public class PqsTflgployServiceImpl extends ServiceImpl<PqsTflgployMapper, PqsTf
ass.setTfIndex(tfIndex); ass.setTfIndex(tfIndex);
info.add(ass); info.add(ass);
} }
} // }
} }
} }

2
pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/TerminalVersionServiceImpl.java
View File

@@ -38,7 +38,7 @@ public class TerminalVersionServiceImpl implements TerminalVersionService {
List<TerminalVersionVO> devList = terminalVersionMapper.getTerminalVersionInfo(terminalMainQueryParam); List<TerminalVersionVO> devList = terminalVersionMapper.getTerminalVersionInfo(terminalMainQueryParam);
if(CollectionUtil.isEmpty(devList)){ if(CollectionUtil.isEmpty(devList)){
throw new BusinessException(DeviceResponseEnum.DEVICE_EMPTY); return devList;
} }
List<String> subIndexes = devList.stream().map(TerminalVersionVO::getPid).collect(Collectors.toList()); List<String> subIndexes = devList.stream().map(TerminalVersionVO::getPid).collect(Collectors.toList());
List<TerminalVersionVO> subList =terminalVersionMapper.getPqLineGdAndSubList(subIndexes); List<TerminalVersionVO> subList =terminalVersionMapper.getPqLineGdAndSubList(subIndexes);

2
pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineDetailMapper.xml
View File

@@ -43,7 +43,7 @@
a.name lineName, a.name lineName,
c.Time_Interval, c.Time_Interval,
d.Scale AS scale, d.Scale AS scale,
c.Obj_Id obyId, c.Obj_Id objId,
c.Big_Obj_Type bigObjType c.Big_Obj_Type bigObjType
from pq_line a from pq_line a
inner join pq_line b on a.pid = b.id inner join pq_line b on a.pid = b.id

3
pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml
View File

@@ -1269,7 +1269,8 @@
SELECT SELECT
voltage.id as id, voltage.id as id,
sub.id as pid, sub.id as pid,
concat( sub.NAME, " ", voltage.NAME ) as name, <!-- 兼容国产数据库-->
concat( sub.NAME, ' ', voltage.NAME ) as name,
voltage.Sort as sort voltage.Sort as sort
FROM FROM
pq_line voltage pq_line voltage