测试充值渠道

src/main/java/com/usky/dxtop/controller/web/TopRadioController.java

@@ -1,8 +1,25 @@
 package com.usky.dxtop.controller.web;
 
 
+import com.usky.dxtop.common.annotation.Log;
+import com.usky.dxtop.common.constant.UserConstants;
+import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.common.core.page.TableDataInfo;
+import com.usky.dxtop.common.enums.BusinessType;
+import com.usky.dxtop.common.utils.SecurityUtils;
+import com.usky.dxtop.controller.BaseController;
+import com.usky.dxtop.model.SysConfig;
+import com.usky.dxtop.model.SysDictData;
+import com.usky.dxtop.model.TopRadio;
+import com.usky.dxtop.service.ISysConfigService;
+import com.usky.dxtop.service.TopRadioService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * <p>
@@ -14,7 +31,47 @@ import org.springframework.web.bind.annotation.RequestMapping;
  */
 @Controller
 @RequestMapping("/dxtop/topRadio")
-public class TopRadioController {
+public class TopRadioController extends BaseController {
+
+    @Autowired
+    private TopRadioService topRadioService;
+
+    /**
+     * 新增
+     * @param topRadio
+     * @return
+     */
+    @PostMapping
+    public AjaxResult add(@RequestBody TopRadio topRadio){
+        if (UserConstants.NOT_UNIQUE.equals(topRadioService.checkIdentityUnique(topRadio)))
+        {
+            return AjaxResult.error("新增身份信息'" + topRadio.getIdentity() + "'失败，身份信息已存在");
+        }
+        topRadio.setCreateBy(SecurityUtils.getUsername());
+        return toAjax(topRadioService.save(topRadio));
+
+    }
+
+    /**
+     * 修改
+     */
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody TopRadio topRadio)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(topRadioService.checkIdentityUnique(topRadio)))
+        {
+            return AjaxResult.error("修改身份信息'" + topRadio.getIdentity() + "'失败，身份信息已存在");
+        }
+        topRadio.setUpdateBy(SecurityUtils.getUsername());
+        return toAjax(topRadioService.updateById(topRadio));
+    }
 
+    @GetMapping("/list")
+    public TableDataInfo list(TopRadio topRadio)
+    {
+        startPage();
+        List<TopRadio> list = topRadioService.list(topRadio);
+        return getDataTable(list);
+    }
 }
 

src/main/java/com/usky/dxtop/model/CallApiLog.java

@@ -1,5 +1,6 @@
 package com.usky.dxtop.model;
 
+import com.usky.dxtop.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -18,7 +19,7 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class CallApiLog implements Serializable {
+public class CallApiLog extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID=1L;
 
@@ -49,17 +50,6 @@ public class CallApiLog implements Serializable {
      */
     private String apiResultData;
 
-    private Long createUserId;
-
-    private LocalDateTime createTime;
-
-    private String createUserName;
-
-    private Long updateUserId;
-
-    private LocalDateTime updateTime;
-
-    private String updateUserName;
 
 
 }

src/main/java/com/usky/dxtop/model/Order.java

@@ -2,6 +2,7 @@ package com.usky.dxtop.model;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.usky.dxtop.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -20,7 +21,7 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class Order implements Serializable {
+public class Order extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID=1L;
 
@@ -67,17 +68,5 @@ public class Order implements Serializable {
      */
     private Double money;
 
-    private Long createUserId;
-
-    private LocalDateTime createTime;
-
-    private String createUserName;
-
-    private Long updateUserId;
-
-    private LocalDateTime updateTime;
-
-    private String updateUserName;
-
 
 }

src/main/java/com/usky/dxtop/model/QrCode.java

@@ -1,5 +1,6 @@
 package com.usky.dxtop.model;
 
+import com.usky.dxtop.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -18,7 +19,7 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class QrCode implements Serializable {
+public class QrCode extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID=1L;
 
@@ -30,17 +31,5 @@ public class QrCode implements Serializable {
 
     private String topChannelName;
 
-    private Long createUserId;
-
-    private LocalDateTime createTime;
-
-    private String createUserName;
-
-    private Long updateUserId;
-
-    private LocalDateTime updateTime;
-
-    private String updateUserName;
-
 
 }

src/main/java/com/usky/dxtop/model/TopChannel.java

@@ -2,6 +2,7 @@ package com.usky.dxtop.model;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.usky.dxtop.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -20,7 +21,7 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class TopChannel implements Serializable {
+public class TopChannel extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID=1L;
 
@@ -31,17 +32,5 @@ public class TopChannel implements Serializable {
 
     private String aliasName;
 
-    private Long createUserId;
-
-    private LocalDateTime createTime;
-
-    private String createUserName;
-
-    private Long updateUserId;
-
-    private LocalDateTime updateTime;
-
-    private String updateUserName;
-
 
 }

src/main/java/com/usky/dxtop/model/TopRadio.java

@@ -1,11 +1,14 @@
 package com.usky.dxtop.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.usky.dxtop.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -18,7 +21,7 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class TopRadio implements Serializable {
+public class TopRadio extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID=1L;
 
@@ -27,25 +30,11 @@ public class TopRadio implements Serializable {
     /**
      * 身份信息
      */
-    private String 
-identity;
+    private String identity;
 
     /**
      * 到账比例
      */
     private Double proportion;
 
-    private Long createUserId;
-
-    private LocalDateTime createTime;
-
-    private String createUserName;
-
-    private Long updateUserId;
-
-    private LocalDateTime updateTime;
-
-    private String updateUserName;
-
-
 }

src/main/java/com/usky/dxtop/service/TopRadioService.java

@@ -2,6 +2,9 @@ package com.usky.dxtop.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.usky.dxtop.model.TopRadio;
+import org.apache.catalina.LifecycleState;
+
+import java.util.List;
 
 
 /**
@@ -14,4 +17,10 @@ import com.usky.dxtop.model.TopRadio;
  */
 public interface TopRadioService extends IService<TopRadio> {
 
+
+
+    String checkIdentityUnique(TopRadio topRadio);
+
+
+    List<TopRadio> list(TopRadio topRadio);
 }

src/main/java/com/usky/dxtop/service/impl/TopRadioServiceImpl.java

@@ -1,12 +1,19 @@
 package com.usky.dxtop.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.usky.dxtop.common.constant.UserConstants;
+import com.usky.dxtop.common.utils.StringUtils;
 import com.usky.dxtop.mapper.TopRadioMapper;
+import com.usky.dxtop.model.SysConfig;
 import com.usky.dxtop.model.TopRadio;
 import com.usky.dxtop.service.TopRadioService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 充值到账比例 服务实现类
@@ -18,4 +25,23 @@ import org.springframework.stereotype.Service;
 @Service
 public class TopRadioServiceImpl extends ServiceImpl<TopRadioMapper, TopRadio> implements TopRadioService {
 
+    @Override
+    public String checkIdentityUnique(TopRadio topRadio) {
+        Long configId = StringUtils.isNull(topRadio.getId()) ? -1L : topRadio.getId();
+        LambdaQueryWrapper<TopRadio> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(TopRadio::getIdentity,topRadio.getIdentity());
+        TopRadio byIdentity = this.getOne(queryWrapper);
+        if (StringUtils.isNotNull(byIdentity) && byIdentity.getId() != configId.longValue())
+        {
+            return UserConstants.NOT_UNIQUE;
+        }
+        return UserConstants.UNIQUE;
+    }
+
+    @Override
+    public List<TopRadio> list(TopRadio topRadio) {
+        LambdaQueryWrapper<TopRadio> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.like(TopRadio::getIdentity,topRadio.getId());
+        return this.list(queryWrapper);
+    }
 }