bonus
/
Bonus-Cloud-JYY-Smart-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
liux 2025-11-13 16:43:30 +08:00
parent 97351e5a2c 3fc528065a
commit 4636cbaba7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/healthmachine/service/TCPMonitorService.java
View File

@ -52,7 +52,7 @@ public class TCPMonitorService {
try {
List<CheckDevice> initialDevices = mapper.selectDeviceList();
initialDevices.forEach(device -> {
if (device.getPort().equals("8080")){
if (device.getPort() == 8080){
devices.put(device.getId(), device);
}else{
pingDevices.put(device.getId(), device);

2
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSampleDishesRecordMapper.xml
View File

@ -143,7 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="stallId != null">#{stallId},</if>
<if test="canteenId != null">#{canteenId},</if>
<if test="dishesId != null">#{dishesId},</if>
<if test="imageUrl != null and imageUrl != ''">#{photoUrl},</if>
<if test="imageUrl != null and imageUrl != ''">#{imageUrl},</if>
<if test="machineNo != null">#{machineNo},</if>
<if test="machineSn != null">#{machineSn},</if>
<if test="sampleWeight != null">#{sampleWeight},</if>