MenuModel的问题已调整

gly-base-core/build.gradle

@@ -151,15 +151,6 @@ task smpProtocol(type:Jar){
     into('cn/com/taiji/core/model/comm/protocol/smp')
     dependsOn(classes)
 }
-task userwProtocol(type:Jar){
-    archiveBaseName='tj'
-    archiveAppendix='userw-protocol'
-    archiveVersion='1.0.0-SNAPSHOT'
-    archiveExtension='jar'
-    from("build/classes/java/main/cn/com/taiji/core/model/comm/protocol/userw")
-    into('cn/com/taiji/core/model/comm/protocol/userw')
-    dependsOn(classes)
-}
 
 
 task packageCoreSrc(type:Jar){
@@ -257,13 +248,6 @@ publishing {
             artifact smpProtocol
             artifact packageCoreSrc
         }
-        myPublicationUserwProtocol(MavenPublication) {
-            groupId ="${groupname}"
-            artifactId ='userw-protocol'
-            version ='1.0.0-SNAPSHOT'
-            artifact userwProtocol
-            artifact packageCoreSrc
-        }
     }//--publications
 
 /*    repositories {

gly-base-core/src/main/java/cn/com/taiji/core/entity/user/AccountInfo.java

@@ -45,7 +45,7 @@ public class AccountInfo extends AbstractStringPropertyUUIDEntity {
     private IdType idType;// 用户-证件类型
     @Enumerated(EnumType.STRING)
     @Column(name = "USER_TYPE")
-    private UserType accountType;// 会员类型：原来是USER_TYPE 1、个人会员 2、企业会员
+    private UserType userType;// 会员类型：原来是USER_TYPE 1、个人会员 2、企业会员
     @Enumerated(EnumType.STRING)
     @Column(name = "LOGIN_SOURCE")
     private SourceType loginSource;// 登录方来源

gly-base-core/src/main/java/cn/com/taiji/core/entity/user/UserRole.java

@@ -4,13 +4,10 @@ import cn.com.taiji.common.entity.StringUUIDEntity;
 import cn.com.taiji.core.entity.dict.user.RbacSource;
 import cn.com.taiji.core.entity.dict.user.RbacStatus;
 import cn.com.taiji.core.entity.dict.user.SystemType;
-import cn.com.taiji.core.model.comm.protocol.userw.MenuModel;
 import lombok.Getter;
 import lombok.Setter;
 
 import javax.persistence.*;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * 角色类
@@ -71,19 +68,6 @@ public class UserRole extends StringUUIDEntity {
     @Column(name = "WHETHER_TEMPLATE")
     private Boolean whetherTemplate;
 
-    /**
-     * 菜单列表
-     */
-    @Transient
-    private List<MenuModel> menuList = new ArrayList<>();
-
-    /**
-     * 菜单id和权限标识id
-     */
-    @Transient
-    private List<String> ids = new ArrayList<>();
-
-
     public UserRole() {
     }
 

gly-base-core/src/main/java/cn/com/taiji/core/entity/user/UserRoleMenuPerm.java

@@ -2,6 +2,8 @@ package cn.com.taiji.core.entity.user;
 
 
 import cn.com.taiji.core.entity.AbstractStringPropertyUUIDEntity;
+import lombok.Getter;
+import lombok.Setter;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -13,6 +15,8 @@ import javax.persistence.Table;
  * @Date 2023/5/4 11:15
  * @Email 13079168756@163.com
  */
+@Getter
+@Setter
 @Entity
 @Table(name = "USER_ROLE_MENU_PERM")
 public class UserRoleMenuPerm extends AbstractStringPropertyUUIDEntity {

gly-base-core/src/main/java/cn/com/taiji/core/entity/user/UserRoleUserMenu.java

@@ -3,6 +3,8 @@ package cn.com.taiji.core.entity.user;
 
 import cn.com.taiji.core.entity.AbstractStringPropertyUUIDEntity;
 import cn.com.taiji.core.entity.dict.user.RbacSource;
+import lombok.Getter;
+import lombok.Setter;
 
 import javax.persistence.*;
 
@@ -11,6 +13,8 @@ import javax.persistence.*;
  * @Date 2023/3/1 10:57
  * @Email 13079168756@163.com
  **/
+@Getter
+@Setter
 @Entity
 @Table(name = "USER_ROLE_MENU")
 public class UserRoleUserMenu extends AbstractStringPropertyUUIDEntity {

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/user/AccountInfoRepo.java

@@ -15,6 +15,7 @@ public interface AccountInfoRepo extends AbstractJpaRepo<AccountInfo, String> {
     @Query("FROM AccountInfo WHERE openId=?1")
     AccountInfo findByOpenId(String openId);
 
+    @Query("FROM AccountInfo WHERE idNum = ?1 and userType = ?2")
     AccountInfo findByIdNumAndUserType(String idNum, UserType userType);
 
     @Query("FROM AccountInfo WHERE mobile=?1 ")

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/user/StaffRepo.java

@@ -13,4 +13,7 @@ public interface StaffRepo extends AbstractJpaRepo<Staff, String> {
     @Query("from Staff where openId=?1")
     Staff findByOpenId(String openId);
 
+    @Query("from Staff where staffId=?1")
+    Staff findByStaffId(String StaffId);
+
 }

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/comm/SatisfactionManagerImpl.java

@@ -38,7 +38,7 @@ public class SatisfactionManagerImpl extends AbstractCommManager implements Sati
         BeanTools.copyProperties(reqDto, pageRequest);
         if (SourceType.WEB.equals(reqDto.getOrderSource()) || SourceType.SERVICE_HALL.equals(reqDto.getOrderSource())){
             // 判断入口路径，微信端只查自己的openId
-            Staff staff = staffRepo.findByopenIdTwo(reqDto.getOpenId());
+            Staff staff = staffRepo.findByOpenId(reqDto.getOpenId());
             if (staff != null){
                 pageRequest.setAgencyId(staff.getAgencyId());
                 if ("SUPER_MANAGER".equals(staff.getIdentityType())){

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/tools/WxLoginUserUtil.java

@@ -4,7 +4,6 @@ package cn.com.taiji.iaw.tools;
 import cn.com.taiji.common.manager.AbstractManager;
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.core.entity.basic.QtkCustomerInfo;
-import cn.com.taiji.core.entity.dict.basic.AccountType;
 import cn.com.taiji.core.entity.user.AccountInfo;
 import cn.com.taiji.core.repo.jpa.basic.QtkCustomerInfoRepo;
 import cn.com.taiji.core.repo.jpa.user.AccountInfoRepo;
@@ -29,7 +28,7 @@ public class WxLoginUserUtil extends AbstractManager {
             throw new ManagerException("身份认证信息错误");
         }
         return customerInfoRepo.findByCustomerIdNumAndCustomerIdTypeAndUserType(accountInfo.getIdNum(),
-                accountInfo.getIdType().getCode(), accountInfo.getAccountType().getCode());
+                accountInfo.getIdType().getCode(), accountInfo.getUserType().getCode());
     }
 
     /**
@@ -61,7 +60,7 @@ public class WxLoginUserUtil extends AbstractManager {
      */
     public  AccountInfo getAccountInfoFromCustomerId(String customerId) throws ManagerException {
         QtkCustomerInfo customer = customerInfoRepo.findByCustomerId(customerId);
-        AccountInfo accountInfo = accountInfoRepo.findByIdNumAndAccountType(customer.getCustomerIdNum(), AccountType.fromCode(customer.getUserType().getCode()));
+        AccountInfo accountInfo = accountInfoRepo.findByIdNumAndUserType(customer.getCustomerIdNum(), customer.getUserType());
         if (accountInfo == null) {
             throw new ManagerException("身份认证信息错误");
         }
@@ -73,7 +72,7 @@ public class WxLoginUserUtil extends AbstractManager {
      */
     public  QtkCustomerInfo getCustomerInfoFromAccountInfo(AccountInfo accountInfo) throws ManagerException {
         QtkCustomerInfo customer = customerInfoRepo.findByCustomerIdNumAndCustomerIdTypeAndUserType(accountInfo.getIdNum(),
-                accountInfo.getIdType().getCode(), accountInfo.getAccountType().getCode());
+                accountInfo.getIdType().getCode(), accountInfo.getUserType().getCode());
         if (customer == null) {
             throw new ManagerException("身份认证信息错误");
         }

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/dto/enter/InvwEnterApplyInfoApplyRequestDTO.java

@@ -1,10 +1,21 @@
 package cn.com.taiji.invw.dto.enter;
 
+import cn.com.taiji.core.entity.dict.basic.CardType;
+import cn.com.taiji.core.entity.dict.basic.DeviceVersion;
+import cn.com.taiji.core.entity.dict.basic.ObuType;
+import cn.com.taiji.core.entity.dict.invw.InventoryType;
+import cn.com.taiji.core.entity.dict.invw.OwnType;
 import cn.com.taiji.invw.dto.AbstractBizRequestDTO;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.persistence.Column;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
 /**
  * @Auther: humh
  * @Description:
@@ -17,5 +28,38 @@ import lombok.Setter;
 @Setter
 public class InvwEnterApplyInfoApplyRequestDTO extends AbstractBizRequestDTO {
 
+    @ApiModelProperty(value = "仓库编号")
+    @NotBlank
+    private String storeCode;
+
+    @ApiModelProperty(value = "库存类型：卡、签")
+    @NotNull
+    private InventoryType inventoryType;
+
+    @ApiModelProperty(value = "库存型号")
+    @NotNull
+    private DeviceVersion version;
+
+    @ApiModelProperty(value = "采购厂商")
+    @NotBlank
+    private String brand;
+
+    @ApiModelProperty(value = "卡类型")
+    private CardType cardType;
+
+    @ApiModelProperty(value = "签类型")
+    private ObuType obuType;
+
+    @ApiModelProperty(value = "单价")
+    private Long unitPrice;
+
+    @ApiModelProperty(value = "产权类型")
+    private OwnType ownType;
+
+    @ApiModelProperty(value = "一发系统号段申请批次号")
+    private String BatchNo;
+
+    @ApiModelProperty(value = "附件地址")
+    private String filePath;
 
 }

zhywpt-app-userw/build.gradle

@@ -9,7 +9,6 @@ dependencies {
     implementation "${groupname}:entity-core:1.0.0-SNAPSHOT"
     implementation "${groupname}:comm-core:1.0.0-SNAPSHOT"
     implementation "${groupname}:sample-protocol:1.0.0-SNAPSHOT"
-    implementation "${groupname}:userw-protocol:1.0.0-SNAPSHOT"
     implementation('cn.com.taiji.common:sso-client:2.3.10.7')
     implementation "org.springframework.boot:spring-boot-starter-security"
     implementation "com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery"

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/RbacMenuListBySystemTypeResponseDTO.java

@@ -2,7 +2,7 @@ package cn.com.taiji.userw.dto.rbac;
 
 
 import cn.com.taiji.common.model.BaseModel;
-import cn.com.taiji.core.model.comm.protocol.userw.MenuModel;
+import cn.com.taiji.userw.model.rbac.MenuModel;
 
 import java.util.List;
 

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/RbacRolePageResponseDTO.java

@@ -2,10 +2,12 @@ package cn.com.taiji.userw.dto.rbac;
 
 import cn.com.taiji.common.model.BaseModel;
 import cn.com.taiji.core.entity.user.UserRole;
+import cn.com.taiji.userw.model.rbac.MenuModel;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Author weicailin
@@ -24,58 +26,10 @@ public class RbacRolePageResponseDTO extends BaseModel {
 
     private long totalCount;
 
-    private List<UserRole> data;
+    private List<Map<UserRole, List<MenuModel>>> data;
 
     private boolean hasData;
 
-    public boolean isHasData() {
-        return hasData;
-    }
-
-    public void setHasData(boolean hasData) {
-        this.hasData = hasData;
-    }
-
-    public int getCurrentPage() {
-        return currentPage;
-    }
-
-    public void setCurrentPage(int currentPage) {
-        this.currentPage = currentPage;
-    }
-
-    public int getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(int pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public long getPageCount() {
-        return pageCount;
-    }
-
-    public void setPageCount(long pageCount) {
-        this.pageCount = pageCount;
-    }
-
-    public long getTotalCount() {
-        return totalCount;
-    }
-
-    public void setTotalCount(long totalCount) {
-        this.totalCount = totalCount;
-    }
-
-    public List<UserRole> getData() {
-        return data;
-    }
-
-    public void setData(List<UserRole> data) {
-        this.data = data;
-    }
-
 }
 
 

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/rbac/RbacRoleQueryResponseDTO.java

@@ -3,27 +3,28 @@ package cn.com.taiji.userw.dto.rbac;
 
 import cn.com.taiji.common.model.BaseModel;
 import cn.com.taiji.core.entity.user.UserRole;
+import cn.com.taiji.userw.model.rbac.MenuModel;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @Author weicailin
  * @Date 2023/3/7 9:31
  * @Email 13079168756@163.com
  **/
+@Setter
+@Getter
 public class RbacRoleQueryResponseDTO extends BaseModel {
 
-    UserRole userRole;
+    private UserRole userRole;
 
-    public RbacRoleQueryResponseDTO(UserRole role) {
-        this.userRole = role;
-    }
+    private List<MenuModel> menuList = new ArrayList<>();
 
-    public UserRole getUserRole() {
-        return userRole;
-    }
+    private List<String> ids = new ArrayList<>();
 
-    public void setUserRole(UserRole userRole) {
-        this.userRole = userRole;
-    }
 }
 
 

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/manager/rbac/RbacMenuMangerImpl.java

@@ -7,13 +7,13 @@ import cn.com.taiji.core.entity.dict.user.RbacSource;
 import cn.com.taiji.core.entity.dict.user.RbacStatus;
 import cn.com.taiji.core.entity.dict.user.SystemType;
 import cn.com.taiji.core.entity.user.*;
-import cn.com.taiji.core.model.comm.protocol.userw.MenuModel;
-import cn.com.taiji.core.model.comm.protocol.userw.PermModel;
 import cn.com.taiji.core.repo.jpa.user.*;
 import cn.com.taiji.userw.dto.rbac.RbacMenuListBySystemTypeRequestDTO;
 import cn.com.taiji.userw.dto.rbac.RbacMenuListBySystemTypeResponseDTO;
 import cn.com.taiji.userw.dto.rbac.SystemTypeListByRbacSourceRequestDTO;
 import cn.com.taiji.userw.dto.rbac.SystemTypeListByRbacSourceResponseDTO;
+import cn.com.taiji.userw.model.rbac.MenuModel;
+import cn.com.taiji.userw.model.rbac.PermModel;
 import cn.com.taiji.userw.model.rbac.SystemTypeMode;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/manager/rbac/RbacRoleMangerImpl.java

@@ -9,13 +9,9 @@ import cn.com.taiji.core.entity.dict.user.RbacStatus;
 import cn.com.taiji.core.entity.dict.user.SystemType;
 import cn.com.taiji.core.entity.user.*;
 import cn.com.taiji.core.manager.tools.DesensitizedUtil;
-import cn.com.taiji.core.model.comm.protocol.userw.MenuModel;
 import cn.com.taiji.core.repo.jpa.user.*;
 import cn.com.taiji.userw.dto.rbac.*;
-import cn.com.taiji.userw.model.rbac.AccountInfoSimpleModel;
-import cn.com.taiji.userw.model.rbac.SetMenuDto;
-import cn.com.taiji.userw.model.rbac.SetMenuModel;
-import cn.com.taiji.userw.model.rbac.UserRoleModel;
+import cn.com.taiji.userw.model.rbac.*;
 import cn.com.taiji.userw.repo.jpa.request.rbac.RbacRolePageableRequest;
 import cn.com.taiji.userw.tools.SystemTypeAndSourceUtil;
 import org.springframework.beans.BeanUtils;
@@ -466,7 +462,6 @@ public class RbacRoleMangerImpl extends CommonAbstract implements RbacRoleManger
         //通过Set做一个去重保护
         Set<String> menuIds = new HashSet<>(userRoleUserMenuRepo.getListByRoleId(request.getId()).stream().map(mr -> mr.getMenuId()).collect(Collectors.toList()));
 
-
         //（2）根据中间表的menuId、permId，查询出所有的菜单、权限
         List<UserMenu> menus = userMenuRepo.findAllById(menuIds);
         List<MenuModel> menuVoList = new ArrayList<>();
@@ -487,10 +482,10 @@ public class RbacRoleMangerImpl extends CommonAbstract implements RbacRoleManger
             menuVoList.add(menuVo);
         }
 
-        role.setMenuList(menuVoList);
-        role.setIds(ids);
-
-        RbacRoleQueryResponseDTO response = new RbacRoleQueryResponseDTO(role);
+        RbacRoleQueryResponseDTO response = new RbacRoleQueryResponseDTO();
+        response.setUserRole(role);
+        response.setMenuList(menuVoList);
+        response.setIds(ids);
         return response;
     }
 
@@ -604,9 +599,8 @@ public class RbacRoleMangerImpl extends CommonAbstract implements RbacRoleManger
      */
     private RbacRolePageResponseDTO toResponse(Pagination pagn) {
         RbacRolePageResponseDTO res = new RbacRolePageResponseDTO();
-        List<UserRole> roleList = new ArrayList<>();
+        List<Map<UserRole,List<MenuModel>>> roleList = new ArrayList<>();
         res.setHasData(false);
-        res.setData(roleList);
         //分页结果非空校验
         if (isEmpty(pagn.getResult())) {
             return res;
@@ -631,10 +625,11 @@ public class RbacRoleMangerImpl extends CommonAbstract implements RbacRoleManger
 
                 menuVoList.add(menuVo);
             }
+            Map<UserRole, List<MenuModel>> map = new HashMap<>();
+            map.put(role,menuVoList);
+//            role.setMenuList(menuVoList);
 
-            role.setMenuList(menuVoList);
-
-            roleList.add(role);
+            roleList.add(map);
         });
         res.setCurrentPage(pagn.getCurrentPage());
         res.setPageCount(pagn.getPageCount());

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/userw/MenuModel.java → zhywpt-app-userw/src/main/java/cn/com/taiji/userw/model/rbac/MenuModel.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.core.model.comm.protocol.userw;
+package cn.com.taiji.userw.model.rbac;
 
 import cn.com.taiji.common.model.BaseModel;
 import cn.com.taiji.core.entity.dict.user.IsEnable;

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/userw/PermModel.java → zhywpt-app-userw/src/main/java/cn/com/taiji/userw/model/rbac/PermModel.java

@@ -1,5 +1,5 @@
 
-package cn.com.taiji.core.model.comm.protocol.userw;
+package cn.com.taiji.userw.model.rbac;
 
 import cn.com.taiji.common.model.BaseModel;
 import cn.com.taiji.core.entity.dict.user.RbacSource;

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/userw/SimpleMenuModel.java → zhywpt-app-userw/src/main/java/cn/com/taiji/userw/model/rbac/SimpleMenuModel.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.core.model.comm.protocol.userw;
+package cn.com.taiji.userw.model.rbac;
 
 import lombok.Getter;
 import lombok.Setter;

zhywpt-service-ias/build.gradle

@@ -15,7 +15,6 @@ dependencies {
     implementation "${groupname}:comm-core:1.0.0-SNAPSHOT"
     implementation "${groupname}:sample-protocol:1.0.0-SNAPSHOT"
     implementation "${groupname}:ias-protocol:1.0.0-SNAPSHOT"
-    implementation "${groupname}:userw-protocol:1.0.0-SNAPSHOT"
     implementation "${groupname}:smp-protocol:1.0.0-SNAPSHOT"
     implementation "com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery"
     implementation "com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config"