优化

src/main/java/com/poteviohealth/cgp/integration/config/MybatisPlusConfig.java

@@ -35,6 +35,7 @@ public class MybatisPlusConfig {
         return globalConfig;
     }
 
+
     /**
      * 多租户属于 SQL 解析部分，依赖 MP 分页插件
      */
@@ -47,7 +48,8 @@ public class MybatisPlusConfig {
 
             @Override
             public Expression getTenantId(boolean select) {
-                return new LongValue(TokenContext.cureOperatorId());
+                Integer operatorId = TokenContext.cureOperatorId();
+                return new LongValue(operatorId==null?1L:operatorId);
             }
 
             @Override

src/main/java/com/poteviohealth/cgp/integration/config/SecurityConfig.java

@@ -0,0 +1,79 @@
+package com.poteviohealth.cgp.integration.config;
+
+import com.alibaba.fastjson.JSON;
+import com.poteviohealth.cgp.common.filter.*;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.Arrays;
+
+/**
+ * 登陆过滤器
+ */
+@Configuration
+public class SecurityConfig {
+//    @Bean
+//    public FilterRegistrationBean registerCrosFilter() {
+//        FilterRegistrationBean registration = new FilterRegistrationBean();
+//        registration.setName("accessControlAllowOriginFilter");
+//        registration.setFilter(new AccessControlAllowOriginFilter());
+//        registration.setOrder(0);
+//        registration.setUrlPatterns(Arrays.asList("/*"));
+//        return registration;
+//    }
+    /**
+     * Web token过滤
+     * @return filter
+     */
+    @Bean
+    public FilterRegistrationBean registerWebFilter() {
+        FilterRegistrationBean registration = new FilterRegistrationBean();
+        registration.setName("webJwtAuthFilter");          // 过滤器名称
+        registration.setFilter(new WebJwtAuthFilter());        // 注入过滤器
+        registration.setOrder(1);                       //过滤器顺序
+        registration.setUrlPatterns(Arrays.asList("/integration/web/*"));  //拦截规则
+        return registration;
+    }
+
+    /**
+     * APP token过滤
+     * @return filter
+     */
+    @Bean
+    public FilterRegistrationBean registerAppFilter() {
+        FilterRegistrationBean registration = new FilterRegistrationBean();
+        registration.setName("appJwtAuthFilter");          // 过滤器名称
+        registration.setFilter(new AppJwtAuthFilter());        // 注入过滤器
+        registration.setOrder(2);                       //过滤器顺序
+        registration.setUrlPatterns(Arrays.asList("/integration/app/*"));  //拦截规则
+        return registration;
+    }
+
+    public static void main(String[] args) {
+        getToken();
+        getTokenWeb();
+    }
+
+    private static void getToken() {
+        MiniJwtVO miniJwtVO = new MiniJwtVO();
+        miniJwtVO.setAppId("wxac7ab174760dbd59");
+        miniJwtVO.setAreaId(4422);
+        miniJwtVO.setCustomerId(677596579610625L);
+        miniJwtVO.setOperatorId(1);
+        miniJwtVO.setCustomerName("客户1");
+        miniJwtVO.setGroupLeaderId(1L);
+        miniJwtVO.setOpenId("oaD-55XF77GFFYeywaAQFbKc7kbo");
+        System.out.println(JwtUtil.createJwt(1, JSON.toJSONString(miniJwtVO)));
+    }
+
+    private static void getTokenWeb() {
+        WebJwtVO miniJwtVO = new WebJwtVO();
+        miniJwtVO.setOperatorId(1);
+        miniJwtVO.setEmployeeId(1);
+        miniJwtVO.setUserId(1);
+        miniJwtVO.setEmployeeRole(true);
+        miniJwtVO.setOperatorRole(true);
+        System.out.println(JwtUtil.createJwt(1, JSON.toJSONString(miniJwtVO)));
+    }
+}

src/main/java/com/poteviohealth/cgp/integration/controller/web/IntegrationWebController.java

@@ -29,7 +29,7 @@ public class IntegrationWebController extends BaseWebController {
 
   @ApiOperation(value="详情页列表查询")
   @RequestMapping(value = "/list", method = RequestMethod.POST)
-  @ResponseBody
+  @PostMapping
   @OperationLog(type = OperateType.SELECT)
   public VaultsResponse<CommonPage<IntegralDetailWebOutDTO>> list(@RequestBody IntegralDetailWebInDTO integralDetailWebInDTO){
     return iIntegralDetailService.selectPage(integralDetailWebInDTO);

src/main/java/com/poteviohealth/cgp/integration/mapstruct/IntegralConverter.java

@@ -33,6 +33,6 @@ public interface IntegralConverter {
      * @Date 6:29 PM 2019/7/25
      * @Author MoonJiDoo
      **/
-    CommonPage<IntegralDetailWebOutDTO> model2WebDTO(IPage<IntegralDetail> integralDetailIPage);
+    CommonPage<IntegralDetailWebOutDTO> model2WebDTO(CommonPage<IntegralDetail> integralDetailIPage);
 
 }

src/main/java/com/poteviohealth/cgp/integration/model/IntegralDetail.java

@@ -2,6 +2,7 @@ package com.poteviohealth.cgp.integration.model;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.poteviohealth.cgp.common.model.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -16,57 +17,63 @@ import org.apache.ibatis.type.Alias;
  * @author: QIN
  * @date: 2020/9/1 10:54
  */
-@NoArgsConstructor
-@AllArgsConstructor
+@TableName(value = "i_integral_detail")
 @Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("i_integral_detail")
-@Alias("i_integral_detail")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = false)
 public class IntegralDetail extends BaseEntity {
 
     /**
      * 逻辑主键
      */
+    @ApiModelProperty(value = "逻辑主键", name = "integralDetailId", required = true)
     private Long integralDetailId;
 
     /**
      * 运营商id
      */
+    @ApiModelProperty(value = "运营商id", name = "operatorId", required = true)
     private Integer operatorId;
 
     /**
      * 客户id
      */
+    @ApiModelProperty(value = "客户id", name = "customerId", required = true)
     private Long customerId;
 
     /**
      * 团长id
      */
+    @ApiModelProperty(value = "团长id", name = "groupLeaderId")
     private Integer groupLeaderId;
 
     /**
      * 逻辑主键
      */
+    @ApiModelProperty(value = "订单id", name = "orderId")
     private Long orderId;
 
     /**
      * 订单编号
      */
+    @ApiModelProperty(value = "订单编号", name = "sn")
     private String sn;
 
     /**
      * 供应商id
      */
+    @ApiModelProperty(value = "供应商id", name = "supplierId")
     private Integer supplierId;
 
     /**
      * 操作事件
      */
+    @ApiModelProperty(value = "操作事件", name = "event",required = true)
     private String event;
 
     /**
      * 积分
      */
+    @ApiModelProperty(value = "积分", name = "integral",required = true)
     private Long integral;
 }

src/main/java/com/poteviohealth/cgp/integration/service/impl/IntegralDetailServiceImpl.java

@@ -96,12 +96,12 @@ public class IntegralDetailServiceImpl extends BaseServiceImpl<IntegralDetailMap
     @Override
     public VaultsResponse<CommonPage<IntegralDetailWebOutDTO>> selectPage(IntegralDetailWebInDTO integralDetailWebInDTO) {
 
-        IPage<IntegralDetail> pageOrder = selectOrderIPage(integralDetailWebInDTO);
+        CommonPage<IntegralDetail> pageOrder = selectOrderIPage(integralDetailWebInDTO);
         return VaultsResponse.success(IntegralConverter.INSTANCE.model2WebDTO(pageOrder));
     }
 
-    private IPage<IntegralDetail> selectOrderIPage(IntegralDetailWebInDTO integralDetailWebInDTO) {
-        Page<IntegralDetail> page = new Page<>(integralDetailWebInDTO.getPageNum(), integralDetailWebInDTO.getPageSize());
+    private CommonPage<IntegralDetail> selectOrderIPage(IntegralDetailWebInDTO integralDetailWebInDTO) {
+        IPage<IntegralDetail> page = new Page<>(integralDetailWebInDTO.getPageNum(), integralDetailWebInDTO.getPageSize());
 
         QueryWrapper<IntegralDetail> orderQueryWrapper = new QueryWrapper<>();
         orderQueryWrapper.eq("customer_id",integralDetailWebInDTO.getCustomerId());
@@ -112,7 +112,7 @@ public class IntegralDetailServiceImpl extends BaseServiceImpl<IntegralDetailMap
             orderQueryWrapper.ge("created_date", integralDetailWebInDTO.getEndDate());
         }
         orderQueryWrapper.orderByDesc("created_date");
-        return super.page(page, orderQueryWrapper);
+        return super.commonPage(page, orderQueryWrapper);
     }
 
 }