wulianwei 1 rok pred
rodič
commit
07ecb224a8

+ 4 - 5
src/main/java/com/tuoren/forward/config/amqp/AmqpClient1.java

@@ -180,17 +180,16 @@ public class AmqpClient1 {
             JSONObject items = json.getJSONObject("items");
             JSONObject localJson = null;
      
-            String hospitalCode = items.containsKey("userId") ? "" : items.getString("userId");
+            String hospitalCode = !items.containsKey("userId") ? "" : items.getString("userId");
             User owner = userMapper.selectByCode(hospitalCode);
     		if(owner == null) {
     			log.info("不存在该医院:"+hospitalCode);
     			return;
     		}
-    		
-            String ci = items.containsKey("ci") ? "" : items.getString("ci");
-            String lac = items.containsKey("lac") ? "" : items.getString("lac");
+            String ci = !items.containsKey("ci") ? "" : items.getString("ci");
+            String lac = !items.containsKey("lac") ? "" : items.getString("lac");
             if(!"".equals(ci) && !"".equals(lac)) {
-            	String mnc = items.containsKey("mnc") ? "00" : items.getString("mnc");
+            	String mnc = !items.containsKey("mnc") ? "00" : items.getString("mnc");
             	localJson = getLocation(mnc,lac,ci);
             	items.put("location", localJson);            	
             }

+ 4 - 4
src/main/java/com/tuoren/forward/config/amqp/AmqpClient2.java

@@ -180,7 +180,7 @@ public class AmqpClient2 {
             JSONObject items = json.getJSONObject("items");
             JSONObject localJson = null;
      
-            String hospitalCode = items.containsKey("userId") ? "" : items.getString("userId");
+            String hospitalCode = !items.containsKey("userId") ? "" : items.getString("userId");
             if(StringUtils.isEmpty(hospitalCode)) {
 //            	String sql = "SELECT h.code FROM bus_hospital h  inner join bus_device d on d.tenant_id = h.tenant_id where device_id=? limit 1";
 //             	try {
@@ -200,10 +200,10 @@ public class AmqpClient2 {
     			return;
     		}
             
-            String ci = items.containsKey("ci") ? "" : items.getString("ci");
-            String lac = items.containsKey("lac") ? "" : items.getString("lac");
+            String ci = !items.containsKey("ci") ? "" : items.getString("ci");
+            String lac = !items.containsKey("lac") ? "" : items.getString("lac");
             if(!"".equals(ci) && !"".equals(lac)) {
-            	String mnc = items.containsKey("mnc") ? "00" : items.getString("mnc");
+            	String mnc = !items.containsKey("mnc") ? "00" : items.getString("mnc");
             	localJson = getLocation(mnc,lac,ci);
             	items.put("location", localJson);            	
             }

+ 1 - 1
src/main/java/com/tuoren/forward/init/AmqpInit.java

@@ -26,7 +26,7 @@ public class AmqpInit implements ApplicationRunner,Ordered{
 		// TODO Auto-generated method stub
 		log.info("Amqp初始化>>>");
 		amqpClient1.connection();
-		amqpClient2.connection();
+		//amqpClient2.connection();
 	}
 
 	@Override