haozq
/
lj-zhgd-ht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

近电感应修改

This commit is contained in:
cwchen 2024-09-30 16:34:49 +08:00
parent 5bcd9950ac
commit 55e0d7f46a
5 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysTcpMessage.java
View File

@ -11,4 +11,6 @@ public class SysTcpMessage {
private String devCode; private String devCode;
private float distance; private float distance;
private String nearelectric;
} }

3
bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/app/vo/JdConfigVo.java
View File

@ -43,6 +43,9 @@ public class JdConfigVo {
@Pattern(regexp = "^(?:100(?:\\.0{1,2})?|[1-9][0-9]?(?:\\.\\d{1,2})?|1(?:\\.\\d{1,2})?)$", message = "距离为（1-100米）区间内,最多保留两位小数", groups = {Query.class}) @Pattern(regexp = "^(?:100(?:\\.0{1,2})?|[1-9][0-9]?(?:\\.\\d{1,2})?|1(?:\\.\\d{1,2})?)$", message = "距离为（1-100米）区间内,最多保留两位小数", groups = {Query.class})
private String distance; private String distance;
/**近电报警距离等级*/
private String nearelectric;
public interface Query { public interface Query {
} }
} }

2
bonus-modules/bonus-app/src/main/java/com/bonus/app/service/impl/CraneMonitorServiceImpl.java
View File

@ -113,6 +113,8 @@ public class CraneMonitorServiceImpl implements ICraneMonitorService {
SysTcpMessage sysTcpMessage = new SysTcpMessage(); SysTcpMessage sysTcpMessage = new SysTcpMessage();
sysTcpMessage.setDevCode(vo.getDevCode()); sysTcpMessage.setDevCode(vo.getDevCode());
sysTcpMessage.setDistance(Float.parseFloat(configItems.get(0).getDistance())); sysTcpMessage.setDistance(Float.parseFloat(configItems.get(0).getDistance()));
sysTcpMessage.setNearelectric(configItems.get(0).getNearelectric());
configItems.get(0).setVoltageLevel(configItems.get(0).getNearelectric());
R result = remoteTcpService.setMessage(sysTcpMessage, SecurityConstants.INNER); R result = remoteTcpService.setMessage(sysTcpMessage, SecurityConstants.INNER);
log.info("调用结果：code:{},msg:{}", result.getCode(),result.getMsg()); log.info("调用结果：code:{},msg:{}", result.getCode(),result.getMsg());
if (result != null && result.getCode() == HttpStatus.SUCCESS && Objects.equals(result.getMsg(), BusinessConstants.SET_MSG)) { if (result != null && result.getCode() == HttpStatus.SUCCESS && Objects.equals(result.getMsg(), BusinessConstants.SET_MSG)) {

4
bonus-modules/bonus-app/src/main/resources/mapper/WarnReminderMapper.xml
View File

@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select select
case case
WHEN tw.dev_type=1 then tdd.dict_label WHEN tw.dev_type=1 then tdd.dict_label
WHEN tw.dev_type=0 then '手环箱' WHEN tw.dev_type=0 then '手环'
ELSE '' ELSE ''
END AS deviceTypeName, END AS deviceTypeName,
tw.warn_time warnTime,tw.warn_content warnContent, tw.warn_time warnTime,tw.warn_content warnContent,
@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and tw.pro_id = #{proId} and tw.pro_id = #{proId}
</if> </if>
</where> </where>
order by deviceTypeName ASC order by tw.warn_time DESC
</select> </select>
</mapper> </mapper>

2
bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/ConsControlServiceImpl.java
View File

@ -634,6 +634,8 @@ public class ConsControlServiceImpl implements IConsControlService {
SysTcpMessage sysTcpMessage = new SysTcpMessage(); SysTcpMessage sysTcpMessage = new SysTcpMessage();
sysTcpMessage.setDevCode(vo.getDevCode()); sysTcpMessage.setDevCode(vo.getDevCode());
sysTcpMessage.setDistance(Float.parseFloat(configItems.get(0).getDistance())); sysTcpMessage.setDistance(Float.parseFloat(configItems.get(0).getDistance()));
sysTcpMessage.setNearelectric(configItems.get(0).getNearelectric());
configItems.get(0).setVoltageLevel(configItems.get(0).getNearelectric());
R result = remoteTcpService.setMessage(sysTcpMessage, SecurityConstants.INNER); R result = remoteTcpService.setMessage(sysTcpMessage, SecurityConstants.INNER);
log.info("调用结果：code:{},msg:{}", result.getCode(),result.getMsg()); log.info("调用结果：code:{},msg:{}", result.getCode(),result.getMsg());
if (result != null && result.getCode() == HttpStatus.SUCCESS && Objects.equals(result.getMsg(), BusinessConstants.SET_MSG)) { if (result != null && result.getCode() == HttpStatus.SUCCESS && Objects.equals(result.getMsg(), BusinessConstants.SET_MSG)) {