优化代码格式

alien-lawyer/src/main/java/shop/alien/lawyer/controller/LawFirmController.java

@@ -15,6 +15,7 @@ import java.util.List;
 /**
  * 律所表 前端控制器
  * qxy
+ *
  * @author system
  * @since 2025-01-XX
  */
@@ -105,8 +106,8 @@ public class LawFirmController {
     })
     @GetMapping("/getPage")
     public R<IPage<LawFirm>> getPage(@ModelAttribute LawFirm lawFirm,
-                                      @RequestParam(defaultValue = "1") int page,
-                                      @RequestParam(defaultValue = "10") int size) {
+                                     @RequestParam(defaultValue = "1") int page,
+                                     @RequestParam(defaultValue = "10") int size) {
         log.info("LawFirmController.getPage?lawFirm={},page={},size={}", lawFirm, page, size);
         int pageNum = page > 0 ? page : 1;
         int pageSize = size > 0 ? size : 10;

alien-lawyer/src/main/java/shop/alien/lawyer/controller/LawyerAiInteractionLogController.java

@@ -100,8 +100,8 @@ public class LawyerAiInteractionLogController {
     })
     @GetMapping("/getPage")
     public R<IPage<LawyerAiInteractionLog>> getPage(@ModelAttribute LawyerAiInteractionLog aiInteractionLog,
-                                                     @RequestParam(defaultValue = "1") int page,
-                                                     @RequestParam(defaultValue = "10") int size) {
+                                                    @RequestParam(defaultValue = "1") int page,
+                                                    @RequestParam(defaultValue = "10") int size) {
         log.info("LawyerAiInteractionLogController.getPage?aiInteractionLog={},page={},size={}", aiInteractionLog, page, size);
         int pageNum = page > 0 ? page : 1;
         int pageSize = size > 0 ? size : 10;
@@ -172,13 +172,13 @@ public class LawyerAiInteractionLogController {
     })
     @GetMapping("/getLogList")
     public R<IPage<LawyerAiInteractionLog>> getLogList(
-                                                    @RequestParam Integer clientUserId,
-                                                    @RequestParam(defaultValue = "0") int page,
-                                                    @RequestParam(defaultValue = "10") int size
-                                                    ) {
+            @RequestParam Integer clientUserId,
+            @RequestParam(defaultValue = "0") int page,
+            @RequestParam(defaultValue = "10") int size
+    ) {
         log.info("LawyerAiInteractionLogController.getLogList?,page={},size={},clientUserId{}", clientUserId, page, size);
 
-        return aiInteractionLogService.getLogList( clientUserId,page, size);
+        return aiInteractionLogService.getLogList(clientUserId, page, size);
     }
 
 

alien-lawyer/src/main/java/shop/alien/lawyer/controller/LawyerChatSessionController.java

@@ -101,8 +101,8 @@ public class LawyerChatSessionController {
     })
     @GetMapping("/getPage")
     public R<IPage<LawyerChatSession>> getPage(@ModelAttribute LawyerChatSession chatSession,
-                                              @RequestParam(defaultValue = "1") int page,
-                                              @RequestParam(defaultValue = "10") int size) {
+                                               @RequestParam(defaultValue = "1") int page,
+                                               @RequestParam(defaultValue = "10") int size) {
         log.info("LawyerChatSessionController.getPage?chatSession={},page={},size={}", chatSession, page, size);
         int pageNum = page > 0 ? page : 1;
         int pageSize = size > 0 ? size : 10;

alien-lawyer/src/main/java/shop/alien/lawyer/controller/LawyerConsultationOrderController.java

@@ -48,12 +48,12 @@ public class LawyerConsultationOrderController {
     })
     @GetMapping("/getConsultationOrderList")
     public R<IPage<LawyerConsultationOrderVO>> getConsultationOrderList(@RequestParam(defaultValue = "1") int page,
-                                                                 @RequestParam(defaultValue = "10") int size,
-                                                                 @RequestParam(required = false) String orderNumber,
-                                                                 @RequestParam(required = false) Integer clientUserId,
-                                                                 @RequestParam(required = false) Integer lawyerUserId,
-                                                                 @RequestParam(required = false) String lawyerName,
-                                                                 @RequestParam(required = false) Integer orderStatus) {
+                                                                        @RequestParam(defaultValue = "10") int size,
+                                                                        @RequestParam(required = false) String orderNumber,
+                                                                        @RequestParam(required = false) Integer clientUserId,
+                                                                        @RequestParam(required = false) Integer lawyerUserId,
+                                                                        @RequestParam(required = false) String lawyerName,
+                                                                        @RequestParam(required = false) Integer orderStatus) {
         log.info("LawyerConsultationOrderController.getConsultationOrderList?page={},size={},orderNumber={},clientUserId={},lawyerUserId={},lawyerName={},orderStatus={}",
                 page, size, orderNumber, clientUserId, lawyerUserId, lawyerName, orderStatus);
         int pageNum = page > 0 ? page : 1;
@@ -73,33 +73,33 @@ public class LawyerConsultationOrderController {
     @ApiOperationSupport(order = 3)
     @PostMapping("/editConsultationOrder")
     public R<LawyerConsultationOrder> editConsultationOrder(@RequestBody LawyerConsultationOrder consultationOrder) {
-        log.info("开始编辑咨询订单，订单ID={}, 订单编号={}", 
+        log.info("开始编辑咨询订单，订单ID={}, 订单编号={}",
                 consultationOrder != null ? consultationOrder.getId() : null,
                 consultationOrder != null ? consultationOrder.getOrderNumber() : null);
-        
+
         // 参数校验：订单ID不能为空
         if (consultationOrder == null || consultationOrder.getId() == null) {
             log.warn("编辑咨询订单失败：订单ID为空");
             return R.fail("订单ID不能为空");
         }
-        
+
         // 记录修改前的关键信息
         Integer orderId = consultationOrder.getId();
         Integer newOrderStatus = consultationOrder.getOrderStatus();
         Integer newPaymentStatus = consultationOrder.getPaymentStatus();
-        log.info("编辑咨询订单，订单ID={}, 新订单状态={}, 新支付状态={}", 
+        log.info("编辑咨询订单，订单ID={}, 新订单状态={}, 新支付状态={}",
                 orderId, newOrderStatus, newPaymentStatus);
-        
+
         R<LawyerConsultationOrder> result = consultationOrderService.editConsultationOrder(consultationOrder);
-        
+
         if (result.isSuccess()) {
-            log.info("编辑咨询订单成功，订单ID={}, 订单编号={}", 
+            log.info("编辑咨询订单成功，订单ID={}, 订单编号={}",
                     orderId, consultationOrder.getOrderNumber());
         } else {
-            log.warn("编辑咨询订单失败，订单ID={}, 失败原因={}", 
+            log.warn("编辑咨询订单失败，订单ID={}, 失败原因={}",
                     orderId, result.getMsg());
         }
-        
+
         return result;
     }
 
@@ -170,8 +170,8 @@ public class LawyerConsultationOrderController {
     })
     @GetMapping("/getPage")
     public R<IPage<LawyerConsultationOrder>> getPage(@ModelAttribute LawyerConsultationOrder consultationOrder,
-                                                      @RequestParam(defaultValue = "1") int page,
-                                                      @RequestParam(defaultValue = "10") int size) {
+                                                     @RequestParam(defaultValue = "1") int page,
+                                                     @RequestParam(defaultValue = "10") int size) {
         log.info("LawyerConsultationOrderController.getPage?consultationOrder={},page={},size={}", consultationOrder, page, size);
         int pageNum = page > 0 ? page : 1;
         int pageSize = size > 0 ? size : 10;
@@ -205,7 +205,6 @@ public class LawyerConsultationOrderController {
     }*/
 
 
-
     @ApiOperation("立即咨询")
     @ApiOperationSupport(order = 9)
     @ApiImplicitParams({
@@ -245,7 +244,7 @@ public class LawyerConsultationOrderController {
         log.info("LawyerConsultationOrderController.payStatus?orderNumber={},paymentStatus={},orderStatus={}",
                 request.getOrderNumber(), request.getPaymentStatus(), request.getOrderStatus());
         //如果订单已支付，关闭redis中的记时
-        if (request.getPaymentStatus() != null && request.getPaymentStatus() == 1){
+        if (request.getPaymentStatus() != null && request.getPaymentStatus() == 1) {
             orderExpirationService.cancelOrderPaymentTimeout(request.getOrderNumber());
         }
         return consultationOrderService.payStatus(request);
@@ -262,10 +261,10 @@ public class LawyerConsultationOrderController {
     })
     @GetMapping("/getConsultationOrderListById")
     public R<IPage<LawyerConsultationOrderVO>> getConsultationOrderListById(@RequestParam(defaultValue = "1") int page,
-                                                                        @RequestParam(defaultValue = "10") int size,
-                                                                        @RequestParam(required = false) String userId,
-                                                                        @RequestParam(required = false) String orderStatus,
-                                                                        @RequestParam(required = false) String lawyerName) {
+                                                                            @RequestParam(defaultValue = "10") int size,
+                                                                            @RequestParam(required = false) String userId,
+                                                                            @RequestParam(required = false) String orderStatus,
+                                                                            @RequestParam(required = false) String lawyerName) {
         log.info("LawyerConsultationOrderController.getConsultationOrderListById?pageNum={},pageSize={},userId={},orderStatus={},lawyerName={}",
                 page, size, userId, orderStatus, lawyerName);
         return consultationOrderService.getConsultationOrderListById(page, size, userId, orderStatus, lawyerName);
@@ -338,7 +337,7 @@ public class LawyerConsultationOrderController {
             @ApiImplicitParam(name = "lawyerUserId", value = "律师用户ID", dataType = "Integer", paramType = "query", required = true),
     })
     @PostMapping("/checkOrder")
-    public R<Map<String, String>> checkOrder( @RequestParam Integer clientUserId, @RequestParam Integer lawyerUserId) {
+    public R<Map<String, String>> checkOrder(@RequestParam Integer clientUserId, @RequestParam Integer lawyerUserId) {
         log.info("LawyerConsultationOrderController.checkOrder?clientUserId={},lawyerUserId{}", clientUserId, lawyerUserId);
         return consultationOrderService.checkOrder(clientUserId, lawyerUserId);
     }

alien-lawyer/src/main/java/shop/alien/lawyer/controller/LawyerConsultationReviewController.java

@@ -100,8 +100,8 @@ public class LawyerConsultationReviewController {
     })
     @GetMapping("/getPage")
     public R<IPage<LawyerConsultationReview>> getPage(@ModelAttribute LawyerConsultationReview consultationReview,
-                                                       @RequestParam(defaultValue = "1") int page,
-                                                       @RequestParam(defaultValue = "10") int size) {
+                                                      @RequestParam(defaultValue = "1") int page,
+                                                      @RequestParam(defaultValue = "10") int size) {
         log.info("LawyerConsultationReviewController.getPage?consultationReview={},page={},size={}", consultationReview, page, size);
         int pageNum = page > 0 ? page : 1;
         int pageSize = size > 0 ? size : 10;

alien-lawyer/src/main/java/shop/alien/lawyer/controller/LawyerExpertiseAreaController.java

@@ -38,8 +38,8 @@ public class LawyerExpertiseAreaController {
     })
     @GetMapping("/getExpertiseAreaList")
     public R<IPage<LawyerExpertiseArea>> getExpertiseAreaList(@RequestParam(defaultValue = "1") int page,
-                                                             @RequestParam(defaultValue = "10") int size,
-                                                             @RequestParam(required = false) String expertiseAreaInfo) {
+                                                              @RequestParam(defaultValue = "10") int size,
+                                                              @RequestParam(required = false) String expertiseAreaInfo) {
         log.info("LawyerExpertiseAreaController.getExpertiseAreaList?page={},size={},expertiseAreaInfo={}",
                 page, size, expertiseAreaInfo);
         int pageNum = page > 0 ? page : 1;
@@ -60,13 +60,13 @@ public class LawyerExpertiseAreaController {
     @PostMapping("/editExpertiseArea")
     public R<LawyerExpertiseArea> editExpertiseArea(@RequestBody LawyerExpertiseArea expertiseArea) {
         log.info("LawyerExpertiseAreaController.editExpertiseArea?expertiseArea={}", expertiseArea);
-        
+
         // 参数校验：ID不能为空
         if (expertiseArea == null || expertiseArea.getId() == null) {
             log.warn("编辑领域信息失败：ID为空");
             return R.fail("ID不能为空");
         }
-        
+
         return expertiseAreaService.editExpertiseArea(expertiseArea);
     }
 

alien-lawyer/src/main/java/shop/alien/lawyer/controller/LawyerLegalProblemScenarioController.java

@@ -91,9 +91,9 @@ public class LawyerLegalProblemScenarioController {
                 .build()
                 .list(lawyerLegalProblemScenarioService);
 
-        for (LawyerLegalProblemScenario item : list){
-            Integer id=item.getId();
-            LawyerImg a=lawyerImgMapper.getLawyerImgById(id);
+        for (LawyerLegalProblemScenario item : list) {
+            Integer id = item.getId();
+            LawyerImg a = lawyerImgMapper.getLawyerImgById(id);
             item.setImgUrl(a.getImgUrl());
         }
 
@@ -117,9 +117,9 @@ public class LawyerLegalProblemScenarioController {
     })
     @GetMapping("/getPage")
     public R<IPage<LawyerLegalProblemScenario>> getPage(@ModelAttribute LawyerLegalProblemScenario lawyerLegalProblemScenario,
-                                                         @RequestParam(defaultValue = "1") int page,
-                                                         @RequestParam(defaultValue = "10") int size) {
-        log.info("LawyerLegalProblemScenarioController.getPage?lawyerLegalProblemScenario={},page={},size={}", 
+                                                        @RequestParam(defaultValue = "1") int page,
+                                                        @RequestParam(defaultValue = "10") int size) {
+        log.info("LawyerLegalProblemScenarioController.getPage?lawyerLegalProblemScenario={},page={},size={}",
                 lawyerLegalProblemScenario, page, size);
         // 参数校验（确保大于0）
         int pageNum = page > 0 ? page : 1;

alien-lawyer/src/main/java/shop/alien/lawyer/controller/LawyerUserController.java

@@ -102,8 +102,8 @@ public class LawyerUserController {
     })
     @GetMapping("/getPage")
     public R<IPage<LawyerUser>> getPage(@ModelAttribute LawyerUser lawyerUser,
-                                         @RequestParam(defaultValue = "1") int page,
-                                         @RequestParam(defaultValue = "10") int size) {
+                                        @RequestParam(defaultValue = "1") int page,
+                                        @RequestParam(defaultValue = "10") int size) {
         log.info("LawyerUserController.getPage?lawyerUser={},page={},size={}", lawyerUser, page, size);
         int pageNum = page > 0 ? page : 1;
         int pageSize = size > 0 ? size : 10;

alien-lawyer/src/main/java/shop/alien/lawyer/service/LawyerUserService.java

@@ -89,9 +89,9 @@ public interface LawyerUserService extends IService<LawyerUser> {
     /**
      * 通过姓名模糊查询律师（并保存搜索历史）
      *
-     * @param nickName        律师姓名（支持模糊查询）
-     * @param page        页码
-     * @param pageSize    每页数量
+     * @param nickName     律师姓名（支持模糊查询）
+     * @param page         页码
+     * @param pageSize     每页数量
      * @param clientUserId 客户端用户ID（可选，用于保存搜索历史）
      * @return R<IPage<LawyerUser>>
      */
@@ -101,7 +101,7 @@ public interface LawyerUserService extends IService<LawyerUser> {
      * 获取推荐律师列表
      *
      * @param page       页码
-     * @param size   每页数量
+     * @param size       每页数量
      * @param categoryId 分类ID（可选）
      * @return R<IPage<LawyerUser>>
      */

alien-lawyer/src/main/java/shop/alien/lawyer/service/impl/LawyerLegalProblemScenarioServiceImpl.java

@@ -62,7 +62,7 @@ public class LawyerLegalProblemScenarioServiceImpl extends ServiceImpl<LawyerLeg
     @Override
     public R<LawyerLegalProblemScenario> getCategoryTreeByFirstLevelId(Integer id) {
         log.info("LawyerLegalProblemScenarioServiceImpl.getCategoryTreeByFirstLevelId?id={}", id);
-        
+
         // 验证一级场景是否存在
         LawyerLegalProblemScenario firstLevel = this.getById(id);
         if (firstLevel == null) {

alien-lawyer/src/main/java/shop/alien/lawyer/service/impl/LawyerUserServiceImpl.java

@@ -129,7 +129,7 @@ public class LawyerUserServiceImpl extends ServiceImpl<LawyerUserMapper, LawyerU
         result.put("rating", lawyer.getServiceScore() != null ? lawyer.getServiceScore() / 20.0 : 0.0);
         result.put("reviewCount", lawyer.getGoodReviewCount() != null ?
                 (lawyer.getGoodReviewCount() + (lawyer.getMediumReviewCount() != null ? lawyer.getMediumReviewCount() : 0) +
-                 (lawyer.getBadReviewCount() != null ? lawyer.getBadReviewCount() : 0)) : 0);
+                        (lawyer.getBadReviewCount() != null ? lawyer.getBadReviewCount() : 0)) : 0);
 
         return R.data(result);
     }
@@ -276,7 +276,6 @@ public class LawyerUserServiceImpl extends ServiceImpl<LawyerUserMapper, LawyerU
     }
 
 
-
     @Override
     public R<IPage<LawyerUser>> getRecommendedLawyersBySession(String sessionId, Integer messageId) {
         log.info("LawyerUserServiceImpl.getRecommendedLawyersBySession?sessionId={},messageId={}", sessionId, messageId);
@@ -303,12 +302,12 @@ public class LawyerUserServiceImpl extends ServiceImpl<LawyerUserMapper, LawyerU
         if (nickName != null && !nickName.trim().isEmpty()) {
             queryWrapper.like("nick_name", nickName.trim());
         }
-        
+
         // 排序：优先推荐律师 -> 在线律师 -> 注册时间
         queryWrapper.orderByDesc("is_recommended")
                 .orderByDesc("is_online")
                 .orderByAsc("created_time");
-        
+
         // 分页查询
         Page<LawyerUser> pageObj = new Page<>(pageNum, pageSizeNum);
         IPage<LawyerUser> pageResult = this.page(pageObj, queryWrapper);
@@ -324,7 +323,7 @@ public class LawyerUserServiceImpl extends ServiceImpl<LawyerUserMapper, LawyerU
                         .eq(LawyerUserSearchHistory::getSearchType, 0)  // 0:律师姓名
                         .eq(LawyerUserSearchHistory::getDeleteFlag, 0);
                 long count = userSearchHistoryService.count(checkWrapper);
-                
+
                 // 如果不存在相同的记录，则添加
                 if (count == 0) {
                     LawyerUserSearchHistory searchHistory = new LawyerUserSearchHistory();
@@ -352,9 +351,10 @@ public class LawyerUserServiceImpl extends ServiceImpl<LawyerUserMapper, LawyerU
 
     /**
      * 获取AI推荐律师列表
+     *
      * @param page 页码
-     * pageSize 页大小
-     * categoryId 分类ID
+     *             pageSize 页大小
+     *             categoryId 分类ID
      */
     @Override
     public R<IPage<LawyerUser>> getAiRecommendList(int page, int size, Integer categoryId) {