楼宇创建

model2d3d-viewer-back-common/src/main/resources/config/language/msg/msg_cn.yml

@@ -36,3 +36,4 @@ msgcn:
         oldPwdError: 旧密码错误
         newPwdSameOld: 新密码不得与旧密码相同
         companyLimit: 最多可创建15个企业
+        buildingNameHasExisted: 楼宇已存在

model2d3d-viewer-back-common/src/main/resources/config/language/msg/msg_en.yml

@@ -36,3 +36,4 @@ msgen:
         oldPwdError: 旧密码错误
         newPwdSameOld: 新密码不得与旧密码相同
         companyLimit: 最多可创建15个企业
+        buildingNameHasExisted: Building already exists.

model2d3d-viewer-back-common/src/main/resources/config/language/msg/msg_jp.yml

@@ -36,3 +36,4 @@ msgjp:
         oldPwdError: 旧パスワードエラー
         newPwdSameOld: 注：旧パスワードと同じものを使用しないでください
         companyLimit: 最大15のエンタープライズを作成可能
+        buildingNameHasExisted: 当該ビルは既に存在しています。

model2d3d-viewer-back-controller/src/main/java/com/model2d3d/viewer/back/controller/AccountController.java

@@ -64,7 +64,7 @@ public class AccountController {
     @RequestMapping(value = "/logout", method = RequestMethod.GET)
     public SimpleDataResponse logout( @Parameter(name="LoginName",description="登录名",required=true) @RequestHeader(required=true) String LoginName,
             @Parameter(name="AccessToken",description="鉴权token",required=true) @RequestHeader(required=true) String AccessToken,
-            @Parameter(name="UserId",description="用户ID",required=true) @RequestHeader(required=true) Long UserId,
+            @Parameter(name="UserId",description="用户ID",required=true) @RequestHeader(required=true) String UserId,
             @Parameter(name="CompanyId",description="所属企业ID",required=false) @RequestHeader(required=false) String CompanyId,
         	@Parameter(name="LanguageType",description="语言类型 0:中文 1:英文 2:日文",required=true, schema = @Schema(defaultValue = "2")) @RequestHeader(required=true) Integer LanguageType) {
         return accountService.logout(AccessToken,CompanyId,LoginName,UserId);

model2d3d-viewer-back-controller/src/main/java/com/model2d3d/viewer/back/controller/BuildingController.java

@@ -0,0 +1,152 @@
+package com.model2d3d.viewer.back.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.model2d3d.viewer.back.common.response.PageResponse;
+import com.model2d3d.viewer.back.common.response.ResponseCode;
+import com.model2d3d.viewer.back.common.response.SimpleDataResponse;
+import com.model2d3d.viewer.back.configurator.interceptor.AccessRequired;
+import com.model2d3d.viewer.back.dto.building.BuildingSearchParams;
+import com.model2d3d.viewer.back.dto.building.DeleteBuildingParams;
+import com.model2d3d.viewer.back.dto.building.OptBuildingParams;
+import com.model2d3d.viewer.back.service.BuildingService;
+import com.model2d3d.viewer.back.vo.building.BuildingPageVO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+
+import java.io.FileNotFoundException;
+
+import jakarta.servlet.http.HttpServletResponse;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+
+/**
+ * 
+ * @author jwy-style
+ *
+ */
+/**
+ * Controller for managing buildings.
+ * Handles JSON formatted data and requires authentication token verification for all methods in the class.
+ * Request mapping for HTTP requests is "/building".
+ */
+@RestController
+@AccessRequired
+// Indicates whether login token verification is required. Placing it here means all methods in this class require authentication.
+@RequestMapping("/building") // HTTP request path mapping
+@Tag(name = "BuildingController", description = "Building Management Module - APIs for managing buildings")
+@SuppressWarnings("unchecked")
+public class BuildingController {
+	
+	private static final Logger logger = LoggerFactory.getLogger(BuildingController.class);
+
+    @Autowired
+    private BuildingService buildingService;
+
+	/**
+	 * Add a building.
+	 *
+	 * @param optBuildingParams parameters for building operation
+	 * @param LoginName         login name
+	 * @param AccessToken       authentication token
+	 * @param UserId            user ID
+	 * @param CompanyId         user's company ID (optional)
+	 * @param LanguageType      language type (0: Chinese, 1: English, 2: Japanese)
+	 * @return a SimpleDataResponse indicating the result of the add operation
+	 */
+	@AccessRequired
+	@Operation(summary = "Add a building")
+	@RequestMapping(value = "/add", method = RequestMethod.POST)
+	public SimpleDataResponse add(
+			@RequestBody @Validated OptBuildingParams optBuildingParams,
+			@Parameter(name = "LoginName", description = "Login name", required = true, schema = @Schema(defaultValue = "admin")) @RequestHeader(required = true) String LoginName,
+			@Parameter(name = "AccessToken", description = "Authentication token", required = true) @RequestHeader(required = true) String AccessToken,
+			@Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String UserId,
+			@Parameter(name="CompanyId",description="所属企业ID",required=false,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String CompanyId,
+			@Parameter(name = "LanguageType", description = "Language type", required = true, schema = @Schema(defaultValue = "2")) @RequestHeader(required = true) Integer LanguageType) {
+		return buildingService.add(optBuildingParams, UserId, CompanyId, LanguageType);
+	}
+
+	/**
+	 * Edit a building.
+	 *
+	 * @param optBuildingParams parameters for building operation
+	 * @param LoginName         login name
+	 * @param AccessToken       authentication token
+	 * @param UserId            user ID
+	 * @param CompanyId         user's company ID (optional)
+	 * @param LanguageType      language type (0: Chinese, 1: English, 2: Japanese)
+	 * @return a SimpleDataResponse indicating the result of the edit operation
+	 */
+	@Operation(summary = "Edit a building")
+	@RequestMapping(value = "/edit", method = RequestMethod.POST)
+	public SimpleDataResponse edit(
+			@RequestBody @Validated OptBuildingParams optBuildingParams,
+			@Parameter(name = "LoginName", description = "Login name", required = true, schema = @Schema(defaultValue = "admin")) @RequestHeader(required = true) String LoginName,
+			@Parameter(name = "AccessToken", description = "Authentication token", required = true) @RequestHeader(required = true) String AccessToken,
+			@Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String UserId,
+			@Parameter(name="CompanyId",description="所属企业ID",required=false,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String CompanyId,
+			@Parameter(name = "LanguageType", description = "Language type", required = true, schema = @Schema(defaultValue = "2")) @RequestHeader(required = true) Integer LanguageType) {
+		return buildingService.edit(optBuildingParams, UserId, CompanyId, LanguageType);
+	}
+
+	/**
+	 * Batch delete buildings.
+	 *
+	 * @param deleteBuildingParams parameters for deleting buildings
+	 * @param LoginName            login name
+	 * @param AccessToken          authentication token
+	 * @param UserId               user ID
+	 * @param CompanyId            user's company ID (optional)
+	 * @param LanguageType         language type (0: Chinese, 1: English, 2: Japanese)
+	 * @return a SimpleDataResponse indicating the result of the batch delete operation
+	 */
+	@Operation(summary = "Batch delete buildings")
+	@RequestMapping(value = "/batchDelete", method = RequestMethod.POST)
+	public SimpleDataResponse batchDelete(
+			@RequestBody @Validated DeleteBuildingParams deleteBuildingParams,
+			@Parameter(name = "LoginName", description = "Login name", required = true, schema = @Schema(defaultValue = "admin")) @RequestHeader(required = true) String LoginName,
+			@Parameter(name = "AccessToken", description = "Authentication token", required = true) @RequestHeader(required = true) String AccessToken,
+			@Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String UserId,
+			@Parameter(name="CompanyId",description="所属企业ID",required=false,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String CompanyId,
+			@Parameter(name = "LanguageType", description = "Language type", required = true, schema = @Schema(defaultValue = "2")) @RequestHeader(required = true) Integer LanguageType) {
+		return buildingService.batchDelete(deleteBuildingParams, UserId, CompanyId, LanguageType);
+	}
+
+	/**
+	 * Get a page of building list.
+	 **/
+	@Operation(summary = "Get a page of building list")
+	@RequestMapping(value = "/getListPage", method = RequestMethod.GET)
+	public PageResponse<IPage<BuildingPageVO>> getListPage(
+			@Parameter(name = "LoginName", description = "Login name", required = true, schema = @Schema(defaultValue = "admin")) @RequestHeader(required = true) String LoginName,
+			@Parameter(name = "AccessToken", description = "Authentication token", required = true) @RequestHeader(required = true) String AccessToken,
+			@Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String UserId,
+			@Parameter(name="CompanyId",description="所属企业ID",required=false,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String CompanyId,
+			@Parameter(name = "LanguageType", description = "Language type", required = true, schema = @Schema(defaultValue = "2")) @RequestHeader(required = true) Integer LanguageType,
+			@Parameter(name = "UTCOffset", description = "Difference between GMT and local time in minutes", required = true, schema = @Schema(defaultValue = "-480")) @RequestHeader(required = true) Integer UTCOffset,
+			BuildingSearchParams pageSearchParam) {
+
+		pageSearchParam.setUserId(UserId);
+
+		PageResponse<IPage<BuildingPageVO>> pageResponse = new PageResponse<>();
+		try {
+			pageResponse.setData(buildingService.getListPage(pageSearchParam, CompanyId, UserId, LanguageType, UTCOffset));
+			pageResponse.setCode(ResponseCode.SUCCESS);
+			pageResponse.setMsg("success");
+		} catch (Exception e) {
+			logger.error("Error querying list", e);
+			pageResponse.setCode(ResponseCode.SERVER_ERROR);
+			pageResponse.setMsg("service error");
+		}
+		return pageResponse;
+	}
+
+}

model2d3d-viewer-back-controller/src/main/java/com/model2d3d/viewer/back/controller/CompanyController.java

@@ -50,7 +50,7 @@ public class CompanyController {
             @RequestBody @Validated OptCompanyParams optCompanyParams,
             @Parameter(name="LoginName",description="登录名",required=true,schema = @Schema(defaultValue = "admin")) @RequestHeader(required=true) String LoginName,
             @Parameter(name="AccessToken",description="鉴权token",required=true) @RequestHeader(required=true) String AccessToken,
-            @Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) Long UserId,
+            @Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String UserId,
             @Parameter(name="CompanyId",description="所属企业ID",required=false,schema = @Schema(defaultValue = "1")) @RequestHeader(required=false) String CompanyId,
         	@Parameter(name="LanguageType",description="语言类型 0:中文 1:英文 2:日文",required=true,schema = @Schema(defaultValue = "0")) @RequestHeader(required=true) Integer LanguageType){
     	return companyService.add(optCompanyParams, CompanyId, UserId, LanguageType);
@@ -63,7 +63,7 @@ public class CompanyController {
             @RequestBody @Validated OptCompanyParams optCompanyParams,
             @Parameter(name="LoginName",description="登录名",required=true,schema = @Schema(defaultValue = "admin")) @RequestHeader(required=true) String LoginName,
             @Parameter(name="AccessToken",description="鉴权token",required=true) @RequestHeader(required=true) String AccessToken,
-            @Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) Long UserId,
+            @Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String UserId,
             @Parameter(name="CompanyId",description="所属企业ID",required=false,schema = @Schema(defaultValue = "1")) @RequestHeader(required=false) String CompanyId,
         	@Parameter(name="LanguageType",description="语言类型 0:中文 1:英文 2:日文",required=true,schema = @Schema(defaultValue = "0")) @RequestHeader(required=true) Integer LanguageType) {
         return companyService.edit(optCompanyParams, CompanyId, UserId, LanguageType);
@@ -76,7 +76,7 @@ public class CompanyController {
             @RequestBody @Validated DeleteCompanyParams deleteCompanyParams,
             @Parameter(name="LoginName",description="登录名",required=true,schema = @Schema(defaultValue = "admin")) @RequestHeader(required=true) String LoginName,
             @Parameter(name="AccessToken",description="鉴权token",required=true) @RequestHeader(required=true) String AccessToken,
-            @Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) Long UserId,
+            @Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String UserId,
             @Parameter(name="CompanyId",description="所属企业ID",required=false,schema = @Schema(defaultValue = "1")) @RequestHeader(required=false) String CompanyId,
         	@Parameter(name="LanguageType",description="语言类型 0:中文 1:英文 2:日文",required=true,schema = @Schema(defaultValue = "0")) @RequestHeader(required=true) Integer LanguageType){
     	return companyService.batchDelete(deleteCompanyParams, CompanyId, UserId, LanguageType);
@@ -88,7 +88,7 @@ public class CompanyController {
     public SimpleDataResponse<List<TreeMenusDTO>> getCompanyTree(
             @Parameter(name="LoginName",description="登录名",required=true,schema = @Schema(defaultValue = "admin")) @RequestHeader(required=true) String LoginName,
             @Parameter(name="AccessToken",description="鉴权token",required=true) @RequestHeader(required=true) String AccessToken,
-            @Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) Long UserId,
+            @Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String UserId,
             @Parameter(name="CompanyId",description="所属企业ID",required=false,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String CompanyId,
             @Parameter(name="LanguageType",description="语言类型 0:中文 1:英文 2:日文",required=true,schema = @Schema(defaultValue = "0")) @RequestHeader(required=true) Integer LanguageType){
     	return companyService.getCompanyTree(CompanyId, UserId, LanguageType);
@@ -100,7 +100,7 @@ public class CompanyController {
     public PageResponse<IPage<CompanyPageDTO>> getListPage(
     		@Parameter(name="LoginName",description="登录名",required=true,schema = @Schema(defaultValue = "admin")) @RequestHeader(required=true) String LoginName,
             @Parameter(name="AccessToken",description="鉴权token",required=true) @RequestHeader(required=true) String AccessToken,
-            @Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) Long UserId,
+            @Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String UserId,
             @Parameter(name="CompanyId",description="所属企业ID",required=false,schema = @Schema(defaultValue = "1")) @RequestHeader(required=false) String CompanyId,
 //            @Parameter(name="LoginCompanyId",description="登录用户的企业ID",required=false,schema = @Schema(defaultValue = "1") @RequestHeader(required=false) Long LoginCompanyId,
         	@Parameter(name="LanguageType",description="语言类型 0:中文 1:英文 2:日文",required=true,schema = @Schema(defaultValue = "0")) @RequestHeader(required=true) Integer LanguageType,

model2d3d-viewer-back-controller/src/main/java/com/model2d3d/viewer/back/controller/RoleController.java

@@ -51,7 +51,7 @@ public class RoleController {
             @RequestBody  @Validated OptRoleParam optRoleParam,
             @Parameter(name="LoginName",description="登录名",required=true,schema = @Schema(defaultValue = "admin")) @RequestHeader(required=true) String LoginName,
             @Parameter(name="AccessToken",description="鉴权token",required=true) @RequestHeader(required=true) String AccessToken,
-            @Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) Long UserId,
+            @Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String UserId,
             @Parameter(name="CompanyId",description="所属企业ID",required=false,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String CompanyId,
             @Parameter(name="LanguageType",description="语言类型 0:中文 1:英文 2:日文",required=true,schema = @Schema(defaultValue = "0")) @RequestHeader(required=true) Integer LanguageType){
     	return roleService.add(optRoleParam, CompanyId, UserId, LanguageType);
@@ -63,7 +63,7 @@ public class RoleController {
             @RequestBody @Validated OptRoleParam optRoleParam,
             @Parameter(name="LoginName",description="登录名",required=true,schema = @Schema(defaultValue = "admin")) @RequestHeader(required=true) String LoginName,
             @Parameter(name="AccessToken",description="鉴权token",required=true) @RequestHeader(required=true) String AccessToken,
-            @Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) Long UserId,
+            @Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String UserId,
             @Parameter(name="CompanyId",description="所属企业ID",required=false,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String CompanyId,
             @Parameter(name="LanguageType",description="语言类型 0:中文 1:英文 2:日文",required=true,schema = @Schema(defaultValue = "0")) @RequestHeader(required=true) Integer LanguageType){
     	return roleService.edit(optRoleParam, CompanyId, UserId, LanguageType);
@@ -75,7 +75,7 @@ public class RoleController {
             @RequestBody @Validated DeleteRoleParam deleteRoleParam,
             @Parameter(name="LoginName",description="登录名",required=true,schema = @Schema(defaultValue = "admin")) @RequestHeader(required=true) String LoginName,
             @Parameter(name="AccessToken",description="鉴权token",required=true) @RequestHeader(required=true) String AccessToken,
-            @Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) Long UserId,
+            @Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String UserId,
             @Parameter(name="CompanyId",description="所属企业ID",required=false,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String CompanyId,
             @Parameter(name="LanguageType",description="语言类型 0:中文 1:英文 2:日文",required=true,schema = @Schema(defaultValue = "0")) @RequestHeader(required=true) Integer LanguageType){
     	return roleService.batchDelete(deleteRoleParam, CompanyId, UserId, LanguageType);
@@ -86,7 +86,7 @@ public class RoleController {
     public PageResponse<IPage<RolePageDTO>> getListPage(
     		@Parameter(name="LoginName",description="登录名",required=true,schema = @Schema(defaultValue = "admin")) @RequestHeader(required=true) String LoginName,
             @Parameter(name="AccessToken",description="鉴权token",required=true) @RequestHeader(required=true) String AccessToken,
-            @Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) Long UserId,
+            @Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String UserId,
             @Parameter(name="CompanyId",description="所属企业ID",required=false,schema = @Schema(defaultValue = "1")) @RequestHeader(required=false) String CompanyId,
         	@Parameter(name="LanguageType",description="语言类型 0:中文 1:英文 2:日文",required=true,schema = @Schema(defaultValue = "0")) @RequestHeader(required=true) Integer LanguageType,
             RolePageSearchParam pageSearchParam
@@ -112,7 +112,7 @@ public class RoleController {
     public SimpleDataResponse<List<TreeMenusDTO>> getOwnMenuIds(
             @Parameter(name="LoginName",description="登录名",required=true,schema = @Schema(defaultValue = "admin")) @RequestHeader(required=true) String LoginName,
             @Parameter(name="AccessToken",description="鉴权token",required=true) @RequestHeader(required=true) String AccessToken,
-            @Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) Long UserId,
+            @Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String UserId,
             @Parameter(name="CompanyId",description="所属企业ID",required=false,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String CompanyId,
             @Parameter(name="LanguageType",description="语言类型 0:中文 1:英文 2:日文",required=true,schema = @Schema(defaultValue = "0")) @RequestHeader(required=true) Integer LanguageType){
     	return roleService.getOwnMenuIds(CompanyId, UserId, LanguageType);
@@ -124,7 +124,7 @@ public class RoleController {
     		@Parameter(name="roleId",description="角色ID",required=true, schema = @Schema(defaultValue = "28")) @RequestParam Long roleId,
             @Parameter(name="LoginName",description="登录名",required=true,schema = @Schema(defaultValue = "admin")) @RequestHeader(required=true) String LoginName,
             @Parameter(name="AccessToken",description="鉴权token",required=true) @RequestHeader(required=true) String AccessToken,
-            @Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) Long UserId,
+            @Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String UserId,
             @Parameter(name="CompanyId",description="所属企业ID",required=false,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String CompanyId,
             @Parameter(name="LanguageType",description="语言类型 0:中文 1:英文 2:日文",required=true,schema = @Schema(defaultValue = "0")) @RequestHeader(required=true) Integer LanguageType){
     	return roleService.getMenuIdsByRoleId(roleId, CompanyId, UserId, LanguageType);

model2d3d-viewer-back-controller/src/main/java/com/model2d3d/viewer/back/controller/UserController.java

@@ -49,7 +49,7 @@ public class UserController {
             @RequestBody @Validated OptUserParam optUserParam,
             @Parameter(name="LoginName",description="登录名",required=true,schema = @Schema(defaultValue = "admin")) @RequestHeader(required=true) String LoginName,
             @Parameter(name="AccessToken",description="鉴权token",required=true) @RequestHeader(required=true) String AccessToken,
-            @Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) Long UserId,
+            @Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String UserId,
             @Parameter(name="CompanyId",description="所属企业ID",required=false,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String CompanyId,
             @Parameter(name="LanguageType",description="语言类型 0:中文 1:英文 2:日文",required=true,schema = @Schema(defaultValue = "0")) @RequestHeader(required=true) Integer LanguageType){
     	return userService.add(optUserParam, CompanyId, UserId, LanguageType);
@@ -62,7 +62,7 @@ public class UserController {
             @RequestBody @Validated OptUserParam optUserParam,
             @Parameter(name="LoginName",description="登录名",required=true,schema = @Schema(defaultValue = "admin")) @RequestHeader(required=true) String LoginName,
             @Parameter(name="AccessToken",description="鉴权token",required=true) @RequestHeader(required=true) String AccessToken,
-            @Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) Long UserId,
+            @Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String UserId,
             @Parameter(name="CompanyId",description="所属企业ID",required=false,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String CompanyId,
             @Parameter(name="LanguageType",description="语言类型 0:中文 1:英文 2:日文",required=true,schema = @Schema(defaultValue = "0")) @RequestHeader(required=true) Integer LanguageType){
     	return userService.edit(optUserParam, CompanyId, UserId, LanguageType);
@@ -75,7 +75,7 @@ public class UserController {
             @RequestBody @Validated DeleteUserParam deleteUserParam,
             @Parameter(name="LoginName",description="登录名",required=true,schema = @Schema(defaultValue = "admin")) @RequestHeader(required=true) String LoginName,
             @Parameter(name="AccessToken",description="鉴权token",required=true) @RequestHeader(required=true) String AccessToken,
-            @Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) Long UserId,
+            @Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String UserId,
             @Parameter(name="CompanyId",description="所属企业ID",required=false,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String CompanyId,
             @Parameter(name="LanguageType",description="语言类型 0:中文 1:英文 2:日文",required=true,schema = @Schema(defaultValue = "0")) @RequestHeader(required=true) Integer LanguageType){
     	return userService.batchDelete(deleteUserParam, CompanyId, UserId, LanguageType);
@@ -88,7 +88,7 @@ public class UserController {
             @RequestBody @Validated ResetPassword resetPassword,
             @Parameter(name="LoginName",description="登录名",required=true,schema = @Schema(defaultValue = "admin")) @RequestHeader(required=true) String LoginName,
             @Parameter(name="AccessToken",description="鉴权token",required=true) @RequestHeader(required=true) String AccessToken,
-            @Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) Long UserId,
+            @Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String UserId,
             @Parameter(name="CompanyId",description="所属企业ID",required=false,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String CompanyId,
             @Parameter(name="LanguageType",description="语言类型 0:中文 1:英文 2:日文",required=true,schema = @Schema(defaultValue = "0")) @RequestHeader(required=true) Integer LanguageType){
     	return userService.batchResetPassword(resetPassword, CompanyId, UserId, LanguageType);
@@ -101,7 +101,7 @@ public class UserController {
     		@RequestBody @Validated ModifyPassword modifyPassword,
     		@Parameter(name="LoginName",description="登录名",required=true,schema = @Schema(defaultValue = "admin")) @RequestHeader(required=true) String LoginName,
             @Parameter(name="AccessToken",description="鉴权token",required=true) @RequestHeader(required=true) String AccessToken,
-            @Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) Long UserId,
+            @Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String UserId,
             @Parameter(name="CompanyId",description="所属企业ID",required=false,schema = @Schema(defaultValue = "1")) @RequestHeader(required=false) String CompanyId,
         	@Parameter(name="LanguageType",description="语言类型 0:中文 1:英文 2:日文",required=true,schema = @Schema(defaultValue = "0")) @RequestHeader(required=true) Integer LanguageType
         	) {
@@ -114,7 +114,7 @@ public class UserController {
     public PageResponse<IPage<UserPageDTO>> getListPage(
     		@Parameter(name="LoginName",description="登录名",required=true,schema = @Schema(defaultValue = "admin")) @RequestHeader(required=true) String LoginName,
             @Parameter(name="AccessToken",description="鉴权token",required=true) @RequestHeader(required=true) String AccessToken,
-            @Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) Long UserId,
+            @Parameter(name="UserId",description="用户ID",required=true,schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) String UserId,
             @Parameter(name="CompanyId",description="所属企业ID",required=false,schema = @Schema(defaultValue = "1")) @RequestHeader(required=false) String CompanyId,
         	@Parameter(name="LanguageType",description="语言类型 0:中文 1:英文 2:日文",required=true,schema = @Schema(defaultValue = "0")) @RequestHeader(required=true) Integer LanguageType,
         	PageSearchParam pageSearchParam

model2d3d-viewer-back-dao/src/main/java/com/model2d3d/viewer/back/dao/MyBatisPlusGenerator.java

@@ -55,6 +55,7 @@ public class MyBatisPlusGenerator {
         );
         // uuid算法主键的表
         List<String> assignIdTables = Arrays.asList(
+                "basic_building",
                 "basic_role",
                 "basic_company",
                 "basic_user"

model2d3d-viewer-back-dao/src/main/java/com/model2d3d/viewer/back/dao/auto/BasicBuildingMapper.java

@@ -0,0 +1,17 @@
+package com.model2d3d.viewer.back.dao.auto;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.model2d3d.viewer.back.model.BasicBuilding;
+
+/**
+ * <p>
+ * 楼宇表 Mapper 接口
+ * </p>
+ *
+ * @author jwy
+ * @since 
+ */
+public interface BasicBuildingMapper extends BaseMapper<BasicBuilding> {
+
+}
+

model2d3d-viewer-back-dao/src/main/java/com/model2d3d/viewer/back/dao/ex/BasicBuildingMapperExt.java

@@ -0,0 +1,27 @@
+package com.model2d3d.viewer.back.dao.ex;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.model2d3d.viewer.back.dao.auto.BasicBuildingMapper;
+import com.model2d3d.viewer.back.dao.auto.BasicCompanyMapper;
+import com.model2d3d.viewer.back.dto.building.BuildingSearchParams;
+import com.model2d3d.viewer.back.dto.building.OptBuildingParams;
+import com.model2d3d.viewer.back.dto.company.CompanySearchParams;
+import com.model2d3d.viewer.back.dto.company.OptCompanyParams;
+import com.model2d3d.viewer.back.model.BasicCompany;
+import com.model2d3d.viewer.back.vo.TreeMenusDTO;
+import com.model2d3d.viewer.back.vo.building.BuildingPageVO;
+import com.model2d3d.viewer.back.vo.company.CompanyPageDTO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface BasicBuildingMapperExt extends BasicBuildingMapper {
+
+    int checkExist(OptBuildingParams optBuildingParams);
+
+    IPage<BuildingPageVO> getListPage(Page page, @Param("params") BuildingSearchParams pageSearchParam);
+}

model2d3d-viewer-back-dao/src/main/resources/mappers/auto/BasicBuildingMapper.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.model2d3d.viewer.back.dao.auto.BasicBuildingMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.model2d3d.viewer.back.model.BasicBuilding">
+        <id column="building_id" property="buildingId" />
+        <result column="company_id" property="companyId" />
+        <result column="name" property="name" />
+        <result column="address" property="address" />
+        <result column="unique_identification" property="uniqueIdentification" />
+        <result column="dimensional_url" property="dimensionalUrl" />
+        <result column="flag" property="flag" />
+        <result column="create_time" property="createTime" />
+        <result column="creator_id" property="creatorId" />
+        <result column="modify_time" property="modifyTime" />
+        <result column="modifier_id" property="modifierId" />
+        <result column="udf_building_id" property="udfBuildingId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        building_id, company_id, name, address, unique_identification, dimensional_url, flag, create_time, creator_id, modify_time, modifier_id, udf_building_id
+    </sql>
+
+</mapper>

model2d3d-viewer-back-dao/src/main/resources/mappers/auto/BasicUserMapper.xml

@@ -6,7 +6,6 @@
     <resultMap id="BaseResultMap" type="com.model2d3d.viewer.back.model.BasicUser">
         <id column="id" property="id" />
         <result column="company_id" property="companyId" />
-        <result column="shop_uuid" property="shopUuid" />
         <result column="username" property="username" />
         <result column="login_name" property="loginName" />
         <result column="password" property="password" />
@@ -26,7 +25,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, company_id, shop_uuid, username, login_name, password, password_modify_time, salt, email, mobile_number, last_login_time, remark, flag, expire_time, create_time, creator_id, modify_time, modifier_id
+        id, company_id, username, login_name, password, password_modify_time, salt, email, mobile_number, last_login_time, remark, flag, expire_time, create_time, creator_id, modify_time, modifier_id
     </sql>
 
 </mapper>

model2d3d-viewer-back-dao/src/main/resources/mappers/ex/BasicBuildingMapperExt.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.model2d3d.viewer.back.dao.ex.BasicBuildingMapperExt">
+    
+    
+    <select id="checkExist" resultType="java.lang.Integer">
+        SELECT
+        	COUNT(1)
+        FROM
+        	basic_building
+        WHERE 
+        	flag != 1 AND (name = #{buildingName} OR unique_identification = #{uniqueIdentification})
+        	<if test="companyId != null">
+	           AND company_id = #{companyId}
+	        </if>
+        	<if test="buildingId != null">
+	           AND building_id != #{buildingId}
+	        </if>
+    </select>
+    
+    
+    <select id="getListPage" resultType="com.model2d3d.viewer.back.vo.building.BuildingPageVO">
+        SELECT
+        	bbuilding.building_id buildingId,
+        	bbuilding.company_id companyId,
+        	bbuilding.name buildingName,
+        	bbuilding.address,
+        	bbuilding.unique_identification,
+        	bbuilding.dimensional_url
+        FROM
+        	basic_building bbuilding
+        INNER JOIN basic_company bcomp ON bcomp.id = bbuilding.company_id
+        WHERE 
+        	bbuilding.flag != 1 AND bcomp.flag != 1
+        AND bbuilding.company_id IN <foreach collection="params.companyIdList" item="item" open="(" separator="," close=")">#{item}</foreach>
+        <if test="params.buildingIdList != null">
+           AND bbuilding.building_id IN <foreach collection="params.buildingIdList" item="item" open="(" separator="," close=")">#{item}</foreach>
+        </if>
+        <if test="params.buildingName != null">
+           AND bbuilding.name LIKE CONCAT('%',#{params.buildingName},'%')
+        </if>
+    </select>
+    
+    
+</mapper>

model2d3d-viewer-back-model/src/main/java/com/model2d3d/viewer/back/dto/BaseSearchNoCompanysParams.java

@@ -20,6 +20,6 @@ public class BaseSearchNoCompanysParams {
     private Integer pageSize;
     
     @Schema(description = "用户ID", hidden = true)
-    private Long userId;
+    private String userId;
 
 }

model2d3d-viewer-back-model/src/main/java/com/model2d3d/viewer/back/dto/BaseSearchParams.java

@@ -14,7 +14,7 @@ import lombok.Setter;
 @Getter
 public class BaseSearchParams extends BaseSearchNoCompanysParams{
 
-    @Schema(description = "查询对象所属企业ID，多个使用逗号连接")
+    @Schema(description = "查询对象所属企业ID，多个使用逗号连接", hidden = true)
     private String companyIds;
 
     @Schema(description = "查询对象所属企业ID", hidden = true)

model2d3d-viewer-back-model/src/main/java/com/model2d3d/viewer/back/dto/building/BuildingSearchParams.java

@@ -0,0 +1,25 @@
+package com.model2d3d.viewer.back.dto.building;
+
+import java.util.List;
+
+import com.model2d3d.viewer.back.dto.BaseSearchParams;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/** 
+* @author Mr.Jiang
+* @time 2022年7月21日 下午8:50:31 
+*/
+@Data
+public class BuildingSearchParams extends BaseSearchParams {
+
+	@Schema(description ="Building name", example = "张三李四")
+	private String buildingName;
+
+	@Schema(description ="Building IDs, comma-separated", example = "1,47")
+	private String buildingIds;
+
+	@Schema(description ="Building IDs", hidden = true)
+	private List<String> buildingIdList;
+
+}

model2d3d-viewer-back-model/src/main/java/com/model2d3d/viewer/back/dto/building/DeleteBuildingParams.java

@@ -0,0 +1,18 @@
+package com.model2d3d.viewer.back.dto.building;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+/** 
+* @author Mr.Jiang
+* @time 2022年7月21日 下午8:50:31 
+*/
+@Data
+public class DeleteBuildingParams{
+
+	@Schema(description ="Building IDs, array", example = "[\"acbdef2738967\",\"abcc556587\"]")
+	private List<String> buildingIds;
+
+}

model2d3d-viewer-back-model/src/main/java/com/model2d3d/viewer/back/dto/building/OptBuildingParams.java

@@ -0,0 +1,42 @@
+package com.model2d3d.viewer.back.dto.building;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+/** 
+* @author Mr.Jiang
+* @time 2022年7月21日 下午8:50:31 
+*/
+@Data
+public class OptBuildingParams{
+
+	@Schema(description ="Building unique identifier ID, not required for new additions", example = "2738967")
+	private String buildingId;
+
+	@Schema(description ="Company ID", example = "2738967", hidden = true)
+	private String companyId;
+
+	@NotBlank(message = "1001")
+	@Length(max = 100,message = "1002")
+	@Schema(description ="Building name", example = "testBuilding1", required = true)
+	private String buildingName;
+
+	@Schema(description ="Address", example = "Abiko City, Japan", required = true)
+	private String address;
+
+//	@Schema(description ="User-defined building ID", example = "123AAA6", required = true)
+//	private String udfBuildingId;
+
+	@NotBlank(message = "1001")
+	@Length(max = 255,message = "1002")
+	@Schema(description ="unique identification", example = "123cbaede2aa6", required = true)
+	private String uniqueIdentification;
+
+	@NotBlank(message = "1001")
+	@Length(max = 255,message = "1002")
+	@Schema(description ="3D redirect URL", example = "www.3d.com", required = true)
+	private String dimensionalUrl;
+
+}

model2d3d-viewer-back-model/src/main/java/com/model2d3d/viewer/back/model/BasicBuilding.java

@@ -0,0 +1,70 @@
+package com.model2d3d.viewer.back.model;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+@TableName("basic_building")
+@Schema(description = "楼宇表")
+public class BasicBuilding implements Serializable {
+
+        @TableId(value = "building_id", type = IdType.ASSIGN_UUID)
+        @Schema(description = "")
+        private String buildingId;
+
+
+        @TableField("company_id")
+        @Schema(description = "")
+        private String companyId;
+
+        @TableField("name")
+        @Schema(description = "楼宇名称")
+        private String name;
+
+        @TableField("address")
+        @Schema(description = "地址")
+        private String address;
+
+        @TableField("unique_identification")
+        @Schema(description = "唯一标识")
+        private String uniqueIdentification;
+
+        @TableField("dimensional_url")
+        @Schema(description = "立体画面跳转url")
+        private String dimensionalUrl;
+
+        @TableField("flag")
+        @Schema(description = "0-正常，1-删除")
+        private Integer flag;
+
+        @TableField("create_time")
+        @Schema(description = "")
+        private Long createTime;
+
+        @TableField("creator_id")
+        @Schema(description = "")
+        private String creatorId;
+
+        @TableField("modify_time")
+        @Schema(description = "")
+        private Long modifyTime;
+
+        @TableField("modifier_id")
+        @Schema(description = "")
+        private String modifierId;
+
+        @TableField("udf_building_id")
+        @Schema(description = "用户自定楼宇ID")
+        private String udfBuildingId;
+
+
+}

model2d3d-viewer-back-model/src/main/java/com/model2d3d/viewer/back/model/BasicRole.java

@@ -40,7 +40,7 @@ public class BasicRole implements Serializable {
 
         @TableField("creator_id")
         @Schema(description = "")
-        private Long creatorId;
+        private String creatorId;
 
         @TableField("create_time")
         @Schema(description = "")
@@ -48,7 +48,7 @@ public class BasicRole implements Serializable {
 
         @TableField("modifier_id")
         @Schema(description = "")
-        private Long modifierId;
+        private String modifierId;
 
         @TableField("modify_time")
         @Schema(description = "")

model2d3d-viewer-back-model/src/main/java/com/model2d3d/viewer/back/model/BasicRoleMenuRelation.java

@@ -28,7 +28,7 @@ public class BasicRoleMenuRelation implements Serializable {
 
         @TableField("creator_id")
         @Schema(description = "")
-        private Long creatorId;
+        private String creatorId;
 
         @TableField("create_time")
         @Schema(description = "")

model2d3d-viewer-back-model/src/main/java/com/model2d3d/viewer/back/model/BasicRoleUserRelation.java

@@ -28,7 +28,7 @@ public class BasicRoleUserRelation implements Serializable {
 
         @TableField("creator_id")
         @Schema(description = "")
-        private Long creatorId;
+        private String creatorId;
 
         @TableField("create_time")
         @Schema(description = "")

model2d3d-viewer-back-model/src/main/java/com/model2d3d/viewer/back/model/BasicUser.java

@@ -26,10 +26,6 @@ public class BasicUser implements Serializable {
         @Schema(description = "")
         private String companyId;
 
-        @TableField("shop_uuid")
-        @Schema(description = "")
-        private String shopUuid;
-
         @TableField("username")
         @Schema(description = "")
         private String username;
@@ -80,7 +76,7 @@ public class BasicUser implements Serializable {
 
         @TableField("creator_id")
         @Schema(description = "")
-        private Long creatorId;
+        private String creatorId;
 
         @TableField("modify_time")
         @Schema(description = "")
@@ -88,7 +84,7 @@ public class BasicUser implements Serializable {
 
         @TableField("modifier_id")
         @Schema(description = "")
-        private Long modifierId;
+        private String modifierId;
 
 
 }

model2d3d-viewer-back-model/src/main/java/com/model2d3d/viewer/back/vo/building/BuildingPageVO.java

@@ -0,0 +1,36 @@
+package com.model2d3d.viewer.back.vo.building;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+/** 
+* @author Mr.Jiang
+* @time 2022年7月21日 下午8:50:31 
+*/
+@Data
+public class BuildingPageVO{
+
+	@Schema(description ="Building unique identifier ID, not required for new additions", example = "2738967")
+	private String buildingId;
+
+	@Schema(description ="Company ID", example = "2738967", hidden = true)
+	private String companyId;
+
+	@Schema(description ="Building name", example = "testBuilding1", required = true)
+	private String buildingName;
+
+	@Schema(description ="Address", example = "Abiko City, Japan", required = true)
+	private String address;
+
+//	@Schema(description ="User-defined building ID", example = "123AAA6", required = true)
+//	private String udfBuildingId;
+
+	@Schema(description ="unique identification", example = "123cbaede2aa6", required = true)
+	private String uniqueIdentification;
+
+	@Schema(description ="3D redirect URL", example = "www.3d.com", required = true)
+	private String dimensionalUrl;
+
+}

model2d3d-viewer-back-service/src/main/java/com/model2d3d/viewer/back/service/AccountService.java

@@ -18,7 +18,7 @@ public interface AccountService {
 	SimpleDataResponse login(LoginParam loginParam, Device device, Integer languageType, HttpServletRequest request,
 			HttpServletResponse response);
 
-	SimpleDataResponse logout(String accessToken, String companyId, String loginName, Long userId);
+	SimpleDataResponse logout(String accessToken, String companyId, String loginName, String userId);
 
 	SimpleDataResponse getCaptcha(String requestId, Device device, Integer languageType, HttpServletRequest request,
 			HttpServletResponse response);

model2d3d-viewer-back-service/src/main/java/com/model2d3d/viewer/back/service/BuildingService.java

@@ -0,0 +1,30 @@
+package com.model2d3d.viewer.back.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.model2d3d.viewer.back.common.response.SimpleDataResponse;
+import com.model2d3d.viewer.back.dto.building.BuildingSearchParams;
+import com.model2d3d.viewer.back.dto.building.DeleteBuildingParams;
+import com.model2d3d.viewer.back.dto.building.OptBuildingParams;
+import com.model2d3d.viewer.back.vo.building.BuildingPageVO;
+import org.springframework.web.multipart.MultipartFile;
+
+
+import java.util.List;
+
+/**
+ * 
+ * @author jwy-style
+ *
+ */
+public interface BuildingService {
+
+	SimpleDataResponse add(OptBuildingParams optBuildingParams, String userId, String companyId, Integer languageType);
+
+	SimpleDataResponse edit(OptBuildingParams optBuildingParams, String userId, String companyId, Integer languageType);
+
+	SimpleDataResponse batchDelete(DeleteBuildingParams deleteBuildingParams, String userId, String companyId, Integer languageType);
+
+	IPage<BuildingPageVO> getListPage(BuildingSearchParams pageSearchParam, String companyId, String userId,
+									  Integer languageType, Integer uTCOffset);
+
+}

model2d3d-viewer-back-service/src/main/java/com/model2d3d/viewer/back/service/CompanyService.java

@@ -19,15 +19,15 @@ public interface CompanyService {
 
 	boolean idsAuth(String valueOf, String needAuthIds);
 
-	SimpleDataResponse add(OptCompanyParams optCompanyParams, String companyId, Long userId, Integer languageType);
+	SimpleDataResponse add(OptCompanyParams optCompanyParams, String companyId, String userId, Integer languageType);
 
-	SimpleDataResponse edit(OptCompanyParams optCompanyParams, String companyId, Long userId, Integer languageType);
+	SimpleDataResponse edit(OptCompanyParams optCompanyParams, String companyId, String userId, Integer languageType);
 
-	SimpleDataResponse batchDelete(DeleteCompanyParams deleteCompanyParams, String companyId, Long userId, Integer languageType);
+	SimpleDataResponse batchDelete(DeleteCompanyParams deleteCompanyParams, String companyId, String userId, Integer languageType);
 
-	IPage<CompanyPageDTO> getListPage(CompanySearchParams pageSearchParam, String companyId, Long userId,
+	IPage<CompanyPageDTO> getListPage(CompanySearchParams pageSearchParam, String companyId, String userId,
 									  Integer languageType, Integer uTCOffset);
 
-	SimpleDataResponse<List<TreeMenusDTO>> getCompanyTree(String companyId, Long userId, Integer languageType);
+	SimpleDataResponse<List<TreeMenusDTO>> getCompanyTree(String companyId, String userId, Integer languageType);
 
 }

model2d3d-viewer-back-service/src/main/java/com/model2d3d/viewer/back/service/RoleService.java

@@ -15,18 +15,18 @@ import com.model2d3d.viewer.back.vo.role.RolePageDTO;
  */
 public interface RoleService {
 
-	SimpleDataResponse add(OptRoleParam param, String companyId, Long userId, Integer languageType);
+	SimpleDataResponse add(OptRoleParam param, String companyId, String userId, Integer languageType);
 
-	SimpleDataResponse edit(OptRoleParam param, String companyId, Long userId, Integer languageType);
+	SimpleDataResponse edit(OptRoleParam param, String companyId, String userId, Integer languageType);
 
-	SimpleDataResponse batchDelete(DeleteRoleParam deleteRoleParam, String companyId, Long userId, Integer languageType);
+	SimpleDataResponse batchDelete(DeleteRoleParam deleteRoleParam, String companyId, String userId, Integer languageType);
 
-	SimpleDataResponse<List<TreeMenusDTO>> getOwnMenuIds(String companyId, Long userId, Integer languageType);
+	SimpleDataResponse<List<TreeMenusDTO>> getOwnMenuIds(String companyId, String userId, Integer languageType);
 
-	SimpleDataResponse<String> getMenuIdsByRoleId(Long roleId, String companyId, Long userId, Integer languageType);
+	SimpleDataResponse<String> getMenuIdsByRoleId(Long roleId, String companyId, String userId, Integer languageType);
 
 	IPage<RolePageDTO> getListPage(RolePageSearchParam pageSearchParam,
-								   String companyId, Long userId, Integer languageType);
+								   String companyId, String userId, Integer languageType);
 	
 
 }

model2d3d-viewer-back-service/src/main/java/com/model2d3d/viewer/back/service/UserService.java

@@ -13,18 +13,18 @@ import com.model2d3d.viewer.back.vo.user.UserPageDTO;
  */
 public interface UserService {
 
-	SimpleDataResponse add(OptUserParam optUserParam, String companyId, Long userId, Integer languageType);
+	SimpleDataResponse add(OptUserParam optUserParam, String companyId, String userId, Integer languageType);
 
-	SimpleDataResponse edit(OptUserParam optUserParam, String companyId, Long userId, Integer languageType);
+	SimpleDataResponse edit(OptUserParam optUserParam, String companyId, String userId, Integer languageType);
 
-	SimpleDataResponse batchDelete(DeleteUserParam deleteUserParam, String companyId, Long userId, Integer languageType);
+	SimpleDataResponse batchDelete(DeleteUserParam deleteUserParam, String companyId, String userId, Integer languageType);
 
 	IPage<UserPageDTO> getListPage(com.model2d3d.viewer.back.dto.user.PageSearchParam pageSearchParam,
-								   String companyId, Long userId, Integer languageType);
+								   String companyId, String userId, Integer languageType);
 
-	SimpleDataResponse batchResetPassword(ResetPassword resetPassword, String companyId, Long userId,
+	SimpleDataResponse batchResetPassword(ResetPassword resetPassword, String companyId, String userId,
 			Integer languageType);
 
-	SimpleDataResponse modifyPassword(ModifyPassword modifyPassword, String companyId, Long userId, Integer languageType);
+	SimpleDataResponse modifyPassword(ModifyPassword modifyPassword, String companyId, String userId, Integer languageType);
 	
 }

model2d3d-viewer-back-service/src/main/java/com/model2d3d/viewer/back/service/impl/AccountServiceImpl.java

@@ -233,7 +233,7 @@ public class AccountServiceImpl implements AccountService {
 	}
 
 	@Override
-	public SimpleDataResponse logout(String accessToken, String companyId, String loginName, Long userId) {
+	public SimpleDataResponse logout(String accessToken, String companyId, String loginName, String userId) {
 		SimpleDataResponse simpleDataResponse = new SimpleDataResponse();
 		try {
             //移除accessToken

model2d3d-viewer-back-service/src/main/java/com/model2d3d/viewer/back/service/impl/BuildingServiceImpl.java

@@ -0,0 +1,208 @@
+package com.model2d3d.viewer.back.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.model2d3d.viewer.back.common.exception.MsgCodeException;
+import com.model2d3d.viewer.back.common.language.msg.MsgLanguageChange;
+import com.model2d3d.viewer.back.common.response.ResponseCode;
+import com.model2d3d.viewer.back.common.response.SimpleDataResponse;
+import com.model2d3d.viewer.back.dao.ex.BasicBuildingMapperExt;
+import com.model2d3d.viewer.back.dto.building.BuildingSearchParams;
+import com.model2d3d.viewer.back.dto.building.DeleteBuildingParams;
+import com.model2d3d.viewer.back.dto.building.OptBuildingParams;
+import com.model2d3d.viewer.back.model.BasicBuilding;
+import com.model2d3d.viewer.back.service.BuildingService;
+import com.model2d3d.viewer.back.service.common.CommonOpt;
+import com.model2d3d.viewer.back.util.CommonUtil;
+import com.model2d3d.viewer.back.vo.building.BuildingPageVO;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.util.ObjectUtils;
+
+/**
+ * 
+ * @author jwy-style
+ *
+ */
+@Service
+public class BuildingServiceImpl implements BuildingService {
+	
+	private static Logger logger = LoggerFactory.getLogger(BuildingServiceImpl.class);
+
+
+	@Autowired
+	private CommonOpt commonOpt;
+
+	@Autowired
+	private MsgLanguageChange msgLanguageChange;
+	@Autowired
+	private BasicBuildingMapperExt basicBuildingMapperExt;
+
+
+	/**
+	 * Adds a new building entity to the system.
+	 *
+	 * @param optBuildingParams The parameters for creating the building.
+	 * @param userId            The ID of the user performing the operation.
+	 * @param companyId         The ID of the company associated with the operation.
+	 * @param languageType      The language type for error messages.
+	 * @return                  A SimpleDataResponse indicating the outcome of the operation.
+	 */
+	@Override
+	@Transactional
+	public SimpleDataResponse add(OptBuildingParams optBuildingParams, String userId, String companyId,
+								  Integer languageType) {
+		try {
+			optBuildingParams.setBuildingId(null); // Ensure buildingId is null for new entity creation
+
+			// Validate parameters and perform necessary checks
+			try {
+				// Check company association to prevent unauthorized operations on other companies' data
+//				if (ObjectUtils.isEmpty(optBuildingParams.getCompanyId())) {
+					optBuildingParams.setCompanyId(companyId);
+//				} else {
+//					checkCompany(optBuildingParams, languageType, companyId);
+//				}
+
+				commonVerifyOpt(optBuildingParams, companyId, languageType);
+
+			} catch (MsgCodeException e) {
+				return new SimpleDataResponse(ResponseCode.MSG_ERROR, e.getMessage());
+			}
+
+			long currentUnix = System.currentTimeMillis();
+			BasicBuilding basicBuilding = new BasicBuilding();
+			BeanUtils.copyProperties(optBuildingParams, basicBuilding);
+			basicBuilding.setCompanyId(companyId);
+			basicBuilding.setBuildingId(null); // Ensure buildingId is null for new entity creation
+			basicBuilding.setName(optBuildingParams.getBuildingName());
+			basicBuilding.setCreateTime(currentUnix);
+			basicBuilding.setCreatorId(userId);
+
+			basicBuildingMapperExt.insert(basicBuilding); // Insert building entity
+
+			return SimpleDataResponse.success();
+		} catch (Exception e) {
+			logger.error("Error occurred while adding a building", e);
+			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); // Rollback transaction on error
+			return new SimpleDataResponse(ResponseCode.SERVER_ERROR, ResponseCode.SERVER_ERROR_MSG);
+		}
+	}
+
+	/**
+	 * Performs common verification operations for adding a building.
+	 *
+	 * @param optBuildingParams The parameters for creating the building.
+	 * @param companyId         The ID of the company associated with the operation.
+	 * @param languageType      The language type for error messages.
+	 */
+	private void commonVerifyOpt(OptBuildingParams optBuildingParams, String companyId, Integer languageType) {
+		// Check for existing building with the same name
+		checkExist(optBuildingParams, languageType);
+	}
+
+	/**
+	 * Checks if a building with the same name already exists in the database.
+	 * Throws a MsgCodeException if the building name is already taken.
+	 *
+	 * @param optBuildingParams The parameters for creating the building.
+	 * @param languageType      The language type for error messages.
+	 */
+	private void checkExist(OptBuildingParams optBuildingParams, Integer languageType) {
+		if (basicBuildingMapperExt.checkExist(optBuildingParams) > 0) {
+			throw new MsgCodeException(msgLanguageChange.getParameterMapByCode(languageType, "buildingNameHasExisted"));
+		}
+	}
+
+
+	@Override
+	@Transactional
+	public SimpleDataResponse edit(OptBuildingParams optBuildingParams, String userId, String companyId,
+								   Integer languageType) {
+		try {
+			BasicBuilding oldBP = basicBuildingMapperExt.selectById(optBuildingParams.getBuildingId());
+			if (ObjectUtils.isEmpty(oldBP) || oldBP.getFlag() == 1) {
+				return new SimpleDataResponse(ResponseCode.MSG_ERROR, "Not found");
+			}
+
+			try {
+
+				commonVerifyOpt(optBuildingParams, companyId, languageType);
+
+			} catch (MsgCodeException e) {
+				return new SimpleDataResponse(ResponseCode.MSG_ERROR, e.getMessage());
+			}
+
+			LambdaUpdateWrapper<BasicBuilding> updateWrapper = new LambdaUpdateWrapper<>();
+			updateWrapper.eq(BasicBuilding::getBuildingId, optBuildingParams.getBuildingId())
+					.set(BasicBuilding::getName, optBuildingParams.getBuildingName())
+					.set(BasicBuilding::getAddress, optBuildingParams.getAddress())
+					.set(BasicBuilding::getUniqueIdentification, optBuildingParams.getUniqueIdentification())
+					.set(BasicBuilding::getDimensionalUrl, optBuildingParams.getDimensionalUrl())
+					.set(BasicBuilding::getModifierId, userId)
+					.set(BasicBuilding::getModifyTime, System.currentTimeMillis());
+
+			basicBuildingMapperExt.update(null, updateWrapper);
+
+			return SimpleDataResponse.success();
+		} catch (Exception e) {
+			logger.error("Error occurred while editing a building", e);
+			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+			return new SimpleDataResponse(ResponseCode.SERVER_ERROR, ResponseCode.SERVER_ERROR_MSG);
+		}
+	}
+
+	@Override
+	@Transactional
+	public SimpleDataResponse batchDelete(DeleteBuildingParams deleteBuildingParams, String userId,
+										  String companyId, Integer languageType) {
+		if (CollectionUtils.isEmpty(deleteBuildingParams.getBuildingIds())) {
+			return SimpleDataResponse.success();
+		}
+
+		try {
+			LambdaUpdateWrapper<BasicBuilding> updateWrapper = new LambdaUpdateWrapper<>();
+			updateWrapper.in(BasicBuilding::getBuildingId, deleteBuildingParams.getBuildingIds())
+					.set(BasicBuilding::getFlag, 1);
+
+			basicBuildingMapperExt.update(null, updateWrapper);
+
+			return SimpleDataResponse.success();
+		} catch (Exception e) {
+			logger.error("Error occurred while batch deleting buildings", e);
+			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+			return new SimpleDataResponse(ResponseCode.SERVER_ERROR, ResponseCode.SERVER_ERROR_MSG);
+		}
+	}
+
+
+	@Override
+	public IPage<BuildingPageVO> getListPage(BuildingSearchParams pageSearchParam, String companyId, String userId,
+											 Integer languageType, Integer uTCOffset) {
+		 //list防${}注入
+		if (StringUtils.isBlank(pageSearchParam.getCompanyIds())) {
+			pageSearchParam.setCompanyIdList(commonOpt.getSelfAndSubCompanyId(companyId));
+		} else {
+			pageSearchParam.setCompanyIdList(commonOpt.filterCompanyIds(companyId, pageSearchParam.getCompanyIds()));
+		}
+		if (StringUtils.isNotBlank(pageSearchParam.getBuildingIds())) {
+			pageSearchParam.setBuildingIdList(CommonUtil.commaStr2LongList(pageSearchParam.getBuildingIds()));
+		}
+		// 使用 MyBatis-Plus 提供的分页对象 Page
+		Page<BuildingPageVO> page = new Page<>(
+				pageSearchParam.getPageNum() == null ? 1 : pageSearchParam.getPageNum(),
+				pageSearchParam.getPageSize() == null ? 20 : pageSearchParam.getPageSize());
+
+        return basicBuildingMapperExt.getListPage(page, pageSearchParam);
+	}
+
+
+}

model2d3d-viewer-back-service/src/main/java/com/model2d3d/viewer/back/service/impl/CompanyServiceImpl.java

@@ -88,7 +88,7 @@ public class CompanyServiceImpl implements CompanyService {
 
 	@Override
 	@Transactional
-	public SimpleDataResponse add(OptCompanyParams optCompanyParams, String companyId, Long userId, 
+	public SimpleDataResponse add(OptCompanyParams optCompanyParams, String companyId, String userId, 
 			Integer languageType) {
 		try {
 			optCompanyParams.setCompanyId(null);
@@ -146,7 +146,7 @@ public class CompanyServiceImpl implements CompanyService {
 
 	@Override
 	@Transactional
-	public SimpleDataResponse edit(OptCompanyParams optCompanyParams, String companyId, Long userId,
+	public SimpleDataResponse edit(OptCompanyParams optCompanyParams, String companyId, String userId,
 			Integer languageType) {
 		try {
 //			optCompanyParams.setParentId(companyId);
@@ -205,7 +205,7 @@ public class CompanyServiceImpl implements CompanyService {
 
 	@Override
 	@Transactional
-	public SimpleDataResponse batchDelete(DeleteCompanyParams deleteCompanyParams, String companyId, Long userId, 
+	public SimpleDataResponse batchDelete(DeleteCompanyParams deleteCompanyParams, String companyId, String userId, 
 			Integer languageType) {
 		if (StringUtils.isBlank(deleteCompanyParams.getCompanyIds())) {
 			return SimpleDataResponse.success();
@@ -248,7 +248,7 @@ public class CompanyServiceImpl implements CompanyService {
 
 	@Override
 	public IPage<CompanyPageDTO> getListPage(CompanySearchParams pageSearchParam, String companyId,
-											 Long userId, Integer languageType, Integer uTCOffset) {
+											 String userId, Integer languageType, Integer uTCOffset) {
 //		pageSearchParam.setSelfCompanyId(companyId);
 		//list防${}注入
 		if (StringUtils.isBlank(pageSearchParam.getCompanyIds())) {
@@ -268,7 +268,7 @@ public class CompanyServiceImpl implements CompanyService {
 
 
 	@Override
-	public SimpleDataResponse<List<TreeMenusDTO>> getCompanyTree(String companyId, Long userId, Integer languageType) {
+	public SimpleDataResponse<List<TreeMenusDTO>> getCompanyTree(String companyId, String userId, Integer languageType) {
 		List<TreeMenusDTO> companyList = basicCompanyMapperExt.getListForTree();
 		if (CollectionUtils.isNotEmpty(companyList)) {
 			TreeMenusDTO rootTree = new TreeMenusDTO();

model2d3d-viewer-back-service/src/main/java/com/model2d3d/viewer/back/service/impl/RoleServiceImpl.java

@@ -58,7 +58,7 @@ public class RoleServiceImpl implements RoleService {
 
     @Override
     @Transactional
-    public SimpleDataResponse add(OptRoleParam param, String companyId, Long userId, Integer languageType) {
+    public SimpleDataResponse add(OptRoleParam param, String companyId, String userId, Integer languageType) {
     	try {
     		param.setCompanyId(companyId);
     		param.setRoleId(null);
@@ -94,7 +94,7 @@ public class RoleServiceImpl implements RoleService {
     
 
 
-	private void insertRoleMenuRelation(Long userId, long currentUnix, String roleId, String menuIds) {
+	private void insertRoleMenuRelation(String userId, long currentUnix, String roleId, String menuIds) {
 		if (StringUtils.isNoneBlank(menuIds)) {
 			//先删除原有的角色ID
 			LambdaQueryWrapper<BasicRoleMenuRelation> queryWrapper = new LambdaQueryWrapper<>();
@@ -128,7 +128,7 @@ public class RoleServiceImpl implements RoleService {
 
 	@Override
 	@Transactional
-	public SimpleDataResponse edit(OptRoleParam param, String companyId, Long userId, Integer languageType) {
+	public SimpleDataResponse edit(OptRoleParam param, String companyId, String userId, Integer languageType) {
 		try {
     		param.setCompanyId(companyId);
     		//校验参数
@@ -163,7 +163,7 @@ public class RoleServiceImpl implements RoleService {
 
 	@Override
 	@Transactional
-	public SimpleDataResponse batchDelete(DeleteRoleParam deleteRoleParam, String companyId, Long userId,
+	public SimpleDataResponse batchDelete(DeleteRoleParam deleteRoleParam, String companyId, String userId,
 			Integer languageType) {
 		try {
 			List<String> idList = Arrays.stream(deleteRoleParam.getRoleIds().split(",")).collect(Collectors.toList());
@@ -198,12 +198,12 @@ public class RoleServiceImpl implements RoleService {
 
 
 	@Override
-	public SimpleDataResponse<List<TreeMenusDTO>> getOwnMenuIds(String companyId, Long userId, Integer languageType) {
+	public SimpleDataResponse<List<TreeMenusDTO>> getOwnMenuIds(String companyId, String userId, Integer languageType) {
 		Map<String, Object> paramMap = new HashMap<String, Object>();
 		paramMap.put("userId", userId);
 		paramMap.put("companyId", companyId);
 		paramMap.put("languageType", languageType);
-		if (1 == userId.intValue()) {
+		if ("1".equals(userId)) {
 			paramMap.put("superRole", 1);
 		}
 		List<TreeMenusDTO> menuList = basicRoleMapperExt.getOwnMenuIds(paramMap);
@@ -219,7 +219,7 @@ public class RoleServiceImpl implements RoleService {
 
 
 	@Override
-	public SimpleDataResponse<String> getMenuIdsByRoleId(Long roleId, String companyId, Long userId,
+	public SimpleDataResponse<String> getMenuIdsByRoleId(Long roleId, String companyId, String userId,
 			Integer languageType) {
 		try {
 			return SimpleDataResponse.success(basicRoleMenuRelationMapperExt.getMenuIdsByRoleId(roleId));
@@ -232,7 +232,7 @@ public class RoleServiceImpl implements RoleService {
 
 
 	@Override
-	public IPage<RolePageDTO> getListPage(RolePageSearchParam pageSearchParam, String companyId, Long userId,
+	public IPage<RolePageDTO> getListPage(RolePageSearchParam pageSearchParam, String companyId, String userId,
 										  Integer languageType) {
 		//list防${}注入
 		if (StringUtils.isBlank(pageSearchParam.getCompanyIds())) {

model2d3d-viewer-back-service/src/main/java/com/model2d3d/viewer/back/service/impl/UserServiceImpl.java

@@ -76,16 +76,16 @@ public class UserServiceImpl implements UserService {
     
 	@Override
 	@Transactional
-	public SimpleDataResponse add(OptUserParam param, String companyId, Long userId, Integer languageType) {
+	public SimpleDataResponse add(OptUserParam param, String companyId, String userId, Integer languageType) {
 		try {
 //			if (StringUtils.isBlank(param.getLoginName())) {
 				param.setLoginName(param.getUsername());
 //			}
-			if (!"1".equals(companyId)) {//非顶级账号
+//			if (!"1".equals(companyId)) {//非顶级账号
 				param.setCompanyId(companyId);
-			} else if (null == param.getCompanyId()) {//admin账号必须能选择企业归属
+//			} else if (null == param.getCompanyId()) {//admin账号必须能选择企业归属
-				return new SimpleDataResponse(ResponseCode.MSG_ERROR, "companyId is required");
+//				return new SimpleDataResponse(ResponseCode.MSG_ERROR, "companyId is required");
-			}
+//			}
     		
     		param.setUserId(null);
     		//校验参数
@@ -133,7 +133,7 @@ public class UserServiceImpl implements UserService {
 	}
 
 
-	private void insertUserRoleRelation(Long creatorId, long currentUnix, String userId, String roleId) {
+	private void insertUserRoleRelation(String creatorId, long currentUnix, String userId, String roleId) {
 		// 先删除原有的关联关系
 		if (userId != null) {
 			basicRoleUserRelationMapperExt.delete(new LambdaQueryWrapper<BasicRoleUserRelation>()
@@ -175,7 +175,7 @@ public class UserServiceImpl implements UserService {
 
 
 	@Override
-	public SimpleDataResponse edit(OptUserParam param, String companyId, Long userId, Integer languageType) {
+	public SimpleDataResponse edit(OptUserParam param, String companyId, String userId, Integer languageType) {
 		try {
 //			if (StringUtils.isBlank(param.getLoginName())) {
 				param.setLoginName(param.getUsername());
@@ -236,7 +236,7 @@ public class UserServiceImpl implements UserService {
 
 
 	@Override
-	public SimpleDataResponse batchDelete(DeleteUserParam deleteUserParam, String companyId, Long userId,
+	public SimpleDataResponse batchDelete(DeleteUserParam deleteUserParam, String companyId, String userId,
 			Integer languageType) {
 		try {
     		//基础表删除
@@ -265,7 +265,7 @@ public class UserServiceImpl implements UserService {
 
 
 	@Override
-	public IPage<UserPageDTO> getListPage(PageSearchParam pageSearchParam, String companyId, Long userId,
+	public IPage<UserPageDTO> getListPage(PageSearchParam pageSearchParam, String companyId, String userId,
 										  Integer languageType) {
 		//list防${}注入
 		if (StringUtils.isBlank(pageSearchParam.getCompanyIds())) {
@@ -284,7 +284,7 @@ public class UserServiceImpl implements UserService {
 
 
 	@Override
-	public SimpleDataResponse batchResetPassword(ResetPassword resetPassword, String companyId, Long userId,
+	public SimpleDataResponse batchResetPassword(ResetPassword resetPassword, String companyId, String userId,
 			Integer languageType) {
 		if (StringUtils.isBlank(resetPassword.getUserIds())) {
 			return SimpleDataResponse.success();
@@ -334,7 +334,7 @@ public class UserServiceImpl implements UserService {
 
 
 	@Override
-	public SimpleDataResponse modifyPassword(ModifyPassword modifyPassword, String companyId, Long userId,
+	public SimpleDataResponse modifyPassword(ModifyPassword modifyPassword, String companyId, String userId,
 			Integer languageType) {
 		try {
 			if (!Pattern.matches(pwdPattern, modifyPassword.getNewPassword())) {