dianliang/dl_admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
13405411873 2025-05-08 18:07:20 +08:00
parent bafb970fc4
commit 10cbfb8d6a
3 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java
View File

@ -139,16 +139,14 @@ public class BusiNoticeServiceImpl extends ServiceImpl<BusiNoticeMapper,BusiNoti
data.setApprovalTime(new Date()); data.setApprovalTime(new Date());
//遍历 list的每条数据与data对比，如果两条数据相似度大于70% 提出预警 //遍历 list的每条数据与data对比，如果两条数据相似度大于70% 提出预警
for (BusiNotice busiNotice : list) { for (BusiNotice busiNotice : list) {
String tempDetail1 = data.getDetail().replaceAll("<br>","").replaceAll("\n",""); if (StringUtils.isNotEmpty(data.getThirdUrl())&&StringUtils.isNotEmpty(busiNotice.getThirdUrl())){
String tempDetail2 = busiNotice.getDetail().replaceAll("<br>","").replaceAll("\n",""); if (data.getThirdUrl().equals(busiNotice.getThirdUrl())){
double v2 = NoticeUtils.computeJaccardSimilarity(tempDetail1, tempDetail2); //title 和 detail 相似度大于70% 待审核
if (v2>=0.7){ data.setApprovalStatus("0");
//title 和 detail 相似度大于70% 待审核 data.setSimilarityIds(Optional.ofNullable(data.getSimilarityIds()).orElse("")+busiNotice.getId()+",");
data.setApprovalStatus("0"); result.put("code",500);
data.setApprovalTime(null); result.put("msg","该通告已被人抢先一步上传，等待平台审核");
data.setSimilarityIds(Optional.ofNullable(data.getSimilarityIds()).orElse("")+busiNotice.getId()+","); }
result.put("code",500);
result.put("msg","该通告已被人抢先一步上传，等待平台审核");
} }
} }
if (StringUtils.isNotEmpty(data.getSimilarityIds())){ if (StringUtils.isNotEmpty(data.getSimilarityIds())){
@ -158,14 +156,16 @@ public class BusiNoticeServiceImpl extends ServiceImpl<BusiNoticeMapper,BusiNoti
data.setCreateTime(new Date()); data.setCreateTime(new Date());
this.save(data); this.save(data);
MemberUserVO memberUserVO = memberUserService.queryByUserId(SecurityUtils.getUserId(), "01"); MemberUserVO memberUserVO = memberUserService.queryByUserId(SecurityUtils.getUserId(), "01");
if(data.getApprovalStatus().equals("1")&&StringUtils.isNotEmpty(memberUserVO.getIdentityType())&&memberUserVO.getIdentityType().equals("05")){ if(data.getApprovalStatus().equals("1")) {
//如果审核通过 if (StringUtils.isNotEmpty(memberUserVO.getIdentityType()) && memberUserVO.getIdentityType().equals("05")){
//从配置表中获取积分 //如果审核通过
MemberPoints memberPoints =new MemberPoints(); //从配置表中获取积分
memberPoints.setUserId(SecurityUtils.getUserId()); MemberPoints memberPoints = new MemberPoints();
memberPoints.setType("1"); memberPoints.setUserId(SecurityUtils.getUserId());
memberPoints.setFromCode("fbgg"); memberPoints.setType("1");
memberPointsService.savePoints(memberPoints); memberPoints.setFromCode("fbgg");
memberPointsService.savePoints(memberPoints);
}
//若是急招扣除对应急招券 //若是急招扣除对应急招券
if (StringUtils.isNotEmpty(data.getIsUrgent())&&data.getIsUrgent().equals("1")){ if (StringUtils.isNotEmpty(data.getIsUrgent())&&data.getIsUrgent().equals("1")){
memberCouponService.saveCoupon( data.getUserId(), "2", data.getId(), 1); memberCouponService.saveCoupon( data.getUserId(), "2", data.getId(), 1);
@ -208,8 +208,7 @@ public class BusiNoticeServiceImpl extends ServiceImpl<BusiNoticeMapper,BusiNoti
//获取当前登录用户 //获取当前登录用户
data.setUserId(SecurityUtils.getUserId()); data.setUserId(SecurityUtils.getUserId());
if (StringUtils.isNotEmpty(data.getApprovalStatus())&&data.getApprovalStatus().equals("8")){ if (StringUtils.isNotEmpty(data.getApprovalStatus())&&data.getApprovalStatus().equals("8")){
//草稿数据直接保存
this.updateById(data);
result.put("code",100); result.put("code",100);
result.put("msg","草稿数据暂存成功"); result.put("msg","草稿数据暂存成功");
}else { }else {
@ -225,16 +224,14 @@ public class BusiNoticeServiceImpl extends ServiceImpl<BusiNoticeMapper,BusiNoti
data.setApprovalTime(new Date()); data.setApprovalTime(new Date());
//遍历 list的每条数据与data对比，如果两条数据相似度大于70% 提出预警 //遍历 list的每条数据与data对比，如果两条数据相似度大于70% 提出预警
for (BusiNotice busiNotice : list) { for (BusiNotice busiNotice : list) {
String tempDetail1 = data.getDetail().replaceAll("<br>","").replaceAll("\n",""); if (StringUtils.isNotEmpty(data.getThirdUrl())&&StringUtils.isNotEmpty(busiNotice.getThirdUrl())){
String tempDetail2 = busiNotice.getDetail().replaceAll("<br>","").replaceAll("\n",""); if (data.getThirdUrl().equals(busiNotice.getThirdUrl())){
double v2 = NoticeUtils.computeJaccardSimilarity(tempDetail1, tempDetail2); //title 和 detail 相似度大于70% 待审核
if (v2>=0.7){ data.setApprovalStatus("0");
//title 和 detail 相似度大于70% 待审核 data.setSimilarityIds(Optional.ofNullable(data.getSimilarityIds()).orElse("")+busiNotice.getId()+",");
data.setApprovalStatus("0"); result.put("code",500);
data.setApprovalTime(null); result.put("msg","该通告已被人抢先一步上传，等待平台审核");
data.setSimilarityIds(Optional.ofNullable(data.getSimilarityIds()).orElse("")+busiNotice.getId()+","); }
result.put("code",500);
result.put("msg","该通告已被人抢先一步上传，等待平台审核");
} }
} }
if (StringUtils.isNotEmpty(data.getSimilarityIds())){ if (StringUtils.isNotEmpty(data.getSimilarityIds())){
@ -260,7 +257,7 @@ public class BusiNoticeServiceImpl extends ServiceImpl<BusiNoticeMapper,BusiNoti
busiNoticeFormService.save(noticeForm); busiNoticeFormService.save(noticeForm);
} }
} }
result.put("noticeId",data.getId());
return result; return result;
} }
@ -329,12 +326,12 @@ public class BusiNoticeServiceImpl extends ServiceImpl<BusiNoticeMapper,BusiNoti
data.setApprovalStatus("1"); data.setApprovalStatus("1");
//遍历 list的每条数据与data对比，如果两条数据相似度大于70% 提出预警 //遍历 list的每条数据与data对比，如果两条数据相似度大于70% 提出预警
for (BusiNotice busiNotice : list) { for (BusiNotice busiNotice : list) {
double v1 = NoticeUtils.computeJaccardSimilarity(data.getTitle(), busiNotice.getTitle()); if (StringUtils.isNotEmpty(data.getThirdUrl())&&StringUtils.isNotEmpty(busiNotice.getThirdUrl())){
double v2 = NoticeUtils.computeJaccardSimilarity(data.getDetail(), busiNotice.getDetail()); if (data.getThirdUrl().equals(busiNotice.getThirdUrl())){
if (v1>=0.7&&v2>=0.7){ //title 和 detail 相似度大于70% 待审核
//title 和 detail 相似度大于70% 待审核 data.setApprovalStatus("0");
data.setApprovalStatus("0"); data.setSimilarityIds(Optional.ofNullable(data.getSimilarityIds()).orElse("")+busiNotice.getId()+",");
data.setSimilarityIds(Optional.ofNullable(data.getSimilarityIds()).orElse("")+busiNotice.getId()+","); }
} }
} }
if (StringUtils.isNotEmpty(data.getSimilarityIds())){ if (StringUtils.isNotEmpty(data.getSimilarityIds())){
@ -393,10 +390,14 @@ public class BusiNoticeServiceImpl extends ServiceImpl<BusiNoticeMapper,BusiNoti
@Override @Override
public IPage<BusiNoticeVo> queryAppListPage(AppNoticeQuery query, Page<BusiNotice> page) { public IPage<BusiNoticeVo> queryAppListPage(AppNoticeQuery query, Page<BusiNotice> page) {
if (ObjectUtil.isNotEmpty(query.getCityId())){ if (ObjectUtil.isNotEmpty(query.getCityId())){
BaseCity city = cityService.getById(query.getCityId()); LambdaQueryWrapper<BaseCity> queryWrapper =new LambdaQueryWrapper<>();
queryWrapper.eq(BaseCity::getCityId,query.getCityId()).last("limit 1");
BaseCity city = cityService.getOne(queryWrapper);
query.setCityName(city.getName()); query.setCityName(city.getName());
} }
IPage<BusiNoticeVo> pageList = busiNoticeMapper.queryAppListPage(query,page); IPage<BusiNoticeVo> pageList = busiNoticeMapper.queryAppListPage(query,page);
//打乱records的排列顺序
List<String> idList = pageList.getRecords().stream().map(BusiNotice::getId).collect(Collectors.toList()); List<String> idList = pageList.getRecords().stream().map(BusiNotice::getId).collect(Collectors.toList());
if(!idList.isEmpty()){ if(!idList.isEmpty()){
//查博主类型字典 //查博主类型字典

2
ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml
View File

@ -127,7 +127,7 @@ order by dbns.create_time desc
</when> </when>
<otherwise> <otherwise>
-- 默认正序排列 -- -- 默认正序排列 --
dbn.create_time DESC RAND()
</otherwise> </otherwise>
</choose> </choose>

2
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
View File

@ -117,7 +117,7 @@ public class SecurityConfig
.antMatchers("/base/category/getByCodeInfo").permitAll() .antMatchers("/base/category/getByCodeInfo").permitAll()
// 静态资源，可匿名访问 // 静态资源，可匿名访问
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").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() .antMatchers("/cos/sts").permitAll()
// 除上面外的所有请求全部需要鉴权认证 // 除上面外的所有请求全部需要鉴权认证
.anyRequest().authenticated(); .anyRequest().authenticated();