Merge remote-tracking branch 'origin/master'

qhse-common/src/main/java/com/rongwei/bscommon/system/fegin/QhseAdminFeginService.java

@@ -1,5 +1,6 @@
 package com.rongwei.bscommon.system.fegin;
 
+import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.vo.generalsql.MasterSlaveInsertVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -9,5 +10,5 @@ public interface QhseAdminFeginService {
 
 
     @PostMapping(value = "/sys/generalCRUD/generalMsInsert")
-    void generalMsInsert(MasterSlaveInsertVo masterSlaveInsert);
+    R generalMsInsert(MasterSlaveInsertVo masterSlaveInsert);
 }

qhse-common/src/main/java/com/rongwei/bscommon/system/fegin/QhseAdminFeginServiceImpl.java

@@ -1,6 +1,7 @@
 package com.rongwei.bscommon.system.fegin;
 
 
+import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.vo.generalsql.MasterSlaveInsertVo;
 import org.springframework.stereotype.Component;
 
@@ -9,7 +10,7 @@ public class QhseAdminFeginServiceImpl implements QhseAdminFeginService {
 
 
     @Override
-    public void generalMsInsert(MasterSlaveInsertVo masterSlaveInsert) {
-
+    public R generalMsInsert(MasterSlaveInsertVo masterSlaveInsert) {
+        return R.error("rw-admin 调用失败");
     }
 }

qhse-common/src/main/java/com/rongwei/bscommon/system/service/QhseVisitorManagementService.java

@@ -3,6 +3,7 @@ package com.rongwei.bscommon.system.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.rongwei.bsentity.domain.QhseVisitorManagementDo;
 import com.rongwei.bsentity.vo.QhseVisitorManagementVo;
+import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.vo.generalsql.MasterSlaveInsertVo;
 
 import javax.servlet.http.HttpServletResponse;
@@ -18,7 +19,7 @@ import java.util.Map;
  */
 public interface QhseVisitorManagementService extends IService<QhseVisitorManagementDo> {
 
-    void generalMsInsert(MasterSlaveInsertVo masterSlaveInsert);
+    R generalMsInsert(MasterSlaveInsertVo masterSlaveInsert);
 
     List<Map<String, String>> getUserByCodes(List<String> codes);
 

qhse-common/src/main/java/com/rongwei/bscommon/system/service/impl/QhseVisitorManagementServiceImpl.java

@@ -13,6 +13,7 @@ import com.rongwei.bscommon.system.utils.WordMergeHandler;
 import com.rongwei.bscommon.system.utils.WordUtils;
 import com.rongwei.bsentity.domain.QhseVisitorManagementDo;
 import com.rongwei.bsentity.vo.QhseVisitorManagementVo;
+import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.utils.StringUtils;
 import com.rongwei.rwcommon.vo.generalsql.MasterSlaveInsertVo;
 import com.rongwei.rwcommonentity.commonservers.domain.SysFileItemDo;
@@ -61,8 +62,8 @@ public class QhseVisitorManagementServiceImpl extends ServiceImpl<QhseVisitorMan
     private QhseQhseItemServiceImpl qhseFileItemServiceImpl;
 
     @Override
-    public void generalMsInsert(MasterSlaveInsertVo masterSlaveInsert) {
-        qhseAdminFeginService.generalMsInsert(masterSlaveInsert);
+    public R generalMsInsert(MasterSlaveInsertVo masterSlaveInsert) {
+       return qhseAdminFeginService.generalMsInsert(masterSlaveInsert);
     }
 
     @Override

qhse-server/src/main/java/com/rongwei/controller/QhseVisitorManagementController.java

@@ -23,7 +23,7 @@ import java.util.Map;
  * @since 2025-08-12 15:30:00
  */
 @RestController
-@RequestMapping("qhse-visitor-management")
+@RequestMapping("/visitor/management")
 public class QhseVisitorManagementController  {
 
 
@@ -52,6 +52,7 @@ public class QhseVisitorManagementController  {
      */
     @PostMapping("/generalMsInsert")
     public R generalMsInsert(@RequestBody MasterSlaveInsertVo masterSlaveInsert) {
+        logger.info("/generalMsInsert 入参 masterSlaveInsert: {}", masterSlaveInsert.toString());
         try {
             qhseVisitorManagementService.generalMsInsert(masterSlaveInsert);
             return R.ok();