Merge pull request '人员卡片权限接口' (#37) from feature/cl into develop

Reviewed-on: #37

src/com/engine/organization/entity/personnelcard/vo/CardAccessVO.java

@@ -1,11 +1,14 @@
 package com.engine.organization.entity.personnelcard.vo;
 
+import com.cloudstore.eccom.pc.table.WeaTableType;
+import com.engine.organization.annotation.OrganizationTable;
+import com.engine.organization.annotation.OrganizationTableColumn;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.Date;
+
 
 /**
  * @Author weaver_cl
@@ -14,8 +17,45 @@ import java.util.Date;
  * @Version V1.0
  **/
 
-
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@OrganizationTable(pageId = "8df45b09-0cda-4f57-a93a-ca9f96a4cfbf",
+        fields = "t.id," +
+                "t.type_name," +
+                "t.status," +
+                "t.all_people," +
+                "t.superior," +
+                "t.all_superior," +
+                "t.custom",
+        fromSql = "FROM jcl_org_cardaccess t ",
+        orderby = "id",
+        sortway = "asc",
+        primarykey = "id",
+        tableType = WeaTableType.CHECKBOX
+)
 public class CardAccessVO {
 
+    @OrganizationTableColumn(column = "id", display = false)
+    private Long id;
+
+    @OrganizationTableColumn(text = "栏目", width = "15%", column = "type_name")
+    private Integer typeName;
+
+    @OrganizationTableColumn(text = "是否启用", width = "15%", column = "status")
+    private Integer status;
+
+    @OrganizationTableColumn(text = "所有人可见", width = "15%", column = "all_people")
+    private Integer allPeople;
+
+    @OrganizationTableColumn(text = "上级可见", width = "15%", column = "superior")
+    private Integer superior;
+
+    @OrganizationTableColumn(text = "所有上级可见", width = "15%", column = "all_superior")
+    private Integer allSuperior;
+
+    @OrganizationTableColumn(text = "查看自定义", width = "15%", column = "custom",transmethod = "com.engine.organization.transmethod.ManagerDetachTransMethod.getRoleLevel")
+    private String custom;
 
 }

src/com/engine/organization/service/CardAccessService.java

@@ -1,5 +1,7 @@
 package com.engine.organization.service;
 
+import java.util.Map;
+
 /**
  * @Author weaver_cl
  * @Description:
@@ -7,4 +9,10 @@ package com.engine.organization.service;
  * @Version V1.0
  **/
 public interface CardAccessService {
+
+    Map<String, Object> tablePage();
+
+    Map<String, Object> hasRight();
+
+    int save(Map<String, Object> params);
 }

src/com/engine/organization/service/impl/CardAccessServiceImpl.java

@@ -1,10 +1,52 @@
 package com.engine.organization.service.impl;
 
+import com.cloudstore.eccom.result.WeaResultMsg;
+import com.engine.core.impl.Service;
+import com.engine.organization.component.OrganizationWeaTable;
+import com.engine.organization.entity.detach.vo.ManagerDetachVO;
+import com.engine.organization.service.CardAccessService;
+import com.engine.organization.util.HasRightUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * @Author weaver_cl
  * @Description:
  * @Date 2022/11/1
  * @Version V1.0
  **/
-public class CardAccessServiceImpl  {
+public class CardAccessServiceImpl extends Service implements CardAccessService {
+
+    private static final String RIGHT_NAME = "CardAccess:All";
+
+    @Override
+    public Map<String, Object> tablePage() {
+        Map<String, Object> resultMap = new HashMap<>();
+        OrganizationWeaTable<ManagerDetachVO> table = new OrganizationWeaTable<>(user, ManagerDetachVO.class);
+        String sqlWhere = " where delete_type = 0";
+        table.setSqlwhere(sqlWhere);
+        WeaResultMsg result = new WeaResultMsg(false);
+        result.putAll(table.makeDataResult());
+        result.success();
+        resultMap.putAll(result.getResultMap());
+
+        return resultMap;
+    }
+
+    @Override
+    public Map<String, Object> hasRight() {
+        Map<String, Object> resultMap = new HashMap<>();
+        boolean hasRight = HasRightUtil.hasRight(user, RIGHT_NAME, true);
+        resultMap.put("hasRight", hasRight);
+        return resultMap;
+    }
+
+    @Override
+    public int save(Map<String, Object> params) {
+        
+        return 0;
+    }
+
+
 }

src/com/engine/organization/web/CardAccessController.java

@@ -1,5 +1,24 @@
 package com.engine.organization.web;
 
+import com.engine.common.util.ParamUtil;
+import com.engine.common.util.ServiceUtil;
+import com.engine.organization.entity.detach.param.ManagerDetachParam;
+import com.engine.organization.util.response.ReturnResult;
+import com.engine.organization.wrapper.CardAccessWrapper;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+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.POST;
+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.Map;
+
 /**
  * @Author weaver_cl
  * @Description:
@@ -8,4 +27,46 @@ package com.engine.organization.web;
  **/
 
 public class CardAccessController {
+
+    public CardAccessWrapper getCardAccessWrapper(User user) {
+        return ServiceUtil.getService(CardAccessWrapper.class,user);
+    }
+
+
+    @GET
+    @Path("/hasRight")
+    @Produces(MediaType.APPLICATION_JSON)
+    public ReturnResult hasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+        try {
+            User user = HrmUserVarify.getUser(request, response);
+            return ReturnResult.successed(getCardAccessWrapper(user).hasRight());
+        } catch (Exception e) {
+            return ReturnResult.exceptionHandle(e);
+        }
+    }
+
+    @GET
+    @Path("/getTable")
+    @Produces(MediaType.APPLICATION_JSON)
+    public ReturnResult listPage(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+        try {
+            User user = HrmUserVarify.getUser(request, response);
+            return ReturnResult.successed(getCardAccessWrapper(user).listPage());
+        } catch (Exception e) {
+            return ReturnResult.exceptionHandle(e);
+        }
+    }
+
+    @POST
+    @Path("/save")
+    @Produces(MediaType.APPLICATION_JSON)
+    public ReturnResult save(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+        try {
+            User user = HrmUserVarify.getUser(request, response);
+            Map<String, Object> map = ParamUtil.request2Map(request);
+            return ReturnResult.successed(getCardAccessWrapper(user).save(map));
+        } catch (Exception e) {
+            return ReturnResult.exceptionHandle(e);
+        }
+    }
 }

src/com/engine/organization/web/ManagerDetachController.java

@@ -33,7 +33,7 @@ public class ManagerDetachController {
     @GET
     @Path("/getTable")
     @Produces(MediaType.APPLICATION_JSON)
-    public ReturnResult listScheme(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+    public ReturnResult listPage(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
@@ -98,7 +98,7 @@ public class ManagerDetachController {
     @POST
     @Path("/save")
     @Produces(MediaType.APPLICATION_JSON)
-    public ReturnResult saveScheme(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody ManagerDetachParam param) {
+    public ReturnResult saveDetach(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody ManagerDetachParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getManagerDetachWrapper(user).save(param));
@@ -110,7 +110,7 @@ public class ManagerDetachController {
     @POST
     @Path("/update")
     @Produces(MediaType.APPLICATION_JSON)
-    public ReturnResult updateScheme(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody ManagerDetachParam param) {
+    public ReturnResult updateDetach(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody ManagerDetachParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getManagerDetachWrapper(user).updateDetach(param));

src/com/engine/organization/wrapper/CardAccessWrapper.java

@@ -1,6 +1,12 @@
 package com.engine.organization.wrapper;
 
+import com.engine.common.util.ServiceUtil;
+import com.engine.organization.service.CardAccessService;
+import com.engine.organization.service.impl.CardAccessServiceImpl;
 import com.engine.organization.util.OrganizationWrapper;
+import weaver.hrm.User;
+
+import java.util.Map;
 
 /**
  * @Author weaver_cl
@@ -9,4 +15,20 @@ import com.engine.organization.util.OrganizationWrapper;
  * @Version V1.0
  **/
 public class CardAccessWrapper extends OrganizationWrapper {
+
+    public CardAccessService getCardAccessService(User user) {
+        return ServiceUtil.getService(CardAccessServiceImpl.class,user);
+    }
+
+    public Map<String, Object> listPage() {
+        return getCardAccessService(user).tablePage();
+    }
+
+    public Map<String, Object> hasRight() {
+        return getCardAccessService(user).hasRight();
+    }
+
+    public int save(Map<String, Object> params) {
+        return getCardAccessService(user).save(params);
+    }
 }