Browse Source

Merge remote-tracking branch 'origin/test' into test

yumeng 2 years ago
parent
commit
a3540bb2ce
25 changed files with 990 additions and 460 deletions
  1. 3 1
      ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/KuaishouItemCollectSamplesServiceImpl.java
  2. 79 0
      ruixuan-live/src/main/java/com/ruixuan/jinniu/controller/KuaishouAccountController.java
  3. 12 12
      ruixuan-live/src/main/java/com/ruixuan/jinniu/controller/RxAdvertiserController.java
  4. 12 12
      ruixuan-live/src/main/java/com/ruixuan/jinniu/controller/RxProjectController.java
  5. 118 0
      ruixuan-live/src/main/java/com/ruixuan/jinniu/entity/KuaishouAccount.java
  6. 1 1
      ruixuan-live/src/main/java/com/ruixuan/jinniu/entity/RxAdvertiser.java
  7. 1 1
      ruixuan-live/src/main/java/com/ruixuan/jinniu/entity/RxProject.java
  8. 62 0
      ruixuan-live/src/main/java/com/ruixuan/jinniu/mapper/KuaishouAccountMapper.java
  9. 54 0
      ruixuan-live/src/main/java/com/ruixuan/jinniu/mapper/KuaishouAdvertiserMapper.java
  10. 54 0
      ruixuan-live/src/main/java/com/ruixuan/jinniu/mapper/KuaishouProjectMapper.java
  11. 0 54
      ruixuan-live/src/main/java/com/ruixuan/jinniu/mapper/RxAdvertiserMapper.java
  12. 0 61
      ruixuan-live/src/main/java/com/ruixuan/jinniu/mapper/RxProjectMapper.java
  13. 62 0
      ruixuan-live/src/main/java/com/ruixuan/jinniu/service/IKuaishouAccountService.java
  14. 53 0
      ruixuan-live/src/main/java/com/ruixuan/jinniu/service/IKuaishouAdvertiserService.java
  15. 53 0
      ruixuan-live/src/main/java/com/ruixuan/jinniu/service/IKuaishouProjectService.java
  16. 0 53
      ruixuan-live/src/main/java/com/ruixuan/jinniu/service/IRxAdvertiserService.java
  17. 0 61
      ruixuan-live/src/main/java/com/ruixuan/jinniu/service/IRxProjectService.java
  18. 87 0
      ruixuan-live/src/main/java/com/ruixuan/jinniu/service/impl/KuaishouAccountServiceImpl.java
  19. 76 0
      ruixuan-live/src/main/java/com/ruixuan/jinniu/service/impl/KuaishouAdvertiserServiceImpl.java
  20. 77 0
      ruixuan-live/src/main/java/com/ruixuan/jinniu/service/impl/KuaishouProjectServiceImpl.java
  21. 0 76
      ruixuan-live/src/main/java/com/ruixuan/jinniu/service/impl/RxAdvertiserServiceImpl.java
  22. 0 88
      ruixuan-live/src/main/java/com/ruixuan/jinniu/service/impl/RxProjectServiceImpl.java
  23. 14 20
      ruixuan-live/src/main/resources/mapper/jinniu/RxProjectMapper.xml
  24. 14 20
      ruixuan-live/src/main/resources/mapper/jinniu/RxAdvertiserMapper.xml
  25. 158 0
      ruixuan-live/src/main/resources/mapper/jinniu/KuaishouProjectMapper.xml

+ 3 - 1
ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/KuaishouItemCollectSamplesServiceImpl.java

@@ -643,6 +643,7 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
                     obj.put("regimentalPromotionAmount", 0);
                     obj.put("promoterCount", 0);
                     obj.put("orderCount", 0);
+                    obj.put("validOrderCount", 0);
                     list.add(obj);
                 }
             }
@@ -701,6 +702,7 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
                         obj.put("orderAmount", 0);
                         obj.put("regimentalPromotionAmount", 0);
                         obj.put("orderCount", 0);
+                        obj.put("validOrderCount", 0);
                         list.add(obj);
                     }
                 }
@@ -718,7 +720,7 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
                 data.put("orderAmount", amount.getInteger("orderAmount"));
                 data.put("regimentalPromotionAmount", amount.getInteger("regimentalPromotionAmount"));
                 data.put("orderAmountRate", amount.getString("orderAmountRate"));
-                data.put("totalRegimentalSettleAmountRate", amount.getString("totalRegimentalSettleAmountRate"));
+                data.put("regimentalPromotionAmountRate", amount.getString("regimentalPromotionAmountRate"));
                 data.put("orderCount", amount.getString("orderCount"));
                 data.put("orderCountRate", amount.getString("orderCountRate"));
             }

+ 79 - 0
ruixuan-live/src/main/java/com/ruixuan/jinniu/controller/KuaishouAccountController.java

@@ -0,0 +1,79 @@
+package com.ruixuan.jinniu.controller;
+
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruixuan.common.core.controller.BaseController;
+import com.ruixuan.common.core.domain.AjaxResult;
+import com.ruixuan.common.core.page.TableDataInfo;
+import com.ruixuan.jinniu.entity.KuaishouAccount;
+import com.ruixuan.jinniu.service.IKuaishouAccountService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 账户Controller
+ *
+ * @author ruoyi
+ * @date 2023-03-15
+ */
+@RestController
+@RequestMapping("/system/account")
+public class KuaishouAccountController extends BaseController {
+    @Autowired
+    private IKuaishouAccountService kuaishouAccountService;
+
+    /**
+     * 查询账户列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:account:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(KuaishouAccount kuaishouAccount) {
+        startPage();
+        List<KuaishouAccount> list = kuaishouAccountService.selectKuaishouAccountList(kuaishouAccount);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 获取账户详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:account:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success(kuaishouAccountService.selectKuaishouAccountById(id));
+    }
+
+    /**
+     * 新增账户
+     */
+    @PostMapping
+    public AjaxResult add(@RequestBody KuaishouAccount kuaishouAccount) {
+        return toAjax(kuaishouAccountService.insertKuaishouAccount(kuaishouAccount));
+    }
+
+    /**
+     * 修改账户
+     */
+    @PutMapping
+    public AjaxResult edit(@RequestBody KuaishouAccount kuaishouAccount) {
+        return toAjax(kuaishouAccountService.updateKuaishouAccount(kuaishouAccount));
+    }
+
+    /**
+     * 删除账户
+     */
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(kuaishouAccountService.deleteKuaishouAccountByIds(ids));
+    }
+}

+ 12 - 12
ruixuan-live/src/main/java/com/ruixuan/jinniu/controller/RxAdvertiserController.java

@@ -3,8 +3,8 @@ package com.ruixuan.jinniu.controller;
 import com.ruixuan.common.core.controller.BaseController;
 import com.ruixuan.common.core.domain.AjaxResult;
 import com.ruixuan.common.core.page.TableDataInfo;
-import com.ruixuan.jinniu.entity.RxAdvertiser;
-import com.ruixuan.jinniu.service.IRxAdvertiserService;
+import com.ruixuan.jinniu.entity.KuaishouAdvertiser;
+import com.ruixuan.jinniu.service.IKuaishouAdvertiserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,19 +25,19 @@ import java.util.List;
  */
 @Api(tags = "广告主")
 @RestController
-@RequestMapping("/rx/advertiser")
-public class RxAdvertiserController extends BaseController {
+@RequestMapping("/Kuaishou/advertiser")
+public class KuaishouAdvertiserController extends BaseController {
     @Autowired
-    private IRxAdvertiserService rxAdvertiserService;
+    private IKuaishouAdvertiserService KuaishouAdvertiserService;
 
     /**
      * 查询广告主列表
      */
     @ApiOperation(value = "查询广告主列表")
     @GetMapping("/list")
-    public TableDataInfo list(RxAdvertiser rxAdvertiser) {
+    public TableDataInfo list(KuaishouAdvertiser kuaishouAdvertiser) {
         startPage();
-        List<RxAdvertiser> list = rxAdvertiserService.selectRxAdvertiserList(rxAdvertiser);
+        List<KuaishouAdvertiser> list = KuaishouAdvertiserService.selectKuaishouAdvertiserList(kuaishouAdvertiser);
         return getDataTable(list);
     }
 
@@ -46,8 +46,8 @@ public class RxAdvertiserController extends BaseController {
      */
     @ApiOperation(value = "新增广告主")
     @PostMapping(value = "/add")
-    public AjaxResult add(@RequestBody RxAdvertiser rxAdvertiser) {
-        return toAjax(rxAdvertiserService.insertRxAdvertiser(rxAdvertiser));
+    public AjaxResult add(@RequestBody KuaishouAdvertiser kuaishouAdvertiser) {
+        return toAjax(KuaishouAdvertiserService.insertKuaishouAdvertiser(kuaishouAdvertiser));
     }
 
     /**
@@ -55,8 +55,8 @@ public class RxAdvertiserController extends BaseController {
      */
     @ApiOperation(value = "修改广告主")
     @PostMapping(value = "/edit")
-    public AjaxResult edit(@RequestBody RxAdvertiser rxAdvertiser) {
-        return toAjax(rxAdvertiserService.updateRxAdvertiser(rxAdvertiser));
+    public AjaxResult edit(@RequestBody KuaishouAdvertiser kuaishouAdvertiser) {
+        return toAjax(KuaishouAdvertiserService.updateKuaishouAdvertiser(kuaishouAdvertiser));
     }
 
     /**
@@ -64,7 +64,7 @@ public class RxAdvertiserController extends BaseController {
      */
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success(rxAdvertiserService.selectRxAdvertiserById(id));
+        return AjaxResult.success(KuaishouAdvertiserService.selectKuaishouAdvertiserById(id));
     }
 }
 

+ 12 - 12
ruixuan-live/src/main/java/com/ruixuan/jinniu/controller/RxProjectController.java

@@ -4,8 +4,8 @@ package com.ruixuan.jinniu.controller;
 import com.ruixuan.common.core.controller.BaseController;
 import com.ruixuan.common.core.domain.AjaxResult;
 import com.ruixuan.common.core.page.TableDataInfo;
-import com.ruixuan.jinniu.entity.RxProject;
-import com.ruixuan.jinniu.service.IRxProjectService;
+import com.ruixuan.jinniu.entity.KuaishouProject;
+import com.ruixuan.jinniu.service.IKuaishouProjectService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,19 +26,19 @@ import java.util.List;
  */
 @Api(tags = "项目")
 @RestController
-@RequestMapping("/rx/project")
-public class RxProjectController extends BaseController {
+@RequestMapping("/Kuaishou/project")
+public class KuaishouProjectController extends BaseController {
     @Autowired
-    private IRxProjectService rxProjectService;
+    private IKuaishouProjectService KuaishouProjectService;
 
     /**
      * 查询项目信息列表
      */
     @ApiOperation(value = "查询项目信息列表")
     @GetMapping("/list")
-    public TableDataInfo list(RxProject rxProject) {
+    public TableDataInfo list(KuaishouProject kuaishouProject) {
         startPage();
-        List<RxProject> list = rxProjectService.selectRxProjectList(rxProject);
+        List<KuaishouProject> list = KuaishouProjectService.selectKuaishouProjectList(kuaishouProject);
         return getDataTable(list);
     }
 
@@ -47,8 +47,8 @@ public class RxProjectController extends BaseController {
      */
     @ApiOperation(value = "新增项目信息")
     @PostMapping(value = "/add")
-    public AjaxResult add(@RequestBody RxProject rxProject) {
-        return toAjax(rxProjectService.insertRxProject(rxProject));
+    public AjaxResult add(@RequestBody KuaishouProject kuaishouProject) {
+        return toAjax(KuaishouProjectService.insertKuaishouProject(kuaishouProject));
     }
 
     /**
@@ -56,8 +56,8 @@ public class RxProjectController extends BaseController {
      */
     @ApiOperation(value = "修改项目信息")
     @PostMapping(value = "/edit")
-    public AjaxResult edit(@RequestBody RxProject rxProject) {
-        return toAjax(rxProjectService.updateRxProject(rxProject));
+    public AjaxResult edit(@RequestBody KuaishouProject kuaishouProject) {
+        return toAjax(KuaishouProjectService.updateKuaishouProject(kuaishouProject));
     }
 
     /**
@@ -65,6 +65,6 @@ public class RxProjectController extends BaseController {
      */
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success(rxProjectService.selectRxProjectById(id));
+        return AjaxResult.success(KuaishouProjectService.selectKuaishouProjectById(id));
     }
 }

+ 118 - 0
ruixuan-live/src/main/java/com/ruixuan/jinniu/entity/KuaishouAccount.java

@@ -0,0 +1,118 @@
+package com.ruixuan.jinniu.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruixuan.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+/**
+ * 账户对象 kuaishou_account
+ *
+ * @author ruoyi
+ * @date 2023-03-15
+ */
+public class KuaishouAccount extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    private Long id;
+
+    /**
+     * 账户ID
+     */
+    @ApiModelProperty(name = "账户ID")
+    private Long accountId;
+
+    /**
+     * 账户名称
+     */
+    @ApiModelProperty(name = "账户名称")
+    private String accountName;
+
+    /**
+     * 项目ID
+     */
+    @ApiModelProperty(name = "项目ID")
+    private Long projectId;
+
+    /**
+     * 项目名称
+     */
+    @ApiModelProperty(name = "项目名称")
+    private String projectName;
+
+    /**
+     * 媒体类型 磁力金牛、千川
+     */
+    @ApiModelProperty(name = "媒体类型 磁力金牛、千川")
+    private String mediaCode;
+
+    /**
+     * 快手ID
+     */
+    @ApiModelProperty(name = "快手ID")
+    private Long ksId;
+
+    /**
+     * 快手昵称
+     */
+    @ApiModelProperty(name = "快手昵称")
+    private String ksName;
+
+    /**
+     * 运营(优化)负责人Id
+     */
+    @ApiModelProperty(name = "运营(优化)负责人Id")
+    private String operatorId;
+
+    /**
+     * 运营(优化)负责人
+     */
+    @ApiModelProperty(name = "运营(优化)负责人")
+    private String operatorLeader;
+
+    /**
+     * 产品名称
+     */
+    @ApiModelProperty(name = "产品名称")
+    private String productName;
+
+    /**
+     * 一级行业
+     */
+    @ApiModelProperty(name = "一级行业")
+    private String industry;
+
+    /**
+     * 二级行业
+     */
+    @ApiModelProperty(name = "二级行业")
+    private String secondIndustry;
+
+    /**
+     * 公司名称
+     */
+    @ApiModelProperty(name = "公司名称")
+    private String corporationName;
+
+    /**
+     * 账户状态
+     */
+    @ApiModelProperty(name = "账户状态")
+    private String accountStatus;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+}

+ 1 - 1
ruixuan-live/src/main/java/com/ruixuan/jinniu/entity/RxAdvertiser.java

@@ -17,7 +17,7 @@ import java.util.Date;
  */
 @Data
 @ApiModel(value = "rx_advertiser", description = "广告主对象")
-public class RxAdvertiser implements Serializable {
+public class KuaishouAdvertiser implements Serializable {
 
     private static final long serialVersionUID = -8714484660488441769L;
     /**

+ 1 - 1
ruixuan-live/src/main/java/com/ruixuan/jinniu/entity/RxProject.java

@@ -14,7 +14,7 @@ import java.util.Date;
  */
 @Data
 @ApiModel(value = "rx_project", description = "项目信息对象")
-public class RxProject implements Serializable {
+public class KuaishouProject implements Serializable {
     private static final long serialVersionUID = -124355905527263391L;
     /**
      * 主键ID

+ 62 - 0
ruixuan-live/src/main/java/com/ruixuan/jinniu/mapper/KuaishouAccountMapper.java

@@ -0,0 +1,62 @@
+package com.ruixuan.jinniu.mapper;
+
+
+import com.ruixuan.jinniu.entity.KuaishouAccount;
+
+import java.util.List;
+
+/**
+ * 账户Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-03-15
+ */
+public interface KuaishouAccountMapper {
+    /**
+     * 查询账户
+     *
+     * @param id 账户主键
+     * @return 账户
+     */
+    public KuaishouAccount selectKuaishouAccountById(Long id);
+
+    /**
+     * 查询账户列表
+     *
+     * @param kuaishouAccount 账户
+     * @return 账户集合
+     */
+    public List<KuaishouAccount> selectKuaishouAccountList(KuaishouAccount kuaishouAccount);
+
+    /**
+     * 新增账户
+     *
+     * @param kuaishouAccount 账户
+     * @return 结果
+     */
+    public int insertKuaishouAccount(KuaishouAccount kuaishouAccount);
+
+    /**
+     * 修改账户
+     *
+     * @param kuaishouAccount 账户
+     * @return 结果
+     */
+    public int updateKuaishouAccount(KuaishouAccount kuaishouAccount);
+
+    /**
+     * 删除账户
+     *
+     * @param id 账户主键
+     * @return 结果
+     */
+    public int deleteKuaishouAccountById(Long id);
+
+    /**
+     * 批量删除账户
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteKuaishouAccountByIds(Long[] ids);
+}

+ 54 - 0
ruixuan-live/src/main/java/com/ruixuan/jinniu/mapper/KuaishouAdvertiserMapper.java

@@ -0,0 +1,54 @@
+package com.ruixuan.jinniu.mapper;
+
+import com.ruixuan.jinniu.entity.KuaishouAdvertiser;
+
+import java.util.List;
+
+/**
+ * 广告主Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-03-14
+ */
+public interface KuaishouAdvertiserMapper {
+    /**
+     * 查询广告主
+     *
+     * @param id 广告主主键
+     * @return 广告主
+     */
+    public KuaishouAdvertiser selectKuaishouAdvertiserById(Long id);
+
+    /**
+     * 查询广告主列表
+     *
+     * @param kuaishouAdvertiser 广告主
+     * @return 广告主集合
+     */
+    public List<KuaishouAdvertiser> selectKuaishouAdvertiserList(KuaishouAdvertiser kuaishouAdvertiser);
+
+    /**
+     * 新增广告主
+     *
+     * @param kuaishouAdvertiser 广告主
+     * @return 结果
+     */
+    public int insertKuaishouAdvertiser(KuaishouAdvertiser kuaishouAdvertiser);
+
+    /**
+     * 修改广告主
+     *
+     * @param kuaishouAdvertiser 广告主
+     * @return 结果
+     */
+    public int updateKuaishouAdvertiser(KuaishouAdvertiser kuaishouAdvertiser);
+
+    /**
+     * 删除广告主
+     *
+     * @param id 广告主主键
+     * @return 结果
+     */
+    public int deleteKuaishouAdvertiserById(Long id);
+
+}

+ 54 - 0
ruixuan-live/src/main/java/com/ruixuan/jinniu/mapper/KuaishouProjectMapper.java

@@ -0,0 +1,54 @@
+package com.ruixuan.jinniu.mapper;
+
+import com.ruixuan.jinniu.entity.KuaishouProject;
+
+import java.util.List;
+
+/**
+ * 项目信息Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-03-14
+ */
+public interface KuaishouProjectMapper {
+    /**
+     * 查询项目信息
+     *
+     * @param id 项目信息主键
+     * @return 项目信息
+     */
+    public KuaishouProject selectKuaishouProjectById(Long id);
+
+    /**
+     * 查询项目信息列表
+     *
+     * @param kuaishouProject 项目信息
+     * @return 项目信息集合
+     */
+    public List<KuaishouProject> selectKuaishouProjectList(KuaishouProject kuaishouProject);
+
+    /**
+     * 新增项目信息
+     *
+     * @param kuaishouProject 项目信息
+     * @return 结果
+     */
+    public int insertKuaishouProject(KuaishouProject kuaishouProject);
+
+    /**
+     * 修改项目信息
+     *
+     * @param kuaishouProject 项目信息
+     * @return 结果
+     */
+    public int updateKuaishouProject(KuaishouProject kuaishouProject);
+
+    /**
+     * 删除项目信息
+     *
+     * @param id 项目信息主键
+     * @return 结果
+     */
+    public int deleteKuaishouProjectById(Long id);
+
+}

+ 0 - 54
ruixuan-live/src/main/java/com/ruixuan/jinniu/mapper/RxAdvertiserMapper.java

@@ -1,54 +0,0 @@
-package com.ruixuan.jinniu.mapper;
-
-import com.ruixuan.jinniu.entity.RxAdvertiser;
-
-import java.util.List;
-
-/**
- * 广告主Mapper接口
- *
- * @author ruoyi
- * @date 2023-03-14
- */
-public interface RxAdvertiserMapper {
-    /**
-     * 查询广告主
-     *
-     * @param id 广告主主键
-     * @return 广告主
-     */
-    public RxAdvertiser selectRxAdvertiserById(Long id);
-
-    /**
-     * 查询广告主列表
-     *
-     * @param rxAdvertiser 广告主
-     * @return 广告主集合
-     */
-    public List<RxAdvertiser> selectRxAdvertiserList(RxAdvertiser rxAdvertiser);
-
-    /**
-     * 新增广告主
-     *
-     * @param rxAdvertiser 广告主
-     * @return 结果
-     */
-    public int insertRxAdvertiser(RxAdvertiser rxAdvertiser);
-
-    /**
-     * 修改广告主
-     *
-     * @param rxAdvertiser 广告主
-     * @return 结果
-     */
-    public int updateRxAdvertiser(RxAdvertiser rxAdvertiser);
-
-    /**
-     * 删除广告主
-     *
-     * @param id 广告主主键
-     * @return 结果
-     */
-    public int deleteRxAdvertiserById(Long id);
-
-}

+ 0 - 61
ruixuan-live/src/main/java/com/ruixuan/jinniu/mapper/RxProjectMapper.java

@@ -1,61 +0,0 @@
-package com.ruixuan.jinniu.mapper;
-
-import com.ruixuan.jinniu.entity.RxProject;
-
-import java.util.List;
-
-/**
- * 项目信息Mapper接口
- *
- * @author ruoyi
- * @date 2023-03-14
- */
-public interface RxProjectMapper {
-    /**
-     * 查询项目信息
-     *
-     * @param id 项目信息主键
-     * @return 项目信息
-     */
-    public RxProject selectRxProjectById(Long id);
-
-    /**
-     * 查询项目信息列表
-     *
-     * @param rxProject 项目信息
-     * @return 项目信息集合
-     */
-    public List<RxProject> selectRxProjectList(RxProject rxProject);
-
-    /**
-     * 新增项目信息
-     *
-     * @param rxProject 项目信息
-     * @return 结果
-     */
-    public int insertRxProject(RxProject rxProject);
-
-    /**
-     * 修改项目信息
-     *
-     * @param rxProject 项目信息
-     * @return 结果
-     */
-    public int updateRxProject(RxProject rxProject);
-
-    /**
-     * 删除项目信息
-     *
-     * @param id 项目信息主键
-     * @return 结果
-     */
-    public int deleteRxProjectById(Long id);
-
-    /**
-     * 批量删除项目信息
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteRxProjectByIds(Long[] ids);
-}

+ 62 - 0
ruixuan-live/src/main/java/com/ruixuan/jinniu/service/IKuaishouAccountService.java

@@ -0,0 +1,62 @@
+package com.ruixuan.jinniu.service;
+
+
+import com.ruixuan.jinniu.entity.KuaishouAccount;
+
+import java.util.List;
+
+/**
+ * 账户Service接口
+ *
+ * @author ruoyi
+ * @date 2023-03-15
+ */
+public interface IKuaishouAccountService {
+    /**
+     * 查询账户
+     *
+     * @param id 账户主键
+     * @return 账户
+     */
+    public KuaishouAccount selectKuaishouAccountById(Long id);
+
+    /**
+     * 查询账户列表
+     *
+     * @param kuaishouAccount 账户
+     * @return 账户集合
+     */
+    public List<KuaishouAccount> selectKuaishouAccountList(KuaishouAccount kuaishouAccount);
+
+    /**
+     * 新增账户
+     *
+     * @param kuaishouAccount 账户
+     * @return 结果
+     */
+    public int insertKuaishouAccount(KuaishouAccount kuaishouAccount);
+
+    /**
+     * 修改账户
+     *
+     * @param kuaishouAccount 账户
+     * @return 结果
+     */
+    public int updateKuaishouAccount(KuaishouAccount kuaishouAccount);
+
+    /**
+     * 批量删除账户
+     *
+     * @param ids 需要删除的账户主键集合
+     * @return 结果
+     */
+    public int deleteKuaishouAccountByIds(Long[] ids);
+
+    /**
+     * 删除账户信息
+     *
+     * @param id 账户主键
+     * @return 结果
+     */
+    public int deleteKuaishouAccountById(Long id);
+}

+ 53 - 0
ruixuan-live/src/main/java/com/ruixuan/jinniu/service/IKuaishouAdvertiserService.java

@@ -0,0 +1,53 @@
+package com.ruixuan.jinniu.service;
+
+import com.ruixuan.jinniu.entity.KuaishouAdvertiser;
+
+import java.util.List;
+
+/**
+ * 广告主Service接口
+ *
+ * @author ruoyi
+ * @date 2023-03-14
+ */
+public interface IKuaishouAdvertiserService {
+    /**
+     * 查询广告主
+     *
+     * @param id 广告主主键
+     * @return 广告主
+     */
+    public KuaishouAdvertiser selectKuaishouAdvertiserById(Long id);
+
+    /**
+     * 查询广告主列表
+     *
+     * @param kuaishouAdvertiser 广告主
+     * @return 广告主集合
+     */
+    public List<KuaishouAdvertiser> selectKuaishouAdvertiserList(KuaishouAdvertiser kuaishouAdvertiser);
+
+    /**
+     * 新增广告主
+     *
+     * @param kuaishouAdvertiser 广告主
+     * @return 结果
+     */
+    public int insertKuaishouAdvertiser(KuaishouAdvertiser kuaishouAdvertiser);
+
+    /**
+     * 修改广告主
+     *
+     * @param kuaishouAdvertiser 广告主
+     * @return 结果
+     */
+    public int updateKuaishouAdvertiser(KuaishouAdvertiser kuaishouAdvertiser);
+
+    /**
+     * 删除广告主信息
+     *
+     * @param id 广告主主键
+     * @return 结果
+     */
+    public int deleteKuaishouAdvertiserById(Long id);
+}

+ 53 - 0
ruixuan-live/src/main/java/com/ruixuan/jinniu/service/IKuaishouProjectService.java

@@ -0,0 +1,53 @@
+package com.ruixuan.jinniu.service;
+
+import com.ruixuan.jinniu.entity.KuaishouProject;
+
+import java.util.List;
+
+/**
+ * 项目信息Service接口
+ *
+ * @author ruoyi
+ * @date 2023-03-14
+ */
+public interface IKuaishouProjectService {
+    /**
+     * 查询项目信息
+     *
+     * @param id 项目信息主键
+     * @return 项目信息
+     */
+    public KuaishouProject selectKuaishouProjectById(Long id);
+
+    /**
+     * 查询项目信息列表
+     *
+     * @param kuaishouProject 项目信息
+     * @return 项目信息集合
+     */
+    public List<KuaishouProject> selectKuaishouProjectList(KuaishouProject kuaishouProject);
+
+    /**
+     * 新增项目信息
+     *
+     * @param kuaishouProject 项目信息
+     * @return 结果
+     */
+    public int insertKuaishouProject(KuaishouProject kuaishouProject);
+
+    /**
+     * 修改项目信息
+     *
+     * @param kuaishouProject 项目信息
+     * @return 结果
+     */
+    public int updateKuaishouProject(KuaishouProject kuaishouProject);
+
+    /**
+     * 删除项目信息信息
+     *
+     * @param id 项目信息主键
+     * @return 结果
+     */
+    public int deleteKuaishouProjectById(Long id);
+}

+ 0 - 53
ruixuan-live/src/main/java/com/ruixuan/jinniu/service/IRxAdvertiserService.java

@@ -1,53 +0,0 @@
-package com.ruixuan.jinniu.service;
-
-import com.ruixuan.jinniu.entity.RxAdvertiser;
-
-import java.util.List;
-
-/**
- * 广告主Service接口
- *
- * @author ruoyi
- * @date 2023-03-14
- */
-public interface IRxAdvertiserService {
-    /**
-     * 查询广告主
-     *
-     * @param id 广告主主键
-     * @return 广告主
-     */
-    public RxAdvertiser selectRxAdvertiserById(Long id);
-
-    /**
-     * 查询广告主列表
-     *
-     * @param rxAdvertiser 广告主
-     * @return 广告主集合
-     */
-    public List<RxAdvertiser> selectRxAdvertiserList(RxAdvertiser rxAdvertiser);
-
-    /**
-     * 新增广告主
-     *
-     * @param rxAdvertiser 广告主
-     * @return 结果
-     */
-    public int insertRxAdvertiser(RxAdvertiser rxAdvertiser);
-
-    /**
-     * 修改广告主
-     *
-     * @param rxAdvertiser 广告主
-     * @return 结果
-     */
-    public int updateRxAdvertiser(RxAdvertiser rxAdvertiser);
-
-    /**
-     * 删除广告主信息
-     *
-     * @param id 广告主主键
-     * @return 结果
-     */
-    public int deleteRxAdvertiserById(Long id);
-}

+ 0 - 61
ruixuan-live/src/main/java/com/ruixuan/jinniu/service/IRxProjectService.java

@@ -1,61 +0,0 @@
-package com.ruixuan.jinniu.service;
-
-import com.ruixuan.jinniu.entity.RxProject;
-
-import java.util.List;
-
-/**
- * 项目信息Service接口
- *
- * @author ruoyi
- * @date 2023-03-14
- */
-public interface IRxProjectService {
-    /**
-     * 查询项目信息
-     *
-     * @param id 项目信息主键
-     * @return 项目信息
-     */
-    public RxProject selectRxProjectById(Long id);
-
-    /**
-     * 查询项目信息列表
-     *
-     * @param rxProject 项目信息
-     * @return 项目信息集合
-     */
-    public List<RxProject> selectRxProjectList(RxProject rxProject);
-
-    /**
-     * 新增项目信息
-     *
-     * @param rxProject 项目信息
-     * @return 结果
-     */
-    public int insertRxProject(RxProject rxProject);
-
-    /**
-     * 修改项目信息
-     *
-     * @param rxProject 项目信息
-     * @return 结果
-     */
-    public int updateRxProject(RxProject rxProject);
-
-    /**
-     * 批量删除项目信息
-     *
-     * @param ids 需要删除的项目信息主键集合
-     * @return 结果
-     */
-    public int deleteRxProjectByIds(Long[] ids);
-
-    /**
-     * 删除项目信息信息
-     *
-     * @param id 项目信息主键
-     * @return 结果
-     */
-    public int deleteRxProjectById(Long id);
-}

+ 87 - 0
ruixuan-live/src/main/java/com/ruixuan/jinniu/service/impl/KuaishouAccountServiceImpl.java

@@ -0,0 +1,87 @@
+package com.ruixuan.jinniu.service.impl;
+
+import com.ruixuan.jinniu.entity.KuaishouAccount;
+import com.ruixuan.jinniu.mapper.KuaishouAccountMapper;
+import com.ruixuan.jinniu.service.IKuaishouAccountService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 账户Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-03-15
+ */
+@Service
+public class KuaishouAccountServiceImpl implements IKuaishouAccountService {
+    @Autowired
+    private KuaishouAccountMapper kuaishouAccountMapper;
+
+    /**
+     * 查询账户
+     *
+     * @param id 账户主键
+     * @return 账户
+     */
+    @Override
+    public KuaishouAccount selectKuaishouAccountById(Long id) {
+        return kuaishouAccountMapper.selectKuaishouAccountById(id);
+    }
+
+    /**
+     * 查询账户列表
+     *
+     * @param kuaishouAccount 账户
+     * @return 账户
+     */
+    @Override
+    public List<KuaishouAccount> selectKuaishouAccountList(KuaishouAccount kuaishouAccount) {
+        return kuaishouAccountMapper.selectKuaishouAccountList(kuaishouAccount);
+    }
+
+    /**
+     * 新增账户
+     *
+     * @param kuaishouAccount 账户
+     * @return 结果
+     */
+    @Override
+    public int insertKuaishouAccount(KuaishouAccount kuaishouAccount) {
+        return kuaishouAccountMapper.insertKuaishouAccount(kuaishouAccount);
+    }
+
+    /**
+     * 修改账户
+     *
+     * @param kuaishouAccount 账户
+     * @return 结果
+     */
+    @Override
+    public int updateKuaishouAccount(KuaishouAccount kuaishouAccount) {
+        return kuaishouAccountMapper.updateKuaishouAccount(kuaishouAccount);
+    }
+
+    /**
+     * 批量删除账户
+     *
+     * @param ids 需要删除的账户主键
+     * @return 结果
+     */
+    @Override
+    public int deleteKuaishouAccountByIds(Long[] ids) {
+        return kuaishouAccountMapper.deleteKuaishouAccountByIds(ids);
+    }
+
+    /**
+     * 删除账户信息
+     *
+     * @param id 账户主键
+     * @return 结果
+     */
+    @Override
+    public int deleteKuaishouAccountById(Long id) {
+        return kuaishouAccountMapper.deleteKuaishouAccountById(id);
+    }
+}

+ 76 - 0
ruixuan-live/src/main/java/com/ruixuan/jinniu/service/impl/KuaishouAdvertiserServiceImpl.java

@@ -0,0 +1,76 @@
+package com.ruixuan.jinniu.service.impl;
+
+import com.ruixuan.jinniu.entity.KuaishouAdvertiser;
+import com.ruixuan.jinniu.mapper.KuaishouAdvertiserMapper;
+import com.ruixuan.jinniu.service.IKuaishouAdvertiserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 广告主Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-03-14
+ */
+@Service
+public class KuaishouAdvertiserServiceImpl implements IKuaishouAdvertiserService {
+    @Autowired
+    private KuaishouAdvertiserMapper KuaishouAdvertiserMapper;
+
+    /**
+     * 查询广告主
+     *
+     * @param id 广告主主键
+     * @return 广告主
+     */
+    @Override
+    public KuaishouAdvertiser selectKuaishouAdvertiserById(Long id) {
+        return KuaishouAdvertiserMapper.selectKuaishouAdvertiserById(id);
+    }
+
+    /**
+     * 查询广告主列表
+     *
+     * @param kuaishouAdvertiser 广告主
+     * @return 广告主
+     */
+    @Override
+    public List<KuaishouAdvertiser> selectKuaishouAdvertiserList(KuaishouAdvertiser kuaishouAdvertiser) {
+        return KuaishouAdvertiserMapper.selectKuaishouAdvertiserList(kuaishouAdvertiser);
+    }
+
+    /**
+     * 新增广告主
+     *
+     * @param kuaishouAdvertiser 广告主
+     * @return 结果
+     */
+    @Override
+    public int insertKuaishouAdvertiser(KuaishouAdvertiser kuaishouAdvertiser) {
+        return KuaishouAdvertiserMapper.insertKuaishouAdvertiser(kuaishouAdvertiser);
+    }
+
+    /**
+     * 修改广告主
+     *
+     * @param kuaishouAdvertiser 广告主
+     * @return 结果
+     */
+    @Override
+    public int updateKuaishouAdvertiser(KuaishouAdvertiser kuaishouAdvertiser) {
+        return KuaishouAdvertiserMapper.updateKuaishouAdvertiser(kuaishouAdvertiser);
+    }
+
+    /**
+     * 删除广告主信息
+     *
+     * @param id 广告主主键
+     * @return 结果
+     */
+    @Override
+    public int deleteKuaishouAdvertiserById(Long id) {
+        return KuaishouAdvertiserMapper.deleteKuaishouAdvertiserById(id);
+    }
+}

+ 77 - 0
ruixuan-live/src/main/java/com/ruixuan/jinniu/service/impl/KuaishouProjectServiceImpl.java

@@ -0,0 +1,77 @@
+package com.ruixuan.jinniu.service.impl;
+
+
+import com.ruixuan.jinniu.entity.KuaishouProject;
+import com.ruixuan.jinniu.mapper.KuaishouProjectMapper;
+import com.ruixuan.jinniu.service.IKuaishouProjectService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 项目信息Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-03-14
+ */
+@Service
+public class KuaishouProjectServiceImpl implements IKuaishouProjectService {
+    @Autowired
+    private KuaishouProjectMapper KuaishouProjectMapper;
+
+    /**
+     * 查询项目信息
+     *
+     * @param id 项目信息主键
+     * @return 项目信息
+     */
+    @Override
+    public KuaishouProject selectKuaishouProjectById(Long id) {
+        return KuaishouProjectMapper.selectKuaishouProjectById(id);
+    }
+
+    /**
+     * 查询项目信息列表
+     *
+     * @param kuaishouProject 项目信息
+     * @return 项目信息
+     */
+    @Override
+    public List<KuaishouProject> selectKuaishouProjectList(KuaishouProject kuaishouProject) {
+        return KuaishouProjectMapper.selectKuaishouProjectList(kuaishouProject);
+    }
+
+    /**
+     * 新增项目信息
+     *
+     * @param kuaishouProject 项目信息
+     * @return 结果
+     */
+    @Override
+    public int insertKuaishouProject(KuaishouProject kuaishouProject) {
+        return KuaishouProjectMapper.insertKuaishouProject(kuaishouProject);
+    }
+
+    /**
+     * 修改项目信息
+     *
+     * @param kuaishouProject 项目信息
+     * @return 结果
+     */
+    @Override
+    public int updateKuaishouProject(KuaishouProject kuaishouProject) {
+        return KuaishouProjectMapper.updateKuaishouProject(kuaishouProject);
+    }
+
+    /**
+     * 删除项目信息信息
+     *
+     * @param id 项目信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteKuaishouProjectById(Long id) {
+        return KuaishouProjectMapper.deleteKuaishouProjectById(id);
+    }
+}

+ 0 - 76
ruixuan-live/src/main/java/com/ruixuan/jinniu/service/impl/RxAdvertiserServiceImpl.java

@@ -1,76 +0,0 @@
-package com.ruixuan.jinniu.service.impl;
-
-import com.ruixuan.jinniu.entity.RxAdvertiser;
-import com.ruixuan.jinniu.mapper.RxAdvertiserMapper;
-import com.ruixuan.jinniu.service.IRxAdvertiserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 广告主Service业务层处理
- *
- * @author ruoyi
- * @date 2023-03-14
- */
-@Service
-public class RxAdvertiserServiceImpl implements IRxAdvertiserService {
-    @Autowired
-    private RxAdvertiserMapper rxAdvertiserMapper;
-
-    /**
-     * 查询广告主
-     *
-     * @param id 广告主主键
-     * @return 广告主
-     */
-    @Override
-    public RxAdvertiser selectRxAdvertiserById(Long id) {
-        return rxAdvertiserMapper.selectRxAdvertiserById(id);
-    }
-
-    /**
-     * 查询广告主列表
-     *
-     * @param rxAdvertiser 广告主
-     * @return 广告主
-     */
-    @Override
-    public List<RxAdvertiser> selectRxAdvertiserList(RxAdvertiser rxAdvertiser) {
-        return rxAdvertiserMapper.selectRxAdvertiserList(rxAdvertiser);
-    }
-
-    /**
-     * 新增广告主
-     *
-     * @param rxAdvertiser 广告主
-     * @return 结果
-     */
-    @Override
-    public int insertRxAdvertiser(RxAdvertiser rxAdvertiser) {
-        return rxAdvertiserMapper.insertRxAdvertiser(rxAdvertiser);
-    }
-
-    /**
-     * 修改广告主
-     *
-     * @param rxAdvertiser 广告主
-     * @return 结果
-     */
-    @Override
-    public int updateRxAdvertiser(RxAdvertiser rxAdvertiser) {
-        return rxAdvertiserMapper.updateRxAdvertiser(rxAdvertiser);
-    }
-
-    /**
-     * 删除广告主信息
-     *
-     * @param id 广告主主键
-     * @return 结果
-     */
-    @Override
-    public int deleteRxAdvertiserById(Long id) {
-        return rxAdvertiserMapper.deleteRxAdvertiserById(id);
-    }
-}

+ 0 - 88
ruixuan-live/src/main/java/com/ruixuan/jinniu/service/impl/RxProjectServiceImpl.java

@@ -1,88 +0,0 @@
-package com.ruixuan.jinniu.service.impl;
-
-
-import com.ruixuan.jinniu.entity.RxProject;
-import com.ruixuan.jinniu.mapper.RxProjectMapper;
-import com.ruixuan.jinniu.service.IRxProjectService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 项目信息Service业务层处理
- *
- * @author ruoyi
- * @date 2023-03-14
- */
-@Service
-public class RxProjectServiceImpl implements IRxProjectService {
-    @Autowired
-    private RxProjectMapper rxProjectMapper;
-
-    /**
-     * 查询项目信息
-     *
-     * @param id 项目信息主键
-     * @return 项目信息
-     */
-    @Override
-    public RxProject selectRxProjectById(Long id) {
-        return rxProjectMapper.selectRxProjectById(id);
-    }
-
-    /**
-     * 查询项目信息列表
-     *
-     * @param rxProject 项目信息
-     * @return 项目信息
-     */
-    @Override
-    public List<RxProject> selectRxProjectList(RxProject rxProject) {
-        return rxProjectMapper.selectRxProjectList(rxProject);
-    }
-
-    /**
-     * 新增项目信息
-     *
-     * @param rxProject 项目信息
-     * @return 结果
-     */
-    @Override
-    public int insertRxProject(RxProject rxProject) {
-        return rxProjectMapper.insertRxProject(rxProject);
-    }
-
-    /**
-     * 修改项目信息
-     *
-     * @param rxProject 项目信息
-     * @return 结果
-     */
-    @Override
-    public int updateRxProject(RxProject rxProject) {
-        return rxProjectMapper.updateRxProject(rxProject);
-    }
-
-    /**
-     * 批量删除项目信息
-     *
-     * @param ids 需要删除的项目信息主键
-     * @return 结果
-     */
-    @Override
-    public int deleteRxProjectByIds(Long[] ids) {
-        return rxProjectMapper.deleteRxProjectByIds(ids);
-    }
-
-    /**
-     * 删除项目信息信息
-     *
-     * @param id 项目信息主键
-     * @return 结果
-     */
-    @Override
-    public int deleteRxProjectById(Long id) {
-        return rxProjectMapper.deleteRxProjectById(id);
-    }
-}

+ 14 - 20
ruixuan-live/src/main/resources/mapper/jinniu/RxProjectMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruixuan.jinniu.mapper.RxProjectMapper">
+<mapper namespace="com.ruixuan.jinniu.mapper.KuaishouProjectMapper">
 
-    <resultMap type="com.ruixuan.jinniu.entity.RxProject" id="RxProjectResult">
+    <resultMap type="com.ruixuan.jinniu.entity.KuaishouProject" id="KuaishouProjectResult">
         <result property="id" column="id"/>
         <result property="projectName" column="project_name"/>
         <result property="mediaCode" column="media_code"/>
@@ -22,7 +22,7 @@
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
-    <sql id="selectRxProjectVo">
+    <sql id="selectKuaishouProjectVo">
         select id,
                project_name,
                media_code,
@@ -38,11 +38,11 @@
                advertiser_id,
                create_time,
                update_time
-        from rx_project
+        from Kuaishou_project
     </sql>
 
-    <select id="selectRxProjectList" parameterType="com.ruixuan.jinniu.entity.RxProject" resultMap="RxProjectResult">
-        <include refid="selectRxProjectVo"/>
+    <select id="selectKuaishouProjectList" parameterType="com.ruixuan.jinniu.entity.KuaishouProject" resultMap="KuaishouProjectResult">
+        <include refid="selectKuaishouProjectVo"/>
         <where>
             <if test="projectName != null  and projectName != ''">and project_name like concat('%', #{projectName},
                 '%')
@@ -67,13 +67,13 @@
         </where>
     </select>
 
-    <select id="selectRxProjectById" parameterType="Long" resultMap="RxProjectResult">
-        <include refid="selectRxProjectVo"/>
+    <select id="selectKuaishouProjectById" parameterType="Long" resultMap="KuaishouProjectResult">
+        <include refid="selectKuaishouProjectVo"/>
         where id = #{id}
     </select>
 
-    <insert id="insertRxProject" parameterType="com.ruixuan.jinniu.entity.RxProject" useGeneratedKeys="true" keyProperty="id">
-        insert into rx_project
+    <insert id="insertKuaishouProject" parameterType="com.ruixuan.jinniu.entity.KuaishouProject" useGeneratedKeys="true" keyProperty="id">
+        insert into Kuaishou_project
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="projectName != null">project_name,</if>
             <if test="mediaCode != null">media_code,</if>
@@ -108,8 +108,8 @@
         </trim>
     </insert>
 
-    <update id="updateRxProject" parameterType="com.ruixuan.jinniu.entity.RxProject">
-        update rx_project
+    <update id="updateKuaishouProject" parameterType="com.ruixuan.jinniu.entity.KuaishouProject">
+        update Kuaishou_project
         <trim prefix="SET" suffixOverrides=",">
             <if test="projectName != null">project_name = #{projectName},</if>
             <if test="mediaCode != null">media_code = #{mediaCode},</if>
@@ -129,16 +129,10 @@
         where id = #{id}
     </update>
 
-    <delete id="deleteRxProjectById" parameterType="Long">
+    <delete id="deleteKuaishouProjectById" parameterType="Long">
         delete
-        from rx_project
+        from Kuaishou_project
         where id = #{id}
     </delete>
 
-    <delete id="deleteRxProjectByIds" parameterType="String">
-        delete from rx_project where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
 </mapper>

+ 14 - 20
ruixuan-live/src/main/resources/mapper/jinniu/RxAdvertiserMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruixuan.jinniu.mapper.RxAdvertiserMapper">
+<mapper namespace="com.ruixuan.jinniu.mapper.KuaishouAdvertiserMapper">
 
-    <resultMap type="com.ruixuan.jinniu.entity.RxAdvertiser" id="RxAdvertiserResult">
+    <resultMap type="com.ruixuan.jinniu.entity.KuaishouAdvertiser" id="KuaishouAdvertiserResult">
         <result property="id" column="id"/>
         <result property="advertiserName" column="advertiser_name"/>
         <result property="userId" column="user_id"/>
@@ -16,7 +16,7 @@
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
-    <sql id="selectRxAdvertiserVo">
+    <sql id="selectKuaishouAdvertiserVo">
         select id,
                advertiser_name,
                user_id,
@@ -26,11 +26,11 @@
                create_time,
                update_by,
                update_time
-        from rx_advertiser
+        from Kuaishou_advertiser
     </sql>
 
-    <select id="selectRxAdvertiserList" parameterType="com.ruixuan.jinniu.entity.RxAdvertiser" resultMap="RxAdvertiserResult">
-        <include refid="selectRxAdvertiserVo"/>
+    <select id="selectKuaishouAdvertiserList" parameterType="com.ruixuan.jinniu.entity.KuaishouAdvertiser" resultMap="KuaishouAdvertiserResult">
+        <include refid="selectKuaishouAdvertiserVo"/>
         <where>
             <if test="advertiserName != null  and advertiserName != ''">and advertiser_name like concat('%',
                 #{advertiserName}, '%')
@@ -41,13 +41,13 @@
         </where>
     </select>
 
-    <select id="selectRxAdvertiserById" parameterType="Long" resultMap="RxAdvertiserResult">
-        <include refid="selectRxAdvertiserVo"/>
+    <select id="selectKuaishouAdvertiserById" parameterType="Long" resultMap="KuaishouAdvertiserResult">
+        <include refid="selectKuaishouAdvertiserVo"/>
         where id = #{id}
     </select>
 
-    <insert id="insertRxAdvertiser" parameterType="com.ruixuan.jinniu.entity.RxAdvertiser">
-        insert into rx_advertiser
+    <insert id="insertKuaishouAdvertiser" parameterType="com.ruixuan.jinniu.entity.KuaishouAdvertiser">
+        insert into Kuaishou_advertiser
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="advertiserName != null and advertiserName != ''">advertiser_name,</if>
@@ -72,8 +72,8 @@
         </trim>
     </insert>
 
-    <update id="updateRxAdvertiser" parameterType="com.ruixuan.jinniu.entity.RxAdvertiser">
-        update rx_advertiser
+    <update id="updateKuaishouAdvertiser" parameterType="com.ruixuan.jinniu.entity.KuaishouAdvertiser">
+        update Kuaishou_advertiser
         <trim prefix="SET" suffixOverrides=",">
             <if test="advertiserName != null and advertiserName != ''">advertiser_name = #{advertiserName},</if>
             <if test="userId != null">user_id = #{userId},</if>
@@ -87,16 +87,10 @@
         where id = #{id}
     </update>
 
-    <delete id="deleteRxAdvertiserById" parameterType="Long">
+    <delete id="deleteKuaishouAdvertiserById" parameterType="Long">
         delete
-        from rx_advertiser
+        from Kuaishou_advertiser
         where id = #{id}
     </delete>
 
-    <delete id="deleteRxAdvertiserByIds" parameterType="String">
-        delete from rx_advertiser where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
 </mapper>

+ 158 - 0
ruixuan-live/src/main/resources/mapper/jinniu/KuaishouProjectMapper.xml

@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruixuan.jinniu.mapper.KuaishouAccountMapper">
+
+    <resultMap type="com.ruixuan.jinniu.entity.KuaishouAccount" id="KuaishouAccountResult">
+        <result property="id" column="id"/>
+        <result property="accountId" column="account_id"/>
+        <result property="accountName" column="account_name"/>
+        <result property="projectId" column="project_id"/>
+        <result property="projectName" column="project_name"/>
+        <result property="mediaCode" column="media_code"/>
+        <result property="ksId" column="ks_id"/>
+        <result property="ksName" column="ks_name"/>
+        <result property="operatorId" column="operator_id"/>
+        <result property="operatorLeader" column="operator_leader"/>
+        <result property="productName" column="product_name"/>
+        <result property="industry" column="industry"/>
+        <result property="secondIndustry" column="second_industry"/>
+        <result property="corporationName" column="corporation_name"/>
+        <result property="accountStatus" column="account_status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <sql id="selectKuaishouAccountVo">
+        select id,
+               account_id,
+               account_name,
+               project_id,
+               project_name,
+               media_code,
+               ks_id,
+               ks_name,
+               operator_id,
+               operator_leader,
+               product_name,
+               industry,
+               second_industry,
+               corporation_name,
+               account_status,
+               create_time,
+               update_time
+        from kuaishou_account
+    </sql>
+
+    <select id="selectKuaishouAccountList" parameterType="com.ruixuan.jinniu.entity.KuaishouAccount"
+            resultMap="KuaishouAccountResult">
+        <include refid="selectKuaishouAccountVo"/>
+        <where>
+            <if test="accountId != null ">and account_id = #{accountId}</if>
+            <if test="accountName != null  and accountName != ''">and account_name like concat('%', #{accountName},
+                '%')
+            </if>
+            <if test="projectId != null ">and project_id = #{projectId}</if>
+            <if test="projectName != null  and projectName != ''">and project_name like concat('%', #{projectName},
+                '%')
+            </if>
+            <if test="mediaCode != null  and mediaCode != ''">and media_code = #{mediaCode}</if>
+            <if test="ksId != null ">and ks_id = #{ksId}</if>
+            <if test="ksName != null  and ksName != ''">and ks_name like concat('%', #{ksName}, '%')</if>
+            <if test="operatorId != null  and operatorId != ''">and operator_id = #{operatorId}</if>
+            <if test="operatorLeader != null  and operatorLeader != ''">and operator_leader = #{operatorLeader}</if>
+            <if test="productName != null  and productName != ''">and product_name like concat('%', #{productName},
+                '%')
+            </if>
+            <if test="industry != null  and industry != ''">and industry = #{industry}</if>
+            <if test="secondIndustry != null  and secondIndustry != ''">and second_industry = #{secondIndustry}</if>
+            <if test="corporationName != null  and corporationName != ''">and corporation_name like concat('%',
+                #{corporationName}, '%')
+            </if>
+            <if test="accountStatus != null  and accountStatus != ''">and account_status = #{accountStatus}</if>
+        </where>
+    </select>
+
+    <select id="selectKuaishouAccountById" parameterType="Long" resultMap="KuaishouAccountResult">
+        <include refid="selectKuaishouAccountVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertKuaishouAccount" parameterType="com.ruixuan.jinniu.entity.KuaishouAccount" useGeneratedKeys="true"
+            keyProperty="id">
+        insert into kuaishou_account
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="accountId != null">account_id,</if>
+            <if test="accountName != null">account_name,</if>
+            <if test="projectId != null">project_id,</if>
+            <if test="projectName != null">project_name,</if>
+            <if test="mediaCode != null">media_code,</if>
+            <if test="ksId != null">ks_id,</if>
+            <if test="ksName != null">ks_name,</if>
+            <if test="operatorId != null">operator_id,</if>
+            <if test="operatorLeader != null">operator_leader,</if>
+            <if test="productName != null">product_name,</if>
+            <if test="industry != null">industry,</if>
+            <if test="secondIndustry != null">second_industry,</if>
+            <if test="corporationName != null">corporation_name,</if>
+            <if test="accountStatus != null">account_status,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="accountId != null">#{accountId},</if>
+            <if test="accountName != null">#{accountName},</if>
+            <if test="projectId != null">#{projectId},</if>
+            <if test="projectName != null">#{projectName},</if>
+            <if test="mediaCode != null">#{mediaCode},</if>
+            <if test="ksId != null">#{ksId},</if>
+            <if test="ksName != null">#{ksName},</if>
+            <if test="operatorId != null">#{operatorId},</if>
+            <if test="operatorLeader != null">#{operatorLeader},</if>
+            <if test="productName != null">#{productName},</if>
+            <if test="industry != null">#{industry},</if>
+            <if test="secondIndustry != null">#{secondIndustry},</if>
+            <if test="corporationName != null">#{corporationName},</if>
+            <if test="accountStatus != null">#{accountStatus},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateKuaishouAccount" parameterType="com.ruixuan.jinniu.entity.KuaishouAccount">
+        update kuaishou_account
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="accountId != null">account_id = #{accountId},</if>
+            <if test="accountName != null">account_name = #{accountName},</if>
+            <if test="projectId != null">project_id = #{projectId},</if>
+            <if test="projectName != null">project_name = #{projectName},</if>
+            <if test="mediaCode != null">media_code = #{mediaCode},</if>
+            <if test="ksId != null">ks_id = #{ksId},</if>
+            <if test="ksName != null">ks_name = #{ksName},</if>
+            <if test="operatorId != null">operator_id = #{operatorId},</if>
+            <if test="operatorLeader != null">operator_leader = #{operatorLeader},</if>
+            <if test="productName != null">product_name = #{productName},</if>
+            <if test="industry != null">industry = #{industry},</if>
+            <if test="secondIndustry != null">second_industry = #{secondIndustry},</if>
+            <if test="corporationName != null">corporation_name = #{corporationName},</if>
+            <if test="accountStatus != null">account_status = #{accountStatus},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteKuaishouAccountById" parameterType="Long">
+        delete
+        from kuaishou_account
+        where id = #{id}
+    </delete>
+
+    <delete id="deleteKuaishouAccountByIds" parameterType="String">
+        delete from kuaishou_account where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>