wulianwei пре 1 година
родитељ
комит
d9c85e9366

+ 7 - 20
src/main/java/com/tuoren/forward/config/amqp/AmqpClient1.java

@@ -181,20 +181,12 @@ public class AmqpClient1 {
             JSONObject localJson = null;
      
             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 {
-//             		hospitalCode = nbJdbcTemplate.queryForObject(sql, String.class, deviceName);
-//             	}catch (Exception e) {
-//     				// TODO: handle exception
-//     			}
-            	hospitalCode = remoteUtil.getHospitalCode(deviceName);
-            	if(StringUtils.isEmpty(hospitalCode)) {
-  				  log.info("设备没有对应医院:"+deviceName);
-  				  return;
-  			    }
-            }
-            
+            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");
             if(!"".equals(ci) && !"".equals(lac)) {
@@ -202,12 +194,7 @@ public class AmqpClient1 {
             	localJson = getLocation(mnc,lac,ci);
             	items.put("location", localJson);            	
             }
-            
-            User owner = userMapper.selectByCode(hospitalCode);
-    		if(owner == null) {
-    			log.info("不存在该医院:"+hospitalCode);
-    			return;
-    		}
+        
     		JSONObject mongoJson = new JSONObject();
     		Device exist = deviceMapper.selectByMac(deviceName);
     		if(exist == null) {

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

@@ -194,6 +194,11 @@ public class AmqpClient2 {
   				  return;
   			    }
             }
+            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");
@@ -203,11 +208,7 @@ public class AmqpClient2 {
             	items.put("location", localJson);            	
             }
             
-            User owner = userMapper.selectByCode(hospitalCode);
-    		if(owner == null) {
-    			log.info("不存在该医院:"+hospitalCode);
-    			return;
-    		}
+            
     		JSONObject mongoJson = new JSONObject();
     		Device exist = deviceMapper.selectByMac(deviceName);
     		if(exist == null) {

+ 2 - 2
src/main/resources/application.yml

@@ -2,7 +2,7 @@ server:
   port: 8585
 spring:
   profiles:
-      active: dev
+      active: prod
   application:
     name: forward
   jackson:
@@ -64,7 +64,7 @@ spring:
         pool-name: HikariCP
   flyway:
     #是否启用
-    enabled: true
+    enabled: false
     # flyway 的 clean 命令会删除指定 schema 下的所有 table, 生产务必禁掉
     clean-disabled: true
     locations: classpath:db/migration