update

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/StudentServiceImpl.java

@@ -60,6 +60,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         }
         SysUser user = sysUserDao.queryByPhone(sysUser.getPhone());
         if (user != null && user.getId() != null) {
+            sysUserDao.lockUser(sysUser.getId());
             Employee employee = employeeDao.get(user.getId());
             if(employee != null && employee.getDelFlag() == false && employee.getEmployeeType().equals("ORGAN")){
                 throw new BizException("手机号被占用");

edu-user/edu-user-biz/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -169,7 +169,7 @@
 	</select>
 
     <select id="lockUser" resultType="int">
-        SELECT id_ FROM sys_user WHERE id_=#{userId}
+        SELECT id_ FROM sys_user WHERE id_ = #{userId}
     </select>
     
     <select id="queryByStatus" resultMap="SysUser">

edu-user/edu-user-server/pom.xml

@@ -24,10 +24,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-websocket</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-amqp</artifactId>
-		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>

edu-user/edu-user-server/src/main/java/com/keao/edu/user/config/RabbitConfig.java

@@ -1,34 +0,0 @@
-package com.keao.edu.user.config;
-
-
-import org.springframework.amqp.core.*;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class RabbitConfig {
-    //交换机名称
-    public static final String ITEM_TOPIC_EXCHANGE = "item_topic_exchange";
-    //队列名称
-    public static final String ITEM_QUEUE = "item_queue";
-
-    //声明交换机
-    @Bean("itemTopicExchange")
-    public Exchange topicExchange(){
-        return ExchangeBuilder.topicExchange(ITEM_TOPIC_EXCHANGE).durable(true).build();
-    }
-
-    //声明队列
-    @Bean("itemQueue")
-    public Queue itemQueue(){
-        return QueueBuilder.durable(ITEM_QUEUE).build();
-    }
-
-    //绑定队列和交换机
-    @Bean
-    public Binding itemQueueExchange(@Qualifier("itemQueue") Queue queue,
-                                     @Qualifier("itemTopicExchange") Exchange exchange){
-        return BindingBuilder.bind(queue).to(exchange).with("item.#").noargs();
-    }
-}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/EmployeeController.java

@@ -7,14 +7,12 @@ import com.keao.edu.common.controller.BaseController;
 import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.common.tenant.TenantContextHolder;
-import com.keao.edu.user.config.RabbitConfig;
 import com.keao.edu.user.entity.Employee;
 import com.keao.edu.user.page.EmployeeQueryInfo;
 import com.keao.edu.user.service.EmployeeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -28,8 +26,6 @@ public class EmployeeController extends BaseController {
 	private EmployeeService employeeService;
 	@Autowired
 	private SysUserFeignService sysUserFeignService;
-	@Autowired
-	private RabbitTemplate rabbitTemplate;
 	
 	@ApiOperation("员工服务分页查询")
 	@GetMapping(value = "/list")
@@ -91,13 +87,4 @@ public class EmployeeController extends BaseController {
 		employeeService.del(id);
 		return succeed();
 	}
-
-	@ApiOperation("删除")
-	@PostMapping(value = "/sendMsg")
-	@PreAuthorize("@pcs.hasPermissions('employee/sendMsg')")
-	public HttpResponseResult sendMsg() {
-		rabbitTemplate.convertAndSend(RabbitConfig.ITEM_TOPIC_EXCHANGE ,"item.springboot-rabbitmq" ,"springboot-rabbitmq-producer");
-		return succeed();
-	}
-
 }

edu-user/edu-user-server/src/main/resources/application.yml

@@ -74,12 +74,6 @@ spring:
         #连接池中的最小空闲连接
         min-idle: 1
 
-  rabbitmq:
-    host: 47.114.176.40
-    port: 5672
-    username: guest
-    password: guest
-
 mybatis:
   mapperLocations: classpath*:config/mybatis/*.xml
   typeAliasesPackage: com.keao.edu.*.entity