定时任务多设备检测；

src/main/java/com/unissoft/interaction/controller/DataController.java

@@ -55,7 +55,7 @@ public class DataController {
         teData.setEtime(new Date());
         //根据唯一的taskId(仓房id+自然增长id)获取仓房id
         String houseId = teData.getTaskID().split(",")[0];	
-        OrgInfo orgInfoHouse = orgInfoService.getById(Integer.parseInt(houseId));
+        OrgInfo orgInfoHouse = orgInfoService.getById(Long.parseLong(houseId));
         
         
         int inum = teDataService.saveTeData(teData); //打点数据返回

src/main/java/com/unissoft/interaction/service/impl/SquareServiceImpl.java

@@ -84,7 +84,7 @@ public class SquareServiceImpl implements SquareService {
 
     	//根据仓房id 获取设备编号
   		QueryWrapper<HardwareParameter> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("house_id", Integer.parseInt(cfId));
+        queryWrapper.eq("house_id", Long.parseLong(cfId));
         List<HardwareParameter> hardList = hardwareParameterMapper.selectList(queryWrapper);
         if(hardList.size()>0){
         	STask task = new STask();
@@ -136,11 +136,11 @@ public class SquareServiceImpl implements SquareService {
         	
         	//查询设备的ip和端口
             QueryWrapper<HardwareParameter> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("house_id", Integer.parseInt(houseId));
+            queryWrapper.eq("house_id", Long.parseLong(houseId));
             List<HardwareParameter> hardList = hardwareParameterMapper.selectList(queryWrapper);
             
             if(hardList.size()>0){
-            	OrgInfo orgInfoHouse = orgInfoMapper.selectById(Integer.parseInt(houseId));//--------------------待完
+            	OrgInfo orgInfoHouse = orgInfoMapper.selectById(Long.parseLong(houseId));//--------------------待完
             	
             	/*double houseWideOn = 0;
                 double houseWideUnder = 0;
@@ -245,7 +245,7 @@ public class SquareServiceImpl implements SquareService {
         
         //根据仓房id查询其信息
     	String houseId = taskID.split(",")[0];//仓房id
-    	OrgInfo orgInfoHouse = orgInfoMapper.selectById(Integer.parseInt(houseId));//--------------------
+    	OrgInfo orgInfoHouse = orgInfoMapper.selectById(Long.parseLong(houseId));//--------------------
     	
     	/*double houseWideOn = 0;
         double houseWideUnder = 0;
@@ -280,7 +280,7 @@ public class SquareServiceImpl implements SquareService {
     	
     	String houseId = taskId.split(",")[0];//仓房id
         //获取仓房信息
-    	OrgInfo orgInfoHouse = orgInfoMapper.selectById(Integer.parseInt(houseId));
+    	OrgInfo orgInfoHouse = orgInfoMapper.selectById(Long.parseLong(houseId));
 		String high = orgInfoHouse.getHigh();//高
 		Double h = Double.parseDouble(high);
 		double houseWideOn = orgInfoHouse.getHouseWideOn().doubleValue();

src/main/java/com/unissoft/interaction/service/impl/TeDataServiceImpl.java

@@ -33,10 +33,7 @@ import org.springframework.web.client.RestTemplate;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 import javax.annotation.Resource;
 
@@ -46,7 +43,8 @@ public class TeDataServiceImpl implements TeDataService {
     private static final Logger logger = LoggerFactory.getLogger(TeDataServiceImpl.class);
 
     //static String base_url = "http://192.168.0.61:4017/";
-    static boolean flag = true;
+    private static HashMap<String, Object> flag=new HashMap<>() ;
+//    static boolean flag = true;
     static double h1 = 6; //h1 圆锥的高
     static double h2 = 3; //h2 水平地面到圆锥尖的高
     private STaskMapper sTaskMapper;
@@ -113,7 +111,7 @@ public class TeDataServiceImpl implements TeDataService {
 
         postHelper(teData,base_url);
         //equipmentTestingEnd
-        flag = true;
+//        flag = true;
 
     }
     
@@ -126,7 +124,7 @@ public class TeDataServiceImpl implements TeDataService {
 		// TODO Auto-generated method stub
 		//根据仓房id 获取设备编号
 		QueryWrapper<HardwareParameter> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("house_id", Integer.parseInt(cfId));
+        queryWrapper.eq("house_id", Long.parseLong(cfId));
         List<HardwareParameter> hardList = hardwareParameterMapper.selectList(queryWrapper);
         if(hardList.size()>0){
         	logger.info("圆筒{}仓第一次打点的直径和高: {},{}",cfId ,diameter,h);
@@ -150,8 +148,8 @@ public class TeDataServiceImpl implements TeDataService {
             
             //发送给硬件
             postHelper(teData,base_url);
-           
-            flag = true;
+
+//            flag = true;
             
         }
 	}
@@ -170,7 +168,7 @@ public class TeDataServiceImpl implements TeDataService {
             e.printStackTrace();
         }
         //只运行 发送一次。
-        if (flag) {
+
            
             // 第二次待打点
 
@@ -184,41 +182,41 @@ public class TeDataServiceImpl implements TeDataService {
             
             //查询设备的ip和端口
             QueryWrapper<HardwareParameter> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("house_id", Integer.parseInt(houseId));
+            queryWrapper.eq("house_id", Long.parseLong(houseId));
             List<HardwareParameter> hardList = hardwareParameterMapper.selectList(queryWrapper);
-            
-            if(hardList.size()>0){
+        //判断是否已经进行过第二次打点，如果有设备信息，且设备flag中无此设备，即进行第二次打点；
+        if(hardList.size()>0&& !flag.containsKey(hardList.get(0).getIpAdress()) ){
             	
-            	OrgInfo orgInfoHouse = orgInfoMapper.selectById(Integer.parseInt(houseId));
-            	String high = orgInfoHouse.getHigh();//仓房的高
-        		String radius = orgInfoHouse.getRadius();//仓房的半径
-        		Double diameter = Double.parseDouble(radius)*2;//直径
-        		Double h = Double.parseDouble(high);
-        		
-        		List<Double> zList = CylinderAlg.getValidZ(teData.getRotationxy(), diameter, h);
-        		double z = Collections.max(zList);//纵坐标的最大值
-        		double z1 = Collections.min(zList);//纵坐标的最小值
-        		//第二次打点的高
-        		//double secondH = h - z;//仓房的高-点的纵坐标
-        		double secondH = z;
-                logger.info("z {} ，z1 {},diameter {}，secondH {}",z,z1,diameter,secondH);
-
-                //打点
-                String rotationxy = CylinderAlg.getAveragePosition1(diameter, secondH);
-                teData.setRotationxy(rotationxy);
-                teData.setStime(new Date());//第二次开始的时间
-                
-            	//IP地址
-                String base_url = "http://"+hardList.get(0).getIpAdress()+":"+hardList.get(0).getPort()+"/";
-                
-            	//发送给硬件打点数据
-                postHelper(teData,base_url);
-
-                flag = false;
-            }
-            
-            
-        } else { 
+            OrgInfo orgInfoHouse = orgInfoMapper.selectById(Long.parseLong(houseId));
+            String high = orgInfoHouse.getHigh();//仓房的高
+            String radius = orgInfoHouse.getRadius();//仓房的半径
+            Double diameter = Double.parseDouble(radius)*2;//直径
+            Double h = Double.parseDouble(high);
+
+            List<Double> zList = CylinderAlg.getValidZ(teData.getRotationxy(), diameter, h);
+            double z = Collections.max(zList);//纵坐标的最大值
+            double z1 = Collections.min(zList);//纵坐标的最小值
+            //第二次打点的高
+            //double secondH = h - z;//仓房的高-点的纵坐标
+            double secondH = z;
+            logger.info("z {} ，z1 {},diameter {}，secondH {}",z,z1,diameter,secondH);
+
+            //打点
+            String rotationxy = CylinderAlg.getAveragePosition1(diameter, secondH);
+            teData.setRotationxy(rotationxy);
+            teData.setStime(new Date());//第二次开始的时间
+
+            //IP地址
+            String base_url = "http://"+hardList.get(0).getIpAdress()+":"+hardList.get(0).getPort()+"/";
+
+            //发送给硬件打点数据
+            postHelper(teData,base_url);
+            //已打点设备信息
+            flag.put(hardList.get(0).getIpAdress(),"");
+//           flag = false;
+
+        } else {
+            flag.remove(hardList.get(0).getIpAdress());
         	//打点两次完毕 计算体积
         	 logger.info("计算体积。。。。");
             double v = this.calculateVolume(teData.getTaskID());//两次数据
@@ -277,7 +275,7 @@ public class TeDataServiceImpl implements TeDataService {
         	
         	//获取直径
         	String houseId = taskID.split(",")[0];//仓房id
-        	OrgInfo orgInfoHouse = orgInfoMapper.selectById(Integer.parseInt(houseId));
+        	OrgInfo orgInfoHouse = orgInfoMapper.selectById(Long.parseLong(houseId));
     		String radius = orgInfoHouse.getRadius();//仓房的半径
     		Double diameter = Double.parseDouble(radius)*2;//直径
     		String high = orgInfoHouse.getHigh();//高
@@ -313,7 +311,7 @@ public class TeDataServiceImpl implements TeDataService {
         	String rotationxy = teDataList.get(0).getRotationxy();
         	//获取直径
         	String houseId = taskID.split(",")[0];//仓房id
-        	OrgInfo orgInfoHouse = orgInfoMapper.selectById(Integer.parseInt(houseId));
+        	OrgInfo orgInfoHouse = orgInfoMapper.selectById(Long.parseLong(houseId));
     		String radius = orgInfoHouse.getRadius();//仓房的半径
     		Double diameter = Double.parseDouble(radius)*2;//直径
     		String high = orgInfoHouse.getHigh();//高
@@ -366,7 +364,7 @@ public class TeDataServiceImpl implements TeDataService {
         
         
         //获取仓房信息
-    	OrgInfo orgInfoHouse = orgInfoMapper.selectById(Integer.parseInt(houseId));
+    	OrgInfo orgInfoHouse = orgInfoMapper.selectById(Long.parseLong(houseId));
     	
     	//获取其库名称
     	OrgInfo orgInfo = orgInfoMapper.selectById(orgInfoHouse.getParentId());
@@ -411,7 +409,7 @@ public class TeDataServiceImpl implements TeDataService {
     	
     	String houseId = taskId.split(",")[0];//仓房id
         //获取仓房信息
-    	OrgInfo orgInfoHouse = orgInfoMapper.selectById(Integer.parseInt(houseId));
+    	OrgInfo orgInfoHouse = orgInfoMapper.selectById(Long.parseLong(houseId));
 		String radius = orgInfoHouse.getRadius();//仓房的半径
 		Double diameter = Double.parseDouble(radius)*2;//直径
 		String high = orgInfoHouse.getHigh();//高
@@ -491,7 +489,7 @@ public class TeDataServiceImpl implements TeDataService {
 		// TODO Auto-generated method stub
 		//根据仓房id 获取设备编号
 				QueryWrapper<HardwareParameter> queryWrapper = new QueryWrapper<>();
-		        queryWrapper.eq("house_id", Integer.parseInt(cfId));
+		        queryWrapper.eq("house_id", Long.parseLong(cfId));
 		        List<HardwareParameter> hardList = hardwareParameterMapper.selectList(queryWrapper);
 		        StringBuffer sb = new StringBuffer();
 		        if(hardList.size()>0){

src/main/java/com/unissoft/mqConsumer/Consumer.java

@@ -33,7 +33,7 @@ public class Consumer {
     private final static String topicCloud="TOPIC_CLOUD";
 
 
-   /* @Component
+    @Component
     @RocketMQMessageListener(topic = topicLocal,consumerGroup = "local")
     public class HPSave implements RocketMQListener<String>{
         @Override
@@ -82,6 +82,6 @@ public class Consumer {
                     log.info("没有可用的业务类型！！{}",message);
             }
         }
-    }*/
+    }
 
 }

src/main/java/com/unissoft/mqProducer/Producer.java

@@ -32,8 +32,8 @@ public class Producer {
     //云端topic，云端使用
     private final String topicCloud="TOPIC_CLOUD";
 
-//    @Autowired
-//    private RocketMQTemplate rocketMQTemplate;
+    @Autowired
+    private RocketMQTemplate rocketMQTemplate;
 
     /**
      *
@@ -41,12 +41,12 @@ public class Producer {
      * @param type  消息属性
      */
     public void send(Object body, MessageEnum type, ServiceEnum ser){
-        Map<String, Object> map = new HashMap<>();
-        map.put("type",type);
-        map.put("service",ser);
-        /*org.springframework.messaging.Message<Object> message = MessageBuilder.createMessage(body, new MessageHeaders(map));
-        rocketMQTemplate.convertAndSend(topicCloud,message);
-        log.info("发送消息：{}",message);*/
+//        Map<String, Object> map = new HashMap<>();
+//        map.put("type",type);
+//        map.put("service",ser);
+//        org.springframework.messaging.Message<Object> message = MessageBuilder.createMessage(body, new MessageHeaders(map));
+//        rocketMQTemplate.convertAndSend(topicCloud,message);
+//        log.info("发送消息：{}",message);
     }
 
     /**

src/main/java/com/unissoft/parameter/service/impl/HardwareParameterServiceImpl.java

@@ -46,7 +46,7 @@ public class HardwareParameterServiceImpl extends ServiceImpl<HardwareParameterM
         if (!StringUtils.isEmpty(condition)) {
         	com.alibaba.fastjson.JSONObject jsStr = JSON.parseObject(condition);
     		String deviceName = jsStr.getString("deviceName");//设备名称
-    		Integer houseId = jsStr.getInteger("houseId");
+    		Long houseId = jsStr.getLong("houseId");
     		if(!StringUtils.isEmpty(houseId.toString())){
     			ew.eq("house_id", houseId);
     		}