提交区域相关代码

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/Area.java

@@ -57,4 +57,10 @@ public class Area extends BaseEntity {
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long creatorId;
 
+    @ApiModelProperty("机构/部门名称")
+    private String bizOrgName;
+
+    @ApiModelProperty("机构编码")
+    private String bizOrgCode;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/AreaResquest.java

@@ -19,5 +19,7 @@ public class AreaResquest {
     private Long creatorId;
     private String userId;
     private Long riskPointId;
+    private String bizOrgCode;
+    private String bizOrgName;
     private List<SourceFile> sourceFiles;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/UnitAreaTreeVo.java

+package com.yeejoin.equipmanage.common.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author DELL
+ */
+@Data
+@ApiModel("单位区域树")
+public class UnitAreaTreeVo {
+
+    @ApiModelProperty("id主键")
+    private Long id;
+
+    @ApiModelProperty("名称")
+    private String name;
+
+    @ApiModelProperty(value = "区域编码")
+    private String code;
+
+    @ApiModelProperty("区域类型")
+    private String type;
+
+    @ApiModelProperty("机构编码")
+    private String bizOrgCode;
+
+    @ApiModelProperty("机构编码")
+    private String bizOrgName;
+
+    @ApiModelProperty("父级id")
+    private Long parentId;
+
+    @ApiModelProperty("children")
+    private List<UnitAreaTreeVo> children;
+
+
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/AreaController.java

 package com.yeejoin.equipmanage.controller;
 
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.module.common.api.core.framework.PersonIdentify;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
 import com.yeejoin.equipmanage.common.dto.AreaDto;
 import com.yeejoin.equipmanage.common.entity.Area;
 import com.yeejoin.equipmanage.common.vo.AreaResquest;
 import com.yeejoin.equipmanage.common.vo.AreaTreeVo;
+import com.yeejoin.equipmanage.common.vo.UnitAreaTreeVo;
 import com.yeejoin.equipmanage.service.IAreaService;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 区域
@@ -41,14 +36,43 @@ public class AreaController extends AbstractBaseController {
 	@Autowired
 	IAreaService iAreaService;
 
+//	/**
+//	 * 获取区域树
+//	 */
+//	@TycloudOperation(ApiLevel = UserType.AGENCY)
+//	@ApiOperation("区域树")
+//	@GetMapping(value = "/tree")
+//	public List<AreaTreeVo> getAreaTree() {
+//		return iAreaService.getAreaTreeVo();
+//	}
+
 	/**
-	 * 获取区域树
+	 * 获取公司部门区域树
+	 * @return list
 	 */
+	@PersonIdentify
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation("区域树")
+	@ApiOperation(httpMethod = "GET", value = "根据登陆人获取单位区域树", notes = "根据登陆人获取单位区域树")
 	@GetMapping(value = "/tree")
-	public List<AreaTreeVo> getAreaTree() {
-		return iAreaService.getAreaTreeVo();
+	public List<UnitAreaTreeVo> getSystemTree(){
+		ReginParams reginParams = getSelectedOrgInfo();
+		ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
+		String bizOrgCode = personIdentity.getBizOrgCode();
+		return iAreaService.getAreaTreeListVo(bizOrgCode);
+	}
+
+	/**
+	 * 获取人员部门树
+	 * @return list
+	 */
+	@PersonIdentify
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET", value = "根据登陆人、机构类型获取人员部门树", notes = "根据登陆人、机构类型获取人员部门树")
+	@GetMapping(value = "/companyTreeByUserAndType")
+	public List<OrgMenuDto> companyTreeByUserAndType(@RequestParam(required = false) String type){
+		// 获取登陆人角色
+		ReginParams reginParams = getSelectedOrgInfo();
+		return iAreaService.companyTreeByUserAndType(reginParams, type);
 	}
 
 	/**
@@ -57,11 +81,11 @@ public class AreaController extends AbstractBaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation("区域树")
 	@GetMapping(value = "/treeById")
-	public List<AreaTreeVo> getAreaTreeById(@RequestParam Long id) {
+	public List<UnitAreaTreeVo> getAreaTreeById(@RequestParam Long id, @RequestParam String bizOrgCode) {
 		if (id == null) {
 			id = -1L;
 		}
-		return iAreaService.getAreaTreeVoById(id);
+		return iAreaService.getAreaTreeVoById(id, bizOrgCode);
 	}
 
 	/**
@@ -84,6 +108,7 @@ public class AreaController extends AbstractBaseController {
 		return iAreaService.areaList(page, area);
 	}
 
+
 	/**
 	 * 保存数据
 	 */

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/WarehouseStructureController.java

@@ -5,8 +5,10 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.equipmanage.common.entity.Warehouse;
 import com.yeejoin.equipmanage.common.vo.AreaTreeVo;
+import com.yeejoin.equipmanage.common.vo.UnitAreaTreeVo;
 import com.yeejoin.equipmanage.service.IFormInstanceService;
 import com.yeejoin.equipmanage.service.IWarehouseService;
 import org.apache.commons.lang3.StringUtils;
@@ -34,7 +36,7 @@ import io.swagger.annotations.ApiOperation;
 @RestController
 @Api(tags = "货架结构Api")
 @RequestMapping(value = "/warehouse-structure", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-public class WarehouseStructureController {
+public class WarehouseStructureController extends AbstractBaseController {
 
 	@Autowired
 	IWarehouseStructureService iWarehouseStructureService;
@@ -195,7 +197,9 @@ public class WarehouseStructureController {
 	@RequestMapping(value = "/getValueByColumn", method = RequestMethod.GET)
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET", value = "根据source_id查询区域树", notes = "根据id查询")
-	public List<AreaTreeVo> getValueByColumn(@RequestParam Long sourceId) {
-		return iFormInstanceService.getValueByColumn(sourceId);
+	public List<UnitAreaTreeVo> getValueByColumn(@RequestParam Long sourceId) {
+		// 获取登陆人角色
+		String orgcode = getOrgCode();
+		return iFormInstanceService.getValueByColumn(sourceId, orgcode);
 	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IAreaService.java

@@ -3,10 +3,13 @@ package com.yeejoin.equipmanage.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
 import com.yeejoin.equipmanage.common.dto.AreaDto;
 import com.yeejoin.equipmanage.common.entity.Area;
 import com.yeejoin.equipmanage.common.vo.AreaResquest;
 import com.yeejoin.equipmanage.common.vo.AreaTreeVo;
+import com.yeejoin.equipmanage.common.vo.UnitAreaTreeVo;
 
 import java.util.List;
 import java.util.Map;
@@ -22,9 +25,10 @@ public interface IAreaService extends IService<Area> {
      * 获取区域树
      * @return
      */
-    List<AreaTreeVo> getAreaTreeVo();
+//    List<AreaTreeVo> getAreaTreeVo();
+
+    List<UnitAreaTreeVo> getAreaTreeVoById(long id, String bizOrgCode);
 
-    List<AreaTreeVo> getAreaTreeVoById(long id);
     /**
      * 根据条件分页
      * @param page
@@ -33,6 +37,22 @@ public interface IAreaService extends IService<Area> {
      */
     IPage<AreaResquest> areaList(Page page, Area area);
 
+    /**
+     * 根据bizOrgCode获取单位区域树
+     * @param bizOrgCode 登陆人的机构编码
+     * @return list
+     */
+    List<UnitAreaTreeVo> getAreaTreeListVo(String bizOrgCode);
+
+
+    /**
+     * 根据登录人及类型获取公司部门树
+     * @param reginParams 公司及部门信息
+     * @param type  默认查询公司及部门，公司：COMPANY，部门：DEPARTMENT
+     * @return
+     */
+    List<OrgMenuDto> companyTreeByUserAndType(ReginParams reginParams, String type);
+
     Object saveArea(AreaResquest areaResquest);
 
     Object updateArea(AreaResquest areaResquest);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IFormInstanceService.java

@@ -6,6 +6,7 @@ import com.yeejoin.equipmanage.common.entity.FormInstance;
 import com.yeejoin.equipmanage.common.entity.dto.BuildSearchDTO;
 import com.yeejoin.equipmanage.common.entity.vo.BuildingVideoListVO;
 import com.yeejoin.equipmanage.common.vo.AreaTreeVo;
+import com.yeejoin.equipmanage.common.vo.UnitAreaTreeVo;
 
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -150,6 +151,6 @@ public interface IFormInstanceService extends IService<FormInstance> {
      */
     void unbindRegionRelation(Long instanceId);
 
-    List<AreaTreeVo> getValueByColumn(Long instanceId);
+    List<UnitAreaTreeVo> getValueByColumn(Long instanceId, String bizOrgcode);
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FormInstanceServiceImpl.java

@@ -18,6 +18,7 @@ import com.yeejoin.equipmanage.common.enums.GroupCodeEnum;
 import com.yeejoin.equipmanage.common.enums.GroupColumnDataType;
 import com.yeejoin.equipmanage.common.utils.RandomUtil;
 import com.yeejoin.equipmanage.common.vo.AreaTreeVo;
+import com.yeejoin.equipmanage.common.vo.UnitAreaTreeVo;
 import com.yeejoin.equipmanage.mapper.FormInstanceMapper;
 import com.yeejoin.equipmanage.remote.RemoteSecurityService;
 import com.yeejoin.equipmanage.service.*;
@@ -493,8 +494,8 @@ public class FormInstanceServiceImpl extends ServiceImpl<FormInstanceMapper, For
     }
 
     @Override
-    public List<AreaTreeVo> getValueByColumn(Long instanceId) {
-        List<AreaTreeVo> listTree = new ArrayList<>();
+    public List<UnitAreaTreeVo> getValueByColumn(Long instanceId, String bizOrgcode) {
+        List<UnitAreaTreeVo> listTree = new ArrayList<>();
         LambdaQueryWrapper<FormInstance> queryWrapper = new LambdaQueryWrapper<>();
         if (instanceId != 0L) {
             queryWrapper.eq(FormInstance::getInstanceId, instanceId);
@@ -503,7 +504,7 @@ public class FormInstanceServiceImpl extends ServiceImpl<FormInstanceMapper, For
         FormInstance formInstance = formInstanceMapper.selectOne(queryWrapper);
         if (formInstance != null && formInstance.getFieldValue() != null && !"".equals(formInstance.getFieldValue())) {
             long fieldValue = Long.parseLong(formInstance.getFieldValue());
-            listTree = iAreaService.getAreaTreeVoById(fieldValue);
+            listTree = iAreaService.getAreaTreeVoById(fieldValue, bizOrgcode);
         }
 
         return listTree;

amos-boot-system-equip/src/main/resources/changelog/wl-3.0.1.xml

@@ -2132,4 +2132,28 @@
             ALTER TABLE `cb_fire_station` add column `biz_org_code` varchar(1000) DEFAULT NULL COMMENT '机构编码';
         </sql>
     </changeSet>
+
+    <changeSet author="keyong" id="1640203458-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_area" columnName="biz_org_code"/>
+            </not>
+        </preConditions>
+        <comment>wl_area add column biz_org_code</comment>
+        <sql>
+            alter table `wl_area` add column `biz_org_code` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '机构编码';
+        </sql>
+    </changeSet>
+    <changeSet author="keyong" id="1640203458-2">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_area" columnName="biz_org_name"/>
+            </not>
+        </preConditions>
+        <comment>wl_area add column biz_org_name</comment>
+        <sql>
+            alter table `wl_area` add column `biz_org_name` varchar(128) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '机构/部门名称';
+        </sql>
+    </changeSet>
+
 </databaseChangeLog>
\ No newline at end of file