优化 组织架构

java110-bean/src/main/java/com/java110/dto/org/OrgDto.java

@@ -15,6 +15,7 @@ import java.util.Date;
  **/
 public class OrgDto extends PageDto implements Serializable {
 
+    public static final String ORG_LEVEL_STORE = "1";
     public static final String ORG_LEVEL_COMPANY = "2";
     public static final String ORG_LEVEL_DEPARTMENT = "3";
 

java110-bean/src/main/java/com/java110/dto/org/OrgTreeDto.java

@@ -0,0 +1,77 @@
+package com.java110.dto.org;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * {
+ * id: 'f_' + pItem.floorId,
+ * floorId: pItem.floorId,
+ * floorNum: pItem.floorNum,
+ * icon: "/img/floor.png",
+ * text: pItem.floorNum + "栋",
+ * state: {
+ * opened: false
+ * },
+ * children: []
+ * }
+ */
+public class OrgTreeDto implements Serializable {
+
+    public OrgTreeDto() {
+
+    }
+
+    public OrgTreeDto(String id, String text,String parentId) {
+        this.id = id;
+        this.text = text;
+        this.parentId = parentId;
+    }
+
+    private String id;
+    private String icon;
+    private String text;
+    private String parentId;
+    private List<OrgTreeDto> children;
+
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getIcon() {
+        return icon;
+    }
+
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
+
+    public List<OrgTreeDto> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<OrgTreeDto> children) {
+        this.children = children;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+}

service-user/src/main/java/com/java110/user/cmd/org/ListOrgTreeCmd.java

@@ -0,0 +1,87 @@
+package com.java110.user.cmd.org;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.org.OrgDto;
+import com.java110.dto.org.OrgTreeDto;
+import com.java110.intf.user.IOrgV1InnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.StringUtil;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Java110Cmd(serviceCode = "org.listOrgTree")
+public class ListOrgTreeCmd extends Cmd {
+
+    @Autowired
+    private IOrgV1InnerServiceSMO orgV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        String storeId = context.getReqHeaders().get("store-id");
+        if (StringUtil.isEmpty(storeId)) {
+            storeId = reqJson.getString("storeId");
+        }
+
+        Assert.hasLength(storeId, "未包含商户信息");
+
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        String storeId = context.getReqHeaders().get("store-id");
+        if (StringUtil.isEmpty(storeId)) {
+            storeId = reqJson.getString("storeId");
+        }
+        Assert.hasLength(storeId, "未包含商户信息");
+
+
+        OrgDto orgDto = new OrgDto();
+        orgDto.setStoreId(storeId);
+        List<OrgDto> orgDtos = orgV1InnerServiceSMOImpl.queryOrgs(orgDto);
+
+        OrgTreeDto storeOrgTreeDto = null;
+        for (OrgDto tmpOrgDto : orgDtos) {
+            if (OrgDto.ORG_LEVEL_STORE.equals(tmpOrgDto.getOrgLevel())) {
+                storeOrgTreeDto = new OrgTreeDto(tmpOrgDto.getOrgId(), tmpOrgDto.getOrgName(), tmpOrgDto.getParentOrgId());
+            }
+        }
+
+        if (storeOrgTreeDto == null) {
+            return;
+        }
+
+        findChilds(storeOrgTreeDto, orgDtos);
+        context.setResponseEntity(ResultVo.createResponseEntity(storeOrgTreeDto));
+
+    }
+
+    private void findChilds(OrgTreeDto parentOrgDto, List<OrgDto> orgDtos) {
+
+        List<OrgTreeDto> childs = new ArrayList<>();
+        OrgTreeDto child = null;
+        for (OrgDto orgDto : orgDtos) {
+            if (orgDto.getParentOrgId().equals(parentOrgDto.getId())) {
+                child = new OrgTreeDto(orgDto.getOrgId(), orgDto.getOrgName(), orgDto.getParentOrgId());
+                childs.add(child);
+            }
+        }
+
+        if (childs.size() < 1) {
+            return;
+        }
+
+        parentOrgDto.setChildren(childs);
+
+        for (OrgTreeDto orgTreeDto : childs) {
+            findChilds(orgTreeDto, orgDtos);
+        }
+    }
+}