更新代码

src/main/java/com/postcard/service/moudle/park/controller/ParkInfoController.java

@@ -47,7 +47,7 @@ public class ParkInfoController {
 
   @GetMapping("/industryList")
   @ApiOperation(value = "主导产业查询条件")
-  public Set<String> industryList(){
+  public List<String> industryList(){
     return parkInfoService.getIndustryList();
   }
 

src/main/java/com/postcard/service/moudle/park/enums/PrimaryIndustryEnum.java

@@ -2,7 +2,7 @@ package com.postcard.service.moudle.park.enums;
 
 public enum PrimaryIndustryEnum {
 
-    EQUIPMENT("装备制造业","机械加工、新能源汽车零部件、高端装备制造、新能源汽车、汽车配件，钢结构、智能制造、汽车零部件、自动化设备、机械制造、机器人、仪器仪表、新能源、装备制造、时尚轻纺、儿童用品、工艺品、新型建材、整车拆解，再生利用，电池PACK，软连接，钣金件，线束，钢壳，盖帽，纸箱，电镀、包装、高端制造、轻工轻纺、汽车，机电一体化，新型材料、表面处理、机械加工、五金建材"),
+    EQUIPMENT("装备制造业","机械加工、新能源汽车零部件、高端装备制造、新能源汽车、汽车配件、钢结构、智能制造、汽车零部件、自动化设备、机械制造、机器人、仪器仪表、新能源、装备制造、时尚轻纺、儿童用品、工艺品、新型建材、整车拆解、再生利用、电池PACK、软连接、钣金件、线束、钢壳、盖帽、纸箱、电镀、包装、高端制造、轻工轻纺、汽车，机电一体化、新型材料、表面处理、机械加工、五金建材"),
     ELECTRONIC("电子信息产业","电子信息、锂电池、集成电路、新型显示、智能终端、光电显示、动力电池制造（回收、综合利用）、大数据服务、激光显示、新能源、家电与电子、电子零部件制造"),
     FOOD("农副食品加工产业","羽毛加工、食品加工、食品、轻工业");
 

src/main/java/com/postcard/service/moudle/park/service/ParkInfoService.java

@@ -45,7 +45,7 @@ public interface ParkInfoService extends IService<ParkInfo> {
      * @param: [id]
      * @return: com.lyy.admin.moudle.park.vo.ParkInfoAllVO
      **/
-    Set<String> getIndustryList();
+    List<String> getIndustryList();
 
     /**
      * @description:  查询园区的一级招商方向

src/main/java/com/postcard/service/moudle/park/service/impl/ParkInfoServiceImpl.java

@@ -89,11 +89,11 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo>
         parkInfoParam.setCoverAreaUnder(Double.valueOf(split[1]));
       }
     }
-   /* if(StringUtils.isNotBlank(parkInfoParam.getPrimaryIndustry())){
+    if(StringUtils.isNotBlank(parkInfoParam.getPrimaryIndustry())){
       String name = PrimaryIndustryEnum.getName(parkInfoParam.getPrimaryIndustry());
       String[] split = name.split("、");
       parkInfoParam.setPrimaryIndustryList(Arrays.asList(split));
-    }*/
+    }
     Page page = CommonUtil.getPageFromEntity(param);
     Page<ParkPageVo> pageInfo = this.baseMapper.pageList(page, parkInfoParam);
     log.info("park时间消耗：{}", timer.intervalRestart());
@@ -157,23 +157,11 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo>
 
 
   @Override
-  public Set<String> getIndustryList(){
-    /*DevelopmentInfo developmentInfo = developmentInfoService.getById(developmentId);
+  public List<String> getIndustryList(){
+    DevelopmentInfo developmentInfo = developmentInfoService.getById(developmentId);
     String primaryIndustry = developmentInfo.getPrimaryIndustry();
-    String[] split = primaryIndustry.split("、");*/
-    LambdaQueryWrapper<ParkInfo> parkQuery=new LambdaQueryWrapper<>();
-    parkQuery.eq(ParkInfo::getZoneId,developmentId);
-    List<ParkInfo> list = this.list(parkQuery);
-    Set<String> result=new LinkedHashSet<>();
-    list.forEach(data->{
-      String primaryIndustry = data.getPrimaryIndustry();
-      if(StringUtils.isNotBlank(primaryIndustry)){
-        String[] split = primaryIndustry.split("，");
-        List<String> splitInfo = Arrays.asList(split);
-        result.addAll(splitInfo);
-      }
-    });
-    return result;
+    String[] split = primaryIndustry.split("、");
+    return Arrays.asList(split);
   }
 
 

src/main/resources/application-dev.yml

@@ -29,7 +29,7 @@ spring:
 
 
   wxconfig:
-    appid: 123456
+    appid: wx6d541865055a52d7
     secret: 123456
     code2Session-url: https://api.weixin.qq.com/sns/jscode2session?appid=${spring.wxconfig.appid}&secret=${spring.wxconfig.secret}&grant_type=authorization_code&js_code=
     tokenUrl: https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=${spring.wxconfig.appid}&secret=${spring.wxconfig.secret}

src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ spring:
       connection-timeout: 10000
 
   wxconfig:
-    appid: 123456
+    appid: wx6d541865055a52d7
     secret: 123456
     code2Session-url: https://api.weixin.qq.com/sns/jscode2session?appid=${spring.wxconfig.appid}&secret=${spring.wxconfig.secret}&grant_type=authorization_code&js_code=
     tokenUrl: https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=${spring.wxconfig.appid}&secret=${spring.wxconfig.secret}

src/main/resources/application-test.yml

@@ -12,7 +12,7 @@ spring:
       connection-timeout: 10000
 
   wxconfig:
-    appid: 123456
+    appid: wx6d541865055a52d7
     secret: 123456
     code2Session-url: https://api.weixin.qq.com/sns/jscode2session?appid=${spring.wxconfig.appid}&secret=${spring.wxconfig.secret}&grant_type=authorization_code&js_code=
     tokenUrl: https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=${spring.wxconfig.appid}&secret=${spring.wxconfig.secret}
@@ -39,10 +39,6 @@ knife4j:
   # 开启增强配置
   enable: true
 
-business:
-  url:
-    thread: http://test.user.liyeyun.com/lyy/api/threadInfo/v1.0/save
-
 logging:
   level:
     com.postcard.service: debug

src/main/resources/mapper/park/ParkInfoMapper.xml

@@ -115,14 +115,14 @@
                     #{status}
                 </foreach>
             </if>
-           <!-- <if test="param.primaryIndustryList != null and param.primaryIndustryList.size() > 0 ">
+            <if test="param.primaryIndustryList != null and param.primaryIndustryList.size() > 0 ">
                 <foreach item="primaryIndustry" collection="param.primaryIndustryList" open=" and ( " separator="or" close=")">
                     primary_industry like concat('%', #{primaryIndustry}, '%')
                 </foreach>
-            </if>-->
-            <if test="param.primaryIndustry != null and param.primaryIndustry != ''">
-                AND primary_industry like concat('%', #{param.primaryIndustry}, '%')
             </if>
+            <!--<if test="param.primaryIndustry != null and param.primaryIndustry != ''">
+                AND primary_industry like concat('%', #{param.primaryIndustry}, '%')
+            </if>-->
             <if test="param.name != null and param.name != ''">
                 AND name like concat('%', #{param.name}, '%')
             </if>