Merge branch 'master' of http://39.106.8.246:3003/persagy/dmp

dmp-alarm/src/main/java/com/persagy/dmp/alarm/jms/ConsumeMessageThreadPool.java

@@ -44,6 +44,7 @@ public class ConsumeMessageThreadPool {
                 // 手动确认消息已消费
                 channel.basicAck(msg.getMessageProperties().getDeliveryTag(), false);
             } catch (Exception e) {
+                log.error(e.getMessage(),e);
                 Boolean isRedeliveredFail = msg.getMessageProperties().getRedelivered();
                 // true表示消息已经重复处理失败
                 try {

dmp-alarm/src/main/java/com/persagy/dmp/alarm/jms/JmsConfig.java

@@ -37,18 +37,18 @@ public class JmsConfig {
     @Value("${persagy.dmp.alarm.queue}")
     private String alarmQueue;
 
-    @Value("${persagy.dmp.alarm.rwd.queue}")
-    private String alarmRwdQueue;
-
-    @Bean
-    public Queue alarmRwdQueue() {
-        return new Queue(alarmRwdQueue, true);
-    }
-
-    @Bean
-    public Binding alarmRwdBinding() {
-        return BindingBuilder.bind(alarmRwdQueue()).to(exchange()).with(rwdRoutingKey);
-    }
+//    @Value("${persagy.dmp.alarm.rwd.queue}")
+//    private String alarmRwdQueue;
+//
+//    @Bean
+//    public Queue alarmRwdQueue() {
+//        return new Queue(alarmRwdQueue, true);
+//    }
+//
+//    @Bean
+//    public Binding alarmRwdBinding() {
+//        return BindingBuilder.bind(alarmRwdQueue()).to(exchange()).with(rwdRoutingKey);
+//    }
 
     /**
      * 报警对象队列
@@ -109,8 +109,13 @@ public class JmsConfig {
         }
     }
 
-    @RabbitListener(queues = {"${persagy.dmp.alarm.queue}", "${persagy.dmp.alarm.rwd.queue}"})    //监听器监听指定的Queue
-    public void process(DmpMessage message, Channel channel, Message msg) {
+//    @RabbitListener(queues ="${persagy.dmp.alarm.rwd.queue}")    //监听器监听指定的Queue
+//    public void processRwdMsg(DmpMessage message, Channel channel, Message msg) {
+//        consumeMessageThreadPool.consumeMessage(message, channel, msg);
+//    }
+
+    @RabbitListener(queues = "${persagy.dmp.alarm.queue}")    //监听器监听指定的Queue
+    public void processAlarmMsg(DmpMessage message, Channel channel, Message msg) {
         consumeMessageThreadPool.consumeMessage(message, channel, msg);
     }
 }

dmp-rwd/src/main/java/com/persagy/dmp/rwd/service/ObjectInstanceCreateService.java

@@ -146,6 +146,10 @@ public class ObjectInstanceCreateService extends BaseService {
 					if (param.has(RwdConstants.OBJECT_VIRTUAL_INFO_CODES)) {
 						entity.setVirtualInfoCodes(getStringList(param, RwdConstants.OBJECT_VIRTUAL_INFO_CODES));
 					}
+					Integer valid = JacksonMapper.getInteger(param, RwdConstants.OBJECT_VALID);
+					if (RwdConstants.OBJECT_VALID_VALID.equals(valid)){
+						entity.setValid(RwdConstants.OBJECT_VALID_VALID);
+					}
 					entity.setUpdateTime(new Date());
 					entity.setUpdateUser(JacksonMapper.getString(param, RwdConstants.OBJECT_CREATE_USER));
 					entity.setUpdateApp(JacksonMapper.getString(param, RwdConstants.OBJECT_CREATE_APP, orgParam.appId));

dmp-rwd/src/main/java/com/persagy/dmp/rwd/service/ObjectInstanceUpdateService.java

@@ -174,6 +174,10 @@ public class ObjectInstanceUpdateService extends BaseService {
 		if (param.has(RwdConstants.OBJECT_VIRTUAL_INFO_CODES)) {
 			entity.setVirtualInfoCodes(getStringList(param, RwdConstants.OBJECT_VIRTUAL_INFO_CODES));
 		}
+		Integer valid = JacksonMapper.getInteger(param, RwdConstants.OBJECT_VALID);
+		if (RwdConstants.OBJECT_VALID_VALID.equals(valid)){
+			entity.setValid(RwdConstants.OBJECT_VALID_VALID);
+		}
 //			entityList.add(entity);
 		String classCode = entity.getClassCode();
 		// 已订阅的信息点