productDev/dmvisit.git

			@@ -10,15 +10,17 @@
			import com.doumee.core.haikang.model.param.request.*;
			import com.doumee.core.haikang.model.param.respose.*;
			import com.doumee.core.haikang.service.HKService;
			import com.doumee.core.model.LoginUserInfo;
			import com.doumee.service.business.third.model.LoginUserInfo;
			import com.doumee.core.utils.Constants;
			import com.doumee.core.utils.DESUtil;
			import com.doumee.core.utils.DateUtil;
			import com.doumee.core.utils.ImageBase64Util;
			import com.doumee.dao.business.*;
			import com.doumee.dao.business.dao.CompanyMapper;
			import com.doumee.dao.business.dao.MemberMapper;
			import com.doumee.dao.business.join.MemberJoinMapper;
			import com.doumee.dao.business.model.*;
			import com.doumee.dao.business.model.Member;
			import com.doumee.dao.system.SystemUserMapper;
			import com.doumee.dao.system.model.SystemUser;
			import com.doumee.service.business.ext.ERPSyncService;
			@@ -28,7 +30,6 @@
			import lombok.extern.slf4j.Slf4j;
			import org.apache.commons.collections.CollectionUtils;
			import org.apache.commons.lang3.StringUtils;
			import org.checkerframework.checker.units.qual.C;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			@@ -93,7 +94,7 @@
			request.setAppKey(systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_APPID).getCode());
			request.setOaId("atwl");
			request.setOpenId(user.getOpenid());
			request.setPlatformName("安泰物流园区");
			request.setPlatformName(user.getRealname());
			BaseResponse<Integer> response = HKService.userOpenidSave(request);
			if(response!=null &&response.getCode().equals(HKConstants.RESPONSE_SUCCEE) && Constants.equalsInteger(response.getData(),Constants.ONE)){
			user.setOpenidHkStatus(Constants.ONE);
			@@ -104,6 +105,22 @@
			}
			user.setOpenidHkDate(new Date());
			systemUserMapper.updateById(user);
			return "成功";
			}
			@Override
			public String delHkUserOpenid(UserOpenidSaveRequest param){
			UserOpenidSaveRequest request = new UserOpenidSaveRequest();
			request.setUserName(param.getUserName());
			request.setAppKey(systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_APPID).getCode());
			BaseResponse response = HKService.userOpenidDel(request);
			if(response!=null &&response.getCode().equals(HKConstants.RESPONSE_SUCCEE)){
			}
			request.setUserName(null);
			request.setOpenId(param.getOpenId());
			request.setAppKey(systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_APPID).getCode());
			response = HKService.userOpenidDel(request);
			if(response!=null &&response.getCode().equals(HKConstants.RESPONSE_SUCCEE)){
			}
			return "成功";
			}

			@@ -343,7 +360,8 @@
			*/
			@Override
			public void syncMemberDelData(){
			if(Constants.DEALING_HK_DEL_USER \|\| Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) != DataSyncConfig.origin.erp){
			if(Constants.DEALING_HK_DEL_USER
			\|\| Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin())== DataSyncConfig.origin.hk){
			return ;
			}
			Constants.DEALING_HK_DEL_USER =true;
			@@ -402,14 +420,16 @@
			}
			Date date = new Date();
			for(Member member : list){
			//一卡通授权下发状态 0待下发 1已下发 2下发成功 3已取消 4下发失败 5任务下载已结束
			if(member!=null && Constants.equalsInteger(member.getIsdeleted(),Constants.ONE) ){
			if(empowerMapper.selectCount(new QueryWrapper<Empower>().lambda()
			.eq(Empower::getMemberId, member.getId())
			.eq(Empower::getIsdeleted,Constants.ONE)
			.ne(Empower::getFailFlag,Constants.ONE)
			.ne(Empower::getSendStatus,Constants.EmpowerStatus.pass)) ==0) {
			//如果权限都已经删除成功，则删除海康人员和卡片数据

			.notIn(Empower::getSendStatus
			,Constants.EmpowerStatus.pass
			,Constants.EmpowerStatus.cancel )) ==0) {
			//如果权限都已经删除成功，则删除海康人员和卡片数
			HkSyncEmpowerServiceImpl.doHkDeleteUser(member.getId(),member.getHkId(),date,memberMapper1,memberCardMapper);
			}
			}
			@@ -436,12 +456,11 @@
			for(String s :ss){
			try {
			Integer ts =Integer.parseInt(s);
			r.add(ts);
			r.add(ts);
			}catch (Exception e){
			//脏数据不处理
			}
			}

			}
			}
			return r;
			@@ -519,9 +538,8 @@
			//如果没有卡也没有人脸
			return;
			}

			if(Constants.equalsInteger(member.getIsdeleted(),Constants.ZERO)){
			// && Constants.equalsInteger(member.getHkStatus(),Constants.ONE)){
			// && Constants.equalsInteger(member.getHkStatus(),Constants.ONE)){
			List<Integer> deviceIds =new ArrayList<>();//新设备编码集合
			List<Empower> list = new ArrayList<>();//新授权记录集合
			//如果用户是同步海康成功，添加带下发权限（只管理新增或者编辑的）
			@@ -660,7 +678,6 @@
			cr.setCardType(m.getType());
			param.getCardList().add(cr);
			}

			//处理新增数据
			BaseResponse<List<CardInfoResponse>> result = HKService.cardBingding(param);
			if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) ){
			@@ -696,7 +713,7 @@
			public static List<MemberCard> getNormalCardList(Member member,MemberCardMapper memberCardMapper) {
			return memberCardMapper.selectList(new QueryWrapper<MemberCard>().lambda()
			.eq(MemberCard::getMemberId,member.getId())
			// .eq(MemberCard::getType,Constants.TWO)
			// .eq(MemberCard::getType,Constants.TWO)
			.eq(MemberCard::getStatus,Constants.MemberCard.normal)
			.eq(MemberCard::getHkStatus,Constants.ONE) );

			@@ -731,7 +748,7 @@
			//处理新增数据
			BaseResponse result = HKService.editUser(addHkModel);
			if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) ){
			if(StringUtils.isNotBlank(c.getFaceImg()) && Constants.equalsInteger(c.getFaceStatus(),Constants.ZERO)){
			if(StringUtils.isNotBlank(c.getFaceImg()) && !Constants.equalsInteger(c.getFaceStatus(),Constants.TWO)){
			//如果有人脸照片，处理人脸照片同步
			String faceid = dealMemberFace(c,path);
			if(StringUtils.isBlank(faceid)){