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 { 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() 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", ""));
@@ -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) { //如果是ERP系统同步下发 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) { //如果是ERP系统同步下发 hkSyncOrgUserService.syncUserData(null); } log.info("=========================开启定时同步海康人员数据===========end==========="); return ApiResponse.success("开启定时同步海康人员数据成功"); } @ApiOperation("开启定时冻结人员") 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 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 , 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; } 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); }
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); 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,14 +820,10 @@ .last("limit 1")); if(model ==null){ continue;//监控点未同步，跳过处理 } //各车道车辆状态 for(EventPlatformStatusInfoRequest status : data.getHPWorkingStatus()){ } break;//只处理第一个数据状态 } } result = "成功"; 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; }
@@ -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;
