员工操作

mec-web/src/main/java/com/ym/mec/web/controller/EmployeeController.java

@@ -9,6 +9,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
+
 /**
  * @Author Joburgess
  * @Date 2019/9/17
@@ -23,7 +25,7 @@ public class EmployeeController extends BaseController {
 
     @ApiOperation(value = "根据部门获取下面的员工")
     @GetMapping("/queryEmployByOrganId")
-    public Object queryEmployByOrganId(@RequestParam EmployeeQueryInfo queryInfo){
+    public Object queryEmployByOrganId(@RequestBody EmployeeQueryInfo queryInfo) throws IOException {
         return employeeService.queryEmployByOrganId(queryInfo);
     }
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/EmployeeDao.java

@@ -24,7 +24,6 @@ public interface EmployeeDao extends BaseDAO<Integer, Employee> {
      */
     int queryEmployByOrganIdCount(Map<String,Object> params);
 
-
     /**
      * 修改密码
      * @param userID

mec-web/src/main/java/com/ym/mec/web/dal/enums/ParamEnum.java

@@ -9,6 +9,7 @@ import com.ym.mec.common.enums.BaseEnum;
 public enum  ParamEnum implements BaseEnum<Integer, ParamEnum> {
 
     ONE(1,""),
+    INIT_PASSWORD(123456,"初始密码"),
     TEACHER_ATTENDANCE_TIME_GAP(-20,"教师正常签到时差");
 
     private Integer code;

mec-web/src/main/java/com/ym/mec/web/service/EmployeeService.java

@@ -6,6 +6,8 @@ import com.ym.mec.web.dal.entity.Employee;
 import com.ym.mec.web.dal.enums.EmployeeOperateEnum;
 import com.ym.mec.web.dal.page.EmployeeQueryInfo;
 
+import java.io.IOException;
+
 public interface EmployeeService extends BaseService<Integer, Employee> {
 
     /**
@@ -13,7 +15,7 @@ public interface EmployeeService extends BaseService<Integer, Employee> {
      * @Date: 2019/9/17
      * 根据部门获取下面的员工
      */
-    PageInfo queryEmployByOrganId(EmployeeQueryInfo queryInfo);
+    PageInfo queryEmployByOrganId(EmployeeQueryInfo queryInfo) throws IOException;
 
     /**
      * @Author: Joburgess

mec-web/src/main/java/com/ym/mec/web/service/impl/EmployeeServiceImpl.java

@@ -1,18 +1,26 @@
 package com.ym.mec.web.service.impl;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.security.SecurityUtils;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.web.dal.dao.EmployeeDao;
 import com.ym.mec.web.dal.dto.EmployeeDto;
 import com.ym.mec.web.dal.entity.Employee;
 import com.ym.mec.web.dal.enums.EmployeeOperateEnum;
+import com.ym.mec.web.dal.enums.ParamEnum;
 import com.ym.mec.web.dal.page.EmployeeQueryInfo;
 import com.ym.mec.web.service.EmployeeService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.*;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
 
+import java.io.IOException;
 import java.util.*;
 
 @Service
@@ -21,14 +29,34 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 	@Autowired
 	private EmployeeDao employeeDao;
 
+	@Autowired
+	private RestTemplate restTemplate;
+
+	@Autowired
+	private ObjectMapper objectMapper;
+
 	@Override
 	public BaseDAO<Integer, Employee> getDAO() {
 		return employeeDao;
 	}
 
 	@Override
-	public PageInfo queryEmployByOrganId(EmployeeQueryInfo queryInfo) {
-		queryInfo.setOrganId(1L);
+	public PageInfo queryEmployByOrganId(EmployeeQueryInfo queryInfo) throws IOException {
+		String url = "http://auth-server/queryUserInfo";
+
+		String base64ClientCredentials = Base64.getEncoder().encodeToString("app:app".getBytes());
+
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Authorization", "bearer " + SecurityUtils.getToken());
+		headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+
+		HttpEntity<MultiValueMap<String, String>> entity = new HttpEntity<MultiValueMap<String, String>>(null, headers);
+
+		ResponseEntity<String> resp = restTemplate.exchange(url, HttpMethod.GET, entity, String.class);
+
+		Map map = objectMapper.readValue(resp.getBody(), Map.class);
+
+		queryInfo.setOrganId(Long.valueOf(map.get("organId").toString()));
 		PageInfo<EmployeeDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 		Map<String, Object> params = new HashMap<String, Object>();
 		MapUtil.populateMap(params, queryInfo);
@@ -51,7 +79,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 	public void employeeOperate(Long employeeId, EmployeeOperateEnum operate) {
 		switch (operate){
 			case RESET_PASSWORD:
-				employeeDao.updatePassword(employeeId,"$10$9qP1IKnbSx/wUOzo2qbGrOOf0LXPmHjp85vU2PxZvlkKRtsVbCwry");
+				employeeDao.updatePassword(employeeId,new BCryptPasswordEncoder().encode(ParamEnum.INIT_PASSWORD.getCode().toString()));
 				break;
 			case LOCK_UNLOCK:
 				employeeDao.updateUserLockStatus(employeeId);

mec-web/src/main/resources/config/mybatis/EmployeeMapper.xml

@@ -167,6 +167,6 @@
 			sys_user su
 		LEFT JOIN employee e ON su.id_=e.user_id_
 		LEFT JOIN sys_user_role sur ON su.id_=sur.user_id_
-		LEFT JOIN sys_role sr ON sur.rol
+		LEFT JOIN sys_role sr ON sur.role_id_=sr.id_
 	</select>
 </mapper>