Skip to content

T
think-tank
提交 0f579943 作者: yuanhaojie
操作

Merge remote-tracking branch 'origin/yjzx_test' into yjzx_test

上级 91088bed f27a375f
正在显示 包含 138 行增加 和 51 行删除
pom.xml
...@@ -84,6 +84,13 @@ ...@@ -84,6 +84,13 @@
<version>1.2.83</version> <version>1.2.83</version>
</dependency> </dependency>
<!-- 注册中心-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
<version>2.1.5.RELEASE</version>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.data</groupId> <groupId>org.springframework.data</groupId>
<artifactId>spring-data-redis</artifactId> <artifactId>spring-data-redis</artifactId>
...@@ -139,7 +146,37 @@ ...@@ -139,7 +146,37 @@
</resource> </resource>
</resources> </resources>
</build> </build>
<!-- 环境 -->
<profiles>
<!-- 开发 -->
<profile>
<id>dev</id>
<activation>
<!--默认激活配置-->
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<!--当前环境-->
<profile.name>dev</profile.name>
</properties>
</profile>
<!-- 测试 -->
<profile>
<id>test</id>
<properties>
<!--当前环境-->
<profile.name>test</profile.name>
</properties>
</profile>
<!-- 生产 -->
<profile>
<id>prod</id>
<properties>
<!--当前环境,生产环境为空-->
<profile.name>prod</profile.name>
</properties>
</profile>
</profiles>
</project> </project>
src/main/java/com/zzsn/thinktank/ThinkTankApplication.java
...@@ -3,11 +3,13 @@ package com.zzsn.thinktank; ...@@ -3,11 +3,13 @@ package com.zzsn.thinktank;
import org.mybatis.spring.annotation.MapperScan; import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableAsync;
@SpringBootApplication @SpringBootApplication
//@EnableAsync //@EnableAsync
@MapperScan(value = {"com.zzsn.thinktank.mapper*"}) @MapperScan(value = {"com.zzsn.thinktank.mapper*"})
@EnableEurekaClient
public class ThinkTankApplication { public class ThinkTankApplication {
public static void main(String[] args) { public static void main(String[] args) {
......
src/main/java/com/zzsn/thinktank/service/impl/ThinktankBasicInfoServiceImpl.java
...@@ -758,62 +758,64 @@ public class ThinktankBasicInfoServiceImpl extends ServiceImpl<ThinktankBasicInf ...@@ -758,62 +758,64 @@ public class ThinktankBasicInfoServiceImpl extends ServiceImpl<ThinktankBasicInf
@Override @Override
public IPage<ThinktankBasicInfo> pageList(Page page, ThinktankBasicInfoListVo vo, HttpServletRequest req) throws Exception { public IPage<ThinktankBasicInfo> pageList(Page page, ThinktankBasicInfoListVo vo, HttpServletRequest req) throws Exception {
List<String> fieldTypeId = vo.getFieldTypeId();
List<String> regionalCountriesTypeId = vo.getRegionalCountriesTypeId();
List<String> regionalCountriesTypeIds = new ArrayList<>();
QueryWrapper<ThinktankBasicInfo> queryWrapper = new QueryWrapper<>(); QueryWrapper<ThinktankBasicInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("status",1); if(vo!=null){
if(vo!=null && StringUtils.isNotBlank(vo.getKeyword())){ List<String> fieldTypeId = vo.getFieldTypeId();
queryWrapper.and(wreapper->{ List<String> regionalCountriesTypeId = vo.getRegionalCountriesTypeId();
wreapper.like("chinese_whole",vo.getKeyword()); List<String> regionalCountriesTypeIds = new ArrayList<>();
wreapper.or(); queryWrapper.eq("status",1);
wreapper.like("chinese_simple",vo.getKeyword()); if(StringUtils.isNotBlank(vo.getKeyword())){
wreapper.or(); queryWrapper.and(wreapper->{
wreapper.like("english_whole",vo.getKeyword()); wreapper.like("chinese_whole",vo.getKeyword());
wreapper.or(); wreapper.or();
wreapper.like("english_simple",vo.getKeyword()); wreapper.like("chinese_simple",vo.getKeyword());
wreapper.or(); wreapper.or();
wreapper.like("tag_name",vo.getKeyword()); wreapper.like("english_whole",vo.getKeyword());
wreapper.or(); wreapper.or();
wreapper.like("belong_country",vo.getKeyword()); wreapper.like("english_simple",vo.getKeyword());
wreapper.or(); wreapper.or();
wreapper.like("biographical_notes",vo.getKeyword()); wreapper.like("tag_name",vo.getKeyword());
}); wreapper.or();
} wreapper.like("belong_country",vo.getKeyword());
if(fieldTypeId!=null && fieldTypeId.size()>0){ wreapper.or();
queryWrapper.and(wreapper->{ wreapper.like("biographical_notes",vo.getKeyword());
for(int i=0;i<fieldTypeId.size();i++){ });
wreapper.like("tag_id",fieldTypeId.get(i)); }
if(i != fieldTypeId.size()-1){ if(fieldTypeId!=null && fieldTypeId.size()>0){
wreapper.or(); queryWrapper.and(wreapper->{
for(int i=0;i<fieldTypeId.size();i++){
wreapper.like("tag_id",fieldTypeId.get(i));
if(i != fieldTypeId.size()-1){
wreapper.or();
}
} }
} });
}); }
} if(regionalCountriesTypeId!=null && regionalCountriesTypeId.size()>0){
if(regionalCountriesTypeId!=null && regionalCountriesTypeId.size()>0){ for(String id:regionalCountriesTypeId){
for(String id:regionalCountriesTypeId){ SysBaseRegion region = sysBaseRegionService.getById(id);
SysBaseRegion region = sysBaseRegionService.getById(id); if(region!=null && region.getLevelId()!=null && region.getLevelId().equals("country")){
if(region!=null && region.getLevelId()!=null && region.getLevelId().equals("country")){ regionalCountriesTypeIds.add(id);
regionalCountriesTypeIds.add(id); }else if(region!=null && region.getLevelId()!=null && region.getLevelId().equals("continent")){
}else if(region!=null && region.getLevelId()!=null && region.getLevelId().equals("continent")){ QueryWrapper<SysBaseRegion> query = new QueryWrapper<>();
QueryWrapper<SysBaseRegion> query = new QueryWrapper<>(); query.eq("pid","id");
query.eq("pid","id"); List<SysBaseRegion> list = sysBaseRegionService.list(query);
List<SysBaseRegion> list = sysBaseRegionService.list(query); for(SysBaseRegion obj:list){
for(SysBaseRegion obj:list){ regionalCountriesTypeIds.add(obj.getId());
regionalCountriesTypeIds.add(obj.getId()); }
} }
} }
} }
} if(regionalCountriesTypeIds!=null && regionalCountriesTypeIds.size()>0){
if(regionalCountriesTypeIds!=null && regionalCountriesTypeIds.size()>0){ queryWrapper.and(wreapper->{
queryWrapper.and(wreapper->{ for(int i=0;i<regionalCountriesTypeIds.size();i++){
for(int i=0;i<regionalCountriesTypeIds.size();i++){ wreapper.like("belong_country_id",regionalCountriesTypeIds.get(i));
wreapper.like("belong_country_id",regionalCountriesTypeIds.get(i)); if(i != regionalCountriesTypeIds.size()-1){
if(i != regionalCountriesTypeIds.size()-1){ wreapper.or();
wreapper.or(); }
} }
} });
}); }
} }
queryWrapper.orderByDesc("update_time"); queryWrapper.orderByDesc("update_time");
return this.getBaseMapper().selectPage(page,queryWrapper); return this.getBaseMapper().selectPage(page,queryWrapper);
......
src/main/resources/application-dev.yml 0 → 100644
eureka:
instance:
#注册到注册中心通过Feign调用时，hostname必须是服务器ip
hostname: 114.115.141.81
instance-id: 114.115.141.81:9099
prefer-ip-address: false
client:
register-with-eureka: true
fetch-registry: false
service-url:
defaultZone: http://sasac:Sasac09ckJHyujT!W@192.168.200.226:8017/eureka/
src/main/resources/application-prod.yml 0 → 100644
#eureka:
# instance:
# #注册到注册中心通过Feign调用时，hostname必须是服务器ip
# hostname: 114.116.39.74
# instance-id: 114.116.39.74:8071
# prefer-ip-address: false
# client:
# register-with-eureka: true
# fetch-registry: false
# service-url:
# defaultZone: http://sasac:Sasac09ckJHyuj@172.16.33.129:8761/eureka/
\ No newline at end of file
src/main/resources/application-test.yml 0 → 100644
#eureka:
# instance:
# #注册到注册中心通过Feign调用时，hostname必须是服务器ip
# hostname: 114.115.141.81
# instance-id: 114.115.141.81:8071
# prefer-ip-address: false
# client:
# register-with-eureka: true
# fetch-registry: false
# service-url:
# # defaultZone: http://admin:admin321@27.189.2.43:8761/eureka/
# # 四期
# # defaultZone: http://sasac:Sasac09ckJHyuj@106.38.99.147:20717/eureka/
# # 三期
# # defaultZone: http://admin:admin321sasac@106.38.99.147:20543/eureka/
# # 五期（测试环境）
# defaultZone: http://sasac:Sasac09ckJHyujT!W@106.38.99.147:20591/eureka/
\ No newline at end of file
src/main/resources/application.yml
...@@ -4,6 +4,10 @@ server: ...@@ -4,6 +4,10 @@ server:
# context-path: /thinktank # context-path: /thinktank
spring: spring:
profiles:
active: @profile.name@
application:
name: think-tank
servlet: servlet:
multipart: multipart:
#单个上传文件大小 #单个上传文件大小
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论