Merge remote-tracking branch 'origin/master'

build.groovy

@@ -0,0 +1,69 @@
+pipeline {
+    agent any
+
+    environment {
+        def appName = "jp-employment"
+        def branch = "master"
+    }
+
+    tools {
+        // Install the Maven version configured as "M3" and add it to the path.
+        maven "M3"
+        jdk "jdk8"
+    }
+
+    stages {
+        stage('checkout') {
+            steps {
+                dir("${env.WORKSPACE}/code"){
+                    git branch: branch,credentialsId: 'cd13504d-d7eb-433f-be4b-4cbeedf0372d', url: 'http://47.92.161.104:10080/shuzhan/jp-employment-server.git'
+                }
+            }
+        }
+
+        stage('package') {
+            steps {
+                dir("${env.WORKSPACE}/code"){
+                    sh 'mvn clean package -Dmaven.test.skip=true -P test -s /usr/maven/apache-maven-3.3.9/conf/settings.xml'
+                }
+            }
+        }
+
+        stage('deploy') {
+            steps {
+                script {
+                    dir("${env.WORKSPACE}/code/web/target") {
+                        def host = '121.37.187.149'
+
+                        withCredentials([usernamePassword(credentialsId: '${host}',
+                                passwordVariable: 'pwd', usernameVariable: 'userName')]) {
+                            def sshServer = [:]
+
+                            sshServer.name = 'huawei server'
+                            sshServer.host ='${host}'
+
+                            sshServer.user = userName
+                            sshServer.password = pwd
+
+                            sshServer.allowAnyHosts= true
+
+                            sshCommand remote: sshServer, command: "docker stop ${appName}-server"
+
+                            if(fullUpdate){
+                                def targetFolder = '/opt/mydocker/tomcat8/jp-employment/webapps/'
+                                sshPut remote: sshServer, from: 'web-1.0.0.war', into: targetFolder
+                                sshCommand remote: sshServer, command: 'rm -rf ${targetFolder}/'
+                                sshCommand remote: sshServer, command: 'unzip ${targetFolder}/web-1.0.0.war -D jp-employment-server'
+                            }
+
+                            def appName = 'demo1'
+                            sshCommand remote: sshServer, command: "docker stop $appName"
+                            sshCommand remote: sshServer, command: "docker rm $appName"
+                            sshCommand remote: sshServer, command: "docker run --name $appName -p 9091:80 -d $imageName"
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

common/src/main/java/com/jpsoft/employment/modules/base/dao/MessageReadDAO.java

@@ -0,0 +1,19 @@
+package com.jpsoft.employment.modules.base.dao;
+
+import java.util.List;
+
+import com.jpsoft.employment.modules.base.entity.MessageRead;
+import org.springframework.stereotype.Repository;
+import java.util.Map;
+import com.jpsoft.employment.modules.common.dto.Sort;
+
+@Repository
+public interface MessageReadDAO {
+	int insert(MessageRead entity);
+	int update(MessageRead entity);
+	int exist(String id);
+	MessageRead get(String id);
+	int delete(String id);
+	List<MessageRead> list();
+	List<MessageRead> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/employment/modules/base/entity/MessageRead.java

@@ -0,0 +1,41 @@
+package com.jpsoft.employment.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:base_message_read的实体类
+ */
+@Data
+@ApiModel(value = "base_message_read的实体类")
+public class MessageRead {
+        @ApiModelProperty(value = "ID")
+    private String id;
+        @ApiModelProperty(value = "消息ID")
+    private String messageId;
+        @ApiModelProperty(value = "用户ID")
+    private String userId;
+        @ApiModelProperty(value = "是否已读")
+    private Boolean isRead;
+        @ApiModelProperty(value = "是否删除")
+    private Boolean delFlag;
+        @ApiModelProperty(value = "创建人")
+    private String createBy;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+        @ApiModelProperty(value = "更新人")
+    private String updateBy;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+}

common/src/main/java/com/jpsoft/employment/modules/base/service/MessageReadService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.employment.modules.base.service;
+
+import java.util.List;
+import java.util.Map;
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.base.entity.MessageRead;
+import com.jpsoft.employment.modules.common.dto.Sort;
+
+public interface MessageReadService {
+	MessageRead get(String id);
+	boolean exist(String id);
+	int insert(MessageRead model);
+	int update(MessageRead model);
+	int delete(String id);
+	List<MessageRead> list();
+	Page<MessageRead> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/employment/modules/base/service/impl/MessageReadServiceImpl.java

@@ -0,0 +1,71 @@
+package com.jpsoft.employment.modules.base.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+
+import com.jpsoft.employment.modules.base.dao.MessageReadDAO;
+import com.jpsoft.employment.modules.base.entity.MessageRead;
+import com.jpsoft.employment.modules.base.service.MessageReadService;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="messageReadService")
+public class MessageReadServiceImpl implements MessageReadService {
+	@Resource(name="messageReadDAO")
+	private MessageReadDAO messageReadDAO;
+
+	@Override
+	public MessageRead get(String id) {
+		// TODO Auto-generated method stub
+		return messageReadDAO.get(id);
+	}
+
+	@Override
+	public int insert(MessageRead model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return messageReadDAO.insert(model);
+	}
+
+	@Override
+	public int update(MessageRead model) {
+		// TODO Auto-generated method stub
+		return messageReadDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return messageReadDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = messageReadDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<MessageRead> list() {
+		// TODO Auto-generated method stub
+		return messageReadDAO.list();
+	}
+		
+	@Override
+	public Page<MessageRead> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<MessageRead> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            messageReadDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

common/src/main/java/com/jpsoft/employment/modules/job/dao/ResumeDeliverContentDAO.java

@@ -0,0 +1,19 @@
+package com.jpsoft.employment.modules.job.dao;
+
+import java.util.List;
+
+import com.jpsoft.employment.modules.job.entity.ResumeDeliverContent;
+import org.springframework.stereotype.Repository;
+import java.util.Map;
+import com.jpsoft.employment.modules.common.dto.Sort;
+
+@Repository
+public interface ResumeDeliverContentDAO {
+	int insert(ResumeDeliverContent entity);
+	int update(ResumeDeliverContent entity);
+	int exist(String id);
+	ResumeDeliverContent get(String id);
+	int delete(String id);
+	List<ResumeDeliverContent> list();
+	List<ResumeDeliverContent> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/employment/modules/job/entity/ResumeDeliverContent.java

@@ -0,0 +1,53 @@
+package com.jpsoft.employment.modules.job.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:job_resume_deliver_content的实体类
+ */
+@Data
+@ApiModel(value = "job_resume_deliver_content的实体类")
+public class ResumeDeliverContent {
+        @ApiModelProperty(value = "")
+    private String id;
+        @ApiModelProperty(value = "")
+    private String createBy;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "")
+    private Date createTime;
+        @ApiModelProperty(value = "")
+    private String updateBy;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "")
+    private Date updateTime;
+        @ApiModelProperty(value = "删除标示")
+    private Boolean delFlag;
+        @ApiModelProperty(value = "投递表ID")
+    private String deliverId;
+        @ApiModelProperty(value = "沟通状态")
+    private String chatStatus;
+        @ApiModelProperty(value = "日期")
+    private String todoTime;
+        @ApiModelProperty(value = "时分秒-起")
+    private String todoMinuteStart;
+        @ApiModelProperty(value = "时分秒-止")
+    private String todoMinuteEnd;
+        @ApiModelProperty(value = "地点")
+    private String address;
+        @ApiModelProperty(value = "入职岗位")
+    private String entryPost;
+        @ApiModelProperty(value = "入职职位")
+    private String entryDepartment;
+        @ApiModelProperty(value = "备注-拒绝原因")
+    private String remark;
+}

common/src/main/java/com/jpsoft/employment/modules/job/service/ResumeDeliverContentService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.employment.modules.job.service;
+
+import java.util.List;
+import java.util.Map;
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.job.entity.ResumeDeliverContent;
+
+public interface ResumeDeliverContentService {
+	ResumeDeliverContent get(String id);
+	boolean exist(String id);
+	int insert(ResumeDeliverContent model);
+	int update(ResumeDeliverContent model);
+	int delete(String id);
+	List<ResumeDeliverContent> list();
+	Page<ResumeDeliverContent> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/employment/modules/job/service/impl/ResumeDeliverContentServiceImpl.java

@@ -0,0 +1,71 @@
+package com.jpsoft.employment.modules.job.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+
+import com.jpsoft.employment.modules.job.dao.ResumeDeliverContentDAO;
+import com.jpsoft.employment.modules.job.entity.ResumeDeliverContent;
+import com.jpsoft.employment.modules.job.service.ResumeDeliverContentService;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="resumeDeliverContentService")
+public class ResumeDeliverContentServiceImpl implements ResumeDeliverContentService {
+	@Resource(name="resumeDeliverContentDAO")
+	private ResumeDeliverContentDAO resumeDeliverContentDAO;
+
+	@Override
+	public ResumeDeliverContent get(String id) {
+		// TODO Auto-generated method stub
+		return resumeDeliverContentDAO.get(id);
+	}
+
+	@Override
+	public int insert(ResumeDeliverContent model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return resumeDeliverContentDAO.insert(model);
+	}
+
+	@Override
+	public int update(ResumeDeliverContent model) {
+		// TODO Auto-generated method stub
+		return resumeDeliverContentDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return resumeDeliverContentDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = resumeDeliverContentDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<ResumeDeliverContent> list() {
+		// TODO Auto-generated method stub
+		return resumeDeliverContentDAO.list();
+	}
+		
+	@Override
+	public Page<ResumeDeliverContent> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<ResumeDeliverContent> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            resumeDeliverContentDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

common/src/main/resources/mapper/base/MessageRead.xml

@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.employment.modules.base.dao.MessageReadDAO">
+	<resultMap id="MessageReadMap" type="com.jpsoft.employment.modules.base.entity.MessageRead">
+		<id property="id" column="id_" />
+			<result property="messageId" column="message_id" />
+			<result property="userId" column="user_id" />
+			<result property="isRead" column="is_read" />
+			<result property="delFlag" column="del_flag" />
+			<result property="createBy" column="create_by" />
+			<result property="createTime" column="create_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="updateTime" column="update_time" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.MessageRead">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into base_message_read
+	    (id_,message_id,user_id,is_read,del_flag,create_by,create_time,update_by,update_time)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{messageId,jdbcType=VARCHAR}
+,#{userId,jdbcType=VARCHAR}
+,#{isRead,jdbcType= NUMERIC }
+,#{delFlag,jdbcType= NUMERIC }
+,#{createBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from base_message_read where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.employment.modules.base.entity.MessageRead">
+		update base_message_read
+		<set>
+				<if test="messageId!=null">
+		message_id=#{messageId,jdbcType=VARCHAR},
+		</if>
+				<if test="userId!=null">
+		user_id=#{userId,jdbcType=VARCHAR},
+		</if>
+				<if test="isRead!=null">
+		is_read=#{isRead,jdbcType= NUMERIC },
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="MessageReadMap">
+		select * from base_message_read where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from base_message_read where id_=#{0}
+	</select>
+	<select id="list" resultMap="MessageReadMap">
+		select * from base_message_read
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="MessageReadMap">
+		<![CDATA[
+			select * from base_message_read
+		]]>
+		<where>
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

common/src/main/resources/mapper/job/ResumeDeliverContent.xml

@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.employment.modules.job.dao.ResumeDeliverContentDAO">
+	<resultMap id="ResumeDeliverContentMap" type="com.jpsoft.employment.modules.job.entity.ResumeDeliverContent">
+		<id property="id" column="id_" />
+			<result property="createBy" column="create_by" />
+			<result property="createTime" column="create_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="delFlag" column="del_flag" />
+			<result property="deliverId" column="deliver_id" />
+			<result property="chatStatus" column="chat_status" />
+			<result property="todoTime" column="todo_time" />
+			<result property="todoMinuteStart" column="todo_minute_start" />
+			<result property="todoMinuteEnd" column="todo_minute_end" />
+			<result property="address" column="address_" />
+			<result property="entryPost" column="entry_post" />
+			<result property="entryDepartment" column="entry_department" />
+			<result property="remark" column="remark_" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.employment.modules.job.entity.ResumeDeliverContent">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into job_resume_deliver_content
+	    (id_,create_by,create_time,update_by,update_time,del_flag,deliver_id,chat_status,todo_time,todo_minute_start,todo_minute_end,address_,entry_post,entry_department,remark_)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{createBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{delFlag,jdbcType= NUMERIC }
+,#{deliverId,jdbcType=VARCHAR}
+,#{chatStatus,jdbcType=VARCHAR}
+,#{todoTime,jdbcType=VARCHAR}
+,#{todoMinuteStart,jdbcType=VARCHAR}
+,#{todoMinuteEnd,jdbcType=VARCHAR}
+,#{address,jdbcType= NUMERIC }
+,#{entryPost,jdbcType=VARCHAR}
+,#{entryDepartment,jdbcType=VARCHAR}
+,#{remark,jdbcType=VARCHAR}
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from job_resume_deliver_content where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.employment.modules.job.entity.ResumeDeliverContent">
+		update job_resume_deliver_content
+		<set>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+				<if test="deliverId!=null">
+		deliver_id=#{deliverId,jdbcType=VARCHAR},
+		</if>
+				<if test="chatStatus!=null">
+		chat_status=#{chatStatus,jdbcType=VARCHAR},
+		</if>
+				<if test="todoTime!=null">
+		todo_time=#{todoTime,jdbcType=VARCHAR},
+		</if>
+				<if test="todoMinuteStart!=null">
+		todo_minute_start=#{todoMinuteStart,jdbcType=VARCHAR},
+		</if>
+				<if test="todoMinuteEnd!=null">
+		todo_minute_end=#{todoMinuteEnd,jdbcType=VARCHAR},
+		</if>
+				<if test="address!=null">
+		address_=#{address,jdbcType= NUMERIC },
+		</if>
+				<if test="entryPost!=null">
+		entry_post=#{entryPost,jdbcType=VARCHAR},
+		</if>
+				<if test="entryDepartment!=null">
+		entry_department=#{entryDepartment,jdbcType=VARCHAR},
+		</if>
+				<if test="remark!=null">
+		remark_=#{remark,jdbcType=VARCHAR},
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="ResumeDeliverContentMap">
+		select * from job_resume_deliver_content where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from job_resume_deliver_content where id_=#{0}
+	</select>
+	<select id="list" resultMap="ResumeDeliverContentMap">
+		select * from job_resume_deliver_content
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="ResumeDeliverContentMap">
+		<![CDATA[
+			select * from job_resume_deliver_content
+		]]>
+		<where>
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

pom.xml

@@ -16,14 +16,12 @@
 	<groupId>com.jpsoft.employment</groupId>
 	<artifactId>parent</artifactId>
 	<version>1.0.0</version>
-	<name>enterprise-federation</name>
-	<description>企业联合会</description>
-
+	<name>jp-employment</name>
+	<description>荆开就业在线</description>
 	<properties>
 		<java.version>1.8</java.version>
 		<lombok.version>1.16.12</lombok.version>
 	</properties>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -64,7 +62,6 @@
 			<version>5.0.6</version>
 		</dependency>
 	</dependencies>
-
     <build>
         <plugins>
             <plugin>
@@ -87,5 +84,4 @@
             </plugin>
         </plugins>
     </build>
-
 </project>

web/src/main/java/com/jpsoft/employment/modules/job/controller/ResumeController.java

@@ -77,7 +77,7 @@ public class ResumeController {
             //数据填充
             List<ResumeWorkExperience> workList = resumeWorkExperienceService.findByResumeId(resume.getId());
             List<ResumeEducationExperience> educationList = resumeEducationExperienceService.findByResumeId(resume.getId());
-            resume.setSexName(dataDictionaryService.getName(resume.getSex()));
+            resume.setSexName(dataDictionaryService.findNameByCatalogNameAndValue("性别",resume.getSex()));
             resume.setJobStatusName(dataDictionaryService.getName(resume.getJobStatus()));
             resume.setJobStatusName(dataDictionaryService.getName(resume.getJobStatus()));
             resume.setUserAge(String.valueOf(getAge(resume.getBirthday())));
@@ -232,7 +232,7 @@ public class ResumeController {
         for(Resume resume : page.getResult()){
             WorkCategory workCategory = workCategoryService.get(resume.getPositionCategoryId());
             if(workCategory != null) resume.setPositionCategoryName(workCategory.getName());
-            resume.setSexName(dataDictionaryService.getName(resume.getSex()));
+            resume.setSexName(dataDictionaryService.findNameByCatalogNameAndValue("性别",resume.getSex()));
             resume.setDreamMoneyName(dataDictionaryService.getName(resume.getDreamMoney()));
             resume.setWorkExpName(dataDictionaryService.getName(resume.getWorkExp()));
             resume.setEducationName(dataDictionaryService.getName(resume.getEducation()));

web/src/main/java/com/jpsoft/employment/modules/mobile/controller/ResumeApiController.java

@@ -80,6 +80,9 @@ public class ResumeApiController {
     @Autowired
     private CityService cityService;
 
+    @Autowired
+    private WorkCategoryService workCategoryService;
+
 
     private Logger logger = LoggerFactory.getLogger(getClass());
 
@@ -262,6 +265,25 @@ public class ResumeApiController {
                 return messageResult;
             }
 
+            JobUser jobUser = jobUserService.get(resume.getJobUserId());
+            if(jobUser != null) {
+                resume.setUserName(jobUser.getRealName());
+            }
+            resume.setSexName(dataDictionaryService.findNameByCatalogNameAndValue("性别",resume.getSex()));
+            resume.setDreamMoneyName(dataDictionaryService.getName(resume.getDreamMoney()));
+            resume.setWorkExpName(dataDictionaryService.getName(resume.getWorkExp()));
+            resume.setEducationName(dataDictionaryService.getName(resume.getEducation()));
+            resume.setJobStatusName(dataDictionaryService.getName(resume.getJobStatus()));
+            WorkCategory workCategory = workCategoryService.get(resume.getPositionCategoryId());
+            if(workCategory != null) {
+                resume.setPositionCategoryName(workCategory.getName());
+            }
+            if(resume.getUserIsAuthentication() == "1")
+                resume.setUserIsAuthenticationName("已实名");
+            else
+                resume.setUserIsAuthenticationName("未实名");
+            resume.setStatusName(dataDictionaryService.getName(resume.getStatus()));
+
             //教育经验
             List<ResumeEducationExperience> rexList = resumeEducationExperienceService.findByResumeId(resume.getId());
             //工作经验

web/src/main/resources/application-test.yml

@@ -5,7 +5,7 @@ server:
 
 spring:
   datasource:
-    url: jdbc:log4jdbc:mysql://mysql57/jp_housekeeper_2.0?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+    url: jdbc:log4jdbc:mysql://mysql57/jp-employment?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
     username: root
     password: jpsoft8121234
   devtools:
@@ -15,7 +15,7 @@ spring:
     enabled: true
   redis:
     # Redis数据库索引（默认为0）
-    database: 3
+    database: 4
     # Redis服务器地址
     host: myredis
     # Redis服务器连接端口
@@ -27,7 +27,7 @@ spring:
     username: admin
     password: jpsoft
     #虚拟host 可以不设置,使用server默认host
-    virtual-host: housekeeper-test
+    virtual-host: jp-employment-test
 
 logger:
   level: WARN
@@ -38,7 +38,7 @@ springfox:
   documentation:
     swagger:
       v2:
-        host: ykt-test.xiaoxinda.com
+#        host: ykt-test.xiaoxinda.com
 
 wx:
   pay:

web/src/main/resources/application.yml

@@ -61,7 +61,7 @@ spring:
     active: @active.profile@
   redis:
     # Redis数据库索引（默认为0）
-    database: 1
+    database: 4
     # Redis服务器地址
     host: 127.0.0.1
     #host: 127.0.0.1
@@ -103,7 +103,7 @@ jwt:
   header: Authorization
 
 mybatis:
-  typeAliasesPackage: com.jpsoft.housekeeper.**.entity
+  typeAliasesPackage: com.jpsoft.employment.**.entity
   mapperLocations: classpath*:mapper/**/*.xml
   configuration:
     default-statement-timeout: 60