From c75257907b5f0d31135236b7c4494aa20e2d7973 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 26 二月 2024 15:56:33 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 2 ++
server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java | 5 +++--
server/dmvisit_service/src/main/java/com/doumee/core/utils/ImageBase64Util.java | 7 ++++---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java | 5 +++--
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java | 8 ++------
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 9 ++++-----
server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java | 7 ++++---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java | 9 +++++++++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 4 +++-
9 files changed, 34 insertions(+), 22 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java
index 66055b0..98132b6 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java
@@ -16,6 +16,7 @@
import com.doumee.service.business.impl.hksync.HkSyncPushServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -46,7 +47,7 @@
@PreventRepeat
@ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ラ棬绂佽澶囨帴鍙�")
@PostMapping("/syncDevices")
-// @RequiresPermissions("business:hksync:device")
+ @RequiresPermissions("business:hksync:device")
public ApiResponse syncHkDevices(@RequestBody AcsDeviceListRequest param) {
String result = hkSyncDeviceService.syncHkDevices(param);
return ApiResponse.success(result);
@@ -54,7 +55,7 @@
@PreventRepeat
@ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ュ仠杞﹀簱鎺ュ彛")
@PostMapping("/syncParks")
-// @RequiresPermissions("business:hksync:park")
+ @RequiresPermissions("business:hksync:park")
public ApiResponse syncHkParks(@RequestBody ParkListRequest param) {
String result = hkSyncParkService.syncHkParks(param);
return ApiResponse.success(result);
@@ -62,7 +63,7 @@
@PreventRepeat
@ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ヨ瀹㈡潈闄愮粍鎺ュ彛")
@PostMapping("/syncPrivilege")
-// @RequiresPermissions("business:hksync:privilege")
+ @RequiresPermissions("business:hksync:privilege")
public ApiResponse syncPrivilege(@RequestBody PrivilegeGroupRequest param) {
String result = hkSyncPrivilegeService.syncPrivilege(param);
return ApiResponse.success(result);
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java b/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
index 22b4a0f..543c769 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -190,7 +190,7 @@
int nb = 2;//鍐呴儴璁垮
}
public interface VisitStatus{
- //瀹℃牳鐘舵�� 0寰呭鏍� 1宸叉彁浜RP瀹℃壒 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 5涓嬪彂鎴愬姛 6涓嬪彂澶辫触 7宸茬绂�
+ //瀹℃牳鐘舵�� 0寰呭鏍� 1宸叉彁浜RP瀹℃壒 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 5涓嬪彂鎴愬姛 6涓嬪彂澶辫触 7宸茬櫥璁� 8宸茬绂�
int waitCheck = 0;
int submitCheck = 1;
int pass = 2;
@@ -198,7 +198,8 @@
int cancel = 4;
int xfSuccess = 5;
int xfFail = 6;
- int signout = 7;
+ int signin= 7;
+ int signout = 8;
}
public interface EmpowerStatus{
//涓�鍗￠�氭巿鏉冧笅鍙戠姸鎬� 0寰呬笅鍙� 1宸蹭笅鍙� 2涓嬪彂鎴愬姛 3宸插彇娑� 4涓嬪彂澶辫触 5浠诲姟涓嬭浇宸茬粨鏉�
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/utils/ImageBase64Util.java b/server/dmvisit_service/src/main/java/com/doumee/core/utils/ImageBase64Util.java
index 327f16c..0ee1cc5 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/utils/ImageBase64Util.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/utils/ImageBase64Util.java
@@ -91,7 +91,8 @@
outStream.write(buffer, 0, len);
}
// 瀵瑰瓧鑺傛暟缁凚ase64缂栫爜
- return new BASE64Encoder().encode(outStream.toByteArray());
+ return Base64.encodeBase64String(outStream.toByteArray());
+// return new BASE64Encoder().encode(outStream.toByteArray());
}catch (Exception e) {
e.printStackTrace();
}
@@ -121,9 +122,9 @@
}
public static void main(String[] args) {
- String url= "http://doumeetest.oss-cn-beijing.aliyuncs.com/member/20210515/de923f81-b417-47fc-a702-472d60d7870a.png";// 寰呭鐞嗙殑鍥剧墖
+ String url= "http://175.27.187.84/file4/member/20223402/DM1005.png";// 寰呭鐞嗙殑鍥剧墖
String imgbese = Image2Base64(url);
- System.out.println(imgbese);
+ System.out.println(imgbese.replace("\r\n", ""));
// String url= "D:\\1.jpg";// 鏂扮敓鎴愮殑鍥剧墖
// generateImage(imgbese, url);
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
index 5f9a4fb..b7a30a9 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
@@ -174,4 +174,13 @@
@TableField(exist = false)
private List<Company> childList;
+ @ApiModelProperty(value = "娴峰悍閮ㄩ棬绾у埆璺緞", example = "1")
+ @ExcelColumn(name="娴峰悍閮ㄩ棬绾у埆璺緞")
+ private String hk_company_path;
+ @ApiModelProperty(value = "鑷缓閮ㄩ棬绾у埆璺緞", example = "1")
+ @ExcelColumn(name="鑷缓閮ㄩ棬绾у埆璺緞")
+ private String company_path;
+ @ApiModelProperty(value = "erp閮ㄩ棬绾у埆璺緞", example = "1")
+ @ExcelColumn(name="erp閮ㄩ棬绾у埆璺緞")
+ private String erp_company_path;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
index 5105d1c..04fea8a 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
@@ -107,14 +107,11 @@
@ApiModelProperty(value = "闅忕▼浜哄憳鏁�", example = "1")
@ExcelColumn(name="闅忕▼浜哄憳鏁�")
private Integer memberNum;
-
-
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "闂ㄧ鏈夋晥鏈熷紑濮�")
@ExcelColumn(name="闂ㄧ鏈夋晥鏈熷紑濮�")
private Date starttime;
-
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "闂ㄧ鏈夋晥鏈熸埅姝�")
@@ -123,7 +120,6 @@
@ApiModelProperty(value = "杩涘巶鏃堕棿")
@ExcelColumn(name="杩涘巶鏃堕棿")
private Date inDate;
-
@ApiModelProperty(value = "绂诲満鏃堕棿")
@ExcelColumn(name="绂诲満鏃堕棿")
private Date outDate;
@@ -153,8 +149,8 @@
@ExcelColumn(name="鎺ュ緟浜哄憳")
private Integer receptMemberId;
- @ApiModelProperty(value = "瀹℃牳鐘舵�� 0寰呭鏍� 1宸叉彁浜RP瀹℃壒 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 5涓嬪彂鎴愬姛 6涓嬪彂澶辫触", example = "1")
- @ExcelColumn(name="瀹℃牳鐘舵�� 0寰呭鏍� 1宸叉彁浜RP瀹℃壒 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 5涓嬪彂鎴愬姛 6涓嬪彂澶辫触")
+ @ApiModelProperty(value = "瀹℃牳鐘舵�� 0寰呭鏍� 1宸叉彁浜RP瀹℃壒 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 5涓嬪彂鎴愬姛 6涓嬪彂澶辫触 7鎷滆涓� 8宸茬绂�", example = "1")
+ @ExcelColumn(name="瀹℃牳鐘舵�� 0寰呭鏍� 1宸叉彁浜RP瀹℃壒 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 5涓嬪彂鎴愬姛 6涓嬪彂澶辫触 7鎷滆涓� 8宸茬绂�")
private Integer status;
@ApiModelProperty(value = "鍒濆浜虹紪鐮�", example = "1")
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index a827a1b..19b9e48 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -460,14 +460,13 @@
int origin =Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin());
List<Company> collect = null;
if(origin == DataSyncConfig.origin.erp){
- companies.stream().filter(s -> ( StringUtils.equals(s.getErpParentId()+"", parentId))).collect(Collectors.toList());
+ collect= companies.stream().filter(s -> ( StringUtils.defaultString(s.getErpParentId(),"").equals(StringUtils.defaultString(parentId)))).collect(Collectors.toList());
}else if(origin == DataSyncConfig.origin.hk){
- companies.stream().filter(s -> ( StringUtils.equals(s.getHkParentId()+"", parentId))).collect(Collectors.toList());
+ collect= companies.stream().filter(s -> ( StringUtils.defaultString(s.getHkParentId(),"").equals(StringUtils.defaultString(parentId)))).collect(Collectors.toList());
}else{
- companies.stream().filter(s -> ( StringUtils.equals(s.getParentId()+"", parentId))).collect(Collectors.toList());
+ collect= companies.stream().filter(s -> (StringUtils.defaultString(s.getParentId()+"","").equals(StringUtils.defaultString(parentId)))).collect(Collectors.toList());
}
-
- if (CollectionUtils.isEmpty(companies)){
+ if (CollectionUtils.isEmpty(collect)){
return null;
}
List<CompanyDTO> companyDTOList = new ArrayList<>();
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index dfc80bd..269e4a7 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -583,6 +583,7 @@
MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(Member.class);
+ queryWrapper.selectAs(Company::getName,Member::getCompanyName);
queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
queryWrapper.in(Objects.nonNull(pageWrap.getModel().getCompanyIds())&&pageWrap.getModel().getCompanyIds().size()>0,
Member::getCompanyId,pageWrap.getModel().getCompanyIds())
@@ -706,6 +707,7 @@
.or().like(Member::getVisitCompanyName,pageWrap.getModel().getCompanyName()))
.like(StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()),Member::getIdcardNo,pageWrap.getModel().getIdcardNo())
.eq(Member::getStatus,Constants.Status.FREEZE.getValue())
+ .eq(pageWrap.getModel().getCompanyId()!=null,Company::getId,pageWrap.getModel().getCompanyId())
.eq(Objects.nonNull(pageWrap.getModel().getCode()),Member::getCode,pageWrap.getModel().getCode())
.orderByDesc(Member::getCreateDate);
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
index fe0d178..3ec0b8d 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -319,9 +319,11 @@
//濡傛灉鏄瀹㈢櫥璁帮紝褰曞叆浜哄憳鐨勫湪鍦烘暟鎹褰�
retentionList.add(getRetentionModelByVisitRequest(visits,request));
//鏉ヨ鏃堕棿
- updateVistis.setOutDate(DateUtil.getISO8601DateByStr(model.getStartTime()));
+ updateVistis.setStatus(Constants.VisitStatus.signin);
+ updateVistis.setInDate(DateUtil.getISO8601DateByStr(model.getStartTime()));
}else {
//濡傛灉鏄瀹㈢绂讳簨浠�
+ updateVistis.setStatus(Constants.VisitStatus.signout);
updateVistis.setOutDate(DateUtil.getISO8601DateByStr(model.getEndTime()));
updateVistis.setOutType(Constants.ZERO);
updateVistis.setOutInfo("璁垮姝ｅ父绛剧");
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java
index 02a711f..22f9196 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java
@@ -180,8 +180,8 @@
//浜鸿劯涓虹┖锛屼笉鑳借繘琛屾帹閫�
return null;
}
- request.setVisitStartTime(DateUtil.getISO8601Timestamp(c.getStarttime()));
- request.setVisitEndTime(DateUtil.getISO8601Timestamp(c.getEndtime()));
+ request.setVisitStartTime(DateUtil.getISO8601Timestamp2(c.getStarttime()));
+ request.setVisitEndTime(DateUtil.getISO8601Timestamp2(c.getEndtime()));
request.setReceptionistId(c.getReceptMemberHkId());//琚浜烘捣搴风紪鐮�
request.setVisitPurpose(c.getReason());
request.setVisitorInfo(info);
@@ -248,6 +248,7 @@
info.setVisitorWorkUnit(c.getCompanyName());
info.setPhoneNo(c.getPhone());
info.setPlateNo(c.getCarNos());
+ info.setGender(c.getSex()+"");
if(Constants.equalsInteger(c.getIdcardType(),Constants.ZERO)){
info.setCertificateType(HKConstants.CertificateType.SHENFENZHENG.getKey()+"");
info.setCertificateNo(DESUtil.decrypt(Constants.EDS_PWD, c.getIdcardNo()));
--
Gitblit v1.9.3