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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
haozq 2024-09-27 18:24:52 +08:00
parent 1fdee77998 a543ad7d45
commit 0d8aeda578
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,9 +28,10 @@ public class DevInfoVo {
private String leaderPhone;
/**电量*/
private String electricQuantity;
/**班组名称*/
private String teamName;
/**工程名称*/
private String proName;
/**告警位置*/
private String warnPosition;
}

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

@ -531,6 +531,8 @@ public class ConsControlServiceImpl implements IConsControlService {
for (DevInfoVo vo : list) {
vo.setLeaderPhone(Sm4Utils.decode(vo.getLeaderPhone()));
}
list.get(0).setIsWarn(1);
list.get(0).setWarnPosition("134");
} catch (Exception e) {
log.error(e.toString(), e);
}
@ -572,8 +574,8 @@ public class ConsControlServiceImpl implements IConsControlService {
try {
dto.setDevType(BusinessConstants.JD);
// 告警数据默认展示当天，不需要加日期限制可去掉
dto.setStartTime(DateTimeHelper.getNowDay());
dto.setEndTime(DateTimeHelper.getNowDay());
// dto.setStartTime(DateTimeHelper.getNowDay());
// dto.setEndTime(DateTimeHelper.getNowDay());
list = mapper.getJdWarnList(dto);
} catch (Exception e) {
log.error(e.toString(), e);

4
bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/ConsControlMapper.xml
View File

@ -184,7 +184,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN tb_project tp ON twt.pro_id = tp.id AND tp.del_flag = 0
WHERE tsb.del_flag = 0 AND tsb.team_id IS NOT NULL AND tb.bid_id IS NOT NULL
UNION ALL
SELECT tpe.id,
SELECT CONCAT('zs','-',tpe.id) AS id,
CONCAT(tpe.name,'-',tpe.phone) AS label,
tp.depart_id AS departId,
CONCAT('team','-',tpe.team_id) AS parentId,
@ -203,7 +203,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN tb_project tp ON twt.pro_id = tp.id AND tp.del_flag = 0
WHERE tb.peopel_type = 0 AND tb.del_flag = 0 AND tb.bid_id IS NOT NULL
UNION ALL
SELECT tlu.id,
SELECT CONCAT('ls','-',tlu.id) AS id,
CONCAT(tlu.name,'-',tlu.phone) AS label,
tp.depart_id AS departId,
CONCAT('team','-',tlu.team_id) AS parentId,