Merge branch 'feature/xgh/2024权限调整' into 'master'

Feature/xgh/2024权限调整

See merge request !1735

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/role/HaobanMenuQDTO.java

@@ -49,6 +49,52 @@ public class HaobanMenuQDTO implements Serializable {
     private String ownerShip;
     private Integer statusFlag = 1;
 
+    private String  appCode ;
+    private Integer funType ;
+    private Integer noOpenFlag ;
+    private Integer expireFlag ;
+    private String appVersions ;
+
+    public String getAppCode() {
+        return appCode;
+    }
+
+    public void setAppCode(String appCode) {
+        this.appCode = appCode;
+    }
+
+    public Integer getFunType() {
+        return funType;
+    }
+
+    public void setFunType(Integer funType) {
+        this.funType = funType;
+    }
+
+    public Integer getNoOpenFlag() {
+        return noOpenFlag;
+    }
+
+    public void setNoOpenFlag(Integer noOpenFlag) {
+        this.noOpenFlag = noOpenFlag;
+    }
+
+    public Integer getExpireFlag() {
+        return expireFlag;
+    }
+
+    public void setExpireFlag(Integer expireFlag) {
+        this.expireFlag = expireFlag;
+    }
+
+    public String getAppVersions() {
+        return appVersions;
+    }
+
+    public void setAppVersions(String appVersions) {
+        this.appVersions = appVersions;
+    }
+
     public Integer getStatusFlag() {
         return statusFlag;
     }

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/role/HaobanMenuDTO.java

@@ -61,6 +61,52 @@ public class HaobanMenuDTO implements Serializable {
     private int authControl ;
     private String btnCodeRel ;
 
+    private String  appCode ;
+    private Integer funType ;
+    private Integer noOpenFlag ;
+    private Integer expireFlag ;
+    private String appVersions ;
+
+    public String getAppCode() {
+        return appCode;
+    }
+
+    public void setAppCode(String appCode) {
+        this.appCode = appCode;
+    }
+
+    public Integer getFunType() {
+        return funType;
+    }
+
+    public void setFunType(Integer funType) {
+        this.funType = funType;
+    }
+
+    public Integer getNoOpenFlag() {
+        return noOpenFlag;
+    }
+
+    public void setNoOpenFlag(Integer noOpenFlag) {
+        this.noOpenFlag = noOpenFlag;
+    }
+
+    public Integer getExpireFlag() {
+        return expireFlag;
+    }
+
+    public void setExpireFlag(Integer expireFlag) {
+        this.expireFlag = expireFlag;
+    }
+
+    public String getAppVersions() {
+        return appVersions;
+    }
+
+    public void setAppVersions(String appVersions) {
+        this.appVersions = appVersions;
+    }
+
     public int getAuthControl() {
         return authControl;
     }

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/HaobanCommonMQApiService.java

@@ -34,5 +34,7 @@ public interface HaobanCommonMQApiService {
     public void memberEventDel(String params) ;
     // 会员扫码关注
     public void memberEventWechat(String params) ;
+    // 服务开通事件
+    public void serviceOpenOffEvent(String params) ;
 
 }

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/role/HaobanMenuApiService.java

@@ -12,6 +12,7 @@ import java.util.List;
  */
 public interface HaobanMenuApiService {
 
+    public void deleteByMenuCode(String menuCode) ;
     /**
      * 添加
      *
@@ -42,7 +43,7 @@ public interface HaobanMenuApiService {
      * @param clerkType      职员类型
      * @return {@link ServiceResponse}<{@link List}<{@link HaobanMenuDTO}>>
      */
-    ServiceResponse<List<HaobanMenuDTO>> getHaobanMenuTreeList(String wxEnterpriseId,Integer clerkType);
+    ServiceResponse<List<HaobanMenuDTO>> getHaobanMenuTreeList(String wxEnterpriseId, String enterpriseId , Integer clerkType);
 
 
     ServiceResponse<String> getMenuNameByCode(String menuCode);

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/role/HaobanRoleApiService.java

@@ -44,6 +44,8 @@ public interface HaobanRoleApiService {
      */
     ServiceResponse<HaobanRoleDTO> getMenuByWxEnterpriseIdAndClerkType(String wxEnterpriseId, Integer clerkType,Integer systemFlag);
 
+    ServiceResponse<HaobanRoleDTO> getMenuByWxEnterpriseIdAndClerkType(String wxEnterpriseId, Integer clerkType,Integer systemFlag , String enterpriseId);
+
     /**
      *
      * 默认生成好办小程序权限
@@ -55,13 +57,6 @@ public interface HaobanRoleApiService {
      */
     ServiceResponse addHaobanRole(String wxEnterpriseId);
 
-    /**
-     * 角色初始化
-     * @param wxEnterpriseId wx企业标识
-     * @return {@link ServiceResponse}
-     */
-    ServiceResponse addHaobanRoleInit(String wxEnterpriseId);
-
 
     /**
      * 查询菜单权限

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/test/TestController.java

@@ -248,22 +248,6 @@ public class TestController extends WebBaseController {
     }
 
 
-    @RequestMapping("/addHaobanRoleInit")
-    public HaobanResponse addHaobanRoleInit(String wxEnterpriseId) {
-        haobanRoleApiService.addHaobanRoleInit(wxEnterpriseId);
-        return resultResponse(HaoBanErrCode.ERR_1);
-    }
-
-
-    @RequestMapping("/addHaobanRoleInitAll")
-    public HaobanResponse addHaobanRoleInitAll() {
-        List<YwWxEnterpriseDTO> ywWxEnterpriseDTOS = wxEnterpriseApiService.listAll();
-        for (YwWxEnterpriseDTO ywWxEnterpriseDTO : ywWxEnterpriseDTOS) {
-            haobanRoleApiService.addHaobanRoleInit(ywWxEnterpriseDTO.getWxEnterpriseId());
-        }
-        return resultResponse(HaoBanErrCode.ERR_1);
-    }
-
     @RequestMapping("/get-cache")
     @ResponseBody
     public Object getCache(String key) {

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/role/TabHaobanMenuMapper.java

@@ -103,5 +103,7 @@ public interface TabHaobanMenuMapper {
     TabHaobanMenu getMenuByCode(@Param("menuCode") String menuCode);
 
     void deleteAll();
+
+    void deleteByMenuCode(@Param("menuCode")String menuCode) ;
 }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/role/HaobanMenuBO.java

@@ -3,6 +3,7 @@ package com.gic.haoban.manage.service.pojo.bo.role;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  *
@@ -190,5 +191,19 @@ public class HaobanMenuBO implements Serializable {
     public void setOwnerShip(String ownerShip) {
         this.ownerShip = ownerShip;
     }
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        HaobanMenuBO that = (HaobanMenuBO) o;
+        return Objects.equals(menuCode, that.menuCode);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(menuCode);
+    }
 }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/HaobanCommonMQApiServiceImpl.java

@@ -8,6 +8,7 @@ import com.gic.haoban.manage.service.service.StaffClerkRelationService;
 import com.gic.commons.util.StringUtil;
 import com.gic.haoban.manage.api.dto.MemberUnionidWechatAccountQDTO;
 import com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService;
+import com.gic.haoban.manage.service.service.role.HaobanMenuService;
 import com.gic.haoban.manage.service.util.EventUtils;
 import com.gic.member.api.dto.MemberInfoChangeNotifyDTO;
 import com.gic.member.api.dto.event.wechat.WeChatOfficialAccountEventParam;
@@ -48,6 +49,8 @@ public class HaobanCommonMQApiServiceImpl implements HaobanCommonMQApiService {
     private ExternalClerkRelatedApiService externalClerkRelatedApiService ;
     @Autowired
     private StaffClerkRelationService staffClerkRelationService ;
+    @Autowired
+    private HaobanMenuService haobanMenuService ;
 
     @Override
     public void putCommonMessage(CommonMQDTO dto) {
@@ -233,4 +236,9 @@ public class HaobanCommonMQApiServiceImpl implements HaobanCommonMQApiService {
             log.error("通知好办失败", e);
         }
     }
+
+    @Override
+    public void serviceOpenOffEvent(String params) {
+        this.haobanMenuService.saveMenuFromGicEvent(params);
+    }
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/role/HaobanMenuApiServiceImpl.java

@@ -19,6 +19,10 @@ public class HaobanMenuApiServiceImpl implements HaobanMenuApiService {
     @Autowired
     private HaobanMenuService haobanMenuService;
 
+    @Override
+    public void deleteByMenuCode(String menuCode) {
+        this.haobanMenuService.deleteByMenuCode(menuCode);
+    }
 
     @Override
     public ServiceResponse add(List<HaobanMenuQDTO> haobanMenuDTOList) {
@@ -55,8 +59,8 @@ public class HaobanMenuApiServiceImpl implements HaobanMenuApiService {
     }
 
     @Override
-    public ServiceResponse<List<HaobanMenuDTO>> getHaobanMenuTreeList(String wxEnterpriseId, Integer clerkType) {
-        List<HaobanMenuBO> haobanMenuBOList = haobanMenuService.getHaobanMenuTreeList(wxEnterpriseId, clerkType);
+    public ServiceResponse<List<HaobanMenuDTO>> getHaobanMenuTreeList(String wxEnterpriseId, String enterpriseId ,Integer clerkType) {
+        List<HaobanMenuBO> haobanMenuBOList = haobanMenuService.getHaobanMenuTreeList(wxEnterpriseId, enterpriseId,clerkType);
         return ServiceResponse.success(EntityUtil.changeEntityListNew(HaobanMenuDTO.class, haobanMenuBOList));
     }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/role/HaobanMenuService.java

 package com.gic.haoban.manage.service.service.role;
 
+import com.gic.clerk.api.dto.right.RightMenuDTO;
 import com.gic.haoban.manage.service.entity.role.TabHaobanMenu;
 import com.gic.haoban.manage.service.pojo.bo.role.HaobanMenuBO;
 
@@ -63,7 +64,10 @@ public interface HaobanMenuService {
      * @param clerkType      职员类型
      * @return {@link List}<{@link HaobanMenuBO}>
      */
-    List<HaobanMenuBO> getHaobanMenuTreeList(String wxEnterpriseId, Integer clerkType);
+    List<HaobanMenuBO> getHaobanMenuTreeList(String wxEnterpriseId, String enterpriseId, Integer clerkType);
+
+    public List<RightMenuDTO> getGicBuyMenus(String enterpriseId) ;
+    public List<String> getGicBuyCodes(String enterpriseId , Integer clerkType) ;
 
 
     /**
@@ -93,4 +97,8 @@ public interface HaobanMenuService {
     HaobanMenuBO getMenuByCode(String menuCode);
 
     void deleteAll();
+
+    void deleteByMenuCode(String menuCode) ;
+
+    void saveMenuFromGicEvent(String params) ;
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/util/Constant.java

+package com.gic.haoban.manage.service.util;
+
+public class Constant {
+
+    public static  final String hb_wxa_namespace = "haoban-wxa";
+
+}

haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml

@@ -235,5 +235,6 @@
     <dubbo:reference id="contentProducerApiService" interface="com.gic.content.api.service.ContentProducerApiService" timeout="10000" retries="0" check="false" />
     <dubbo:reference interface="com.gic.content.api.service.ContentMaterialApiService" id="contentMaterialApiService" timeout="10000" retries="0" check="false" />
     <dubbo:reference interface="com.gic.content.api.service.ContentSettingApiService" id="contentSettingApiService" timeout="10000" retries="0" check="false" />
+    <dubbo:reference interface="com.gic.clerk.api.service.MenuApiService" id="menuApiService" timeout="10000" retries="0" check="false" />
 
 </beans>
\ No newline at end of file

haoban-manage3-service/src/main/resources/mapper/role/TabHaobanMenuMapper.xml

@@ -213,5 +213,10 @@
         from tab_haoban_menu
     </delete>
 
+
+    <delete id="deleteByMenuCode" parameterType="java.lang.String">
+        update  tab_haoban_menu set status_flag = 0 where menu_code = #{menuCode}
+    </delete>
+
 </mapper>
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/HaobanRoleController.java

@@ -133,7 +133,7 @@ public class HaobanRoleController extends WebBaseController {
     @RequestMapping(value = "/getHaobanMenuTreeList", method = RequestMethod.GET)
     public RestResponse<List<HaobanMenuDTO>> getHaobanMenuTreeList(Integer clerkType) {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
-        ServiceResponse<List<HaobanMenuDTO>> serviceResponse = haobanMenuApiService.getHaobanMenuTreeList(login.getWxEnterpriseId(), clerkType);
+        ServiceResponse<List<HaobanMenuDTO>> serviceResponse = haobanMenuApiService.getHaobanMenuTreeList(login.getWxEnterpriseId(),login.getEnterpriseId(), clerkType);
         return RestResponse.successResult(serviceResponse.getResult());
     }
 
@@ -145,7 +145,7 @@ public class HaobanRoleController extends WebBaseController {
     @RequestMapping(value = "/queryMenuByClerkType", method = RequestMethod.GET)
     public RestResponse<HaobanRoleDTO> queryMenuByClerkType(Integer clerkType) {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
-        ServiceResponse<HaobanRoleDTO> serviceResponse = haobanRoleApiService.getMenuByWxEnterpriseIdAndClerkType(login.getWxEnterpriseId(), clerkType, 1);
+        ServiceResponse<HaobanRoleDTO> serviceResponse = haobanRoleApiService.getMenuByWxEnterpriseIdAndClerkType(login.getWxEnterpriseId(), clerkType, 1 , login.getEnterpriseId());
         return RestResponse.successResult(serviceResponse.getResult());
     }
 

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxStaffController.java

@@ -1484,7 +1484,7 @@ public class WxStaffController extends WebBaseController {
      * @return
      */
     @RequestMapping(value = "/queryMenuCodesByClerkType", method = RequestMethod.GET)
-    public RestResponse<HaobanRoleDTO> queryMenuByClerkType(Integer clerkType, String staffId, String wxEnterpriseId) {
+    public RestResponse<HaobanRoleDTO> queryMenuByClerkType(Integer clerkType, String staffId, String wxEnterpriseId , String enterpriseId) {
         if (clerkType == null) {
             return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_2.getCode()), HaoBanErrCode.ERR_2.getMsg());
         }
@@ -1503,7 +1503,7 @@ public class WxStaffController extends WebBaseController {
             return RestResponse.successResult(serviceResponse.getResult());
         }
         ServiceResponse<HaobanRoleDTO> serviceResponse = haobanRoleApiService
-                .getMenuByWxEnterpriseIdAndClerkType(wxEnterpriseId, clerkType, 1);
+                .getMenuByWxEnterpriseIdAndClerkType(wxEnterpriseId, clerkType, 1 , enterpriseId);
         return RestResponse.successResult(serviceResponse.getResult());
     }