积分配置优化包路径

performance-api/src/main/java/com/clx/performance/param/app/integral/IntegralRuleUpdateParam.java → performance-api/src/main/java/com/clx/performance/param/pc/integral/IntegralRuleUpdateParam.java

-package com.clx.performance.param.app.integral;
+package com.clx.performance.param.pc.integral;
 
-import com.clx.performance.vo.app.integral.AppIntegralRuleVO;
+import com.clx.performance.vo.pc.integral.AppIntegralRuleVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

performance-api/src/main/java/com/clx/performance/param/app/integral/IntegralTruckRuleSaveParam.java → performance-api/src/main/java/com/clx/performance/param/pc/integral/IntegralTruckRuleSaveParam.java

-package com.clx.performance.param.app.integral;
+package com.clx.performance.param.pc.integral;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

performance-api/src/main/java/com/clx/performance/param/app/integral/IntegralTruckRuleStatusDeleteParam.java → performance-api/src/main/java/com/clx/performance/param/pc/integral/IntegralTruckRuleStatusDeleteParam.java

-package com.clx.performance.param.app.integral;
+package com.clx.performance.param.pc.integral;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

performance-api/src/main/java/com/clx/performance/param/app/integral/IntegralTruckRuleStatusUpdateParam.java → performance-api/src/main/java/com/clx/performance/param/pc/integral/IntegralTruckRuleStatusUpdateParam.java

-package com.clx.performance.param.app.integral;
+package com.clx.performance.param.pc.integral;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

performance-api/src/main/java/com/clx/performance/param/app/integral/IntegralTruckRuleUpdateParam.java → performance-api/src/main/java/com/clx/performance/param/pc/integral/IntegralTruckRuleUpdateParam.java

-package com.clx.performance.param.app.integral;
+package com.clx.performance.param.pc.integral;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

performance-api/src/main/java/com/clx/performance/param/app/integral/PageIntegralTruckRuleParam.java → performance-api/src/main/java/com/clx/performance/param/pc/integral/PageIntegralTruckRuleParam.java

-package com.clx.performance.param.app.integral;
+package com.clx.performance.param.pc.integral;
 
 import com.msl.common.base.PageParam;
 import lombok.Getter;

performance-api/src/main/java/com/clx/performance/vo/app/integral/AppIntegralRuleVO.java → performance-api/src/main/java/com/clx/performance/vo/pc/integral/AppIntegralRuleVO.java

-package com.clx.performance.vo.app.integral;
+package com.clx.performance.vo.pc.integral;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

performance-api/src/main/java/com/clx/performance/vo/app/integral/AppIntegralTruckRuleVO.java → performance-api/src/main/java/com/clx/performance/vo/pc/integral/AppIntegralTruckRuleVO.java

-package com.clx.performance.vo.app.integral;
+package com.clx.performance.vo.pc.integral;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

performance-web/src/main/java/com/clx/performance/controller/app/integral/IntegralRuleController.java → performance-web/src/main/java/com/clx/performance/controller/pc/integral/IntegralRuleController.java

-package com.clx.performance.controller.app.integral;
+package com.clx.performance.controller.pc.integral;
 
-import com.clx.performance.param.app.integral.IntegralRuleUpdateParam;
+import com.clx.performance.param.pc.integral.IntegralRuleUpdateParam;
 import com.clx.performance.service.integral.IntegralRuleService;
-import com.clx.performance.vo.app.integral.AppIntegralRuleVO;
+import com.clx.performance.vo.pc.integral.AppIntegralRuleVO;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
@@ -15,9 +15,9 @@ import org.springframework.web.bind.annotation.*;
 
 @Slf4j
 @RestController
-@RequestMapping(value="/app/driver/integral/rule")
+@RequestMapping(value="/pc/carrier/integral/rule")
 @Validated
-@Api(tags = "司机APP-积分记录")
+@Api(tags = "司机APP-积分规则")
 @AllArgsConstructor
 public class IntegralRuleController {
 

performance-web/src/main/java/com/clx/performance/controller/app/integral/IntegralTruckRuleController.java → performance-web/src/main/java/com/clx/performance/controller/pc/integral/IntegralTruckRuleController.java

-package com.clx.performance.controller.app.integral;
+package com.clx.performance.controller.pc.integral;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.enums.PerformanceResultEnum;
-import com.clx.performance.param.app.collect.PageCollectLineReportParam;
-import com.clx.performance.param.app.integral.*;
+import com.clx.performance.param.pc.integral.*;
 import com.clx.performance.service.integral.IntegralTruckRuleService;
-import com.clx.performance.vo.app.integral.AppIntegralTruckRuleVO;
+import com.clx.performance.vo.pc.integral.AppIntegralTruckRuleVO;
 import com.msl.common.base.PageData;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.exception.ServiceSystemException;
@@ -22,7 +21,7 @@ import javax.validation.constraints.NotBlank;
 
 @Slf4j
 @RestController
-@RequestMapping(value="/app/driver/integral/rule/truck")
+@RequestMapping(value="/pc/carrier/integral/truck/rule")
 @Validated
 @Api(tags = "司机APP-积分记录")
 @AllArgsConstructor

performance-web/src/main/java/com/clx/performance/dao/impl/integral/IntegralTruckRuleDaoImpl.java

@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.integral.IntegralTruckRuleDao;
 import com.clx.performance.mapper.integral.IntegralTruckRuleMapper;
 import com.clx.performance.model.integral.IntegralTruckRule;
-import com.clx.performance.param.app.integral.PageIntegralTruckRuleParam;
-import com.clx.performance.vo.app.integral.AppIntegralTruckRuleVO;
+import com.clx.performance.param.pc.integral.PageIntegralTruckRuleParam;
+import com.clx.performance.vo.pc.integral.AppIntegralTruckRuleVO;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 

performance-web/src/main/java/com/clx/performance/dao/integral/IntegralTruckRuleDao.java

@@ -3,8 +3,8 @@ package com.clx.performance.dao.integral;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.mapper.integral.IntegralTruckRuleMapper;
 import com.clx.performance.model.integral.IntegralTruckRule;
-import com.clx.performance.param.app.integral.PageIntegralTruckRuleParam;
-import com.clx.performance.vo.app.integral.AppIntegralTruckRuleVO;
+import com.clx.performance.param.pc.integral.PageIntegralTruckRuleParam;
+import com.clx.performance.vo.pc.integral.AppIntegralTruckRuleVO;
 import com.msl.common.dao.BaseDao;
 
 import java.util.List;

performance-web/src/main/java/com/clx/performance/mapper/integral/IntegralTruckRuleMapper.java

@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.model.integral.IntegralTruckRule;
-import com.clx.performance.param.app.integral.PageIntegralTruckRuleParam;
+import com.clx.performance.param.pc.integral.PageIntegralTruckRuleParam;
 import com.clx.performance.sqlProvider.integral.IntegralTruckRuleProvider;
-import com.clx.performance.vo.app.integral.AppIntegralTruckRuleVO;
+import com.clx.performance.vo.pc.integral.AppIntegralTruckRuleVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.SelectProvider;
@@ -22,7 +22,7 @@ import org.apache.ibatis.annotations.SelectProvider;
 public interface IntegralTruckRuleMapper extends BaseMapper<IntegralTruckRule> {
 
     /**
-     * @see IntegralTruckRuleProvider#pageRule(com.baomidou.mybatisplus.extension.plugins.pagination.Page, com.clx.performance.param.app.integral.PageIntegralTruckRuleParam)
+     * @see IntegralTruckRuleProvider#pageRule(com.baomidou.mybatisplus.extension.plugins.pagination.Page, PageIntegralTruckRuleParam)
      */
     @SelectProvider(type = IntegralTruckRuleProvider.class, method = "pageRule")
     IPage<AppIntegralTruckRuleVO> pageRule(@Param("page") Page<AppIntegralTruckRuleVO> page, @Param("param") PageIntegralTruckRuleParam param);

performance-web/src/main/java/com/clx/performance/service/impl/integral/IntegralRuleServiceImpl.java

@@ -4,9 +4,9 @@ import com.alibaba.fastjson.JSON;
 import com.clx.performance.dao.integral.IntegralRuleDao;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.model.integral.IntegralRule;
-import com.clx.performance.param.app.integral.IntegralRuleUpdateParam;
+import com.clx.performance.param.pc.integral.IntegralRuleUpdateParam;
 import com.clx.performance.service.integral.IntegralRuleService;
-import com.clx.performance.vo.app.integral.AppIntegralRuleVO;
+import com.clx.performance.vo.pc.integral.AppIntegralRuleVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

performance-web/src/main/java/com/clx/performance/service/impl/integral/IntegralTruckRuleServiceImpl.java

@@ -4,10 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.dao.integral.IntegralTruckRuleDao;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.model.integral.IntegralTruckRule;
-import com.clx.performance.param.app.integral.*;
+import com.clx.performance.param.pc.integral.*;
 import com.clx.performance.service.integral.IntegralTruckRuleService;
 import com.clx.performance.struct.integral.IntegralTruckRuleStruct;
-import com.clx.performance.vo.app.integral.AppIntegralTruckRuleVO;
+import com.clx.performance.vo.pc.integral.AppIntegralTruckRuleVO;
 import com.msl.common.exception.ServiceSystemException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

performance-web/src/main/java/com/clx/performance/service/integral/IntegralRuleService.java

 package com.clx.performance.service.integral;
 
-import com.clx.performance.param.app.integral.IntegralRuleUpdateParam;
-import com.clx.performance.vo.app.integral.AppIntegralRuleVO;
+import com.clx.performance.param.pc.integral.IntegralRuleUpdateParam;
+import com.clx.performance.vo.pc.integral.AppIntegralRuleVO;
 
 public interface IntegralRuleService {
 

performance-web/src/main/java/com/clx/performance/service/integral/IntegralTruckRuleService.java

 package com.clx.performance.service.integral;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.clx.performance.param.app.integral.*;
-import com.clx.performance.vo.app.integral.AppIntegralTruckRuleVO;
+import com.clx.performance.param.pc.integral.*;
+import com.clx.performance.vo.pc.integral.AppIntegralTruckRuleVO;
 
 public interface IntegralTruckRuleService {
 

performance-web/src/main/java/com/clx/performance/sqlProvider/integral/IntegralTruckRuleProvider.java

@@ -2,8 +2,8 @@ package com.clx.performance.sqlProvider.integral;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.clx.performance.param.app.integral.PageIntegralTruckRuleParam;
-import com.clx.performance.vo.app.integral.AppIntegralTruckRuleVO;
+import com.clx.performance.param.pc.integral.PageIntegralTruckRuleParam;
+import com.clx.performance.vo.pc.integral.AppIntegralTruckRuleVO;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.jdbc.SQL;
 

performance-web/src/main/java/com/clx/performance/struct/integral/IntegralTruckRuleStruct.java

 package com.clx.performance.struct.integral;
 
 import com.clx.performance.model.integral.IntegralTruckRule;
-import com.clx.performance.vo.app.integral.AppIntegralTruckRuleVO;
+import com.clx.performance.vo.pc.integral.AppIntegralTruckRuleVO;
 import com.msl.common.utils.DateStructUtil;
 import com.msl.common.utils.DateUtils;
 import org.mapstruct.Mapper;