From f7fb92466e70972e8d5e8ae7dc7533a7c37a8873 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 11 九月 2024 17:39:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformCarsDataRequest.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 11 +++--
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformInfoRequest.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java | 8 +--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java | 8 +++-
admin/src/views/timer/timer.vue | 2
admin/src/components/business/OperaDeviceRoleWindow.vue | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 11 +----
server/system_service/src/main/java/com/doumee/core/utils/ImageBase64Util.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InterfaceLogServiceImpl.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java | 5 +-
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformDataRequest.java | 2
server/visits/admin_timer/src/main/java/com/doumee/api/HkUsersTimerController.java | 15 ++++++-
13 files changed, 42 insertions(+), 30 deletions(-)
diff --git a/admin/src/components/business/OperaDeviceRoleWindow.vue b/admin/src/components/business/OperaDeviceRoleWindow.vue
index f8a5257..c588141 100644
--- a/admin/src/components/business/OperaDeviceRoleWindow.vue
+++ b/admin/src/components/business/OperaDeviceRoleWindow.vue
@@ -158,7 +158,7 @@
},
// 鑾峰彇璁惧
getLists () {
- getList({})
+ getList({type:0, isdeleted:0 })
.then(res => {
this.device = res.map(item => {
return {
diff --git a/admin/src/views/timer/timer.vue b/admin/src/views/timer/timer.vue
index 6eeca3f..8529d97 100644
--- a/admin/src/views/timer/timer.vue
+++ b/admin/src/views/timer/timer.vue
@@ -110,7 +110,7 @@
this.$dialog.actionConfirm('纭鏆傚仠璇ヤ换鍔″悧?')
.then(() => {
this.pausing = true
- this.api.paustById(row.id)
+ this.api.pauseById(row.id)
.then(() => {
this.$message.info('鏆傚仠鎴愬姛')
this.search()
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/ImageBase64Util.java b/server/system_service/src/main/java/com/doumee/core/utils/ImageBase64Util.java
index 0ee1cc5..3bd91a7 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/ImageBase64Util.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/ImageBase64Util.java
@@ -122,7 +122,7 @@
}
public static void main(String[] args) {
- String url= "http://175.27.187.84/file4/member/20223402/DM1005.png";// 寰呭鐞嗙殑鍥剧墖
+ String url= "http://10.50.250.178:8088/file/member/20240910/c9a4d1cc-76ca-4aa1-bead-5dfd5daf1e76.jpg";// 寰呭鐞嗙殑鍥剧墖
String imgbese = Image2Base64(url);
System.out.println(imgbese.replace("\r\n", ""));
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/HkUsersTimerController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/HkUsersTimerController.java
index ffef6c7..495a7e2 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/HkUsersTimerController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/HkUsersTimerController.java
@@ -9,6 +9,7 @@
import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -21,6 +22,7 @@
@Api(tags = "缁勭粐浜哄憳瀹氭椂鍣ㄦ帴鍙�")
@RestController
@RequestMapping("/timer/orguser")
+@Slf4j
public class HkUsersTimerController extends BaseController {
@Autowired
@@ -36,25 +38,34 @@
@ApiOperation("寮�鍚畾鏃跺悓姝ユ捣搴风粍缁囨暟鎹�")
@GetMapping("/syncOrgData")
public ApiResponse syncOrgData() {
- if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp){
+ log.info("=========================寮�鍚畾鏃跺悓姝ユ捣搴风粍缁囨暟鎹�===========start===========");
+ if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp
+ || Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.self) {
//濡傛灉鏄疎RP绯荤粺鍚屾涓嬪彂
hkSyncOrgUserService.syncOrgData(null);
}
+ log.info("=========================寮�鍚畾鏃跺悓姝ユ捣搴风粍缁囨暟鎹�===========end===========");
return ApiResponse.success("寮�鍚畾鏃跺悓姝ユ捣搴风粍缁囨暟鎹垚鍔�");
}
@ApiOperation("寮�鍚畾鏃堕噸鏂颁笅鍙戝垹闄や汉鍛樻暟鎹�")
@GetMapping("/syncMemberDelData")
public ApiResponse syncMemberDelData() {
+ log.info("=========================寮�鍚畾鏃堕噸鏂颁笅鍙戝垹闄や汉鍛樻暟鎹�===========start===========");
hkSyncOrgUserService.syncMemberDelData();
+
+ log.info("=========================寮�鍚畾鏃堕噸鏂颁笅鍙戝垹闄や汉鍛樻暟鎹�===========end===========");
return ApiResponse.success("寮�鍚畾鏃堕噸鏂颁笅鍙戝垹闄や汉鍛樻暟鎹垚鍔�");
}
@ApiOperation("寮�鍚畾鏃跺悓姝ユ捣搴蜂汉鍛樻暟鎹�")
@GetMapping("/syncUserData")
public ApiResponse syncUserData() {
- if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp) {
+ log.info("=========================寮�鍚畾鏃跺悓姝ユ捣搴蜂汉鍛樻暟鎹�===========start===========");
+ if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp
+ || Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.self) {
//濡傛灉鏄疎RP绯荤粺鍚屾涓嬪彂
hkSyncOrgUserService.syncUserData(null);
}
+ log.info("=========================寮�鍚畾鏃跺悓姝ユ捣搴蜂汉鍛樻暟鎹�===========end===========");
return ApiResponse.success("寮�鍚畾鏃跺悓姝ユ捣搴蜂汉鍛樻暟鎹垚鍔�");
}
@ApiOperation("寮�鍚畾鏃跺喕缁撲汉鍛�")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformCarsDataRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformCarsDataRequest.java
index 622cd5a..18c6f1f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformCarsDataRequest.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformCarsDataRequest.java
@@ -7,7 +7,7 @@
@Data
public class EventPlatformCarsDataRequest {
private List<EventPlatformCarsStatusInfoRequest> HPVehicleStatus;//
- private List<EventPlatformAttrInfoRequest> targetAttrs;//
+ private EventPlatformAttrInfoRequest targetAttrs;//
private String dataType;//HPVehicleStatus
private String sendTime;//2017-04-22T15:39:01.000+08:00
private String dateTime;//2004-05-03T17:30:08.000+08:00
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformDataRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformDataRequest.java
index a8a65e6..48c60f0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformDataRequest.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformDataRequest.java
@@ -8,7 +8,7 @@
@Data
public class EventPlatformDataRequest {
private List<EventPlatformStatusInfoRequest> HPWorkingStatus;//
- private List<EventPlatformAttrInfoRequest> targetAttrs;//
+ private EventPlatformAttrInfoRequest targetAttrs;//
private Integer activePostCount;//1,
private Integer channelID;//1,
private String dataProcInterval;// 3private String ,
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformInfoRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformInfoRequest.java
index c1b4ab5..246ec64 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformInfoRequest.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformInfoRequest.java
@@ -16,5 +16,5 @@
private Integer timeout ;//Number 鑴夊啿瓒呮椂鏃堕棿 鏄� 鍗曚綅锛氱
private String happenTime ;//String 浜嬩欢鍙戠敓鏃堕棿锛堣澶囨椂闂达級 鏄� 64
private String srcParentIndex ;//String 浜嬩欢鍙戠敓鐨勪簨浠舵簮鐖惰澶囩紪鍙� 鍚� 64
- private List<EventPlatformDataRequest> data;
+ private EventPlatformDataRequest data;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
index 3617b81..0992819 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
@@ -91,11 +91,9 @@
public List<Device> findIdAndNameList(Device param) {
LambdaQueryWrapper<Device> wrapper = new LambdaQueryWrapper<>(param);
wrapper.select(Device::getId, Device::getName, Device::getDoorName,Device::getRegionPathName, Device::getRegionName);
- if(null != param.getType() && null != param.getIsdeleted() && null != param.getHkStatus()) {
- wrapper.eq(Device::getType,param.getType())
- .eq(Device::getIsdeleted,param.getIsdeleted())
- .eq(Device::getHkStatus,param.getHkStatus());
- }
+ wrapper.eq(null != param.getType(),Device::getType,param.getType())
+ .eq(null !=param.getIsdeleted(),Device::getIsdeleted,param.getIsdeleted())
+ .eq(null != param.getHkStatus(),Device::getHkStatus,param.getHkStatus());
return deviceMapper.selectList(wrapper);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InterfaceLogServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InterfaceLogServiceImpl.java
index 6fe0fdf..0ac1181 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InterfaceLogServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InterfaceLogServiceImpl.java
@@ -166,6 +166,6 @@
days = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.HK_LOG_DEL_DAYS_LIMIT).getCode());
}catch (Exception e){}
interfaceLogMapper.delete(new UpdateWrapper<InterfaceLog>().lambda()
- .apply("to_days(create_dat e)+"+days+" < to_days(now())") );
+ .apply("to_days(create_date)+"+days+" < to_days(now())") );
}
}
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 e352822..066d9bc 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
@@ -558,7 +558,7 @@
public void deleteById(Integer id,LoginUserInfo loginUserInfo) {
Member member=new Member();
member.setId(id);
- member.setIsdeleted(Constants.ZERO);
+ member.setIsdeleted(Constants.ONE);
member.setEditor(loginUserInfo.getId());
member.setEditDate(new Date());
member.setHkStatus(Constants.ZERO);
@@ -785,7 +785,10 @@
if (CollectionUtils.isEmpty(ids)) {
return;
}
- Member member=new Member();
+ for(Integer id : ids){
+ deleteById(id,loginUserInfo);
+ }
+ /* Member member=new Member();
ids.stream().forEach(s ->{
member.setId(s);
member.setIsdeleted(Constants.ONE);
@@ -795,7 +798,7 @@
member.setEditDate(new Date());
memberMapper.updateById(member);
saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.DELETE,userActionJoinMapper,JSONObject.toJSONString(member));
- });
+ });*/
}
@@ -1343,7 +1346,7 @@
public PageData<Member> findMemberInfoPage(PageWrap<MemberQuery> pageWrap) {
IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
-
+ pageWrap.getModel().setIsdeleted(Constants.formatIntegerNum(pageWrap.getModel().getIsdeleted()));
queryWrapper.selectAll(Member.class);
queryWrapper.selectAs(Company::getName,Member::getCompanyName);
queryWrapper.selectAs(SystemUser::getRealname,Member::getEditorName);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
index c7b56b4..c312ebc 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -155,7 +155,7 @@
.eq(Device::getIsdeleted,Constants.ZERO)
.last("limit 1" ));
delRetentionLis.add(member.getId());
- if(!(Constants.equalsInteger(d.getIsEntrance(),Constants.ONE) && Constants.formatIntegerNum(request.getData().getExtEventInOut()) != Constants.ONE)){
+ if(d!=null && !(Constants.equalsInteger(d.getIsEntrance(),Constants.ONE) && Constants.formatIntegerNum(request.getData().getExtEventInOut()) != Constants.ONE)){
//濡傛灉鏄繘闂紝褰曞叆浜哄憳鐨勫湪鍦烘暟鎹褰�
retentionList.add(getRetentionModelByRequest(member,request));
}
@@ -806,12 +806,11 @@
List<EventPlatformInfoRequest> events = param.getParams().getEvents();
List<Platform> list = new ArrayList<>();
for(EventPlatformInfoRequest request : events){
- List<EventPlatformDataRequest> dataList = request.getData();
- if(dataList ==null || dataList.size()==0){
+ EventPlatformDataRequest data = request.getData();
+ if(data ==null ){
continue;
}
Integer workStatus = 0;
- for(EventPlatformDataRequest data : dataList){
if( data.getHPWorkingStatus() ==null || data.getHPWorkingStatus().size() ==0){
continue;//濡備綍鎺ㄩ�佺姸鎬侀泦鍚堜负绌猴紝涓嶅鐞嗚烦杩�
}
@@ -821,15 +820,11 @@
.last("limit 1"));
if(model ==null){
continue;//鐩戞帶鐐规湭鍚屾锛岃烦杩囧鐞�
-
}
//鍚勮溅閬撹溅杈嗙姸鎬�
for(EventPlatformStatusInfoRequest status : data.getHPWorkingStatus()){
-
}
- break;//鍙鐞嗙涓�涓暟鎹姸鎬�
- }
}
result = "鎴愬姛";
log.error("銆愭捣搴锋湀鍙板伐浣滅姸鎬佷簨浠舵帹閫併��========鎴愬姛=======");
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java
index 9c4fba9..6951543 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java
@@ -682,9 +682,12 @@
return null;
}
if(StringUtils.isNotBlank(c.getFaceImg())){
+ log.info("===================================="+path+c.getFaceImg()+"======start====");
info.setVisitorPhoto(ImageBase64Util.Image2Base64(path+c.getFaceImg()));
+ log.info("===================================="+path+c.getFaceImg()+"========end===");
}
if(info.getVisitorPhoto() == null){
+ log.info("===================================="+path+c.getFaceImg()+"======imgerror=====");
return null;
}
if(StringUtils.isNotBlank(c.getName())){
@@ -696,7 +699,6 @@
info.setVisitorName(c.getName());
}
}
-
if(StringUtils.isNotBlank(c.getCompanyName())){
char[] charArray = c.getCompanyName().toCharArray();
int length = charArray.length;
@@ -716,7 +718,6 @@
info.setCertificateType(HKConstants.CertificateType.HUZHAO.getKey()+"");
info.setCertificateNo(DESUtil.decrypt(Constants.EDS_PWD, c.getIdcardNo()));
}
-
return info;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
index fb18e3a..eb378b4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
@@ -73,7 +73,9 @@
*/
@Override
public void syncOrgData(LoginUserInfo user){
- if(Constants.DEALING_HK_ORG || Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) != DataSyncConfig.origin.erp){
+ if(Constants.DEALING_HK_ORG ||
+ !(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp
+ || Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.self)){
return ;
}
Constants.DEALING_HK_ORG =true;
@@ -263,7 +265,9 @@
*/
@Override
public void syncUserData(LoginUserInfo user){
- if(Constants.DEALING_HK_USER || Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) != DataSyncConfig.origin.erp){
+ if(Constants.DEALING_HK_USER ||
+ !(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp
+ || Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.self)){
return ;
}
Constants.DEALING_HK_USER =true;
--
Gitblit v1.9.3