admin/wisdomisitezw_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
pengjie 2024-03-26 14:18:51 +08:00
parent 2a8a7af2c9
commit b2f5407b1b
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java
View File

@ -21,6 +21,8 @@ import com.zhgd.xmgl.modules.safety.entity.InspectRecord;
import com.zhgd.xmgl.modules.safety.entity.ProjectSubItem; import com.zhgd.xmgl.modules.safety.entity.ProjectSubItem;
import com.zhgd.xmgl.modules.safety.service.IInspectRecordService; import com.zhgd.xmgl.modules.safety.service.IInspectRecordService;
import com.zhgd.xmgl.modules.safety.service.IProjectSubItemService; import com.zhgd.xmgl.modules.safety.service.IProjectSubItemService;
import com.zhgd.xmgl.modules.wisdom.entity.EnvironmentAlarm;
import com.zhgd.xmgl.modules.wisdom.service.IEnvironmentAlarmService;
import com.zhgd.xmgl.security.JwtTokenProvider; import com.zhgd.xmgl.security.JwtTokenProvider;
import com.zhgd.xmgl.security.SecurityUser; import com.zhgd.xmgl.security.SecurityUser;
import com.zhgd.xmgl.security.SecurityUtil; import com.zhgd.xmgl.security.SecurityUtil;
@ -285,6 +287,9 @@ public class SystemUserAuthController {
@Autowired @Autowired
private IProjectSubItemService projectSubItemService; private IProjectSubItemService projectSubItemService;
@Autowired
private IEnvironmentAlarmService environmentAlarmService;
@Autowired @Autowired
private IInspectRecordService inspectRecordService; private IInspectRecordService inspectRecordService;
@ -414,6 +419,32 @@ public class SystemUserAuthController {
listMap.add(map); listMap.add(map);
} }
} }
// 报警台账
if (actionCodes.contains("sub_item_examine")) {
List<ProjectSubItem> list = projectSubItemService.list(Wrappers.<ProjectSubItem>lambdaQuery().eq(ProjectSubItem::getApprovalStatus, 0));
for (ProjectSubItem projectSubItem : list) {
Map<String, Object> map = new HashMap<>();
map.put("projectSn", projectSubItem.getEngineeringSn());
map.put("flag", 3);
map.put("type", "施工节点审批");
map.put("state", 1);
map.put("projectName", engineerings.stream().filter(e -> e.getEngineeringSn().equals(projectSubItem.getEngineeringSn()))
.collect(Collectors.toList()).get(0).getEngineeringName());
listMap.add(map);
}
}
List<EnvironmentAlarm> list = environmentAlarmService.list(Wrappers.<EnvironmentAlarm>lambdaQuery().eq(EnvironmentAlarm::getState, 0));
for (EnvironmentAlarm environmentAlarm : list) {
Map<String, Object> map = new HashMap<>();
map.put("projectSn", environmentAlarm.getEngineeringSn());
map.put("flag", 4);
map.put("type", "扬尘报警");
map.put("state", 1);
map.put("projectName", engineerings.stream().filter(e -> e.getEngineeringSn().equals(environmentAlarm.getEngineeringSn()))
.collect(Collectors.toList()).get(0).getEngineeringName());
listMap.add(map);
}
Integer flag = MapUtils.getInteger(param, "flag"); Integer flag = MapUtils.getInteger(param, "flag");
Integer state = MapUtils.getInteger(param, "state"); Integer state = MapUtils.getInteger(param, "state");
String projectName = MapUtils.getString(param, "projectName"); String projectName = MapUtils.getString(param, "projectName");

4
src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/DustNoiseDataServiceImpl.java
View File

@ -30,7 +30,9 @@ public class DustNoiseDataServiceImpl extends ServiceImpl<DustNoiseDataMapper, D
@Override @Override
public Page<DustNoiseData> pageList(Page page, Wrapper<DustNoiseData> wrapper) { public Page<DustNoiseData> pageList(Page page, Wrapper<DustNoiseData> wrapper) {
return baseMapper.pageList(page, wrapper); Page<DustNoiseData> dustNoiseDataPage = baseMapper.pageList(page, wrapper);
dustNoiseDataPage.getRecords().forEach(d -> setAlarm(d));
return dustNoiseDataPage;
} }
@Override @Override