server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -108,6 +108,7 @@ // 访客来访配置 public static final String VISIT_CONFIG = "VISIT_CONFIG"; public static final String MEMBER_IMG = "MEMBER_IMG"; public static final String ACTIVATE = "ACTIVATE"; public static final String PLATFORM_EVENT_IMG = "PLATFORM_EVENT_IMG"; public static final String VISIT_NOTICE = "VISIT_NOTICE"; public static final String TIME_OUT_CONFIG = "TIME_OUT_CONFIG"; server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/cabinet/CabinetController.java
@@ -65,6 +65,9 @@ @Autowired private JkVersionService jkVersionService; @Autowired private JkCabinetGridServiceImpl impl; @LoginNoRequired @ApiOperation("获取钥匙柜APK最新版本") @GetMapping("/getLastVersion") @@ -243,9 +246,6 @@ return ApiResponse.success("操作成功"); } @Autowired private JkCabinetGridServiceImpl impl; @LoginNoRequired @ApiOperation("testTimeOutBackAlarm") server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.core.annotation.excel.ExcelColumn; import com.doumee.dao.system.model.Multifile; import com.doumee.service.business.third.model.LoginUserModel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -163,5 +164,7 @@ @TableField(exist = false) private List<String> authMemberIdList; @ApiModelProperty(value = "激活文件") @TableField(exist = false) private Multifile activateFile; } server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/CabinetInfoVO.java
@@ -70,4 +70,7 @@ @ApiModelProperty(value = "酒精检测配置") private CabinetConfigDataVO cabinetConfigDataVO; @ApiModelProperty(value = "激活文件地址") private String activateFileUrl; } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java
@@ -12,6 +12,8 @@ import com.doumee.dao.business.dao.MemberMapper; import com.doumee.dao.business.model.*; import com.doumee.dao.business.vo.*; import com.doumee.dao.system.MultifileMapper; import com.doumee.dao.system.model.Multifile; import com.doumee.dao.system.model.SystemDictData; import com.doumee.service.business.third.model.LoginUserInfo; import com.doumee.service.business.third.model.PageData; @@ -61,6 +63,9 @@ @Autowired private MemberMapper memberMapper; @Autowired private MultifileMapper multifileMapper; @Override @Transactional(rollbackFor = {Exception.class,BusinessException.class}) @@ -113,6 +118,17 @@ jkCabinet.setAuthMemberId(String.join(",",jkCabinet.getAuthMemberIdList())); jkCabinetMapper.insert(jkCabinet); this.createGrid(jkCabinet); if(Objects.nonNull(jkCabinet.getActivateFile())){ Multifile multifile = jkCabinet.getActivateFile(); multifile.setCreateDate(new Date()); multifile.setEditDate(multifile.getCreateDate()); multifile.setIsdeleted(Constants.ZERO); multifile.setObjId(jkCabinet.getId()); multifile.setObjType(Constants.FIVE); multifileMapper.insert(multifile); } return jkCabinet.getId(); } @@ -224,6 +240,23 @@ jkCabinet.setManagerId(String.join(",",jkCabinet.getManagerIdList())); jkCabinet.setAuthMemberId(String.join(",",jkCabinet.getAuthMemberIdList())); jkCabinetMapper.updateById(jkCabinet); multifileMapper.update(new UpdateWrapper<Multifile>().lambda() .set(Multifile::getIsdeleted,Constants.ONE) .eq(Multifile::getObjType,Constants.FIVE) .eq(Multifile::getObjId,jkCabinet.getId()) ); if(Objects.nonNull(jkCabinet.getActivateFile())){ Multifile multifile = jkCabinet.getActivateFile(); multifile.setId(null); multifile.setCreateDate(new Date()); multifile.setEditDate(multifile.getCreateDate()); multifile.setIsdeleted(Constants.ZERO); multifile.setObjId(jkCabinet.getId()); multifile.setObjType(Constants.FIVE); multifileMapper.insert(multifile); } } @Override @@ -274,6 +307,19 @@ jkCabinet.getAuthMemberId().split(",") )); } Multifile multifile = multifileMapper.selectOne(new QueryWrapper<Multifile>() .lambda() .eq(Multifile::getObjType,Constants.FIVE) .eq(Multifile::getObjId,jkCabinet.getId()) .eq(Multifile::getIsdeleted,Constants.ZERO) .last(" limit 1 ")); if(Objects.nonNull(multifile)){ String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(Constants.FTP,Constants.ACTIVATE).getCode(); multifile.setFileurlFull(prefixUrl + multifile.getFileurl()); jkCabinet.setActivateFile(multifile); } return jkCabinet; } @@ -585,6 +631,19 @@ categoryList.stream().map(i->i.getImgurlFull()).collect(Collectors.toList()) ); } Multifile multifile = multifileMapper.selectOne(new QueryWrapper<Multifile>() .lambda() .eq(Multifile::getObjType,Constants.FIVE) .eq(Multifile::getObjId,jkCabinet.getId()) .eq(Multifile::getIsdeleted,Constants.ZERO) .last(" limit 1 ")); if(Objects.nonNull(multifile)&&StringUtils.isNotBlank(multifile.getFileurl())){ String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(Constants.FTP,Constants.ACTIVATE).getCode(); cabinetInfoVO.setActivateFileUrl(prefixUrl + multifile.getFileurl()); } return cabinetInfoVO; }
@@ -175,7 +175,7 @@ Member insert = initAddMemberModel(member,loginUserInfo); //海康人员新增业务 try { if(dealHkUserBiz(insert)){ // if(dealHkUserBiz(insert)){ memberMapper.insert(insert); //创建系统登陆账号（默认无任何角色） // if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){ @@ -184,9 +184,9 @@ //处理培训有效期业务 dealTrainTIme(member,0,loginUserInfo); // } }else{ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息同步安防平台失败，请稍后重试！"); } // }else{ // throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息同步安防平台失败，请稍后重试！"); // } }catch (BusinessException e){ //如果发生异常，删除已经创建的人员信息 deleteHkUserBiz(new String[]{insert.getHkId()}); @@ -199,6 +199,7 @@ } return insert; } public static SystemUser createSystemUser(Member insert,SystemDictDataBiz systemDictDataBiz) { SystemUser user = new SystemUser(); // 生成密码盐 @@ -397,9 +398,9 @@ if(company == null || Constants.equalsInteger(company.getIsdeleted(),Constants.ONE)){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该组织信息已被删除，请刷新页面重试！"); } if(StringUtils.isBlank(company.getHkId())){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该组织信息未同步安防平台，请先前往【组织管理】菜单进行维护！"); } // if(StringUtils.isBlank(company.getHkId())){ // throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该组织信息未同步安防平台，请先前往【组织管理】菜单进行维护！"); // } member.setHkOrgId(company.getHkId()); member.setCompanyType(company.getType()); if(Constants.equalsInteger(company.getType(),Constants.ONE)){ @@ -1555,7 +1556,8 @@ .eq(pageWrap.getModel().getHkStatus()!=null,Member::getHkStatus,pageWrap.getModel().getHkStatus()) .orderByAsc(Company::getSortnum) .orderByAsc(Position::getSortnum); .orderByAsc(Position::getSortnum) .orderByAsc(Member::getId); // .orderByAsc(!Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getPinyin) // .orderByDesc(Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getEditDate); if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin())==DataSyncConfig.origin.erp){
