diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java index 0d7c10d..1036b7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -7,11 +7,18 @@ @Data public class AlarmLevelParam { + private String deptId; + private String wellType; + private String lng; + private String lat; + private String tenantId; private String name; private String deviceType; private String openAlarm; private String openJob; + private String highValue; + private String lowValue; + private String level; //等级列表 - private List levelList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java index 0d7c10d..1036b7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -7,11 +7,18 @@ @Data public class AlarmLevelParam { + private String deptId; + private String wellType; + private String lng; + private String lat; + private String tenantId; private String name; private String deviceType; private String openAlarm; private String openJob; + private String highValue; + private String lowValue; + private String level; //等级列表 - private List levelList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index e24fccd..44c994b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -111,11 +111,10 @@ alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); - alarmLevelParam.getLevelList().forEach( - alarmLevels -> { - alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); - this.save(alarmLevel); - } - ); + alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevelParam.getLevel()) ? "-1" : alarmLevelParam.getLevel())); + this.save(alarmLevel); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java index 0d7c10d..1036b7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -7,11 +7,18 @@ @Data public class AlarmLevelParam { + private String deptId; + private String wellType; + private String lng; + private String lat; + private String tenantId; private String name; private String deviceType; private String openAlarm; private String openJob; + private String highValue; + private String lowValue; + private String level; //等级列表 - private List levelList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index e24fccd..44c994b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -111,11 +111,10 @@ alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); - alarmLevelParam.getLevelList().forEach( - alarmLevels -> { - alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); - this.save(alarmLevel); - } - ); + alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevelParam.getLevel()) ? "-1" : alarmLevelParam.getLevel())); + this.save(alarmLevel); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 4a35142..a480f26 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -18,7 +18,7 @@ List> deviceStaticsByType(); - List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") Long deviceType); List> deviceStaticsByRoad(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java index 0d7c10d..1036b7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -7,11 +7,18 @@ @Data public class AlarmLevelParam { + private String deptId; + private String wellType; + private String lng; + private String lat; + private String tenantId; private String name; private String deviceType; private String openAlarm; private String openJob; + private String highValue; + private String lowValue; + private String level; //等级列表 - private List levelList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index e24fccd..44c994b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -111,11 +111,10 @@ alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); - alarmLevelParam.getLevelList().forEach( - alarmLevels -> { - alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); - this.save(alarmLevel); - } - ); + alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevelParam.getLevel()) ? "-1" : alarmLevelParam.getLevel())); + this.save(alarmLevel); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 4a35142..a480f26 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -18,7 +18,7 @@ List> deviceStaticsByType(); - List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") Long deviceType); List> deviceStaticsByRoad(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index c4ea3dd..6286a05 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -37,21 +37,21 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java index 0d7c10d..1036b7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -7,11 +7,18 @@ @Data public class AlarmLevelParam { + private String deptId; + private String wellType; + private String lng; + private String lat; + private String tenantId; private String name; private String deviceType; private String openAlarm; private String openJob; + private String highValue; + private String lowValue; + private String level; //等级列表 - private List levelList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index e24fccd..44c994b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -111,11 +111,10 @@ alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); - alarmLevelParam.getLevelList().forEach( - alarmLevels -> { - alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); - this.save(alarmLevel); - } - ); + alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevelParam.getLevel()) ? "-1" : alarmLevelParam.getLevel())); + this.save(alarmLevel); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 4a35142..a480f26 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -18,7 +18,7 @@ List> deviceStaticsByType(); - List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") Long deviceType); List> deviceStaticsByRoad(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index c4ea3dd..6286a05 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -37,21 +37,21 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 8b7767b..514448a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -57,7 +57,7 @@ LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID BD.VALID = '1' AND BDW.VALID='1' - + AND BD.DEVICE_TYPE = #{deviceType} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java index 0d7c10d..1036b7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -7,11 +7,18 @@ @Data public class AlarmLevelParam { + private String deptId; + private String wellType; + private String lng; + private String lat; + private String tenantId; private String name; private String deviceType; private String openAlarm; private String openJob; + private String highValue; + private String lowValue; + private String level; //等级列表 - private List levelList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index e24fccd..44c994b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -111,11 +111,10 @@ alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); - alarmLevelParam.getLevelList().forEach( - alarmLevels -> { - alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); - this.save(alarmLevel); - } - ); + alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevelParam.getLevel()) ? "-1" : alarmLevelParam.getLevel())); + this.save(alarmLevel); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 4a35142..a480f26 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -18,7 +18,7 @@ List> deviceStaticsByType(); - List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") Long deviceType); List> deviceStaticsByRoad(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index c4ea3dd..6286a05 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -37,21 +37,21 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 8b7767b..514448a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -57,7 +57,7 @@ LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID BD.VALID = '1' AND BDW.VALID='1' - + AND BD.DEVICE_TYPE = #{deviceType} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 209b900..95110b4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -69,7 +69,7 @@ @Override public List> deviceStaticsByDept(DataScope dataScope, String deviceType) { - List> mapList = statisticMapper.deviceStaticsByDept(dataScope, deviceType); + List> mapList = statisticMapper.deviceStaticsByDept(dataScope, StrUtil.isEmpty(deviceType)?-1:Long.valueOf(deviceType)); for (Map map : mapList) { map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java index 0d7c10d..1036b7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -7,11 +7,18 @@ @Data public class AlarmLevelParam { + private String deptId; + private String wellType; + private String lng; + private String lat; + private String tenantId; private String name; private String deviceType; private String openAlarm; private String openJob; + private String highValue; + private String lowValue; + private String level; //等级列表 - private List levelList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index e24fccd..44c994b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -111,11 +111,10 @@ alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); - alarmLevelParam.getLevelList().forEach( - alarmLevels -> { - alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); - this.save(alarmLevel); - } - ); + alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevelParam.getLevel()) ? "-1" : alarmLevelParam.getLevel())); + this.save(alarmLevel); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 4a35142..a480f26 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -18,7 +18,7 @@ List> deviceStaticsByType(); - List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") Long deviceType); List> deviceStaticsByRoad(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index c4ea3dd..6286a05 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -37,21 +37,21 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 8b7767b..514448a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -57,7 +57,7 @@ LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID BD.VALID = '1' AND BDW.VALID='1' - + AND BD.DEVICE_TYPE = #{deviceType} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 209b900..95110b4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -69,7 +69,7 @@ @Override public List> deviceStaticsByDept(DataScope dataScope, String deviceType) { - List> mapList = statisticMapper.deviceStaticsByDept(dataScope, deviceType); + List> mapList = statisticMapper.deviceStaticsByDept(dataScope, StrUtil.isEmpty(deviceType)?-1:Long.valueOf(deviceType)); for (Map map : mapList) { map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 3d7ae31..bf89d08 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -583,7 +583,7 @@ /** * 数据列表查询 */ - @GetMapping(value = "/data/list-page") + @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { if (StrUtil.isEmpty(watchType)) { return ResponseData.success("缺少监测类型参数，请重传"); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java index 0d7c10d..1036b7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -7,11 +7,18 @@ @Data public class AlarmLevelParam { + private String deptId; + private String wellType; + private String lng; + private String lat; + private String tenantId; private String name; private String deviceType; private String openAlarm; private String openJob; + private String highValue; + private String lowValue; + private String level; //等级列表 - private List levelList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index e24fccd..44c994b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -111,11 +111,10 @@ alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); - alarmLevelParam.getLevelList().forEach( - alarmLevels -> { - alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); - this.save(alarmLevel); - } - ); + alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevelParam.getLevel()) ? "-1" : alarmLevelParam.getLevel())); + this.save(alarmLevel); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 4a35142..a480f26 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -18,7 +18,7 @@ List> deviceStaticsByType(); - List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") Long deviceType); List> deviceStaticsByRoad(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index c4ea3dd..6286a05 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -37,21 +37,21 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 8b7767b..514448a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -57,7 +57,7 @@ LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID BD.VALID = '1' AND BDW.VALID='1' - + AND BD.DEVICE_TYPE = #{deviceType} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 209b900..95110b4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -69,7 +69,7 @@ @Override public List> deviceStaticsByDept(DataScope dataScope, String deviceType) { - List> mapList = statisticMapper.deviceStaticsByDept(dataScope, deviceType); + List> mapList = statisticMapper.deviceStaticsByDept(dataScope, StrUtil.isEmpty(deviceType)?-1:Long.valueOf(deviceType)); for (Map map : mapList) { map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 3d7ae31..bf89d08 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -583,7 +583,7 @@ /** * 数据列表查询 */ - @GetMapping(value = "/data/list-page") + @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { if (StrUtil.isEmpty(watchType)) { return ResponseData.success("缺少监测类型参数，请重传"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index eb4ab56..393589c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -58,6 +58,11 @@ */ DeviceData lgLiquidData(@Param("devcode") String devcode); + + DeviceData tubeData(@Param("devcode") String devcode); + + DeviceData H2sData(@Param("devcode") String devcode); + BfztCountDataDto bfztCountData(@Param("deptIds") List deptIds, @Param("isApp") Boolean isApp); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java index 0d7c10d..1036b7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -7,11 +7,18 @@ @Data public class AlarmLevelParam { + private String deptId; + private String wellType; + private String lng; + private String lat; + private String tenantId; private String name; private String deviceType; private String openAlarm; private String openJob; + private String highValue; + private String lowValue; + private String level; //等级列表 - private List levelList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index e24fccd..44c994b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -111,11 +111,10 @@ alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); - alarmLevelParam.getLevelList().forEach( - alarmLevels -> { - alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); - this.save(alarmLevel); - } - ); + alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevelParam.getLevel()) ? "-1" : alarmLevelParam.getLevel())); + this.save(alarmLevel); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 4a35142..a480f26 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -18,7 +18,7 @@ List> deviceStaticsByType(); - List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") Long deviceType); List> deviceStaticsByRoad(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index c4ea3dd..6286a05 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -37,21 +37,21 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 8b7767b..514448a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -57,7 +57,7 @@ LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID BD.VALID = '1' AND BDW.VALID='1' - + AND BD.DEVICE_TYPE = #{deviceType} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 209b900..95110b4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -69,7 +69,7 @@ @Override public List> deviceStaticsByDept(DataScope dataScope, String deviceType) { - List> mapList = statisticMapper.deviceStaticsByDept(dataScope, deviceType); + List> mapList = statisticMapper.deviceStaticsByDept(dataScope, StrUtil.isEmpty(deviceType)?-1:Long.valueOf(deviceType)); for (Map map : mapList) { map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 3d7ae31..bf89d08 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -583,7 +583,7 @@ /** * 数据列表查询 */ - @GetMapping(value = "/data/list-page") + @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { if (StrUtil.isEmpty(watchType)) { return ResponseData.success("缺少监测类型参数，请重传"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index eb4ab56..393589c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -58,6 +58,11 @@ */ DeviceData lgLiquidData(@Param("devcode") String devcode); + + DeviceData tubeData(@Param("devcode") String devcode); + + DeviceData H2sData(@Param("devcode") String devcode); + BfztCountDataDto bfztCountData(@Param("deptIds") List deptIds, @Param("isApp") Boolean isApp); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 7f028c5..3be6c65 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -78,6 +78,7 @@ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') + ${paramStr} @@ -170,8 +171,8 @@ UPTIME AS logtime FROM data_gas WHERE DEVCODE = #{devcode} - ORDER BY UPTIME - DESC LIMIT 1 + ORDER BY UPTIME DESC + LIMIT 1 - + + + + SELECT devcode, - deviceType, - deviceTypeName, + "deviceType", + "deviceTypeName", deptid, - wellCode, + "wellCode", descn, cell, uptime, @@ -371,7 +389,7 @@ liquiddata FROM ( - ( + SELECT dl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -413,8 +431,8 @@ - ) UNION ALL - ( + UNION ALL + SELECT dgl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -456,7 +474,7 @@ - ) + ) t1 ORDER BY uptime asc @@ -558,10 +576,10 @@ @@ -663,7 +681,7 @@ parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page"> SELECT DEVCODE, - deviceType, + "deviceType", @@ -671,11 +689,11 @@ DESCN, STATUS, DEPTID, - wellCode, - wellId, - deviceId, + "wellCode", + "wellId", + "deviceId", VALID, - deviceTypeName + "deviceTypeName" FROM wellcover_monitorview @@ -1261,7 +1279,7 @@ - AS logtime,dh.DESCN AS descn + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1294,8 +1312,8 @@ SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH AS strength, - dh2s.CELL AS cell, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, @@ -1306,7 +1324,7 @@ AS logtime, bdt.TYPE_NAME AS "deviceTypeName", bd.device_type as deviceType, - bwi.DEPTID AS deptid + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE @@ -1329,8 +1347,9 @@ - AND (dh2s.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE ) + AND (dh2s.DEVCODE LIKE + + OR dh2s.WELL_CODE LIKE) diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java index 0d7c10d..1036b7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -7,11 +7,18 @@ @Data public class AlarmLevelParam { + private String deptId; + private String wellType; + private String lng; + private String lat; + private String tenantId; private String name; private String deviceType; private String openAlarm; private String openJob; + private String highValue; + private String lowValue; + private String level; //等级列表 - private List levelList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index e24fccd..44c994b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -111,11 +111,10 @@ alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); - alarmLevelParam.getLevelList().forEach( - alarmLevels -> { - alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); - this.save(alarmLevel); - } - ); + alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevelParam.getLevel()) ? "-1" : alarmLevelParam.getLevel())); + this.save(alarmLevel); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 4a35142..a480f26 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -18,7 +18,7 @@ List> deviceStaticsByType(); - List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") Long deviceType); List> deviceStaticsByRoad(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index c4ea3dd..6286a05 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -37,21 +37,21 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 8b7767b..514448a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -57,7 +57,7 @@ LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID BD.VALID = '1' AND BDW.VALID='1' - + AND BD.DEVICE_TYPE = #{deviceType} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 209b900..95110b4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -69,7 +69,7 @@ @Override public List> deviceStaticsByDept(DataScope dataScope, String deviceType) { - List> mapList = statisticMapper.deviceStaticsByDept(dataScope, deviceType); + List> mapList = statisticMapper.deviceStaticsByDept(dataScope, StrUtil.isEmpty(deviceType)?-1:Long.valueOf(deviceType)); for (Map map : mapList) { map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 3d7ae31..bf89d08 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -583,7 +583,7 @@ /** * 数据列表查询 */ - @GetMapping(value = "/data/list-page") + @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { if (StrUtil.isEmpty(watchType)) { return ResponseData.success("缺少监测类型参数，请重传"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index eb4ab56..393589c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -58,6 +58,11 @@ */ DeviceData lgLiquidData(@Param("devcode") String devcode); + + DeviceData tubeData(@Param("devcode") String devcode); + + DeviceData H2sData(@Param("devcode") String devcode); + BfztCountDataDto bfztCountData(@Param("deptIds") List deptIds, @Param("isApp") Boolean isApp); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 7f028c5..3be6c65 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -78,6 +78,7 @@ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') + ${paramStr} @@ -170,8 +171,8 @@ UPTIME AS logtime FROM data_gas WHERE DEVCODE = #{devcode} - ORDER BY UPTIME - DESC LIMIT 1 + ORDER BY UPTIME DESC + LIMIT 1 - + + + + SELECT devcode, - deviceType, - deviceTypeName, + "deviceType", + "deviceTypeName", deptid, - wellCode, + "wellCode", descn, cell, uptime, @@ -371,7 +389,7 @@ liquiddata FROM ( - ( + SELECT dl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -413,8 +431,8 @@ - ) UNION ALL - ( + UNION ALL + SELECT dgl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -456,7 +474,7 @@ - ) + ) t1 ORDER BY uptime asc @@ -558,10 +576,10 @@ @@ -663,7 +681,7 @@ parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page"> SELECT DEVCODE, - deviceType, + "deviceType", @@ -671,11 +689,11 @@ DESCN, STATUS, DEPTID, - wellCode, - wellId, - deviceId, + "wellCode", + "wellId", + "deviceId", VALID, - deviceTypeName + "deviceTypeName" FROM wellcover_monitorview @@ -1261,7 +1279,7 @@ - AS logtime,dh.DESCN AS descn + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1294,8 +1312,8 @@ SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH AS strength, - dh2s.CELL AS cell, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, @@ -1306,7 +1324,7 @@ AS logtime, bdt.TYPE_NAME AS "deviceTypeName", bd.device_type as deviceType, - bwi.DEPTID AS deptid + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE @@ -1329,8 +1347,9 @@ - AND (dh2s.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE ) + AND (dh2s.DEVCODE LIKE + + OR dh2s.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index bb28cfc..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -195,6 +195,24 @@ } deviceDataDtoList.add((DeviceDataDto) deviceDataDto.clone()); break; + case "管盯": + deviceData = this.baseMapper.tubeData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("燃气泄漏"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("H2S浓度"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; default://未知设备 log.info("未知设备！"); @@ -378,7 +396,6 @@ watchDataDto.setWatchType("井内水位"); watchDataDto.setType("10"); if (ObjectUtil.isNotEmpty(deviceData)) { - watchDataDto.setValue(deviceData.getData() + "m"); watchDataDto.setData(deviceData.getData() + "m"); watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -388,7 +405,28 @@ } watchDataDtos.add((WatchDataDto) watchDataDto.clone()); break; - + case "管盯": + deviceData = this.baseMapper.tubeData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("燃气泄漏"); + watchDataDto.setType("12"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("H2S浓度"); + watchDataDto.setType("14"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; default://未知设备 log.info("未知设备！"); break; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java index 0d7c10d..1036b7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -7,11 +7,18 @@ @Data public class AlarmLevelParam { + private String deptId; + private String wellType; + private String lng; + private String lat; + private String tenantId; private String name; private String deviceType; private String openAlarm; private String openJob; + private String highValue; + private String lowValue; + private String level; //等级列表 - private List levelList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index e24fccd..44c994b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -111,11 +111,10 @@ alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); - alarmLevelParam.getLevelList().forEach( - alarmLevels -> { - alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); - this.save(alarmLevel); - } - ); + alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevelParam.getLevel()) ? "-1" : alarmLevelParam.getLevel())); + this.save(alarmLevel); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 4a35142..a480f26 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -18,7 +18,7 @@ List> deviceStaticsByType(); - List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") Long deviceType); List> deviceStaticsByRoad(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index c4ea3dd..6286a05 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -37,21 +37,21 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 8b7767b..514448a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -57,7 +57,7 @@ LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID BD.VALID = '1' AND BDW.VALID='1' - + AND BD.DEVICE_TYPE = #{deviceType} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 209b900..95110b4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -69,7 +69,7 @@ @Override public List> deviceStaticsByDept(DataScope dataScope, String deviceType) { - List> mapList = statisticMapper.deviceStaticsByDept(dataScope, deviceType); + List> mapList = statisticMapper.deviceStaticsByDept(dataScope, StrUtil.isEmpty(deviceType)?-1:Long.valueOf(deviceType)); for (Map map : mapList) { map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 3d7ae31..bf89d08 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -583,7 +583,7 @@ /** * 数据列表查询 */ - @GetMapping(value = "/data/list-page") + @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { if (StrUtil.isEmpty(watchType)) { return ResponseData.success("缺少监测类型参数，请重传"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index eb4ab56..393589c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -58,6 +58,11 @@ */ DeviceData lgLiquidData(@Param("devcode") String devcode); + + DeviceData tubeData(@Param("devcode") String devcode); + + DeviceData H2sData(@Param("devcode") String devcode); + BfztCountDataDto bfztCountData(@Param("deptIds") List deptIds, @Param("isApp") Boolean isApp); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 7f028c5..3be6c65 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -78,6 +78,7 @@ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') + ${paramStr} @@ -170,8 +171,8 @@ UPTIME AS logtime FROM data_gas WHERE DEVCODE = #{devcode} - ORDER BY UPTIME - DESC LIMIT 1 + ORDER BY UPTIME DESC + LIMIT 1 - + + + + SELECT devcode, - deviceType, - deviceTypeName, + "deviceType", + "deviceTypeName", deptid, - wellCode, + "wellCode", descn, cell, uptime, @@ -371,7 +389,7 @@ liquiddata FROM ( - ( + SELECT dl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -413,8 +431,8 @@ - ) UNION ALL - ( + UNION ALL + SELECT dgl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -456,7 +474,7 @@ - ) + ) t1 ORDER BY uptime asc @@ -558,10 +576,10 @@ @@ -663,7 +681,7 @@ parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page"> SELECT DEVCODE, - deviceType, + "deviceType", @@ -671,11 +689,11 @@ DESCN, STATUS, DEPTID, - wellCode, - wellId, - deviceId, + "wellCode", + "wellId", + "deviceId", VALID, - deviceTypeName + "deviceTypeName" FROM wellcover_monitorview @@ -1261,7 +1279,7 @@ - AS logtime,dh.DESCN AS descn + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1294,8 +1312,8 @@ SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH AS strength, - dh2s.CELL AS cell, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, @@ -1306,7 +1324,7 @@ AS logtime, bdt.TYPE_NAME AS "deviceTypeName", bd.device_type as deviceType, - bwi.DEPTID AS deptid + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE @@ -1329,8 +1347,9 @@ - AND (dh2s.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE ) + AND (dh2s.DEVCODE LIKE + + OR dh2s.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index bb28cfc..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -195,6 +195,24 @@ } deviceDataDtoList.add((DeviceDataDto) deviceDataDto.clone()); break; + case "管盯": + deviceData = this.baseMapper.tubeData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("燃气泄漏"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("H2S浓度"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; default://未知设备 log.info("未知设备！"); @@ -378,7 +396,6 @@ watchDataDto.setWatchType("井内水位"); watchDataDto.setType("10"); if (ObjectUtil.isNotEmpty(deviceData)) { - watchDataDto.setValue(deviceData.getData() + "m"); watchDataDto.setData(deviceData.getData() + "m"); watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -388,7 +405,28 @@ } watchDataDtos.add((WatchDataDto) watchDataDto.clone()); break; - + case "管盯": + deviceData = this.baseMapper.tubeData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("燃气泄漏"); + watchDataDto.setType("12"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("H2S浓度"); + watchDataDto.setType("14"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; default://未知设备 log.info("未知设备！"); break; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 4c1bc0b..ce81120 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.dict.BusConfigDict; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -20,6 +22,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; /** @@ -30,7 +33,7 @@ */ @Controller @RequestMapping("/busConfig") -public class BusConfigController extends BaseController { +public class BusConfigController extends ExportController { @Qualifier("busConfigServiceImpl") @@ -143,7 +146,7 @@ /** - * 燃气获取配置列表 + * 管顶获取配置列表 */ @RequestMapping(value = "/tubeConfig/list") @ResponseBody @@ -382,7 +385,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -401,7 +411,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busMethaneConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busMethaneConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -420,7 +437,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTubeConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTubeConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -440,7 +464,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busWasteGasConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busWasteGasConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -460,7 +491,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTempHumiConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTempHumiConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -479,7 +517,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busDigConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busDigConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -498,7 +543,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busNoiseConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busNoiseConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -712,7 +764,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busGasLiquidConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busGasLiquidConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java index 0d7c10d..1036b7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -7,11 +7,18 @@ @Data public class AlarmLevelParam { + private String deptId; + private String wellType; + private String lng; + private String lat; + private String tenantId; private String name; private String deviceType; private String openAlarm; private String openJob; + private String highValue; + private String lowValue; + private String level; //等级列表 - private List levelList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index e24fccd..44c994b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -111,11 +111,10 @@ alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); - alarmLevelParam.getLevelList().forEach( - alarmLevels -> { - alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); - this.save(alarmLevel); - } - ); + alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevelParam.getLevel()) ? "-1" : alarmLevelParam.getLevel())); + this.save(alarmLevel); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 4a35142..a480f26 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -18,7 +18,7 @@ List> deviceStaticsByType(); - List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") Long deviceType); List> deviceStaticsByRoad(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index c4ea3dd..6286a05 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -37,21 +37,21 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 8b7767b..514448a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -57,7 +57,7 @@ LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID BD.VALID = '1' AND BDW.VALID='1' - + AND BD.DEVICE_TYPE = #{deviceType} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 209b900..95110b4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -69,7 +69,7 @@ @Override public List> deviceStaticsByDept(DataScope dataScope, String deviceType) { - List> mapList = statisticMapper.deviceStaticsByDept(dataScope, deviceType); + List> mapList = statisticMapper.deviceStaticsByDept(dataScope, StrUtil.isEmpty(deviceType)?-1:Long.valueOf(deviceType)); for (Map map : mapList) { map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 3d7ae31..bf89d08 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -583,7 +583,7 @@ /** * 数据列表查询 */ - @GetMapping(value = "/data/list-page") + @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { if (StrUtil.isEmpty(watchType)) { return ResponseData.success("缺少监测类型参数，请重传"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index eb4ab56..393589c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -58,6 +58,11 @@ */ DeviceData lgLiquidData(@Param("devcode") String devcode); + + DeviceData tubeData(@Param("devcode") String devcode); + + DeviceData H2sData(@Param("devcode") String devcode); + BfztCountDataDto bfztCountData(@Param("deptIds") List deptIds, @Param("isApp") Boolean isApp); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 7f028c5..3be6c65 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -78,6 +78,7 @@ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') + ${paramStr} @@ -170,8 +171,8 @@ UPTIME AS logtime FROM data_gas WHERE DEVCODE = #{devcode} - ORDER BY UPTIME - DESC LIMIT 1 + ORDER BY UPTIME DESC + LIMIT 1 - + + + + SELECT devcode, - deviceType, - deviceTypeName, + "deviceType", + "deviceTypeName", deptid, - wellCode, + "wellCode", descn, cell, uptime, @@ -371,7 +389,7 @@ liquiddata FROM ( - ( + SELECT dl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -413,8 +431,8 @@ - ) UNION ALL - ( + UNION ALL + SELECT dgl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -456,7 +474,7 @@ - ) + ) t1 ORDER BY uptime asc @@ -558,10 +576,10 @@ @@ -663,7 +681,7 @@ parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page"> SELECT DEVCODE, - deviceType, + "deviceType", @@ -671,11 +689,11 @@ DESCN, STATUS, DEPTID, - wellCode, - wellId, - deviceId, + "wellCode", + "wellId", + "deviceId", VALID, - deviceTypeName + "deviceTypeName" FROM wellcover_monitorview @@ -1261,7 +1279,7 @@ - AS logtime,dh.DESCN AS descn + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1294,8 +1312,8 @@ SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH AS strength, - dh2s.CELL AS cell, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, @@ -1306,7 +1324,7 @@ AS logtime, bdt.TYPE_NAME AS "deviceTypeName", bd.device_type as deviceType, - bwi.DEPTID AS deptid + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE @@ -1329,8 +1347,9 @@ - AND (dh2s.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE ) + AND (dh2s.DEVCODE LIKE + + OR dh2s.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index bb28cfc..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -195,6 +195,24 @@ } deviceDataDtoList.add((DeviceDataDto) deviceDataDto.clone()); break; + case "管盯": + deviceData = this.baseMapper.tubeData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("燃气泄漏"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("H2S浓度"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; default://未知设备 log.info("未知设备！"); @@ -378,7 +396,6 @@ watchDataDto.setWatchType("井内水位"); watchDataDto.setType("10"); if (ObjectUtil.isNotEmpty(deviceData)) { - watchDataDto.setValue(deviceData.getData() + "m"); watchDataDto.setData(deviceData.getData() + "m"); watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -388,7 +405,28 @@ } watchDataDtos.add((WatchDataDto) watchDataDto.clone()); break; - + case "管盯": + deviceData = this.baseMapper.tubeData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("燃气泄漏"); + watchDataDto.setType("12"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("H2S浓度"); + watchDataDto.setType("14"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; default://未知设备 log.info("未知设备！"); break; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 4c1bc0b..ce81120 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.dict.BusConfigDict; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -20,6 +22,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; /** @@ -30,7 +33,7 @@ */ @Controller @RequestMapping("/busConfig") -public class BusConfigController extends BaseController { +public class BusConfigController extends ExportController { @Qualifier("busConfigServiceImpl") @@ -143,7 +146,7 @@ /** - * 燃气获取配置列表 + * 管顶获取配置列表 */ @RequestMapping(value = "/tubeConfig/list") @ResponseBody @@ -382,7 +385,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -401,7 +411,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busMethaneConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busMethaneConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -420,7 +437,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTubeConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTubeConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -440,7 +464,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busWasteGasConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busWasteGasConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -460,7 +491,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTempHumiConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTempHumiConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -479,7 +517,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busDigConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busDigConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -498,7 +543,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busNoiseConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busNoiseConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -712,7 +764,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busGasLiquidConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busGasLiquidConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 8b147d2..75c5be2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,22 +1,17 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; -import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.service.IDeviceTypeService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.PathVariable; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import java.util.List; -import java.util.Map; import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -34,10 +29,7 @@ private final IDeviceModelsService deviceModelsService; - private final IDeviceTypeService deviceTypeService; - - public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { - this.deviceTypeService = deviceTypeService; + public DeviceModelsController(IDeviceModelsService deviceModelsService) { this.deviceModelsService = deviceModelsService; } @@ -48,25 +40,9 @@ @ResponseBody public Object listPage(String deviceType, String communication) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper() - .like("MODEL_NAME", deviceType == null ? "" : deviceType) - .like("COMMUNICATION", communication == null ? "" : communication); - page = deviceModelsService.page(page, query); - Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().forEach( - deviceModels -> { - DeviceType deviceTypeModel = deviceTypeService.getById(deviceModels.getDeviceType()); - deviceModels.setDeviceTypeName(deviceTypeModel == null ? "" : deviceTypeModel.getTypeName()); - String[] d = deviceModels.getCommunication().split(","); - if (d.length > 0) { - deviceModels.setCommunNameGroup(dictMap.get(d[0])); - } - for (int i = 1; i < d.length; i++) { - deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); - } - } - ); - return new SuccessResponseData(super.packForBT(page)); + ResponseData responseData = deviceModelsService.getListPage(page,deviceType, communication); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java index 0d7c10d..1036b7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -7,11 +7,18 @@ @Data public class AlarmLevelParam { + private String deptId; + private String wellType; + private String lng; + private String lat; + private String tenantId; private String name; private String deviceType; private String openAlarm; private String openJob; + private String highValue; + private String lowValue; + private String level; //等级列表 - private List levelList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index e24fccd..44c994b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -111,11 +111,10 @@ alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); - alarmLevelParam.getLevelList().forEach( - alarmLevels -> { - alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); - this.save(alarmLevel); - } - ); + alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevelParam.getLevel()) ? "-1" : alarmLevelParam.getLevel())); + this.save(alarmLevel); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 4a35142..a480f26 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -18,7 +18,7 @@ List> deviceStaticsByType(); - List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") Long deviceType); List> deviceStaticsByRoad(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index c4ea3dd..6286a05 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -37,21 +37,21 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 8b7767b..514448a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -57,7 +57,7 @@ LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID BD.VALID = '1' AND BDW.VALID='1' - + AND BD.DEVICE_TYPE = #{deviceType} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 209b900..95110b4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -69,7 +69,7 @@ @Override public List> deviceStaticsByDept(DataScope dataScope, String deviceType) { - List> mapList = statisticMapper.deviceStaticsByDept(dataScope, deviceType); + List> mapList = statisticMapper.deviceStaticsByDept(dataScope, StrUtil.isEmpty(deviceType)?-1:Long.valueOf(deviceType)); for (Map map : mapList) { map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 3d7ae31..bf89d08 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -583,7 +583,7 @@ /** * 数据列表查询 */ - @GetMapping(value = "/data/list-page") + @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { if (StrUtil.isEmpty(watchType)) { return ResponseData.success("缺少监测类型参数，请重传"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index eb4ab56..393589c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -58,6 +58,11 @@ */ DeviceData lgLiquidData(@Param("devcode") String devcode); + + DeviceData tubeData(@Param("devcode") String devcode); + + DeviceData H2sData(@Param("devcode") String devcode); + BfztCountDataDto bfztCountData(@Param("deptIds") List deptIds, @Param("isApp") Boolean isApp); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 7f028c5..3be6c65 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -78,6 +78,7 @@ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') + ${paramStr} @@ -170,8 +171,8 @@ UPTIME AS logtime FROM data_gas WHERE DEVCODE = #{devcode} - ORDER BY UPTIME - DESC LIMIT 1 + ORDER BY UPTIME DESC + LIMIT 1 - + + + + SELECT devcode, - deviceType, - deviceTypeName, + "deviceType", + "deviceTypeName", deptid, - wellCode, + "wellCode", descn, cell, uptime, @@ -371,7 +389,7 @@ liquiddata FROM ( - ( + SELECT dl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -413,8 +431,8 @@ - ) UNION ALL - ( + UNION ALL + SELECT dgl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -456,7 +474,7 @@ - ) + ) t1 ORDER BY uptime asc @@ -558,10 +576,10 @@ @@ -663,7 +681,7 @@ parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page"> SELECT DEVCODE, - deviceType, + "deviceType", @@ -671,11 +689,11 @@ DESCN, STATUS, DEPTID, - wellCode, - wellId, - deviceId, + "wellCode", + "wellId", + "deviceId", VALID, - deviceTypeName + "deviceTypeName" FROM wellcover_monitorview @@ -1261,7 +1279,7 @@ - AS logtime,dh.DESCN AS descn + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1294,8 +1312,8 @@ SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH AS strength, - dh2s.CELL AS cell, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, @@ -1306,7 +1324,7 @@ AS logtime, bdt.TYPE_NAME AS "deviceTypeName", bd.device_type as deviceType, - bwi.DEPTID AS deptid + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE @@ -1329,8 +1347,9 @@ - AND (dh2s.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE ) + AND (dh2s.DEVCODE LIKE + + OR dh2s.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index bb28cfc..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -195,6 +195,24 @@ } deviceDataDtoList.add((DeviceDataDto) deviceDataDto.clone()); break; + case "管盯": + deviceData = this.baseMapper.tubeData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("燃气泄漏"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("H2S浓度"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; default://未知设备 log.info("未知设备！"); @@ -378,7 +396,6 @@ watchDataDto.setWatchType("井内水位"); watchDataDto.setType("10"); if (ObjectUtil.isNotEmpty(deviceData)) { - watchDataDto.setValue(deviceData.getData() + "m"); watchDataDto.setData(deviceData.getData() + "m"); watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -388,7 +405,28 @@ } watchDataDtos.add((WatchDataDto) watchDataDto.clone()); break; - + case "管盯": + deviceData = this.baseMapper.tubeData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("燃气泄漏"); + watchDataDto.setType("12"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("H2S浓度"); + watchDataDto.setType("14"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; default://未知设备 log.info("未知设备！"); break; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 4c1bc0b..ce81120 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.dict.BusConfigDict; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -20,6 +22,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; /** @@ -30,7 +33,7 @@ */ @Controller @RequestMapping("/busConfig") -public class BusConfigController extends BaseController { +public class BusConfigController extends ExportController { @Qualifier("busConfigServiceImpl") @@ -143,7 +146,7 @@ /** - * 燃气获取配置列表 + * 管顶获取配置列表 */ @RequestMapping(value = "/tubeConfig/list") @ResponseBody @@ -382,7 +385,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -401,7 +411,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busMethaneConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busMethaneConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -420,7 +437,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTubeConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTubeConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -440,7 +464,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busWasteGasConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busWasteGasConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -460,7 +491,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTempHumiConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTempHumiConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -479,7 +517,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busDigConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busDigConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -498,7 +543,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busNoiseConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busNoiseConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -712,7 +764,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busGasLiquidConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busGasLiquidConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 8b147d2..75c5be2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,22 +1,17 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; -import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.service.IDeviceTypeService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.PathVariable; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import java.util.List; -import java.util.Map; import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -34,10 +29,7 @@ private final IDeviceModelsService deviceModelsService; - private final IDeviceTypeService deviceTypeService; - - public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { - this.deviceTypeService = deviceTypeService; + public DeviceModelsController(IDeviceModelsService deviceModelsService) { this.deviceModelsService = deviceModelsService; } @@ -48,25 +40,9 @@ @ResponseBody public Object listPage(String deviceType, String communication) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper() - .like("MODEL_NAME", deviceType == null ? "" : deviceType) - .like("COMMUNICATION", communication == null ? "" : communication); - page = deviceModelsService.page(page, query); - Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().forEach( - deviceModels -> { - DeviceType deviceTypeModel = deviceTypeService.getById(deviceModels.getDeviceType()); - deviceModels.setDeviceTypeName(deviceTypeModel == null ? "" : deviceTypeModel.getTypeName()); - String[] d = deviceModels.getCommunication().split(","); - if (d.length > 0) { - deviceModels.setCommunNameGroup(dictMap.get(d[0])); - } - for (int i = 1; i < d.length; i++) { - deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); - } - } - ); - return new SuccessResponseData(super.packForBT(page)); + ResponseData responseData = deviceModelsService.getListPage(page,deviceType, communication); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 5178f9b..efad32d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,9 +20,9 @@ */ public interface DeviceMapper extends BaseMapper { - List getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List getDeviceList(@Param("scope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") Long deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); List getDeviceListInfo(@Param("scope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java index 0d7c10d..1036b7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -7,11 +7,18 @@ @Data public class AlarmLevelParam { + private String deptId; + private String wellType; + private String lng; + private String lat; + private String tenantId; private String name; private String deviceType; private String openAlarm; private String openJob; + private String highValue; + private String lowValue; + private String level; //等级列表 - private List levelList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index e24fccd..44c994b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -111,11 +111,10 @@ alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); - alarmLevelParam.getLevelList().forEach( - alarmLevels -> { - alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); - this.save(alarmLevel); - } - ); + alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevelParam.getLevel()) ? "-1" : alarmLevelParam.getLevel())); + this.save(alarmLevel); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 4a35142..a480f26 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -18,7 +18,7 @@ List> deviceStaticsByType(); - List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") Long deviceType); List> deviceStaticsByRoad(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index c4ea3dd..6286a05 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -37,21 +37,21 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 8b7767b..514448a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -57,7 +57,7 @@ LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID BD.VALID = '1' AND BDW.VALID='1' - + AND BD.DEVICE_TYPE = #{deviceType} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 209b900..95110b4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -69,7 +69,7 @@ @Override public List> deviceStaticsByDept(DataScope dataScope, String deviceType) { - List> mapList = statisticMapper.deviceStaticsByDept(dataScope, deviceType); + List> mapList = statisticMapper.deviceStaticsByDept(dataScope, StrUtil.isEmpty(deviceType)?-1:Long.valueOf(deviceType)); for (Map map : mapList) { map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 3d7ae31..bf89d08 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -583,7 +583,7 @@ /** * 数据列表查询 */ - @GetMapping(value = "/data/list-page") + @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { if (StrUtil.isEmpty(watchType)) { return ResponseData.success("缺少监测类型参数，请重传"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index eb4ab56..393589c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -58,6 +58,11 @@ */ DeviceData lgLiquidData(@Param("devcode") String devcode); + + DeviceData tubeData(@Param("devcode") String devcode); + + DeviceData H2sData(@Param("devcode") String devcode); + BfztCountDataDto bfztCountData(@Param("deptIds") List deptIds, @Param("isApp") Boolean isApp); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 7f028c5..3be6c65 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -78,6 +78,7 @@ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') + ${paramStr} @@ -170,8 +171,8 @@ UPTIME AS logtime FROM data_gas WHERE DEVCODE = #{devcode} - ORDER BY UPTIME - DESC LIMIT 1 + ORDER BY UPTIME DESC + LIMIT 1 - + + + + SELECT devcode, - deviceType, - deviceTypeName, + "deviceType", + "deviceTypeName", deptid, - wellCode, + "wellCode", descn, cell, uptime, @@ -371,7 +389,7 @@ liquiddata FROM ( - ( + SELECT dl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -413,8 +431,8 @@ - ) UNION ALL - ( + UNION ALL + SELECT dgl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -456,7 +474,7 @@ - ) + ) t1 ORDER BY uptime asc @@ -558,10 +576,10 @@ @@ -663,7 +681,7 @@ parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page"> SELECT DEVCODE, - deviceType, + "deviceType", @@ -671,11 +689,11 @@ DESCN, STATUS, DEPTID, - wellCode, - wellId, - deviceId, + "wellCode", + "wellId", + "deviceId", VALID, - deviceTypeName + "deviceTypeName" FROM wellcover_monitorview @@ -1261,7 +1279,7 @@ - AS logtime,dh.DESCN AS descn + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1294,8 +1312,8 @@ SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH AS strength, - dh2s.CELL AS cell, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, @@ -1306,7 +1324,7 @@ AS logtime, bdt.TYPE_NAME AS "deviceTypeName", bd.device_type as deviceType, - bwi.DEPTID AS deptid + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE @@ -1329,8 +1347,9 @@ - AND (dh2s.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE ) + AND (dh2s.DEVCODE LIKE + + OR dh2s.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index bb28cfc..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -195,6 +195,24 @@ } deviceDataDtoList.add((DeviceDataDto) deviceDataDto.clone()); break; + case "管盯": + deviceData = this.baseMapper.tubeData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("燃气泄漏"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("H2S浓度"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; default://未知设备 log.info("未知设备！"); @@ -378,7 +396,6 @@ watchDataDto.setWatchType("井内水位"); watchDataDto.setType("10"); if (ObjectUtil.isNotEmpty(deviceData)) { - watchDataDto.setValue(deviceData.getData() + "m"); watchDataDto.setData(deviceData.getData() + "m"); watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -388,7 +405,28 @@ } watchDataDtos.add((WatchDataDto) watchDataDto.clone()); break; - + case "管盯": + deviceData = this.baseMapper.tubeData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("燃气泄漏"); + watchDataDto.setType("12"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("H2S浓度"); + watchDataDto.setType("14"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; default://未知设备 log.info("未知设备！"); break; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 4c1bc0b..ce81120 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.dict.BusConfigDict; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -20,6 +22,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; /** @@ -30,7 +33,7 @@ */ @Controller @RequestMapping("/busConfig") -public class BusConfigController extends BaseController { +public class BusConfigController extends ExportController { @Qualifier("busConfigServiceImpl") @@ -143,7 +146,7 @@ /** - * 燃气获取配置列表 + * 管顶获取配置列表 */ @RequestMapping(value = "/tubeConfig/list") @ResponseBody @@ -382,7 +385,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -401,7 +411,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busMethaneConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busMethaneConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -420,7 +437,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTubeConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTubeConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -440,7 +464,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busWasteGasConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busWasteGasConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -460,7 +491,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTempHumiConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTempHumiConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -479,7 +517,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busDigConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busDigConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -498,7 +543,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busNoiseConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busNoiseConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -712,7 +764,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busGasLiquidConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busGasLiquidConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 8b147d2..75c5be2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,22 +1,17 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; -import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.service.IDeviceTypeService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.PathVariable; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import java.util.List; -import java.util.Map; import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -34,10 +29,7 @@ private final IDeviceModelsService deviceModelsService; - private final IDeviceTypeService deviceTypeService; - - public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { - this.deviceTypeService = deviceTypeService; + public DeviceModelsController(IDeviceModelsService deviceModelsService) { this.deviceModelsService = deviceModelsService; } @@ -48,25 +40,9 @@ @ResponseBody public Object listPage(String deviceType, String communication) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper() - .like("MODEL_NAME", deviceType == null ? "" : deviceType) - .like("COMMUNICATION", communication == null ? "" : communication); - page = deviceModelsService.page(page, query); - Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().forEach( - deviceModels -> { - DeviceType deviceTypeModel = deviceTypeService.getById(deviceModels.getDeviceType()); - deviceModels.setDeviceTypeName(deviceTypeModel == null ? "" : deviceTypeModel.getTypeName()); - String[] d = deviceModels.getCommunication().split(","); - if (d.length > 0) { - deviceModels.setCommunNameGroup(dictMap.get(d[0])); - } - for (int i = 1; i < d.length; i++) { - deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); - } - } - ); - return new SuccessResponseData(super.packForBT(page)); + ResponseData responseData = deviceModelsService.getListPage(page,deviceType, communication); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 5178f9b..efad32d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,9 +20,9 @@ */ public interface DeviceMapper extends BaseMapper { - List getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List getDeviceList(@Param("scope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") Long deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); List getDeviceListInfo(@Param("scope") DataScope dataScope); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java index 0f589db..ce44c35 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.dao; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -23,5 +24,11 @@ List selectModelList(@Param("deviceType") Long deviceType); + List getListPage(@Param("page") Page page, + @Param("deviceType") Long deviceType, + @Param("communication") String communication); + Map getDictNameByCode(); + + List> getDeviceTypeList(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java index 0d7c10d..1036b7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -7,11 +7,18 @@ @Data public class AlarmLevelParam { + private String deptId; + private String wellType; + private String lng; + private String lat; + private String tenantId; private String name; private String deviceType; private String openAlarm; private String openJob; + private String highValue; + private String lowValue; + private String level; //等级列表 - private List levelList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index e24fccd..44c994b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -111,11 +111,10 @@ alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); - alarmLevelParam.getLevelList().forEach( - alarmLevels -> { - alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); - this.save(alarmLevel); - } - ); + alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevelParam.getLevel()) ? "-1" : alarmLevelParam.getLevel())); + this.save(alarmLevel); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 4a35142..a480f26 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -18,7 +18,7 @@ List> deviceStaticsByType(); - List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") Long deviceType); List> deviceStaticsByRoad(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index c4ea3dd..6286a05 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -37,21 +37,21 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 8b7767b..514448a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -57,7 +57,7 @@ LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID BD.VALID = '1' AND BDW.VALID='1' - + AND BD.DEVICE_TYPE = #{deviceType} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 209b900..95110b4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -69,7 +69,7 @@ @Override public List> deviceStaticsByDept(DataScope dataScope, String deviceType) { - List> mapList = statisticMapper.deviceStaticsByDept(dataScope, deviceType); + List> mapList = statisticMapper.deviceStaticsByDept(dataScope, StrUtil.isEmpty(deviceType)?-1:Long.valueOf(deviceType)); for (Map map : mapList) { map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 3d7ae31..bf89d08 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -583,7 +583,7 @@ /** * 数据列表查询 */ - @GetMapping(value = "/data/list-page") + @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { if (StrUtil.isEmpty(watchType)) { return ResponseData.success("缺少监测类型参数，请重传"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index eb4ab56..393589c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -58,6 +58,11 @@ */ DeviceData lgLiquidData(@Param("devcode") String devcode); + + DeviceData tubeData(@Param("devcode") String devcode); + + DeviceData H2sData(@Param("devcode") String devcode); + BfztCountDataDto bfztCountData(@Param("deptIds") List deptIds, @Param("isApp") Boolean isApp); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 7f028c5..3be6c65 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -78,6 +78,7 @@ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') + ${paramStr} @@ -170,8 +171,8 @@ UPTIME AS logtime FROM data_gas WHERE DEVCODE = #{devcode} - ORDER BY UPTIME - DESC LIMIT 1 + ORDER BY UPTIME DESC + LIMIT 1 - + + + + SELECT devcode, - deviceType, - deviceTypeName, + "deviceType", + "deviceTypeName", deptid, - wellCode, + "wellCode", descn, cell, uptime, @@ -371,7 +389,7 @@ liquiddata FROM ( - ( + SELECT dl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -413,8 +431,8 @@ - ) UNION ALL - ( + UNION ALL + SELECT dgl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -456,7 +474,7 @@ - ) + ) t1 ORDER BY uptime asc @@ -558,10 +576,10 @@ @@ -663,7 +681,7 @@ parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page"> SELECT DEVCODE, - deviceType, + "deviceType", @@ -671,11 +689,11 @@ DESCN, STATUS, DEPTID, - wellCode, - wellId, - deviceId, + "wellCode", + "wellId", + "deviceId", VALID, - deviceTypeName + "deviceTypeName" FROM wellcover_monitorview @@ -1261,7 +1279,7 @@ - AS logtime,dh.DESCN AS descn + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1294,8 +1312,8 @@ SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH AS strength, - dh2s.CELL AS cell, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, @@ -1306,7 +1324,7 @@ AS logtime, bdt.TYPE_NAME AS "deviceTypeName", bd.device_type as deviceType, - bwi.DEPTID AS deptid + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE @@ -1329,8 +1347,9 @@ - AND (dh2s.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE ) + AND (dh2s.DEVCODE LIKE + + OR dh2s.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index bb28cfc..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -195,6 +195,24 @@ } deviceDataDtoList.add((DeviceDataDto) deviceDataDto.clone()); break; + case "管盯": + deviceData = this.baseMapper.tubeData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("燃气泄漏"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("H2S浓度"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; default://未知设备 log.info("未知设备！"); @@ -378,7 +396,6 @@ watchDataDto.setWatchType("井内水位"); watchDataDto.setType("10"); if (ObjectUtil.isNotEmpty(deviceData)) { - watchDataDto.setValue(deviceData.getData() + "m"); watchDataDto.setData(deviceData.getData() + "m"); watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -388,7 +405,28 @@ } watchDataDtos.add((WatchDataDto) watchDataDto.clone()); break; - + case "管盯": + deviceData = this.baseMapper.tubeData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("燃气泄漏"); + watchDataDto.setType("12"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("H2S浓度"); + watchDataDto.setType("14"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; default://未知设备 log.info("未知设备！"); break; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 4c1bc0b..ce81120 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.dict.BusConfigDict; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -20,6 +22,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; /** @@ -30,7 +33,7 @@ */ @Controller @RequestMapping("/busConfig") -public class BusConfigController extends BaseController { +public class BusConfigController extends ExportController { @Qualifier("busConfigServiceImpl") @@ -143,7 +146,7 @@ /** - * 燃气获取配置列表 + * 管顶获取配置列表 */ @RequestMapping(value = "/tubeConfig/list") @ResponseBody @@ -382,7 +385,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -401,7 +411,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busMethaneConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busMethaneConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -420,7 +437,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTubeConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTubeConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -440,7 +464,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busWasteGasConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busWasteGasConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -460,7 +491,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTempHumiConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTempHumiConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -479,7 +517,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busDigConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busDigConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -498,7 +543,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busNoiseConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busNoiseConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -712,7 +764,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busGasLiquidConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busGasLiquidConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 8b147d2..75c5be2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,22 +1,17 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; -import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.service.IDeviceTypeService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.PathVariable; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import java.util.List; -import java.util.Map; import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -34,10 +29,7 @@ private final IDeviceModelsService deviceModelsService; - private final IDeviceTypeService deviceTypeService; - - public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { - this.deviceTypeService = deviceTypeService; + public DeviceModelsController(IDeviceModelsService deviceModelsService) { this.deviceModelsService = deviceModelsService; } @@ -48,25 +40,9 @@ @ResponseBody public Object listPage(String deviceType, String communication) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper() - .like("MODEL_NAME", deviceType == null ? "" : deviceType) - .like("COMMUNICATION", communication == null ? "" : communication); - page = deviceModelsService.page(page, query); - Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().forEach( - deviceModels -> { - DeviceType deviceTypeModel = deviceTypeService.getById(deviceModels.getDeviceType()); - deviceModels.setDeviceTypeName(deviceTypeModel == null ? "" : deviceTypeModel.getTypeName()); - String[] d = deviceModels.getCommunication().split(","); - if (d.length > 0) { - deviceModels.setCommunNameGroup(dictMap.get(d[0])); - } - for (int i = 1; i < d.length; i++) { - deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); - } - } - ); - return new SuccessResponseData(super.packForBT(page)); + ResponseData responseData = deviceModelsService.getListPage(page,deviceType, communication); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 5178f9b..efad32d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,9 +20,9 @@ */ public interface DeviceMapper extends BaseMapper { - List getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List getDeviceList(@Param("scope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") Long deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); List getDeviceListInfo(@Param("scope") DataScope dataScope); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java index 0f589db..ce44c35 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.dao; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -23,5 +24,11 @@ List selectModelList(@Param("deviceType") Long deviceType); + List getListPage(@Param("page") Page page, + @Param("deviceType") Long deviceType, + @Param("communication") String communication); + Map getDictNameByCode(); + + List> getDeviceTypeList(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index abec443..ea76482 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -157,7 +157,7 @@ FROM device_view dv LEFT JOIN bus_device_status bds ON bds.DEVICE_ID=dv.ID WHERE VALID = '1' - + and deviceType = #{deviceType} @@ -240,7 +240,7 @@ - d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='1' THEN 1 ELSE 0 END AS "onlineState",t.TYPE_NAME AS "typeName" + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='0' THEN 0 ELSE 1 END AS "onlineState",t.TYPE_NAME AS "typeName" diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java index 0d7c10d..1036b7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -7,11 +7,18 @@ @Data public class AlarmLevelParam { + private String deptId; + private String wellType; + private String lng; + private String lat; + private String tenantId; private String name; private String deviceType; private String openAlarm; private String openJob; + private String highValue; + private String lowValue; + private String level; //等级列表 - private List levelList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index e24fccd..44c994b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -111,11 +111,10 @@ alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); - alarmLevelParam.getLevelList().forEach( - alarmLevels -> { - alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); - this.save(alarmLevel); - } - ); + alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevelParam.getLevel()) ? "-1" : alarmLevelParam.getLevel())); + this.save(alarmLevel); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 4a35142..a480f26 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -18,7 +18,7 @@ List> deviceStaticsByType(); - List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") Long deviceType); List> deviceStaticsByRoad(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index c4ea3dd..6286a05 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -37,21 +37,21 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 8b7767b..514448a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -57,7 +57,7 @@ LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID BD.VALID = '1' AND BDW.VALID='1' - + AND BD.DEVICE_TYPE = #{deviceType} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 209b900..95110b4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -69,7 +69,7 @@ @Override public List> deviceStaticsByDept(DataScope dataScope, String deviceType) { - List> mapList = statisticMapper.deviceStaticsByDept(dataScope, deviceType); + List> mapList = statisticMapper.deviceStaticsByDept(dataScope, StrUtil.isEmpty(deviceType)?-1:Long.valueOf(deviceType)); for (Map map : mapList) { map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 3d7ae31..bf89d08 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -583,7 +583,7 @@ /** * 数据列表查询 */ - @GetMapping(value = "/data/list-page") + @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { if (StrUtil.isEmpty(watchType)) { return ResponseData.success("缺少监测类型参数，请重传"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index eb4ab56..393589c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -58,6 +58,11 @@ */ DeviceData lgLiquidData(@Param("devcode") String devcode); + + DeviceData tubeData(@Param("devcode") String devcode); + + DeviceData H2sData(@Param("devcode") String devcode); + BfztCountDataDto bfztCountData(@Param("deptIds") List deptIds, @Param("isApp") Boolean isApp); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 7f028c5..3be6c65 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -78,6 +78,7 @@ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') + ${paramStr} @@ -170,8 +171,8 @@ UPTIME AS logtime FROM data_gas WHERE DEVCODE = #{devcode} - ORDER BY UPTIME - DESC LIMIT 1 + ORDER BY UPTIME DESC + LIMIT 1 - + + + + SELECT devcode, - deviceType, - deviceTypeName, + "deviceType", + "deviceTypeName", deptid, - wellCode, + "wellCode", descn, cell, uptime, @@ -371,7 +389,7 @@ liquiddata FROM ( - ( + SELECT dl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -413,8 +431,8 @@ - ) UNION ALL - ( + UNION ALL + SELECT dgl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -456,7 +474,7 @@ - ) + ) t1 ORDER BY uptime asc @@ -558,10 +576,10 @@ @@ -663,7 +681,7 @@ parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page"> SELECT DEVCODE, - deviceType, + "deviceType", @@ -671,11 +689,11 @@ DESCN, STATUS, DEPTID, - wellCode, - wellId, - deviceId, + "wellCode", + "wellId", + "deviceId", VALID, - deviceTypeName + "deviceTypeName" FROM wellcover_monitorview @@ -1261,7 +1279,7 @@ - AS logtime,dh.DESCN AS descn + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1294,8 +1312,8 @@ SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH AS strength, - dh2s.CELL AS cell, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, @@ -1306,7 +1324,7 @@ AS logtime, bdt.TYPE_NAME AS "deviceTypeName", bd.device_type as deviceType, - bwi.DEPTID AS deptid + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE @@ -1329,8 +1347,9 @@ - AND (dh2s.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE ) + AND (dh2s.DEVCODE LIKE + + OR dh2s.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index bb28cfc..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -195,6 +195,24 @@ } deviceDataDtoList.add((DeviceDataDto) deviceDataDto.clone()); break; + case "管盯": + deviceData = this.baseMapper.tubeData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("燃气泄漏"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("H2S浓度"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; default://未知设备 log.info("未知设备！"); @@ -378,7 +396,6 @@ watchDataDto.setWatchType("井内水位"); watchDataDto.setType("10"); if (ObjectUtil.isNotEmpty(deviceData)) { - watchDataDto.setValue(deviceData.getData() + "m"); watchDataDto.setData(deviceData.getData() + "m"); watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -388,7 +405,28 @@ } watchDataDtos.add((WatchDataDto) watchDataDto.clone()); break; - + case "管盯": + deviceData = this.baseMapper.tubeData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("燃气泄漏"); + watchDataDto.setType("12"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("H2S浓度"); + watchDataDto.setType("14"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; default://未知设备 log.info("未知设备！"); break; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 4c1bc0b..ce81120 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.dict.BusConfigDict; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -20,6 +22,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; /** @@ -30,7 +33,7 @@ */ @Controller @RequestMapping("/busConfig") -public class BusConfigController extends BaseController { +public class BusConfigController extends ExportController { @Qualifier("busConfigServiceImpl") @@ -143,7 +146,7 @@ /** - * 燃气获取配置列表 + * 管顶获取配置列表 */ @RequestMapping(value = "/tubeConfig/list") @ResponseBody @@ -382,7 +385,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -401,7 +411,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busMethaneConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busMethaneConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -420,7 +437,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTubeConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTubeConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -440,7 +464,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busWasteGasConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busWasteGasConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -460,7 +491,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTempHumiConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTempHumiConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -479,7 +517,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busDigConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busDigConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -498,7 +543,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busNoiseConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busNoiseConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -712,7 +764,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busGasLiquidConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busGasLiquidConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 8b147d2..75c5be2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,22 +1,17 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; -import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.service.IDeviceTypeService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.PathVariable; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import java.util.List; -import java.util.Map; import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -34,10 +29,7 @@ private final IDeviceModelsService deviceModelsService; - private final IDeviceTypeService deviceTypeService; - - public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { - this.deviceTypeService = deviceTypeService; + public DeviceModelsController(IDeviceModelsService deviceModelsService) { this.deviceModelsService = deviceModelsService; } @@ -48,25 +40,9 @@ @ResponseBody public Object listPage(String deviceType, String communication) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper() - .like("MODEL_NAME", deviceType == null ? "" : deviceType) - .like("COMMUNICATION", communication == null ? "" : communication); - page = deviceModelsService.page(page, query); - Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().forEach( - deviceModels -> { - DeviceType deviceTypeModel = deviceTypeService.getById(deviceModels.getDeviceType()); - deviceModels.setDeviceTypeName(deviceTypeModel == null ? "" : deviceTypeModel.getTypeName()); - String[] d = deviceModels.getCommunication().split(","); - if (d.length > 0) { - deviceModels.setCommunNameGroup(dictMap.get(d[0])); - } - for (int i = 1; i < d.length; i++) { - deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); - } - } - ); - return new SuccessResponseData(super.packForBT(page)); + ResponseData responseData = deviceModelsService.getListPage(page,deviceType, communication); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 5178f9b..efad32d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,9 +20,9 @@ */ public interface DeviceMapper extends BaseMapper { - List getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List getDeviceList(@Param("scope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") Long deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); List getDeviceListInfo(@Param("scope") DataScope dataScope); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java index 0f589db..ce44c35 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.dao; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -23,5 +24,11 @@ List selectModelList(@Param("deviceType") Long deviceType); + List getListPage(@Param("page") Page page, + @Param("deviceType") Long deviceType, + @Param("communication") String communication); + Map getDictNameByCode(); + + List> getDeviceTypeList(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index abec443..ea76482 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -157,7 +157,7 @@ FROM device_view dv LEFT JOIN bus_device_status bds ON bds.DEVICE_ID=dv.ID WHERE VALID = '1' - + and deviceType = #{deviceType} @@ -240,7 +240,7 @@ - d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='1' THEN 1 ELSE 0 END AS "onlineState",t.TYPE_NAME AS "typeName" + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='0' THEN 0 ELSE 1 END AS "onlineState",t.TYPE_NAME AS "typeName" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index 4943869..6e6e554 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -50,4 +50,24 @@ GROUP BY pid + + + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java index 0d7c10d..1036b7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -7,11 +7,18 @@ @Data public class AlarmLevelParam { + private String deptId; + private String wellType; + private String lng; + private String lat; + private String tenantId; private String name; private String deviceType; private String openAlarm; private String openJob; + private String highValue; + private String lowValue; + private String level; //等级列表 - private List levelList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index e24fccd..44c994b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -111,11 +111,10 @@ alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); - alarmLevelParam.getLevelList().forEach( - alarmLevels -> { - alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); - this.save(alarmLevel); - } - ); + alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevelParam.getLevel()) ? "-1" : alarmLevelParam.getLevel())); + this.save(alarmLevel); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 4a35142..a480f26 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -18,7 +18,7 @@ List> deviceStaticsByType(); - List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") Long deviceType); List> deviceStaticsByRoad(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index c4ea3dd..6286a05 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -37,21 +37,21 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 8b7767b..514448a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -57,7 +57,7 @@ LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID BD.VALID = '1' AND BDW.VALID='1' - + AND BD.DEVICE_TYPE = #{deviceType} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 209b900..95110b4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -69,7 +69,7 @@ @Override public List> deviceStaticsByDept(DataScope dataScope, String deviceType) { - List> mapList = statisticMapper.deviceStaticsByDept(dataScope, deviceType); + List> mapList = statisticMapper.deviceStaticsByDept(dataScope, StrUtil.isEmpty(deviceType)?-1:Long.valueOf(deviceType)); for (Map map : mapList) { map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 3d7ae31..bf89d08 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -583,7 +583,7 @@ /** * 数据列表查询 */ - @GetMapping(value = "/data/list-page") + @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { if (StrUtil.isEmpty(watchType)) { return ResponseData.success("缺少监测类型参数，请重传"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index eb4ab56..393589c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -58,6 +58,11 @@ */ DeviceData lgLiquidData(@Param("devcode") String devcode); + + DeviceData tubeData(@Param("devcode") String devcode); + + DeviceData H2sData(@Param("devcode") String devcode); + BfztCountDataDto bfztCountData(@Param("deptIds") List deptIds, @Param("isApp") Boolean isApp); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 7f028c5..3be6c65 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -78,6 +78,7 @@ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') + ${paramStr} @@ -170,8 +171,8 @@ UPTIME AS logtime FROM data_gas WHERE DEVCODE = #{devcode} - ORDER BY UPTIME - DESC LIMIT 1 + ORDER BY UPTIME DESC + LIMIT 1 - + + + + SELECT devcode, - deviceType, - deviceTypeName, + "deviceType", + "deviceTypeName", deptid, - wellCode, + "wellCode", descn, cell, uptime, @@ -371,7 +389,7 @@ liquiddata FROM ( - ( + SELECT dl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -413,8 +431,8 @@ - ) UNION ALL - ( + UNION ALL + SELECT dgl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -456,7 +474,7 @@ - ) + ) t1 ORDER BY uptime asc @@ -558,10 +576,10 @@ @@ -663,7 +681,7 @@ parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page"> SELECT DEVCODE, - deviceType, + "deviceType", @@ -671,11 +689,11 @@ DESCN, STATUS, DEPTID, - wellCode, - wellId, - deviceId, + "wellCode", + "wellId", + "deviceId", VALID, - deviceTypeName + "deviceTypeName" FROM wellcover_monitorview @@ -1261,7 +1279,7 @@ - AS logtime,dh.DESCN AS descn + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1294,8 +1312,8 @@ SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH AS strength, - dh2s.CELL AS cell, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, @@ -1306,7 +1324,7 @@ AS logtime, bdt.TYPE_NAME AS "deviceTypeName", bd.device_type as deviceType, - bwi.DEPTID AS deptid + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE @@ -1329,8 +1347,9 @@ - AND (dh2s.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE ) + AND (dh2s.DEVCODE LIKE + + OR dh2s.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index bb28cfc..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -195,6 +195,24 @@ } deviceDataDtoList.add((DeviceDataDto) deviceDataDto.clone()); break; + case "管盯": + deviceData = this.baseMapper.tubeData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("燃气泄漏"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("H2S浓度"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; default://未知设备 log.info("未知设备！"); @@ -378,7 +396,6 @@ watchDataDto.setWatchType("井内水位"); watchDataDto.setType("10"); if (ObjectUtil.isNotEmpty(deviceData)) { - watchDataDto.setValue(deviceData.getData() + "m"); watchDataDto.setData(deviceData.getData() + "m"); watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -388,7 +405,28 @@ } watchDataDtos.add((WatchDataDto) watchDataDto.clone()); break; - + case "管盯": + deviceData = this.baseMapper.tubeData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("燃气泄漏"); + watchDataDto.setType("12"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("H2S浓度"); + watchDataDto.setType("14"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; default://未知设备 log.info("未知设备！"); break; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 4c1bc0b..ce81120 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.dict.BusConfigDict; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -20,6 +22,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; /** @@ -30,7 +33,7 @@ */ @Controller @RequestMapping("/busConfig") -public class BusConfigController extends BaseController { +public class BusConfigController extends ExportController { @Qualifier("busConfigServiceImpl") @@ -143,7 +146,7 @@ /** - * 燃气获取配置列表 + * 管顶获取配置列表 */ @RequestMapping(value = "/tubeConfig/list") @ResponseBody @@ -382,7 +385,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -401,7 +411,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busMethaneConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busMethaneConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -420,7 +437,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTubeConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTubeConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -440,7 +464,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busWasteGasConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busWasteGasConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -460,7 +491,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTempHumiConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTempHumiConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -479,7 +517,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busDigConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busDigConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -498,7 +543,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busNoiseConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busNoiseConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -712,7 +764,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busGasLiquidConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busGasLiquidConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 8b147d2..75c5be2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,22 +1,17 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; -import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.service.IDeviceTypeService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.PathVariable; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import java.util.List; -import java.util.Map; import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -34,10 +29,7 @@ private final IDeviceModelsService deviceModelsService; - private final IDeviceTypeService deviceTypeService; - - public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { - this.deviceTypeService = deviceTypeService; + public DeviceModelsController(IDeviceModelsService deviceModelsService) { this.deviceModelsService = deviceModelsService; } @@ -48,25 +40,9 @@ @ResponseBody public Object listPage(String deviceType, String communication) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper() - .like("MODEL_NAME", deviceType == null ? "" : deviceType) - .like("COMMUNICATION", communication == null ? "" : communication); - page = deviceModelsService.page(page, query); - Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().forEach( - deviceModels -> { - DeviceType deviceTypeModel = deviceTypeService.getById(deviceModels.getDeviceType()); - deviceModels.setDeviceTypeName(deviceTypeModel == null ? "" : deviceTypeModel.getTypeName()); - String[] d = deviceModels.getCommunication().split(","); - if (d.length > 0) { - deviceModels.setCommunNameGroup(dictMap.get(d[0])); - } - for (int i = 1; i < d.length; i++) { - deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); - } - } - ); - return new SuccessResponseData(super.packForBT(page)); + ResponseData responseData = deviceModelsService.getListPage(page,deviceType, communication); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 5178f9b..efad32d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,9 +20,9 @@ */ public interface DeviceMapper extends BaseMapper { - List getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List getDeviceList(@Param("scope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") Long deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); List getDeviceListInfo(@Param("scope") DataScope dataScope); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java index 0f589db..ce44c35 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.dao; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -23,5 +24,11 @@ List selectModelList(@Param("deviceType") Long deviceType); + List getListPage(@Param("page") Page page, + @Param("deviceType") Long deviceType, + @Param("communication") String communication); + Map getDictNameByCode(); + + List> getDeviceTypeList(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index abec443..ea76482 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -157,7 +157,7 @@ FROM device_view dv LEFT JOIN bus_device_status bds ON bds.DEVICE_ID=dv.ID WHERE VALID = '1' - + and deviceType = #{deviceType} @@ -240,7 +240,7 @@ - d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='1' THEN 1 ELSE 0 END AS "onlineState",t.TYPE_NAME AS "typeName" + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='0' THEN 0 ELSE 1 END AS "onlineState",t.TYPE_NAME AS "typeName" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index 4943869..6e6e554 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -50,4 +50,24 @@ GROUP BY pid + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 730d95b..988bcba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -77,10 +77,10 @@ /** * 液位设备配置导入 * - * @param uploadFile 附件 + * @param busConfigDTOList 附件 * @return */ - SuccessResponseData imp(MultipartFile uploadFile); + SuccessResponseData imp(List busConfigDTOList); /** * 设备配置导出 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java index 0d7c10d..1036b7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -7,11 +7,18 @@ @Data public class AlarmLevelParam { + private String deptId; + private String wellType; + private String lng; + private String lat; + private String tenantId; private String name; private String deviceType; private String openAlarm; private String openJob; + private String highValue; + private String lowValue; + private String level; //等级列表 - private List levelList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index e24fccd..44c994b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -111,11 +111,10 @@ alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); - alarmLevelParam.getLevelList().forEach( - alarmLevels -> { - alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); - this.save(alarmLevel); - } - ); + alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevelParam.getLevel()) ? "-1" : alarmLevelParam.getLevel())); + this.save(alarmLevel); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 4a35142..a480f26 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -18,7 +18,7 @@ List> deviceStaticsByType(); - List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") Long deviceType); List> deviceStaticsByRoad(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index c4ea3dd..6286a05 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -37,21 +37,21 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 8b7767b..514448a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -57,7 +57,7 @@ LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID BD.VALID = '1' AND BDW.VALID='1' - + AND BD.DEVICE_TYPE = #{deviceType} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 209b900..95110b4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -69,7 +69,7 @@ @Override public List> deviceStaticsByDept(DataScope dataScope, String deviceType) { - List> mapList = statisticMapper.deviceStaticsByDept(dataScope, deviceType); + List> mapList = statisticMapper.deviceStaticsByDept(dataScope, StrUtil.isEmpty(deviceType)?-1:Long.valueOf(deviceType)); for (Map map : mapList) { map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 3d7ae31..bf89d08 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -583,7 +583,7 @@ /** * 数据列表查询 */ - @GetMapping(value = "/data/list-page") + @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { if (StrUtil.isEmpty(watchType)) { return ResponseData.success("缺少监测类型参数，请重传"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index eb4ab56..393589c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -58,6 +58,11 @@ */ DeviceData lgLiquidData(@Param("devcode") String devcode); + + DeviceData tubeData(@Param("devcode") String devcode); + + DeviceData H2sData(@Param("devcode") String devcode); + BfztCountDataDto bfztCountData(@Param("deptIds") List deptIds, @Param("isApp") Boolean isApp); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 7f028c5..3be6c65 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -78,6 +78,7 @@ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') + ${paramStr} @@ -170,8 +171,8 @@ UPTIME AS logtime FROM data_gas WHERE DEVCODE = #{devcode} - ORDER BY UPTIME - DESC LIMIT 1 + ORDER BY UPTIME DESC + LIMIT 1 - + + + + SELECT devcode, - deviceType, - deviceTypeName, + "deviceType", + "deviceTypeName", deptid, - wellCode, + "wellCode", descn, cell, uptime, @@ -371,7 +389,7 @@ liquiddata FROM ( - ( + SELECT dl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -413,8 +431,8 @@ - ) UNION ALL - ( + UNION ALL + SELECT dgl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -456,7 +474,7 @@ - ) + ) t1 ORDER BY uptime asc @@ -558,10 +576,10 @@ @@ -663,7 +681,7 @@ parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page"> SELECT DEVCODE, - deviceType, + "deviceType", @@ -671,11 +689,11 @@ DESCN, STATUS, DEPTID, - wellCode, - wellId, - deviceId, + "wellCode", + "wellId", + "deviceId", VALID, - deviceTypeName + "deviceTypeName" FROM wellcover_monitorview @@ -1261,7 +1279,7 @@ - AS logtime,dh.DESCN AS descn + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1294,8 +1312,8 @@ SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH AS strength, - dh2s.CELL AS cell, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, @@ -1306,7 +1324,7 @@ AS logtime, bdt.TYPE_NAME AS "deviceTypeName", bd.device_type as deviceType, - bwi.DEPTID AS deptid + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE @@ -1329,8 +1347,9 @@ - AND (dh2s.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE ) + AND (dh2s.DEVCODE LIKE + + OR dh2s.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index bb28cfc..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -195,6 +195,24 @@ } deviceDataDtoList.add((DeviceDataDto) deviceDataDto.clone()); break; + case "管盯": + deviceData = this.baseMapper.tubeData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("燃气泄漏"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("H2S浓度"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; default://未知设备 log.info("未知设备！"); @@ -378,7 +396,6 @@ watchDataDto.setWatchType("井内水位"); watchDataDto.setType("10"); if (ObjectUtil.isNotEmpty(deviceData)) { - watchDataDto.setValue(deviceData.getData() + "m"); watchDataDto.setData(deviceData.getData() + "m"); watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -388,7 +405,28 @@ } watchDataDtos.add((WatchDataDto) watchDataDto.clone()); break; - + case "管盯": + deviceData = this.baseMapper.tubeData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("燃气泄漏"); + watchDataDto.setType("12"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("H2S浓度"); + watchDataDto.setType("14"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; default://未知设备 log.info("未知设备！"); break; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 4c1bc0b..ce81120 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.dict.BusConfigDict; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -20,6 +22,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; /** @@ -30,7 +33,7 @@ */ @Controller @RequestMapping("/busConfig") -public class BusConfigController extends BaseController { +public class BusConfigController extends ExportController { @Qualifier("busConfigServiceImpl") @@ -143,7 +146,7 @@ /** - * 燃气获取配置列表 + * 管顶获取配置列表 */ @RequestMapping(value = "/tubeConfig/list") @ResponseBody @@ -382,7 +385,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -401,7 +411,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busMethaneConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busMethaneConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -420,7 +437,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTubeConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTubeConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -440,7 +464,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busWasteGasConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busWasteGasConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -460,7 +491,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTempHumiConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTempHumiConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -479,7 +517,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busDigConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busDigConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -498,7 +543,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busNoiseConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busNoiseConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -712,7 +764,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busGasLiquidConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busGasLiquidConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 8b147d2..75c5be2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,22 +1,17 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; -import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.service.IDeviceTypeService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.PathVariable; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import java.util.List; -import java.util.Map; import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -34,10 +29,7 @@ private final IDeviceModelsService deviceModelsService; - private final IDeviceTypeService deviceTypeService; - - public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { - this.deviceTypeService = deviceTypeService; + public DeviceModelsController(IDeviceModelsService deviceModelsService) { this.deviceModelsService = deviceModelsService; } @@ -48,25 +40,9 @@ @ResponseBody public Object listPage(String deviceType, String communication) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper() - .like("MODEL_NAME", deviceType == null ? "" : deviceType) - .like("COMMUNICATION", communication == null ? "" : communication); - page = deviceModelsService.page(page, query); - Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().forEach( - deviceModels -> { - DeviceType deviceTypeModel = deviceTypeService.getById(deviceModels.getDeviceType()); - deviceModels.setDeviceTypeName(deviceTypeModel == null ? "" : deviceTypeModel.getTypeName()); - String[] d = deviceModels.getCommunication().split(","); - if (d.length > 0) { - deviceModels.setCommunNameGroup(dictMap.get(d[0])); - } - for (int i = 1; i < d.length; i++) { - deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); - } - } - ); - return new SuccessResponseData(super.packForBT(page)); + ResponseData responseData = deviceModelsService.getListPage(page,deviceType, communication); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 5178f9b..efad32d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,9 +20,9 @@ */ public interface DeviceMapper extends BaseMapper { - List getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List getDeviceList(@Param("scope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") Long deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); List getDeviceListInfo(@Param("scope") DataScope dataScope); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java index 0f589db..ce44c35 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.dao; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -23,5 +24,11 @@ List selectModelList(@Param("deviceType") Long deviceType); + List getListPage(@Param("page") Page page, + @Param("deviceType") Long deviceType, + @Param("communication") String communication); + Map getDictNameByCode(); + + List> getDeviceTypeList(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index abec443..ea76482 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -157,7 +157,7 @@ FROM device_view dv LEFT JOIN bus_device_status bds ON bds.DEVICE_ID=dv.ID WHERE VALID = '1' - + and deviceType = #{deviceType} @@ -240,7 +240,7 @@ - d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='1' THEN 1 ELSE 0 END AS "onlineState",t.TYPE_NAME AS "typeName" + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='0' THEN 0 ELSE 1 END AS "onlineState",t.TYPE_NAME AS "typeName" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index 4943869..6e6e554 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -50,4 +50,24 @@ GROUP BY pid + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 730d95b..988bcba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -77,10 +77,10 @@ /** * 液位设备配置导入 * - * @param uploadFile 附件 + * @param busConfigDTOList 附件 * @return */ - SuccessResponseData imp(MultipartFile uploadFile); + SuccessResponseData imp(List busConfigDTOList); /** * 设备配置导出 diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java index 4bc79ba..b4c601b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.extension.service.IService; @@ -34,5 +36,7 @@ DeviceModels selectDeviceTypeById(String id); + ResponseData getListPage(Page page,String deviceType, String communication); + Map getDictNameByCode(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java index 0d7c10d..1036b7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -7,11 +7,18 @@ @Data public class AlarmLevelParam { + private String deptId; + private String wellType; + private String lng; + private String lat; + private String tenantId; private String name; private String deviceType; private String openAlarm; private String openJob; + private String highValue; + private String lowValue; + private String level; //等级列表 - private List levelList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index e24fccd..44c994b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -111,11 +111,10 @@ alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); - alarmLevelParam.getLevelList().forEach( - alarmLevels -> { - alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); - this.save(alarmLevel); - } - ); + alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevelParam.getLevel()) ? "-1" : alarmLevelParam.getLevel())); + this.save(alarmLevel); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 4a35142..a480f26 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -18,7 +18,7 @@ List> deviceStaticsByType(); - List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") Long deviceType); List> deviceStaticsByRoad(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index c4ea3dd..6286a05 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -37,21 +37,21 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 8b7767b..514448a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -57,7 +57,7 @@ LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID BD.VALID = '1' AND BDW.VALID='1' - + AND BD.DEVICE_TYPE = #{deviceType} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 209b900..95110b4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -69,7 +69,7 @@ @Override public List> deviceStaticsByDept(DataScope dataScope, String deviceType) { - List> mapList = statisticMapper.deviceStaticsByDept(dataScope, deviceType); + List> mapList = statisticMapper.deviceStaticsByDept(dataScope, StrUtil.isEmpty(deviceType)?-1:Long.valueOf(deviceType)); for (Map map : mapList) { map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 3d7ae31..bf89d08 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -583,7 +583,7 @@ /** * 数据列表查询 */ - @GetMapping(value = "/data/list-page") + @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { if (StrUtil.isEmpty(watchType)) { return ResponseData.success("缺少监测类型参数，请重传"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index eb4ab56..393589c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -58,6 +58,11 @@ */ DeviceData lgLiquidData(@Param("devcode") String devcode); + + DeviceData tubeData(@Param("devcode") String devcode); + + DeviceData H2sData(@Param("devcode") String devcode); + BfztCountDataDto bfztCountData(@Param("deptIds") List deptIds, @Param("isApp") Boolean isApp); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 7f028c5..3be6c65 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -78,6 +78,7 @@ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') + ${paramStr} @@ -170,8 +171,8 @@ UPTIME AS logtime FROM data_gas WHERE DEVCODE = #{devcode} - ORDER BY UPTIME - DESC LIMIT 1 + ORDER BY UPTIME DESC + LIMIT 1 - + + + + SELECT devcode, - deviceType, - deviceTypeName, + "deviceType", + "deviceTypeName", deptid, - wellCode, + "wellCode", descn, cell, uptime, @@ -371,7 +389,7 @@ liquiddata FROM ( - ( + SELECT dl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -413,8 +431,8 @@ - ) UNION ALL - ( + UNION ALL + SELECT dgl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -456,7 +474,7 @@ - ) + ) t1 ORDER BY uptime asc @@ -558,10 +576,10 @@ @@ -663,7 +681,7 @@ parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page"> SELECT DEVCODE, - deviceType, + "deviceType", @@ -671,11 +689,11 @@ DESCN, STATUS, DEPTID, - wellCode, - wellId, - deviceId, + "wellCode", + "wellId", + "deviceId", VALID, - deviceTypeName + "deviceTypeName" FROM wellcover_monitorview @@ -1261,7 +1279,7 @@ - AS logtime,dh.DESCN AS descn + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1294,8 +1312,8 @@ SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH AS strength, - dh2s.CELL AS cell, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, @@ -1306,7 +1324,7 @@ AS logtime, bdt.TYPE_NAME AS "deviceTypeName", bd.device_type as deviceType, - bwi.DEPTID AS deptid + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE @@ -1329,8 +1347,9 @@ - AND (dh2s.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE ) + AND (dh2s.DEVCODE LIKE + + OR dh2s.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index bb28cfc..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -195,6 +195,24 @@ } deviceDataDtoList.add((DeviceDataDto) deviceDataDto.clone()); break; + case "管盯": + deviceData = this.baseMapper.tubeData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("燃气泄漏"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("H2S浓度"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; default://未知设备 log.info("未知设备！"); @@ -378,7 +396,6 @@ watchDataDto.setWatchType("井内水位"); watchDataDto.setType("10"); if (ObjectUtil.isNotEmpty(deviceData)) { - watchDataDto.setValue(deviceData.getData() + "m"); watchDataDto.setData(deviceData.getData() + "m"); watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -388,7 +405,28 @@ } watchDataDtos.add((WatchDataDto) watchDataDto.clone()); break; - + case "管盯": + deviceData = this.baseMapper.tubeData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("燃气泄漏"); + watchDataDto.setType("12"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("H2S浓度"); + watchDataDto.setType("14"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; default://未知设备 log.info("未知设备！"); break; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 4c1bc0b..ce81120 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.dict.BusConfigDict; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -20,6 +22,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; /** @@ -30,7 +33,7 @@ */ @Controller @RequestMapping("/busConfig") -public class BusConfigController extends BaseController { +public class BusConfigController extends ExportController { @Qualifier("busConfigServiceImpl") @@ -143,7 +146,7 @@ /** - * 燃气获取配置列表 + * 管顶获取配置列表 */ @RequestMapping(value = "/tubeConfig/list") @ResponseBody @@ -382,7 +385,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -401,7 +411,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busMethaneConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busMethaneConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -420,7 +437,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTubeConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTubeConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -440,7 +464,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busWasteGasConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busWasteGasConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -460,7 +491,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTempHumiConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTempHumiConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -479,7 +517,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busDigConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busDigConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -498,7 +543,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busNoiseConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busNoiseConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -712,7 +764,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busGasLiquidConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busGasLiquidConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 8b147d2..75c5be2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,22 +1,17 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; -import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.service.IDeviceTypeService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.PathVariable; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import java.util.List; -import java.util.Map; import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -34,10 +29,7 @@ private final IDeviceModelsService deviceModelsService; - private final IDeviceTypeService deviceTypeService; - - public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { - this.deviceTypeService = deviceTypeService; + public DeviceModelsController(IDeviceModelsService deviceModelsService) { this.deviceModelsService = deviceModelsService; } @@ -48,25 +40,9 @@ @ResponseBody public Object listPage(String deviceType, String communication) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper() - .like("MODEL_NAME", deviceType == null ? "" : deviceType) - .like("COMMUNICATION", communication == null ? "" : communication); - page = deviceModelsService.page(page, query); - Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().forEach( - deviceModels -> { - DeviceType deviceTypeModel = deviceTypeService.getById(deviceModels.getDeviceType()); - deviceModels.setDeviceTypeName(deviceTypeModel == null ? "" : deviceTypeModel.getTypeName()); - String[] d = deviceModels.getCommunication().split(","); - if (d.length > 0) { - deviceModels.setCommunNameGroup(dictMap.get(d[0])); - } - for (int i = 1; i < d.length; i++) { - deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); - } - } - ); - return new SuccessResponseData(super.packForBT(page)); + ResponseData responseData = deviceModelsService.getListPage(page,deviceType, communication); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 5178f9b..efad32d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,9 +20,9 @@ */ public interface DeviceMapper extends BaseMapper { - List getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List getDeviceList(@Param("scope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") Long deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); List getDeviceListInfo(@Param("scope") DataScope dataScope); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java index 0f589db..ce44c35 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.dao; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -23,5 +24,11 @@ List selectModelList(@Param("deviceType") Long deviceType); + List getListPage(@Param("page") Page page, + @Param("deviceType") Long deviceType, + @Param("communication") String communication); + Map getDictNameByCode(); + + List> getDeviceTypeList(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index abec443..ea76482 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -157,7 +157,7 @@ FROM device_view dv LEFT JOIN bus_device_status bds ON bds.DEVICE_ID=dv.ID WHERE VALID = '1' - + and deviceType = #{deviceType} @@ -240,7 +240,7 @@ - d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='1' THEN 1 ELSE 0 END AS "onlineState",t.TYPE_NAME AS "typeName" + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='0' THEN 0 ELSE 1 END AS "onlineState",t.TYPE_NAME AS "typeName" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index 4943869..6e6e554 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -50,4 +50,24 @@ GROUP BY pid + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 730d95b..988bcba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -77,10 +77,10 @@ /** * 液位设备配置导入 * - * @param uploadFile 附件 + * @param busConfigDTOList 附件 * @return */ - SuccessResponseData imp(MultipartFile uploadFile); + SuccessResponseData imp(List busConfigDTOList); /** * 设备配置导出 diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java index 4bc79ba..b4c601b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.extension.service.IService; @@ -34,5 +36,7 @@ DeviceModels selectDeviceTypeById(String id); + ResponseData getListPage(Page page,String deviceType, String communication); + Map getDictNameByCode(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index 9e70f4b..a0a177d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -317,16 +317,14 @@ /** * 液位设备配置导入 * - * @param uploadFile 附件 + * @param busConfigDTOList 附件 * @return */ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); try { - - List busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { @@ -337,7 +335,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java index 0d7c10d..1036b7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -7,11 +7,18 @@ @Data public class AlarmLevelParam { + private String deptId; + private String wellType; + private String lng; + private String lat; + private String tenantId; private String name; private String deviceType; private String openAlarm; private String openJob; + private String highValue; + private String lowValue; + private String level; //等级列表 - private List levelList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index e24fccd..44c994b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -111,11 +111,10 @@ alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); - alarmLevelParam.getLevelList().forEach( - alarmLevels -> { - alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); - this.save(alarmLevel); - } - ); + alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevelParam.getLevel()) ? "-1" : alarmLevelParam.getLevel())); + this.save(alarmLevel); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 4a35142..a480f26 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -18,7 +18,7 @@ List> deviceStaticsByType(); - List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") Long deviceType); List> deviceStaticsByRoad(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index c4ea3dd..6286a05 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -37,21 +37,21 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 8b7767b..514448a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -57,7 +57,7 @@ LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID BD.VALID = '1' AND BDW.VALID='1' - + AND BD.DEVICE_TYPE = #{deviceType} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 209b900..95110b4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -69,7 +69,7 @@ @Override public List> deviceStaticsByDept(DataScope dataScope, String deviceType) { - List> mapList = statisticMapper.deviceStaticsByDept(dataScope, deviceType); + List> mapList = statisticMapper.deviceStaticsByDept(dataScope, StrUtil.isEmpty(deviceType)?-1:Long.valueOf(deviceType)); for (Map map : mapList) { map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 3d7ae31..bf89d08 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -583,7 +583,7 @@ /** * 数据列表查询 */ - @GetMapping(value = "/data/list-page") + @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { if (StrUtil.isEmpty(watchType)) { return ResponseData.success("缺少监测类型参数，请重传"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index eb4ab56..393589c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -58,6 +58,11 @@ */ DeviceData lgLiquidData(@Param("devcode") String devcode); + + DeviceData tubeData(@Param("devcode") String devcode); + + DeviceData H2sData(@Param("devcode") String devcode); + BfztCountDataDto bfztCountData(@Param("deptIds") List deptIds, @Param("isApp") Boolean isApp); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 7f028c5..3be6c65 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -78,6 +78,7 @@ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') + ${paramStr} @@ -170,8 +171,8 @@ UPTIME AS logtime FROM data_gas WHERE DEVCODE = #{devcode} - ORDER BY UPTIME - DESC LIMIT 1 + ORDER BY UPTIME DESC + LIMIT 1 - + + + + SELECT devcode, - deviceType, - deviceTypeName, + "deviceType", + "deviceTypeName", deptid, - wellCode, + "wellCode", descn, cell, uptime, @@ -371,7 +389,7 @@ liquiddata FROM ( - ( + SELECT dl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -413,8 +431,8 @@ - ) UNION ALL - ( + UNION ALL + SELECT dgl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -456,7 +474,7 @@ - ) + ) t1 ORDER BY uptime asc @@ -558,10 +576,10 @@ @@ -663,7 +681,7 @@ parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page"> SELECT DEVCODE, - deviceType, + "deviceType", @@ -671,11 +689,11 @@ DESCN, STATUS, DEPTID, - wellCode, - wellId, - deviceId, + "wellCode", + "wellId", + "deviceId", VALID, - deviceTypeName + "deviceTypeName" FROM wellcover_monitorview @@ -1261,7 +1279,7 @@ - AS logtime,dh.DESCN AS descn + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1294,8 +1312,8 @@ SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH AS strength, - dh2s.CELL AS cell, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, @@ -1306,7 +1324,7 @@ AS logtime, bdt.TYPE_NAME AS "deviceTypeName", bd.device_type as deviceType, - bwi.DEPTID AS deptid + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE @@ -1329,8 +1347,9 @@ - AND (dh2s.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE ) + AND (dh2s.DEVCODE LIKE + + OR dh2s.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index bb28cfc..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -195,6 +195,24 @@ } deviceDataDtoList.add((DeviceDataDto) deviceDataDto.clone()); break; + case "管盯": + deviceData = this.baseMapper.tubeData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("燃气泄漏"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("H2S浓度"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; default://未知设备 log.info("未知设备！"); @@ -378,7 +396,6 @@ watchDataDto.setWatchType("井内水位"); watchDataDto.setType("10"); if (ObjectUtil.isNotEmpty(deviceData)) { - watchDataDto.setValue(deviceData.getData() + "m"); watchDataDto.setData(deviceData.getData() + "m"); watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -388,7 +405,28 @@ } watchDataDtos.add((WatchDataDto) watchDataDto.clone()); break; - + case "管盯": + deviceData = this.baseMapper.tubeData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("燃气泄漏"); + watchDataDto.setType("12"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("H2S浓度"); + watchDataDto.setType("14"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; default://未知设备 log.info("未知设备！"); break; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 4c1bc0b..ce81120 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.dict.BusConfigDict; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -20,6 +22,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; /** @@ -30,7 +33,7 @@ */ @Controller @RequestMapping("/busConfig") -public class BusConfigController extends BaseController { +public class BusConfigController extends ExportController { @Qualifier("busConfigServiceImpl") @@ -143,7 +146,7 @@ /** - * 燃气获取配置列表 + * 管顶获取配置列表 */ @RequestMapping(value = "/tubeConfig/list") @ResponseBody @@ -382,7 +385,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -401,7 +411,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busMethaneConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busMethaneConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -420,7 +437,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTubeConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTubeConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -440,7 +464,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busWasteGasConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busWasteGasConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -460,7 +491,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTempHumiConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTempHumiConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -479,7 +517,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busDigConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busDigConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -498,7 +543,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busNoiseConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busNoiseConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -712,7 +764,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busGasLiquidConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busGasLiquidConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 8b147d2..75c5be2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,22 +1,17 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; -import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.service.IDeviceTypeService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.PathVariable; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import java.util.List; -import java.util.Map; import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -34,10 +29,7 @@ private final IDeviceModelsService deviceModelsService; - private final IDeviceTypeService deviceTypeService; - - public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { - this.deviceTypeService = deviceTypeService; + public DeviceModelsController(IDeviceModelsService deviceModelsService) { this.deviceModelsService = deviceModelsService; } @@ -48,25 +40,9 @@ @ResponseBody public Object listPage(String deviceType, String communication) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper() - .like("MODEL_NAME", deviceType == null ? "" : deviceType) - .like("COMMUNICATION", communication == null ? "" : communication); - page = deviceModelsService.page(page, query); - Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().forEach( - deviceModels -> { - DeviceType deviceTypeModel = deviceTypeService.getById(deviceModels.getDeviceType()); - deviceModels.setDeviceTypeName(deviceTypeModel == null ? "" : deviceTypeModel.getTypeName()); - String[] d = deviceModels.getCommunication().split(","); - if (d.length > 0) { - deviceModels.setCommunNameGroup(dictMap.get(d[0])); - } - for (int i = 1; i < d.length; i++) { - deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); - } - } - ); - return new SuccessResponseData(super.packForBT(page)); + ResponseData responseData = deviceModelsService.getListPage(page,deviceType, communication); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 5178f9b..efad32d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,9 +20,9 @@ */ public interface DeviceMapper extends BaseMapper { - List getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List getDeviceList(@Param("scope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") Long deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); List getDeviceListInfo(@Param("scope") DataScope dataScope); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java index 0f589db..ce44c35 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.dao; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -23,5 +24,11 @@ List selectModelList(@Param("deviceType") Long deviceType); + List getListPage(@Param("page") Page page, + @Param("deviceType") Long deviceType, + @Param("communication") String communication); + Map getDictNameByCode(); + + List> getDeviceTypeList(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index abec443..ea76482 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -157,7 +157,7 @@ FROM device_view dv LEFT JOIN bus_device_status bds ON bds.DEVICE_ID=dv.ID WHERE VALID = '1' - + and deviceType = #{deviceType} @@ -240,7 +240,7 @@ - d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='1' THEN 1 ELSE 0 END AS "onlineState",t.TYPE_NAME AS "typeName" + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='0' THEN 0 ELSE 1 END AS "onlineState",t.TYPE_NAME AS "typeName" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index 4943869..6e6e554 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -50,4 +50,24 @@ GROUP BY pid + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 730d95b..988bcba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -77,10 +77,10 @@ /** * 液位设备配置导入 * - * @param uploadFile 附件 + * @param busConfigDTOList 附件 * @return */ - SuccessResponseData imp(MultipartFile uploadFile); + SuccessResponseData imp(List busConfigDTOList); /** * 设备配置导出 diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java index 4bc79ba..b4c601b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.extension.service.IService; @@ -34,5 +36,7 @@ DeviceModels selectDeviceTypeById(String id); + ResponseData getListPage(Page page,String deviceType, String communication); + Map getDictNameByCode(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index 9e70f4b..a0a177d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -317,16 +317,14 @@ /** * 液位设备配置导入 * - * @param uploadFile 附件 + * @param busConfigDTOList 附件 * @return */ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); try { - - List busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { @@ -337,7 +335,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index 9d74002..f626ab7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -265,7 +265,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -278,19 +278,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - //TODO 导入项设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setSuccess(false); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java index 0d7c10d..1036b7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -7,11 +7,18 @@ @Data public class AlarmLevelParam { + private String deptId; + private String wellType; + private String lng; + private String lat; + private String tenantId; private String name; private String deviceType; private String openAlarm; private String openJob; + private String highValue; + private String lowValue; + private String level; //等级列表 - private List levelList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index e24fccd..44c994b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -111,11 +111,10 @@ alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); - alarmLevelParam.getLevelList().forEach( - alarmLevels -> { - alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); - this.save(alarmLevel); - } - ); + alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevelParam.getLevel()) ? "-1" : alarmLevelParam.getLevel())); + this.save(alarmLevel); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 4a35142..a480f26 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -18,7 +18,7 @@ List> deviceStaticsByType(); - List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") Long deviceType); List> deviceStaticsByRoad(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index c4ea3dd..6286a05 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -37,21 +37,21 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 8b7767b..514448a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -57,7 +57,7 @@ LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID BD.VALID = '1' AND BDW.VALID='1' - + AND BD.DEVICE_TYPE = #{deviceType} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 209b900..95110b4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -69,7 +69,7 @@ @Override public List> deviceStaticsByDept(DataScope dataScope, String deviceType) { - List> mapList = statisticMapper.deviceStaticsByDept(dataScope, deviceType); + List> mapList = statisticMapper.deviceStaticsByDept(dataScope, StrUtil.isEmpty(deviceType)?-1:Long.valueOf(deviceType)); for (Map map : mapList) { map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 3d7ae31..bf89d08 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -583,7 +583,7 @@ /** * 数据列表查询 */ - @GetMapping(value = "/data/list-page") + @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { if (StrUtil.isEmpty(watchType)) { return ResponseData.success("缺少监测类型参数，请重传"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index eb4ab56..393589c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -58,6 +58,11 @@ */ DeviceData lgLiquidData(@Param("devcode") String devcode); + + DeviceData tubeData(@Param("devcode") String devcode); + + DeviceData H2sData(@Param("devcode") String devcode); + BfztCountDataDto bfztCountData(@Param("deptIds") List deptIds, @Param("isApp") Boolean isApp); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 7f028c5..3be6c65 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -78,6 +78,7 @@ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') + ${paramStr} @@ -170,8 +171,8 @@ UPTIME AS logtime FROM data_gas WHERE DEVCODE = #{devcode} - ORDER BY UPTIME - DESC LIMIT 1 + ORDER BY UPTIME DESC + LIMIT 1 - + + + + SELECT devcode, - deviceType, - deviceTypeName, + "deviceType", + "deviceTypeName", deptid, - wellCode, + "wellCode", descn, cell, uptime, @@ -371,7 +389,7 @@ liquiddata FROM ( - ( + SELECT dl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -413,8 +431,8 @@ - ) UNION ALL - ( + UNION ALL + SELECT dgl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -456,7 +474,7 @@ - ) + ) t1 ORDER BY uptime asc @@ -558,10 +576,10 @@ @@ -663,7 +681,7 @@ parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page"> SELECT DEVCODE, - deviceType, + "deviceType", @@ -671,11 +689,11 @@ DESCN, STATUS, DEPTID, - wellCode, - wellId, - deviceId, + "wellCode", + "wellId", + "deviceId", VALID, - deviceTypeName + "deviceTypeName" FROM wellcover_monitorview @@ -1261,7 +1279,7 @@ - AS logtime,dh.DESCN AS descn + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1294,8 +1312,8 @@ SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH AS strength, - dh2s.CELL AS cell, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, @@ -1306,7 +1324,7 @@ AS logtime, bdt.TYPE_NAME AS "deviceTypeName", bd.device_type as deviceType, - bwi.DEPTID AS deptid + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE @@ -1329,8 +1347,9 @@ - AND (dh2s.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE ) + AND (dh2s.DEVCODE LIKE + + OR dh2s.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index bb28cfc..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -195,6 +195,24 @@ } deviceDataDtoList.add((DeviceDataDto) deviceDataDto.clone()); break; + case "管盯": + deviceData = this.baseMapper.tubeData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("燃气泄漏"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("H2S浓度"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; default://未知设备 log.info("未知设备！"); @@ -378,7 +396,6 @@ watchDataDto.setWatchType("井内水位"); watchDataDto.setType("10"); if (ObjectUtil.isNotEmpty(deviceData)) { - watchDataDto.setValue(deviceData.getData() + "m"); watchDataDto.setData(deviceData.getData() + "m"); watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -388,7 +405,28 @@ } watchDataDtos.add((WatchDataDto) watchDataDto.clone()); break; - + case "管盯": + deviceData = this.baseMapper.tubeData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("燃气泄漏"); + watchDataDto.setType("12"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("H2S浓度"); + watchDataDto.setType("14"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; default://未知设备 log.info("未知设备！"); break; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 4c1bc0b..ce81120 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.dict.BusConfigDict; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -20,6 +22,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; /** @@ -30,7 +33,7 @@ */ @Controller @RequestMapping("/busConfig") -public class BusConfigController extends BaseController { +public class BusConfigController extends ExportController { @Qualifier("busConfigServiceImpl") @@ -143,7 +146,7 @@ /** - * 燃气获取配置列表 + * 管顶获取配置列表 */ @RequestMapping(value = "/tubeConfig/list") @ResponseBody @@ -382,7 +385,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -401,7 +411,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busMethaneConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busMethaneConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -420,7 +437,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTubeConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTubeConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -440,7 +464,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busWasteGasConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busWasteGasConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -460,7 +491,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTempHumiConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTempHumiConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -479,7 +517,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busDigConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busDigConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -498,7 +543,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busNoiseConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busNoiseConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -712,7 +764,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busGasLiquidConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busGasLiquidConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 8b147d2..75c5be2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,22 +1,17 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; -import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.service.IDeviceTypeService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.PathVariable; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import java.util.List; -import java.util.Map; import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -34,10 +29,7 @@ private final IDeviceModelsService deviceModelsService; - private final IDeviceTypeService deviceTypeService; - - public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { - this.deviceTypeService = deviceTypeService; + public DeviceModelsController(IDeviceModelsService deviceModelsService) { this.deviceModelsService = deviceModelsService; } @@ -48,25 +40,9 @@ @ResponseBody public Object listPage(String deviceType, String communication) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper() - .like("MODEL_NAME", deviceType == null ? "" : deviceType) - .like("COMMUNICATION", communication == null ? "" : communication); - page = deviceModelsService.page(page, query); - Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().forEach( - deviceModels -> { - DeviceType deviceTypeModel = deviceTypeService.getById(deviceModels.getDeviceType()); - deviceModels.setDeviceTypeName(deviceTypeModel == null ? "" : deviceTypeModel.getTypeName()); - String[] d = deviceModels.getCommunication().split(","); - if (d.length > 0) { - deviceModels.setCommunNameGroup(dictMap.get(d[0])); - } - for (int i = 1; i < d.length; i++) { - deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); - } - } - ); - return new SuccessResponseData(super.packForBT(page)); + ResponseData responseData = deviceModelsService.getListPage(page,deviceType, communication); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 5178f9b..efad32d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,9 +20,9 @@ */ public interface DeviceMapper extends BaseMapper { - List getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List getDeviceList(@Param("scope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") Long deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); List getDeviceListInfo(@Param("scope") DataScope dataScope); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java index 0f589db..ce44c35 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.dao; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -23,5 +24,11 @@ List selectModelList(@Param("deviceType") Long deviceType); + List getListPage(@Param("page") Page page, + @Param("deviceType") Long deviceType, + @Param("communication") String communication); + Map getDictNameByCode(); + + List> getDeviceTypeList(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index abec443..ea76482 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -157,7 +157,7 @@ FROM device_view dv LEFT JOIN bus_device_status bds ON bds.DEVICE_ID=dv.ID WHERE VALID = '1' - + and deviceType = #{deviceType} @@ -240,7 +240,7 @@ - d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='1' THEN 1 ELSE 0 END AS "onlineState",t.TYPE_NAME AS "typeName" + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='0' THEN 0 ELSE 1 END AS "onlineState",t.TYPE_NAME AS "typeName" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index 4943869..6e6e554 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -50,4 +50,24 @@ GROUP BY pid + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 730d95b..988bcba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -77,10 +77,10 @@ /** * 液位设备配置导入 * - * @param uploadFile 附件 + * @param busConfigDTOList 附件 * @return */ - SuccessResponseData imp(MultipartFile uploadFile); + SuccessResponseData imp(List busConfigDTOList); /** * 设备配置导出 diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java index 4bc79ba..b4c601b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.extension.service.IService; @@ -34,5 +36,7 @@ DeviceModels selectDeviceTypeById(String id); + ResponseData getListPage(Page page,String deviceType, String communication); + Map getDictNameByCode(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index 9e70f4b..a0a177d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -317,16 +317,14 @@ /** * 液位设备配置导入 * - * @param uploadFile 附件 + * @param busConfigDTOList 附件 * @return */ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); try { - - List busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { @@ -337,7 +335,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index 9d74002..f626ab7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -265,7 +265,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -278,19 +278,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - //TODO 导入项设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setSuccess(false); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index fb1048b..01154ff 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -252,7 +252,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -262,17 +262,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class,uploadFile,null,null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java index 0d7c10d..1036b7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -7,11 +7,18 @@ @Data public class AlarmLevelParam { + private String deptId; + private String wellType; + private String lng; + private String lat; + private String tenantId; private String name; private String deviceType; private String openAlarm; private String openJob; + private String highValue; + private String lowValue; + private String level; //等级列表 - private List levelList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index e24fccd..44c994b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -111,11 +111,10 @@ alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); - alarmLevelParam.getLevelList().forEach( - alarmLevels -> { - alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); - this.save(alarmLevel); - } - ); + alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevelParam.getLevel()) ? "-1" : alarmLevelParam.getLevel())); + this.save(alarmLevel); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 4a35142..a480f26 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -18,7 +18,7 @@ List> deviceStaticsByType(); - List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") Long deviceType); List> deviceStaticsByRoad(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index c4ea3dd..6286a05 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -37,21 +37,21 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 8b7767b..514448a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -57,7 +57,7 @@ LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID BD.VALID = '1' AND BDW.VALID='1' - + AND BD.DEVICE_TYPE = #{deviceType} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 209b900..95110b4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -69,7 +69,7 @@ @Override public List> deviceStaticsByDept(DataScope dataScope, String deviceType) { - List> mapList = statisticMapper.deviceStaticsByDept(dataScope, deviceType); + List> mapList = statisticMapper.deviceStaticsByDept(dataScope, StrUtil.isEmpty(deviceType)?-1:Long.valueOf(deviceType)); for (Map map : mapList) { map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 3d7ae31..bf89d08 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -583,7 +583,7 @@ /** * 数据列表查询 */ - @GetMapping(value = "/data/list-page") + @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { if (StrUtil.isEmpty(watchType)) { return ResponseData.success("缺少监测类型参数，请重传"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index eb4ab56..393589c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -58,6 +58,11 @@ */ DeviceData lgLiquidData(@Param("devcode") String devcode); + + DeviceData tubeData(@Param("devcode") String devcode); + + DeviceData H2sData(@Param("devcode") String devcode); + BfztCountDataDto bfztCountData(@Param("deptIds") List deptIds, @Param("isApp") Boolean isApp); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 7f028c5..3be6c65 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -78,6 +78,7 @@ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') + ${paramStr} @@ -170,8 +171,8 @@ UPTIME AS logtime FROM data_gas WHERE DEVCODE = #{devcode} - ORDER BY UPTIME - DESC LIMIT 1 + ORDER BY UPTIME DESC + LIMIT 1 - + + + + SELECT devcode, - deviceType, - deviceTypeName, + "deviceType", + "deviceTypeName", deptid, - wellCode, + "wellCode", descn, cell, uptime, @@ -371,7 +389,7 @@ liquiddata FROM ( - ( + SELECT dl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -413,8 +431,8 @@ - ) UNION ALL - ( + UNION ALL + SELECT dgl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -456,7 +474,7 @@ - ) + ) t1 ORDER BY uptime asc @@ -558,10 +576,10 @@ @@ -663,7 +681,7 @@ parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page"> SELECT DEVCODE, - deviceType, + "deviceType", @@ -671,11 +689,11 @@ DESCN, STATUS, DEPTID, - wellCode, - wellId, - deviceId, + "wellCode", + "wellId", + "deviceId", VALID, - deviceTypeName + "deviceTypeName" FROM wellcover_monitorview @@ -1261,7 +1279,7 @@ - AS logtime,dh.DESCN AS descn + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1294,8 +1312,8 @@ SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH AS strength, - dh2s.CELL AS cell, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, @@ -1306,7 +1324,7 @@ AS logtime, bdt.TYPE_NAME AS "deviceTypeName", bd.device_type as deviceType, - bwi.DEPTID AS deptid + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE @@ -1329,8 +1347,9 @@ - AND (dh2s.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE ) + AND (dh2s.DEVCODE LIKE + + OR dh2s.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index bb28cfc..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -195,6 +195,24 @@ } deviceDataDtoList.add((DeviceDataDto) deviceDataDto.clone()); break; + case "管盯": + deviceData = this.baseMapper.tubeData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("燃气泄漏"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("H2S浓度"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; default://未知设备 log.info("未知设备！"); @@ -378,7 +396,6 @@ watchDataDto.setWatchType("井内水位"); watchDataDto.setType("10"); if (ObjectUtil.isNotEmpty(deviceData)) { - watchDataDto.setValue(deviceData.getData() + "m"); watchDataDto.setData(deviceData.getData() + "m"); watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -388,7 +405,28 @@ } watchDataDtos.add((WatchDataDto) watchDataDto.clone()); break; - + case "管盯": + deviceData = this.baseMapper.tubeData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("燃气泄漏"); + watchDataDto.setType("12"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("H2S浓度"); + watchDataDto.setType("14"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; default://未知设备 log.info("未知设备！"); break; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 4c1bc0b..ce81120 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.dict.BusConfigDict; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -20,6 +22,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; /** @@ -30,7 +33,7 @@ */ @Controller @RequestMapping("/busConfig") -public class BusConfigController extends BaseController { +public class BusConfigController extends ExportController { @Qualifier("busConfigServiceImpl") @@ -143,7 +146,7 @@ /** - * 燃气获取配置列表 + * 管顶获取配置列表 */ @RequestMapping(value = "/tubeConfig/list") @ResponseBody @@ -382,7 +385,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -401,7 +411,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busMethaneConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busMethaneConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -420,7 +437,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTubeConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTubeConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -440,7 +464,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busWasteGasConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busWasteGasConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -460,7 +491,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTempHumiConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTempHumiConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -479,7 +517,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busDigConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busDigConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -498,7 +543,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busNoiseConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busNoiseConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -712,7 +764,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busGasLiquidConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busGasLiquidConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 8b147d2..75c5be2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,22 +1,17 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; -import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.service.IDeviceTypeService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.PathVariable; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import java.util.List; -import java.util.Map; import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -34,10 +29,7 @@ private final IDeviceModelsService deviceModelsService; - private final IDeviceTypeService deviceTypeService; - - public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { - this.deviceTypeService = deviceTypeService; + public DeviceModelsController(IDeviceModelsService deviceModelsService) { this.deviceModelsService = deviceModelsService; } @@ -48,25 +40,9 @@ @ResponseBody public Object listPage(String deviceType, String communication) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper() - .like("MODEL_NAME", deviceType == null ? "" : deviceType) - .like("COMMUNICATION", communication == null ? "" : communication); - page = deviceModelsService.page(page, query); - Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().forEach( - deviceModels -> { - DeviceType deviceTypeModel = deviceTypeService.getById(deviceModels.getDeviceType()); - deviceModels.setDeviceTypeName(deviceTypeModel == null ? "" : deviceTypeModel.getTypeName()); - String[] d = deviceModels.getCommunication().split(","); - if (d.length > 0) { - deviceModels.setCommunNameGroup(dictMap.get(d[0])); - } - for (int i = 1; i < d.length; i++) { - deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); - } - } - ); - return new SuccessResponseData(super.packForBT(page)); + ResponseData responseData = deviceModelsService.getListPage(page,deviceType, communication); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 5178f9b..efad32d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,9 +20,9 @@ */ public interface DeviceMapper extends BaseMapper { - List getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List getDeviceList(@Param("scope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") Long deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); List getDeviceListInfo(@Param("scope") DataScope dataScope); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java index 0f589db..ce44c35 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.dao; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -23,5 +24,11 @@ List selectModelList(@Param("deviceType") Long deviceType); + List getListPage(@Param("page") Page page, + @Param("deviceType") Long deviceType, + @Param("communication") String communication); + Map getDictNameByCode(); + + List> getDeviceTypeList(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index abec443..ea76482 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -157,7 +157,7 @@ FROM device_view dv LEFT JOIN bus_device_status bds ON bds.DEVICE_ID=dv.ID WHERE VALID = '1' - + and deviceType = #{deviceType} @@ -240,7 +240,7 @@ - d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='1' THEN 1 ELSE 0 END AS "onlineState",t.TYPE_NAME AS "typeName" + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='0' THEN 0 ELSE 1 END AS "onlineState",t.TYPE_NAME AS "typeName" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index 4943869..6e6e554 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -50,4 +50,24 @@ GROUP BY pid + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 730d95b..988bcba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -77,10 +77,10 @@ /** * 液位设备配置导入 * - * @param uploadFile 附件 + * @param busConfigDTOList 附件 * @return */ - SuccessResponseData imp(MultipartFile uploadFile); + SuccessResponseData imp(List busConfigDTOList); /** * 设备配置导出 diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java index 4bc79ba..b4c601b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.extension.service.IService; @@ -34,5 +36,7 @@ DeviceModels selectDeviceTypeById(String id); + ResponseData getListPage(Page page,String deviceType, String communication); + Map getDictNameByCode(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index 9e70f4b..a0a177d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -317,16 +317,14 @@ /** * 液位设备配置导入 * - * @param uploadFile 附件 + * @param busConfigDTOList 附件 * @return */ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); try { - - List busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { @@ -337,7 +335,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index 9d74002..f626ab7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -265,7 +265,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -278,19 +278,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - //TODO 导入项设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setSuccess(false); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index fb1048b..01154ff 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -252,7 +252,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -262,17 +262,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class,uploadFile,null,null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index e175ec7..53c0a1d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -251,7 +251,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList ) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -261,18 +261,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - try (InputStream in = uploadFile.getInputStream()) { - try { - //TODO 导入类设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - } Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 @@ -283,7 +272,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java index 0d7c10d..1036b7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -7,11 +7,18 @@ @Data public class AlarmLevelParam { + private String deptId; + private String wellType; + private String lng; + private String lat; + private String tenantId; private String name; private String deviceType; private String openAlarm; private String openJob; + private String highValue; + private String lowValue; + private String level; //等级列表 - private List levelList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index e24fccd..44c994b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -111,11 +111,10 @@ alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); - alarmLevelParam.getLevelList().forEach( - alarmLevels -> { - alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); - this.save(alarmLevel); - } - ); + alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevelParam.getLevel()) ? "-1" : alarmLevelParam.getLevel())); + this.save(alarmLevel); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 4a35142..a480f26 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -18,7 +18,7 @@ List> deviceStaticsByType(); - List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") Long deviceType); List> deviceStaticsByRoad(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index c4ea3dd..6286a05 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -37,21 +37,21 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 8b7767b..514448a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -57,7 +57,7 @@ LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID BD.VALID = '1' AND BDW.VALID='1' - + AND BD.DEVICE_TYPE = #{deviceType} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 209b900..95110b4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -69,7 +69,7 @@ @Override public List> deviceStaticsByDept(DataScope dataScope, String deviceType) { - List> mapList = statisticMapper.deviceStaticsByDept(dataScope, deviceType); + List> mapList = statisticMapper.deviceStaticsByDept(dataScope, StrUtil.isEmpty(deviceType)?-1:Long.valueOf(deviceType)); for (Map map : mapList) { map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 3d7ae31..bf89d08 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -583,7 +583,7 @@ /** * 数据列表查询 */ - @GetMapping(value = "/data/list-page") + @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { if (StrUtil.isEmpty(watchType)) { return ResponseData.success("缺少监测类型参数，请重传"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index eb4ab56..393589c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -58,6 +58,11 @@ */ DeviceData lgLiquidData(@Param("devcode") String devcode); + + DeviceData tubeData(@Param("devcode") String devcode); + + DeviceData H2sData(@Param("devcode") String devcode); + BfztCountDataDto bfztCountData(@Param("deptIds") List deptIds, @Param("isApp") Boolean isApp); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 7f028c5..3be6c65 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -78,6 +78,7 @@ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') + ${paramStr} @@ -170,8 +171,8 @@ UPTIME AS logtime FROM data_gas WHERE DEVCODE = #{devcode} - ORDER BY UPTIME - DESC LIMIT 1 + ORDER BY UPTIME DESC + LIMIT 1 - + + + + SELECT devcode, - deviceType, - deviceTypeName, + "deviceType", + "deviceTypeName", deptid, - wellCode, + "wellCode", descn, cell, uptime, @@ -371,7 +389,7 @@ liquiddata FROM ( - ( + SELECT dl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -413,8 +431,8 @@ - ) UNION ALL - ( + UNION ALL + SELECT dgl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -456,7 +474,7 @@ - ) + ) t1 ORDER BY uptime asc @@ -558,10 +576,10 @@ @@ -663,7 +681,7 @@ parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page"> SELECT DEVCODE, - deviceType, + "deviceType", @@ -671,11 +689,11 @@ DESCN, STATUS, DEPTID, - wellCode, - wellId, - deviceId, + "wellCode", + "wellId", + "deviceId", VALID, - deviceTypeName + "deviceTypeName" FROM wellcover_monitorview @@ -1261,7 +1279,7 @@ - AS logtime,dh.DESCN AS descn + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1294,8 +1312,8 @@ SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH AS strength, - dh2s.CELL AS cell, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, @@ -1306,7 +1324,7 @@ AS logtime, bdt.TYPE_NAME AS "deviceTypeName", bd.device_type as deviceType, - bwi.DEPTID AS deptid + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE @@ -1329,8 +1347,9 @@ - AND (dh2s.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE ) + AND (dh2s.DEVCODE LIKE + + OR dh2s.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index bb28cfc..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -195,6 +195,24 @@ } deviceDataDtoList.add((DeviceDataDto) deviceDataDto.clone()); break; + case "管盯": + deviceData = this.baseMapper.tubeData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("燃气泄漏"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("H2S浓度"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; default://未知设备 log.info("未知设备！"); @@ -378,7 +396,6 @@ watchDataDto.setWatchType("井内水位"); watchDataDto.setType("10"); if (ObjectUtil.isNotEmpty(deviceData)) { - watchDataDto.setValue(deviceData.getData() + "m"); watchDataDto.setData(deviceData.getData() + "m"); watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -388,7 +405,28 @@ } watchDataDtos.add((WatchDataDto) watchDataDto.clone()); break; - + case "管盯": + deviceData = this.baseMapper.tubeData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("燃气泄漏"); + watchDataDto.setType("12"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("H2S浓度"); + watchDataDto.setType("14"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; default://未知设备 log.info("未知设备！"); break; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 4c1bc0b..ce81120 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.dict.BusConfigDict; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -20,6 +22,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; /** @@ -30,7 +33,7 @@ */ @Controller @RequestMapping("/busConfig") -public class BusConfigController extends BaseController { +public class BusConfigController extends ExportController { @Qualifier("busConfigServiceImpl") @@ -143,7 +146,7 @@ /** - * 燃气获取配置列表 + * 管顶获取配置列表 */ @RequestMapping(value = "/tubeConfig/list") @ResponseBody @@ -382,7 +385,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -401,7 +411,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busMethaneConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busMethaneConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -420,7 +437,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTubeConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTubeConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -440,7 +464,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busWasteGasConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busWasteGasConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -460,7 +491,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTempHumiConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTempHumiConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -479,7 +517,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busDigConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busDigConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -498,7 +543,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busNoiseConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busNoiseConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -712,7 +764,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busGasLiquidConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busGasLiquidConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 8b147d2..75c5be2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,22 +1,17 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; -import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.service.IDeviceTypeService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.PathVariable; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import java.util.List; -import java.util.Map; import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -34,10 +29,7 @@ private final IDeviceModelsService deviceModelsService; - private final IDeviceTypeService deviceTypeService; - - public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { - this.deviceTypeService = deviceTypeService; + public DeviceModelsController(IDeviceModelsService deviceModelsService) { this.deviceModelsService = deviceModelsService; } @@ -48,25 +40,9 @@ @ResponseBody public Object listPage(String deviceType, String communication) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper() - .like("MODEL_NAME", deviceType == null ? "" : deviceType) - .like("COMMUNICATION", communication == null ? "" : communication); - page = deviceModelsService.page(page, query); - Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().forEach( - deviceModels -> { - DeviceType deviceTypeModel = deviceTypeService.getById(deviceModels.getDeviceType()); - deviceModels.setDeviceTypeName(deviceTypeModel == null ? "" : deviceTypeModel.getTypeName()); - String[] d = deviceModels.getCommunication().split(","); - if (d.length > 0) { - deviceModels.setCommunNameGroup(dictMap.get(d[0])); - } - for (int i = 1; i < d.length; i++) { - deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); - } - } - ); - return new SuccessResponseData(super.packForBT(page)); + ResponseData responseData = deviceModelsService.getListPage(page,deviceType, communication); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 5178f9b..efad32d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,9 +20,9 @@ */ public interface DeviceMapper extends BaseMapper { - List getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List getDeviceList(@Param("scope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") Long deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); List getDeviceListInfo(@Param("scope") DataScope dataScope); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java index 0f589db..ce44c35 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.dao; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -23,5 +24,11 @@ List selectModelList(@Param("deviceType") Long deviceType); + List getListPage(@Param("page") Page page, + @Param("deviceType") Long deviceType, + @Param("communication") String communication); + Map getDictNameByCode(); + + List> getDeviceTypeList(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index abec443..ea76482 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -157,7 +157,7 @@ FROM device_view dv LEFT JOIN bus_device_status bds ON bds.DEVICE_ID=dv.ID WHERE VALID = '1' - + and deviceType = #{deviceType} @@ -240,7 +240,7 @@ - d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='1' THEN 1 ELSE 0 END AS "onlineState",t.TYPE_NAME AS "typeName" + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='0' THEN 0 ELSE 1 END AS "onlineState",t.TYPE_NAME AS "typeName" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index 4943869..6e6e554 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -50,4 +50,24 @@ GROUP BY pid + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 730d95b..988bcba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -77,10 +77,10 @@ /** * 液位设备配置导入 * - * @param uploadFile 附件 + * @param busConfigDTOList 附件 * @return */ - SuccessResponseData imp(MultipartFile uploadFile); + SuccessResponseData imp(List busConfigDTOList); /** * 设备配置导出 diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java index 4bc79ba..b4c601b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.extension.service.IService; @@ -34,5 +36,7 @@ DeviceModels selectDeviceTypeById(String id); + ResponseData getListPage(Page page,String deviceType, String communication); + Map getDictNameByCode(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index 9e70f4b..a0a177d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -317,16 +317,14 @@ /** * 液位设备配置导入 * - * @param uploadFile 附件 + * @param busConfigDTOList 附件 * @return */ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); try { - - List busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { @@ -337,7 +335,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index 9d74002..f626ab7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -265,7 +265,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -278,19 +278,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - //TODO 导入项设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setSuccess(false); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index fb1048b..01154ff 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -252,7 +252,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -262,17 +262,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class,uploadFile,null,null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index e175ec7..53c0a1d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -251,7 +251,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList ) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -261,18 +261,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - try (InputStream in = uploadFile.getInputStream()) { - try { - //TODO 导入类设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - } Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 @@ -283,7 +272,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index ad81f03..046bf4e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -248,7 +248,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -259,18 +259,6 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); - - try { - //导入文件头设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setSuccess(false); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java index 0d7c10d..1036b7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -7,11 +7,18 @@ @Data public class AlarmLevelParam { + private String deptId; + private String wellType; + private String lng; + private String lat; + private String tenantId; private String name; private String deviceType; private String openAlarm; private String openJob; + private String highValue; + private String lowValue; + private String level; //等级列表 - private List levelList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index e24fccd..44c994b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -111,11 +111,10 @@ alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); - alarmLevelParam.getLevelList().forEach( - alarmLevels -> { - alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); - this.save(alarmLevel); - } - ); + alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevelParam.getLevel()) ? "-1" : alarmLevelParam.getLevel())); + this.save(alarmLevel); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 4a35142..a480f26 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -18,7 +18,7 @@ List> deviceStaticsByType(); - List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") Long deviceType); List> deviceStaticsByRoad(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index c4ea3dd..6286a05 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -37,21 +37,21 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 8b7767b..514448a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -57,7 +57,7 @@ LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID BD.VALID = '1' AND BDW.VALID='1' - + AND BD.DEVICE_TYPE = #{deviceType} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 209b900..95110b4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -69,7 +69,7 @@ @Override public List> deviceStaticsByDept(DataScope dataScope, String deviceType) { - List> mapList = statisticMapper.deviceStaticsByDept(dataScope, deviceType); + List> mapList = statisticMapper.deviceStaticsByDept(dataScope, StrUtil.isEmpty(deviceType)?-1:Long.valueOf(deviceType)); for (Map map : mapList) { map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 3d7ae31..bf89d08 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -583,7 +583,7 @@ /** * 数据列表查询 */ - @GetMapping(value = "/data/list-page") + @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { if (StrUtil.isEmpty(watchType)) { return ResponseData.success("缺少监测类型参数，请重传"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index eb4ab56..393589c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -58,6 +58,11 @@ */ DeviceData lgLiquidData(@Param("devcode") String devcode); + + DeviceData tubeData(@Param("devcode") String devcode); + + DeviceData H2sData(@Param("devcode") String devcode); + BfztCountDataDto bfztCountData(@Param("deptIds") List deptIds, @Param("isApp") Boolean isApp); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 7f028c5..3be6c65 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -78,6 +78,7 @@ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') + ${paramStr} @@ -170,8 +171,8 @@ UPTIME AS logtime FROM data_gas WHERE DEVCODE = #{devcode} - ORDER BY UPTIME - DESC LIMIT 1 + ORDER BY UPTIME DESC + LIMIT 1 - + + + + SELECT devcode, - deviceType, - deviceTypeName, + "deviceType", + "deviceTypeName", deptid, - wellCode, + "wellCode", descn, cell, uptime, @@ -371,7 +389,7 @@ liquiddata FROM ( - ( + SELECT dl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -413,8 +431,8 @@ - ) UNION ALL - ( + UNION ALL + SELECT dgl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -456,7 +474,7 @@ - ) + ) t1 ORDER BY uptime asc @@ -558,10 +576,10 @@ @@ -663,7 +681,7 @@ parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page"> SELECT DEVCODE, - deviceType, + "deviceType", @@ -671,11 +689,11 @@ DESCN, STATUS, DEPTID, - wellCode, - wellId, - deviceId, + "wellCode", + "wellId", + "deviceId", VALID, - deviceTypeName + "deviceTypeName" FROM wellcover_monitorview @@ -1261,7 +1279,7 @@ - AS logtime,dh.DESCN AS descn + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1294,8 +1312,8 @@ SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH AS strength, - dh2s.CELL AS cell, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, @@ -1306,7 +1324,7 @@ AS logtime, bdt.TYPE_NAME AS "deviceTypeName", bd.device_type as deviceType, - bwi.DEPTID AS deptid + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE @@ -1329,8 +1347,9 @@ - AND (dh2s.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE ) + AND (dh2s.DEVCODE LIKE + + OR dh2s.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index bb28cfc..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -195,6 +195,24 @@ } deviceDataDtoList.add((DeviceDataDto) deviceDataDto.clone()); break; + case "管盯": + deviceData = this.baseMapper.tubeData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("燃气泄漏"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("H2S浓度"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; default://未知设备 log.info("未知设备！"); @@ -378,7 +396,6 @@ watchDataDto.setWatchType("井内水位"); watchDataDto.setType("10"); if (ObjectUtil.isNotEmpty(deviceData)) { - watchDataDto.setValue(deviceData.getData() + "m"); watchDataDto.setData(deviceData.getData() + "m"); watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -388,7 +405,28 @@ } watchDataDtos.add((WatchDataDto) watchDataDto.clone()); break; - + case "管盯": + deviceData = this.baseMapper.tubeData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("燃气泄漏"); + watchDataDto.setType("12"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("H2S浓度"); + watchDataDto.setType("14"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; default://未知设备 log.info("未知设备！"); break; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 4c1bc0b..ce81120 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.dict.BusConfigDict; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -20,6 +22,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; /** @@ -30,7 +33,7 @@ */ @Controller @RequestMapping("/busConfig") -public class BusConfigController extends BaseController { +public class BusConfigController extends ExportController { @Qualifier("busConfigServiceImpl") @@ -143,7 +146,7 @@ /** - * 燃气获取配置列表 + * 管顶获取配置列表 */ @RequestMapping(value = "/tubeConfig/list") @ResponseBody @@ -382,7 +385,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -401,7 +411,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busMethaneConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busMethaneConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -420,7 +437,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTubeConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTubeConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -440,7 +464,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busWasteGasConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busWasteGasConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -460,7 +491,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTempHumiConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTempHumiConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -479,7 +517,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busDigConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busDigConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -498,7 +543,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busNoiseConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busNoiseConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -712,7 +764,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busGasLiquidConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busGasLiquidConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 8b147d2..75c5be2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,22 +1,17 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; -import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.service.IDeviceTypeService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.PathVariable; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import java.util.List; -import java.util.Map; import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -34,10 +29,7 @@ private final IDeviceModelsService deviceModelsService; - private final IDeviceTypeService deviceTypeService; - - public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { - this.deviceTypeService = deviceTypeService; + public DeviceModelsController(IDeviceModelsService deviceModelsService) { this.deviceModelsService = deviceModelsService; } @@ -48,25 +40,9 @@ @ResponseBody public Object listPage(String deviceType, String communication) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper() - .like("MODEL_NAME", deviceType == null ? "" : deviceType) - .like("COMMUNICATION", communication == null ? "" : communication); - page = deviceModelsService.page(page, query); - Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().forEach( - deviceModels -> { - DeviceType deviceTypeModel = deviceTypeService.getById(deviceModels.getDeviceType()); - deviceModels.setDeviceTypeName(deviceTypeModel == null ? "" : deviceTypeModel.getTypeName()); - String[] d = deviceModels.getCommunication().split(","); - if (d.length > 0) { - deviceModels.setCommunNameGroup(dictMap.get(d[0])); - } - for (int i = 1; i < d.length; i++) { - deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); - } - } - ); - return new SuccessResponseData(super.packForBT(page)); + ResponseData responseData = deviceModelsService.getListPage(page,deviceType, communication); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 5178f9b..efad32d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,9 +20,9 @@ */ public interface DeviceMapper extends BaseMapper { - List getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List getDeviceList(@Param("scope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") Long deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); List getDeviceListInfo(@Param("scope") DataScope dataScope); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java index 0f589db..ce44c35 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.dao; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -23,5 +24,11 @@ List selectModelList(@Param("deviceType") Long deviceType); + List getListPage(@Param("page") Page page, + @Param("deviceType") Long deviceType, + @Param("communication") String communication); + Map getDictNameByCode(); + + List> getDeviceTypeList(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index abec443..ea76482 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -157,7 +157,7 @@ FROM device_view dv LEFT JOIN bus_device_status bds ON bds.DEVICE_ID=dv.ID WHERE VALID = '1' - + and deviceType = #{deviceType} @@ -240,7 +240,7 @@ - d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='1' THEN 1 ELSE 0 END AS "onlineState",t.TYPE_NAME AS "typeName" + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='0' THEN 0 ELSE 1 END AS "onlineState",t.TYPE_NAME AS "typeName" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index 4943869..6e6e554 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -50,4 +50,24 @@ GROUP BY pid + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 730d95b..988bcba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -77,10 +77,10 @@ /** * 液位设备配置导入 * - * @param uploadFile 附件 + * @param busConfigDTOList 附件 * @return */ - SuccessResponseData imp(MultipartFile uploadFile); + SuccessResponseData imp(List busConfigDTOList); /** * 设备配置导出 diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java index 4bc79ba..b4c601b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.extension.service.IService; @@ -34,5 +36,7 @@ DeviceModels selectDeviceTypeById(String id); + ResponseData getListPage(Page page,String deviceType, String communication); + Map getDictNameByCode(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index 9e70f4b..a0a177d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -317,16 +317,14 @@ /** * 液位设备配置导入 * - * @param uploadFile 附件 + * @param busConfigDTOList 附件 * @return */ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); try { - - List busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { @@ -337,7 +335,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index 9d74002..f626ab7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -265,7 +265,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -278,19 +278,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - //TODO 导入项设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setSuccess(false); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index fb1048b..01154ff 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -252,7 +252,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -262,17 +262,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class,uploadFile,null,null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index e175ec7..53c0a1d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -251,7 +251,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList ) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -261,18 +261,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - try (InputStream in = uploadFile.getInputStream()) { - try { - //TODO 导入类设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - } Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 @@ -283,7 +272,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index ad81f03..046bf4e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -248,7 +248,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -259,18 +259,6 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); - - try { - //导入文件头设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setSuccess(false); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index c45f6ff..994e825 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -250,7 +250,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp( List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -261,17 +261,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java index 0d7c10d..1036b7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -7,11 +7,18 @@ @Data public class AlarmLevelParam { + private String deptId; + private String wellType; + private String lng; + private String lat; + private String tenantId; private String name; private String deviceType; private String openAlarm; private String openJob; + private String highValue; + private String lowValue; + private String level; //等级列表 - private List levelList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index e24fccd..44c994b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -111,11 +111,10 @@ alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); - alarmLevelParam.getLevelList().forEach( - alarmLevels -> { - alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); - this.save(alarmLevel); - } - ); + alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevelParam.getLevel()) ? "-1" : alarmLevelParam.getLevel())); + this.save(alarmLevel); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 4a35142..a480f26 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -18,7 +18,7 @@ List> deviceStaticsByType(); - List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") Long deviceType); List> deviceStaticsByRoad(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index c4ea3dd..6286a05 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -37,21 +37,21 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 8b7767b..514448a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -57,7 +57,7 @@ LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID BD.VALID = '1' AND BDW.VALID='1' - + AND BD.DEVICE_TYPE = #{deviceType} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 209b900..95110b4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -69,7 +69,7 @@ @Override public List> deviceStaticsByDept(DataScope dataScope, String deviceType) { - List> mapList = statisticMapper.deviceStaticsByDept(dataScope, deviceType); + List> mapList = statisticMapper.deviceStaticsByDept(dataScope, StrUtil.isEmpty(deviceType)?-1:Long.valueOf(deviceType)); for (Map map : mapList) { map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 3d7ae31..bf89d08 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -583,7 +583,7 @@ /** * 数据列表查询 */ - @GetMapping(value = "/data/list-page") + @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { if (StrUtil.isEmpty(watchType)) { return ResponseData.success("缺少监测类型参数，请重传"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index eb4ab56..393589c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -58,6 +58,11 @@ */ DeviceData lgLiquidData(@Param("devcode") String devcode); + + DeviceData tubeData(@Param("devcode") String devcode); + + DeviceData H2sData(@Param("devcode") String devcode); + BfztCountDataDto bfztCountData(@Param("deptIds") List deptIds, @Param("isApp") Boolean isApp); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 7f028c5..3be6c65 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -78,6 +78,7 @@ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') + ${paramStr} @@ -170,8 +171,8 @@ UPTIME AS logtime FROM data_gas WHERE DEVCODE = #{devcode} - ORDER BY UPTIME - DESC LIMIT 1 + ORDER BY UPTIME DESC + LIMIT 1 - + + + + SELECT devcode, - deviceType, - deviceTypeName, + "deviceType", + "deviceTypeName", deptid, - wellCode, + "wellCode", descn, cell, uptime, @@ -371,7 +389,7 @@ liquiddata FROM ( - ( + SELECT dl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -413,8 +431,8 @@ - ) UNION ALL - ( + UNION ALL + SELECT dgl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -456,7 +474,7 @@ - ) + ) t1 ORDER BY uptime asc @@ -558,10 +576,10 @@ @@ -663,7 +681,7 @@ parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page"> SELECT DEVCODE, - deviceType, + "deviceType", @@ -671,11 +689,11 @@ DESCN, STATUS, DEPTID, - wellCode, - wellId, - deviceId, + "wellCode", + "wellId", + "deviceId", VALID, - deviceTypeName + "deviceTypeName" FROM wellcover_monitorview @@ -1261,7 +1279,7 @@ - AS logtime,dh.DESCN AS descn + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1294,8 +1312,8 @@ SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH AS strength, - dh2s.CELL AS cell, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, @@ -1306,7 +1324,7 @@ AS logtime, bdt.TYPE_NAME AS "deviceTypeName", bd.device_type as deviceType, - bwi.DEPTID AS deptid + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE @@ -1329,8 +1347,9 @@ - AND (dh2s.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE ) + AND (dh2s.DEVCODE LIKE + + OR dh2s.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index bb28cfc..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -195,6 +195,24 @@ } deviceDataDtoList.add((DeviceDataDto) deviceDataDto.clone()); break; + case "管盯": + deviceData = this.baseMapper.tubeData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("燃气泄漏"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("H2S浓度"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; default://未知设备 log.info("未知设备！"); @@ -378,7 +396,6 @@ watchDataDto.setWatchType("井内水位"); watchDataDto.setType("10"); if (ObjectUtil.isNotEmpty(deviceData)) { - watchDataDto.setValue(deviceData.getData() + "m"); watchDataDto.setData(deviceData.getData() + "m"); watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -388,7 +405,28 @@ } watchDataDtos.add((WatchDataDto) watchDataDto.clone()); break; - + case "管盯": + deviceData = this.baseMapper.tubeData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("燃气泄漏"); + watchDataDto.setType("12"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("H2S浓度"); + watchDataDto.setType("14"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; default://未知设备 log.info("未知设备！"); break; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 4c1bc0b..ce81120 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.dict.BusConfigDict; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -20,6 +22,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; /** @@ -30,7 +33,7 @@ */ @Controller @RequestMapping("/busConfig") -public class BusConfigController extends BaseController { +public class BusConfigController extends ExportController { @Qualifier("busConfigServiceImpl") @@ -143,7 +146,7 @@ /** - * 燃气获取配置列表 + * 管顶获取配置列表 */ @RequestMapping(value = "/tubeConfig/list") @ResponseBody @@ -382,7 +385,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -401,7 +411,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busMethaneConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busMethaneConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -420,7 +437,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTubeConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTubeConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -440,7 +464,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busWasteGasConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busWasteGasConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -460,7 +491,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTempHumiConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTempHumiConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -479,7 +517,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busDigConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busDigConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -498,7 +543,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busNoiseConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busNoiseConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -712,7 +764,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busGasLiquidConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busGasLiquidConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 8b147d2..75c5be2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,22 +1,17 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; -import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.service.IDeviceTypeService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.PathVariable; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import java.util.List; -import java.util.Map; import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -34,10 +29,7 @@ private final IDeviceModelsService deviceModelsService; - private final IDeviceTypeService deviceTypeService; - - public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { - this.deviceTypeService = deviceTypeService; + public DeviceModelsController(IDeviceModelsService deviceModelsService) { this.deviceModelsService = deviceModelsService; } @@ -48,25 +40,9 @@ @ResponseBody public Object listPage(String deviceType, String communication) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper() - .like("MODEL_NAME", deviceType == null ? "" : deviceType) - .like("COMMUNICATION", communication == null ? "" : communication); - page = deviceModelsService.page(page, query); - Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().forEach( - deviceModels -> { - DeviceType deviceTypeModel = deviceTypeService.getById(deviceModels.getDeviceType()); - deviceModels.setDeviceTypeName(deviceTypeModel == null ? "" : deviceTypeModel.getTypeName()); - String[] d = deviceModels.getCommunication().split(","); - if (d.length > 0) { - deviceModels.setCommunNameGroup(dictMap.get(d[0])); - } - for (int i = 1; i < d.length; i++) { - deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); - } - } - ); - return new SuccessResponseData(super.packForBT(page)); + ResponseData responseData = deviceModelsService.getListPage(page,deviceType, communication); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 5178f9b..efad32d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,9 +20,9 @@ */ public interface DeviceMapper extends BaseMapper { - List getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List getDeviceList(@Param("scope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") Long deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); List getDeviceListInfo(@Param("scope") DataScope dataScope); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java index 0f589db..ce44c35 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.dao; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -23,5 +24,11 @@ List selectModelList(@Param("deviceType") Long deviceType); + List getListPage(@Param("page") Page page, + @Param("deviceType") Long deviceType, + @Param("communication") String communication); + Map getDictNameByCode(); + + List> getDeviceTypeList(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index abec443..ea76482 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -157,7 +157,7 @@ FROM device_view dv LEFT JOIN bus_device_status bds ON bds.DEVICE_ID=dv.ID WHERE VALID = '1' - + and deviceType = #{deviceType} @@ -240,7 +240,7 @@ - d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='1' THEN 1 ELSE 0 END AS "onlineState",t.TYPE_NAME AS "typeName" + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='0' THEN 0 ELSE 1 END AS "onlineState",t.TYPE_NAME AS "typeName" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index 4943869..6e6e554 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -50,4 +50,24 @@ GROUP BY pid + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 730d95b..988bcba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -77,10 +77,10 @@ /** * 液位设备配置导入 * - * @param uploadFile 附件 + * @param busConfigDTOList 附件 * @return */ - SuccessResponseData imp(MultipartFile uploadFile); + SuccessResponseData imp(List busConfigDTOList); /** * 设备配置导出 diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java index 4bc79ba..b4c601b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.extension.service.IService; @@ -34,5 +36,7 @@ DeviceModels selectDeviceTypeById(String id); + ResponseData getListPage(Page page,String deviceType, String communication); + Map getDictNameByCode(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index 9e70f4b..a0a177d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -317,16 +317,14 @@ /** * 液位设备配置导入 * - * @param uploadFile 附件 + * @param busConfigDTOList 附件 * @return */ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); try { - - List busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { @@ -337,7 +335,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index 9d74002..f626ab7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -265,7 +265,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -278,19 +278,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - //TODO 导入项设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setSuccess(false); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index fb1048b..01154ff 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -252,7 +252,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -262,17 +262,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class,uploadFile,null,null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index e175ec7..53c0a1d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -251,7 +251,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList ) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -261,18 +261,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - try (InputStream in = uploadFile.getInputStream()) { - try { - //TODO 导入类设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - } Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 @@ -283,7 +272,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index ad81f03..046bf4e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -248,7 +248,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -259,18 +259,6 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); - - try { - //导入文件头设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setSuccess(false); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index c45f6ff..994e825 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -250,7 +250,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp( List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -261,17 +261,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index e27af66..01ffe04 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -250,7 +250,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -260,9 +260,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java index 0d7c10d..1036b7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -7,11 +7,18 @@ @Data public class AlarmLevelParam { + private String deptId; + private String wellType; + private String lng; + private String lat; + private String tenantId; private String name; private String deviceType; private String openAlarm; private String openJob; + private String highValue; + private String lowValue; + private String level; //等级列表 - private List levelList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index e24fccd..44c994b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -111,11 +111,10 @@ alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); - alarmLevelParam.getLevelList().forEach( - alarmLevels -> { - alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); - this.save(alarmLevel); - } - ); + alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevelParam.getLevel()) ? "-1" : alarmLevelParam.getLevel())); + this.save(alarmLevel); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 4a35142..a480f26 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -18,7 +18,7 @@ List> deviceStaticsByType(); - List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") Long deviceType); List> deviceStaticsByRoad(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index c4ea3dd..6286a05 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -37,21 +37,21 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 8b7767b..514448a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -57,7 +57,7 @@ LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID BD.VALID = '1' AND BDW.VALID='1' - + AND BD.DEVICE_TYPE = #{deviceType} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 209b900..95110b4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -69,7 +69,7 @@ @Override public List> deviceStaticsByDept(DataScope dataScope, String deviceType) { - List> mapList = statisticMapper.deviceStaticsByDept(dataScope, deviceType); + List> mapList = statisticMapper.deviceStaticsByDept(dataScope, StrUtil.isEmpty(deviceType)?-1:Long.valueOf(deviceType)); for (Map map : mapList) { map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 3d7ae31..bf89d08 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -583,7 +583,7 @@ /** * 数据列表查询 */ - @GetMapping(value = "/data/list-page") + @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { if (StrUtil.isEmpty(watchType)) { return ResponseData.success("缺少监测类型参数，请重传"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index eb4ab56..393589c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -58,6 +58,11 @@ */ DeviceData lgLiquidData(@Param("devcode") String devcode); + + DeviceData tubeData(@Param("devcode") String devcode); + + DeviceData H2sData(@Param("devcode") String devcode); + BfztCountDataDto bfztCountData(@Param("deptIds") List deptIds, @Param("isApp") Boolean isApp); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 7f028c5..3be6c65 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -78,6 +78,7 @@ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') + ${paramStr} @@ -170,8 +171,8 @@ UPTIME AS logtime FROM data_gas WHERE DEVCODE = #{devcode} - ORDER BY UPTIME - DESC LIMIT 1 + ORDER BY UPTIME DESC + LIMIT 1 - + + + + SELECT devcode, - deviceType, - deviceTypeName, + "deviceType", + "deviceTypeName", deptid, - wellCode, + "wellCode", descn, cell, uptime, @@ -371,7 +389,7 @@ liquiddata FROM ( - ( + SELECT dl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -413,8 +431,8 @@ - ) UNION ALL - ( + UNION ALL + SELECT dgl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -456,7 +474,7 @@ - ) + ) t1 ORDER BY uptime asc @@ -558,10 +576,10 @@ @@ -663,7 +681,7 @@ parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page"> SELECT DEVCODE, - deviceType, + "deviceType", @@ -671,11 +689,11 @@ DESCN, STATUS, DEPTID, - wellCode, - wellId, - deviceId, + "wellCode", + "wellId", + "deviceId", VALID, - deviceTypeName + "deviceTypeName" FROM wellcover_monitorview @@ -1261,7 +1279,7 @@ - AS logtime,dh.DESCN AS descn + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1294,8 +1312,8 @@ SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH AS strength, - dh2s.CELL AS cell, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, @@ -1306,7 +1324,7 @@ AS logtime, bdt.TYPE_NAME AS "deviceTypeName", bd.device_type as deviceType, - bwi.DEPTID AS deptid + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE @@ -1329,8 +1347,9 @@ - AND (dh2s.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE ) + AND (dh2s.DEVCODE LIKE + + OR dh2s.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index bb28cfc..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -195,6 +195,24 @@ } deviceDataDtoList.add((DeviceDataDto) deviceDataDto.clone()); break; + case "管盯": + deviceData = this.baseMapper.tubeData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("燃气泄漏"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("H2S浓度"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; default://未知设备 log.info("未知设备！"); @@ -378,7 +396,6 @@ watchDataDto.setWatchType("井内水位"); watchDataDto.setType("10"); if (ObjectUtil.isNotEmpty(deviceData)) { - watchDataDto.setValue(deviceData.getData() + "m"); watchDataDto.setData(deviceData.getData() + "m"); watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -388,7 +405,28 @@ } watchDataDtos.add((WatchDataDto) watchDataDto.clone()); break; - + case "管盯": + deviceData = this.baseMapper.tubeData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("燃气泄漏"); + watchDataDto.setType("12"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("H2S浓度"); + watchDataDto.setType("14"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; default://未知设备 log.info("未知设备！"); break; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 4c1bc0b..ce81120 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.dict.BusConfigDict; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -20,6 +22,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; /** @@ -30,7 +33,7 @@ */ @Controller @RequestMapping("/busConfig") -public class BusConfigController extends BaseController { +public class BusConfigController extends ExportController { @Qualifier("busConfigServiceImpl") @@ -143,7 +146,7 @@ /** - * 燃气获取配置列表 + * 管顶获取配置列表 */ @RequestMapping(value = "/tubeConfig/list") @ResponseBody @@ -382,7 +385,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -401,7 +411,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busMethaneConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busMethaneConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -420,7 +437,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTubeConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTubeConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -440,7 +464,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busWasteGasConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busWasteGasConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -460,7 +491,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTempHumiConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTempHumiConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -479,7 +517,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busDigConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busDigConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -498,7 +543,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busNoiseConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busNoiseConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -712,7 +764,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busGasLiquidConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busGasLiquidConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 8b147d2..75c5be2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,22 +1,17 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; -import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.service.IDeviceTypeService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.PathVariable; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import java.util.List; -import java.util.Map; import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -34,10 +29,7 @@ private final IDeviceModelsService deviceModelsService; - private final IDeviceTypeService deviceTypeService; - - public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { - this.deviceTypeService = deviceTypeService; + public DeviceModelsController(IDeviceModelsService deviceModelsService) { this.deviceModelsService = deviceModelsService; } @@ -48,25 +40,9 @@ @ResponseBody public Object listPage(String deviceType, String communication) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper() - .like("MODEL_NAME", deviceType == null ? "" : deviceType) - .like("COMMUNICATION", communication == null ? "" : communication); - page = deviceModelsService.page(page, query); - Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().forEach( - deviceModels -> { - DeviceType deviceTypeModel = deviceTypeService.getById(deviceModels.getDeviceType()); - deviceModels.setDeviceTypeName(deviceTypeModel == null ? "" : deviceTypeModel.getTypeName()); - String[] d = deviceModels.getCommunication().split(","); - if (d.length > 0) { - deviceModels.setCommunNameGroup(dictMap.get(d[0])); - } - for (int i = 1; i < d.length; i++) { - deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); - } - } - ); - return new SuccessResponseData(super.packForBT(page)); + ResponseData responseData = deviceModelsService.getListPage(page,deviceType, communication); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 5178f9b..efad32d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,9 +20,9 @@ */ public interface DeviceMapper extends BaseMapper { - List getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List getDeviceList(@Param("scope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") Long deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); List getDeviceListInfo(@Param("scope") DataScope dataScope); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java index 0f589db..ce44c35 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.dao; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -23,5 +24,11 @@ List selectModelList(@Param("deviceType") Long deviceType); + List getListPage(@Param("page") Page page, + @Param("deviceType") Long deviceType, + @Param("communication") String communication); + Map getDictNameByCode(); + + List> getDeviceTypeList(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index abec443..ea76482 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -157,7 +157,7 @@ FROM device_view dv LEFT JOIN bus_device_status bds ON bds.DEVICE_ID=dv.ID WHERE VALID = '1' - + and deviceType = #{deviceType} @@ -240,7 +240,7 @@ - d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='1' THEN 1 ELSE 0 END AS "onlineState",t.TYPE_NAME AS "typeName" + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='0' THEN 0 ELSE 1 END AS "onlineState",t.TYPE_NAME AS "typeName" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index 4943869..6e6e554 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -50,4 +50,24 @@ GROUP BY pid + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 730d95b..988bcba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -77,10 +77,10 @@ /** * 液位设备配置导入 * - * @param uploadFile 附件 + * @param busConfigDTOList 附件 * @return */ - SuccessResponseData imp(MultipartFile uploadFile); + SuccessResponseData imp(List busConfigDTOList); /** * 设备配置导出 diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java index 4bc79ba..b4c601b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.extension.service.IService; @@ -34,5 +36,7 @@ DeviceModels selectDeviceTypeById(String id); + ResponseData getListPage(Page page,String deviceType, String communication); + Map getDictNameByCode(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index 9e70f4b..a0a177d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -317,16 +317,14 @@ /** * 液位设备配置导入 * - * @param uploadFile 附件 + * @param busConfigDTOList 附件 * @return */ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); try { - - List busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { @@ -337,7 +335,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index 9d74002..f626ab7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -265,7 +265,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -278,19 +278,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - //TODO 导入项设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setSuccess(false); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index fb1048b..01154ff 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -252,7 +252,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -262,17 +262,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class,uploadFile,null,null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index e175ec7..53c0a1d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -251,7 +251,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList ) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -261,18 +261,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - try (InputStream in = uploadFile.getInputStream()) { - try { - //TODO 导入类设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - } Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 @@ -283,7 +272,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index ad81f03..046bf4e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -248,7 +248,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -259,18 +259,6 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); - - try { - //导入文件头设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setSuccess(false); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index c45f6ff..994e825 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -250,7 +250,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp( List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -261,17 +261,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index e27af66..01ffe04 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -250,7 +250,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -260,9 +260,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java index 7bf1aa9..1ea9554 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java @@ -237,7 +237,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -245,9 +245,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { @@ -258,7 +256,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java index 0d7c10d..1036b7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -7,11 +7,18 @@ @Data public class AlarmLevelParam { + private String deptId; + private String wellType; + private String lng; + private String lat; + private String tenantId; private String name; private String deviceType; private String openAlarm; private String openJob; + private String highValue; + private String lowValue; + private String level; //等级列表 - private List levelList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index e24fccd..44c994b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -111,11 +111,10 @@ alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); - alarmLevelParam.getLevelList().forEach( - alarmLevels -> { - alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); - this.save(alarmLevel); - } - ); + alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevelParam.getLevel()) ? "-1" : alarmLevelParam.getLevel())); + this.save(alarmLevel); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 4a35142..a480f26 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -18,7 +18,7 @@ List> deviceStaticsByType(); - List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") Long deviceType); List> deviceStaticsByRoad(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index c4ea3dd..6286a05 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -37,21 +37,21 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 8b7767b..514448a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -57,7 +57,7 @@ LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID BD.VALID = '1' AND BDW.VALID='1' - + AND BD.DEVICE_TYPE = #{deviceType} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 209b900..95110b4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -69,7 +69,7 @@ @Override public List> deviceStaticsByDept(DataScope dataScope, String deviceType) { - List> mapList = statisticMapper.deviceStaticsByDept(dataScope, deviceType); + List> mapList = statisticMapper.deviceStaticsByDept(dataScope, StrUtil.isEmpty(deviceType)?-1:Long.valueOf(deviceType)); for (Map map : mapList) { map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 3d7ae31..bf89d08 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -583,7 +583,7 @@ /** * 数据列表查询 */ - @GetMapping(value = "/data/list-page") + @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { if (StrUtil.isEmpty(watchType)) { return ResponseData.success("缺少监测类型参数，请重传"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index eb4ab56..393589c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -58,6 +58,11 @@ */ DeviceData lgLiquidData(@Param("devcode") String devcode); + + DeviceData tubeData(@Param("devcode") String devcode); + + DeviceData H2sData(@Param("devcode") String devcode); + BfztCountDataDto bfztCountData(@Param("deptIds") List deptIds, @Param("isApp") Boolean isApp); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 7f028c5..3be6c65 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -78,6 +78,7 @@ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') + ${paramStr} @@ -170,8 +171,8 @@ UPTIME AS logtime FROM data_gas WHERE DEVCODE = #{devcode} - ORDER BY UPTIME - DESC LIMIT 1 + ORDER BY UPTIME DESC + LIMIT 1 - + + + + SELECT devcode, - deviceType, - deviceTypeName, + "deviceType", + "deviceTypeName", deptid, - wellCode, + "wellCode", descn, cell, uptime, @@ -371,7 +389,7 @@ liquiddata FROM ( - ( + SELECT dl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -413,8 +431,8 @@ - ) UNION ALL - ( + UNION ALL + SELECT dgl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -456,7 +474,7 @@ - ) + ) t1 ORDER BY uptime asc @@ -558,10 +576,10 @@ @@ -663,7 +681,7 @@ parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page"> SELECT DEVCODE, - deviceType, + "deviceType", @@ -671,11 +689,11 @@ DESCN, STATUS, DEPTID, - wellCode, - wellId, - deviceId, + "wellCode", + "wellId", + "deviceId", VALID, - deviceTypeName + "deviceTypeName" FROM wellcover_monitorview @@ -1261,7 +1279,7 @@ - AS logtime,dh.DESCN AS descn + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1294,8 +1312,8 @@ SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH AS strength, - dh2s.CELL AS cell, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, @@ -1306,7 +1324,7 @@ AS logtime, bdt.TYPE_NAME AS "deviceTypeName", bd.device_type as deviceType, - bwi.DEPTID AS deptid + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE @@ -1329,8 +1347,9 @@ - AND (dh2s.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE ) + AND (dh2s.DEVCODE LIKE + + OR dh2s.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index bb28cfc..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -195,6 +195,24 @@ } deviceDataDtoList.add((DeviceDataDto) deviceDataDto.clone()); break; + case "管盯": + deviceData = this.baseMapper.tubeData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("燃气泄漏"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("H2S浓度"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; default://未知设备 log.info("未知设备！"); @@ -378,7 +396,6 @@ watchDataDto.setWatchType("井内水位"); watchDataDto.setType("10"); if (ObjectUtil.isNotEmpty(deviceData)) { - watchDataDto.setValue(deviceData.getData() + "m"); watchDataDto.setData(deviceData.getData() + "m"); watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -388,7 +405,28 @@ } watchDataDtos.add((WatchDataDto) watchDataDto.clone()); break; - + case "管盯": + deviceData = this.baseMapper.tubeData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("燃气泄漏"); + watchDataDto.setType("12"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("H2S浓度"); + watchDataDto.setType("14"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; default://未知设备 log.info("未知设备！"); break; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 4c1bc0b..ce81120 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.dict.BusConfigDict; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -20,6 +22,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; /** @@ -30,7 +33,7 @@ */ @Controller @RequestMapping("/busConfig") -public class BusConfigController extends BaseController { +public class BusConfigController extends ExportController { @Qualifier("busConfigServiceImpl") @@ -143,7 +146,7 @@ /** - * 燃气获取配置列表 + * 管顶获取配置列表 */ @RequestMapping(value = "/tubeConfig/list") @ResponseBody @@ -382,7 +385,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -401,7 +411,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busMethaneConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busMethaneConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -420,7 +437,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTubeConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTubeConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -440,7 +464,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busWasteGasConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busWasteGasConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -460,7 +491,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTempHumiConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTempHumiConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -479,7 +517,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busDigConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busDigConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -498,7 +543,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busNoiseConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busNoiseConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -712,7 +764,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busGasLiquidConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busGasLiquidConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 8b147d2..75c5be2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,22 +1,17 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; -import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.service.IDeviceTypeService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.PathVariable; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import java.util.List; -import java.util.Map; import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -34,10 +29,7 @@ private final IDeviceModelsService deviceModelsService; - private final IDeviceTypeService deviceTypeService; - - public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { - this.deviceTypeService = deviceTypeService; + public DeviceModelsController(IDeviceModelsService deviceModelsService) { this.deviceModelsService = deviceModelsService; } @@ -48,25 +40,9 @@ @ResponseBody public Object listPage(String deviceType, String communication) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper() - .like("MODEL_NAME", deviceType == null ? "" : deviceType) - .like("COMMUNICATION", communication == null ? "" : communication); - page = deviceModelsService.page(page, query); - Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().forEach( - deviceModels -> { - DeviceType deviceTypeModel = deviceTypeService.getById(deviceModels.getDeviceType()); - deviceModels.setDeviceTypeName(deviceTypeModel == null ? "" : deviceTypeModel.getTypeName()); - String[] d = deviceModels.getCommunication().split(","); - if (d.length > 0) { - deviceModels.setCommunNameGroup(dictMap.get(d[0])); - } - for (int i = 1; i < d.length; i++) { - deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); - } - } - ); - return new SuccessResponseData(super.packForBT(page)); + ResponseData responseData = deviceModelsService.getListPage(page,deviceType, communication); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 5178f9b..efad32d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,9 +20,9 @@ */ public interface DeviceMapper extends BaseMapper { - List getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List getDeviceList(@Param("scope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") Long deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); List getDeviceListInfo(@Param("scope") DataScope dataScope); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java index 0f589db..ce44c35 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.dao; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -23,5 +24,11 @@ List selectModelList(@Param("deviceType") Long deviceType); + List getListPage(@Param("page") Page page, + @Param("deviceType") Long deviceType, + @Param("communication") String communication); + Map getDictNameByCode(); + + List> getDeviceTypeList(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index abec443..ea76482 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -157,7 +157,7 @@ FROM device_view dv LEFT JOIN bus_device_status bds ON bds.DEVICE_ID=dv.ID WHERE VALID = '1' - + and deviceType = #{deviceType} @@ -240,7 +240,7 @@ - d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='1' THEN 1 ELSE 0 END AS "onlineState",t.TYPE_NAME AS "typeName" + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='0' THEN 0 ELSE 1 END AS "onlineState",t.TYPE_NAME AS "typeName" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index 4943869..6e6e554 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -50,4 +50,24 @@ GROUP BY pid + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 730d95b..988bcba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -77,10 +77,10 @@ /** * 液位设备配置导入 * - * @param uploadFile 附件 + * @param busConfigDTOList 附件 * @return */ - SuccessResponseData imp(MultipartFile uploadFile); + SuccessResponseData imp(List busConfigDTOList); /** * 设备配置导出 diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java index 4bc79ba..b4c601b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.extension.service.IService; @@ -34,5 +36,7 @@ DeviceModels selectDeviceTypeById(String id); + ResponseData getListPage(Page page,String deviceType, String communication); + Map getDictNameByCode(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index 9e70f4b..a0a177d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -317,16 +317,14 @@ /** * 液位设备配置导入 * - * @param uploadFile 附件 + * @param busConfigDTOList 附件 * @return */ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); try { - - List busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { @@ -337,7 +335,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index 9d74002..f626ab7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -265,7 +265,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -278,19 +278,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - //TODO 导入项设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setSuccess(false); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index fb1048b..01154ff 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -252,7 +252,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -262,17 +262,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class,uploadFile,null,null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index e175ec7..53c0a1d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -251,7 +251,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList ) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -261,18 +261,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - try (InputStream in = uploadFile.getInputStream()) { - try { - //TODO 导入类设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - } Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 @@ -283,7 +272,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index ad81f03..046bf4e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -248,7 +248,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -259,18 +259,6 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); - - try { - //导入文件头设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setSuccess(false); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index c45f6ff..994e825 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -250,7 +250,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp( List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -261,17 +261,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index e27af66..01ffe04 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -250,7 +250,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -260,9 +260,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java index 7bf1aa9..1ea9554 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java @@ -237,7 +237,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -245,9 +245,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { @@ -258,7 +256,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java index 34d9e6b..e4f137c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java @@ -1,15 +1,23 @@ package com.casic.missiles.modular.system.service.impl; +import com.alibaba.excel.util.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.DeviceModelsMapper; import com.casic.missiles.modular.system.model.DeviceModels; +import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; +import lombok.extern.slf4j.Slf4j; +import org.apache.poi.util.StringUtil; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import java.io.Serializable; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -20,6 +28,7 @@ * @since 2019-05-23 */ @Service +@Slf4j public class DeviceModelsServiceImpl extends ServiceImpl implements IDeviceModelsService { @Override @@ -44,8 +53,40 @@ return this.baseMapper.selectById(id); } + public ResponseData getListPage(Page page, String deviceType, String communication) { + ResponseData responseData = new ResponseData(); + try { + List deviceModelsList = this.baseMapper.getListPage(page,StringUtils.isEmpty(deviceType)?-1:Long.valueOf(deviceType), communication); + Map dictMap = this.baseMapper.getDictNameByCode(); + List> deviceTypeList= this.baseMapper.getDeviceTypeList(); + Map deviceTypeMap = deviceTypeList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("id")), e -> String.valueOf(e.get("typeName"))) + ); + deviceModelsList.forEach( + deviceModels -> { + deviceModels.setDeviceTypeName(String.valueOf(deviceTypeMap.get(String.valueOf(deviceModels.getDeviceType())))); + String[] d = deviceModels.getCommunication().split(","); + if (d.length > 0) { + deviceModels.setCommunNameGroup(dictMap.get(d[0])); + } + for (int i = 1; i < d.length; i++) { + deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); + } + } + ); + page.setRecords(deviceModelsList); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + } catch (DataAccessException dae) { + log.error("主题：查询异常，设备类型{},型号{},异常信息{}", deviceType, communication, dae.getMessage()); + responseData.setMessage(ResponseData.DEFAULT_ERROR_MESSAGE); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + } + return responseData; + } + @Override - public Map getDictNameByCode() { + public Map getDictNameByCode() { return this.baseMapper.getDictNameByCode(); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java index 0d7c10d..1036b7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -7,11 +7,18 @@ @Data public class AlarmLevelParam { + private String deptId; + private String wellType; + private String lng; + private String lat; + private String tenantId; private String name; private String deviceType; private String openAlarm; private String openJob; + private String highValue; + private String lowValue; + private String level; //等级列表 - private List levelList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index e24fccd..44c994b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -111,11 +111,10 @@ alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); - alarmLevelParam.getLevelList().forEach( - alarmLevels -> { - alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); - this.save(alarmLevel); - } - ); + alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevelParam.getLevel()) ? "-1" : alarmLevelParam.getLevel())); + this.save(alarmLevel); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 4a35142..a480f26 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -18,7 +18,7 @@ List> deviceStaticsByType(); - List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") Long deviceType); List> deviceStaticsByRoad(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index c4ea3dd..6286a05 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -37,21 +37,21 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 8b7767b..514448a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -57,7 +57,7 @@ LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID BD.VALID = '1' AND BDW.VALID='1' - + AND BD.DEVICE_TYPE = #{deviceType} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 209b900..95110b4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -69,7 +69,7 @@ @Override public List> deviceStaticsByDept(DataScope dataScope, String deviceType) { - List> mapList = statisticMapper.deviceStaticsByDept(dataScope, deviceType); + List> mapList = statisticMapper.deviceStaticsByDept(dataScope, StrUtil.isEmpty(deviceType)?-1:Long.valueOf(deviceType)); for (Map map : mapList) { map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 3d7ae31..bf89d08 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -583,7 +583,7 @@ /** * 数据列表查询 */ - @GetMapping(value = "/data/list-page") + @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { if (StrUtil.isEmpty(watchType)) { return ResponseData.success("缺少监测类型参数，请重传"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index eb4ab56..393589c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -58,6 +58,11 @@ */ DeviceData lgLiquidData(@Param("devcode") String devcode); + + DeviceData tubeData(@Param("devcode") String devcode); + + DeviceData H2sData(@Param("devcode") String devcode); + BfztCountDataDto bfztCountData(@Param("deptIds") List deptIds, @Param("isApp") Boolean isApp); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 7f028c5..3be6c65 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -78,6 +78,7 @@ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') + ${paramStr} @@ -170,8 +171,8 @@ UPTIME AS logtime FROM data_gas WHERE DEVCODE = #{devcode} - ORDER BY UPTIME - DESC LIMIT 1 + ORDER BY UPTIME DESC + LIMIT 1 - + + + + SELECT devcode, - deviceType, - deviceTypeName, + "deviceType", + "deviceTypeName", deptid, - wellCode, + "wellCode", descn, cell, uptime, @@ -371,7 +389,7 @@ liquiddata FROM ( - ( + SELECT dl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -413,8 +431,8 @@ - ) UNION ALL - ( + UNION ALL + SELECT dgl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -456,7 +474,7 @@ - ) + ) t1 ORDER BY uptime asc @@ -558,10 +576,10 @@ @@ -663,7 +681,7 @@ parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page"> SELECT DEVCODE, - deviceType, + "deviceType", @@ -671,11 +689,11 @@ DESCN, STATUS, DEPTID, - wellCode, - wellId, - deviceId, + "wellCode", + "wellId", + "deviceId", VALID, - deviceTypeName + "deviceTypeName" FROM wellcover_monitorview @@ -1261,7 +1279,7 @@ - AS logtime,dh.DESCN AS descn + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1294,8 +1312,8 @@ SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH AS strength, - dh2s.CELL AS cell, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, @@ -1306,7 +1324,7 @@ AS logtime, bdt.TYPE_NAME AS "deviceTypeName", bd.device_type as deviceType, - bwi.DEPTID AS deptid + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE @@ -1329,8 +1347,9 @@ - AND (dh2s.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE ) + AND (dh2s.DEVCODE LIKE + + OR dh2s.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index bb28cfc..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -195,6 +195,24 @@ } deviceDataDtoList.add((DeviceDataDto) deviceDataDto.clone()); break; + case "管盯": + deviceData = this.baseMapper.tubeData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("燃气泄漏"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("H2S浓度"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; default://未知设备 log.info("未知设备！"); @@ -378,7 +396,6 @@ watchDataDto.setWatchType("井内水位"); watchDataDto.setType("10"); if (ObjectUtil.isNotEmpty(deviceData)) { - watchDataDto.setValue(deviceData.getData() + "m"); watchDataDto.setData(deviceData.getData() + "m"); watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -388,7 +405,28 @@ } watchDataDtos.add((WatchDataDto) watchDataDto.clone()); break; - + case "管盯": + deviceData = this.baseMapper.tubeData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("燃气泄漏"); + watchDataDto.setType("12"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("H2S浓度"); + watchDataDto.setType("14"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; default://未知设备 log.info("未知设备！"); break; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 4c1bc0b..ce81120 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.dict.BusConfigDict; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -20,6 +22,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; /** @@ -30,7 +33,7 @@ */ @Controller @RequestMapping("/busConfig") -public class BusConfigController extends BaseController { +public class BusConfigController extends ExportController { @Qualifier("busConfigServiceImpl") @@ -143,7 +146,7 @@ /** - * 燃气获取配置列表 + * 管顶获取配置列表 */ @RequestMapping(value = "/tubeConfig/list") @ResponseBody @@ -382,7 +385,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -401,7 +411,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busMethaneConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busMethaneConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -420,7 +437,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTubeConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTubeConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -440,7 +464,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busWasteGasConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busWasteGasConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -460,7 +491,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTempHumiConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTempHumiConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -479,7 +517,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busDigConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busDigConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -498,7 +543,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busNoiseConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busNoiseConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -712,7 +764,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busGasLiquidConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busGasLiquidConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 8b147d2..75c5be2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,22 +1,17 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; -import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.service.IDeviceTypeService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.PathVariable; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import java.util.List; -import java.util.Map; import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -34,10 +29,7 @@ private final IDeviceModelsService deviceModelsService; - private final IDeviceTypeService deviceTypeService; - - public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { - this.deviceTypeService = deviceTypeService; + public DeviceModelsController(IDeviceModelsService deviceModelsService) { this.deviceModelsService = deviceModelsService; } @@ -48,25 +40,9 @@ @ResponseBody public Object listPage(String deviceType, String communication) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper() - .like("MODEL_NAME", deviceType == null ? "" : deviceType) - .like("COMMUNICATION", communication == null ? "" : communication); - page = deviceModelsService.page(page, query); - Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().forEach( - deviceModels -> { - DeviceType deviceTypeModel = deviceTypeService.getById(deviceModels.getDeviceType()); - deviceModels.setDeviceTypeName(deviceTypeModel == null ? "" : deviceTypeModel.getTypeName()); - String[] d = deviceModels.getCommunication().split(","); - if (d.length > 0) { - deviceModels.setCommunNameGroup(dictMap.get(d[0])); - } - for (int i = 1; i < d.length; i++) { - deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); - } - } - ); - return new SuccessResponseData(super.packForBT(page)); + ResponseData responseData = deviceModelsService.getListPage(page,deviceType, communication); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 5178f9b..efad32d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,9 +20,9 @@ */ public interface DeviceMapper extends BaseMapper { - List getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List getDeviceList(@Param("scope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") Long deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); List getDeviceListInfo(@Param("scope") DataScope dataScope); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java index 0f589db..ce44c35 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.dao; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -23,5 +24,11 @@ List selectModelList(@Param("deviceType") Long deviceType); + List getListPage(@Param("page") Page page, + @Param("deviceType") Long deviceType, + @Param("communication") String communication); + Map getDictNameByCode(); + + List> getDeviceTypeList(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index abec443..ea76482 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -157,7 +157,7 @@ FROM device_view dv LEFT JOIN bus_device_status bds ON bds.DEVICE_ID=dv.ID WHERE VALID = '1' - + and deviceType = #{deviceType} @@ -240,7 +240,7 @@ - d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='1' THEN 1 ELSE 0 END AS "onlineState",t.TYPE_NAME AS "typeName" + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='0' THEN 0 ELSE 1 END AS "onlineState",t.TYPE_NAME AS "typeName" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index 4943869..6e6e554 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -50,4 +50,24 @@ GROUP BY pid + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 730d95b..988bcba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -77,10 +77,10 @@ /** * 液位设备配置导入 * - * @param uploadFile 附件 + * @param busConfigDTOList 附件 * @return */ - SuccessResponseData imp(MultipartFile uploadFile); + SuccessResponseData imp(List busConfigDTOList); /** * 设备配置导出 diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java index 4bc79ba..b4c601b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.extension.service.IService; @@ -34,5 +36,7 @@ DeviceModels selectDeviceTypeById(String id); + ResponseData getListPage(Page page,String deviceType, String communication); + Map getDictNameByCode(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index 9e70f4b..a0a177d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -317,16 +317,14 @@ /** * 液位设备配置导入 * - * @param uploadFile 附件 + * @param busConfigDTOList 附件 * @return */ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); try { - - List busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { @@ -337,7 +335,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index 9d74002..f626ab7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -265,7 +265,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -278,19 +278,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - //TODO 导入项设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setSuccess(false); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index fb1048b..01154ff 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -252,7 +252,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -262,17 +262,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class,uploadFile,null,null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index e175ec7..53c0a1d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -251,7 +251,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList ) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -261,18 +261,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - try (InputStream in = uploadFile.getInputStream()) { - try { - //TODO 导入类设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - } Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 @@ -283,7 +272,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index ad81f03..046bf4e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -248,7 +248,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -259,18 +259,6 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); - - try { - //导入文件头设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setSuccess(false); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index c45f6ff..994e825 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -250,7 +250,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp( List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -261,17 +261,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index e27af66..01ffe04 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -250,7 +250,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -260,9 +260,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java index 7bf1aa9..1ea9554 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java @@ -237,7 +237,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -245,9 +245,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { @@ -258,7 +256,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java index 34d9e6b..e4f137c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java @@ -1,15 +1,23 @@ package com.casic.missiles.modular.system.service.impl; +import com.alibaba.excel.util.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.DeviceModelsMapper; import com.casic.missiles.modular.system.model.DeviceModels; +import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; +import lombok.extern.slf4j.Slf4j; +import org.apache.poi.util.StringUtil; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import java.io.Serializable; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -20,6 +28,7 @@ * @since 2019-05-23 */ @Service +@Slf4j public class DeviceModelsServiceImpl extends ServiceImpl implements IDeviceModelsService { @Override @@ -44,8 +53,40 @@ return this.baseMapper.selectById(id); } + public ResponseData getListPage(Page page, String deviceType, String communication) { + ResponseData responseData = new ResponseData(); + try { + List deviceModelsList = this.baseMapper.getListPage(page,StringUtils.isEmpty(deviceType)?-1:Long.valueOf(deviceType), communication); + Map dictMap = this.baseMapper.getDictNameByCode(); + List> deviceTypeList= this.baseMapper.getDeviceTypeList(); + Map deviceTypeMap = deviceTypeList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("id")), e -> String.valueOf(e.get("typeName"))) + ); + deviceModelsList.forEach( + deviceModels -> { + deviceModels.setDeviceTypeName(String.valueOf(deviceTypeMap.get(String.valueOf(deviceModels.getDeviceType())))); + String[] d = deviceModels.getCommunication().split(","); + if (d.length > 0) { + deviceModels.setCommunNameGroup(dictMap.get(d[0])); + } + for (int i = 1; i < d.length; i++) { + deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); + } + } + ); + page.setRecords(deviceModelsList); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + } catch (DataAccessException dae) { + log.error("主题：查询异常，设备类型{},型号{},异常信息{}", deviceType, communication, dae.getMessage()); + responseData.setMessage(ResponseData.DEFAULT_ERROR_MESSAGE); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + } + return responseData; + } + @Override - public Map getDictNameByCode() { + public Map getDictNameByCode() { return this.baseMapper.getDictNameByCode(); } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index b2c33d6..613d8a1 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -193,7 +193,7 @@ @Override public List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) { - List deviceDtoList = this.baseMapper.selectDataScopePage(dataScope, page, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline); + List deviceDtoList = this.baseMapper.selectDataScopePage(dataScope, page,Long.valueOf(StrUtil.isEmpty(deviceType) ? "-1" : deviceType) , Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline); deviceDtoList.forEach( deviceDto -> deviceDto.setOnlineState(deviceDto.getOnlineState() == "0" ? "0" : "1") ); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java index 0d7c10d..1036b7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -7,11 +7,18 @@ @Data public class AlarmLevelParam { + private String deptId; + private String wellType; + private String lng; + private String lat; + private String tenantId; private String name; private String deviceType; private String openAlarm; private String openJob; + private String highValue; + private String lowValue; + private String level; //等级列表 - private List levelList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index e24fccd..44c994b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -111,11 +111,10 @@ alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); - alarmLevelParam.getLevelList().forEach( - alarmLevels -> { - alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); - this.save(alarmLevel); - } - ); + alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevelParam.getLevel()) ? "-1" : alarmLevelParam.getLevel())); + this.save(alarmLevel); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 4a35142..a480f26 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -18,7 +18,7 @@ List> deviceStaticsByType(); - List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") Long deviceType); List> deviceStaticsByRoad(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index c4ea3dd..6286a05 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -37,21 +37,21 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 8b7767b..514448a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -57,7 +57,7 @@ LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID BD.VALID = '1' AND BDW.VALID='1' - + AND BD.DEVICE_TYPE = #{deviceType} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 209b900..95110b4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -69,7 +69,7 @@ @Override public List> deviceStaticsByDept(DataScope dataScope, String deviceType) { - List> mapList = statisticMapper.deviceStaticsByDept(dataScope, deviceType); + List> mapList = statisticMapper.deviceStaticsByDept(dataScope, StrUtil.isEmpty(deviceType)?-1:Long.valueOf(deviceType)); for (Map map : mapList) { map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 3d7ae31..bf89d08 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -583,7 +583,7 @@ /** * 数据列表查询 */ - @GetMapping(value = "/data/list-page") + @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { if (StrUtil.isEmpty(watchType)) { return ResponseData.success("缺少监测类型参数，请重传"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index eb4ab56..393589c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -58,6 +58,11 @@ */ DeviceData lgLiquidData(@Param("devcode") String devcode); + + DeviceData tubeData(@Param("devcode") String devcode); + + DeviceData H2sData(@Param("devcode") String devcode); + BfztCountDataDto bfztCountData(@Param("deptIds") List deptIds, @Param("isApp") Boolean isApp); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 7f028c5..3be6c65 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -78,6 +78,7 @@ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') + ${paramStr} @@ -170,8 +171,8 @@ UPTIME AS logtime FROM data_gas WHERE DEVCODE = #{devcode} - ORDER BY UPTIME - DESC LIMIT 1 + ORDER BY UPTIME DESC + LIMIT 1 - + + + + SELECT devcode, - deviceType, - deviceTypeName, + "deviceType", + "deviceTypeName", deptid, - wellCode, + "wellCode", descn, cell, uptime, @@ -371,7 +389,7 @@ liquiddata FROM ( - ( + SELECT dl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -413,8 +431,8 @@ - ) UNION ALL - ( + UNION ALL + SELECT dgl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -456,7 +474,7 @@ - ) + ) t1 ORDER BY uptime asc @@ -558,10 +576,10 @@ @@ -663,7 +681,7 @@ parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page"> SELECT DEVCODE, - deviceType, + "deviceType", @@ -671,11 +689,11 @@ DESCN, STATUS, DEPTID, - wellCode, - wellId, - deviceId, + "wellCode", + "wellId", + "deviceId", VALID, - deviceTypeName + "deviceTypeName" FROM wellcover_monitorview @@ -1261,7 +1279,7 @@ - AS logtime,dh.DESCN AS descn + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1294,8 +1312,8 @@ SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH AS strength, - dh2s.CELL AS cell, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, @@ -1306,7 +1324,7 @@ AS logtime, bdt.TYPE_NAME AS "deviceTypeName", bd.device_type as deviceType, - bwi.DEPTID AS deptid + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE @@ -1329,8 +1347,9 @@ - AND (dh2s.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE ) + AND (dh2s.DEVCODE LIKE + + OR dh2s.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index bb28cfc..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -195,6 +195,24 @@ } deviceDataDtoList.add((DeviceDataDto) deviceDataDto.clone()); break; + case "管盯": + deviceData = this.baseMapper.tubeData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("燃气泄漏"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("H2S浓度"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; default://未知设备 log.info("未知设备！"); @@ -378,7 +396,6 @@ watchDataDto.setWatchType("井内水位"); watchDataDto.setType("10"); if (ObjectUtil.isNotEmpty(deviceData)) { - watchDataDto.setValue(deviceData.getData() + "m"); watchDataDto.setData(deviceData.getData() + "m"); watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -388,7 +405,28 @@ } watchDataDtos.add((WatchDataDto) watchDataDto.clone()); break; - + case "管盯": + deviceData = this.baseMapper.tubeData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("燃气泄漏"); + watchDataDto.setType("12"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("H2S浓度"); + watchDataDto.setType("14"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; default://未知设备 log.info("未知设备！"); break; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 4c1bc0b..ce81120 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.dict.BusConfigDict; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -20,6 +22,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; /** @@ -30,7 +33,7 @@ */ @Controller @RequestMapping("/busConfig") -public class BusConfigController extends BaseController { +public class BusConfigController extends ExportController { @Qualifier("busConfigServiceImpl") @@ -143,7 +146,7 @@ /** - * 燃气获取配置列表 + * 管顶获取配置列表 */ @RequestMapping(value = "/tubeConfig/list") @ResponseBody @@ -382,7 +385,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -401,7 +411,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busMethaneConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busMethaneConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -420,7 +437,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTubeConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTubeConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -440,7 +464,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busWasteGasConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busWasteGasConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -460,7 +491,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTempHumiConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTempHumiConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -479,7 +517,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busDigConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busDigConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -498,7 +543,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busNoiseConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busNoiseConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -712,7 +764,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busGasLiquidConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busGasLiquidConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 8b147d2..75c5be2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,22 +1,17 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; -import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.service.IDeviceTypeService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.PathVariable; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import java.util.List; -import java.util.Map; import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -34,10 +29,7 @@ private final IDeviceModelsService deviceModelsService; - private final IDeviceTypeService deviceTypeService; - - public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { - this.deviceTypeService = deviceTypeService; + public DeviceModelsController(IDeviceModelsService deviceModelsService) { this.deviceModelsService = deviceModelsService; } @@ -48,25 +40,9 @@ @ResponseBody public Object listPage(String deviceType, String communication) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper() - .like("MODEL_NAME", deviceType == null ? "" : deviceType) - .like("COMMUNICATION", communication == null ? "" : communication); - page = deviceModelsService.page(page, query); - Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().forEach( - deviceModels -> { - DeviceType deviceTypeModel = deviceTypeService.getById(deviceModels.getDeviceType()); - deviceModels.setDeviceTypeName(deviceTypeModel == null ? "" : deviceTypeModel.getTypeName()); - String[] d = deviceModels.getCommunication().split(","); - if (d.length > 0) { - deviceModels.setCommunNameGroup(dictMap.get(d[0])); - } - for (int i = 1; i < d.length; i++) { - deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); - } - } - ); - return new SuccessResponseData(super.packForBT(page)); + ResponseData responseData = deviceModelsService.getListPage(page,deviceType, communication); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 5178f9b..efad32d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,9 +20,9 @@ */ public interface DeviceMapper extends BaseMapper { - List getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List getDeviceList(@Param("scope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") Long deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); List getDeviceListInfo(@Param("scope") DataScope dataScope); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java index 0f589db..ce44c35 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.dao; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -23,5 +24,11 @@ List selectModelList(@Param("deviceType") Long deviceType); + List getListPage(@Param("page") Page page, + @Param("deviceType") Long deviceType, + @Param("communication") String communication); + Map getDictNameByCode(); + + List> getDeviceTypeList(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index abec443..ea76482 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -157,7 +157,7 @@ FROM device_view dv LEFT JOIN bus_device_status bds ON bds.DEVICE_ID=dv.ID WHERE VALID = '1' - + and deviceType = #{deviceType} @@ -240,7 +240,7 @@ - d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='1' THEN 1 ELSE 0 END AS "onlineState",t.TYPE_NAME AS "typeName" + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='0' THEN 0 ELSE 1 END AS "onlineState",t.TYPE_NAME AS "typeName" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index 4943869..6e6e554 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -50,4 +50,24 @@ GROUP BY pid + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 730d95b..988bcba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -77,10 +77,10 @@ /** * 液位设备配置导入 * - * @param uploadFile 附件 + * @param busConfigDTOList 附件 * @return */ - SuccessResponseData imp(MultipartFile uploadFile); + SuccessResponseData imp(List busConfigDTOList); /** * 设备配置导出 diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java index 4bc79ba..b4c601b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.extension.service.IService; @@ -34,5 +36,7 @@ DeviceModels selectDeviceTypeById(String id); + ResponseData getListPage(Page page,String deviceType, String communication); + Map getDictNameByCode(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index 9e70f4b..a0a177d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -317,16 +317,14 @@ /** * 液位设备配置导入 * - * @param uploadFile 附件 + * @param busConfigDTOList 附件 * @return */ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); try { - - List busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { @@ -337,7 +335,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index 9d74002..f626ab7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -265,7 +265,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -278,19 +278,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - //TODO 导入项设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setSuccess(false); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index fb1048b..01154ff 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -252,7 +252,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -262,17 +262,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class,uploadFile,null,null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index e175ec7..53c0a1d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -251,7 +251,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList ) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -261,18 +261,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - try (InputStream in = uploadFile.getInputStream()) { - try { - //TODO 导入类设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - } Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 @@ -283,7 +272,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index ad81f03..046bf4e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -248,7 +248,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -259,18 +259,6 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); - - try { - //导入文件头设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setSuccess(false); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index c45f6ff..994e825 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -250,7 +250,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp( List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -261,17 +261,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index e27af66..01ffe04 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -250,7 +250,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -260,9 +260,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java index 7bf1aa9..1ea9554 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java @@ -237,7 +237,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -245,9 +245,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { @@ -258,7 +256,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java index 34d9e6b..e4f137c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java @@ -1,15 +1,23 @@ package com.casic.missiles.modular.system.service.impl; +import com.alibaba.excel.util.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.DeviceModelsMapper; import com.casic.missiles.modular.system.model.DeviceModels; +import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; +import lombok.extern.slf4j.Slf4j; +import org.apache.poi.util.StringUtil; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import java.io.Serializable; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -20,6 +28,7 @@ * @since 2019-05-23 */ @Service +@Slf4j public class DeviceModelsServiceImpl extends ServiceImpl implements IDeviceModelsService { @Override @@ -44,8 +53,40 @@ return this.baseMapper.selectById(id); } + public ResponseData getListPage(Page page, String deviceType, String communication) { + ResponseData responseData = new ResponseData(); + try { + List deviceModelsList = this.baseMapper.getListPage(page,StringUtils.isEmpty(deviceType)?-1:Long.valueOf(deviceType), communication); + Map dictMap = this.baseMapper.getDictNameByCode(); + List> deviceTypeList= this.baseMapper.getDeviceTypeList(); + Map deviceTypeMap = deviceTypeList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("id")), e -> String.valueOf(e.get("typeName"))) + ); + deviceModelsList.forEach( + deviceModels -> { + deviceModels.setDeviceTypeName(String.valueOf(deviceTypeMap.get(String.valueOf(deviceModels.getDeviceType())))); + String[] d = deviceModels.getCommunication().split(","); + if (d.length > 0) { + deviceModels.setCommunNameGroup(dictMap.get(d[0])); + } + for (int i = 1; i < d.length; i++) { + deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); + } + } + ); + page.setRecords(deviceModelsList); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + } catch (DataAccessException dae) { + log.error("主题：查询异常，设备类型{},型号{},异常信息{}", deviceType, communication, dae.getMessage()); + responseData.setMessage(ResponseData.DEFAULT_ERROR_MESSAGE); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + } + return responseData; + } + @Override - public Map getDictNameByCode() { + public Map getDictNameByCode() { return this.baseMapper.getDictNameByCode(); } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index b2c33d6..613d8a1 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -193,7 +193,7 @@ @Override public List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) { - List deviceDtoList = this.baseMapper.selectDataScopePage(dataScope, page, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline); + List deviceDtoList = this.baseMapper.selectDataScopePage(dataScope, page,Long.valueOf(StrUtil.isEmpty(deviceType) ? "-1" : deviceType) , Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline); deviceDtoList.forEach( deviceDto -> deviceDto.setOnlineState(deviceDto.getOnlineState() == "0" ? "0" : "1") ); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java index 434a0ae..af59a7c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java @@ -31,15 +31,14 @@ @Resource private ITenantDeptService tenantDeptService; - @Resource - private AbstractTenantService abstractTenantService; /** * 获取组织绑定关系列表 */ @RequestMapping(value = "/list") @ResponseBody - public Object list(String condition) { + public Object list(String tenantName) { QueryWrapper query = new QueryWrapper<>(); + query.like("tenant_name",tenantName); List list = tenantDeptService.tenantList(query); return ResponseData.success(list); } @@ -49,9 +48,10 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { + public Object listPage(String tenantName) { Page page = PageFactory.defaultPage(); QueryWrapper query = new QueryWrapper<>(); + query.like("tenant_name",tenantName); page = tenantDeptService.page(page, query); return super.packForBT(page); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java index 0d7c10d..1036b7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -7,11 +7,18 @@ @Data public class AlarmLevelParam { + private String deptId; + private String wellType; + private String lng; + private String lat; + private String tenantId; private String name; private String deviceType; private String openAlarm; private String openJob; + private String highValue; + private String lowValue; + private String level; //等级列表 - private List levelList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index e24fccd..44c994b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -111,11 +111,10 @@ alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); - alarmLevelParam.getLevelList().forEach( - alarmLevels -> { - alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); - this.save(alarmLevel); - } - ); + alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevelParam.getLevel()) ? "-1" : alarmLevelParam.getLevel())); + this.save(alarmLevel); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 4a35142..a480f26 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -18,7 +18,7 @@ List> deviceStaticsByType(); - List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") Long deviceType); List> deviceStaticsByRoad(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index c4ea3dd..6286a05 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -37,21 +37,21 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 8b7767b..514448a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -57,7 +57,7 @@ LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID BD.VALID = '1' AND BDW.VALID='1' - + AND BD.DEVICE_TYPE = #{deviceType} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 209b900..95110b4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -69,7 +69,7 @@ @Override public List> deviceStaticsByDept(DataScope dataScope, String deviceType) { - List> mapList = statisticMapper.deviceStaticsByDept(dataScope, deviceType); + List> mapList = statisticMapper.deviceStaticsByDept(dataScope, StrUtil.isEmpty(deviceType)?-1:Long.valueOf(deviceType)); for (Map map : mapList) { map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 3d7ae31..bf89d08 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -583,7 +583,7 @@ /** * 数据列表查询 */ - @GetMapping(value = "/data/list-page") + @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { if (StrUtil.isEmpty(watchType)) { return ResponseData.success("缺少监测类型参数，请重传"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index eb4ab56..393589c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -58,6 +58,11 @@ */ DeviceData lgLiquidData(@Param("devcode") String devcode); + + DeviceData tubeData(@Param("devcode") String devcode); + + DeviceData H2sData(@Param("devcode") String devcode); + BfztCountDataDto bfztCountData(@Param("deptIds") List deptIds, @Param("isApp") Boolean isApp); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 7f028c5..3be6c65 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -78,6 +78,7 @@ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') + ${paramStr} @@ -170,8 +171,8 @@ UPTIME AS logtime FROM data_gas WHERE DEVCODE = #{devcode} - ORDER BY UPTIME - DESC LIMIT 1 + ORDER BY UPTIME DESC + LIMIT 1 - + + + + SELECT devcode, - deviceType, - deviceTypeName, + "deviceType", + "deviceTypeName", deptid, - wellCode, + "wellCode", descn, cell, uptime, @@ -371,7 +389,7 @@ liquiddata FROM ( - ( + SELECT dl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -413,8 +431,8 @@ - ) UNION ALL - ( + UNION ALL + SELECT dgl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -456,7 +474,7 @@ - ) + ) t1 ORDER BY uptime asc @@ -558,10 +576,10 @@ @@ -663,7 +681,7 @@ parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page"> SELECT DEVCODE, - deviceType, + "deviceType", @@ -671,11 +689,11 @@ DESCN, STATUS, DEPTID, - wellCode, - wellId, - deviceId, + "wellCode", + "wellId", + "deviceId", VALID, - deviceTypeName + "deviceTypeName" FROM wellcover_monitorview @@ -1261,7 +1279,7 @@ - AS logtime,dh.DESCN AS descn + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1294,8 +1312,8 @@ SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH AS strength, - dh2s.CELL AS cell, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, @@ -1306,7 +1324,7 @@ AS logtime, bdt.TYPE_NAME AS "deviceTypeName", bd.device_type as deviceType, - bwi.DEPTID AS deptid + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE @@ -1329,8 +1347,9 @@ - AND (dh2s.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE ) + AND (dh2s.DEVCODE LIKE + + OR dh2s.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index bb28cfc..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -195,6 +195,24 @@ } deviceDataDtoList.add((DeviceDataDto) deviceDataDto.clone()); break; + case "管盯": + deviceData = this.baseMapper.tubeData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("燃气泄漏"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("H2S浓度"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; default://未知设备 log.info("未知设备！"); @@ -378,7 +396,6 @@ watchDataDto.setWatchType("井内水位"); watchDataDto.setType("10"); if (ObjectUtil.isNotEmpty(deviceData)) { - watchDataDto.setValue(deviceData.getData() + "m"); watchDataDto.setData(deviceData.getData() + "m"); watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -388,7 +405,28 @@ } watchDataDtos.add((WatchDataDto) watchDataDto.clone()); break; - + case "管盯": + deviceData = this.baseMapper.tubeData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("燃气泄漏"); + watchDataDto.setType("12"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("H2S浓度"); + watchDataDto.setType("14"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; default://未知设备 log.info("未知设备！"); break; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 4c1bc0b..ce81120 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.dict.BusConfigDict; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -20,6 +22,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; /** @@ -30,7 +33,7 @@ */ @Controller @RequestMapping("/busConfig") -public class BusConfigController extends BaseController { +public class BusConfigController extends ExportController { @Qualifier("busConfigServiceImpl") @@ -143,7 +146,7 @@ /** - * 燃气获取配置列表 + * 管顶获取配置列表 */ @RequestMapping(value = "/tubeConfig/list") @ResponseBody @@ -382,7 +385,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -401,7 +411,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busMethaneConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busMethaneConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -420,7 +437,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTubeConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTubeConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -440,7 +464,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busWasteGasConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busWasteGasConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -460,7 +491,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTempHumiConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTempHumiConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -479,7 +517,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busDigConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busDigConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -498,7 +543,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busNoiseConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busNoiseConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -712,7 +764,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busGasLiquidConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busGasLiquidConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 8b147d2..75c5be2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,22 +1,17 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; -import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.service.IDeviceTypeService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.PathVariable; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import java.util.List; -import java.util.Map; import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -34,10 +29,7 @@ private final IDeviceModelsService deviceModelsService; - private final IDeviceTypeService deviceTypeService; - - public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { - this.deviceTypeService = deviceTypeService; + public DeviceModelsController(IDeviceModelsService deviceModelsService) { this.deviceModelsService = deviceModelsService; } @@ -48,25 +40,9 @@ @ResponseBody public Object listPage(String deviceType, String communication) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper() - .like("MODEL_NAME", deviceType == null ? "" : deviceType) - .like("COMMUNICATION", communication == null ? "" : communication); - page = deviceModelsService.page(page, query); - Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().forEach( - deviceModels -> { - DeviceType deviceTypeModel = deviceTypeService.getById(deviceModels.getDeviceType()); - deviceModels.setDeviceTypeName(deviceTypeModel == null ? "" : deviceTypeModel.getTypeName()); - String[] d = deviceModels.getCommunication().split(","); - if (d.length > 0) { - deviceModels.setCommunNameGroup(dictMap.get(d[0])); - } - for (int i = 1; i < d.length; i++) { - deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); - } - } - ); - return new SuccessResponseData(super.packForBT(page)); + ResponseData responseData = deviceModelsService.getListPage(page,deviceType, communication); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 5178f9b..efad32d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,9 +20,9 @@ */ public interface DeviceMapper extends BaseMapper { - List getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List getDeviceList(@Param("scope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") Long deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); List getDeviceListInfo(@Param("scope") DataScope dataScope); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java index 0f589db..ce44c35 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.dao; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -23,5 +24,11 @@ List selectModelList(@Param("deviceType") Long deviceType); + List getListPage(@Param("page") Page page, + @Param("deviceType") Long deviceType, + @Param("communication") String communication); + Map getDictNameByCode(); + + List> getDeviceTypeList(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index abec443..ea76482 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -157,7 +157,7 @@ FROM device_view dv LEFT JOIN bus_device_status bds ON bds.DEVICE_ID=dv.ID WHERE VALID = '1' - + and deviceType = #{deviceType} @@ -240,7 +240,7 @@ - d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='1' THEN 1 ELSE 0 END AS "onlineState",t.TYPE_NAME AS "typeName" + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='0' THEN 0 ELSE 1 END AS "onlineState",t.TYPE_NAME AS "typeName" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index 4943869..6e6e554 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -50,4 +50,24 @@ GROUP BY pid + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 730d95b..988bcba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -77,10 +77,10 @@ /** * 液位设备配置导入 * - * @param uploadFile 附件 + * @param busConfigDTOList 附件 * @return */ - SuccessResponseData imp(MultipartFile uploadFile); + SuccessResponseData imp(List busConfigDTOList); /** * 设备配置导出 diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java index 4bc79ba..b4c601b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.extension.service.IService; @@ -34,5 +36,7 @@ DeviceModels selectDeviceTypeById(String id); + ResponseData getListPage(Page page,String deviceType, String communication); + Map getDictNameByCode(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index 9e70f4b..a0a177d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -317,16 +317,14 @@ /** * 液位设备配置导入 * - * @param uploadFile 附件 + * @param busConfigDTOList 附件 * @return */ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); try { - - List busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { @@ -337,7 +335,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index 9d74002..f626ab7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -265,7 +265,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -278,19 +278,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - //TODO 导入项设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setSuccess(false); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index fb1048b..01154ff 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -252,7 +252,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -262,17 +262,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class,uploadFile,null,null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index e175ec7..53c0a1d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -251,7 +251,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList ) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -261,18 +261,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - try (InputStream in = uploadFile.getInputStream()) { - try { - //TODO 导入类设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - } Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 @@ -283,7 +272,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index ad81f03..046bf4e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -248,7 +248,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -259,18 +259,6 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); - - try { - //导入文件头设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setSuccess(false); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index c45f6ff..994e825 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -250,7 +250,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp( List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -261,17 +261,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index e27af66..01ffe04 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -250,7 +250,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -260,9 +260,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java index 7bf1aa9..1ea9554 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java @@ -237,7 +237,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -245,9 +245,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { @@ -258,7 +256,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java index 34d9e6b..e4f137c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java @@ -1,15 +1,23 @@ package com.casic.missiles.modular.system.service.impl; +import com.alibaba.excel.util.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.DeviceModelsMapper; import com.casic.missiles.modular.system.model.DeviceModels; +import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; +import lombok.extern.slf4j.Slf4j; +import org.apache.poi.util.StringUtil; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import java.io.Serializable; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -20,6 +28,7 @@ * @since 2019-05-23 */ @Service +@Slf4j public class DeviceModelsServiceImpl extends ServiceImpl implements IDeviceModelsService { @Override @@ -44,8 +53,40 @@ return this.baseMapper.selectById(id); } + public ResponseData getListPage(Page page, String deviceType, String communication) { + ResponseData responseData = new ResponseData(); + try { + List deviceModelsList = this.baseMapper.getListPage(page,StringUtils.isEmpty(deviceType)?-1:Long.valueOf(deviceType), communication); + Map dictMap = this.baseMapper.getDictNameByCode(); + List> deviceTypeList= this.baseMapper.getDeviceTypeList(); + Map deviceTypeMap = deviceTypeList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("id")), e -> String.valueOf(e.get("typeName"))) + ); + deviceModelsList.forEach( + deviceModels -> { + deviceModels.setDeviceTypeName(String.valueOf(deviceTypeMap.get(String.valueOf(deviceModels.getDeviceType())))); + String[] d = deviceModels.getCommunication().split(","); + if (d.length > 0) { + deviceModels.setCommunNameGroup(dictMap.get(d[0])); + } + for (int i = 1; i < d.length; i++) { + deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); + } + } + ); + page.setRecords(deviceModelsList); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + } catch (DataAccessException dae) { + log.error("主题：查询异常，设备类型{},型号{},异常信息{}", deviceType, communication, dae.getMessage()); + responseData.setMessage(ResponseData.DEFAULT_ERROR_MESSAGE); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + } + return responseData; + } + @Override - public Map getDictNameByCode() { + public Map getDictNameByCode() { return this.baseMapper.getDictNameByCode(); } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index b2c33d6..613d8a1 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -193,7 +193,7 @@ @Override public List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) { - List deviceDtoList = this.baseMapper.selectDataScopePage(dataScope, page, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline); + List deviceDtoList = this.baseMapper.selectDataScopePage(dataScope, page,Long.valueOf(StrUtil.isEmpty(deviceType) ? "-1" : deviceType) , Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline); deviceDtoList.forEach( deviceDto -> deviceDto.setOnlineState(deviceDto.getOnlineState() == "0" ? "0" : "1") ); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java index 434a0ae..af59a7c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java @@ -31,15 +31,14 @@ @Resource private ITenantDeptService tenantDeptService; - @Resource - private AbstractTenantService abstractTenantService; /** * 获取组织绑定关系列表 */ @RequestMapping(value = "/list") @ResponseBody - public Object list(String condition) { + public Object list(String tenantName) { QueryWrapper query = new QueryWrapper<>(); + query.like("tenant_name",tenantName); List list = tenantDeptService.tenantList(query); return ResponseData.success(list); } @@ -49,9 +48,10 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { + public Object listPage(String tenantName) { Page page = PageFactory.defaultPage(); QueryWrapper query = new QueryWrapper<>(); + query.like("tenant_name",tenantName); page = tenantDeptService.page(page, query); return super.packForBT(page); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java index 5ecbc11..626303f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java @@ -12,7 +12,7 @@ @Mapper public interface DeptPermissionConfigDao extends BaseMapper { - List> getListPage(@Param("deptid") String deptid); + List> getListPage(@Param("deptid") Long deptid); Long getPid(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java index 0d7c10d..1036b7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -7,11 +7,18 @@ @Data public class AlarmLevelParam { + private String deptId; + private String wellType; + private String lng; + private String lat; + private String tenantId; private String name; private String deviceType; private String openAlarm; private String openJob; + private String highValue; + private String lowValue; + private String level; //等级列表 - private List levelList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index e24fccd..44c994b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -111,11 +111,10 @@ alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); - alarmLevelParam.getLevelList().forEach( - alarmLevels -> { - alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); - this.save(alarmLevel); - } - ); + alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevelParam.getLevel()) ? "-1" : alarmLevelParam.getLevel())); + this.save(alarmLevel); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 4a35142..a480f26 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -18,7 +18,7 @@ List> deviceStaticsByType(); - List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") Long deviceType); List> deviceStaticsByRoad(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index c4ea3dd..6286a05 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -37,21 +37,21 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 8b7767b..514448a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -57,7 +57,7 @@ LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID BD.VALID = '1' AND BDW.VALID='1' - + AND BD.DEVICE_TYPE = #{deviceType} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 209b900..95110b4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -69,7 +69,7 @@ @Override public List> deviceStaticsByDept(DataScope dataScope, String deviceType) { - List> mapList = statisticMapper.deviceStaticsByDept(dataScope, deviceType); + List> mapList = statisticMapper.deviceStaticsByDept(dataScope, StrUtil.isEmpty(deviceType)?-1:Long.valueOf(deviceType)); for (Map map : mapList) { map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 3d7ae31..bf89d08 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -583,7 +583,7 @@ /** * 数据列表查询 */ - @GetMapping(value = "/data/list-page") + @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { if (StrUtil.isEmpty(watchType)) { return ResponseData.success("缺少监测类型参数，请重传"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index eb4ab56..393589c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -58,6 +58,11 @@ */ DeviceData lgLiquidData(@Param("devcode") String devcode); + + DeviceData tubeData(@Param("devcode") String devcode); + + DeviceData H2sData(@Param("devcode") String devcode); + BfztCountDataDto bfztCountData(@Param("deptIds") List deptIds, @Param("isApp") Boolean isApp); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 7f028c5..3be6c65 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -78,6 +78,7 @@ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') + ${paramStr} @@ -170,8 +171,8 @@ UPTIME AS logtime FROM data_gas WHERE DEVCODE = #{devcode} - ORDER BY UPTIME - DESC LIMIT 1 + ORDER BY UPTIME DESC + LIMIT 1 - + + + + SELECT devcode, - deviceType, - deviceTypeName, + "deviceType", + "deviceTypeName", deptid, - wellCode, + "wellCode", descn, cell, uptime, @@ -371,7 +389,7 @@ liquiddata FROM ( - ( + SELECT dl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -413,8 +431,8 @@ - ) UNION ALL - ( + UNION ALL + SELECT dgl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -456,7 +474,7 @@ - ) + ) t1 ORDER BY uptime asc @@ -558,10 +576,10 @@ @@ -663,7 +681,7 @@ parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page"> SELECT DEVCODE, - deviceType, + "deviceType", @@ -671,11 +689,11 @@ DESCN, STATUS, DEPTID, - wellCode, - wellId, - deviceId, + "wellCode", + "wellId", + "deviceId", VALID, - deviceTypeName + "deviceTypeName" FROM wellcover_monitorview @@ -1261,7 +1279,7 @@ - AS logtime,dh.DESCN AS descn + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1294,8 +1312,8 @@ SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH AS strength, - dh2s.CELL AS cell, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, @@ -1306,7 +1324,7 @@ AS logtime, bdt.TYPE_NAME AS "deviceTypeName", bd.device_type as deviceType, - bwi.DEPTID AS deptid + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE @@ -1329,8 +1347,9 @@ - AND (dh2s.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE ) + AND (dh2s.DEVCODE LIKE + + OR dh2s.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index bb28cfc..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -195,6 +195,24 @@ } deviceDataDtoList.add((DeviceDataDto) deviceDataDto.clone()); break; + case "管盯": + deviceData = this.baseMapper.tubeData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("燃气泄漏"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("H2S浓度"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; default://未知设备 log.info("未知设备！"); @@ -378,7 +396,6 @@ watchDataDto.setWatchType("井内水位"); watchDataDto.setType("10"); if (ObjectUtil.isNotEmpty(deviceData)) { - watchDataDto.setValue(deviceData.getData() + "m"); watchDataDto.setData(deviceData.getData() + "m"); watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -388,7 +405,28 @@ } watchDataDtos.add((WatchDataDto) watchDataDto.clone()); break; - + case "管盯": + deviceData = this.baseMapper.tubeData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("燃气泄漏"); + watchDataDto.setType("12"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("H2S浓度"); + watchDataDto.setType("14"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; default://未知设备 log.info("未知设备！"); break; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 4c1bc0b..ce81120 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.dict.BusConfigDict; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -20,6 +22,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; /** @@ -30,7 +33,7 @@ */ @Controller @RequestMapping("/busConfig") -public class BusConfigController extends BaseController { +public class BusConfigController extends ExportController { @Qualifier("busConfigServiceImpl") @@ -143,7 +146,7 @@ /** - * 燃气获取配置列表 + * 管顶获取配置列表 */ @RequestMapping(value = "/tubeConfig/list") @ResponseBody @@ -382,7 +385,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -401,7 +411,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busMethaneConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busMethaneConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -420,7 +437,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTubeConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTubeConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -440,7 +464,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busWasteGasConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busWasteGasConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -460,7 +491,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTempHumiConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTempHumiConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -479,7 +517,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busDigConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busDigConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -498,7 +543,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busNoiseConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busNoiseConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -712,7 +764,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busGasLiquidConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busGasLiquidConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 8b147d2..75c5be2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,22 +1,17 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; -import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.service.IDeviceTypeService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.PathVariable; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import java.util.List; -import java.util.Map; import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -34,10 +29,7 @@ private final IDeviceModelsService deviceModelsService; - private final IDeviceTypeService deviceTypeService; - - public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { - this.deviceTypeService = deviceTypeService; + public DeviceModelsController(IDeviceModelsService deviceModelsService) { this.deviceModelsService = deviceModelsService; } @@ -48,25 +40,9 @@ @ResponseBody public Object listPage(String deviceType, String communication) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper() - .like("MODEL_NAME", deviceType == null ? "" : deviceType) - .like("COMMUNICATION", communication == null ? "" : communication); - page = deviceModelsService.page(page, query); - Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().forEach( - deviceModels -> { - DeviceType deviceTypeModel = deviceTypeService.getById(deviceModels.getDeviceType()); - deviceModels.setDeviceTypeName(deviceTypeModel == null ? "" : deviceTypeModel.getTypeName()); - String[] d = deviceModels.getCommunication().split(","); - if (d.length > 0) { - deviceModels.setCommunNameGroup(dictMap.get(d[0])); - } - for (int i = 1; i < d.length; i++) { - deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); - } - } - ); - return new SuccessResponseData(super.packForBT(page)); + ResponseData responseData = deviceModelsService.getListPage(page,deviceType, communication); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 5178f9b..efad32d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,9 +20,9 @@ */ public interface DeviceMapper extends BaseMapper { - List getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List getDeviceList(@Param("scope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") Long deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); List getDeviceListInfo(@Param("scope") DataScope dataScope); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java index 0f589db..ce44c35 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.dao; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -23,5 +24,11 @@ List selectModelList(@Param("deviceType") Long deviceType); + List getListPage(@Param("page") Page page, + @Param("deviceType") Long deviceType, + @Param("communication") String communication); + Map getDictNameByCode(); + + List> getDeviceTypeList(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index abec443..ea76482 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -157,7 +157,7 @@ FROM device_view dv LEFT JOIN bus_device_status bds ON bds.DEVICE_ID=dv.ID WHERE VALID = '1' - + and deviceType = #{deviceType} @@ -240,7 +240,7 @@ - d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='1' THEN 1 ELSE 0 END AS "onlineState",t.TYPE_NAME AS "typeName" + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='0' THEN 0 ELSE 1 END AS "onlineState",t.TYPE_NAME AS "typeName" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index 4943869..6e6e554 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -50,4 +50,24 @@ GROUP BY pid + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 730d95b..988bcba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -77,10 +77,10 @@ /** * 液位设备配置导入 * - * @param uploadFile 附件 + * @param busConfigDTOList 附件 * @return */ - SuccessResponseData imp(MultipartFile uploadFile); + SuccessResponseData imp(List busConfigDTOList); /** * 设备配置导出 diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java index 4bc79ba..b4c601b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.extension.service.IService; @@ -34,5 +36,7 @@ DeviceModels selectDeviceTypeById(String id); + ResponseData getListPage(Page page,String deviceType, String communication); + Map getDictNameByCode(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index 9e70f4b..a0a177d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -317,16 +317,14 @@ /** * 液位设备配置导入 * - * @param uploadFile 附件 + * @param busConfigDTOList 附件 * @return */ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); try { - - List busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { @@ -337,7 +335,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index 9d74002..f626ab7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -265,7 +265,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -278,19 +278,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - //TODO 导入项设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setSuccess(false); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index fb1048b..01154ff 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -252,7 +252,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -262,17 +262,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class,uploadFile,null,null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index e175ec7..53c0a1d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -251,7 +251,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList ) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -261,18 +261,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - try (InputStream in = uploadFile.getInputStream()) { - try { - //TODO 导入类设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - } Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 @@ -283,7 +272,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index ad81f03..046bf4e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -248,7 +248,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -259,18 +259,6 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); - - try { - //导入文件头设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setSuccess(false); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index c45f6ff..994e825 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -250,7 +250,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp( List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -261,17 +261,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index e27af66..01ffe04 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -250,7 +250,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -260,9 +260,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java index 7bf1aa9..1ea9554 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java @@ -237,7 +237,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -245,9 +245,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { @@ -258,7 +256,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java index 34d9e6b..e4f137c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java @@ -1,15 +1,23 @@ package com.casic.missiles.modular.system.service.impl; +import com.alibaba.excel.util.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.DeviceModelsMapper; import com.casic.missiles.modular.system.model.DeviceModels; +import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; +import lombok.extern.slf4j.Slf4j; +import org.apache.poi.util.StringUtil; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import java.io.Serializable; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -20,6 +28,7 @@ * @since 2019-05-23 */ @Service +@Slf4j public class DeviceModelsServiceImpl extends ServiceImpl implements IDeviceModelsService { @Override @@ -44,8 +53,40 @@ return this.baseMapper.selectById(id); } + public ResponseData getListPage(Page page, String deviceType, String communication) { + ResponseData responseData = new ResponseData(); + try { + List deviceModelsList = this.baseMapper.getListPage(page,StringUtils.isEmpty(deviceType)?-1:Long.valueOf(deviceType), communication); + Map dictMap = this.baseMapper.getDictNameByCode(); + List> deviceTypeList= this.baseMapper.getDeviceTypeList(); + Map deviceTypeMap = deviceTypeList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("id")), e -> String.valueOf(e.get("typeName"))) + ); + deviceModelsList.forEach( + deviceModels -> { + deviceModels.setDeviceTypeName(String.valueOf(deviceTypeMap.get(String.valueOf(deviceModels.getDeviceType())))); + String[] d = deviceModels.getCommunication().split(","); + if (d.length > 0) { + deviceModels.setCommunNameGroup(dictMap.get(d[0])); + } + for (int i = 1; i < d.length; i++) { + deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); + } + } + ); + page.setRecords(deviceModelsList); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + } catch (DataAccessException dae) { + log.error("主题：查询异常，设备类型{},型号{},异常信息{}", deviceType, communication, dae.getMessage()); + responseData.setMessage(ResponseData.DEFAULT_ERROR_MESSAGE); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + } + return responseData; + } + @Override - public Map getDictNameByCode() { + public Map getDictNameByCode() { return this.baseMapper.getDictNameByCode(); } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index b2c33d6..613d8a1 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -193,7 +193,7 @@ @Override public List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) { - List deviceDtoList = this.baseMapper.selectDataScopePage(dataScope, page, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline); + List deviceDtoList = this.baseMapper.selectDataScopePage(dataScope, page,Long.valueOf(StrUtil.isEmpty(deviceType) ? "-1" : deviceType) , Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline); deviceDtoList.forEach( deviceDto -> deviceDto.setOnlineState(deviceDto.getOnlineState() == "0" ? "0" : "1") ); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java index 434a0ae..af59a7c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java @@ -31,15 +31,14 @@ @Resource private ITenantDeptService tenantDeptService; - @Resource - private AbstractTenantService abstractTenantService; /** * 获取组织绑定关系列表 */ @RequestMapping(value = "/list") @ResponseBody - public Object list(String condition) { + public Object list(String tenantName) { QueryWrapper query = new QueryWrapper<>(); + query.like("tenant_name",tenantName); List list = tenantDeptService.tenantList(query); return ResponseData.success(list); } @@ -49,9 +48,10 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { + public Object listPage(String tenantName) { Page page = PageFactory.defaultPage(); QueryWrapper query = new QueryWrapper<>(); + query.like("tenant_name",tenantName); page = tenantDeptService.page(page, query); return super.packForBT(page); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java index 5ecbc11..626303f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java @@ -12,7 +12,7 @@ @Mapper public interface DeptPermissionConfigDao extends BaseMapper { - List> getListPage(@Param("deptid") String deptid); + List> getListPage(@Param("deptid") Long deptid); Long getPid(); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml index 9c5ab69..606d817 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml @@ -14,7 +14,7 @@ SELECT id,deptid,communication,well_type AS "wellType",device_type AS "deviceType",area,map,lng,lat FROM config_dept_permission WHERE 1=1 - + AND DEPTID = #{deptid} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java index 0d7c10d..1036b7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -7,11 +7,18 @@ @Data public class AlarmLevelParam { + private String deptId; + private String wellType; + private String lng; + private String lat; + private String tenantId; private String name; private String deviceType; private String openAlarm; private String openJob; + private String highValue; + private String lowValue; + private String level; //等级列表 - private List levelList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index e24fccd..44c994b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -111,11 +111,10 @@ alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); - alarmLevelParam.getLevelList().forEach( - alarmLevels -> { - alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); - this.save(alarmLevel); - } - ); + alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevelParam.getLevel()) ? "-1" : alarmLevelParam.getLevel())); + this.save(alarmLevel); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 4a35142..a480f26 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -18,7 +18,7 @@ List> deviceStaticsByType(); - List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") Long deviceType); List> deviceStaticsByRoad(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index c4ea3dd..6286a05 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -37,21 +37,21 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 8b7767b..514448a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -57,7 +57,7 @@ LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID BD.VALID = '1' AND BDW.VALID='1' - + AND BD.DEVICE_TYPE = #{deviceType} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 209b900..95110b4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -69,7 +69,7 @@ @Override public List> deviceStaticsByDept(DataScope dataScope, String deviceType) { - List> mapList = statisticMapper.deviceStaticsByDept(dataScope, deviceType); + List> mapList = statisticMapper.deviceStaticsByDept(dataScope, StrUtil.isEmpty(deviceType)?-1:Long.valueOf(deviceType)); for (Map map : mapList) { map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 3d7ae31..bf89d08 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -583,7 +583,7 @@ /** * 数据列表查询 */ - @GetMapping(value = "/data/list-page") + @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { if (StrUtil.isEmpty(watchType)) { return ResponseData.success("缺少监测类型参数，请重传"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index eb4ab56..393589c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -58,6 +58,11 @@ */ DeviceData lgLiquidData(@Param("devcode") String devcode); + + DeviceData tubeData(@Param("devcode") String devcode); + + DeviceData H2sData(@Param("devcode") String devcode); + BfztCountDataDto bfztCountData(@Param("deptIds") List deptIds, @Param("isApp") Boolean isApp); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 7f028c5..3be6c65 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -78,6 +78,7 @@ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') + ${paramStr} @@ -170,8 +171,8 @@ UPTIME AS logtime FROM data_gas WHERE DEVCODE = #{devcode} - ORDER BY UPTIME - DESC LIMIT 1 + ORDER BY UPTIME DESC + LIMIT 1 - + + + + SELECT devcode, - deviceType, - deviceTypeName, + "deviceType", + "deviceTypeName", deptid, - wellCode, + "wellCode", descn, cell, uptime, @@ -371,7 +389,7 @@ liquiddata FROM ( - ( + SELECT dl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -413,8 +431,8 @@ - ) UNION ALL - ( + UNION ALL + SELECT dgl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -456,7 +474,7 @@ - ) + ) t1 ORDER BY uptime asc @@ -558,10 +576,10 @@ @@ -663,7 +681,7 @@ parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page"> SELECT DEVCODE, - deviceType, + "deviceType", @@ -671,11 +689,11 @@ DESCN, STATUS, DEPTID, - wellCode, - wellId, - deviceId, + "wellCode", + "wellId", + "deviceId", VALID, - deviceTypeName + "deviceTypeName" FROM wellcover_monitorview @@ -1261,7 +1279,7 @@ - AS logtime,dh.DESCN AS descn + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1294,8 +1312,8 @@ SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH AS strength, - dh2s.CELL AS cell, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, @@ -1306,7 +1324,7 @@ AS logtime, bdt.TYPE_NAME AS "deviceTypeName", bd.device_type as deviceType, - bwi.DEPTID AS deptid + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE @@ -1329,8 +1347,9 @@ - AND (dh2s.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE ) + AND (dh2s.DEVCODE LIKE + + OR dh2s.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index bb28cfc..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -195,6 +195,24 @@ } deviceDataDtoList.add((DeviceDataDto) deviceDataDto.clone()); break; + case "管盯": + deviceData = this.baseMapper.tubeData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("燃气泄漏"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("H2S浓度"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; default://未知设备 log.info("未知设备！"); @@ -378,7 +396,6 @@ watchDataDto.setWatchType("井内水位"); watchDataDto.setType("10"); if (ObjectUtil.isNotEmpty(deviceData)) { - watchDataDto.setValue(deviceData.getData() + "m"); watchDataDto.setData(deviceData.getData() + "m"); watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -388,7 +405,28 @@ } watchDataDtos.add((WatchDataDto) watchDataDto.clone()); break; - + case "管盯": + deviceData = this.baseMapper.tubeData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("燃气泄漏"); + watchDataDto.setType("12"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("H2S浓度"); + watchDataDto.setType("14"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; default://未知设备 log.info("未知设备！"); break; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 4c1bc0b..ce81120 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.dict.BusConfigDict; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -20,6 +22,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; /** @@ -30,7 +33,7 @@ */ @Controller @RequestMapping("/busConfig") -public class BusConfigController extends BaseController { +public class BusConfigController extends ExportController { @Qualifier("busConfigServiceImpl") @@ -143,7 +146,7 @@ /** - * 燃气获取配置列表 + * 管顶获取配置列表 */ @RequestMapping(value = "/tubeConfig/list") @ResponseBody @@ -382,7 +385,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -401,7 +411,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busMethaneConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busMethaneConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -420,7 +437,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTubeConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTubeConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -440,7 +464,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busWasteGasConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busWasteGasConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -460,7 +491,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTempHumiConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTempHumiConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -479,7 +517,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busDigConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busDigConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -498,7 +543,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busNoiseConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busNoiseConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -712,7 +764,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busGasLiquidConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busGasLiquidConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 8b147d2..75c5be2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,22 +1,17 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; -import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.service.IDeviceTypeService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.PathVariable; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import java.util.List; -import java.util.Map; import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -34,10 +29,7 @@ private final IDeviceModelsService deviceModelsService; - private final IDeviceTypeService deviceTypeService; - - public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { - this.deviceTypeService = deviceTypeService; + public DeviceModelsController(IDeviceModelsService deviceModelsService) { this.deviceModelsService = deviceModelsService; } @@ -48,25 +40,9 @@ @ResponseBody public Object listPage(String deviceType, String communication) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper() - .like("MODEL_NAME", deviceType == null ? "" : deviceType) - .like("COMMUNICATION", communication == null ? "" : communication); - page = deviceModelsService.page(page, query); - Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().forEach( - deviceModels -> { - DeviceType deviceTypeModel = deviceTypeService.getById(deviceModels.getDeviceType()); - deviceModels.setDeviceTypeName(deviceTypeModel == null ? "" : deviceTypeModel.getTypeName()); - String[] d = deviceModels.getCommunication().split(","); - if (d.length > 0) { - deviceModels.setCommunNameGroup(dictMap.get(d[0])); - } - for (int i = 1; i < d.length; i++) { - deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); - } - } - ); - return new SuccessResponseData(super.packForBT(page)); + ResponseData responseData = deviceModelsService.getListPage(page,deviceType, communication); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 5178f9b..efad32d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,9 +20,9 @@ */ public interface DeviceMapper extends BaseMapper { - List getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List getDeviceList(@Param("scope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") Long deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); List getDeviceListInfo(@Param("scope") DataScope dataScope); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java index 0f589db..ce44c35 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.dao; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -23,5 +24,11 @@ List selectModelList(@Param("deviceType") Long deviceType); + List getListPage(@Param("page") Page page, + @Param("deviceType") Long deviceType, + @Param("communication") String communication); + Map getDictNameByCode(); + + List> getDeviceTypeList(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index abec443..ea76482 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -157,7 +157,7 @@ FROM device_view dv LEFT JOIN bus_device_status bds ON bds.DEVICE_ID=dv.ID WHERE VALID = '1' - + and deviceType = #{deviceType} @@ -240,7 +240,7 @@ - d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='1' THEN 1 ELSE 0 END AS "onlineState",t.TYPE_NAME AS "typeName" + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='0' THEN 0 ELSE 1 END AS "onlineState",t.TYPE_NAME AS "typeName" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index 4943869..6e6e554 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -50,4 +50,24 @@ GROUP BY pid + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 730d95b..988bcba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -77,10 +77,10 @@ /** * 液位设备配置导入 * - * @param uploadFile 附件 + * @param busConfigDTOList 附件 * @return */ - SuccessResponseData imp(MultipartFile uploadFile); + SuccessResponseData imp(List busConfigDTOList); /** * 设备配置导出 diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java index 4bc79ba..b4c601b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.extension.service.IService; @@ -34,5 +36,7 @@ DeviceModels selectDeviceTypeById(String id); + ResponseData getListPage(Page page,String deviceType, String communication); + Map getDictNameByCode(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index 9e70f4b..a0a177d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -317,16 +317,14 @@ /** * 液位设备配置导入 * - * @param uploadFile 附件 + * @param busConfigDTOList 附件 * @return */ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); try { - - List busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { @@ -337,7 +335,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index 9d74002..f626ab7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -265,7 +265,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -278,19 +278,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - //TODO 导入项设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setSuccess(false); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index fb1048b..01154ff 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -252,7 +252,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -262,17 +262,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class,uploadFile,null,null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index e175ec7..53c0a1d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -251,7 +251,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList ) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -261,18 +261,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - try (InputStream in = uploadFile.getInputStream()) { - try { - //TODO 导入类设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - } Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 @@ -283,7 +272,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index ad81f03..046bf4e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -248,7 +248,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -259,18 +259,6 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); - - try { - //导入文件头设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setSuccess(false); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index c45f6ff..994e825 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -250,7 +250,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp( List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -261,17 +261,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index e27af66..01ffe04 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -250,7 +250,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -260,9 +260,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java index 7bf1aa9..1ea9554 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java @@ -237,7 +237,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -245,9 +245,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { @@ -258,7 +256,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java index 34d9e6b..e4f137c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java @@ -1,15 +1,23 @@ package com.casic.missiles.modular.system.service.impl; +import com.alibaba.excel.util.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.DeviceModelsMapper; import com.casic.missiles.modular.system.model.DeviceModels; +import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; +import lombok.extern.slf4j.Slf4j; +import org.apache.poi.util.StringUtil; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import java.io.Serializable; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -20,6 +28,7 @@ * @since 2019-05-23 */ @Service +@Slf4j public class DeviceModelsServiceImpl extends ServiceImpl implements IDeviceModelsService { @Override @@ -44,8 +53,40 @@ return this.baseMapper.selectById(id); } + public ResponseData getListPage(Page page, String deviceType, String communication) { + ResponseData responseData = new ResponseData(); + try { + List deviceModelsList = this.baseMapper.getListPage(page,StringUtils.isEmpty(deviceType)?-1:Long.valueOf(deviceType), communication); + Map dictMap = this.baseMapper.getDictNameByCode(); + List> deviceTypeList= this.baseMapper.getDeviceTypeList(); + Map deviceTypeMap = deviceTypeList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("id")), e -> String.valueOf(e.get("typeName"))) + ); + deviceModelsList.forEach( + deviceModels -> { + deviceModels.setDeviceTypeName(String.valueOf(deviceTypeMap.get(String.valueOf(deviceModels.getDeviceType())))); + String[] d = deviceModels.getCommunication().split(","); + if (d.length > 0) { + deviceModels.setCommunNameGroup(dictMap.get(d[0])); + } + for (int i = 1; i < d.length; i++) { + deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); + } + } + ); + page.setRecords(deviceModelsList); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + } catch (DataAccessException dae) { + log.error("主题：查询异常，设备类型{},型号{},异常信息{}", deviceType, communication, dae.getMessage()); + responseData.setMessage(ResponseData.DEFAULT_ERROR_MESSAGE); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + } + return responseData; + } + @Override - public Map getDictNameByCode() { + public Map getDictNameByCode() { return this.baseMapper.getDictNameByCode(); } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index b2c33d6..613d8a1 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -193,7 +193,7 @@ @Override public List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) { - List deviceDtoList = this.baseMapper.selectDataScopePage(dataScope, page, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline); + List deviceDtoList = this.baseMapper.selectDataScopePage(dataScope, page,Long.valueOf(StrUtil.isEmpty(deviceType) ? "-1" : deviceType) , Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline); deviceDtoList.forEach( deviceDto -> deviceDto.setOnlineState(deviceDto.getOnlineState() == "0" ? "0" : "1") ); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java index 434a0ae..af59a7c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java @@ -31,15 +31,14 @@ @Resource private ITenantDeptService tenantDeptService; - @Resource - private AbstractTenantService abstractTenantService; /** * 获取组织绑定关系列表 */ @RequestMapping(value = "/list") @ResponseBody - public Object list(String condition) { + public Object list(String tenantName) { QueryWrapper query = new QueryWrapper<>(); + query.like("tenant_name",tenantName); List list = tenantDeptService.tenantList(query); return ResponseData.success(list); } @@ -49,9 +48,10 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { + public Object listPage(String tenantName) { Page page = PageFactory.defaultPage(); QueryWrapper query = new QueryWrapper<>(); + query.like("tenant_name",tenantName); page = tenantDeptService.page(page, query); return super.packForBT(page); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java index 5ecbc11..626303f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java @@ -12,7 +12,7 @@ @Mapper public interface DeptPermissionConfigDao extends BaseMapper { - List> getListPage(@Param("deptid") String deptid); + List> getListPage(@Param("deptid") Long deptid); Long getPid(); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml index 9c5ab69..606d817 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml @@ -14,7 +14,7 @@ SELECT id,deptid,communication,well_type AS "wellType",device_type AS "deviceType",area,map,lng,lat FROM config_dept_permission WHERE 1=1 - + AND DEPTID = #{deptid} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java index 3dde18e..5a0adf2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java @@ -33,7 +33,7 @@ public ResponseData deviceDeptPermissionList(String deptid) { ResponseData responseData = new ResponseData(); try { - List> deptList = this.baseMapper.getListPage(deptid); + List> deptList = this.baseMapper.getListPage(StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid)); this.supplementData(deptList); responseData.setMessage("查询成功"); responseData.setCode(200); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java index 0d7c10d..1036b7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -7,11 +7,18 @@ @Data public class AlarmLevelParam { + private String deptId; + private String wellType; + private String lng; + private String lat; + private String tenantId; private String name; private String deviceType; private String openAlarm; private String openJob; + private String highValue; + private String lowValue; + private String level; //等级列表 - private List levelList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index e24fccd..44c994b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -111,11 +111,10 @@ alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); - alarmLevelParam.getLevelList().forEach( - alarmLevels -> { - alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); - this.save(alarmLevel); - } - ); + alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevelParam.getLevel()) ? "-1" : alarmLevelParam.getLevel())); + this.save(alarmLevel); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 4a35142..a480f26 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -18,7 +18,7 @@ List> deviceStaticsByType(); - List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") Long deviceType); List> deviceStaticsByRoad(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index c4ea3dd..6286a05 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -37,21 +37,21 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 8b7767b..514448a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -57,7 +57,7 @@ LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID BD.VALID = '1' AND BDW.VALID='1' - + AND BD.DEVICE_TYPE = #{deviceType} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 209b900..95110b4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -69,7 +69,7 @@ @Override public List> deviceStaticsByDept(DataScope dataScope, String deviceType) { - List> mapList = statisticMapper.deviceStaticsByDept(dataScope, deviceType); + List> mapList = statisticMapper.deviceStaticsByDept(dataScope, StrUtil.isEmpty(deviceType)?-1:Long.valueOf(deviceType)); for (Map map : mapList) { map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 3d7ae31..bf89d08 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -583,7 +583,7 @@ /** * 数据列表查询 */ - @GetMapping(value = "/data/list-page") + @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { if (StrUtil.isEmpty(watchType)) { return ResponseData.success("缺少监测类型参数，请重传"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index eb4ab56..393589c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -58,6 +58,11 @@ */ DeviceData lgLiquidData(@Param("devcode") String devcode); + + DeviceData tubeData(@Param("devcode") String devcode); + + DeviceData H2sData(@Param("devcode") String devcode); + BfztCountDataDto bfztCountData(@Param("deptIds") List deptIds, @Param("isApp") Boolean isApp); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 7f028c5..3be6c65 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -78,6 +78,7 @@ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') + ${paramStr} @@ -170,8 +171,8 @@ UPTIME AS logtime FROM data_gas WHERE DEVCODE = #{devcode} - ORDER BY UPTIME - DESC LIMIT 1 + ORDER BY UPTIME DESC + LIMIT 1 - + + + + SELECT devcode, - deviceType, - deviceTypeName, + "deviceType", + "deviceTypeName", deptid, - wellCode, + "wellCode", descn, cell, uptime, @@ -371,7 +389,7 @@ liquiddata FROM ( - ( + SELECT dl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -413,8 +431,8 @@ - ) UNION ALL - ( + UNION ALL + SELECT dgl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -456,7 +474,7 @@ - ) + ) t1 ORDER BY uptime asc @@ -558,10 +576,10 @@ @@ -663,7 +681,7 @@ parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page"> SELECT DEVCODE, - deviceType, + "deviceType", @@ -671,11 +689,11 @@ DESCN, STATUS, DEPTID, - wellCode, - wellId, - deviceId, + "wellCode", + "wellId", + "deviceId", VALID, - deviceTypeName + "deviceTypeName" FROM wellcover_monitorview @@ -1261,7 +1279,7 @@ - AS logtime,dh.DESCN AS descn + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1294,8 +1312,8 @@ SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH AS strength, - dh2s.CELL AS cell, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, @@ -1306,7 +1324,7 @@ AS logtime, bdt.TYPE_NAME AS "deviceTypeName", bd.device_type as deviceType, - bwi.DEPTID AS deptid + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE @@ -1329,8 +1347,9 @@ - AND (dh2s.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE ) + AND (dh2s.DEVCODE LIKE + + OR dh2s.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index bb28cfc..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -195,6 +195,24 @@ } deviceDataDtoList.add((DeviceDataDto) deviceDataDto.clone()); break; + case "管盯": + deviceData = this.baseMapper.tubeData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("燃气泄漏"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("H2S浓度"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; default://未知设备 log.info("未知设备！"); @@ -378,7 +396,6 @@ watchDataDto.setWatchType("井内水位"); watchDataDto.setType("10"); if (ObjectUtil.isNotEmpty(deviceData)) { - watchDataDto.setValue(deviceData.getData() + "m"); watchDataDto.setData(deviceData.getData() + "m"); watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -388,7 +405,28 @@ } watchDataDtos.add((WatchDataDto) watchDataDto.clone()); break; - + case "管盯": + deviceData = this.baseMapper.tubeData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("燃气泄漏"); + watchDataDto.setType("12"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("H2S浓度"); + watchDataDto.setType("14"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; default://未知设备 log.info("未知设备！"); break; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 4c1bc0b..ce81120 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.dict.BusConfigDict; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -20,6 +22,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; /** @@ -30,7 +33,7 @@ */ @Controller @RequestMapping("/busConfig") -public class BusConfigController extends BaseController { +public class BusConfigController extends ExportController { @Qualifier("busConfigServiceImpl") @@ -143,7 +146,7 @@ /** - * 燃气获取配置列表 + * 管顶获取配置列表 */ @RequestMapping(value = "/tubeConfig/list") @ResponseBody @@ -382,7 +385,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -401,7 +411,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busMethaneConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busMethaneConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -420,7 +437,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTubeConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTubeConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -440,7 +464,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busWasteGasConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busWasteGasConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -460,7 +491,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTempHumiConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTempHumiConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -479,7 +517,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busDigConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busDigConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -498,7 +543,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busNoiseConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busNoiseConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -712,7 +764,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busGasLiquidConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busGasLiquidConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 8b147d2..75c5be2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,22 +1,17 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; -import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.service.IDeviceTypeService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.PathVariable; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import java.util.List; -import java.util.Map; import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -34,10 +29,7 @@ private final IDeviceModelsService deviceModelsService; - private final IDeviceTypeService deviceTypeService; - - public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { - this.deviceTypeService = deviceTypeService; + public DeviceModelsController(IDeviceModelsService deviceModelsService) { this.deviceModelsService = deviceModelsService; } @@ -48,25 +40,9 @@ @ResponseBody public Object listPage(String deviceType, String communication) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper() - .like("MODEL_NAME", deviceType == null ? "" : deviceType) - .like("COMMUNICATION", communication == null ? "" : communication); - page = deviceModelsService.page(page, query); - Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().forEach( - deviceModels -> { - DeviceType deviceTypeModel = deviceTypeService.getById(deviceModels.getDeviceType()); - deviceModels.setDeviceTypeName(deviceTypeModel == null ? "" : deviceTypeModel.getTypeName()); - String[] d = deviceModels.getCommunication().split(","); - if (d.length > 0) { - deviceModels.setCommunNameGroup(dictMap.get(d[0])); - } - for (int i = 1; i < d.length; i++) { - deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); - } - } - ); - return new SuccessResponseData(super.packForBT(page)); + ResponseData responseData = deviceModelsService.getListPage(page,deviceType, communication); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 5178f9b..efad32d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,9 +20,9 @@ */ public interface DeviceMapper extends BaseMapper { - List getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List getDeviceList(@Param("scope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") Long deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); List getDeviceListInfo(@Param("scope") DataScope dataScope); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java index 0f589db..ce44c35 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.dao; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -23,5 +24,11 @@ List selectModelList(@Param("deviceType") Long deviceType); + List getListPage(@Param("page") Page page, + @Param("deviceType") Long deviceType, + @Param("communication") String communication); + Map getDictNameByCode(); + + List> getDeviceTypeList(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index abec443..ea76482 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -157,7 +157,7 @@ FROM device_view dv LEFT JOIN bus_device_status bds ON bds.DEVICE_ID=dv.ID WHERE VALID = '1' - + and deviceType = #{deviceType} @@ -240,7 +240,7 @@ - d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='1' THEN 1 ELSE 0 END AS "onlineState",t.TYPE_NAME AS "typeName" + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='0' THEN 0 ELSE 1 END AS "onlineState",t.TYPE_NAME AS "typeName" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index 4943869..6e6e554 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -50,4 +50,24 @@ GROUP BY pid + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 730d95b..988bcba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -77,10 +77,10 @@ /** * 液位设备配置导入 * - * @param uploadFile 附件 + * @param busConfigDTOList 附件 * @return */ - SuccessResponseData imp(MultipartFile uploadFile); + SuccessResponseData imp(List busConfigDTOList); /** * 设备配置导出 diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java index 4bc79ba..b4c601b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.extension.service.IService; @@ -34,5 +36,7 @@ DeviceModels selectDeviceTypeById(String id); + ResponseData getListPage(Page page,String deviceType, String communication); + Map getDictNameByCode(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index 9e70f4b..a0a177d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -317,16 +317,14 @@ /** * 液位设备配置导入 * - * @param uploadFile 附件 + * @param busConfigDTOList 附件 * @return */ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); try { - - List busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { @@ -337,7 +335,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index 9d74002..f626ab7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -265,7 +265,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -278,19 +278,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - //TODO 导入项设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setSuccess(false); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index fb1048b..01154ff 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -252,7 +252,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -262,17 +262,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class,uploadFile,null,null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index e175ec7..53c0a1d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -251,7 +251,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList ) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -261,18 +261,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - try (InputStream in = uploadFile.getInputStream()) { - try { - //TODO 导入类设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - } Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 @@ -283,7 +272,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index ad81f03..046bf4e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -248,7 +248,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -259,18 +259,6 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); - - try { - //导入文件头设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setSuccess(false); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index c45f6ff..994e825 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -250,7 +250,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp( List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -261,17 +261,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index e27af66..01ffe04 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -250,7 +250,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -260,9 +260,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java index 7bf1aa9..1ea9554 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java @@ -237,7 +237,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -245,9 +245,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { @@ -258,7 +256,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java index 34d9e6b..e4f137c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java @@ -1,15 +1,23 @@ package com.casic.missiles.modular.system.service.impl; +import com.alibaba.excel.util.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.DeviceModelsMapper; import com.casic.missiles.modular.system.model.DeviceModels; +import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; +import lombok.extern.slf4j.Slf4j; +import org.apache.poi.util.StringUtil; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import java.io.Serializable; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -20,6 +28,7 @@ * @since 2019-05-23 */ @Service +@Slf4j public class DeviceModelsServiceImpl extends ServiceImpl implements IDeviceModelsService { @Override @@ -44,8 +53,40 @@ return this.baseMapper.selectById(id); } + public ResponseData getListPage(Page page, String deviceType, String communication) { + ResponseData responseData = new ResponseData(); + try { + List deviceModelsList = this.baseMapper.getListPage(page,StringUtils.isEmpty(deviceType)?-1:Long.valueOf(deviceType), communication); + Map dictMap = this.baseMapper.getDictNameByCode(); + List> deviceTypeList= this.baseMapper.getDeviceTypeList(); + Map deviceTypeMap = deviceTypeList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("id")), e -> String.valueOf(e.get("typeName"))) + ); + deviceModelsList.forEach( + deviceModels -> { + deviceModels.setDeviceTypeName(String.valueOf(deviceTypeMap.get(String.valueOf(deviceModels.getDeviceType())))); + String[] d = deviceModels.getCommunication().split(","); + if (d.length > 0) { + deviceModels.setCommunNameGroup(dictMap.get(d[0])); + } + for (int i = 1; i < d.length; i++) { + deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); + } + } + ); + page.setRecords(deviceModelsList); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + } catch (DataAccessException dae) { + log.error("主题：查询异常，设备类型{},型号{},异常信息{}", deviceType, communication, dae.getMessage()); + responseData.setMessage(ResponseData.DEFAULT_ERROR_MESSAGE); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + } + return responseData; + } + @Override - public Map getDictNameByCode() { + public Map getDictNameByCode() { return this.baseMapper.getDictNameByCode(); } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index b2c33d6..613d8a1 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -193,7 +193,7 @@ @Override public List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) { - List deviceDtoList = this.baseMapper.selectDataScopePage(dataScope, page, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline); + List deviceDtoList = this.baseMapper.selectDataScopePage(dataScope, page,Long.valueOf(StrUtil.isEmpty(deviceType) ? "-1" : deviceType) , Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline); deviceDtoList.forEach( deviceDto -> deviceDto.setOnlineState(deviceDto.getOnlineState() == "0" ? "0" : "1") ); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java index 434a0ae..af59a7c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java @@ -31,15 +31,14 @@ @Resource private ITenantDeptService tenantDeptService; - @Resource - private AbstractTenantService abstractTenantService; /** * 获取组织绑定关系列表 */ @RequestMapping(value = "/list") @ResponseBody - public Object list(String condition) { + public Object list(String tenantName) { QueryWrapper query = new QueryWrapper<>(); + query.like("tenant_name",tenantName); List list = tenantDeptService.tenantList(query); return ResponseData.success(list); } @@ -49,9 +48,10 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { + public Object listPage(String tenantName) { Page page = PageFactory.defaultPage(); QueryWrapper query = new QueryWrapper<>(); + query.like("tenant_name",tenantName); page = tenantDeptService.page(page, query); return super.packForBT(page); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java index 5ecbc11..626303f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java @@ -12,7 +12,7 @@ @Mapper public interface DeptPermissionConfigDao extends BaseMapper { - List> getListPage(@Param("deptid") String deptid); + List> getListPage(@Param("deptid") Long deptid); Long getPid(); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml index 9c5ab69..606d817 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml @@ -14,7 +14,7 @@ SELECT id,deptid,communication,well_type AS "wellType",device_type AS "deviceType",area,map,lng,lat FROM config_dept_permission WHERE 1=1 - + AND DEPTID = #{deptid} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java index 3dde18e..5a0adf2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java @@ -33,7 +33,7 @@ public ResponseData deviceDeptPermissionList(String deptid) { ResponseData responseData = new ResponseData(); try { - List> deptList = this.baseMapper.getListPage(deptid); + List> deptList = this.baseMapper.getListPage(StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid)); this.supplementData(deptList); responseData.setMessage("查询成功"); responseData.setCode(200); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java index 715c5ef..6b56937 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java @@ -205,7 +205,9 @@ throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } SuccessResponseData resultData = new SuccessResponseData(); - resultData.setData(busWellInfoService.getById(id)); + BusWellInfo busWellInfo=busWellInfoService.getById(id); + busWellInfo.setBfztName(dictService.getDictNameByCode(BusWellConst.BFZT_TEMP, busWellInfo.getBfzt())); + resultData.setData(busWellInfo); return resultData; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java index 0d7c10d..1036b7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -7,11 +7,18 @@ @Data public class AlarmLevelParam { + private String deptId; + private String wellType; + private String lng; + private String lat; + private String tenantId; private String name; private String deviceType; private String openAlarm; private String openJob; + private String highValue; + private String lowValue; + private String level; //等级列表 - private List levelList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index e24fccd..44c994b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -111,11 +111,10 @@ alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); - alarmLevelParam.getLevelList().forEach( - alarmLevels -> { - alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); - this.save(alarmLevel); - } - ); + alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevelParam.getLevel()) ? "-1" : alarmLevelParam.getLevel())); + this.save(alarmLevel); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 4a35142..a480f26 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -18,7 +18,7 @@ List> deviceStaticsByType(); - List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") Long deviceType); List> deviceStaticsByRoad(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index c4ea3dd..6286a05 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -37,21 +37,21 @@ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 8b7767b..514448a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -57,7 +57,7 @@ LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID BD.VALID = '1' AND BDW.VALID='1' - + AND BD.DEVICE_TYPE = #{deviceType} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index 209b900..95110b4 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -69,7 +69,7 @@ @Override public List> deviceStaticsByDept(DataScope dataScope, String deviceType) { - List> mapList = statisticMapper.deviceStaticsByDept(dataScope, deviceType); + List> mapList = statisticMapper.deviceStaticsByDept(dataScope, StrUtil.isEmpty(deviceType)?-1:Long.valueOf(deviceType)); for (Map map : mapList) { map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString()))); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 3d7ae31..bf89d08 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -583,7 +583,7 @@ /** * 数据列表查询 */ - @GetMapping(value = "/data/list-page") + @GetMapping(value = "/data/list") public Object dataList(String wellCode, String watchType, String beginTime, String endTime) { if (StrUtil.isEmpty(watchType)) { return ResponseData.success("缺少监测类型参数，请重传"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index eb4ab56..393589c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -58,6 +58,11 @@ */ DeviceData lgLiquidData(@Param("devcode") String devcode); + + DeviceData tubeData(@Param("devcode") String devcode); + + DeviceData H2sData(@Param("devcode") String devcode); + BfztCountDataDto bfztCountData(@Param("deptIds") List deptIds, @Param("isApp") Boolean isApp); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 7f028c5..3be6c65 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -78,6 +78,7 @@ TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss') + ${paramStr} @@ -170,8 +171,8 @@ UPTIME AS logtime FROM data_gas WHERE DEVCODE = #{devcode} - ORDER BY UPTIME - DESC LIMIT 1 + ORDER BY UPTIME DESC + LIMIT 1 - + + + + SELECT devcode, - deviceType, - deviceTypeName, + "deviceType", + "deviceTypeName", deptid, - wellCode, + "wellCode", descn, cell, uptime, @@ -371,7 +389,7 @@ liquiddata FROM ( - ( + SELECT dl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -413,8 +431,8 @@ - ) UNION ALL - ( + UNION ALL + SELECT dgl.DEVCODE AS devcode, bd.DEVICE_TYPE AS "deviceType", @@ -456,7 +474,7 @@ - ) + ) t1 ORDER BY uptime asc @@ -558,10 +576,10 @@ @@ -663,7 +681,7 @@ parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page"> SELECT DEVCODE, - deviceType, + "deviceType", @@ -671,11 +689,11 @@ DESCN, STATUS, DEPTID, - wellCode, - wellId, - deviceId, + "wellCode", + "wellId", + "deviceId", VALID, - deviceTypeName + "deviceTypeName" FROM wellcover_monitorview @@ -1261,7 +1279,7 @@ - AS logtime,dh.DESCN AS descn + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1294,8 +1312,8 @@ SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH AS strength, - dh2s.CELL AS cell, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, @@ -1306,7 +1324,7 @@ AS logtime, bdt.TYPE_NAME AS "deviceTypeName", bd.device_type as deviceType, - bwi.DEPTID AS deptid + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE @@ -1329,8 +1347,9 @@ - AND (dh2s.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE ) + AND (dh2s.DEVCODE LIKE + + OR dh2s.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index bb28cfc..7cef8c4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -195,6 +195,24 @@ } deviceDataDtoList.add((DeviceDataDto) deviceDataDto.clone()); break; + case "管盯": + deviceData = this.baseMapper.tubeData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("燃气泄漏"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(devcode); + if (ObjectUtil.isNotEmpty(deviceData)) { + deviceDataDto.setTypeName("H2S浓度"); + deviceDataDto.setValue(deviceData.getData() + "%LEL"); + deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + deviceDataDtoList.add(deviceDataDto); + } + break; default://未知设备 log.info("未知设备！"); @@ -378,7 +396,6 @@ watchDataDto.setWatchType("井内水位"); watchDataDto.setType("10"); if (ObjectUtil.isNotEmpty(deviceData)) { - watchDataDto.setValue(deviceData.getData() + "m"); watchDataDto.setData(deviceData.getData() + "m"); watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -388,7 +405,28 @@ } watchDataDtos.add((WatchDataDto) watchDataDto.clone()); break; - + case "管盯": + deviceData = this.baseMapper.tubeData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("燃气泄漏"); + watchDataDto.setType("12"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; + case "硫化氢检测终端": + deviceData = this.baseMapper.H2sData(deviceInWellInfo.getDevcode()); + if (ObjectUtil.isNotEmpty(deviceData)) { + watchDataDto.setWatchType("H2S浓度"); + watchDataDto.setType("14"); + watchDataDto.setValue(deviceData.getData()+ "%LEL"); + watchDataDto.setData(deviceData.getData()+ "%LEL"); + watchDataDto.setLogtime(sdf.format(deviceData.getLogtime())); + watchDataDtos.add(watchDataDto); + } + break; default://未知设备 log.info("未知设备！"); break; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 4c1bc0b..ce81120 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.page.PageFactory; @@ -11,6 +12,7 @@ import com.casic.missiles.modular.system.dict.BusConfigDict; import com.casic.missiles.modular.system.dto.BusConfigDTO; import com.casic.missiles.modular.system.dto.DeviceTypeEnum; +import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -20,6 +22,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; /** @@ -30,7 +33,7 @@ */ @Controller @RequestMapping("/busConfig") -public class BusConfigController extends BaseController { +public class BusConfigController extends ExportController { @Qualifier("busConfigServiceImpl") @@ -143,7 +146,7 @@ /** - * 燃气获取配置列表 + * 管顶获取配置列表 */ @RequestMapping(value = "/tubeConfig/list") @ResponseBody @@ -382,7 +385,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -401,7 +411,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busMethaneConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busMethaneConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -420,7 +437,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTubeConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTubeConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -440,7 +464,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busWasteGasConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busWasteGasConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -460,7 +491,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busTempHumiConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busTempHumiConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -479,7 +517,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busDigConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busDigConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -498,7 +543,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busNoiseConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busNoiseConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } @@ -712,7 +764,14 @@ resultData.setMessage("上传失败，无法找到文件！"); return resultData; } - resultData = busGasLiquidConfigService.imp(uploadFile); + try { + List busConfigDTOList = this.importExcel(BusConfigDTO.class, uploadFile, null, null); + resultData = busGasLiquidConfigService.imp(busConfigDTOList); + } catch (Exception e) { + e.printStackTrace(); + resultData.setCode(400); + resultData.setMessage("导入失败"); + } return resultData; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 8b147d2..75c5be2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -1,22 +1,17 @@ package com.casic.missiles.modular.system.controller; -import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; -import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.service.IDeviceTypeService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.PathVariable; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import java.util.List; -import java.util.Map; import com.casic.missiles.core.page.PageFactory; import org.springframework.web.bind.annotation.RequestParam; @@ -34,10 +29,7 @@ private final IDeviceModelsService deviceModelsService; - private final IDeviceTypeService deviceTypeService; - - public DeviceModelsController(IDeviceTypeService deviceTypeService, IDeviceModelsService deviceModelsService) { - this.deviceTypeService = deviceTypeService; + public DeviceModelsController(IDeviceModelsService deviceModelsService) { this.deviceModelsService = deviceModelsService; } @@ -48,25 +40,9 @@ @ResponseBody public Object listPage(String deviceType, String communication) { Page page = PageFactory.defaultPage(); - QueryWrapper query = new QueryWrapper() - .like("MODEL_NAME", deviceType == null ? "" : deviceType) - .like("COMMUNICATION", communication == null ? "" : communication); - page = deviceModelsService.page(page, query); - Map dictMap = deviceModelsService.getDictNameByCode(); - page.getRecords().forEach( - deviceModels -> { - DeviceType deviceTypeModel = deviceTypeService.getById(deviceModels.getDeviceType()); - deviceModels.setDeviceTypeName(deviceTypeModel == null ? "" : deviceTypeModel.getTypeName()); - String[] d = deviceModels.getCommunication().split(","); - if (d.length > 0) { - deviceModels.setCommunNameGroup(dictMap.get(d[0])); - } - for (int i = 1; i < d.length; i++) { - deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); - } - } - ); - return new SuccessResponseData(super.packForBT(page)); + ResponseData responseData = deviceModelsService.getListPage(page,deviceType, communication); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 5178f9b..efad32d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,9 +20,9 @@ */ public interface DeviceMapper extends BaseMapper { - List getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List getDeviceList(@Param("scope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") Long deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline); List getDeviceListInfo(@Param("scope") DataScope dataScope); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java index 0f589db..ce44c35 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceModelsMapper.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.dao; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -23,5 +24,11 @@ List selectModelList(@Param("deviceType") Long deviceType); + List getListPage(@Param("page") Page page, + @Param("deviceType") Long deviceType, + @Param("communication") String communication); + Map getDictNameByCode(); + + List> getDeviceTypeList(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index abec443..ea76482 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -157,7 +157,7 @@ FROM device_view dv LEFT JOIN bus_device_status bds ON bds.DEVICE_ID=dv.ID WHERE VALID = '1' - + and deviceType = #{deviceType} @@ -240,7 +240,7 @@ - d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='1' THEN 1 ELSE 0 END AS "onlineState",t.TYPE_NAME AS "typeName" + d.ID AS "deviceId", DEVCODE AS devcode, INSTALL_DATE AS "installDate",CASE WHEN bds.ONLINE_STATE ='0' THEN 0 ELSE 1 END AS "onlineState",t.TYPE_NAME AS "typeName" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml index 4943869..6e6e554 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml @@ -50,4 +50,24 @@ GROUP BY pid + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 730d95b..988bcba 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -77,10 +77,10 @@ /** * 液位设备配置导入 * - * @param uploadFile 附件 + * @param busConfigDTOList 附件 * @return */ - SuccessResponseData imp(MultipartFile uploadFile); + SuccessResponseData imp(List busConfigDTOList); /** * 设备配置导出 diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java index 4bc79ba..b4c601b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceModelsService.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceModels; import com.baomidou.mybatisplus.extension.service.IService; @@ -34,5 +36,7 @@ DeviceModels selectDeviceTypeById(String id); + ResponseData getListPage(Page page,String deviceType, String communication); + Map getDictNameByCode(); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index 9e70f4b..a0a177d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -317,16 +317,14 @@ /** * 液位设备配置导入 * - * @param uploadFile 附件 + * @param busConfigDTOList 附件 * @return */ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); try { - - List busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { @@ -337,7 +335,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index 9d74002..f626ab7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -265,7 +265,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -278,19 +278,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - //TODO 导入项设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setSuccess(false); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index fb1048b..01154ff 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -252,7 +252,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -262,17 +262,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class,uploadFile,null,null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index e175ec7..53c0a1d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -251,7 +251,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList ) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -261,18 +261,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - try (InputStream in = uploadFile.getInputStream()) { - try { - //TODO 导入类设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - } Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 @@ -283,7 +272,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index ad81f03..046bf4e 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -248,7 +248,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -259,18 +259,6 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); - - try { - //导入文件头设置 - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setSuccess(false); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index c45f6ff..994e825 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -250,7 +250,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp( List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -261,17 +261,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - - try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); - } catch (Exception e) { - e.printStackTrace(); - resultData.setCode(400); - resultData.setMessage("导入失败"); - } - Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index e27af66..01ffe04 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -250,7 +250,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -260,9 +260,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); if ((Boolean) objectMap.get("success")) {//检验通过后写入 this.addBatchConfig(busConfigDTOList); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java index 7bf1aa9..1ea9554 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java @@ -237,7 +237,7 @@ @Transactional @Override - public SuccessResponseData imp(MultipartFile uploadFile) { + public SuccessResponseData imp(List busConfigDTOList) { SuccessResponseData resultData = new SuccessResponseData(); Map mapper = new HashMap<>(); mapper.put("设备编号", "devcode"); @@ -245,9 +245,7 @@ mapper.put("IP地址", "ip"); mapper.put("端口号", "port"); mapper.put("最大尝试次数", "attemptsMax"); - List busConfigDTOList = new ArrayList<>(); try { - busConfigDTOList = exportService.importExcel(BusConfigDTO.class, uploadFile, null, null); Map objectMap = this.validate(busConfigDTOList); //检验通过后写入 if ((Boolean) objectMap.get("success")) { @@ -258,7 +256,7 @@ resultData.setCode(400); resultData.setMessage(objectMap.get("msg").toString()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); resultData.setCode(400); resultData.setMessage("导入失败"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java index 34d9e6b..e4f137c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceModelsServiceImpl.java @@ -1,15 +1,23 @@ package com.casic.missiles.modular.system.service.impl; +import com.alibaba.excel.util.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.DeviceModelsMapper; import com.casic.missiles.modular.system.model.DeviceModels; +import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; +import lombok.extern.slf4j.Slf4j; +import org.apache.poi.util.StringUtil; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import java.io.Serializable; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -20,6 +28,7 @@ * @since 2019-05-23 */ @Service +@Slf4j public class DeviceModelsServiceImpl extends ServiceImpl implements IDeviceModelsService { @Override @@ -44,8 +53,40 @@ return this.baseMapper.selectById(id); } + public ResponseData getListPage(Page page, String deviceType, String communication) { + ResponseData responseData = new ResponseData(); + try { + List deviceModelsList = this.baseMapper.getListPage(page,StringUtils.isEmpty(deviceType)?-1:Long.valueOf(deviceType), communication); + Map dictMap = this.baseMapper.getDictNameByCode(); + List> deviceTypeList= this.baseMapper.getDeviceTypeList(); + Map deviceTypeMap = deviceTypeList.stream().collect( + Collectors.toMap(e -> String.valueOf(e.get("id")), e -> String.valueOf(e.get("typeName"))) + ); + deviceModelsList.forEach( + deviceModels -> { + deviceModels.setDeviceTypeName(String.valueOf(deviceTypeMap.get(String.valueOf(deviceModels.getDeviceType())))); + String[] d = deviceModels.getCommunication().split(","); + if (d.length > 0) { + deviceModels.setCommunNameGroup(dictMap.get(d[0])); + } + for (int i = 1; i < d.length; i++) { + deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i])); + } + } + ); + page.setRecords(deviceModelsList); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + } catch (DataAccessException dae) { + log.error("主题：查询异常，设备类型{},型号{},异常信息{}", deviceType, communication, dae.getMessage()); + responseData.setMessage(ResponseData.DEFAULT_ERROR_MESSAGE); + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + } + return responseData; + } + @Override - public Map getDictNameByCode() { + public Map getDictNameByCode() { return this.baseMapper.getDictNameByCode(); } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index b2c33d6..613d8a1 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -193,7 +193,7 @@ @Override public List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) { - List deviceDtoList = this.baseMapper.selectDataScopePage(dataScope, page, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline); + List deviceDtoList = this.baseMapper.selectDataScopePage(dataScope, page,Long.valueOf(StrUtil.isEmpty(deviceType) ? "-1" : deviceType) , Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline); deviceDtoList.forEach( deviceDto -> deviceDto.setOnlineState(deviceDto.getOnlineState() == "0" ? "0" : "1") ); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java index 434a0ae..af59a7c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java @@ -31,15 +31,14 @@ @Resource private ITenantDeptService tenantDeptService; - @Resource - private AbstractTenantService abstractTenantService; /** * 获取组织绑定关系列表 */ @RequestMapping(value = "/list") @ResponseBody - public Object list(String condition) { + public Object list(String tenantName) { QueryWrapper query = new QueryWrapper<>(); + query.like("tenant_name",tenantName); List list = tenantDeptService.tenantList(query); return ResponseData.success(list); } @@ -49,9 +48,10 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String condition) { + public Object listPage(String tenantName) { Page page = PageFactory.defaultPage(); QueryWrapper query = new QueryWrapper<>(); + query.like("tenant_name",tenantName); page = tenantDeptService.page(page, query); return super.packForBT(page); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java index 5ecbc11..626303f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java @@ -12,7 +12,7 @@ @Mapper public interface DeptPermissionConfigDao extends BaseMapper { - List> getListPage(@Param("deptid") String deptid); + List> getListPage(@Param("deptid") Long deptid); Long getPid(); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml index 9c5ab69..606d817 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml @@ -14,7 +14,7 @@ SELECT id,deptid,communication,well_type AS "wellType",device_type AS "deviceType",area,map,lng,lat FROM config_dept_permission WHERE 1=1 - + AND DEPTID = #{deptid} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java index 3dde18e..5a0adf2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java @@ -33,7 +33,7 @@ public ResponseData deviceDeptPermissionList(String deptid) { ResponseData responseData = new ResponseData(); try { - List> deptList = this.baseMapper.getListPage(deptid); + List> deptList = this.baseMapper.getListPage(StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid)); this.supplementData(deptList); responseData.setMessage("查询成功"); responseData.setCode(200); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java index 715c5ef..6b56937 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java @@ -205,7 +205,9 @@ throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } SuccessResponseData resultData = new SuccessResponseData(); - resultData.setData(busWellInfoService.getById(id)); + BusWellInfo busWellInfo=busWellInfoService.getById(id); + busWellInfo.setBfztName(dictService.getDictNameByCode(BusWellConst.BFZT_TEMP, busWellInfo.getBfzt())); + resultData.setData(busWellInfo); return resultData; } diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java index c355a58..ac2f2a0 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java @@ -161,13 +161,13 @@ } //其他相关性校验 -// String areaId = this.baseMapper.getAreaId(well.getQu(), well.getArea()); -// if (StrUtil.isNotEmpty(areaId)) { -// well.setArea(areaId); -// } else { -// list.add("第" + index[0] + "行，区与街道名不对应！"); -// break; -// } + String areaId = this.baseMapper.getAreaId(well.getQu(), well.getArea()); + if (StrUtil.isNotEmpty(areaId)) { + well.setArea(areaId); + } else { + list.add("第" + index[0] + "行，区与街道名不对应！"); + break; + } if (sluicewellTypeMap.containsKey(well.getWellType())) { well.setWellType(sluicewellTypeMap.get(well.getWellType()));