Explorar o código

直播数据报表 导入功能——条件查询

zhaoxian %!s(int64=3) %!d(string=hai) anos
pai
achega
ff62fe8c55

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

@@ -51,7 +51,7 @@ public class LiveDataAccountsController {
                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                          HttpServletRequest req) {
         Result<IPage<LiveDataAccounts>> result = new Result<>();
-        QueryWrapper<LiveDataAccounts> queryWrapper = QueryGenerator.initQueryWrapper(liveDataAccounts, req.getParameterMap());
+        QueryWrapper<LiveDataAccounts> queryWrapper = QueryGenerator.initQueryWrapper(new LiveDataAccounts(), req.getParameterMap());
         Page<LiveDataAccounts> page = new Page<LiveDataAccounts>(pageNo, pageSize);
         if (!Check.isNull(liveDataAccounts.getLiveAccountId())) {
             queryWrapper.like("live_account_id", liveDataAccounts.getLiveAccountId());
@@ -155,6 +155,9 @@ public class LiveDataAccountsController {
     @GetMapping(value = "/delete")
     public Result<?> delete(@RequestParam(name = "liveAccountId") String liveAccountId, String userId) {
         try {
+            if (Check.isNull(userId) || Check.isNull(liveAccountId)) {
+                return Result.ok("缺少数据");
+            }
             LiveDataAccounts accounts = liveDataAccountsService.getById(liveAccountId);
             if (!Check.isNull(accounts)) {
                 accounts.setState("0");

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/live/controller/LiveDataAdController.java

@@ -50,7 +50,7 @@ public class LiveDataAdController {
                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                    HttpServletRequest req) {
         Result<IPage<LiveDataAd>> result = new Result<>();
-        QueryWrapper<LiveDataAd> queryWrapper = QueryGenerator.initQueryWrapper(liveDataAd, req.getParameterMap());
+        QueryWrapper<LiveDataAd> queryWrapper = QueryGenerator.initQueryWrapper(new LiveDataAd(), req.getParameterMap());
         Page<LiveDataAd> page = new Page<LiveDataAd>(pageNo, pageSize);
         if (!Check.isNull(liveDataAd.getAccountId())) {
             queryWrapper.eq("account_id", liveDataAd.getAccountId());

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/live/controller/LiveDataAgeController.java

@@ -71,7 +71,7 @@ public class LiveDataAgeController {
                                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                     HttpServletRequest req) {
         Result<IPage<LiveDataAge>> result = new Result<>();
-        QueryWrapper<LiveDataAge> queryWrapper = QueryGenerator.initQueryWrapper(liveDataAge, req.getParameterMap());
+        QueryWrapper<LiveDataAge> queryWrapper = QueryGenerator.initQueryWrapper(new LiveDataAge(), req.getParameterMap());
         Page<LiveDataAge> page = new Page<LiveDataAge>(pageNo, pageSize);
         if (!Check.isNull(liveDataAge.getAccountId())) {
             queryWrapper.eq("account_id", liveDataAge.getAccountId());

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/live/controller/LiveDataGenderController.java

@@ -52,7 +52,7 @@ public class LiveDataGenderController {
                                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                        HttpServletRequest req) {
         Result<IPage<LiveDataGender>> result = new Result<>();
-        QueryWrapper<LiveDataGender> queryWrapper = QueryGenerator.initQueryWrapper(liveDataGender, req.getParameterMap());
+        QueryWrapper<LiveDataGender> queryWrapper = QueryGenerator.initQueryWrapper(new LiveDataGender(), req.getParameterMap());
         Page<LiveDataGender> page = new Page<LiveDataGender>(pageNo, pageSize);
         if (!Check.isNull(liveDataGender.getAccountId())) {
             queryWrapper.eq("account_id", liveDataGender.getAccountId());

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/live/controller/LiveDataImportRecordController.java

@@ -40,7 +40,7 @@ public class LiveDataImportRecordController {
                                                              @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                              HttpServletRequest req) {
         Result<IPage<LiveDataImportRecord>> result = new Result<>();
-        QueryWrapper<LiveDataImportRecord> queryWrapper = QueryGenerator.initQueryWrapper(liveDataImportRecord, req.getParameterMap());
+        QueryWrapper<LiveDataImportRecord> queryWrapper = QueryGenerator.initQueryWrapper(new LiveDataImportRecord(), req.getParameterMap());
         Page<LiveDataImportRecord> page = new Page<LiveDataImportRecord>(pageNo, pageSize);
         if (!Check.isNull(liveDataImportRecord.getAccountId())) {
                 queryWrapper.eq("account_id", liveDataImportRecord.getAccountId());

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/live/controller/LiveDataMaterialController.java

@@ -51,7 +51,7 @@ public class LiveDataMaterialController {
                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                          HttpServletRequest req) {
         Result<IPage<LiveDataMaterial>> result = new Result<>();
-        QueryWrapper<LiveDataMaterial> queryWrapper = QueryGenerator.initQueryWrapper(liveDataMaterial, req.getParameterMap());
+        QueryWrapper<LiveDataMaterial> queryWrapper = QueryGenerator.initQueryWrapper(new LiveDataMaterial(), req.getParameterMap());
         if (!Check.isNull(liveDataMaterial.getAccountId())) {
             queryWrapper.eq("account_id", liveDataMaterial.getAccountId());
         }

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/live/controller/LiveDataPriceController.java

@@ -52,7 +52,7 @@ public class LiveDataPriceController {
                                                       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                       HttpServletRequest req) {
         Result<IPage<LiveDataPrice>> result = new Result<>();
-        QueryWrapper<LiveDataPrice> queryWrapper = QueryGenerator.initQueryWrapper(liveDataPrice, req.getParameterMap());
+        QueryWrapper<LiveDataPrice> queryWrapper = QueryGenerator.initQueryWrapper(new LiveDataPrice(), req.getParameterMap());
         Page<LiveDataPrice> page = new Page<LiveDataPrice>(pageNo, pageSize);
         if (!Check.isNull(liveDataPrice.getAccountId())) {
             queryWrapper.eq("account_id", liveDataPrice.getAccountId());

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/live/controller/LiveDataProvinceController.java

@@ -52,7 +52,7 @@ public class LiveDataProvinceController {
                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                          HttpServletRequest req) {
         Result<IPage<LiveDataProvince>> result = new Result<>();
-        QueryWrapper<LiveDataProvince> queryWrapper = QueryGenerator.initQueryWrapper(liveDataProvince, req.getParameterMap());
+        QueryWrapper<LiveDataProvince> queryWrapper = QueryGenerator.initQueryWrapper(new LiveDataProvince(), req.getParameterMap());
         if (!Check.isNull(liveDataProvince.getAccountId())) {
             queryWrapper.eq("account_id", liveDataProvince.getAccountId());
         }

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/live/controller/LiveDataTouchController.java

@@ -64,7 +64,7 @@ public class LiveDataTouchController {
                                                       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                       HttpServletRequest req) {
         Result<IPage<LiveDataTouch>> result = new Result<>();
-        QueryWrapper<LiveDataTouch> queryWrapper = QueryGenerator.initQueryWrapper(liveDataTouch, req.getParameterMap());
+        QueryWrapper<LiveDataTouch> queryWrapper = QueryGenerator.initQueryWrapper(new LiveDataTouch(), req.getParameterMap());
         Page<LiveDataTouch> page = new Page<LiveDataTouch>(pageNo, pageSize);
         if (!Check.isNull(liveDataTouch.getAccountId())) {
             queryWrapper.eq("account_id", liveDataTouch.getAccountId());