From 7d8243c4f6c739ab095d158c3c075b9dd9a2142c Mon Sep 17 00:00:00 2001 From: sunflower2014 Date: Wed, 28 May 2025 00:17:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E4=B8=9A=E5=88=86=E7=B1=BB=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E8=84=9A=E6=9C=AC=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reference/admin/AdminApplication.java | 6 ------ .../admin/controller/IndustryController.java | 18 +++++++++++++++++ .../admin/controller/NewsController.java | 3 ++- .../reference/core/mapper/IndustryMapper.java | 8 +++++++- .../core/service/IndustryService.java | 20 +++++++++++++++++++ 5 files changed, 47 insertions(+), 8 deletions(-) diff --git a/admin/src/main/java/com/jinrui/reference/admin/AdminApplication.java b/admin/src/main/java/com/jinrui/reference/admin/AdminApplication.java index 3de7e46..5ae9552 100644 --- a/admin/src/main/java/com/jinrui/reference/admin/AdminApplication.java +++ b/admin/src/main/java/com/jinrui/reference/admin/AdminApplication.java @@ -7,11 +7,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; import org.springframework.util.StringUtils; -import com.jinrui.reference.admin.controller.NewsController; -import com.jinrui.reference.core.model.vo.ResultObject; -import com.jinrui.reference.core.model.vo.news.NewsDetailVO; -import com.jinrui.reference.core.service.NewsService; - import redis.clients.jedis.JedisPool; import redis.clients.jedis.JedisPoolConfig; @@ -26,7 +21,6 @@ public class AdminApplication { public static void main(String[] args) { SpringApplication.run(AdminApplication.class, args); - System.out.println("++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"); } @Bean diff --git a/admin/src/main/java/com/jinrui/reference/admin/controller/IndustryController.java b/admin/src/main/java/com/jinrui/reference/admin/controller/IndustryController.java index 64b67a7..40ea234 100644 --- a/admin/src/main/java/com/jinrui/reference/admin/controller/IndustryController.java +++ b/admin/src/main/java/com/jinrui/reference/admin/controller/IndustryController.java @@ -81,6 +81,24 @@ public class IndustryController { return industryService.delete(saveIndustryDTO.getId()); } + @PostMapping("/update") + public ResultObject update(@RequestHeader("auth-token") String token, + @RequestBody SaveIndustryDTO saveIndustryDTO + ) { + AdminUser adminUser = AdminJwtService.parseToken(token); + if (adminUser == null) { + log.warn("解析token {}拿不到AdminUser对象!", token); + return ResultObject.failed("登陆Token有误，请联系系统管理员!"); + } + + if (!adminUser.isActive()) { + log.warn("当前用户已被封禁! id = {}", adminUser.getId()); + return ResultObject.failed("当前用户已被封禁！请联系系统管理员!"); + } + + return industryService.update(saveIndustryDTO.getId(), saveIndustryDTO.getPrimaryName(), saveIndustryDTO.getSecondaryName()); + } + /** * 行业分类搜索接口 * diff --git a/admin/src/main/java/com/jinrui/reference/admin/controller/NewsController.java b/admin/src/main/java/com/jinrui/reference/admin/controller/NewsController.java index 24177f2..ab81d55 100644 --- a/admin/src/main/java/com/jinrui/reference/admin/controller/NewsController.java +++ b/admin/src/main/java/com/jinrui/reference/admin/controller/NewsController.java @@ -31,11 +31,12 @@ public class NewsController { private final NewsService newsService; private final ObjectMapper objectMapper; + public NewsController(NewsService newsService, ObjectMapper objectMapper) { this.newsService = newsService; - this.objectMapper = objectMapper; + this.objectMapper = objectMapper;; } @PostMapping("/publish") diff --git a/core/src/main/java/com/jinrui/reference/core/mapper/IndustryMapper.java b/core/src/main/java/com/jinrui/reference/core/mapper/IndustryMapper.java index 2c2a270..ce4c314 100644 --- a/core/src/main/java/com/jinrui/reference/core/mapper/IndustryMapper.java +++ b/core/src/main/java/com/jinrui/reference/core/mapper/IndustryMapper.java @@ -41,6 +41,12 @@ public interface IndustryMapper { @Select("select * from industry where secondary_name = #{secondaryName} and parent_id = #{parentId}") Industry querySecondaryIndustry(Long parentId,String secondaryName); + @Select("select * from industry where secondary_name = #{secondaryName}") + Industry querySecondaryIndustryByName(String secondaryName); + + @Insert("update industry set parent_id = #{parentId},primary_name=#{primaryName}, secondary_name= #{secondaryName}, update_time=now() where id=#{id}") + void updateIndustry(@Param("id") Long id,@Param("parentId") Long parentId, @Param("primaryName") String primaryName,@Param("secondaryName") String secondaryName); + @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id") @Insert("insert into industry(parent_id, primary_name, secondary_name, create_time, update_time) values (#{parentId}, #{primaryName}, #{secondaryName}, now(), now())") void saveIndustry(Industry industry); @@ -76,7 +82,7 @@ public interface IndustryMapper { "and primary_name like concat('%', #{keyword}, '%') or secondary_name like concat('%', #{keyword}, '%') " + "" + "" + - "order by tag.${orderBy} " + + "order by industry.${orderBy} " + "" + "desc" + "" + diff --git a/core/src/main/java/com/jinrui/reference/core/service/IndustryService.java b/core/src/main/java/com/jinrui/reference/core/service/IndustryService.java index 97a78cb..ede87ef 100644 --- a/core/src/main/java/com/jinrui/reference/core/service/IndustryService.java +++ b/core/src/main/java/com/jinrui/reference/core/service/IndustryService.java @@ -64,6 +64,26 @@ public class IndustryService { return ResultObject.success(); } + public ResultObject update(Long id, String primaryName, String secondaryName) { + Industry industry = industryMapper.queryPrimaryIndustry(primaryName); + if (industry == null) { + Industry primaryIndustry = new Industry(); + primaryIndustry.setParentId(0L); + primaryIndustry.setPrimaryName(primaryName); + industryMapper.saveIndustry(primaryIndustry); + industry = primaryIndustry; + } + + Industry secondaryIndustry = industryMapper.querySecondaryIndustryByName(secondaryName); + + if(secondaryIndustry != null && secondaryIndustry.getId() != id){ + return ResultObject.failed("该行业分类已存在!"); + } + + industryMapper.updateIndustry(id, industry.getId(), primaryName, secondaryName); + return ResultObject.success(); + } + /** * 标签搜索接口 *