lyhzzz 1 年之前
父節點
當前提交
4058f24284
共有 1 個文件被更改,包括 5 次插入4 次删除
  1. 5 4
      src/main/java/com/fdkankan/manage_jp/controller/ProjectSceneController.java

+ 5 - 4
src/main/java/com/fdkankan/manage_jp/controller/ProjectSceneController.java

@@ -51,17 +51,18 @@ public class ProjectSceneController extends BaseController{
         param.setCompanyId(getUser().getCompanyId());
         param.setCompanyId(getUser().getCompanyId());
         String jsonString = JSONObject.toJSONString(param);
         String jsonString = JSONObject.toJSONString(param);
         String ciphertext = RsaUtils.encipher(jsonString, RsaUtils.publicKey);
         String ciphertext = RsaUtils.encipher(jsonString, RsaUtils.publicKey);
-        return Result.success("/service/manage_jp/projectScene/getSceneMap/"+ URLEncoder.encode(ciphertext));
+        return Result.success("/service/manage_jp/projectScene/getSceneMap?ciphertext="+ ciphertext);
     }
     }
 
 
-    @GetMapping("/getSceneMap/{ciphertext}/{type}")
-    public Result getSceneMap(@PathVariable String ciphertext,
-                              @PathVariable Integer type){
+    @GetMapping("/getSceneMap")
+    public Result getSceneMap(@RequestParam(required = false) String ciphertext,
+                              @RequestParam(required = false,defaultValue = "1") Integer type){
         if (StringUtils.isBlank(ciphertext)){
         if (StringUtils.isBlank(ciphertext)){
             throw new BusinessException(ResultCode.PARAM_ERROR);
             throw new BusinessException(ResultCode.PARAM_ERROR);
         }
         }
         log.info("ciphertext:{},type:{}",ciphertext,type);
         log.info("ciphertext:{},type:{}",ciphertext,type);
         String deTxt = RsaUtils.decipher(ciphertext, RsaUtils.privateKey);
         String deTxt = RsaUtils.decipher(ciphertext, RsaUtils.privateKey);
+        log.info("deTxt:{}",deTxt);
         SceneGpsParam param = JSONObject.parseObject(deTxt, SceneGpsParam.class);
         SceneGpsParam param = JSONObject.parseObject(deTxt, SceneGpsParam.class);
         param.setType(type);
         param.setType(type);
         return Result.success(projectSceneGpsService.allSceneGps(param));
         return Result.success(projectSceneGpsService.allSceneGps(param));