From 50fb58286ed3b718c39a97e0987ee7561a295651 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 04 七月 2025 17:56:41 +0800
Subject: [PATCH] git ch

---
 server/service/src/main/java/com/doumee/service/business/impl/KnowledgeServiceImpl.java |   37 +++++++++++++++++++++++++++++++------
 1 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/service/business/impl/KnowledgeServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/KnowledgeServiceImpl.java
index c04c5d2..a15d867 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/KnowledgeServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/KnowledgeServiceImpl.java
@@ -7,14 +7,16 @@
 import com.doumee.core.model.PageWrap;
 import com.doumee.core.utils.Constants;
 import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.AreasMapper;
 import com.doumee.dao.business.KnowledgeMapper;
+import com.doumee.dao.business.model.Areas;
 import com.doumee.dao.business.model.Knowledge;
 import com.doumee.service.business.KnowledgeService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -35,15 +37,16 @@
     @Autowired
     private KnowledgeMapper knowledgeMapper;
 
+    @Autowired
+    private AreasMapper areasMapper;
+
     @Override
     public Integer create(Knowledge knowledge) {
         LoginUserInfo user= (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
         if(Objects.isNull(knowledge)
         || StringUtils.isBlank(knowledge.getTitle())
                 || StringUtils.isBlank(knowledge.getLink())
-//                || StringUtils.isBlank(knowledge.getCityName())
 //                || Objects.isNull(knowledge.getCityId())
-                || StringUtils.isBlank(knowledge.getProvinceName())
                 || Objects.isNull(knowledge.getProvinceId())
                 || StringUtils.isBlank(knowledge.getYearInfo())
                 || StringUtils.isBlank(knowledge.getTitle())
@@ -53,6 +56,18 @@
         }
         if(knowledge.getLabels().split(",").length>10){
             throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏍囩鏁版渶澶氭坊鍔犲崄涓�");
+        }
+        Areas province = areasMapper.selectById(knowledge.getProvinceId());
+        if(Objects.isNull(province)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鐪佷唤淇℃伅閿欒");
+        }
+        knowledge.setProvinceName(province.getName());
+        if(Objects.nonNull(knowledge.getCityId())){
+            Areas city = areasMapper.selectById(knowledge.getCityId());
+            if(Objects.isNull(city)){
+                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"甯傚尯淇℃伅閿欒");
+            }
+            knowledge.setCityName(city.getName());
         }
         knowledge.setIsdeleted(Constants.ZERO);
         knowledge.setCreateDate(new Date());
@@ -88,9 +103,7 @@
                 || Objects.isNull(knowledge.getId())
                 || StringUtils.isBlank(knowledge.getTitle())
                 || StringUtils.isBlank(knowledge.getLink())
-                || StringUtils.isBlank(knowledge.getProvinceName())
-//                || StringUtils.isBlank(knowledge.getCityName())
-//                || Objects.isNull(knowledge.getCityId())
+                || Objects.isNull(knowledge.getCityId())
                 || Objects.isNull(knowledge.getProvinceId())
                 || StringUtils.isBlank(knowledge.getYearInfo())
                 || StringUtils.isBlank(knowledge.getTitle())
@@ -101,6 +114,18 @@
         if(knowledge.getLabels().split(",").length>10){
             throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏍囩鏁版渶澶氭坊鍔犲崄涓�");
         }
+        Areas province = areasMapper.selectById(knowledge.getProvinceId());
+        if(Objects.isNull(province)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鐪佷唤淇℃伅閿欒");
+        }
+        knowledge.setProvinceName(province.getName());
+        if(Objects.nonNull(knowledge.getCityId())){
+            Areas city = areasMapper.selectById(knowledge.getCityId());
+            if(Objects.isNull(city)){
+                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"甯傚尯淇℃伅閿欒");
+            }
+            knowledge.setCityName(city.getName());
+        }
         knowledge.setEditDate(new Date());
         knowledge.setEditor(user.getId());
         knowledgeMapper.updateById(knowledge);

--
Gitblit v1.9.3