update

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

@@ -62,5 +62,13 @@
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
 		</dependency>
-    </dependencies>
+        <dependency>
+            <groupId>com.keao.edu</groupId>
+            <artifactId>edu-auth-api</artifactId>
+        </dependency>
+		<dependency>
+			<groupId>com.keao.edu</groupId>
+			<artifactId>edu-auth-api</artifactId>
+		</dependency>
+	</dependencies>
 </project>

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

@@ -3,6 +3,7 @@ package com.keao.edu.user.controller;
 
 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.page.QueryInfo;
 import com.keao.edu.user.entity.Employee;
 import com.keao.edu.user.service.EmployeeService;
@@ -24,24 +25,24 @@ public class EmployeeController extends BaseController {
 	
 	@ApiOperation("员工服务分页查询")
 	@GetMapping(value = "/list")
-	public HttpResponseResult getList(QueryInfo queryInfo) {
+	public HttpResponseResult<PageInfo<Employee>> getList(QueryInfo queryInfo) {
 		return succeed(employeeService.queryPage(queryInfo));
 	}
 
 	@ApiOperation("查询员工详情")
 	@ApiImplicitParam(name = "id", value = "员工ID", required = true, dataType = "Integer", paramType = "path")
 	@GetMapping(value = "/query")
-	public HttpResponseResult query(Integer id) {
+	public HttpResponseResult<Employee> query(Integer id) {
 		return succeed(employeeService.get(id));
 	}
 
 	@ApiOperation("新增员工")
 	@PostMapping(value = "/add")
 	public HttpResponseResult add(Employee employee) {
-		return succeed(employeeService.insert(employee));
+		return succeed(employeeService.add(employee));
 	}
 
-	@ApiOperation("更新资讯")
+	@ApiOperation("更新员工")
 	@PostMapping(value = "/update")
 	public HttpResponseResult update(Employee employee) {
 		Date date = new Date();

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/Employee.java

@@ -1,5 +1,6 @@
 package com.keao.edu.user.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -8,27 +9,35 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 public class Employee {
 
 	/**  */
+	@ApiModelProperty(value = "用户编号",required = false)
 	private Integer userId;
 	
 	/** 工作性质（兼职、全职、临时） */
+	@ApiModelProperty(value = "工作性质（兼职、全职、临时）",required = false)
 	private String jobNature;
 	
 	/** 学历 */
+	@ApiModelProperty(value = "学历",required = false)
 	private String educationBackground;
 	
 	/** 毕业学校 */
+	@ApiModelProperty(value = "毕业学校",required = false)
 	private String graduateSchool;
 	
 	/** 技术职称 */
+	@ApiModelProperty(value = "技术职称",required = false)
 	private String technicalTitles;
 	
 	/** 入职时间 */
+	@ApiModelProperty(value = "入职时间",required = false)
 	private java.util.Date entryDate;
 	
 	/** 证件类型 */
+	@ApiModelProperty(value = "证件类型",required = false)
 	private String certificateType;
 	
 	/** 证件号码 */
+	@ApiModelProperty(value = "证件号码",required = false)
 	private String certificateNum;
 	
 	/**  */
@@ -38,15 +47,19 @@ public class Employee {
 	private java.util.Date createTime;
 	
 	/** 介绍 */
+	@ApiModelProperty(value = "介绍",required = false)
 	private String introduction;
 	
 	/** 离职日期 */
+	@ApiModelProperty(value = "离职日期",required = false)
 	private java.util.Date demissionDate;
 	
 	/** 联系地址 */
+	@ApiModelProperty(value = "联系地址",required = false)
 	private String contactAddress;
 	
 	/** 邮政编码 */
+	@ApiModelProperty(value = "邮政编码",required = false)
 	private String postalCode;
 	
 	public void setUserId(Integer userId){

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/EmployeeService.java

@@ -5,4 +5,10 @@ import com.keao.edu.user.entity.Employee;
 
 public interface EmployeeService extends BaseService<Integer, Employee> {
 
+    /**
+     * 新增员工
+     * @param employee
+     * @return
+     */
+    Integer add(Employee employee);
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/EmployeeServiceImpl.java

@@ -1,6 +1,7 @@
 package com.keao.edu.user.service.impl;
 
 
+import com.keao.edu.auth.api.client.SysUserFeignService;
 import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.common.service.impl.BaseServiceImpl;
 import com.keao.edu.user.dao.EmployeeDao;
@@ -14,10 +15,16 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 	
 	@Autowired
 	private EmployeeDao employeeDao;
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
 
 	@Override
 	public BaseDAO<Integer, Employee> getDAO() {
 		return employeeDao;
 	}
-	
+
+	@Override
+	public Integer add(Employee employee) {
+		return null;
+	}
 }

edu-util/pom.xml

@@ -76,12 +76,6 @@
 		</dependency>
 
 		<dependency>
-			<groupId>iTextAsian</groupId>
-			<artifactId>iTextAsian</artifactId>
-			<version>1.0</version>
-		</dependency>
-
-		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
 		</dependency>