Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码提交

Browse Source
This commit is contained in:
huangzj
2023-10-11 09:57:29 +08:00
parent 3faf9a39d5
commit 60dcf51013
12 changed files with 129 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/CsEquipmentDeliveryDTO.java
View File

@@ -99,5 +99,5 @@ public class CsEquipmentDeliveryDTO {
private Integer runStatus;
private Integer moduleNumber;
private Integer process;
}

3
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/LineParamDTO.java
View File

@@ -23,4 +23,7 @@ public class LineParamDTO {
@ApiModelProperty(value = "设备id")
private String devId;
@ApiModelProperty(value = "监测点id")
private String lineId;
}

5
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsLedgerMapper.xml
View File

@@ -40,7 +40,7 @@
</select>
<select id="queryLine" resultType="com.njcn.csdevice.pojo.po.CsLedger">
select id from cs_ledger a where a.`Level`='3' and a.state='1'
select * from cs_ledger a where a.`Level`='3' and a.state='1'
<if test="lineParamdto.engineerId!=null and lineParamdto.engineerId!=''">
and FIND_IN_SET(#{lineParamdto.engineerId}, a.pids )
</if>
@@ -50,6 +50,9 @@
<if test="lineParamdto.devId!=null and lineParamdto.devId!=''">
and FIND_IN_SET(#{lineParamdto.devId}, a.pids )
</if>
<if test="lineParamdto.lineId!=null and lineParamdto.lineId!=''">
and a.id=#{lineParamdto.lineId}
</if>
</select>