文件上传以及用户查询

src/main/java/com/chelvc/cloud/admin/controller/HelpCategoryController.java

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import javax.validation.constraints.Min;
+import java.util.List;
 
 /**
  * 问题分类接口
@@ -69,7 +70,7 @@ public class HelpCategoryController {
 
 
     /**
-     * 修改问题分类配置
+     * 删除问题分类配置
      *
      * @param id    问题分类配置主键
      */
@@ -77,4 +78,15 @@ public class HelpCategoryController {
     public void deleteHelpCategory(@PathVariable("id") @Min(value = 1, message = "问题分类配置主键不能小于1") Long id) {
         this.helpCategoryService.deleteHelpCategoryById(id);
     }
+
+
+    /**
+     * 查询问题分类配置列表
+     *
+     * @return 问题分类配置列表信息
+     */
+    @GetMapping("/helpCategory/list")
+    public List<HelpCategoryDTO> getHelpCategories() {
+        return this.helpCategoryService.selectHelpCategories();
+    }
 }

src/main/java/com/chelvc/cloud/admin/controller/MerchantController.java

@@ -1,6 +1,7 @@
 package com.chelvc.cloud.admin.controller;
 
 import java.util.List;
+import java.util.Map;
 import javax.validation.Valid;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotEmpty;
@@ -128,4 +129,15 @@ public class MerchantController {
     public List<MerchantRankDTO> listRankMerchants(@Valid MerchantRankParam param) {
         return this.merchantService.listRankMerchants(param, SessionContextHolder.getId());
     }
+
+
+    /**
+     * 获取商家营业状况
+     *
+     * @return 获取商家营业状况
+     */
+    @GetMapping("/merchant/operatConditions")
+    public Map<String,Object> listRankMerchants() {
+        return this.merchantService.operatConditions();
+    }
 }

src/main/java/com/chelvc/cloud/admin/controller/UserController.java

@@ -2,13 +2,20 @@ package com.chelvc.cloud.admin.controller;
 
 import com.chelvc.cloud.admin.copier.UserCopier;
 import com.chelvc.cloud.admin.vo.PersonalVO;
+import com.chelvc.cloud.uc.api.dto.UserDTO;
+import com.chelvc.cloud.uc.api.param.UserPagingParam;
 import com.chelvc.cloud.uc.api.service.UserService;
+import com.chelvc.cloud.vehicle.api.dto.HelpCategoryDTO;
+import com.chelvc.cloud.vehicle.api.param.HelpCategoryPagingParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
+import com.chelvc.framework.common.model.Pagination;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+
 /**
  * 用户接口
  *
@@ -31,4 +38,17 @@ public class UserController {
     public PersonalVO getPersonal() {
         return UserCopier.INSTANCE.copying(this.userService.getPersonal());
     }
+
+
+
+    /**
+     * 查询用户分页
+     *
+     * @param param 查询参数
+     * @return 用户分页信息
+     */
+    @GetMapping("/user/paging")
+    public Pagination<UserDTO> getUserPaging(@Valid UserPagingParam param) {
+        return this.userService.getUserPaging(param);
+    }
 }