From 10cbfb8d6ac81f7aefabf3464c504941a0160be7 Mon Sep 17 00:00:00 2001 From: 13405411873 <1994398261@qq.com> Date: Thu, 8 May 2025 18:07:20 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BusiNoticeServiceImpl.java | 77 ++++++++++--------- .../mapper/busi/BusiNoticeMapper.xml | 2 +- .../framework/config/SecurityConfig.java | 2 +- 3 files changed, 41 insertions(+), 40 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java index dfebaac..86cd8b0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java @@ -139,16 +139,14 @@ public class BusiNoticeServiceImpl extends ServiceImpl","").replaceAll("\n",""); - String tempDetail2 = busiNotice.getDetail().replaceAll("
","").replaceAll("\n",""); - double v2 = NoticeUtils.computeJaccardSimilarity(tempDetail1, tempDetail2); - if (v2>=0.7){ - //title 和 detail 相似度大于70% 待审核 - data.setApprovalStatus("0"); - data.setApprovalTime(null); - data.setSimilarityIds(Optional.ofNullable(data.getSimilarityIds()).orElse("")+busiNotice.getId()+","); - result.put("code",500); - result.put("msg","该通告已被人抢先一步上传，等待平台审核"); + if (StringUtils.isNotEmpty(data.getThirdUrl())&&StringUtils.isNotEmpty(busiNotice.getThirdUrl())){ + if (data.getThirdUrl().equals(busiNotice.getThirdUrl())){ + //title 和 detail 相似度大于70% 待审核 + data.setApprovalStatus("0"); + data.setSimilarityIds(Optional.ofNullable(data.getSimilarityIds()).orElse("")+busiNotice.getId()+","); + result.put("code",500); + result.put("msg","该通告已被人抢先一步上传，等待平台审核"); + } } } if (StringUtils.isNotEmpty(data.getSimilarityIds())){ @@ -158,14 +156,16 @@ public class BusiNoticeServiceImpl extends ServiceImpl","").replaceAll("\n",""); - String tempDetail2 = busiNotice.getDetail().replaceAll("
","").replaceAll("\n",""); - double v2 = NoticeUtils.computeJaccardSimilarity(tempDetail1, tempDetail2); - if (v2>=0.7){ - //title 和 detail 相似度大于70% 待审核 - data.setApprovalStatus("0"); - data.setApprovalTime(null); - data.setSimilarityIds(Optional.ofNullable(data.getSimilarityIds()).orElse("")+busiNotice.getId()+","); - result.put("code",500); - result.put("msg","该通告已被人抢先一步上传，等待平台审核"); + if (StringUtils.isNotEmpty(data.getThirdUrl())&&StringUtils.isNotEmpty(busiNotice.getThirdUrl())){ + if (data.getThirdUrl().equals(busiNotice.getThirdUrl())){ + //title 和 detail 相似度大于70% 待审核 + data.setApprovalStatus("0"); + data.setSimilarityIds(Optional.ofNullable(data.getSimilarityIds()).orElse("")+busiNotice.getId()+","); + result.put("code",500); + result.put("msg","该通告已被人抢先一步上传，等待平台审核"); + } } } if (StringUtils.isNotEmpty(data.getSimilarityIds())){ @@ -260,7 +257,7 @@ public class BusiNoticeServiceImpl extends ServiceImpl=0.7&&v2>=0.7){ - //title 和 detail 相似度大于70% 待审核 - data.setApprovalStatus("0"); - data.setSimilarityIds(Optional.ofNullable(data.getSimilarityIds()).orElse("")+busiNotice.getId()+","); + if (StringUtils.isNotEmpty(data.getThirdUrl())&&StringUtils.isNotEmpty(busiNotice.getThirdUrl())){ + if (data.getThirdUrl().equals(busiNotice.getThirdUrl())){ + //title 和 detail 相似度大于70% 待审核 + data.setApprovalStatus("0"); + data.setSimilarityIds(Optional.ofNullable(data.getSimilarityIds()).orElse("")+busiNotice.getId()+","); + } } } if (StringUtils.isNotEmpty(data.getSimilarityIds())){ @@ -393,10 +390,14 @@ public class BusiNoticeServiceImpl extends ServiceImpl queryAppListPage(AppNoticeQuery query, Page page) { if (ObjectUtil.isNotEmpty(query.getCityId())){ - BaseCity city = cityService.getById(query.getCityId()); + LambdaQueryWrapper queryWrapper =new LambdaQueryWrapper<>(); + queryWrapper.eq(BaseCity::getCityId,query.getCityId()).last("limit 1"); + BaseCity city = cityService.getOne(queryWrapper); query.setCityName(city.getName()); } IPage pageList = busiNoticeMapper.queryAppListPage(query,page); + //打乱records的排列顺序 + List idList = pageList.getRecords().stream().map(BusiNotice::getId).collect(Collectors.toList()); if(!idList.isEmpty()){ //查博主类型字典 diff --git a/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml b/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml index 210336f..4b92739 100644 --- a/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml @@ -127,7 +127,7 @@ order by dbns.create_time desc -- 默认正序排列 -- - dbn.create_time DESC + RAND() diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index 73285e3..91b8afa 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -117,7 +117,7 @@ public class SecurityConfig .antMatchers("/base/category/getByCodeInfo").permitAll() // 静态资源，可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() - .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() + .antMatchers("/swagger-ui.html", "/system/config/configKey/isOpenZf","/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() .antMatchers("/cos/sts").permitAll() // 除上面外的所有请求全部需要鉴权认证 .anyRequest().authenticated();