动态获取ip

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

@@ -32,7 +32,7 @@ public class SquareServiceImpl implements SquareService {
 
     private static final Logger logger = LoggerFactory.getLogger(SquareServiceImpl.class);
 
-    static String base_url = "http://192.168.0.61:4017/";
+    //static String base_url = "http://192.168.0.61:4017/";
     static boolean flag = true;
     /*static double houseWideOn;
     static double houseWideUnder;
@@ -96,8 +96,11 @@ public class SquareServiceImpl implements SquareService {
             teData.setRotationxy(rotationxy);
             logger.info("第一次打点数据{}",teData);
 
+            //ip地址
+            String base_url = "http://"+hardList.get(0).getIpAdress()+":"+hardList.get(0).getPort()+"/";
+            
             //发送给硬件
-            postHelper(teData);
+            postHelper(teData,base_url);
             //第一次打点标识
             flag = true;
         }else{
@@ -123,31 +126,43 @@ public class SquareServiceImpl implements SquareService {
             //根据仓房id查询其信息
         	String taskId = teData.getTaskID();
         	String houseId = taskId.split(",")[0];//仓房id
-        	OrgInfo orgInfoHouse = orgInfoMapper.selectById(Integer.parseInt(houseId));//--------------------待完
         	
-        	double houseWideOn = 0;
-            double houseWideUnder = 0;
-            double houseLengthLeft = 0;
-            double houseLengthRight = 0;
-            double houseHight = 0;
-            
-            
-        	//计算以粮面为基准面的高
-            List<Double> zlist = SquareAlg.zHeight(teData.getRotationxy(),houseWideOn,houseWideUnder,houseLengthLeft,houseLengthRight,houseHight);
-            double zHeight = Collections.max(zlist);//纵坐标的最大值
-            double secondH = houseHight - zHeight;//仓房的高-点的纵坐标
-            logger.info("以粮面为基准面的高secondH {}",secondH);
-
-            //打点
-            String rotationxy = SquareAlg.getAveragePosition(houseWideOn,houseWideUnder,houseLengthLeft,houseLengthRight, secondH);
-            teData.setRotationxy(rotationxy);
-            teData.setStime(new Date());//第二次开始的时间
+        	//查询设备的ip和端口
+            QueryWrapper<HardwareParameter> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("house_id", Integer.parseInt(houseId));
+            List<HardwareParameter> hardList = hardwareParameterMapper.selectList(queryWrapper);
             
-            //发送给硬件
-            postHelper(teData);
-
-            //打点次数的标识
-            flag = false;
+            if(hardList.size()>0){
+            	OrgInfo orgInfoHouse = orgInfoMapper.selectById(Integer.parseInt(houseId));//--------------------待完
+            	
+            	double houseWideOn = 0;
+                double houseWideUnder = 0;
+                double houseLengthLeft = 0;
+                double houseLengthRight = 0;
+                double houseHight = 0;
+                
+                
+            	//计算以粮面为基准面的高
+                List<Double> zlist = SquareAlg.zHeight(teData.getRotationxy(),houseWideOn,houseWideUnder,houseLengthLeft,houseLengthRight,houseHight);
+                double zHeight = Collections.max(zlist);//纵坐标的最大值
+                double secondH = houseHight - zHeight;//仓房的高-点的纵坐标
+                logger.info("以粮面为基准面的高secondH {}",secondH);
+
+                //打点
+                String rotationxy = SquareAlg.getAveragePosition(houseWideOn,houseWideUnder,houseLengthLeft,houseLengthRight, 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 { 
         	//打点两次完毕 计算体积
             double v = this.calculateVolume(teData.getTaskID());
@@ -165,7 +180,7 @@ public class SquareServiceImpl implements SquareService {
         return teDataMapper.insert(teData);
     }
 
-    public ReMsg postHelper(TeData teData) {
+    public ReMsg postHelper(TeData teData,String base_url) {
 
         logger.info("in ...... postHelper teData{}",teData);
 

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

@@ -39,7 +39,7 @@ 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 String base_url = "http://192.168.0.61:4017/";
     static boolean flag = true;
     static double h1 = 6; //h1 圆锥的高
     static double h2 = 3; //h2 水平地面到圆锥尖的高
@@ -81,6 +81,7 @@ public class TeDataServiceImpl implements TeDataService {
      */
     @Override
     public void scanTask(double diameter, double high) {
+    	String base_url = "http://192.168.0.61:4017/";
         logger.info("圆筒仓第一次打点的直径和高: {},{}",diameter,high);
         STask task = new STask();
         Date date = new Date();
@@ -100,7 +101,7 @@ public class TeDataServiceImpl implements TeDataService {
 
         logger.info("scanTask sTaskMapper teDataMapper {},{}",task,teData);
 
-        postHelper(teData);
+        postHelper(teData,base_url);
         //equipmentTestingEnd
         flag = true;
 
@@ -129,6 +130,8 @@ public class TeDataServiceImpl implements TeDataService {
             teData.setEquipmentID(hardList.get(0).getDeviceCode());//设备id
             teData.setTaskID(cfId+","+ task.getId());//拼接一个仓房id
             teData.setStime(date);
+            //IP地址
+            String base_url = "http://"+hardList.get(0).getIpAdress()+":"+hardList.get(0).getPort()+"/";
 
             // 第一次待打点
             String rotationxy = CylinderAlg.getAveragePosition(diameter, h);
@@ -136,7 +139,7 @@ public class TeDataServiceImpl implements TeDataService {
             logger.info("第一次打点的数据{}",teData);
             
             //发送给硬件
-            postHelper(teData);
+            postHelper(teData,base_url);
            
             flag = true;
             
@@ -168,29 +171,43 @@ public class TeDataServiceImpl implements TeDataService {
         	
         	String taskId = teData.getTaskID();
         	String houseId = taskId.split(",")[0];//仓房id
-        	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);
-    		
-            //double zHeight = CylinderAlg.zHeight(teData.getRotationxy(), diameter, h);
             
-    		List<Double> zList = CylinderAlg.getValidZ(teData.getRotationxy(), diameter, h);
-    		double z = Collections.max(zList);//纵坐标的最大值
-    		//第二次打点的高
-    		double secondH = h - z;//仓房的高-点的纵坐标
-            logger.info("z {} ，diameter {}，secondH {}",z,diameter,secondH);
-
-            //打点
-            String rotationxy = CylinderAlg.getAveragePosition(diameter, secondH);
-            teData.setRotationxy(rotationxy);
-            teData.setStime(new Date());//第二次开始的时间
+            //查询设备的ip和端口
+            QueryWrapper<HardwareParameter> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("house_id", Integer.parseInt(houseId));
+            List<HardwareParameter> hardList = hardwareParameterMapper.selectList(queryWrapper);
+            
+            if(hardList.size()>0){
+            	
+            	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);
+        		
+                //double zHeight = CylinderAlg.zHeight(teData.getRotationxy(), diameter, h);
+                
+        		List<Double> zList = CylinderAlg.getValidZ(teData.getRotationxy(), diameter, h);
+        		double z = Collections.max(zList);//纵坐标的最大值
+        		//第二次打点的高
+        		double secondH = h - z;//仓房的高-点的纵坐标
+                logger.info("z {} ，diameter {}，secondH {}",z,diameter,secondH);
+
+                //打点
+                String rotationxy = CylinderAlg.getAveragePosition(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;
+            }
+            
             
-            //发送给硬件打点数据
-            postHelper(teData);
-
-            flag = false;
         } else { 
         	//打点两次完毕 计算体积
             double v = this.calculateVolume(teData.getTaskID());
@@ -207,7 +224,7 @@ public class TeDataServiceImpl implements TeDataService {
         return teDataMapper.insert(teData);
     }
 
-    public ReMsg postHelper(TeData teData) {
+    public ReMsg postHelper(TeData teData,String base_url) {
 
         logger.info("in ...... postHelper teData{}",teData);
 
@@ -391,7 +408,7 @@ public class TeDataServiceImpl implements TeDataService {
     	JSONArray jsonArray=JSONArray.parseArray(xyz);
     	for(int i=0;i<jsonArray.size();i++){
 		    double z = Double.parseDouble(jsonArray.get(i).toString().split(",")[2].split("]")[0])/1000;//单位转化为米
-		    System.out.println(z);
+		    //System.out.println(z);
 		}
     	
 	}