Merge branch 'master' of https://gitee.com/anthonywj/udims-java

api-udims/src/main/java/com/glxp/udi/admin/controller/udidl/SysMenuController.java

@@ -0,0 +1,45 @@
+package com.glxp.udi.admin.controller.udidl;
+
+import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
+import com.glxp.udi.admin.req.feign.SysMenuModel;
+import com.glxp.udi.admin.service.udidl.UdidlService;
+import com.glxp.udi.common.res.BaseResponse;
+import feign.Param;
+import feign.RequestLine;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+public class SysMenuController {
+    @Resource
+    UdidlService udidlService;
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/sys/menu/list")
+    public BaseResponse list() {
+        return udidlService.sysMenu_list();
+    }
+    @AuthRuleAnnotation("")
+    @PostMapping("/sys/menu/insert")
+    public BaseResponse insert(@RequestBody SysMenuModel model){
+        return udidlService.sysMenu_insert(model);
+    }
+    @AuthRuleAnnotation("")
+    @PostMapping("/sys/menu/update")
+    public BaseResponse update(@RequestBody SysMenuModel model) {
+        return udidlService.sysMenu_update(model);
+    }
+    @AuthRuleAnnotation("")
+    @PostMapping("/sys/menu/detail")
+    public BaseResponse detail(Integer id) {
+        return udidlService.sysMenu_detail(id);
+    }
+    @AuthRuleAnnotation("")
+    @PostMapping("/sys/menu/delete")
+    public BaseResponse delete(Integer id){
+        return udidlService.sysMenu_delete(id);
+    }
+}

api-udims/src/main/java/com/glxp/udi/admin/controller/udidl/SysRoleController.java

@@ -0,0 +1,51 @@
+package com.glxp.udi.admin.controller.udidl;
+
+import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
+import com.glxp.udi.admin.req.feign.SysRoleMenuModel;
+import com.glxp.udi.admin.req.feign.SysRoleModel;
+import com.glxp.udi.admin.req.feign.SysRoleParam;
+import com.glxp.udi.admin.service.udidl.UdidlService;
+import com.glxp.udi.common.res.BaseResponse;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+public class SysRoleController {
+    @Resource
+    UdidlService udidlService;
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/sys/role/list")
+    public BaseResponse list(@RequestBody SysRoleParam param) {
+        return udidlService.sysRole_list(param);
+    }
+    @AuthRuleAnnotation("")
+    @PostMapping("/sys/role/insert")
+    public BaseResponse insert(@RequestBody SysRoleModel model){
+        return udidlService.sysRole_insert(model);
+    }
+    @AuthRuleAnnotation("")
+    @PostMapping("/sys/role/update")
+    public BaseResponse update(@RequestBody SysRoleModel model) {
+        return udidlService.sysRole_update(model);
+    }
+    @AuthRuleAnnotation("")
+    @PostMapping("/sys/role/detail")
+    public BaseResponse detail(Integer id) {
+        return udidlService.sysRole_detail(id);
+    }
+    @AuthRuleAnnotation("")
+    @PostMapping("/sys/role/delete")
+    public BaseResponse delete(Integer id){
+        return udidlService.sysRole_delete(id);
+    }
+    @AuthRuleAnnotation("")
+    @PostMapping("/sys/role/getRoleMenu")
+    public BaseResponse getRoleMenu(Integer roleId){ return udidlService.sysRole_getRoleMenu(roleId); }
+    @AuthRuleAnnotation("")
+    @PostMapping("/sys/role/saveRoleMenu")
+    public BaseResponse saveRoleMenu(@RequestBody SysRoleMenuModel model){ return udidlService.sysRole_saveRoleMenu(model);}
+}

api-udims/src/main/java/com/glxp/udi/admin/controller/udidl/SysUserController.java

@@ -0,0 +1,46 @@
+package com.glxp.udi.admin.controller.udidl;
+
+import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
+import com.glxp.udi.admin.req.feign.SysRoleModel;
+import com.glxp.udi.admin.req.feign.SysRoleParam;
+import com.glxp.udi.admin.req.feign.SysUserModel;
+import com.glxp.udi.admin.req.feign.SysUserParam;
+import com.glxp.udi.admin.service.udidl.UdidlService;
+import com.glxp.udi.common.res.BaseResponse;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+public class SysUserController {
+    @Resource
+    UdidlService udidlService;
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/sys/user/list")
+    public BaseResponse list(@RequestBody SysUserParam param) {
+        return udidlService.sysUser_list(param);
+    }
+    @AuthRuleAnnotation("")
+    @PostMapping("/sys/user/insert")
+    public BaseResponse insert(@RequestBody SysUserModel model){
+        return udidlService.sysUser_insert(model);
+    }
+    @AuthRuleAnnotation("")
+    @PostMapping("/sys/user/update")
+    public BaseResponse update(@RequestBody SysUserModel model) {
+        return udidlService.sysUser_update(model);
+    }
+    @AuthRuleAnnotation("")
+    @PostMapping("/sys/user/detail")
+    public BaseResponse detail(Integer id) {
+        return udidlService.sysUser_detail(id);
+    }
+    @AuthRuleAnnotation("")
+    @PostMapping("/sys/user/delete")
+    public BaseResponse delete(Integer id){
+        return udidlService.sysUser_delete(id);
+    }
+}

api-udims/src/main/java/com/glxp/udi/admin/controller/udidl/UdplatGoodsMatchController.java

@@ -42,7 +42,6 @@ public class UdplatGoodsMatchController {
     @AuthRuleAnnotation("")
     @PostMapping("udplat/goodsMatch/searchByName")
     public BaseResponse searchByName(String name){
-         System.out.println(name);
         return udidlService.udplatGoodsMatch_searchByName(name);
     }
 }

api-udims/src/main/java/com/glxp/udi/admin/req/feign/SysMenuModel.java

@@ -0,0 +1,40 @@
+package com.glxp.udi.admin.req.feign;
+
+import lombok.Data;
+
+@Data
+public class SysMenuModel {
+    /**
+     * 编号
+     */
+    private Integer id;
+
+    /**
+     * 菜单名称
+     */
+    private String name;
+
+    /**
+     * 父菜单ID
+     */
+    private Integer parentId;
+
+    /**
+     * 菜单类型M: 目录, C: 菜单,F: 资源
+     */
+    private String type;
+
+    /**
+     * 权限标识
+     */
+    private String perms;
+
+    /**
+     * 状态（0启用 1禁用）
+     */
+    private String status;
+    /**
+     * 排序
+     */
+    private Integer sort;
+}

api-udims/src/main/java/com/glxp/udi/admin/req/feign/SysRoleMenuModel.java

@@ -0,0 +1,11 @@
+package com.glxp.udi.admin.req.feign;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SysRoleMenuModel {
+    private Integer roleId;
+    private List<Integer> menuIds;
+}

api-udims/src/main/java/com/glxp/udi/admin/req/feign/SysRoleModel.java

@@ -0,0 +1,30 @@
+package com.glxp.udi.admin.req.feign;
+
+import lombok.Data;
+
+@Data
+public class SysRoleModel {
+    /**
+     *
+     */
+    private Integer id;
+
+    /**
+     * 角色名称
+     */
+    private String name;
+
+    /**
+     * 角色代码
+     */
+    private String code;
+
+    /**
+     * 状态0: 启用,1: 禁用
+     */
+    private String status;
+    /**
+     * 排序
+     */
+    private Integer sort;
+}

api-udims/src/main/java/com/glxp/udi/admin/req/feign/SysRoleParam.java

@@ -0,0 +1,10 @@
+package com.glxp.udi.admin.req.feign;
+
+import com.glxp.udi.admin.req.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class SysRoleParam extends ListPageRequest {
+    private String status;
+    private String  name;
+}

api-udims/src/main/java/com/glxp/udi/admin/req/feign/SysUserModel.java

@@ -0,0 +1,45 @@
+package com.glxp.udi.admin.req.feign;
+
+import lombok.Data;
+
+@Data
+public class SysUserModel {
+    /**
+     * 用户ID
+     */
+    private Integer id;
+
+    /**
+     * 用户key, 登录用
+     */
+    private String userKey;
+
+    /**
+     * 用户账号
+     */
+    private String userName;
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+
+    /**
+     * 密码
+     */
+    private String password;
+    /**
+     * 状态（0启用 1禁用）
+     */
+    private String status;
+
+
+    /**
+     * 角色ID
+     */
+    private Integer roleId;
+
+    private String Udplat_appId;
+    private String Udplat_secretKey;
+    private String Udplat_userName;
+}

api-udims/src/main/java/com/glxp/udi/admin/req/feign/SysUserParam.java

@@ -0,0 +1,11 @@
+package com.glxp.udi.admin.req.feign;
+
+import com.glxp.udi.admin.req.ListPageRequest;
+import lombok.Data;
+
+
+@Data
+public class SysUserParam extends ListPageRequest {
+    private String status;
+    private String  name;
+}

api-udims/src/main/java/com/glxp/udi/admin/service/udidl/UdidlService.java

@@ -8,12 +8,9 @@ import feign.Param;
 import feign.QueryMap;
 import feign.RequestLine;
 import feign.Response;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import java.util.Date;
+
 
 public interface UdidlService {
     //<editor-fold desc="国家库同步">
@@ -97,5 +94,42 @@ public interface UdidlService {
     @RequestLine("POST /udplat/goodsMatch/searchByName?name={name}")
     BaseResponse udplatGoodsMatch_searchByName(@Param("name") String name);
 
+    //系统权限相关
+    @RequestLine("POST /sys/menu/list")
+    BaseResponse sysMenu_list();
+    @RequestLine("POST /sys/menu/insert")
+    BaseResponse sysMenu_insert(@RequestBody SysMenuModel model);
+    @RequestLine("POST /sys/menu/update")
+    BaseResponse sysMenu_update(@RequestBody SysMenuModel model);
+    @RequestLine("POST /sys/menu/detail?id={id}")
+    BaseResponse sysMenu_detail(@Param("id") Integer id);
+    @RequestLine("POST /sys/menu/delete?id={id}")
+    BaseResponse sysMenu_delete(@Param("id") Integer id);
+
+    @RequestLine("POST /sys/role/list")
+    BaseResponse sysRole_list(@RequestBody SysRoleParam param);
+    @RequestLine("POST /sys/role/insert")
+    BaseResponse sysRole_insert(@RequestBody SysRoleModel model);
+    @RequestLine("POST /sys/role/update")
+    BaseResponse sysRole_update(@RequestBody SysRoleModel model);
+    @RequestLine("POST /sys/role/detail?id={id}")
+    BaseResponse sysRole_detail(@Param("id") Integer id);
+    @RequestLine("POST /sys/role/delete?id={id}")
+    BaseResponse sysRole_delete(@Param("id") Integer id);
+    @RequestLine("POST /sys/role/getRoleMenu?roleId={roleId}")
+    BaseResponse sysRole_getRoleMenu(@Param("roleId") Integer roleId);
+    @RequestLine("POST /sys/role/saveRoleMenu")
+    BaseResponse sysRole_saveRoleMenu(@RequestBody SysRoleMenuModel model);
+
+    @RequestLine("POST /sys/user/list")
+    BaseResponse sysUser_list(@RequestBody SysUserParam param);
+    @RequestLine("POST /sys/user/insert")
+    BaseResponse sysUser_insert(@RequestBody SysUserModel model);
+    @RequestLine("POST /sys/user/update")
+    BaseResponse sysUser_update(@RequestBody SysUserModel model);
+    @RequestLine("POST /sys/user/detail?id={id}")
+    BaseResponse sysUser_detail(@Param("id") Integer id);
+    @RequestLine("POST /sys/user/delete?id={id}")
+    BaseResponse sysUser_delete(@Param("id") Integer id);
     //</editor-fold>
 }