返回所有机构信息

user_center/src/main/java/com/huaxu/controller/OrgController.java

@@ -100,8 +100,11 @@ public class OrgController {
      */
     @RequestMapping(value = "getOrgTree", method = RequestMethod.POST)
     @ApiOperation(value = "获取机构树")
-    public AjaxMessage<List<OrgTree>> getOrgTree(@ApiParam(value = "机构类型", required = true)String orgType) {
+    public AjaxMessage<List<OrgTree>> getOrgTree(@ApiParam(value = "机构类型", required = true)
+
+                                                             @RequestParam  String orgType) {
         Org org=new Org();
+        if("company".equals(orgType))
         org.setOrgType(orgType);
         ;
         return new AjaxMessage<>(ResultStatus.OK, orgService.getTrees(org));

user_center/src/main/java/com/huaxu/dto/OrgTree.java

@@ -1,9 +1,11 @@
 package com.huaxu.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.huaxu.entity.Org;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 @Data
 public class OrgTree {
@@ -17,13 +19,90 @@ public class OrgTree {
     */
    @ApiModelProperty(value = "租户标识")
    private String tenantId;
+   /**
+    * 机构类型
+    */
+   @ApiModelProperty(value = "机构类型")
+   private String orgType;
+   /**
+    * 上级机构
+    */
+   @ApiModelProperty(value = "上级机构")
+   private Integer parentOrgId;
+   /**
+    * 机构所在区域
+    */
+   @ApiModelProperty(value = "机构所在区域")
+   private Integer orgAreaId;
    /**
     * 机构名称
     */
    @ApiModelProperty(value = "机构名称")
    private String orgName;
-   @ApiModelProperty(value = "上级机构")
-   private Integer parentOrgId;
+   /**
+    * 机构状态
+    */
+   @ApiModelProperty(value = "机构状态")
+   private Integer orgState;
+   /**
+    * 备注
+    */
+   @ApiModelProperty(value = "备注")
+   private String remark;
+   /**
+    * 机构负责人名称
+    */
+   @ApiModelProperty(value = "机构负责人名称")
+   private String orgLeaderName;
+   /**
+    * 机构负责人手机
+    */
+   @ApiModelProperty(value = "机构负责人手机")
+   private String orgLeaderPhone;
+   /**
+    * 机构负责人邮箱
+    */
+   @ApiModelProperty(value = "机构负责人邮箱")
+   private String orgLeaderEmail;
+   /**
+    * 机构负责人性别
+    */
+   @ApiModelProperty(value = "机构负责人性别")
+   private String orgLeaderSex;
+   /**
+    * 数据删除标记
+    */
+   @ApiModelProperty(value = "数据删除标记")
+   private Integer status;
+   /**
+    * 创建时间
+    */
+   @ApiModelProperty(value = "创建时间")
+   private Date dateCreate;
+   /**
+    * 创建人
+    */
+   @ApiModelProperty(value = "创建人")
+   private String createBy;
+   @ApiModelProperty(value = "")
+   private Date dateUpdate;
+   @ApiModelProperty(value = "")
+   private String updateBy;
+   @ApiModelProperty(value = "父组织类型")
+   @TableField(exist = false)
+   private String parentType;
+   @ApiModelProperty(value = "子组织类型")
+   @TableField(exist = false)
+   private String childType;
+   @ApiModelProperty(value = "父组织id")
+   @TableField(exist = false)
+   private Integer parentId;
+   @ApiModelProperty(value = "父组织名称")
+   @TableField(exist = false)
+   private String parentName;
+   @ApiModelProperty(value = "区域名称")
+   @TableField(exist = false)
+   private String areaName;
    private List<OrgTree>orgs;
    private boolean display;
 }

user_center/src/main/java/com/huaxu/service/impl/OrgServiceImpl.java

@@ -184,7 +184,7 @@ public class OrgServiceImpl implements OrgService {
         trees=getOrgTree(trees,0,1,orgIds);
         return trees;
     }
-    public static List<OrgTree> getOrgTree(List<OrgTree> list, Integer id, Integer leve, Set<Integer> set) {
+    public static List<OrgTree> getOrgTree(List<OrgTree> list, Integer id, Integer level, Set<Integer> set) {
         List<OrgTree> temList = newArrayList();
         if (list != null) {
             for (OrgTree orgTree : list) {
@@ -194,12 +194,12 @@ public class OrgServiceImpl implements OrgService {
                     if(!set.contains(id)){
                         orgTree.setDisplay(true);
                     }
-                    List<OrgTree> chidren = getOrgTree(list, orgTree.getId(), ++leve,set);
+                    List<OrgTree> chidren = getOrgTree(list, orgTree.getId(), ++level,set);
                     OrgTree temPermission = new OrgTree();
                     BeanUtils.copyProperties(orgTree, temPermission);
                     temPermission.setOrgs(chidren);
                     temList.add(temPermission);
-                    leve--;
+                    level--;
                 }
 
             }

user_center/src/main/resources/mapper/OrgMapper.xml

@@ -260,7 +260,7 @@
          limit 1
     </select>
     <select id="selectTrees" resultType="com.huaxu.dto.OrgTree">
-          select ID, TENANT_ID, PARENT_ORG_ID,ORG_NAME
+          select ID, TENANT_ID, ORG_TYPE, PARENT_ORG_ID, ORG_AREA_ID, ORG_NAME, ORG_STATE, REMARK, ORG_LEADER_NAME, ORG_LEADER_PHONE, ORG_LEADER_EMAIL, ORG_LEADER_SEX, STATUS, DATE_CREATE, CREATE_BY, DATE_UPDATE, UPDATE_BY
            from uims_org
            <where>
               and status!=-1

user_center/src/test/com/huaxu/test/TestOrgTree.java

@@ -102,9 +102,9 @@ public class TestOrgTree {
             e.printStackTrace();
         }
     }
-    @Test
+    //@Test
     public void test2() throws SQLException, ClassNotFoundException {
-        Class.forName(JDBC_DRIVER);
+        /*Class.forName(JDBC_DRIVER);
         Connection conn = null;
 
         conn = DriverManager.getConnection(DB_URL,USER,PASS);
@@ -114,12 +114,12 @@ public class TestOrgTree {
 
         // 执行查询
 
-        /*String []tables={"SC_ROLE","SC_USER_ROLE","SC_PERMISSION","SC_ROLE_PERMISSION","SC_ROLE_PERMISSION","SC_ROLE_PERMISSION"
+        *//*String []tables={"SC_ROLE","SC_USER_ROLE","SC_PERMISSION","SC_ROLE_PERMISSION","SC_ROLE_PERMISSION","SC_ROLE_PERMISSION"
         ,"SC_SITE","SC_SITE_PERMISSION","SC_SITE_USER","SC_LOGIN_LOG","SC_BUILDING","SC_COMMUNITY"
         ,"SC_AREA","SC_MESSAGE","SC_DEVICE","SC_DEVICE_DATA_DIM","SC_METER_READ_RECORD","SC_SITE_PERMISSION","SC_SITE_PERMISSION",
                 "SC_SITE_PERMISSION","SC_SITE_PERMISSION","SC_SITE_PERMISSION",
                 "sc_stat_meter_read_rate_by_building","sc_stat_meter_read_rate_by_building_15day",
-        "sc_stat_meter_read_rate_by_building_month","sc_clearing_plan", "sc_clearing_record_item"};*/
+        "sc_stat_meter_read_rate_by_building_month","sc_clearing_plan", "sc_clearing_record_item"};*//*
         String []tables={"udip_unit_profile_t","udip_unit_attribute_t","udip_unit_specs_t"
         ,"udip_unit_method_t","udip_unit_param_t","udip_unit_t","udip_unit_data_t",
                 "udip_unit_command_t"};
@@ -128,7 +128,7 @@ public class TestOrgTree {
          produceTable(tables[i],dbMetaData);
         }
 
-        conn.close();
+        conn.close();*/
     }
     // @Test
     public void test(){