更新代码

src/main/java/com/postcard/service/config/auth/CurrentUserInterceptor.java

@@ -18,7 +18,7 @@ public class CurrentUserInterceptor implements AsyncHandlerInterceptor {
   @Override
   public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
       throws Exception {
-    // 从header中获取权限请求头
+    /*// 从header中获取权限请求头
     String authToken = request.getHeader(Constants.TOKEN_HEADER);
     if (StringUtils.isBlank(authToken)) {
       throw new AuthException("未授权，请重新登录");
@@ -27,7 +27,7 @@ public class CurrentUserInterceptor implements AsyncHandlerInterceptor {
     JwtInfo jwtUser = JwtTokenUtil.getJwtUser(token);
 
     // 根据token信息，生成当前登录用户信息的设置，存放容器threadlocal
-    BaseContextHandler.setCurrentUserInfo(jwtUser);
+    BaseContextHandler.setCurrentUserInfo(jwtUser);*/
     return true;
   }
 

src/main/java/com/postcard/service/config/auth/WebConfig.java

 package com.postcard.service.config.auth;
 
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.StringHttpMessageConverter;
+import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import java.nio.charset.StandardCharsets;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -33,6 +46,29 @@ public class WebConfig implements WebMvcConfigurer {
         .excludePathPatterns(getExcludePathPatterns());
   }
 
+  @Override
+  public void extendMessageConverters(List<HttpMessageConverter<?>> converters) {
+    MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
+
+    //localDateTime格式化
+    JavaTimeModule module = new JavaTimeModule();
+    LocalDateTimeDeserializer dateTimeDeserializer = new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+    LocalDateTimeSerializer dateTimeSerializer = new LocalDateTimeSerializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+    module.addDeserializer(LocalDateTime.class, dateTimeDeserializer);
+    module.addSerializer(LocalDateTime.class, dateTimeSerializer);
+    ObjectMapper objectMapper = Jackson2ObjectMapperBuilder.json().modules(module)
+            .featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS).build();
+
+    //date时间格式化
+    objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+    objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+
+    // 设置格式化内容
+    converter.setObjectMapper(objectMapper);
+    converters.add(0, converter);
+
+  }
+
   @Override
   public void addResourceHandlers(ResourceHandlerRegistry registry) {
     registry.addResourceHandler("/**").addResourceLocations("classpath:/static/");

src/main/java/com/postcard/service/moudle/carrier/dto/CarrierPageDto.java

@@ -31,7 +31,7 @@ public class CarrierPageDto {
   private String typeInfo;
 
   @ApiModelProperty(value = "建筑结构")
-  private String carrierConstruction;
+  private String structure;
 
   @ApiModelProperty(hidden = true)
   private Double lowCarrierArea;
@@ -42,6 +42,10 @@ public class CarrierPageDto {
   //数据库映射字段
   @ApiModelProperty(hidden = true)
   private List<String> carrierType;
-
+  @ApiModelProperty(hidden = true)
   private Integer developmentId;
+  @ApiModelProperty(hidden = true)
+  private Integer parkId;
+
+
 }

src/main/java/com/postcard/service/moudle/carrier/vo/CarrierPageVo.java

@@ -33,7 +33,7 @@ public class CarrierPageVo {
     private String imgUrl;
 
     @ApiModelProperty(value = "建筑结构")
-    private String carrierConstruction;
+    private String structure;
 
     @ApiModelProperty(value = "经度（坐标系gcj02）")
     private BigDecimal longitude;

src/main/java/com/postcard/service/moudle/development/controller/DevelopmentInfoController.java

@@ -14,7 +14,7 @@ import java.util.Arrays;
 
 @RestController
 @RequestMapping("/api/developmentInfo/v1.0")
-@Api(tags = "开发区信息和首页视频图片")
+@Api(tags = "开发区信息和首页")
 @Slf4j
 public class DevelopmentInfoController {
 
@@ -30,6 +30,7 @@ public class DevelopmentInfoController {
 
     @GetMapping("/detail/{id}")
     @ApiOperation(value = "开发区-招商引资")
+    @ApiImplicitParam(name = "id", value = "开发信息id", type = "Integer")
     public DevelopmentDetailVo detail(){
         return developmentInfoSerivce.detail();
     }

src/main/java/com/postcard/service/moudle/land/controller/LandInfoController.java

@@ -29,13 +29,14 @@ public class LandInfoController {
 
 
   @PostMapping("/page")
-  @ApiOperation(value = "土地分页信息")
+  @ApiOperation(value = "分页查询")
   public Page<LandPageVo> page(@RequestBody ParamEntity<LandPageDto> param){
 
     return landInfoService.pageInfo(param);
   }
 
   @GetMapping("/detail/{id}")
+  @ApiOperation(value = "土地详情")
   @ApiImplicitParam(name = "id", value = "土地详情", type = "Integer")
   public LandDetailVo detail(@PathVariable Integer id){
     return landInfoService.detail(id);

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

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
 
 
 @RestController
@@ -33,7 +34,7 @@ public class ParkInfoController {
   ParkInfoService parkInfoService;
 
   @PostMapping("/page")
-  @ApiOperation(value = "园区列表信息")
+  @ApiOperation(value = "分页查询")
   public Page<ParkPageVo> page(@RequestBody ParamEntity<ParkPageDto> param){
     TimeInterval timer = DateUtil.timer();
     ParkPageDto parkInfoParam = param.getCondition();
@@ -46,7 +47,7 @@ public class ParkInfoController {
 
   @GetMapping("/industryList")
   @ApiOperation(value = "主导产业查询条件")
-  public List<String> industryList(){
+  public Set<String> industryList(){
     return parkInfoService.getIndustryList();
   }
 

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

@@ -14,6 +14,7 @@ import com.postcard.service.moudle.park.vo.ParkPageVo;
 import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * @author 26996
@@ -44,7 +45,7 @@ public interface ParkInfoService extends IService<ParkInfo> {
      * @param: [id]
      * @return: com.lyy.admin.moudle.park.vo.ParkInfoAllVO
      **/
-    List<String> getIndustryList();
+    Set<String> getIndustryList();
 
     /**
      * @description:  查询园区的一级招商方向

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

@@ -66,7 +66,7 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo>
   private CarrierInfoService carrierInfoService;
   @Autowired
   private DevelopmentInfoService developmentInfoService;
-  
+
   @Value("${development.id}")
   private Integer developmentId;
 
@@ -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,12 +157,23 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo>
 
 
   @Override
-//  public List<ParkIndustryVo> getIndustryList(){
-  public List<String> getIndustryList(){
-    DevelopmentInfo developmentInfo = developmentInfoService.getById(developmentId);
+  public Set<String> getIndustryList(){
+    /*DevelopmentInfo developmentInfo = developmentInfoService.getById(developmentId);
     String primaryIndustry = developmentInfo.getPrimaryIndustry();
-    String[] split = primaryIndustry.split("、");
-    return Arrays.asList(split);
+    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;
   }
 
 

src/main/java/com/postcard/service/moudle/system/controller/InvestClueInfoController.java

 package com.postcard.service.moudle.system.controller;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.postcard.service.config.auth.BaseContextHandler;
 import com.postcard.service.domain.ParamEntity;
+import com.postcard.service.moudle.system.dto.InvestClueInfoSave;
 import com.postcard.service.moudle.system.dto.InvestCluePageDto;
 import com.postcard.service.moudle.system.entity.InvestClueInfoEntity;
+import com.postcard.service.moudle.system.vo.InvestClueInfoPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +20,7 @@ import com.postcard.service.moudle.system.service.InvestClueInfoService;
  * @createTime: 2023/12/16 11:47
  * @description: 投资舒城 投资线索表
  */
-@Api(tags = "投资舒城 投资线索表对象功能接口")
+@Api(tags = "投资舒城—》新增和列表")
 @RestController
 @RequestMapping("/api/investClueInfo")
 public class InvestClueInfoController {
@@ -25,9 +28,10 @@ public class InvestClueInfoController {
 
   @PostMapping("/save")
   @ApiOperation(value = "投资线索保存")
-  public boolean save(@RequestBody InvestClueInfoEntity investClueInfo) {
-    investClueInfo.setUserId(BaseContextHandler.getCurrentUserInfo().getUserId());
-    return this.investClueInfoService.save(investClueInfo);
+  public boolean save(@RequestBody InvestClueInfoSave investClueInfo) {
+    InvestClueInfoEntity investClueInfoEntity = BeanUtil.toBean(investClueInfo, InvestClueInfoEntity.class);
+    investClueInfoEntity.setUserId(BaseContextHandler.getCurrentUserInfo().getUserId());
+    return this.investClueInfoService.save(investClueInfoEntity);
   }
 
   @PostMapping("/page")

src/main/java/com/postcard/service/moudle/system/controller/ScSourceInfoController.java

@@ -15,7 +15,7 @@ import java.util.Map;
  * @createTime: 2023/12/16 17:07
  * @description: 舒城静态资源数据
  */
-@Api(tags = "舒城静态资源数据对象功能接口")
+@Api(tags = "投资舒城-》联系我们")
 @RestController
 @RequestMapping("/api/scSourceInfo")
 public class ScSourceInfoController {

src/main/java/com/postcard/service/moudle/system/controller/SysDictDataController.java

@@ -20,7 +20,7 @@ import java.util.List;
  * @createTime: 2023/11/22 11:19
  * @description: 字典表
  */
-@Api(tags = "字典表对象功能接口")
+@Api(tags = "字典接口")
 @RestController
 @RequestMapping("/api/sysDictData")
 @RequiredArgsConstructor
@@ -40,7 +40,7 @@ public class SysDictDataController {
           notes = "园区（产业园级别:park_level；招商方向：park_direction；产业园面积：park_area；产业资源：park_resources；产业政策：industry_policy）" +
                   "开发区（开发区级别：development_level；开发区类型：development_type；招商方向：development_direction；开发区面积：development_area；产业政策：industry_policy" +
                   "土地（土地价格：land_price；土地类型：land_type；土地面积：land_area；）" +
-                  "载体（载体面积：carrier_area；载体类型：carrier_type；建筑结构：carrier_construction；标准层高：floor_height；标准承重：load_bearing；柱距：pillar_distance）")
+                  "载体（载体面积：carrier_area；载体类型：carrier_type；建筑结构：carrier_construction；标准层高：floor_height；标准承重：load_bearing；柱距：pillar_distance;咨询类型：invest_type）")
   @ApiImplicitParam(name = "code", value = "字典查询关键词，以英文逗号拼接", type = "String")
   public JSONObject listByCodes(String code) {
     TimeInterval timer = DateUtil.timer();

src/main/java/com/postcard/service/moudle/system/dto/InvestClueInfoSave.java

+package com.postcard.service.moudle.system.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+/**
+ * @Author:zhouxudong
+ * @version: 1.0
+ * @Date: 2023/12/17 11:13
+ * @Description:
+ */
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+public class InvestClueInfoSave {
+    /** 咨询类型 */
+    @ApiModelProperty(name = "咨询类型", notes = "")
+    private Integer consultType;
+    /** 所属企业 */
+    @ApiModelProperty(name = "所属企业", notes = "")
+    private String company;
+    /** 姓名 */
+    @ApiModelProperty(name = "姓名", notes = "")
+    private String name;
+    /** 邮箱 */
+    @ApiModelProperty(name = "邮箱", notes = "")
+    private String email;
+    /** 需求描述 */
+    @ApiModelProperty(name = "需求描述", notes = "")
+    private String details;
+    /** 手机号 */
+    @ApiModelProperty(name = "手机号", notes = "")
+    private String phone;
+}

src/main/java/com/postcard/service/moudle/system/entity/InvestClueInfoEntity.java

@@ -26,7 +26,7 @@ import java.util.Date;
 @ToString
 public class InvestClueInfoEntity extends BaseEntity implements Serializable {
   /** 用户id */
-  @ApiModelProperty(name = "用户id", notes = "")
+  @ApiModelProperty(name = "用户id", hidden=true,notes = "")
   private Long userId;
   /** 咨询类型 */
   @ApiModelProperty(name = "咨询类型", notes = "")
@@ -47,7 +47,7 @@ public class InvestClueInfoEntity extends BaseEntity implements Serializable {
   @ApiModelProperty(name = "手机号", notes = "")
   private String phone;
 
-  @ApiModelProperty(name = "咨询类型名称", notes = "")
+  @ApiModelProperty(name = "咨询类型名称",hidden=true, notes = "")
   @TableField(exist = false)
   private String consultTypeName;
 }

src/main/java/com/postcard/service/moudle/system/service/InvestClueInfoService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.postcard.service.domain.ParamEntity;
 import com.postcard.service.moudle.system.dto.InvestCluePageDto;
 import com.postcard.service.moudle.system.entity.InvestClueInfoEntity;
+import com.postcard.service.moudle.system.vo.InvestClueInfoPage;
 
 /**
  * 投资舒城 投资线索表;(invest_clue_info)表服务接口

src/main/java/com/postcard/service/moudle/system/service/impl/InvestClueInfoServiceImpl.java

@@ -10,6 +10,7 @@ import com.postcard.service.moudle.system.dto.InvestCluePageDto;
 import com.postcard.service.moudle.system.entity.InvestClueInfoEntity;
 import com.postcard.service.moudle.system.entity.SysDictDataEntity;
 import com.postcard.service.moudle.system.service.SysDictDataService;
+import com.postcard.service.moudle.system.vo.InvestClueInfoPage;
 import com.postcard.service.util.CommonUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -48,7 +49,7 @@ public class InvestClueInfoServiceImpl
     records.forEach(
         data -> {
           data.setConsultTypeName(
-              stringSysDictDataEntityMap.get(data.getConsultType()).getDetail());
+              stringSysDictDataEntityMap.get(data.getConsultType().toString()).getDetail());
         });
     return pageInfo;
   }

src/main/java/com/postcard/service/moudle/system/vo/InvestClueInfoPage.java

+package com.postcard.service.moudle.system.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+/**
+ * @Author:zhouxudong
+ * @version: 1.0
+ * @Date: 2023/12/17 11:20
+ * @Description:
+ */
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+public class InvestClueInfoPage {
+    /** 所属企业 */
+    @ApiModelProperty(name = "所属企业", notes = "")
+    private String company;
+    /** 姓名 */
+    @ApiModelProperty(name = "姓名", notes = "")
+    private String name;
+    /** 邮箱 */
+    @ApiModelProperty(name = "邮箱", notes = "")
+    private String email;
+    /** 需求描述 */
+    @ApiModelProperty(name = "需求描述", notes = "")
+    private String details;
+    /** 手机号 */
+    @ApiModelProperty(name = "手机号", notes = "")
+    private String phone;
+    @ApiModelProperty(name = "咨询类型", notes = "")
+    private Integer consultType;
+    @ApiModelProperty(name = "咨询类型名称", notes = "")
+    @TableField(exist = false)
+    private String consultTypeName;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(name = "手机号", notes = "")
+    private LocalDateTime createTime;
+}

src/main/resources/mapper/carrier/CarrierInfoMapper.xml

@@ -37,6 +37,7 @@
         left join park_info b on a.park_id=b.id
         left join development_info c on c.id=b.zone_id
         <where>
+            1=1
             <if test="param.name != null and param.name != ''">
                 AND CONCAT( REPLACE(b.province_name,'省',''), REPLACE(b.city_name,'市',''),b.region_name,b.name,case when a.area is null then '' else CONCAT(ROUND(a.area,0),'㎡') end ,a.type) LIKE concat('%', #{param.name}, '%')
             </if>
@@ -48,8 +49,8 @@
                 </foreach>
             </if>
             /*建筑结构*/
-            <if test="param.carrierConstruction != null and param.carrierConstruction != ''">
-                AND a.structure=#{param.carrierConstruction}
+            <if test="param.structure != null and param.structure != ''">
+                AND a.structure=#{param.structure}
             </if>
             <if test="param.developmentId != null and param.developmentId != ''">
                 AND c.id=#{param.developmentId}

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

@@ -106,7 +106,7 @@
             city_name,region_code,region_name,
             status,primary_industry,level_code,
             level_name,cover_area,img_url,longitude,latitude
-        from park_info pi
+        from park_info
         <where>
             1 = 1
             <if test="param.statusList != null and param.statusList.size() > 0 ">
@@ -115,28 +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.provinceName != null and param.provinceName != ''">-->
-<!--                AND province_name=#{param.provinceName}-->
-<!--            </if>-->
-<!--            <if test="param.cityName != null and param.cityName != ''">-->
-<!--                AND city_name=#{param.cityName}-->
-<!--            </if>-->
-<!--            <if test="param.regionName != null and param.regionName != ''">-->
-<!--                AND region_name=#{param.regionName}-->
-<!--            </if>-->
-<!--            <if test="param.levelName != null and param.levelName != ''">-->
-<!--                AND level_name=#{param.levelName}-->
-<!--            </if>-->
-<!--            <if test="param.investmentDirection != null and param.investmentDirection != ''">-->
-<!--                /*招商方向*/-->
-<!--                AND id in (SELECT b.park_id FROM park_investment_direction_info b WHERE b.industrial_track =-->
-<!--                #{param.investmentDirection})-->
-<!--            </if>-->
             <if test="param.name != null and param.name != ''">
                 AND name like concat('%', #{param.name}, '%')
             </if>