浏览代码

充值到账比例测试

yq 3 年之前
父节点
当前提交
46b28b2962

+ 4 - 0
src/main/java/com/usky/dxtop/common/core/domain/BaseEntity.java

@@ -4,6 +4,8 @@ import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
@@ -16,6 +18,7 @@ public class BaseEntity implements Serializable
     private static final long serialVersionUID = 1L;
 
     /** 搜索值 */
+    @TableField(exist = false)
     private String searchValue;
 
     /** 创建者 */
@@ -36,6 +39,7 @@ public class BaseEntity implements Serializable
     private String remark;
 
     /** 请求参数 */
+    @TableField(exist = false)
     private Map<String, Object> params;
 
     public String getSearchValue()

+ 2 - 1
src/main/java/com/usky/dxtop/controller/web/CallApiLogController.java

@@ -3,6 +3,7 @@ package com.usky.dxtop.controller.web;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -12,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
  * @author yq
  * @since 2021-08-26
  */
-@Controller
+@RestController
 @RequestMapping("/dxtop/callApiLog")
 public class CallApiLogController {
 

+ 2 - 1
src/main/java/com/usky/dxtop/controller/web/OrderController.java

@@ -3,6 +3,7 @@ package com.usky.dxtop.controller.web;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -12,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
  * @author yq
  * @since 2021-08-26
  */
-@Controller
+@RestController
 @RequestMapping("/dxtop/order")
 public class OrderController {
 

+ 2 - 1
src/main/java/com/usky/dxtop/controller/web/QrCodeController.java

@@ -3,6 +3,7 @@ package com.usky.dxtop.controller.web;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -12,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
  * @author yq
  * @since 2021-08-26
  */
-@Controller
+@RestController
 @RequestMapping("/dxtop/qrCode")
 public class QrCodeController {
 

+ 2 - 1
src/main/java/com/usky/dxtop/controller/web/TopChannelController.java

@@ -3,6 +3,7 @@ package com.usky.dxtop.controller.web;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -12,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
  * @author yq
  * @since 2021-08-26
  */
-@Controller
+@RestController
 @RequestMapping("/dxtop/topChannel")
 public class TopChannelController {
 

+ 2 - 2
src/main/java/com/usky/dxtop/controller/web/TopRadioController.java

@@ -29,7 +29,7 @@ import java.util.List;
  * @author yq
  * @since 2021-08-26
  */
-@Controller
+@RestController
 @RequestMapping("/dxtop/topRadio")
 public class TopRadioController extends BaseController {
 
@@ -56,7 +56,7 @@ public class TopRadioController extends BaseController {
      * 修改
      */
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody TopRadio topRadio)
+    public AjaxResult edit(@RequestBody TopRadio topRadio)
     {
         if (UserConstants.NOT_UNIQUE.equals(topRadioService.checkIdentityUnique(topRadio)))
         {

+ 2 - 0
src/main/java/com/usky/dxtop/model/TopRadio.java

@@ -1,6 +1,7 @@
 package com.usky.dxtop.model;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.usky.dxtop.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -25,6 +26,7 @@ public class TopRadio extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID=1L;
 
+
     private Long id;
 
     /**

+ 1 - 1
src/main/java/com/usky/dxtop/service/impl/TopRadioServiceImpl.java

@@ -41,7 +41,7 @@ public class TopRadioServiceImpl extends ServiceImpl<TopRadioMapper, TopRadio> i
     @Override
     public List<TopRadio> list(TopRadio topRadio) {
         LambdaQueryWrapper<TopRadio> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.like(TopRadio::getIdentity,topRadio.getId());
+        queryWrapper.like(StringUtils.isNotBlank(topRadio.getIdentity()),TopRadio::getIdentity,topRadio.getIdentity());
         return this.list(queryWrapper);
     }
 }

+ 1 - 1
src/main/resources/application-dev.properties

@@ -16,7 +16,7 @@ mybatis.refresh.sleep-seconds=20
 # datasource
 spring.autoconfigure.exclude=com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
 spring.datasource.dynamic.primary=dxtop
-spring.datasource.dynamic.datasource.dxtop.url=jdbc:mysql://120.55.70.156:3306/dxtop?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&characterEncoding=utf8&allowMultiQueries=true
+spring.datasource.dynamic.datasource.dxtop.url=jdbc:mysql://120.55.70.156:3306/dxtop?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&characterEncoding=utf8&allowMultiQueries=true
 spring.datasource.dynamic.datasource.dxtop.username=root
 spring.datasource.dynamic.datasource.dxtop.password=123456
 spring.datasource.dynamic.druid.initial-size=5