From 98802a28acb95a01058ae34c5d9b3985028c9399 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 06 十二月 2024 17:18:14 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/api/common/PublicController.java | 33 ++++++++++++++--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 9 +++-
server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java | 16 ++++++++
server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java | 1
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/WebPublicController.java | 34 ++++++++++++++--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 6 ++-
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java | 3 +
8 files changed, 89 insertions(+), 15 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java
index d4874b3..26136e1 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java
@@ -93,6 +93,7 @@
@ApiModelProperty(value = "寰俊openid", example = "1", hidden = true)
private String openid;
+ //2024骞�12鏈�6鏃�11:00:30 绫诲瀷 0鍙告満浜哄憳 1鏅�氳瀹� 2鍐呴儴浜哄憳
@ApiModelProperty(value = "绫诲瀷 0骞冲彴鐢ㄦ埛 1璁垮", example = "0")
private Integer type;
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
index f698a75..7f344ed 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
@@ -290,6 +290,22 @@
if (user == null) {
throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT);
}
+ //娉ㄥ唽鍙告満/鍔冲姟浜哄憳
+ if((Constants.equalsInteger(user.getType(),Constants.ZERO)||Constants.equalsInteger(user.getType(),Constants.TWO)) && Objects.nonNull(user.getMemberId())){
+ if(Constants.equalsInteger(user.getType(),Constants.TWO)){
+ if(Objects.isNull(user.getCompanyId())){
+ throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
+ }
+ Company company = companyMapper.selectById(user.getCompanyId());
+ if(Objects.isNull(company) || Constants.equalsInteger(company.getType(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
+ }
+ }
+ }else{
+ throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
+ }
+
+
String pwd = Utils.Secure.encryptPassword(new String(dto.getPassword()), user.getSalt());
// 姣旇緝瀵嗙爜
if( !StringUtils.equals(pwd, user.getPassword())){
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/common/PublicController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/common/PublicController.java
index 504191b..438cdd3 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/common/PublicController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/common/PublicController.java
@@ -3,6 +3,13 @@
import com.alibaba.fastjson.JSONObject;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.annotation.trace.Trace;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+import com.doumee.core.haikang.model.HKConstants;
+import com.doumee.core.haikang.model.param.BaseResponse;
+import com.doumee.core.haikang.model.param.request.FacePictureCheckRequest;
+import com.doumee.core.haikang.model.param.respose.FacePictureCheckResponse;
+import com.doumee.core.haikang.service.HKService;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.FtpUtil;
@@ -26,10 +33,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
import com.doumee.api.BaseController;
/**
@@ -98,7 +102,7 @@
@ApiOperation(value = "涓婁紶鏂囦欢鍒癋TP")
@RequestMapping(method= RequestMethod.POST,value="upload")
@ResponseBody
- public void upload(HttpServletRequest request, HttpServletResponse response, String folder) throws Exception {
+ public void upload(HttpServletRequest request, HttpServletResponse response, String folder,Integer isFace) throws Exception {
// folder = systemDictDataBiz.queryByCode(Constants.FTP,folder).getCode();
String prefixPath = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode();
InputStream is = null;
@@ -127,6 +131,25 @@
String fileName = folder+fName;
boolean r = ftp.uploadInputstream(is,fileName);
if(r){
+ if(Constants.equalsInteger(isFace,Constants.ZERO)){
+ //楠岃瘉浜鸿劯璇勫垎
+ //浜鸿劯璇勫垎
+ FacePictureCheckRequest param = new FacePictureCheckRequest();
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode() +
+ systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+ param.setFacePicUrl(prefixUrl + fileName);
+ BaseResponse<FacePictureCheckResponse> responseBaseResponse = HKService.facePictureCheck(param);
+ if(responseBaseResponse == null || !StringUtils.equals(responseBaseResponse.getCode(), HKConstants.RESPONSE_SUCCEE)){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝浜鸿劯璇勫垎鑾峰彇鏁版嵁澶辫触~");
+ }
+ FacePictureCheckResponse facePictureCheckResponse = responseBaseResponse.getData();
+ if(Objects.isNull(facePictureCheckResponse) || Objects.isNull(facePictureCheckResponse.getCheckResult())){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝浜鸿劯璇勫垎鑾峰彇鏁版嵁澶辫触~");
+ }
+ if(!facePictureCheckResponse.getCheckResult()){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), facePictureCheckResponse.getStatusMessage());
+ }
+ }
context.put("success", true);
context.put("code", 200);
context.put("errno",0);
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java
index 9bedaec..930da3f 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java
@@ -122,6 +122,9 @@
@ApiOperation("璁垮璁板綍 - 鍒嗛〉鍒楄〃")
@PostMapping("/visitPage")
public ApiResponse<PageData<Visits>> visitPage (@RequestBody PageWrap<Visits> pageWrap) {
+ if(Objects.isNull(pageWrap.getModel().getMemberId())){
+ pageWrap.getModel().setMemberId(0);
+ }
return ApiResponse.success(visitsService.findPage(pageWrap));
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/WebPublicController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/WebPublicController.java
index c04cf08..6852569 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/WebPublicController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/WebPublicController.java
@@ -5,6 +5,13 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.trace.Trace;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+import com.doumee.core.haikang.model.HKConstants;
+import com.doumee.core.haikang.model.param.BaseResponse;
+import com.doumee.core.haikang.model.param.request.FacePictureCheckRequest;
+import com.doumee.core.haikang.model.param.respose.FacePictureCheckResponse;
+import com.doumee.core.haikang.service.HKService;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.FtpUtil;
@@ -28,10 +35,7 @@
import java.awt.*;
import java.awt.image.BufferedImage;
import java.io.*;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
/**
* @author Eva.Caesar Liu
@@ -98,7 +102,7 @@
@ApiOperation(value = "涓婁紶鏂囦欢鍒癋TP")
@RequestMapping(method= RequestMethod.POST,value="uploadFtp.do",headers = "content-type=multipart/form-data")
@ResponseBody
- public void uploadFtp(HttpServletRequest request, HttpServletResponse response, String folderCode) throws Exception {
+ public void uploadFtp(HttpServletRequest request, HttpServletResponse response, String folderCode,Integer isFace) throws Exception {
System.out.println("涓婁紶涓�");
String folder = systemDictDataBiz.queryByCode(Constants.FTP,folderCode).getCode();
String prefixPath = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode();
@@ -128,6 +132,26 @@
// boolean r = ftp.uploadInputstream(compressImg(is),fileName);
boolean r = ftp.uploadInputstream(is,fileName);
if(r){
+ if(Constants.equalsInteger(isFace,Constants.ZERO)){
+ //楠岃瘉浜鸿劯璇勫垎
+ //浜鸿劯璇勫垎
+ FacePictureCheckRequest param = new FacePictureCheckRequest();
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode() +
+ systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+ param.setFacePicUrl(prefixUrl + fileName);
+ BaseResponse<FacePictureCheckResponse> responseBaseResponse = HKService.facePictureCheck(param);
+ if(responseBaseResponse == null || !StringUtils.equals(responseBaseResponse.getCode(), HKConstants.RESPONSE_SUCCEE)){
+ throw new BusinessException(com.doumee.core.constants.ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝浜鸿劯璇勫垎鑾峰彇鏁版嵁澶辫触~");
+ }
+ FacePictureCheckResponse facePictureCheckResponse = responseBaseResponse.getData();
+ if(Objects.isNull(facePictureCheckResponse) || Objects.isNull(facePictureCheckResponse.getCheckResult())){
+ throw new BusinessException(com.doumee.core.constants.ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝浜鸿劯璇勫垎鑾峰彇鏁版嵁澶辫触~");
+ }
+ if(!facePictureCheckResponse.getCheckResult()){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), facePictureCheckResponse.getStatusMessage());
+ }
+ }
+
context.put("success", true);
context.put("code", 200);
context.put("errno",0);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index e6e736f..d637458 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -1716,6 +1716,9 @@
}
WxAuthorizeVO wxAuthorizeVO = new WxAuthorizeVO();
wxAuthorizeVO.setOpenid(openId);
+ if(StringUtils.isBlank(openId)){
+ return wxAuthorizeVO;
+ }
if(source==1){
//鏍规嵁openId 鏌ヨ鐢ㄦ埛淇℃伅
Member member = memberJoinMapper.selectJoinOne(Member.class,new MPJLambdaWrapper<Member>()
@@ -1762,7 +1765,7 @@
.last(" limit 1 "));
//闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
if(!Objects.isNull(user)){
- Member member = memberMapper.selectById(user.getId());
+ Member member = memberMapper.selectById(user.getMemberId());
if(member.getIsdeleted() == Constants.ONE){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
}
@@ -2091,6 +2094,7 @@
}
if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
.eq(Member::getIsdeleted,Constants.ZERO)
+ .ne(Member::getType,Constants.memberType.visitor)
.eq(Member::getPhone,registerDriverDTO.getPhone())
)>Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎵嬫満鍙峰凡娉ㄥ唽!");
@@ -2108,7 +2112,7 @@
Member member = new Member();
member.setCreateDate(new Date());
member.setIsdeleted(Constants.ZERO);
- member.setType(Constants.THREE);
+ member.setType(Constants.memberType.driver);
member.setName(registerDriverDTO.getName());
member.setPhone(registerDriverDTO.getPhone());
member.setStatus(Constants.ZERO);
@@ -2126,6 +2130,7 @@
systemUser.setSalt(salt);
systemUser.setPassword(member.getPassward());
systemUser.setStatus(Constants.ZERO);
+ systemUser.setType(Constants.memberType.driver);
systemUser.setSource(Constants.TWO);
systemUserMapper.insert(systemUser);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
index 2000a83..f8d9293 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
@@ -1265,7 +1265,7 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧�,涓氬姟鐘舵�佸凡娴佽浆锛�");
}
- Platform platform = platformJoinMapper.selectById(jobOperateDTO.getPlatformId());
+ Platform platform = platformJoinMapper.selectById(platformJob.getPlatformId());
if(Objects.isNull(platform)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鏈堝彴淇℃伅");
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index 85180ac..15ceb11 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -256,7 +256,7 @@
if(StringUtils.isNotBlank(visits.getFaceImg())&&(Constants.equalsInteger(visits.getType(),Constants.ZERO)|| Constants.equalsInteger(visits.getType(),Constants.TWO))){
//浜鸿劯璇勫垎
FacePictureCheckRequest param = new FacePictureCheckRequest();
- String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode() +
systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
param.setFacePicUrl(prefixUrl + visits.getFaceImg());
BaseResponse<FacePictureCheckResponse> response = HKService.facePictureCheck(param);
@@ -1558,7 +1558,8 @@
//鍦ㄥ洯闀挎湡鐩稿叧鏂逛汉鏁�
pcWorkPlatformDataVO.setInParkLwUserNum(
- retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.TWO) && Constants.equalsInteger(i.getCompanyType(),Constants.ZERO)).count()
+ retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.TWO)
+ && Constants.equalsInteger(i.getCompanyType(),Constants.ZERO)).count()
);
pcWorkPlatformDataVO.setLwUserInNum(Constants.ZERO);
pcWorkPlatformDataVO.setLwUserOutNum(Constants.ZERO);
@@ -1655,6 +1656,7 @@
List<Integer> companyIds = companyList.stream().map(i->i.getId()).collect(Collectors.toList());
List<Retention> retentionList = retentionMapper.selectList(
new QueryWrapper<Retention>().lambda()
+ .eq(Retention::getType,Constants.TWO)
.in(Retention::getCompanyId,companyIds)
);
for (Company company:companyList) {
--
Gitblit v1.9.3