syh преди 4 години
родител
ревизия
b8a1a54c58
променени са 15 файла, в които са добавени 27 реда и са изтрити 17 реда
  1. 1 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ads/controller/JeecgController.java
  2. 1 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/industry/controller/IndustryController.java
  3. 1 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/media/controller/MediaController.java
  4. 1 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/opencv/controller/ModelVideoCompositeInfoController.java
  5. 1 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/opencv/controller/ModelVideoInfoConfigController.java
  6. 1 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/opencv/controller/ModelVideoInfoController.java
  7. 1 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/opencv/controller/ModelVideoInfoTagController.java
  8. 4 8
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/oss/controller/OSSFileController.java
  9. 4 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java
  10. 3 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java
  11. 1 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysCheckRuleController.java
  12. 1 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDataLogController.java
  13. 2 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDataSourceController.java
  14. 1 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
  15. 4 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ads/controller/JeecgController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ads.controller;
 
+import cn.com.ctop.common.module.utils.QueryGenerator;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import lombok.extern.slf4j.Slf4j;

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/industry/controller/IndustryController.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.industry.controller;
 
 import cn.com.ctop.common.module.annotation.AutoLog;
+import cn.com.ctop.common.module.utils.QueryGenerator;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.Api;

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/media/controller/MediaController.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.media.controller;
 
 import cn.com.ctop.common.module.annotation.AutoLog;
+import cn.com.ctop.common.module.utils.QueryGenerator;
 import cn.com.ctop.common.module.utils.StringUtils;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/opencv/controller/ModelVideoCompositeInfoController.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.opencv.controller;
 
 import cn.com.ctop.common.module.annotation.AutoLog;
+import cn.com.ctop.common.module.utils.QueryGenerator;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/opencv/controller/ModelVideoInfoConfigController.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.opencv.controller;
 
 import cn.com.ctop.common.module.annotation.AutoLog;
+import cn.com.ctop.common.module.utils.QueryGenerator;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/opencv/controller/ModelVideoInfoController.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.opencv.controller;
 
 import cn.com.ctop.common.module.annotation.AutoLog;
+import cn.com.ctop.common.module.utils.QueryGenerator;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/opencv/controller/ModelVideoInfoTagController.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.opencv.controller;
 
 import cn.com.ctop.common.module.annotation.AutoLog;
+import cn.com.ctop.common.module.utils.QueryGenerator;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

+ 4 - 8
jeecg-boot-module-system/src/main/java/org/jeecg/modules/oss/controller/OSSFileController.java

@@ -1,7 +1,6 @@
 package org.jeecg.modules.oss.controller;
 
-import javax.servlet.http.HttpServletRequest;
-
+import cn.com.ctop.common.module.utils.QueryGenerator;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -11,14 +10,11 @@ import org.jeecg.modules.oss.entity.OSSFile;
 import org.jeecg.modules.oss.service.IOSSFileService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
+
 @Slf4j
 @Controller
 @RequestMapping("/oss/file")

+ 4 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java

@@ -1,5 +1,9 @@
 package org.jeecg.modules.system.controller;
 
+import cn.com.ctop.common.module.entity.SysAnnouncement;
+import cn.com.ctop.common.module.entity.SysAnnouncementSend;
+import cn.com.ctop.common.module.message.websocket.WebSocket;
+import cn.com.ctop.common.module.utils.QueryGenerator;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -15,9 +19,6 @@ import org.jeecg.common.constant.WebsocketConst;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
-import cn.com.ctop.common.module.message.websocket.WebSocket;
-import cn.com.ctop.common.module.entity.SysAnnouncement;
-import cn.com.ctop.common.module.entity.SysAnnouncementSend;
 import org.jeecg.modules.system.service.ISysAnnouncementSendService;
 import org.jeecg.modules.system.service.ISysAnnouncementService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;

+ 3 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java

@@ -1,5 +1,8 @@
 package org.jeecg.modules.system.controller;
 
+import cn.com.ctop.common.module.entity.SysCategory;
+import cn.com.ctop.common.module.model.TreeSelectModel;
+import cn.com.ctop.common.module.utils.QueryGenerator;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -11,8 +14,6 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
-import cn.com.ctop.common.module.entity.SysCategory;
-import cn.com.ctop.common.module.model.TreeSelectModel;
 import org.jeecg.modules.system.service.ISysCategoryService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysCheckRuleController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.system.controller;
 
+import cn.com.ctop.common.module.utils.QueryGenerator;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDataLogController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.system.controller;
 
+import cn.com.ctop.common.module.utils.QueryGenerator;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

+ 2 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDataSourceController.java

@@ -1,7 +1,9 @@
 package org.jeecg.modules.system.controller;
 
+import cn.com.ctop.common.module.db.DataSourceCachePool;
 import cn.com.ctop.common.module.entity.SysDataSource;
 import cn.com.ctop.common.module.service.ISysDataSourceService;
+import cn.com.ctop.common.module.utils.QueryGenerator;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -12,7 +14,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.ads.controller.JeecgController;
-import cn.com.ctop.common.module.db.DataSourceCachePool;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java

@@ -6,6 +6,7 @@ import cn.com.ctop.common.module.model.SysDepartTreeModel;
 import cn.com.ctop.common.module.service.ISysDepartService;
 import cn.com.ctop.common.module.service.ISysUserDepartService;
 import cn.com.ctop.common.module.service.ISysUserService;
+import cn.com.ctop.common.module.utils.QueryGenerator;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;

+ 4 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java

@@ -1,7 +1,10 @@
 package org.jeecg.modules.system.controller;
 
+import cn.com.ctop.common.module.entity.SysDepartPermission;
+import cn.com.ctop.common.module.entity.SysDepartRolePermission;
 import cn.com.ctop.common.module.entity.SysPermission;
 import cn.com.ctop.common.module.model.TreeModel;
+import cn.com.ctop.common.module.utils.QueryGenerator;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -12,10 +15,8 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.modules.ads.controller.JeecgController;
 import org.jeecg.common.util.oConvertUtils;
-import cn.com.ctop.common.module.entity.SysDepartPermission;
-import cn.com.ctop.common.module.entity.SysDepartRolePermission;
+import org.jeecg.modules.ads.controller.JeecgController;
 import org.jeecg.modules.system.entity.SysPermissionDataRule;
 import org.jeecg.modules.system.service.ISysDepartPermissionService;
 import org.jeecg.modules.system.service.ISysDepartRolePermissionService;