Merge remote-tracking branch 'origin/master'

build.groovy

@@ -4,6 +4,7 @@ pipeline {
     environment {
         def appName = "jp-employment"
         def branch = "master"
+        def host = '121.37.187.149'
     }
 
     tools {
@@ -24,7 +25,7 @@ pipeline {
         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'
+                    sh 'mvn -s "/usr/local/maven/apache-maven-3.3.9/conf/jenkins.xml" clean package -Dmaven.test.skip=true -P test'
                 }
             }
         }
@@ -33,33 +34,42 @@ pipeline {
             steps {
                 script {
                     dir("${env.WORKSPACE}/code/web/target") {
-                        def host = '121.37.187.149'
-
-                        withCredentials([usernamePassword(credentialsId: '${host}',
+                        withCredentials([usernamePassword(credentialsId: host,
                                 passwordVariable: 'pwd', usernameVariable: 'userName')]) {
                             def sshServer = [:]
 
                             sshServer.name = 'huawei server'
-                            sshServer.host ='${host}'
-
+                            sshServer.host = host
                             sshServer.user = userName
                             sshServer.password = pwd
-
                             sshServer.allowAnyHosts= true
 
-                            sshCommand remote: sshServer, command: "docker stop ${appName}-server"
+                            sshCommand remote: sshServer, command: "docker stop ${appName}"
+
+                            def targetFolder = "/opt/mydocker/tomcat8/jp-employment/webapps"
+
+                            if(fullUpdate=='true'){
+                                sh "mv web-1.0.0.war web.zip"
+                                sshPut remote: sshServer, from: 'web.zip', into: targetFolder
+                                sshCommand remote: sshServer, command: "rm -rf ${targetFolder}/${appName}-server"
+                                sshCommand remote: sshServer, command: "unzip ${targetFolder}/web.zip -d ${targetFolder}/${appName}-server"
+                            }
+                            else{
+                                //更新 classes
+                                dir("${env.WORKSPACE}/code/web/target/web-1.0.0/WEB-INF/classes"){
+                                    sh 'tar -czvf com.tar.gz com'
+                                    sshPut remote: sshServer, from: 'com.tar.gz', into: "${targetFolder}/${appName}-server/WEB-INF/classes"
+                                    sshCommand remote: sshServer, command: "rm -rf ${targetFolder}/${appName}-server/WEB-INF/classes/com"
+                                    sshCommand remote: sshServer, command: "tar -zxvf ${targetFolder}/${appName}-server/WEB-INF/classes/com.tar.gz -C ${targetFolder}/${appName}-server/WEB-INF/classes"
+                                }
 
-                            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'
+                                //更新 lib
+                                dir("${env.WORKSPACE}/code/web/target/web-1.0.0/WEB-INF/lib"){
+                                    sshPut remote: sshServer, from: "common-1.0.0.jar", into: "${targetFolder}/${appName}-server/WEB-INF/lib"
+                                }
                             }
 
-                            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"
+                            sshCommand remote: sshServer, command: "docker start ${appName}"
                         }
                     }
                 }

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

@@ -17,4 +17,5 @@ public interface ResumeEducationExperienceDAO {
 	List<ResumeEducationExperience> list();
 	List<ResumeEducationExperience> search(@Param("searchParams") Map<String,Object> searchParams, @Param("sortList")List<Sort> sortList);
 	List<ResumeEducationExperience> findByResumeId(String resumeId);
+	int deleteByResumeId(String resumeId);
 }

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

@@ -19,4 +19,5 @@ public interface ResumeWorkExperienceDAO {
 	List<ResumeWorkExperience> list();
 	List<ResumeWorkExperience> search(@Param("searchParams") Map<String,Object> searchParams, @Param("sortList")List<Sort> sortList);
 	List<ResumeWorkExperience> findByResumeId(String resumeId);
+	int deleteByResumeId(String resumeId);
 }

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

@@ -15,4 +15,5 @@ public interface ResumeEducationExperienceService {
 	List<ResumeEducationExperience> list();
 	Page<ResumeEducationExperience> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
 	List<ResumeEducationExperience> findByResumeId(String resumeId);
+	int deleteByResumeId(String resumeId);
 }

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

@@ -15,4 +15,5 @@ public interface ResumeWorkExperienceService {
 	List<ResumeWorkExperience> list();
 	Page<ResumeWorkExperience> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
 	List<ResumeWorkExperience> findByResumeId(String resumeId);
+	int deleteByResumeId(String resumeId);
 }

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

@@ -72,4 +72,9 @@ public class ResumeEducationExperienceServiceImpl implements ResumeEducationExpe
 	public List<ResumeEducationExperience> findByResumeId(String resumeId){
 		return resumeEducationExperienceDAO.findByResumeId(resumeId);
 	}
+
+	@Override
+	public int deleteByResumeId(String resumeId){
+		return resumeEducationExperienceDAO.deleteByResumeId(resumeId);
+	}
 }

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

@@ -72,4 +72,9 @@ public class ResumeWorkExperienceServiceImpl implements ResumeWorkExperienceServ
 	public List<ResumeWorkExperience> findByResumeId(String resumeId){
 		return resumeWorkExperienceDAO.findByResumeId(resumeId);
 	}
+
+	@Override
+	public int deleteByResumeId(String resumeId){
+		return resumeWorkExperienceDAO.deleteByResumeId(resumeId);
+	}
 }

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

@@ -121,4 +121,10 @@
 		and resume_id = #{resumeId}
 		order by sort_no
 	</select>
+
+	<update id="deleteByResumeId" parameterType="com.jpsoft.employment.modules.job.entity.ResumeEducationExperience">
+		UPDATE job_resume_education_experience set del_flag = 1
+		WHERE
+		resume_id = #{resumeId}
+	</update>
 </mapper>

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

@@ -122,4 +122,9 @@
 		and resume_id = #{resumeId}
 		order by sort_no
 	</select>
+	<update id="deleteByResumeId" parameterType="com.jpsoft.employment.modules.job.entity.ResumeWorkExperience">
+		UPDATE job_resume_work_experience set del_flag = 1
+		WHERE
+		resume_id = #{resumeId}
+	</update>
 </mapper>

web/src/main/java/com/jpsoft/employment/modules/base/controller/MessageNoticeController.java

@@ -0,0 +1,233 @@
+package com.jpsoft.employment.modules.base.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.utils.PojoUtils;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.common.dto.MessageResult;
+import com.jpsoft.employment.modules.base.entity.MessageNotice;
+import com.jpsoft.employment.modules.base.service.MessageNoticeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/base/messageNotice")
+@Api(description = "messageNotice")
+public class MessageNoticeController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private MessageNoticeService messageNoticeService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<MessageNotice> create(){
+        MessageResult<MessageNotice> msgResult = new MessageResult<>();
+
+        MessageNotice messageNotice = new MessageNotice();
+
+        msgResult.setData(messageNotice);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<MessageNotice> add(@RequestBody MessageNotice messageNotice,@RequestAttribute String subject){
+        MessageResult<MessageNotice> msgResult = new MessageResult<>();
+
+        try {
+            messageNotice.setId(UUID.randomUUID().toString());
+            messageNotice.setClassify("3");
+            messageNotice.setStatus(false);
+            messageNotice.setType("1");
+            messageNotice.setDelFlag(false);
+            messageNotice.setCreateBy(subject);
+            messageNotice.setCreateTime(new Date());
+            
+            int affectCount = messageNoticeService.insert(messageNotice);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(messageNotice);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<MessageNotice> edit(@PathVariable("id") String id){
+        MessageResult<MessageNotice> msgResult = new MessageResult<>();
+
+        try {
+            MessageNotice messageNotice = messageNoticeService.get(id);
+
+            if (messageNotice != null) {
+                msgResult.setResult(true);
+                msgResult.setData(messageNotice);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<MessageNotice> update(@RequestBody MessageNotice messageNotice,@RequestAttribute String subject){
+        MessageResult<MessageNotice> msgResult = new MessageResult<>();
+
+        try {
+            messageNotice.setUpdateBy(subject);
+            messageNotice.setUpdateTime(new Date());
+            
+            int affectCount = messageNoticeService.update(messageNotice);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(messageNotice);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            MessageNotice messageNotice = messageNoticeService.get(id);
+            messageNotice.setDelFlag(true);
+            messageNotice.setUpdateBy(subject);
+            messageNotice.setUpdateTime(new Date());
+
+            int affectCount = messageNoticeService.update(messageNotice);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                MessageNotice messageNotice = messageNoticeService.get(id);
+                messageNotice.setDelFlag(true);
+                messageNotice.setUpdateBy(subject);
+                messageNotice.setUpdateTime(new Date());
+
+                affectCount += messageNoticeService.update(messageNotice);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String title, Boolean status, String classify, String type,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (StringUtils.isNotEmpty(title)) {
+            searchParams.put("title","%" + title + "%");
+        }
+        if (status != null) {
+            searchParams.put("status",status);
+        }
+        if (StringUtils.isNotEmpty(classify)) {
+            searchParams.put("classify",classify);
+        }
+        if (StringUtils.isNotEmpty(type)) {
+            searchParams.put("type",type);
+        }
+
+        Page<MessageNotice> page = messageNoticeService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

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

@@ -329,7 +329,9 @@ public class JobUserApiController {
             if (jobUser == null) {
                 throw new Exception("人员信息不存在!");
             }
-
+            if(photoName==null){
+                photoName=photoFile.getOriginalFilename();
+            }
             String retFileUrl = OSSUtil.upload(ossConfig, "/jobUser", photoName, photoFile.getInputStream());
 
             messageResult.setResult(true);

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

@@ -509,36 +509,37 @@ public class ResumeApiController {
         int updateCount = 0;
         try {
             int i = 0;
+            resumeEducationExperienceService.deleteByResumeId(resumeId);
             for(EducationExpDTO expDTO:educationExpList){
                 i++;
-                if(StringUtils.isNotEmpty(expDTO.getId())){
-                    ResumeEducationExperience ree = resumeEducationExperienceService.get(expDTO.getId());
-                    ree.setUpdateBy(subject);
-                    ree.setUpdateTime(new Date());
-                    ree.setDelFlag(false);
-                    ree.setResumeId(resumeId);
-                    ree.setSchoolName(expDTO.getName());
-                    ree.setMajor(expDTO.getContent());
-                    ree.setEducation(expDTO.getRemark());
-                    ree.setStartTime(expDTO.getTimeS());
-                    ree.setEndTime(expDTO.getTimeE());
-                    ree.setSortNo(i);
-                    updateCount += resumeEducationExperienceService.update(ree);
-                }else{
-                    ResumeEducationExperience ree = new ResumeEducationExperience();
-                    ree.setId(UUID.randomUUID().toString());
-                    ree.setCreateBy(subject);
-                    ree.setCreateTime(new Date());
-                    ree.setDelFlag(false);
-                    ree.setResumeId(resumeId);
-                    ree.setSchoolName(expDTO.getName());
-                    ree.setMajor(expDTO.getContent());
-                    ree.setEducation(expDTO.getRemark());
-                    ree.setStartTime(expDTO.getTimeS());
-                    ree.setEndTime(expDTO.getTimeE());
-                    ree.setSortNo(i);
-                    updateCount += resumeEducationExperienceService.insert(ree);
-                }
+//                if(StringUtils.isNotEmpty(expDTO.getId())){
+//                    ResumeEducationExperience ree = resumeEducationExperienceService.get(expDTO.getId());
+//                    ree.setUpdateBy(subject);
+//                    ree.setUpdateTime(new Date());
+//                    ree.setDelFlag(false);
+//                    ree.setResumeId(resumeId);
+//                    ree.setSchoolName(expDTO.getName());
+//                    ree.setMajor(expDTO.getContent());
+//                    ree.setEducation(expDTO.getRemark());
+//                    ree.setStartTime(expDTO.getTimeS());
+//                    ree.setEndTime(expDTO.getTimeE());
+//                    ree.setSortNo(i);
+//                    updateCount += resumeEducationExperienceService.update(ree);
+//                }else{
+                ResumeEducationExperience ree = new ResumeEducationExperience();
+                ree.setId(UUID.randomUUID().toString());
+                ree.setCreateBy(subject);
+                ree.setCreateTime(new Date());
+                ree.setDelFlag(false);
+                ree.setResumeId(resumeId);
+                ree.setSchoolName(expDTO.getName());
+                ree.setMajor(expDTO.getContent());
+                ree.setEducation(expDTO.getRemark());
+                ree.setStartTime(expDTO.getTimeS());
+                ree.setEndTime(expDTO.getTimeE());
+                ree.setSortNo(i);
+                updateCount += resumeEducationExperienceService.insert(ree);
+                //}
             }
         } catch (Exception ex) {
             log.error(ex.getMessage());
@@ -551,36 +552,37 @@ public class ResumeApiController {
         int updateCount = 0;
         try {
             int i = 0;
+            resumeWorkExperienceService.deleteByResumeId(resumeId);
             for(WorkExpDTO expDTO:WorkExpList){
                 i++;
-                if(StringUtils.isNotEmpty(expDTO.getId())){
-                    ResumeWorkExperience rwe = resumeWorkExperienceService.get(expDTO.getId());
-                    rwe.setUpdateBy(subject);
-                    rwe.setUpdateTime(new Date());
-                    rwe.setDelFlag(false);
-                    rwe.setResumeId(resumeId);
-                    rwe.setCompanyName(expDTO.getName());
-                    rwe.setContent(expDTO.getContent());
-                    rwe.setJob(expDTO.getRemark());
-                    rwe.setStartTime(expDTO.getTimeS());
-                    rwe.setEndTime(expDTO.getTimeE());
-                    rwe.setSortNo(i);
-                    updateCount += resumeWorkExperienceService.update(rwe);
-                }else{
-                    ResumeWorkExperience rwe = new ResumeWorkExperience();
-                    rwe.setId(UUID.randomUUID().toString());
-                    rwe.setCreateBy(subject);
-                    rwe.setCreateTime(new Date());
-                    rwe.setDelFlag(false);
-                    rwe.setResumeId(resumeId);
-                    rwe.setCompanyName(expDTO.getName());
-                    rwe.setContent(expDTO.getContent());
-                    rwe.setJob(expDTO.getRemark());
-                    rwe.setStartTime(expDTO.getTimeS());
-                    rwe.setEndTime(expDTO.getTimeE());
-                    rwe.setSortNo(i);
-                    updateCount += resumeWorkExperienceService.insert(rwe);
-                }
+//                if(StringUtils.isNotEmpty(expDTO.getId())){
+//                    ResumeWorkExperience rwe = resumeWorkExperienceService.get(expDTO.getId());
+//                    rwe.setUpdateBy(subject);
+//                    rwe.setUpdateTime(new Date());
+//                    rwe.setDelFlag(false);
+//                    rwe.setResumeId(resumeId);
+//                    rwe.setCompanyName(expDTO.getName());
+//                    rwe.setContent(expDTO.getContent());
+//                    rwe.setJob(expDTO.getRemark());
+//                    rwe.setStartTime(expDTO.getTimeS());
+//                    rwe.setEndTime(expDTO.getTimeE());
+//                    rwe.setSortNo(i);
+//                    updateCount += resumeWorkExperienceService.update(rwe);
+//                }else{
+                ResumeWorkExperience rwe = new ResumeWorkExperience();
+                rwe.setId(UUID.randomUUID().toString());
+                rwe.setCreateBy(subject);
+                rwe.setCreateTime(new Date());
+                rwe.setDelFlag(false);
+                rwe.setResumeId(resumeId);
+                rwe.setCompanyName(expDTO.getName());
+                rwe.setContent(expDTO.getContent());
+                rwe.setJob(expDTO.getRemark());
+                rwe.setStartTime(expDTO.getTimeS());
+                rwe.setEndTime(expDTO.getTimeE());
+                rwe.setSortNo(i);
+                updateCount += resumeWorkExperienceService.insert(rwe);
+                //}
             }
         } catch (Exception ex) {
             log.error(ex.getMessage());