21

src/main/java/com/fdkankan/site/controller/AppController.java

@@ -21,7 +21,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/app")
-public class AppController extends BaseController {
+public class AppController {
 
     @Autowired
     IProjectNumService projectNumService;
@@ -31,19 +31,9 @@ public class AppController extends BaseController {
         if(param.getNumList() == null || param.getNumList().size() <=0 ){
             throw new BusinessException(ResultCode.PARAM_MISS);
         }
-        List<ProjectNum> projectNums = projectNumService.getByNumList(param.getNumList(),getToken());
+        List<ProjectNum> projectNums = projectNumService.getByNumList(param.getNumList());
         return ResultData.ok(projectNums);
     }
 
-    @PostMapping("/updateProjectScene")
-    public ResultData updateProjectScene(@RequestBody AppGetSceneInfoParam param){
-        if(param.getNumList() == null || param.getNumList().size() <=0 ){
-            throw new BusinessException(ResultCode.PARAM_MISS);
-         }
-        projectNumService.updateProjectScene(param,getToken());
-        return ResultData.ok();
-    }
-
-
 
 }

src/main/java/com/fdkankan/site/controller/ProjectController.java

@@ -8,9 +8,12 @@ import com.fdkankan.site.common.util.JwtUtil;
 import com.fdkankan.site.common.util.VUtils;
 import com.fdkankan.site.entity.Project;
 import com.fdkankan.site.entity.ProjectBim;
+import com.fdkankan.site.exception.BusinessException;
+import com.fdkankan.site.request.AppGetSceneInfoParam;
 import com.fdkankan.site.request.ProjectAddSceneParam;
 import com.fdkankan.site.request.ProjectDelSceneParam;
 import com.fdkankan.site.request.ProjectListParam;
+import com.fdkankan.site.service.IProjectNumService;
 import com.fdkankan.site.service.IProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -29,6 +32,8 @@ public class ProjectController extends BaseController {
 
     @Autowired
     IProjectService projectService;
+    @Autowired
+    IProjectNumService projectNumService;
 
     @GetMapping("/userData")
     public ResultData userData(){
@@ -96,5 +101,14 @@ public class ProjectController extends BaseController {
         return ResultData.ok();
     }
 
+    @PostMapping("/updateProjectScene")
+    public ResultData updateProjectScene(@RequestBody AppGetSceneInfoParam param){
+        if(param.getNumList() == null || param.getNumList().size() <=0 ){
+            throw new BusinessException(ResultCode.PARAM_MISS);
+        }
+        projectNumService.updateProjectScene(param);
+        return ResultData.ok();
+    }
+
 }
 

src/main/java/com/fdkankan/site/service/IProjectNumService.java

@@ -30,8 +30,8 @@ public interface IProjectNumService extends IService<ProjectNum> {
 
     void addByNumList(Integer projectId, HashMap<String, Integer> numType, List<String> addNumList);
 
-    List<ProjectNum> getByNumList(List<String> numList,String token);
+    List<ProjectNum> getByNumList(List<String> numList);
 
 
-    void updateProjectScene(AppGetSceneInfoParam param,String token);
+    void updateProjectScene(AppGetSceneInfoParam param);
 }

src/main/java/com/fdkankan/site/service/impl/ProjectNumServiceImpl.java

@@ -90,27 +90,19 @@ public class ProjectNumServiceImpl extends ServiceImpl<IProjectNumMapper, Projec
     }
 
     @Override
-    public List<ProjectNum> getByNumList(List<String> numList,String token) {
-        String userName = JwtUtil.getUserName(token);
-        List<ProjectTeam> projectTeamList = projectTeamService.getListByUserName(userName);
-        Set<Integer> projectIds = projectTeamList.stream().map(ProjectTeam::getProjectId).collect(Collectors.toSet());
-
-        if(numList.size() >0 &&projectIds.size() >0){
+    public List<ProjectNum> getByNumList(List<String> numList) {
+        if(numList.size() >0 ){
             LambdaQueryWrapper<ProjectNum> wrapper = new LambdaQueryWrapper<>();
             wrapper.in(ProjectNum::getNum,numList);
-            wrapper.in(ProjectNum::getProjectId,projectIds);
             return this.list(wrapper);
         }
         return new ArrayList<>();
     }
 
     @Override
-    public void updateProjectScene(AppGetSceneInfoParam param,String token) {
-        String userName = JwtUtil.getUserName(token);
-        List<ProjectTeam> projectTeamList = projectTeamService.getListByUserName(userName);
-        Set<Integer> projectIds = projectTeamList.stream().map(ProjectTeam::getProjectId).collect(Collectors.toSet());
+    public void updateProjectScene(AppGetSceneInfoParam param) {
 
-        if(param.getNumList().size() >0 && projectIds.size() >0){
+        if(param.getNumList().size() >0 ){
             LambdaUpdateWrapper<ProjectNum> wrapper = new LambdaUpdateWrapper<>();
             wrapper.in(ProjectNum::getNum,param.getNumList());
             if(param.getEditableFlag()!= null){