瀏覽代碼

bim添加创建人

lyhzzz 2 年之前
父節點
當前提交
3990bdc1fe

+ 7 - 1
src/main/java/com/fdkankan/site/config/WebAppConfig.java

@@ -17,7 +17,13 @@ public class WebAppConfig implements WebMvcConfigurer {
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
 		registry.addInterceptor(tokenInterceptor).addPathPatterns("/**")
-				.excludePathPatterns("/**/test/**","/**/fdLogin/**","/**/bim/**","/**/callBack/**","/**/app/**");
+				.excludePathPatterns(
+						"/**/test/**",
+						"/**/fdLogin/**",
+						"/**/bim/**",
+						"/**/callBack/**",
+						"/**/app/**",
+						"/**/fdkk/**");
 		WebMvcConfigurer.super.addInterceptors(registry);
 	}
 

+ 69 - 0
src/main/java/com/fdkankan/site/controller/FdkkController.java

@@ -0,0 +1,69 @@
+package com.fdkankan.site.controller;
+
+import com.fdkankan.site.common.ResultCode;
+import com.fdkankan.site.common.ResultData;
+import com.fdkankan.site.entity.Project;
+import com.fdkankan.site.entity.ProjectNum;
+import com.fdkankan.site.exception.BusinessException;
+import com.fdkankan.site.response.ProjectNumAddParam;
+import com.fdkankan.site.service.IProjectNumService;
+import com.fdkankan.site.service.IProjectService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.xml.transform.Result;
+import java.util.List;
+
+/**
+ * 四维看看调用,项目关联场景
+ */
+@RestController
+@RequestMapping("/fdkk")
+@Slf4j
+public class FdkkController {
+
+    @Autowired
+    IProjectNumService projectNumService;
+    @Autowired
+    IProjectService projectService;
+
+    @PostMapping("/projectAddNum")
+    public ResultData projectAddNum(@RequestBody ProjectNumAddParam param){
+        log.info("四维通知项目添加场景---{}",param);
+        try {
+            if(StringUtils.isBlank(param.getNum()) || StringUtils.isBlank(param.getParentScene())
+                    || StringUtils.isBlank(param.getProjectId()) || param.getSceneSource() == null){
+                throw new BusinessException(ResultCode.PARAM_MISS);
+            }
+            Project project = projectService.getById(param.getProjectId());
+            if(project == null){
+                throw new BusinessException(ResultCode.PROJECT_NOT_EXIST);
+            }
+            List<ProjectNum> dbNums = projectNumService.getByNum(param.getNum());
+            if(dbNums.size() >0){
+                throw new BusinessException(ResultCode.SCENE_BIND);
+            }
+            ProjectNum projectNum = new ProjectNum();
+            projectNum.setParentScene(param.getParentScene());
+            projectNum.setProjectId(param.getProjectId());
+            projectNum.setNum(param.getNum());
+            switch (param.getSceneSource()){
+                case 3: projectNum.setType(1); break;
+                case 4: projectNum.setType(2); break;
+                default:
+                    projectNum.setType(0); break;
+            }
+            projectNumService.save(projectNum);
+            log.info("四维通知项目添加场景成功");
+        }catch (Exception e){
+            log.error("四维通知项目添加场景失败---{}",e.getMessage());
+        }
+        return ResultData.ok();
+    }
+
+}

+ 1 - 0
src/main/java/com/fdkankan/site/controller/ProjectController.java

@@ -58,6 +58,7 @@ public class ProjectController extends BaseController {
     public ResultData del(@RequestBody Project param){
         VUtils.isTure(param.getProjectId() == null).throwMessage(ResultCode.PARAM_MISS);
         projectService.removeById(param.getProjectId());
+        projectNumService.delByProjectId(param.getProjectId());
         return ResultData.ok();
     }
 

+ 2 - 0
src/main/java/com/fdkankan/site/controller/UploadController.java

@@ -6,6 +6,7 @@ import com.fdkankan.site.common.BaseController;
 import com.fdkankan.site.common.FilePath;
 import com.fdkankan.site.common.ResultCode;
 import com.fdkankan.site.common.ResultData;
+import com.fdkankan.site.common.util.JwtUtil;
 import com.fdkankan.site.common.util.UploadToOssUtil;
 import com.fdkankan.site.common.util.VUtils;
 import com.fdkankan.site.entity.ProjectBim;
@@ -74,6 +75,7 @@ public class UploadController extends BaseController {
         }
         ProjectBim projectBim = new ProjectBim();
         projectBim.setProjectId(projectId);
+        projectBim.setUserName(JwtUtil.getUserName(getToken()));
         projectBimService.save(projectBim);
         File localFile = null;
         try {

+ 3 - 0
src/main/java/com/fdkankan/site/entity/ProjectBim.java

@@ -81,6 +81,9 @@ public class ProjectBim implements Serializable {
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("user_name")
+    private String userName;
+
 
 
 }

+ 13 - 0
src/main/java/com/fdkankan/site/response/ProjectNumAddParam.java

@@ -0,0 +1,13 @@
+package com.fdkankan.site.response;
+
+import lombok.Data;
+import lombok.ToString;
+
+@Data
+@ToString
+public class ProjectNumAddParam {
+    private String projectId;
+    private String parentScene;
+    private String num;
+    private Integer sceneSource;
+}

+ 4 - 0
src/main/java/com/fdkankan/site/service/IProjectNumService.java

@@ -36,4 +36,8 @@ public interface IProjectNumService extends IService<ProjectNum> {
     void updateProjectScene(AppGetSceneInfoParam param);
 
     Set<String> getNumList();
+
+    void delByProjectId(Integer projectId);
+
+    List<ProjectNum> getByNum(String num);
 }

+ 14 - 0
src/main/java/com/fdkankan/site/service/impl/ProjectNumServiceImpl.java

@@ -121,4 +121,18 @@ public class ProjectNumServiceImpl extends ServiceImpl<IProjectNumMapper, Projec
         List<ProjectNum> list = this.list();
         return list.stream().map(ProjectNum::getNum).collect(Collectors.toSet());
     }
+
+    @Override
+    public void delByProjectId(Integer projectId) {
+        LambdaQueryWrapper<ProjectNum> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ProjectNum::getProjectId,projectId);
+        this.remove(wrapper);
+    }
+
+    @Override
+    public List<ProjectNum> getByNum(String num) {
+        LambdaQueryWrapper<ProjectNum> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ProjectNum::getNum,num);
+        return this.list(wrapper);
+    }
 }