Merge remote-tracking branch 'origin/master'

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

@@ -30,13 +30,12 @@ public class DynamicCommentController {
   /**
    * 查询列表
    * @param param
-   * @param page
    * @author igl
    * @date 2023/8/9 17:25
    */
   @GetMapping("/list")
-  public Pagination<DynamicCommentDTO> list(QueryAdminDynamicParam param, Paging page) {
-    return this.dynamicCommentService.queryAdminPageList(param, (long) page.getNumber(), (long) page.getSize());
+  public Pagination<DynamicCommentDTO> list(QueryAdminDynamicParam param) {
+    return this.dynamicCommentService.queryAdminPageList(param);
   }
 
   /**

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

@@ -34,13 +34,12 @@ public class DynamicContentController {
     /**
      * 查询列表
      * @param param
-     * @param page
      * @author igl
      * @date 2023/8/9 17:25
      */
     @GetMapping("/list")
-    public Pagination<DynamicContentDTO> list(QueryAdminDynamicParam param, Paging page) {
-        return this.iDynamicContentService.queryAdminPageList(param, (long) page.getNumber(), (long) page.getSize());
+    public Pagination<DynamicContentDTO> list(QueryAdminDynamicParam param) {
+        return this.iDynamicContentService.queryAdminPageList(param);
     }
 
     /**

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

@@ -12,6 +12,7 @@ import com.chelvc.cloud.vehicle.api.dto.MerchantRankDTO;
 import com.chelvc.cloud.vehicle.api.param.MerchantModifyParam;
 import com.chelvc.cloud.vehicle.api.param.MerchantPagingParam;
 import com.chelvc.cloud.vehicle.api.param.MerchantRankParam;
+import com.chelvc.cloud.vehicle.api.param.ReportModifyParam;
 import com.chelvc.cloud.vehicle.api.service.GoodsService;
 import com.chelvc.cloud.vehicle.api.service.MerchantService;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
@@ -147,7 +148,7 @@ public class MerchantController {
      * @return 获取经营报表状况
      */
     @GetMapping("/merchant/operatReport")
-    public List<Map<String,Object>> operatReport() {
-        return this.merchantService.operatReport();
+    public List<Map<String,Object>> operatReport(@RequestBody @Valid ReportModifyParam param) {
+        return this.merchantService.operatReport(param);
     }
 }

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

@@ -69,12 +69,11 @@ public class ProfitRatioConfigController {
      * 查询列表
      *
      * @param param
-     * @param page
      * @author igl
      * @date 2024/2/23 17:25
      */
     @GetMapping("/profit-ratio/list")
-    public Pagination<ProfitRatioConfigDTO> list(QueryProfitRatioConfigParam param, Paging page) {
-        return this.profitRatioConfigService.queryPageList(param, page);
+    public Pagination<ProfitRatioConfigDTO> list(QueryProfitRatioConfigParam param) {
+        return this.profitRatioConfigService.queryPageList(param);
     }
 }

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

@@ -29,20 +29,12 @@ public class ProfitRatioController {
     /**
      * 查询列表
      * @param param 查询参数
-     * @param pageCode
-     * @param pageSize
      * @author igl
      * @date 2024/2/23 17:25
      */
     @GetMapping("/platform/profit-ratio/page")
-    public Pagination<PlatformProfitRatioDTO> list(@Validated QueryPlatformProfitRatioParam param, Long pageCode, Long pageSize) {
-        if (pageCode == null) {
-            pageCode = 1L;
-        }
-        if (pageSize == null) {
-            pageSize = 20L;
-        }
-        return this.platformProfitRatioService.queryPageList(param, pageCode, pageSize);
+    public Pagination<PlatformProfitRatioDTO> list(@Validated QueryPlatformProfitRatioParam param) {
+        return this.platformProfitRatioService.queryPageList(param);
     }
 
     /**

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

@@ -30,7 +30,6 @@ import org.springframework.web.bind.annotation.RestController;
 @Validated
 @RestController
 @ResponseWrapping
-@PreAuthorize("isScope('EMPLOYEE')")
 public class RankAwardConfigController {
 
     @DubboReference
@@ -72,12 +71,11 @@ public class RankAwardConfigController {
      * 查询列表
      *
      * @param param
-     * @param page
      * @author igl
      * @date 2024/2/23 17:25
      */
     @GetMapping("/rank-award/list")
-    public Pagination<RankAwardConfigDTO> list(QueryRankAwardConfigParam param, Paging page) {
-        return this.rankAwardConfigService.queryPageList(param, page.getNumber(), page.getSize());
+    public Pagination<RankAwardConfigDTO> list(QueryRankAwardConfigParam param) {
+        return this.rankAwardConfigService.queryPageList(param);
     }
 }

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

@@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.RestController;
 @Validated
 @RestController
 @ResponseWrapping
-@PreAuthorize("isScope('EMPLOYEE')")
 public class RankAwardRecordController {
 
     @DubboReference
@@ -33,13 +32,12 @@ public class RankAwardRecordController {
      * 查询列表
      *
      * @param param
-     * @param page
      * @author igl
      * @date 2024/2/23 17:25
      */
     @GetMapping("/rank-award-record/list")
-    public Pagination<RankAwardRecordDTO> list(QueryRankAwardRecordParam param, Paging page) {
-        return this.rankAwardRecordService.queryPageList(param, page.getNumber(), page.getSize());
+    public Pagination<RankAwardRecordDTO> list(QueryRankAwardRecordParam param) {
+        return this.rankAwardRecordService.queryPageList(param);
     }
 
     /**

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

@@ -9,6 +9,7 @@ import com.chelvc.cloud.uc.api.dto.RoleDetailDTO;
 import com.chelvc.cloud.uc.api.param.RoleModifyParam;
 import com.chelvc.cloud.uc.api.param.RolePagingParam;
 import com.chelvc.cloud.uc.api.service.RoleService;
+import com.chelvc.cloud.vehicle.api.param.MenuModifyParam;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.common.model.Pagination;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -88,4 +89,16 @@ public class RoleController {
     public Pagination<RoleDTO> getRolePaging(@Valid RolePagingParam param) {
         return this.roleService.getRolePaging(param);
     }
+
+    /**
+     * 修改角色得菜单
+     *
+     * @param id    角色主键
+     * @param param 修改得菜单ID参数
+     */
+    @PostMapping("/role/menus/{id}")
+    public void updateRoleMenus(@PathVariable("id") @Min(value = 1, message = "角色主键不能小于1") Long id,
+                                @RequestBody @Valid MenuModifyParam param) {
+        this.roleService.updateRoleMenu(id, param.getMenuIds());
+    }
 }

src/main/resources/application.yml

@@ -1,6 +1,17 @@
 server:
   port: 10100
 
+feign:
+  hystrix:
+    enabled: false
+  httpclient:
+    enabled: true
+  client:
+    config:
+      default:
+        readTimeout: 30000
+        connectTimeout: 5000
+
 spring:
   main:
     allow-bean-definition-overriding: true

src/main/resources/i18n/messages.properties

@@ -2,6 +2,7 @@ ADMIN=管理端
 CUSTOMER=顾客端
 MERCHANT=商家端
 Time.Deviated=请校准系统时间
+Token.Invalid=令牌无效
 Token.Expired=当前会话已失效，请重新登陆
 Token.Changed=您的账号已在其他设备登陆
 Scope.Changed=您的应用已切换到【{0}】