From a254510ced8108c0cde37eb31a6b3e6469fcb2fb Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 04 三月 2024 13:51:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_admin/src/main/resources/application.yml | 2 +-
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/RoleListResponse.java | 2 ++
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/InterfaceLog.java | 12 ++++++++++--
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java | 2 +-
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java | 5 ++++-
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/InterfaceLogServiceImpl.java | 21 +++++++++++----------
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 3 +++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 6 ++++++
8 files changed, 38 insertions(+), 15 deletions(-)
diff --git a/server/dmvisit_admin/src/main/resources/application.yml b/server/dmvisit_admin/src/main/resources/application.yml
index a91f8c2..e051fda 100644
--- a/server/dmvisit_admin/src/main/resources/application.yml
+++ b/server/dmvisit_admin/src/main/resources/application.yml
@@ -10,7 +10,7 @@
# application:
# name: doumeemes
profiles:
- active: devYL
+ active: testHS
# JSON杩斿洖閰嶇疆
jackson:
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/RoleListResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/RoleListResponse.java
index 58ee28e..c6977e4 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/RoleListResponse.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/RoleListResponse.java
@@ -20,6 +20,8 @@
private String name;
@ApiModelProperty(value = "鐘舵�� 0绂佺敤 1鍚敤", example = "1")
private Integer status;
+ @ApiModelProperty(value = "绫诲瀷 0璁垮 1鍐呴儴浜哄憳" )
+ private Integer type;
@ApiModelProperty(value = "鍏宠仈闂ㄧ璁惧闆嗗悎" )
private List<DeviceListResponse> deviceList;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/InterfaceLog.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/InterfaceLog.java
index 92f9d32..e6ef8f7 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/InterfaceLog.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/InterfaceLog.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -31,7 +32,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +40,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -87,4 +86,13 @@
@ExcelColumn(name="鍏宠仈瀵硅薄缂栫爜锛堝涓敤鑻辨枃閫楀彿闅斿紑锛�")
private String objId;
+
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ @TableField(exist = false)
+ private Date startDate;
+
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ @TableField(exist = false)
+ private Date endDate;
+
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/InterfaceLogServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/InterfaceLogServiceImpl.java
index 3339db5..2a7a93e 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/InterfaceLogServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/InterfaceLogServiceImpl.java
@@ -106,6 +106,13 @@
queryWrapper.lambda().ge(InterfaceLog::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
queryWrapper.lambda().le(InterfaceLog::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
}
+
+ if (pageWrap.getModel().getStartDate() != null) {
+ queryWrapper.lambda().ge(InterfaceLog::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getStartDate()));
+ }
+ if (pageWrap.getModel().getEndDate() != null) {
+ queryWrapper.lambda().le(InterfaceLog::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getEndDate()));
+ }
if (pageWrap.getModel().getIsdeleted() != null) {
queryWrapper.lambda().eq(InterfaceLog::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
@@ -116,16 +123,16 @@
queryWrapper.lambda().eq(InterfaceLog::getType, pageWrap.getModel().getType());
}
if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(InterfaceLog::getName, pageWrap.getModel().getName());
+ queryWrapper.lambda().like(InterfaceLog::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getUrl() != null) {
queryWrapper.lambda().like(InterfaceLog::getUrl, pageWrap.getModel().getUrl());
}
if (pageWrap.getModel().getRequest() != null) {
- queryWrapper.lambda().eq(InterfaceLog::getRequest, pageWrap.getModel().getRequest());
+ queryWrapper.lambda().like(InterfaceLog::getRequest, pageWrap.getModel().getRequest());
}
if (pageWrap.getModel().getRepose() != null) {
- queryWrapper.lambda().eq(InterfaceLog::getRepose, pageWrap.getModel().getRepose());
+ queryWrapper.lambda().like(InterfaceLog::getRepose, pageWrap.getModel().getRepose());
}
if (pageWrap.getModel().getSuccess() != null) {
queryWrapper.lambda().eq(InterfaceLog::getSuccess, pageWrap.getModel().getSuccess());
@@ -139,13 +146,7 @@
if (pageWrap.getModel().getObjId() != null) {
queryWrapper.lambda().eq(InterfaceLog::getObjId, pageWrap.getModel().getObjId());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
+ queryWrapper.lambda().orderByDesc(InterfaceLog::getCreateDate);
return PageData.from(interfaceLogMapper.selectPage(page, queryWrapper));
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
index 4aa25ca..df96abb 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
@@ -277,7 +277,7 @@
.ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
Retention::getEventDate,pageWrap.getModel().getStartTime())
.le(Objects.nonNull(pageWrap.getModel().getEndTime()),
- Retention::getEventDate,pageWrap.getModel().getStartTime());
+ Retention::getEventDate,pageWrap.getModel().getEndTime());
queryWrapper.orderByDesc(Retention::getCreateDate);
IPage<Retention> retentionIPage = retentionJoinMapper.selectJoinPage(page, Retention.class, queryWrapper);
return retentionIPage;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index 0af16c2..43d9931 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -963,6 +963,9 @@
}
}else{
//濡傛灉蹇呴』閫夋嫨闂ㄧ锛屼絾鏈�夋嫨
+ if(StringUtils.isNotBlank(visits.getDoors())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝璇烽�夋嫨鏈夋晥璁块棶闂ㄧ锛�");
+ }
String[] dIds = visits.getDoors().split(",");
roles = deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
.eq(DeviceRole::getIsdeleted,Constants.ZERO)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
index fbdff3c..bc734f7 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -408,6 +408,7 @@
member.setRoleIds(param.getRoleIds());
member.setCompanyId(Objects.isNull(company)?null:company.getId());
member.setErpOrgId(param.getOrgId());
+ member.setCanVisit(Constants.ONE);
// member.setStartTime(request.getStartTime());
// member.setEndTime(request.getEndTime());
return member;
@@ -523,6 +524,11 @@
for (DeviceRole deviceRole:deviceRoleList) {
RoleListResponse roleListResponse = new RoleListResponse();
BeanUtils.copyProperties(deviceRole,roleListResponse);
+ if(deviceRole.getType().equals(Constants.TWO)){
+ roleListResponse.setType(Constants.ONE);
+ }else{
+ roleListResponse.setType(Constants.ZERO);
+ }
if(StringUtils.isNotBlank(deviceRole.getDoorIds())){
List<DeviceListResponse> DeviceListResponseList = new ArrayList<>();
List<String> doorList = Arrays.asList(deviceRole.getDoorIds().split(","));
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
index 07709a6..47cb4d7 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
@@ -264,7 +264,7 @@
List<Member> list = memberMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
.selectAll(Member.class )
.selectAs(Company::getHkId,Member::getHkOrgId)
- .isNotNull(Member::getFaceId)
+// .isNotNull(Member::getFaceId
.leftJoin(Company.class,Company::getId,Member::getCompanyId)
.eq(Member::getHkStatus,Constants.ZERO)
.eq(Member::getType,Constants.memberType.internal)
@@ -548,6 +548,7 @@
noticeErpFail(c,Constants.ZERO,"浜鸿劯鐓х墖涓嶅瓨鍦紝鑾峰彇澶辫触锛�");
c.setHkStatus(Constants.TWO);
c.setRemark("浜鸿劯鐓х墖涓嶅瓨鍦紝鑾峰彇澶辫触锛�");
+ c.setHkDate(new Date());
memberMapper.updateById(c);
return false;
}
@@ -557,6 +558,7 @@
c.setFaceId(result.getData().getFaceId());
c.setHkStatus(Constants.ONE);
c.setHkId(addHkModel.getPersonId());
+ c.setHkDate(new Date());
memberMapper.updateById(c);
dealMemberRoleEmpower(c);
return true;
@@ -564,6 +566,7 @@
noticeErpFail(c,Constants.ZERO,"浜哄憳淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃淇鍚庨噸璇曪紒"+result.getCode()+result.getMsg());
c.setHkStatus(Constants.TWO);
c.setRemark("浜哄憳淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃淇鍚庨噸璇曪紒"+(result!=null?result.getMsg():""));
+ c.setHkDate(new Date());
memberMapper.updateById(c);
return false;
}
--
Gitblit v1.9.3