数据第一版 人员汇报关系

.gitignore

@@ -5,7 +5,7 @@
 HELP.md
 target/
 
-.idea
+.idea/
 
 /test
 /src/rebel.xml

.idea/artifacts/weaver_develop_jar.xml

@@ -1,6 +1,6 @@
 <component name="ArtifactManager">
   <artifact type="jar" name="weaver-develop:jar">
-    <output-path>$PROJECT_DIR$/out/artifacts/weaver_develop_jar</output-path>
+    <output-path>$PROJECT_DIR$/../../../../weaver/ecology/WEB-INF/lib</output-path>
     <root id="archive" name="weaver-develop.jar">
       <element id="module-output" name="weaver-develop" />
     </root>

WEB-INF/prop/sship.properties

@@ -0,0 +1,3 @@
+roleId=67
+rolelevel=2
+fieldid=field19

src/com/api/jygf/web/MobilePermissionsAction.java

@@ -1,13 +0,0 @@
-package com.api.jygf.web;
-
-import javax.ws.rs.Path;
-
-/**
- * @Author weaver_cl
- * @Description:
- * @Date 2022/10/9
- * @Version V1.0
- **/
-@Path("/mobile/permission")
-public class MobilePermissionsAction extends com.engine.jygf.web.MobilePermissionsAction {
-}

src/com/api/sship/web/OrgChartController.java

@@ -0,0 +1,10 @@
+package com.api.sship.web;
+
+import javax.ws.rs.Path;
+
+/**
+ * @author liang.cheng
+ */
+@Path("/sship/organization/chart")
+public class OrgChartController extends com.engine.sship.web.OrgChartController {
+}

src/com/engine/jygf/cmd/MobilePermissionsCmd.java

@@ -1,68 +0,0 @@
-package com.engine.jygf.cmd;
-
-import com.engine.common.biz.AbstractCommonCommand;
-import com.engine.common.entity.BizLogContext;
-import com.engine.core.interceptor.CommandContext;
-import org.apache.commons.lang3.StringUtils;
-import weaver.conn.RecordSet;
-import weaver.hrm.User;
-import weaver.wechat.util.Utils;
-
-import java.util.*;
-
-/**
- * @Author weaver_cl
- * @Description:
- * @Date 2022/10/9
- * @Version V1.0
- **/
-public class MobilePermissionsCmd extends AbstractCommonCommand<Map<String, Object>> {
-
-    private static final String FIELDID = "field100043"; //移动电话自定义字段field100026
-
-    private static final String SCOPE = "HrmCustomFieldByInfoType";
-
-    private static final String SCOPEID = "-1";
-
-    public MobilePermissionsCmd(Map<String, Object> params, User user) {
-        this.user = user;
-        this.params = params;
-    }
-
-    @Override
-    public BizLogContext getLogContext() {
-        return null;
-    }
-
-
-    @Override
-    public Map<String, Object> execute(CommandContext commandContext) {
-        Map<String, Object> data = new HashMap<>();
-        String uid =  Utils.null2String(user.getUID());
-        RecordSet rs = new RecordSet();
-        HashSet<String> ids = new HashSet<>();
-        ids.add(uid);
-        rs.executeQuery("select ckr,bckr from uf_yddhqx_dt1");
-        while (rs.next()) {
-            String ckr = Utils.null2String(rs.getString("ckr"));
-            String bckr = Utils.null2String(rs.getString("bckr"));
-            if (Arrays.asList(ckr.split(",")).contains(uid)) {
-                ids.addAll(Arrays.asList(bckr.split(",")));
-            }
-        }
-
-        Map<String,String> mobileInfo = new HashMap<>();
-        String value = StringUtils.join(ids,",");
-        rs.executeQuery("select id,"+FIELDID+" from cus_fielddata where scope = ? and scopeid = ?" +
-                " and id in ("+value+")",SCOPE,SCOPEID);
-        while (rs.next()){
-            mobileInfo.put(Utils.null2String(rs.getString("id")),rs.getString(FIELDID));
-        }
-
-        data.put("ids",ids);
-        data.put("mobileInfo",mobileInfo);
-        return data;
-    }
-
-
-}

src/com/engine/jygf/service/MobilePermissionsService.java

@@ -1,16 +0,0 @@
-package com.engine.jygf.service;
-
-import weaver.hrm.User;
-
-import java.util.Map;
-
-/**
- * @Author weaver_cl
- * @Description:
- * @Date 2022/10/9
- * @Version V1.0
- **/
-public interface MobilePermissionsService {
-
-    Map<String, Object> getPermissionInfo(Map<String, Object> params, User user);
-}

src/com/engine/jygf/service/impl/MobilePermissionsServiceImpl.java

@@ -1,24 +0,0 @@
-package com.engine.jygf.service.impl;
-
-import com.engine.core.impl.Service;
-import com.engine.jygf.cmd.MobilePermissionsCmd;
-import com.engine.jygf.service.MobilePermissionsService;
-import weaver.hrm.User;
-
-import java.util.Map;
-
-/**
- * @Author weaver_cl
- * @Description:
- * @Date 2022/10/9
- * @Version V1.0
- **/
-public class MobilePermissionsServiceImpl extends Service implements MobilePermissionsService {
-
-
-
-    @Override
-    public Map<String, Object> getPermissionInfo(Map<String, Object> params, User user) {
-        return commandExecutor.execute(new MobilePermissionsCmd(params,user));
-    }
-}

src/com/engine/jygf/web/MobilePermissionsAction.java

@@ -1,57 +0,0 @@
-package com.engine.jygf.web;
-
-import com.alibaba.fastjson.JSONObject;
-import com.engine.common.util.ParamUtil;
-import com.engine.common.util.ServiceUtil;
-import com.engine.jygf.service.MobilePermissionsService;
-import com.engine.jygf.service.impl.MobilePermissionsServiceImpl;
-import weaver.hrm.HrmUserVarify;
-import weaver.hrm.User;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @Author weaver_cl
- * @Description:
- * @Date 2022/10/9
- * @Version V1.0
- **/
-public class MobilePermissionsAction {
-
-    public MobilePermissionsService getMobilePermissionsService(User user) {
-        return ServiceUtil.getService(MobilePermissionsServiceImpl.class,user);
-    }
-
-    /**
-     * 晶优光伏 移动电话通过建模控制权限 通讯录显示
-     * @param request
-     * @param response
-     * @return
-     */
-    @GET
-    @Path("/controller")
-    @Produces(MediaType.APPLICATION_JSON)
-    public String getPermissionInfo(@Context HttpServletRequest request, @Context HttpServletResponse response) {
-        Map<String, Object> apidatas = new HashMap<>();
-        try {
-            User user = HrmUserVarify.getUser(request, response);
-            //实例化Service 并调用业务类处理
-            apidatas = getMobilePermissionsService(user).getPermissionInfo(ParamUtil.request2Map(request), user);
-        } catch (Exception e) {
-            //异常处理
-            apidatas.put("api_status", false);
-        }
-        return JSONObject.toJSONString(apidatas);
-    }
-
-
-
-}

src/com/engine/sship/entity/ChartChildrensVO.java

@@ -0,0 +1,26 @@
+package com.engine.sship.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @author liang.cheng
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ChartChildrensVO {
+
+    private String id;
+
+    private String pid;
+
+    private String label;
+
+    private List<ChartChildrensVO> childrens;
+}

src/com/engine/sship/entity/PersonTablePO.java

@@ -0,0 +1,32 @@
+package com.engine.sship.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author liang.cheng
+ * @Date 2024/1/4 3:22 PM
+ * @Description: TODO
+ * @Version 1.0
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class PersonTablePO {
+
+    private Integer id;
+
+    private String lastname;
+
+    private String workcode;
+
+    private Integer sex;
+
+    private Integer managerid;
+
+    private String loginid;
+
+}

src/com/engine/sship/entity/PersonTableParam.java

@@ -0,0 +1,23 @@
+package com.engine.sship.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author liang.cheng
+ * @Date 2024/1/4 3:26 PM
+ * @Description: TODO
+ * @Version 1.0
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class PersonTableParam {
+
+    //todo 分页参数
+
+    private String id;
+}

src/com/engine/sship/entity/PersonTableVO.java

@@ -0,0 +1,34 @@
+package com.engine.sship.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author liang.cheng
+ * @Date 2024/1/4 3:17 PM
+ * @Description: TODO
+ * @Version 1.0
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class PersonTableVO {
+
+    private Integer id;
+
+    private String lastname;
+
+    private String workcode;
+
+    private String sex;
+
+    private String manager;
+
+    private String loginid;
+
+
+
+}

src/com/engine/sship/entity/TreeDataVO.java

@@ -0,0 +1,27 @@
+package com.engine.sship.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+
+/**
+ * @author apple
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class TreeDataVO {
+
+    private String id;
+
+    private String label;
+
+    private List<ChartChildrensVO> childrens;
+
+
+}

src/com/engine/sship/exception/CustomizeRunTimeException.java

@@ -0,0 +1,22 @@
+package com.engine.sship.exception;
+
+/**
+ * @Author weaver_cl
+ * @Description:
+ * @Date 2023/2/21
+ * @Version V1.0
+ **/
+public class CustomizeRunTimeException extends RuntimeException{
+
+    public CustomizeRunTimeException(String message) {
+        super(message);
+    }
+
+    public CustomizeRunTimeException(Throwable cause) {
+        super(cause);
+    }
+
+    public CustomizeRunTimeException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

src/com/engine/sship/service/OrgChartService.java

@@ -0,0 +1,53 @@
+package com.engine.sship.service;
+
+
+import com.engine.sship.entity.PersonTableParam;
+import com.engine.sship.entity.PersonTableVO;
+import com.engine.sship.entity.TreeDataVO;
+
+import java.util.List;
+
+
+/**
+ * @author apple
+ */
+public interface OrgChartService {
+
+
+   /**
+    * @Description: 根据角色Id判断当前人员是否在成员信息
+    * @Author: liang.cheng
+    * @Date: 2024/1/3 3:16 PM
+    * @param: [roleId, rolelevel]
+    * @return: int
+    */
+    boolean selectIdsByRole(String roleId,String rolelevel);
+
+    /**
+     * @Description: 集团组织人员图
+     * @Author: liang.cheng
+     * @Date: 2024/1/3 10:07 AM
+     * @param: []
+     * @return: com.engine.sship.entity.ChartChildrensVO
+     */
+    TreeDataVO selectResourceChart();
+
+
+    /**
+     * @Description: 获取SiteHead人员集合
+     * @Author: liang.cheng
+     * @Date: 2024/1/3 4:23 PM
+     * @param: []
+     * @return: java.util.List<java.lang.Integer>
+     */
+    List<Integer> selectCusSiteHead();
+
+    /**
+     * @Description: 人员信息
+     * @Author: liang.cheng
+     * @Date: 2024/1/4 3:29 PM
+     * @param: [personTableParam]
+     * @return: com.engine.sship.entity.PersonTableVO
+     */
+    List<PersonTableVO> selectPerson(PersonTableParam personTableParam);
+}

src/com/engine/sship/service/impl/OrgChartServiceImpl.java

@@ -0,0 +1,238 @@
+package com.engine.sship.service.impl;
+
+import com.engine.common.service.HrmCommonService;
+import com.engine.common.service.impl.HrmCommonServiceImpl;
+import com.engine.core.impl.Service;
+import com.engine.sship.entity.*;
+import com.engine.sship.service.OrgChartService;
+import com.weaver.general.BaseBean;
+import com.weaver.general.Util;
+import lombok.SneakyThrows;
+import weaver.conn.RecordSet;
+import weaver.hrm.company.DepartmentComInfo;
+import weaver.hrm.resource.ResourceComInfo;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+/**
+ * @Author liang.cheng
+ * @Date 2023/9/26 5:52 PM
+ * @Description:
+ * @Version 1.0
+ */
+public class OrgChartServiceImpl extends Service implements OrgChartService {
+
+    private HrmCommonService hrmCommonService = new HrmCommonServiceImpl();
+
+    @Override
+    public boolean selectIdsByRole(String roleId,String rolelevel) {
+        String roleMemberIds = hrmCommonService.getRoleMemberIds(roleId, rolelevel);
+        List<String> roleMemberList = Arrays.stream(roleMemberIds.split(","))
+                .filter(s -> !s.isEmpty())
+                .collect(Collectors.toList());
+        return roleMemberList.stream()
+                .anyMatch(s -> Integer.parseInt(s) == user.getUID());
+    }
+
+    @Override
+    public TreeDataVO selectResourceChart() {
+        BaseBean bb = new BaseBean();
+        String roleId = bb.getPropValue("sship", "roleId");
+        String rolelevel = bb.getPropValue("sship", "rolelevel");
+        boolean isExsit = selectIdsByRole(roleId, rolelevel);
+        if (isExsit || (user.getUID() == 1)) {
+            return getAllTreeData();
+        }
+
+        return getBaseTreeData();
+    }
+
+    @Override
+    public List<Integer> selectCusSiteHead() {
+        RecordSet rs = new RecordSet();
+        BaseBean bb = new BaseBean();
+        String fieldid = bb.getPropValue("sship", "fieldid");
+        String sitehead = bb.getPropValue("sship", "sitehead");
+        List<Integer> ids = new ArrayList<>();
+        rs.executeQuery("select id from cus_fielddata where "+fieldid+" = ? and scopeid = 3 and scope = 'HrmCustomFieldByInfoType'",sitehead);
+        while (rs.next()) {
+            ids.add(Util.getIntValue(rs.getString("id")));
+        }
+        return ids;
+    }
+
+    @SneakyThrows
+    @Override
+    public List<PersonTableVO> selectPerson(PersonTableParam personTableParam) {
+        List<PersonTablePO> poList;
+        ResourceComInfo rInfo = new ResourceComInfo();
+        BaseBean bb = new BaseBean();
+        String shareholder = bb.getPropValue("sship", "shareholder");
+        String committee = bb.getPropValue("sship", "committee");
+        switch(personTableParam.getId()){
+            case "S-1":
+                poList = selectByLevel(Integer.valueOf(shareholder));
+                break;
+            case "C-1":
+                poList = selectByLevel(Integer.valueOf(committee));
+                break;
+                default:
+                    poList = selectByDeptId(personTableParam.getId());
+        }
+
+        return poList.stream()
+                .map(po -> new PersonTableVO(po.getId(), po.getLastname(), po.getWorkcode(),
+                        po.getSex() == 0 ? "男" : "女",
+                        po.getManagerid() != null ? rInfo.getLastname(String.valueOf(po.getManagerid())) : "",
+                        po.getLoginid()))
+                .collect(Collectors.toList());
+    }
+
+
+    private List<PersonTablePO> selectByLevel(Integer level) {
+        RecordSet rs = new RecordSet();
+        List<PersonTablePO> poList = new ArrayList<>();
+        BaseBean bb = new BaseBean();
+        String fieldid = bb.getPropValue("sship", "fieldid");
+        rs.executeQuery("select h.id,h.lastname,h.workcode,h.sex,h.managerid,h.loginid from hrmresource h\n" +
+                " left join cus_fielddata c on h.id = c.id\n" +
+                " where c.scopeid = 3 and c.scope = 'HrmCustomFieldByInfoType' and c."+fieldid+" = ?",level);
+        while (rs.next()) {
+            poList.add(
+                    PersonTablePO.builder()
+                            .id(Util.getIntValue(rs.getString("id")))
+                            .lastname(Util.null2String(rs.getString("lastname")))
+                            .workcode(Util.null2String(rs.getString("workcode")))
+                            .sex(Util.getIntValue(rs.getString("sex")))
+                            .managerid(Util.getIntValue(rs.getString("managerid")))
+                            .loginid(Util.null2String(rs.getString("loginid")))
+                            .build()
+            );
+        }
+        return poList;
+    }
+
+    private List<PersonTablePO> selectByDeptId(String id) {
+        RecordSet rs = new RecordSet();
+        List<PersonTablePO> poList = new ArrayList<>();
+        rs.executeQuery("select id,lastname,workcode,sex,managerid,loginid from hrmresource where status < 4 and departmentid = ?",id);
+        while (rs.next()) {
+            poList.add(
+                    PersonTablePO.builder()
+                        .id(Util.getIntValue(rs.getString("id")))
+                            .lastname(Util.null2String(rs.getString("lastname")))
+                            .workcode(Util.null2String(rs.getString("workcode")))
+                            .sex(Util.getIntValue(rs.getString("sex")))
+                            .managerid(Util.getIntValue(rs.getString("managerid")))
+                            .loginid(Util.null2String(rs.getString("loginid")))
+                            .build()
+            );
+        }
+        return poList;
+    }
+
+    /**
+     * 获取指定组织树
+     * @return
+     */
+    @SneakyThrows
+    private TreeDataVO getBaseTreeData() {
+        int uid = user.getUID();
+        List<Integer> idList = selectCusSiteHead();
+        boolean contains = idList.contains(uid);
+        DepartmentComInfo dInfo = new DepartmentComInfo();
+        ResourceComInfo rInfo = new ResourceComInfo();
+        String departmentId = rInfo.getDepartmentID(String.valueOf(uid));
+        TreeDataVO build = TreeDataVO.builder()
+                .id(departmentId)
+                .label(contains ? dInfo.getDepartmentName(departmentId) : rInfo.getLastname(String.valueOf(uid)))
+                .build();
+        boolean manager = hrmCommonService.isManager(uid);
+        if (manager) {
+            build.setChildrens(recursionDepartment(uid));
+        }
+        return build;
+    }
+
+    /**
+     * 获取全量组织树
+     * @return
+     */
+    private TreeDataVO getAllTreeData() {
+        //1.股东及委员会层级指定
+        ChartChildrensVO committee = ChartChildrensVO.builder().id("C-1")
+                .pid("S-1")
+                .label("Committee")
+                .childrens(getSiteHead())
+                .build();
+        List<ChartChildrensVO> committeeList = Collections.singletonList(committee);
+
+        return TreeDataVO.builder().id("S-1")
+                .label("Shareholder")
+                .childrens(committeeList)
+                .build();
+    }
+
+    @SneakyThrows
+    private List<ChartChildrensVO> getSiteHead() {
+        List<Integer> idList = selectCusSiteHead();
+        List<ChartChildrensVO> siteHeadList = new ArrayList<>();
+        DepartmentComInfo dInfo = new DepartmentComInfo();
+        ResourceComInfo rInfo = new ResourceComInfo();
+        idList.forEach(item -> {
+            String departmentId = rInfo.getDepartmentID(String.valueOf(item));
+            ChartChildrensVO build = ChartChildrensVO.builder()
+                    .id(departmentId)
+                    .pid("C-1")
+                    //.label(dInfo.getDepartmentmark(departmentId))
+                    .label(rInfo.getLastname(String.valueOf(item)))
+                    .build();
+            boolean manager = hrmCommonService.isManager(item);
+            if (manager) {
+                build.setChildrens(recursionDepartment(item));
+            }
+            siteHeadList.add(build);
+        });
+
+
+        return siteHeadList;
+    }
+
+    /**
+     * 递归获取
+     * @param id
+     * @return
+     */
+    @SneakyThrows
+    private List<ChartChildrensVO> recursionDepartment(Integer id) {
+        List<ChartChildrensVO> vos = new ArrayList<>();
+        DepartmentComInfo dInfo = new DepartmentComInfo();
+        ResourceComInfo rInfo = new ResourceComInfo();
+        String underling = hrmCommonService.getUnderling(id);
+        //获取直接下属
+        List<String> underList = Arrays.stream(underling.split(","))
+                .filter(s -> !s.isEmpty())
+                .collect(Collectors.toList());
+        underList.forEach(item -> {
+            String departmentId = rInfo.getDepartmentID(String.valueOf(item));
+            ChartChildrensVO build = ChartChildrensVO.builder()
+                    .id(departmentId)
+                    .pid(item)
+                    //.label(dInfo.getDepartmentmark(departmentId))
+                    .label(rInfo.getLastname(String.valueOf(item)))
+                    .build();
+            boolean manager = hrmCommonService.isManager(Integer.valueOf(item));
+            if (manager) {
+                build.setChildrens(recursionDepartment(Integer.valueOf(item)));
+            }
+            vos.add(build);
+        });
+
+        return vos;
+    }
+}

src/com/engine/sship/util/CommonAssert.java

@@ -0,0 +1,175 @@
+package com.engine.sship.util;
+
+import com.engine.sship.exception.CustomizeRunTimeException;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
+
+import java.util.Collection;
+import java.util.Map;
+
+/**
+ * @Author weaver_cl
+ * @description:
+ * @Date 2022/4/26
+ * @Version V1.0
+ **/
+public abstract class CommonAssert {
+    /**
+     * 判断入参不为null
+     *
+     * @param object  待检查参数
+     * @param message 检查失败返回的异常信息
+     */
+    public static void notNull(Object object, String message) {
+        if (object == null) {
+            throw new CustomizeRunTimeException(message);
+        }
+    }
+
+    /**
+     * 判断入参不为null
+     *
+     * @param string  待检查参数
+     * @param message 检查失败返回的异常信息
+     */
+    public static void notNull(String string, String message) {
+        if (StringUtils.isBlank(string)) {
+            throw new CustomizeRunTimeException(message);
+        }
+    }
+
+    /**
+     * 判断多个入参不为null
+     *
+     * @param message 检查失败返回的异常信息
+     * @param objects 待检查参数
+     */
+    public static void notNull(String message, Object... objects) {
+        for (Object obj : objects) {
+            if (obj == null) {
+                throw new CustomizeRunTimeException(message);
+            }
+        }
+    }
+
+    /**
+     * 判断入参为null
+     *
+     * @param object  待检查参数
+     * @param message 检查失败返回的异常信息
+     */
+    public static void isNull(Object object, String message) {
+        if (object != null) {
+            throw new CustomizeRunTimeException(message);
+        }
+    }
+
+    /**
+     * 判断集合是否为空
+     *
+     * @param collection 待检查参数
+     * @param message    检查失败返回的异常信息
+     */
+    public static void isEmpty(Collection<?> collection, String message) {
+        if (!CollectionUtils.isEmpty(collection)) {
+            throw new CustomizeRunTimeException(message);
+        }
+    }
+
+    /**
+     * 判断集合不为空
+     *
+     * @param collection 待检查参数
+     * @param message    检查失败返回的异常信息
+     */
+    public static void notEmpty(Collection<?> collection, String message) {
+        if (CollectionUtils.isEmpty(collection)) {
+            throw new CustomizeRunTimeException(message);
+        }
+    }
+
+    /**
+     * 判断数组是否为空
+     *
+     * @param arr     待检查参数
+     * @param message 检查失败返回的异常信息
+     */
+    public static void notEmpty(Object[] arr, String message) {
+        if (ObjectUtils.isEmpty(arr)) {
+            throw new CustomizeRunTimeException(message);
+        }
+    }
+
+    /**
+     * 判断map是否为空
+     *
+     * @param map     待检查参数
+     * @param message 检查失败返回的异常信息
+     */
+    public static void notEmpty(Map<?, ?> map, String message) {
+        if (CollectionUtils.isEmpty(map)) {
+            throw new CustomizeRunTimeException(message);
+        }
+    }
+
+    /**
+     * 判断数组元素是否为空
+     *
+     * @param arr     待检查参数
+     * @param message 检查失败返回的异常信息
+     */
+    public static void notNullElement(Object[] arr, String message) {
+        if (arr != null) {
+            for (Object obj : arr) {
+                if (obj == null) {
+                    throw new CustomizeRunTimeException(message);
+                }
+            }
+        }
+    }
+
+    /**
+     * 判断boolean
+     *
+     * @param expression 待检查参数
+     * @param message    检查失败返回的异常信息
+     */
+    public static void isTrue(boolean expression, String message) {
+        if (!expression) {
+            throw new CustomizeRunTimeException(message);
+        }
+    }
+
+    public static void isFalse(boolean expression, String message) {
+        if (expression) {
+            throw new CustomizeRunTimeException(message);
+        }
+    }
+
+    public static void isBlank(CharSequence cs, String message) {
+        int strLen;
+        if (cs != null && (strLen = cs.length()) != 0) {
+            for (int i = 0; i < strLen; ++i) {
+                if (!Character.isWhitespace(cs.charAt(i))) {
+                    throw new CustomizeRunTimeException(message);
+                }
+            }
+        }
+    }
+
+    public static void notBlank(CharSequence cs, String message) {
+        int strLen;
+        if (cs != null && (strLen = cs.length()) != 0) {
+            for (int i = 0; i < strLen; ++i) {
+                if (Character.isWhitespace(cs.charAt(i))) {
+                    throw new CustomizeRunTimeException(message);
+                }
+            }
+        }
+        if (cs == null || cs.length() == 0) {
+            throw new CustomizeRunTimeException(message);
+        }
+
+    }
+}

src/com/engine/sship/util/ExceptionUtil.java

@@ -0,0 +1,18 @@
+package com.engine.sship.util;
+
+
+/**
+ * @author apple
+ */
+public class ExceptionUtil {
+    public static String getRealMessage(Throwable e) {
+        while (e != null) {
+            Throwable cause = e.getCause();
+            if (cause == null) {
+                return e.getMessage();
+            }
+            e = cause;
+        }
+        return "";
+    }
+}

src/com/engine/sship/util/ResponseResult.java

@@ -0,0 +1,185 @@
+package com.engine.sship.util;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+
+import com.engine.core.exception.ECException;
+import com.engine.sship.exception.CustomizeRunTimeException;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
+import weaver.general.BaseBean;
+import weaver.hrm.User;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+
+@Slf4j
+public class ResponseResult<T, R> {
+
+    private static final long serialVersionUID = 1L;
+
+    private final User user;
+
+    private final BaseBean baseBean = new BaseBean();
+
+    private final Boolean isLog = "true".equals(baseBean.getPropValue("hrmSalary", "log"));
+
+    public ResponseResult(User user) {
+        this.user = user;
+    }
+
+    /**
+     * 统一返回方法(自定义返回格式)
+     */
+    public String customRun(Function<T, R> f, T t) {
+        try {
+            if (isLog) {
+                log.info("run api , param {}", t);
+            }
+            return getJsonString(f.apply(t));
+        } catch (CustomizeRunTimeException e) {
+            log.error("api run fail", e);
+            return Error(e.getMessage());
+        } catch (ECException e) {
+            log.error("api run fail", e);
+            Throwable cause = e.getCause();
+            return Error(cause.getMessage());
+        } catch (Exception e) {
+            log.error("api run fail", e);
+            return Error("系统异常!");
+        }
+    }
+
+    /**
+     * 统一返回方法
+     */
+    public String run(Function<T, R> f, T t) {
+        try {
+            if (isLog) {
+                log.info("run api , param {}", t);
+            }
+            return Ok(f.apply(t));
+        } catch (CustomizeRunTimeException e) {
+            log.error("api run fail", e);
+            return Error(e.getMessage());
+        } catch (ECException e) {
+            log.error("api run fail", e);
+            Throwable cause = e.getCause();
+            return Error(cause.getMessage());
+        } catch (Exception e) {
+            log.error("api run fail", e);
+            return Error("系统异常!");
+        }
+    }
+
+    /**
+     * 统一返回方法（有参无返回）
+     */
+    public String run(Consumer<T> f, T t) {
+        try {
+            if (isLog) {
+                log.info("run api , param {}", t);
+            }
+            f.accept(t);
+            return Ok();
+        } catch (CustomizeRunTimeException e) {
+            log.error("api run fail", e);
+            return Error(e.getMessage());
+        } catch (ECException e) {
+            log.error("api run fail", e);
+            return Error(ExceptionUtil.getRealMessage(e));
+        } catch (Exception e) {
+            log.error("api run fail", e);
+            return Error("系统异常!", e);
+        }
+    }
+
+
+    /**
+     * 统一返回方法（无参有返回）
+     */
+    public String run(Supplier<R> f) {
+        try {
+            if (isLog) {
+                log.info("run api");
+            }
+            return Ok(f.get());
+        } catch (CustomizeRunTimeException e) {
+            log.error("api run fail", e);
+            return Error(e.getMessage());
+        } catch (ECException e) {
+            log.error("api run fail", e);
+            Throwable cause = e.getCause();
+            return Error(cause.getMessage());
+        } catch (Exception e) {
+            log.error("api run fail", e);
+            return Error("系统异常!", e);
+        }
+    }
+
+
+    private static String getJsonString(Object apidatas) {
+        ObjectMapper mapper = new ObjectMapper();
+        try {
+            return mapper.writeValueAsString(apidatas);
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+        return "";
+    }
+
+
+    /**
+     * 成功返回
+     */
+    private String Ok() {
+        Map<String, Object> apidatas = new HashMap<>();
+        apidatas.put("api_status", true);
+        return JSONObject.toJSONString(apidatas, SerializerFeature.DisableCircularReferenceDetect);
+    }
+
+
+    /**
+     * 成功返回
+     */
+    private String Ok(R r) {
+        Map<String, Object> apidatas = new HashMap<>();
+        apidatas.put("api_status", true);
+        apidatas.put("data", r);
+        String success = getJsonString(apidatas);
+        if (isLog) {
+            log.info("run salary api success return {}", success);
+        }
+        return success;
+    }
+
+
+    /**
+     * 失败返回
+     */
+    private static String Error(String message) {
+        Map<String, Object> apidatas = new HashMap<>();
+        apidatas.put("api_status", false);
+        apidatas.put("msg", message);
+        return JSONObject.toJSONString(apidatas, SerializerFeature.DisableCircularReferenceDetect);
+    }
+
+
+    /**
+     * 系统异常失败返回
+     */
+    private static String Error(String message, Exception e) {
+        Map<String, Object> apidatas = new HashMap<>();
+        apidatas.put("api_status", false);
+        apidatas.put("msg", message);
+        apidatas.put("error", e.getMessage());
+        return JSONObject.toJSONString(apidatas, SerializerFeature.DisableCircularReferenceDetect);
+    }
+
+}

src/com/engine/sship/web/OrgChartController.java

@@ -0,0 +1,56 @@
+package com.engine.sship.web;
+
+import com.engine.common.util.ServiceUtil;
+import com.engine.sship.entity.PersonTableParam;
+import com.engine.sship.entity.PersonTableVO;
+import com.engine.sship.entity.TreeDataVO;
+import com.engine.sship.service.OrgChartService;
+import com.engine.sship.service.impl.OrgChartServiceImpl;
+import com.engine.sship.util.ResponseResult;
+import weaver.hrm.HrmUserVarify;
+import weaver.hrm.User;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import java.util.List;
+
+
+/**
+ * @Author liang.cheng
+ * @Date 2023/9/26 5:51 PM
+ * @Description: 组织架构图
+ * @Version 1.0
+ */
+public class OrgChartController {
+
+    private OrgChartService getOrgChartService(User user) {
+        return ServiceUtil.getService(OrgChartServiceImpl.class,user);
+    }
+
+
+    @GET
+    @Path("/resource-tree")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String selectResourceChart(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+        User user = HrmUserVarify.getUser(request, response);
+        return new ResponseResult<String, TreeDataVO>(user).run(getOrgChartService(user) :: selectResourceChart);
+    }
+
+    @GET
+    @Path("/person")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String selectPerson(@Context HttpServletRequest request, @Context HttpServletResponse response,@QueryParam("id") String id) {
+        User user = HrmUserVarify.getUser(request, response);
+        PersonTableParam build = PersonTableParam.builder().id(id).build();
+        return new ResponseResult<PersonTableParam, List<PersonTableVO>>(user).run(getOrgChartService(user) :: selectPerson,build);
+    }
+
+
+
+}

src/test/MainTest.java

@@ -1,5 +1,7 @@
 package test;
 
+import java.util.*;
+
 /**
  * @Author weaver_cl
  * @Description:
@@ -10,5 +12,13 @@ public class MainTest {
 
     public static void main(String[] args) {
 
+       TreeSet<String> a = new TreeSet<>();
+       a.add("和平");
+        a.add("阿姨");
+        a.add("测试");
+        for (String string : a) {
+            System.out.println(string);
+        }
     }
+
 }

src/weaver/interfaces/gsjrkg/action/SyncCertificateAction.java

@@ -1,135 +0,0 @@
-package weaver.interfaces.gsjrkg.action;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import weaver.conn.RecordSet;
-import weaver.general.Util;
-import weaver.interfaces.workflow.action.Action;
-import weaver.soa.workflow.request.MainTableInfo;
-import weaver.soa.workflow.request.Property;
-import weaver.soa.workflow.request.RequestInfo;
-
-import java.util.*;
-
-/**
- * @Description: 同步证书到人员卡片个人信息
- * @author:dxfeng
- * @createTime: 2023/02/20
- * @version: 1.0
- */
-public class SyncCertificateAction implements Action {
-    /**
-     * 建模表表名
-     */
-    private String modeTableName;
-
-    /**
-     * 参数名称：建模表字段名：人员表字段名
-     */
-    private String params;
-
-    private String resourceFieldGroup;
-
-    @Override
-    public String execute(RequestInfo requestInfo) {
-        if (StringUtils.isBlank(params)) {
-            requestInfo.getRequestManager().setMessagecontent("自定义接口参数值配置错误");
-            return Action.FAILURE_AND_CONTINUE;
-        }
-        if (StringUtils.isBlank(resourceFieldGroup)) {
-            // -1:基本信息,1:个人信息,3:工作信息
-            resourceFieldGroup = "1";
-        }
-        Map<String, String> fieldMap = new HashMap<>();
-        String[] fieldsArray = params.split(";");
-        for (String fields : fieldsArray) {
-            String[] field = fields.split(":");
-            if (field.length == 2) {
-                fieldMap.put(field[0], field[1]);
-            }
-        }
-        if (fieldMap.size() != fieldsArray.length) {
-            requestInfo.getRequestManager().setMessagecontent("自定义接口参数值格式错误,请检查");
-            return Action.FAILURE_AND_CONTINUE;
-        }
-        Set<String> modeFields = fieldMap.keySet();
-        Map<String, Set<String>> modeMap = new HashMap<>();
-
-        RecordSet rs = new RecordSet();
-        String resourceId = "";
-        MainTableInfo mainTableInfo = requestInfo.getMainTableInfo();
-        Property[] property = mainTableInfo.getProperty();
-        for (Property item : property) {
-            String name = item.getName();
-            String value = Util.null2String(item.getValue());
-            if (StringUtils.isNotBlank(name) && StringUtils.isNotBlank(value)) {
-                if ("xm".equals(name)) {
-                    resourceId = value;
-                }
-            }
-        }
-        // 查询当前人员的所有数据
-        StringBuilder sqlBuilder = new StringBuilder("select ").append(StringUtils.join(modeFields, ",")).append(" from ").append(modeTableName).append(" where xm = ").append(resourceId).append(" order by id");
-        rs.executeQuery(sqlBuilder.toString());
-        while (rs.next()) {
-            appendIds(modeFields, rs, modeMap);
-        }
-        // 判断有无数据，没有的话插入数据
-        sqlBuilder = new StringBuilder("SELECT id FROM CUS_FIELDDATA where scope ='HrmCustomFieldByInfoType' and scopeid = '").append(resourceFieldGroup).append("' and id =? ");
-        rs.executeQuery(sqlBuilder.toString(), resourceId);
-        if (!rs.next()) {
-            // 插入人员信息数据
-            rs.executeUpdate("insert into cus_fielddata (scope,scopeid,id) values ('HrmCustomFieldByInfoType','" + resourceFieldGroup + "',?)", resourceId);
-        }
-        // 组装更新SQL语句
-        sqlBuilder = new StringBuilder("update cus_fielddata set ");
-        for (Map.Entry<String, String> entry : fieldMap.entrySet()) {
-            Set<String> valueSet = modeMap.get(entry.getKey());
-            String values = CollectionUtils.isEmpty(valueSet) ? "" : StringUtils.join(valueSet, ",");
-            sqlBuilder.append(" ").append(entry.getValue()).append(" = '").append(values).append("',");
-        }
-        sqlBuilder.deleteCharAt(sqlBuilder.length() - 1);
-        sqlBuilder.append(" where scope ='HrmCustomFieldByInfoType' and scopeid = ").append(resourceFieldGroup).append(" and id = ").append(resourceId);
-        rs.executeUpdate(sqlBuilder.toString());
-
-        return Action.SUCCESS;
-    }
-
-
-    private void appendIds(Set<String> modeFields, RecordSet rs, Map<String, Set<String>> modeMap) {
-        for (String modeField : modeFields) {
-            String ids = rs.getString(modeField);
-            if (StringUtils.isBlank(ids)) {
-                return;
-            }
-            if (CollectionUtils.isEmpty(modeMap.get(modeField))) {
-                modeMap.put(modeField, new HashSet<>());
-            }
-            modeMap.get(modeField).addAll(Arrays.asList(ids.split(",")));
-        }
-    }
-
-    public String getParams() {
-        return params;
-    }
-
-    public void setParams(String params) {
-        this.params = params;
-    }
-
-    public String getModeTableName() {
-        return modeTableName;
-    }
-
-    public void setModeTableName(String modeTableName) {
-        this.modeTableName = modeTableName;
-    }
-
-    public String getResourceFieldGroup() {
-        return resourceFieldGroup;
-    }
-
-    public void setResourceFieldGroup(String resourceFieldGroup) {
-        this.resourceFieldGroup = resourceFieldGroup;
-    }
-}