From b07475482968ccfcf76cf6647d1d224865762313 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Wed, 22 May 2024 10:08:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E5=B9=B6=E4=B8=94=E5=A7=93=E5=90=8D=E5=92=8C=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E8=A6=81=E5=8C=B9=E9=85=8D=E7=9A=84=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicdata/controller/LoginController.java | 15 ++++++++++-- .../basicdata/service/ISystemUserService.java | 3 +++ .../service/impl/SystemUserServiceImpl.java | 24 +++++++++++++++++++ 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/LoginController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/LoginController.java index 8c8648b14..6ed51c53f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/LoginController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/LoginController.java @@ -1,7 +1,6 @@ package com.zhgd.xmgl.modules.basicdata.controller; -import cn.hutool.crypto.SecureUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; @@ -9,6 +8,7 @@ import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; import com.zhgd.xmgl.modules.basicdata.entity.dto.LoginInfoByTokenDto; import com.zhgd.xmgl.modules.basicdata.service.ILoginService; import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService; +import com.zhgd.xmgl.modules.worker.entity.WorkerInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -22,7 +22,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.Map; -import java.util.Objects; /** * @program: devManage @@ -103,6 +102,18 @@ public class LoginController { return Result.success(resultMap); } + @OperLog(operModul = "劳务人员根据身份证号和名称登录", operType = "劳务人员根据身份证号和名称登录", operDesc = "劳务人员根据身份证号和名称登录") + @ApiOperation(value = "劳务人员根据身份证号和名称登录", notes = "劳务人员根据身份证号和名称登录", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "name", required = true, value = "姓名", paramType = "body"), + @ApiImplicitParam(name = "idCard", required = true, value = "身份证号", paramType = "body"), + @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = false, dataType = "String"), + }) + @PostMapping(value = "/workerInfo/login") + public Result workerInfoLogin(@RequestBody Map map) { + return Result.success(systemUserService.workerInfoLogin(map)); + } + @ApiOperation(value = "根据token获取用户登录信息", notes = "根据token获取用户登录信息", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "headquartersSn", required = false, value = "总公司sn", paramType = "body"), diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserService.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserService.java index 89721b1bf..561b2ef58 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserService.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserService.java @@ -7,6 +7,7 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.entity.sj.JwtPayloadUserInfo; import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; import com.zhgd.xmgl.modules.basicdata.entity.dto.LoginInfoByTokenDto; +import com.zhgd.xmgl.modules.worker.entity.WorkerInfo; import java.util.HashMap; import java.util.List; @@ -95,6 +96,8 @@ public interface ISystemUserService extends IService { Map deviceLogin(Map map); + WorkerInfo workerInfoLogin(Map map); + /** * 是否项目子账号 * diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java index 5d106398c..b775b086e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java @@ -1460,6 +1460,30 @@ public class SystemUserServiceImpl extends ServiceImpl map) { + String idCard = MapUtils.getString(map, "idCard"); + String name = MapUtils.getString(map, "name"); + String projectSn = MapUtils.getString(map, "projectSn"); + if (StrUtil.isBlank(idCard) || StrUtil.isBlank(name)) { + throw new OpenAlertException("idCard或name不能为空"); + } + List workerInfos = workerInfoMapper.selectList(new LambdaQueryWrapper() + .eq(WorkerInfo::getIdCard, idCard) + .eq(WorkerInfo::getWorkerName, name) + .eq(StrUtil.isNotBlank(projectSn), WorkerInfo::getProjectSn, projectSn) + ); + if (CollUtil.isEmpty(workerInfos)) { + return null; + } + for (WorkerInfo dev : workerInfos) { + if (!dev.getWorkerName().equals(name)) { + throw new OpenAlertException("人员姓名错误"); + } + } + return workerInfos.get(0); + } + @Override public boolean isSubProject() { UserInfo user = SecurityUtils.getUser();