业务逻辑修改以及完善

vetti-admin/src/main/java/com/vetti/web/controller/common/CommonController.java

@@ -56,7 +56,7 @@ public class CommonController
         {
             if (!FileUtils.checkAllowDownload(fileName))
             {
-                throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName));
+                throw new Exception(StringUtils.format("The file name ({}) is illegal and cannot be downloaded。 ", fileName));
             }
             String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
             String filePath = RuoYiConfig.getDownloadPath() + fileName;
@@ -152,7 +152,7 @@ public class CommonController
         {
             if (!FileUtils.checkAllowDownload(resource))
             {
-                throw new Exception(StringUtils.format("资源文件({})非法，不允许下载。 ", resource));
+                throw new Exception(StringUtils.format("The resource file ({}) is illegal and cannot be downloaded。 ", resource));
             }
             // 本地资源路径
             String localPath = RuoYiConfig.getProfile();

vetti-admin/src/main/java/com/vetti/web/controller/hotake/HotakeRolesInfoController.java

@@ -7,6 +7,7 @@ import com.vetti.common.core.domain.AjaxResult;
 import com.vetti.common.core.domain.R;
 import com.vetti.common.core.page.TableWebDataInfo;
 import com.vetti.common.enums.BusinessType;
+import com.vetti.common.utils.SecurityUtils;
 import com.vetti.hotake.domain.HotakeRolesInfo;
 import com.vetti.hotake.domain.dto.HotakeRolesInfoDto;
 import com.vetti.hotake.service.IHotakeRolesInfoService;
@@ -38,6 +39,7 @@ public class HotakeRolesInfoController extends BaseController
     @GetMapping("/getPageList")
     public TableWebDataInfo<HotakeRolesInfo> listPage(HotakeRolesInfo hotakeRolesInfo)
     {
+        hotakeRolesInfo.setRecruiterId(SecurityUtils.getUserId());
         startPage();
         List<HotakeRolesInfo> list = hotakeRolesInfoService.selectHotakeRolesInfoList(hotakeRolesInfo);
         return getWebDataTable(list);
@@ -50,10 +52,36 @@ public class HotakeRolesInfoController extends BaseController
     @GetMapping("/getList")
     public R<List<HotakeRolesInfo>> list(HotakeRolesInfo hotakeRolesInfo)
     {
+        hotakeRolesInfo.setRecruiterId(SecurityUtils.getUserId());
         List<HotakeRolesInfo> list = hotakeRolesInfoService.selectHotakeRolesInfoList(hotakeRolesInfo);
         return R.ok(list,"");
     }
 
+
+    /**
+     * 查询岗位信息列表
+     */
+    @ApiOperation("查询岗位信息列表")
+    @GetMapping("/home/getPageList")
+    public TableWebDataInfo<HotakeRolesInfo> listHomePage(HotakeRolesInfo hotakeRolesInfo)
+    {
+        startPage();
+        List<HotakeRolesInfo> list = hotakeRolesInfoService.selectHotakeRolesInfoList(hotakeRolesInfo);
+        return getWebDataTable(list);
+    }
+
+    /**
+     * 查询岗位信息列表(无分页)
+     */
+    @ApiOperation("查询岗位信息列表(无分页)")
+    @GetMapping("/home/getList")
+    public R<List<HotakeRolesInfo>> listHome(HotakeRolesInfo hotakeRolesInfo)
+    {
+        List<HotakeRolesInfo> list = hotakeRolesInfoService.selectHotakeRolesInfoList(hotakeRolesInfo);
+        return R.ok(list,"");
+    }
+
+
     /**
      * 获取岗位信息详细信息
      */

vetti-admin/src/main/java/com/vetti/web/controller/system/VerificationController.java

@@ -1,18 +1,24 @@
 package com.vetti.web.controller.system;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.vetti.common.core.controller.BaseController;
 import com.vetti.common.core.domain.AjaxResult;
+import com.vetti.common.core.domain.entity.SysUser;
+import com.vetti.common.exception.ServiceException;
 import com.vetti.common.service.verification.VerificationService;
 import com.vetti.common.utils.MessageUtils;
+import com.vetti.system.mapper.SysUserMapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * @author ID
@@ -27,6 +33,9 @@ public class VerificationController extends BaseController {
     @Resource
     private final VerificationService verificationEmailService;
 
+    @Autowired
+    private SysUserMapper userMapper;
+
 
     @ApiOperation("发送验证码（标题、内容走的配置文件）")
     @PostMapping("/email/send")
@@ -35,6 +44,20 @@ public class VerificationController extends BaseController {
         return AjaxResult.success(MessageUtils.messageCustomize("systemVerificationEmailController10001"));
     }
 
+    @ApiOperation("发送验证码（标题、内容走的配置文件）-注册使用")
+    @PostMapping("/email/register/send")
+    public AjaxResult sendRegisterVerificationCode(@RequestParam String email) {
+
+        SysUser query = new SysUser();
+        query.setUserName(email);
+        List<SysUser> userList = userMapper.selectUserList(query);
+        if (CollectionUtil.isNotEmpty(userList)) {
+            throw new ServiceException(MessageUtils.messageCustomize("systemExceptionSysAppLoginServiceImpl10004"));
+        }
+        verificationEmailService.sendVerificationEm7941VerificationCode(email);
+        return AjaxResult.success(MessageUtils.messageCustomize("systemVerificationEmailController10001"));
+    }
+
     /**
      * 验证邮箱验证码
      */

vetti-admin/src/main/resources/i18n/messages.properties

@@ -1,39 +1,39 @@
 #错误消息
-not.null=* 必须填写
-user.jcaptcha.error=验证码错误
-user.jcaptcha.expire=验证码已失效
-user.not.exists=User does not exist/password incorrect
-user.password.not.match=User does not exist/password incorrect
-user.password.retry.limit.count=密码输入错误{0}次
-user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定{1}分钟
-user.password.delete=对不起，您的账号已被删除
-user.blocked=用户已封禁，请联系管理员
-role.blocked=角色已封禁，请联系管理员
-login.blocked=很遗憾，访问IP已被列入系统黑名单
-user.logout.success=退出成功
+not.null=* Required
+user.jcaptcha.error=Incorrect verification code
+user.jcaptcha.expire=The verification code has expired
+user.not.exists=Account Or Password Error
+user.password.not.match=Account Or Password Error
+user.password.retry.limit.count=Password input error {0} times
+user.password.retry.limit.exceed=Password input error {0} times, account locked for {1} minutes
+user.password.delete=Sorry, your account has been deleted
+user.blocked=The user has been banned, please contact the administrator
+role.blocked=The role has been banned, please contact the administrator
+login.blocked=Unfortunately, the access IP has been blacklisted by the system
+user.logout.success=Exit successful
 
-length.not.valid=长度必须在{min}到{max}个字符之间
+length.not.valid=The length must be between {min} and {max} characters
 
-user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头
-user.password.not.valid=* 5-50个字符
+user.username.not.valid=* Composed of 2 to 20 Chinese characters, letters, numbers, or underscores, and must start with a non numeric character
+user.password.not.valid=* 5-50 characters
 
-user.email.not.valid=邮箱格式错误
-user.mobile.phone.number.not.valid=手机号格式错误
-user.login.success=登录成功
-user.register.success=注册成功
-user.notfound=请重新登录
-user.forcelogout=管理员强制退出，请重新登录
-user.unknown.error=未知错误，请重新登录
+user.email.not.valid=Email format error
+user.mobile.phone.number.not.valid=Phone number format error
+user.login.success=Login successful
+user.register.success=registered successfully
+user.notfound=Please log in again
+user.forcelogout=Administrator forced logout, please log in again
+user.unknown.error=Unknown error, please log in again
 
 ##文件上传消息
-upload.exceed.maxSize=上传的文件大小超出限制的文件大小！<br/>允许的文件最大大小是：{0}MB！
-upload.filename.exceed.length=上传的文件名最长{0}个字符
+upload.exceed.maxSize=The uploaded file size exceeds the limit! The maximum allowed file size is: {0}MB ！
+upload.filename.exceed.length=The maximum length of the uploaded file name is {0} characters
 
 ##权限
-no.permission=您没有数据的权限，请联系管理员添加权限 [{0}]
-no.create.permission=您没有创建数据的权限，请联系管理员添加权限 [{0}]
-no.update.permission=您没有修改数据的权限，请联系管理员添加权限 [{0}]
-no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}]
-no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}]
-no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}]
+no.permission=You do not have permission to access the data. Please contact the administrator to add permission [{0}]
+no.create.permission=You do not have permission to create data. Please contact the administrator to add permission [{0}]
+no.update.permission=You do not have permission to modify data. Please contact the administrator to add permission [{0}]
+no.delete.permission=You do not have permission to delete data. Please contact the administrator to add permission [{0}]
+no.export.permission=You do not have permission to export data. Please contact the administrator to add permission [{0}]
+no.view.permission=You do not have permission to view data. Please contact the administrator to add permission [{0}]
 

vetti-hotakes/src/main/java/com/vetti/hotake/domain/HotakeInitScreQuestionsReplyRecordInfo.java

@@ -22,6 +22,9 @@ public class HotakeInitScreQuestionsReplyRecordInfo extends BaseEntity
     @ApiModelProperty("主键ID")
     private Long id;
 
+    @ApiModelProperty("岗位申请ID")
+    private Long roleApplyId;
+
     /** 岗位ID */
     @ApiModelProperty("岗位ID")
     @Excel(name = "岗位ID")

vetti-hotakes/src/main/java/com/vetti/hotake/service/impl/HotakeRolesInfoServiceImpl.java

@@ -136,7 +136,7 @@ public class HotakeRolesInfoServiceImpl extends BaseServiceImpl implements IHota
     @Override
     public List<HotakeRolesInfo> selectHotakeRolesInfoList(HotakeRolesInfo hotakeRolesInfo)
     {
-        hotakeRolesInfo.setRecruiterId(SecurityUtils.getUserId());
+
         List<HotakeRolesInfo> rolesInfoList = hotakeRolesInfoMapper.selectHotakeRolesInfoList(hotakeRolesInfo);
         //计算一个发布日期
         if(CollectionUtil.isNotEmpty(rolesInfoList)){