feature 代码提交

js-training/training-common/src/main/java/com/rongwei/trainingcommon/sys/service/JfCommonService.java

@@ -1,4 +1,4 @@
-package com.rongwei.trainingcommon.sys.service;
+package com.rongwei.sfcommon.sys.service;
 
 import com.rongwei.rwcommon.base.R;
 

js-training/training-common/src/main/java/com/rongwei/trainingcommon/sys/service/impl/JfCommonServiceImpl.java

@@ -1,9 +1,9 @@
-package com.rongwei.trainingcommon.sys.service.impl;
+package com.rongwei.sfcommon.sys.service.impl;
 
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.utils.StringUtils;
 import com.rongwei.safecommon.utils.JSCommonUtils;
-import com.rongwei.trainingcommon.sys.service.JfCommonService;
+import com.rongwei.sfcommon.sys.service.JfCommonService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

js-security/security-server/src/main/java/com/rongwei/savecheck/controller/CommonUtilController.java

@@ -1,10 +1,12 @@
 package com.rongwei.savecheck.controller;
 
 import com.rongwei.rwcommon.base.R;
+import com.rongwei.sfcommon.sys.service.impl.JfCommonServiceImpl;
 import com.rongwei.sfcommon.utils.CommonUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,11 +22,14 @@ import java.util.Date;
  * @date 2021/01/08
  */
 @RestController
-@RequestMapping("common-util")
+@RequestMapping("/common-util")
 @Slf4j
 public class CommonUtilController {
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
+    @Autowired
+    private JfCommonServiceImpl jfCommonService;
+
     @GetMapping("/week-for-year")
     public R weekForYear(@RequestParam("date") @DateTimeFormat(pattern = "yyyy-MM-dd") Date date,
                          @RequestParam("returnLastWeek") String returnLastWeek) {
@@ -39,4 +44,9 @@ public class CommonUtilController {
         r.putData(CommonUtil.getWeekForYear(date, Boolean.parseBoolean(returnLastWeek)));
         return r;
     }
+
+    @GetMapping("/gps")
+    public R getLocationIdFormBDApi(@RequestParam(name = "address") String address){
+        return jfCommonService.getLocationIdFormBDApi(address);
+    }
 }

js-training/training-server/src/main/java/com/rongwei/training/controller/JfCommonController.java

@@ -1,30 +0,0 @@
-package com.rongwei.training.controller;
-
-import com.rongwei.rwcommon.base.R;
-import com.rongwei.trainingcommon.sys.service.impl.JfCommonServiceImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * JfCommonController class
- *
- * @author XH
- * @date 2024/09/20
- */
-@RestController
-@RequestMapping("/common/jf")
-public class JfCommonController {
-    private final Logger log = LoggerFactory.getLogger(this.getClass().getName());
-
-    @Autowired
-
-    private JfCommonServiceImpl jfCommonServiceImpl;
-
-    public R getLocationIdFormBDApi(@RequestParam String address){
-        return jfCommonServiceImpl.getLocationIdFormBDApi(address);
-    }
-}