【fix】优化代码，删掉不需要的内容
【modify】修改公告标题模糊查询的逻辑
This commit is contained in:
zer0Black
-1
@@ -162,7 +162,6 @@ public class TranslationAspect {
|
||||
if (!StringUtils.isEmpty(table)){
|
||||
tmpValue = commonAPI.queryTableDictTextByKey(table,text,code,k.trim());
|
||||
}else {
|
||||
// tmpValue = dictService.queryDictTextByKey(code, k.trim());
|
||||
List<SysDictItemCore> listNew = listDict.stream().filter(o-> Objects.equals(o.getDictCode(),code) && Objects.equals(o.getItemValue(),k.trim())).collect(Collectors.toList());
|
||||
if(!CollectionUtils.isEmpty(listNew)){
|
||||
tmpValue = listNew.get(0).getItemText();
|
||||
|
||||
+1
-8
@@ -12,14 +12,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
*
|
||||
* </p>
|
||||
*
|
||||
* @Author zhangweijian
|
||||
* @since 2018-12-28
|
||||
*/
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Accessors(chain = true)
|
||||
|
||||
-18
@@ -12,10 +12,8 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
|
||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
||||
import springfox.bean.validators.configuration.BeanValidatorPluginsConfiguration;
|
||||
import springfox.documentation.builders.ApiInfoBuilder;
|
||||
import springfox.documentation.builders.ParameterBuilder;
|
||||
import springfox.documentation.builders.PathSelectors;
|
||||
import springfox.documentation.builders.RequestHandlerSelectors;
|
||||
import springfox.documentation.schema.ModelRef;
|
||||
import springfox.documentation.service.*;
|
||||
import springfox.documentation.spi.DocumentationType;
|
||||
import springfox.documentation.spi.service.contexts.SecurityContext;
|
||||
@@ -79,19 +77,6 @@ public class Swagger2Config implements WebMvcConfigurer {
|
||||
SecurityScheme securityScheme() {
|
||||
return new ApiKey(CommonConstant.X_ACCESS_TOKEN, CommonConstant.X_ACCESS_TOKEN, "header");
|
||||
}
|
||||
/**
|
||||
* JWT token
|
||||
* @return
|
||||
* @deprecated 未调用
|
||||
*/
|
||||
@Deprecated
|
||||
private List<Parameter> setHeaderToken() {
|
||||
ParameterBuilder tokenPar = new ParameterBuilder();
|
||||
List<Parameter> pars = new ArrayList<>();
|
||||
tokenPar.name(CommonConstant.X_ACCESS_TOKEN).description("token").modelRef(new ModelRef("string")).parameterType("header").required(false).build();
|
||||
pars.add(tokenPar.build());
|
||||
return pars;
|
||||
}
|
||||
|
||||
/**
|
||||
* api文档的详细信息函数,注意这里的注解引用的是哪个
|
||||
@@ -104,11 +89,8 @@ public class Swagger2Config implements WebMvcConfigurer {
|
||||
.title("jero-boot 后台服务API接口文档")
|
||||
// 版本号
|
||||
.version("1.0")
|
||||
// .termsOfServiceUrl("NO terms of service")
|
||||
// 描述
|
||||
.description("后台API接口")
|
||||
// 作者
|
||||
.contact("JERO团队")
|
||||
.license("The Apache License, Version 2.0")
|
||||
.licenseUrl("http://www.apache.org/licenses/LICENSE-2.0.html")
|
||||
.build();
|
||||
|
||||
+1
-1
@@ -43,7 +43,7 @@ public class WebConfig {
|
||||
@Bean
|
||||
public FilterRegistrationBean<CorsFilter> corsFilter() {
|
||||
FilterRegistrationBean<CorsFilter> registration = new FilterRegistrationBean<>();
|
||||
registration.setFilter(new CorsFilter(originIp,notFilter));
|
||||
registration.setFilter(new CorsFilter(originIp, notFilter));
|
||||
registration.addUrlPatterns("/*");
|
||||
registration.setName("corsFilter");
|
||||
registration.setOrder(2);
|
||||
|
||||
+1
-1
@@ -39,7 +39,7 @@ public class CorsFilter implements Filter {
|
||||
HttpServletRequest req = (HttpServletRequest) request;
|
||||
|
||||
final String origin = ((HttpServletRequest) request).getHeader("Origin");
|
||||
//请求头与系统的origin不通则咔嚓
|
||||
//请求头与系统的origin不同则咔嚓
|
||||
String[] split = originIp.split(",");
|
||||
if (Objects.nonNull(origin) && !ArrayUtils.contains(split,origin)){
|
||||
return;
|
||||
|
||||
+11
-5
@@ -90,12 +90,18 @@ public class SysAnnouncementController {
|
||||
HttpServletRequest req) {
|
||||
Results<IPage<SysAnnouncement>> result = new Results<>();
|
||||
sysAnnouncement.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
|
||||
QueryWrapper<SysAnnouncement> queryWrapper = new QueryWrapper<>(sysAnnouncement);
|
||||
Page<SysAnnouncement> page = new Page<>(pageNo,pageSize);
|
||||
LambdaQueryWrapper<SysAnnouncement> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.eq(SysAnnouncement::getDelFlag, sysAnnouncement.getDelFlag());
|
||||
queryWrapper.like(StringUtils.isNotBlank(sysAnnouncement.getTitile())
|
||||
,SysAnnouncement::getTitile, sysAnnouncement.getTitile());
|
||||
queryWrapper.orderByDesc(SysAnnouncement::getCreateTime);
|
||||
//排序逻辑 处理
|
||||
String column = req.getParameter("column");
|
||||
String order = req.getParameter("order");
|
||||
if(oConvertUtils.isNotEmpty(column) && oConvertUtils.isNotEmpty(order)) {
|
||||
if("asc".equals(order)) {
|
||||
queryWrapper.orderByAsc(oConvertUtils.camelToUnderline(column));
|
||||
}else {
|
||||
queryWrapper.orderByDesc(oConvertUtils.camelToUnderline(column));
|
||||
}
|
||||
}
|
||||
IPage<SysAnnouncement> pageList = sysAnnouncementService.page(page, queryWrapper);
|
||||
result.setSuccess(true);
|
||||
result.setResult(pageList);
|
||||
|
||||
+2
-3
@@ -1,8 +1,6 @@
|
||||
package com.jero.modules.system.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.jero.common.aspect.annotation.Dict;
|
||||
import lombok.Data;
|
||||
@@ -31,6 +29,7 @@ public class SysAnnouncement implements Serializable {
|
||||
* 标题
|
||||
*/
|
||||
@Excel(name = "标题", width = 15)
|
||||
@TableField(condition = SqlCondition.LIKE)
|
||||
private java.lang.String titile;
|
||||
/**
|
||||
* 内容
|
||||
|
||||
-1
@@ -333,7 +333,6 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
|
||||
copyTreeSelectModel = newTreeSelectModel;
|
||||
}
|
||||
}
|
||||
log.info("aaa");
|
||||
List<TreeSelectModel> treeNodeList = getTreeSelectModels(resultMap);
|
||||
|
||||
return treeNodeList;
|
||||
|
||||
Reference in New Issue
Block a user