浏览代码

下载场景接口路由修改

lyhzzz 2 年之前
父节点
当前提交
3f44010a25

+ 0 - 30
src/main/java/com/fdkankan/manage_jp/controller/SceneProController.java

@@ -59,36 +59,6 @@ public class SceneProController extends BaseController{
 
 
     /**
-     * 检查下载
-     * num      场景码
-     */
-    @GetMapping("/checkDownLoad")
-    public Result checkDownLoad(@RequestParam(required = false) String num,
-                                    @RequestParam(required = false,defaultValue = "0") Integer isObj){
-        return Result.success(downService.checkDownLoad(num,isObj));
-    }
-
-    /**
-     * 下载场景
-     * num      场景码
-     */
-    @GetMapping("/downScene")
-    public Result downScene(@RequestParam(required = false) String num,
-                                @RequestParam(required = false,defaultValue = "0") Integer isObj){
-        return Result.success(downService.down(num,isObj));
-    }
-
-    /**
-     * 下载场景进度条
-     * num      场景码
-     */
-    @GetMapping("/downloadProcess")
-    public Result downloadProcess(@RequestParam(required = false) String num,
-                                      @RequestParam(required = false,defaultValue = "0") Integer isObj){
-        return Result.success(downService.downloadProcess(num,isObj));
-    }
-
-    /**
      * 增加场景下载次数
      */
     @RequestMapping(value = "/addDownloadNum", method = RequestMethod.GET)

+ 75 - 0
src/main/java/com/fdkankan/manage_jp/controller/UserSceneController.java

@@ -0,0 +1,75 @@
+package com.fdkankan.manage_jp.controller;
+
+
+import com.fdkankan.common.util.JwtUtil;
+import com.fdkankan.manage_jp.common.Result;
+import com.fdkankan.manage_jp.entity.User;
+import com.fdkankan.manage_jp.httpClient.client.FdKKClient;
+import com.fdkankan.manage_jp.service.IDownService;
+import com.fdkankan.manage_jp.service.ISceneProService;
+import com.fdkankan.manage_jp.service.IUserRoleService;
+import com.fdkankan.manage_jp.service.IUserService;
+import com.fdkankan.manage_jp.vo.request.SceneParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.Set;
+
+/**
+ * <p>
+ * pro场景表 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2022-12-30
+ */
+@RestController
+@RequestMapping("/manage_jp/user/scene")
+public class UserSceneController extends BaseController{
+
+    @Autowired
+    ISceneProService sceneProService;
+    @Autowired
+    IUserService userService;
+    @Autowired
+    IUserRoleService userRoleService;
+    @Autowired
+    IDownService downService;
+
+
+
+    /**
+     * 检查下载
+     * num      场景码
+     */
+    @GetMapping("/checkDownLoad")
+    public Result checkDownLoad(@RequestParam(required = false) String num,
+                                    @RequestParam(required = false,defaultValue = "0") Integer isObj){
+        return Result.success(downService.checkDownLoad(num,isObj));
+    }
+
+    /**
+     * 下载场景
+     * num      场景码
+     */
+    @GetMapping("/downScene")
+    public Result downScene(@RequestParam(required = false) String num,
+                                @RequestParam(required = false,defaultValue = "0") Integer isObj){
+        return Result.success(downService.down(num,isObj));
+    }
+
+    /**
+     * 下载场景进度条
+     * num      场景码
+     */
+    @GetMapping("/downloadProcess")
+    public Result downloadProcess(@RequestParam(required = false) String num,
+                                      @RequestParam(required = false,defaultValue = "0") Integer isObj){
+        return Result.success(downService.downloadProcess(num,isObj));
+    }
+
+
+
+}
+

+ 1 - 0
src/main/java/com/fdkankan/manage_jp/service/impl/CompanyServiceImpl.java

@@ -299,6 +299,7 @@ public class CompanyServiceImpl extends ServiceImpl<ICompanyMapper, Company> imp
             userEntity.setNickName(user.getNickName());
             userEntity.setCreateTime(DateUtil.date2String(currentDate,"yyyy-MM-dd HH:mm:ss"));
             userEntity.setUpdateTime(currentDate);
+            userEntity.setRecStatus("A");
             if (ObjectUtils.isEmpty(userEntity.getId())) {
                 userService.save(userEntity);
             } else {