Merge remote-tracking branch 'origin/master'

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

@@ -24,8 +24,10 @@ public class MessageNotice {
     private String content;
         @ApiModelProperty(value = "收件人ID")
     private String recipientId;
+    private String recipientName;
         @ApiModelProperty(value = "审核状态是否")
     private Boolean status;
+    private String statusName;
         @ApiModelProperty(value = "是否删除")
     private Boolean delFlag;
         @ApiModelProperty(value = "创建人")
@@ -44,8 +46,10 @@ public class MessageNotice {
     private Date updateTime;
         @ApiModelProperty(value = "分类(字典:通知分类")
     private String classify;
+    private String classifyName;
         @ApiModelProperty(value = "类型:1站内通告,2微信")
     private String type;
+    private String typeName;
         @ApiModelProperty(value = "点击超链接")
     private String noticeLink;
         @ApiModelProperty(value = "是否发送微信消息")

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

@@ -6,6 +6,7 @@ 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 com.jpsoft.employment.modules.sys.service.DataDictionaryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -26,6 +27,8 @@ public class MessageNoticeController {
 
     @Autowired
     private MessageNoticeService messageNoticeService;
+    @Autowired
+    private DataDictionaryService dataDictionaryService;
 
     @ApiOperation(value="创建空记录")
     @GetMapping("create")
@@ -206,6 +209,7 @@ public class MessageNoticeController {
         MessageResult<Map> msgResult = new MessageResult<>();
 
         Map<String,Object> searchParams = new HashMap<>();
+        searchParams.put("classify","3");
 
         List<Sort> sortList = new ArrayList<>();
         sortList.add(new Sort("id_","asc"));
@@ -217,13 +221,28 @@ public class MessageNoticeController {
             searchParams.put("status",status);
         }
         if (StringUtils.isNotEmpty(classify)) {
-            searchParams.put("classify",classify);
+//            searchParams.put("classify",classify);
         }
         if (StringUtils.isNotEmpty(type)) {
             searchParams.put("type",type);
         }
 
         Page<MessageNotice> page = messageNoticeService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+        for(MessageNotice messageNotice : page.getResult()){
+            if(messageNotice.getStatus()){
+                messageNotice.setStatusName("已审核");
+            }
+            else{
+                messageNotice.setStatusName("未审核");
+            }
+            if(messageNotice.getType().equals("1")){
+                messageNotice.setTypeName("站内通告");
+            }
+            else{
+                messageNotice.setTypeName("微信");
+            }
+            messageNotice.setClassifyName(dataDictionaryService.findNameByCatalogNameAndValue("消息分类",messageNotice.getClassify()));
+        }
 
         msgResult.setResult(true);
         msgResult.setData(PojoUtils.pageWrapper(page));

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

@@ -539,4 +539,170 @@ public class JobUserApiController {
     }
 
 
+    @PostMapping("myInformation")
+    @ApiOperation(value = "个人信息")
+    public MessageResult<JobUser> myInformation(
+            String token,
+            @RequestAttribute  String subject) {
+        MessageResult<JobUser> messageResult = new MessageResult<>();
+
+        try {
+            JobUser jobUser = jobUserService.get(subject);
+
+            if (jobUser == null) {
+                throw new Exception("未登录!");
+            }
+
+            messageResult.setData(jobUser);
+            messageResult.setResult(true);
+            messageResult.setCode(200);
+        } catch (Exception ex) {
+            log.error(ex.getMessage());
+            messageResult.setResult(false);
+            messageResult.setMessage(ex.getMessage());
+        }
+
+        return messageResult;
+    }
+
+
+    @PostMapping("saveInformation")
+    @ApiOperation(value = "保存个人信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "headImageUrl", value = "头像", required = true, paramType = "form"),
+            @ApiImplicitParam(name = "realName", value = "姓名", required = true, paramType = "form"),
+            @ApiImplicitParam(name = "sex", value = "性别", required = true, paramType = "form"),
+            @ApiImplicitParam(name = "birthday", value = "出生年月", required = true, paramType = "form"),
+            @ApiImplicitParam(name = "address", value = "常住地", required = true, paramType = "form"),
+            @ApiImplicitParam(name = "firstJobTime", value = "参加工作时间", required = true, paramType = "form"),
+    })
+    public MessageResult<String> saveInformation(
+            String headImageUrl,
+            String realName,
+            String sex,
+            Date birthday,
+            String address,
+            Date firstJobTime,
+            String token,
+            @RequestAttribute  String subject) {
+        MessageResult<String> messageResult = new MessageResult<>();
+
+        try {
+            JobUser jobUser = jobUserService.get(subject);
+
+            if (jobUser == null) {
+                throw new Exception("未登录!");
+            }
+
+            jobUser.setHeadImageUrl(headImageUrl);
+            jobUser.setRealName(realName);
+            jobUser.setSex(sex);
+            jobUser.setBirthday(birthday);
+            jobUser.setAddress(address);
+            jobUser.setFirstJobTime(firstJobTime);
+            jobUser.setUpdateBy(subject);
+            jobUser.setUpdateTime(new Date());
+            int updateCount = jobUserService.update(jobUser);
+
+            if(updateCount > 0) {
+                messageResult.setData("修改成功");
+                messageResult.setResult(true);
+                messageResult.setCode(200);
+            }else{
+                messageResult.setData("修改失败");
+                messageResult.setResult(false);
+                messageResult.setCode(400);
+            }
+        } catch (Exception ex) {
+            log.error(ex.getMessage());
+            messageResult.setResult(false);
+            messageResult.setMessage(ex.getMessage());
+        }
+
+        return messageResult;
+    }
+
+    @PostMapping("rebuildPassword")
+    @ApiOperation(value = "重设密码")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "password", value = "新密码", required = true, paramType = "form"),
+    })
+    public MessageResult<String> rebuildPassword(
+            String password,
+            String token,
+            @RequestAttribute  String subject) {
+        MessageResult<String> messageResult = new MessageResult<>();
+
+        try {
+            JobUser jobUser = jobUserService.get(subject);
+
+            if (jobUser == null) {
+                throw new Exception("未登录!");
+            }
+
+            DES3 des3 = new DES3();
+            String passwordEnc = des3.encrypt(jwtSecret,password);
+
+            jobUser.setPassword(password);
+            jobUser.setUpdateBy(subject);
+            jobUser.setUpdateTime(new Date());
+            int updateCount = jobUserService.update(jobUser);
+            if(updateCount > 0) {
+                messageResult.setData("修改成功");
+                messageResult.setResult(true);
+                messageResult.setCode(200);
+            }else{
+                messageResult.setData("修改失败");
+                messageResult.setResult(false);
+                messageResult.setCode(400);
+            }
+        } catch (Exception ex) {
+            log.error(ex.getMessage());
+            messageResult.setResult(false);
+            messageResult.setMessage(ex.getMessage());
+        }
+
+        return messageResult;
+    }
+
+    @PostMapping("rebuildTel")
+    @ApiOperation(value = "重设手机号")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tel", value = "新手机号", required = true, paramType = "form"),
+    })
+    public MessageResult<String> rebuildTel(
+            String tel,
+            String token,
+            @RequestAttribute  String subject) {
+        MessageResult<String> messageResult = new MessageResult<>();
+
+        try {
+            JobUser jobUser = jobUserService.get(subject);
+
+            if (jobUser == null) {
+                throw new Exception("未登录!");
+            }
+
+            jobUser.setTel(tel);
+            jobUser.setUpdateBy(subject);
+            jobUser.setUpdateTime(new Date());
+            int updateCount = jobUserService.update(jobUser);
+            if(updateCount > 0) {
+                messageResult.setData("修改成功");
+                messageResult.setResult(true);
+                messageResult.setCode(200);
+            }else{
+                messageResult.setData("修改失败");
+                messageResult.setResult(false);
+                messageResult.setCode(400);
+            }
+        } catch (Exception ex) {
+            log.error(ex.getMessage());
+            messageResult.setResult(false);
+            messageResult.setMessage(ex.getMessage());
+        }
+
+        return messageResult;
+    }
+
 }

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

@@ -377,9 +377,9 @@ public class MessageNoticeApiController {
         MessageResult<List> messageResult = new MessageResult<>();
         List<Map> resultList = new ArrayList<>();
         try {
-            JobUser jobUser = jobUserService.get(subject);
+            User sysUser = userService.get(subject);
 
-            if (jobUser == null) {
+            if (sysUser == null) {
                 throw new Exception("未登录!");
             }
             //List<DataDictionary> ddList = dataDictionaryService.findByCatalogName("消息分类");
@@ -393,7 +393,7 @@ public class MessageNoticeApiController {
             for(String classify : classifys){
                 if("1".equals(classify)){
                     Map<String, Object> mnMap = new HashMap<>();
-                    MessageNotice mn = messageNoticeService.findTopByUserIdAndClassify(jobUser.getId(),"1");
+                    MessageNotice mn = messageNoticeService.findTopByUserIdAndClassify(sysUser.getId(),"1");
                     mnMap.put("classify","系统消息");
                     mnMap.put("classifyId","1");
                     mnMap.put("newMessage",mn);
@@ -403,7 +403,7 @@ public class MessageNoticeApiController {
                 }else if("2".equals(classify)){
                     Map<String, Object> mnMap = new HashMap<>();
                     //job_resume_deliver_content
-                    ResumeDeliverContent rdc = resumeDeliverContentService.findTopByUserId(jobUser.getId());
+                    ResumeDeliverContent rdc = resumeDeliverContentService.findTopByUserId(sysUser.getId());
 
                     mnMap.put("classify","求职消息");
                     mnMap.put("classifyId","2");
@@ -413,7 +413,7 @@ public class MessageNoticeApiController {
                     resultList.add(mnMap);
                 }else if("3".equals(classify)){
                     Map<String, Object> mnMap = new HashMap<>();
-                    MessageNotice mn = messageNoticeService.findTopByUserIdAndClassify(jobUser.getId(),"3");
+                    MessageNotice mn = messageNoticeService.findTopByUserIdAndClassify(sysUser.getId(),"3");
                     mnMap.put("classify","政策发布");
                     mnMap.put("classifyId","3");
                     mnMap.put("newMessage",mn);

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

@@ -249,6 +249,7 @@ public class ResumeApiController {
             }
             resume.setUserIsAuthenticationName(dataDictionaryService.findNameByCatalogNameAndValue("实名制状态",resume.getUserIsAuthentication()));
             resume.setStatusName(dataDictionaryService.findNameByCatalogNameAndValue("简历状态",resume.getStatus()));
+            resume.setDreamAddName(dataDictionaryService.findNameByCatalogNameAndValue("期望工作地",resume.getDreamAdd()));
 
 
             //教育经验
@@ -609,10 +610,11 @@ public class ResumeApiController {
             if(workCategory != null) {
                 resume.setPositionCategoryName(workCategory.getName());
             }
-            City city = cityService.get(Integer.parseInt(resume.getDreamAdd()));
-            if(city != null){
-                resume.setDreamAddName(city.getCityName());
-            }
+//            City city = cityService.get(Integer.parseInt(resume.getDreamAdd()));
+//            if(city != null){
+//                resume.setDreamAddName(city.getCityName());
+//            }
+            resume.setDreamAddName(dataDictionaryService.findNameByCatalogNameAndValue("期望工作地",resume.getDreamAdd()));
             //resume.setUserIsAuthenticationName(dataDictionaryService.findNameByCatalogNameAndValue("实名制状态",resume.getUserIsAuthentication()));
             //resume.setStatusName(dataDictionaryService.findNameByCatalogNameAndValue("简历状态",resume.getStatus()));
         }