server/system_service/src/main/java/com/doumee/core/utils/HttpsUtil.java
@@ -114,9 +114,7 @@ } catch (Exception e) { e.printStackTrace(); } finally { if(connection != null){ connection.disconnect(); } } return null; } server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
@@ -259,8 +259,8 @@ String hkToken = DESUtil.generateTokenToHk(loginUserInfo.getUsername(),Integer.valueOf( systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_TOKEN_VALIDITY).getCode() ),redisTemplate); String url = (type==6?"":(systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_HTTPS).getCode() + systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_HOST).getCode())) String url = (systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_HTTPS).getCode() + systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_HOST).getCode()) + HKService.getMenuUrl(type,hkToken); try { if(redisTemplate!=null&& jwtProperties!=null){ server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java
@@ -166,9 +166,7 @@ } InputStream inputStream = HttpsUtil.connectionInputsteam(param.getUrl(),"GET","",null); if(inputStream == null){ if(StringUtils.isBlank(param.getUrl())){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"文件下载失败，请检查文件路径是否合法！"); } } if(StringUtils.isBlank(param.getFileName())){ param.setFileName(System.currentTimeMillis()+""); server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CompanyDocuments.java
@@ -41,7 +41,6 @@ @ApiModelProperty(value = "更新时间") @ExcelColumn(name="更新时间") @JsonFormat(pattern = "yyyy-MM-dd") private Date editDate; @ApiModelProperty(value = "是否删除0否 1是", example = "1") @@ -97,4 +96,7 @@ @ApiModelProperty(value = "责任部门编码(关联company)", example = "1") @TableField(exist = false ) private String fileurlFull; @ApiModelProperty(value = "创建人名称", example = "1") @TableField(exist = false ) private String creatorName; } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyDocumentsServiceImpl.java
@@ -10,6 +10,7 @@ import com.doumee.dao.business.model.Company; import com.doumee.dao.business.model.CompanyDocuments; import com.doumee.dao.business.model.Member; import com.doumee.dao.system.model.SystemUser; import com.doumee.service.business.CompanyDocumentsService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -120,7 +121,7 @@ throw new BusinessException(ResponseStatus.DATA_EMPTY); } if(StringUtils.isNotBlank(companyDocuments.getFileurl())){ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode() +systemDictDataBiz.queryByCode(Constants.FTP,Constants.COMPANY_DOCUMENTS).getCode(); companyDocuments.setFileurlFull(path + companyDocuments.getFileurl()); } @@ -148,8 +149,10 @@ queryWrapper.selectAll(CompanyDocuments.class) .selectAs(Company::getName,CompanyDocuments::getCompanyName) .selectAs(Category::getName,CompanyDocuments::getCategoryName) .selectAs(SystemUser::getRealname,CompanyDocuments::getCreatorName) .leftJoin(Company.class,Company::getId,CompanyDocuments::getCompanyId) .leftJoin(Category.class,Category::getId,CompanyDocuments::getCategoryId) .leftJoin(SystemUser.class,SystemUser::getId,CompanyDocuments::getCreator) .eq(CompanyDocuments::getIsdeleted,Constants.ZERO) .like(Objects.nonNull(queryModel)&&StringUtils.isNotBlank(queryModel.getName()),CompanyDocuments::getName,queryModel.getName()) .eq(Objects.nonNull(queryModel)&&Objects.nonNull(queryModel.getCategoryId()),CompanyDocuments::getCategoryId,queryModel.getCategoryId()) @@ -157,7 +160,7 @@ .orderByDesc(CompanyDocuments::getSortnum) .orderByDesc(CompanyDocuments::getCreateDate); IPage<CompanyDocuments> iPage = companyDocumentsMapper.selectJoinPage(page, CompanyDocuments.class,queryWrapper); String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode() +systemDictDataBiz.queryByCode(Constants.FTP,Constants.COMPANY_DOCUMENTS).getCode(); for (CompanyDocuments companyDocuments:iPage.getRecords()) { companyDocuments.setFileurlFull(path + companyDocuments.getFileurl()); server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
@@ -353,7 +353,7 @@ .leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId) .leftJoin("company t4 on t1.company_id=t4.id") .leftJoin("company t5 on t2.company_id=t5.id") .leftJoin("hidden_danger_param t6 on t2.check_type_id=t6.id"); .leftJoin("hidden_danger_param t6 on t.check_type_id=t6.id"); queryWrapper .eq(HiddenDanger::getId, id) .eq(HiddenDanger::getIsdeleted, Constants.ZERO) @@ -451,7 +451,7 @@ .leftJoin(Member.class,Member::getId,HiddenDanger::getCheckUserId) .leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId) .leftJoin("company t4 on t1.company_id=t4.id") .leftJoin("hidden_danger_param t6 on t2.check_type_id=t6.id") .leftJoin("hidden_danger_param t6 on t.check_type_id=t6.id") .leftJoin("company t5 on t2.company_id=t5.id"); //数据权限开始--------------------start----------------
