修复最新代码提交：25-03-19

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employJob/entity/EmployJob.java

@@ -12,6 +12,7 @@ import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.jeecg.modules.employAuthenticationCompany.entity.EmployAuthenticationCompany;
 import org.jeecg.modules.employAuthenticationPerson.entity.EmployAuthenticationPerson;
+import org.jeecg.modules.employOrder.entity.EmployOrder;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
@@ -135,4 +136,7 @@ public class EmployJob implements Serializable {
     //用户信息
     @TableField(exist = false)
     private HanHaiMember hanHaiMember;
+
+    @TableField(exist = false)
+    private EmployOrder employOrder;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employSeek/entity/EmploySeek.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.modules.employOrder.entity.EmployOrder;
 import org.jeecg.modules.employResume.entity.EmployResume;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -112,4 +113,6 @@ public class EmploySeek implements Serializable {
     private HanHaiMember hanHaiMember;
 	@TableField(exist = false)
     private EmployResume employResume;
+    @TableField(exist = false)
+    private EmployOrder employOrder;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/SeekController.java

@@ -62,6 +62,12 @@ public class SeekController {
 
 
 
+    //求职信息-删除求职信息
+    @ApiOperation(value="求职信息-删除求职信息", notes="求职信息-删除求职信息")
+    @RequestMapping(value = "/deleteSeek", method = {RequestMethod.POST})
+    public Result<?> deleteSeek(@RequestHeader("X-Access-Token")String token, String seekId){
+        return seekService.deleteSeek(token, seekId);
+    }
 
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/JobService.java

@@ -14,18 +14,18 @@ public interface JobService {
     public Result<?> queryJobList(EmployJob employJob, PageBean pageBean);
 
     //工作信息-根据Id查看工作详情
-    public Result<?> queryJobById(@RequestHeader("X-Access-Token")String token, String jobId);
+    public Result<?> queryJobById(String token, String jobId);
 
     //工作信息-我的发布
-    public Result<?> queryJobListByUserId(@RequestHeader("X-Access-Token")String token, PageBean pageBean);
+    public Result<?> queryJobListByUserId(String token, PageBean pageBean);
 
     //工作信息-添加工作信息
-    public Result<?> addJob(@RequestHeader("X-Access-Token")String token, EmployJob employJob);
+    public Result<?> addJob(String token, EmployJob employJob);
 
     //工作信息-修改工作信息
-    public Result<?> updateJob(@RequestHeader("X-Access-Token")String token, EmployJob employJob);
+    public Result<?> updateJob(String token, EmployJob employJob);
 
     //工作信息-删除工作信息
-    public Result<?> deleteJob(@RequestHeader("X-Access-Token")String token, String jobId);
+    public Result<?> deleteJob(String token, String jobId);
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/SeekService.java

@@ -12,16 +12,18 @@ public interface SeekService {
     public Result<?> querySeekList(EmploySeek employSeek, PageBean pageBean);
 
     //求职信息-根据Id查看求职信息详情
-    public Result<?> querySeekById(@RequestHeader("X-Access-Token")String token, String id);
+    public Result<?> querySeekById(String token, String id);
 
     //求职信息-添加求职信息
-    public Result<?> addSeek(@RequestHeader("X-Access-Token")String token, EmploySeek employSeek);
+    public Result<?> addSeek(String token, EmploySeek employSeek);
 
     //求职信息-修改求职信息
-    public Result<?> updateSeek(@RequestHeader("X-Access-Token") String token, EmploySeek employSeek);
+    public Result<?> updateSeek( String token, EmploySeek employSeek);
 
     //查询我的求职信息列表-求职订单
-    public Result<?> queryMySeekList(@RequestHeader("X-Access-Token")String token, EmploySeek employSeek, PageBean pageBean);
+    public Result<?> queryMySeekList(String token, EmploySeek employSeek, PageBean pageBean);
 
+    //求职信息-删除求职信息
+    public Result<?> deleteSeek(String token, String seekId);
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserService.java

@@ -8,10 +8,10 @@ import org.springframework.web.bind.annotation.RequestMethod;
 
 public interface UserService {
     //个人信息-查看个人信息
-    public Result<?> queryUser(@RequestHeader("X-Access-Token") String token);
+    public Result<?> queryUser(String token);
 
     //个人信息-修改个人信息
-    public Result<?> updateUser(@RequestHeader("X-Access-Token") String token, String nickName, String phone, String headImage);
+    public Result<?> updateUser(String token, String nickName, String phone, String headImage);
 
     //获取个人中心基础数据信息
     public Result<?> getUserCenterData(String token);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/JobServiceImpl.java

@@ -14,7 +14,10 @@ import org.jeecg.modules.employCategory.entity.EmployCategory;
 import org.jeecg.modules.employCategory.service.IEmployCategoryService;
 import org.jeecg.modules.employJob.entity.EmployJob;
 import org.jeecg.modules.employJob.service.IEmployJobService;
+import org.jeecg.modules.employOrder.entity.EmployOrder;
+import org.jeecg.modules.employOrder.service.IEmployOrderService;
 import org.jeecg.modules.employResume.entity.EmployResume;
+import org.jeecg.modules.employSeek.entity.EmploySeek;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.springframework.stereotype.Service;
@@ -47,6 +50,8 @@ public class JobServiceImpl implements JobService {
 
     @Resource
     private IHanHaiMemberService hanHaiMemberService;
+    @Resource
+    private IEmployOrderService employOrderService;
     /******************************************************************************************************************/
 
     //工作信息-查询工作信息列表
@@ -194,6 +199,17 @@ public class JobServiceImpl implements JobService {
                     .lambdaQuery()
                     .eq(EmployJob::getUserId, hanHaiMember.getId())
                     .page(page);
+            //循环替换数据
+            List records = pageList.getRecords();
+            //创建一个新的集合
+            List<EmployJob> list = new ArrayList<>();
+            for (Object record : records) {
+                EmployJob job = (EmployJob) record;
+                EmployOrder one = employOrderService.lambdaQuery().eq(EmployOrder::getJobId, job.getId()).one();
+                job.setEmployOrder(one);
+                list.add(job);
+            }
+            pageList.setRecords(list);
 
             return Result.OK("我的招工", pageList);
         }catch (Exception e){

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/SeekServiceImpl.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.apiService.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import jodd.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.apiBean.PageBean;
@@ -10,6 +11,8 @@ import org.jeecg.modules.employAuthenticationCompany.service.IEmployAuthenticati
 import org.jeecg.modules.employAuthenticationPerson.entity.EmployAuthenticationPerson;
 import org.jeecg.modules.employAuthenticationPerson.service.IEmployAuthenticationPersonService;
 import org.jeecg.modules.employCategory.service.IEmployCategoryService;
+import org.jeecg.modules.employOrder.entity.EmployOrder;
+import org.jeecg.modules.employOrder.service.IEmployOrderService;
 import org.jeecg.modules.employResume.entity.EmployResume;
 import org.jeecg.modules.employResume.service.IEmployResumeService;
 import org.jeecg.modules.employSeek.entity.EmploySeek;
@@ -42,6 +45,8 @@ public class SeekServiceImpl implements SeekService {
     //权限验证
     @Resource
     private ShiroRealm shiroRealm;
+    @Resource
+    private IEmployOrderService employOrderService;
 
 
 
@@ -50,10 +55,6 @@ public class SeekServiceImpl implements SeekService {
     public Result<?> querySeekList(EmploySeek employSeek, PageBean pageBean){
         Page page =  new Page(pageBean.getPageNo(), pageBean.getPageSize());
         Page pageList = employSeekService.lambdaQuery().page(page);
-
-
-
-
         //循环替换数据
         List records = pageList.getRecords();
         //创建一个新的集合
@@ -123,8 +124,38 @@ public class SeekServiceImpl implements SeekService {
     }
 
     //查询我的求职信息列表-求职订单
+    @Override
     public Result<?> queryMySeekList(String token, EmploySeek employSeek, PageBean pageBean){
-        return null;
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        Page page =  new Page(pageBean.getPageNo(), pageBean.getPageSize());
+        Page pageList = employSeekService.lambdaQuery()
+                .eq(EmploySeek::getUserId, hanHaiMember.getId())
+                .page(page);
+
+        //循环替换数据
+        List records = pageList.getRecords();
+        //创建一个新的集合
+        List<EmploySeek> list = new ArrayList<>();
+        for (Object record : records) {
+            EmploySeek seek = (EmploySeek) record;
+            seek.setHanHaiMember(hanHaiMemberService.getById(seek.getUserId()));
+            seek.setEmployResume(employResumeService.getById(seek.getResumeId()));
+            EmployOrder one = employOrderService.lambdaQuery().eq(EmployOrder::getSeekId, seek.getId()).one();
+            seek.setEmployOrder(one);
+            list.add(seek);
+        }
+        pageList.setRecords(list);
+        return Result.OK("求职信息查询成功", pageList);
+    }
+
+    //求职信息-删除求职信息
+    public Result<?> deleteSeek(String token, String seekId){
+        HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        if(StringUtils.isBlank(seekId)){
+            return Result.error("求职订单不能为空");
+        }
+        employSeekService.removeById(seekId);
+        return Result.OK("删除成功");
     }
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserServiceImpl.java

@@ -102,7 +102,8 @@ public class UserServiceImpl implements UserService {
                     .one();
 
             //组装个人基础数据
-            map.put("amount",hanHaiMember.getPrice());//余额
+            HanHaiMember byId = hanHaiMemberService.getById(hanHaiMember.getId());
+            map.put("amount",byId.getPrice());//余额
             if(null != ahthenticationPerson){
                 map.put("personAuthenticationStatus",ahthenticationPerson.getStatus());//个人实名状态
             }else {

jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -134,9 +134,9 @@ spring:
       #        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://8.138.162.67:3306/employ2?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
+          url: jdbc:mysql://1.117.69.110:3306/employ2?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
           username: root
-          password: Fk4q*h@V
+          password: NlI@f1~z
           driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:
@@ -147,7 +147,7 @@ spring:
   #redis 配置
   redis:
     database: 0
-    host: 8.138.162.67
+    host: 1.117.69.110
     lettuce:
       pool:
         max-active: -1   #最大连接数据库连接数,设 -1 为没有限制
@@ -155,7 +155,7 @@ spring:
         max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
         min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
       shutdown-timeout: 1000ms
-    password: 'gmmGMM@2024'
+    password: 'NlI@f1~z'
     port: 6379
 #mybatis plus 设置
 mybatis-plus: