【fix】优化代码，删掉不需要的内容

【modify】修改公告标题模糊查询的逻辑

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/TranslationAspect.java

@@ -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();

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/vo/SysDictItemCore.java

@@ -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)

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/Swagger2Config.java

@@ -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();

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/WebConfig.java

@@ -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);

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/filter/cors/CorsFilter.java

@@ -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;

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java

@@ -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());
+		String column = req.getParameter("column");
-		queryWrapper.like(StringUtils.isNotBlank(sysAnnouncement.getTitile())
+		String order = req.getParameter("order");
-				,SysAnnouncement::getTitile, sysAnnouncement.getTitile());
+		if(oConvertUtils.isNotEmpty(column) && oConvertUtils.isNotEmpty(order)) {
-		queryWrapper.orderByDesc(SysAnnouncement::getCreateTime);
+			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);

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncement.java

@@ -1,8 +1,6 @@
 package com.jero.modules.system.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 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;
     /**
      * 内容

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java

@@ -333,7 +333,6 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 				copyTreeSelectModel = newTreeSelectModel;
 			}
 		}
-		log.info("aaa");
 		List<TreeSelectModel> treeNodeList = getTreeSelectModels(resultMap);
 
 		return treeNodeList;