|
@@ -167,13 +167,16 @@ public class HookupServiceImpl extends AbstractCrudService<HookupMapper, Hookup>
|
|
public List<HookupComponentCompleteVo> getHookupComponentComplete(Integer siteId) {
|
|
public List<HookupComponentCompleteVo> getHookupComponentComplete(Integer siteId) {
|
|
List<DeviceTypeVo> deviceTypeVo = baseMapper.getDevidetype(siteId);
|
|
List<DeviceTypeVo> deviceTypeVo = baseMapper.getDevidetype(siteId);
|
|
List<RtAnalogDataOneVo> variable_vaue = null;
|
|
List<RtAnalogDataOneVo> variable_vaue = null;
|
|
- if (deviceTypeVo.get(0).getDeviceType() == 3) {
|
|
|
|
- variable_vaue = baseMapper.getVariable171(siteId);
|
|
|
|
- } else if (deviceTypeVo.get(0).getDeviceType() == 4) {
|
|
|
|
- variable_vaue = baseMapper.getVariable173(siteId);
|
|
|
|
- } else {
|
|
|
|
- variable_vaue = baseMapper.getVariable(siteId);
|
|
|
|
|
|
+ if (deviceTypeVo.size()>0){
|
|
|
|
+ if (deviceTypeVo.get(0).getDeviceType() == 3) {
|
|
|
|
+ variable_vaue = baseMapper.getVariable171(siteId);
|
|
|
|
+ } else if (deviceTypeVo.get(0).getDeviceType() == 4) {
|
|
|
|
+ variable_vaue = baseMapper.getVariable173(siteId);
|
|
|
|
+ } else {
|
|
|
|
+ variable_vaue = baseMapper.getVariable(siteId);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
+
|
|
List<HookupComponentCompleteTowVo> hookupComponentComplete = baseMapper.getHookupComponentComplete(siteId);
|
|
List<HookupComponentCompleteTowVo> hookupComponentComplete = baseMapper.getHookupComponentComplete(siteId);
|
|
List<HookupComponentCompleteVo> hookupComponentCompleteVoLsit = new ArrayList<HookupComponentCompleteVo>();
|
|
List<HookupComponentCompleteVo> hookupComponentCompleteVoLsit = new ArrayList<HookupComponentCompleteVo>();
|
|
if (hookupComponentComplete.size() > 0) {
|
|
if (hookupComponentComplete.size() > 0) {
|