修改人员

dmp-org/src/main/java/com/persagy/dmp/org/controller/InitController.java

@@ -14,9 +14,9 @@ public class InitController {
     @Autowired
     private InitService initService;
 
-    @GetMapping("/group")
+//    @GetMapping("/group")
-    public MapResponse initGroup() {
+//    public MapResponse initGroup() {
-        return initService.initGroup();
+//        return initService.initGroup();
-    }
+//    }
 
 }

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

@@ -1,6 +1,8 @@
 package com.persagy.dmp.org.jms;
 
 import com.persagy.common.json.JacksonMapper;
+import com.persagy.dmp.org.constant.OrgConstants;
+import com.persagy.dmp.org.service.GroupService;
 import com.persagy.dmp.rwd.model.DmpMessage;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Binding;
@@ -34,6 +36,9 @@ public class JmsConfig {
 	@Autowired
 	private MessageProcesser messageProcesser;
 
+	@Autowired
+	private GroupService groupService;
+
 	@Bean
 	public TopicExchange exchange() {
 		return new TopicExchange(exchange);
@@ -45,13 +50,17 @@ public class JmsConfig {
 	}
 
 	@Bean
-	public Binding alarmBinding() {
+	public Binding orgBinding() {
 		return BindingBuilder.bind(queue()).to(exchange()).with(orgRoutingKey);
 	}
 
 	@RabbitListener(queues = "${persagy.dmp.org.queue}")    //监听器监听指定的Queue
 	public void processC(DmpMessage message) {
 		log.info("============================== Receive {}: {}", orgQueue, JacksonMapper.toSimpleJson(message));
+		// TODO 创建表
+		if (OrgConstants.MESSAGE_GROUP_CREATE.equals(message.getType())){
+			groupService.initGroupData(message);
+		}
 		messageProcesser.listen(message);
 	}
 

dmp-org/src/main/java/com/persagy/dmp/org/service/GroupService.java

@@ -79,30 +79,34 @@ public class GroupService extends OrgBaseService {
 		entity.setCreateTime(new Date());
 		groupRepository.save(entity);
 
-		initService.initGroup();
+		response.add("id", entity.getId());
+
+		DmpMessage msg = new DmpMessage(OrgConstants.MESSAGE_GROUP_CREATE, entity.getId());
+		msg.setGroupCode(entity.getCode());
+		msg.setStr1(entity.getName());
+		response.add(msg);
+
+		return response;
+	}
+
+	public void initGroupData(DmpMessage msg){
+
+		String groupCode = msg.getGroupCode();
+		initService.initGroup(groupCode);
 
-		// TODO 创建集团时自动创建顶级公司
 		Company company = new Company();
 
 		company.setId(OrgUtils.getUUID());
-		company.setGroupCode(entity.getCode());
+		company.setGroupCode(msg.getGroupCode());
-		company.setCode(entity.getCode());
+		company.setCode(msg.getGroupCode());
-		company.setName(entity.getName());
+		company.setName(msg.getStr1());
 		company.setParentId("0");
 		company.setStatus(1);
-		company.setCreateUser(orgParam.userId);
+		company.setCreateUser(msg.getUserId());
 		company.setCreateTime(new Date());
 
 		companyRepository.save(company);
 
-		response.add("id", entity.getId());
-
-		DmpMessage msg = new DmpMessage(OrgConstants.MESSAGE_GROUP_CREATE, entity.getId());
-		msg.setGroupCode(entity.getCode());
-		msg.setStr1(entity.getName());
-		response.add(msg);
-
-		return response;
 	}
 
 	@Transactional

dmp-org/src/main/java/com/persagy/dmp/org/service/InitService.java

@@ -20,9 +20,8 @@ public class InitService {
     private DataSource dataSource;
 
     @Transactional
-    public MapResponse initGroup() {
+    public MapResponse initGroup(String groupCode) {
         MapResponse resp = new MapResponse();
-        String groupCode = DmpParameterStorage.getGroupCode();
         String sql = null;
         Connection connection = null;
         Statement statement = null;