diff --git a/src/main/java/com/example/backend/config/SecurityConfig.java b/src/main/java/com/example/backend/config/SecurityConfig.java index 61640695..37153a37 100644 --- a/src/main/java/com/example/backend/config/SecurityConfig.java +++ b/src/main/java/com/example/backend/config/SecurityConfig.java @@ -26,7 +26,8 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti .csrf().disable() // 设置白名单 .authorizeHttpRequests() - .requestMatchers("/auth/**") + .requestMatchers("/auth/**", "/map/**", "/service/**", + "/forum/**", "/photo/**", "/ps-rel/**", "/user/**") .permitAll() // 保护剩余请求 .anyRequest() diff --git a/src/main/java/com/example/backend/controller/PinController.java b/src/main/java/com/example/backend/controller/PinController.java index 85f07b7c..eaffb289 100644 --- a/src/main/java/com/example/backend/controller/PinController.java +++ b/src/main/java/com/example/backend/controller/PinController.java @@ -37,8 +37,8 @@ public CommonResult insertPin(@RequestBody Pin pin) { } @RequestMapping("/pin_search") - public CommonResult searchPin(@RequestBody Text text) { - ArrayList pins = pinService.searchPin(text.getSearchContext()); + public CommonResult searchPin(@RequestBody Text text, @RequestParam(name = "id") Integer id) { + ArrayList pins = pinService.searchPin(text.getSearchContext(), id); if (pins == null || pins.size() == 0) return CommonResult.failed("搜索不到包含字段 '" + text.getSearchContext() + "' 的数据"); SearchInfo searchInfo = new SearchInfo(); diff --git a/src/main/java/com/example/backend/domain/Pin.java b/src/main/java/com/example/backend/domain/Pin.java index 63271711..302212a7 100644 --- a/src/main/java/com/example/backend/domain/Pin.java +++ b/src/main/java/com/example/backend/domain/Pin.java @@ -52,6 +52,11 @@ public class Pin implements Serializable { */ private String phone; + /** + * 地点联系电话 + */ + private String visibility; + /** * 用户id,个人用户创建pin为私有的,管理员创建pin为公开的 */ @@ -100,6 +105,10 @@ public String getPhone() { return phone; } + public String getVisibility() { + return visibility; + } + public Integer getUser_id() { return user_id; } @@ -140,6 +149,10 @@ public void setPhone(String phone) { this.phone = phone; } + public void setVisibility(String visibility) { + this.visibility = visibility; + } + public void setUser_id(Integer user_id) { this.user_id = user_id; } diff --git a/src/main/java/com/example/backend/mapper/PinMapper.java b/src/main/java/com/example/backend/mapper/PinMapper.java index 844f460b..f6636a37 100644 --- a/src/main/java/com/example/backend/mapper/PinMapper.java +++ b/src/main/java/com/example/backend/mapper/PinMapper.java @@ -14,7 +14,7 @@ public interface PinMapper extends BaseMapper { int insertAll(Pin pin); - ArrayList searchAll(String searchContext); + ArrayList searchAll(String searchContext, Integer id); int updateAll(Pin pin); diff --git a/src/main/java/com/example/backend/service/PinService.java b/src/main/java/com/example/backend/service/PinService.java index debd25a7..0770cfab 100644 --- a/src/main/java/com/example/backend/service/PinService.java +++ b/src/main/java/com/example/backend/service/PinService.java @@ -14,7 +14,7 @@ public interface PinService extends IService { int insertPin(Pin pin); - ArrayList searchPin(String searchContext); + ArrayList searchPin(String searchContext, Integer id); int updatePin(Pin pin); diff --git a/src/main/java/com/example/backend/service/impl/PinServiceImpl.java b/src/main/java/com/example/backend/service/impl/PinServiceImpl.java index a5589b52..b822947b 100644 --- a/src/main/java/com/example/backend/service/impl/PinServiceImpl.java +++ b/src/main/java/com/example/backend/service/impl/PinServiceImpl.java @@ -27,8 +27,8 @@ public int insertPin(Pin pin) { } @Override - public ArrayList searchPin(String searchContext) { - ArrayList pins = pinMapper.searchAll(searchContext); + public ArrayList searchPin(String searchContext, Integer id) { + ArrayList pins = pinMapper.searchAll(searchContext, id); return pins; } diff --git a/src/main/resources/mapper/PinMapper.xml b/src/main/resources/mapper/PinMapper.xml index 3f2c5c02..730e6ea4 100644 --- a/src/main/resources/mapper/PinMapper.xml +++ b/src/main/resources/mapper/PinMapper.xml @@ -12,6 +12,7 @@ + @@ -20,27 +21,31 @@ p_id,p_name,p_pos, p_brief,p_type,p_openTime, - p_phone,u_id,ph_id, + p_visibility,p_phone,u_id,ph_id, f_id insert into pin - (p_id,p_name,p_pos,p_brief,p_type,p_openTime,p_phone,u_id,ph_id,f_id) + (p_id,p_name,p_pos,p_brief,p_type,p_openTime,p_phone,p_visibility,u_id,ph_id,f_id) values (#{id,jdbcType=NUMERIC}, #{name,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR}, #{brief,jdbcType=VARCHAR}, #{type,jdbcType=NUMERIC}, #{openTime,jdbcType=VARCHAR}, - #{phone,jdbcType=VARCHAR}, #{user_id,jdbcType=NUMERIC}, #{photo_id,jdbcType=NUMERIC}, - #{forum_id,jdbcType=NUMERIC}) + #{phone,jdbcType=VARCHAR}, #{visibility,jdbcType=NUMERIC}, #{user_id,jdbcType=NUMERIC}, + #{photo_id,jdbcType=NUMERIC}, #{forum_id,jdbcType=NUMERIC}) update pin set p_name=#{name}, p_pos=#{position}, p_brief=#{brief}, - p_type=#{type}, p_openTime=#{openTime}, p_phone=#{phone} + p_type=#{type}, p_openTime=#{openTime}, p_phone=#{phone}, + p_visibility=#{visibility} where p_id=#{id}