个人中心

eladmin-system/src/main/java/me/zhengjie/modules/dm/system/domain/DmSystem.java

@@ -65,6 +65,14 @@ public class DmSystem extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "子系统管理员")
     private DmUser dmUser;
 
+    @Column(name = "is_menu")
+    @ApiModelProperty(value = "是否跳转到菜单(0.否 1.是)")
+    private Boolean isMenu;
+
+    @Column(name = "menu_path")
+    @ApiModelProperty(value = "菜单地址")
+    private String menuPath;
+
 //    @ManyToMany
 //    @ApiModelProperty(value = "子系统接口")
 //    @JoinTable(name = "dm_system_api",

eladmin-system/src/main/java/me/zhengjie/modules/dm/system/repository/DmSystemRepository.java

@@ -36,7 +36,7 @@ public interface DmSystemRepository extends JpaRepository<DmSystem, Integer>, Jp
      * @param userId
      * @return
      */
-    @Query(value = "select s.* from dm_system as s left join dm_user_system as us on s.id = us.system_id left join dm_user as u on us.user_id = u.id where u.id=:userId", nativeQuery = true)
-    List<DmSystem> findByUserId(@Param("userId") String userId);
+    @Query(value = "select s.* from dm_system as s left join dm_user_system as us on s.id = us.system_id left join dm_user as u on us.user_id = u.id where u.id=:userId and if(:isMenu IS NULL,1=1,s.is_menu = :isMenu)", nativeQuery = true)
+    List<DmSystem> findByUserId(@Param("userId") String userId, @Param("isMenu") Long isMenu);
 
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/system/rest/DmSystemController.java

@@ -88,7 +88,7 @@ public class DmSystemController {
     @Log("根据用户查询子系统")
     @ApiOperation("根据用户查询子系统")
     @GetMapping(value = "/queryByUserId")
-    public ResponseEntity<Object> queryByUserId(String userId){
-        return new ResponseEntity<>(dmSystemService.findByUserId(userId),HttpStatus.OK);
+    public ResponseEntity<Object> queryByUserId(String userId,Long isMenu){
+        return new ResponseEntity<>(dmSystemService.findByUserId(userId,isMenu),HttpStatus.OK);
     }
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/system/service/DmSystemService.java

@@ -86,6 +86,6 @@ public interface DmSystemService {
      * @param userId userId
      * @return DmSystem
      */
-    List<DmSystem> findByUserId(String userId);
+    List<DmSystem> findByUserId(String userId,Long isMenu);
 
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/system/service/dto/DmSystemDto.java

@@ -49,5 +49,11 @@ public class DmSystemDto extends BaseDTO implements Serializable {
     /** 子系统管理员 */
     private DmUser dmUser;
 
+    /** 是否跳转到菜单(0.否 1.是) */
+    private Boolean isMenu;
+
+    /** 菜单地址 */
+    private String menuPath;
+
 //    private List<DmApi> dmApis;
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/system/service/impl/DmSystemServiceImpl.java

@@ -106,8 +106,8 @@ public class DmSystemServiceImpl implements DmSystemService {
     }
 
     @Override
-    public List<DmSystem> findByUserId(String userId) {
-        return dmSystemRepository.findByUserId(userId);
+    public List<DmSystem> findByUserId(String userId, Long isMenu) {
+        return dmSystemRepository.findByUserId(userId, isMenu);
     }
 
 }

eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Role.java

@@ -44,6 +44,7 @@ public class Role extends BaseEntity implements Serializable {
     @Column(name = "role_id")
     @NotNull(groups = {Update.class})
     @ApiModelProperty(value = "ID", hidden = true)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private String id;
 
     @JSONField(serialize = false)

eladmin-system/src/main/java/me/zhengjie/modules/thirdparty/v1/UserApiController.java

@@ -18,6 +18,8 @@ import me.zhengjie.config.RsaProperties;
 import me.zhengjie.domain.LocalStorage;
 import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.modules.dm.api.service.DmApiService;
+import me.zhengjie.modules.dm.system.service.DmSystemService;
+import me.zhengjie.modules.dm.system.service.dto.DmSystemQueryCriteria;
 import me.zhengjie.modules.dm.user.domain.DmUser;
 import me.zhengjie.modules.dm.user.service.DmUserService;
 import me.zhengjie.modules.dm.user.service.dto.DmUserDto;
@@ -84,6 +86,7 @@ public class UserApiController {
     private final String erpapiUrl = "https://portal.caih.com";
     private final DmApiService dmApiService;
     private final String key = "DMERPYT!@#$QWER2021+{:>";
+    private final DmSystemService dmSystemService;
 
 
     @Log("获取ERP用户数据")
@@ -391,4 +394,12 @@ public class UserApiController {
     public ResponseEntity<Object> findByIdAndStatus(@RequestParam("systemId") Integer systemId,@RequestParam("status")Integer status) {
         return new ResponseEntity<>(dmApiService.findByIdAndStatus(systemId,status),HttpStatus.OK);
     }
+
+    @Log("查询子系统")
+    @ApiOperation("查询子系统")
+    @AnonymousPostMapping(value = "/querySystem")
+    public ResponseEntity<Object> querySystem(@RequestBody QueryPageParams<DmSystemQueryCriteria> params, Pageable pageable){
+        SecurityUtils.CheckApiAuth(params);
+        return new ResponseEntity<>(dmSystemService.queryAll(params.getQuery(),pageable),HttpStatus.OK);
+    }
 }