admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

安全帽提交

Browse Source
This commit is contained in:
guoshengxiong 2025-03-04 15:19:54 +08:00
parent 01bc5227f3
commit b5e0ca74aa
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatAlarmMapper.xml
View File

@ -4,7 +4,7 @@
<select id="queryList" resultType="com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatAlarm">
select sha.*, wi.worker_name
from safety_hat_alarm sha
left join safety_hat_dev wi on wi.id = sha.dev_sn
left join safety_hat_dev wi on wi.dev_sn = sha.dev_sn
${ew.customSqlSegment}
</select>

2
src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml
View File

@ -4,7 +4,7 @@
<select id="queryList" resultType="com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatData">
select shd.*, wi.worker_name
from safety_hat_data shd
left join safety_hat_dev wi on wi.id = shd.dev_sn
left join safety_hat_dev wi on wi.dev_sn = shd.dev_sn
${ew.customSqlSegment}
</select>

8
src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatAlarmServiceImpl.java
View File

@ -11,6 +11,8 @@ import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
import com.zhgd.xmgl.base.entity.vo.TrendVo;
import com.zhgd.xmgl.enums.ParamEnum;
import com.zhgd.xmgl.modules.basicdata.entity.DictionaryItem;
import com.zhgd.xmgl.modules.basicdata.service.impl.DictionaryItemServiceImpl;
import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatAlarm;
import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatDev;
import com.zhgd.xmgl.modules.safetyhat.mapper.SafetyHatAlarmMapper;
@ -43,6 +45,8 @@ public class SafetyHatAlarmServiceImpl extends ServiceImpl<SafetyHatAlarmMapper,
private SafetyHatAlarmMapper safetyHatAlarmMapper;
@Autowired
private SafetyHatDevMapper safetyHatDevMapper;
@Autowired
private DictionaryItemServiceImpl dictionaryItemService;
@Override
public IPage<SafetyHatAlarm> queryPageList(HashMap<String, Object> paramMap) {
@ -82,7 +86,9 @@ public class SafetyHatAlarmServiceImpl extends ServiceImpl<SafetyHatAlarmMapper,
if (dev == null) {
throw new OpenAlertException("设备编号不正确");
}
String str = ParamEnum.getStr(ParamEnum.SafetyHatAlarmAlarmType.values(), safetyHatAlarm.getAlarmType());
List<DictionaryItem> typeList = dictionaryItemService.getDictList("safety_hat_alarm_type", dev.getProjectSn());
String str = typeList.stream().filter(o -> o.getData().equals(safetyHatAlarm.getAlarmType() + "")).findFirst().map(o -> o.getName()).orElse(null);
// String str = ParamEnum.getStr(ParamEnum.SafetyHatAlarmAlarmType.values(), safetyHatAlarm.getAlarmType());
safetyHatAlarm.setAlarmInfo(str);
safetyHatAlarm.setProjectSn(dev.getProjectSn());
safetyHatAlarm.setId(null);