refactor: 代码路径维护

mini-app/src/main/java/com/onsiteservice/miniapp/controller/category/ServiceCategoryController.java

@@ -36,17 +36,11 @@ public class ServiceCategoryController {
     private ServiceCategoryService serviceCategoryService;
 
 
-    @ApiOperation(value = "查询服务大类")
+    @ApiOperation(value = "查询服务子类(大类全部返回)")
     @GetMapping("list")
     public Result<List<ServiceCategoryVO>> list(@RequestParam(required = false) String keyWord) {
         return serviceCategoryService.list(keyWord);
     }
 
-    /*@ApiOperation(value = "分页查询服务大类")
-    @PostMapping("page")
-    public Result<PageInfoVO<ServiceCategoryVO>> getPage(@RequestBody @NonNull @Validated PageServiceCategoryDTO dto) {
-        return serviceCategoryService.getPage(dto);
-    }*/
-
 
 }

mini-app/src/main/java/com/onsiteservice/miniapp/controller/category/ServiceSubclassController.java

@@ -32,12 +32,6 @@ public class ServiceSubclassController {
     private ServiceSubclassService serviceSubclassService;
 
 
-    /*@ApiOperation(value = "分页查询列表")
-    @PostMapping("page")
-    public Result<PageInfoVO<ServiceSubclassVO>> getPage(@RequestBody @NonNull @Validated PageServiceSubclassDTO dto) {
-        return serviceSubclassService.getPage(dto);
-    }*/
-
     @ApiOperation(value = "根据id查询服务详情")
     @GetMapping("get/{id}")
     public Result<ServiceSubclassVO> getDetail(@ApiParam(name = "id", value = "服务子类id") @PathVariable @Positive Long id) {

mini-app/src/main/java/com/onsiteservice/miniapp/controller/category/HomeCommonController.java → mini-app/src/main/java/com/onsiteservice/miniapp/controller/common/HomeCommonController.java

-package com.onsiteservice.miniapp.controller.category;
+package com.onsiteservice.miniapp.controller.common;
 
 import com.onsiteservice.common.annotation.user.CurrentUserId;
 import com.onsiteservice.core.result.Result;
-import com.onsiteservice.miniapp.controller.category.vo.HomeViewVO;
+import com.onsiteservice.miniapp.controller.common.vo.HomeViewVO;
 import com.onsiteservice.miniapp.service.category.HomeCommonService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -20,7 +20,7 @@ import javax.annotation.Resource;
  * @version v1.0
  * @since 2022/7/7 08:51
  */
-@Api(tags = "首页模块")
+@Api(tags = "通用(首页)模块")
 @RestController
 @RequestMapping("/common/")
 @Validated

mini-app/src/main/java/com/onsiteservice/miniapp/controller/category/vo/HomeNoticeVO.java → mini-app/src/main/java/com/onsiteservice/miniapp/controller/common/vo/HomeNoticeVO.java

-package com.onsiteservice.miniapp.controller.category.vo;
+package com.onsiteservice.miniapp.controller.common.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

mini-app/src/main/java/com/onsiteservice/miniapp/controller/category/vo/HomeViewVO.java → mini-app/src/main/java/com/onsiteservice/miniapp/controller/common/vo/HomeViewVO.java

-package com.onsiteservice.miniapp.controller.category.vo;
+package com.onsiteservice.miniapp.controller.common.vo;
 
+import com.onsiteservice.miniapp.controller.category.vo.BannerVO;
+import com.onsiteservice.miniapp.controller.category.vo.ServiceCategoryVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -7,7 +9,6 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Column;
 import java.util.List;
 
 @Data

mini-app/src/main/java/com/onsiteservice/miniapp/controller/log/ServiceOrderLogController.java

-package com.onsiteservice.miniapp.controller.log;
-
-import com.onsiteservice.entity.service.ServiceOrderLog;
-import com.onsiteservice.miniapp.service.log.ServiceOrderLogService;
-
-import com.onsiteservice.core.result.Result;
-import com.onsiteservice.dao.common.page.PageInfoVO;
-import com.onsiteservice.dao.common.page.PageParams;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.NonNull;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
-
-import javax.annotation.Resource;
-import javax.validation.constraints.Positive;
-
-import static com.onsiteservice.core.result.ResultGenerator.success;
-import static com.onsiteservice.core.result.ResultGenerator.fail;
-
-/**
- * @author 潘维吉
- * @date 2022-07-11 11:37
- * @description ServiceOrderLogController控制类
- */
-@ApiIgnore
-@Api(tags = "ServiceOrderLogController")
-@RestController
-@RequestMapping("/service/order/log")
-@Validated
-public class ServiceOrderLogController {
-
-    @Resource
-    private ServiceOrderLogService serviceOrderLogService;
-
-
-    @ApiOperation(value = "分页查询列表", notes = "作者: 潘维吉")
-    @PostMapping("/page")
-    public Result<PageInfoVO> getPage(@RequestBody @NonNull @Validated PageParams param) {
-        return success(serviceOrderLogService.getPage(param), "获取分页列表");
-    }
-
-    @ApiOperation(value = "根据id查询", notes = "作者: 潘维吉")
-    @GetMapping("/{id}")
-    public Result<ServiceOrderLog> getDetails(@PathVariable @Positive Long id) {
-        return success(serviceOrderLogService.selectByPrimaryKey(id), "根据id获取详情");
-    }
-
-    @ApiOperation(value = "新增或修改", notes = "作者: 潘维吉")
-    @PostMapping("/save-or-update")
-    public Result saveOrUpdate(@RequestBody @NonNull @Validated ServiceOrderLog serviceOrderLog) {
-        return success(serviceOrderLogService.saveOrUpdate(serviceOrderLog), serviceOrderLog.getId() == null ? "新增成功" : "修改成功");
-    }
-
-    @ApiOperation(value = "根据id删除", notes = "作者: 潘维吉")
-    @DeleteMapping("/{id}")
-    public Result deleteById(@PathVariable @Positive Long id) {
-        return success(serviceOrderLogService.deleteByPrimaryKey(id), "删除成功");
-    }
-
-}

mini-app/src/main/java/com/onsiteservice/miniapp/service/category/HomeCommonService.java

@@ -3,7 +3,6 @@ package com.onsiteservice.miniapp.service.category;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Sets;
 import com.onsiteservice.constant.constant.BizConstants;
 import com.onsiteservice.constant.constant.RedisKeyConstants;
 import com.onsiteservice.constant.constant.SysParamConstants;
@@ -21,10 +20,11 @@ import com.onsiteservice.entity.home.HomeNotice;
 import com.onsiteservice.entity.sys.SysParam;
 import com.onsiteservice.entity.user.User;
 import com.onsiteservice.miniapp.controller.category.vo.*;
+import com.onsiteservice.miniapp.controller.common.vo.HomeNoticeVO;
+import com.onsiteservice.miniapp.controller.common.vo.HomeViewVO;
 import com.onsiteservice.util.AttrCopyUtils;
 import com.onsiteservice.util.tree.TreeUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;