fix: 重复bean名称修改

zjrs-service-backend/pom.xml

@@ -336,6 +336,18 @@
             <artifactId>commons-beanutils</artifactId>
             <version>1.9.4</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+            <version>3.5.10.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-mapper-asl</artifactId>
+            <version>1.9.13</version>
+        </dependency>
     </dependencies>
 
     <build>

zjrs-service-backend/src/main/java/com/zjrs/ZjrsServiceBackendApplication.java

@@ -3,7 +3,7 @@ package com.zjrs;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = {"com.zjrs", "org.mohrss"})
 public class ZjrsServiceBackendApplication {
 
     public static void main(String[] args) {

zjrs-service-backend/src/main/java/com/zjrs/ggfw/utils/FeignConfig.java

@@ -1,4 +1,4 @@
-package com.zjrs.ggfw.utils;
+package com.zjrs.config;
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
 import jakarta.servlet.http.HttpServletRequest;

zjrs-service-backend/src/main/java/com/zjrs/config/FullBeanNameGenerator.java

@@ -0,0 +1,12 @@
+package com.zjrs.config;
+
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.context.annotation.AnnotationBeanNameGenerator;
+
+public class FullBeanNameGenerator extends AnnotationBeanNameGenerator {
+    @Override
+    protected String buildDefaultBeanName(BeanDefinition definition) {
+        // 返回类的全路径名
+        return definition.getBeanClassName();
+    }
+}

zjrs-service-backend/src/main/java/com/zjrs/config/MybatisPlusConfig.java

@@ -11,10 +11,10 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableTransactionManagement
 @Configuration
 // 注意：MapperScan 通常建议扫描 Mapper 接口所在的包，而不是 entity 实体类包
-@MapperScan({
-        "com.zjrs.zwnw.**.entity",
-        "com.zjrs.ggfw.**.entity"
-})
+@MapperScan(
+        basePackages = {"com.zjrs.zwnw.**.entity", "com.zjrs.ggfw.**.entity"},
+        nameGenerator = FullBeanNameGenerator.class // 指定命名生成器
+)
 public class MybatisPlusConfig {
 
     /**

zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/blo/impl/JxgwBLOimpl.java

@@ -20,7 +20,7 @@ import jakarta.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
-@Service
+@Service("ggfwJxgwBLO")
 public class JxgwBLOimpl extends BLOImpl implements JxgwBLO {
 
     @Resource

zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/blo/impl/YgbaBLOImpl.java

@@ -37,7 +37,7 @@ import java.util.*;
 
 import static org.mohrss.leaf.core.framework.util.SecurityUtils.getCurrentUser;
 
-@Service
+@Service("ggfwygbaBLO")
 public class YgbaBLOImpl implements YgbaBLO {
 
     private static final Logger LOG = LoggerFactory.getLogger(YgbaBLOImpl.class);

zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/bpo/JbxxglFeignClientBPO.java

@@ -4,7 +4,6 @@ package com.zjrs.ggfw.rlzysc.bpo;
 import org.mohrss.leaf.core.framework.web.controller.AjaxResponse;
 import com.zjrs.ggfw.rlzysc.dto.AreaDTO;
 import com.zjrs.ggfw.rlzysc.dto.ShUDTO;
-import com.zjrs.ggfw.utils.FeignConfig;
 //import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.PostMapping;

zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/bpo/WjfwFeignClientBPO.java

@@ -1,7 +1,6 @@
 package com.zjrs.ggfw.rlzysc.bpo;
 
 import com.zjrs.ggfw.rlzysc.dto.FileDTO;
-import com.zjrs.ggfw.utils.FeignConfig;
 //import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;

zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/bpo/impl/JxgwBPOimpl.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Service;
 
 import jakarta.annotation.Resource;
 
-@Service
+@Service("ggfwjxgwBPOimpl")
 public class JxgwBPOimpl extends BPOImpl implements JxgwBPO {
 
     @Resource

zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/bpo/impl/YgbaBPOImpl.java

@@ -13,7 +13,7 @@ import jakarta.annotation.Resource;
 import java.io.InputStream;
 import java.util.Map;
 
-@Service
+@Service("ggfwygbaBPOImpl")
 public class YgbaBPOImpl extends BPOImpl implements YgbaBPO {
 
     @Resource

zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/controller/GxygController.java

@@ -20,7 +20,7 @@ import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 
 @Api("共享用工")
-@RestController
+@RestController("ggfwgxygController")
 @RequestMapping("/api/rlzysc/gxyg")
 public class GxygController {
 

zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/controller/JxgwController.java

@@ -20,7 +20,7 @@ import jakarta.validation.Valid;
 见习岗位管理
  */
 @Api("见习岗位管理")
-@RestController
+@RestController("ggfwjxgwController")
 @RequestMapping("/api/rlzysc/jxgwgl")
 public class JxgwController {
     private static final Logger LOG = LoggerFactory.getLogger(JxgwController.class);

zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/controller/YgbaController.java

@@ -25,7 +25,7 @@ import java.net.URLEncoder;
 import java.util.Map;
 
 @Api("用工备案")
-@RestController
+@RestController("ggfwygbaController")
 @RequestMapping("/api/rlzysc/ygba")
 public class YgbaController {
 

zjrs-service-backend/src/main/java/com/zjrs/ggfw/rlzysc/controller/ZphglController.java

@@ -19,7 +19,7 @@ import jakarta.validation.Valid;
 import java.util.List;
 
 @Api("招聘会管理")
-@RestController
+@RestController("ggfwzphglController")
 @RequestMapping("/api/rlzysc/xczph")
 public class ZphglController {
     private static final Logger LOG = LoggerFactory.getLogger(ZphglController.class);

zjrs-service-backend/src/main/java/com/zjrs/zwnw/rlzysc/blo/impl/JxgwBLOimpl.java

@@ -32,7 +32,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-@Service
+@Service("zwnwJxgwBLO")
 public class JxgwBLOimpl extends BLOImpl implements JxgwBLO {
     private static final Logger LOG = LoggerFactory.getLogger(JxgwBLOimpl.class);
     @Resource

zjrs-service-backend/src/main/java/com/zjrs/zwnw/rlzysc/blo/impl/YgbaBLOImpl.java

@@ -29,7 +29,7 @@ import java.util.Map;
 
 import static org.mohrss.leaf.core.framework.util.SecurityUtils.getCurrentUser;
 
-@Service
+@Service("zwnwygbaBLOImpl")
 public class YgbaBLOImpl implements YgbaBLO {
 
     private static final Logger LOG = LoggerFactory.getLogger(YgbaBLOImpl.class);

zjrs-service-backend/src/main/java/com/zjrs/zwnw/rlzysc/bpo/impl/JxgwBPOimpl.java

@@ -13,7 +13,7 @@ import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 
-@Service
+@Service("zwnwjxgwBPOimpl")
 public class JxgwBPOimpl extends BPOImpl implements JxgwBPO {
 
     @Resource

zjrs-service-backend/src/main/java/com/zjrs/zwnw/rlzysc/bpo/impl/YgbaBPOImpl.java

@@ -11,7 +11,7 @@ import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import java.util.Map;
 
-@Service
+@Service("zwnwygbaBPOImpl")
 public class YgbaBPOImpl extends BPOImpl implements YgbaBPO {
 
     @Resource

zjrs-service-backend/src/main/java/com/zjrs/zwnw/rlzysc/controller/GxygController.java

@@ -21,7 +21,7 @@ import jakarta.validation.Valid;
 import java.util.List;
 
 @Api("共享用工管理")
-@RestController
+@RestController("zwnwgxygController")
 @RequestMapping("/api/rlzysc/gxyg")
 public class GxygController {
 

zjrs-service-backend/src/main/java/com/zjrs/zwnw/rlzysc/controller/JxgwController.java

@@ -24,7 +24,7 @@ import java.io.IOException;
 见习岗位管理
  */
 @Api("见习岗位管理")
-@RestController
+@RestController("zwnwjxgwController")
 @RequestMapping("/api/rlzysc/jxgwgl")
 public class JxgwController {
     private static final Logger LOG = LoggerFactory.getLogger(JxgwController.class);

zjrs-service-backend/src/main/java/com/zjrs/zwnw/rlzysc/controller/YgbaController.java

@@ -22,7 +22,7 @@ import jakarta.validation.Valid;
 import java.io.IOException;
 
 @Api("用工备案")
-@RestController
+@RestController("zwnwygbaController")
 @RequestMapping("/api/rlzysc/ygba")
 public class YgbaController {
 

zjrs-service-backend/src/main/java/com/zjrs/zwnw/rlzysc/controller/ZphglController.java

@@ -31,7 +31,7 @@ import java.util.Map;
 招聘会管理
  */
 @Api("招聘会管理")
-@RestController
+@RestController("zwnwzphglController")
 @RequestMapping("/api/rlzysc/zphgl")
 public class ZphglController {
     private static final Logger LOG = LoggerFactory.getLogger(ZphglController.class);

zjrs-service-backend/src/main/java/com/zjrs/zwnw/zj/bpo/WjfwFeignClientBPO.java

@@ -1,7 +1,6 @@
 package com.zjrs.zwnw.zj.bpo;
 
 import org.mohrss.leaf.core.framework.web.controller.AjaxResponse;
-import com.zjrs.zwnw.zj.util.FeignConfig;
 //import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;

zjrs-service-backend/src/main/java/com/zjrs/zwnw/zj/util/FeignConfig.java

@@ -1,19 +0,0 @@
-package com.zjrs.zwnw.zj.util;
-import feign.RequestInterceptor;
-import feign.RequestTemplate;
-import org.springframework.http.HttpHeaders;
-import org.springframework.stereotype.Component;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import jakarta.servlet.http.HttpServletRequest;
-
-@Component
-public class FeignConfig implements RequestInterceptor {
-    @Override
-    public void apply(RequestTemplate template) {
-        ServletRequestAttributes attributes=(ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
-        HttpServletRequest request=attributes.getRequest();
-        template.header(HttpHeaders.AUTHORIZATION, request.getHeader(HttpHeaders.AUTHORIZATION));
-    }
-}