Browse Source

代码合并

syh 4 năm trước cách đây
mục cha
commit
a12979d78c
100 tập tin đã thay đổi với 1376 bổ sung3834 xóa
  1. 1 1
      jeecg-boot-base-common/pom.xml
  2. 0 43
      jeecg-boot-base-common/src/main/java/org/jeecg/common/aspect/annotation/AutoLog.java
  3. 0 46
      jeecg-boot-base-common/src/main/java/org/jeecg/common/aspect/annotation/Dict.java
  4. 0 29
      jeecg-boot-base-common/src/main/java/org/jeecg/common/aspect/annotation/PermissionData.java
  5. 11 12
      jeecg-boot-base-common/src/main/java/org/jeecg/common/system/api/ISysBaseApi.java
  6. 2 3
      jeecg-boot-base-common/src/main/java/org/jeecg/common/system/controller/CommonController.java
  7. 44 51
      jeecg-boot-base-common/src/main/java/org/jeecg/common/system/query/QueryGenerator.java
  8. 4 1
      jeecg-boot-base-common/src/main/java/org/jeecg/common/util/DateUtils.java
  9. 2 2
      jeecg-boot-base-common/src/main/java/org/jeecg/common/util/TokenUtils.java
  10. 3 3
      jeecg-boot-base-common/src/main/java/org/jeecg/common/util/dynamic/db/DataSourceCachePool.java
  11. 0 147
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysAnnouncement.java
  12. 0 49
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysAnnouncementSend.java
  13. 0 58
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysCategory.java
  14. 0 88
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysCheckRule.java
  15. 0 34
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysDataLog.java
  16. 0 120
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysDataSource.java
  17. 0 135
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysDepart.java
  18. 0 50
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysDepartPermission.java
  19. 0 74
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysDepartRole.java
  20. 0 54
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysDepartRolePermission.java
  21. 0 47
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysDepartRoleUser.java
  22. 0 84
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysDict.java
  23. 0 80
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysDictItem.java
  24. 0 86
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysFillRule.java
  25. 0 112
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysLog.java
  26. 0 182
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysPermission.java
  27. 0 78
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysPermissionDataRule.java
  28. 0 90
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysPosition.java
  29. 0 79
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysRole.java
  30. 0 55
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysRolePermission.java
  31. 0 75
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysUserAgent.java
  32. 0 33
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysUserDepart.java
  33. 0 49
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysUserRole.java
  34. 0 65
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/UserCompany.java
  35. 0 52
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/model/AnnouncementSendModel.java
  36. 0 64
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/model/DepartIdModel.java
  37. 0 45
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/model/DuplicateCheckVo.java
  38. 0 371
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java
  39. 0 45
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/model/SysDictPage.java
  40. 0 94
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/model/SysDictTree.java
  41. 0 28
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/model/SysLoginModel.java
  42. 0 395
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/model/SysPermissionTree.java
  43. 0 34
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/model/SysUserDepartsVO.java
  44. 0 176
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/model/TreeModel.java
  45. 0 93
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/model/TreeSelectModel.java
  46. 0 28
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/vo/SysDepartUsersVO.java
  47. 0 41
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/vo/SysDictPage.java
  48. 0 27
      jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/vo/SysUserRoleVO.java
  49. 17 8
      jeecg-boot-module-activiti/pom.xml
  50. 2 7
      jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/service/Impl/ActZprocessServiceImpl.java
  51. 2 2
      jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/web/ActBusinessController.java
  52. 2 2
      jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/web/ActProcessInsController.java
  53. 2 2
      jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/web/ActTaskController.java
  54. 21 2
      jeecg-boot-module-system/pom.xml
  55. 3 2
      jeecg-boot-module-system/src/main/java/org/jeecg/JeecgOneGui.java
  56. 0 3
      jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java
  57. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/config/WebMvcConfiguration.java
  58. 0 1
      jeecg-boot-module-system/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java
  59. 6 13
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/append/xd_schedule/controller/XdScheduleController.java
  60. 11 14
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/cas/controller/CasClientController.java
  61. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AdvertiserController.java
  62. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AgentInfoController.java
  63. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BindAccountAuthController.java
  64. 16 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BindAccountLoginController.java
  65. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceTemplateController.java
  66. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CallbackController.java
  67. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CorpFeishuUserController.java
  68. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CtopOauthTokenController.java
  69. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/DramaInfoController.java
  70. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/DramaItemInfoController.java
  71. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/DramaRoleInfoController.java
  72. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/FileInfoController.java
  73. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaiShouDefectMaterialController.java
  74. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouAdvertiserController.java
  75. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouAgentAccountController.java
  76. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouAppAccountController.java
  77. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouAppProductController.java
  78. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouChannelRegInfoController.java
  79. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouEffectAdInfoController.java
  80. 157 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouEffectVideoInfoController.java
  81. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouHotPhotoInfoController.java
  82. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouInspiredAdController.java
  83. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialAscriptionController.java
  84. 1 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialCutFrameController.java
  85. 5 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialImageInfoController.java
  86. 200 76
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialInfoController.java
  87. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialParameterController.java
  88. 8 8
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialPartController.java
  89. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialTagController.java
  90. 32 10
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java
  91. 1 26
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectMemberController.java
  92. 210 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectTransferRecordController.java
  93. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ReleaseRecordController.java
  94. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ReleaseViewRecordController.java
  95. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/SalePerformanceDetailController.java
  96. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ScriptTagInfoController.java
  97. 248 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/SupplierListController.java
  98. 248 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/SupplierWatermarkController.java
  99. 86 9
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TestController.java
  100. 0 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TransferAccountController.java

+ 1 - 1
jeecg-boot-base-common/pom.xml

@@ -29,4 +29,4 @@
         </repository>
         </repository>
     </repositories>
     </repositories>
 
 
-</project>
+</project>

+ 0 - 43
jeecg-boot-base-common/src/main/java/org/jeecg/common/aspect/annotation/AutoLog.java

@@ -1,43 +0,0 @@
-package org.jeecg.common.aspect.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.jeecg.common.constant.CommonConstant;
-
-/**
- * 系统日志注解
- * 
- * @Author scott
- * @email jeecgos@163.com
- * @Date 2019年1月14日
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface AutoLog {
-
-	/**
-	 * 日志内容
-	 * 
-	 * @return
-	 */
-	String value() default "";
-
-	/**
-	 * 日志类型
-	 * 
-	 * @return 0:操作日志;1:登录日志;2:定时任务;
-	 */
-	int logType() default CommonConstant.LOG_TYPE_2;
-
-	/**
-	 * 操作日志类型
-	 *
-	 * @return (1查询,2添加,3修改,4删除)
-	 */
-	int operateType() default 0;
-}

+ 0 - 46
jeecg-boot-base-common/src/main/java/org/jeecg/common/aspect/annotation/Dict.java

@@ -1,46 +0,0 @@
-package org.jeecg.common.aspect.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- *  类描述:  字典注解
- * 作    者: dangzhenghui
- * 日    期: 2019年03月17日-下午9:37:16
- */
-@Target(ElementType.FIELD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Dict {
-    /**
-     * 方法描述:  数据code
-     * 作    者: dangzhenghui
-     * 日    期: 2019年03月17日-下午9:37:16
-     *
-     * @return 返回类型: String
-     */
-    String dicCode();
-
-    /**
-     * 方法描述:  数据Text
-     * 作    者: dangzhenghui
-     * 日    期: 2019年03月17日-下午9:37:16
-     *
-     * @return 返回类型: String
-     */
-    String dicText() default "";
-
-    /**
-     * 方法描述: 数据字典表
-     * 作    者: dangzhenghui
-     * 日    期: 2019年03月17日-下午9:37:16
-     *
-     * @return 返回类型: String
-     */
-    String dictTable() default "";
-
-    String extendsKey() default "";
-
-    String extendsValue() default "";
-}

+ 0 - 29
jeecg-boot-base-common/src/main/java/org/jeecg/common/aspect/annotation/PermissionData.java

@@ -1,29 +0,0 @@
-package org.jeecg.common.aspect.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
-  *  数据权限注解
- * @Author taoyan
- * @Date 2019年4月11日
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE,ElementType.METHOD})
-@Documented
-public @interface PermissionData {
-	/**
-	 * 暂时没用
-	 * @return
-	 */
-	String value() default "";
-	
-	
-	/**
-	 * 配置菜单的组件路径,用于数据权限
-	 */
-	String pageComponent() default "";
-}

+ 11 - 12
jeecg-boot-base-common/src/main/java/org/jeecg/common/system/api/ISysBaseApi.java

@@ -1,23 +1,22 @@
 package org.jeecg.common.system.api;
 package org.jeecg.common.system.api;
 
 
-import java.sql.SQLException;
-import java.util.List;
-import java.util.Map;
-
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import org.jeecg.common.system.vo.*;
 import org.jeecg.common.system.vo.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartFile;
 
 
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Map;
 
 
 /**
 /**
  * @Description: 底层共通业务API,提供其他独立模块调用
  * @Description: 底层共通业务API,提供其他独立模块调用
  * @Author: scott
  * @Author: scott
- * @Date:2019-4-20 
+ * @Date:2019-4-20
  * @Version:V1.0
  * @Version:V1.0
  */
  */
-public interface ISysBaseAPI {
+public interface ISysBaseApi {
 
 
 	/**
 	/**
 	 * 日志添加
 	 * 日志添加
@@ -26,21 +25,21 @@ public interface ISysBaseAPI {
 	 * @param operatetype 操作类型(1:添加;2:修改;3:删除;)
 	 * @param operatetype 操作类型(1:添加;2:修改;3:删除;)
 	 */
 	 */
 	void addLog(String LogContent, Integer logType, Integer operatetype);
 	void addLog(String LogContent, Integer logType, Integer operatetype);
-	
+
 	/**
 	/**
 	  * 根据用户账号查询用户信息
 	  * 根据用户账号查询用户信息
 	 * @param username
 	 * @param username
 	 * @return
 	 * @return
 	 */
 	 */
 	public LoginUser getUserByName(String username);
 	public LoginUser getUserByName(String username);
-	
+
 	/**
 	/**
 	  * 根据用户id查询用户信息
 	  * 根据用户id查询用户信息
 	 * @param id
 	 * @param id
 	 * @return
 	 * @return
 	 */
 	 */
 	public LoginUser getUserById(String id);
 	public LoginUser getUserById(String id);
-	
+
 	/**
 	/**
 	 * 通过用户账号查询角色集合
 	 * 通过用户账号查询角色集合
 	 * @param username
 	 * @param username
@@ -65,10 +64,10 @@ public interface ISysBaseAPI {
 	/**
 	/**
 	 * 获取当前数据库类型
 	 * 获取当前数据库类型
 	 * @return
 	 * @return
-	 * @throws Exception 
+	 * @throws Exception
 	 */
 	 */
 	public String getDatabaseType() throws SQLException;
 	public String getDatabaseType() throws SQLException;
-	
+
 	/**
 	/**
 	  * 获取数据字典
 	  * 获取数据字典
 	 * @param code
 	 * @param code
@@ -93,7 +92,7 @@ public interface ISysBaseAPI {
 	 * @return
 	 * @return
 	 */
 	 */
     List<DictModel> queryTableDictItemsByCode(String table, String text, String code);
     List<DictModel> queryTableDictItemsByCode(String table, String text, String code);
-    
+
     /**
     /**
    	 * 查询所有部门 作为字典信息 id -->value,departName -->text
    	 * 查询所有部门 作为字典信息 id -->value,departName -->text
    	 * @return
    	 * @return

+ 2 - 3
jeecg-boot-base-common/src/main/java/org/jeecg/common/system/controller/CommonController.java

@@ -5,8 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.system.api.ISysBaseAPI;
-import org.jeecg.common.system.util.JwtUtil;
+import org.jeecg.common.system.api.ISysBaseApi;
 import org.jeecg.common.util.CommonUtils;
 import org.jeecg.common.util.CommonUtils;
 import org.jeecg.common.util.RestUtil;
 import org.jeecg.common.util.RestUtil;
 import org.jeecg.common.util.TokenUtils;
 import org.jeecg.common.util.TokenUtils;
@@ -44,7 +43,7 @@ import java.net.URLDecoder;
 public class CommonController {
 public class CommonController {
 
 
 	@Autowired
 	@Autowired
-	private ISysBaseAPI sysBaseAPI;
+	private ISysBaseApi sysBaseAPI;
 
 
 	@Value(value = "${jeecg.path.upload}")
 	@Value(value = "${jeecg.path.upload}")
 	private String uploadpath;
 	private String uploadpath;

+ 44 - 51
jeecg-boot-base-common/src/main/java/org/jeecg/common/system/query/QueryGenerator.java

@@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.constant.DataBaseConstant;
 import org.jeecg.common.constant.DataBaseConstant;
-import org.jeecg.common.system.api.ISysBaseAPI;
+import org.jeecg.common.system.api.ISysBaseApi;
 import org.jeecg.common.system.util.JeecgDataAutorUtils;
 import org.jeecg.common.system.util.JeecgDataAutorUtils;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.SysPermissionDataRuleModel;
 import org.jeecg.common.system.vo.SysPermissionDataRuleModel;
@@ -52,7 +52,7 @@ public class QueryGenerator {
 	/**排序方式*/
 	/**排序方式*/
 	private static final String ORDER_TYPE = "order";
 	private static final String ORDER_TYPE = "order";
 	private static final String ORDER_TYPE_ASC = "ASC";
 	private static final String ORDER_TYPE_ASC = "ASC";
-	
+
 	/**时间格式化 */
 	/**时间格式化 */
 	private static final ThreadLocal<SimpleDateFormat> local = new ThreadLocal<SimpleDateFormat>();
 	private static final ThreadLocal<SimpleDateFormat> local = new ThreadLocal<SimpleDateFormat>();
 	private static SimpleDateFormat getTime(){
 	private static SimpleDateFormat getTime(){
@@ -63,7 +63,7 @@ public class QueryGenerator {
 		}
 		}
 		return time;
 		return time;
 	}
 	}
-	
+
 	/**
 	/**
 	 * 获取查询条件构造器QueryWrapper实例 通用查询条件已被封装完成
 	 * 获取查询条件构造器QueryWrapper实例 通用查询条件已被封装完成
 	 * @param searchObj 查询实体
 	 * @param searchObj 查询实体
@@ -77,35 +77,35 @@ public class QueryGenerator {
 		log.debug("---查询条件构造器初始化完成,耗时:"+(System.currentTimeMillis()-start)+"毫秒----");
 		log.debug("---查询条件构造器初始化完成,耗时:"+(System.currentTimeMillis()-start)+"毫秒----");
 		return queryWrapper;
 		return queryWrapper;
 	}
 	}
-	
+
 	/**
 	/**
 	 * 组装Mybatis Plus 查询条件
 	 * 组装Mybatis Plus 查询条件
-	 * <p>使用此方法 需要有如下几点注意:   
+	 * <p>使用此方法 需要有如下几点注意:
 	 * <br>1.使用QueryWrapper 而非LambdaQueryWrapper;
 	 * <br>1.使用QueryWrapper 而非LambdaQueryWrapper;
-	 * <br>2.实例化QueryWrapper时不可将实体传入参数   
+	 * <br>2.实例化QueryWrapper时不可将实体传入参数
 	 * <br>错误示例:如QueryWrapper<JeecgDemo> queryWrapper = new QueryWrapper<JeecgDemo>(jeecgDemo);
 	 * <br>错误示例:如QueryWrapper<JeecgDemo> queryWrapper = new QueryWrapper<JeecgDemo>(jeecgDemo);
 	 * <br>正确示例:QueryWrapper<JeecgDemo> queryWrapper = new QueryWrapper<JeecgDemo>();
 	 * <br>正确示例:QueryWrapper<JeecgDemo> queryWrapper = new QueryWrapper<JeecgDemo>();
 	 * <br>3.也可以不使用这个方法直接调用 {@link #initQueryWrapper}直接获取实例
 	 * <br>3.也可以不使用这个方法直接调用 {@link #initQueryWrapper}直接获取实例
 	 */
 	 */
 	public static void installMplus(QueryWrapper<?> queryWrapper,Object searchObj,Map<String, String[]> parameterMap) {
 	public static void installMplus(QueryWrapper<?> queryWrapper,Object searchObj,Map<String, String[]> parameterMap) {
-		
+
 		/*
 		/*
 		 * 注意:权限查询由前端配置数据规则 当一个人有多个所属部门时候 可以在规则配置包含条件 orgCode 包含 #{sys_org_code}
 		 * 注意:权限查询由前端配置数据规则 当一个人有多个所属部门时候 可以在规则配置包含条件 orgCode 包含 #{sys_org_code}
-		但是不支持在自定义SQL中写orgCode in #{sys_org_code} 
+		但是不支持在自定义SQL中写orgCode in #{sys_org_code}
 		当一个人只有一个部门 就直接配置等于条件: orgCode 等于 #{sys_org_code} 或者配置自定义SQL: orgCode = '#{sys_org_code}'
 		当一个人只有一个部门 就直接配置等于条件: orgCode 等于 #{sys_org_code} 或者配置自定义SQL: orgCode = '#{sys_org_code}'
 		*/
 		*/
-		
+
 		//区间条件组装 模糊查询 高级查询组装 简单排序 权限查询
 		//区间条件组装 模糊查询 高级查询组装 简单排序 权限查询
 		PropertyDescriptor origDescriptors[] = PropertyUtils.getPropertyDescriptors(searchObj);
 		PropertyDescriptor origDescriptors[] = PropertyUtils.getPropertyDescriptors(searchObj);
 		Map<String,SysPermissionDataRuleModel> ruleMap = getRuleMap();
 		Map<String,SysPermissionDataRuleModel> ruleMap = getRuleMap();
-		
+
 		//权限规则自定义SQL表达式
 		//权限规则自定义SQL表达式
 		for (String c : ruleMap.keySet()) {
 		for (String c : ruleMap.keySet()) {
 			if(oConvertUtils.isNotEmpty(c) && c.startsWith(SQL_RULES_COLUMN)){
 			if(oConvertUtils.isNotEmpty(c) && c.startsWith(SQL_RULES_COLUMN)){
 				queryWrapper.and(i ->i.apply(getSqlRuleValue(ruleMap.get(c).getRuleValue())));
 				queryWrapper.and(i ->i.apply(getSqlRuleValue(ruleMap.get(c).getRuleValue())));
 			}
 			}
 		}
 		}
-		
+
 		String name, type;
 		String name, type;
 		for (int i = 0; i < origDescriptors.length; i++) {
 		for (int i = 0; i < origDescriptors.length; i++) {
 			//aliasName = origDescriptors[i].getName();  mybatis  不存在实体属性 不用处理别名的情况
 			//aliasName = origDescriptors[i].getName();  mybatis  不存在实体属性 不用处理别名的情况
@@ -115,18 +115,18 @@ public class QueryGenerator {
 				if (judgedIsUselessField(name)|| !PropertyUtils.isReadable(searchObj, name)) {
 				if (judgedIsUselessField(name)|| !PropertyUtils.isReadable(searchObj, name)) {
 					continue;
 					continue;
 				}
 				}
-				
+
 				//数据权限查询
 				//数据权限查询
 				if(ruleMap.containsKey(name)) {
 				if(ruleMap.containsKey(name)) {
 					addRuleToQueryWrapper(ruleMap.get(name), name, origDescriptors[i].getPropertyType(), queryWrapper);
 					addRuleToQueryWrapper(ruleMap.get(name), name, origDescriptors[i].getPropertyType(), queryWrapper);
 				}
 				}
-				
+
 				// 添加 判断是否有区间值
 				// 添加 判断是否有区间值
 				String endValue = null,beginValue = null;
 				String endValue = null,beginValue = null;
 				if (parameterMap != null && parameterMap.containsKey(name + BEGIN)) {
 				if (parameterMap != null && parameterMap.containsKey(name + BEGIN)) {
 					beginValue = parameterMap.get(name + BEGIN)[0].trim();
 					beginValue = parameterMap.get(name + BEGIN)[0].trim();
 					addQueryByRule(queryWrapper, name, type, beginValue, QueryRuleEnum.GE);
 					addQueryByRule(queryWrapper, name, type, beginValue, QueryRuleEnum.GE);
-					
+
 				}
 				}
 				if (parameterMap != null && parameterMap.containsKey(name + END)) {
 				if (parameterMap != null && parameterMap.containsKey(name + END)) {
 					endValue = parameterMap.get(name + END)[0].trim();
 					endValue = parameterMap.get(name + END)[0].trim();
@@ -168,19 +168,19 @@ public class QueryGenerator {
 					// add -end 添加判断为字符串时设为全模糊查询
 					// add -end 添加判断为字符串时设为全模糊查询
 					addEasyQuery(queryWrapper, name, rule, value);
 					addEasyQuery(queryWrapper, name, rule, value);
 				}
 				}
-				
+
 			} catch (Exception e) {
 			} catch (Exception e) {
 				log.error(e.getMessage(), e);
 				log.error(e.getMessage(), e);
 			}
 			}
 		}
 		}
-		// 排序逻辑 处理 
+		// 排序逻辑 处理
 		doMultiFieldsOrder(queryWrapper, parameterMap);
 		doMultiFieldsOrder(queryWrapper, parameterMap);
-				
+
 		//高级查询
 		//高级查询
 		doSuperQuery(queryWrapper, parameterMap);
 		doSuperQuery(queryWrapper, parameterMap);
-		
+
 	}
 	}
-	
+
 	//多字段排序 TODO 需要修改前端
 	//多字段排序 TODO 需要修改前端
 	public static void doMultiFieldsOrder(QueryWrapper<?> queryWrapper,Map<String, String[]> parameterMap) {
 	public static void doMultiFieldsOrder(QueryWrapper<?> queryWrapper,Map<String, String[]> parameterMap) {
 		String column=null,order=null;
 		String column=null,order=null;
@@ -197,8 +197,8 @@ public class QueryGenerator {
 				column = column.substring(0, column.lastIndexOf(CommonConstant.DICT_TEXT_SUFFIX));
 				column = column.substring(0, column.lastIndexOf(CommonConstant.DICT_TEXT_SUFFIX));
 			}
 			}
 			//SQL注入check
 			//SQL注入check
-			SqlInjectionUtil.filterContent(column); 
-			
+			SqlInjectionUtil.filterContent(column);
+
 			if (order.toUpperCase().indexOf(ORDER_TYPE_ASC)>=0) {
 			if (order.toUpperCase().indexOf(ORDER_TYPE_ASC)>=0) {
 				queryWrapper.orderByAsc(oConvertUtils.camelToUnderline(column));
 				queryWrapper.orderByAsc(oConvertUtils.camelToUnderline(column));
 			} else {
 			} else {
@@ -206,7 +206,7 @@ public class QueryGenerator {
 			}
 			}
 		}
 		}
 	}
 	}
-	
+
 	/**
 	/**
 	 * 高级查询
 	 * 高级查询
 	 * @param queryWrapper
 	 * @param queryWrapper
@@ -301,16 +301,16 @@ public class QueryGenerator {
 			//TODO in 查询这里应该有个bug  如果一字段本身就是多选 此时用in查询 未必能查询出来
 			//TODO in 查询这里应该有个bug  如果一字段本身就是多选 此时用in查询 未必能查询出来
 			rule = QueryRuleEnum.IN;
 			rule = QueryRuleEnum.IN;
 		}
 		}
-		// step 5 != 
+		// step 5 !=
 		if(rule == null && val.startsWith(NOT_EQUAL)){
 		if(rule == null && val.startsWith(NOT_EQUAL)){
 			rule = QueryRuleEnum.NE;
 			rule = QueryRuleEnum.NE;
 		}
 		}
 		return rule != null ? rule : QueryRuleEnum.EQ;
 		return rule != null ? rule : QueryRuleEnum.EQ;
 	}
 	}
-	
+
 	/**
 	/**
 	 * 替换掉关键字字符
 	 * 替换掉关键字字符
-	 * 
+	 *
 	 * @param rule
 	 * @param rule
 	 * @param value
 	 * @param value
 	 * @return
 	 * @return
@@ -343,7 +343,7 @@ public class QueryGenerator {
 		}
 		}
 		return value;
 		return value;
 	}
 	}
-	
+
 	private static void addQueryByRule(QueryWrapper<?> queryWrapper,String name,String type,String value,QueryRuleEnum rule) throws ParseException {
 	private static void addQueryByRule(QueryWrapper<?> queryWrapper,String name,String type,String value,QueryRuleEnum rule) throws ParseException {
 		if(oConvertUtils.isNotEmpty(value)) {
 		if(oConvertUtils.isNotEmpty(value)) {
 			Object temp;
 			Object temp;
@@ -383,7 +383,7 @@ public class QueryGenerator {
 			addEasyQuery(queryWrapper, name, rule, temp);
 			addEasyQuery(queryWrapper, name, rule, temp);
 		}
 		}
 	}
 	}
-	
+
 	/**
 	/**
 	 * 获取日期类型的值
 	 * 获取日期类型的值
 	 * @param value
 	 * @param value
@@ -408,7 +408,7 @@ public class QueryGenerator {
 		}
 		}
 		return date;
 		return date;
 	}
 	}
-	
+
 	/**
 	/**
 	  * 根据规则走不同的查询
 	  * 根据规则走不同的查询
 	 * @param queryWrapper QueryWrapper
 	 * @param queryWrapper QueryWrapper
@@ -465,7 +465,7 @@ public class QueryGenerator {
 		}
 		}
 	}
 	}
 	/**
 	/**
-	 * 
+	 *
 	 * @param name
 	 * @param name
 	 * @return
 	 * @return
 	 */
 	 */
@@ -475,7 +475,7 @@ public class QueryGenerator {
 				|| "sort".equals(name) || "order".equals(name);
 				|| "sort".equals(name) || "order".equals(name);
 	}
 	}
 
 
-	
+
 
 
 	/**
 	/**
 	 * 获取请求对应的数据权限规则
 	 * 获取请求对应的数据权限规则
@@ -498,7 +498,7 @@ public class QueryGenerator {
 		}
 		}
 		return ruleMap;
 		return ruleMap;
 	}
 	}
-	
+
 	private static void addRuleToQueryWrapper(SysPermissionDataRuleModel dataRule, String name, Class propertyType, QueryWrapper<?> queryWrapper) {
 	private static void addRuleToQueryWrapper(SysPermissionDataRuleModel dataRule, String name, Class propertyType, QueryWrapper<?> queryWrapper) {
 		QueryRuleEnum rule = QueryRuleEnum.getByValue(dataRule.getRuleConditions());
 		QueryRuleEnum rule = QueryRuleEnum.getByValue(dataRule.getRuleConditions());
 		if(rule.equals(QueryRuleEnum.IN) && ! propertyType.equals(String.class)) {
 		if(rule.equals(QueryRuleEnum.IN) && ! propertyType.equals(String.class)) {
@@ -523,7 +523,7 @@ public class QueryGenerator {
 			}
 			}
 		}
 		}
 	}
 	}
-	
+
 	public static String converRuleValue(String ruleValue) {
 	public static String converRuleValue(String ruleValue) {
 		String value = JwtUtil.getSessionData(ruleValue);
 		String value = JwtUtil.getSessionData(ruleValue);
 		if(oConvertUtils.isEmpty(value)) {
 		if(oConvertUtils.isEmpty(value)) {
@@ -536,7 +536,7 @@ public class QueryGenerator {
 	* @author: scott
 	* @author: scott
 	* @Description: 去掉值前后单引号
 	* @Description: 去掉值前后单引号
 	* @date: 2020/3/19 21:26
 	* @date: 2020/3/19 21:26
-	* @param ruleValue: 
+	* @param ruleValue:
 	* @Return: java.lang.String
 	* @Return: java.lang.String
 	*/
 	*/
 	public static String trimSingleQuote(String ruleValue) {
 	public static String trimSingleQuote(String ruleValue) {
@@ -551,7 +551,7 @@ public class QueryGenerator {
 		}
 		}
 		return ruleValue;
 		return ruleValue;
 	}
 	}
-	
+
 	public static String getSqlRuleValue(String sqlRule){
 	public static String getSqlRuleValue(String sqlRule){
 		try {
 		try {
 			Set<String> varParams = getSqlRuleParams(sqlRule);
 			Set<String> varParams = getSqlRuleParams(sqlRule);
@@ -564,7 +564,7 @@ public class QueryGenerator {
 		}
 		}
 		return sqlRule;
 		return sqlRule;
 	}
 	}
-	
+
 	/**
 	/**
 	 * 获取sql中的#{key} 这个key组成的set
 	 * 获取sql中的#{key} 这个key组成的set
 	 */
 	 */
@@ -574,7 +574,7 @@ public class QueryGenerator {
 		}
 		}
 		Set<String> varParams = new HashSet<String>();
 		Set<String> varParams = new HashSet<String>();
 		String regex = "\\#\\{\\w+\\}";
 		String regex = "\\#\\{\\w+\\}";
-		
+
 		Pattern p = Pattern.compile(regex);
 		Pattern p = Pattern.compile(regex);
 		Matcher m = p.matcher(sql);
 		Matcher m = p.matcher(sql);
 		while(m.find()){
 		while(m.find()){
@@ -583,9 +583,9 @@ public class QueryGenerator {
 		}
 		}
 		return varParams;
 		return varParams;
 	}
 	}
-	
+
 	/**
 	/**
-	 * 获取查询条件 
+	 * 获取查询条件
 	 * @param field
 	 * @param field
 	 * @param alias
 	 * @param alias
 	 * @param value
 	 * @param value
@@ -600,7 +600,7 @@ public class QueryGenerator {
 		QueryRuleEnum rule = QueryGenerator.convert2Rule(value);
 		QueryRuleEnum rule = QueryGenerator.convert2Rule(value);
 		return getSingleSqlByRule(rule, field, value, isString);
 		return getSingleSqlByRule(rule, field, value, isString);
 	}
 	}
-	
+
 	public static String getSingleSqlByRule(QueryRuleEnum rule,String field,Object value,boolean isString) {
 	public static String getSingleSqlByRule(QueryRuleEnum rule,String field,Object value,boolean isString) {
 		String res = "";
 		String res = "";
 		switch (rule) {
 		switch (rule) {
@@ -663,7 +663,7 @@ public class QueryGenerator {
 			return value.toString();
 			return value.toString();
 		}
 		}
 	}
 	}
-	
+
 	private static String getInConditionValue(Object value,boolean isString) {
 	private static String getInConditionValue(Object value,boolean isString) {
 		if(isString) {
 		if(isString) {
 			String temp[] = value.toString().split(",");
 			String temp[] = value.toString().split(",");
@@ -680,7 +680,7 @@ public class QueryGenerator {
 			return "("+value.toString()+")";
 			return "("+value.toString()+")";
 		}
 		}
 	}
 	}
-	
+
 	private static String getLikeConditionValue(Object value) {
 	private static String getLikeConditionValue(Object value) {
 		String str = value.toString().trim();
 		String str = value.toString().trim();
 		if(str.startsWith("*") && str.endsWith("*")) {
 		if(str.startsWith("*") && str.endsWith("*")) {
@@ -725,11 +725,9 @@ public class QueryGenerator {
 			}
 			}
 		}
 		}
 	}
 	}
-	
+
 	/**
 	/**
 	 *   根据权限相关配置生成相关的SQL 语句
 	 *   根据权限相关配置生成相关的SQL 语句
-	 * @param searchObj
-	 * @param parameterMap
 	 * @return
 	 * @return
 	 */
 	 */
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@SuppressWarnings({ "unchecked", "rawtypes" })
@@ -768,11 +766,9 @@ public class QueryGenerator {
 		log.info("query auth sql is:"+sb.toString());
 		log.info("query auth sql is:"+sb.toString());
 		return sb.toString();
 		return sb.toString();
 	}
 	}
-	
+
 	/**
 	/**
 	  * 根据权限相关配置 组装mp需要的权限
 	  * 根据权限相关配置 组装mp需要的权限
-	 * @param searchObj
-	 * @param parameterMap
 	 * @return
 	 * @return
 	 */
 	 */
 	public static void installAuthMplus(QueryWrapper<?> queryWrapper,Class<?> clazz) {
 	public static void installAuthMplus(QueryWrapper<?> queryWrapper,Class<?> clazz) {
@@ -839,8 +835,6 @@ public class QueryGenerator {
 		return sb.toString();
 		return sb.toString();
 	}
 	}
 
 
-
-
 	/** 当前系统数据库类型 */
 	/** 当前系统数据库类型 */
 	private static String DB_TYPE;
 	private static String DB_TYPE;
 	/**
 	/**
@@ -851,7 +845,7 @@ public class QueryGenerator {
 			return DB_TYPE;
 			return DB_TYPE;
 		}
 		}
 		try {
 		try {
-			ISysBaseAPI sysBaseAPI = ApplicationContextUtil.getContext().getBean(ISysBaseAPI.class);
+			ISysBaseApi sysBaseAPI = ApplicationContextUtil.getContext().getBean(ISysBaseApi.class);
 			DB_TYPE = sysBaseAPI.getDatabaseType();
 			DB_TYPE = sysBaseAPI.getDatabaseType();
 			return DB_TYPE;
 			return DB_TYPE;
 		} catch (Exception e) {
 		} catch (Exception e) {
@@ -859,5 +853,4 @@ public class QueryGenerator {
 		}
 		}
 		return DB_TYPE;
 		return DB_TYPE;
 	}
 	}
-	
 }
 }

+ 4 - 1
jeecg-boot-base-common/src/main/java/org/jeecg/common/util/DateUtils.java

@@ -86,7 +86,10 @@ public class DateUtils extends PropertyEditorSupport {
     }
     }
 
 
 
 
-
+    public static String getNowHour(Date date){
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH");
+        return simpleDateFormat.format(date);
+    }
 
 
 
 
     public static String getDateByDateStr(String dateStr) throws ParseException {
     public static String getDateByDateStr(String dateStr) throws ParseException {

+ 2 - 2
jeecg-boot-base-common/src/main/java/org/jeecg/common/util/TokenUtils.java

@@ -4,7 +4,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.AuthenticationException;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.system.api.ISysBaseAPI;
+import org.jeecg.common.system.api.ISysBaseApi;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
 
 
@@ -35,7 +35,7 @@ public class TokenUtils {
     /**
     /**
      * 验证Token
      * 验证Token
      */
      */
-    public static boolean verifyToken(HttpServletRequest request, ISysBaseAPI sysBaseAPI, RedisUtil redisUtil) {
+    public static boolean verifyToken(HttpServletRequest request, ISysBaseApi sysBaseAPI, RedisUtil redisUtil) {
         log.info(" -- url --" + request.getRequestURL());
         log.info(" -- url --" + request.getRequestURL());
         String token = getTokenByRequest(request);
         String token = getTokenByRequest(request);
 
 

+ 3 - 3
jeecg-boot-base-common/src/main/java/org/jeecg/common/util/dynamic/db/DataSourceCachePool.java

@@ -2,11 +2,11 @@ package org.jeecg.common.util.dynamic.db;
 
 
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.pool.DruidDataSource;
 import org.jeecg.common.constant.CacheConstant;
 import org.jeecg.common.constant.CacheConstant;
-import org.jeecg.common.system.api.ISysBaseAPI;
+import org.jeecg.common.system.api.ISysBaseApi;
 import org.jeecg.common.system.vo.DynamicDataSourceModel;
 import org.jeecg.common.system.vo.DynamicDataSourceModel;
-import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.common.util.SpringContextUtils;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.RedisTemplate;
+
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map;
 
 
@@ -37,7 +37,7 @@ public class DataSourceCachePool {
         if (getRedisTemplate().hasKey(redisCacheKey)) {
         if (getRedisTemplate().hasKey(redisCacheKey)) {
             return (DynamicDataSourceModel) getRedisTemplate().opsForValue().get(redisCacheKey);
             return (DynamicDataSourceModel) getRedisTemplate().opsForValue().get(redisCacheKey);
         }
         }
-        ISysBaseAPI sysBaseAPI = SpringContextUtils.getBean(ISysBaseAPI.class);
+        ISysBaseApi sysBaseAPI = SpringContextUtils.getBean(ISysBaseApi.class);
         DynamicDataSourceModel dbSource = sysBaseAPI.getDynamicDbSourceByCode(dbKey);
         DynamicDataSourceModel dbSource = sysBaseAPI.getDynamicDbSourceByCode(dbKey);
         if (dbSource != null) {
         if (dbSource != null) {
             getRedisTemplate().opsForValue().set(redisCacheKey, dbSource);
             getRedisTemplate().opsForValue().set(redisCacheKey, dbSource);

+ 0 - 147
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysAnnouncement.java

@@ -1,147 +0,0 @@
-package org.jeecg.modules.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import org.jeecg.common.aspect.annotation.Dict;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @Description: 系统通告表
- * @Author: jeecg-boot
- * @Date:  2019-01-02
- * @Version: V1.0
- */
-@Data
-@TableName("sys_announcement")
-public class SysAnnouncement implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.ID_WORKER_STR)
-    private String id;
-    /**
-     * 标题
-     */
-    @Excel(name = "标题", width = 15)
-    private String titile;
-    /**
-     * 内容
-     */
-    @Excel(name = "内容", width = 30)
-    private String msgContent;
-    /**
-     * 开始时间
-     */
-    @Excel(name = "开始时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-    /**
-     * 结束时间
-     */
-    @Excel(name = "结束时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date endTime;
-    /**
-     * 发布人
-     */
-    @Excel(name = "发布人", width = 15)
-    private String sender;
-    /**
-     * 优先级(L低,M中,H高)
-     */
-    @Excel(name = "优先级", width = 15, dicCode = "priority")
-    @Dict(dicCode = "priority")
-    private String priority;
-
-    /**
-     * 消息类型1:通知公告2:系统消息
-     */
-    @Excel(name = "消息类型", width = 15, dicCode = "msg_category")
-    @Dict(dicCode = "msg_category")
-    private String msgCategory;
-    /**
-     * 通告对象类型(USER:指定用户,ALL:全体用户)
-     */
-    @Excel(name = "通告对象类型", width = 15, dicCode = "msg_type")
-    @Dict(dicCode = "msg_type")
-    private String msgType;
-    /**
-     * 发布状态(0未发布,1已发布,2已撤销)
-     */
-    @Excel(name = "发布状态", width = 15, dicCode = "send_status")
-    @Dict(dicCode = "send_status")
-    private String sendStatus;
-    /**
-     * 发布时间
-     */
-    @Excel(name = "发布时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date sendTime;
-    /**
-     * 撤销时间
-     */
-    @Excel(name = "撤销时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-    /**
-     * 删除状态(0,正常,1已删除)
-     */
-    private String delFlag;
-    /**
-     * 创建人
-     */
-    private String createBy;
-    /**
-     * 创建时间
-     */
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    /**
-     * 更新人
-     */
-    private String updateBy;
-    /**
-     * 更新时间
-     */
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-    /**
-     * 指定用户
-     **/
-    private String userIds;
-    /**
-     * 业务类型(email:邮件 bpm:流程)
-     */
-    private String busType;
-    /**
-     * 业务id
-     */
-    private String busId;
-    /**
-     * 打开方式 组件:component 路由:url
-     */
-    private String openType;
-    /**
-     * 组件/路由 地址
-     */
-    private String openPage;
-    /**
-     * 摘要
-     */
-    private String msgAbstract;
-}

+ 0 - 49
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysAnnouncementSend.java

@@ -1,49 +0,0 @@
-package org.jeecg.modules.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @Description: 用户通告阅读标记表
- * @Author: jeecg-boot
- * @Date:  2019-02-21
- * @Version: V1.0
- */
-@Data
-@TableName("sys_announcement_send")
-public class SysAnnouncementSend implements Serializable {
-    private static final long serialVersionUID = 1L;
-    
-	/**id*/
-	@TableId(type = IdType.ID_WORKER_STR)
-	private String id;
-	/**通告id*/
-	private String anntId;
-	/**用户id*/
-	private String userId;
-	/**阅读状态(0未读,1已读)*/
-	private String readFlag;
-	/**阅读时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private Date readTime;
-	/**创建人*/
-	private String createBy;
-	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private Date createTime;
-	/**更新人*/
-	private String updateBy;
-	/**更新时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private Date updateTime;
-}

+ 0 - 58
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysCategory.java

@@ -1,58 +0,0 @@
-package org.jeecg.modules.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-
-/**
- * @Description: 分类字典
- * @Author: jeecg-boot
- * @Date:   2019-05-29
- * @Version: V1.0
- */
-@Data
-@TableName("sys_category")
-public class SysCategory implements Serializable {
-    private static final long serialVersionUID = 1L;
-    
-	/**主键*/
-	@TableId(type = IdType.ID_WORKER_STR)
-	private String id;
-	/**父级节点*/
-	@Excel(name = "父级节点", width = 15)
-	private String pid;
-	/**类型名称*/
-	@Excel(name = "类型名称", width = 15)
-	private String name;
-	/**类型编码*/
-	@Excel(name = "类型编码", width = 15)
-	private String code;
-	/**创建人*/
-	@Excel(name = "创建人", width = 15)
-	private String createBy;
-	/**创建日期*/
-	@Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private java.util.Date createTime;
-	/**更新人*/
-	@Excel(name = "更新人", width = 15)
-	private String updateBy;
-	/**更新日期*/
-	@Excel(name = "更新日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private java.util.Date updateTime;
-	/**所属部门*/
-	@Excel(name = "所属部门", width = 15)
-	private String sysOrgCode;
-	/**是否有子节点*/
-	@Excel(name = "是否有子节点", width = 15)
-	private String hasChild;
-}

+ 0 - 88
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysCheckRule.java

@@ -1,88 +0,0 @@
-package org.jeecg.modules.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * @Description: 编码校验规则
- * @Author: jeecg-boot
- * @Date: 2020-02-04
- * @Version: V1.0
- */
-@Data
-@TableName("sys_check_rule")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "sys_check_rule对象", description = "编码校验规则")
-public class SysCheckRule {
-
-    /**
-     * 主键id
-     */
-    @TableId(type = IdType.ID_WORKER_STR)
-    @ApiModelProperty(value = "主键id")
-    private String id;
-    /**
-     * 规则名称
-     */
-    @Excel(name = "规则名称", width = 15)
-    @ApiModelProperty(value = "规则名称")
-    private String ruleName;
-    /**
-     * 规则Code
-     */
-    @Excel(name = "规则Code", width = 15)
-    @ApiModelProperty(value = "规则Code")
-    private String ruleCode;
-    /**
-     * 规则JSON
-     */
-    @Excel(name = "规则JSON", width = 15)
-    @ApiModelProperty(value = "规则JSON")
-    private String ruleJson;
-    /**
-     * 规则描述
-     */
-    @Excel(name = "规则描述", width = 15)
-    @ApiModelProperty(value = "规则描述")
-    private String ruleDescription;
-    /**
-     * 更新人
-     */
-    @Excel(name = "更新人", width = 15)
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-    /**
-     * 更新时间
-     */
-    @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-    /**
-     * 创建人
-     */
-    @Excel(name = "创建人", width = 15)
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-    /**
-     * 创建时间
-     */
-    @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-}

+ 0 - 34
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysDataLog.java

@@ -1,34 +0,0 @@
-package org.jeecg.modules.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class SysDataLog implements Serializable {
-	private static final long serialVersionUID = 1L;
-	
-	@TableId(type = IdType.ID_WORKER_STR)
-	private String id; //id'
-	private String createBy; //创建人登录名称
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private Date createTime; //创建日期
-	private String updateBy; //更新人登录名称
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private Date updateTime; //更新日期
-	private String dataTable; //表名
-	private String dataId; //数据ID
-	private String dataContent; //数据内容
-	private String dataVersion; //版本号
-}

+ 0 - 120
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysDataSource.java

@@ -1,120 +0,0 @@
-package org.jeecg.modules.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecg.common.aspect.annotation.Dict;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
-/**
- * @Description: 多数据源管理
- * @Author: jeecg-boot
- * @Date: 2019-12-25
- * @Version: V1.0
- */
-@Data
-@TableName("sys_data_source")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "sys_data_source对象", description = "多数据源管理")
-public class SysDataSource {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.ID_WORKER_STR)
-    @ApiModelProperty(value = "id")
-    private String id;
-    /**
-     * 数据源编码
-     */
-    @Excel(name = "数据源编码", width = 15)
-    @ApiModelProperty(value = "数据源编码")
-    private String code;
-    /**
-     * 数据源名称
-     */
-    @Excel(name = "数据源名称", width = 15)
-    @ApiModelProperty(value = "数据源名称")
-    private String name;
-    /**
-     * 描述
-     */
-    @Excel(name = "备注", width = 15)
-    @ApiModelProperty(value = "备注")
-    private String remark;
-    /**
-     * 数据库类型
-     */
-    @Dict(dicCode = "database_type")
-    @Excel(name = "数据库类型", width = 15, dicCode = "database_type")
-    @ApiModelProperty(value = "数据库类型")
-    private String dbType;
-    /**
-     * 驱动类
-     */
-    @Excel(name = "驱动类", width = 15)
-    @ApiModelProperty(value = "驱动类")
-    private String dbDriver;
-    /**
-     * 数据源地址
-     */
-    @Excel(name = "数据源地址", width = 15)
-    @ApiModelProperty(value = "数据源地址")
-    private String dbUrl;
-    /**
-     * 数据库名称
-     */
-    @Excel(name = "数据库名称", width = 15)
-    @ApiModelProperty(value = "数据库名称")
-    private String dbName;
-    /**
-     * 用户名
-     */
-    @Excel(name = "用户名", width = 15)
-    @ApiModelProperty(value = "用户名")
-    private String dbUsername;
-    /**
-     * 密码
-     */
-    @Excel(name = "密码", width = 15)
-    @ApiModelProperty(value = "密码")
-    private String dbPassword;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-    /**
-     * 创建日期
-     */
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "创建日期")
-    private java.util.Date createTime;
-    /**
-     * 更新人
-     */
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-    /**
-     * 更新日期
-     */
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "更新日期")
-    private java.util.Date updateTime;
-    /**
-     * 所属部门
-     */
-    @Excel(name = "所属部门", width = 15)
-    @ApiModelProperty(value = "所属部门")
-    private String sysOrgCode;
-}

+ 0 - 135
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysDepart.java

@@ -1,135 +0,0 @@
-package org.jeecg.modules.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import org.jeecg.common.aspect.annotation.Dict;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.Objects;
-
-/**
- * <p>
- * 部门表
- * <p>
- * 
- * @Author Steve
- * @Since  2019-01-22
- */
-@Data
-@TableName("sys_depart")
-public class SysDepart implements Serializable {
-    private static final long serialVersionUID = 1L;
-    
-	/**ID*/
-	@TableId(type = IdType.ID_WORKER_STR)
-	private String id;
-	/**父机构ID*/
-	private String parentId;
-	/**机构/部门名称*/
-	@Excel(name="机构/部门名称",width=15)
-	private String departName;
-	/**英文名*/
-	@Excel(name="英文名",width=15)
-	private String departNameEn;
-	/**缩写*/
-	private String departNameAbbr;
-	/**排序*/
-	@Excel(name="排序",width=15)
-	private Integer departOrder;
-	/**描述*/
-	@Excel(name="描述",width=15)
-	private String description;
-	/**机构类别 1组织机构,2岗位*/
-	@Excel(name="机构类别",width=15,dicCode="org_category")
-	private String orgCategory;
-	/**机构类型*/
-	private String orgType;
-	/**机构编码*/
-	@Excel(name="机构编码",width=15)
-	private String orgCode;
-	/**手机号*/
-	@Excel(name="手机号",width=15)
-	private String mobile;
-	/**传真*/
-	@Excel(name="传真",width=15)
-	private String fax;
-	/**地址*/
-	@Excel(name="地址",width=15)
-	private String address;
-	/**备注*/
-	@Excel(name="备注",width=15)
-	private String memo;
-	/**状态(1启用,0不启用)*/
-	@Dict(dicCode = "depart_status")
-	private String status;
-	/**删除状态(0,正常,1已删除)*/
-	@Dict(dicCode = "del_flag")
-	private String delFlag;
-	/**创建人*/
-	private String createBy;
-	/**创建日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private Date createTime;
-	/**更新人*/
-	private String updateBy;
-	/**更新日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private Date updateTime;
-	
-	/**
-	 * 重写equals方法
-	 */
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-			return true;
-		}
-        if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-        if (!super.equals(o)) {
-			return false;
-		}
-        SysDepart depart = (SysDepart) o;
-        return Objects.equals(id, depart.id) &&
-                Objects.equals(parentId, depart.parentId) &&
-                Objects.equals(departName, depart.departName) &&
-                Objects.equals(departNameEn, depart.departNameEn) &&
-                Objects.equals(departNameAbbr, depart.departNameAbbr) &&
-                Objects.equals(departOrder, depart.departOrder) &&
-                Objects.equals(description, depart.description) &&
-                Objects.equals(orgCategory, depart.orgCategory) &&
-                Objects.equals(orgType, depart.orgType) &&
-                Objects.equals(orgCode, depart.orgCode) &&
-                Objects.equals(mobile, depart.mobile) &&
-                Objects.equals(fax, depart.fax) &&
-                Objects.equals(address, depart.address) &&
-                Objects.equals(memo, depart.memo) &&
-                Objects.equals(status, depart.status) &&
-                Objects.equals(delFlag, depart.delFlag) &&
-                Objects.equals(createBy, depart.createBy) &&
-                Objects.equals(createTime, depart.createTime) &&
-                Objects.equals(updateBy, depart.updateBy) &&
-                Objects.equals(updateTime, depart.updateTime);
-    }
-
-    /**
-     * 重写hashCode方法
-     */
-    @Override
-    public int hashCode() {
-
-        return Objects.hash(super.hashCode(), id, parentId, departName, 
-        		departNameEn, departNameAbbr, departOrder, description,orgCategory, 
-        		orgType, orgCode, mobile, fax, address, memo, status, 
-        		delFlag, createBy, createTime, updateBy, updateTime);
-    }
-}

+ 0 - 50
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysDepartPermission.java

@@ -1,50 +0,0 @@
-package org.jeecg.modules.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-/**
- * @Description: 部门权限表
- * @Author: jeecg-boot
- * @Date:   2020-02-11
- * @Version: V1.0
- */
-@Data
-@TableName("sys_depart_permission")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="sys_depart_permission对象", description="部门权限表")
-public class SysDepartPermission {
-    
-	/**id*/
-	@TableId(type = IdType.ID_WORKER_STR)
-    @ApiModelProperty(value = "id")
-	private String id;
-	/**部门id*/
-	@Excel(name = "部门id", width = 15)
-    @ApiModelProperty(value = "部门id")
-	private String departId;
-	/**权限id*/
-	@Excel(name = "权限id", width = 15)
-    @ApiModelProperty(value = "权限id")
-	private String permissionId;
-	/**数据规则id*/
-	@ApiModelProperty(value = "数据规则id")
-	private String dataRuleIds;
-
-	public SysDepartPermission() {
-
-	}
-
-	public SysDepartPermission(String departId, String permissionId) {
-		this.departId = departId;
-		this.permissionId = permissionId;
-	}
-}

+ 0 - 74
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysDepartRole.java

@@ -1,74 +0,0 @@
-package org.jeecg.modules.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecg.common.aspect.annotation.Dict;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * @Description: 部门角色
- * @Author: jeecg-boot
- * @Date:   2020-02-12
- * @Version: V1.0
- */
-@Data
-@TableName("sys_depart_role")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="sys_depart_role对象", description="部门角色")
-public class SysDepartRole {
-    
-	/**id*/
-	@TableId(type = IdType.ID_WORKER_STR)
-    @ApiModelProperty(value = "id")
-	private String id;
-	/**部门id*/
-	@Excel(name = "部门id", width = 15)
-	@ApiModelProperty(value = "部门id")
-	@Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
-	private String departId;
-	/**部门角色名称*/
-	@Excel(name = "部门角色名称", width = 15)
-    @ApiModelProperty(value = "部门角色名称")
-	private String roleName;
-	/**部门角色编码*/
-	@Excel(name = "部门角色编码", width = 15)
-    @ApiModelProperty(value = "部门角色编码")
-	private String roleCode;
-	/**描述*/
-	@Excel(name = "描述", width = 15)
-    @ApiModelProperty(value = "描述")
-	private String description;
-	/**创建人*/
-	@Excel(name = "创建人", width = 15)
-    @ApiModelProperty(value = "创建人")
-	private String createBy;
-	/**创建时间*/
-	@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "创建时间")
-	private Date createTime;
-	/**更新人*/
-	@Excel(name = "更新人", width = 15)
-    @ApiModelProperty(value = "更新人")
-	private String updateBy;
-	/**更新时间*/
-	@Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "更新时间")
-	private Date updateTime;
-
-
-}

+ 0 - 54
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysDepartRolePermission.java

@@ -1,54 +0,0 @@
-package org.jeecg.modules.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-/**
- * @Description: 部门角色权限
- * @Author: jeecg-boot
- * @Date:   2020-02-12
- * @Version: V1.0
- */
-@Data
-@TableName("sys_depart_role_permission")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="sys_depart_role_permission对象", description="部门角色权限")
-public class SysDepartRolePermission {
-    
-	/**id*/
-	@TableId(type = IdType.ID_WORKER_STR)
-    @ApiModelProperty(value = "id")
-	private String id;
-	/**部门id*/
-	@Excel(name = "部门id", width = 15)
-    @ApiModelProperty(value = "部门id")
-	private String departId;
-	/**角色id*/
-	@Excel(name = "角色id", width = 15)
-    @ApiModelProperty(value = "角色id")
-	private String roleId;
-	/**权限id*/
-	@Excel(name = "权限id", width = 15)
-    @ApiModelProperty(value = "权限id")
-	private String permissionId;
-	/**dataRuleIds*/
-	@Excel(name = "dataRuleIds", width = 15)
-    @ApiModelProperty(value = "dataRuleIds")
-	private String dataRuleIds;
-
-	public SysDepartRolePermission() {
-	}
-
-	public SysDepartRolePermission(String roleId, String permissionId) {
-		this.roleId = roleId;
-		this.permissionId = permissionId;
-	}
-}

+ 0 - 47
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysDepartRoleUser.java

@@ -1,47 +0,0 @@
-package org.jeecg.modules.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-/**
- * @Description: 部门角色人员信息
- * @Author: jeecg-boot
- * @Date:   2020-02-13
- * @Version: V1.0
- */
-@Data
-@TableName("sys_depart_role_user")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="sys_depart_role_user对象", description="部门角色人员信息")
-public class SysDepartRoleUser {
-    
-	/**主键id*/
-	@TableId(type = IdType.ID_WORKER_STR)
-    @ApiModelProperty(value = "主键id")
-	private String id;
-	/**用户id*/
-	@Excel(name = "用户id", width = 15)
-    @ApiModelProperty(value = "用户id")
-	private String userId;
-	/**角色id*/
-	@Excel(name = "角色id", width = 15)
-    @ApiModelProperty(value = "角色id")
-	private String droleId;
-
-	public SysDepartRoleUser() {
-
-	}
-
-	public SysDepartRoleUser(String userId, String droleId) {
-		this.userId = userId;
-		this.droleId = droleId;
-	}
-}

+ 0 - 84
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysDict.java

@@ -1,84 +0,0 @@
-package org.jeecg.modules.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 字典表
- * </p>
- *
- * @Author zhangweijian
- * @since 2018-12-28
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class SysDict implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.ID_WORKER_STR)
-    private String id;
-    
-    /**
-     * [预留字段,暂时无用]
-     * 字典类型,0 string,1 number类型,2 boolean
-     * 前端js对stirng类型和number类型 boolean 类型敏感,需要区分。在select 标签匹配的时候会用到
-     * 默认为string类型
-     */
-    private Integer type;
-    
-    /**
-     * 字典名称
-     */
-    private String dictName;
-
-    /**
-     * 字典编码
-     */
-    private String dictCode;
-
-    /**
-     * 描述
-     */
-    private String description;
-
-    /**
-     * 删除状态
-     */
-    @TableLogic
-    private Integer delFlag;
-
-    /**
-     * 创建人
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 更新人
-     */
-    private String updateBy;
-
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
-
-
-}

+ 0 - 80
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysDictItem.java

@@ -1,80 +0,0 @@
-package org.jeecg.modules.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecg.common.aspect.annotation.Dict;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- *
- * </p>
- *
- * @Author zhangweijian
- * @since 2018-12-28
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class SysDictItem implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.ID_WORKER_STR)
-    private String id;
-
-    /**
-     * 字典id
-     */
-    private String dictId;
-
-    /**
-     * 字典项文本
-     */
-    @Excel(name = "字典项文本", width = 20)
-    private String itemText;
-
-    /**
-     * 字典项值
-     */
-    @Excel(name = "字典项值", width = 30)
-    private String itemValue;
-
-    /**
-     * 描述
-     */
-    @Excel(name = "描述", width = 40)
-    private String description;
-
-    /**
-     * 排序
-     */
-    @Excel(name = "排序", width = 15,type=4)
-    private Integer sortOrder;
-
-
-    /**
-     * 状态(1启用 0不启用)
-     */
-    @Dict(dicCode = "dict_item_status")
-    private Integer status;
-
-    private String createBy;
-
-    private Date createTime;
-
-    private String updateBy;
-
-    private Date updateTime;
-
-
-}

+ 0 - 86
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysFillRule.java

@@ -1,86 +0,0 @@
-package org.jeecg.modules.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
-/**
- * @Description: 填值规则
- * @Author: jeecg-boot
- * @Date: 2019-11-07
- * @Version: V1.0
- */
-@Data
-@TableName("sys_fill_rule")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "sys_fill_rule对象", description = "填值规则")
-public class SysFillRule {
-
-    /**
-     * 主键ID
-     */
-    @TableId(type = IdType.ID_WORKER_STR)
-    @ApiModelProperty(value = "主键ID")
-    private String id;
-    /**
-     * 规则名称
-     */
-    @Excel(name = "规则名称", width = 15)
-    @ApiModelProperty(value = "规则名称")
-    private String ruleName;
-    /**
-     * 规则Code
-     */
-    @Excel(name = "规则Code", width = 15)
-    @ApiModelProperty(value = "规则Code")
-    private String ruleCode;
-    /**
-     * 规则实现类
-     */
-    @Excel(name = "规则实现类", width = 15)
-    @ApiModelProperty(value = "规则实现类")
-    private String ruleClass;
-    /**
-     * 规则参数
-     */
-    @Excel(name = "规则参数", width = 15)
-    @ApiModelProperty(value = "规则参数")
-    private String ruleParams;
-    /**
-     * 修改人
-     */
-    @Excel(name = "修改人", width = 15)
-    @ApiModelProperty(value = "修改人")
-    private String updateBy;
-    /**
-     * 修改时间
-     */
-    @Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "修改时间")
-    private java.util.Date updateTime;
-    /**
-     * 创建人
-     */
-    @Excel(name = "创建人", width = 15)
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-    /**
-     * 创建时间
-     */
-    @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "创建时间")
-    private java.util.Date createTime;
-}

+ 0 - 112
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysLog.java

@@ -1,112 +0,0 @@
-package org.jeecg.modules.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecg.common.aspect.annotation.Dict;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 系统日志表
- * </p>
- *
- * @Author zhangweijian
- * @since 2018-12-26
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class SysLog implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * id
-	 */
-	@TableId(type = IdType.ID_WORKER_STR)
-	private String id;
-
-	/**
-	 * 创建人
-	 */
-	private String createBy;
-
-	/**
-	 * 创建时间
-	 */
-	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	private Date createTime;
-
-	/**
-	 * 更新人
-	 */
-	private String updateBy;
-
-	/**
-	 * 更新时间
-	 */
-	private Date updateTime;
-
-	/**
-	 * 耗时
-	 */
-	private Long costTime;
-
-	/**
-	 * IP
-	 */
-	private String ip;
-
-	/**
-	 * 请求参数
-	 */
-	private String requestParam;
-
-	/**
-	 * 请求类型
-	 */
-	private String requestType;
-
-	/**
-	 * 请求路径
-	 */
-	private String requestUrl;
-	/**
-	 * 请求方法
-	 */
-	private String method;
-
-	/**
-	 * 操作人用户名称
-	 */
-	private String username;
-	/**
-	 * 操作人用户账户
-	 */
-	private String userid;
-	/**
-	 * 操作详细日志
-	 */
-	private String logContent;
-
-	/**
-	 * 日志类型(1登录日志,2操作日志)
-	 */
-	@Dict(dicCode = "log_type")
-	private Integer logType;
-
-	/**
-	 * 操作类型(1查询,2添加,3修改,4删除,5导入,6导出)
-	 */
-	@Dict(dicCode = "operate_type")
-	private Integer operateType;
-
-}

+ 0 - 182
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysPermission.java

@@ -1,182 +0,0 @@
-package org.jeecg.modules.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecg.common.aspect.annotation.Dict;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 菜单权限表
- * </p>
- *
- * @Author scott
- * @since 2018-12-21
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class SysPermission implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * id
-	 */
-	@TableId(type = IdType.ID_WORKER_STR)
-	private String id;
-
-	/**
-	 * 父id
-	 */
-	private String parentId;
-
-	/**
-	 * 菜单名称
-	 */
-	private String name;
-
-	/**
-	 * 菜单权限编码,例如:“sys:schedule:list,sys:schedule:info”,多个逗号隔开
-	 */
-	private String perms;
-	/**
-	 * 权限策略1显示2禁用
-	 */
-	private String permsType;
-
-	/**
-	 * 菜单图标
-	 */
-	private String icon;
-
-	/**
-	 * 组件
-	 */
-	private String component;
-	
-	/**
-	 * 组件名字
-	 */
-	private String componentName;
-
-	/**
-	 * 路径
-	 */
-	private String url;
-	/**
-	 * 一级菜单跳转地址
-	 */
-	private String redirect;
-
-	/**
-	 * 菜单排序
-	 */
-	private Double sortNo;
-
-	/**
-	 * 类型(0:一级菜单;1:子菜单 ;2:按钮权限)
-	 */
-	@Dict(dicCode = "menu_type")
-	private Integer menuType;
-
-	/**
-	 * 是否叶子节点: 1:是  0:不是
-	 */
-	@TableField(value="is_leaf")
-	private boolean leaf;
-	
-	/**
-	 * 是否路由菜单: 0:不是  1:是(默认值1)
-	 */
-	@TableField(value="is_route")
-	private boolean route;
-
-
-	/**
-	 * 是否缓存页面: 0:不是  1:是(默认值1)
-	 */
-	@TableField(value="keep_alive")
-	private boolean keepAlive;
-
-	/**
-	 * 描述
-	 */
-	private String description;
-
-	/**
-	 * 创建人
-	 */
-	private String createBy;
-
-	/**
-	 * 删除状态 0正常 1已删除
-	 */
-	private Integer delFlag;
-	
-	/**
-	 * 是否配置菜单的数据权限 1是0否 默认0
-	 */
-	private Integer ruleFlag;
-	
-	/**
-	 * 是否隐藏路由菜单: 0否,1是(默认值0)
-	 */
-	private boolean hidden;
-
-	/**
-	 * 创建时间
-	 */
-	private Date createTime;
-
-	/**
-	 * 更新人
-	 */
-	private String updateBy;
-
-	/**
-	 * 更新时间
-	 */
-	private Date updateTime;
-	
-	/**按钮权限状态(0无效1有效)*/
-	private String status;
-	
-	/**alwaysShow*/
-    private boolean alwaysShow;
-
-	/*update_begin author:wuxianquan date:20190908 for:实体增加字段 */
-    /** 外链菜单打开方式 0/内部打开 1/外部打开 */
-    private boolean internalOrExternal;
-	/*update_end author:wuxianquan date:20190908 for:实体增加字段 */
-
-    public SysPermission() {
-    	
-    }
-    public SysPermission(boolean index) {
-    	if(index) {
-    		this.id = "9502685863ab87f0ad1134142788a385";
-        	this.name="首页";
-        	this.component="dashboard/Analysis";
-        	this.componentName="dashboard-analysis";
-        	this.url="/dashboard/analysis";
-        	this.icon="home";
-        	this.menuType=0;
-        	this.sortNo=0.0;
-        	this.ruleFlag=0;
-        	this.delFlag=0;
-        	this.alwaysShow=false;
-        	this.route=true;
-        	this.keepAlive=true;
-        	this.leaf=true;
-        	this.hidden=false;
-    	}
-    	
-    }
-}

+ 0 - 78
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysPermissionDataRule.java

@@ -1,78 +0,0 @@
-package org.jeecg.modules.system.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 菜单权限规则表
- * </p>
- *
- * @Author huangzhilin
- * @since 2019-03-29
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class SysPermissionDataRule implements Serializable {
-	
-	private static final long serialVersionUID = 1L;
-	
-	/**
-	 * id
-	 */
-	@TableId(type = IdType.UUID)
-	private String id;
-	
-	/**
-	 * 对应的菜单id
-	 */
-	private String permissionId;
-	
-	/**
-	 * 规则名称
-	 */
-	private String ruleName;
-	
-	/**
-	 * 字段
-	 */
-	private String ruleColumn;
-	
-	/**
-	 * 条件
-	 */
-	private String ruleConditions;
-	
-	/**
-	 * 规则值
-	 */
-	private String ruleValue;
-	
-	/**
-	 * 创建时间
-	 */
-	private Date createTime;
-	
-	/**
-	 * 创建人
-	 */
-	private String createBy;
-	
-	/**
-	 * 修改时间
-	 */
-	private Date updateTime;
-	
-	/**
-	 * 修改人
-	 */
-	private String updateBy;
-}

+ 0 - 90
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysPosition.java

@@ -1,90 +0,0 @@
-package org.jeecg.modules.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecg.common.aspect.annotation.Dict;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
-/**
- * @Description: 职务表
- * @Author: jeecg-boot
- * @Date: 2019-09-19
- * @Version: V1.0
- */
-@Data
-@TableName("sys_position")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "sys_position对象", description = "职务表")
-public class SysPosition {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.ID_WORKER_STR)
-    @ApiModelProperty(value = "id")
-    private String id;
-    /**
-     * 职务编码
-     */
-    @Excel(name = "职务编码", width = 15)
-    @ApiModelProperty(value = "职务编码")
-    private String code;
-    /**
-     * 职务名称
-     */
-    @Excel(name = "职务名称", width = 15)
-    @ApiModelProperty(value = "职务名称")
-    private String name;
-    /**
-     * 职级
-     */
-    @Excel(name = "职级", width = 15,dicCode ="position_rank")
-    @ApiModelProperty(value = "职级")
-    @Dict(dicCode = "position_rank")
-    private String postRank;
-    /**
-     * 公司id
-     */
-    @Excel(name = "公司id", width = 15)
-    @ApiModelProperty(value = "公司id")
-    private String companyId;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-    /**
-     * 创建时间
-     */
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "创建时间")
-    private java.util.Date createTime;
-    /**
-     * 修改人
-     */
-    @ApiModelProperty(value = "修改人")
-    private String updateBy;
-    /**
-     * 修改时间
-     */
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "修改时间")
-    private java.util.Date updateTime;
-    /**
-     * 组织机构编码
-     */
-    @Excel(name = "组织机构编码", width = 15)
-    @ApiModelProperty(value = "组织机构编码")
-    private String sysOrgCode;
-}

+ 0 - 79
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysRole.java

@@ -1,79 +0,0 @@
-package org.jeecg.modules.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 角色表
- * </p>
- *
- * @Author scott
- * @since 2018-12-19
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class SysRole implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.ID_WORKER_STR)
-    private String id;
-    
-    /**
-     * 角色名称
-     */
-    @Excel(name="角色名",width=15)
-    private String roleName;
-    
-    /**
-     * 角色编码
-     */
-    @Excel(name="角色编码",width=15)
-    private String roleCode;
-    
-    /**
-          * 描述
-     */
-    @Excel(name="描述",width=60)
-    private String description;
-
-    /**
-     * 创建人
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    /**
-     * 更新人
-     */
-    private String updateBy;
-
-    /**
-     * 更新时间
-     */
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-
-}

+ 0 - 55
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysRolePermission.java

@@ -1,55 +0,0 @@
-package org.jeecg.modules.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 角色权限表
- * </p>
- *
- * @Author scott
- * @since 2018-12-21
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class SysRolePermission implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.ID_WORKER_STR)
-    private String id;
-    
-    /**
-     * 角色id
-     */
-    private String roleId;
-
-    /**
-     * 权限id
-     */
-    private String permissionId;
-    
-    /**
-     * 数据权限
-     */
-    private String dataRuleIds;
-
-    public SysRolePermission() {
-   	}
-       
-   	public SysRolePermission(String roleId, String permissionId) {
-   		this.roleId = roleId;
-   		this.permissionId = permissionId;
-   	}
-
-}

+ 0 - 75
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysUserAgent.java

@@ -1,75 +0,0 @@
-package org.jeecg.modules.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @Description: 用户代理人设置
- * @Author: jeecg-boot
- * @Date:  2019-04-17
- * @Version: V1.0
- */
-@Data
-@TableName("sys_user_agent")
-public class SysUserAgent implements Serializable {
-    private static final long serialVersionUID = 1L;
-    
-	/**序号*/
-	@TableId(type = IdType.ID_WORKER_STR)
-	private String id;
-	/**用户名*/
-	@Excel(name = "用户名", width = 15)
-	private String userName;
-	/**代理人用户名*/
-	@Excel(name = "代理人用户名", width = 15)
-	private String agentUserName;
-	/**代理开始时间*/
-	@Excel(name = "代理开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private Date startTime;
-	/**代理结束时间*/
-	@Excel(name = "代理结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private Date endTime;
-	/**状态0无效1有效*/
-	@Excel(name = "状态0无效1有效", width = 15)
-	private String status;
-	/**创建人名称*/
-	@Excel(name = "创建人名称", width = 15)
-	private String createName;
-	/**创建人登录名称*/
-	@Excel(name = "创建人登录名称", width = 15)
-	private String createBy;
-	/**创建日期*/
-	@Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private Date createTime;
-	/**更新人名称*/
-	@Excel(name = "更新人名称", width = 15)
-	private String updateName;
-	/**更新人登录名称*/
-	@Excel(name = "更新人登录名称", width = 15)
-	private String updateBy;
-	/**更新日期*/
-	@Excel(name = "更新日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private Date updateTime;
-	/**所属部门*/
-	@Excel(name = "所属部门", width = 15)
-	private String sysOrgCode;
-	/**所属公司*/
-	@Excel(name = "所属公司", width = 15)
-	private String sysCompanyCode;
-}

+ 0 - 33
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysUserDepart.java

@@ -1,33 +0,0 @@
-package org.jeecg.modules.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-@TableName("sys_user_depart")
-public class SysUserDepart implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	/**主键id*/
-    @TableId(type = IdType.ID_WORKER_STR)
-	private String id;
-	/**用户id*/
-	private String userId;
-	/**部门id*/
-	private String depId;
-	public SysUserDepart(String id, String userId, String depId) {
-		super();
-		this.id = id;
-		this.userId = userId;
-		this.depId = depId;
-	}
-
-	public SysUserDepart(String id, String departId) {
-		this.userId = id;
-		this.depId = departId;
-	}
-}

+ 0 - 49
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/SysUserRole.java

@@ -1,49 +0,0 @@
-package org.jeecg.modules.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 用户角色表
- * </p>
- *
- * @Author scott
- * @since 2018-12-21
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class SysUserRole implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(type = IdType.ID_WORKER_STR)
-    private String id;
-    
-    /**
-     * 用户id
-     */
-    private String userId;
-
-    /**
-     * 角色id
-     */
-    private String roleId;
-
-	public SysUserRole() {
-	}
-
-	public SysUserRole(String userId, String roleId) {
-		this.userId = userId;
-		this.roleId = roleId;
-	}
-
-    
-
-}

+ 0 - 65
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/entity/UserCompany.java

@@ -1,65 +0,0 @@
-package org.jeecg.modules.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.util.Date;
-
-/**
- * 用户够公司
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-11-14
- */
-@Data
-@TableName("user_company")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "user_company对象", description = "用户够公司")
-public class UserCompany {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.UUID)
-    @ApiModelProperty(value = "id")
-    private String id;
-    /**
-     * 用户id
-     */
-    @Excel(name = "用户id", width = 15)
-    @ApiModelProperty(value = "用户id")
-    private String userId;
-    /**
-     * 用户名称
-     */
-    @Excel(name = "用户名称", width = 15)
-    @ApiModelProperty(value = "用户名称")
-    private String userName;
-    /**
-     * 部门id
-     */
-    @Excel(name = "部门id", width = 15)
-    @ApiModelProperty(value = "部门id")
-    private String companyId;
-    /**
-     * 公司名称
-     */
-    @Excel(name = "公司名称", width = 15)
-    @ApiModelProperty(value = "公司名称")
-    private String companyName;
-
-
-    private Date createTime;
-    private Date updateTime;
-
-
-}

+ 0 - 52
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/model/AnnouncementSendModel.java

@@ -1,52 +0,0 @@
-package org.jeecg.modules.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-
-/**
- * @Description: 用户通告阅读标记表
- * @Author: jeecg-boot
- * @Date:  2019-02-21
- * @Version: V1.0
- */
-@Data
-@TableName("sys_announcement_send")
-public class AnnouncementSendModel implements Serializable {
-    private static final long serialVersionUID = 1L;
-    
-	/**id*/
-	@TableId(type = IdType.UUID)
-	private String id;
-	/**通告id*/
-	private String anntId;
-	/**用户id*/
-	private String userId;
-	/**标题*/
-	private String titile;
-	/**内容*/
-	private String msgContent;
-	/**发布人*/
-	private String sender;
-	/**优先级(L低,M中,H高)*/
-	private String priority;
-	/**阅读状态*/
-	private String readFlag;
-	/**发布时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private java.util.Date sendTime;
-	/**页数*/
-	private Integer pageNo;
-	/**大小*/
-	private Integer pageSize;
-    /**
-     * 消息类型1:通知公告2:系统消息
-     */
-    private String msgCategory;
-}

+ 0 - 64
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/model/DepartIdModel.java

@@ -1,64 +0,0 @@
-package org.jeecg.modules.system.model;
-
-import lombok.Data;
-import org.jeecg.modules.system.entity.SysDepart;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * <p>
- * 部门表 封装树结构的部门的名称的实体类
- * <p>
- *
- * @author Steve
- * @since 2019-01-22
- *
- */
-@Data
-public class DepartIdModel implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键ID
-     */
-    private String key;
-
-    /**
-     * 主键ID
-     */
-    private String value;
-
-    /**
-     * 部门名称
-     */
-    private String title;
-    
-    List<DepartIdModel> children = new ArrayList<>();
-    
-    /**
-     * 将SysDepartTreeModel的部分数据放在该对象当中
-     * @param treeModel 树状结构
-     * @return 部门信息
-     */
-    public DepartIdModel convert(SysDepartTreeModel treeModel) {
-        this.key = treeModel.getId();
-        this.value = treeModel.getId();
-        this.title = treeModel.getDepartName();
-        return this;
-    }
-    
-    /**
-     * 该方法为用户部门的实现类所使用
-     * @param sysDepart 系统部门信息
-     * @return 部门信息
-     */
-    public DepartIdModel convertByUserDepart(SysDepart sysDepart) {
-        this.key = sysDepart.getId();
-        this.value = sysDepart.getId();
-        this.title = sysDepart.getDepartName();
-        return this;
-    }
-}

+ 0 - 45
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/model/DuplicateCheckVo.java

@@ -1,45 +0,0 @@
-package org.jeecg.modules.system.model;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @Title: DuplicateCheckVo
- * @Description: 重复校验VO
- * @Author 张代浩
- * @Date 2019-03-25
- * @Version V1.0
- */
-@Data
-@ApiModel(value="重复校验数据模型",description="重复校验数据模型")
-public class DuplicateCheckVo implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * 表名
-	 */
-	@ApiModelProperty(value="表名",name="tableName",example="sys_log")
-	private String tableName;
-	
-	/**
-	 * 字段名
-	 */
-	@ApiModelProperty(value="字段名",name="fieldName",example="id")
-	private String fieldName;
-	
-	/**
-	 * 字段值
-	 */
-	@ApiModelProperty(value="字段值",name="fieldVal",example="1000")
-	private String fieldVal;
-	
-	/**
-	 * 数据ID
-	*/
-	@ApiModelProperty(value="数据ID",name="dataId",example="2000")
-	private String dataId;
-
-}

+ 0 - 371
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java

@@ -1,371 +0,0 @@
-package org.jeecg.modules.system.model;
-
-import org.jeecg.modules.system.entity.SysDepart;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * <p>
- * 部门表 存储树结构数据的实体类
- * <p>
- * 
- * @Author Steve
- * @Since 2019-01-22 
- */
-public class SysDepartTreeModel implements Serializable{
-	
-    private static final long serialVersionUID = 1L;
-    
-    /** 对应SysDepart中的id字段,前端数据树中的key*/
-    private String key;
-
-    /** 对应SysDepart中的id字段,前端数据树中的value*/
-    private String value;
-
-    /** 对应depart_name字段,前端数据树中的title*/
-    private String title;
-
-
-    private boolean isLeaf;
-    // 以下所有字段均与SysDepart相同
-    
-    private String id;
-
-    private String parentId;
-
-    private String departName;
-
-    private String departNameEn;
-
-    private String departNameAbbr;
-
-    private Integer departOrder;
-
-    private String description;
-
-    private String orgCategory;
-
-    private String orgType;
-
-    private String orgCode;
-
-    private String mobile;
-
-    private String fax;
-
-    private String address;
-
-    private String memo;
-
-    private String status;
-
-    private String delFlag;
-
-    private String createBy;
-
-    private Date createTime;
-
-    private String updateBy;
-
-    private Date updateTime;
-
-    private List<SysDepartTreeModel> children = new ArrayList<>();
-
-
-    /**
-     * 将SysDepart对象转换成SysDepartTreeModel对象
-     * @param sysDepart
-     */
-	public SysDepartTreeModel(SysDepart sysDepart) {
-		this.key = sysDepart.getId();
-        this.value = sysDepart.getId();
-        this.title = sysDepart.getDepartName();
-        this.id = sysDepart.getId();
-        this.parentId = sysDepart.getParentId();
-        this.departName = sysDepart.getDepartName();
-        this.departNameEn = sysDepart.getDepartNameEn();
-        this.departNameAbbr = sysDepart.getDepartNameAbbr();
-        this.departOrder = sysDepart.getDepartOrder();
-        this.description = sysDepart.getDescription();
-        this.orgCategory = sysDepart.getOrgCategory();
-        this.orgType = sysDepart.getOrgType();
-        this.orgCode = sysDepart.getOrgCode();
-        this.mobile = sysDepart.getMobile();
-        this.fax = sysDepart.getFax();
-        this.address = sysDepart.getAddress();
-        this.memo = sysDepart.getMemo();
-        this.status = sysDepart.getStatus();
-        this.delFlag = sysDepart.getDelFlag();
-        this.createBy = sysDepart.getCreateBy();
-        this.createTime = sysDepart.getCreateTime();
-        this.updateBy = sysDepart.getUpdateBy();
-        this.updateTime = sysDepart.getUpdateTime();
-    }
-
-    public boolean getIsLeaf() {
-        return isLeaf;
-    }
-
-    public void setIsLeaf(boolean isleaf) {
-         this.isLeaf = isleaf;
-    }
-
-    public String getKey() {
-		return key;
-	}
-
-
-	public void setKey(String key) {
-		this.key = key;
-	}
-
-
-	public String getValue() {
-		return value;
-	}
-
-
-	public void setValue(String value) {
-		this.value = value;
-	}
-
-
-	public String getTitle() {
-		return title;
-	}
-
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-
-	public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public List<SysDepartTreeModel> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<SysDepartTreeModel> children) {
-        if (children==null){
-            this.isLeaf=true;
-        }
-        this.children = children;
-    }
-
-    public String getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(String parentId) {
-        this.parentId = parentId;
-    }
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public String getDepartName() {
-        return departName;
-    }
-
-    public void setDepartName(String departName) {
-        this.departName = departName;
-    }
-
-    public String getOrgCategory() {
-		return orgCategory;
-	}
-
-	public void setOrgCategory(String orgCategory) {
-		this.orgCategory = orgCategory;
-	}
-
-    public String getOrgType() {
-        return orgType;
-    }
-
-    public void setOrgType(String orgType) {
-        this.orgType = orgType;
-    }
-
-    public String getOrgCode() {
-        return orgCode;
-    }
-
-    public void setOrgCode(String orgCode) {
-        this.orgCode = orgCode;
-    }
-
-    public String getMobile() {
-        return mobile;
-    }
-
-    public void setMobile(String mobile) {
-        this.mobile = mobile;
-    }
-
-    public String getFax() {
-        return fax;
-    }
-
-    public void setFax(String fax) {
-        this.fax = fax;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public String getDepartNameEn() {
-        return departNameEn;
-    }
-
-    public void setDepartNameEn(String departNameEn) {
-        this.departNameEn = departNameEn;
-    }
-
-    public String getDepartNameAbbr() {
-        return departNameAbbr;
-    }
-
-    public void setDepartNameAbbr(String departNameAbbr) {
-        this.departNameAbbr = departNameAbbr;
-    }
-
-    public Integer getDepartOrder() {
-        return departOrder;
-    }
-
-    public void setDepartOrder(Integer departOrder) {
-        this.departOrder = departOrder;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getDelFlag() {
-        return delFlag;
-    }
-
-    public void setDelFlag(String delFlag) {
-        this.delFlag = delFlag;
-    }
-
-    public String getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(String createBy) {
-        this.createBy = createBy;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(String updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public SysDepartTreeModel() { }
-
-    /**
-     * 重写equals方法
-     */
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-			return true;
-		}
-        if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-        SysDepartTreeModel model = (SysDepartTreeModel) o;
-        return Objects.equals(id, model.id) &&
-                Objects.equals(parentId, model.parentId) &&
-                Objects.equals(departName, model.departName) &&
-                Objects.equals(departNameEn, model.departNameEn) &&
-                Objects.equals(departNameAbbr, model.departNameAbbr) &&
-                Objects.equals(departOrder, model.departOrder) &&
-                Objects.equals(description, model.description) &&
-                Objects.equals(orgCategory, model.orgCategory) &&
-                Objects.equals(orgType, model.orgType) &&
-                Objects.equals(orgCode, model.orgCode) &&
-                Objects.equals(mobile, model.mobile) &&
-                Objects.equals(fax, model.fax) &&
-                Objects.equals(address, model.address) &&
-                Objects.equals(memo, model.memo) &&
-                Objects.equals(status, model.status) &&
-                Objects.equals(delFlag, model.delFlag) &&
-                Objects.equals(createBy, model.createBy) &&
-                Objects.equals(createTime, model.createTime) &&
-                Objects.equals(updateBy, model.updateBy) &&
-                Objects.equals(updateTime, model.updateTime) &&
-                Objects.equals(children, model.children);
-    }
-    
-    /**
-     * 重写hashCode方法
-     */
-    @Override
-    public int hashCode() {
-
-        return Objects.hash(id, parentId, departName, departNameEn, departNameAbbr,
-        		departOrder, description, orgCategory, orgType, orgCode, mobile, fax, address,
-        		memo, status, delFlag, createBy, createTime, updateBy, updateTime, 
-        		children);
-    }
-
-}

+ 0 - 45
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/model/SysDictPage.java

@@ -1,45 +0,0 @@
-package org.jeecg.modules.system.model;
-
-import lombok.Data;
-import org.jeecg.modules.system.entity.SysDictItem;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecgframework.poi.excel.annotation.ExcelCollection;
-
-import java.util.List;
-
-/**
- * @author jeecg-boot
- * 2019年12月5日19:57:58
- */
-@Data
-public class SysDictPage {
-
-    /**
-     * 主键
-     */
-    private String id;
-    /**
-     * 字典名称
-     */
-    @Excel(name = "字典名称", width = 20)
-    private String dictName;
-
-    /**
-     * 字典编码
-     */
-    @Excel(name = "字典编码", width = 30)
-    private String dictCode;
-    /**
-     * 删除状态
-     */
-    private Integer delFlag;
-    /**
-     * 描述
-     */
-    @Excel(name = "描述", width = 30)
-    private String description;
-
-    @ExcelCollection(name = "字典列表")
-    private List<SysDictItem> sysDictItemList;
-
-}

+ 0 - 94
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/model/SysDictTree.java

@@ -1,94 +0,0 @@
-package org.jeecg.modules.system.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecg.modules.system.entity.SysDict;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 字典表
- * </p>
- *
- * @Author zhangweijian
- * @since 2018-12-28
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class SysDictTree implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private String key;
-	
-	private String title;
-	
-    /**
-     * id
-     */
-    @TableId(type = IdType.ID_WORKER_STR)
-    private String id;
-    /**
-     * 字典类型,0 string,1 number类型,2 boolean
-     * 前端js对stirng类型和number类型 boolean 类型敏感,需要区分。在select 标签匹配的时候会用到
-     * 默认为string类型
-     */
-    private Integer type;
-    
-    /**
-     * 字典名称
-     */
-    private String dictName;
-
-    /**
-     * 字典编码
-     */
-    private String dictCode;
-
-    /**
-     * 描述
-     */
-    private String description;
-
-    /**
-     * 删除状态
-     */
-    private Integer delFlag;
-
-    /**
-     * 创建人
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 更新人
-     */
-    private String updateBy;
-
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
-    
-    public SysDictTree(SysDict node) {
-    	this.id = node.getId();
-		this.key = node.getId();
-		this.title = node.getDictName();
-		this.dictCode = node.getDictCode();
-		this.description = node.getDescription();
-		this.delFlag = node.getDelFlag();
-		this.type = node.getType();
-	}
-    
-}

+ 0 - 28
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/model/SysLoginModel.java

@@ -1,28 +0,0 @@
-package org.jeecg.modules.system.model;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 登录表单
- *
- * @Author scott
- * @since  2019-01-18
- */
-@Data
-@ApiModel(value="登录对象", description="登录对象")
-public class SysLoginModel {
-	@ApiModelProperty(value = "账号")
-    private String username;
-	@ApiModelProperty(value = "密码")
-    private String password;
-	@ApiModelProperty(value = "验证码")
-    private String captcha;
-	@ApiModelProperty(value = "滑块验证")
-    private Boolean slidered;
-	@ApiModelProperty(value = "验证码key")
-    private String checkKey;
-
-
-}

+ 0 - 395
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/model/SysPermissionTree.java

@@ -1,395 +0,0 @@
-package org.jeecg.modules.system.model;
-
-import org.jeecg.modules.system.entity.SysPermission;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-public class SysPermissionTree implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * id
-	 */
-	private String id;
-
-	private String key;
-	private String title;
-
-	/**
-	 * 父id
-	 */
-	private String parentId;
-
-	/**
-	 * 菜单名称
-	 */
-	private String name;
-
-	/**
-	 * 菜单权限编码
-	 */
-	private String perms;
-	/**
-	 * 权限策略1显示2禁用
-	 */
-	private String permsType;
-
-	/**
-	 * 菜单图标
-	 */
-	private String icon;
-
-	/**
-	 * 组件
-	 */
-	private String component;
-
-	/**
-	 * 跳转网页链接
-	 */
-	private String url;
-	
-	/**
-	 * 一级菜单跳转地址
-	 */
-	private String redirect;
-
-	/**
-	 * 菜单排序
-	 */
-	private Double sortNo;
-
-	/**
-	 * 类型(0:一级菜单;1:子菜单 ;2:按钮权限)
-	 */
-	private Integer menuType;
-
-	/**
-	 * 是否叶子节点: 1:是 0:不是
-	 */
-	private boolean isLeaf;
-	
-	/**
-	 * 是否路由菜单: 0:不是  1:是(默认值1)
-	 */
-	private boolean route;
-
-
-	/**
-	 * 是否路缓存页面: 0:不是  1:是(默认值1)
-	 */
-	private boolean keepAlive;
-
-
-	/**
-	 * 描述
-	 */
-	private String description;
-
-	/**
-	 * 删除状态 0正常 1已删除
-	 */
-	private Integer delFlag;
-
-	/**
-	 * 创建人
-	 */
-	private String createBy;
-
-	/**
-	 * 创建时间
-	 */
-	private Date createTime;
-
-	/**
-	 * 更新人
-	 */
-	private String updateBy;
-
-	/**
-	 * 更新时间
-	 */
-	private Date updateTime;
-
-	/**alwaysShow*/
-    private boolean alwaysShow;
-    /**是否隐藏路由菜单: 0否,1是(默认值0)*/
-    private boolean hidden;
-    
-    /**按钮权限状态(0无效1有效)*/
-	private String status;
-
-	/*update_begin author:wuxianquan date:20190908 for:model增加字段 */
-	/** 外链菜单打开方式 0/内部打开 1/外部打开 */
-	private boolean internalOrExternal;
-	/*update_end author:wuxianquan date:20190908 for:model增加字段 */
-
-
-	public SysPermissionTree() {
-	}
-
-	public SysPermissionTree(SysPermission permission) {
-		this.key = permission.getId();
-		this.id = permission.getId();
-		this.perms = permission.getPerms();
-		this.permsType = permission.getPermsType();
-		this.component = permission.getComponent();
-		this.createBy = permission.getCreateBy();
-		this.createTime = permission.getCreateTime();
-		this.delFlag = permission.getDelFlag();
-		this.description = permission.getDescription();
-		this.icon = permission.getIcon();
-		this.isLeaf = permission.isLeaf();
-		this.menuType = permission.getMenuType();
-		this.name = permission.getName();
-		this.parentId = permission.getParentId();
-		this.sortNo = permission.getSortNo();
-		this.updateBy = permission.getUpdateBy();
-		this.updateTime = permission.getUpdateTime();
-		this.redirect = permission.getRedirect();
-		this.url = permission.getUrl();
-		this.hidden = permission.isHidden();
-		this.route = permission.isRoute();
-		this.keepAlive = permission.isKeepAlive();
-		this.alwaysShow= permission.isAlwaysShow();
-		/*update_begin author:wuxianquan date:20190908 for:赋值 */
-		this.internalOrExternal = permission.isInternalOrExternal();
-		/*update_end author:wuxianquan date:20190908 for:赋值 */
-		this.title=permission.getName();
-		if (!permission.isLeaf()) {
-			this.children = new ArrayList<SysPermissionTree>();
-		}
-		this.status = permission.getStatus();
-	}
-
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-	private List<SysPermissionTree> children;
-
-	public boolean isLeaf() {
-		return isLeaf;
-	}
-
-	public void setLeaf(boolean leaf) {
-		isLeaf = leaf;
-	}
-
-	public boolean isKeepAlive() {
-		return keepAlive;
-	}
-
-	public void setKeepAlive(boolean keepAlive) {
-		this.keepAlive = keepAlive;
-	}
-
-	public boolean isAlwaysShow() {
-		return alwaysShow;
-	}
-
-	public void setAlwaysShow(boolean alwaysShow) {
-		this.alwaysShow = alwaysShow;
-	}
-	public List<SysPermissionTree> getChildren() {
-		return children;
-	}
-
-	public void setChildren(List<SysPermissionTree> children) {
-		this.children = children;
-	}
-
-	public String getRedirect() {
-		return redirect;
-	}
-
-	public void setRedirect(String redirect) {
-		this.redirect = redirect;
-	}
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getParentId() {
-		return parentId;
-	}
-
-	public void setParentId(String parentId) {
-		this.parentId = parentId;
-	}
-
-	public boolean isHidden() {
-		return hidden;
-	}
-
-	public void setHidden(boolean hidden) {
-		this.hidden = hidden;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getIcon() {
-		return icon;
-	}
-
-	public void setIcon(String icon) {
-		this.icon = icon;
-	}
-
-	public String getComponent() {
-		return component;
-	}
-
-	public void setComponent(String component) {
-		this.component = component;
-	}
-
-	public String getUrl() {
-		return url;
-	}
-
-	public void setUrl(String url) {
-		this.url = url;
-	}
-
-	public Double getSortNo() {
-		return sortNo;
-	}
-
-	public void setSortNo(Double sortNo) {
-		this.sortNo = sortNo;
-	}
-
-	public Integer getMenuType() {
-		return menuType;
-	}
-
-	public void setMenuType(Integer menuType) {
-		this.menuType = menuType;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public boolean isRoute() {
-		return route;
-	}
-
-	public void setRoute(boolean route) {
-		this.route = route;
-	}
-
-	public Integer getDelFlag() {
-		return delFlag;
-	}
-
-	public void setDelFlag(Integer delFlag) {
-		this.delFlag = delFlag;
-	}
-
-	public String getCreateBy() {
-		return createBy;
-	}
-
-	public void setCreateBy(String createBy) {
-		this.createBy = createBy;
-	}
-
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getUpdateBy() {
-		return updateBy;
-	}
-
-	public void setUpdateBy(String updateBy) {
-		this.updateBy = updateBy;
-	}
-
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public String getKey() {
-		return key;
-	}
-
-	public void setKey(String key) {
-		this.key = key;
-	}
-
-	public String getPerms() {
-		return perms;
-	}
-
-	public void setPerms(String perms) {
-		this.perms = perms;
-	}
-
-	public boolean getIsLeaf() {
-		return isLeaf;
-	}
-
-	public void setIsLeaf(boolean isLeaf) {
-		this.isLeaf = isLeaf;
-	}
-
-	public String getPermsType() {
-		return permsType;
-	}
-
-	public void setPermsType(String permsType) {
-		this.permsType = permsType;
-	}
-
-	public String getStatus() {
-		return status;
-	}
-
-	public void setStatus(String status) {
-		this.status = status;
-	}
-
-	/*update_begin author:wuxianquan date:20190908 for:get set方法 */
-	public boolean isInternalOrExternal() {
-		return internalOrExternal;
-	}
-
-	public void setInternalOrExternal(boolean internalOrExternal) {
-		this.internalOrExternal = internalOrExternal;
-	}
-	/*update_end author:wuxianquan date:20190908 for:get set 方法 */
-}

+ 0 - 34
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/model/SysUserDepartsVO.java

@@ -1,34 +0,0 @@
-package org.jeecg.modules.system.model;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @author jeecg-boot
- * 2019年12月5日19:57:58
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@NoArgsConstructor
-public class SysUserDepartsVO implements Serializable{
-    private static final long serialVersionUID = 1L;
-
-    /**用户id*/
-    private String userId;
-    /**对应的部门id集合*/
-    private List<String> departIdList;
-
-    public SysUserDepartsVO(String userId, List<String> departIdList) {
-        super();
-        this.userId = userId;
-        this.departIdList = departIdList;
-    }
-
-
-}

+ 0 - 176
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/model/TreeModel.java

@@ -1,176 +0,0 @@
-package org.jeecg.modules.system.model;
-
-import org.jeecg.modules.system.entity.SysPermission;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author jeecg-boot
- * 2019年11月12日11:09:37
- */
-
-public class TreeModel implements Serializable {
-
-	private static final long serialVersionUID = 4013193970046502756L;
-
-	private String key;
-
-	private String title;
-
-	private String slotTitle;
-
-	private boolean isLeaf;
-
-	private String icon;
-
-	private Integer ruleFlag;
-
-	private Map<String,String> scopedSlots;
-
-	public Map<String, String> getScopedSlots() {
-		return scopedSlots;
-	}
-
-	public void setScopedSlots(Map<String, String> scopedSlots) {
-		this.scopedSlots = scopedSlots;
-	}
-
-	public String getKey() {
-		return key;
-	}
-
-	public void setKey(String key) {
-		this.key = key;
-	}
-
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-	public boolean getIsLeaf() {
-		return isLeaf;
-	}
-
-	public void setIsLeaf(boolean isLeaf) {
-		this.isLeaf = isLeaf;
-	}
-
-	public String getIcon() {
-		return icon;
-	}
-
-	public void setIcon(String icon) {
-		this.icon = icon;
-	}
-
-	private List<TreeModel> children;
-
-	public List<TreeModel> getChildren() {
-		return children;
-	}
-
-	public void setChildren(List<TreeModel> children) {
-		this.children = children;
-	}
-
-	public TreeModel() {
-
-	}
-
-	public TreeModel(SysPermission permission) {
-		this.key = permission.getId();
-		this.icon = permission.getIcon();
-		this.parentId = permission.getParentId();
-		this.title = permission.getName();
-		this.slotTitle =  permission.getName();
-		this.value = permission.getId();
-		this.isLeaf = permission.isLeaf();
-		this.label = permission.getName();
-		if(!permission.isLeaf()) {
-			this.children = new ArrayList<TreeModel>();
-		}
-	}
-
-	 public TreeModel(String key,String parentId,String slotTitle,Integer ruleFlag,boolean isLeaf) {
-    	this.key = key;
-    	this.parentId = parentId;
-    	this.ruleFlag=ruleFlag;
-    	this.slotTitle =  slotTitle;
-    	Map<String,String> map = new HashMap<String,String>();
-    	map.put("title", "hasDatarule");
-    	this.scopedSlots = map;
-    	this.isLeaf = isLeaf;
-    	this.value = key;
-    	if(!isLeaf) {
-    		this.children = new ArrayList<TreeModel>();
-    	}
-    }
-
-    private String parentId;
-
-    private String label;
-
-    private String value;
-
-
-    public String getParentId() {
-		return parentId;
-	}
-
-	public void setParentId(String parentId) {
-		this.parentId = parentId;
-	}
-
-	/**
-	 * @return the label
-	 */
-	public String getLabel() {
-		return label;
-	}
-
-	/**
-	 * @param label the label to set
-	 */
-	public void setLabel(String label) {
-		this.label = label;
-	}
-
-	/**
-	 * @return the value
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * @param value the value to set
-	 */
-	public void setValue(String value) {
-		this.value = value;
-	}
-
-	public String getSlotTitle() {
-		return slotTitle;
-	}
-
-	public void setSlotTitle(String slotTitle) {
-		this.slotTitle = slotTitle;
-	}
-
-	public Integer getRuleFlag() {
-		return ruleFlag;
-	}
-
-	public void setRuleFlag(Integer ruleFlag) {
-		this.ruleFlag = ruleFlag;
-	}
-
-}

+ 0 - 93
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/model/TreeSelectModel.java

@@ -1,93 +0,0 @@
-package org.jeecg.modules.system.model;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
-  * 树形下拉框
- */
-public class TreeSelectModel implements Serializable {
-
-	private static final long serialVersionUID = 9016390975325574747L;
-
-	private String key;
-	
-	private String title;
-	
-	private boolean isLeaf;
-	
-	private String icon;
-	
-	private String parentId;
-	
-	private String value;
-	
-	private String code;
-	
-	public String getValue() {
-		return value;
-	}
-
-	public void setValue(String value) {
-		this.value = value;
-	}
-
-	public String getParentId() {
-		return parentId;
-	}
-
-	public void setParentId(String parentId) {
-		this.parentId = parentId;
-	}
-
-	public String getKey() {
-		return key;
-	}
-
-	public void setKey(String key) {
-		this.key = key;
-	}
-
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-	public boolean isLeaf() {
-		return isLeaf;
-	}
-
-	public void setLeaf(boolean isLeaf) {
-		this.isLeaf = isLeaf;
-	}
-
-	public String getIcon() {
-		return icon;
-	}
-
-	public void setIcon(String icon) {
-		this.icon = icon;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-	
-	private List<TreeSelectModel> children;
-
-	public List<TreeSelectModel> getChildren() {
-		return children;
-	}
-
-	public void setChildren(List<TreeSelectModel> children) {
-		this.children = children;
-	}
-
-}

+ 0 - 28
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/vo/SysDepartUsersVO.java

@@ -1,28 +0,0 @@
-package org.jeecg.modules.system.vo;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-@Data
-public class SysDepartUsersVO implements Serializable{
-	private static final long serialVersionUID = 1L;
-	
-	/**部门id*/
-	private String depId;
-	/**对应的用户id集合*/
-	private List<String> userIdList;
-	public SysDepartUsersVO(String depId, List<String> userIdList) {
-		super();
-		this.depId = depId;
-		this.userIdList = userIdList;
-	}
-    //update-begin--Author:kangxiaolin  Date:20190908 for:[512][部门管理]点击添加已有用户失败修复--------------------
-
-	public SysDepartUsersVO(){
-
-	}
-    //update-begin--Author:kangxiaolin  Date:20190908 for:[512][部门管理]点击添加已有用户失败修复--------------------
-
-}

+ 0 - 41
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/vo/SysDictPage.java

@@ -1,41 +0,0 @@
-package org.jeecg.modules.system.vo;
-
-import lombok.Data;
-import org.jeecg.modules.system.entity.SysDictItem;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecgframework.poi.excel.annotation.ExcelCollection;
-
-import java.util.List;
-
-@Data
-public class SysDictPage {
-
-    /**
-     * 主键
-     */
-    private String id;
-    /**
-     * 字典名称
-     */
-    @Excel(name = "字典名称", width = 20)
-    private String dictName;
-
-    /**
-     * 字典编码
-     */
-    @Excel(name = "字典编码", width = 30)
-    private String dictCode;
-    /**
-     * 删除状态
-     */
-    private Integer delFlag;
-    /**
-     * 描述
-     */
-    @Excel(name = "描述", width = 30)
-    private String description;
-
-    @ExcelCollection(name = "字典列表")
-    private List<SysDictItem> sysDictItemList;
-
-}

+ 0 - 27
jeecg-boot-base-common/src/main/java/org/jeecg/modules/system/vo/SysUserRoleVO.java

@@ -1,27 +0,0 @@
-package org.jeecg.modules.system.vo;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-@Data
-public class SysUserRoleVO implements Serializable{
-	private static final long serialVersionUID = 1L;
-
-	/**部门id*/
-	private String roleId;
-	/**对应的用户id集合*/
-	private List<String> userIdList;
-
-	public SysUserRoleVO() {
-		super();
-	}
-
-	public SysUserRoleVO(String roleId, List<String> userIdList) {
-		super();
-		this.roleId = roleId;
-		this.userIdList = userIdList;
-	}
-
-}

+ 17 - 8
jeecg-boot-module-activiti/pom.xml

@@ -1,15 +1,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-<modelVersion>4.0.0</modelVersion>
-<artifactId>jeecg-boot-module-activiti</artifactId>
-<version>2.2.0</version>
-
-<parent>
-    <groupId>org.jeecgframework.boot</groupId>
-    <artifactId>jeecg-boot-parent</artifactId>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>jeecg-boot-module-activiti</artifactId>
     <version>2.2.0</version>
     <version>2.2.0</version>
-</parent>
+    <parent>
+        <groupId>org.jeecgframework.boot</groupId>
+        <artifactId>jeecg-boot-parent</artifactId>
+        <version>2.0.2</version>
+    </parent>
 
 
 <repositories>
 <repositories>
     <repository>
     <repository>
@@ -37,6 +36,16 @@
         <groupId>org.jeecgframework.boot</groupId>
         <groupId>org.jeecgframework.boot</groupId>
         <artifactId>jeecg-boot-base-common</artifactId>
         <artifactId>jeecg-boot-base-common</artifactId>
     </dependency>
     </dependency>
+    <dependency>
+        <groupId>cn.com.ctop</groupId>
+        <artifactId>module-common</artifactId>
+        <version>2.0.2</version>
+    </dependency>
+    <dependency>
+        <groupId>org.eclipse.persistence</groupId>
+        <artifactId>org.eclipse.persistence.jpa</artifactId>
+        <version>2.6.0</version>
+    </dependency>
     <!--<dependency>
     <!--<dependency>
         <groupId>org.activiti</groupId>
         <groupId>org.activiti</groupId>
         <artifactId>activiti-spring</artifactId>
         <artifactId>activiti-spring</artifactId>

+ 2 - 7
jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/service/Impl/ActZprocessServiceImpl.java

@@ -20,7 +20,7 @@ import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.activiti.engine.task.Task;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.exception.JeecgBootException;
-import org.jeecg.common.system.api.ISysBaseAPI;
+import org.jeecg.common.system.api.ISysBaseApi;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.common.util.SpringContextUtils;
@@ -32,8 +32,6 @@ import org.springframework.mail.SimpleMailMessage;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
 import java.util.Collection;
 import java.util.Collection;
 import java.util.LinkedHashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.List;
@@ -63,10 +61,8 @@ public class ActZprocessServiceImpl extends ServiceImpl<ActZprocessMapper, ActZp
     private ActNodeServiceImpl actNodeService;
     private ActNodeServiceImpl actNodeService;
     @Autowired
     @Autowired
     private ActBusinessServiceImpl actBusinessService;
     private ActBusinessServiceImpl actBusinessService;
-    @PersistenceContext
-    private EntityManager entityManager;
     @Autowired
     @Autowired
-    private ISysBaseAPI sysBaseAPI;
+    private ISysBaseApi sysBaseAPI;
 
 
     /**
     /**
      * 通过key设置所有版本为旧
      * 通过key设置所有版本为旧
@@ -273,7 +269,6 @@ public class ActZprocessServiceImpl extends ServiceImpl<ActZprocessMapper, ActZp
         set.addAll(list);
         set.addAll(list);
         list.clear();
         list.clear();
         list.addAll(set);
         list.addAll(set);
-        entityManager.clear();
         list.forEach(u -> {
         list.forEach(u -> {
             u.setPassword(null);
             u.setPassword(null);
         });
         });

+ 2 - 2
jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/web/ActBusinessController.java

@@ -10,7 +10,7 @@ import org.activiti.engine.TaskService;
 import org.activiti.engine.task.Task;
 import org.activiti.engine.task.Task;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.api.ISysBaseAPI;
+import org.jeecg.common.system.api.ISysBaseApi;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.activiti.entity.ActBusiness;
 import org.jeecg.modules.activiti.entity.ActBusiness;
 import org.jeecg.modules.activiti.entity.ActZprocess;
 import org.jeecg.modules.activiti.entity.ActZprocess;
@@ -49,7 +49,7 @@ public class ActBusinessController {
     @Autowired
     @Autowired
     private RuntimeService runtimeService;
     private RuntimeService runtimeService;
     @Autowired
     @Autowired
-    ISysBaseAPI sysBaseAPI;
+    ISysBaseApi sysBaseAPI;
     /*添加申请草稿状态*/
     /*添加申请草稿状态*/
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     public Result add(HttpServletRequest request){
     public Result add(HttpServletRequest request){

+ 2 - 2
jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/web/ActProcessInsController.java

@@ -12,7 +12,7 @@ import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.runtime.ProcessInstanceQuery;
 import org.activiti.engine.runtime.ProcessInstanceQuery;
 import org.activiti.engine.task.Task;
 import org.activiti.engine.task.Task;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.api.ISysBaseAPI;
+import org.jeecg.common.system.api.ISysBaseApi ;
 import org.jeecg.common.system.vo.ComboModel;
 import org.jeecg.common.system.vo.ComboModel;
 import org.jeecg.modules.activiti.entity.*;
 import org.jeecg.modules.activiti.entity.*;
 import org.jeecg.modules.activiti.service.Impl.ActBusinessServiceImpl;
 import org.jeecg.modules.activiti.service.Impl.ActBusinessServiceImpl;
@@ -55,7 +55,7 @@ public class ActProcessInsController {
     private ActBusinessServiceImpl actBusinessService;
     private ActBusinessServiceImpl actBusinessService;
 
 
     @Autowired
     @Autowired
-    private ISysBaseAPI sysBaseAPI;
+    private ISysBaseApi sysBaseAPI;
 
 
     @Autowired
     @Autowired
     private ProcessEngineConfiguration processEngineConfiguration;
     private ProcessEngineConfiguration processEngineConfiguration;

+ 2 - 2
jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/web/ActTaskController.java

@@ -24,7 +24,7 @@ import org.activiti.engine.task.Task;
 import org.activiti.engine.task.TaskQuery;
 import org.activiti.engine.task.TaskQuery;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.api.ISysBaseAPI;
+import org.jeecg.common.system.api.ISysBaseApi;
 import org.jeecg.common.system.vo.ComboModel;
 import org.jeecg.common.system.vo.ComboModel;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.activiti.entity.*;
 import org.jeecg.modules.activiti.entity.*;
@@ -68,7 +68,7 @@ public class ActTaskController {
     @Autowired
     @Autowired
     private ActBusinessServiceImpl actBusinessService;
     private ActBusinessServiceImpl actBusinessService;
     @Autowired
     @Autowired
-    ISysBaseAPI sysBaseAPI;
+    ISysBaseApi sysBaseAPI;
 
 
     /*代办列表*/
     /*代办列表*/
     @RequestMapping(value = "/todoList" )
     @RequestMapping(value = "/todoList" )

+ 21 - 2
jeecg-boot-module-system/pom.xml

@@ -51,7 +51,15 @@
             <artifactId>jeecg-boot-module-activiti</artifactId>
             <artifactId>jeecg-boot-module-activiti</artifactId>
             <version>2.2.0</version>
             <version>2.2.0</version>
         </dependency>
         </dependency>
-
+        <dependency>
+            <groupId>me.zhyd.oauth</groupId>
+            <artifactId>JustAuth</artifactId>
+            <version>1.15.6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
         <dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
             <artifactId>jcl-over-slf4j</artifactId>
@@ -89,6 +97,17 @@
             <artifactId>aliyun-sdk-oss</artifactId>
             <artifactId>aliyun-sdk-oss</artifactId>
             <version>3.5.0</version>
             <version>3.5.0</version>
         </dependency>
         </dependency>
+        <dependency>
+            <groupId>org.crazycake</groupId>
+            <artifactId>shiro-redis</artifactId>
+            <version>3.1.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.shiro</groupId>
+                    <artifactId>shiro-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-csv -->
         <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-csv -->
         <dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <groupId>org.apache.commons</groupId>
@@ -250,4 +269,4 @@
             </properties>
             </properties>
         </profile>
         </profile>
     </profiles>
     </profiles>
-</project>
+</project>

+ 3 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/JeecgOneGui.java

@@ -9,11 +9,12 @@ import org.jeecgframework.codegenerate.window.CodeWindow;
  * @site www.jeecg.com
  * @site www.jeecg.com
  * @Version:V1.0.1
  * @Version:V1.0.1
  */
  */
-public class JeecgOneGUI {
+public class JeecgOneGui {
 
 
 	/** 详细使用手册: http://doc.jeecg.com/1275846 */
 	/** 详细使用手册: http://doc.jeecg.com/1275846 */
     public static void main(String[] args) {
     public static void main(String[] args) {
     	new CodeWindow().pack();
     	new CodeWindow().pack();
 	}
 	}
+}
+
 
 
-}

+ 0 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java

@@ -1,6 +1,5 @@
 package org.jeecg.config;
 package org.jeecg.config;
 
 
-import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.mgt.DefaultSessionStorageEvaluator;
 import org.apache.shiro.mgt.DefaultSessionStorageEvaluator;
 import org.apache.shiro.mgt.DefaultSubjectDAO;
 import org.apache.shiro.mgt.DefaultSubjectDAO;
 import org.apache.shiro.mgt.SecurityManager;
 import org.apache.shiro.mgt.SecurityManager;
@@ -93,8 +92,6 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/appium/crawler/*", "anon");
         filterChainDefinitionMap.put("/appium/crawler/*", "anon");
 
 
         filterChainDefinitionMap.put("/ctop/kuaishouChannelRegInfo/*", "anon");
         filterChainDefinitionMap.put("/ctop/kuaishouChannelRegInfo/*", "anon");
-
-
         filterChainDefinitionMap.put("/ctop/byteDance/homePage/report/*", "anon");
         filterChainDefinitionMap.put("/ctop/byteDance/homePage/report/*", "anon");
         filterChainDefinitionMap.put("/ctop/material/top/cost", "anon");
         filterChainDefinitionMap.put("/ctop/material/top/cost", "anon");
 
 

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/config/WebMvcConfiguration.java

@@ -1,9 +1,8 @@
 package org.jeecg.config;
 package org.jeecg.config;
 
 
-import cn.com.ctop.common.module.utils.StringUtils;
 import org.jeecg.config.interceptors.BrowseLogHandelInterceptor;
 import org.jeecg.config.interceptors.BrowseLogHandelInterceptor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.jeecg.modules.shiro.authc.interceptor.OnlineInterceptor;
 import org.jeecg.modules.shiro.authc.interceptor.OnlineInterceptor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Configuration;
@@ -39,6 +38,7 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
 		return new OnlineInterceptor();
 		return new OnlineInterceptor();
 	}
 	}
 
 
+
 	@Bean
 	@Bean
 	public CorsFilter corsFilter() {
 	public CorsFilter corsFilter() {
 		final UrlBasedCorsConfigurationSource urlBasedCorsConfigurationSource = new UrlBasedCorsConfigurationSource();
 		final UrlBasedCorsConfigurationSource urlBasedCorsConfigurationSource = new UrlBasedCorsConfigurationSource();

+ 0 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java

@@ -16,7 +16,6 @@ import org.apache.ibatis.plugin.Signature;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.SysUser;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 
 
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;

+ 6 - 13
jeecg-boot-module-system/src/main/java/org/jeecg/modules/append/xd_schedule/controller/XdScheduleController.java

@@ -7,7 +7,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.append.xd_schedule.entity.XdSchedule;
 import org.jeecg.modules.append.xd_schedule.entity.XdSchedule;
@@ -34,7 +33,7 @@ import java.util.Arrays;
 public class XdScheduleController extends JeecgController<XdSchedule, IXdScheduleService> {
 public class XdScheduleController extends JeecgController<XdSchedule, IXdScheduleService> {
 	@Autowired
 	@Autowired
 	private XdScheduleServiceImpl xdScheduleService;
 	private XdScheduleServiceImpl xdScheduleService;
-	
+
 	/**
 	/**
 	 * 分页列表查询
 	 * 分页列表查询
 	 *
 	 *
@@ -44,7 +43,6 @@ public class XdScheduleController extends JeecgController<XdSchedule, IXdSchedul
 	 * @param req
 	 * @param req
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "时间表-分页列表查询")
 	@ApiOperation(value="时间表-分页列表查询", notes="时间表-分页列表查询")
 	@ApiOperation(value="时间表-分页列表查询", notes="时间表-分页列表查询")
 	@GetMapping(value = "/list")
 	@GetMapping(value = "/list")
 	public Result<?> queryPageList(XdSchedule xdSchedule,
 	public Result<?> queryPageList(XdSchedule xdSchedule,
@@ -57,70 +55,65 @@ public class XdScheduleController extends JeecgController<XdSchedule, IXdSchedul
 		IPage<XdSchedule> pageList = xdScheduleService.page(page, queryWrapper);
 		IPage<XdSchedule> pageList = xdScheduleService.page(page, queryWrapper);
 		return Result.ok(pageList);
 		return Result.ok(pageList);
 	}
 	}
-	
+
 	/**
 	/**
 	 * 添加
 	 * 添加
 	 *
 	 *
 	 * @param xdSchedule
 	 * @param xdSchedule
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "时间表-添加")
 	@ApiOperation(value="时间表-添加", notes="时间表-添加")
 	@ApiOperation(value="时间表-添加", notes="时间表-添加")
 	@PostMapping(value = "/add")
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody XdSchedule xdSchedule) {
 	public Result<?> add(@RequestBody XdSchedule xdSchedule) {
 		xdScheduleService.save(xdSchedule);
 		xdScheduleService.save(xdSchedule);
 		return Result.ok("添加成功!");
 		return Result.ok("添加成功!");
 	}
 	}
-	
+
 	/**
 	/**
 	 * 编辑
 	 * 编辑
 	 *
 	 *
 	 * @param xdSchedule
 	 * @param xdSchedule
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "时间表-编辑")
 	@ApiOperation(value="时间表-编辑", notes="时间表-编辑")
 	@ApiOperation(value="时间表-编辑", notes="时间表-编辑")
 	@PutMapping(value = "/edit")
 	@PutMapping(value = "/edit")
 	public Result<?> edit(@RequestBody XdSchedule xdSchedule) {
 	public Result<?> edit(@RequestBody XdSchedule xdSchedule) {
 		xdScheduleService.updateById(xdSchedule);
 		xdScheduleService.updateById(xdSchedule);
 		return Result.ok("编辑成功!");
 		return Result.ok("编辑成功!");
 	}
 	}
-	
+
 	/**
 	/**
 	 * 通过id删除
 	 * 通过id删除
 	 *
 	 *
 	 * @param id
 	 * @param id
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "时间表-通过id删除")
 	@ApiOperation(value="时间表-通过id删除", notes="时间表-通过id删除")
 	@ApiOperation(value="时间表-通过id删除", notes="时间表-通过id删除")
 	@DeleteMapping(value = "/delete")
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 		xdScheduleService.removeById(id);
 		xdScheduleService.removeById(id);
 		return Result.ok("删除成功!");
 		return Result.ok("删除成功!");
 	}
 	}
-	
+
 	/**
 	/**
 	 * 批量删除
 	 * 批量删除
 	 *
 	 *
 	 * @param ids
 	 * @param ids
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "时间表-批量删除")
 	@ApiOperation(value="时间表-批量删除", notes="时间表-批量删除")
 	@ApiOperation(value="时间表-批量删除", notes="时间表-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.xdScheduleService.removeByIds(Arrays.asList(ids.split(",")));
 		this.xdScheduleService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.ok("批量删除成功!");
 		return Result.ok("批量删除成功!");
 	}
 	}
-	
+
 	/**
 	/**
 	 * 通过id查询
 	 * 通过id查询
 	 *
 	 *
 	 * @param id
 	 * @param id
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "时间表-通过id查询")
 	@ApiOperation(value="时间表-通过id查询", notes="时间表-通过id查询")
 	@ApiOperation(value="时间表-通过id查询", notes="时间表-通过id查询")
 	@GetMapping(value = "/queryById")
 	@GetMapping(value = "/queryById")
 	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
 	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {

+ 11 - 14
jeecg-boot-module-system/src/main/java/org/jeecg/modules/cas/controller/CasClientController.java

@@ -1,10 +1,8 @@
 package org.jeecg.modules.cas.controller;
 package org.jeecg.modules.cas.controller;
 
 
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import cn.com.ctop.common.module.entity.SysUser;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.constant.CommonConstant;
@@ -13,7 +11,6 @@ import org.jeecg.common.util.RedisUtil;
 import org.jeecg.modules.cas.util.CASServiceUtil;
 import org.jeecg.modules.cas.util.CASServiceUtil;
 import org.jeecg.modules.cas.util.XmlUtils;
 import org.jeecg.modules.cas.util.XmlUtils;
 import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.entity.SysDepart;
-import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.service.ISysDepartService;
 import org.jeecg.modules.system.service.ISysDepartService;
 import org.jeecg.modules.system.service.ISysUserService;
 import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,9 +21,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
-import com.alibaba.fastjson.JSONObject;
-
-import lombok.extern.slf4j.Slf4j;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 
 /**
 /**
  * <p>
  * <p>
@@ -47,11 +44,11 @@ public class CasClientController {
     private ISysDepartService sysDepartService;
     private ISysDepartService sysDepartService;
 	@Autowired
 	@Autowired
     private RedisUtil redisUtil;
     private RedisUtil redisUtil;
-	
+
 	@Value("${cas.prefixUrl}")
 	@Value("${cas.prefixUrl}")
     private String prefixUrl;
     private String prefixUrl;
-	
-	
+
+
 	@GetMapping("/validateLogin")
 	@GetMapping("/validateLogin")
 	public Object validateLogin(@RequestParam(name="ticket") String ticket,
 	public Object validateLogin(@RequestParam(name="ticket") String ticket,
 								@RequestParam(name="service") String service,
 								@RequestParam(name="service") String service,
@@ -98,7 +95,7 @@ public class CasClientController {
 			obj.put("userInfo", sysUser);
 			obj.put("userInfo", sysUser);
 			result.setResult(obj);
 			result.setResult(obj);
 			result.success("登录成功");
 			result.success("登录成功");
-	  		
+
 		} catch (Exception e) {
 		} catch (Exception e) {
 			//e.printStackTrace();
 			//e.printStackTrace();
 			result.error500(e.getMessage());
 			result.error500(e.getMessage());
@@ -106,5 +103,5 @@ public class CasClientController {
 		return new HttpEntity<>(result);
 		return new HttpEntity<>(result);
 	}
 	}
 
 
-	
+
 }
 }

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AdvertiserController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.constant.CtopRoleCodeConstant;
 import cn.com.ctop.common.module.constant.CtopRoleCodeConstant;
 import cn.com.ctop.common.module.entity.Project;
 import cn.com.ctop.common.module.entity.Project;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.entity.UserAllocation;
@@ -19,7 +20,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.ctop.entity.Advertiser;
 import org.jeecg.modules.ctop.entity.Advertiser;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AgentInfoController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -8,7 +9,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ctop.entity.AgentInfo;
 import org.jeecg.modules.ctop.entity.AgentInfo;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BindAccountAuthController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.entity.BindAccountAuth;
 import cn.com.ctop.common.module.entity.BindAccountAuth;
 import cn.com.ctop.common.module.service.IBindAccountAuthService;
 import cn.com.ctop.common.module.service.IBindAccountAuthService;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.Check;
@@ -12,7 +13,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;

+ 16 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BindAccountLoginController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.entity.BindAccountLogin;
 import cn.com.ctop.common.module.entity.BindAccountLogin;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.mapper.UserAllocationMapper;
 import cn.com.ctop.common.module.mapper.UserAllocationMapper;
@@ -16,10 +17,10 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.ctop.service.ICreateInternalService;
 import org.jeecg.modules.ctop.service.ICreateInternalService;
+import org.jeecg.modules.system.service.ISysRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
@@ -45,7 +46,8 @@ public class BindAccountLoginController {
     private UserAllocationMapper userAllocationMapper;
     private UserAllocationMapper userAllocationMapper;
     @Autowired
     @Autowired
     private ICreateInternalService createInternalService;
     private ICreateInternalService createInternalService;
-
+    @Autowired
+    private ISysRoleService sysRoleService;
     /**
     /**
      * @param json
      * @param json
      * @return
      * @return
@@ -123,9 +125,20 @@ public class BindAccountLoginController {
                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                          HttpServletRequest req) {
                                                          HttpServletRequest req) {
         Result<IPage<BindAccountLogin>> result = new Result<>();
         Result<IPage<BindAccountLogin>> result = new Result<>();
+        String accountName = bindAccountLogin.getAccountName();
+        String loginType = bindAccountLogin.getLoginType();
+        bindAccountLogin.setAccountName(null);
+        bindAccountLogin.setLoginType(null);
         QueryWrapper<BindAccountLogin> queryWrapper = QueryGenerator.initQueryWrapper(bindAccountLogin, req.getParameterMap());
         QueryWrapper<BindAccountLogin> queryWrapper = QueryGenerator.initQueryWrapper(bindAccountLogin, req.getParameterMap());
+        if(null!=accountName&&!"".equals(accountName.trim())){
+            queryWrapper.like("account_name",accountName);
+        }
+        if(null != loginType&&!"".equals(loginType.trim())&&!"none".equals(loginType)){
+            queryWrapper.eq("login_type",loginType);
+        }
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if (!Check.isNull(user)) {
+        String roleCode = sysRoleService.getRoleCodeByUserId(user.getId());
+        if(!roleCode.equals("admin")){
             queryWrapper.eq("user_id", user.getId());
             queryWrapper.eq("user_id", user.getId());
         }
         }
         queryWrapper.orderByDesc("id");
         queryWrapper.orderByDesc("id");

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceTemplateController.java

@@ -107,7 +107,7 @@ public class ByteDanceTemplateController {
                                                               @RequestParam(name = "pageSize", defaultValue = "1000") Integer pageSize, HttpServletRequest req) {
                                                               @RequestParam(name = "pageSize", defaultValue = "1000") Integer pageSize, HttpServletRequest req) {
         Result<IPage<ByteDanceAdvertisePlan>> result = new Result<>();
         Result<IPage<ByteDanceAdvertisePlan>> result = new Result<>();
         QueryWrapper<ByteDanceAdvertisePlan> queryWrapper = QueryGenerator.initQueryWrapper(plan, req.getParameterMap());
         QueryWrapper<ByteDanceAdvertisePlan> queryWrapper = QueryGenerator.initQueryWrapper(plan, req.getParameterMap());
-        queryWrapper.eq("toutiao_id", plan.getToutiaoId()).orderByDesc("id");
+        queryWrapper.eq("account_id", plan.getAccountId()).orderByDesc("id");
         Page<ByteDanceAdvertisePlan> page = new Page<>(pageNo, pageSize);
         Page<ByteDanceAdvertisePlan> page = new Page<>(pageNo, pageSize);
         IPage<ByteDanceAdvertisePlan> pageList = planService.page(page, queryWrapper);
         IPage<ByteDanceAdvertisePlan> pageList = planService.page(page, queryWrapper);
         result.setSuccess(true);
         result.setSuccess(true);

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CallbackController.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.entity.SysUser;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.mapper.UserAllocationMapper;
 import cn.com.ctop.common.module.mapper.UserAllocationMapper;
 import cn.com.ctop.common.module.service.IBindAccountAuthService;
 import cn.com.ctop.common.module.service.IBindAccountAuthService;
@@ -21,7 +22,6 @@ import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.entity.SysDepart;
-import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.service.ISysDepartService;
 import org.jeecg.modules.system.service.ISysDepartService;
 import org.jeecg.modules.system.service.ISysUserService;
 import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CorpFeishuUserController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.entity.CorpFeishuUser;
 import cn.com.ctop.common.module.entity.CorpFeishuUser;
 import cn.com.ctop.common.module.service.ICorpFeishuUserService;
 import cn.com.ctop.common.module.service.ICorpFeishuUserService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,7 +10,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;

+ 3 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CtopOauthTokenController.java

@@ -1,5 +1,8 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
+import cn.com.ctop.common.module.annotation.AutoLog;
+import cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.common.module.utils.StringUtils;
 import cn.com.ctop.common.module.utils.StringUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -8,10 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
-import cn.com.ctop.common.module.entity.CtopOauthToken;
-import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/DramaInfoController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.utils.ResultMapUtils;
 import cn.com.ctop.common.module.utils.ResultMapUtils;
 import cn.com.ctop.common.module.utils.StatusCode;
 import cn.com.ctop.common.module.utils.StatusCode;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -10,7 +11,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.ctop.entity.DramaInfo;
 import org.jeecg.modules.ctop.entity.DramaInfo;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/DramaItemInfoController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,7 +8,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.ctop.entity.DramaItemInfo;
 import org.jeecg.modules.ctop.entity.DramaItemInfo;
 import org.jeecg.modules.ctop.service.IDramaItemInfoService;
 import org.jeecg.modules.ctop.service.IDramaItemInfoService;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/DramaRoleInfoController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,7 +8,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.ctop.entity.DramaRoleInfo;
 import org.jeecg.modules.ctop.entity.DramaRoleInfo;
 import org.jeecg.modules.ctop.service.IDramaRoleInfoService;
 import org.jeecg.modules.ctop.service.IDramaRoleInfoService;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/FileInfoController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.entity.FileInfo;
 import cn.com.ctop.common.module.entity.FileInfo;
 import cn.com.ctop.common.module.service.IFileInfoService;
 import cn.com.ctop.common.module.service.IFileInfoService;
 import cn.com.ctop.common.module.utils.StringUtils;
 import cn.com.ctop.common.module.utils.StringUtils;
@@ -10,7 +11,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaiShouDefectMaterialController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,7 +8,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.ctop.entity.KuaiShouDefectMaterial;
 import org.jeecg.modules.ctop.entity.KuaiShouDefectMaterial;
 import org.jeecg.modules.ctop.service.IKuaiShouDefectMaterialService;
 import org.jeecg.modules.ctop.service.IKuaiShouDefectMaterialService;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouAdvertiserController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.utils.StringUtils;
 import cn.com.ctop.common.module.utils.StringUtils;
 import cn.com.ctop.crawler.modules.account.entity.KuaishouAdAccount;
 import cn.com.ctop.crawler.modules.account.entity.KuaishouAdAccount;
 import cn.com.ctop.crawler.modules.account.service.IKuaishouAdAccountService;
 import cn.com.ctop.crawler.modules.account.service.IKuaishouAdAccountService;
@@ -11,7 +12,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.system.entity.SysCategory;
 import org.jeecg.modules.system.entity.SysCategory;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouAgentAccountController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.utils.ExportExcelUtils;
 import cn.com.ctop.common.module.utils.ExportExcelUtils;
 import cn.com.ctop.kuaishou.modules.report.entity.KuaishouAgentAccount;
 import cn.com.ctop.kuaishou.modules.report.entity.KuaishouAgentAccount;
 import cn.com.ctop.kuaishou.modules.report.service.IKuaishouAgentAccountService;
 import cn.com.ctop.kuaishou.modules.report.service.IKuaishouAgentAccountService;
@@ -12,7 +13,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouAppAccountController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.utils.StringUtils;
 import cn.com.ctop.common.module.utils.StringUtils;
 import cn.com.ctop.crawler.modules.account.entity.KuaishouAppAccount;
 import cn.com.ctop.crawler.modules.account.entity.KuaishouAppAccount;
 import cn.com.ctop.crawler.modules.account.service.IKuaishouAppAccountService;
 import cn.com.ctop.crawler.modules.account.service.IKuaishouAppAccountService;
@@ -11,7 +12,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouAppProductController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.kuaishou.modules.app.entity.KuaishouAppProduct;
 import cn.com.ctop.kuaishou.modules.app.entity.KuaishouAppProduct;
 import cn.com.ctop.kuaishou.modules.app.service.IKuaishouAppProductService;
 import cn.com.ctop.kuaishou.modules.app.service.IKuaishouAppProductService;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
@@ -10,7 +11,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouChannelRegInfoController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,7 +8,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.ctop.entity.KuaishouChannelRegInfo;
 import org.jeecg.modules.ctop.entity.KuaishouChannelRegInfo;
 import org.jeecg.modules.ctop.service.IKuaishouChannelRegInfoService;
 import org.jeecg.modules.ctop.service.IKuaishouChannelRegInfoService;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouEffectAdInfoController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.crawler.modules.kuaishoucce.entity.KuaishouEffectAdInfo;
 import cn.com.ctop.crawler.modules.kuaishoucce.entity.KuaishouEffectAdInfo;
 import cn.com.ctop.crawler.modules.kuaishoucce.service.IKuaishouEffectAdInfoService;
 import cn.com.ctop.crawler.modules.kuaishoucce.service.IKuaishouEffectAdInfoService;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
@@ -10,7 +11,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;

+ 157 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouEffectVideoInfoController.java

@@ -0,0 +1,157 @@
+package org.jeecg.modules.ctop.controller;
+
+import cn.com.ctop.common.module.annotation.AutoLog;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.ctop.entity.KuaishouEffectVideoInfo;
+import org.jeecg.modules.ctop.service.IKuaishouEffectVideoInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+
+ /**
+ * 快手视频数据清洗信息
+ * @author jeecg-boot
+ * @date   2020-07-23
+ * @version V1.0
+ */
+@Slf4j
+@Api(tags="快手视频数据清洗信息")
+@RestController
+@RequestMapping("/ctop/kuaishouEffectVideoInfo")
+public class KuaishouEffectVideoInfoController {
+	@Autowired
+	private IKuaishouEffectVideoInfoService kuaishouEffectVideoInfoService;
+
+	/**
+	  * 分页列表查询
+	 * @param kuaishouEffectVideoInfo
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "快手视频数据清洗信息-分页列表查询")
+	@ApiOperation(value="快手视频数据清洗信息-分页列表查询", notes="快手视频数据清洗信息-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<KuaishouEffectVideoInfo>> queryPageList(KuaishouEffectVideoInfo kuaishouEffectVideoInfo,
+																@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+																@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+																HttpServletRequest req) {
+		Result<IPage<KuaishouEffectVideoInfo>> result = new Result<>();
+		QueryWrapper<KuaishouEffectVideoInfo> queryWrapper = QueryGenerator.initQueryWrapper(kuaishouEffectVideoInfo, req.getParameterMap());
+		Page<KuaishouEffectVideoInfo> page = new Page<>(pageNo, pageSize);
+		IPage<KuaishouEffectVideoInfo> pageList = kuaishouEffectVideoInfoService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+
+	/**
+	  *   添加
+	 * @param kuaishouEffectVideoInfo
+	 * @return
+	 */
+	@AutoLog(value = "快手视频数据清洗信息-添加")
+	@ApiOperation(value="快手视频数据清洗信息-添加", notes="快手视频数据清洗信息-添加")
+	@PostMapping(value = "/add")
+	public Result<KuaishouEffectVideoInfo> add(@RequestBody KuaishouEffectVideoInfo kuaishouEffectVideoInfo) {
+		Result<KuaishouEffectVideoInfo> result = new Result<>();
+		try {
+			kuaishouEffectVideoInfoService.save(kuaishouEffectVideoInfo);
+			result.success("添加成功!");
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+			result.error500("操作失败");
+		}
+		return result;
+	}
+
+	/**
+	  *  编辑
+	 * @param kuaishouEffectVideoInfo
+	 * @return
+	 */
+	@AutoLog(value = "快手视频数据清洗信息-编辑")
+	@ApiOperation(value="快手视频数据清洗信息-编辑", notes="快手视频数据清洗信息-编辑")
+	@PutMapping(value = "/edit")
+	public Result<KuaishouEffectVideoInfo> edit(@RequestBody KuaishouEffectVideoInfo kuaishouEffectVideoInfo) {
+		Result<KuaishouEffectVideoInfo> result = new Result<>();
+		KuaishouEffectVideoInfo kuaishouEffectVideoInfoEntity = kuaishouEffectVideoInfoService.getById(kuaishouEffectVideoInfo.getId());
+		if(kuaishouEffectVideoInfoEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = kuaishouEffectVideoInfoService.updateById(kuaishouEffectVideoInfo);
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	  *   通过id删除
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "快手视频数据清洗信息-通过id删除")
+	@ApiOperation(value="快手视频数据清洗信息-通过id删除", notes="快手视频数据清洗信息-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<Object> delete(@RequestParam(name="id",required=true) String id) {
+		try {
+			kuaishouEffectVideoInfoService.removeById(id);
+		} catch (Exception e) {
+			log.error("删除失败",e.getMessage());
+			return Result.error("删除失败!");
+		}
+		return Result.ok("删除成功!");
+	}
+
+	/**
+	  *  批量删除
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "快手视频数据清洗信息-批量删除")
+	@ApiOperation(value="快手视频数据清洗信息-批量删除", notes="快手视频数据清洗信息-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<KuaishouEffectVideoInfo> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<KuaishouEffectVideoInfo> result = new Result<>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别!");
+		}else {
+			this.kuaishouEffectVideoInfoService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "快手视频数据清洗信息-通过id查询")
+	@ApiOperation(value="快手视频数据清洗信息-通过id查询", notes="快手视频数据清洗信息-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<KuaishouEffectVideoInfo> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<KuaishouEffectVideoInfo> result = new Result<>();
+		KuaishouEffectVideoInfo kuaishouEffectVideoInfo = kuaishouEffectVideoInfoService.getById(id);
+		if(kuaishouEffectVideoInfo==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(kuaishouEffectVideoInfo);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+}

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouHotPhotoInfoController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.crawler.modules.kuaishoucce.entity.KuaishouHotPhotoInfo;
 import cn.com.ctop.crawler.modules.kuaishoucce.entity.KuaishouHotPhotoInfo;
 import cn.com.ctop.crawler.modules.kuaishoucce.service.IKuaishouHotPhotoInfoService;
 import cn.com.ctop.crawler.modules.kuaishoucce.service.IKuaishouHotPhotoInfoService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,7 +10,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouInspiredAdController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.crawler.modules.kuaishoucce.entity.KuaishouInspiredAd;
 import cn.com.ctop.crawler.modules.kuaishoucce.entity.KuaishouInspiredAd;
 import cn.com.ctop.crawler.modules.kuaishoucce.service.IKuaishouInspiredAdService;
 import cn.com.ctop.crawler.modules.kuaishoucce.service.IKuaishouInspiredAdService;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
@@ -10,7 +11,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialAscriptionController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.entity.MaterialAscription;
 import cn.com.ctop.common.module.entity.MaterialAscription;
 import cn.com.ctop.common.module.service.IMaterialAscriptionService;
 import cn.com.ctop.common.module.service.IMaterialAscriptionService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,7 +10,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;

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

@@ -1,9 +1,9 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.entity.MaterialCutFrame;
 import cn.com.ctop.common.module.entity.MaterialCutFrame;
 import cn.com.ctop.common.module.entity.MaterialCutFrameTask;
 import cn.com.ctop.common.module.entity.MaterialCutFrameTask;
 import cn.com.ctop.common.module.entity.MaterialInfo;
 import cn.com.ctop.common.module.entity.MaterialInfo;
-import cn.com.ctop.common.module.entity.MaterialParameter;
 import cn.com.ctop.common.module.service.IMaterialCutFrameService;
 import cn.com.ctop.common.module.service.IMaterialCutFrameService;
 import cn.com.ctop.common.module.service.IMaterialCutFrameTaskService;
 import cn.com.ctop.common.module.service.IMaterialCutFrameTaskService;
 import cn.com.ctop.common.module.service.IMaterialInfoService;
 import cn.com.ctop.common.module.service.IMaterialInfoService;
@@ -15,7 +15,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;

+ 5 - 5
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialImageInfoController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.entity.MaterialImageInfo;
 import cn.com.ctop.common.module.entity.MaterialImageInfo;
 import cn.com.ctop.common.module.entity.MaterialInfo;
 import cn.com.ctop.common.module.entity.MaterialInfo;
 import cn.com.ctop.common.module.mapper.MaterialInfoMapper;
 import cn.com.ctop.common.module.mapper.MaterialInfoMapper;
@@ -17,7 +18,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.DateUtils;
@@ -74,8 +74,6 @@ public class MaterialImageInfoController {
                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                      HttpServletRequest req) {
                                                      HttpServletRequest req) {
         Result<IPage<MaterialImageInfo>> result = new Result<IPage<MaterialImageInfo>>();
         Result<IPage<MaterialImageInfo>> result = new Result<IPage<MaterialImageInfo>>();
-
-
         QueryWrapper<MaterialImageInfo> queryWrapper = new QueryWrapper<>();
         QueryWrapper<MaterialImageInfo> queryWrapper = new QueryWrapper<>();
         Object createTime = materialImageInfo.getCreateTime();
         Object createTime = materialImageInfo.getCreateTime();
         materialImageInfo.setCreateTime(null);
         materialImageInfo.setCreateTime(null);
@@ -116,13 +114,15 @@ public class MaterialImageInfoController {
     @AutoLog(value = "素材-分页列表查询")
     @AutoLog(value = "素材-分页列表查询")
     @ApiOperation(value = "素材-分页列表查询", notes = "素材-分页列表查询")
     @ApiOperation(value = "素材-分页列表查询", notes = "素材-分页列表查询")
     @GetMapping(value = "/list")
     @GetMapping(value = "/list")
-    public Result<List<MaterialImageInfo>> queryPageList(String videoId) {
+    public Result<List<MaterialImageInfo>> queryPageList(String videoId, Integer status) {
         Result<List<MaterialImageInfo>> result = new Result<>();
         Result<List<MaterialImageInfo>> result = new Result<>();
-
         List<MaterialImageInfo> list = new ArrayList<>();
         List<MaterialImageInfo> list = new ArrayList<>();
         if (!Check.isNull(videoId)) {
         if (!Check.isNull(videoId)) {
             QueryWrapper<MaterialImageInfo> queryWrapper = new QueryWrapper<>();
             QueryWrapper<MaterialImageInfo> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("video_id", videoId);
             queryWrapper.eq("video_id", videoId);
+            if (!Check.isNull(status)) {
+                queryWrapper.eq("status", status);
+            }
             list = MaterialImageInfoService.list(queryWrapper);
             list = MaterialImageInfoService.list(queryWrapper);
         }
         }
 
 

+ 200 - 76
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialInfoController.java

@@ -1,8 +1,10 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
 
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.constant.CtopRoleCodeConstant;
 import cn.com.ctop.common.module.constant.CtopRoleCodeConstant;
 import cn.com.ctop.common.module.entity.*;
 import cn.com.ctop.common.module.entity.*;
+import cn.com.ctop.common.module.enums.MaterialSupplierEnum;
 import cn.com.ctop.common.module.service.*;
 import cn.com.ctop.common.module.service.*;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.JsonUtil;
 import cn.com.ctop.common.module.utils.JsonUtil;
@@ -21,15 +23,14 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.DateUtils;
-import org.jeecg.modules.ctop.service.IKuaiShouUploadService;
 import org.jeecg.modules.ctop.service.IProjectMemberService;
 import org.jeecg.modules.ctop.service.IProjectMemberService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.text.ParseException;
 import java.text.ParseException;
 import java.util.Arrays;
 import java.util.Arrays;
@@ -51,6 +52,8 @@ import java.util.Map;
 public class MaterialInfoController {
 public class MaterialInfoController {
     @Autowired
     @Autowired
     private IMaterialInfoService materialInfoService;
     private IMaterialInfoService materialInfoService;
+    @Resource
+    private IMaterialCutFrameService materialCutFrameService;
     @Autowired
     @Autowired
     private IMaterialAscriptionService materialAscriptionService;
     private IMaterialAscriptionService materialAscriptionService;
     @Autowired
     @Autowired
@@ -64,7 +67,50 @@ public class MaterialInfoController {
     @Autowired
     @Autowired
     private IVideoWatermarkTaskService watermarkTaskService;
     private IVideoWatermarkTaskService watermarkTaskService;
     @Autowired
     @Autowired
-    private IKuaiShouUploadService uploadService;
+    private IProjectMemberService memberService;
+    @Autowired
+    private IMaterialImageInfoService iMaterialImageInfoService;
+
+
+    @GetMapping("/supplierWatermark")
+    public Result<String> supplierWatermark(String id) {
+        Result<String> result = new Result<>();
+        try {
+            if (Check.isNull(id)) {
+                throw new Exception("请选择素材");
+            }
+            MaterialInfo materialInfo = materialInfoService.getById(id);
+            if (Check.isNull(materialInfo)) {
+                throw new Exception("素材信息为空");
+            }
+            QueryWrapper<MaterialParameter> parameterQueryWrapper = new QueryWrapper<>();
+            parameterQueryWrapper.eq("material_id", materialInfo.getCode());
+            parameterQueryWrapper.last("limit 1");
+            MaterialParameter parameter = materialParameterService.getOne(parameterQueryWrapper);
+            if (Check.isNull(parameter)) {
+                throw new Exception("素材基本信息为空");
+            }
+
+            Long templateId = MaterialSupplierEnum.getTemplateIdBySize(Integer.valueOf(parameter.getWidth()), Integer.valueOf(parameter.getHeight()));
+            String s = null;
+            if (!Check.isNull(templateId)) {
+                s = materialInfoService.watermarkVideoBySupplierCode(materialInfo.getCode(), materialInfo.getUrl(), templateId);
+
+            }
+            if (Check.isNull(s)) {
+                result.setSuccess(false);
+                result.setMessage("水印生成失败");
+            } else {
+                result.setSuccess(true);
+                result.setResult(s);
+            }
+        } catch (Exception e) {
+            result.setSuccess(false);
+            result.setMessage(e.getMessage());
+        }
+
+        return result;
+    }
 
 
 
 
     @PostMapping("/correlationUpload")
     @PostMapping("/correlationUpload")
@@ -76,6 +122,18 @@ public class MaterialInfoController {
         return materialInfoService.correlationUpload(json);
         return materialInfoService.correlationUpload(json);
     }
     }
 
 
+    @PostMapping("/supplementFrameUrl")
+    public Result<Object> supplementFrameUrl(@RequestParam String videoMD5) {
+        Result<Object> result = new Result<>();
+        boolean bool = materialCutFrameService.updateTencentCutFrame(videoMD5);
+        if (!bool) {
+            result.setSuccess(false);
+            result.error500("补全截帧url失败");
+            return result;
+        }
+        result.setSuccess(true);
+        return result;
+    }
 
 
     @GetMapping(value = "/report")
     @GetMapping(value = "/report")
     public JSONObject report(String userId) {
     public JSONObject report(String userId) {
@@ -111,18 +169,6 @@ public class MaterialInfoController {
     }
     }
 
 
 
 
-    /**
-     * 分页列表查询
-     *
-     * @param materialInfo
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @Autowired
-    private IProjectMemberService memberService;
-
     @GetMapping("/excellent/list")
     @GetMapping("/excellent/list")
     public Result<IPage<MaterialInfo>> excellentList(MaterialInfo materialInfo,
     public Result<IPage<MaterialInfo>> excellentList(MaterialInfo materialInfo,
                                                      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@@ -151,9 +197,6 @@ public class MaterialInfoController {
         return result;
         return result;
     }
     }
 
 
-    @Autowired
-    private IMaterialImageInfoService iMaterialImageInfoService;
-
     @AutoLog(value = "素材信息-分页列表查询")
     @AutoLog(value = "素材信息-分页列表查询")
     @ApiOperation(value = "素材信息-分页列表查询", notes = "素材信息-分页列表查询")
     @ApiOperation(value = "素材信息-分页列表查询", notes = "素材信息-分页列表查询")
     @GetMapping(value = "/list")
     @GetMapping(value = "/list")
@@ -162,7 +205,10 @@ public class MaterialInfoController {
                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                      HttpServletRequest req) {
                                                      HttpServletRequest req) {
 
 
+
         Result<IPage<MaterialInfo>> result = new Result<>();
         Result<IPage<MaterialInfo>> result = new Result<>();
+        String materialName = materialInfo.getMaterialName();
+        materialInfo.setMaterialName(null);
         QueryWrapper<MaterialInfo> queryWrapper = new QueryWrapper<>();
         QueryWrapper<MaterialInfo> queryWrapper = new QueryWrapper<>();
         Object createTime = materialInfo.getCreateTime();
         Object createTime = materialInfo.getCreateTime();
         materialInfo.setCreateTime(null);
         materialInfo.setCreateTime(null);
@@ -199,6 +245,10 @@ public class MaterialInfoController {
                 }
                 }
             }
             }
         }
         }
+        if (!Check.isNull(materialName)) {
+            queryWrapper.like("material_name", materialName);
+
+        }
         Page<MaterialInfo> page = new Page<>(pageNo, pageSize);
         Page<MaterialInfo> page = new Page<>(pageNo, pageSize);
         IPage<MaterialInfo> pageList = materialInfoService.page(page, queryWrapper);
         IPage<MaterialInfo> pageList = materialInfoService.page(page, queryWrapper);
         List<MaterialInfo> materialInfoList = pageList.getRecords();
         List<MaterialInfo> materialInfoList = pageList.getRecords();
@@ -264,6 +314,82 @@ public class MaterialInfoController {
     }
     }
 
 
 
 
+    @AutoLog(value = "素材信息-分页列表查询")
+    @ApiOperation(value = "素材信息-分页列表查询", notes = "素材信息-分页列表查询")
+    @GetMapping(value = "/supplierList")
+    public Result<IPage<MaterialInfo>> supplierList(MaterialInfo materialInfo,
+                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                    HttpServletRequest req) {
+
+
+        Result<IPage<MaterialInfo>> result = new Result<>();
+        String materialName = materialInfo.getMaterialName();
+        materialInfo.setMaterialName(null);
+        QueryWrapper<MaterialInfo> queryWrapper = new QueryWrapper<>();
+        Object createTime = materialInfo.getCreateTime();
+        materialInfo.setCreateTime(null);
+        if (!Check.isNull(materialInfo.getUserId())) {
+            String roleCode = materialInfoService.getRoleCodeByUserId(materialInfo.getUserId());
+            if (CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN.equals(roleCode)) {
+                materialInfo.setUserId(null);
+            } else {
+                result.setResult(null);
+                return result;
+            }
+
+            queryWrapper = QueryGenerator.initQueryWrapper(materialInfo, req.getParameterMap());
+
+            if (!Check.isNull(createTime)) {
+                try {
+                    String dateString = DateUtils.getDateString(String.valueOf(createTime));
+                    Map<String, Object> map = DateUtils.getStartEndTime(dateString);
+                    queryWrapper.ge("create_time", map.get("start"));
+                    queryWrapper.lt("create_time", map.get("end"));
+                } catch (ParseException e) {
+                    e.printStackTrace();
+                }
+            }
+        } else {
+            result.setResult(null);
+            return result;
+        }
+        if (!Check.isNull(materialName)) {
+            queryWrapper.like("material_name", materialName);
+
+        }
+        Page<MaterialInfo> page = new Page<>(pageNo, pageSize);
+        IPage<MaterialInfo> pageList = materialInfoService.page(page, queryWrapper);
+        List<MaterialInfo> materialInfoList = pageList.getRecords();
+        if (materialInfoList.size() != 0) {
+            for (MaterialInfo material : materialInfoList) {
+                Project project = projectService.getById(material.getProjectId());
+                if (!Check.isNull(project)) {
+                    material.setMediaId(project.getMediaId());
+                    material.setProjectName(project.getProjectName());
+                }
+
+                QueryWrapper<MaterialImageInfo> imageInfoQueryWrapper = new QueryWrapper<>();
+                imageInfoQueryWrapper.eq("video_id", material.getCode());
+                imageInfoQueryWrapper.eq("status", 0);
+                List<MaterialImageInfo> imageInfoList = iMaterialImageInfoService.list(imageInfoQueryWrapper);
+                if (Check.isNull(imageInfoList)) {
+                    material.setWhetherUnaudited(false);
+                } else {
+                    material.setWhetherUnaudited(true);
+                }
+
+            }
+
+
+        }
+
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+
     /**
     /**
      * 添加
      * 添加
      *
      *
@@ -334,74 +460,72 @@ public class MaterialInfoController {
         Result<MaterialInfo> result = new Result<>();
         Result<MaterialInfo> result = new Result<>();
         MaterialInfo materialInfoEntity = materialInfoService.getById(materialInfo.getId());
         MaterialInfo materialInfoEntity = materialInfoService.getById(materialInfo.getId());
         if (materialInfoEntity == null) {
         if (materialInfoEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            String url = materialInfo.getUrl();
-            if (!Check.isNull(url)) {
-                if (!url.contains(KuaishouInterfaceConstant.HTTPS_PREFIX)) {
-                    url = KuaishouInterfaceConstant.HTTPS_PREFIX + url;
-                }
-                materialInfo.setUrl(url);
+            return result.error500("未找到对应实体");
+        }
+        String url = materialInfo.getUrl();
+        if (!Check.isNull(url)) {
+            if (!url.contains(KuaishouInterfaceConstant.HTTPS_PREFIX)) {
+                url = KuaishouInterfaceConstant.HTTPS_PREFIX + url;
             }
             }
+            materialInfo.setUrl(url);
+        }
 
 
-            //  修改素材库 相关联code
-            if (!Check.isNull(materialInfo.getCode())) {
-                String code = materialInfoEntity.getCode();
-                if (!Check.isNull(code)) {
-                    MaterialTag updateMaterialTag = new MaterialTag();
-                    updateMaterialTag.setMaterialId(materialInfo.getCode());
-                    QueryWrapper<MaterialTag> tagQueryWrapper = new QueryWrapper<>();
-                    tagQueryWrapper.eq("material_id", code);
-                    materialTagService.update(updateMaterialTag, tagQueryWrapper);
-                    MaterialParameter updateParameter = new MaterialParameter();
-                    updateParameter.setMaterialId(materialInfo.getCode());
-                    QueryWrapper<MaterialParameter> parameterQueryWrapper = new QueryWrapper<>();
-                    parameterQueryWrapper.eq("material_id", code);
-                    materialParameterService.update(updateParameter, parameterQueryWrapper);
-                    MaterialAscription updateMaterialAscription = new MaterialAscription();
-                    updateMaterialAscription.setMaterialId(materialInfo.getCode());
-                    QueryWrapper<MaterialAscription> ascriptionQueryWrapper = new QueryWrapper<>();
-                    ascriptionQueryWrapper.eq("material_id", code);
-                    materialAscriptionService.update(updateMaterialAscription, ascriptionQueryWrapper);
-                }
+        //  修改素材库 相关联code
+        if (!Check.isNull(materialInfo.getCode())) {
+            String code = materialInfoEntity.getCode();
+            if (!Check.isNull(code)) {
+                MaterialTag updateMaterialTag = new MaterialTag();
+                updateMaterialTag.setMaterialId(materialInfo.getCode());
+                QueryWrapper<MaterialTag> tagQueryWrapper = new QueryWrapper<>();
+                tagQueryWrapper.eq("material_id", code);
+                materialTagService.update(updateMaterialTag, tagQueryWrapper);
+                MaterialParameter updateParameter = new MaterialParameter();
+                updateParameter.setMaterialId(materialInfo.getCode());
+                QueryWrapper<MaterialParameter> parameterQueryWrapper = new QueryWrapper<>();
+                parameterQueryWrapper.eq("material_id", code);
+                materialParameterService.update(updateParameter, parameterQueryWrapper);
+                MaterialAscription updateMaterialAscription = new MaterialAscription();
+                updateMaterialAscription.setMaterialId(materialInfo.getCode());
+                QueryWrapper<MaterialAscription> ascriptionQueryWrapper = new QueryWrapper<>();
+                ascriptionQueryWrapper.eq("material_id", code);
+                materialAscriptionService.update(updateMaterialAscription, ascriptionQueryWrapper);
             }
             }
+        }
 
 
-            //  审核通过自动同步到到媒体后台
-           /* Long projectId = materialInfoEntity.getProjectId();
-            Project project = projectService.getById(projectId);
-            if (!Check.isNull(projectId)) {
-                if ("2".equals(project.getMediaId())) {
-                    if (!Check.isNull(materialInfo.getStatus())) {
-                        Integer status = materialInfo.getStatus();
-                        if (status == 1) {
-                            Thread thread = new Thread() {
-                                @Override
-                                public void run() {
-                                    log.info("开始自动同步素材,code:{}", materialInfoEntity.getCode());
-                                    uploadService.upload(materialInfoEntity);
-                                }
-                            };
-                            thread.start();
-                        }
+        //  审核通过自动同步到到媒体后台
+       /* Long projectId = materialInfoEntity.getProjectId();
+        Project project = projectService.getById(projectId);
+        if (!Check.isNull(projectId)) {
+            if ("2".equals(project.getMediaId())) {
+                if (!Check.isNull(materialInfo.getStatus())) {
+                    Integer status = materialInfo.getStatus();
+                    if (status == 1) {
+                        Thread thread = new Thread() {
+                            @Override
+                            public void run() {
+                                log.info("开始自动同步素材,code:{}", materialInfoEntity.getCode());
+                                uploadService.upload(materialInfoEntity);
+                            }
+                        };
+                        thread.start();
                     }
                     }
                 }
                 }
-
-            }*/
-
-            boolean ok = materialInfoService.updateById(materialInfo);
-            if (ok) {
-                result.success("修改成功!");
             }
             }
 
 
-            Integer status = materialInfo.getStatus();
-            // 如果状态为2 审核拒绝 给上传人发送消息
-            if (status == 2) {
-                Project project = projectService.getById(materialInfoEntity.getProjectId());
-                String text = messageTemplate.getMaterialRejectTemplate(project.getProjectName(), materialInfoEntity.getMaterialName(), materialInfo.getRefuseReason());
-                sendMessageService.sendMessage(materialInfoEntity.getUserId(), text);
-            }
+        }*/
+
+        boolean ok = materialInfoService.updateById(materialInfo);
+        if (ok) {
+            result.success("修改成功!");
         }
         }
 
 
+        Integer status = materialInfo.getStatus();
+        // 如果状态为2 审核拒绝 给上传人发送消息
+        if (status == 2) {
+            Project project = projectService.getById(materialInfoEntity.getProjectId());
+            String text = messageTemplate.getMaterialRejectTemplate(project.getProjectName(), materialInfoEntity.getMaterialName(), materialInfo.getRefuseReason());
+            sendMessageService.sendMessage(materialInfoEntity.getUserId(), text);
+        }
         return result;
         return result;
 
 
     }
     }

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialParameterController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.entity.MaterialParameter;
 import cn.com.ctop.common.module.entity.MaterialParameter;
 import cn.com.ctop.common.module.service.IMaterialParameterService;
 import cn.com.ctop.common.module.service.IMaterialParameterService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,7 +10,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;

+ 8 - 8
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialPartController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.entity.MaterialInfo;
 import cn.com.ctop.common.module.entity.MaterialInfo;
 import cn.com.ctop.common.module.entity.VideoMerge;
 import cn.com.ctop.common.module.entity.VideoMerge;
 import cn.com.ctop.common.module.entity.VideoMergeTask;
 import cn.com.ctop.common.module.entity.VideoMergeTask;
@@ -16,7 +17,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -48,22 +48,22 @@ public class MaterialPartController {
         List<String> jobIdList = new ArrayList<>();
         List<String> jobIdList = new ArrayList<>();
         List<VideoMerge> videoMergeList = jsonArray.toJavaList(VideoMerge.class);
         List<VideoMerge> videoMergeList = jsonArray.toJavaList(VideoMerge.class);
         try {
         try {
-            for (VideoMerge videoMerge:videoMergeList){
+            for (VideoMerge videoMerge : videoMergeList) {
                 MaterialInfo start = materialInfoService.getMaterialInfoByCode(videoMerge.getStartPart());
                 MaterialInfo start = materialInfoService.getMaterialInfoByCode(videoMerge.getStartPart());
                 MaterialInfo end = materialInfoService.getMaterialInfoByCode(videoMerge.getEndPart());
                 MaterialInfo end = materialInfoService.getMaterialInfoByCode(videoMerge.getEndPart());
                 List<String> partUrlList = new ArrayList<>();
                 List<String> partUrlList = new ArrayList<>();
                 List<String> parts = videoMerge.getParts();
                 List<String> parts = videoMerge.getParts();
-                for (String part :parts){
+                for (String part : parts) {
                     MaterialInfo materialInfo = materialInfoService.getMaterialInfoByCode(part);
                     MaterialInfo materialInfo = materialInfoService.getMaterialInfoByCode(part);
                     String url = materialInfo.getUrl();
                     String url = materialInfo.getUrl();
                     int i = url.indexOf('/', 10);
                     int i = url.indexOf('/', 10);
-                    partUrlList.add(url.substring(i+1,url.length()));
+                    partUrlList.add(url.substring(i + 1, url.length()));
                 }
                 }
                 String startUrl = start.getUrl();
                 String startUrl = start.getUrl();
                 String startPath = startUrl.substring(startUrl.indexOf('/', 10) + 1, startUrl.length());
                 String startPath = startUrl.substring(startUrl.indexOf('/', 10) + 1, startUrl.length());
                 String endUrl = end.getUrl();
                 String endUrl = end.getUrl();
                 String endPath = endUrl.substring(endUrl.indexOf('/', 10) + 1, endUrl.length());
                 String endPath = endUrl.substring(endUrl.indexOf('/', 10) + 1, endUrl.length());
-                String jobId = MpsUtils.mergeOneVideo(startPath,partUrlList,endPath);
+                String jobId = MpsUtils.mergeOneVideo(startPath, partUrlList, endPath);
                 QueryJobListResponse.Job job = MpsUtils.getJobStatus(jobId);
                 QueryJobListResponse.Job job = MpsUtils.getJobStatus(jobId);
                 VideoMergeTask videoMergeTask = new VideoMergeTask();
                 VideoMergeTask videoMergeTask = new VideoMergeTask();
                 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
                 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -71,9 +71,9 @@ public class MaterialPartController {
                 videoMergeTask.setJobId(jobId);
                 videoMergeTask.setJobId(jobId);
                 videoMergeTask.setStatus(job.getState());
                 videoMergeTask.setStatus(job.getState());
                 videoMergeTaskService.save(videoMergeTask);
                 videoMergeTaskService.save(videoMergeTask);
-                parts.add(0,videoMerge.getStartPart());
+                parts.add(0, videoMerge.getStartPart());
                 parts.add(videoMerge.getStartPart());
                 parts.add(videoMerge.getStartPart());
-                for(String part :parts){
+                for (String part : parts) {
                     VideoPart videoPart = new VideoPart();
                     VideoPart videoPart = new VideoPart();
                     videoPart.setJobId(jobId);
                     videoPart.setJobId(jobId);
                     videoPart.setPartId(part);
                     videoPart.setPartId(part);
@@ -81,7 +81,7 @@ public class MaterialPartController {
                 }
                 }
                 jobIdList.add(jobId);
                 jobIdList.add(jobId);
             }
             }
-            result.success("合成中,可在任务列表中查询状态,任务ID:"+new Gson().toJson(jobIdList));
+            result.success("合成中,可在任务列表中查询状态,任务ID:" + new Gson().toJson(jobIdList));
         } catch (Exception e) {
         } catch (Exception e) {
             log.error(e.getMessage(), e);
             log.error(e.getMessage(), e);
             result.error500("操作失败");
             result.error500("操作失败");

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialTagController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.entity.MaterialTag;
 import cn.com.ctop.common.module.entity.MaterialTag;
 import cn.com.ctop.common.module.service.IMaterialTagService;
 import cn.com.ctop.common.module.service.IMaterialTagService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,7 +10,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;

+ 32 - 10
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java

@@ -1,12 +1,10 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.constant.CtopRoleCodeConstant;
 import cn.com.ctop.common.module.constant.CtopRoleCodeConstant;
-import cn.com.ctop.common.module.entity.Project;
-import cn.com.ctop.common.module.entity.UserAllocation;
+import cn.com.ctop.common.module.entity.*;
 import cn.com.ctop.common.module.mapper.ProjectMapper;
 import cn.com.ctop.common.module.mapper.ProjectMapper;
-import cn.com.ctop.common.module.service.IProjectService;
-import cn.com.ctop.common.module.service.ISysRoleExtService;
-import cn.com.ctop.common.module.service.IUserAllocationService;
+import cn.com.ctop.common.module.service.*;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.Check;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -16,7 +14,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.ctop.entity.Advertiser;
 import org.jeecg.modules.ctop.entity.Advertiser;
@@ -27,7 +24,6 @@ import org.jeecg.modules.ctop.service.IAdvertiserService;
 import org.jeecg.modules.ctop.service.IProjectMemberService;
 import org.jeecg.modules.ctop.service.IProjectMemberService;
 import org.jeecg.modules.ctop.service.ITransferAccountService;
 import org.jeecg.modules.ctop.service.ITransferAccountService;
 import org.jeecg.modules.system.entity.SysCategory;
 import org.jeecg.modules.system.entity.SysCategory;
-import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.service.ISysCategoryService;
 import org.jeecg.modules.system.service.ISysCategoryService;
 import org.jeecg.modules.system.service.ISysUserService;
 import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -68,7 +64,6 @@ public class ProjectController {
      * @param mediaId
      * @param mediaId
      * @return
      * @return
      */
      */
-
     @GetMapping(value = "/getProjectByAdvertiserAndMediaId")
     @GetMapping(value = "/getProjectByAdvertiserAndMediaId")
     public Result<List<Project>> getProjectByCompany(String advertiserId, String mediaId) {
     public Result<List<Project>> getProjectByCompany(String advertiserId, String mediaId) {
         Result<List<Project>> result = new Result<>();
         Result<List<Project>> result = new Result<>();
@@ -155,6 +150,8 @@ public class ProjectController {
 
 
     @Autowired
     @Autowired
     private ISysCategoryService sysCategoryService;
     private ISysCategoryService sysCategoryService;
+    @Autowired
+    private ISupplierListService supplierListService;
 
 
     /**
     /**
      * 分页列表查询
      * 分页列表查询
@@ -177,8 +174,6 @@ public class ProjectController {
         project.setAdvertiserName(null);
         project.setAdvertiserName(null);
         String projectName = project.getProjectName();
         String projectName = project.getProjectName();
         project.setProjectName(null);
         project.setProjectName(null);
-
-
         String industryId = project.getIndustryId();
         String industryId = project.getIndustryId();
         project.setIndustryId(null);
         project.setIndustryId(null);
         QueryWrapper<Project> queryWrapper = QueryGenerator.initQueryWrapper(project, req.getParameterMap());
         QueryWrapper<Project> queryWrapper = QueryGenerator.initQueryWrapper(project, req.getParameterMap());
@@ -203,6 +198,23 @@ public class ProjectController {
             queryWrapper.like("project_name", projectName);
             queryWrapper.like("project_name", projectName);
         }
         }
         IPage<Project> pageList = projectService.page(page, queryWrapper);
         IPage<Project> pageList = projectService.page(page, queryWrapper);
+        List<Project> records = pageList.getRecords();
+        if (!Check.isNull(records)) {
+            for (Project project1 : records) {
+                if (!Check.isNull(project1.getSupplierCode())) {
+                    QueryWrapper<SupplierList> supplierListQueryWrapper = new QueryWrapper<>();
+                    supplierListQueryWrapper.eq("supplier_code", project1.getSupplierCode());
+                    supplierListQueryWrapper.last("limit 1");
+                    SupplierList one = supplierListService.getOne(supplierListQueryWrapper);
+                    if (!Check.isNull(one)) {
+                        project1.setSupplierCode_dictText(one.getSupplierName());
+                    }
+                }
+
+
+            }
+
+        }
         result.setSuccess(true);
         result.setSuccess(true);
         result.setResult(pageList);
         result.setResult(pageList);
         return result;
         return result;
@@ -277,6 +289,8 @@ public class ProjectController {
 
 
     @Autowired
     @Autowired
     private ISysRoleExtService sysRoleService;
     private ISysRoleExtService sysRoleService;
+    @Autowired
+    private IMaterialInfoService materialInfoService;
 
 
     /**
     /**
      * 编辑
      * 编辑
@@ -324,6 +338,14 @@ public class ProjectController {
             // updateUserAllocation.setMediaId(project.getMediaId());
             // updateUserAllocation.setMediaId(project.getMediaId());
             userAllocationService.update(updateUserAllocation, userAllocationQueryWrapper);
             userAllocationService.update(updateUserAllocation, userAllocationQueryWrapper);
 
 
+            if (!projectEntity.getSupplierCode().equals(project.getSupplierCode())) {
+                QueryWrapper<MaterialInfo> materialInfoQueryWrapper = new QueryWrapper<>();
+                materialInfoQueryWrapper.eq("project_id", project.getId());
+                MaterialInfo updateMaterialInfo = new MaterialInfo();
+                updateMaterialInfo.setSupplierCode(project.getSupplierCode());
+                materialInfoService.update(updateMaterialInfo, materialInfoQueryWrapper);
+            }
+
             if (ok) {
             if (ok) {
                 result.success("修改成功!");
                 result.success("修改成功!");
             }
             }

+ 1 - 26
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectMemberController.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
 import cn.com.ctop.common.module.entity.Project;
 import cn.com.ctop.common.module.entity.Project;
+import cn.com.ctop.common.module.entity.SysUser;
 import cn.com.ctop.common.module.service.IProjectService;
 import cn.com.ctop.common.module.service.IProjectService;
 import cn.com.ctop.common.module.service.ISysRoleExtService;
 import cn.com.ctop.common.module.service.ISysRoleExtService;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.Check;
@@ -10,17 +11,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.ctop.entity.ProjectMember;
 import org.jeecg.modules.ctop.entity.ProjectMember;
 import org.jeecg.modules.ctop.mapper.ProjectMemberMapper;
 import org.jeecg.modules.ctop.mapper.ProjectMemberMapper;
 import org.jeecg.modules.ctop.service.IProjectMemberService;
 import org.jeecg.modules.ctop.service.IProjectMemberService;
-import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.service.ISysUserService;
 import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
@@ -58,8 +56,6 @@ public class ProjectMemberController {
      * @param projectId
      * @param projectId
      * @return
      * @return
      */
      */
-    @AutoLog(value = "项目成员-分页列表查询")
-    @ApiOperation(value = "项目成员-分页列表查询", notes = "项目成员-分页列表查询")
     @GetMapping(value = "/getMemberList")
     @GetMapping(value = "/getMemberList")
     public Map<String, Object> getMemberList(String projectId) {
     public Map<String, Object> getMemberList(String projectId) {
         Map<String, Object> map = new HashMap<>();
         Map<String, Object> map = new HashMap<>();
@@ -86,8 +82,6 @@ public class ProjectMemberController {
      * @param userId
      * @param userId
      * @return
      * @return
      */
      */
-    @AutoLog(value = "项目成员-分页列表查询")
-    @ApiOperation(value = "项目成员-分页列表查询", notes = "项目成员-分页列表查询")
     @GetMapping(value = "/participateList")
     @GetMapping(value = "/participateList")
     public Map<String, Object> participateList(String userId) {
     public Map<String, Object> participateList(String userId) {
         Map<String, Object> map = new HashMap<>();
         Map<String, Object> map = new HashMap<>();
@@ -116,7 +110,6 @@ public class ProjectMemberController {
                         projectMember.setMaxBid(project.getMaxBid());
                         projectMember.setMaxBid(project.getMaxBid());
                         projectMemberList.add(projectMember);
                         projectMemberList.add(projectMember);
                     }
                     }
-
                 }
                 }
             }
             }
             map.put("code", 0);
             map.put("code", 0);
@@ -141,8 +134,6 @@ public class ProjectMemberController {
      * @param req
      * @param req
      * @return
      * @return
      */
      */
-    @AutoLog(value = "项目成员-分页列表查询")
-    @ApiOperation(value = "项目成员-分页列表查询", notes = "项目成员-分页列表查询")
     @GetMapping(value = "/list")
     @GetMapping(value = "/list")
     public Result<IPage<ProjectMember>> queryPageList(ProjectMember projectMember,
     public Result<IPage<ProjectMember>> queryPageList(ProjectMember projectMember,
                                                       @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                       @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@@ -164,10 +155,6 @@ public class ProjectMemberController {
      * @param jsonObject
      * @param jsonObject
      * @return
      * @return
      */
      */
-
-
-    @AutoLog(value = "项目成员-添加")
-    @ApiOperation(value = "项目成员-添加", notes = "项目成员-添加")
     @PostMapping(value = "/batchAdd")
     @PostMapping(value = "/batchAdd")
     public Result<ProjectMember> batchAdd(@RequestBody JSONObject jsonObject) {
     public Result<ProjectMember> batchAdd(@RequestBody JSONObject jsonObject) {
         Result<ProjectMember> result = new Result<>();
         Result<ProjectMember> result = new Result<>();
@@ -222,8 +209,6 @@ public class ProjectMemberController {
      * @param projectMember
      * @param projectMember
      * @return
      * @return
      */
      */
-    @AutoLog(value = "项目成员-添加")
-    @ApiOperation(value = "项目成员-添加", notes = "项目成员-添加")
     @PostMapping(value = "/add")
     @PostMapping(value = "/add")
     public Result<ProjectMember> add(@RequestBody ProjectMember projectMember) {
     public Result<ProjectMember> add(@RequestBody ProjectMember projectMember) {
         Result<ProjectMember> result = new Result<>();
         Result<ProjectMember> result = new Result<>();
@@ -243,8 +228,6 @@ public class ProjectMemberController {
      * @param projectMember
      * @param projectMember
      * @return
      * @return
      */
      */
-    @AutoLog(value = "项目成员-编辑")
-    @ApiOperation(value = "项目成员-编辑", notes = "项目成员-编辑")
     @PutMapping(value = "/edit")
     @PutMapping(value = "/edit")
     public Result<ProjectMember> edit(@RequestBody ProjectMember projectMember) {
     public Result<ProjectMember> edit(@RequestBody ProjectMember projectMember) {
         Result<ProjectMember> result = new Result<>();
         Result<ProjectMember> result = new Result<>();
@@ -267,8 +250,6 @@ public class ProjectMemberController {
      * @param id
      * @param id
      * @return
      * @return
      */
      */
-    @AutoLog(value = "项目成员-通过id删除")
-    @ApiOperation(value = "项目成员-通过id删除", notes = "项目成员-通过id删除")
     @DeleteMapping(value = "/delete")
     @DeleteMapping(value = "/delete")
     public Result<Object> delete(@RequestParam(name = "id", required = true) String id) {
     public Result<Object> delete(@RequestParam(name = "id", required = true) String id) {
         try {
         try {
@@ -286,8 +267,6 @@ public class ProjectMemberController {
      * @param ids
      * @param ids
      * @return
      * @return
      */
      */
-    @AutoLog(value = "项目成员-批量删除")
-    @ApiOperation(value = "项目成员-批量删除", notes = "项目成员-批量删除")
     @DeleteMapping(value = "/deleteBatch")
     @DeleteMapping(value = "/deleteBatch")
     public Result<ProjectMember> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
     public Result<ProjectMember> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
         Result<ProjectMember> result = new Result<>();
         Result<ProjectMember> result = new Result<>();
@@ -306,8 +285,6 @@ public class ProjectMemberController {
      * @param id
      * @param id
      * @return
      * @return
      */
      */
-    @AutoLog(value = "项目成员-通过id查询")
-    @ApiOperation(value = "项目成员-通过id查询", notes = "项目成员-通过id查询")
     @GetMapping(value = "/queryById")
     @GetMapping(value = "/queryById")
     public Result<ProjectMember> queryById(@RequestParam(name = "id", required = true) String id) {
     public Result<ProjectMember> queryById(@RequestParam(name = "id", required = true) String id) {
         Result<ProjectMember> result = new Result<>();
         Result<ProjectMember> result = new Result<>();
@@ -326,8 +303,6 @@ public class ProjectMemberController {
      *
      *
      * @return
      * @return
      */
      */
-    @AutoLog(value = "头条视频报表-参与项目列表")
-    @ApiOperation(value = "头条视频报表-参与项目列表", notes = "头条视频报表-参与项目列表")
     @GetMapping(value = "/bytedanceProjectParticipateInList")
     @GetMapping(value = "/bytedanceProjectParticipateInList")
     public Result<List<ProjectMember>> bytedanceProjectParticipateInList() {
     public Result<List<ProjectMember>> bytedanceProjectParticipateInList() {
         Result<List<ProjectMember>> result = new Result<>();
         Result<List<ProjectMember>> result = new Result<>();

+ 210 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectTransferRecordController.java

@@ -0,0 +1,210 @@
+package org.jeecg.modules.ctop.controller;
+
+import cn.com.ctop.common.module.annotation.AutoLog;
+import cn.com.ctop.common.module.utils.ResultMapUtils;
+import cn.com.ctop.common.module.utils.StatusCode;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.ctop.entity.ProjectTransferRecord;
+import org.jeecg.modules.ctop.service.IProjectTransferRecordService;
+import org.jeecg.modules.system.service.ISysRoleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 账户转项目记录
+ * @author jeecg-boot
+ * @date   2020-07-22
+ * @version V1.0
+ */
+@Slf4j
+@Api(tags="账户转项目记录")
+@RestController
+@RequestMapping("/ctop/projectTransferRecord")
+public class ProjectTransferRecordController {
+	@Autowired
+	private IProjectTransferRecordService projectTransferRecordService;
+	@Autowired
+	private ISysRoleService sysRoleService;
+	/**
+	  * 我发起的
+	 * @param projectTransferRecord
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "账户转项目记录-分页列表查询")
+	@ApiOperation(value="账户转项目记录-分页列表查询", notes="账户转项目记录-分页列表查询")
+	@GetMapping(value = "/initiatedList")
+	public Result<IPage<ProjectTransferRecord>> initiatedList(ProjectTransferRecord projectTransferRecord,
+									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									  HttpServletRequest req) {
+		Integer status = projectTransferRecord.getStatus();
+		if(null == status||status.equals(0)){
+			projectTransferRecord.setStatus(null);
+		}
+		Result<IPage<ProjectTransferRecord>> result = new Result<>();
+		QueryWrapper<ProjectTransferRecord> queryWrapper = QueryGenerator.initQueryWrapper(projectTransferRecord, req.getParameterMap());
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		String rodeCode = sysRoleService.getRoleCodeByUserId(sysUser.getId());
+		if(null!=rodeCode&&rodeCode.trim().equals("admin")){
+			queryWrapper.eq("user_id",sysUser.getId());
+		}
+		queryWrapper.ne("status",0);
+		Page<ProjectTransferRecord> page = new Page<>(pageNo, pageSize);
+		IPage<ProjectTransferRecord> pageList = projectTransferRecordService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+
+	 /**
+	  * 待审核的
+	  * @param projectTransferRecord
+	  * @param pageNo
+	  * @param pageSize
+	  * @param req
+	  * @return
+	  */
+	 @AutoLog(value = "账户转项目记录-分页列表查询")
+	 @ApiOperation(value="账户转项目记录-分页列表查询", notes="账户转项目记录-分页列表查询")
+	 @GetMapping(value = "/auditList")
+	 public Result<IPage<ProjectTransferRecord>> auditList(ProjectTransferRecord projectTransferRecord,
+															   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+															   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+															   HttpServletRequest req) {
+		 Integer status = projectTransferRecord.getStatus();
+		 if(null == status||status.equals(0)){
+			 projectTransferRecord.setStatus(null);
+		 }
+		 Result<IPage<ProjectTransferRecord>> result = new Result<>();
+		 QueryWrapper<ProjectTransferRecord> queryWrapper = QueryGenerator.initQueryWrapper(projectTransferRecord, req.getParameterMap());
+		 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		 String rodeCode = sysRoleService.getRoleCodeByUserId(sysUser.getId());
+		 if(null!=rodeCode&&rodeCode.trim().equals("admin")){
+			 queryWrapper.eq("reviewer_id",sysUser.getId());
+		 }
+		 queryWrapper.ne("status",0);
+		 Page<ProjectTransferRecord> page = new Page<>(pageNo, pageSize);
+		 IPage<ProjectTransferRecord> pageList = projectTransferRecordService.page(page, queryWrapper);
+		 result.setSuccess(true);
+		 result.setResult(pageList);
+		 return result;
+	 }
+
+	 @PostMapping("editStatus")
+	 public Map<String,Object> editStatus(Long id, Integer status){
+	 	Map<String, Object>result = new HashMap<>();
+	 	if(id == null||id == 0||status == null){
+			ResultMapUtils.setResultMap(result, StatusCode.COMMON_PARAM_ERROR);
+			return result;
+		}
+		return projectTransferRecordService.updateStatus(id,status);
+	 }
+
+	/**
+	  *  添加
+	 * @return
+	 */
+	@AutoLog(value = "账户转项目记录-添加")
+	@ApiOperation(value="账户转项目记录-添加", notes="账户转项目记录-添加")
+	@PostMapping(value = "/add")
+	public Map<String,Object> add(Long accountId, Long projectId) {
+		return projectTransferRecordService.addRecord(accountId,projectId);
+	}
+
+	/**
+	  *  编辑
+	 * @param projectTransferRecord
+	 * @return
+	 */
+	@AutoLog(value = "账户转项目记录-编辑")
+	@ApiOperation(value="账户转项目记录-编辑", notes="账户转项目记录-编辑")
+	@PutMapping(value = "/edit")
+	public Result<ProjectTransferRecord> edit(@RequestBody ProjectTransferRecord projectTransferRecord) {
+		Result<ProjectTransferRecord> result = new Result<>();
+		ProjectTransferRecord projectTransferRecordEntity = projectTransferRecordService.getById(projectTransferRecord.getId());
+		if(projectTransferRecordEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = projectTransferRecordService.updateById(projectTransferRecord);
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * 通过id删除
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "账户转项目记录-通过id删除")
+	@ApiOperation(value="账户转项目记录-通过id删除", notes="账户转项目记录-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<Object> delete(@RequestParam(name="id",required=true) Long id,@RequestParam(name = "status",defaultValue = "0") Integer status) {
+		try {
+			projectTransferRecordService.updateStatus(id,status);
+		} catch (Exception e) {
+			log.error("删除失败",e.getMessage());
+			return Result.error("删除失败!");
+		}
+		return Result.ok("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "账户转项目记录-批量删除")
+	@ApiOperation(value="账户转项目记录-批量删除", notes="账户转项目记录-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<ProjectTransferRecord> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<ProjectTransferRecord> result = new Result<>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别!");
+		}else {
+			this.projectTransferRecordService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+
+	/**
+	 * 通过id查询
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "账户转项目记录-通过id查询")
+	@ApiOperation(value="账户转项目记录-通过id查询", notes="账户转项目记录-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<ProjectTransferRecord> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<ProjectTransferRecord> result = new Result<>();
+		ProjectTransferRecord projectTransferRecord = projectTransferRecordService.getById(id);
+		if(projectTransferRecord==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(projectTransferRecord);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+}

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ReleaseRecordController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,7 +8,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.ctop.entity.ReleaseRecord;
 import org.jeecg.modules.ctop.entity.ReleaseRecord;
 import org.jeecg.modules.ctop.service.IReleaseRecordService;
 import org.jeecg.modules.ctop.service.IReleaseRecordService;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ReleaseViewRecordController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -9,7 +10,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.ctop.entity.ReleaseViewRecord;
 import org.jeecg.modules.ctop.entity.ReleaseViewRecord;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/SalePerformanceDetailController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -8,7 +9,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.performance.entity.SalePerformanceDetail;
 import org.jeecg.modules.performance.entity.SalePerformanceDetail;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ScriptTagInfoController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
+import cn.com.ctop.common.module.annotation.AutoLog;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,7 +8,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.ctop.entity.ScriptTagInfo;
 import org.jeecg.modules.ctop.entity.ScriptTagInfo;
 import org.jeecg.modules.ctop.service.IScriptTagInfoService;
 import org.jeecg.modules.ctop.service.IScriptTagInfoService;

+ 248 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/SupplierListController.java

@@ -0,0 +1,248 @@
+package org.jeecg.modules.ctop.controller;
+
+import cn.com.ctop.common.module.annotation.AutoLog;
+import cn.com.ctop.common.module.entity.SupplierList;
+import cn.com.ctop.common.module.service.ISupplierListService;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 供应商列表
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2020-07-27
+ */
+@Slf4j
+@Api(tags = "供应商列表")
+@RestController
+@RequestMapping("/ctop/supplierList")
+public class SupplierListController {
+    @Autowired
+    private ISupplierListService supplierListService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param supplierList
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "供应商列表-分页列表查询")
+    @ApiOperation(value = "供应商列表-分页列表查询", notes = "供应商列表-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<SupplierList>> queryPageList(SupplierList supplierList,
+                                                     @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                     HttpServletRequest req) {
+        Result<IPage<SupplierList>> result = new Result<>();
+        QueryWrapper<SupplierList> queryWrapper = QueryGenerator.initQueryWrapper(supplierList, req.getParameterMap());
+        Page<SupplierList> page = new Page<SupplierList>(pageNo, pageSize);
+        IPage<SupplierList> pageList = supplierListService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param supplierList
+     * @return
+     */
+    @AutoLog(value = "供应商列表-添加")
+    @ApiOperation(value = "供应商列表-添加", notes = "供应商列表-添加")
+    @PostMapping(value = "/add")
+    public Result<SupplierList> add(@RequestBody SupplierList supplierList) {
+        Result<SupplierList> result = new Result<>();
+        try {
+            supplierListService.save(supplierList);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param supplierList
+     * @return
+     */
+    @AutoLog(value = "供应商列表-编辑")
+    @ApiOperation(value = "供应商列表-编辑", notes = "供应商列表-编辑")
+    @PutMapping(value = "/edit")
+    public Result<SupplierList> edit(@RequestBody SupplierList supplierList) {
+        Result<SupplierList> result = new Result<SupplierList>();
+        SupplierList supplierListEntity = supplierListService.getById(supplierList.getId());
+        if (supplierListEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = supplierListService.updateById(supplierList);
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "供应商列表-通过id删除")
+    @ApiOperation(value = "供应商列表-通过id删除", notes = "供应商列表-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        try {
+            supplierListService.removeById(id);
+        } catch (Exception e) {
+            log.error("删除失败", e.getMessage());
+            return Result.error("删除失败!");
+        }
+        return Result.ok("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "供应商列表-批量删除")
+    @ApiOperation(value = "供应商列表-批量删除", notes = "供应商列表-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<SupplierList> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<SupplierList> result = new Result<>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.supplierListService.removeByIds(Arrays.asList(ids.split(",")));
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "供应商列表-通过id查询")
+    @ApiOperation(value = "供应商列表-通过id查询", notes = "供应商列表-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<SupplierList> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<SupplierList> result = new Result<>();
+        SupplierList supplierList = supplierListService.getById(id);
+        if (supplierList == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(supplierList);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<SupplierList> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                SupplierList supplierList = JSON.parseObject(deString, SupplierList.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(supplierList, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<SupplierList> pageList = supplierListService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "供应商列表列表");
+        mv.addObject(NormalExcelConstants.CLASS, SupplierList.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("供应商列表列表数据", "导出人:Jeecg", "导出信息"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        return mv;
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            MultipartFile file = entity.getValue();
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+            params.setNeedSave(true);
+            try {
+                List<SupplierList> listSupplierLists = ExcelImportUtil.importExcel(file.getInputStream(), SupplierList.class, params);
+                supplierListService.saveBatch(listSupplierLists);
+                return Result.ok("文件导入成功!数据行数:" + listSupplierLists.size());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.ok("文件导入失败!");
+    }
+
+}

+ 248 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/SupplierWatermarkController.java

@@ -0,0 +1,248 @@
+package org.jeecg.modules.ctop.controller;
+
+import cn.com.ctop.common.module.annotation.AutoLog;
+import cn.com.ctop.common.module.entity.SupplierWatermark;
+import cn.com.ctop.common.module.service.ISupplierWatermarkService;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 供应商水印
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2020-07-28
+ */
+@Slf4j
+@Api(tags = "供应商水印")
+@RestController
+@RequestMapping("/ctop/supplierWatermark")
+public class SupplierWatermarkController {
+    @Autowired
+    private ISupplierWatermarkService supplierWatermarkService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param supplierWatermark
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "供应商水印-分页列表查询")
+    @ApiOperation(value = "供应商水印-分页列表查询", notes = "供应商水印-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<SupplierWatermark>> queryPageList(SupplierWatermark supplierWatermark,
+                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                          HttpServletRequest req) {
+        Result<IPage<SupplierWatermark>> result = new Result<>();
+        QueryWrapper<SupplierWatermark> queryWrapper = QueryGenerator.initQueryWrapper(supplierWatermark, req.getParameterMap());
+        Page<SupplierWatermark> page = new Page<SupplierWatermark>(pageNo, pageSize);
+        IPage<SupplierWatermark> pageList = supplierWatermarkService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param supplierWatermark
+     * @return
+     */
+    @AutoLog(value = "供应商水印-添加")
+    @ApiOperation(value = "供应商水印-添加", notes = "供应商水印-添加")
+    @PostMapping(value = "/add")
+    public Result<SupplierWatermark> add(@RequestBody SupplierWatermark supplierWatermark) {
+        Result<SupplierWatermark> result = new Result<>();
+        try {
+            supplierWatermarkService.save(supplierWatermark);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param supplierWatermark
+     * @return
+     */
+    @AutoLog(value = "供应商水印-编辑")
+    @ApiOperation(value = "供应商水印-编辑", notes = "供应商水印-编辑")
+    @PutMapping(value = "/edit")
+    public Result<SupplierWatermark> edit(@RequestBody SupplierWatermark supplierWatermark) {
+        Result<SupplierWatermark> result = new Result<SupplierWatermark>();
+        SupplierWatermark supplierWatermarkEntity = supplierWatermarkService.getById(supplierWatermark.getId());
+        if (supplierWatermarkEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = supplierWatermarkService.updateById(supplierWatermark);
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "供应商水印-通过id删除")
+    @ApiOperation(value = "供应商水印-通过id删除", notes = "供应商水印-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        try {
+            supplierWatermarkService.removeById(id);
+        } catch (Exception e) {
+            log.error("删除失败", e.getMessage());
+            return Result.error("删除失败!");
+        }
+        return Result.ok("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "供应商水印-批量删除")
+    @ApiOperation(value = "供应商水印-批量删除", notes = "供应商水印-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<SupplierWatermark> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<SupplierWatermark> result = new Result<>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.supplierWatermarkService.removeByIds(Arrays.asList(ids.split(",")));
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "供应商水印-通过id查询")
+    @ApiOperation(value = "供应商水印-通过id查询", notes = "供应商水印-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<SupplierWatermark> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<SupplierWatermark> result = new Result<>();
+        SupplierWatermark supplierWatermark = supplierWatermarkService.getById(id);
+        if (supplierWatermark == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(supplierWatermark);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<SupplierWatermark> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                SupplierWatermark supplierWatermark = JSON.parseObject(deString, SupplierWatermark.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(supplierWatermark, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<SupplierWatermark> pageList = supplierWatermarkService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "供应商水印列表");
+        mv.addObject(NormalExcelConstants.CLASS, SupplierWatermark.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("供应商水印列表数据", "导出人:Jeecg", "导出信息"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        return mv;
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            MultipartFile file = entity.getValue();
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+            params.setNeedSave(true);
+            try {
+                List<SupplierWatermark> listSupplierWatermarks = ExcelImportUtil.importExcel(file.getInputStream(), SupplierWatermark.class, params);
+                supplierWatermarkService.saveBatch(listSupplierWatermarks);
+                return Result.ok("文件导入成功!数据行数:" + listSupplierWatermarks.size());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.ok("文件导入失败!");
+    }
+
+}

+ 86 - 9
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TestController.java

@@ -3,10 +3,8 @@ package org.jeecg.modules.ctop.controller;
 import cn.com.ctop.common.module.entity.*;
 import cn.com.ctop.common.module.entity.*;
 import cn.com.ctop.common.module.mapper.CtopOauthTokenMapper;
 import cn.com.ctop.common.module.mapper.CtopOauthTokenMapper;
 import cn.com.ctop.common.module.service.*;
 import cn.com.ctop.common.module.service.*;
-import cn.com.ctop.common.module.utils.Check;
-import cn.com.ctop.common.module.utils.CtopAdConstant;
-import cn.com.ctop.common.module.utils.ResultMapUtils;
-import cn.com.ctop.common.module.utils.StatusCode;
+import cn.com.ctop.common.module.utils.*;
+import cn.com.ctop.common.module.vo.ResFileDTO;
 import cn.com.ctop.kuaishou.modules.batch.service.*;
 import cn.com.ctop.kuaishou.modules.batch.service.*;
 import cn.com.ctop.kuaishou.modules.graphql.service.IKuaishouWebInterfaceService;
 import cn.com.ctop.kuaishou.modules.graphql.service.IKuaishouWebInterfaceService;
 import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertiserDataService;
 import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertiserDataService;
@@ -26,6 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
 import java.io.IOException;
 import java.io.IOException;
+import java.io.InputStream;
 import java.text.ParseException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.*;
@@ -69,11 +68,54 @@ public class TestController {
     private IMaterialImageInfoService iMaterialImageInfoService;
     private IMaterialImageInfoService iMaterialImageInfoService;
     @Autowired
     @Autowired
     private IBytedanceReportService bytedanceReportService;
     private IBytedanceReportService bytedanceReportService;
-    static ExecutorService executorService = Executors.newFixedThreadPool(10);
+    static ExecutorService executorService = Executors.newFixedThreadPool(15);
     static ExecutorService videoService = Executors.newFixedThreadPool(5);
     static ExecutorService videoService = Executors.newFixedThreadPool(5);
     static ExecutorService suzhaoService = Executors.newFixedThreadPool(5);
     static ExecutorService suzhaoService = Executors.newFixedThreadPool(5);
 
 
 
 
+
+    @GetMapping(value = "/getCut")
+    public void getCut() {
+        QueryWrapper<MaterialInfo> materialInfoQueryWrapper = new QueryWrapper<>();
+        materialInfoQueryWrapper.like("cover_url", "ctop-media.oss-cn-beijing.aliyuncs.com");
+        List<MaterialInfo> list = materialInfoService.list(materialInfoQueryWrapper);
+        if (!Check.isNull(list)) {
+            for (MaterialInfo materialInfo : list) {
+                executorService.submit(new Runnable() {
+                    @Override
+                    public void run() {
+                        try {
+                            String url = materialInfo.getCoverUrl();
+                            if (!Check.isNull(url)) {
+                                InputStream imageStream = LoadFileUtil.getFileStream(url);
+                                if (!Check.isNull(imageStream)) {
+                                    ResFileDTO jpg = CosUtils.uploadDetailInputStreamV2(imageStream, materialInfo.getCode() + ".jpg", "jpg", 0L, "zeroImage/");
+                                    String fileUrl = jpg.getFileUrl();
+                                    materialInfo.setCoverUrl(fileUrl);
+                                    boolean b = materialInfoService.saveOrUpdate(materialInfo);
+                                    if (b) {
+                                        log.info("修改成功,videoCode:{}", materialInfo.getCode());
+                                    }
+                                }
+                            }
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    }
+                });
+            }
+        }
+        // InputStream in, String fileName, String fileType, long fileSize, String fileSavePath
+
+
+    }
+
+
+
+
+
+
+
     @GetMapping(value = "/t")
     @GetMapping(value = "/t")
     public String test() {
     public String test() {
         Result<String> result = new Result<>();
         Result<String> result = new Result<>();
@@ -94,7 +136,6 @@ public class TestController {
     }
     }
 
 
 
 
-
     @GetMapping(value = "/getSuZhao")
     @GetMapping(value = "/getSuZhao")
     public void getSuZhao() throws JobExecutionException {
     public void getSuZhao() throws JobExecutionException {
         try {
         try {
@@ -765,13 +806,49 @@ public class TestController {
             bytedanceReportService.bytedanceAsyncTaskCreate(startDate, endDate, token, 4);
             bytedanceReportService.bytedanceAsyncTaskCreate(startDate, endDate, token, 4);
         }
         }
     }
     }
+
     @Autowired
     @Autowired
     private IBytedanceEffectVideoInfoService effectVideoInfoService;
     private IBytedanceEffectVideoInfoService effectVideoInfoService;
+
     @GetMapping("/bytedance/effectVideo/get")
     @GetMapping("/bytedance/effectVideo/get")
-    public Map<String,Object>effectVideoGet(String date){
-        Map<String,Object>result = new HashMap<>();
+    public Map<String, Object> effectVideoGet(String date) {
+        Map<String, Object> result = new HashMap<>();
         effectVideoInfoService.loadEffectVideo(date);
         effectVideoInfoService.loadEffectVideo(date);
-        ResultMapUtils.setResultMap(result,StatusCode.COMMON_SUCCESS);
+        ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
         return result;
         return result;
     }
     }
+
+
+
+    @GetMapping(value = "/getAppList")
+    public void getAppList() throws JobExecutionException {
+        try {
+            //1:查询当日数据
+            QueryWrapper<CtopOauthToken> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("media_id", 2);
+            queryWrapper.orderByDesc("create_time");
+            List<CtopOauthToken> tokens = tokenService.list(queryWrapper);
+            if (null == tokens || tokens.size() <= 0) {
+                log.info("定时获取快手数据异常:未获取到可用的token");
+                return;
+            }
+
+            tokens.forEach(token -> {
+
+                kuaishouInterfaceService.getAppList(token.getAccountId(),token.getAccessToken());
+                //suzhaoService.submit(new Runnable() {
+                //    @Override
+                //    public void run() {
+                //        //1: 获取广告主信息数据
+                //        log.info("获取素造素材:accountId:{}", token.getAccountId());
+                //        kuaishouInterfaceService.getSuZaoList(token.getAccessToken(), token.getAccountId(), 1, null, null);
+                //    }
+                //});
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+
+    }
 }
 }

+ 0 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TransferAccountController.java


Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác