Commit 781cdc12 authored by zhoumaotao's avatar zhoumaotao

测试代码去掉

parent 57fd96e3
package com.gavel.kwell.service.impl; package com.gavel.kwell.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.gavel.common.base.entity.BaseEntity; import com.gavel.common.base.entity.BaseEntity;
import com.gavel.common.base.service.impl.BaseEditServiceImpl; import com.gavel.common.base.service.impl.BaseEditServiceImpl;
import com.gavel.common.utils.NumberUtils;
import com.gavel.common.utils.RedisConnection; import com.gavel.common.utils.RedisConnection;
import com.gavel.common.utils.StringUtils; import com.gavel.common.utils.StringUtils;
import com.gavel.kwell.dao.UpointDao; import com.gavel.kwell.dao.UpointDao;
...@@ -18,9 +20,8 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -18,9 +20,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList; import java.util.*;
import java.util.Date; import java.util.stream.Collectors;
import java.util.List;
@Service("upointService") @Service("upointService")
...@@ -75,7 +76,7 @@ public class UpointServiceImpl extends BaseEditServiceImpl implements UpointServ ...@@ -75,7 +76,7 @@ public class UpointServiceImpl extends BaseEditServiceImpl implements UpointServ
@Override @Override
public List<DataPointItem> queryringpoint() { public List<DataPointItem> queryringpoint() {
/* try { try {
List<Upoint> ponitList = upointDao.queryList(PointTypeEnum.RIGN.getId()); List<Upoint> ponitList = upointDao.queryList(PointTypeEnum.RIGN.getId());
if(ponitList==null || ponitList.size()==0){ if(ponitList==null || ponitList.size()==0){
logger.error("点位信息未配置,请检查!"); logger.error("点位信息未配置,请检查!");
...@@ -118,9 +119,9 @@ public class UpointServiceImpl extends BaseEditServiceImpl implements UpointServ ...@@ -118,9 +119,9 @@ public class UpointServiceImpl extends BaseEditServiceImpl implements UpointServ
} catch (Exception e) { } catch (Exception e) {
logger.error("数据点采集出错!", e); logger.error("数据点采集出错!", e);
} }
return Collections.EMPTY_LIST;*/ return Collections.EMPTY_LIST;
List<DataPointItem> dataPointItems = new ArrayList<DataPointItem>(); /* List<DataPointItem> dataPointItems = new ArrayList<DataPointItem>();
dataPointItems.add(new DataPointItem("R1",new Date().getTime(),1,"R1",0)); dataPointItems.add(new DataPointItem("R1",new Date().getTime(),1,"R1",0));
dataPointItems.add(new DataPointItem("R2",new Date().getTime(),1,"R2",0)); dataPointItems.add(new DataPointItem("R2",new Date().getTime(),1,"R2",0));
dataPointItems.add(new DataPointItem("R3",new Date().getTime(),1,"R3",0)); dataPointItems.add(new DataPointItem("R3",new Date().getTime(),1,"R3",0));
...@@ -129,7 +130,7 @@ public class UpointServiceImpl extends BaseEditServiceImpl implements UpointServ ...@@ -129,7 +130,7 @@ public class UpointServiceImpl extends BaseEditServiceImpl implements UpointServ
dataPointItems.add(new DataPointItem("R6",new Date().getTime(),1,"R6",1)); dataPointItems.add(new DataPointItem("R6",new Date().getTime(),1,"R6",1));
dataPointItems.add(new DataPointItem("R7",new Date().getTime(),1,"R7",-1)); dataPointItems.add(new DataPointItem("R7",new Date().getTime(),1,"R7",-1));
dataPointItems.add(new DataPointItem("R8",new Date().getTime(),1,"R8",-1)); dataPointItems.add(new DataPointItem("R8",new Date().getTime(),1,"R8",-1));
return dataPointItems; return dataPointItems;*/
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment