Procházet zdrojové kódy

直播数据报表 导入功能——添加查询账户类型接口

zhaoxian před 3 roky
rodič
revize
e9d0848069

+ 16 - 3
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/live/controller/LiveDataAccountsController.java

@@ -4,6 +4,7 @@ import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.kuaishou.modules.live.entity.LiveDataAccounts;
 import cn.com.ctop.kuaishou.modules.live.service.ILiveDataAccountsService;
 import cn.com.ctop.kuaishou.modules.live.service.ILiveDataImportRecordService;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -22,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
  * 直播数据——操作记录表
@@ -63,9 +65,6 @@ public class LiveDataAccountsController {
         if (!Check.isNull(liveDataAccounts.getProductName())) {
             queryWrapper.like("product_name", liveDataAccounts.getProductName());
         }
-        if (!Check.isNull(liveDataAccounts.getProductId())) {
-            queryWrapper.like("product_id", liveDataAccounts.getProductId());
-        }
         if (Check.isNull(liveDataAccounts.getState())) {
             queryWrapper.eq("state", 1);
         } else {
@@ -79,6 +78,20 @@ public class LiveDataAccountsController {
     }
 
     /**
+     * 分页列表查询
+     */
+    @GetMapping(value = "/typeList")
+    public Result<Object> typeList() {
+        try {
+            List<JSONObject> list = liveDataAccountsService.typeList();
+            return Result.ok(list);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return Result.ok("查询异常");
+    }
+
+    /**
      * 添加直播账户
      */
     @PostMapping(value = "/add")

+ 0 - 6
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/live/entity/LiveDataAccounts.java

@@ -59,12 +59,6 @@ public class LiveDataAccounts {
     @ApiModelProperty(value = "日期")
     private String statDate;
     /**
-     * 产品id
-     */
-    @Excel(name = "产品id", width = 15)
-    @ApiModelProperty(value = "产品id")
-    private Long productId;
-    /**
      * 产品名
      */
     @Excel(name = "产品名", width = 15)

+ 5 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/live/mapper/LiveDataAccountsMapper.java

@@ -1,9 +1,12 @@
 package cn.com.ctop.kuaishou.modules.live.mapper;
 
 import cn.com.ctop.kuaishou.modules.live.entity.LiveDataAccounts;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 直播数据——操作记录表
  *
@@ -26,4 +29,6 @@ public interface LiveDataAccountsMapper extends BaseMapper<LiveDataAccounts> {
     void updateProvinceState(@Param("accountId") String accountId);
 
     void updateTouchState(@Param("accountId") String accountId);
+
+    List<JSONObject> getTypeList();
 }

+ 3 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/live/mapper/xml/LiveDataAccountsMapper.xml

@@ -44,4 +44,7 @@
         WHERE account_id = #{accountId}
     </update>
 
+    <select id="getTypeList" resultType="com.alibaba.fastjson.JSONObject">
+        select type_code as 'code',type_name as 'name' from ctop_live_data_accounts_type where state = 1
+    </select>
 </mapper>

+ 5 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/live/service/ILiveDataAccountsService.java

@@ -1,8 +1,11 @@
 package cn.com.ctop.kuaishou.modules.live.service;
 
 import cn.com.ctop.kuaishou.modules.live.entity.LiveDataAccounts;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * 直播数据——操作记录表
  *
@@ -13,4 +16,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface ILiveDataAccountsService extends IService<LiveDataAccounts> {
 
     void updateOtherReport(String liveAccountId);
+
+    List<JSONObject> typeList();
 }

+ 8 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/live/service/impl/LiveDataAccountsServiceImpl.java

@@ -3,9 +3,12 @@ package cn.com.ctop.kuaishou.modules.live.service.impl;
 import cn.com.ctop.kuaishou.modules.live.entity.LiveDataAccounts;
 import cn.com.ctop.kuaishou.modules.live.mapper.LiveDataAccountsMapper;
 import cn.com.ctop.kuaishou.modules.live.service.ILiveDataAccountsService;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 直播数据——操作记录表
  *
@@ -26,4 +29,9 @@ public class LiveDataAccountsServiceImpl extends ServiceImpl<LiveDataAccountsMap
         baseMapper.updateProvinceState(accountId);
         baseMapper.updateTouchState(accountId);
     }
+
+    @Override
+    public List<JSONObject> typeList() {
+        return baseMapper.getTypeList();
+    }
 }

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/live/service/impl/LiveDataTouchServiceImpl.java

@@ -95,7 +95,7 @@ public class LiveDataTouchServiceImpl extends ServiceImpl<LiveDataTouchMapper, L
         if (!Check.isNull(array)) {
             baseMapper.replaceBatch(array);
         }
-        //记录枚举中不存在不匹配的字段
+        //记录枚举中不存在不匹配的字段
         String sign = titleObj.getString("sign");
         if (!Check.isNull(sign)) {
             return Result.ok("数据导入成功, 其中(" + sign.substring(0, sign.length() - 1) + ")字段暂时不支持导入,如需要添加请联系研发人员");