diff --git "a/doc/04\345\274\200\345\217\221\350\247\204\350\214\203/\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\247\204\350\214\203.txt" "b/doc/04\345\274\200\345\217\221\350\247\204\350\214\203/\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\247\204\350\214\203.txt" new file mode 100644 index 0000000000000000000000000000000000000000..8a13be2ae642cc3dc3054f7fc148dec5c86507d0 --- /dev/null +++ "b/doc/04\345\274\200\345\217\221\350\247\204\350\214\203/\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\247\204\350\214\203.txt" @@ -0,0 +1,963 @@ + Oracle + 数据库整体设计规范（必读） +1．设计 +1. 应用里面，多个数据库之间请不要通过 DBLINK 访问。 +2. 请不要采用触发器。 +3. 请不要使用视图和物化视图。 +4. 请不要使用外键约束，如果数据存在外键关系，请在程序层面实现。 +5. 请尽量不要使用 job，如果不得已必须使用，Job 的设计必须是可重复执行的。 +6. 请尽量不要采用存储过程。 +7. 应用必须具有自动重连的机制。但是又要避免每执行一条 SQL 语句就检查一下 DB 的可 +用性。 +2．命名 +a) 命名应使用富有意义的英文词汇(见词知义)，多个单词组成的，中间以下划线分割。 +b) 命名只能使用英文字母，数字和下划线。 +c) 命名避免使用 Oracle 保留字和系统关键字。 +d) 命名长度以不超过 15 个字符为宜(避免超过 20)。 +e) 命名全部采用小写，并且名称前后不能加引号。 + + 数据库对象设计规范 +1. 表 +设计 +a) 在设计时尽量包含两个日期字段:gmt_created(创建日期),gmt_modified(修改日期)且 +非空, 对表的记录进行更新的时候，必须包含对 gmt_modified 字段的更新。 +b) 尽可能使用简单数据类型，不要使用类似数组或者嵌套表这种复杂类型。 +c) 必须要有主键，且尽量不要使用有实际意义的字段做主键。 +d) 需要 join 的字段，数据类型保持绝对一致。 +e) 当表的字段数非常多时，可以将表分成两张表，一张作为条件查询表，一张作为详 +细内容表（主要是为了性能考虑）。 +f) 当字段的类型为枚举型或布尔型时，建议使用 char(1)类型。 +命名 +a) 同一个模块的表尽可能使用相同的前缀，表名尽可能表达含义，例如： +CRM_SAL_FUND_ITEM。 +b) 字段命名应尽可能使用表达实际含义的英文单词或缩写，不要使用类似“VALUE1” +这种无意义的字段名。 +c) 布尔值类型的字段命名为 is+描述。如 member 表上表示是否为 enabled 的会员的字 +段命名为 IsEnabled。 +字段类型 +类型 规范 +NUMBER(p,s) 固定精度数字类型 +NUMBER 不固定精度数字类型，当不确定数字的精度时使用，PK 通常使用此类型 +DATE 当仅需精确到秒时，选择 DATE 而不是 TIMESTAMP 类型 +TIMESTAMP 扩展日期类型，不建议使用 +VARCHAR2 变长字符串，最长 4000 个字节 +CHAR 定长字符串，除非是 CHAR(1),否则不要使用 +CLOB 当超过 4000 字节时使用，但是要求这个字段必须单独创建到一张表中， +然后有 PK 与主表关联。此类型应该尽量控制使用 + +字段注释 +a) 标准字段注释由一组"@"开头的标签+空格+文本组成。 +以 MD_USER 表的部分字段为例： +Name Type Comments +PARTY_ID VARCHAR2(20) @desc 主键 ID +CORPORATION_ID VARCHAR2(20) @desc 用户所在公司 ID +@fk md_corporation.party_id +STATUS VARCHAR2(20) @desc 状态 +@values disable|enable:未激活状 +态|激活状态 +IS_PRI_ACCOUNT CHAR(1) @desc 是否为主账号。后台生成 +UK 时使用 +@values y|n:是帐号，非主帐号 +@logic 一个公司内部，有且仅有 +一个主账号存在 +b) 注释标签说明 +标签名 中文含义 必填 备注 +@desc 字段中文描述 Yes +@fk 字段对应的外键字段 +@values 取值范围说明。多个值以"|" +分隔 +如此字段的值由系统自动生成，可忽略不书写。 +@sample 数据范本 对于复杂数据格式，最好给一个数据范本。 +@formula 计算公式 写明该字段由哪些字段以何种公式计算得到。 +@logic 数据逻辑 简要写明该字段的数据是在何种业务规则下，如何变 +化的。 +@redu 标识此字段冗余 +@depr 标识此字段已废弃 简要写明：废弃人 废弃日期 废弃原因 + +2. 索引 +设计 +a) Bitmap 索引通常不适合我们的环境。 +b) 索引根据实际业务SQL，建立对应的索引字段。 +c) 不要创建带约束的索引，所有的约束效果都通过显示创建约束然后再 using index 一 +个已经创建好的普通索引来实现。 +命名 +a) __ind,各部分以下划线（_）分割。 +b) 多单词组成的 column name，取前几个单词首字母，加末单词组成 column_name。如： +sample 表 member_id 上的索引：sample_mid_ind。 +3. 约束 +设计 +a) 主键最好是无意义的，由 Sequence 产生的 ID 字段，类型为 number，不建议使用组 +合主键。 +b) 若要达到唯一性限制的效果，不要创建 unique index，必须显式创建普通索引和约束 +（pk 或 uk），即先创建一个以约束名命名的普通索引，然后创建一个约束，用 using +index ...指定索引。 +c) 当删除约束的时候，为了确保不影响到 index，最好加上 keep index 参数。 +d) 主键的内容不能被修改。 +e) 外键约束一般不在数据库上创建，只表达一个逻辑的概念，由程序控制。 +f) 当万不得已必须使用外健的话，必须在外健列创建 INDEX。 +命名 +a) 主键约束： _pk 结尾，_pk； +b) unique 约束：_uk 结尾，__uk； +c) check 约束： _ck 结尾，__ck； +d) 外键约束： _fk 结尾，以 pri 连接本表与主表，_pri__fk； +4. SEQUENCE +命名 +a) seq_ + +5. 触发器 +命名 +a) _A(After)B(Before)I(Insert)U(Update)D(Delete)_trg。 +b) 若是用于同步的触发器以 sync 作为前缀：sync__trg。 +6. 过程、函数、包 +命名 +a) 过程以 proc_开头，函数以 func_开头，包以 pkg_开头。 +b) 变量命名约定：本地变量以 v_为前缀，参数以 p_为前缀，可以带_I(输入)，_O(输出)、 +_IO(输入输出）表示参数的输入输出类型。 + + SQL 开发规范 +一. 编码规范 +1. 在代码中不允许出现任何 DDL 语句 +a) DDL 语句一律由 DBA 编写并统一执行 +2. 写 SQL 的时侯一定要使用绑定变量 +a) 对于极少数情况下不使用绑定变量提高性能，使用之前一定要和 DBA 沟通 +3. 写 SQL 的时候一定要给每个字段指定表名做前缀 +a) 比如 select a.id,a.name from test a; 好处是一来带来性能的提升，二来可以避免一些错 +误的发生。 +4. 在 sqlmap 中的变量，要用#号，而不要用$符号 +a) 如#appid#。因为$name$ 是字面意义的替换，这种形式会有 SQL 注入的漏洞，而 +#name# 是带类型的替换，不存在 SQL 注入的风险。 +5. 请不要写 select * 这样的代码，指定需要的字段名 +6. 避免在 where 子句中对字段施加函数 +a) 通常，不允许在字段上添加函数或者表达式，这样将导致索引失效，如： +错误的写法： +select * from iw_account_log where to_char ( trans_dt, 'yyyy-mm-dd') = '2007-04-04'; +select qty from product where p_id + 12 = 168; +正确的写法： +select * from iw_account_log +where trans_dt >= to_date ( '2007-04-04', 'yyyy-mm-dd') and trans_dt < to_date +( '2007-04-05', 'yyyy-mm-dd'); +select qty from product where p_id = 168 - 12; +b) 如果是业务要求的除外，但需要在编写时咨询 DBA +c) 特别注意，当表连接时，用于连接的两个表的字段如果数据类型不一致，则必须在 +一边加上类型转换的函数，如 +错误的写法（a.id 是 number 类型，而 b.operator_number 是 char 类型）： +select count from adm_user a, adm_action_log b where a.id = b.operator_number +and a.username = '小钗'; + +正确的写法： +select count from adm_user a, adm_action_log b where to_char(a.id) = +b.operator_number and a.username = '小钗'; +select count from adm_user a, adm_action_log b where a.id = +to_number(b.operator_number) and a.username = '小钗'; +上面两种写法哪个正确？遇到这种情况时必须咨询 DBA！ +7. 严格要求使用正确类型的变量，杜绝 oracle 做隐式类型转换的情况 +a) 推荐在 sqlmap 的变量中指定变量的数据类型，如：select * from iw_user where +iw_user_id = #userid:VARCHAR# +b) 其中，对于时间类型的字段，必须使用 TO_DATE 进行赋值（当前时间可直接用 +sysdate 表示），不允许下列这些错误用法： +错误的写法（使用 date 类型的变量）： +select * +from iw_account_log +where trans_account = #transaccount:varchar# +and trans_dt >= #dateBegin:date# +and trans_dt < #dateEnd:date# +错误的写法（将 to_date 函数和数字进行算术运算）： +select * +from iw_account_log +where trans_account = #transaccount:varchar# +and trans_dt >= to_date(#dateBegin:varchar#, 'yyyy-mm-dd hh24:mi:ss') +and trans_dt < to_date(#dateBegin:varchar#, 'yyyy-mm-dd hh24:mi:ss') + 1 +正确的写法： +select * +from iw_account_log +where trans_account = #transaccount:varchar# +and trans_dt >= to_date(#dateBegin:varchar#, 'yyyy-mm-dd hh24:mi:ss') +and trans_dt < to_date(#dateEnd:varchar#, 'yyyy-mm-dd hh24:mi:ss') /*或 trans_dt +< sysdate */ +c) 3、对于变量数据类型错误导致 SQL 严重性能问题的，按严重的编码错误 Bug 处理！ +8. 全模糊查询无法使用 INDEX，应当尽可能避免 +a) 比如：select * from table where name like '%jacky%'; +9. 外连接的写法 +a) 不推荐使用 ANSI 连接，如 inner join、left join、right join、full outer join，而推荐使 +用（+）来表示外连接 + +不推荐的写法： +select a.*, b.goods_title from iw_account_log a left join beyond_trade_base b on +a.TRANS_OUT_ORDER_NO = b.trade_no +where a.trans_code = '6003' and a.trans_account = #transacnt:varchar# and +a.trans_dt > to_date(...) +推荐的写法： +select a.*, b.goods_title from iw_account_log a, beyond_trade_base b +where a.TRANS_OUT_ORDER_NO = b.trade_no(+) and a.trans_code = '6003' +and a.trans_account = #transacnt:varchar# and a.trans_dt > to_date(...) +10. 表连接分页查询的使用 +a) 包含排序逻辑的分页查询写法，必须是三层 select 嵌套： +错误的写法： +SELECT t1.* +FROM (SELECT t.*, ROWNUM rnum +FROM beyond_trade_base t +WHERE seller_account = :1 +AND gmt_create >= TO_DATE (:2, 'yyyy-mm-dd') +AND gmt_create < TO_DATE (:3, 'yyyy-mm-dd') +ORDER BY gmt_create DESC) t1 +WHERE rnum >= :4 AND rnum < :5 +正确的写法： +SELECT t2.* +FROM (SELECT t1.*, ROWNUM rnum +FROM (SELECT t.* +FROM beyond_trade_base t +WHERE seller_account = :1 +AND gmt_create >= TO_DATE (:2, 'yyyy-mm-dd') +AND gmt_create < TO_DATE (:3, 'yyyy-mm-dd') +ORDER BY gmt_create DESC) t1 +WHERE ROWNUM <= :4) t2 +WHERE rnum >= :5 +b) 不包含排序逻辑的分页查询写法，则是两层 select 嵌套，但对 rownum 的范围指定仍 +然必须在不同的查询层次指定： +错误的写法： + +SELECT t1.* +FROM (SELECT t.*, ROWNUM rnum +FROM beyond_trade_base t +WHERE seller_account = :1 +AND gmt_create >= TO_DATE (:2, 'yyyy-mm-dd') +AND gmt_create < TO_DATE (:3, 'yyyy-mm-dd')) t1 +WHERE rnum >= :4 AND rnum <= :5 +正确的写法： +SELECT t1.* +FROM (SELECT t.*, ROWNUM rnum +FROM beyond_trade_base t +WHERE seller_account = :1 +AND gmt_create >= TO_DATE (:2, 'yyyy-mm-dd') +AND gmt_create < TO_DATE (:3, 'yyyy-mm-dd') +AND ROWNUM <= :4) t1 +WHERE rnum >= :5 +c) 注意下面两种写法的逻辑含义是不同的： +按创建时间排序（倒序），然后再取前 10 条： +SELECT t2.* +FROM (SELECT t1.*, ROWNUM rnum +FROM (SELECT t.* +FROM sell_offer t +WHERE owner_member_id = :1 +AND gmt_create >= TO_DATE (:2, 'yyyy-mm-dd') +AND gmt_create < TO_DATE (:3, 'yyyy-mm-dd') +ORDER BY gmt_create DESC) t1 +WHERE ROWNUM <= 10) t2 +WHERE rnum >= 1 +随机取 10 条，然后在这 10 条中按照交易创建时间排序（倒序）： +SELECT t1.* +FROM (SELECT t.*, ROWNUM rnum +FROM beyond_trade_base t +WHERE seller_account = :1 +AND gmt_create >= TO_DATE (:2, 'yyyy-mm-dd') +AND gmt_create < TO_DATE (:3, 'yyyy-mm-dd') +AND ROWNUM <= 10 + +ORDER BY gmt_create DESC) t1 +WHERE rnum >= 1 +d) 先连接后分页与先分页后连接 +性能较差： +SELECT t2.* +FROM (SELECT t1.*, ROWNUM rnum +FROM (SELECT a.*, b.receive_fee +FROM beyond_trade_base a, beyond_trade_process b +WHERE a.trade_no = b.trade_no +AND a.seller_account = :1 +AND a.gmt_create >= TO_DATE (:2, 'yyyy-mm-dd') +AND a.gmt_create < TO_DATE (:3, 'yyyy-mm-dd') +ORDER BY a.gmt_create DESC) t1 +WHERE ROWNUM <= :4) t2 +WHERE rnum >= :5 +性能较好： +SELECT /*+ ordered use_nl(a,b) */ +a.*, b.receive_fee +FROM (SELECT t2.* +FROM (SELECT t1.*, ROWNUM rnum +FROM (SELECT t.* +FROM beyond_trade_base t +WHERE seller_account = :1 +AND gmt_create >= TO_DATE (:2, 'yyyy-mm-dd') +AND gmt_create < TO_DATE (:3, 'yyyy-mm-dd') +ORDER BY gmt_create DESC) t1 +WHERE ROWNUM <= :4) t2 +WHERE rnum >= :5) a, +beyond_trade_process b +WHERE a.trade_no = b.trade_no +后面这种写法的适用情况： +1)where 子句中的查询条件都是针对 beyond_trade_base 表的（否则得到的结果将 +不相同） +2）关联 beyond_trade_process 表时，用的是该表的主键或者唯一键字段（否则将 +改变结果集的条数） +11. Hint 的使用 + +a) sql 中的/*+ ordered use_nl(member offer)*/是 hint，用来确定 SQL 的执行计划，请在 +DBA 确认后使用。 +12. "<>"、"!="、"not in"、"exsits"和"not exists"的使用规范 +a) 原则上一般禁止使用"<>"、"!="和"not in"，而应该转换成相应的"="和"in"查询条件 +错误的写法： +select a.id,a.subject,a.create_type +from product +where status <> 'new' +and owner_member_id = :1 +正确的写法： +select a.id,a.subject,a.create_type +from product +where status in ('auditing','modified','service-delete','tbd','user-delete','wait-for-audit') +and owner_member_id = :1 +错误的写法： +select a.id,a.subject,a.create_type +from product +where create_type not in ('new_order','vip_add') +and owner_member_id = :1 +正确的写法： +select a.id,a.subject,a.create_type +from product +where create_type = 'cust_add' +and owner_member_id = :1 +b) 原则上不允许使用"exsits"和"not exists"查询，应转换成相应的"等连接"和外连接来查 +询 +错误的写法： +select a.id +from company a +where not exsits (select 1 +from av_info_new b +where a.id = b.company_id +) +正确的写法： +select a.id +from company a,av_info_draft b + +where a.id = b.company_id +and b.company_id is null +错误的写法： +select count +from company a +where exsits (select 1 +from av_info_new b +where a.id = b.company_id +) +正确的写法： +select count +from company a,av_info_draft b +where a.id = b.company_id +注：在通过等连接替换 exsits 的时候有一点需要注意，只有在一对一的时候两者才 +能较容易替换，如果是一对多的关系，直接替换后两者的结果会出现不一致情况。 +因为 exsits 是实现是否存在，他不 care 存在一条还是多条，而等连接时返回所关联 +上的所有数据。 +c) 如有特殊需要无法完成相应的转换，必须在 DBA 允许的情况下使用"<>"、"!="、"not +in"、"exsits"和"not exists" +13. 其它编写规范 +a) 对表的记录进行更新的时候，必须包含对 gmt_modified 字段的更新，并且不要使用 +dynamic 标记，如： +错误的写法： +update BD_CONTACTINFO + +...... + +GMT_MODIFIED = #gmtModified:TIMESTAMP# + + +where ID = #id# +正确的写法（当然，这里更推荐直接更新为 sysdate）： +update BD_CONTACTINFO +set GMT_MODIFIED = #gmtModified:TIMESTAMP# + + +...... + +where ID = #id# +b) 不允许在 where 后添加 1=1 这样的无用条件，where 可以写在 prepend 属性里，如： +错误的写法： +select count from BD_CONTRACT t where 1=1 + +...... + +正确的写法： +select count from BD_CONTRACT t + +...... + +c) 对大表进行查询时，在 SQLMAP 中需要加上对空条件的判断语句，具体可在遇到时 +咨询 DBA，如： +性能上不保险的写法： +select count from iw_user usr + + +usr.iw_user_id = #userId:varchar# + + +usr.email = #email:varchar# + + +usr.cert_type = #certType:varchar# + + +usr.cert_no = #certNo:varchar# + + +性能上较保险的写法（防止那些能保证查询性能的关键条件都为空）： +select count from iw_user usr + + + +usr.iw_user_id = #userId:varchar# + + +usr.email = #email:varchar# + + +usr.cert_type = #certType:varchar# + + +usr.cert_no = #certNo:varchar# + + + + +query not allowed + + + + +另外，对查询表单的查询控制建议使用 web 层进行控制而不是客户端脚本 +（JAVASCRIPT/VBSCRIPT） +d) 聚合函数常见问题 +1) 不要使用 count(1)代替 count（*） +2) count(column_name)计算该列不为 NULL 的记录条数 +3) count(distinct column_name)计算该列不为 NULL 的不重复值数量 +4) count()函数不会返回 NULL，但 sum()函数可能返回 NULL，可以使用 +nvl(sum(qty),0)来避免返回 NULL +e) NULL 的使用 +1) 理解 NULL 的含义，是"不确定"，而不是"空" +2) 查询时，使用 is null 或者 is not null +3) 更新时，使用等于号，如：update tablename set column_name = null +f) STR2NUMLIST、STR2VARLIST 函数的使用： +1) 适用情况：使用唯一值（或者接近唯一值）批量取数据时 +2) 编写规范：a 表必须放在 from list 的第一位，并且必须在 select 后加上下面的 hint +正确的写法： +select /+ ordered use_nl(a,b) */ b. +from TABLE(CAST(str2varlist(:1) as vartabletype)) a, beyond_trade_base b +where a.column_value = b.trade_no; + +二. 格式规范 1．注释说明 +a) 本注释说明主要用于 PL/SQL 程序及其它 SQL 文件，其它可作参考； +b) SQLPLUS 接受的注释有三种： +―― 这儿是注释 +／＊ 这儿是注释 ＊／ +REM 这儿是注释 +c) 开始注释，类似 JAVAK 中的开始注释，主要列出文件名，编写日期，版权说明，程 +序功能以及修改记录： +REM +REM $Header: filename, version, created date,auther +REM +REM Copyright +REM +REM FUNCTION +REM function explanation +REM +REM NOTES +REM +REM MODIFIED （yy/mm/dd） +REM who when - for what, recently goes first +d) 块注释，如表注释，PROCEDURE 注释等，同 JAVA: +/* +* This table is for TrustPass +* mainly store the information +* of TrustPass members +*/ +注意: 在“/*”后应当另起一行，或与其后描述有间隔，否则在 SQLPLUS +中会有问题。 +e) 单行注释，如列注释： +login_id VARCHAR2(32) NOT NULL, -- 会员标识 + +2．缩进 +低级别语句在高级别语句后的，一般缩进 4 个空格： +DECLARE + v_MemberId VARCHAR2(32), +BEGIN + SELECT admin_member_id INTO v_MemberId + FROM company + WHERE id = 10; + DBMS_OUTPUT.PUT_LINE(v_MemberId); +END; +同一语句不同部分的缩进，如果为 sub statement，则通常为 2 个空格，如果与上一句某 +部分有密切联系的，则缩至与其对齐： +BEGIN +FOR v_TmpRec IN +(SELECT login_id, + gmt_created, -- here indented as column above + satus + FROM member -- sub statement + WHERE site = 'china' + AND country='cn' ) + LOOP + NULL; + END LOOP; +END; +3．断行 +a) 一行最长不能超过 80 字符 +b) 同一语句不同字句之间 +c) 逗号以后空格 +d) 其他分割符前空格 +SELECT offer_name + ||',' + ||offer_count as offer_category, + id + FROM category +WHERE super_category_id_1 = 0; + + 附录：Oracle 关键字 +ACCESS DECIMAL INITIAL ON START +ADD NOT INSERT ONLINE SUCCESSFUL +ALL DEFAULT INTEGER OPTION SYNONYM +ALTER DELETE INTERSECT OR SYSDATE +AND DESC INTO ORDER TABLE +ANY DISTINCT IS PCTFREE THEN +AS DROP LEVEL PRIOR TO +ASC ELSE LIKE PRIVILEGES TRIGGER +AUDIT EXCLUSIVE LOCK PUBLIC UID +BETWEEN EXISTS LONG RAW UNION +BY FILE MAXEXTENTS RENAME UNIQUE +FROM FLOAT MINUS RESOURCE UPDATE +CHAR FOR MLSLABEL REVOKE USER +CHECK SHARE MODE ROW VALIDATE +CLUSTER GRANT MODIFY ROWID VALUES +COLUMN GROUP NOAUDIT ROWNUM VARCHAR +COMMENT HAVING NOCOMPRESS ROWS VARCHAR2 +COMPRESS IDENTIFIED NOWAIT SELECT VIEW +CONNECT IMMEDIATE NULL SESSION WHENEVER +CREATE IN NUMBER SET WHERE +CURRENT INCREMENT OF SIZE WITH +DATE INDEX OFFLINE SMALLINT +CHAR VARHCAR VARCHAR2 NUMBER DATE LONG +CLOB BLOB BFILE +INTEGER DECIMAL +SUM COUNT GROUPING AVERAGE +TYPE + Oracle 名词解释 +a) PK：Primary Key，主键 +b) UK：Unique Key，唯一性索引 +c) FK：Foreign Key，外键 +d) DBLINK：Database Link，数据库链接 + + Mysql + 数据库整体设计规范（必读） +1．设计 +1. 一般都使用 INNODB 存储引擎，除非读写比率<1%,才考虑使用 MYISAM 存储引擎；其 +他存储引擎请在 DBA 的建议下使用。 +2. Stored procedure （包括存储过程，函数，触发器）对于 MYSQL 来说还不是很成熟， +没有完善的出错记录处理，不建议使用。 +3. UUID()，USER()这样的 MYSQL INSIDE 函数对于复制来说是很危险的，会导致主备数 +据.不一致。所以请不要使用。如果一定要使用 UUID 作为主键，让应用程序来产生。 +4. 请不要使用外键约束，如果数据存在外键关系，请在程序层面实现。 +5. 如果应用使用的是长连接，应用必须具有自动重连的机制。但请避免每执行一个 SQL +去检查一次 DB 可用性。 +6. 如果应用使用的是长连接，应用应该具有连接的 TIMEOUT 检查机制，及时回收长时间 +没有使用的连接。 TIMEOUT 时间一般建议为 20min。 +7. 我们所有的 MySQL 数据库除历史原因外，都必须采用 UTF8 编码。 +8. Mysql 对 DDL 支持很差，表结构推荐设计为 Key-Value 结构。如果是关系型结构的数 +据库，请尽量预留一些字段，如 value1 ,value2 ,value3。 +9. Mysql 用户名与数据库名字一样。 2．命名 +a) 命名应使用富有意义的英文词汇，多个单词组成的，中间以下划线分割。 +b) 命名只能使用英文字母，数字和下划线。 +c) 命名避免使用 Mysql 的保留字（详见附录 A）和系统关键字。 +d) 命名长度以不超过 15 个字符为宜(避免超过 20)。 +e) 命名全部采用小写，并且名称前后不能加引号。 + + 数据库对象设计规范 +1. 表 +设计 +a) 在设计时尽量包含两个日期字段:gmt_created(创建日期),gmt_modified(修改日期)且 +非空, 对表的记录进行更新的时候，必须包含对 gmt_modified 字段的更新。 +b) 必须要有主键，主键尽量用自增字段类型，推荐类型为 INT 或者 BIGINT 类型。 +c) 需要多表 join 的字段，数据类型保持绝对一致。 +d) Mysql 的表尽量设置成 KV（Key-Value）结构，这样便于扩展和维护。 +e) 当表的字段数非常多时，可以将表分成两张表，一张作为条件查询表，一张作为详 +细内容表（主要是为了性能考虑）。 +f) 当字段的类型为枚举型或布尔型时，建议使用 char(1)类型。 +g) 同一表中，所有 varchar 字段的长度加起来，不能大于 65535.如果有这样的需求，请 +使用 TEXT/LONGTEXT 类型。 +h) 由于 MYSQL 表 DDL 维护成本很高，所以在适当的时候，可以有一定的字段容余。 +比如：Value1,Value2,Value3 这样的字段。 +命名 +a) 同一个模块的表尽可能使用相同的前缀，表名尽可能表达含义，例如： +CRM_SAL_FUND_ITEM。 +b) 字段命名应尽可能使用表达实际含义的英文单词或缩写， +如，公司 ID，不要使用：corporation_id, 而用：corp_id 即可。 +c) 布尔值类型的字段命名为 is+描述。如 member 表上表示是否为 enabled 的会员的字 +段命名为 IsEnabled。 +常用字段类型 +TINYINT 1 个字节, -128 to 127 || 0 to 255 +SMALLINT 2 个字节, -32768 to 32767 || 0 to 65535 +MEDIUMINT 3 个字节, -8388608 to 8388607 || 0 to 16777215. +INT, INTEGER 4 个字节, -2147483648 to 2147483647 || 0 to 4294967295. +BIGINT 8 个字节, -9223372036854775808 to 922337203685477580 + 0 to 18446744073709551615 + +DECIMAL(P,S) 定点数(以字符串形式存放) 默认:P 为 10,S 为 0,最大 65 位 +DATE 范围'1000-01-01'到'9999-12-31' 格式'YYYY-MM-DD' (3 字节) +Time 范围'-838:59:59'到'838:59:59' 格式'HH:MM:SS' (3 字节) +DATETIME 范围 '1000-01-01 00:00:00' 到 '9999-12-31 23:59:59' +格式 'YYYY-MM-DD HH:MM:SS' (8 字节) +TIMESTAMP 范围 '1970-01-01 00:00:00' 到 2037 年 +格式'YYYY-MM-DD HH:MM:SS' 宽度固定为 19 个字符(4 字节) +不建议使用。 +VARCHAR(n) 变长字符串，65532>n>4, 注意，n 是字符数，而不是字节数 +CHAR(n) 定长字符串,n 范围(0,255)， +如果不是定长的数据，n<=4 时才使用 +TINYBLOB, +TINYTEXT +存储 L+1 个字节，其中 L < 2^8 +BLOB, TEXT 存储 L+2 个字节，其中 L < 2^16 +MEDIUMBLOB, +MEDIUMTEXT +存储 L+3 个字节，其中 L < 2^24 +LONGBLOB, +LONGTEXT +存储 L+4 个字节，其中 L < 2^32 +字段注释 +a) 标准字段注释由一组"@"开头的标签+空格+文本组成。 +以 MD_USER 表的部分字段为例： +Name Type Comments +PARTY_ID VARCHAR(20) @desc 主键 ID +CORP_ID VARCHAR(20) @desc 用户所在公司 ID +@fk md_corp_id + +STATUS VARCHAR(20) @desc 状态 +@values disable|enable:未激活状 +态|激活状态 +IS_PRI_ACCOUNT CHAR(1) @desc 是否为主账号。后台生成 +UK 时使用 +@values y|n:是帐号，非主帐号 +@logic 一个公司内部，有且仅有 +一个主账号存在 +b) 注释标签说明 +标签名 中文含义 必填 备注 +@desc 字段中文描述 Yes +@fk 字段对应的外键字段 +@values 取值范围说明。多个值以"|" +分隔 +如此字段的值由系统自动生成，可忽略不书写。 +@sample 数据范本 对于复杂数据格式，最好给一个数据范本。 +@formula 计算公式 写明该字段由哪些字段以何种公式计算得到。 +@logic 数据逻辑 简要写明该字段的数据是在何种业务规则下，如何变 +化的。 +@redu 标识此字段冗余 +@depr 标识此字段已废弃 简要写明：废弃人 废弃日期 废弃原因 + +2. 索引 +设计 +a) Bitmap 索引通常不适合我们的环境。 +b) 索引根据实际 SQL，由 DBA 创建。 +c) 不要创建带约束的索引，所有的约束效果都通过显示创建约束然后再 using index 一 +个已经创建好的普通索引来实现。 +命名 +a) __ind,各部分以下划线（_）分割。 +b) 多单词组成的 column name，取前几个单词首字母，加末单词组成 column_name。如： +sample 表 member_id 上的索引：sample_mid_ind。 +3. 约束 +设计 +a) 主键最好是无意义的，，统一由 Auto-Increment 字段生成整型数据，不建议使用组合 +主键。 +b) 若要达到唯一性限制的效果，不要创建 unique index，必须显式创建普通索引和约束 +（pk 或 uk），即先创建一个以约束名命名的普通索引，然后创建一个约束，用 using +index ...指定索引。 +c) 当删除约束的时候，为了确保不影响到 index，最好加上 keep index 参数。 +d) 主键的内容不能被修改。 +e) 外键约束一般不在数据库上创建，只表达一个逻辑的概念，由程序控制。 +f) 当万不得已必须使用外健的话，必须在外健列创建 INDEX。 +命名 +a) 主键约束： _pk 结尾，_pk； +b) unique 约束：_uk 结尾，__uk； +c) check 约束： _ck 结尾，__ck； +d) 外键约束： _fk 结尾，以 pri 连接本表与主表，_pri__fk； + +4. 触发器 +命名 +a) _A(After)B(Before)I(Insert)U(Update)D(Delete)_trg。 +b) 若是用于同步的触发器以 sync 作为前缀：sync__trg。 +5. 过程、函数 +设计 +a) 如果要在 MYSQL 里使用存储过程类的技术，请务必和 DBA 沟通确认。 +命名 +a) 过程以 proc_开头，函数以 func_开头。 +b) 变量命名约定：本地变量以 v_为前缀，参数以 p_为前缀，可以带_I(输入)，_O(输出)、 +_IO(输入输出）表示参数的输入输出类型。 + + SQL 开发规范 +一．编码规范 +1. 使用 SQL 操作数据库前，必须由 use DB_name 开始 Use Test ; +Insert into Table_name values ( … ) ; +Commit; +2. 如果需要事务的支持，在确认使用了 innodb 存储引擎的前提下，在数据库连接时，先 +关闭自动提交 +比如，设定 set auto_commit =0 ; +3. 写到应用程序里的 SQL 语句，禁止一切 DDL 操作 +例： Create table ， Drop table ， Create database ， Drop database ， + Alter table ，grant … … +如有特殊需要，必需与 DBA 协商同意方可使用。 +4. 获取当前时间请使用 now()，不要用 sysdate()来代替 +这对复制来说是很危险的，会导致主从数据不一致的情况； +因为 sysdate,取的是系统主机时间，在 BINLOG 会原文传输， +当在应用时会与主库产生差异。 +5. 写 SQL 的时候一定要给每个字段指定表名做前缀 +比如: +select a.id,a.name from test a; +好处是 一来带来性能的提升， +二来可以避免一些错误的发生。 +6. 在 iBatis 的 SqlMap 文件中绑定变量使用 “#var_name#”表示,替代变量使用 +“$var_name$” +所有需要动态 Order By 条件的 Query，在使用替代变量过程中，需要将可能传入的内 +容以枚举类写死在代码中，禁止接受任何外部传入内容。 +7. 请不要写 select * 这样的代码，指定需要的字段名 + +8. Mysql 对日期（datetime）允许“不严格”语法 +任何标点符都可以用做日期部分或时间部分之间的间割符。 +例如， +'98-12-31 11:30:45'、'98.12.31 11+30+45'、'98/12/31 11*30*45'和'98@12@31 11^30^45' +是等价的。] +我们自己约定一种写法，与 Oracle 相通： '2009-12-31 11:30:45' +9. Mysql 的日期与字符是相同的，所以不需要做另外的转换 +例： +Select e.username from employee e where + e.birthday >=’1998-12-31 11:30:45’ +10. 避免多余的排序。使用 GROUP BY 时，默认会进行排序，当你不需要排序时，可以使用 +order by null Select product,count(*) cnt from crm_sale_detail group by product order by null; +11. 避免在 where 子句中对字段施加函数 +a) 通常，不允许在字段上添加函数或者表达式，这样将导致索引失效，如： +错误的写法： +select * from iw_account_log where substr(username,1,5)=’abcde’ +正确的写法： + select * from iw_account_log where username like ’abcde%’ +b) 如果是业务要求的除外，但需要在编写时咨询 DBA +c) 特别注意，当表连接时，用于连接的两个表的字段如果数据类型不一致，则必须在 +一边加上类型转换的函数 +12. 严格要求使用正确类型的变量，杜绝 Mysql 做隐式类型转换的情况 +13. 全模糊查询无法使用 INDEX，应当尽可能避免 +比如：select * from table where name like '%jacky%'; +14. 表连接规范 +a) 所有非外连接 SQL（即 INNER JOIN），请把关联表统一写到 FROM 字句中，关 +联条件与过滤条件统一写到 WHERE 字句中 +b) 出于代码的可读性原因，所有外连接 SQL 语句中，请一律使用 LEFT JOIN，禁用 +RIGHT JOIN +c) 另外，请注意 LEFT JOIN 字句中，右边位置表的条件书写位置不同的影响： +SELECT A.rolename,A.gmt_create,B.nickname FROM gl_role A LEFT JOIN + +gl_roledetail B ON A.ID=B.roleid AND B.roleID=2; +-------------+---------------------+----------+ +| rolename | gmt_create | nickname | ++-------------+---------------------+----------+ +| 163.com | 0000-00-00 00:00:00 | test2 | +| sina.com | 0000-00-00 00:00:00 | NULL | +| hotmail.com | 0000-00-00 00:00:00 | NULL | +| 126.com | 2009-08-20 18:20:18 | NULL | ++-------------+---------------------+----------+ +SELECT A.rolename,A.gmt_create,B.nickname FROM gl_role A LEFT JOIN +gl_roledetail B ON A.ID=B.roleid WHERE B.roleID=2; +----------+---------------------+----------+ +| rolename | gmt_create | nickname | ++----------+---------------------+----------+ +| 163.com | 0000-00-00 00:00:00 | test2 | ++----------+---------------------+----------+ +15. 表连接分页查询的使用 +a) 常规分页语句写法(start：起始记录数，page_offset：每页记录数)： +SELECT ID,username FROM gl_user WHERE username like '%@163.com' ORDER BY +M.gmt_create LIMIT start, page_offset; +b) 多表 Join 的分页语句，如果过滤条件在单个表上，需要先分页，再 Join： +低性能写法： +SELECT M.username,P.rolename FROM gl_user M INNER JOIN gl_role P ON +M.ID=P.userid WHERE username like '%@163.com' ORDER BY M.gmt_create LIMIT +start, page_offset; +高性能写法： +SELECT M.username,P.rolename +FROM (SELECT ID,username FROM gl_user WHERE username like '%@163.com' +ORDER BY M.gmt_create LIMIT start, page_offset)M,gl_role P +WHERE M.ID=P.userid; +这样写的前提是关联的表之间记录一一对应，否则可能会返回的记录数目少于或多余 +page_offset 的值。 +16. "join"、"in"、"not in"、"exsits"和"not exists"的使用 +a) 比较 IN,EXISTS,JOIN +按效率从好到差排序: +字段上有索引 : EXISTS, IN, JOIN +字段上没有索引: JOIN, EXISTS ,IN +b) Anti-Joins: NOT IN ,NOT EXISTS, LEFT JOIN + +按效率从好到差排序: +字段上有索引 : LEFT JOIN, NOT EXISTS, NOT IN +字段上没有索引: NOT IN, NOT EXISTS, LEFT JOIN +17. 其它编写规范 +a) 对表的记录进行更新的时候，必须包含对 gmt_modified 字段的更新; +b) 不允许在 where 后添加 1=1 这样的无用条件，where 可以写在 prepend 属性里，如： +错误的写法： +select count from BD_CONTRACT t where 1=1 + +...... + +正确的写法： +select count from BD_CONTRACT t + +...... + +c) 对大表进行查询时，在 SQLMAP 中需要加上对空条件的判断语句，具体可在遇到时 +咨询 DBA，如： +性能上不保险的写法： +select count from iw_user usr + + +usr.iw_user_id = #userId:varchar# + + +usr.email = #email:varchar# + + +usr.cert_type = #certType:varchar# + + +usr.cert_no = #certNo:varchar# + + +性能上较保险的写法（防止那些能保证查询性能的关键条件都为空）： + +select count from iw_user usr + + +usr.iw_user_id = #userId:varchar# + + +usr.email = #email:varchar# + + +usr.cert_type = #certType:varchar# + + +usr.cert_no = #certNo:varchar# + + + + +query not allowed + + + + +另外，对查询表单的查询控制建议使用 web 层进行控制而不是客户端脚本 +（JAVASCRIPT/VBSCRIPT） +d) 聚合函数常见问题 +1) 不要使用 count(1)代替 count（*） +2) count(column_name)计算该列不为 NULL 的记录条数 +3) count(distinct column_name)计算该列不为 NULL 的不重复值数量 +4) count()函数不会返回 NULL，但 sum()函数可能返回 NULL，可以使用 +ifnull(sum(qty),0)来避免返回 NULL +e) NULL 的使用 +1) 理解 NULL 的含义，是"不确定"，而不是"空" +2) 查询时，使用 is null 或者 is not null +3) 更新时，使用等于号，如：update tablename set column_name = null + +二．格式规范 1．注释说明 +a) 本注释说明主要用于 Mysql Client 程序及其它 SQL 文件，其它可作参考； +b) SQL 接受的注释有三种： +-- 这儿是注释 (注意，第 2 个破折号后面至少跟一个空格符) +/* 这儿是注释 */ +# 这儿是注释 +c) 下面的例子显示了 3 种风格的注释： +mysql> SELECT 1+1; # This comment continues to the end of line +mysql> SELECT 1+1; -- This comment continues to the end of line +mysql> SELECT 1 /* this is an in-line comment */ + 1; +mysql> SELECT 1+ +/* +this is a +multiple-line comment +*/ +2．缩进 +低级别语句在高级别语句后的，一般缩进 4 个空格： +DECLARE + v_MemberId VARCHAR(32), +BEGIN + SELECT admin_member_id INTO v_MemberId + FROM company + WHERE id = 10; + SELECT v_MemberId ; +END; +同一语句不同部分的缩进，如果为 sub statement，则通常为 2 个空格，如果与上一句某 +部分有密切联系的，则缩至与其对齐： + +BEGIN +FOR v_TmpRec IN +(SELECT login_id, + gmt_created, -- here indented as column above + satus + FROM member -- sub statement + WHERE site = 'china' + AND country='cn' ) + LOOP + NULL; + END LOOP; +END; +3．断行 +a) 一行最长不能超过 80 字符 +b) 同一语句不同字句之间 +c) 逗号以后空格 +d) 其他分割符前空格 +SELECT concat(offer_name,',', + offer_count as offer_category, + id) + FROM category +WHERE super_category_id_1 = 0; + + 附录：Mysql 保留字 +ADD DEFAULT INSERT NULL +SQL_CALC_FOUN +D_ROWS +ALL DELAYED INT NUMERIC +SQL_SMALL_RES +ULT +ALTER DELETE INT1 ON SQLEXCEPTION +ANALYZE DESC INT2 OPTIMIZE SQLSTATE +AND DESCRIBE INT3 OPTION SQLWARNING +AS DETERMINISTIC INT4 OPTIONALLY SSL +ASC DISTINCT INT8 OR STARTING +ASENSITIVE DISTINCTROW INTEGER ORDER STRAIGHT_JOIN +BEFORE DIV INTERVAL OUT TABLE +BETWEEN DOUBLE INTO OUTER TERMINATED +BIGINT DROP IS OUTFILE THEN +BINARY DUAL ITERATE PRECISION TINYBLOB +BLOB EACH JOIN PRIMARY TINYINT +BOTH ELSE KEY PROCEDURE TINYTEXT +BY ELSEIF KEYS PURGE TO +CALL ENCLOSED KILL RAID0 TRAILING +CASCADE ESCAPED LABEL RANGE TRIGGER +CASE EXISTS LEADING READ UNDO +CHANGE EXIT LEAVE READS UNION +CHAR EXPLAIN LEFT REAL UNIQUE +CHARACTER FETCH LIKE REFERENCES UNLOCK +CHECK FLOAT LIMIT REGEXP UNSIGNED +COLLATE FLOAT4 LINEAR RELEASE UPDATE +COLUMN FLOAT8 LINES RENAME USAGE +CONDITION FOR LOAD REPEAT USE +CONNECTION FORCE LOCALTIME REPLACE USING +CONSTRAINT FOREIGN LOCALTIMESTAMP REQUIRE UTC_DATE +CONTINUE FROM LOCK RESTRICT UTC_TIME +CONVERT FULLTEXT LONG RETURN UTC_TIMESTAMP +CREATE GOTO LONGBLOB REVOKE VALUES +CROSS GRANT LONGTEXT RIGHT VARBINARY +CURRENT_DATE GROUP LOOP RLIKE VARCHAR +CURRENT_TIME HAVING LOW_PRIORITY SCHEMA VARCHARACTER +CURRENT_TIMESTAMP HIGH_PRIORITY MATCH SCHEMAS VARYING +CURRENT_USER HOUR_MICROSECOND MEDIUMBLOB SECOND_MICROSECOND WHEN +CURSOR HOUR_MINUTE MEDIUMINT SELECT WHERE +DATABASE HOUR_SECOND MEDIUMTEXT SENSITIVE WHILE + +DATABASES IF MIDDLEINT SEPARATOR WITH +DAY_HOUR IGNORE +MINUTE_MICROSEC +OND SET WRITE +DAY_MICROSECOND IN MINUTE_SECOND SHOW X509 +DAY_MINUTE INDEX MOD SMALLINT XOR +DAY_SECOND INFILE MODIFIES SPATIAL YEAR_MONTH +DEC INNER NATURAL SPECIFIC ZEROFILL +DECIMAL INOUT +NO_WRITE_TO_BIN +LOG SQL FALSE +DECLARE INSENSITIVE NOT SQL_BIG_RESULT TRUE + Mysql 名词解释 +a) PK：Primary Key，主键 +b) UK：Unique Key，唯一性索引 +c) FK：Foreign Key，外键 \ No newline at end of file diff --git a/src/main/java/com/jeecg/demo/controller/JeecgFormDemoController.java b/src/main/java/com/jeecg/demo/controller/JeecgFormDemoController.java index 7fccce8cad0ced28215d7de42b09be7f40b26301..10bc45b2b1fb0c47cf3aee5d0b3dfda64d8eab7e 100644 --- a/src/main/java/com/jeecg/demo/controller/JeecgFormDemoController.java +++ b/src/main/java/com/jeecg/demo/controller/JeecgFormDemoController.java @@ -30,184 +30,185 @@ import com.jeecg.demo.dao.JeecgMinidaoDao; import net.sf.json.JSONArray; /** + * @author jeecg * @ClassName: JeecgFormDemoController * @Description: TODO(演示例子处理类) - * @author jeecg */ @Controller @RequestMapping("/jeecgFormDemoController") public class JeecgFormDemoController extends BaseController { - private static final Logger logger = Logger.getLogger(JeecgFormDemoController.class); - - @Autowired - private SystemService systemService; - @Autowired - private JeecgMinidaoDao jeecgMinidaoDao; - - @RequestMapping(params = "uitag") - public ModelAndView uitag(HttpServletRequest request) { - return new ModelAndView("com/jeecg/demo/form_uitag"); - } - - @RequestMapping(params = "formValidDemo") - public ModelAndView formValidDemo(HttpServletRequest request) { - return new ModelAndView("com/jeecg/demo/form_valid"); - } - - @RequestMapping(params = "testsubmit=1",method ={RequestMethod.GET, RequestMethod.POST}) - public ModelAndView testsubmit(HttpServletRequest request) { - logger.info("请求成功byebye"); - return new ModelAndView("com/jeecg/demo/form_valid"); - } - - @RequestMapping(params = "nature") - public ModelAndView easyDemo(HttpServletRequest request) { - logger.info("demo-nature"); - //ztree同步加载 - JSONArray jsonArray=JSONArray.fromObject(getZtreeData()); - request.setAttribute("regions", jsonArray.toString().replaceAll("pid","pId")); - return new ModelAndView("com/jeecg/demo/form_nature"); - } - - @RequestMapping(params = "ueditor") - public ModelAndView ueditor(HttpServletRequest request) { - logger.info("ueditor"); - return new ModelAndView("com/jeecg/demo/ueditor"); - } - - - - - /** - *下拉联动数据---省市区 - */ - @RequestMapping(params="regionSelect",method = RequestMethod.GET) - @ResponseBody - public List> cityselect(HttpServletRequest req) throws Exception{ - logger.info("----省市区联动-----"); - String pid=req.getParameter("pid"); - //List> list=jeecgMinidaoDao.getProCity(pid); - return jeecgMinidaoDao.getProCity(pid); - } - - /** - * Ztree - * 获取所有的省市区数据 - * @return - */ - public List> getZtreeData(){ - return jeecgMinidaoDao.getAllRegions(); - } - - /** - * 父级DEMO下拉菜单 - */ - @RequestMapping(params = "getComboTreeData") - @ResponseBody - public List getComboTreeData(HttpServletRequest request, ComboTree comboTree) { - CriteriaQuery cq = new CriteriaQuery(TSDepart.class); - if (comboTree.getId() != null) { - cq.eq("TSPDepart.id", comboTree.getId()); - } - if (comboTree.getId() == null) { - cq.isNull("TSPDepart"); - } - cq.add(); - List demoList = systemService.getListByCriteriaQuery(cq, false); + private static final Logger logger = Logger.getLogger(JeecgFormDemoController.class); + + @Autowired + private SystemService systemService; + @Autowired + private JeecgMinidaoDao jeecgMinidaoDao; + + @RequestMapping(params = "uitag") + public ModelAndView uitag(HttpServletRequest request) { + return new ModelAndView("com/jeecg/demo/form_uitag"); + } + + @RequestMapping(params = "formValidDemo") + public ModelAndView formValidDemo(HttpServletRequest request) { + return new ModelAndView("com/jeecg/demo/form_valid"); + } + + @RequestMapping(params = "testsubmit=1", method = {RequestMethod.GET, RequestMethod.POST}) + public ModelAndView testsubmit(HttpServletRequest request) { + logger.info("请求成功byebye"); + return new ModelAndView("com/jeecg/demo/form_valid"); + } + + @RequestMapping(params = "nature") + public ModelAndView easyDemo(HttpServletRequest request) { + logger.info("demo-nature"); + //ztree同步加载 + JSONArray jsonArray = JSONArray.fromObject(getZtreeData()); + request.setAttribute("regions", jsonArray.toString().replaceAll("pid", "pId")); + return new ModelAndView("com/jeecg/demo/form_nature"); + } + + @RequestMapping(params = "ueditor") + public ModelAndView ueditor(HttpServletRequest request) { + logger.info("ueditor"); + return new ModelAndView("com/jeecg/demo/ueditor"); + } + + + /** + * 下拉联动数据---省市区 + */ + @RequestMapping(params = "regionSelect", method = RequestMethod.GET) + @ResponseBody + public List> cityselect(HttpServletRequest req) throws Exception { + logger.info("----省市区联动-----"); + String pid = req.getParameter("pid"); + //List> list=jeecgMinidaoDao.getProCity(pid); + return jeecgMinidaoDao.getProCity(pid); + } + + /** + * Ztree + * 获取所有的省市区数据 + * + * @return + */ + public List> getZtreeData() { + return jeecgMinidaoDao.getAllRegions(); + } + + /** + * 父级DEMO下拉菜单 + */ + @RequestMapping(params = "getComboTreeData") + @ResponseBody + public List getComboTreeData(HttpServletRequest request, ComboTree comboTree) { + CriteriaQuery cq = new CriteriaQuery(TSDepart.class); + if (comboTree.getId() != null) { + cq.eq("TSPDepart.id", comboTree.getId()); + } + if (comboTree.getId() == null) { + cq.isNull("TSPDepart"); + } + cq.add(); + List demoList = systemService.getListByCriteriaQuery(cq, false); // List comboTrees = new ArrayList(); - ComboTreeModel comboTreeModel = new ComboTreeModel("id", "departname", "TSDeparts"); - List comboTrees = systemService.ComboTree(demoList, comboTreeModel, null, false); - return comboTrees; - } - - /** - * 加载ztree - * @param response - * @param request - * @return - */ - @RequestMapping(params="getTreeData",method ={RequestMethod.GET, RequestMethod.POST}) - @ResponseBody - public AjaxJson getTreeData(TSDepart depatr,HttpServletResponse response,HttpServletRequest request ){ - AjaxJson j = new AjaxJson(); - try{ + ComboTreeModel comboTreeModel = new ComboTreeModel("id", "departname", "TSDeparts"); + List comboTrees = systemService.ComboTree(demoList, comboTreeModel, null, false); + return comboTrees; + } + + /** + * 加载ztree + * + * @param response + * @param request + * @return + */ + @RequestMapping(params = "getTreeData", method = {RequestMethod.GET, RequestMethod.POST}) + @ResponseBody + public AjaxJson getTreeData(TSDepart depatr, HttpServletResponse response, HttpServletRequest request) { + AjaxJson j = new AjaxJson(); + try { // List depatrList = new ArrayList(); - StringBuffer hql = new StringBuffer(" from TSDepart t"); - //hql.append(" and (parent.id is null or parent.id='')"); - List depatrList = this.systemService.findHql(hql.toString()); - List> dataList = new ArrayList>(); - Map map = null; - for (TSDepart tsdepart : depatrList) { - String sqls = null; - Object[] paramss = null; - map = new HashMap(); - map.put("id", tsdepart.getId()); - map.put("name", tsdepart.getDepartname()); - if (tsdepart.getTSPDepart() != null) { - map.put("pId", tsdepart.getTSPDepart().getId()); - map.put("open",false); - }else { - map.put("pId", "1"); - map.put("open",false); - } - sqls = "select count(1) from t_s_depart t where t.parentdepartid = ?"; - paramss = new Object[]{tsdepart.getId()}; - long counts = this.systemService.getCountForJdbcParam(sqls, paramss); - if(counts>0){ - dataList.add(map); - }else{ - TSDepart de = this.systemService.get(TSDepart.class, tsdepart.getId()); - if (de != null) { - map.put("id", de.getId()); - map.put("name", de.getDepartname()); - if(tsdepart.getTSPDepart()!=null){ - map.put("pId", tsdepart.getTSPDepart().getId()); - map.put("open",false); - }else{ - map.put("pId", "1"); - map.put("open",false); - } - dataList.add(map); - }else{ - map.put("open",false); - dataList.add(map); - } - } - } - j.setObj(dataList); - }catch(Exception e){ - e.printStackTrace(); - } - return j; - } - - - /** - * 自动完成请求返回数据 - * @param request - * @param responss - */ - @RequestMapping(params = "getAutocompleteData",method ={RequestMethod.GET, RequestMethod.POST}) - public void getAutocompleteData(HttpServletRequest request, HttpServletResponse response) { - String searchVal = request.getParameter("searchVal"); - String hql = "from TSUser where userName like '%"+searchVal+"%'"; - List autoList = systemService.findHql(hql); - try { - response.setContentType("application/json;charset=UTF-8"); - response.setHeader("Pragma", "No-cache"); + StringBuffer hql = new StringBuffer(" from TSDepart t"); + //hql.append(" and (parent.id is null or parent.id='')"); + List depatrList = this.systemService.findHql(hql.toString()); + List> dataList = new ArrayList>(); + Map map = null; + for (TSDepart tsdepart : depatrList) { + String sqls = null; + Object[] paramss = null; + map = new HashMap(); + map.put("id", tsdepart.getId()); + map.put("name", tsdepart.getDepartname()); + if (tsdepart.getTSPDepart() != null) { + map.put("pId", tsdepart.getTSPDepart().getId()); + map.put("open", false); + } else { + map.put("pId", "1"); + map.put("open", false); + } + sqls = "select count(1) from t_s_depart t where t.parentdepartid = ?"; + paramss = new Object[]{tsdepart.getId()}; + long counts = this.systemService.getCountForJdbcParam(sqls, paramss); + if (counts > 0) { + dataList.add(map); + } else { + TSDepart de = this.systemService.get(TSDepart.class, tsdepart.getId()); + if (de != null) { + map.put("id", de.getId()); + map.put("name", de.getDepartname()); + if (tsdepart.getTSPDepart() != null) { + map.put("pId", tsdepart.getTSPDepart().getId()); + map.put("open", false); + } else { + map.put("pId", "1"); + map.put("open", false); + } + dataList.add(map); + } else { + map.put("open", false); + dataList.add(map); + } + } + } + j.setObj(dataList); + } catch (Exception e) { + e.printStackTrace(); + } + return j; + } + + + /** + * 自动完成请求返回数据 + * + * @param request + * @param response + */ + @RequestMapping(params = "getAutocompleteData", method = {RequestMethod.GET, RequestMethod.POST}) + public void getAutocompleteData(HttpServletRequest request, HttpServletResponse response) { + String searchVal = request.getParameter("searchVal"); + String hql = "from TSUser where userName like '%" + searchVal + "%'"; + List autoList = systemService.findHql(hql); + try { + response.setContentType("application/json;charset=UTF-8"); + response.setHeader("Pragma", "No-cache"); response.setHeader("Cache-Control", "no-cache"); response.setDateHeader("Expires", 0); - response.getWriter().write(JSONHelper.listtojson(new String[]{"userName"},1,autoList)); + response.getWriter().write(JSONHelper.listtojson(new String[]{"userName"}, 1, autoList)); response.getWriter().flush(); - } catch (Exception e1) { - e1.printStackTrace(); - }finally{ - try { - response.getWriter().close(); - } catch (IOException e) { - } - } - - } - + } catch (Exception e1) { + e1.printStackTrace(); + } finally { + try { + response.getWriter().close(); + } catch (IOException e) { + } + } + + } + } diff --git a/src/main/java/com/jeecg/demo/controller/JeecgListDemoController.java b/src/main/java/com/jeecg/demo/controller/JeecgListDemoController.java index 21b003b7c55d113e9e86af085aa90103ed569d9a..6d1b7ed96fb25f1a13d1dede11b45b0ab320f10d 100644 --- a/src/main/java/com/jeecg/demo/controller/JeecgListDemoController.java +++ b/src/main/java/com/jeecg/demo/controller/JeecgListDemoController.java @@ -146,7 +146,6 @@ public class JeecgListDemoController extends BaseController { * @param request * @param response * @param dataGrid - * @param user */ @RequestMapping(params = "datagrid") @@ -240,10 +239,12 @@ public class JeecgListDemoController extends BaseController { if (StringUtil.isNotEmpty(jeecgDemo.getId())) { jeecgDemo = jeecgDemoService.getEntity(JeecgDemoEntity.class, jeecgDemo.getId()); req.setAttribute("jgDemo", jeecgDemo); - if ("0".equals(jeecgDemo.getSex())) - req.setAttribute("sex", "男"); - if ("1".equals(jeecgDemo.getSex())) - req.setAttribute("sex", "女"); + if ("0".equals(jeecgDemo.getSex())) { + req.setAttribute("sex", "男"); + } + if ("1".equals(jeecgDemo.getSex())) { + req.setAttribute("sex", "女"); + } } return new ModelAndView("com/jeecg/demo/jeecgDemo-print"); } @@ -304,7 +305,7 @@ public class JeecgListDemoController extends BaseController { /** * 添加jeecg_demo * - * @param ids + * @param jeecgDemo * @return */ @RequestMapping(params = "doAdd") @@ -328,7 +329,7 @@ public class JeecgListDemoController extends BaseController { /** * 更新jeecg_demo * - * @param ids + * @param jeecgDemo * @return */ @RequestMapping(params = "doUpdate") diff --git a/src/main/java/com/jeecg/demo/dao/JeecgMinidaoDao.java b/src/main/java/com/jeecg/demo/dao/JeecgMinidaoDao.java index ef7a5610e422a64efa2bce26d46da3cecc98e8b6..62a500acd37dbac59a4b9d83e3b2429889605bc9 100644 --- a/src/main/java/com/jeecg/demo/dao/JeecgMinidaoDao.java +++ b/src/main/java/com/jeecg/demo/dao/JeecgMinidaoDao.java @@ -18,6 +18,13 @@ import com.jeecg.demo.entity.JeecgLogReport; @MiniDao public interface JeecgMinidaoDao { + /** + * @Description + * @Author xushanchang + * @Date 2021/7/411:08 + * @Param + * @return + **/ @Arguments("pid") @Sql("select ID,NAME,PID from t_s_region where pid=:pid order by name_en") List> getProCity(String pid); diff --git a/src/main/java/com/jeecg/demo/service/impl/JeecgDemoServiceImpl.java b/src/main/java/com/jeecg/demo/service/impl/JeecgDemoServiceImpl.java index 06fd3395af4fba1f3b6d8ff13fa151397f5d38b5..e04c038b3bb89993d9e70d39a96d89d96a512be3 100644 --- a/src/main/java/com/jeecg/demo/service/impl/JeecgDemoServiceImpl.java +++ b/src/main/java/com/jeecg/demo/service/impl/JeecgDemoServiceImpl.java @@ -20,20 +20,23 @@ import com.jeecg.demo.service.JeecgDemoServiceI; public class JeecgDemoServiceImpl extends CommonServiceImpl implements JeecgDemoServiceI { - public void delete(JeecgDemoEntity entity) throws Exception{ + @Override + public void delete(JeecgDemoEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(JeecgDemoEntity entity) throws Exception{ + @Override + public Serializable save(JeecgDemoEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(JeecgDemoEntity entity) throws Exception{ + @Override + public void saveOrUpdate(JeecgDemoEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -55,7 +58,7 @@ public class JeecgDemoServiceImpl extends CommonServiceImpl implements JeecgDemo } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(JeecgDemoEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/api/tmsapi.java b/src/main/java/com/zzjee/api/tmsapi.java index f3bc57845cbf1ca6b9d88003c82787b7ca27e08a..ea52419aa2abc07d768fe152e847ae26d780be65 100644 --- a/src/main/java/com/zzjee/api/tmsapi.java +++ b/src/main/java/com/zzjee/api/tmsapi.java @@ -1,16 +1,12 @@ package com.zzjee.api; -import com.sap.conn.jco.JCoParameterList; -import com.sap.conn.jco.JCoTable; - import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; -import org.jeecgframework.core.util.*; - import org.jeecgframework.web.system.service.SystemService; +import org.jeecgframework.core.util.StringUtil; +import org.jeecgframework.web.system.service.SystemService; import org.jeecgframework.web.system.service.UserService; import org.springframework.beans.factory.annotation.Autowired; - import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -18,12 +14,7 @@ import org.springframework.web.util.UriComponentsBuilder; import javax.validation.Validator; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; - -import static com.xiaoleilu.hutool.date.DateTime.now; @Controller @RequestMapping(value = "/tmsapi") diff --git a/src/main/java/com/zzjee/ba/service/impl/BaCostConfServiceImpl.java b/src/main/java/com/zzjee/ba/service/impl/BaCostConfServiceImpl.java index f6f5ed24046e753cfea0a5d06223729aa5d81073..82395693198b5ae2b3a7d55e4f092f991ed37346 100644 --- a/src/main/java/com/zzjee/ba/service/impl/BaCostConfServiceImpl.java +++ b/src/main/java/com/zzjee/ba/service/impl/BaCostConfServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class BaCostConfServiceImpl extends CommonServiceImpl implements BaCostConfServiceI { - public void delete(BaCostConfEntity entity) throws Exception{ + @Override + public void delete(BaCostConfEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(BaCostConfEntity entity) throws Exception{ + @Override + public Serializable save(BaCostConfEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(BaCostConfEntity entity) throws Exception{ + @Override + public void saveOrUpdate(BaCostConfEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class BaCostConfServiceImpl extends CommonServiceImpl implements BaCostCo } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(BaCostConfEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/ba/service/impl/BaCostServiceImpl.java b/src/main/java/com/zzjee/ba/service/impl/BaCostServiceImpl.java index 8f6fbd977698fb0e1fd77a4a5cc113367c230ab8..c6e2690b3cdc3a6cb286ae932b539ebbe8428e98 100644 --- a/src/main/java/com/zzjee/ba/service/impl/BaCostServiceImpl.java +++ b/src/main/java/com/zzjee/ba/service/impl/BaCostServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class BaCostServiceImpl extends CommonServiceImpl implements BaCostServiceI { - public void delete(BaCostEntity entity) throws Exception{ + @Override + public void delete(BaCostEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(BaCostEntity entity) throws Exception{ + @Override + public Serializable save(BaCostEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(BaCostEntity entity) throws Exception{ + @Override + public void saveOrUpdate(BaCostEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class BaCostServiceImpl extends CommonServiceImpl implements BaCostServic } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(BaCostEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/ba/service/impl/BaGoodsTypeServiceImpl.java b/src/main/java/com/zzjee/ba/service/impl/BaGoodsTypeServiceImpl.java index e6499ee5ae9aee7e678b68bdd4357f27e28b0478..12e76a84dfc0fd4253c28574ec80f6500ff935f8 100644 --- a/src/main/java/com/zzjee/ba/service/impl/BaGoodsTypeServiceImpl.java +++ b/src/main/java/com/zzjee/ba/service/impl/BaGoodsTypeServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class BaGoodsTypeServiceImpl extends CommonServiceImpl implements BaGoodsTypeServiceI { - public void delete(BaGoodsTypeEntity entity) throws Exception{ + @Override + public void delete(BaGoodsTypeEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(BaGoodsTypeEntity entity) throws Exception{ + @Override + public Serializable save(BaGoodsTypeEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(BaGoodsTypeEntity entity) throws Exception{ + @Override + public void saveOrUpdate(BaGoodsTypeEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class BaGoodsTypeServiceImpl extends CommonServiceImpl implements BaGoods } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(BaGoodsTypeEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/ba/service/impl/BaPlatformServiceImpl.java b/src/main/java/com/zzjee/ba/service/impl/BaPlatformServiceImpl.java index f744bcd0484334e19130066a446c66e009ad0a60..1ba2811590c67435373fe5d89234138fe148db93 100644 --- a/src/main/java/com/zzjee/ba/service/impl/BaPlatformServiceImpl.java +++ b/src/main/java/com/zzjee/ba/service/impl/BaPlatformServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class BaPlatformServiceImpl extends CommonServiceImpl implements BaPlatformServiceI { - public void delete(BaPlatformEntity entity) throws Exception{ + @Override + public void delete(BaPlatformEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(BaPlatformEntity entity) throws Exception{ + @Override + public Serializable save(BaPlatformEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(BaPlatformEntity entity) throws Exception{ + @Override + public void saveOrUpdate(BaPlatformEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class BaPlatformServiceImpl extends CommonServiceImpl implements BaPlatfo } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(BaPlatformEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/ba/service/impl/BaStoreServiceImpl.java b/src/main/java/com/zzjee/ba/service/impl/BaStoreServiceImpl.java index 1b23d51e019d0cd0ff93f5ccd5e339c90fde30f9..04169bf6a4904acb23610204c31305f336d52ca3 100644 --- a/src/main/java/com/zzjee/ba/service/impl/BaStoreServiceImpl.java +++ b/src/main/java/com/zzjee/ba/service/impl/BaStoreServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class BaStoreServiceImpl extends CommonServiceImpl implements BaStoreServiceI { - public void delete(BaStoreEntity entity) throws Exception{ + @Override + public void delete(BaStoreEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(BaStoreEntity entity) throws Exception{ + @Override + public Serializable save(BaStoreEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(BaStoreEntity entity) throws Exception{ + @Override + public void saveOrUpdate(BaStoreEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class BaStoreServiceImpl extends CommonServiceImpl implements BaStoreServ } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(BaStoreEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/ba/service/impl/BaUnitServiceImpl.java b/src/main/java/com/zzjee/ba/service/impl/BaUnitServiceImpl.java index 9fa6e522337a7385d9015a43027ebde59c358c5a..5fb34f84d61e51b1900e9df6247ee7949d2c1497 100644 --- a/src/main/java/com/zzjee/ba/service/impl/BaUnitServiceImpl.java +++ b/src/main/java/com/zzjee/ba/service/impl/BaUnitServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class BaUnitServiceImpl extends CommonServiceImpl implements BaUnitServiceI { - public void delete(BaUnitEntity entity) throws Exception{ + @Override + public void delete(BaUnitEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(BaUnitEntity entity) throws Exception{ + @Override + public Serializable save(BaUnitEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(BaUnitEntity entity) throws Exception{ + @Override + public void saveOrUpdate(BaUnitEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class BaUnitServiceImpl extends CommonServiceImpl implements BaUnitServic } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(BaUnitEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/base/service/impl/TmsYufeiConfServiceImpl.java b/src/main/java/com/zzjee/base/service/impl/TmsYufeiConfServiceImpl.java index 2de0f1bbbc1de36f0b4e0cd1439802d266a38906..096074e983e1f57ca051600f28297570ffa9bea1 100644 --- a/src/main/java/com/zzjee/base/service/impl/TmsYufeiConfServiceImpl.java +++ b/src/main/java/com/zzjee/base/service/impl/TmsYufeiConfServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class TmsYufeiConfServiceImpl extends CommonServiceImpl implements TmsYufeiConfServiceI { - public void delete(TmsYufeiConfEntity entity) throws Exception{ + @Override + public void delete(TmsYufeiConfEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(TmsYufeiConfEntity entity) throws Exception{ + @Override + public Serializable save(TmsYufeiConfEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(TmsYufeiConfEntity entity) throws Exception{ + @Override + public void saveOrUpdate(TmsYufeiConfEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class TmsYufeiConfServiceImpl extends CommonServiceImpl implements TmsYuf } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(TmsYufeiConfEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/base/service/impl/WmsWaveConfServiceImpl.java b/src/main/java/com/zzjee/base/service/impl/WmsWaveConfServiceImpl.java index d567c59bda0e4d077e51c99d65b5b9098d1bb917..62bb6bc7cd55370833a04c2e4d51d6f49a50f11a 100644 --- a/src/main/java/com/zzjee/base/service/impl/WmsWaveConfServiceImpl.java +++ b/src/main/java/com/zzjee/base/service/impl/WmsWaveConfServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class WmsWaveConfServiceImpl extends CommonServiceImpl implements WmsWaveConfServiceI { - public void delete(WmsWaveConfEntity entity) throws Exception{ + @Override + public void delete(WmsWaveConfEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(WmsWaveConfEntity entity) throws Exception{ + @Override + public Serializable save(WmsWaveConfEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(WmsWaveConfEntity entity) throws Exception{ + @Override + public void saveOrUpdate(WmsWaveConfEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class WmsWaveConfServiceImpl extends CommonServiceImpl implements WmsWave } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(WmsWaveConfEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/bireport/service/impl/RpPeriodInOutServiceImpl.java b/src/main/java/com/zzjee/bireport/service/impl/RpPeriodInOutServiceImpl.java index 7d22759c14c1bc1f6151b8fe5b3c3a303f10bc3d..c421677142b0a8cc5571d281c81d5a7b3b1ef94b 100644 --- a/src/main/java/com/zzjee/bireport/service/impl/RpPeriodInOutServiceImpl.java +++ b/src/main/java/com/zzjee/bireport/service/impl/RpPeriodInOutServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class RpPeriodInOutServiceImpl extends CommonServiceImpl implements RpPeriodInOutServiceI { - public void delete(RpPeriodInOutEntity entity) throws Exception{ + @Override + public void delete(RpPeriodInOutEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(RpPeriodInOutEntity entity) throws Exception{ + @Override + public Serializable save(RpPeriodInOutEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(RpPeriodInOutEntity entity) throws Exception{ + @Override + public void saveOrUpdate(RpPeriodInOutEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class RpPeriodInOutServiceImpl extends CommonServiceImpl implements RpPer } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(RpPeriodInOutEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/bm/service/impl/MvCusCostServiceImpl.java b/src/main/java/com/zzjee/bm/service/impl/MvCusCostServiceImpl.java index 01e78390b9e0467b072ced2872ee5b2b9968c5a7..22b26c87fd2781e96d9bddc9165ab20bd2b04eba 100644 --- a/src/main/java/com/zzjee/bm/service/impl/MvCusCostServiceImpl.java +++ b/src/main/java/com/zzjee/bm/service/impl/MvCusCostServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class MvCusCostServiceImpl extends CommonServiceImpl implements MvCusCostServiceI { - public void delete(MvCusCostEntity entity) throws Exception{ + @Override + public void delete(MvCusCostEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(MvCusCostEntity entity) throws Exception{ + @Override + public Serializable save(MvCusCostEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(MvCusCostEntity entity) throws Exception{ + @Override + public void saveOrUpdate(MvCusCostEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class MvCusCostServiceImpl extends CommonServiceImpl implements MvCusCost } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(MvCusCostEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/bm/service/impl/WvDayCostSumServiceImpl.java b/src/main/java/com/zzjee/bm/service/impl/WvDayCostSumServiceImpl.java index 88770d785941aad08038d618037bbee2dc36ad87..51fc02f7e49b19a34fffd7d8bed11c6b2cc349bc 100644 --- a/src/main/java/com/zzjee/bm/service/impl/WvDayCostSumServiceImpl.java +++ b/src/main/java/com/zzjee/bm/service/impl/WvDayCostSumServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class WvDayCostSumServiceImpl extends CommonServiceImpl implements WvDayCostSumServiceI { - public void delete(WvDayCostSumEntity entity) throws Exception{ + @Override + public void delete(WvDayCostSumEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(WvDayCostSumEntity entity) throws Exception{ + @Override + public Serializable save(WvDayCostSumEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(WvDayCostSumEntity entity) throws Exception{ + @Override + public void saveOrUpdate(WvDayCostSumEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class WvDayCostSumServiceImpl extends CommonServiceImpl implements WvDayC } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(WvDayCostSumEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/conf/service/impl/FxjOtherLoginServiceImpl.java b/src/main/java/com/zzjee/conf/service/impl/FxjOtherLoginServiceImpl.java index 64a5c9e857335341c0df3411fe4472ecad5d63cd..696b5dc34ca0a585e36acc55c1df6dc85a30feed 100644 --- a/src/main/java/com/zzjee/conf/service/impl/FxjOtherLoginServiceImpl.java +++ b/src/main/java/com/zzjee/conf/service/impl/FxjOtherLoginServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class FxjOtherLoginServiceImpl extends CommonServiceImpl implements FxjOtherLoginServiceI { - public void delete(FxjOtherLoginEntity entity) throws Exception{ + @Override + public void delete(FxjOtherLoginEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(FxjOtherLoginEntity entity) throws Exception{ + @Override + public Serializable save(FxjOtherLoginEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(FxjOtherLoginEntity entity) throws Exception{ + @Override + public void saveOrUpdate(FxjOtherLoginEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class FxjOtherLoginServiceImpl extends CommonServiceImpl implements FxjOt } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(FxjOtherLoginEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/conf/service/impl/WxConfigServiceImpl.java b/src/main/java/com/zzjee/conf/service/impl/WxConfigServiceImpl.java index dea6842d39bfd73b949a923a0a03ccb7450cbfed..8676cdeb0ee93c31934654d018f39e616d1a3fc8 100644 --- a/src/main/java/com/zzjee/conf/service/impl/WxConfigServiceImpl.java +++ b/src/main/java/com/zzjee/conf/service/impl/WxConfigServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class WxConfigServiceImpl extends CommonServiceImpl implements WxConfigServiceI { - public void delete(WxConfigEntity entity) throws Exception{ + @Override + public void delete(WxConfigEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(WxConfigEntity entity) throws Exception{ + @Override + public Serializable save(WxConfigEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(WxConfigEntity entity) throws Exception{ + @Override + public void saveOrUpdate(WxConfigEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class WxConfigServiceImpl extends CommonServiceImpl implements WxConfigSe } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(WxConfigEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/md/service/TMdBomHeadServiceI.java b/src/main/java/com/zzjee/md/service/TMdBomHeadServiceI.java index b3d1e223565ddbee56cd39d643c018cc6e395b2e..9f8b9b0118bea728dbc787ebfe9524d55445be0a 100644 --- a/src/main/java/com/zzjee/md/service/TMdBomHeadServiceI.java +++ b/src/main/java/com/zzjee/md/service/TMdBomHeadServiceI.java @@ -8,7 +8,8 @@ import java.util.List; public interface TMdBomHeadServiceI extends CommonService { - public void delete(T entity); + @Override + public void delete(T entity); /** * 添加一对多 * @@ -25,19 +26,19 @@ public interface TMdBomHeadServiceI extends CommonService { /** * 默认按钮-sql增强-新增操作 - * @param id + * @param t * @return */ public boolean doAddSql(TMdBomHeadEntity t); /** * 默认按钮-sql增强-更新操作 - * @param id + * @param t * @return */ public boolean doUpdateSql(TMdBomHeadEntity t); /** * 默认按钮-sql增强-删除操作 - * @param id + * @param t * @return */ public boolean doDelSql(TMdBomHeadEntity t); diff --git a/src/main/java/com/zzjee/md/service/impl/MdBinServiceImpl.java b/src/main/java/com/zzjee/md/service/impl/MdBinServiceImpl.java index 4a2bbdde0a7cefab2b5cdd10e4abdb308b054f86..53eeeb25b218c74d7e92052f6fbbd3a671539e48 100644 --- a/src/main/java/com/zzjee/md/service/impl/MdBinServiceImpl.java +++ b/src/main/java/com/zzjee/md/service/impl/MdBinServiceImpl.java @@ -23,20 +23,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class MdBinServiceImpl extends CommonServiceImpl implements MdBinServiceI { - public void delete(MdBinEntity entity) throws Exception{ + @Override + public void delete(MdBinEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(MdBinEntity entity) throws Exception{ + @Override + public Serializable save(MdBinEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(MdBinEntity entity) throws Exception{ + @Override + public void saveOrUpdate(MdBinEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -68,7 +71,7 @@ public class MdBinServiceImpl extends CommonServiceImpl implements MdBinServiceI } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(MdBinEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/md/service/impl/MdCusOtherServiceImpl.java b/src/main/java/com/zzjee/md/service/impl/MdCusOtherServiceImpl.java index d4c9d50c16916dc446034838e6a8f12069fc3afe..3f0e29b93fcd2454fb94379de4b32ab75e6eb489 100644 --- a/src/main/java/com/zzjee/md/service/impl/MdCusOtherServiceImpl.java +++ b/src/main/java/com/zzjee/md/service/impl/MdCusOtherServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class MdCusOtherServiceImpl extends CommonServiceImpl implements MdCusOtherServiceI { - public void delete(MdCusOtherEntity entity) throws Exception{ + @Override + public void delete(MdCusOtherEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(MdCusOtherEntity entity) throws Exception{ + @Override + public Serializable save(MdCusOtherEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(MdCusOtherEntity entity) throws Exception{ + @Override + public void saveOrUpdate(MdCusOtherEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class MdCusOtherServiceImpl extends CommonServiceImpl implements MdCusOth } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(MdCusOtherEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/md/service/impl/MdCusServiceImpl.java b/src/main/java/com/zzjee/md/service/impl/MdCusServiceImpl.java index 0a9a33c9abe529bca0c4416e4ad885534d629ee5..950b439c9dec51206497837dd050c810c92b7a92 100644 --- a/src/main/java/com/zzjee/md/service/impl/MdCusServiceImpl.java +++ b/src/main/java/com/zzjee/md/service/impl/MdCusServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class MdCusServiceImpl extends CommonServiceImpl implements MdCusServiceI { - public void delete(MdCusEntity entity) throws Exception{ + @Override + public void delete(MdCusEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(MdCusEntity entity) throws Exception{ + @Override + public Serializable save(MdCusEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(MdCusEntity entity) throws Exception{ + @Override + public void saveOrUpdate(MdCusEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class MdCusServiceImpl extends CommonServiceImpl implements MdCusServiceI } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(MdCusEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/md/service/impl/MdGoodsServiceImpl.java b/src/main/java/com/zzjee/md/service/impl/MdGoodsServiceImpl.java index cbed1835a18e4ba4291f1f148f7d2148ac73e4c4..cf2111da573dfa3b7f386632be5b57815be8db7f 100644 --- a/src/main/java/com/zzjee/md/service/impl/MdGoodsServiceImpl.java +++ b/src/main/java/com/zzjee/md/service/impl/MdGoodsServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class MdGoodsServiceImpl extends CommonServiceImpl implements MdGoodsServiceI { - public void delete(MdGoodsEntity entity) throws Exception{ + @Override + public void delete(MdGoodsEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(MdGoodsEntity entity) throws Exception{ + @Override + public Serializable save(MdGoodsEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(MdGoodsEntity entity) throws Exception{ + @Override + public void saveOrUpdate(MdGoodsEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class MdGoodsServiceImpl extends CommonServiceImpl implements MdGoodsServ } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(MdGoodsEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/md/service/impl/MdSupServiceImpl.java b/src/main/java/com/zzjee/md/service/impl/MdSupServiceImpl.java index e9f5b086f9922f76f2cfe6de8429a9d8791c7760..5685319aa68c6f04f574190577758a0dafd9ba75 100644 --- a/src/main/java/com/zzjee/md/service/impl/MdSupServiceImpl.java +++ b/src/main/java/com/zzjee/md/service/impl/MdSupServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class MdSupServiceImpl extends CommonServiceImpl implements MdSupServiceI { - public void delete(MdSupEntity entity) throws Exception{ + @Override + public void delete(MdSupEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(MdSupEntity entity) throws Exception{ + @Override + public Serializable save(MdSupEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(MdSupEntity entity) throws Exception{ + @Override + public void saveOrUpdate(MdSupEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class MdSupServiceImpl extends CommonServiceImpl implements MdSupServiceI } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(MdSupEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/md/service/impl/MvCusOtherServiceImpl.java b/src/main/java/com/zzjee/md/service/impl/MvCusOtherServiceImpl.java index f761c78ec00a7f7e03d6a5a8deaef623ddc2e50b..f9a010e9445847acca704e5ae241c3d3efbf30e2 100644 --- a/src/main/java/com/zzjee/md/service/impl/MvCusOtherServiceImpl.java +++ b/src/main/java/com/zzjee/md/service/impl/MvCusOtherServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class MvCusOtherServiceImpl extends CommonServiceImpl implements MvCusOtherServiceI { - public void delete(MvCusOtherEntity entity) throws Exception{ + @Override + public void delete(MvCusOtherEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(MvCusOtherEntity entity) throws Exception{ + @Override + public Serializable save(MvCusOtherEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(MvCusOtherEntity entity) throws Exception{ + @Override + public void saveOrUpdate(MvCusOtherEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class MvCusOtherServiceImpl extends CommonServiceImpl implements MvCusOth } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(MvCusOtherEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/md/service/impl/MvGoodsServiceImpl.java b/src/main/java/com/zzjee/md/service/impl/MvGoodsServiceImpl.java index 6a26e9ae9ed9d26e34a172130013dfaa6595b562..4decfbb6b53fe3d8a499f192d781fe1f7167add3 100644 --- a/src/main/java/com/zzjee/md/service/impl/MvGoodsServiceImpl.java +++ b/src/main/java/com/zzjee/md/service/impl/MvGoodsServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class MvGoodsServiceImpl extends CommonServiceImpl implements MvGoodsServiceI { - public void delete(MvGoodsEntity entity) throws Exception{ + @Override + public void delete(MvGoodsEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(MvGoodsEntity entity) throws Exception{ + @Override + public Serializable save(MvGoodsEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(MvGoodsEntity entity) throws Exception{ + @Override + public void saveOrUpdate(MvGoodsEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class MvGoodsServiceImpl extends CommonServiceImpl implements MvGoodsServ } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(MvGoodsEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/md/service/impl/TMdBomHeadServiceImpl.java b/src/main/java/com/zzjee/md/service/impl/TMdBomHeadServiceImpl.java index 323065c1004602f1ac0268900a327fb77b10a925..9577875d7a226eaf2710d3afa19c4b4abb96b6ca 100644 --- a/src/main/java/com/zzjee/md/service/impl/TMdBomHeadServiceImpl.java +++ b/src/main/java/com/zzjee/md/service/impl/TMdBomHeadServiceImpl.java @@ -18,14 +18,16 @@ import java.util.UUID; @Transactional public class TMdBomHeadServiceImpl extends CommonServiceImpl implements TMdBomHeadServiceI { - public void delete(T entity) { + @Override + public void delete(T entity) { super.delete(entity); //执行删除操作配置的sql增强 this.doDelSql((TMdBomHeadEntity)entity); } - public void addMain(TMdBomHeadEntity tMdBomHead, - List tMdBomItemList){ + @Override + public void addMain(TMdBomHeadEntity tMdBomHead, + List tMdBomItemList){ //保存主信息 this.save(tMdBomHead); @@ -40,8 +42,9 @@ public class TMdBomHeadServiceImpl extends CommonServiceImpl implements TMdBomHe } - public void updateMain(TMdBomHeadEntity tMdBomHead, - List tMdBomItemList) { + @Override + public void updateMain(TMdBomHeadEntity tMdBomHead, + List tMdBomItemList) { //保存主表信息 this.saveOrUpdate(tMdBomHead); //=================================================================================== @@ -89,7 +92,8 @@ public class TMdBomHeadServiceImpl extends CommonServiceImpl implements TMdBomHe } - public void delMain(TMdBomHeadEntity tMdBomHead) { + @Override + public void delMain(TMdBomHeadEntity tMdBomHead) { //删除主表信息 this.delete(tMdBomHead); //=================================================================================== @@ -105,26 +109,29 @@ public class TMdBomHeadServiceImpl extends CommonServiceImpl implements TMdBomHe /** * 默认按钮-sql增强-新增操作 - * @param id + * @param t * @return */ - public boolean doAddSql(TMdBomHeadEntity t){ + @Override + public boolean doAddSql(TMdBomHeadEntity t){ return true; } /** * 默认按钮-sql增强-更新操作 - * @param id + * @param t * @return */ - public boolean doUpdateSql(TMdBomHeadEntity t){ + @Override + public boolean doUpdateSql(TMdBomHeadEntity t){ return true; } /** * 默认按钮-sql增强-删除操作 - * @param id + * @param t * @return */ - public boolean doDelSql(TMdBomHeadEntity t){ + @Override + public boolean doDelSql(TMdBomHeadEntity t){ return true; } diff --git a/src/main/java/com/zzjee/mvyj/service/impl/MvStockYjServiceImpl.java b/src/main/java/com/zzjee/mvyj/service/impl/MvStockYjServiceImpl.java index a35c2cc2a3a613e6253d1350f902c889c937b6c3..30c3428b5babf074e50ee24d2c69279bce40b95a 100644 --- a/src/main/java/com/zzjee/mvyj/service/impl/MvStockYjServiceImpl.java +++ b/src/main/java/com/zzjee/mvyj/service/impl/MvStockYjServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class MvStockYjServiceImpl extends CommonServiceImpl implements MvStockYjServiceI { - public void delete(MvStockYjEntity entity) throws Exception{ + @Override + public void delete(MvStockYjEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(MvStockYjEntity entity) throws Exception{ + @Override + public Serializable save(MvStockYjEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(MvStockYjEntity entity) throws Exception{ + @Override + public void saveOrUpdate(MvStockYjEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class MvStockYjServiceImpl extends CommonServiceImpl implements MvStockYj } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(MvStockYjEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/oms/service/impl/OmsOederDetailServiceImpl.java b/src/main/java/com/zzjee/oms/service/impl/OmsOederDetailServiceImpl.java index a6ac186bf8a22efdb043f0238c26229ff8704d04..b7e03382fd60be75ddace8095aa57e5ae8bfdf38 100644 --- a/src/main/java/com/zzjee/oms/service/impl/OmsOederDetailServiceImpl.java +++ b/src/main/java/com/zzjee/oms/service/impl/OmsOederDetailServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class OmsOederDetailServiceImpl extends CommonServiceImpl implements OmsOederDetailServiceI { - public void delete(OmsOederDetailEntity entity) throws Exception{ + @Override + public void delete(OmsOederDetailEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(OmsOederDetailEntity entity) throws Exception{ + @Override + public Serializable save(OmsOederDetailEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(OmsOederDetailEntity entity) throws Exception{ + @Override + public void saveOrUpdate(OmsOederDetailEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class OmsOederDetailServiceImpl extends CommonServiceImpl implements OmsO } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(OmsOederDetailEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/report/service/impl/RpWmHisStockKuServiceImpl.java b/src/main/java/com/zzjee/report/service/impl/RpWmHisStockKuServiceImpl.java index 9811bcf5bb77cd2bf4433852981899327a29e70d..ae0d8270905c277bd6f4d3f4e2041d151c2f586a 100644 --- a/src/main/java/com/zzjee/report/service/impl/RpWmHisStockKuServiceImpl.java +++ b/src/main/java/com/zzjee/report/service/impl/RpWmHisStockKuServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class RpWmHisStockKuServiceImpl extends CommonServiceImpl implements RpWmHisStockKuServiceI { - public void delete(RpWmHisStockKuEntity entity) throws Exception{ + @Override + public void delete(RpWmHisStockKuEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(RpWmHisStockKuEntity entity) throws Exception{ + @Override + public Serializable save(RpWmHisStockKuEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(RpWmHisStockKuEntity entity) throws Exception{ + @Override + public void saveOrUpdate(RpWmHisStockKuEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class RpWmHisStockKuServiceImpl extends CommonServiceImpl implements RpWm } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(RpWmHisStockKuEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/report/service/impl/RpWmInQmServiceImpl.java b/src/main/java/com/zzjee/report/service/impl/RpWmInQmServiceImpl.java index 6cf8db4c4c21d6c0b9fb8df2e03479b09b0a4976..913b58f3af0f5c876118c84c0fc5818b81750245 100644 --- a/src/main/java/com/zzjee/report/service/impl/RpWmInQmServiceImpl.java +++ b/src/main/java/com/zzjee/report/service/impl/RpWmInQmServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class RpWmInQmServiceImpl extends CommonServiceImpl implements RpWmInQmServiceI { - public void delete(RpWmInQmEntity entity) throws Exception{ + @Override + public void delete(RpWmInQmEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(RpWmInQmEntity entity) throws Exception{ + @Override + public Serializable save(RpWmInQmEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(RpWmInQmEntity entity) throws Exception{ + @Override + public void saveOrUpdate(RpWmInQmEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class RpWmInQmServiceImpl extends CommonServiceImpl implements RpWmInQmSe } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(RpWmInQmEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/report/service/impl/RpWmToDownGoodsServiceImpl.java b/src/main/java/com/zzjee/report/service/impl/RpWmToDownGoodsServiceImpl.java index cb6a2a41afafebaf5459cc8cbe50edaf34e57ba4..d89de6f2d5ae58ece9de6bf07e591d9056537cbe 100644 --- a/src/main/java/com/zzjee/report/service/impl/RpWmToDownGoodsServiceImpl.java +++ b/src/main/java/com/zzjee/report/service/impl/RpWmToDownGoodsServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class RpWmToDownGoodsServiceImpl extends CommonServiceImpl implements RpWmToDownGoodsServiceI { - public void delete(RpWmToDownGoodsEntity entity) throws Exception{ + @Override + public void delete(RpWmToDownGoodsEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(RpWmToDownGoodsEntity entity) throws Exception{ + @Override + public Serializable save(RpWmToDownGoodsEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(RpWmToDownGoodsEntity entity) throws Exception{ + @Override + public void saveOrUpdate(RpWmToDownGoodsEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class RpWmToDownGoodsServiceImpl extends CommonServiceImpl implements RpW } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(RpWmToDownGoodsEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/report/service/impl/RpWmToUpGoodsServiceImpl.java b/src/main/java/com/zzjee/report/service/impl/RpWmToUpGoodsServiceImpl.java index 4d1d11a27bd39702aad48c5c48ebd1441916b7a6..90f8b81716f741a07684887806991fe29c6898e8 100644 --- a/src/main/java/com/zzjee/report/service/impl/RpWmToUpGoodsServiceImpl.java +++ b/src/main/java/com/zzjee/report/service/impl/RpWmToUpGoodsServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class RpWmToUpGoodsServiceImpl extends CommonServiceImpl implements RpWmToUpGoodsServiceI { - public void delete(RpWmToUpGoodsEntity entity) throws Exception{ + @Override + public void delete(RpWmToUpGoodsEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(RpWmToUpGoodsEntity entity) throws Exception{ + @Override + public Serializable save(RpWmToUpGoodsEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(RpWmToUpGoodsEntity entity) throws Exception{ + @Override + public void saveOrUpdate(RpWmToUpGoodsEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class RpWmToUpGoodsServiceImpl extends CommonServiceImpl implements RpWmT } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(RpWmToUpGoodsEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/report/service/impl/RpWmUpAndDownServiceImpl.java b/src/main/java/com/zzjee/report/service/impl/RpWmUpAndDownServiceImpl.java index 17860f626d0c37e331ce952e2423424bf90d651f..8df6c4764d0ec6944031610b70d869d57e585896 100644 --- a/src/main/java/com/zzjee/report/service/impl/RpWmUpAndDownServiceImpl.java +++ b/src/main/java/com/zzjee/report/service/impl/RpWmUpAndDownServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class RpWmUpAndDownServiceImpl extends CommonServiceImpl implements RpWmUpAndDownServiceI { - public void delete(RpWmUpAndDownEntity entity) throws Exception{ + @Override + public void delete(RpWmUpAndDownEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(RpWmUpAndDownEntity entity) throws Exception{ + @Override + public Serializable save(RpWmUpAndDownEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(RpWmUpAndDownEntity entity) throws Exception{ + @Override + public void saveOrUpdate(RpWmUpAndDownEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class RpWmUpAndDownServiceImpl extends CommonServiceImpl implements RpWmU } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(RpWmUpAndDownEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/rfid/service/impl/RfidBuseServiceImpl.java b/src/main/java/com/zzjee/rfid/service/impl/RfidBuseServiceImpl.java index 813694b5caca56a2165571601753f5281cf900f1..628587443e5b6135fd71b30a9305e7133c852999 100644 --- a/src/main/java/com/zzjee/rfid/service/impl/RfidBuseServiceImpl.java +++ b/src/main/java/com/zzjee/rfid/service/impl/RfidBuseServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class RfidBuseServiceImpl extends CommonServiceImpl implements RfidBuseServiceI { - public void delete(RfidBuseEntity entity) throws Exception{ + @Override + public void delete(RfidBuseEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(RfidBuseEntity entity) throws Exception{ + @Override + public Serializable save(RfidBuseEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(RfidBuseEntity entity) throws Exception{ + @Override + public void saveOrUpdate(RfidBuseEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class RfidBuseServiceImpl extends CommonServiceImpl implements RfidBuseSe } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(RfidBuseEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/sap/SapRFC.java b/src/main/java/com/zzjee/sap/SapRFC.java index 6afffaedd1648e99ff3a86f98dc6ac32f1e084d6..b1a4e8ce6ad83b423882be27bde36e64165007a3 100644 --- a/src/main/java/com/zzjee/sap/SapRFC.java +++ b/src/main/java/com/zzjee/sap/SapRFC.java @@ -183,8 +183,9 @@ public class SapRFC { } public String convertNull(String str) { - if (str == null) - return ""; + if (str == null) { + return ""; + } return str; } diff --git a/src/main/java/com/zzjee/sdk/HttpClientUtil.java b/src/main/java/com/zzjee/sdk/HttpClientUtil.java index 979ed7de22b0809d97590b388abc10958e52bf29..0dcc3d30c8da9a6eb72f1b5ffc3f12db98fa98ff 100644 --- a/src/main/java/com/zzjee/sdk/HttpClientUtil.java +++ b/src/main/java/com/zzjee/sdk/HttpClientUtil.java @@ -180,9 +180,9 @@ public class HttpClientUtil { } /** * 获取SSLContext - * @param trustFile + * @param trustFileInputStream * @param trustPasswd - * @param keyFile + * @param keyFileInputStream * @param keyPasswd * @return * @throws NoSuchAlgorithmException @@ -225,7 +225,9 @@ public class HttpClientUtil { * @return char[] */ public static char[] str2CharArray(String str) { - if(null == str) return null; + if(null == str) { + return null; + } return str.toCharArray(); } @@ -248,8 +250,9 @@ public class HttpClientUtil { byte[] data = new byte[BUFFER_SIZE]; int count = -1; - while((count = in.read(data,0,BUFFER_SIZE)) != -1) + while((count = in.read(data,0,BUFFER_SIZE)) != -1) { outStream.write(data, 0, count); + } data = null; byte[] outByte = outStream.toByteArray(); diff --git a/src/main/java/com/zzjee/sdk/MD5Util.java b/src/main/java/com/zzjee/sdk/MD5Util.java index b1084be513c0abe46fe01b19fa4665157663fae2..57ceb7ff80269804988bd6eddc28885fd46bb03e 100644 --- a/src/main/java/com/zzjee/sdk/MD5Util.java +++ b/src/main/java/com/zzjee/sdk/MD5Util.java @@ -11,16 +11,18 @@ public class MD5Util { */ private static String byteArrayToHexString(byte b[]) { StringBuffer resultSb = new StringBuffer(); - for (int i = 0; i < b.length; i++) + for (int i = 0; i < b.length; i++) { resultSb.append(byteToHexString(b[i])); + } return resultSb.toString(); } private static String byteToHexString(byte b) { int n = b; - if (n < 0) + if (n < 0) { n += 256; + } int d1 = n / 16; int d2 = n % 16; return hexDigits[d1] + hexDigits[d2]; @@ -32,12 +34,13 @@ public class MD5Util { //Dm DM_STRING_CTOR 因为使用String（String）构造函数生成新字符串会浪费内存，推荐使用原有字符串。 resultString = origin; MessageDigest md = MessageDigest.getInstance("MD5"); - if (charsetname == null || "".equals(charsetname)) + if (charsetname == null || "".equals(charsetname)) { resultString = byteArrayToHexString(md.digest(resultString .getBytes())); - else + } else { resultString = byteArrayToHexString(md.digest(resultString .getBytes(charsetname))); + } } catch (Exception exception) { } return resultString; diff --git a/src/main/java/com/zzjee/sdk/PrepayIdRequestHandler.java b/src/main/java/com/zzjee/sdk/PrepayIdRequestHandler.java index d49186d79e5e09bff049f9fdf7acac01fe2ba6a0..c539d3971742a482b2054db378b6aa11396f9e01 100644 --- a/src/main/java/com/zzjee/sdk/PrepayIdRequestHandler.java +++ b/src/main/java/com/zzjee/sdk/PrepayIdRequestHandler.java @@ -52,8 +52,9 @@ public class PrepayIdRequestHandler extends RequestHandler { resContent = httpClient.getResContent(); System.out.println("获取prepayid的返回值："+resContent); Map map=XMLUtil.doXMLParse(resContent); - if(map.containsKey("prepay_id")) + if(map.containsKey("prepay_id")) { prepayid=map.get("prepay_id"); + } } return prepayid; } diff --git a/src/main/java/com/zzjee/sdk/RequestHandler.java b/src/main/java/com/zzjee/sdk/RequestHandler.java index 536ca1e480ee85c0a08df5c8dd9e38071b7c9529..1cc1801e6c4987a9345e9696df421b064d4749ac 100644 --- a/src/main/java/com/zzjee/sdk/RequestHandler.java +++ b/src/main/java/com/zzjee/sdk/RequestHandler.java @@ -94,8 +94,9 @@ public class RequestHandler { public void setParameter(String parameter, Object parameterValue) { String v = ""; if(null != parameterValue) { - if(parameterValue instanceof String) + if(parameterValue instanceof String) { v = ((String) parameterValue).trim(); + } } this.parameters.put(parameter, v); } diff --git a/src/main/java/com/zzjee/sdk/TenpayUtil.java b/src/main/java/com/zzjee/sdk/TenpayUtil.java index d33f12671b357a3cdeea19e115ac7462418e6b49..82ae9262a4243d96e4874499228e773026a8a7c9 100644 --- a/src/main/java/com/zzjee/sdk/TenpayUtil.java +++ b/src/main/java/com/zzjee/sdk/TenpayUtil.java @@ -13,8 +13,9 @@ public class TenpayUtil { * @return String 转换成字符串,若对象为null,则返回空字符串. */ public static String toString(Object obj) { - if(obj == null) + if(obj == null) { return ""; + } return obj.toString(); } @@ -29,8 +30,9 @@ public class TenpayUtil { public static int toInt(Object obj) { int a = 0; try { - if (obj != null) + if (obj != null) { a = Integer.parseInt(obj.toString()); + } } catch (Exception e) { } diff --git a/src/main/java/com/zzjee/sdk/UUID.java b/src/main/java/com/zzjee/sdk/UUID.java index 4c17ee9fcf6d81bfb14f55c438dae9896b7a0da4..5989e4b1f437c77af9af508b269b947a1cc335fb 100644 --- a/src/main/java/com/zzjee/sdk/UUID.java +++ b/src/main/java/com/zzjee/sdk/UUID.java @@ -9,8 +9,9 @@ public class UUID { private static final int ROTATION = 99999; public static synchronized long next() { - if (seq > ROTATION) + if (seq > ROTATION) { seq = 0; + } buf.delete(0, buf.length()); date.setTime(System.currentTimeMillis()); String str = String.format("%1$tY%1$tm%1$td%1$tk%1$tM%1$tS%2$05d", date, seq++); diff --git a/src/main/java/com/zzjee/sys/service/impl/SysParaServiceImpl.java b/src/main/java/com/zzjee/sys/service/impl/SysParaServiceImpl.java index 75d897e3ab596ac799e0e17ec814ad8ef8501573..97239675ba1c361af4123e55d304dc6506d1510f 100644 --- a/src/main/java/com/zzjee/sys/service/impl/SysParaServiceImpl.java +++ b/src/main/java/com/zzjee/sys/service/impl/SysParaServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class SysParaServiceImpl extends CommonServiceImpl implements SysParaServiceI { - public void delete(SysParaEntity entity) throws Exception{ + @Override + public void delete(SysParaEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(SysParaEntity entity) throws Exception{ + @Override + public Serializable save(SysParaEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(SysParaEntity entity) throws Exception{ + @Override + public void saveOrUpdate(SysParaEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class SysParaServiceImpl extends CommonServiceImpl implements SysParaServ } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(SysParaEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/tms/service/impl/TmsMdCheliangServiceImpl.java b/src/main/java/com/zzjee/tms/service/impl/TmsMdCheliangServiceImpl.java index 0c88e84baf224e9a0c673cdfc09e612438c5dcef..d4623556f1f32c81f66cd207841a440ba48cc238 100644 --- a/src/main/java/com/zzjee/tms/service/impl/TmsMdCheliangServiceImpl.java +++ b/src/main/java/com/zzjee/tms/service/impl/TmsMdCheliangServiceImpl.java @@ -20,20 +20,23 @@ import java.util.UUID; public class TmsMdCheliangServiceImpl extends CommonServiceImpl implements TmsMdCheliangServiceI { - public void delete(TmsMdCheliangEntity entity) throws Exception{ + @Override + public void delete(TmsMdCheliangEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(TmsMdCheliangEntity entity) throws Exception{ + @Override + public Serializable save(TmsMdCheliangEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(TmsMdCheliangEntity entity) throws Exception{ + @Override + public void saveOrUpdate(TmsMdCheliangEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -65,7 +68,7 @@ public class TmsMdCheliangServiceImpl extends CommonServiceImpl implements TmsMd } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(TmsMdCheliangEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/tms/service/impl/TmsMdDzServiceImpl.java b/src/main/java/com/zzjee/tms/service/impl/TmsMdDzServiceImpl.java index 7fabf118e9c34e7aeb7ec29da54ec7380d77d06e..d915a918dbcbbee1009ada5bbac4ec78a54c6540 100644 --- a/src/main/java/com/zzjee/tms/service/impl/TmsMdDzServiceImpl.java +++ b/src/main/java/com/zzjee/tms/service/impl/TmsMdDzServiceImpl.java @@ -20,20 +20,23 @@ import java.util.UUID; public class TmsMdDzServiceImpl extends CommonServiceImpl implements TmsMdDzServiceI { - public void delete(TmsMdDzEntity entity) throws Exception{ + @Override + public void delete(TmsMdDzEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(TmsMdDzEntity entity) throws Exception{ + @Override + public Serializable save(TmsMdDzEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(TmsMdDzEntity entity) throws Exception{ + @Override + public void saveOrUpdate(TmsMdDzEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -65,7 +68,7 @@ public class TmsMdDzServiceImpl extends CommonServiceImpl implements TmsMdDzServ } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(TmsMdDzEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/tms/service/impl/TmsYwDingdanServiceImpl.java b/src/main/java/com/zzjee/tms/service/impl/TmsYwDingdanServiceImpl.java index b93320dd31b6b5681207daa39a84fd1a801826a6..642eaee26223fb9010a3a9bd292f60a7a7e08e68 100644 --- a/src/main/java/com/zzjee/tms/service/impl/TmsYwDingdanServiceImpl.java +++ b/src/main/java/com/zzjee/tms/service/impl/TmsYwDingdanServiceImpl.java @@ -20,20 +20,23 @@ import java.util.UUID; public class TmsYwDingdanServiceImpl extends CommonServiceImpl implements TmsYwDingdanServiceI { - public void delete(TmsYwDingdanEntity entity) throws Exception{ + @Override + public void delete(TmsYwDingdanEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(TmsYwDingdanEntity entity) throws Exception{ + @Override + public Serializable save(TmsYwDingdanEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(TmsYwDingdanEntity entity) throws Exception{ + @Override + public void saveOrUpdate(TmsYwDingdanEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -65,7 +68,7 @@ public class TmsYwDingdanServiceImpl extends CommonServiceImpl implements TmsYwD } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(TmsYwDingdanEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/tms/service/impl/VTmsDzServiceImpl.java b/src/main/java/com/zzjee/tms/service/impl/VTmsDzServiceImpl.java index bfe0d41348b39ad546211dccc2726777e1c9ac0a..3472bcdbc0d48cfdf5495c14e520c84bbc9bf84f 100644 --- a/src/main/java/com/zzjee/tms/service/impl/VTmsDzServiceImpl.java +++ b/src/main/java/com/zzjee/tms/service/impl/VTmsDzServiceImpl.java @@ -20,20 +20,23 @@ import java.util.UUID; public class VTmsDzServiceImpl extends CommonServiceImpl implements VTmsDzServiceI { - public void delete(VTmsDzEntity entity) throws Exception{ + @Override + public void delete(VTmsDzEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(VTmsDzEntity entity) throws Exception{ + @Override + public Serializable save(VTmsDzEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(VTmsDzEntity entity) throws Exception{ + @Override + public void saveOrUpdate(VTmsDzEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -65,7 +68,7 @@ public class VTmsDzServiceImpl extends CommonServiceImpl implements VTmsDzServic } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(VTmsDzEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/tmsv/service/impl/VYsddServiceImpl.java b/src/main/java/com/zzjee/tmsv/service/impl/VYsddServiceImpl.java index 8b0b95ad1e0d5440d2a5d9d0eb01bd3ff1add50c..dcb427fd0d6903910a6474fec1536fa68260c217 100644 --- a/src/main/java/com/zzjee/tmsv/service/impl/VYsddServiceImpl.java +++ b/src/main/java/com/zzjee/tmsv/service/impl/VYsddServiceImpl.java @@ -20,20 +20,23 @@ import java.util.UUID; public class VYsddServiceImpl extends CommonServiceImpl implements VYsddServiceI { - public void delete(VYsddEntity entity) throws Exception{ + @Override + public void delete(VYsddEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(VYsddEntity entity) throws Exception{ + @Override + public Serializable save(VYsddEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(VYsddEntity entity) throws Exception{ + @Override + public void saveOrUpdate(VYsddEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -65,7 +68,7 @@ public class VYsddServiceImpl extends CommonServiceImpl implements VYsddServiceI } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(VYsddEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/wave/service/impl/WaveToDownServiceImpl.java b/src/main/java/com/zzjee/wave/service/impl/WaveToDownServiceImpl.java index f5f113972834e6b19e9d956b3b80a252974ef064..f23137f370eb0c195bf45e6c8ab4ada4fd7bfe05 100644 --- a/src/main/java/com/zzjee/wave/service/impl/WaveToDownServiceImpl.java +++ b/src/main/java/com/zzjee/wave/service/impl/WaveToDownServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class WaveToDownServiceImpl extends CommonServiceImpl implements WaveToDownServiceI { - public void delete(WaveToDownEntity entity) throws Exception{ + @Override + public void delete(WaveToDownEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(WaveToDownEntity entity) throws Exception{ + @Override + public Serializable save(WaveToDownEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(WaveToDownEntity entity) throws Exception{ + @Override + public void saveOrUpdate(WaveToDownEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class WaveToDownServiceImpl extends CommonServiceImpl implements WaveToDo } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(WaveToDownEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/wave/service/impl/WaveToFjServiceImpl.java b/src/main/java/com/zzjee/wave/service/impl/WaveToFjServiceImpl.java index 0f3e35eedd5252abb24c7319328c212b05788f69..b195a325a520e678e36aa5f85f196e9103b6ae8f 100644 --- a/src/main/java/com/zzjee/wave/service/impl/WaveToFjServiceImpl.java +++ b/src/main/java/com/zzjee/wave/service/impl/WaveToFjServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class WaveToFjServiceImpl extends CommonServiceImpl implements WaveToFjServiceI { - public void delete(WaveToFjEntity entity) throws Exception{ + @Override + public void delete(WaveToFjEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(WaveToFjEntity entity) throws Exception{ + @Override + public Serializable save(WaveToFjEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(WaveToFjEntity entity) throws Exception{ + @Override + public void saveOrUpdate(WaveToFjEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class WaveToFjServiceImpl extends CommonServiceImpl implements WaveToFjSe } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(WaveToFjEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/wm/service/WmCusCostHServiceI.java b/src/main/java/com/zzjee/wm/service/WmCusCostHServiceI.java index 092f7751973f22274eea0f8093e998749bfb7c7e..898bcf9aa2910f55b71f1e56ec7ca0b80dc0358b 100644 --- a/src/main/java/com/zzjee/wm/service/WmCusCostHServiceI.java +++ b/src/main/java/com/zzjee/wm/service/WmCusCostHServiceI.java @@ -8,7 +8,8 @@ import java.io.Serializable; public interface WmCusCostHServiceI extends CommonService{ - public void delete(T entity); + @Override + public void delete(T entity); /** * 添加一对多 * @@ -25,19 +26,19 @@ public interface WmCusCostHServiceI extends CommonService{ /** * 默认按钮-sql增强-新增操作 - * @param id + * @param t * @return */ public boolean doAddSql(WmCusCostHEntity t); /** * 默认按钮-sql增强-更新操作 - * @param id + * @param t * @return */ public boolean doUpdateSql(WmCusCostHEntity t); /** * 默认按钮-sql增强-删除操作 - * @param id + * @param t * @return */ public boolean doDelSql(WmCusCostHEntity t); diff --git a/src/main/java/com/zzjee/wm/service/WmImNoticeHServiceI.java b/src/main/java/com/zzjee/wm/service/WmImNoticeHServiceI.java index 9333c5fb252addd32ca75246c7a6d8e1142385a4..dc7582d657c28efbba5435e10c500666d48b7ed3 100644 --- a/src/main/java/com/zzjee/wm/service/WmImNoticeHServiceI.java +++ b/src/main/java/com/zzjee/wm/service/WmImNoticeHServiceI.java @@ -8,7 +8,8 @@ import java.io.Serializable; public interface WmImNoticeHServiceI extends CommonService{ - public void delete(T entity); + @Override + public void delete(T entity); /** * 添加一对多 * @@ -25,19 +26,19 @@ public interface WmImNoticeHServiceI extends CommonService{ /** * 默认按钮-sql增强-新增操作 - * @param id + * @param t * @return */ public boolean doAddSql(WmImNoticeHEntity t); /** * 默认按钮-sql增强-更新操作 - * @param id + * @param t * @return */ public boolean doUpdateSql(WmImNoticeHEntity t); /** * 默认按钮-sql增强-删除操作 - * @param id + * @param t * @return */ public boolean doDelSql(WmImNoticeHEntity t); diff --git a/src/main/java/com/zzjee/wm/service/WmOmNoticeHServiceI.java b/src/main/java/com/zzjee/wm/service/WmOmNoticeHServiceI.java index b77816f35acabb612ca258813f7e54e2fa823cd3..75cad7a9d89e4a137a5e302893906e472a5d6c2f 100644 --- a/src/main/java/com/zzjee/wm/service/WmOmNoticeHServiceI.java +++ b/src/main/java/com/zzjee/wm/service/WmOmNoticeHServiceI.java @@ -12,7 +12,8 @@ import java.io.Serializable; public interface WmOmNoticeHServiceI extends CommonService{ - public void delete(T entity); + @Override + public void delete(T entity); /** * 添加一对多 * @@ -31,19 +32,19 @@ public interface WmOmNoticeHServiceI extends CommonService{ /** * 默认按钮-sql增强-新增操作 - * @param id + * @param t * @return */ public boolean doAddSql(WmOmNoticeHEntity t); /** * 默认按钮-sql增强-更新操作 - * @param id + * @param t * @return */ public boolean doUpdateSql(WmOmNoticeHEntity t); /** * 默认按钮-sql增强-删除操作 - * @param id + * @param t * @return */ public boolean doDelSql(WmOmNoticeHEntity t); diff --git a/src/main/java/com/zzjee/wm/service/impl/WmCusCostHServiceImpl.java b/src/main/java/com/zzjee/wm/service/impl/WmCusCostHServiceImpl.java index 6c6a1f4a0a28c4a3e449da01e5a125321a526db4..d9a849b57767c53f3fee5e0bd24caa30a9394898 100644 --- a/src/main/java/com/zzjee/wm/service/impl/WmCusCostHServiceImpl.java +++ b/src/main/java/com/zzjee/wm/service/impl/WmCusCostHServiceImpl.java @@ -21,14 +21,16 @@ import java.io.Serializable; @Transactional public class WmCusCostHServiceImpl extends CommonServiceImpl implements WmCusCostHServiceI { - public void delete(T entity) { + @Override + public void delete(T entity) { super.delete(entity); //执行删除操作配置的sql增强 this.doDelSql((WmCusCostHEntity)entity); } - public void addMain(WmCusCostHEntity wmCusCostH, - List wmCusCostIList){ + @Override + public void addMain(WmCusCostHEntity wmCusCostH, + List wmCusCostIList){ //保存主信息 this.save(wmCusCostH); @@ -43,8 +45,9 @@ public class WmCusCostHServiceImpl extends CommonServiceImpl implements WmCusCos } - public void updateMain(WmCusCostHEntity wmCusCostH, - List wmCusCostIList) { + @Override + public void updateMain(WmCusCostHEntity wmCusCostH, + List wmCusCostIList) { //保存主表信息 this.saveOrUpdate(wmCusCostH); //=================================================================================== @@ -92,7 +95,8 @@ public class WmCusCostHServiceImpl extends CommonServiceImpl implements WmCusCos } - public void delMain(WmCusCostHEntity wmCusCostH) { + @Override + public void delMain(WmCusCostHEntity wmCusCostH) { //删除主表信息 this.delete(wmCusCostH); //=================================================================================== @@ -108,26 +112,29 @@ public class WmCusCostHServiceImpl extends CommonServiceImpl implements WmCusCos /** * 默认按钮-sql增强-新增操作 - * @param id + * @param t * @return */ - public boolean doAddSql(WmCusCostHEntity t){ + @Override + public boolean doAddSql(WmCusCostHEntity t){ return true; } /** * 默认按钮-sql增强-更新操作 - * @param id + * @param t * @return */ - public boolean doUpdateSql(WmCusCostHEntity t){ + @Override + public boolean doUpdateSql(WmCusCostHEntity t){ return true; } /** * 默认按钮-sql增强-删除操作 - * @param id + * @param t * @return */ - public boolean doDelSql(WmCusCostHEntity t){ + @Override + public boolean doDelSql(WmCusCostHEntity t){ return true; } diff --git a/src/main/java/com/zzjee/wm/service/impl/WmDayCostConfServiceImpl.java b/src/main/java/com/zzjee/wm/service/impl/WmDayCostConfServiceImpl.java index 1c9f179c343ff664aba97d009a187f707167f388..119d6dccb0f57855568ceef9d784bdc427e505bb 100644 --- a/src/main/java/com/zzjee/wm/service/impl/WmDayCostConfServiceImpl.java +++ b/src/main/java/com/zzjee/wm/service/impl/WmDayCostConfServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class WmDayCostConfServiceImpl extends CommonServiceImpl implements WmDayCostConfServiceI { - public void delete(WmDayCostConfEntity entity) throws Exception{ + @Override + public void delete(WmDayCostConfEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(WmDayCostConfEntity entity) throws Exception{ + @Override + public Serializable save(WmDayCostConfEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(WmDayCostConfEntity entity) throws Exception{ + @Override + public void saveOrUpdate(WmDayCostConfEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class WmDayCostConfServiceImpl extends CommonServiceImpl implements WmDay } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(WmDayCostConfEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/wm/service/impl/WmDayCostServiceImpl.java b/src/main/java/com/zzjee/wm/service/impl/WmDayCostServiceImpl.java index f0e2a079a1506949d07eb9fded4a870eadb5bf0e..b3a1acb34ea90503071df3483ff69c6827cc3297 100644 --- a/src/main/java/com/zzjee/wm/service/impl/WmDayCostServiceImpl.java +++ b/src/main/java/com/zzjee/wm/service/impl/WmDayCostServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class WmDayCostServiceImpl extends CommonServiceImpl implements WmDayCostServiceI { - public void delete(WmDayCostEntity entity) throws Exception{ + @Override + public void delete(WmDayCostEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(WmDayCostEntity entity) throws Exception{ + @Override + public Serializable save(WmDayCostEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(WmDayCostEntity entity) throws Exception{ + @Override + public void saveOrUpdate(WmDayCostEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class WmDayCostServiceImpl extends CommonServiceImpl implements WmDayCost } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(WmDayCostEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/wm/service/impl/WmImNoticeHServiceImpl.java b/src/main/java/com/zzjee/wm/service/impl/WmImNoticeHServiceImpl.java index 23e3831e635656e2515c360bf925f71e08cc7441..b433d632e494b98616d3c672d1da5db259de8b61 100644 --- a/src/main/java/com/zzjee/wm/service/impl/WmImNoticeHServiceImpl.java +++ b/src/main/java/com/zzjee/wm/service/impl/WmImNoticeHServiceImpl.java @@ -34,14 +34,16 @@ import java.io.Serializable; @Transactional public class WmImNoticeHServiceImpl extends CommonServiceImpl implements WmImNoticeHServiceI { - public void delete(T entity) { + @Override + public void delete(T entity) { super.delete(entity); //执行删除操作配置的sql增强 this.doDelSql((WmImNoticeHEntity)entity); } - public void addMain(WmImNoticeHEntity wmImNoticeH, - List wmImNoticeIList){ + @Override + public void addMain(WmImNoticeHEntity wmImNoticeH, + List wmImNoticeIList){ //保存主信息 this.save(wmImNoticeH); @@ -147,8 +149,9 @@ public class WmImNoticeHServiceImpl extends CommonServiceImpl implements WmImNot } - public void updateMain(WmImNoticeHEntity wmImNoticeH, - List wmImNoticeIList) { + @Override + public void updateMain(WmImNoticeHEntity wmImNoticeH, + List wmImNoticeIList) { //保存主表信息 this.saveOrUpdate(wmImNoticeH); //=================================================================================== @@ -232,7 +235,8 @@ public class WmImNoticeHServiceImpl extends CommonServiceImpl implements WmImNot } - public void delMain(WmImNoticeHEntity wmImNoticeH) { + @Override + public void delMain(WmImNoticeHEntity wmImNoticeH) { //删除主表信息 this.delete(wmImNoticeH); //=================================================================================== @@ -250,21 +254,24 @@ public class WmImNoticeHServiceImpl extends CommonServiceImpl implements WmImNot * 默认按钮-sql增强-新增操作 * @return */ - public boolean doAddSql(WmImNoticeHEntity t){ + @Override + public boolean doAddSql(WmImNoticeHEntity t){ return true; } /** * 默认按钮-sql增强-更新操作 * @return */ - public boolean doUpdateSql(WmImNoticeHEntity t){ + @Override + public boolean doUpdateSql(WmImNoticeHEntity t){ return true; } /** * 默认按钮-sql增强-删除操作 * @return */ - public boolean doDelSql(WmImNoticeHEntity t){ + @Override + public boolean doDelSql(WmImNoticeHEntity t){ return true; } diff --git a/src/main/java/com/zzjee/wm/service/impl/WmInQmIServiceImpl.java b/src/main/java/com/zzjee/wm/service/impl/WmInQmIServiceImpl.java index c9902361e76c9889f0f4989bf7eae67e23d6c268..3e7c56f1ae94c0c6a0901b8b3e08995d549abac1 100644 --- a/src/main/java/com/zzjee/wm/service/impl/WmInQmIServiceImpl.java +++ b/src/main/java/com/zzjee/wm/service/impl/WmInQmIServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class WmInQmIServiceImpl extends CommonServiceImpl implements WmInQmIServiceI { - public void delete(WmInQmIEntity entity) throws Exception{ + @Override + public void delete(WmInQmIEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(WmInQmIEntity entity) throws Exception{ + @Override + public Serializable save(WmInQmIEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(WmInQmIEntity entity) throws Exception{ + @Override + public void saveOrUpdate(WmInQmIEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class WmInQmIServiceImpl extends CommonServiceImpl implements WmInQmIServ } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(WmInQmIEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/wm/service/impl/WmNoticeConfServiceImpl.java b/src/main/java/com/zzjee/wm/service/impl/WmNoticeConfServiceImpl.java index d2ba261650fa51ebc1fb8cef978e6c675f83ea99..0b0e3c0058b0765fa157143c9a700bf72f26dc34 100644 --- a/src/main/java/com/zzjee/wm/service/impl/WmNoticeConfServiceImpl.java +++ b/src/main/java/com/zzjee/wm/service/impl/WmNoticeConfServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class WmNoticeConfServiceImpl extends CommonServiceImpl implements WmNoticeConfServiceI { - public void delete(WmNoticeConfEntity entity) throws Exception{ + @Override + public void delete(WmNoticeConfEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(WmNoticeConfEntity entity) throws Exception{ + @Override + public Serializable save(WmNoticeConfEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(WmNoticeConfEntity entity) throws Exception{ + @Override + public void saveOrUpdate(WmNoticeConfEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class WmNoticeConfServiceImpl extends CommonServiceImpl implements WmNoti } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(WmNoticeConfEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java b/src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java index b50c8e4c0dea47184add02fc76d662352dd8d9fc..0b8a426f1472fe82993d8fe4b7302db7f852cb3f 100644 --- a/src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java +++ b/src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java @@ -30,14 +30,16 @@ import java.io.Serializable; @Transactional public class WmOmNoticeHServiceImpl extends CommonServiceImpl implements WmOmNoticeHServiceI { - public void delete(T entity) { + @Override + public void delete(T entity) { super.delete(entity); //执行删除操作配置的sql增强 this.doDelSql((WmOmNoticeHEntity)entity); } - public void addMain(WmOmNoticeHEntity wmOmNoticeH, - List wmOmNoticeIList){ + @Override + public void addMain(WmOmNoticeHEntity wmOmNoticeH, + List wmOmNoticeIList){ //保存主信息 this.save(wmOmNoticeH); Double jishu = 0.00; @@ -125,8 +127,9 @@ public class WmOmNoticeHServiceImpl extends CommonServiceImpl implements WmOmNot //执行新增操作配置的sql增强 this.doAddSql(wmOmNoticeH); } - public void addMaintms(WmTmsNoticeHEntity wmOmNoticeH, - List wmOmNoticeIList){ + @Override + public void addMaintms(WmTmsNoticeHEntity wmOmNoticeH, + List wmOmNoticeIList){ //保存主信息 this.save(wmOmNoticeH); Double jishu = 0.00; @@ -215,8 +218,9 @@ public class WmOmNoticeHServiceImpl extends CommonServiceImpl implements WmOmNot } - public void updateMain(WmOmNoticeHEntity wmOmNoticeH, - List wmOmNoticeIList,List wmOmtmsIList) { + @Override + public void updateMain(WmOmNoticeHEntity wmOmNoticeH, + List wmOmNoticeIList, List wmOmtmsIList) { //保存主表信息 this.saveOrUpdate(wmOmNoticeH); //=================================================================================== @@ -328,7 +332,8 @@ public class WmOmNoticeHServiceImpl extends CommonServiceImpl implements WmOmNot } - public void delMain(WmOmNoticeHEntity wmOmNoticeH) { + @Override + public void delMain(WmOmNoticeHEntity wmOmNoticeH) { //删除主表信息 this.delete(wmOmNoticeH); //=================================================================================== @@ -346,21 +351,24 @@ public class WmOmNoticeHServiceImpl extends CommonServiceImpl implements WmOmNot * 默认按钮-sql增强-新增操作 * @return */ - public boolean doAddSql(WmOmNoticeHEntity t){ + @Override + public boolean doAddSql(WmOmNoticeHEntity t){ return true; } /** * 默认按钮-sql增强-更新操作 * @return */ - public boolean doUpdateSql(WmOmNoticeHEntity t){ + @Override + public boolean doUpdateSql(WmOmNoticeHEntity t){ return true; } /** * 默认按钮-sql增强-删除操作 * @return */ - public boolean doDelSql(WmOmNoticeHEntity t){ + @Override + public boolean doDelSql(WmOmNoticeHEntity t){ return true; } diff --git a/src/main/java/com/zzjee/wm/service/impl/WmOmQmIServiceImpl.java b/src/main/java/com/zzjee/wm/service/impl/WmOmQmIServiceImpl.java index 4c78f748feb956acaeb76cc47b2ea8b6f5fc640e..033ee432c1441592d8f8566daca9c5c310631b31 100644 --- a/src/main/java/com/zzjee/wm/service/impl/WmOmQmIServiceImpl.java +++ b/src/main/java/com/zzjee/wm/service/impl/WmOmQmIServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class WmOmQmIServiceImpl extends CommonServiceImpl implements WmOmQmIServiceI { - public void delete(WmOmQmIEntity entity) throws Exception{ + @Override + public void delete(WmOmQmIEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(WmOmQmIEntity entity) throws Exception{ + @Override + public Serializable save(WmOmQmIEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(WmOmQmIEntity entity) throws Exception{ + @Override + public void saveOrUpdate(WmOmQmIEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class WmOmQmIServiceImpl extends CommonServiceImpl implements WmOmQmIServ } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(WmOmQmIEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/wm/service/impl/WmPlatIoServiceImpl.java b/src/main/java/com/zzjee/wm/service/impl/WmPlatIoServiceImpl.java index b191d4f74dad14344544dadc692cf2cc3930d84d..cb08219682dfaecf278cc61532ba9867f7e9525a 100644 --- a/src/main/java/com/zzjee/wm/service/impl/WmPlatIoServiceImpl.java +++ b/src/main/java/com/zzjee/wm/service/impl/WmPlatIoServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class WmPlatIoServiceImpl extends CommonServiceImpl implements WmPlatIoServiceI { - public void delete(WmPlatIoEntity entity) throws Exception{ + @Override + public void delete(WmPlatIoEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(WmPlatIoEntity entity) throws Exception{ + @Override + public Serializable save(WmPlatIoEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(WmPlatIoEntity entity) throws Exception{ + @Override + public void saveOrUpdate(WmPlatIoEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class WmPlatIoServiceImpl extends CommonServiceImpl implements WmPlatIoSe } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(WmPlatIoEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/wm/service/impl/WmSttInGoodsServiceImpl.java b/src/main/java/com/zzjee/wm/service/impl/WmSttInGoodsServiceImpl.java index 6f03ab3f457b6dd31f53f4f8f9bdc6e491825fe9..05ce6cb3812001058012ab916a61fafe94c43727 100644 --- a/src/main/java/com/zzjee/wm/service/impl/WmSttInGoodsServiceImpl.java +++ b/src/main/java/com/zzjee/wm/service/impl/WmSttInGoodsServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class WmSttInGoodsServiceImpl extends CommonServiceImpl implements WmSttInGoodsServiceI { - public void delete(WmSttInGoodsEntity entity) throws Exception{ + @Override + public void delete(WmSttInGoodsEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(WmSttInGoodsEntity entity) throws Exception{ + @Override + public Serializable save(WmSttInGoodsEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(WmSttInGoodsEntity entity) throws Exception{ + @Override + public void saveOrUpdate(WmSttInGoodsEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class WmSttInGoodsServiceImpl extends CommonServiceImpl implements WmSttI } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(WmSttInGoodsEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/wm/service/impl/WmToDownGoodsServiceImpl.java b/src/main/java/com/zzjee/wm/service/impl/WmToDownGoodsServiceImpl.java index 65bc50c2ef04b236fae0c55530512bd54918220d..4517007c5bd2f26fbd3161ad3841d40099d0dc17 100644 --- a/src/main/java/com/zzjee/wm/service/impl/WmToDownGoodsServiceImpl.java +++ b/src/main/java/com/zzjee/wm/service/impl/WmToDownGoodsServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class WmToDownGoodsServiceImpl extends CommonServiceImpl implements WmToDownGoodsServiceI { - public void delete(WmToDownGoodsEntity entity) throws Exception{ + @Override + public void delete(WmToDownGoodsEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(WmToDownGoodsEntity entity) throws Exception{ + @Override + public Serializable save(WmToDownGoodsEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(WmToDownGoodsEntity entity) throws Exception{ + @Override + public void saveOrUpdate(WmToDownGoodsEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class WmToDownGoodsServiceImpl extends CommonServiceImpl implements WmToD } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(WmToDownGoodsEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/wm/service/impl/WmToMoveGoodsServiceImpl.java b/src/main/java/com/zzjee/wm/service/impl/WmToMoveGoodsServiceImpl.java index fa951e365514b3612f99a8a38a115f607925c153..e47b6a7596aced394715cf32e75c744067fdb9d4 100644 --- a/src/main/java/com/zzjee/wm/service/impl/WmToMoveGoodsServiceImpl.java +++ b/src/main/java/com/zzjee/wm/service/impl/WmToMoveGoodsServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class WmToMoveGoodsServiceImpl extends CommonServiceImpl implements WmToMoveGoodsServiceI { - public void delete(WmToMoveGoodsEntity entity) throws Exception{ + @Override + public void delete(WmToMoveGoodsEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(WmToMoveGoodsEntity entity) throws Exception{ + @Override + public Serializable save(WmToMoveGoodsEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(WmToMoveGoodsEntity entity) throws Exception{ + @Override + public void saveOrUpdate(WmToMoveGoodsEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class WmToMoveGoodsServiceImpl extends CommonServiceImpl implements WmToM } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(WmToMoveGoodsEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/wm/service/impl/WmToUpGoodsServiceImpl.java b/src/main/java/com/zzjee/wm/service/impl/WmToUpGoodsServiceImpl.java index 9f55820cefaa812d55e7e54d5a0b033197cc6b17..c55b821896171fd302bd26fcb25d944f1b30b48f 100644 --- a/src/main/java/com/zzjee/wm/service/impl/WmToUpGoodsServiceImpl.java +++ b/src/main/java/com/zzjee/wm/service/impl/WmToUpGoodsServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class WmToUpGoodsServiceImpl extends CommonServiceImpl implements WmToUpGoodsServiceI { - public void delete(WmToUpGoodsEntity entity) throws Exception{ + @Override + public void delete(WmToUpGoodsEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(WmToUpGoodsEntity entity) throws Exception{ + @Override + public Serializable save(WmToUpGoodsEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(WmToUpGoodsEntity entity) throws Exception{ + @Override + public void saveOrUpdate(WmToUpGoodsEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class WmToUpGoodsServiceImpl extends CommonServiceImpl implements WmToUpG } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(WmToUpGoodsEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/wm/service/impl/WvStockServiceImpl.java b/src/main/java/com/zzjee/wm/service/impl/WvStockServiceImpl.java index b14940fb0a19ef802864dbdb6ef7348002e2efa0..49c8fdacadc0356a37261f949f5c00c03a943b4c 100644 --- a/src/main/java/com/zzjee/wm/service/impl/WvStockServiceImpl.java +++ b/src/main/java/com/zzjee/wm/service/impl/WvStockServiceImpl.java @@ -23,20 +23,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class WvStockServiceImpl extends CommonServiceImpl implements WvStockServiceI { - public void delete(WvStockEntity entity) throws Exception{ + @Override + public void delete(WvStockEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(WvStockEntity entity) throws Exception{ + @Override + public Serializable save(WvStockEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(WvStockEntity entity) throws Exception{ + @Override + public void saveOrUpdate(WvStockEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -68,7 +71,7 @@ public class WvStockServiceImpl extends CommonServiceImpl implements WvStockServ } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(WvStockEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/wm/service/impl/WvStockSttBinServiceImpl.java b/src/main/java/com/zzjee/wm/service/impl/WvStockSttBinServiceImpl.java index 12f49362b14680267f8dd3a13b0fa3b1c5a20e33..7e1baea3c284719951d5e2761cbb9ba02cb04832 100644 --- a/src/main/java/com/zzjee/wm/service/impl/WvStockSttBinServiceImpl.java +++ b/src/main/java/com/zzjee/wm/service/impl/WvStockSttBinServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class WvStockSttBinServiceImpl extends CommonServiceImpl implements WvStockSttBinServiceI { - public void delete(WvStockSttBinEntity entity) throws Exception{ + @Override + public void delete(WvStockSttBinEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(WvStockSttBinEntity entity) throws Exception{ + @Override + public Serializable save(WvStockSttBinEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(WvStockSttBinEntity entity) throws Exception{ + @Override + public void saveOrUpdate(WvStockSttBinEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class WvStockSttBinServiceImpl extends CommonServiceImpl implements WvSto } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(WvStockSttBinEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/wmapi/service/impl/WvGiNoticeServiceImpl.java b/src/main/java/com/zzjee/wmapi/service/impl/WvGiNoticeServiceImpl.java index 09f34253e8abb5f61289a2c2287926b39c4a23d0..9bc328297a3ac461f4a8108f9df3a5b27bee1bf8 100644 --- a/src/main/java/com/zzjee/wmapi/service/impl/WvGiNoticeServiceImpl.java +++ b/src/main/java/com/zzjee/wmapi/service/impl/WvGiNoticeServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class WvGiNoticeServiceImpl extends CommonServiceImpl implements WvGiNoticeServiceI { - public void delete(WvGiNoticeEntity entity) throws Exception{ + @Override + public void delete(WvGiNoticeEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(WvGiNoticeEntity entity) throws Exception{ + @Override + public Serializable save(WvGiNoticeEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(WvGiNoticeEntity entity) throws Exception{ + @Override + public void saveOrUpdate(WvGiNoticeEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class WvGiNoticeServiceImpl extends CommonServiceImpl implements WvGiNoti } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(WvGiNoticeEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/wmapi/service/impl/WvGiServiceImpl.java b/src/main/java/com/zzjee/wmapi/service/impl/WvGiServiceImpl.java index 0ca90c7763c88a14d27d1f9033e23ae1b8a0761e..977267d6b74219e47cacaa3cea59ff0e8a0acd9a 100644 --- a/src/main/java/com/zzjee/wmapi/service/impl/WvGiServiceImpl.java +++ b/src/main/java/com/zzjee/wmapi/service/impl/WvGiServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class WvGiServiceImpl extends CommonServiceImpl implements WvGiServiceI { - public void delete(WvGiEntity entity) throws Exception{ + @Override + public void delete(WvGiEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(WvGiEntity entity) throws Exception{ + @Override + public Serializable save(WvGiEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(WvGiEntity entity) throws Exception{ + @Override + public void saveOrUpdate(WvGiEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class WvGiServiceImpl extends CommonServiceImpl implements WvGiServiceI { } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(WvGiEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/wmapi/service/impl/WvNoticeServiceImpl.java b/src/main/java/com/zzjee/wmapi/service/impl/WvNoticeServiceImpl.java index a33c029c3115d250f69787bd6113496d10594d80..64f91a696b602fd2728397f1259f1d005aba7466 100644 --- a/src/main/java/com/zzjee/wmapi/service/impl/WvNoticeServiceImpl.java +++ b/src/main/java/com/zzjee/wmapi/service/impl/WvNoticeServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class WvNoticeServiceImpl extends CommonServiceImpl implements WvNoticeServiceI { - public void delete(WvNoticeEntity entity) throws Exception{ + @Override + public void delete(WvNoticeEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(WvNoticeEntity entity) throws Exception{ + @Override + public Serializable save(WvNoticeEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(WvNoticeEntity entity) throws Exception{ + @Override + public void saveOrUpdate(WvNoticeEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class WvNoticeServiceImpl extends CommonServiceImpl implements WvNoticeSe } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(WvNoticeEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/wmutil/uasUtil.java b/src/main/java/com/zzjee/wmutil/uasUtil.java index 5d8430dc98d6fbf15db494478062ada41f96a6b0..1cd4f6601d7ec44b4bc6263b5dbaa913f20139ff 100644 --- a/src/main/java/com/zzjee/wmutil/uasUtil.java +++ b/src/main/java/com/zzjee/wmutil/uasUtil.java @@ -1,14 +1,10 @@ package com.zzjee.wmutil; import com.xiaoleilu.hutool.http.HttpUtil; -import net.sf.json.JSONObject; -import netscape.javascript.JSObject; -import org.apache.commons.chain.web.servlet.RequestParameterMapper; import org.jeecgframework.core.util.DateUtils; import org.jeecgframework.core.util.JSONHelper; import org.jeecgframework.core.util.ResourceUtil; import org.jeecgframework.core.util.StringUtil; -import org.json.HTTP; import org.springframework.util.DigestUtils; import java.nio.charset.Charset; @@ -44,223 +40,226 @@ public class uasUtil { } - // public static uasloginres getToken(String master) { uasloginres uasloginres = null; String url; url = "http://36.110.2.114:8099/XKN/wms2uas/login.action"; - try{ - url = ResourceUtil.getConfigByName("uas.url")+"wms2uas/login.action"; - }catch (Exception e){ + try { + url = ResourceUtil.getConfigByName("uas.url") + "wms2uas/login.action"; + } catch (Exception e) { } Map paramMap = new HashMap(); - String userName= "xknTest"; - String passWord = "xknTest123"; - master = "XKN_TEST"; - try{ + String userName = "xknTest"; + String passWord = "xknTest123"; + master = "XKN_TEST"; + try { userName = ResourceUtil.getConfigByName("uas.userName"); - }catch (Exception e){ + } catch (Exception e) { } - try{ - passWord = ResourceUtil.getConfigByName("uas.passWord"); - }catch (Exception e){ + try { + passWord = ResourceUtil.getConfigByName("uas.passWord"); + } catch (Exception e) { } - try{ - if(StringUtil.isEmpty(master)){ + try { + if (StringUtil.isEmpty(master)) { master = ResourceUtil.getConfigByName("uas.master"); } - }catch (Exception e){ + } catch (Exception e) { } - paramMap.put("userName",userName); - paramMap.put("passWord",passWord); - paramMap.put("master",master); - String res = HttpUtil.post(url,paramMap); - uasloginres = JSONHelper.fromJsonToObject(res,uasloginres.class); + paramMap.put("userName", userName); + paramMap.put("passWord", passWord); + paramMap.put("master", master); + String res = HttpUtil.post(url, paramMap); + uasloginres = JSONHelper.fromJsonToObject(res, uasloginres.class); org.jeecgframework.core.util.LogUtil - .info("===================获取TOKEN==================="+uasloginres); - return uasloginres; + .info("===================获取TOKEN===================" + uasloginres); + return uasloginres; } + public static productResult getProduct(Map params) { productResult productResult = null; - String token=null; - String url = ResourceUtil.getConfigByName("uas.url")+"basic/getProduct.action"; + String token = null; + String url = ResourceUtil.getConfigByName("uas.url") + "basic/getProduct.action"; String master = ResourceUtil.getConfigByName("uas.master"); token = getToken("").getToken(); Map paramMap = new HashMap(); String formDate = DateUtils.date2Str(DateUtils.date_sdf); - try{ + try { formDate = params.get("formDate").toString(); - }catch (Exception e){ + } catch (Exception e) { } - paramMap.put("formDate",formDate); - paramMap.put("token",token); - paramMap.put("master",master); - paramMap.put("timestamp",DateUtils.gettimestamp()); + paramMap.put("formDate", formDate); + paramMap.put("token", token); + paramMap.put("master", master); + paramMap.put("timestamp", DateUtils.gettimestamp()); String sign = createSign(paramMap); - paramMap.put("sign",sign); - String res = HttpUtil.post(url,paramMap); - productResult = JSONHelper.fromJsonToObject(res,productResult.class); + paramMap.put("sign", sign); + String res = HttpUtil.post(url, paramMap); + productResult = JSONHelper.fromJsonToObject(res, productResult.class); org.jeecgframework.core.util.LogUtil - .info("===================获取商品==================="+productResult); - return productResult; + .info("===================获取商品===================" + productResult); + return productResult; } + public static customerResult getCustomer(Map params) { customerResult customerResult = null; - String token=null; - String url = ResourceUtil.getConfigByName("uas.url")+"basic/getCustomer.action"; + String token = null; + String url = ResourceUtil.getConfigByName("uas.url") + "basic/getCustomer.action"; String master = ResourceUtil.getConfigByName("uas.master"); token = getToken("").getToken(); Map paramMap = new HashMap(); String formDate = DateUtils.date2Str(DateUtils.date_sdf); - try{ + try { formDate = params.get("formDate").toString(); - }catch (Exception e){ + } catch (Exception e) { } - paramMap.put("formDate",formDate); - paramMap.put("token",token); - paramMap.put("master",master); - paramMap.put("timestamp",DateUtils.gettimestamp()); + paramMap.put("formDate", formDate); + paramMap.put("token", token); + paramMap.put("master", master); + paramMap.put("timestamp", DateUtils.gettimestamp()); String sign = createSign(paramMap); - paramMap.put("sign",sign); - String res = HttpUtil.post(url,paramMap); + paramMap.put("sign", sign); + String res = HttpUtil.post(url, paramMap); - customerResult = JSONHelper.fromJsonToObject(res,customerResult.class); + customerResult = JSONHelper.fromJsonToObject(res, customerResult.class); org.jeecgframework.core.util.LogUtil - .info("===================获取客户==================="+customerResult); - return customerResult; + .info("===================获取客户===================" + customerResult); + return customerResult; } + public static vendorResult getVendor(Map params) { vendorResult vendorResult = null; - String token=null; - String url = ResourceUtil.getConfigByName("uas.url")+"basic/getVendor.action"; + String token = null; + String url = ResourceUtil.getConfigByName("uas.url") + "basic/getVendor.action"; String master = ResourceUtil.getConfigByName("uas.master"); token = getToken("").getToken(); Map paramMap = new HashMap(); String formDate = DateUtils.date2Str(DateUtils.date_sdf); - try{ + try { formDate = params.get("formDate").toString(); - }catch (Exception e){ + } catch (Exception e) { } - paramMap.put("formDate",formDate); - paramMap.put("token",token); - paramMap.put("master",master); - paramMap.put("timestamp",DateUtils.gettimestamp()); + paramMap.put("formDate", formDate); + paramMap.put("token", token); + paramMap.put("master", master); + paramMap.put("timestamp", DateUtils.gettimestamp()); String sign = createSign(paramMap); - paramMap.put("sign",sign); - String res = HttpUtil.post(url,paramMap); + paramMap.put("sign", sign); + String res = HttpUtil.post(url, paramMap); - vendorResult = JSONHelper.fromJsonToObject(res,vendorResult.class); + vendorResult = JSONHelper.fromJsonToObject(res, vendorResult.class); org.jeecgframework.core.util.LogUtil - .info("===================获取供应商==================="+vendorResult); - return vendorResult; + .info("===================获取供应商===================" + vendorResult); + return vendorResult; } + public static warehouseResult getWarehouse(Map params) { warehouseResult warehouseResult = null; - String token=null; - String url = ResourceUtil.getConfigByName("uas.url")+"basic/getWarehouse.action"; + String token = null; + String url = ResourceUtil.getConfigByName("uas.url") + "basic/getWarehouse.action"; String master = ResourceUtil.getConfigByName("uas.master"); token = getToken("").getToken(); Map paramMap = new HashMap(); String formDate = DateUtils.date2Str(DateUtils.date_sdf); - try{ + try { formDate = params.get("formDate").toString(); - }catch (Exception e){ + } catch (Exception e) { } - paramMap.put("formDate",formDate); - paramMap.put("token",token); - paramMap.put("master",master); - paramMap.put("timestamp",DateUtils.gettimestamp()); + paramMap.put("formDate", formDate); + paramMap.put("token", token); + paramMap.put("master", master); + paramMap.put("timestamp", DateUtils.gettimestamp()); String sign = createSign(paramMap); - paramMap.put("sign",sign); - String res = HttpUtil.post(url,paramMap); + paramMap.put("sign", sign); + String res = HttpUtil.post(url, paramMap); - warehouseResult = JSONHelper.fromJsonToObject(res,warehouseResult.class); + warehouseResult = JSONHelper.fromJsonToObject(res, warehouseResult.class); org.jeecgframework.core.util.LogUtil - .info("===================获取仓库==================="+warehouseResult); - return warehouseResult; + .info("===================获取仓库===================" + warehouseResult); + return warehouseResult; } public static billResult getBil(Map params) { billResult billResult = null; - String token=null; - String url = ResourceUtil.getConfigByName("uas.url")+"productio/getBill.action"; + String token = null; + String url = ResourceUtil.getConfigByName("uas.url") + "productio/getBill.action"; String master = params.get("master").toString(); token = getToken(master).getToken(); Map paramMap = new HashMap(); String formDate = DateUtils.date2Str(DateUtils.date_sdf); - try{ + try { formDate = params.get("lastUpdateTime").toString(); - }catch (Exception e){ + } catch (Exception e) { } - paramMap.put("pi_class",params.get("pi_class").toString()); - paramMap.put("lastUpdateTime",formDate); - paramMap.put("token",token); - paramMap.put("master",master); - paramMap.put("timestamp",Calendar.getInstance().getTimeInMillis()); + paramMap.put("pi_class", params.get("pi_class").toString()); + paramMap.put("lastUpdateTime", formDate); + paramMap.put("token", token); + paramMap.put("master", master); + paramMap.put("timestamp", Calendar.getInstance().getTimeInMillis()); String sign = createSign(paramMap); - paramMap.put("sign",sign); - String res = HttpUtil.post(url,paramMap); + paramMap.put("sign", sign); + String res = HttpUtil.post(url, paramMap); - billResult = JSONHelper.fromJsonToObject(res,billResult.class); + billResult = JSONHelper.fromJsonToObject(res, billResult.class); org.jeecgframework.core.util.LogUtil - .info("===================获取单据==================="+billResult); - return billResult; + .info("===================获取单据===================" + billResult); + return billResult; } public static sdresult getsdBil(Map params) { sdresult sdresult = null; - String token=null; - String url = ResourceUtil.getConfigByName("uas.url")+"productio/getBill.action"; + String token = null; + String url = ResourceUtil.getConfigByName("uas.url") + "productio/getBill.action"; String master = params.get("master").toString(); token = getToken(master).getToken(); Map paramMap = new HashMap(); String formDate = DateUtils.date2Str(DateUtils.date_sdf); - try{ + try { formDate = params.get("lastUpdateTime").toString(); - }catch (Exception e){ + } catch (Exception e) { } - paramMap.put("pi_class",params.get("pi_class").toString()); - paramMap.put("lastUpdateTime",formDate); - paramMap.put("token",token); - paramMap.put("master",master); - paramMap.put("timestamp",Calendar.getInstance().getTimeInMillis()); + paramMap.put("pi_class", params.get("pi_class").toString()); + paramMap.put("lastUpdateTime", formDate); + paramMap.put("token", token); + paramMap.put("master", master); + paramMap.put("timestamp", Calendar.getInstance().getTimeInMillis()); String sign = createSign(paramMap); - paramMap.put("sign",sign); - String res = HttpUtil.post(url,paramMap); + paramMap.put("sign", sign); + String res = HttpUtil.post(url, paramMap); - sdresult = JSONHelper.fromJsonToObject(res,sdresult.class); + sdresult = JSONHelper.fromJsonToObject(res, sdresult.class); org.jeecgframework.core.util.LogUtil - .info("===================获取单据==================="+sdresult); - return sdresult; + .info("===================获取单据===================" + sdresult); + return sdresult; } - public static resResult postBill(Map params) { + public static resResult postBill(Map params) { resResult resResult = null; - String token=null; - String url = ResourceUtil.getConfigByName("uas.url")+"porductio/post.action"; + String token = null; + String url = ResourceUtil.getConfigByName("uas.url") + "porductio/post.action"; String master = params.get("master").toString(); token = getToken(master).getToken(); Map paramMap = new HashMap(); paramMap.put("data", params.get("data").toString()); - paramMap.put("token",token); - paramMap.put("master",master); - paramMap.put("timestamp",Calendar.getInstance().getTimeInMillis()); + paramMap.put("token", token); + paramMap.put("master", master); + paramMap.put("timestamp", Calendar.getInstance().getTimeInMillis()); String sign = createSign(paramMap); - paramMap.put("sign",sign); - String res = HttpUtil.post(url,paramMap); + paramMap.put("sign", sign); + String res = HttpUtil.post(url, paramMap); - resResult = JSONHelper.fromJsonToObject(res,resResult.class); + resResult = JSONHelper.fromJsonToObject(res, resResult.class); org.jeecgframework.core.util.LogUtil - .info("===================提交单据==================="+resResult); - return resResult; + .info("===================提交单据===================" + resResult); + return resResult; } } diff --git a/src/main/java/com/zzjee/wv/service/impl/MvStockCusServiceImpl.java b/src/main/java/com/zzjee/wv/service/impl/MvStockCusServiceImpl.java index 93060ecd731ed0c28633b0e46952c0d7c147c9c6..0d8de945bc2d92fd40cfd5effb44f463ef4e4c9b 100644 --- a/src/main/java/com/zzjee/wv/service/impl/MvStockCusServiceImpl.java +++ b/src/main/java/com/zzjee/wv/service/impl/MvStockCusServiceImpl.java @@ -18,20 +18,23 @@ import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; public class MvStockCusServiceImpl extends CommonServiceImpl implements MvStockCusServiceI { - public void delete(MvStockCusEntity entity) throws Exception{ + @Override + public void delete(MvStockCusEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(MvStockCusEntity entity) throws Exception{ + @Override + public Serializable save(MvStockCusEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(MvStockCusEntity entity) throws Exception{ + @Override + public void saveOrUpdate(MvStockCusEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -63,7 +66,7 @@ public class MvStockCusServiceImpl extends CommonServiceImpl implements MvStockC } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(MvStockCusEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/wz/service/impl/TWzLocationServiceImpl.java b/src/main/java/com/zzjee/wz/service/impl/TWzLocationServiceImpl.java index 1d9fd310ad183408337b53ffe682be80e63f9eb6..fa372cfde8b0f109859cd517be889ca95d066537 100644 --- a/src/main/java/com/zzjee/wz/service/impl/TWzLocationServiceImpl.java +++ b/src/main/java/com/zzjee/wz/service/impl/TWzLocationServiceImpl.java @@ -21,20 +21,23 @@ import java.util.UUID; public class TWzLocationServiceImpl extends CommonServiceImpl implements TWzLocationServiceI { - public void delete(TWzLocationEntity entity) throws Exception{ + @Override + public void delete(TWzLocationEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(TWzLocationEntity entity) throws Exception{ + @Override + public Serializable save(TWzLocationEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(TWzLocationEntity entity) throws Exception{ + @Override + public void saveOrUpdate(TWzLocationEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -66,7 +69,7 @@ public class TWzLocationServiceImpl extends CommonServiceImpl implements TWzLoca } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(TWzLocationEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/wz/service/impl/TWzMaterialServiceImpl.java b/src/main/java/com/zzjee/wz/service/impl/TWzMaterialServiceImpl.java index 6b8df4f5e1e6c354059b4229f483ec2dca7abd51..e7cd23960f36e86fe086963e0beea65a4cf222a5 100644 --- a/src/main/java/com/zzjee/wz/service/impl/TWzMaterialServiceImpl.java +++ b/src/main/java/com/zzjee/wz/service/impl/TWzMaterialServiceImpl.java @@ -21,20 +21,23 @@ import java.util.UUID; public class TWzMaterialServiceImpl extends CommonServiceImpl implements TWzMaterialServiceI { - public void delete(TWzMaterialEntity entity) throws Exception{ + @Override + public void delete(TWzMaterialEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(TWzMaterialEntity entity) throws Exception{ + @Override + public Serializable save(TWzMaterialEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(TWzMaterialEntity entity) throws Exception{ + @Override + public void saveOrUpdate(TWzMaterialEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -66,7 +69,7 @@ public class TWzMaterialServiceImpl extends CommonServiceImpl implements TWzMate } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(TWzMaterialEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/wz/service/impl/TWzSpConfServiceImpl.java b/src/main/java/com/zzjee/wz/service/impl/TWzSpConfServiceImpl.java index 09d35804a4ad379be226b4fdaf8f5d102dd9dac6..da42af69d35f77c029ae8210cb25ca9852796481 100644 --- a/src/main/java/com/zzjee/wz/service/impl/TWzSpConfServiceImpl.java +++ b/src/main/java/com/zzjee/wz/service/impl/TWzSpConfServiceImpl.java @@ -21,20 +21,23 @@ import java.util.UUID; public class TWzSpConfServiceImpl extends CommonServiceImpl implements TWzSpConfServiceI { - public void delete(TWzSpConfEntity entity) throws Exception{ + @Override + public void delete(TWzSpConfEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(TWzSpConfEntity entity) throws Exception{ + @Override + public Serializable save(TWzSpConfEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(TWzSpConfEntity entity) throws Exception{ + @Override + public void saveOrUpdate(TWzSpConfEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -66,7 +69,7 @@ public class TWzSpConfServiceImpl extends CommonServiceImpl implements TWzSpConf } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(TWzSpConfEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/wzpo/service/impl/VWzPoWqServiceImpl.java b/src/main/java/com/zzjee/wzpo/service/impl/VWzPoWqServiceImpl.java index 9678df5eea23396fae473c5988a6da84fc7a5012..0a5bc1afe4ccd5273e1e334fd23420edbb6f031f 100644 --- a/src/main/java/com/zzjee/wzpo/service/impl/VWzPoWqServiceImpl.java +++ b/src/main/java/com/zzjee/wzpo/service/impl/VWzPoWqServiceImpl.java @@ -20,20 +20,23 @@ import java.util.UUID; public class VWzPoWqServiceImpl extends CommonServiceImpl implements VWzPoWqServiceI { - public void delete(VWzPoWqEntity entity) throws Exception{ + @Override + public void delete(VWzPoWqEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(VWzPoWqEntity entity) throws Exception{ + @Override + public Serializable save(VWzPoWqEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(VWzPoWqEntity entity) throws Exception{ + @Override + public void saveOrUpdate(VWzPoWqEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -65,7 +68,7 @@ public class VWzPoWqServiceImpl extends CommonServiceImpl implements VWzPoWqServ } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(VWzPoWqEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/wzrepair/service/impl/TWzRepairServiceImpl.java b/src/main/java/com/zzjee/wzrepair/service/impl/TWzRepairServiceImpl.java index 5980becb1d6ec087df42ac2d9310377ddda75de7..cc12dda6db23494e9b82ecf32ac30d4428414e4e 100644 --- a/src/main/java/com/zzjee/wzrepair/service/impl/TWzRepairServiceImpl.java +++ b/src/main/java/com/zzjee/wzrepair/service/impl/TWzRepairServiceImpl.java @@ -20,20 +20,23 @@ import java.util.UUID; public class TWzRepairServiceImpl extends CommonServiceImpl implements TWzRepairServiceI { - public void delete(TWzRepairEntity entity) throws Exception{ + @Override + public void delete(TWzRepairEntity entity) throws Exception{ super.delete(entity); //执行删除操作增强业务 this.doDelBus(entity); } - public Serializable save(TWzRepairEntity entity) throws Exception{ + @Override + public Serializable save(TWzRepairEntity entity) throws Exception{ Serializable t = super.save(entity); //执行新增操作增强业务 this.doAddBus(entity); return t; } - public void saveOrUpdate(TWzRepairEntity entity) throws Exception{ + @Override + public void saveOrUpdate(TWzRepairEntity entity) throws Exception{ super.saveOrUpdate(entity); //执行更新操作增强业务 this.doUpdateBus(entity); @@ -65,7 +68,7 @@ public class TWzRepairServiceImpl extends CommonServiceImpl implements TWzRepair } /** * 删除操作增强业务 - * @param id + * @param t * @return */ private void doDelBus(TWzRepairEntity t) throws Exception{ diff --git a/src/main/java/com/zzjee/wzyw/service/TWzCkHeadServiceI.java b/src/main/java/com/zzjee/wzyw/service/TWzCkHeadServiceI.java index f7b29ed2cdb5d588dceb6ab0216d97e71d17dbdb..4d5354257c7fae3a95de0aeb0afb660edd513137 100644 --- a/src/main/java/com/zzjee/wzyw/service/TWzCkHeadServiceI.java +++ b/src/main/java/com/zzjee/wzyw/service/TWzCkHeadServiceI.java @@ -8,7 +8,8 @@ import java.util.List; public interface TWzCkHeadServiceI extends CommonService { - public void delete(T entity); + @Override + public void delete(T entity); /** * 添加一对多 * @@ -25,19 +26,19 @@ public interface TWzCkHeadServiceI extends CommonService { /** * 默认按钮-sql增强-新增操作 - * @param id + * @param t * @return */ public boolean doAddSql(TWzCkHeadEntity t); /** * 默认按钮-sql增强-更新操作 - * @param id + * @param t * @return */ public boolean doUpdateSql(TWzCkHeadEntity t); /** * 默认按钮-sql增强-删除操作 - * @param id + * @param t * @return */ public boolean doDelSql(TWzCkHeadEntity t); diff --git a/src/main/java/com/zzjee/wzyw/service/TWzPoHeadServiceI.java b/src/main/java/com/zzjee/wzyw/service/TWzPoHeadServiceI.java index 0f7b8c8aa891c94fa518cca6674043876868da88..c159eec245cb3bb35008106ba2d6f2c621c441a3 100644 --- a/src/main/java/com/zzjee/wzyw/service/TWzPoHeadServiceI.java +++ b/src/main/java/com/zzjee/wzyw/service/TWzPoHeadServiceI.java @@ -8,7 +8,8 @@ import java.util.List; public interface TWzPoHeadServiceI extends CommonService { - public void delete(T entity); + @Override + public void delete(T entity); /** * 添加一对多 * @@ -25,19 +26,19 @@ public interface TWzPoHeadServiceI extends CommonService { /** * 默认按钮-sql增强-新增操作 - * @param id + * @param t * @return */ public boolean doAddSql(TWzPoHeadEntity t); /** * 默认按钮-sql增强-更新操作 - * @param id + * @param t * @return */ public boolean doUpdateSql(TWzPoHeadEntity t); /** * 默认按钮-sql增强-删除操作 - * @param id + * @param t * @return */ public boolean doDelSql(TWzPoHeadEntity t); diff --git a/src/main/java/com/zzjee/wzyw/service/TWzRkHeadServiceI.java b/src/main/java/com/zzjee/wzyw/service/TWzRkHeadServiceI.java index 62d2f0415d9778bdba1547da56af6c43f41754a8..9be9bc1b1d7f41e55b0dcf1609666debfd3a45be 100644 --- a/src/main/java/com/zzjee/wzyw/service/TWzRkHeadServiceI.java +++ b/src/main/java/com/zzjee/wzyw/service/TWzRkHeadServiceI.java @@ -8,7 +8,8 @@ import java.util.List; public interface TWzRkHeadServiceI extends CommonService { - public void delete(T entity); + @Override + public void delete(T entity); /** * 添加一对多 * @@ -25,19 +26,19 @@ public interface TWzRkHeadServiceI extends CommonService { /** * 默认按钮-sql增强-新增操作 - * @param id + * @param t * @return */ public boolean doAddSql(TWzRkHeadEntity t); /** * 默认按钮-sql增强-更新操作 - * @param id + * @param t * @return */ public boolean doUpdateSql(TWzRkHeadEntity t); /** * 默认按钮-sql增强-删除操作 - * @param id + * @param t * @return */ public boolean doDelSql(TWzRkHeadEntity t); diff --git a/src/main/java/com/zzjee/wzyw/service/impl/TWzCkHeadServiceImpl.java b/src/main/java/com/zzjee/wzyw/service/impl/TWzCkHeadServiceImpl.java index 12047de27b0ae4f4b91519c8aa0e5e522e0896d5..1d6786e552918f0f2cab5d8187bfa952d05fce56 100644 --- a/src/main/java/com/zzjee/wzyw/service/impl/TWzCkHeadServiceImpl.java +++ b/src/main/java/com/zzjee/wzyw/service/impl/TWzCkHeadServiceImpl.java @@ -19,14 +19,16 @@ import java.util.UUID; @Transactional public class TWzCkHeadServiceImpl extends CommonServiceImpl implements TWzCkHeadServiceI { - public void delete(T entity) { + @Override + public void delete(T entity) { super.delete(entity); //执行删除操作配置的sql增强 this.doDelSql((TWzCkHeadEntity)entity); } - public void addMain(TWzCkHeadEntity tWzCkHead, - List tWzCkItemList){ + @Override + public void addMain(TWzCkHeadEntity tWzCkHead, + List tWzCkItemList){ //保存主信息 // tWzCkHead.setBpmStatus("0"); this.save(tWzCkHead); @@ -43,8 +45,9 @@ public class TWzCkHeadServiceImpl extends CommonServiceImpl implements TWzCkHead } - public void updateMain(TWzCkHeadEntity tWzCkHead, - List tWzCkItemList) { + @Override + public void updateMain(TWzCkHeadEntity tWzCkHead, + List tWzCkItemList) { //保存主表信息 if(StringUtil.isNotEmpty(tWzCkHead.getId())){ try { @@ -102,7 +105,8 @@ public class TWzCkHeadServiceImpl extends CommonServiceImpl implements TWzCkHead } - public void delMain(TWzCkHeadEntity tWzCkHead) { + @Override + public void delMain(TWzCkHeadEntity tWzCkHead) { //删除主表信息 this.delete(tWzCkHead); //=================================================================================== @@ -118,10 +122,11 @@ public class TWzCkHeadServiceImpl extends CommonServiceImpl implements TWzCkHead /** * 默认按钮-sql增强-新增操作 - * @param id + * @param t * @return */ - public boolean doAddSql(TWzCkHeadEntity t){ + @Override + public boolean doAddSql(TWzCkHeadEntity t){ String tsql = "call p_wz_shenpi("+"'"+t.getId()+")"; try { @@ -134,18 +139,20 @@ public class TWzCkHeadServiceImpl extends CommonServiceImpl implements TWzCkHead } /** * 默认按钮-sql增强-更新操作 - * @param id + * @param t * @return */ - public boolean doUpdateSql(TWzCkHeadEntity t){ + @Override + public boolean doUpdateSql(TWzCkHeadEntity t){ return true; } /** * 默认按钮-sql增强-删除操作 - * @param id + * @param t * @return */ - public boolean doDelSql(TWzCkHeadEntity t){ + @Override + public boolean doDelSql(TWzCkHeadEntity t){ return true; } diff --git a/src/main/java/com/zzjee/wzyw/service/impl/TWzPoHeadServiceImpl.java b/src/main/java/com/zzjee/wzyw/service/impl/TWzPoHeadServiceImpl.java index 55cd929e597347c71a9a8710dd0427db8d149655..a1fc55c73cdef8107318652b221f7b6e6146afb9 100644 --- a/src/main/java/com/zzjee/wzyw/service/impl/TWzPoHeadServiceImpl.java +++ b/src/main/java/com/zzjee/wzyw/service/impl/TWzPoHeadServiceImpl.java @@ -19,14 +19,16 @@ import java.util.UUID; @Transactional public class TWzPoHeadServiceImpl extends CommonServiceImpl implements TWzPoHeadServiceI { - public void delete(T entity) { + @Override + public void delete(T entity) { super.delete(entity); //执行删除操作配置的sql增强 this.doDelSql((TWzPoHeadEntity)entity); } - public void addMain(TWzPoHeadEntity tWzPoHead, - List tWzPoItemList){ + @Override + public void addMain(TWzPoHeadEntity tWzPoHead, + List tWzPoItemList){ //保存主信息 this.save(tWzPoHead); @@ -41,8 +43,9 @@ public class TWzPoHeadServiceImpl extends CommonServiceImpl implements TWzPoHead } - public void updateMain(TWzPoHeadEntity tWzPoHead, - List tWzPoItemList) { + @Override + public void updateMain(TWzPoHeadEntity tWzPoHead, + List tWzPoItemList) { //保存主表信息 if(StringUtil.isNotEmpty(tWzPoHead.getId())){ try { @@ -100,7 +103,8 @@ public class TWzPoHeadServiceImpl extends CommonServiceImpl implements TWzPoHead } - public void delMain(TWzPoHeadEntity tWzPoHead) { + @Override + public void delMain(TWzPoHeadEntity tWzPoHead) { //删除主表信息 this.delete(tWzPoHead); //=================================================================================== @@ -116,26 +120,29 @@ public class TWzPoHeadServiceImpl extends CommonServiceImpl implements TWzPoHead /** * 默认按钮-sql增强-新增操作 - * @param id + * @param t * @return */ - public boolean doAddSql(TWzPoHeadEntity t){ + @Override + public boolean doAddSql(TWzPoHeadEntity t){ return true; } /** * 默认按钮-sql增强-更新操作 - * @param id + * @param t * @return */ - public boolean doUpdateSql(TWzPoHeadEntity t){ + @Override + public boolean doUpdateSql(TWzPoHeadEntity t){ return true; } /** * 默认按钮-sql增强-删除操作 - * @param id + * @param t * @return */ - public boolean doDelSql(TWzPoHeadEntity t){ + @Override + public boolean doDelSql(TWzPoHeadEntity t){ return true; } diff --git a/src/main/java/com/zzjee/wzyw/service/impl/TWzRkHeadServiceImpl.java b/src/main/java/com/zzjee/wzyw/service/impl/TWzRkHeadServiceImpl.java index d395ccb057e23cfd2727bcc70db87788a9360fbe..d0b137d9fb5acd1c3b85aa7a475103677bafebd9 100644 --- a/src/main/java/com/zzjee/wzyw/service/impl/TWzRkHeadServiceImpl.java +++ b/src/main/java/com/zzjee/wzyw/service/impl/TWzRkHeadServiceImpl.java @@ -19,13 +19,15 @@ import java.util.UUID; @Transactional public class TWzRkHeadServiceImpl extends CommonServiceImpl implements TWzRkHeadServiceI { - public void delete(T entity) { + @Override + public void delete(T entity) { super.delete(entity); //执行删除操作配置的sql增强 this.doDelSql((TWzRkHeadEntity)entity); } - public void addMain(TWzRkHeadEntity tWzRkHead, + @Override + public void addMain(TWzRkHeadEntity tWzRkHead, List tWzRkItemList){ //保存主信息 tWzRkHead.setBpmStatus("0"); @@ -43,7 +45,8 @@ public class TWzRkHeadServiceImpl extends CommonServiceImpl implements TWzRkHead } - public void updateMain(TWzRkHeadEntity tWzRkHead, + @Override + public void updateMain(TWzRkHeadEntity tWzRkHead, List tWzRkItemList) { //保存主表信息 if(StringUtil.isNotEmpty(tWzRkHead.getId())){ @@ -102,7 +105,8 @@ public class TWzRkHeadServiceImpl extends CommonServiceImpl implements TWzRkHead } - public void delMain(TWzRkHeadEntity tWzRkHead) { + @Override + public void delMain(TWzRkHeadEntity tWzRkHead) { //删除主表信息 this.delete(tWzRkHead); //=================================================================================== @@ -118,27 +122,30 @@ public class TWzRkHeadServiceImpl extends CommonServiceImpl implements TWzRkHead /** * 默认按钮-sql增强-新增操作 - * @param id + * @param t * @return */ - public boolean doAddSql(TWzRkHeadEntity t){ + @Override + public boolean doAddSql(TWzRkHeadEntity t){ return true; } /** * 默认按钮-sql增强-更新操作 - * @param id + * @param t * @return */ - public boolean doUpdateSql(TWzRkHeadEntity t){ + @Override + public boolean doUpdateSql(TWzRkHeadEntity t){ return true; } /** * 默认按钮-sql增强-删除操作 - * @param id + * @param t * @return */ - public boolean doDelSql(TWzRkHeadEntity t){ + @Override + public boolean doDelSql(TWzRkHeadEntity t){ return true; } diff --git a/src/main/java/com/zzjee/yongyoubase/openapi4j/util/HttpUtil.java b/src/main/java/com/zzjee/yongyoubase/openapi4j/util/HttpUtil.java index 4002a8af3f346b49006a1fda343db76b27d127c8..297f82f1c860d8439109fa9d63d00d725541ab20 100644 --- a/src/main/java/com/zzjee/yongyoubase/openapi4j/util/HttpUtil.java +++ b/src/main/java/com/zzjee/yongyoubase/openapi4j/util/HttpUtil.java @@ -140,8 +140,6 @@ public class HttpUtil { * * @param url * @param params - * @param connTimeout - * @param readTimeout * @return * @throws ConnectTimeoutException * @throws SocketTimeoutException @@ -218,7 +216,6 @@ public class HttpUtil { * 发送一个 GET 请求 * * @param url - * @param charset * @return * @throws Exception */ @@ -323,28 +320,33 @@ public class HttpUtil { private static CloseableHttpClient createSSLInsecureClient() throws GeneralSecurityException { try { SSLContext sslContext = new SSLContextBuilder().loadTrustMaterial(null, new TrustStrategy() { - public boolean isTrusted(X509Certificate[] chain, String authType) throws CertificateException { + @Override + public boolean isTrusted(X509Certificate[] chain, String authType) throws CertificateException { return true; } }).build(); SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslContext, new X509HostnameVerifier() { - public boolean verify(String arg0, SSLSession arg1) { + @Override + public boolean verify(String arg0, SSLSession arg1) { // TODO Auto-generated method stub return true; } - public void verify(String host, SSLSocket ssl) throws IOException { + @Override + public void verify(String host, SSLSocket ssl) throws IOException { // TODO Auto-generated method stub } - public void verify(String host, X509Certificate cert) throws SSLException { + @Override + public void verify(String host, X509Certificate cert) throws SSLException { // TODO Auto-generated method stub } - public void verify(String host, String[] cns, String[] subjectAlts) throws SSLException { + @Override + public void verify(String host, String[] cns, String[] subjectAlts) throws SSLException { // TODO Auto-generated method stub } @@ -361,7 +363,6 @@ public class HttpUtil { * * @param url * http://www.xxx.com/img/333.jpg - * @param destFileName * xxx.jpg/xxx.png/xxx.txt * @throws ClientProtocolException * @throws IOException diff --git a/src/main/java/org/jeecgframework/core/aop/HiberAspect.java b/src/main/java/org/jeecgframework/core/aop/HiberAspect.java index 29948b6ea516b65ca4fa72d6221328c639dc7971..bb1c0e6aa0ce90b64d715bdf1ed0df882fada8f2 100644 --- a/src/main/java/org/jeecgframework/core/aop/HiberAspect.java +++ b/src/main/java/org/jeecgframework/core/aop/HiberAspect.java @@ -24,8 +24,9 @@ public class HiberAspect extends EmptyInterceptor { +@Override public boolean onSave(Object entity, Serializable id, Object[] state, - String[] propertyNames, Type[] types) { + String[] propertyNames, Type[] types) { TSUser currentUser = null; try { currentUser = ResourceUtil.getSessionUserName(); @@ -102,9 +103,10 @@ public boolean onSave(Object entity, Serializable id, Object[] state, } +@Override public boolean onFlushDirty(Object entity, Serializable id, - Object[] currentState, Object[] previousState, - String[] propertyNames, Type[] types) { + Object[] currentState, Object[] previousState, + String[] propertyNames, Type[] types) { TSUser currentUser = null; try { currentUser = ResourceUtil.getSessionUserName(); diff --git a/src/main/java/org/jeecgframework/core/common/dao/impl/CommonDao.java b/src/main/java/org/jeecgframework/core/common/dao/impl/CommonDao.java index a0edaeca43dedad73b04cdfef40a539e04374c73..a793da190ed8987b42d25f0f9f4a4b4e8824f880 100644 --- a/src/main/java/org/jeecgframework/core/common/dao/impl/CommonDao.java +++ b/src/main/java/org/jeecgframework/core/common/dao/impl/CommonDao.java @@ -46,6 +46,7 @@ public class CommonDao extends GenericBaseCommonDao implements ICommonDao, IGene /** * 检查用户是否存在 * */ + @Override public TSUser getUserByUserIdAndUserNameExits(TSUser user) { // String password = PasswordUtil.encrypt(user.getUserName(), user.getPassword(), PasswordUtil.getStaticSalt()); // String query = "from TSUser u where u.userName = :username and u.password=:passowrd"; @@ -100,6 +101,7 @@ public class CommonDao extends GenericBaseCommonDao implements ICommonDao, IGene /** * 检查用户是否存在 * */ + @Override public TSUser findUserByAccountAndPassword(String username,String inpassword) { // String password = PasswordUtil.encrypt(username, inpassword, PasswordUtil.getStaticSalt()); // String query = "from TSUser u where u.userName = :username and u.password=:passowrd"; @@ -150,6 +152,7 @@ public class CommonDao extends GenericBaseCommonDao implements ICommonDao, IGene /** * admin账户初始化 */ + @Override public void pwdInit(TSUser user,String newPwd){ String query ="from TSUser u where u.userName = :username "; Query queryObject = getSession().createQuery(query); @@ -165,6 +168,7 @@ public class CommonDao extends GenericBaseCommonDao implements ICommonDao, IGene } + @Override public String getUserRole(TSUser user) { String userRole = ""; List sRoleUser = findByProperty(TSRoleUser.class, "TSUser.id", user.getId()); @@ -180,6 +184,7 @@ public class CommonDao extends GenericBaseCommonDao implements ICommonDao, IGene * * @throws Exception */ + @Override @SuppressWarnings("unchecked") public Object uploadFile(UploadFile uploadFile) { Object object = uploadFile.getObject(); @@ -343,6 +348,7 @@ public class CommonDao extends GenericBaseCommonDao implements ICommonDao, IGene * @throws Exception * @throws Exception */ + @Override @SuppressWarnings("unchecked") public HttpServletResponse viewOrDownloadFile(UploadFile uploadFile) { uploadFile.getResponse().setContentType("UTF-8"); @@ -363,8 +369,9 @@ public class CommonDao extends GenericBaseCommonDao implements ICommonDao, IGene e.printStackTrace(); } } else { - if (uploadFile.getContent() != null) - bis = new ByteArrayInputStream(uploadFile.getContent()); + if (uploadFile.getContent() != null) { + bis = new ByteArrayInputStream(uploadFile.getContent()); + } fileLength = uploadFile.getContent().length; } try { @@ -408,6 +415,7 @@ public class CommonDao extends GenericBaseCommonDao implements ICommonDao, IGene return response; } + @Override public Map getDataSourceMap(Template template) { return DataSourceMap.getDataSourceMap(); } @@ -415,6 +423,7 @@ public class CommonDao extends GenericBaseCommonDao implements ICommonDao, IGene /** * 生成XML importFile 导出xml工具类 */ + @Override public HttpServletResponse createXml(ImportFile importFile) { HttpServletResponse response = importFile.getResponse(); HttpServletRequest request = importFile.getRequest(); @@ -465,6 +474,7 @@ public class CommonDao extends GenericBaseCommonDao implements ICommonDao, IGene /** * 解析XML文件将数据导入数据库中 */ + @Override @SuppressWarnings("unchecked") public void parserXml(String fileName) { try { @@ -533,6 +543,7 @@ public class CommonDao extends GenericBaseCommonDao implements ICommonDao, IGene * 模型 * @return */ + @Override public List comTree(List all, ComboTree comboTree) { List trees = new ArrayList(); for (TSDepart depart : all) { @@ -565,6 +576,7 @@ public class CommonDao extends GenericBaseCommonDao implements ICommonDao, IGene return tree; } + @Override public List ComboTree(List all, ComboTreeModel comboTreeModel, List in, boolean recursive) { List trees = new ArrayList(); for (Object obj : all) { @@ -634,6 +646,7 @@ public class CommonDao extends GenericBaseCommonDao implements ICommonDao, IGene /** * 构建树形数据表 */ + @Override public List treegrid(List all, TreeGridModel treeGridModel) { List treegrid = new ArrayList(); for (Object obj : all) { diff --git a/src/main/java/org/jeecgframework/core/common/dao/impl/GenericBaseCommonDao.java b/src/main/java/org/jeecgframework/core/common/dao/impl/GenericBaseCommonDao.java index e2f83d68af0a9afb5fdf7f7fb7468a76a53fba98..2a35a15fc7248f802991d63886134ebeb96b86e5 100644 --- a/src/main/java/org/jeecgframework/core/common/dao/impl/GenericBaseCommonDao.java +++ b/src/main/java/org/jeecgframework/core/common/dao/impl/GenericBaseCommonDao.java @@ -83,7 +83,8 @@ public abstract class GenericBaseCommonDao @Qualifier("sessionFactory") private SessionFactory sessionFactory; - public Session getSession() { + @Override + public Session getSession() { // 事务必须是开启的(Required)，否则获取不到 return sessionFactory.getCurrentSession(); } @@ -109,7 +110,8 @@ public abstract class GenericBaseCommonDao * * @return */ - public List getAllDbTableName() { + @Override + public List getAllDbTableName() { List resultList = new ArrayList(); SessionFactory factory = getSession().getSessionFactory(); Map metaMap = factory.getAllClassMetadata(); @@ -137,7 +139,8 @@ public abstract class GenericBaseCommonDao * * @return */ - public Integer getAllDbTableSize() { + @Override + public Integer getAllDbTableSize() { SessionFactory factory = getSession().getSessionFactory(); Map metaMap = factory.getAllClassMetadata(); return metaMap.size(); @@ -150,8 +153,9 @@ public abstract class GenericBaseCommonDao * @param value * @return */ - public T findUniqueByProperty(Class entityClass, - String propertyName, Object value) { + @Override + public T findUniqueByProperty(Class entityClass, + String propertyName, Object value) { Assert.hasText(propertyName); return (T) createCriteria(entityClass, Restrictions.eq(propertyName, value)).uniqueResult(); @@ -160,8 +164,9 @@ public abstract class GenericBaseCommonDao /** * 按属性查找对象列表. */ - public List findByProperty(Class entityClass, - String propertyName, Object value) { + @Override + public List findByProperty(Class entityClass, + String propertyName, Object value) { Assert.hasText(propertyName); return (List) createCriteria(entityClass, Restrictions.eq(propertyName, value)).list(); @@ -170,7 +175,8 @@ public abstract class GenericBaseCommonDao /** * 根据传入的实体持久化对象 */ - public Serializable save(T entity) { + @Override + public Serializable save(T entity) { try { Serializable id = getSession().save(entity); //getSession().flush(); @@ -192,7 +198,8 @@ public abstract class GenericBaseCommonDao * @param entitys * 要持久化的临时实体对象集合 */ - public void batchSave(List entitys) { + @Override + public void batchSave(List entitys) { for (int i = 0; i < entitys.size(); i++) { getSession().save(entitys.get(i)); if (i % 1000 == 0) { @@ -214,7 +221,8 @@ public abstract class GenericBaseCommonDao * @param entity */ - public void saveOrUpdate(T entity) { + @Override + public void saveOrUpdate(T entity) { try { getSession().saveOrUpdate(entity); //getSession().flush(); @@ -230,7 +238,8 @@ public abstract class GenericBaseCommonDao /** * 根据传入的实体删除对象 */ - public void delete(T entity) { + @Override + public void delete(T entity) { try { getSession().delete(entity); //getSession().flush(); @@ -247,9 +256,10 @@ public abstract class GenericBaseCommonDao * 根据主键删除指定的实体 * * @param - * @param pojo + * @param id */ - public void deleteEntityById(Class entityName, Serializable id) { + @Override + public void deleteEntityById(Class entityName, Serializable id) { delete(get(entityName, id)); //getSession().flush(); } @@ -261,7 +271,8 @@ public abstract class GenericBaseCommonDao * * @param entitys */ - public void deleteAllEntitie(Collection entitys) { + @Override + public void deleteAllEntitie(Collection entitys) { for (Object entity : entitys) { getSession().delete(entity); //getSession().flush(); @@ -271,7 +282,8 @@ public abstract class GenericBaseCommonDao /** * 根据Id获取对象。 */ - public T get(Class entityClass, final Serializable id) { + @Override + public T get(Class entityClass, final Serializable id) { return (T) getSession().get(entityClass, id); @@ -283,10 +295,10 @@ public abstract class GenericBaseCommonDao * @param * @param entityName * @param id - * @param lock * @return */ - public T getEntity(Class entityName, Serializable id) { + @Override + public T getEntity(Class entityName, Serializable id) { T t = (T) getSession().get(entityName, id); if (t != null) { @@ -301,7 +313,8 @@ public abstract class GenericBaseCommonDao * @param * @param pojo */ - public void updateEntitie(T pojo) { + @Override + public void updateEntitie(T pojo) { getSession().update(pojo); //getSession().flush(); } @@ -310,7 +323,7 @@ public abstract class GenericBaseCommonDao * 更新指定的实体 * * @param - * @param pojo + * @param id */ public void updateEntitie(String className, Object id) { getSession().update(className, id); @@ -320,18 +333,19 @@ public abstract class GenericBaseCommonDao /** * 根据主键更新实体 */ - public void updateEntityById(Class entityName, Serializable id) { + @Override + public void updateEntityById(Class entityName, Serializable id) { updateEntitie(get(entityName, id)); } /** * 通过hql 查询语句查找对象 * - * @param * @param query * @return */ - public List findByQueryString(final String query) { + @Override + public List findByQueryString(final String query) { Query queryObject = getSession().createQuery(query); List list = queryObject.list(); @@ -346,10 +360,11 @@ public abstract class GenericBaseCommonDao * 通过hql查询唯一对象 * * @param - * @param query + * @param hql * @return */ - public T singleResult(String hql) { + @Override + public T singleResult(String hql) { T t = null; Query queryObject = getSession().createQuery(hql); List list = queryObject.list(); @@ -365,11 +380,11 @@ public abstract class GenericBaseCommonDao /** * 通过hql 查询语句查找HashMap对象 * - * @param - * @param query + * @param hql * @return */ - public Map getHashMapbyQuery(String hql) { + @Override + public Map getHashMapbyQuery(String hql) { Query query = getSession().createQuery(hql); List list = query.list(); @@ -385,11 +400,11 @@ public abstract class GenericBaseCommonDao /** * 通过sql更新记录 * - * @param * @param query * @return */ - public int updateBySqlString(final String query) { + @Override + public int updateBySqlString(final String query) { Query querys = getSession().createSQLQuery(query); return querys.executeUpdate(); @@ -398,11 +413,11 @@ public abstract class GenericBaseCommonDao /** * 通过sql查询语句查找对象 * - * @param - * @param query + * @param sql * @return */ - public List findListbySql(final String sql) { + @Override + public List findListbySql(final String sql) { Query querys = getSession().createSQLQuery(sql); return querys.list(); } @@ -412,7 +427,6 @@ public abstract class GenericBaseCommonDao * * @param * @param entityClass - * @param orderBy * @param isAsc * @param criterions * @return @@ -445,7 +459,8 @@ public abstract class GenericBaseCommonDao return criteria; } - public List loadAll(final Class entityClass) { + @Override + public List loadAll(final Class entityClass) { Criteria criteria = createCriteria(entityClass); return criteria.list(); } @@ -455,7 +470,6 @@ public abstract class GenericBaseCommonDao * * @param * @param entityClass - * @param criterions * @return */ private Criteria createCriteria(Class entityClass) { @@ -470,12 +484,12 @@ public abstract class GenericBaseCommonDao * @param entityClass * @param propertyName * @param value - * @param orderBy * @param isAsc * @return */ - public List findByPropertyisOrder(Class entityClass, - String propertyName, Object value, boolean isAsc) { + @Override + public List findByPropertyisOrder(Class entityClass, + String propertyName, Object value, boolean isAsc) { Assert.hasText(propertyName); return createCriteria(entityClass, isAsc, Restrictions.eq(propertyName, value)).list(); @@ -517,8 +531,7 @@ public abstract class GenericBaseCommonDao /** * 批量插入实体 * - * @param clas - * @param values + * @param entityList * @return */ public int batchInsertsEntitie(List entityList) { @@ -541,9 +554,8 @@ public abstract class GenericBaseCommonDao /** * 使用占位符的方式填充值 请注意：like对应的值格式："%"+username+"%" Hibernate Query * - * @param hibernateTemplate * @param hql - * @param valus + * @param values * 占位符号?对应的值，顺序必须一一对应 可以为空对象数组，但是不能为null * @return 2008-07-19 add by liuyang */ @@ -566,8 +578,9 @@ public abstract class GenericBaseCommonDao * @return */ - public List findByExample(final String entityName, - final Object exampleEntity) { + @Override + public List findByExample(final String entityName, + final Object exampleEntity) { Assert.notNull(exampleEntity, "Example entity must not be null"); Criteria executableCriteria = (entityName != null ? getSession() .createCriteria(entityName) : getSession().createCriteria( @@ -610,7 +623,8 @@ public abstract class GenericBaseCommonDao * @param isOffset * @return */ - public PageList getPageList(final CriteriaQuery cq, final boolean isOffset) { + @Override + public PageList getPageList(final CriteriaQuery cq, final boolean isOffset) { Criteria criteria = cq.getDetachedCriteria().getExecutableCriteria( getSession()); @@ -653,8 +667,9 @@ public abstract class GenericBaseCommonDao /** * 返回JQUERY datatables DataTableReturn模型对象 */ - public DataTableReturn getDataTableReturn(final CriteriaQuery cq, - final boolean isOffset) { + @Override + public DataTableReturn getDataTableReturn(final CriteriaQuery cq, + final boolean isOffset) { Criteria criteria = cq.getDetachedCriteria().getExecutableCriteria( getSession()); @@ -689,8 +704,9 @@ public abstract class GenericBaseCommonDao /** * 返回easyui datagrid DataGridReturn模型对象 */ - public DataGridReturn getDataGridReturn(final CriteriaQuery cq, - final boolean isOffset) { + @Override + public DataGridReturn getDataGridReturn(final CriteriaQuery cq, + final boolean isOffset) { Criteria criteria = cq.getDetachedCriteria().getExecutableCriteria(getSession()); CriteriaImpl impl = (CriteriaImpl) criteria; // 先把Projection和OrderBy条件取出来,清空两者来执行Count操作 @@ -750,11 +766,12 @@ public abstract class GenericBaseCommonDao /** * 获取分页记录SqlQuery * - * @param cq - * @param isOffset + * @param hqlQuery + * @param isToEntity * @return */ - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public PageList getPageListBySql(final HqlQuery hqlQuery, final boolean isToEntity) { @@ -782,11 +799,12 @@ public abstract class GenericBaseCommonDao /** * 获取分页记录HqlQuery * - * @param cq - * @param isOffset + * @param hqlQuery + * @param needParameter * @return */ - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public PageList getPageList(final HqlQuery hqlQuery, final boolean needParameter) { @@ -810,10 +828,11 @@ public abstract class GenericBaseCommonDao * 根据CriteriaQuery获取List * * @param cq - * @param isOffset + * @param ispage * @return */ - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public List getListByCriteriaQuery(final CriteriaQuery cq, Boolean ispage) { Criteria criteria = cq.getDetachedCriteria().getExecutableCriteria( getSession()); @@ -840,7 +859,8 @@ public abstract class GenericBaseCommonDao /** * 使用指定的检索标准检索数据并分页返回数据 */ - public List> findForJdbc(String sql, int page, int rows) { + @Override + public List> findForJdbc(String sql, int page, int rows) { // 封装分页SQL sql = JdbcDao.jeecgCreatePageSql(sql, page, rows); return this.jdbcTemplate.queryForList(sql); @@ -852,8 +872,9 @@ public abstract class GenericBaseCommonDao * @throws IllegalAccessException * @throws InstantiationException */ - public List findObjForJdbc(String sql, int page, int rows, - Class clazz) { + @Override + public List findObjForJdbc(String sql, int page, int rows, + Class clazz) { List rsList = new ArrayList(); // 封装分页SQL sql = JdbcDao.jeecgCreatePageSql(sql, page, rows); @@ -875,14 +896,15 @@ public abstract class GenericBaseCommonDao /** * 使用指定的检索标准检索数据并分页返回数据-采用预处理方式 * - * @param criteria - * @param firstResult - * @param maxResults + * @param sql + * @param page + * @param objs * @return * @throws DataAccessException */ - public List> findForJdbcParam(String sql, int page, - int rows, Object... objs) { + @Override + public List> findForJdbcParam(String sql, int page, + int rows, Object... objs) { // 封装分页SQL sql = JdbcDao.jeecgCreatePageSql(sql, page, rows); return this.jdbcTemplate.queryForList(sql, objs); @@ -891,7 +913,8 @@ public abstract class GenericBaseCommonDao /** * 使用指定的检索标准检索数据并分页返回数据For JDBC */ - public Long getCountForJdbc(String sql) { + @Override + public Long getCountForJdbc(String sql) { return this.jdbcTemplate.queryForObject(sql,Long.class); } @@ -899,29 +922,35 @@ public abstract class GenericBaseCommonDao * 使用指定的检索标准检索数据并分页返回数据For JDBC-采用预处理方式 * */ - public Long getCountForJdbcParam(String sql, Object[] objs) { + @Override + public Long getCountForJdbcParam(String sql, Object[] objs) { return this.jdbcTemplate.queryForObject(sql, objs,Long.class); } - public List> findForJdbc(String sql, Object... objs) { + @Override + public List> findForJdbc(String sql, Object... objs) { return this.jdbcTemplate.queryForList(sql, objs); } - public Integer executeSql(String sql, List param) { + @Override + public Integer executeSql(String sql, List param) { return this.jdbcTemplate.update(sql, param); } - public Integer executeSql(String sql, Object... param) { + @Override + public Integer executeSql(String sql, Object... param) { return this.jdbcTemplate.update(sql, param); } - public Integer executeSql(String sql, Map param) { + @Override + public Integer executeSql(String sql, Map param) { return this.namedParameterJdbcTemplate.update(sql, param); } - public Object executeSqlReturnKey(final String sql, Map param) { + @Override + public Object executeSqlReturnKey(final String sql, Map param) { Object keyValue = null; KeyHolder keyHolder = null; SqlParameterSource sqlp = new MapSqlParameterSource(param); @@ -948,7 +977,8 @@ public abstract class GenericBaseCommonDao } - public Map findOneForJdbc(String sql, Object... objs) { + @Override + public Map findOneForJdbc(String sql, Object... objs) { try { return this.jdbcTemplate.queryForMap(sql, objs); } catch (EmptyResultDataAccessException e) { @@ -960,10 +990,11 @@ public abstract class GenericBaseCommonDao * 通过hql 查询语句查找对象 * * @param - * @param query + * @param hql * @return */ - public List findHql(String hql, Object... param) { + @Override + public List findHql(String hql, Object... param) { Query q = getSession().createQuery(hql); if (param != null && param.length > 0) { for (int i = 0; i < param.length; i++) { @@ -979,13 +1010,15 @@ public abstract class GenericBaseCommonDao * @param hql * @return */ - public Integer executeHql(String hql) { + @Override + public Integer executeHql(String hql) { Query q = getSession().createQuery(hql); return q.executeUpdate(); } - public List pageList(DetachedCriteria dc, int firstResult, - int maxResult) { + @Override + public List pageList(DetachedCriteria dc, int firstResult, + int maxResult) { Criteria criteria = dc.getExecutableCriteria(getSession()); criteria.setResultTransformer(CriteriaSpecification.ROOT_ENTITY); criteria.setFirstResult(firstResult); @@ -996,14 +1029,16 @@ public abstract class GenericBaseCommonDao /** * 离线查询 */ - public List findByDetached(DetachedCriteria dc) { + @Override + public List findByDetached(DetachedCriteria dc) { return dc.getExecutableCriteria(getSession()).list(); } /** * 调用存储过程 */ - @SuppressWarnings({ "unchecked",}) + @Override + @SuppressWarnings({ "unchecked",}) public List executeProcedure(String executeSql,Object... params) { SQLQuery sqlQuery = getSession().createSQLQuery(executeSql); diff --git a/src/main/java/org/jeecgframework/core/common/dao/jdbc/JdbcDao.java b/src/main/java/org/jeecgframework/core/common/dao/jdbc/JdbcDao.java index 1dbfd43ee1b2eec5ba80fe002a445c43d8c7df0e..99e0e7a74e13300efc32114db8a5a8fa672e8929 100644 --- a/src/main/java/org/jeecgframework/core/common/dao/jdbc/JdbcDao.java +++ b/src/main/java/org/jeecgframework/core/common/dao/jdbc/JdbcDao.java @@ -46,54 +46,59 @@ public class JdbcDao extends SimpleJdbcTemplate{ /** * 根据sql语句，返回对象集合 - * @param sql语句(参数用冒号加参数名，例如select * from tb where id=:id) - * @param clazz类型 - * @param parameters参数集合(key为参数名，value为参数值) + * @param sql 语句 (参数用冒号加参数名，例如select * from tb where id=:id) + * @param clazz 类型 + * @param parameters 参数集合(key为参数名，value为参数值) * @return bean对象集合 */ - public List find(String sql,Class clazz,Map parameters){ + @Override + public List find(String sql, Class clazz, Map parameters){ return super.find(sql,clazz,parameters); } /** * 根据sql语句，返回对象 - * @param sql语句(参数用冒号加参数名，例如select * from tb where id=:id) - * @param clazz类型 - * @param parameters参数集合(key为参数名，value为参数值) + * @param sql 语句 (参数用冒号加参数名，例如select * from tb where id=:id) + * @param clazz 类型 + * @param parameters 参数集合(key为参数名，value为参数值) * @return bean对象 */ - public Object findForObject(String sql,Class clazz,Map parameters){ + @Override + public Object findForObject(String sql, Class clazz, Map parameters){ return super.findForObject(sql, clazz, parameters); } /** * 根据sql语句，返回数值型返回结果 - * @param sql语句(参数用冒号加参数名，例如select count(*) from tb where id=:id) - * @param parameters参数集合(key为参数名，value为参数值) + * @param sql 语句(参数用冒号加参数名，例如select count(*) from tb where id=:id) + * @param parameters 参数集合(key为参数名，value为参数值) * @return bean对象 */ - public long findForLong(String sql,Map parameters){ + @Override + public long findForLong(String sql, Map parameters){ return super.findForLong(sql, parameters); } /** * 根据sql语句，返回Map对象,对于某些项目来说，没有准备Bean对象，则可以使用Map代替Key为字段名,value为值 - * @param sql语句(参数用冒号加参数名，例如select count(*) from tb where id=:id) - * @param parameters参数集合(key为参数名，value为参数值) + * @param sql 语句(参数用冒号加参数名，例如select count(*) from tb where id=:id) + * @param parameters 参数集合(key为参数名，value为参数值) * @return bean对象 */ - public Map findForMap(String sql,Map parameters){ + @Override + public Map findForMap(String sql, Map parameters){ return super.findForMap(sql, parameters); } /** * 根据sql语句，返回Map对象集合 - * @see findForMap - * @param sql语句(参数用冒号加参数名，例如select count(*) from tb where id=:id) - * @param parameters参数集合(key为参数名，value为参数值) + * @see + * @param sql 语句(参数用冒号加参数名，例如select count(*) from tb where id=:id) + * @param parameters 参数集合(key为参数名，value为参数值) * @return bean对象 */ - public List> findForListMap(String sql,Map parameters){ + @Override + public List> findForListMap(String sql, Map parameters){ return super.findForListMap(sql, parameters); } @@ -104,7 +109,8 @@ public class JdbcDao extends SimpleJdbcTemplate{ * @param sql * @param bean */ - public int executeForObject(String sql,Object bean){ + @Override + public int executeForObject(String sql, Object bean){ return super.executeForObject(sql, bean); } @@ -115,7 +121,8 @@ public class JdbcDao extends SimpleJdbcTemplate{ * @param sql * @param parameters */ - public int executeForMap(String sql,Map parameters){ + @Override + public int executeForMap(String sql, Map parameters){ return super.executeForMap(sql, parameters); } /* @@ -123,7 +130,8 @@ public class JdbcDao extends SimpleJdbcTemplate{ * 例如：update t_actor set first_name = :firstName, last_name = :lastName where id = :id * 参数用冒号 */ - public int[] batchUpdate(final String sql,List batch ){ + @Override + public int[] batchUpdate(final String sql, List batch ){ return super.batchUpdate(sql,batch); } @@ -169,9 +177,9 @@ public class JdbcDao extends SimpleJdbcTemplate{ /** * 使用指定的检索标准检索数据并分页返回数据-采用预处理方式 * - * @param criteria - * @param firstResult - * @param maxResults + * @param sql + * @param page + * @param rows * @return * @throws DataAccessException */ diff --git a/src/main/java/org/jeecgframework/core/common/exception/GlobalExceptionResolver.java b/src/main/java/org/jeecgframework/core/common/exception/GlobalExceptionResolver.java index 0eb04e81a3dfbe0b1765db640f525563f2fda65c..ad825a16aa65ca9c8b6e10ea028b411e17ddda92 100644 --- a/src/main/java/org/jeecgframework/core/common/exception/GlobalExceptionResolver.java +++ b/src/main/java/org/jeecgframework/core/common/exception/GlobalExceptionResolver.java @@ -40,8 +40,9 @@ public class GlobalExceptionResolver implements HandlerExceptionResolver { /** * 对异常信息进行统一处理，区分异步和同步请求，分别处理 */ - public ModelAndView resolveException(HttpServletRequest request, - HttpServletResponse response, Object handler, Exception ex) { + @Override + public ModelAndView resolveException(HttpServletRequest request, + HttpServletResponse response, Object handler, Exception ex) { boolean isajax = isAjax(request,response); Throwable deepestException = deepestException(ex); return processException(request, response, handler, deepestException, isajax); @@ -75,7 +76,6 @@ public class GlobalExceptionResolver implements HandlerExceptionResolver { * @param request * @param response * @param handler - * @param deepestException * @param isajax * @return */ @@ -142,7 +142,7 @@ public class GlobalExceptionResolver implements HandlerExceptionResolver { * @param request * @param response * @param handler - * @param deepestException + * @param ex * @return */ private ModelAndView processNotAjax(HttpServletRequest request, diff --git a/src/main/java/org/jeecgframework/core/common/exception/MyExceptionHandler.java b/src/main/java/org/jeecgframework/core/common/exception/MyExceptionHandler.java index 8c66055a24c66f17280b7c8161262026e096ab88..8106092b24bdca49da1f906048290d30fe2196e3 100644 --- a/src/main/java/org/jeecgframework/core/common/exception/MyExceptionHandler.java +++ b/src/main/java/org/jeecgframework/core/common/exception/MyExceptionHandler.java @@ -24,8 +24,9 @@ public class MyExceptionHandler implements HandlerExceptionResolver { private static final Logger logger = Logger .getLogger(MyExceptionHandler.class); - public ModelAndView resolveException(HttpServletRequest request, - HttpServletResponse response, Object handler, Exception ex) { + @Override + public ModelAndView resolveException(HttpServletRequest request, + HttpServletResponse response, Object handler, Exception ex) { String exceptionMessage = ExceptionUtil.getExceptionMessage(ex); logger.error(exceptionMessage); Map model = new HashMap(); diff --git a/src/main/java/org/jeecgframework/core/common/hibernate/dialect/DB2Dialect.java b/src/main/java/org/jeecgframework/core/common/hibernate/dialect/DB2Dialect.java index 4a69be4c697f6ae65a24fc8638a779745cc8d9f1..70537ff8d567985716f2a5675536d3cb43e8204a 100644 --- a/src/main/java/org/jeecgframework/core/common/hibernate/dialect/DB2Dialect.java +++ b/src/main/java/org/jeecgframework/core/common/hibernate/dialect/DB2Dialect.java @@ -3,11 +3,13 @@ package org.jeecgframework.core.common.hibernate.dialect; public class DB2Dialect extends Dialect { + @Override public boolean supportsLimit() { return true; } + @Override public boolean supportsLimitOffset() { return true; @@ -30,6 +32,7 @@ public class DB2Dialect extends Dialect return sql.toLowerCase().indexOf("select distinct") >= 0; } + @Override public String getLimitString(String sql, int offset, String offsetPlaceholder, int limit, String limitPlaceholder) { int startOfSelect = sql.toLowerCase().indexOf("select"); @@ -57,6 +60,7 @@ public class DB2Dialect extends Dialect return pagingSelect.toString(); } + @Override public String getCountSql(String sql) { return null; diff --git a/src/main/java/org/jeecgframework/core/common/hibernate/dialect/DerbyDialect.java b/src/main/java/org/jeecgframework/core/common/hibernate/dialect/DerbyDialect.java index 7b2243c12188f2b60cda8281f7191f99037b5577..495d2ad630e7859ae68dc1cb44231e91b9c5f889 100644 --- a/src/main/java/org/jeecgframework/core/common/hibernate/dialect/DerbyDialect.java +++ b/src/main/java/org/jeecgframework/core/common/hibernate/dialect/DerbyDialect.java @@ -3,16 +3,19 @@ package org.jeecgframework.core.common.hibernate.dialect; public class DerbyDialect extends Dialect { + @Override public boolean supportsLimit() { return false; } + @Override public boolean supportsLimitOffset() { return false; } + @Override public String getLimitString(String sql, int offset, String offsetPlaceholder, int limit, String limitPlaceholder) { throw new UnsupportedOperationException("paged queries not supported"); diff --git a/src/main/java/org/jeecgframework/core/common/hibernate/dialect/DialectFactoryBean.java b/src/main/java/org/jeecgframework/core/common/hibernate/dialect/DialectFactoryBean.java index 38f8c52ef4d4bce3d44e08e5fee494c2d511a864..aab0c11b41990561f1a0963eab0a80ace7cbffbc 100644 --- a/src/main/java/org/jeecgframework/core/common/hibernate/dialect/DialectFactoryBean.java +++ b/src/main/java/org/jeecgframework/core/common/hibernate/dialect/DialectFactoryBean.java @@ -15,7 +15,8 @@ public class DialectFactoryBean implements FactoryBean { this.dbType = dbType; } - public Dialect getObject() throws Exception { + @Override + public Dialect getObject() throws Exception { if (this.dbType.equals("oracle")) { this.dialect = new OracleDialect(); } else if (this.dbType.equals("sqlserver")) { @@ -32,11 +33,13 @@ public class DialectFactoryBean implements FactoryBean { return this.dialect; } - public Class getObjectType() { + @Override + public Class getObjectType() { return Dialect.class; } - public boolean isSingleton() { + @Override + public boolean isSingleton() { return true; } } \ No newline at end of file diff --git a/src/main/java/org/jeecgframework/core/common/hibernate/dialect/H2Dialect.java b/src/main/java/org/jeecgframework/core/common/hibernate/dialect/H2Dialect.java index 2afaa0d44d366a00d059c2125e6c3319055e0272..5872e1a94e425db383efbad039266d420330d9e5 100644 --- a/src/main/java/org/jeecgframework/core/common/hibernate/dialect/H2Dialect.java +++ b/src/main/java/org/jeecgframework/core/common/hibernate/dialect/H2Dialect.java @@ -3,16 +3,19 @@ package org.jeecgframework.core.common.hibernate.dialect; public class H2Dialect extends Dialect { + @Override public boolean supportsLimit() { return true; } + @Override public String getLimitString(String sql, int offset, String offsetPlaceholder, int limit, String limitPlaceholder) { return new StringBuffer(sql.length() + 40).append(sql).append(" limit " + limitPlaceholder).toString(); } + @Override public boolean supportsLimitOffset() { return true; diff --git a/src/main/java/org/jeecgframework/core/common/hibernate/dialect/HSQLDialect.java b/src/main/java/org/jeecgframework/core/common/hibernate/dialect/HSQLDialect.java index 1a81f2ef1407f7294efde9c017787525b2bfc5e3..e27cd75bbd8e6ef953f7ccdea38ad0a11a019a20 100644 --- a/src/main/java/org/jeecgframework/core/common/hibernate/dialect/HSQLDialect.java +++ b/src/main/java/org/jeecgframework/core/common/hibernate/dialect/HSQLDialect.java @@ -3,16 +3,19 @@ package org.jeecgframework.core.common.hibernate.dialect; public class HSQLDialect extends Dialect { + @Override public boolean supportsLimit() { return true; } + @Override public boolean supportsLimitOffset() { return true; } + @Override public String getLimitString(String sql, int offset, String offsetPlaceholder, int limit, String limitPlaceholder) { boolean hasOffset = offset > 0; diff --git a/src/main/java/org/jeecgframework/core/common/hibernate/dialect/MyPostgreSQLDialect.java b/src/main/java/org/jeecgframework/core/common/hibernate/dialect/MyPostgreSQLDialect.java index e727ae858c33c021ca808f9b2fb26572c81b3b38..a213143318fe4ee504fe059ee78aaa29f8d0c0aa 100644 --- a/src/main/java/org/jeecgframework/core/common/hibernate/dialect/MyPostgreSQLDialect.java +++ b/src/main/java/org/jeecgframework/core/common/hibernate/dialect/MyPostgreSQLDialect.java @@ -5,7 +5,8 @@ import org.hibernate.dialect.PostgreSQLDialect; public class MyPostgreSQLDialect extends PostgreSQLDialect { - public boolean useInputStreamToInsertBlob() { + @Override + public boolean useInputStreamToInsertBlob() { // TODO Auto-generated method stub return true; } diff --git a/src/main/java/org/jeecgframework/core/common/hibernate/dialect/MySQLDialect.java b/src/main/java/org/jeecgframework/core/common/hibernate/dialect/MySQLDialect.java index 3003cdfd0db787abe2405df7b68aed0720ebd0bc..9f506b125ff7ba389998ea561f0229f1e2f9bca3 100644 --- a/src/main/java/org/jeecgframework/core/common/hibernate/dialect/MySQLDialect.java +++ b/src/main/java/org/jeecgframework/core/common/hibernate/dialect/MySQLDialect.java @@ -3,16 +3,19 @@ package org.jeecgframework.core.common.hibernate.dialect; public class MySQLDialect extends Dialect { + @Override public boolean supportsLimitOffset() { return true; } + @Override public boolean supportsLimit() { return true; } + @Override public String getLimitString(String sql, int offset, String offsetPlaceholder, int limit, String limitPlaceholder) { if (offset > 0) diff --git a/src/main/java/org/jeecgframework/core/common/hibernate/dialect/OracleDialect.java b/src/main/java/org/jeecgframework/core/common/hibernate/dialect/OracleDialect.java index 7265a7f32e9e2ca71f79d6b2010d6c28911e5705..c67e88ffbd3ad52f6fd4045c14237d0683b990d9 100644 --- a/src/main/java/org/jeecgframework/core/common/hibernate/dialect/OracleDialect.java +++ b/src/main/java/org/jeecgframework/core/common/hibernate/dialect/OracleDialect.java @@ -3,16 +3,19 @@ package org.jeecgframework.core.common.hibernate.dialect; public class OracleDialect extends Dialect { + @Override public boolean supportsLimit() { return true; } + @Override public boolean supportsLimitOffset() { return true; } + @Override public String getLimitString(String sql, int offset, String offsetPlaceholder, int limit, String limitPlaceholder) { sql = sql.trim(); diff --git a/src/main/java/org/jeecgframework/core/common/hibernate/dialect/PostgreSQLDialect.java b/src/main/java/org/jeecgframework/core/common/hibernate/dialect/PostgreSQLDialect.java index d3a4bd109591d9c35d97f8b78857e66f85e02dc2..967a6e38cfb50284493539a1ce969f9d04111ab9 100644 --- a/src/main/java/org/jeecgframework/core/common/hibernate/dialect/PostgreSQLDialect.java +++ b/src/main/java/org/jeecgframework/core/common/hibernate/dialect/PostgreSQLDialect.java @@ -3,16 +3,19 @@ package org.jeecgframework.core.common.hibernate.dialect; public class PostgreSQLDialect extends Dialect { + @Override public boolean supportsLimit() { return true; } + @Override public boolean supportsLimitOffset() { return true; } + @Override public String getLimitString(String sql, int offset, String offsetPlaceholder, int limit, String limitPlaceholder) { return new StringBuffer(sql.length() + 20).append(sql).append(" limit " + limitPlaceholder).toString(); diff --git a/src/main/java/org/jeecgframework/core/common/hibernate/dialect/SQLServer2005Dialect.java b/src/main/java/org/jeecgframework/core/common/hibernate/dialect/SQLServer2005Dialect.java index ec36f51b2fc56062d550436c0564e6411a83baa4..08305f3b66dad7c32e1c1e2157bf19b7e4309c79 100644 --- a/src/main/java/org/jeecgframework/core/common/hibernate/dialect/SQLServer2005Dialect.java +++ b/src/main/java/org/jeecgframework/core/common/hibernate/dialect/SQLServer2005Dialect.java @@ -3,16 +3,19 @@ package org.jeecgframework.core.common.hibernate.dialect; public class SQLServer2005Dialect extends Dialect { + @Override public boolean supportsLimit() { return true; } + @Override public boolean supportsLimitOffset() { return true; } + @Override public String getLimitString(String querySqlString, int offset, String offsetPlaceholder, int limit, String limitPlaceholder) { int start = offset + 1; diff --git a/src/main/java/org/jeecgframework/core/common/hibernate/dialect/SQLServerDialect.java b/src/main/java/org/jeecgframework/core/common/hibernate/dialect/SQLServerDialect.java index 4be177b3fd5985e71b789c1ffe656503707e73f6..a144121dea4f2d41951b9a81a6004ccc38440d9e 100644 --- a/src/main/java/org/jeecgframework/core/common/hibernate/dialect/SQLServerDialect.java +++ b/src/main/java/org/jeecgframework/core/common/hibernate/dialect/SQLServerDialect.java @@ -3,11 +3,13 @@ package org.jeecgframework.core.common.hibernate.dialect; public class SQLServerDialect extends Dialect { + @Override public boolean supportsLimitOffset() { return false; } + @Override public boolean supportsLimit() { return true; @@ -20,11 +22,13 @@ public class SQLServerDialect extends Dialect return selectIndex + (selectDistinctIndex == selectIndex ? 15 : 6); } + @Override public String getLimitString(String sql, int offset, int limit) { return getLimitString(sql, offset, null, limit, null); } + @Override public String getLimitString(String querySelect, int offset, String offsetPlaceholder, int limit, String limitPlaceholder) { if (offset > 0) diff --git a/src/main/java/org/jeecgframework/core/common/hibernate/dialect/SybaseDialect.java b/src/main/java/org/jeecgframework/core/common/hibernate/dialect/SybaseDialect.java index 66550d9dd2080dddfbf17451da7a7e586e534aab..d5bcf4cf9fb740c31e11d322d66b30be80eed5ab 100644 --- a/src/main/java/org/jeecgframework/core/common/hibernate/dialect/SybaseDialect.java +++ b/src/main/java/org/jeecgframework/core/common/hibernate/dialect/SybaseDialect.java @@ -3,16 +3,19 @@ package org.jeecgframework.core.common.hibernate.dialect; public class SybaseDialect extends Dialect { + @Override public boolean supportsLimit() { return false; } + @Override public boolean supportsLimitOffset() { return false; } + @Override public String getLimitString(String sql, int offset, String offsetPlaceholder, int limit, String limitPlaceholder) { throw new UnsupportedOperationException("paged queries not supported"); diff --git a/src/main/java/org/jeecgframework/core/common/hibernate/qbc/AliasToBean.java b/src/main/java/org/jeecgframework/core/common/hibernate/qbc/AliasToBean.java index e00fc8b4d5b88fbe7d35205bbe972457c64d8c95..1bdea311fe361d53f897097cdbb091e7a587694a 100644 --- a/src/main/java/org/jeecgframework/core/common/hibernate/qbc/AliasToBean.java +++ b/src/main/java/org/jeecgframework/core/common/hibernate/qbc/AliasToBean.java @@ -30,12 +30,14 @@ public class AliasToBean implements ResultTransformer { private final Class resultClass; public AliasToBean(Class pojoClass) { - if(pojoClass==null) throw new IllegalArgumentException("resultClass cannot be null"); + if(pojoClass==null) { + throw new IllegalArgumentException("resultClass cannot be null"); + } this.resultClass = pojoClass; } + @Override @SuppressWarnings("unchecked") - public List transformList(List collection) { return collection; } @@ -49,6 +51,7 @@ public class AliasToBean implements ResultTransformer { * @return 单个POJO实例--查询结果 */ + @Override public Object transformTuple(Object[] tuple, String[] aliases) { try { Object root = resultClass.newInstance(); diff --git a/src/main/java/org/jeecgframework/core/common/hibernate/qbc/CriteriaQuery.java b/src/main/java/org/jeecgframework/core/common/hibernate/qbc/CriteriaQuery.java index 0184a97571548e9f47df3fabb4a1118188e3f822..acac4eb453b1bcc2fd3d78f914ee5d0142d26273 100644 --- a/src/main/java/org/jeecgframework/core/common/hibernate/qbc/CriteriaQuery.java +++ b/src/main/java/org/jeecgframework/core/common/hibernate/qbc/CriteriaQuery.java @@ -223,8 +223,8 @@ public class CriteriaQuery { /** * 创建外键表关联对象 * - * @param name外键表实体名 - * @param value引用名 + * @param name 外键表实体名 + * @param value 引用名 */ public void createAlias(String name, String value) { if(!alias.contains(name)){ @@ -260,8 +260,8 @@ public class CriteriaQuery { * 设置条件之间and关系 * * @param query - * @param source - * @param dest + * @param souce + * @param c * hql:(this_.0 like ? or this_.1 like ?) 表示法:cq.add(cq.or(cq, 0, * 1)); * @return @@ -288,9 +288,8 @@ public class CriteriaQuery { /** * 设置组合后的Criterion OR关系 * - * @param query - * @param source - * @param dest + * @param c1 + * @param c2 * @return */ public Criterion getor(Criterion c1,Criterion c2) { @@ -301,9 +300,8 @@ public class CriteriaQuery { /** * 设置条件之间and关系 * - * @param query - * @param source - * @param dest + * @param c1 + * @param c2 * @return */ public Criterion and(Criterion c1, Criterion c2) @@ -316,8 +314,8 @@ public class CriteriaQuery { * 设置Or查询 * * @param query - * @param source条件1 - * @param dest条件2 + * @param source 条件1 + * @param dest 条件2 * @return */ public Criterion or(CriteriaQuery query, int source, int dest) { @@ -328,9 +326,9 @@ public class CriteriaQuery { /** * 设置or(Criterion c, CriteriaQuery query, int source)（或）查询条件 * - * @param keyname - * @param keyvalue1 - * @param keyvalue2 + * @param c + * @param query + * @param source */ public Criterion or(Criterion c, CriteriaQuery query, int source) { return Restrictions.or(c, query.getCriterionList().getParas(source)); @@ -339,9 +337,8 @@ public class CriteriaQuery { /** * 设置or(Criterion c1, Criterion c2)（或）查询条件 * - * @param keyname - * @param keyvalue1 - * @param keyvalue2 + * @param c1 + * @param c2 * 两个条件或查询： Restrictions.or(Restrictions.in("username",list1), * Restrictions.idEq(1)); 三个或多个条件查询:（使用嵌套方式） * criteria.add(Restrictions @@ -367,9 +364,8 @@ public class CriteriaQuery { /** * 设置order（排序）查询条件 * - * @param ordername + * @param map * ：排序字段名 - * @param ordervalue * ：排序字段值（"asc","desc"） */ public void setOrder(Map map) { @@ -426,8 +422,7 @@ public class CriteriaQuery { * 设置notEq(不等)查询条件 * * @param keyname - * @param keyvalue1 - * @param keyvalue2 + * @param keyvalue */ public void notEq(String keyname, Object keyvalue) { if (keyvalue != null && keyvalue != "") { @@ -443,8 +438,7 @@ public class CriteriaQuery { * 设置like(模糊)查询条件 * * @param keyname - * @param keyvalue1 - * @param keyvalue2 + * @param keyvalue */ public void like(String keyname, Object keyvalue) { if (keyvalue != null && keyvalue != "") { @@ -461,8 +455,7 @@ public class CriteriaQuery { * 设置gt(>)查询条件 * * @param keyname - * @param keyvalue1 - * @param keyvalue2 + * @param keyvalue */ public void gt(String keyname, Object keyvalue) { if (keyvalue != null && keyvalue != "") { @@ -478,8 +471,7 @@ public class CriteriaQuery { * 设置lt(<)查询条件 * * @param keyname - * @param keyvalue1 - * @param keyvalue2 + * @param keyvalue */ public void lt(String keyname, Object keyvalue) { if (keyvalue != null && keyvalue != "") { @@ -495,8 +487,7 @@ public class CriteriaQuery { * 设置le(<=)查询条件 * * @param keyname - * @param keyvalue1 - * @param keyvalue2 + * @param keyvalue */ public void le(String keyname, Object keyvalue) { if (keyvalue != null && keyvalue != "") { @@ -512,8 +503,7 @@ public class CriteriaQuery { * 设置ge(>=)查询条件 * * @param keyname - * @param keyvalue1 - * @param keyvalue2 + * @param keyvalue */ public void ge(String keyname, Object keyvalue) { if (keyvalue != null && keyvalue != "") { @@ -529,8 +519,7 @@ public class CriteriaQuery { * 设置in(包含)查询条件 * * @param keyname - * @param keyvalue1 - * @param keyvalue2 + * @param keyvalue */ public void in(String keyname, Object[] keyvalue) { if (keyvalue != null&&keyvalue.length>0&& keyvalue[0] != "") { @@ -542,8 +531,6 @@ public class CriteriaQuery { * 设置isNull查询条件 * * @param keyname - * @param keyvalue1 - * @param keyvalue2 */ public void isNull(String keyname) { criterionList.addPara(Restrictions.isNull(keyname)); @@ -553,8 +540,6 @@ public class CriteriaQuery { * 设置isNull查询条件 * * @param keyname - * @param keyvalue1 - * @param keyvalue2 */ public void isNotNull(String keyname) { criterionList.addPara(Restrictions.isNotNull(keyname)); @@ -564,8 +549,7 @@ public class CriteriaQuery { * 保存查询条件 * * @param keyname - * @param keyvalue1 - * @param keyvalue2 + * @param keyvalue */ public void put(String keyname, Object keyvalue) { if (keyvalue != null && keyvalue != "") { diff --git a/src/main/java/org/jeecgframework/core/common/hibernate/qbc/Pager.java b/src/main/java/org/jeecgframework/core/common/hibernate/qbc/Pager.java index fa702b6e8788aebff301b0a77c0433742995d1af..3ac9742770058144197ae391c1c4e89254db3945 100644 --- a/src/main/java/org/jeecgframework/core/common/hibernate/qbc/Pager.java +++ b/src/main/java/org/jeecgframework/core/common/hibernate/qbc/Pager.java @@ -16,7 +16,7 @@ public class Pager { /** * @param allCount * 记录行数 - * @param offset + * @param curPagerNo * 记录开始数目 * @param pageSize * 每页显示的记录数 @@ -75,6 +75,7 @@ public class Pager { public boolean isLast() { return (curPageNO == pageCount) ? true : false; } + @Override public String toString() { return "Pager的值为 " + " curPageNO = " + curPageNO + " limit = " + pageSize + " rowsCount = " + rowsCount + " pageCount = " + pageCount; } @@ -101,21 +102,26 @@ public class Pager { } String str = ""; str += ""; - if (isFirst()) - str += "第" + curPageNO + "页 共" + pageCount + "页 首页 上一页 "; - else { + if (isFirst()) { + str += "第" + curPageNO + "页 共" + pageCount + "页 首页 上一页 "; + } else { str += "第" + curPageNO + "页 共" + pageCount + "页 首页 "; str += "上一页 "; } - if (isLast() || rowsCount == 0) - str += "下一页 尾页 "; - else { + if (isLast() || rowsCount == 0) { + str += "下一页 尾页 "; + } else { str += "下一页 "; str += "尾页 "; } str += " 共" + rowsCount + "条记录 "; - str += " 转到"; + str += " 转到"; return str; } @@ -142,15 +148,15 @@ public class Pager { str += " }" + "\n"; str += "" + "\n"; str += " 
共" + rowsCount + "条 当前第" + curPageNO + "/" + pageCount + "页   "; - if (curPageNO == 1 || curPageNO == 0) - str += " "; - else { + if (curPageNO == 1 || curPageNO == 0) { + str += " "; + } else { str += ""; str += ""; } - if (curPageNO - pageCount == 0 || pageCount == 0 || pageCount == 1) - str += "  "; - else { + if (curPageNO - pageCount == 0 || pageCount == 0 || pageCount == 1) { + str += "  "; + } else { str += ""; str += ""; } diff --git a/src/main/java/org/jeecgframework/core/common/hibernate/qbc/PagerUtil.java b/src/main/java/org/jeecgframework/core/common/hibernate/qbc/PagerUtil.java index 4787fb2f8137c8d6ecf1a7ced9b44fd6394ab48b..5d0041b4a972a94c8c9ef016ac61060a2b00abd9 100644 --- a/src/main/java/org/jeecgframework/core/common/hibernate/qbc/PagerUtil.java +++ b/src/main/java/org/jeecgframework/core/common/hibernate/qbc/PagerUtil.java @@ -1,8 +1,6 @@ package org.jeecgframework.core.common.hibernate.qbc; import java.util.Map; - -import org.omg.CORBA.PUBLIC_MEMBER; /** *类描述：分页工具类 *admin @@ -17,10 +15,12 @@ public class PagerUtil { public static String getBar(String action, String form, int allCounts, int curPageNO, int pageSize, Map map) { Pager pager = null; try { - if (curPageNO > (int) Math.ceil((double) allCounts / pageSize)) - curPageNO = (int) Math.ceil((double) allCounts / pageSize); - if (curPageNO <= 1) - curPageNO = 1; + if (curPageNO > (int) Math.ceil((double) allCounts / pageSize)) { + curPageNO = (int) Math.ceil((double) allCounts / pageSize); + } + if (curPageNO <= 1) { + curPageNO = 1; + } // 得到offset pager = new Pager(allCounts, curPageNO, pageSize, map); } catch (Exception e) { @@ -32,10 +32,12 @@ public class PagerUtil { public static String getBar(String url, int allCounts, int curPageNO, int pageSize, Map map) { Pager pager = null; try { - if (curPageNO > (int) Math.ceil((double) allCounts / pageSize)) - curPageNO = (int) Math.ceil((double) allCounts / pageSize); - if (curPageNO <= 1) - curPageNO = 1; + if (curPageNO > (int) Math.ceil((double) allCounts / pageSize)) { + curPageNO = (int) Math.ceil((double) allCounts / pageSize); + } + if (curPageNO <= 1) { + curPageNO = 1; + } // 得到offset // 生成工具条 pager = new Pager(allCounts, curPageNO, pageSize, map); @@ -48,13 +50,14 @@ public class PagerUtil { public static int getOffset(int rowCounts, int curPageNO, int pageSize) { int offset = 0; try { - if (curPageNO > (int) Math.ceil((double) rowCounts / pageSize)) - - curPageNO = (int) Math.ceil((double) rowCounts / pageSize) + 1; + if (curPageNO > (int) Math.ceil((double) rowCounts / pageSize)) { + curPageNO = (int) Math.ceil((double) rowCounts / pageSize) + 1; + } // 得到第几页 - if (curPageNO <= 1) - curPageNO = 1; + if (curPageNO <= 1) { + curPageNO = 1; + } // 得到offset offset = (curPageNO - 1) * pageSize; } catch (Exception e) { @@ -66,12 +69,13 @@ public class PagerUtil { public static int getcurPageNo(int rowCounts, int curPageNO, int pageSize) { try { // 得到第几页 - if (curPageNO > (int) Math.ceil((double) rowCounts / pageSize)) - - curPageNO = (int) Math.ceil((double) rowCounts / pageSize) + 1; + if (curPageNO > (int) Math.ceil((double) rowCounts / pageSize)) { + curPageNO = (int) Math.ceil((double) rowCounts / pageSize) + 1; + } - if (curPageNO <= 1) - curPageNO = 1; + if (curPageNO <= 1) { + curPageNO = 1; + } } catch (Exception e) { org.jeecgframework.core.util.LogUtil.info("getOffset出错!"); } diff --git a/src/main/java/org/jeecgframework/core/common/model/common/QueryCondition.java b/src/main/java/org/jeecgframework/core/common/model/common/QueryCondition.java index 8864da5054f96b18b6786a5fb4ae73de9d835faf..fde7a807eb3563b47f357d4128791a5f64768709 100644 --- a/src/main/java/org/jeecgframework/core/common/model/common/QueryCondition.java +++ b/src/main/java/org/jeecgframework/core/common/model/common/QueryCondition.java @@ -47,7 +47,8 @@ public class QueryCondition { public void setRelation(String relation) { this.relation = relation; } - public String toString(){ + @Override + public String toString(){ StringBuffer sb =new StringBuffer(); sb.append(this.relation).append(" "); sb.append(this.field).append(" ") diff --git a/src/main/java/org/jeecgframework/core/common/service/impl/CommonExcelServiceImpl.java b/src/main/java/org/jeecgframework/core/common/service/impl/CommonExcelServiceImpl.java index f1722257380f7aaa990a0271634818473cb36b4a..fc97b52a8e06e7d6c2858c4908532f716a8f1c01 100644 --- a/src/main/java/org/jeecgframework/core/common/service/impl/CommonExcelServiceImpl.java +++ b/src/main/java/org/jeecgframework/core/common/service/impl/CommonExcelServiceImpl.java @@ -22,7 +22,8 @@ import org.springframework.transaction.annotation.Transactional; @Transactional public class CommonExcelServiceImpl extends CommonServiceImpl implements CommonExcelServiceI { - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public HSSFWorkbook exportExcel(String title, Collection titleSet, Collection dataSet) { diff --git a/src/main/java/org/jeecgframework/core/common/service/impl/CommonServiceImpl.java b/src/main/java/org/jeecgframework/core/common/service/impl/CommonServiceImpl.java index a9a04abcbeee7861c17d749733492dc6d507456a..2e0412fd4aa33b347e2280ba8524aacf95bddf43 100644 --- a/src/main/java/org/jeecgframework/core/common/service/impl/CommonServiceImpl.java +++ b/src/main/java/org/jeecgframework/core/common/service/impl/CommonServiceImpl.java @@ -1,14 +1,5 @@ package org.jeecgframework.core.common.service.impl; -import java.io.Serializable; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; - -import org.jeecgframework.web.system.pojo.base.TSDepart; import org.hibernate.Session; import org.hibernate.criterion.DetachedCriteria; import org.jeecgframework.core.common.dao.ICommonDao; @@ -26,9 +17,17 @@ import org.jeecgframework.tag.vo.datatable.DataTableReturn; import org.jeecgframework.tag.vo.easyui.Autocomplete; import org.jeecgframework.tag.vo.easyui.ComboTreeModel; import org.jeecgframework.tag.vo.easyui.TreeGridModel; +import org.jeecgframework.web.system.pojo.base.TSDepart; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.Serializable; +import java.util.Collection; +import java.util.List; +import java.util.Map; + @Service("commonService") @Transactional public class CommonServiceImpl implements CommonService { @@ -39,11 +38,13 @@ public class CommonServiceImpl implements CommonService { * * @return */ - public List getAllDbTableName() { + @Override + public List getAllDbTableName() { return commonDao.getAllDbTableName(); } - public Integer getAllDbTableSize() { + @Override + public Integer getAllDbTableSize() { return commonDao.getAllDbTableSize(); } @@ -53,18 +54,21 @@ public class CommonServiceImpl implements CommonService { } - public Serializable save(T entity) { + @Override + public Serializable save(T entity) { return commonDao.save(entity); } - public void saveOrUpdate(T entity) { + @Override + public void saveOrUpdate(T entity) { commonDao.saveOrUpdate(entity); } - public void delete(T entity) { + @Override + public void delete(T entity) { commonDao.delete(entity); } @@ -75,14 +79,16 @@ public class CommonServiceImpl implements CommonService { * @param * @param entities */ - public void deleteAllEntitie(Collection entities) { + @Override + public void deleteAllEntitie(Collection entities) { commonDao.deleteAllEntitie(entities); } /** * 根据实体名获取对象 */ - public T get(Class class1, Serializable id) { + @Override + public T get(Class class1, Serializable id) { return commonDao.get(class1, id); } @@ -90,18 +96,19 @@ public class CommonServiceImpl implements CommonService { * 根据实体名返回全部对象 * * @param - * @param hql - * @param size + * @param clas * @return */ - public List getList(Class clas) { + @Override + public List getList(Class clas) { return commonDao.loadAll(clas); } /** * 根据实体名获取对象 */ - public T getEntity(Class entityName, Serializable id) { + @Override + public T getEntity(Class entityName, Serializable id) { return commonDao.getEntity(entityName, id); } @@ -114,16 +121,18 @@ public class CommonServiceImpl implements CommonService { * @param value * @return */ - public T findUniqueByProperty(Class entityClass, - String propertyName, Object value) { + @Override + public T findUniqueByProperty(Class entityClass, + String propertyName, Object value) { return commonDao.findUniqueByProperty(entityClass, propertyName, value); } /** * 按属性查找对象列表. */ - public List findByProperty(Class entityClass, - String propertyName, Object value) { + @Override + public List findByProperty(Class entityClass, + String propertyName, Object value) { return commonDao.findByProperty(entityClass, propertyName, value); } @@ -135,11 +144,13 @@ public class CommonServiceImpl implements CommonService { * @param entityClass * @return */ - public List loadAll(final Class entityClass) { + @Override + public List loadAll(final Class entityClass) { return commonDao.loadAll(entityClass); } - public T singleResult(String hql) { + @Override + public T singleResult(String hql) { return commonDao.singleResult(hql); } @@ -147,9 +158,10 @@ public class CommonServiceImpl implements CommonService { * 删除实体主键ID删除对象 * * @param - * @param entities + * @param id */ - public void deleteEntityById(Class entityName, Serializable id) { + @Override + public void deleteEntityById(Class entityName, Serializable id) { commonDao.deleteEntityById(entityName, id); } @@ -159,7 +171,8 @@ public class CommonServiceImpl implements CommonService { * @param * @param pojo */ - public void updateEntitie(T pojo) { + @Override + public void updateEntitie(T pojo) { commonDao.updateEntitie(pojo); } @@ -168,20 +181,22 @@ public class CommonServiceImpl implements CommonService { * 通过hql 查询语句查找对象 * * @param - * @param query + * @param hql * @return */ - public List findByQueryString(String hql) { + @Override + public List findByQueryString(String hql) { return commonDao.findByQueryString(hql); } /** * 根据sql更新 * - * @param query + * @param sql * @return */ - public int updateBySqlString(String sql) { + @Override + public int updateBySqlString(String sql) { return commonDao.updateBySqlString(sql); } @@ -192,7 +207,8 @@ public class CommonServiceImpl implements CommonService { * @param query * @return */ - public List findListbySql(String query) { + @Override + public List findListbySql(String query) { return commonDao.findListbySql(query); } @@ -200,11 +216,12 @@ public class CommonServiceImpl implements CommonService { * 通过属性称获取实体带排序 * * @param - * @param clas + * @param entityClass * @return */ - public List findByPropertyisOrder(Class entityClass, - String propertyName, Object value, boolean isAsc) { + @Override + public List findByPropertyisOrder(Class entityClass, + String propertyName, Object value, boolean isAsc) { return commonDao.findByPropertyisOrder(entityClass, propertyName, value, isAsc); } @@ -217,7 +234,8 @@ public class CommonServiceImpl implements CommonService { * @param isOffset * @return */ - public PageList getPageList(final CriteriaQuery cq, final boolean isOffset) { + @Override + public PageList getPageList(final CriteriaQuery cq, final boolean isOffset) { return commonDao.getPageList(cq, isOffset); } @@ -228,8 +246,9 @@ public class CommonServiceImpl implements CommonService { * @param isOffset * @return */ - public DataTableReturn getDataTableReturn(final CriteriaQuery cq, - final boolean isOffset) { + @Override + public DataTableReturn getDataTableReturn(final CriteriaQuery cq, + final boolean isOffset) { return commonDao.getDataTableReturn(cq, isOffset); } @@ -240,8 +259,9 @@ public class CommonServiceImpl implements CommonService { * @param isOffset * @return */ - public DataGridReturn getDataGridReturn(final CriteriaQuery cq, - final boolean isOffset) { + @Override + public DataGridReturn getDataGridReturn(final CriteriaQuery cq, + final boolean isOffset) { return commonDao.getDataGridReturn(cq, isOffset); } @@ -249,12 +269,13 @@ public class CommonServiceImpl implements CommonService { * * hqlQuery方式分页 * - * @param cq - * @param isOffset + * @param hqlQuery + * @param needParameter * @return */ - public PageList getPageList(final HqlQuery hqlQuery, - final boolean needParameter) { + @Override + public PageList getPageList(final HqlQuery hqlQuery, + final boolean needParameter) { return commonDao.getPageList(hqlQuery, needParameter); } @@ -262,23 +283,26 @@ public class CommonServiceImpl implements CommonService { * * sqlQuery方式分页 * - * @param cq - * @param isOffset + * @param hqlQuery + * @param isToEntity * @return */ - public PageList getPageListBySql(final HqlQuery hqlQuery, - final boolean isToEntity) { + @Override + public PageList getPageListBySql(final HqlQuery hqlQuery, + final boolean isToEntity) { return commonDao.getPageListBySql(hqlQuery, isToEntity); } - public Session getSession() + @Override + public Session getSession() { return commonDao.getSession(); } - public List findByExample(final String entityName, - final Object exampleEntity) { + @Override + public List findByExample(final String entityName, + final Object exampleEntity) { return commonDao.findByExample(entityName, exampleEntity); } @@ -289,21 +313,24 @@ public class CommonServiceImpl implements CommonService { * @param cq * @return */ - public List getListByCriteriaQuery(final CriteriaQuery cq, - Boolean ispage) { + @Override + public List getListByCriteriaQuery(final CriteriaQuery cq, + Boolean ispage) { return commonDao.getListByCriteriaQuery(cq, ispage); } /** * 文件上传 * - * @param request + * @param uploadFile */ - public T uploadFile(UploadFile uploadFile) { + @Override + public T uploadFile(UploadFile uploadFile) { return commonDao.uploadFile(uploadFile); } - public HttpServletResponse viewOrDownloadFile(UploadFile uploadFile) + @Override + public HttpServletResponse viewOrDownloadFile(UploadFile uploadFile) { return commonDao.viewOrDownloadFile(uploadFile); @@ -312,11 +339,12 @@ public class CommonServiceImpl implements CommonService { /** * 生成XML文件 * - * @param fileName + * @param importFile * XML全路径 * @return */ - public HttpServletResponse createXml(ImportFile importFile) { + @Override + public HttpServletResponse createXml(ImportFile importFile) { return commonDao.createXml(importFile); } @@ -326,22 +354,26 @@ public class CommonServiceImpl implements CommonService { * @param fileName * XML全路径 */ - public void parserXml(String fileName) { + @Override + public void parserXml(String fileName) { commonDao.parserXml(fileName); } - public List comTree(List all, ComboTree comboTree) { + @Override + public List comTree(List all, ComboTree comboTree) { return commonDao.comTree(all, comboTree); } - public List ComboTree(List all, ComboTreeModel comboTreeModel, List in, boolean recursive) { + @Override + public List ComboTree(List all, ComboTreeModel comboTreeModel, List in, boolean recursive) { return commonDao.ComboTree(all, comboTreeModel, in, recursive); } /** * 构建树形数据表 */ - public List treegrid(List all, TreeGridModel treeGridModel) { + @Override + public List treegrid(List all, TreeGridModel treeGridModel) { return commonDao.treegrid(all, treeGridModel); } @@ -351,7 +383,8 @@ public class CommonServiceImpl implements CommonService { * @param * @return */ - public List getAutoList(Autocomplete autocomplete) { + @Override + public List getAutoList(Autocomplete autocomplete) { StringBuffer sb = new StringBuffer(""); for (String searchField : autocomplete.getSearchField().split(",")) { sb.append(" or " + searchField + " like '%"+ autocomplete.getTrem() + "%' "); @@ -361,60 +394,72 @@ public class CommonServiceImpl implements CommonService { } - public Integer executeSql(String sql, List param) { + @Override + public Integer executeSql(String sql, List param) { return commonDao.executeSql(sql, param); } - public Integer executeSql(String sql, Object... param) { + @Override + public Integer executeSql(String sql, Object... param) { return commonDao.executeSql(sql, param); } - public Integer executeSql(String sql, Map param) { + @Override + public Integer executeSql(String sql, Map param) { return commonDao.executeSql(sql, param); } - public Object executeSqlReturnKey(String sql, Map param) { + @Override + public Object executeSqlReturnKey(String sql, Map param) { return commonDao.executeSqlReturnKey(sql, param); } - public List> findForJdbc(String sql, int page, int rows) { + @Override + public List> findForJdbc(String sql, int page, int rows) { return commonDao.findForJdbc(sql, page, rows); } - public List> findForJdbc(String sql, Object... objs) { + @Override + public List> findForJdbc(String sql, Object... objs) { return commonDao.findForJdbc(sql, objs); } - public List> findForJdbcParam(String sql, int page, - int rows, Object... objs) { + @Override + public List> findForJdbcParam(String sql, int page, + int rows, Object... objs) { return commonDao.findForJdbcParam(sql, page, rows, objs); } - public List findObjForJdbc(String sql, int page, int rows, - Class clazz) { + @Override + public List findObjForJdbc(String sql, int page, int rows, + Class clazz) { return commonDao.findObjForJdbc(sql, page, rows, clazz); } - public Map findOneForJdbc(String sql, Object... objs) { + @Override + public Map findOneForJdbc(String sql, Object... objs) { return commonDao.findOneForJdbc(sql, objs); } - public Long getCountForJdbc(String sql) { + @Override + public Long getCountForJdbc(String sql) { return commonDao.getCountForJdbc(sql); } - public Long getCountForJdbcParam(String sql, Object[] objs) { + @Override + public Long getCountForJdbcParam(String sql, Object[] objs) { return commonDao.getCountForJdbcParam(sql,objs); } - public void batchSave(List entitys) { + @Override + public void batchSave(List entitys) { this.commonDao.batchSave(entitys); } @@ -422,26 +467,30 @@ public class CommonServiceImpl implements CommonService { * 通过hql 查询语句查找对象 * * @param - * @param query + * @param hql * @return */ - public List findHql(String hql, Object... param) { + @Override + public List findHql(String hql, Object... param) { return this.commonDao.findHql(hql, param); } - public List pageList(DetachedCriteria dc, int firstResult, - int maxResult) { + @Override + public List pageList(DetachedCriteria dc, int firstResult, + int maxResult) { return this.commonDao.pageList(dc, firstResult, maxResult); } - public List findByDetached(DetachedCriteria dc) { + @Override + public List findByDetached(DetachedCriteria dc) { return this.commonDao.findByDetached(dc); } /** * 调用存储过程 */ - public List executeProcedure(String procedureSql,Object... params) { + @Override + public List executeProcedure(String procedureSql, Object... params) { return this.commonDao.executeProcedure(procedureSql, params); } diff --git a/src/main/java/org/jeecgframework/core/enums/SysACEIconEnum.java b/src/main/java/org/jeecgframework/core/enums/SysACEIconEnum.java index e5cef1abd3a641f552ec25e09c1c8b82cd950935..980cc1cc8820efaa0d383ac966d5eced74eb94db 100644 --- a/src/main/java/org/jeecgframework/core/enums/SysACEIconEnum.java +++ b/src/main/java/org/jeecgframework/core/enums/SysACEIconEnum.java @@ -80,6 +80,7 @@ public enum SysACEIconEnum { return default_icon; } + @Override public String toString() { return "{style: " + style + ", themes: " + themes + ", desc: " + desc +"}"; } diff --git a/src/main/java/org/jeecgframework/core/enums/SysDatabaseEnum.java b/src/main/java/org/jeecgframework/core/enums/SysDatabaseEnum.java index d20ce4df5a0a14d67b22db208521f622dc93a7aa..b9eea82b27d7ae12ff10df0fc488d3023f7c2a82 100644 --- a/src/main/java/org/jeecgframework/core/enums/SysDatabaseEnum.java +++ b/src/main/java/org/jeecgframework/core/enums/SysDatabaseEnum.java @@ -71,6 +71,7 @@ public enum SysDatabaseEnum { return null; } + @Override public String toString() { return "{dbtype: " + dbtype + ", url: " + url + ", driverClass: " + driverClass +"}"; } diff --git a/src/main/java/org/jeecgframework/core/enums/SysThemesEnum.java b/src/main/java/org/jeecgframework/core/enums/SysThemesEnum.java index ec15bd530ee1241722c130af5cd5a92fd7d54ff0..e0f830ba5002ad0fa0292d357e35a1d4e7d631a6 100644 --- a/src/main/java/org/jeecgframework/core/enums/SysThemesEnum.java +++ b/src/main/java/org/jeecgframework/core/enums/SysThemesEnum.java @@ -90,6 +90,7 @@ public enum SysThemesEnum { return ACE_STYLE; } + @Override public String toString() { return "{style: " + style + ", indexPath: " + indexPath + ", themes: " + themes + ", desc: " + desc +"}"; } diff --git a/src/main/java/org/jeecgframework/core/extend/datasource/DynamicDataSource.java b/src/main/java/org/jeecgframework/core/extend/datasource/DynamicDataSource.java index a3a9425e987d434303dab92c9c1636b8bd54addb..44845e3e945fd8f7c775d409ea835bc16ec851da 100644 --- a/src/main/java/org/jeecgframework/core/extend/datasource/DynamicDataSource.java +++ b/src/main/java/org/jeecgframework/core/extend/datasource/DynamicDataSource.java @@ -15,23 +15,27 @@ public class DynamicDataSource extends AbstractRoutingDataSource { * 该方法必须要重写 方法是为了根据数据库标示符取得当前的数据库 */ - protected Object determineCurrentLookupKey() { + @Override + protected Object determineCurrentLookupKey() { DataSourceType dataSourceType= DataSourceContextHolder.getDataSourceType(); return dataSourceType; } - public void setDataSourceLookup(DataSourceLookup dataSourceLookup) { + @Override + public void setDataSourceLookup(DataSourceLookup dataSourceLookup) { super.setDataSourceLookup(dataSourceLookup); } - public void setDefaultTargetDataSource(Object defaultTargetDataSource) { + @Override + public void setDefaultTargetDataSource(Object defaultTargetDataSource) { super.setDefaultTargetDataSource(defaultTargetDataSource); } - public void setTargetDataSources(Map targetDataSources) { + @Override + public void setTargetDataSources(Map targetDataSources) { super.setTargetDataSources(targetDataSources); } diff --git a/src/main/java/org/jeecgframework/core/extend/hqlsearch/HqlGenerateUtil.java b/src/main/java/org/jeecgframework/core/extend/hqlsearch/HqlGenerateUtil.java index 31ed2e0b7a376609016b5f2e0622c7699517ea28..85b433816c2d6b40e716dcbab71a826e10989655 100644 --- a/src/main/java/org/jeecgframework/core/extend/hqlsearch/HqlGenerateUtil.java +++ b/src/main/java/org/jeecgframework/core/extend/hqlsearch/HqlGenerateUtil.java @@ -146,30 +146,40 @@ public class HqlGenerateUtil { Object beginValue_=null , endValue_ =null; if ("class java.lang.Integer".equals(type)) { - if(!"".equals(beginValue)&&null!=beginValue) - beginValue_ = Integer.parseInt(beginValue); - if(!"".equals(endValue)&&null!=endValue) - endValue_ =Integer.parseInt(endValue); + if(!"".equals(beginValue)&&null!=beginValue) { + beginValue_ = Integer.parseInt(beginValue); + } + if(!"".equals(endValue)&&null!=endValue) { + endValue_ =Integer.parseInt(endValue); + } } else if ("class java.math.BigDecimal".equals(type)) { - if(!"".equals(beginValue)&&null!=beginValue) - beginValue_ = new BigDecimal(beginValue); - if(!"".equals(endValue)&&null!=endValue) - endValue_ = new BigDecimal(endValue); + if(!"".equals(beginValue)&&null!=beginValue) { + beginValue_ = new BigDecimal(beginValue); + } + if(!"".equals(endValue)&&null!=endValue) { + endValue_ = new BigDecimal(endValue); + } } else if ("class java.lang.Short".equals(type)) { - if(!"".equals(beginValue)&&null!=beginValue) - beginValue_ =Short.parseShort(beginValue); - if(!"".equals(endValue)&&null!=endValue) - endValue_ =Short.parseShort(endValue); + if(!"".equals(beginValue)&&null!=beginValue) { + beginValue_ =Short.parseShort(beginValue); + } + if(!"".equals(endValue)&&null!=endValue) { + endValue_ =Short.parseShort(endValue); + } } else if ("class java.lang.Long".equals(type)) { - if(!"".equals(beginValue)&&null!=beginValue) - beginValue_ = Long.parseLong(beginValue); - if(!"".equals(endValue)&&null!=endValue) - endValue_ =Long.parseLong(endValue); + if(!"".equals(beginValue)&&null!=beginValue) { + beginValue_ = Long.parseLong(beginValue); + } + if(!"".equals(endValue)&&null!=endValue) { + endValue_ =Long.parseLong(endValue); + } } else if ("class java.lang.Float".equals(type)) { - if(!"".equals(beginValue)&&null!=beginValue) - beginValue_ = Float.parseFloat(beginValue); - if(!"".equals(endValue)&&null!=endValue) - endValue_ =Float.parseFloat(endValue); + if(!"".equals(beginValue)&&null!=beginValue) { + beginValue_ = Float.parseFloat(beginValue); + } + if(!"".equals(endValue)&&null!=endValue) { + endValue_ =Float.parseFloat(endValue); + } }else{ beginValue_ = beginValue; endValue_ = endValue; @@ -353,7 +363,7 @@ public class HqlGenerateUtil { * 根据对象拼装sql * TODO 结合DataRule * @param list - * @param tab格式化 + * @param tab 格式化 * @return */ public static String getSql(List list,String tab,Class claszz){ diff --git a/src/main/java/org/jeecgframework/core/extend/hqlsearch/SysContextSqlConvert.java b/src/main/java/org/jeecgframework/core/extend/hqlsearch/SysContextSqlConvert.java index 5017c13b1a450f17db8dcbcf1b6c0c025aa67c8d..c0ccdd68f99e6e580849cbaac3a17f3a9be21d73 100644 --- a/src/main/java/org/jeecgframework/core/extend/hqlsearch/SysContextSqlConvert.java +++ b/src/main/java/org/jeecgframework/core/extend/hqlsearch/SysContextSqlConvert.java @@ -31,8 +31,9 @@ public class SysContextSqlConvert { * @throws */ public static String setSqlModel(TSDataRule dataRule){ - if(dataRule == null) - return ""; + if(dataRule == null) { + return ""; + } String sqlValue=""; HqlRuleEnum ruleEnum=HqlRuleEnum.getByValue(dataRule.getRuleConditions()); //#{sys_user_code}% diff --git a/src/main/java/org/jeecgframework/core/extend/swftools/OpenOfficePDFConverter.java b/src/main/java/org/jeecgframework/core/extend/swftools/OpenOfficePDFConverter.java index e743bd56bab1cc56ebf1cc23c588e817fef0d29a..c008aa3ce43a6363f20d2e150b732fe5c221f944 100644 --- a/src/main/java/org/jeecgframework/core/extend/swftools/OpenOfficePDFConverter.java +++ b/src/main/java/org/jeecgframework/core/extend/swftools/OpenOfficePDFConverter.java @@ -22,7 +22,8 @@ public class OpenOfficePDFConverter implements PDFConverter { private static String OFFICE_HOME = ConStant.OFFICE_HOME; private static int[] port = { 8100 }; - public void convert2PDF(String inputFile, String pdfFile, String extend) { + @Override + public void convert2PDF(String inputFile, String pdfFile, String extend) { // if (extend.equals("txt")) { // @@ -59,7 +60,8 @@ public class OpenOfficePDFConverter implements PDFConverter { org.jeecgframework.core.util.LogUtil.info("进行文档转换转换---- 结束----"); } - public void convert2PDF(String inputFile, String extend) { + @Override + public void convert2PDF(String inputFile, String extend) { //inputFile = inputFile.replaceAll(" ", "").replaceAll("　", ""); String pdfFile = FileUtils.getFilePrefix2(inputFile) + ".pdf"; convert2PDF(inputFile, pdfFile, extend); diff --git a/src/main/java/org/jeecgframework/core/extend/swftools/SWFToolsSWFConverter.java b/src/main/java/org/jeecgframework/core/extend/swftools/SWFToolsSWFConverter.java index 74eaa51e84dda5bbdb6c9bd770615b0c31380a0e..cbd5cb0d853f6289c65f58eddae4d338d4f9a107 100644 --- a/src/main/java/org/jeecgframework/core/extend/swftools/SWFToolsSWFConverter.java +++ b/src/main/java/org/jeecgframework/core/extend/swftools/SWFToolsSWFConverter.java @@ -21,7 +21,8 @@ public class SWFToolsSWFConverter implements SWFConverter { return p.toLowerCase().indexOf("windows") >= 0 ? true : false; } - public void convert2SWF(String inputFile, String swfFile, String extend) { + @Override + public void convert2SWF(String inputFile, String swfFile, String extend) { File pdfFile = new File(inputFile); File outFile = new File(swfFile); @@ -80,7 +81,8 @@ public class SWFToolsSWFConverter implements SWFConverter { } } - public void convert2SWF(String inputFile, String extend) { + @Override + public void convert2SWF(String inputFile, String extend) { String swfFile = PinyinUtil.getPinYinHeadChar(FileUtils.getFilePrefix2(inputFile)) + ".swf"; convert2SWF(inputFile, swfFile, extend); } diff --git a/src/main/java/org/jeecgframework/core/extend/swftools/StreamGobbler.java b/src/main/java/org/jeecgframework/core/extend/swftools/StreamGobbler.java index 8ba68cc3ee82b5b2c711f0fb8cbb220c573ad91a..679f6c1e6c35f4cd01d93e222584c34dc5222701 100644 --- a/src/main/java/org/jeecgframework/core/extend/swftools/StreamGobbler.java +++ b/src/main/java/org/jeecgframework/core/extend/swftools/StreamGobbler.java @@ -15,7 +15,8 @@ public class StreamGobbler extends Thread { this.type = type; } - public void run() { + @Override + public void run() { try { InputStreamReader isr = new InputStreamReader(is); BufferedReader br = new BufferedReader(isr); diff --git a/src/main/java/org/jeecgframework/core/extend/template/Caculator.java b/src/main/java/org/jeecgframework/core/extend/template/Caculator.java index ae1d9a301aa4672b526460a08cb1a923ca3d9507..8cf44d6bc91b8adcc8d847022d303b2e2e103c94 100644 --- a/src/main/java/org/jeecgframework/core/extend/template/Caculator.java +++ b/src/main/java/org/jeecgframework/core/extend/template/Caculator.java @@ -214,7 +214,9 @@ public class Caculator { default: int j=i; - for(;j='0'&&cin[j]<='9') ||cin[j]=='.' || cin[j]=='E');j++); + for(;j='0'&&cin[j]<='9') ||cin[j]=='.' || cin[j]=='E');j++) { + ; + } if(j==i) { throw new RuntimeException("wrong input."); diff --git a/src/main/java/org/jeecgframework/core/groovy/GroovyBinding.java b/src/main/java/org/jeecgframework/core/groovy/GroovyBinding.java index 13bfa8ac1a23697265e40225465ee0dfd73ea10f..4633bb8d39410f02e6123425bca788a6ec6a0b3c 100644 --- a/src/main/java/org/jeecgframework/core/groovy/GroovyBinding.java +++ b/src/main/java/org/jeecgframework/core/groovy/GroovyBinding.java @@ -23,7 +23,8 @@ public class GroovyBinding extends Binding { setVariable("args", args); } - public Object getVariable(String name) { + @Override + public Object getVariable(String name) { Map map = localVars.get(); Object result = null; if ((map != null) && (map.containsKey(name))) { @@ -35,7 +36,8 @@ public class GroovyBinding extends Binding { return result; } - public void setVariable(String name, Object value) { + @Override + public void setVariable(String name, Object value) { if (localVars.get() == null) { Map vars = new LinkedHashMap(); vars.put(name, value); @@ -45,7 +47,8 @@ public class GroovyBinding extends Binding { } } - public Map getVariables() { + @Override + public Map getVariables() { if (localVars.get() == null) { return new LinkedHashMap(); } @@ -57,11 +60,13 @@ public class GroovyBinding extends Binding { localVars.remove(); } - public Object getProperty(String property) { + @Override + public Object getProperty(String property) { return propertyMap.get(property); } - public void setProperty(String property, Object newValue) { + @Override + public void setProperty(String property, Object newValue) { propertyMap.put(property, newValue); } } \ No newline at end of file diff --git a/src/main/java/org/jeecgframework/core/groovy/GroovyScriptEngine.java b/src/main/java/org/jeecgframework/core/groovy/GroovyScriptEngine.java index fb101e43a3279d5d2bfff07d95f9450667e437d7..a0571d7055a7ca1ad028c45815b74d5c130a670b 100644 --- a/src/main/java/org/jeecgframework/core/groovy/GroovyScriptEngine.java +++ b/src/main/java/org/jeecgframework/core/groovy/GroovyScriptEngine.java @@ -25,8 +25,9 @@ public class GroovyScriptEngine implements BeanPostProcessor { } private void setParameters(GroovyShell shell, Map vars) { - if (vars == null) - return; + if (vars == null) { + return; + } Set set = vars.entrySet(); for (Iterator it = set.iterator(); it.hasNext();) { @SuppressWarnings("rawtypes") @@ -68,6 +69,7 @@ public class GroovyScriptEngine implements BeanPostProcessor { return rtn; } + @Override public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { boolean isImplScript = bean.getClass().isInstance(IScript.class); if (isImplScript) { @@ -76,6 +78,7 @@ public class GroovyScriptEngine implements BeanPostProcessor { return bean; } + @Override public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { return bean; } diff --git a/src/main/java/org/jeecgframework/core/interceptors/AuthInterceptor.java b/src/main/java/org/jeecgframework/core/interceptors/AuthInterceptor.java index c01fd8ffb7985c830ffe66e0f90b44f36bd57ee1..e5963b30ce574f079ccab5dc1cf2775f810aaa5c 100644 --- a/src/main/java/org/jeecgframework/core/interceptors/AuthInterceptor.java +++ b/src/main/java/org/jeecgframework/core/interceptors/AuthInterceptor.java @@ -72,17 +72,20 @@ public class AuthInterceptor implements HandlerInterceptor { /** * 在controller后拦截 */ - public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object object, Exception exception) throws Exception { + @Override + public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object object, Exception exception) throws Exception { } - public void postHandle(HttpServletRequest request, HttpServletResponse response, Object object, ModelAndView modelAndView) throws Exception { + @Override + public void postHandle(HttpServletRequest request, HttpServletResponse response, Object object, ModelAndView modelAndView) throws Exception { } /** * 在controller前拦截 */ - public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object object) throws Exception { + @Override + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object object) throws Exception { String requestPath = ResourceUtil.getRequestPath(request);// 用户访问的资源地址 //logger.info("-----authInterceptor----requestPath------"+requestPath); //步骤一： 判断是否是排除拦截请求，直接返回TRUE @@ -269,8 +272,7 @@ public class AuthInterceptor implements HandlerInterceptor { /** * 转发 * - * @param user - * @param req + * @param request * @return */ @RequestMapping(params = "forword") diff --git a/src/main/java/org/jeecgframework/core/interceptors/DateConvertEditor.java b/src/main/java/org/jeecgframework/core/interceptors/DateConvertEditor.java index 42bb299cda5087fa8068a4e1d0e89905e4d3269e..59c32211b785a469c90dcc3de3e6c4a58b86ab2c 100644 --- a/src/main/java/org/jeecgframework/core/interceptors/DateConvertEditor.java +++ b/src/main/java/org/jeecgframework/core/interceptors/DateConvertEditor.java @@ -14,7 +14,8 @@ public class DateConvertEditor extends PropertyEditorSupport { private SimpleDateFormat datetimeFormat = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss"); private SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); - public void setAsText(String text) throws IllegalArgumentException { + @Override + public void setAsText(String text) throws IllegalArgumentException { if (StringUtils.hasText(text)) { try { if (text.indexOf(":") == -1 && text.length() == 10) { diff --git a/src/main/java/org/jeecgframework/core/interceptors/EncodingInterceptor.java b/src/main/java/org/jeecgframework/core/interceptors/EncodingInterceptor.java index 460ffbcd2639945038fe40cf176a91cf6a4d15f6..b080752be2e3e30269c9004510544102fb1f074f 100644 --- a/src/main/java/org/jeecgframework/core/interceptors/EncodingInterceptor.java +++ b/src/main/java/org/jeecgframework/core/interceptors/EncodingInterceptor.java @@ -17,18 +17,21 @@ public class EncodingInterceptor implements HandlerInterceptor { /** * 在controller后拦截 */ - public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object object, Exception exception) throws Exception { + @Override + public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object object, Exception exception) throws Exception { } - public void postHandle(HttpServletRequest request, HttpServletResponse response, Object object, ModelAndView modelAndView) throws Exception { + @Override + public void postHandle(HttpServletRequest request, HttpServletResponse response, Object object, ModelAndView modelAndView) throws Exception { } /** * 在controller前拦截 */ - public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object object) throws Exception { + @Override + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object object) throws Exception { request.setCharacterEncoding("UTF-8"); response.setCharacterEncoding("UTF-8"); return true; diff --git a/src/main/java/org/jeecgframework/core/interceptors/MyWebBinding.java b/src/main/java/org/jeecgframework/core/interceptors/MyWebBinding.java index 57e90c95da64fc0e9acd593516ac843eeb9e2db7..a37feaea6571aa592240bb68c9c4d274870a22d4 100644 --- a/src/main/java/org/jeecgframework/core/interceptors/MyWebBinding.java +++ b/src/main/java/org/jeecgframework/core/interceptors/MyWebBinding.java @@ -8,7 +8,8 @@ import org.springframework.web.context.request.WebRequest; public class MyWebBinding implements WebBindingInitializer { - public void initBinder(WebDataBinder binder, WebRequest request) { + @Override + public void initBinder(WebDataBinder binder, WebRequest request) { // 1. 使用spring自带的CustomDateEditor // SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); // binder.registerCustomEditor(Date.class, new diff --git a/src/main/java/org/jeecgframework/core/servlet/UploadTmpPhotoServlet.java b/src/main/java/org/jeecgframework/core/servlet/UploadTmpPhotoServlet.java index 9393c9a875b5ed608b9f90b844a408ccb40edbf5..1652dc5b6c202e94eeeae6cab0db6dc48b8ef121 100644 --- a/src/main/java/org/jeecgframework/core/servlet/UploadTmpPhotoServlet.java +++ b/src/main/java/org/jeecgframework/core/servlet/UploadTmpPhotoServlet.java @@ -37,6 +37,7 @@ import org.apache.commons.fileupload.servlet.ServletFileUpload; public class UploadTmpPhotoServlet extends HttpServlet { + @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { @@ -44,6 +45,7 @@ public class UploadTmpPhotoServlet extends HttpServlet { } + @Override public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { @@ -60,9 +62,9 @@ public class UploadTmpPhotoServlet extends HttpServlet { File file = new File(base); - if (!file.exists()) - + if (!file.exists()) { file.mkdirs(); + } factory.setRepository(file); @@ -70,11 +72,11 @@ public class UploadTmpPhotoServlet extends HttpServlet { // 设置单个文件的最大上传值 - upload.setFileSizeMax(10002400000l); + upload.setFileSizeMax(10002400000L); // 设置整个request的最大值 - upload.setSizeMax(10002400000l); + upload.setSizeMax(10002400000L); upload.setHeaderEncoding("UTF-8"); diff --git a/src/main/java/org/jeecgframework/core/timer/DataBaseCronTriggerBean.java b/src/main/java/org/jeecgframework/core/timer/DataBaseCronTriggerBean.java index e5f6030cf1f794dbc78b501c017c43df1e8366c9..3637f2a6b325f6c2cecadfe56bf86e5f782396c0 100644 --- a/src/main/java/org/jeecgframework/core/timer/DataBaseCronTriggerBean.java +++ b/src/main/java/org/jeecgframework/core/timer/DataBaseCronTriggerBean.java @@ -21,7 +21,8 @@ public class DataBaseCronTriggerBean extends CronTriggerBean{ /** * 读取数据库更新文件 */ - public void afterPropertiesSet() { + @Override + public void afterPropertiesSet() { super.afterPropertiesSet(); TSTimeTaskEntity task = timeTaskService.findUniqueByProperty (TSTimeTaskEntity.class,"taskId",this.getName()); diff --git a/src/main/java/org/jeecgframework/core/timer/DataBaseSchedulerFactoryBean.java b/src/main/java/org/jeecgframework/core/timer/DataBaseSchedulerFactoryBean.java index 4b0b1c68ccd8c217695c8061374f84c636e33da6..00d258738fdf68d877d40ef268e73001ba45e966 100644 --- a/src/main/java/org/jeecgframework/core/timer/DataBaseSchedulerFactoryBean.java +++ b/src/main/java/org/jeecgframework/core/timer/DataBaseSchedulerFactoryBean.java @@ -19,7 +19,8 @@ public class DataBaseSchedulerFactoryBean extends SchedulerFactoryBean { /** * 读取数据库判断是否开始定时任务 */ - public void afterPropertiesSet() throws Exception { + @Override + public void afterPropertiesSet() throws Exception { super.afterPropertiesSet(); String[] trigerrNames = this.getScheduler().getTriggerNames(Scheduler.DEFAULT_GROUP); TSTimeTaskEntity task; diff --git a/src/main/java/org/jeecgframework/core/util/ApplicationContextUtil.java b/src/main/java/org/jeecgframework/core/util/ApplicationContextUtil.java index b1f264576486a8af8033f7bdd408e046393487dc..2753da54c4f1626864ac9ffb6a9ba53e8d7a02a5 100644 --- a/src/main/java/org/jeecgframework/core/util/ApplicationContextUtil.java +++ b/src/main/java/org/jeecgframework/core/util/ApplicationContextUtil.java @@ -14,7 +14,8 @@ public class ApplicationContextUtil implements ApplicationContextAware { private static ApplicationContext context; - public void setApplicationContext(ApplicationContext context) + @Override + public void setApplicationContext(ApplicationContext context) throws BeansException { this.context = context; } diff --git a/src/main/java/org/jeecgframework/core/util/BrowserUtils.java b/src/main/java/org/jeecgframework/core/util/BrowserUtils.java index 70b82f0580560778a4d329b80241d7feeee8224e..1c9d478346a4ed6b9ba6989b809509f68c4bd509 100644 --- a/src/main/java/org/jeecgframework/core/util/BrowserUtils.java +++ b/src/main/java/org/jeecgframework/core/util/BrowserUtils.java @@ -113,34 +113,48 @@ public class BrowserUtils { public static String checkBrowse(HttpServletRequest request) { String userAgent = request.getHeader("USER-AGENT"); - if (regex(OPERA, userAgent)) - return OPERA; - if (regex(CHROME, userAgent)) - return CHROME; - if (regex(FIREFOX, userAgent)) - return FIREFOX; - if (regex(SAFARI, userAgent)) - return SAFARI; - if (regex(SE360, userAgent)) - return SE360; - if (regex(GREEN, userAgent)) - return GREEN; - if (regex(QQ, userAgent)) - return QQ; - if (regex(MAXTHON, userAgent)) - return MAXTHON; - if (regex(IE11, userAgent)) - return IE11; - if (regex(IE10, userAgent)) - return IE10; - if (regex(IE9, userAgent)) - return IE9; - if (regex(IE8, userAgent)) - return IE8; - if (regex(IE7, userAgent)) - return IE7; - if (regex(IE6, userAgent)) - return IE6; + if (regex(OPERA, userAgent)) { + return OPERA; + } + if (regex(CHROME, userAgent)) { + return CHROME; + } + if (regex(FIREFOX, userAgent)) { + return FIREFOX; + } + if (regex(SAFARI, userAgent)) { + return SAFARI; + } + if (regex(SE360, userAgent)) { + return SE360; + } + if (regex(GREEN, userAgent)) { + return GREEN; + } + if (regex(QQ, userAgent)) { + return QQ; + } + if (regex(MAXTHON, userAgent)) { + return MAXTHON; + } + if (regex(IE11, userAgent)) { + return IE11; + } + if (regex(IE10, userAgent)) { + return IE10; + } + if (regex(IE9, userAgent)) { + return IE9; + } + if (regex(IE8, userAgent)) { + return IE8; + } + if (regex(IE7, userAgent)) { + return IE7; + } + if (regex(IE6, userAgent)) { + return IE6; + } return OTHER; } diff --git a/src/main/java/org/jeecgframework/core/util/DateUtils.java b/src/main/java/org/jeecgframework/core/util/DateUtils.java index 43c08eabae71f517751edb96e4df2138b12b813b..49473a221b00c663a05a6865739d29691ed3006d 100644 --- a/src/main/java/org/jeecgframework/core/util/DateUtils.java +++ b/src/main/java/org/jeecgframework/core/util/DateUtils.java @@ -140,10 +140,8 @@ public class DateUtils extends PropertyEditorSupport { /** * 日期转换为字符串 - * - * @param date - * 日期 - * @param format + * + * @param date_sdf * 日期格式 * @return 字符串 */ @@ -177,7 +175,7 @@ public class DateUtils extends PropertyEditorSupport { * * @param date * 日期 - * @param format + * @param date_sdf * 日期格式 * @return 字符串 */ @@ -189,8 +187,7 @@ public class DateUtils extends PropertyEditorSupport { } /** * 日期转换为字符串 - * - * @param date + * * 日期 * @param format * 日期格式 @@ -521,7 +518,7 @@ public class DateUtils extends PropertyEditorSupport { * 转换的匹配格式 * @return 如果转换成功则返回转换后的日期 * @throws ParseException - * @throws AIDateFormatException + * @throws */ public static Date parseDate(String src, String pattern) throws ParseException { @@ -538,7 +535,7 @@ public class DateUtils extends PropertyEditorSupport { * 转换的匹配格式 * @return 如果转换成功则返回转换后的日期 * @throws ParseException - * @throws AIDateFormatException + * @throws */ public static Calendar parseCalendar(String src, String pattern) throws ParseException { @@ -566,7 +563,7 @@ public class DateUtils extends PropertyEditorSupport { * 转换的匹配格式 * @return 如果转换成功则返回转换后的时间戳 * @throws ParseException - * @throws AIDateFormatException + * @throws */ public static Timestamp parseTimestamp(String src, String pattern) throws ParseException { @@ -623,7 +620,8 @@ public class DateUtils extends PropertyEditorSupport { * * @param text * String类型的时间值 */ - public void setAsText(String text) throws IllegalArgumentException { + @Override + public void setAsText(String text) throws IllegalArgumentException { if (StringUtils.hasText(text)) { try { if (text.indexOf(":") == -1 && text.length() == 10) { diff --git a/src/main/java/org/jeecgframework/core/util/FormUtil.java b/src/main/java/org/jeecgframework/core/util/FormUtil.java index a93f69e55d62c2f7f4f86120fb041eafce9bcb0e..66351fc9ea4c581e932abe7252bfc99eab4af1f1 100644 --- a/src/main/java/org/jeecgframework/core/util/FormUtil.java +++ b/src/main/java/org/jeecgframework/core/util/FormUtil.java @@ -49,8 +49,9 @@ public class FormUtil { JSONArray jsonArray = new JSONArray().fromObject(contentData); for (int f = 0; f < jsonArray.size(); f++) { if (jsonArray.getJSONObject(f) == null - || "".equals(jsonArray.getJSONObject(f))) - continue; + || "".equals(jsonArray.getJSONObject(f))) { + continue; + } JSONObject json = jsonArray.getJSONObject(f);// 获取对象 @@ -59,10 +60,11 @@ public class FormUtil { } String leipiplugins = json.getString("leipiplugins").toString(); - if ("checkboxs".equals(leipiplugins)) - name = json.getString("parse_name").toString(); - else - name = json.getString("name").toString(); + if ("checkboxs".equals(leipiplugins)) { + name = json.getString("parse_name").toString(); + } else { + name = json.getString("name").toString(); + } String temp_html = ""; if ("text".equals(leipiplugins)) { @@ -104,23 +106,27 @@ public class FormUtil { String value = formData.get(name) == null ? null : formData.get(name) .toString(); - if (value == null) - value = item.getString("value") == null ? "" : item.getString( - "value").toString(); + if (value == null) { + value = item.getString("value") == null ? "" : item.getString( + "value").toString(); + } String style = item.getString("style") == null ? "" : item.getString( "style").toString(); String temp_html = MessageFormat.format(temp, value, name, style); - if ("view".equals(action)) - return MessageFormat.format(temp_view, style, value); - else - return temp_html; + if ("view".equals(action)) { + return MessageFormat.format(temp_view, style, value); + } else { + return temp_html; + } } // popup private static String GetPopUp(JSONObject item, Map formData, String action) { String dictionary = item.getString("dictionary").toString(); String[]dic = new String[]{"","",""}; - if(dictionary.split(",").length>1)dic = dictionary.split(","); + if(dictionary.split(",").length>1) { + dic = dictionary.split(","); + } String temp = ""; String name = item.getString("name").toString(); @@ -131,25 +137,28 @@ public class FormUtil { String style = item.getString("style") == null ? "" : item.getString( "style").toString(); String temp_html = MessageFormat.format(temp, value, name, style,dic[1],dic[0]); - if ("view".equals(action)) - return MessageFormat.format(temp_view, style, value,dic[1],dic[0]); - else - return temp_html; + if ("view".equals(action)) { + return MessageFormat.format(temp_view, style, value,dic[1],dic[0]); + } else { + return temp_html; + } } // TextArea private static String GetTextArea(JSONObject item, Map formData, String action) { String script = ""; if (item.getString("orgrich") != null - && "1".equals(item.getString("orgrich").toString())) - script = "orgrich=\"true\" "; + && "1".equals(item.getString("orgrich").toString())) { + script = "orgrich=\"true\" "; + } String name = item.getString("name").toString(); String value = formData.get(name) == null ? null : formData.get(name) .toString(); - if (value == null) - value = item.getString("value") == null ? "" : item.getString( - "value").toString(); + if (value == null) { + value = item.getString("value") == null ? "" : item.getString( + "value").toString(); + } String style = item.getString("style") == null ? "" : item.getString( "style").toString(); @@ -158,10 +167,11 @@ public class FormUtil { String temp_html = MessageFormat.format(temp, name, name, style, script, value); - if ("view".equals(action)) - return MessageFormat.format(temp_view, style, value); - else - return temp_html; + if ("view".equals(action)) { + return MessageFormat.format(temp_view, style, value); + } else { + return temp_html; + } } // Radios @@ -196,10 +206,11 @@ public class FormUtil { temp_html += MessageFormat.format(temp, name, cvalue, Ischecked, cvalue); } - if ("view".equals(action)) - return MessageFormat.format(temp_view, " ", cvalue_); - else - return temp_html; + if ("view".equals(action)) { + return MessageFormat.format(temp_view, " ", cvalue_); + } else { + return temp_html; + } } // Checkboxs @@ -237,10 +248,11 @@ public class FormUtil { cvalue); } - if ("view".equals(action)) - return MessageFormat.format(temp_view, " ", view_value); - else - return temp_html; + if ("view".equals(action)) { + return MessageFormat.format(temp_view, " ", view_value); + } else { + return temp_html; + } } // Select(比较特殊) @@ -264,8 +276,9 @@ public class FormUtil { return MessageFormat.format(temp_view, " ", value != null ? value : item.getString("value").toString() .split(",")[0]); - } else - return temp_html; + } else { + return temp_html; + } } // Macros @@ -331,9 +344,10 @@ public class FormUtil { } // endregion } - if ("view".equals(action)) - return value.replace("${userId}", ClientManager.getInstance().getClient().getUser().getId()) - .replace("${userName}", ClientManager.getInstance().getClient().getUser().getUserName()); + if ("view".equals(action)) { + return value.replace("${userId}", ClientManager.getInstance().getClient().getUser().getId()) + .replace("${userName}", ClientManager.getInstance().getClient().getUser().getUserName()); + } if(value!=null){ temp_html = temp_html.replace("type=\"text\"","type=\""+microtype+"\" "); return temp_html.replace("{macros}", value); @@ -360,8 +374,9 @@ public class FormUtil { orgType = "电话"; } String qrcode_value = ""; - if (item.getString("value") != null) - qrcode_value = item.getString("value").toString(); + if (item.getString("value") != null) { + qrcode_value = item.getString("value").toString(); + } // print_R($qrcode_value);exit; //array(value,qrcode_url) if ("edit".equals(action)) { temp = orgType @@ -432,10 +447,12 @@ public class FormUtil { String trTitle = "";// 标题 for (int i = 0; i < tdCount; i++) { - if (i == tdCount - 1) - listTitle.set(i, "操作"); - if ("view".equals(action) && i == tdCount - 1) - continue;// 如果是查看最后一列不显示 + if (i == tdCount - 1) { + listTitle.set(i, "操作"); + } + if ("view".equals(action) && i == tdCount - 1) { + continue;// 如果是查看最后一列不显示 + } trTitle += MessageFormat.format("{0}", listTitle.get(i)); } trTitle = "" + trTitle + ""; @@ -470,8 +487,9 @@ public class FormUtil { { // region 计算统计值 float tempTdValue = 0; - if (SumValueDic.containsKey(i)) - tempTdValue = SumValueDic.get(i); + if (SumValueDic.containsKey(i)) { + tempTdValue = SumValueDic.get(i); + } try { float resultTdTemp = 0; resultTdTemp = Float.parseFloat(tdValue); @@ -480,21 +498,24 @@ public class FormUtil { } catch (Exception e) { tdValue = "0"; } - if (SumValueDic.containsKey(i)) - SumValueDic.subMap(i, (int) tempTdValue); - else - SumValueDic.put(i, tempTdValue); + if (SumValueDic.containsKey(i)) { + SumValueDic.subMap(i, (int) tempTdValue); + } else { + SumValueDic.put(i, tempTdValue); + } // endregion } if (i == tdCount - 1)// 最后一列不显示 { - if ("view".equals(action)) - continue; + if ("view".equals(action)) { + continue; + } // tr += ""; - else - tr += "删除"; + else { + tr += "删除"; + } // tr += // string.Format("删除", // dataValue != null ? "" : "hide"); @@ -502,26 +523,27 @@ public class FormUtil { if ("view".equals(action)) { tr += MessageFormat.format("{0}", tdValue); } else { - if ("text".equals(type)) - tr += MessageFormat - .format( - "", - tdValue, tdname, sum); - else if ("int".equals(type)) - tr += MessageFormat - .format( - "", - tdValue, tdname, sum); - else if ("textarea".equals(type)) - tr += MessageFormat - .format( - "", - tdname, tdValue, sum); - else if ("calc".equals(type)) - tr += MessageFormat - .format( - "", - tdValue, tdname, sum); + if ("text".equals(type)) { + tr += MessageFormat + .format( + "", + tdValue, tdname, sum); + } else if ("int".equals(type)) { + tr += MessageFormat + .format( + "", + tdValue, tdname, sum); + } else if ("textarea".equals(type)) { + tr += MessageFormat + .format( + "", + tdname, tdValue, sum); + } else if ("calc".equals(type)) { + tr += MessageFormat + .format( + "", + tdValue, tdname, sum); + } } } @@ -529,15 +551,16 @@ public class FormUtil { { // region if (sum != "") { - if ("view".equals(action)) - tdSum += MessageFormat.format( - "合计：value{0}{1}", i, listUnit - .get(i)); - else - tdSum += MessageFormat - .format( - "合计：{3}", - i, tdname, sum, listUnit.get(i)); + if ("view".equals(action)) { + tdSum += MessageFormat.format( + "合计：value{0}{1}", i, listUnit + .get(i)); + } else { + tdSum += MessageFormat + .format( + "合计：{3}", + i, tdname, sum, listUnit.get(i)); + } } else { tdSum += ""; } @@ -564,12 +587,13 @@ public class FormUtil { "{0}", tdSum); } } - if ("view".equals(action)) - theader = MessageFormat - .format(theader, tdCount, title, "", trTitle); - else - theader = MessageFormat.format(theader, tdCount, title, btnAdd, - trTitle); + if ("view".equals(action)) { + theader = MessageFormat + .format(theader, tdCount, title, "", trTitle); + } else { + theader = MessageFormat.format(theader, tdCount, title, btnAdd, + trTitle); + } temp_html = MessageFormat.format(temp, theader, sbTr.toString(), tdSum); diff --git a/src/main/java/org/jeecgframework/core/util/IdcardUtils.java b/src/main/java/org/jeecgframework/core/util/IdcardUtils.java index 4585ebfbaac58ac414f6d3a97ca0c14fd8172f57..ececc4a35d5161a1ce14550d1f961023e57e9393 100644 --- a/src/main/java/org/jeecgframework/core/util/IdcardUtils.java +++ b/src/main/java/org/jeecgframework/core/util/IdcardUtils.java @@ -141,8 +141,9 @@ public class IdcardUtils extends StringUtils { e.printStackTrace(); } Calendar cal = Calendar.getInstance(); - if (birthDate != null) + if (birthDate != null) { cal.setTime(birthDate); + } // 获取出生年(完全表现形式,如：2010) String sYear = String.valueOf(cal.get(Calendar.YEAR)); idCard18 = idCard.substring(0, 6) + sYear + idCard.substring(8); @@ -240,8 +241,9 @@ public class IdcardUtils extends StringUtils { e.printStackTrace(); } Calendar cal = Calendar.getInstance(); - if (birthDate != null) + if (birthDate != null) { cal.setTime(birthDate); + } if (!valiDate(cal.get(Calendar.YEAR), Integer.valueOf(birthCode.substring(2, 4)), Integer.valueOf(birthCode.substring(4, 6)))) { return false; diff --git a/src/main/java/org/jeecgframework/core/util/JeecgSqlUtil.java b/src/main/java/org/jeecgframework/core/util/JeecgSqlUtil.java index 8d9f74178fadbed0cdd8756593d9a255dae07a59..521b882ddbce24edbc897ccfa315b85ce3eb5ff9 100644 --- a/src/main/java/org/jeecgframework/core/util/JeecgSqlUtil.java +++ b/src/main/java/org/jeecgframework/core/util/JeecgSqlUtil.java @@ -81,8 +81,9 @@ public class JeecgSqlUtil { try { - if (reader != null) - reader.close(); + if (reader != null) { + reader.close(); + } } catch (IOException e) { @@ -96,7 +97,7 @@ public class JeecgSqlUtil { /** * 读取SQL内容 - * @param args + * @param fileUrl * @throws IOException */ @@ -169,8 +170,9 @@ public class JeecgSqlUtil { BufferedReader br=new BufferedReader(new InputStreamReader(is)); String s=""; try { - while((s=br.readLine())!=null) - sb.append(s+" "); + while((s=br.readLine())!=null) { + sb.append(s+" "); + } } catch (IOException e) { e.printStackTrace(); } @@ -217,8 +219,9 @@ public class JeecgSqlUtil { @SuppressWarnings("unchecked") public static String getAppPath(Class cls) { // 检查用户传入的参数是否为空 - if (cls == null) - throw new java.lang.IllegalArgumentException("参数不能为空！"); + if (cls == null) { + throw new IllegalArgumentException("参数不能为空！"); + } ClassLoader loader = cls.getClassLoader(); // 获得类的全名，包括包名 String clsName = cls.getName() + ".class"; @@ -229,14 +232,15 @@ public class JeecgSqlUtil { if (pack != null) { String packName = pack.getName(); // 此处简单判定是否是Java基础类库，防止用户传入JDK内置的类库 - if (packName.startsWith("java.") || packName.startsWith("javax.")) - throw new java.lang.IllegalArgumentException("不要传送系统类！"); + if (packName.startsWith("java.") || packName.startsWith("javax.")) { + throw new IllegalArgumentException("不要传送系统类！"); + } // 在类的名称中，去掉包名的部分，获得类的文件名 clsName = clsName.substring(packName.length() + 1); // 判定包名是否是简单包名，如果是，则直接将包名转换为路径， - if (packName.indexOf(".") < 0) - path = packName + "/"; - else {// 否则按照包名的组成部分，将包名转换为路径 + if (packName.indexOf(".") < 0) { + path = packName + "/"; + } else {// 否则按照包名的组成部分，将包名转换为路径 int start = 0, end = 0; end = packName.indexOf("."); while (end != -1) { @@ -253,14 +257,16 @@ public class JeecgSqlUtil { String realPath = url.getPath(); // 去掉路径信息中的协议名"file:" int pos = realPath.indexOf("file:"); - if (pos > -1) - realPath = realPath.substring(pos + 5); + if (pos > -1) { + realPath = realPath.substring(pos + 5); + } // 去掉路径信息最后包含类文件信息的部分，得到类所在的路径 pos = realPath.indexOf(path + clsName); realPath = realPath.substring(0, pos - 1); // 如果类文件被打包到JAR等文件中时，去掉对应的JAR等打包文件名 - if (realPath.endsWith("!")) - realPath = realPath.substring(0, realPath.lastIndexOf("/")); + if (realPath.endsWith("!")) { + realPath = realPath.substring(0, realPath.lastIndexOf("/")); + } /*------------------------------------------------------------ ClassLoader的getResource方法使用了utf-8对路径信息进行了编码，当路径 中存在中文和空格时，他会对这些字符进行转换，这样，得到的往往不是我们想要 diff --git a/src/main/java/org/jeecgframework/core/util/ListUtils.java b/src/main/java/org/jeecgframework/core/util/ListUtils.java index c7dcf974ba62ba9c23eb9a905d9cb753bef0cbfb..25ad9081ea1436d2efbc131d2be9ea4152bbcd9e 100644 --- a/src/main/java/org/jeecgframework/core/util/ListUtils.java +++ b/src/main/java/org/jeecgframework/core/util/ListUtils.java @@ -11,12 +11,13 @@ public class ListUtils { * 按新的Class对象复制 * * @param source list, example: list - * @param dest class, example: UserEntity.class; + * @param source class, example: UserEntity.class; */ public static List copyTo(List source, Class destinationClass) throws Exception { - if (source.size() == 0) - return new ArrayList(); + if (source.size() == 0) { + return new ArrayList(); + } List res = new ArrayList(source.size()); for (Object o : source) { E e = destinationClass.newInstance(); diff --git a/src/main/java/org/jeecgframework/core/util/LogUtil.java b/src/main/java/org/jeecgframework/core/util/LogUtil.java index 4faa54b57c27a80512543f0cc3c35745af75f890..a4617650066e07f59c0b995c4abdaaf2821871d0 100644 --- a/src/main/java/org/jeecgframework/core/util/LogUtil.java +++ b/src/main/java/org/jeecgframework/core/util/LogUtil.java @@ -205,8 +205,9 @@ public class LogUtil { String input = sw.getBuffer().toString(); StringReader sr = new StringReader(input); BufferedReader br = new BufferedReader(sr); - for(int i=0;i<4;i++) - br.readLine(); + for(int i=0;i<4;i++) { + br.readLine(); + } String line = br.readLine(); //at com.media.web.action.DicManageAction.list(DicManageAction.java:89) int paren = line.indexOf("at "); diff --git a/src/main/java/org/jeecgframework/core/util/MutiLangUtil.java b/src/main/java/org/jeecgframework/core/util/MutiLangUtil.java index 174b7b723c699905e898fcce28ef3445c4436f8b..a0207e460b5a8d78977ab12c058597765431c858 100644 --- a/src/main/java/org/jeecgframework/core/util/MutiLangUtil.java +++ b/src/main/java/org/jeecgframework/core/util/MutiLangUtil.java @@ -80,7 +80,9 @@ public class MutiLangUtil { */ public static void setMutiTree(List treeList) { - if(ListUtils.isNullOrEmpty(treeList)) return; + if(ListUtils.isNullOrEmpty(treeList)) { + return; + } for(Object treeItem : treeList) { diff --git a/src/main/java/org/jeecgframework/core/util/MyClassLoader.java b/src/main/java/org/jeecgframework/core/util/MyClassLoader.java index 4e003d257e8472818b41a7da1e0190f4666217a5..e1315e2d9e3cf84af25cc429c0d19aa66b81dac3 100644 --- a/src/main/java/org/jeecgframework/core/util/MyClassLoader.java +++ b/src/main/java/org/jeecgframework/core/util/MyClassLoader.java @@ -19,8 +19,9 @@ public class MyClassLoader extends ClassLoader { // 获得类的全名，包括包名 public static String getPackPath(Object object) { // 检查用户传入的参数是否为空 - if (object == null) - throw new java.lang.IllegalArgumentException("参数不能为空！"); + if (object == null) { + throw new IllegalArgumentException("参数不能为空！"); + } // 获得类的全名，包括包名 String clsName = object.getClass().getName(); return clsName; @@ -28,8 +29,9 @@ public class MyClassLoader extends ClassLoader { public static String getAppPath(Class cls) { // 检查用户传入的参数是否为空 - if (cls == null) - throw new java.lang.IllegalArgumentException("参数不能为空！"); + if (cls == null) { + throw new IllegalArgumentException("参数不能为空！"); + } ClassLoader loader = cls.getClassLoader(); // 获得类的全名，包括包名 String clsName = cls.getName() + ".class"; @@ -40,14 +42,15 @@ public class MyClassLoader extends ClassLoader { if (pack != null) { String packName = pack.getName(); // 此处简单判定是否是Java基础类库，防止用户传入JDK内置的类库 - if (packName.startsWith("java.") || packName.startsWith("javax.")) - throw new java.lang.IllegalArgumentException("不要传送系统类！"); + if (packName.startsWith("java.") || packName.startsWith("javax.")) { + throw new IllegalArgumentException("不要传送系统类！"); + } // 在类的名称中，去掉包名的部分，获得类的文件名 clsName = clsName.substring(packName.length() + 1); // 判定包名是否是简单包名，如果是，则直接将包名转换为路径， - if (packName.indexOf(".") < 0) - path = packName + "/"; - else {// 否则按照包名的组成部分，将包名转换为路径 + if (packName.indexOf(".") < 0) { + path = packName + "/"; + } else {// 否则按照包名的组成部分，将包名转换为路径 int start = 0, end = 0; end = packName.indexOf("."); while (end != -1) { @@ -64,14 +67,16 @@ public class MyClassLoader extends ClassLoader { String realPath = url.getPath(); // 去掉路径信息中的协议名"file:" int pos = realPath.indexOf("file:"); - if (pos > -1) - realPath = realPath.substring(pos + 5); + if (pos > -1) { + realPath = realPath.substring(pos + 5); + } // 去掉路径信息最后包含类文件信息的部分，得到类所在的路径 pos = realPath.indexOf(path + clsName); realPath = realPath.substring(0, pos - 1); // 如果类文件被打包到JAR等文件中时，去掉对应的JAR等打包文件名 - if (realPath.endsWith("!")) - realPath = realPath.substring(0, realPath.lastIndexOf("/")); + if (realPath.endsWith("!")) { + realPath = realPath.substring(0, realPath.lastIndexOf("/")); + } /*------------------------------------------------------------ ClassLoader的getResource方法使用了utf-8对路径信息进行了编码，当路径 中存在中文和空格时，他会对这些字符进行转换，这样，得到的往往不是我们想要 diff --git a/src/main/java/org/jeecgframework/core/util/NumberComparator.java b/src/main/java/org/jeecgframework/core/util/NumberComparator.java index 625454b91dd2db4b8e0b0598632464a1df2e65fb..266022b9d4413b8d6c55fc0d7432d2123a8380e3 100644 --- a/src/main/java/org/jeecgframework/core/util/NumberComparator.java +++ b/src/main/java/org/jeecgframework/core/util/NumberComparator.java @@ -21,7 +21,8 @@ public class NumberComparator implements Comparator { this.ignoreCase = ignoreCase; } - public int compare(Object obj1, Object obj2) { + @Override + public int compare(Object obj1, Object obj2) { String o1 = ""; String o2 = ""; if (ignoreCase) { diff --git a/src/main/java/org/jeecgframework/core/util/PropertiesUtil.java b/src/main/java/org/jeecgframework/core/util/PropertiesUtil.java index d3fb9bc893767838ae3732d451738629930581e3..fa91ce3a706b7765abc575e65779cdc25199f7d2 100644 --- a/src/main/java/org/jeecgframework/core/util/PropertiesUtil.java +++ b/src/main/java/org/jeecgframework/core/util/PropertiesUtil.java @@ -83,10 +83,12 @@ public class PropertiesUtil { e.printStackTrace(); } finally { try { - if (null != is) - is.close(); - if (null != os) - os.close(); + if (null != is) { + is.close(); + } + if (null != os) { + os.close(); + } } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/src/main/java/org/jeecgframework/core/util/QRcodeUtil.java b/src/main/java/org/jeecgframework/core/util/QRcodeUtil.java index 9b031b1375edbb39f4f57186b36f88b9e2dc2430..d682b349bc6778e5bdec7dccf358d0397994cd29 100644 --- a/src/main/java/org/jeecgframework/core/util/QRcodeUtil.java +++ b/src/main/java/org/jeecgframework/core/util/QRcodeUtil.java @@ -64,7 +64,9 @@ public class QRcodeUtil { /** 在二维码中间插入logo图片 */ private static void insertImage(BufferedImage source, InputStream logo, boolean needCompress)throws Exception { - if(logo==null)return; + if(logo==null) { + return; + } Image src = ImageIO.read(logo); int width = src.getWidth(null); int height = src.getHeight(null); @@ -215,6 +217,7 @@ public class QRcodeUtil { this.top = top; } + @Override public byte[] getRow(int y, byte[] row) { if (y < 0 || y >= getHeight()) { throw new IllegalArgumentException("Requested row is outside the image: " + y); @@ -227,6 +230,7 @@ public class QRcodeUtil { return row; } + @Override public byte[] getMatrix() { int width = getWidth(); int height = getHeight(); @@ -236,19 +240,23 @@ public class QRcodeUtil { return matrix; } + @Override public boolean isCropSupported() { return true; } + @Override public LuminanceSource crop(int left, int top, int width, int height) { return new BufferedImageLuminanceSource(image, this.left + left, this.top + top, width, height); } + @Override public boolean isRotateSupported() { return true; } + @Override public LuminanceSource rotateCounterClockwise() { int sourceWidth = image.getWidth(); int sourceHeight = image.getHeight(); diff --git a/src/main/java/org/jeecgframework/core/util/ResourceUtil.java b/src/main/java/org/jeecgframework/core/util/ResourceUtil.java index ba5d510ab4e20695927cfe8680fa9c916796814d..a70adb0a5ef2ac92480d81f2c5dca394a9a268ed 100644 --- a/src/main/java/org/jeecgframework/core/util/ResourceUtil.java +++ b/src/main/java/org/jeecgframework/core/util/ResourceUtil.java @@ -158,7 +158,7 @@ public class ResourceUtil { /** * 获取配置文件参数 * - * @param name + * @param path * @return */ public static final Map getConfigMap(String path) { @@ -347,14 +347,15 @@ public class ResourceUtil { /** * 处理数据权限规则变量 * 以用户变量为准 先得到用户变量，如果用户没有设置，则获到 系统变量 - * @param key + * @param ruleValue * Session 中的值 * @return */ public static String converRuleValue(String ruleValue) { String value = ResourceUtil.getSessionData(ruleValue); - if(StringUtil.isEmpty(value)) - value = ResourceUtil.getUserSystemData(ruleValue); + if(StringUtil.isEmpty(value)) { + value = ResourceUtil.getUserSystemData(ruleValue); + } return value!= null ? value : ruleValue; } diff --git a/src/main/java/org/jeecgframework/core/util/SendMailUtil.java b/src/main/java/org/jeecgframework/core/util/SendMailUtil.java index a381eff2283cbe2130433346a20d650188d7a61f..0c2a0299dbbe8708038a80ae715ed248b3046c5f 100644 --- a/src/main/java/org/jeecgframework/core/util/SendMailUtil.java +++ b/src/main/java/org/jeecgframework/core/util/SendMailUtil.java @@ -182,8 +182,9 @@ public class SendMailUtil @SuppressWarnings("unchecked") public static String getAppPath(Class cls) { // 检查用户传入的参数是否为空 - if (cls == null) - throw new java.lang.IllegalArgumentException("参数不能为空！"); + if (cls == null) { + throw new IllegalArgumentException("参数不能为空！"); + } ClassLoader loader = cls.getClassLoader(); // 获得类的全名，包括包名 String clsName = cls.getName() + ".class"; @@ -194,14 +195,15 @@ public class SendMailUtil if (pack != null) { String packName = pack.getName(); // 此处简单判定是否是Java基础类库，防止用户传入JDK内置的类库 - if (packName.startsWith("java.") || packName.startsWith("javax.")) - throw new java.lang.IllegalArgumentException("不要传送系统类！"); + if (packName.startsWith("java.") || packName.startsWith("javax.")) { + throw new IllegalArgumentException("不要传送系统类！"); + } // 在类的名称中，去掉包名的部分，获得类的文件名 clsName = clsName.substring(packName.length() + 1); // 判定包名是否是简单包名，如果是，则直接将包名转换为路径， - if (packName.indexOf(".") < 0) - path = packName + "/"; - else {// 否则按照包名的组成部分，将包名转换为路径 + if (packName.indexOf(".") < 0) { + path = packName + "/"; + } else {// 否则按照包名的组成部分，将包名转换为路径 int start = 0, end = 0; end = packName.indexOf("."); while (end != -1) { @@ -218,14 +220,16 @@ public class SendMailUtil String realPath = url.getPath(); // 去掉路径信息中的协议名"file:" int pos = realPath.indexOf("file:"); - if (pos > -1) - realPath = realPath.substring(pos + 5); + if (pos > -1) { + realPath = realPath.substring(pos + 5); + } // 去掉路径信息最后包含类文件信息的部分，得到类所在的路径 pos = realPath.indexOf(path + clsName); realPath = realPath.substring(0, pos - 1); // 如果类文件被打包到JAR等文件中时，去掉对应的JAR等打包文件名 - if (realPath.endsWith("!")) - realPath = realPath.substring(0, realPath.lastIndexOf("/")); + if (realPath.endsWith("!")) { + realPath = realPath.substring(0, realPath.lastIndexOf("/")); + } /*------------------------------------------------------------ ClassLoader的getResource方法使用了utf-8对路径信息进行了编码，当路径 中存在中文和空格时，他会对这些字符进行转换，这样，得到的往往不是我们想要 diff --git a/src/main/java/org/jeecgframework/core/util/SetListSort.java b/src/main/java/org/jeecgframework/core/util/SetListSort.java index a9c98084463b729c6adebef99cf392cda985f238..ec78491af52707fde01b128c730263e9766c7c52 100644 --- a/src/main/java/org/jeecgframework/core/util/SetListSort.java +++ b/src/main/java/org/jeecgframework/core/util/SetListSort.java @@ -16,7 +16,8 @@ public class SetListSort implements Comparator { /** * 菜单排序比较器 */ - public int compare(Object o1, Object o2) { + @Override + public int compare(Object o1, Object o2) { TSFunction c1 = (TSFunction) o1; TSFunction c2 = (TSFunction) o2; if (c1.getFunctionOrder() != null && c2.getFunctionOrder() != null) { diff --git a/src/main/java/org/jeecgframework/core/util/StreamUtils.java b/src/main/java/org/jeecgframework/core/util/StreamUtils.java index 6a8d77efa5cd029f21f5484c4d27e49bc7a6bae5..6bafd7e67ac9f00297fe2ce6eecaa337ca9a3474 100644 --- a/src/main/java/org/jeecgframework/core/util/StreamUtils.java +++ b/src/main/java/org/jeecgframework/core/util/StreamUtils.java @@ -39,8 +39,9 @@ public class StreamUtils { String string = null; int count = 0; try { - while ((count = in.read(data, 0, BUFFER_SIZE)) != -1) - outStream.write(data, 0, count); + while ((count = in.read(data, 0, BUFFER_SIZE)) != -1) { + outStream.write(data, 0, count); + } } catch (IOException e) { e.printStackTrace(); } @@ -68,8 +69,9 @@ public class StreamUtils { byte[] data = new byte[BUFFER_SIZE]; int count = -1; try { - while ((count = in.read(data, 0, BUFFER_SIZE)) != -1) - outStream.write(data, 0, count); + while ((count = in.read(data, 0, BUFFER_SIZE)) != -1) { + outStream.write(data, 0, count); + } } catch (IOException e) { e.printStackTrace(); } @@ -127,8 +129,9 @@ public class StreamUtils { ByteArrayOutputStream outStream = new ByteArrayOutputStream(); byte[] data = new byte[BUFFER_SIZE]; int count = -1; - while ((count = in.read(data, 0, BUFFER_SIZE)) != -1) - outStream.write(data, 0, count); + while ((count = in.read(data, 0, BUFFER_SIZE)) != -1) { + outStream.write(data, 0, count); + } data = null; return outStream.toByteArray(); @@ -216,7 +219,7 @@ public class StreamUtils { /** * 根据文件路径创建文件输入流处理 * 以字节为单位（非 unicode ） - * @param path + * @param filepath * @return */ public static FileInputStream getFileInputStream(String filepath) { @@ -232,7 +235,7 @@ public class StreamUtils { /** * 根据文件对象创建文件输入流处理 * 以字节为单位（非 unicode ） - * @param path + * @param file * @return */ public static FileInputStream getFileInputStream(File file) { @@ -265,7 +268,7 @@ public class StreamUtils { /** * 根据文件路径创建文件输出流处理 * 以字节为单位（非 unicode ） - * @param path + * @param filepath * @param append true:文件以追加方式打开,false:则覆盖原文件的内容 * @return */ diff --git a/src/main/java/org/jeecgframework/core/util/StringUtil.java b/src/main/java/org/jeecgframework/core/util/StringUtil.java index 94aaf863408eab3517eb3dcee7881df2e3229c85..712b9f22fe7eacca4261ae4277945e116a09ea09 100644 --- a/src/main/java/org/jeecgframework/core/util/StringUtil.java +++ b/src/main/java/org/jeecgframework/core/util/StringUtil.java @@ -1,5 +1,14 @@ package org.jeecgframework.core.util; +import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.dom4j.Document; +import org.dom4j.DocumentHelper; +import org.dom4j.io.HTMLWriter; +import org.dom4j.io.OutputFormat; + import java.beans.XMLDecoder; import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; @@ -8,27 +17,10 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.net.URLEncoder; import java.text.DecimalFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.lang.RandomStringUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.dom4j.Document; -import org.dom4j.DocumentHelper; -import org.dom4j.io.HTMLWriter; -import org.dom4j.io.OutputFormat; - /** * 字符串处理及转换工具类 * @author admin @@ -125,11 +117,13 @@ public class StringUtil { if (array != null) { for (int i = 0; i < array.size(); i++) { String temp = array.get(i).toString(); - if (temp != null && temp.trim().length() > 0) - result += (temp + symbol); + if (temp != null && temp.trim().length() > 0) { + result += (temp + symbol); + } } - if (result.length() > 1) - result = result.substring(0, result.length() - 1); + if (result.length() > 1) { + result = result.substring(0, result.length() - 1); + } } return result; } @@ -188,7 +182,6 @@ public class StringUtil { * @param len * 　字符串长度　长度计量单位为一个GBK汉字　　两个英文字母计算为一个单位长度 * @param str - * @param symbol * @return12 */ public static String getLimitLengthString(String str, int len) { @@ -222,11 +215,13 @@ public class StringUtil { if (array != null) { for (int i = 0; i < array.length; i++) { String temp = array[i]; - if (temp != null && temp.trim().length() > 0) - result += (temp + symbol); + if (temp != null && temp.trim().length() > 0) { + result += (temp + symbol); + } } - if (result.length() > 1) - result = result.substring(0, result.length() - 1); + if (result.length() > 1) { + result = result.substring(0, result.length() - 1); + } } return result; } @@ -258,11 +253,13 @@ public class StringUtil { public static boolean check(String str) { String sIllegal = "'\""; int len = sIllegal.length(); - if (null == str) - return false; + if (null == str) { + return false; + } for (int i = 0; i < len; i++) { - if (str.indexOf(sIllegal.charAt(i)) != -1) - return true; + if (str.indexOf(sIllegal.charAt(i)) != -1) { + return true; + } } return false; @@ -298,8 +295,9 @@ public class StringUtil { **************************************************************************/ public static String repeat(String src, int num) { StringBuffer s = new StringBuffer(); - for (int i = 0; i < num; i++) - s.append(src); + for (int i = 0; i < num; i++) { + s.append(src); + } return s.toString(); } @@ -311,8 +309,9 @@ public class StringUtil { */ public static List parseString2ListByCustomerPattern(String pattern, String src) { - if (src == null) - return null; + if (src == null) { + return null; + } List list = new ArrayList(); String[] result = src.split(pattern); for (int i = 0; i < result.length; i++) { @@ -423,7 +422,7 @@ public class StringUtil { /** * 解析字符串返回 名称=值的参数表 (a=1&b=2 => a=1,b=2) * - * @see test.koubei.util.StringUtilTest#testParseStr() + * @see * @param str * @return */ @@ -569,14 +568,15 @@ public class StringUtil { * 在sou中是否存在finds 如果指定的finds字符串有一个在sou中找到,返回true; * * @param sou - * @param find + * @param finds * @return */ public static boolean strPos(String sou, String... finds) { if (sou != null && finds != null && finds.length > 0) { for (int i = 0; i < finds.length; i++) { - if (sou.indexOf(finds[i]) > -1) - return true; + if (sou.indexOf(finds[i]) > -1) { + return true; + } } } return false; @@ -585,8 +585,9 @@ public class StringUtil { public static boolean strPos(String sou, List finds) { if (sou != null && finds != null && finds.size() > 0) { for (String s : finds) { - if (sou.indexOf(s) > -1) - return true; + if (sou.indexOf(s) > -1) { + return true; + } } } return false; @@ -650,8 +651,9 @@ public class StringUtil { public static long toLong(String s) { try { - if (s != null && !"".equals(s.trim())) - return Long.parseLong(s); + if (s != null && !"".equals(s.trim())) { + return Long.parseLong(s); + } } catch (Exception exception) { } return 0L; @@ -683,8 +685,9 @@ public class StringUtil { * @return 返回处理后的字符串 */ public static String removeURL(String str) { - if (str != null) - str = str.toLowerCase().replaceAll("(http|www|com|cn|org|\\.)+", ""); + if (str != null) { + str = str.toLowerCase().replaceAll("(http|www|com|cn|org|\\.)+", ""); + } return str; } @@ -698,8 +701,9 @@ public class StringUtil { * @return String */ public static String numRandom(int bit) { - if (bit == 0) - bit = 6; // 默认6位 + if (bit == 0) { + bit = 6; // 默认6位 + } String str = ""; str = "0123456789";// 初始化种子 return RandomStringUtils.random(bit, str);// 返回6位的字符串 @@ -716,8 +720,9 @@ public class StringUtil { * @return String */ public static String random(int bit) { - if (bit == 0) - bit = 6; // 默认6位 + if (bit == 0) { + bit = 6; // 默认6位 + } // 因为o和0,l和1很难区分,所以,去掉大小写的o和l String str = ""; str = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijkmnpqrstuvwxyz";// 初始化种子 @@ -790,7 +795,7 @@ public class StringUtil { * * @author bailong * @date 2007-08-29 - * @param str + * @param QJstr * @return */ public static String Q2B(String QJstr) { @@ -1004,7 +1009,7 @@ public class StringUtil { /** * 根据正则表达式提取字符串,相同的字符串只返回一个 * - * @param str源字符串 + * @param str * @param pattern * 正则表达式 * @return 目标字符串数据组 @@ -1225,7 +1230,7 @@ public class StringUtil { /** * ************************************************************************* 用要通过URL传输的内容进行编码 * - * @param 源字符串 + * @param src * @return 经过编码的内容 ************************************************************************* */ @@ -1248,7 +1253,7 @@ public class StringUtil { * ************************************************************************* * * @author 李锋 2007.4.18 - * @param 传入 + * @param str * 福test照楼（北大门&# 24635 ;店）福 * @return 经过解码的内容 ************************************************************************* @@ -1279,7 +1284,7 @@ public class StringUtil { * * @author yxg * @date 2007-09-17 - * @param str + * @param subject * @return */ public static String subYhooString(String subject, int size) { @@ -1304,17 +1309,20 @@ public class StringUtil { * @return 以“,”相隔的字符串 */ public static String listTtoString(List list) { - if (list == null || list.size() < 1) - return ""; + if (list == null || list.size() < 1) { + return ""; + } Iterator i = list.iterator(); - if (!i.hasNext()) - return ""; + if (!i.hasNext()) { + return ""; + } StringBuilder sb = new StringBuilder(); for (;;) { T e = i.next(); sb.append(e); - if (!i.hasNext()) - return sb.toString(); + if (!i.hasNext()) { + return sb.toString(); + } sb.append(","); } } @@ -1329,16 +1337,19 @@ public class StringUtil { * @return 以“,”相隔的字符串 */ public static String intArraytoString(int[] a) { - if (a == null) - return ""; + if (a == null) { + return ""; + } int iMax = a.length - 1; - if (iMax == -1) - return ""; + if (iMax == -1) { + return ""; + } StringBuilder b = new StringBuilder(); for (int i = 0;; i++) { b.append(a[i]); - if (i == iMax) - return b.toString(); + if (i == iMax) { + return b.toString(); + } b.append(","); } } @@ -1359,29 +1370,33 @@ public class StringUtil { boolean result = false; float endNum = (float) 0.0; if (content != null && content.length() > 0) { - if (content.length() % 1000 > 0) - thousandNum = (int) Math.floor(content.length() / 1000) + 1; - else - thousandNum = (int) Math.floor(content.length() / 1000); - if (thousandNum < 3) - subNum = 100 * thousandNum; - else if (thousandNum < 6) - subNum = 200 * thousandNum; - else if (thousandNum < 9) - subNum = 300 * thousandNum; - else - subNum = 3000; + if (content.length() % 1000 > 0) { + thousandNum = (int) Math.floor(content.length() / 1000) + 1; + } else { + thousandNum = (int) Math.floor(content.length() / 1000); + } + if (thousandNum < 3) { + subNum = 100 * thousandNum; + } else if (thousandNum < 6) { + subNum = 200 * thousandNum; + } else if (thousandNum < 9) { + subNum = 300 * thousandNum; + } else { + subNum = 3000; + } for (int j = 1; j < subNum; j++) { - if (content.length() % j > 0) - forNum = (int) Math.floor(content.length() / j) + 1; - else - forNum = (int) Math.floor(content.length() / j); - if (result || j >= content.length()) - break; - else { + if (content.length() % j > 0) { + forNum = (int) Math.floor(content.length() / j) + 1; + } else { + forNum = (int) Math.floor(content.length() / j); + } + if (result || j >= content.length()) { + break; + } else { for (int m = 0; m < forNum; m++) { - if (m * j > content.length() || (m + 1) * j > content.length() || (m + 2) * j > content.length()) - break; + if (m * j > content.length() || (m + 1) * j > content.length() || (m + 2) * j > content.length()) { + break; + } startStr = content.substring(m * j, (m + 1) * j); nextStr = content.substring((m + 1) * j, (m + 2) * j); if (startStr.equals(nextStr)) { @@ -1391,8 +1406,9 @@ public class StringUtil { result = true; break; } - } else - similarNum = 0; + } else { + similarNum = 0; + } } } } @@ -1440,17 +1456,19 @@ public class StringUtil { * @return */ public static String full2Half(String str) { - if (str == null || "".equals(str)) - return ""; + if (str == null || "".equals(str)) { + return ""; + } StringBuffer sb = new StringBuffer(); for (int i = 0; i < str.length(); i++) { char c = str.charAt(i); - if (c >= 65281 && c < 65373) - sb.append((char) (c - 65248)); - else - sb.append(str.charAt(i)); + if (c >= 65281 && c < 65373) { + sb.append((char) (c - 65248)); + } else { + sb.append(str.charAt(i)); + } } return sb.toString(); @@ -1549,10 +1567,11 @@ public class StringUtil { returnStr.append(list.get(i)).append(slipStr); } } - if (returnStr.toString().length() > 0) - return returnStr.toString().substring(0, returnStr.toString().lastIndexOf(slipStr)); - else - return ""; + if (returnStr.toString().length() > 0) { + return returnStr.toString().substring(0, returnStr.toString().lastIndexOf(slipStr)); + } else { + return ""; + } } /** @@ -1607,8 +1626,9 @@ public class StringUtil { */ public static List stringToStringListBySlipStr(String slipStr, String src) { - if (src == null) - return null; + if (src == null) { + return null; + } List list = new ArrayList(); String[] result = src.split(slipStr); for (int i = 0; i < result.length; i++) { @@ -1713,7 +1733,7 @@ public class StringUtil { /** * 解析前台encodeURIComponent编码后的参数 * - * @param encodeURIComponent + * @param property * (encodeURIComponent(no)) * @return */ @@ -1836,7 +1856,6 @@ public class StringUtil { /** * 判断这个类是不是java自带的类 - * @param clazz * @return */ public static String getEmptyString() { diff --git a/src/main/java/org/jeecgframework/core/util/UUIDGenerator.java b/src/main/java/org/jeecgframework/core/util/UUIDGenerator.java index 195776a95fb8428d788e18d06db1de2d0b0326ee..774add531f29d5d3444b8ab7c5f9a7b8952e54e6 100644 --- a/src/main/java/org/jeecgframework/core/util/UUIDGenerator.java +++ b/src/main/java/org/jeecgframework/core/util/UUIDGenerator.java @@ -59,8 +59,9 @@ public class UUIDGenerator { private final static short getCount() { synchronized (UUIDGenerator.class) { - if (counter < 0) - counter = 0; + if (counter < 0) { + counter = 0; + } return counter++; } } diff --git a/src/main/java/org/jeecgframework/core/util/ZipUtil.java b/src/main/java/org/jeecgframework/core/util/ZipUtil.java index 45fbe5baf6121295e6a11b5506535d9f7c95a1a0..f2aba5eeb56462b938c933ecb29979f5544b470f 100644 --- a/src/main/java/org/jeecgframework/core/util/ZipUtil.java +++ b/src/main/java/org/jeecgframework/core/util/ZipUtil.java @@ -101,8 +101,9 @@ public class ZipUtil { while (true) { length = bis.read(buffere); - if (length == -1) - break; + if (length == -1) { + break; + } zos.write(buffere, 0, length); } bis.close(); @@ -141,8 +142,9 @@ public class ZipUtil { File baseFile = new File(base); String filename = file.getPath(); // int index=filename.lastIndexOf(baseFile.getName()); - if (baseFile.getParentFile().getParentFile() == null) - return filename.substring(baseFile.getParent().length()); + if (baseFile.getParentFile().getParentFile() == null) { + return filename.substring(baseFile.getParent().length()); + } return filename.substring(baseFile.getParent().length() + 1); } diff --git a/src/main/java/org/jeecgframework/core/util/oConvertUtils.java b/src/main/java/org/jeecgframework/core/util/oConvertUtils.java index e922528c07f9b1032bf01ea152d0ba96ec7644ff..cf9ed6d806245336bd2fe87e88e2951113080e8a 100644 --- a/src/main/java/org/jeecgframework/core/util/oConvertUtils.java +++ b/src/main/java/org/jeecgframework/core/util/oConvertUtils.java @@ -66,8 +66,9 @@ public class oConvertUtils { private static String code2code(String strIn, String sourceCode, String targetCode) { String strOut = null; - if (strIn == null || (strIn.trim()).equals("")) - return strIn; + if (strIn == null || (strIn.trim()).equals("")) { + return strIn; + } try { byte[] b = strIn.getBytes(sourceCode); for (int i = 0; i < b.length; i++) { @@ -350,7 +351,7 @@ public class oConvertUtils { /** * SET转换MAP * - * @param str + * @param setobj * @return */ public static Map SetToMap(Set setobj) { diff --git a/src/main/java/org/jeecgframework/easypoi/service/EasypoiDictService.java b/src/main/java/org/jeecgframework/easypoi/service/EasypoiDictService.java index 2d1323e536cdbd6e335f8062fb31dd15a6c922e3..5aa91314f1c744c8e1c07fa70641888924d6d2fc 100644 --- a/src/main/java/org/jeecgframework/easypoi/service/EasypoiDictService.java +++ b/src/main/java/org/jeecgframework/easypoi/service/EasypoiDictService.java @@ -31,7 +31,8 @@ public class EasypoiDictService implements EasypoiDictServiceI { * @author：qinfeng * @since：2017-4-12 下午06:10:22 */ - public String[] queryDict(String dicTable, String dicCode,String dicText){ + @Override + public String[] queryDict(String dicTable, String dicCode, String dicText){ List dictReplace = new ArrayList();; List dictList = null; //step.1 如果没有字典表则使用系统字典表 diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/AuthFilterTag.java b/src/main/java/org/jeecgframework/tag/core/easyui/AuthFilterTag.java index e47028ff7c1591d97c4bec961fdddd2a03fe62fe..6300e6a4bf27b0fc40ae592058d83f94f99974da 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/AuthFilterTag.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/AuthFilterTag.java @@ -27,11 +27,13 @@ public class AuthFilterTag extends TagSupport{ @Autowired private SystemService systemService; - public int doStartTag() throws JspException { + @Override + public int doStartTag() throws JspException { return super.doStartTag(); } - public int doEndTag() throws JspException { + @Override + public int doEndTag() throws JspException { JspWriter out = null; try { out = this.pageContext.getOut(); diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/AutocompleteTag.java b/src/main/java/org/jeecgframework/tag/core/easyui/AutocompleteTag.java index 387dc640d8c6113b2bc4a991ab42b207d0505961..aaee401856c64517f1df0c5f579b0a0b144036ff 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/AutocompleteTag.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/AutocompleteTag.java @@ -54,10 +54,12 @@ public class AutocompleteTag extends TagSupport { } - public int doStartTag() throws JspTagException { + @Override + public int doStartTag() throws JspTagException { return EVAL_PAGE; } - public int doEndTag() throws JspTagException { + @Override + public int doEndTag() throws JspTagException { JspWriter out = null; try { out = this.pageContext.getOut(); diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/BaseTag.java b/src/main/java/org/jeecgframework/tag/core/easyui/BaseTag.java index 7188f2cf36037410c269c6d91b1ba64fe2ad0d44..36714e618a5fcbf22948c56c746b6e326bb15083 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/BaseTag.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/BaseTag.java @@ -40,12 +40,14 @@ public class BaseTag extends TagSupport { } - public int doStartTag() throws JspException { + @Override + public int doStartTag() throws JspException { return EVAL_PAGE; } - public int doEndTag() throws JspException { + @Override + public int doEndTag() throws JspException { JspWriter out = null; StringBuffer sb = new StringBuffer(); String types[] = type.split(","); diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/ChooseTag.java b/src/main/java/org/jeecgframework/tag/core/easyui/ChooseTag.java index fc156e63aa2c37c0873702c05d23afa4e2dd9826..6f43153c3fb87258df8192b4c13a6c8945d457e8 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/ChooseTag.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/ChooseTag.java @@ -37,11 +37,13 @@ public class ChooseTag extends TagSupport { protected String langArg; protected Boolean isInit = false;//是否初始化 - public int doStartTag() throws JspTagException { + @Override + public int doStartTag() throws JspTagException { return EVAL_PAGE; } - public int doEndTag() throws JspTagException { + @Override + public int doEndTag() throws JspTagException { JspWriter out = null; try { title = MutiLangUtil.doMutiLang(title, langArg); diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/CkeditorTag.java b/src/main/java/org/jeecgframework/tag/core/easyui/CkeditorTag.java index fd888a1aa5ad0c64b9f32647f34e34c745fe78d8..27445d2bbd59ffc1150a358cdb3cdfdb6b532cd7 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/CkeditorTag.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/CkeditorTag.java @@ -44,10 +44,12 @@ public class CkeditorTag extends TagSupport { this.type = type; } + @Override public int doStartTag() throws JspTagException { return EVAL_PAGE; } + @Override public int doEndTag() throws JspTagException { JspWriter out = null; try { @@ -73,8 +75,9 @@ public class CkeditorTag extends TagSupport { + value + ""); sb.append(""); return sb; diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/ColorChangeTag.java b/src/main/java/org/jeecgframework/tag/core/easyui/ColorChangeTag.java index 3454a5d8c2c95b691d908bb30e372cf17cbdc6b9..bce01c94c252abaabe2c952eefe198f9513ef8f6 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/ColorChangeTag.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/ColorChangeTag.java @@ -15,10 +15,12 @@ import javax.servlet.jsp.tagext.TagSupport; * @version 1.0 */ public class ColorChangeTag extends TagSupport { - public int doStartTag() throws JspTagException { + @Override + public int doStartTag() throws JspTagException { return EVAL_PAGE; } - public int doEndTag() throws JspTagException { + @Override + public int doEndTag() throws JspTagException { JspWriter out = null; try { out = this.pageContext.getOut(); diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/ComboBoxTag.java b/src/main/java/org/jeecgframework/tag/core/easyui/ComboBoxTag.java index 0da20adb609a17dc9ef3d68dd994f26cb5ff3eef..50957313a99b2d75bfbfc0df2bf07ebb174a48d1 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/ComboBoxTag.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/ComboBoxTag.java @@ -26,10 +26,12 @@ public class ComboBoxTag extends TagSupport { protected Integer listWidth;//下拉框宽度 protected Integer listHeight;//下拉框高度 protected boolean editable;//定义是否可以直接到文本域中键入文本 - public int doStartTag() throws JspTagException { + @Override + public int doStartTag() throws JspTagException { return EVAL_PAGE; } - public int doEndTag() throws JspTagException { + @Override + public int doEndTag() throws JspTagException { JspWriter out = null; try { out = this.pageContext.getOut(); @@ -73,7 +75,8 @@ public class ComboBoxTag extends TagSupport { +"multiple=\"true\" panelHeight=\"auto\" name=\""+name+"name\" id=\""+name+"\" >"); return sb; } - public void setId(String id) { + @Override + public void setId(String id) { this.id = id; } public void setText(String text) { diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/ComboTreeTag.java b/src/main/java/org/jeecgframework/tag/core/easyui/ComboTreeTag.java index 0f69ddad8cca7e2035de98a2f4ee077ca1444b54..180582352037aaa26c34963a9e6b9a6fc03c7047 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/ComboTreeTag.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/ComboTreeTag.java @@ -21,11 +21,13 @@ public class ComboTreeTag extends TagSupport { protected String width;// 宽度 protected String value;// 控件值 private boolean multiple=false;//是否多选 - public int doStartTag() throws JspTagException { + @Override + public int doStartTag() throws JspTagException { return EVAL_PAGE; } - public int doEndTag() throws JspTagException { + @Override + public int doEndTag() throws JspTagException { JspWriter out = null; try { out = this.pageContext.getOut(); @@ -63,7 +65,8 @@ public class ComboTreeTag extends TagSupport { return sb; } - public void setId(String id) { + @Override + public void setId(String id) { this.id = id; } diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/DataGridColumnTag.java b/src/main/java/org/jeecgframework/tag/core/easyui/DataGridColumnTag.java index da6eb21690482236db0d270069cfad61dcb28afb..fb20162ad49f51393de595e7759d838db5ea4bcc 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/DataGridColumnTag.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/DataGridColumnTag.java @@ -64,7 +64,8 @@ public class DataGridColumnTag extends TagSupport { public void setEditor(String editor) { this.editor = editor; } - public int doEndTag() throws JspTagException { + @Override + public int doEndTag() throws JspTagException { title = MutiLangUtil.doMutiLang(title, langArg); Tag t = findAncestorWithClass(this, DataGridTag.class); @@ -153,7 +154,8 @@ public class DataGridColumnTag extends TagSupport { this.hidden = hidden; } - public int doStartTag() throws JspTagException { + @Override + public int doStartTag() throws JspTagException { return EVAL_PAGE; } diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/DataGridConfOptTag.java b/src/main/java/org/jeecgframework/tag/core/easyui/DataGridConfOptTag.java index 1c458fad11bc9a25346e00524a9132d6214f87eb..a36c5d2993bdd0ab4a92d805f2516479f0063971 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/DataGridConfOptTag.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/DataGridConfOptTag.java @@ -25,10 +25,12 @@ public class DataGridConfOptTag extends TagSupport { private String urlclass;//自定义按钮样式 private String urlfont;//自定义按钮图标样式 - public int doStartTag() throws JspTagException { + @Override + public int doStartTag() throws JspTagException { return EVAL_PAGE; } - public int doEndTag() throws JspTagException { + @Override + public int doEndTag() throws JspTagException { Tag t = findAncestorWithClass(this, DataGridTag.class); DataGridTag parent = (DataGridTag) t; diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/DataGridDefOptTag.java b/src/main/java/org/jeecgframework/tag/core/easyui/DataGridDefOptTag.java index 9def5a3f46dcbe90231e44a3d17b9b20aba7f1d8..b36c4d2cb20b9d78db43fd627301faf108ccd7fd 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/DataGridDefOptTag.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/DataGridDefOptTag.java @@ -23,10 +23,12 @@ public class DataGridDefOptTag extends TagSupport { private String urlfont;//按钮图标 - public int doStartTag() throws JspTagException { + @Override + public int doStartTag() throws JspTagException { return EVAL_PAGE; } - public int doEndTag() throws JspTagException { + @Override + public int doEndTag() throws JspTagException { Tag t = findAncestorWithClass(this, DataGridTag.class); DataGridTag parent = (DataGridTag) t; parent.setDefUrl(url, title, exp,operationCode,urlStyle,urlclass,urlfont); diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/DataGridDelOptTag.java b/src/main/java/org/jeecgframework/tag/core/easyui/DataGridDelOptTag.java index 3e7ebdbbb6193ab6cbffbfd9dd134d7aeb26e5d3..cb03a7a0cd28359f5f82aaf7b6a9fafabcf2edf9 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/DataGridDelOptTag.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/DataGridDelOptTag.java @@ -29,10 +29,12 @@ public class DataGridDelOptTag extends TagSupport { private String urlfont;//按钮图标 - public int doStartTag() throws JspTagException { + @Override + public int doStartTag() throws JspTagException { return EVAL_PAGE; } - public int doEndTag() throws JspTagException { + @Override + public int doEndTag() throws JspTagException { title = MutiLangUtil.doMutiLang(title, langArg); Tag t = findAncestorWithClass(this, DataGridTag.class); diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/DataGridFunOptTag.java b/src/main/java/org/jeecgframework/tag/core/easyui/DataGridFunOptTag.java index 0a7b9d676e707ee029c66441983a19fd25e0d827..ea9f29529146126df0817ba645206f0b4b17db79 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/DataGridFunOptTag.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/DataGridFunOptTag.java @@ -27,10 +27,12 @@ public class DataGridFunOptTag extends TagSupport { private String urlfont;//按钮图标 - public int doStartTag() throws JspTagException { + @Override + public int doStartTag() throws JspTagException { return EVAL_PAGE; } - public int doEndTag() throws JspTagException { + @Override + public int doEndTag() throws JspTagException { title = MutiLangUtil.doMutiLang(title, langArg); Tag t = findAncestorWithClass(this, DataGridTag.class); diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/DataGridOpenOptTag.java b/src/main/java/org/jeecgframework/tag/core/easyui/DataGridOpenOptTag.java index 3fd4471ba4ea9feb31aa4d4ab3b8eb8560f1892d..661d83a729dd4e7a00434084f172bde4b4e11979 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/DataGridOpenOptTag.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/DataGridOpenOptTag.java @@ -25,10 +25,12 @@ public class DataGridOpenOptTag extends TagSupport { private String urlfont;//按钮图标 private String openModel = "OpenWin"; //弹出方式 - public int doStartTag() throws JspTagException { + @Override + public int doStartTag() throws JspTagException { return EVAL_PAGE; } - public int doEndTag() throws JspTagException { + @Override + public int doEndTag() throws JspTagException { Tag t = findAncestorWithClass(this, DataGridTag.class); DataGridTag parent = (DataGridTag) t; parent.setOpenUrl(url,title,width,height,exp,operationCode,openModel,urlStyle,urlclass,urlfont); diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/DataGridTag.java b/src/main/java/org/jeecgframework/tag/core/easyui/DataGridTag.java index 0529de6d6fcec65aa55300dc807ba1b1bbee55ad..610de308149410cd3088d12c5c95f721cc46c8b9 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/DataGridTag.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/DataGridTag.java @@ -386,8 +386,9 @@ public class DataGridTag extends TagSupport { Set operationCodes = (Set) super.pageContext.getRequest().getAttribute(Globals.OPERATIONCODES); if (null!=operationCodes) { for (String MyoperationCode : operationCodes) { - if (oConvertUtils.isEmpty(MyoperationCode)) - break; + if (oConvertUtils.isEmpty(MyoperationCode)) { + break; + } systemService = ApplicationContextUtil.getContext().getBean( SystemService.class); TSOperation operation = systemService.getEntity(TSOperation.class, MyoperationCode); @@ -433,8 +434,9 @@ public class DataGridTag extends TagSupport { text += map.get("text") + ","; value += map.get("field") + ","; } - if(list.size()>0) - setColumn(field, text, value); + if(list.size()>0) { + setColumn(field, text, value); + } }else{ String text = ""; String value = ""; @@ -494,11 +496,13 @@ public class DataGridTag extends TagSupport { columnValueList.add(columnValue); } + @Override public int doStartTag() throws JspTagException { return EVAL_PAGE; } + @Override public int doEndTag() throws JspException { JspWriter out = null; try { @@ -963,8 +967,9 @@ public class DataGridTag extends TagSupport { sb.append(",\"bSearchable\":" + column.isQuery() + ""); } sb.append("}"); - if (i < columnList.size()) - sb.append(","); + if (i < columnList.size()) { + sb.append(","); + } } sb.append("]" + "});" + "});" + ""); @@ -1009,10 +1014,11 @@ public class DataGridTag extends TagSupport { } - if(autoLoadData) - sb.append("url:\'" + actionUrl + "&field=" + fields + "\',"); - else - sb.append("url:\'',"); + if(autoLoadData) { + sb.append("url:\'" + actionUrl + "&field=" + fields + "\',"); + } else { + sb.append("url:\'',"); + } if(StringUtils.isNotEmpty(rowStyler)){ sb.append("rowStyler: function(index,row){ return "+rowStyler+"(index,row);},"); } @@ -2005,8 +2011,9 @@ public class DataGridTag extends TagSupport { Set operationCodes = (Set) super.pageContext.getRequest().getAttribute(Globals.OPERATIONCODES); if (null!=operationCodes) { for (String MyoperationCode : operationCodes) { - if (oConvertUtils.isEmpty(MyoperationCode)) - break; + if (oConvertUtils.isEmpty(MyoperationCode)) { + break; + } systemService = ApplicationContextUtil.getContext().getBean( SystemService.class); TSOperation operation = systemService.getEntity(TSOperation.class, MyoperationCode); @@ -2043,8 +2050,9 @@ public class DataGridTag extends TagSupport { if (null!=operationCodes) { List operationCodesStr = new ArrayList(); for (String MyoperationCode : operationCodes) { - if (oConvertUtils.isEmpty(MyoperationCode)) - break; + if (oConvertUtils.isEmpty(MyoperationCode)) { + break; + } systemService = ApplicationContextUtil.getContext().getBean( SystemService.class); TSOperation operation = systemService.getEntity(TSOperation.class, MyoperationCode); @@ -2176,10 +2184,11 @@ public class DataGridTag extends TagSupport { sb.append("title: \'" + title + "\',"); } - if(autoLoadData) - sb.append("url:\'" + actionUrl + "&field=" + fields + "\',"); - else - sb.append("url:\'',"); + if(autoLoadData) { + sb.append("url:\'" + actionUrl + "&field=" + fields + "\',"); + } else { + sb.append("url:\'',"); + } if(StringUtils.isNotEmpty(rowStyler)){ sb.append("rowStyler: function(index,row){ return "+rowStyler+"(index,row);},"); } @@ -2532,7 +2541,9 @@ appendLine(sb," }}\">关系"); fieldArray.append(" [ "); for (int i=0;i"); - if ("btn_sub".equals(btnsub) && dialog) - sb.append(""); + if ("btn_sub".equals(btnsub) && dialog) { + sb.append(""); + } out.print(sb.toString()); out.flush(); } catch (IOException e) { @@ -129,6 +131,7 @@ public class FormValidationTag extends TagSupport { } + @Override public int doEndTag() throws JspException { StringBuffer sb = new StringBuffer(); JspWriter out = null; @@ -153,8 +156,9 @@ public class FormValidationTag extends TagSupport { // } //divfrom.css sb.append(SysThemesUtil.getValidformDivfromTheme(sysThemesEnum)); - if (tabtitle != null) - sb.append(""); + if (tabtitle != null) { + sb.append(""); + } } // if("metro".equals(cssTheme)){ // sb.append(""); diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/HasPermissionTag.java b/src/main/java/org/jeecgframework/tag/core/easyui/HasPermissionTag.java index 4e395c7b4732e8d84f0cb9e93035d8f0df10c80a..028906b14bf70167d2a44bc949be90747c7253c7 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/HasPermissionTag.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/HasPermissionTag.java @@ -27,6 +27,7 @@ public class HasPermissionTag extends TagSupport{ @Autowired private SystemService systemService; + @Override public int doStartTag() throws JspException { boolean show = showTagBody(code); if (show) { @@ -45,8 +46,9 @@ public class HasPermissionTag extends TagSupport{ systemService = ApplicationContextUtil.getContext().getBean(SystemService.class); if (null!=operationCodeIds) { for (String operationCodeId : operationCodeIds) { - if (oConvertUtils.isEmpty(operationCodeId)) - break; + if (oConvertUtils.isEmpty(operationCodeId)) { + break; + } TSOperation operation = systemService.getEntity(TSOperation.class, operationCodeId); if (operation!=null && operation.getOperationcode().equals(code)){ return true; diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/MenuTag.java b/src/main/java/org/jeecgframework/tag/core/easyui/MenuTag.java index ab03e850b1bd170d87621d425aebfb18be938f06..c7702a8a6507fbafce2b5c2d30937a3c00cf93a2 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/MenuTag.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/MenuTag.java @@ -37,11 +37,13 @@ public class MenuTag extends TagSupport { this.childFun = childFun; } - public int doStartTag() throws JspTagException { + @Override + public int doStartTag() throws JspTagException { return EVAL_PAGE; } - public int doEndTag() throws JspTagException { + @Override + public int doEndTag() throws JspTagException { JspWriter out = null; try { diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/MutiLangTag.java b/src/main/java/org/jeecgframework/tag/core/easyui/MutiLangTag.java index d869a629af292b397bf97c5e95d17228b08e74fe..e29bcddeeda8aec26d9c467c4557fd6398a2a18b 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/MutiLangTag.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/MutiLangTag.java @@ -23,11 +23,13 @@ public class MutiLangTag extends TagSupport { protected String langKey; protected String langArg; - public int doStartTag() throws JspTagException { + @Override + public int doStartTag() throws JspTagException { return EVAL_PAGE; } - public int doEndTag() throws JspTagException { + @Override + public int doEndTag() throws JspTagException { JspWriter out = null; try { out = this.pageContext.getOut(); diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/OrgSelectTag.java b/src/main/java/org/jeecgframework/tag/core/easyui/OrgSelectTag.java index 69073cf79e4902daf1ffe25368134cc5be1c821f..d6a449833a1802b0bba3b8bb8969e8df3169d896 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/OrgSelectTag.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/OrgSelectTag.java @@ -101,11 +101,13 @@ public class OrgSelectTag extends TagSupport { public void setDepartNamesDefalutVal(String departNamesDefalutVal) { this.departNamesDefalutVal = departNamesDefalutVal; } - public int doStartTag() throws JspTagException { + @Override + public int doStartTag() throws JspTagException { return EVAL_PAGE; } - public int doEndTag() throws JspTagException { + @Override + public int doEndTag() throws JspTagException { JspWriter out = null; try { out = this.pageContext.getOut(); diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/PagerUtil.java b/src/main/java/org/jeecgframework/tag/core/easyui/PagerUtil.java index 5c6c41b11a7b889733bcc71f16c8bbfc3c22a1de..d11c531eff1dbe0fda76170171d1ba0d4b512775 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/PagerUtil.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/PagerUtil.java @@ -66,15 +66,15 @@ public class PagerUtil { sb.append(" }" + "\n"); sb.append("" + "\n"); sb.append(" 共" + rowsCount + "条 当前第" + curPageNO + "/" + pageCount + "页   "); - if (isFirst()) - sb.append("  "); - else { + if (isFirst()) { + sb.append("  "); + } else { sb.append(""); sb.append(" "); } - if (curPageNO - pageCount == 0 || pageCount == 0 || pageCount == 1) - sb.append("   "); - else { + if (curPageNO - pageCount == 0 || pageCount == 0 || pageCount == 1) { + sb.append("   "); + } else { sb.append(" "); sb.append(" "); } @@ -95,15 +95,15 @@ public class PagerUtil { String str = ""; str += ""; - if (isFirst()) - sb.append("第" + curPageNO + "页 共" + pageCount + "页 首页 "); - else { + if (isFirst()) { + sb.append("第" + curPageNO + "页 共" + pageCount + "页 首页 "); + } else { sb.append("第" + curPageNO + "页 共" + pageCount + "页 首页 "); sb.append("上一页 "); } - if (isLast() || rowsCount == 0) - sb.append("尾页 "); - else { + if (isLast() || rowsCount == 0) { + sb.append("尾页 "); + } else { sb.append("下一页 "); sb.append("尾页 "); } @@ -113,10 +113,11 @@ public class PagerUtil { int begin = (curPageNO > 10) ? curPageNO - 10 : 1; int end = (pageCount - curPageNO > 10) ? curPageNO + 10 : pageCount; for (int i = begin; i <= end; i++) { - if (i == curPageNO) - str += ""; - else - str += ""; + if (i == curPageNO) { + str += ""; + } else { + str += ""; + } } str += ""; sb.append(str); diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/SelectZTreeTag.java b/src/main/java/org/jeecgframework/tag/core/easyui/SelectZTreeTag.java index d668c46122bb5d2db5c5331e0e1725e4490bbcf2..934c8085917ccfe5094d094a00a3c195b56a9a8d 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/SelectZTreeTag.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/SelectZTreeTag.java @@ -28,11 +28,13 @@ public class SelectZTreeTag extends TagSupport { return url; } - public String getId() { + @Override + public String getId() { return id; } - public void setId(String id) { + @Override + public void setId(String id) { this.id = id; } @@ -56,11 +58,13 @@ public class SelectZTreeTag extends TagSupport { this.windowHeight = windowHeight; } - public int doStartTag() throws JspTagException { + @Override + public int doStartTag() throws JspTagException { return EVAL_PAGE; } - public int doEndTag() throws JspTagException { + @Override + public int doEndTag() throws JspTagException { JspWriter out = null; try { out = this.pageContext.getOut(); diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/TabTag.java b/src/main/java/org/jeecgframework/tag/core/easyui/TabTag.java index 6b6bdee83fec2a9ac3719289cfd996020225ea99..ca3bf88cd2deaf50652730e68c48b7b7775c40cb 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/TabTag.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/TabTag.java @@ -29,10 +29,12 @@ public class TabTag extends TagSupport { private boolean closable=false;//是否带关闭按钮 private String langArg; - public int doStartTag() throws JspTagException { + @Override + public int doStartTag() throws JspTagException { return EVAL_PAGE; } - public int doEndTag() throws JspTagException { + @Override + public int doEndTag() throws JspTagException { Tag t = findAncestorWithClass(this, TabsTag.class); TabsTag parent = (TabsTag) t; parent.setTab( id, title,iframe, href, icon, cache, content, width, heigth,closable); @@ -41,7 +43,8 @@ public class TabTag extends TagSupport { public void setHref(String href) { this.href = href; } - public void setId(String id) { + @Override + public void setId(String id) { this.id = id; } public void setTitle(String title) { diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/TabsTag.java b/src/main/java/org/jeecgframework/tag/core/easyui/TabsTag.java index 6ed4dba8e963862f09ef4b800a2818d991303d39..8396e4dab529231d5006b970954f6bc3511c5a14 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/TabsTag.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/TabsTag.java @@ -42,7 +42,8 @@ public class TabsTag extends TagSupport { this.tabs = tabs; } - public void setId(String id) { + @Override + public void setId(String id) { this.id = id; } @@ -88,12 +89,14 @@ public class TabsTag extends TagSupport { private List tabList = new ArrayList(); - public int doStartTag() throws JspTagException { + @Override + public int doStartTag() throws JspTagException { tabList.clear(); return EVAL_PAGE; } - public int doEndTag() throws JspTagException { + @Override + public int doEndTag() throws JspTagException { JspWriter out = null; try { out = this.pageContext.getOut(); diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/TagUtil.java b/src/main/java/org/jeecgframework/tag/core/easyui/TagUtil.java index 88fb95ed4276b26d940f37d6cd6e8413f848937a..6ea7335f25b54937aaadb92c2b2ccd5a2d90e6bc 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/TagUtil.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/TagUtil.java @@ -55,7 +55,7 @@ public class TagUtil { /** * * 获取对象内对应字段的值 - * @param fields + * @param FiledName */ public static Object fieldNametoValues(String FiledName, Object o){ Object value = ""; @@ -139,7 +139,6 @@ public class TagUtil { * 对象转数组 * @param fields * @param o - * @param stack * @return * @throws Exception */ @@ -157,7 +156,7 @@ public class TagUtil { * @param total * @param list * @param dataStyle - * @param page + * @param pageSize */ private static String listtojson(String[] fields, int total, List list, String[] footers, String dataStyle, int pageSize) throws Exception { //Object[] values = new Object[fields.length]; @@ -165,7 +164,9 @@ public class TagUtil { if("jqgrid".equals(dataStyle)){ int totalPage = total % pageSize > 0 ? total / pageSize + 1 : total / pageSize; - if(totalPage == 0) totalPage = 1; + if(totalPage == 0) { + totalPage = 1; + } jsonTemp.append("{\"total\":" + totalPage ); }else{ jsonTemp.append("{\"total\":" + total ); @@ -182,9 +183,9 @@ public class TagUtil { Object fieldValue = null; for (i = 0; i < fields.length; ++i) { fieldName = fields[i].toString(); - if (list.get(j) instanceof Map) - fieldValue = ((Map) list.get(j)).get(fieldName); - else { + if (list.get(j) instanceof Map) { + fieldValue = ((Map) list.get(j)).get(fieldName); + } else { fieldValue = fieldNametoValues(fieldName, list.get(j)); } @@ -194,9 +195,9 @@ public class TagUtil { jsonTemp.append(","); } } - if (j != list.size() - 1) - jsonTemp.append("},"); - else { + if (j != list.size() - 1) { + jsonTemp.append("},"); + } else { jsonTemp.append("}"); } } @@ -209,9 +210,9 @@ public class TagUtil { for(i=0;i> extMap) { @@ -562,7 +561,7 @@ public class TagUtil { * 控件类型：datatable * 返回datatable JSON数据 * @param response - * @param datatable + * @param dataTableReturn */ public static void datatable(HttpServletResponse response, DataTableReturn dataTableReturn,String field) { response.setContentType("application/json"); diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/UploadTag.java b/src/main/java/org/jeecgframework/tag/core/easyui/UploadTag.java index 4c0113672e3808cc98499f6f427a9185e5fcef72..f945dfc9cb05b339906edadde7880fd0bb709184 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/UploadTag.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/UploadTag.java @@ -82,9 +82,11 @@ public class UploadTag extends TagSupport { public void setName(String name) { this.name = name; } + @Override public int doStartTag() throws JspTagException { return EVAL_PAGE; } + @Override public int doEndTag() throws JspTagException { JspWriter out = null; try { @@ -180,8 +182,9 @@ public class UploadTag extends TagSupport { } else { - if(callback!=null) - sb.append(""+callback+"();"); + if(callback!=null) { + sb.append(""+callback+"();"); + } } if(view) { @@ -259,6 +262,7 @@ public class UploadTag extends TagSupport { return uploader+"&sessionId="+pageContext.getSession().getId()+"',"; } + @Override public void setId(String id) { this.id = id; } diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/UserSelectTag.java b/src/main/java/org/jeecgframework/tag/core/easyui/UserSelectTag.java index e80cb918921a5fe1245fc8ced98b9304a67c72c4..85a8f80adeb468319b74968772ddeba4b49d7d98 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/UserSelectTag.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/UserSelectTag.java @@ -102,11 +102,13 @@ public class UserSelectTag extends TagSupport { public void setUserNamesDefalutVal(String userNamesDefalutVal) { this.userNamesDefalutVal = userNamesDefalutVal; } - public int doStartTag() throws JspTagException { + @Override + public int doStartTag() throws JspTagException { return EVAL_PAGE; } - public int doEndTag() throws JspTagException { + @Override + public int doEndTag() throws JspTagException { JspWriter out = null; try { out = this.pageContext.getOut(); diff --git a/src/main/java/org/jeecgframework/tag/core/easyui/WebUploaderTag.java b/src/main/java/org/jeecgframework/tag/core/easyui/WebUploaderTag.java index 6813a95c33fb894952c045e2007352fe3f6e269d..0ed186451e1ea3ad5ce3985f51ddd23dd4cbffe1 100644 --- a/src/main/java/org/jeecgframework/tag/core/easyui/WebUploaderTag.java +++ b/src/main/java/org/jeecgframework/tag/core/easyui/WebUploaderTag.java @@ -33,10 +33,12 @@ public class WebUploaderTag extends TagSupport { private String extendParams;//类似css写法 这是文件上传时候需要传递的参数 private String readOnly="false";//保留字段 //private static String imgexts="gif,jpg,jpeg,bmp,png"; - public int doStartTag() throws JspTagException { + @Override + public int doStartTag() throws JspTagException { return EVAL_PAGE; } - public int doEndTag() throws JspTagException { + @Override + public int doEndTag() throws JspTagException { JspWriter out = null; StringBuffer sb = new StringBuffer(); try { diff --git a/src/main/java/org/jeecgframework/web/cgdynamgraph/controller/CgDynamGraphController.java b/src/main/java/org/jeecgframework/web/cgdynamgraph/controller/CgDynamGraphController.java index 55efc6fa0a22f123bd1f1056d85bfd5a12724ada..506e2654330d6794d168ea734c9e12a75f8449ac 100644 --- a/src/main/java/org/jeecgframework/web/cgdynamgraph/controller/CgDynamGraphController.java +++ b/src/main/java/org/jeecgframework/web/cgdynamgraph/controller/CgDynamGraphController.java @@ -225,8 +225,6 @@ public class CgDynamGraphController extends BaseController { /** * 动态报表数据查询 * @param configId 配置id-code - * @param page 分页页面 - * @param rows 分页大小 * @param request * @param response */ @@ -269,7 +267,7 @@ public class CgDynamGraphController extends BaseController { String dbKey=(String)configM.get("db_source"); List> result=null; - Long size=0l; + Long size= 0L; if(StringUtils.isNotBlank(dbKey)){ result= DynamicDBUtil.findList(dbKey,querySql); @@ -402,7 +400,7 @@ public class CgDynamGraphController extends BaseController { /** * 装载数据字典 * @param m 要放入freemarker的数据 - * @param bean 读取出来的动态配置数据 + * @param cgDynamGraphMap 读取出来的动态配置数据 */ @SuppressWarnings("unchecked") private void loadDic(Map m, Map cgDynamGraphMap) { diff --git a/src/main/java/org/jeecgframework/web/cgdynamgraph/service/core/CgDynamGraphConfigHeadServiceI.java b/src/main/java/org/jeecgframework/web/cgdynamgraph/service/core/CgDynamGraphConfigHeadServiceI.java index 9f38bd17b45116dda8817c0236cdd21e250b9a11..7e82e6ea62e3a4e09b38a66be96ee5ff634ef36c 100644 --- a/src/main/java/org/jeecgframework/web/cgdynamgraph/service/core/CgDynamGraphConfigHeadServiceI.java +++ b/src/main/java/org/jeecgframework/web/cgdynamgraph/service/core/CgDynamGraphConfigHeadServiceI.java @@ -9,7 +9,8 @@ import org.jeecgframework.web.cgdynamgraph.entity.core.CgDynamGraphConfigParamEn public interface CgDynamGraphConfigHeadServiceI extends CommonService{ - public void delete(T entity); + @Override + public void delete(T entity); /** * 添加一对多 * @@ -26,19 +27,19 @@ public interface CgDynamGraphConfigHeadServiceI extends CommonService{ /** * 默认按钮-sql增强-新增操作 - * @param id + * @param t * @return */ public boolean doAddSql(CgDynamGraphConfigHeadEntity t); /** * 默认按钮-sql增强-更新操作 - * @param id + * @param t * @return */ public boolean doUpdateSql(CgDynamGraphConfigHeadEntity t); /** * 默认按钮-sql增强-删除操作 - * @param id + * @param t * @return */ public boolean doDelSql(CgDynamGraphConfigHeadEntity t); diff --git a/src/main/java/org/jeecgframework/web/cgdynamgraph/service/impl/core/CgDynamGraphConfigHeadServiceImpl.java b/src/main/java/org/jeecgframework/web/cgdynamgraph/service/impl/core/CgDynamGraphConfigHeadServiceImpl.java index 574a6809d6389dea454ed1a706a7a54e3a3fd73c..48f941db390b0af50a95e9d4b671bfb0c8ae72cb 100644 --- a/src/main/java/org/jeecgframework/web/cgdynamgraph/service/impl/core/CgDynamGraphConfigHeadServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/cgdynamgraph/service/impl/core/CgDynamGraphConfigHeadServiceImpl.java @@ -17,14 +17,16 @@ import org.springframework.transaction.annotation.Transactional; @Transactional public class CgDynamGraphConfigHeadServiceImpl extends CommonServiceImpl implements CgDynamGraphConfigHeadServiceI { - public void delete(T entity) { + @Override + public void delete(T entity) { super.delete(entity); //执行删除操作配置的sql增强 this.doDelSql((CgDynamGraphConfigHeadEntity)entity); } - public void addMain(CgDynamGraphConfigHeadEntity cgDynamGraphConfigHead, - List cgDynamGraphConfigItemList,List cgDynamGraphConfigParamList){ + @Override + public void addMain(CgDynamGraphConfigHeadEntity cgDynamGraphConfigHead, + List cgDynamGraphConfigItemList, List cgDynamGraphConfigParamList){ //保存主信息 this.save(cgDynamGraphConfigHead); @@ -47,8 +49,9 @@ public class CgDynamGraphConfigHeadServiceImpl extends CommonServiceImpl impleme } - public void updateMain(CgDynamGraphConfigHeadEntity cgDynamGraphConfigHead, - List cgDynamGraphConfigItemList,List cgDynamGraphConfigParamList) { + @Override + public void updateMain(CgDynamGraphConfigHeadEntity cgDynamGraphConfigHead, + List cgDynamGraphConfigItemList, List cgDynamGraphConfigParamList) { //保存主表信息 this.saveOrUpdate(cgDynamGraphConfigHead); //=================================================================================== @@ -130,7 +133,8 @@ public class CgDynamGraphConfigHeadServiceImpl extends CommonServiceImpl impleme } - public void delMain(CgDynamGraphConfigHeadEntity cgDynamGraphConfigHead) { + @Override + public void delMain(CgDynamGraphConfigHeadEntity cgDynamGraphConfigHead) { //删除主表信息 this.delete(cgDynamGraphConfigHead); //=================================================================================== @@ -150,26 +154,29 @@ public class CgDynamGraphConfigHeadServiceImpl extends CommonServiceImpl impleme /** * 默认按钮-sql增强-新增操作 - * @param id + * @param t * @return */ - public boolean doAddSql(CgDynamGraphConfigHeadEntity t){ + @Override + public boolean doAddSql(CgDynamGraphConfigHeadEntity t){ return true; } /** * 默认按钮-sql增强-更新操作 - * @param id + * @param t * @return */ - public boolean doUpdateSql(CgDynamGraphConfigHeadEntity t){ + @Override + public boolean doUpdateSql(CgDynamGraphConfigHeadEntity t){ return true; } /** * 默认按钮-sql增强-删除操作 - * @param id + * @param t * @return */ - public boolean doDelSql(CgDynamGraphConfigHeadEntity t){ + @Override + public boolean doDelSql(CgDynamGraphConfigHeadEntity t){ return true; } diff --git a/src/main/java/org/jeecgframework/web/cgdynamgraph/service/impl/core/CgDynamGraphServiceImpl.java b/src/main/java/org/jeecgframework/web/cgdynamgraph/service/impl/core/CgDynamGraphServiceImpl.java index e0d3c3028ab202dfb0f0f23d4bc4c62be5bcf62e..c2ba29a3e87c4d6796ffe3e677415627d7f71acb 100644 --- a/src/main/java/org/jeecgframework/web/cgdynamgraph/service/impl/core/CgDynamGraphServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/cgdynamgraph/service/impl/core/CgDynamGraphServiceImpl.java @@ -30,7 +30,8 @@ public class CgDynamGraphServiceImpl extends CommonServiceImpl implements private CgDynamGraphDao cgDynamGraphDao; - public Map queryCgDynamGraphConfig(String reportId) { + @Override + public Map queryCgDynamGraphConfig(String reportId) { Map cgDynamGraphM = new HashMap(0); Map mainM = queryCgDynamGraphMainConfig(reportId); List> itemsM = queryCgDynamGraphItems(reportId); @@ -41,7 +42,8 @@ public class CgDynamGraphServiceImpl extends CommonServiceImpl implements return cgDynamGraphM; } - public Map queryCgDynamGraphMainConfig(String reportId){ + @Override + public Map queryCgDynamGraphMainConfig(String reportId){ // String sql = JeecgSqlUtil.getMethodSql(JeecgSqlUtil.getMethodUrl()); // Map parameters = new LinkedHashMap(); // parameters.put("id", reportId); @@ -51,7 +53,8 @@ public class CgDynamGraphServiceImpl extends CommonServiceImpl implements return cgDynamGraphDao.queryCgDynamGraphMainConfig(reportId); } - public List> queryCgDynamGraphItems(String reportId){ + @Override + public List> queryCgDynamGraphItems(String reportId){ // String sql = JeecgSqlUtil.getMethodSql(JeecgSqlUtil.getMethodUrl()); // Map parameters = new LinkedHashMap(); // parameters.put("configId", reportId); @@ -75,7 +78,8 @@ public class CgDynamGraphServiceImpl extends CommonServiceImpl implements return list; } - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public List> queryByCgDynamGraphSql(String sql, Map params) { String querySql = getFullSql(sql,params); List> result = null; @@ -108,7 +112,8 @@ public class CgDynamGraphServiceImpl extends CommonServiceImpl implements } return sqlB.toString(); } - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public long countQueryByCgDynamGraphSql(String sql, Map params) { String querySql = getFullSql(sql,params); @@ -116,7 +121,8 @@ public class CgDynamGraphServiceImpl extends CommonServiceImpl implements long result = jdbcDao.findForLong(querySql,new HashMap(0)); return result; } - @SuppressWarnings( "unchecked" ) + @Override + @SuppressWarnings( "unchecked" ) public List getSqlFields(String sql) { if(oConvertUtils.isEmpty(sql)){ diff --git a/src/main/java/org/jeecgframework/web/cgform/common/CommUtils.java b/src/main/java/org/jeecgframework/web/cgform/common/CommUtils.java index 92e15a5169cdaf2f8b4843ddaea2717bd68ab6e4..48db3977765d75999408b65e722705dbc2d1dae0 100644 --- a/src/main/java/org/jeecgframework/web/cgform/common/CommUtils.java +++ b/src/main/java/org/jeecgframework/web/cgform/common/CommUtils.java @@ -27,7 +27,9 @@ public class CommUtils { { for(int i=0;i clazz = dbTable.getClass1(); if(null != clazz){ List dataList = dbTable.getTableData(); - if(null == dataList || dataList.size() < 1) return; + if(null == dataList || dataList.size() < 1) { + return; + } Map idMap = new HashMap(); String id = ""; String countSql = ""; diff --git a/src/main/java/org/jeecgframework/web/cgform/controller/cgformftl/CgformFtlController.java b/src/main/java/org/jeecgframework/web/cgform/controller/cgformftl/CgformFtlController.java index a71975253617b3b2da65692625de0de0623a761a..1558c640155fa15ce3be3f477c9e955db356ca9d 100644 --- a/src/main/java/org/jeecgframework/web/cgform/controller/cgformftl/CgformFtlController.java +++ b/src/main/java/org/jeecgframework/web/cgform/controller/cgformftl/CgformFtlController.java @@ -141,7 +141,6 @@ public class CgformFtlController extends BaseController { * @param request * @param response * @param dataGrid - * @param user */ @SuppressWarnings("unchecked") @@ -251,7 +250,7 @@ public class CgformFtlController extends BaseController { /** * 添加Word转Ftl * - * @param ids + * @param cgformFtl * @return */ @RequestMapping(params = "save") @@ -363,7 +362,7 @@ public class CgformFtlController extends BaseController { /** * 保存转换表单文件 * - * @param ids + * @param request * @return * @throws Exception */ @@ -503,10 +502,11 @@ public class CgformFtlController extends BaseController { } attributes.put("id", cgformFtl.getId()); - if (StringUtil.isNotEmpty(message)) - j.setMsg("Word 模板上传失败," + message); - else - j.setMsg("Word 模板上传成功"); + if (StringUtil.isNotEmpty(message)) { + j.setMsg("Word 模板上传失败," + message); + } else { + j.setMsg("Word 模板上传成功"); + } j.setAttributes(attributes); return j; @@ -541,24 +541,30 @@ public class CgformFtlController extends BaseController { .getParameter("createName")); String createDate = oConvertUtils.getString(request .getParameter("createDate")); - if (oConvertUtils.isEmpty(ftlStatus)) - ftlStatus = "0"; + if (oConvertUtils.isEmpty(ftlStatus)) { + ftlStatus = "0"; + } cgformFtl.setCgformId(cgformId); cgformFtl.setCgformName(cgformName); cgformFtl.setFtlStatus(ftlStatus); if (StringUtil.isNotEmpty(fileKey)) { cgformFtl.setId(fileKey); - if(StringUtil.isNotEmpty(ftlVersion)) - cgformFtl.setFtlVersion(Integer.valueOf(ftlVersion)); - if (StringUtil.isNotEmpty(ftlWordUrl)) - cgformFtl.setFtlWordUrl(ftlWordUrl); - if (StringUtil.isNotEmpty(createBy)) - cgformFtl.setCreateBy(createBy); - if (StringUtil.isNotEmpty(createName)) - cgformFtl.setCreateName(createName); - if (StringUtil.isNotEmpty(createDate)) - cgformFtl.setCreateDate(DateUtils.str2Date(createDate, DateUtils.date_sdf)); + if(StringUtil.isNotEmpty(ftlVersion)) { + cgformFtl.setFtlVersion(Integer.valueOf(ftlVersion)); + } + if (StringUtil.isNotEmpty(ftlWordUrl)) { + cgformFtl.setFtlWordUrl(ftlWordUrl); + } + if (StringUtil.isNotEmpty(createBy)) { + cgformFtl.setCreateBy(createBy); + } + if (StringUtil.isNotEmpty(createName)) { + cgformFtl.setCreateName(createName); + } + if (StringUtil.isNotEmpty(createDate)) { + cgformFtl.setCreateDate(DateUtils.str2Date(createDate, DateUtils.date_sdf)); + } if (cgformFtl.getFtlContent()!=null&&cgformFtl.getFtlContent().indexOf(" fileMap = multipartRequest.getFileMap(); File picTempFile=null; File tempDir=new File(getUploadBasePath(request),"temp"); - if(!tempDir.exists()) - tempDir.mkdirs(); + if(!tempDir.exists()) { + tempDir.mkdirs(); + } for (Map.Entry entity : fileMap.entrySet()) { MultipartFile file = entity.getValue(); picTempFile=new File(tempDir.getAbsolutePath(),"/index_"+request.getSession().getId()+"."+FileUtils.getExtend(file.getOriginalFilename())); try{ - if(picTempFile.exists()) - org.apache.commons.io.FileUtils.forceDelete(picTempFile); + if(picTempFile.exists()) { + org.apache.commons.io.FileUtils.forceDelete(picTempFile); + } FileCopyUtils.copy(file.getBytes(),picTempFile); }catch (Exception e){ e.printStackTrace(); @@ -473,14 +477,16 @@ public class CgformTemplateController extends BaseController { Map fileMap = multipartRequest.getFileMap(); File picTempFile=null; File tempDir=new File(getUploadBasePath(request),"temp"); - if(!tempDir.exists()) - tempDir.mkdirs(); + if(!tempDir.exists()) { + tempDir.mkdirs(); + } for (Map.Entry entity : fileMap.entrySet()) { MultipartFile file = entity.getValue(); picTempFile=new File(tempDir.getAbsolutePath(),"/zip_"+request.getSession().getId()+"."+ FileUtils.getExtend(file.getOriginalFilename())); try{ - if(picTempFile.exists()) - org.apache.commons.io.FileUtils.forceDelete(picTempFile); + if(picTempFile.exists()) { + org.apache.commons.io.FileUtils.forceDelete(picTempFile); + } FileCopyUtils.copy(file.getBytes(),picTempFile); }catch (Exception e){ e.printStackTrace(); @@ -631,8 +637,9 @@ public class CgformTemplateController extends BaseController { } response.setContentType("application/octet-stream; charset=utf-8"); response.setHeader("Content-Disposition", "attachment;filename="+fileName); - if(size>0) - response.addHeader("Content-Length",size+""); + if(size>0) { + response.addHeader("Content-Length",size+""); + } OutputStream stream= null; try { stream = response.getOutputStream(); diff --git a/src/main/java/org/jeecgframework/web/cgform/controller/trans/CgformTransController.java b/src/main/java/org/jeecgframework/web/cgform/controller/trans/CgformTransController.java index b46db4c05e1aaccc85e5a0c37d32e8e58aefac0d..70163bad02eb2b2ba931248ff87503d37e07f478 100644 --- a/src/main/java/org/jeecgframework/web/cgform/controller/trans/CgformTransController.java +++ b/src/main/java/org/jeecgframework/web/cgform/controller/trans/CgformTransController.java @@ -77,12 +77,14 @@ public class CgformTransController { List index = new ArrayList(); if (StringUtil.isNotEmpty(tableName)) { for (int i = 0; i < list.size(); i++) { - if (list.get(i).contains(tableName)) - index.add(list.get(i)); + if (list.get(i).contains(tableName)) { + index.add(list.get(i)); + } } html = getJson(index, index.size()); - } else - html = getJson(list, list.size()); + } else { + html = getJson(list, list.size()); + } PrintWriter writer = null; try { response.setContentType("text/html"); @@ -114,8 +116,9 @@ public class CgformTransController { .findByProperty(CgFormHeadEntity.class, "tableName", ids[i]); if (cffList.size() > 0) { - if (no != "") - no += ","; + if (no != "") { + no += ","; + } no += ids[i]; continue; } @@ -138,10 +141,11 @@ public class CgformTransController { CgFormFieldEntity cgFormField = new CgFormFieldEntity(); cgFormField.setFieldName(columnt.getFieldDbName() .toLowerCase()); - if (StringUtil.isNotEmpty(columnt.getFiledComment())) - cgFormField.setContent(columnt.getFiledComment()); - else - cgFormField.setContent(columnt.getFieldName()); + if (StringUtil.isNotEmpty(columnt.getFiledComment())) { + cgFormField.setContent(columnt.getFiledComment()); + } else { + cgFormField.setContent(columnt.getFieldName()); + } cgFormField.setIsKey("N"); cgFormField.setIsShow("Y"); cgFormField.setIsShowList("Y"); @@ -207,9 +211,10 @@ public class CgformTransController { } } - if (StringUtil.isNotEmpty(columnt.getScale())) - cgFormField.setPointLength(Integer.valueOf(columnt - .getScale())); + if (StringUtil.isNotEmpty(columnt.getScale())) { + cgFormField.setPointLength(Integer.valueOf(columnt + .getScale())); + } } columnsList.add(cgFormField); @@ -221,8 +226,9 @@ public class CgformTransController { } cgFormFieldService.saveTable(cgFormHead, ""); - if (yes != "") - yes += ","; + if (yes != "") { + yes += ","; + } yes += ids[i]; } } @@ -254,6 +260,7 @@ public class CgformTransController { } + @Override public int compare(String prev, String next) { return sortOrder.equals(SortDirection.asc)? prev.compareTo(next):next.compareTo(prev); diff --git a/src/main/java/org/jeecgframework/web/cgform/engine/DBTempletLoader.java b/src/main/java/org/jeecgframework/web/cgform/engine/DBTempletLoader.java index 6d2213bae87ff9693c537df9582ac81a1327df2c..d594009c0491a9e41c8810b27120e391d1556b54 100644 --- a/src/main/java/org/jeecgframework/web/cgform/engine/DBTempletLoader.java +++ b/src/main/java/org/jeecgframework/web/cgform/engine/DBTempletLoader.java @@ -45,7 +45,8 @@ public class DBTempletLoader implements TemplateLoader { @Autowired private CgformTemplateServiceI cgformTemplateService; - public Object findTemplateSource(String name) throws IOException { + @Override + public Object findTemplateSource(String name) throws IOException { //update by Robin postgreSQL 修正大小写的问题 2013-03-13 name = name.replace("_zh_cn", "").replace("_ZH_CN", "").replace("_zh_CN", ""); name = name.replace("_en_us", "").replace("_EN_US", "").replace("_en_US", ""); @@ -56,12 +57,14 @@ public class DBTempletLoader implements TemplateLoader { } - public long getLastModified(Object templateSource) { + @Override + public long getLastModified(Object templateSource) { return 0; } - public Reader getReader(Object templateSource, String encoding) throws IOException { + @Override + public Reader getReader(Object templateSource, String encoding) throws IOException { Reader br = new StringReader(""); if (templateSource instanceof InputStreamReader) { br = new BufferedReader((InputStreamReader)templateSource); @@ -95,7 +98,9 @@ public class DBTempletLoader implements TemplateLoader { if(name.lastIndexOf(".ftl")==-1){//判断是否为include的模板 //如果是主表直接走一对多模板 CgFormHeadEntity head = cgFormFieldService.getCgFormHeadByTableName(name); - if(head==null)return null; + if(head==null) { + return null; + } CgformTemplateEntity entity=cgformTemplateService.findByCode(head.getFormTemplate()); @@ -145,7 +150,8 @@ public class DBTempletLoader implements TemplateLoader { } - public void closeTemplateSource(Object templateSource) throws IOException { + @Override + public void closeTemplateSource(Object templateSource) throws IOException { } diff --git a/src/main/java/org/jeecgframework/web/cgform/engine/TempletContext.java b/src/main/java/org/jeecgframework/web/cgform/engine/TempletContext.java index 99e99b0220ad5df8b4273f0c15a8c0650dae977d..21ce4afde16826b7890e53a8a7315673411428d3 100644 --- a/src/main/java/org/jeecgframework/web/cgform/engine/TempletContext.java +++ b/src/main/java/org/jeecgframework/web/cgform/engine/TempletContext.java @@ -49,8 +49,9 @@ public class TempletContext { @PostConstruct public void init() { - if (tags == null) - return; + if (tags == null) { + return; + } for (String key : tags.keySet()) { freemarker.setSharedVariable(key, tags.get(key)); } @@ -91,7 +92,7 @@ public class TempletContext { /** * 从缓存中读取ftl模板 - * @param template + * @param tableName * @param encoding * @return */ @@ -116,8 +117,7 @@ public class TempletContext { /** * 从缓存中读取ftl模板 - * @param template - * @param encoding + * @param tableName * @return */ public void removeTemplateFromCache(String tableName){ diff --git a/src/main/java/org/jeecgframework/web/cgform/engine/tag/DictDataTag.java b/src/main/java/org/jeecgframework/web/cgform/engine/tag/DictDataTag.java index 7f9c5e8350460209c611452dd3e62c407ab97fee..00942e6a0ac21d3b2c7d6ced50b47901f8a8ed81 100644 --- a/src/main/java/org/jeecgframework/web/cgform/engine/tag/DictDataTag.java +++ b/src/main/java/org/jeecgframework/web/cgform/engine/tag/DictDataTag.java @@ -38,7 +38,8 @@ public class DictDataTag implements TemplateDirectiveModel { @Autowired private SystemService systemService; - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body) throws TemplateException, IOException { diff --git a/src/main/java/org/jeecgframework/web/cgform/engine/tag/MutiLangTag.java b/src/main/java/org/jeecgframework/web/cgform/engine/tag/MutiLangTag.java index 102006f7d9d9ed9d7f70d591bbe9aa54f28b8ef0..3ebc6ecdc7a0b094c0df7c15261ecae96e617761 100644 --- a/src/main/java/org/jeecgframework/web/cgform/engine/tag/MutiLangTag.java +++ b/src/main/java/org/jeecgframework/web/cgform/engine/tag/MutiLangTag.java @@ -29,8 +29,9 @@ public class MutiLangTag implements TemplateDirectiveModel { private static final Logger LOG = LoggerFactory.getLogger(MutiLangTag.class); - public void execute(Environment env, Map params, TemplateModel[] loopVars, - TemplateDirectiveBody body) throws TemplateException, IOException { + @Override + public void execute(Environment env, Map params, TemplateModel[] loopVars, + TemplateDirectiveBody body) throws TemplateException, IOException { // 多语言key String langKey = getAttribute(params, "langKey"); diff --git a/src/main/java/org/jeecgframework/web/cgform/entity/generate/GenerateEntity.java b/src/main/java/org/jeecgframework/web/cgform/entity/generate/GenerateEntity.java index f244e4b741cbd99452ae0b15e7938d08be5fe38c..1c30857647b68ac651b6418987248b5971ce72e8 100644 --- a/src/main/java/org/jeecgframework/web/cgform/entity/generate/GenerateEntity.java +++ b/src/main/java/org/jeecgframework/web/cgform/entity/generate/GenerateEntity.java @@ -184,7 +184,8 @@ public class GenerateEntity implements java.io.Serializable{ this.packageStyle = packageStyle; } - public Object clone() throws CloneNotSupportedException { + @Override + public Object clone() throws CloneNotSupportedException { return super.clone(); } diff --git a/src/main/java/org/jeecgframework/web/cgform/interceptors/CgFormVersionInterceptor.java b/src/main/java/org/jeecgframework/web/cgform/interceptors/CgFormVersionInterceptor.java index 39b2c567dc2ac747feb5c43d48f7e46bc49a7416..e145fc5bbe29efa8bd40a44a007b49427eb464f4 100644 --- a/src/main/java/org/jeecgframework/web/cgform/interceptors/CgFormVersionInterceptor.java +++ b/src/main/java/org/jeecgframework/web/cgform/interceptors/CgFormVersionInterceptor.java @@ -27,8 +27,9 @@ public class CgFormVersionInterceptor implements HandlerInterceptor { @Autowired private CgFormFieldServiceI cgFormFieldService; - public void afterCompletion(HttpServletRequest arg0, - HttpServletResponse arg1, Object arg2, Exception arg3) + @Override + public void afterCompletion(HttpServletRequest arg0, + HttpServletResponse arg1, Object arg2, Exception arg3) throws Exception { String requestPath = ResourceUtil.getRequestPath(arg0);// 用户访问的资源地址 if(!includeUrls.contains(requestPath)){ @@ -49,13 +50,15 @@ public class CgFormVersionInterceptor implements HandlerInterceptor { } - public void postHandle(HttpServletRequest arg0, HttpServletResponse arg1, - Object arg2, ModelAndView arg3) throws Exception { + @Override + public void postHandle(HttpServletRequest arg0, HttpServletResponse arg1, + Object arg2, ModelAndView arg3) throws Exception { } - public boolean preHandle(HttpServletRequest arg0, HttpServletResponse arg1, - Object arg2) throws Exception { + @Override + public boolean preHandle(HttpServletRequest arg0, HttpServletResponse arg1, + Object arg2) throws Exception { return true; } diff --git a/src/main/java/org/jeecgframework/web/cgform/service/config/CgFormIndexServiceI.java b/src/main/java/org/jeecgframework/web/cgform/service/config/CgFormIndexServiceI.java index 5fe0f59174b23f3126bf45a2aaaf9094537cc5ae..c2bda555661a781c823edf9cecc39494928dc603 100644 --- a/src/main/java/org/jeecgframework/web/cgform/service/config/CgFormIndexServiceI.java +++ b/src/main/java/org/jeecgframework/web/cgform/service/config/CgFormIndexServiceI.java @@ -7,27 +7,30 @@ import org.jeecgframework.web.cgform.entity.config.CgFormIndexEntity; public interface CgFormIndexServiceI extends CommonService{ - public void delete(T entity); + @Override + public void delete(T entity); - public Serializable save(T entity); + @Override + public Serializable save(T entity); - public void saveOrUpdate(T entity); + @Override + public void saveOrUpdate(T entity); /** * 默认按钮-sql增强-新增操作 - * @param id + * @param t * @return */ public boolean doAddSql(CgFormIndexEntity t); /** * 默认按钮-sql增强-更新操作 - * @param id + * @param t * @return */ public boolean doUpdateSql(CgFormIndexEntity t); /** * 默认按钮-sql增强-删除操作 - * @param id + * @param t * @return */ public boolean doDelSql(CgFormIndexEntity t); diff --git a/src/main/java/org/jeecgframework/web/cgform/service/enhance/CgformEnhanceJavaServiceI.java b/src/main/java/org/jeecgframework/web/cgform/service/enhance/CgformEnhanceJavaServiceI.java index c56f81ac1d45e927e032d31a61e412009216d086..a3165fa3e671f26cd7d25637a02ffb6500d2f9be 100644 --- a/src/main/java/org/jeecgframework/web/cgform/service/enhance/CgformEnhanceJavaServiceI.java +++ b/src/main/java/org/jeecgframework/web/cgform/service/enhance/CgformEnhanceJavaServiceI.java @@ -8,27 +8,30 @@ import org.jeecgframework.web.cgform.entity.enhance.CgformEnhanceJavaEntity; public interface CgformEnhanceJavaServiceI extends CommonService{ - public void delete(T entity); + @Override + public void delete(T entity); - public Serializable save(T entity); + @Override + public Serializable save(T entity); - public void saveOrUpdate(T entity); + @Override + public void saveOrUpdate(T entity); /** * 默认按钮-sql增强-新增操作 - * @param id + * @param t * @return */ public boolean doAddSql(CgformEnhanceJavaEntity t); /** * 默认按钮-sql增强-更新操作 - * @param id + * @param t * @return */ public boolean doUpdateSql(CgformEnhanceJavaEntity t); /** * 默认按钮-sql增强-删除操作 - * @param id + * @param t * @return */ public boolean doDelSql(CgformEnhanceJavaEntity t); diff --git a/src/main/java/org/jeecgframework/web/cgform/service/impl/autolist/CgTableServiceImpl.java b/src/main/java/org/jeecgframework/web/cgform/service/impl/autolist/CgTableServiceImpl.java index bfe311e79b92568747b921c3e966b2eb43040d47..1c4c07bd7545e6bf0db313a025fe94fc02df2460 100644 --- a/src/main/java/org/jeecgframework/web/cgform/service/impl/autolist/CgTableServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/cgform/service/impl/autolist/CgTableServiceImpl.java @@ -46,7 +46,8 @@ public class CgTableServiceImpl extends CommonServiceImpl implements CgTableServ @Autowired private CgFormFieldServiceI cgFormFieldService; - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public List> querySingle(String table, String field, Map params, int page, int rows) { @@ -57,8 +58,9 @@ public class CgTableServiceImpl extends CommonServiceImpl implements CgTableServ return result; } - public List> querySingle(String table, String field, Map params, - String sort, String order, int page, int rows) { + @Override + public List> querySingle(String table, String field, Map params, + String sort, String order, int page, int rows) { StringBuilder sqlB = new StringBuilder(); dealQuerySql(table,field,params,sqlB); if(!StringUtil.isEmpty(sort)&& !StringUtil.isEmpty(order)){ @@ -69,7 +71,8 @@ public class CgTableServiceImpl extends CommonServiceImpl implements CgTableServ return result; } - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public boolean delete(String table, Object id) { try{ @@ -165,7 +168,8 @@ public class CgTableServiceImpl extends CommonServiceImpl implements CgTableServ } - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public Long getQuerySingleSize(String table, String field, Map params) { StringBuilder sqlB = new StringBuilder(); @@ -178,7 +182,8 @@ public class CgTableServiceImpl extends CommonServiceImpl implements CgTableServ } } - public boolean deleteBatch(String table, String[] ids) { + @Override + public boolean deleteBatch(String table, String[] ids) { try{ for(String id:ids){ delete(table, id); diff --git a/src/main/java/org/jeecgframework/web/cgform/service/impl/autolist/ConfigServiceImpl.java b/src/main/java/org/jeecgframework/web/cgform/service/impl/autolist/ConfigServiceImpl.java index 26d0c052bb617b97bb1fbeb5065f18758d15f41b..84c805ab618ac43cc1b2a2d8f527fc69f317e67f 100644 --- a/src/main/java/org/jeecgframework/web/cgform/service/impl/autolist/ConfigServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/cgform/service/impl/autolist/ConfigServiceImpl.java @@ -43,7 +43,8 @@ public class ConfigServiceImpl implements ConfigServiceI { /** * tableName 表单名 */ - @Ehcache + @Override + @Ehcache public Map queryConfigs(String tableName,String jversion) { //step.1 要返回的配置数据 Map configs = new HashMap(); diff --git a/src/main/java/org/jeecgframework/web/cgform/service/impl/build/DataBaseServiceImpl.java b/src/main/java/org/jeecgframework/web/cgform/service/impl/build/DataBaseServiceImpl.java index b98bebf398ad71a8d7f32d5d71a5afaf22eab0a0..6eff35a8f0693b9154994a7f8ff349de04e0b866 100644 --- a/src/main/java/org/jeecgframework/web/cgform/service/impl/build/DataBaseServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/cgform/service/impl/build/DataBaseServiceImpl.java @@ -63,7 +63,8 @@ public class DataBaseServiceImpl extends CommonServiceImpl implements DataBaseSe * @throws BusinessException */ - public void insertTable(String tableName, Map data) throws BusinessException { + @Override + public void insertTable(String tableName, Map data) throws BusinessException { CgFormHeadEntity cgFormHeadEntity = cgFormFieldService.getCgFormHeadByTableName(tableName); //系统上下文变量赋值 fillInsertSysVar(tableName,data); @@ -202,7 +203,8 @@ public class DataBaseServiceImpl extends CommonServiceImpl implements DataBaseSe * @param data 修改的数据map */ - public int updateTable(String tableName, Object id, Map data) throws BusinessException { + @Override + public int updateTable(String tableName, Object id, Map data) throws BusinessException { fillUpdateSysVar(tableName,data); dataAdapter(tableName,data); String comma = ""; @@ -247,7 +249,8 @@ public class DataBaseServiceImpl extends CommonServiceImpl implements DataBaseSe * @param id 表数据id */ - public Map findOneForJdbc(String tableName, String id) { + @Override + public Map findOneForJdbc(String tableName, String id) { StringBuffer sqlBuffer = new StringBuffer(); sqlBuffer.append("select * from ").append(tableName); sqlBuffer.append(" where id= ? "); @@ -259,7 +262,8 @@ public class DataBaseServiceImpl extends CommonServiceImpl implements DataBaseSe * sql业务增强 * */ - public void executeSqlExtend(String formId,String buttonCode,Map data){ + @Override + public void executeSqlExtend(String formId, String buttonCode, Map data){ //根据formId和buttonCode获取 CgformButtonSqlEntity cgformButtonSqlVo = getCgformButtonSqlByCodeFormId(buttonCode,formId); if(cgformButtonSqlVo!=null){ @@ -325,7 +329,8 @@ public class DataBaseServiceImpl extends CommonServiceImpl implements DataBaseSe return sql; } - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public Map insertTableMore(Map>> mapMore, String mainTableName) throws BusinessException { //插入主表信息 @@ -359,7 +364,8 @@ public class DataBaseServiceImpl extends CommonServiceImpl implements DataBaseSe return mainMap; } - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public boolean updateTableMore(Map>> mapMore, String mainTableName) throws BusinessException { //更新主表信息 @@ -467,7 +473,8 @@ public class DataBaseServiceImpl extends CommonServiceImpl implements DataBaseSe * @param tableName 表单名称 * @return */ - public Object getPkValue(String tableName) { + @Override + public Object getPkValue(String tableName) { Object pkValue = null; CgFormHeadEntity cghead = cgFormFieldService.getCgFormHeadByTableName(tableName); String dbType = DBTypeUtil.getDBType(); @@ -682,7 +689,8 @@ public class DataBaseServiceImpl extends CommonServiceImpl implements DataBaseSe return null; } - public List getCgformEnhanceJavaEntityByFormId( String formId) { + @Override + public List getCgformEnhanceJavaEntityByFormId(String formId) { StringBuilder hql = new StringBuilder(""); hql.append(" from CgformEnhanceJavaEntity t"); hql.append(" where t.formId='").append(formId).append("'"); diff --git a/src/main/java/org/jeecgframework/web/cgform/service/impl/button/CgformButtonServiceImpl.java b/src/main/java/org/jeecgframework/web/cgform/service/impl/button/CgformButtonServiceImpl.java index a4fc584e5e6e60fa73782bc09eb428464f215fe6..3e2c6bea14df1b7ccd5c9ac807a6ce1ce7af7034 100644 --- a/src/main/java/org/jeecgframework/web/cgform/service/impl/button/CgformButtonServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/cgform/service/impl/button/CgformButtonServiceImpl.java @@ -19,7 +19,8 @@ public class CgformButtonServiceImpl extends CommonServiceImpl implements Cgform * @return */ - public List getCgformButtonListByFormId(String formId) { + @Override + public List getCgformButtonListByFormId(String formId) { StringBuilder hql = new StringBuilder(""); hql.append(" from CgformButtonEntity t"); hql.append(" where t.formId=? order by t.orderNum asc"); @@ -33,7 +34,8 @@ public class CgformButtonServiceImpl extends CommonServiceImpl implements Cgform * @return */ - public List checkCgformButton(CgformButtonEntity cgformButtonEntity) { + @Override + public List checkCgformButton(CgformButtonEntity cgformButtonEntity) { StringBuilder hql = new StringBuilder(""); hql.append(" from CgformButtonEntity t"); hql.append(" where t.formId='").append(cgformButtonEntity.getFormId()).append("'"); diff --git a/src/main/java/org/jeecgframework/web/cgform/service/impl/button/CgformButtonSqlServiceImpl.java b/src/main/java/org/jeecgframework/web/cgform/service/impl/button/CgformButtonSqlServiceImpl.java index ebbf00dbc0bfdae03dc21f5e23dd2101fda00008..cc857dba69bd45fc89ab8d10e8fc2cffb171d1f5 100644 --- a/src/main/java/org/jeecgframework/web/cgform/service/impl/button/CgformButtonSqlServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/cgform/service/impl/button/CgformButtonSqlServiceImpl.java @@ -15,11 +15,12 @@ public class CgformButtonSqlServiceImpl extends CommonServiceImpl implements Cgf /** * 校验按钮sql增强唯一性 - * @param cgformButtonEntity + * @param cgformButtonSqlEntity * @return */ - public List checkCgformButtonSql( + @Override + public List checkCgformButtonSql( CgformButtonSqlEntity cgformButtonSqlEntity) { StringBuilder hql = new StringBuilder(""); hql.append(" from CgformButtonSqlEntity t"); @@ -33,7 +34,8 @@ public class CgformButtonSqlServiceImpl extends CommonServiceImpl implements Cgf } - public CgformButtonSqlEntity getCgformButtonSqlByCodeFormId(String buttonCode, String formId) { + @Override + public CgformButtonSqlEntity getCgformButtonSqlByCodeFormId(String buttonCode, String formId) { StringBuilder hql = new StringBuilder(""); hql.append(" from CgformButtonSqlEntity t"); hql.append(" where t.formId='").append(formId).append("'"); diff --git a/src/main/java/org/jeecgframework/web/cgform/service/impl/cgformftl/CgformFtlServiceImpl.java b/src/main/java/org/jeecgframework/web/cgform/service/impl/cgformftl/CgformFtlServiceImpl.java index 421dc5cad42b9e0ff9860b37c6095213abfb7e66..784a6020b3b0419fdf74be35e02a1b164441d72b 100644 --- a/src/main/java/org/jeecgframework/web/cgform/service/impl/cgformftl/CgformFtlServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/cgform/service/impl/cgformftl/CgformFtlServiceImpl.java @@ -33,7 +33,8 @@ public class CgformFtlServiceImpl extends CommonServiceImpl implements CgformFtl * 根据tableName获取form模板信息 */ - public Map getCgformFtlByTableName(String tableName) { + @Override + public Map getCgformFtlByTableName(String tableName) { StringBuilder sql = new StringBuilder(""); sql.append("select ftl.* from cgform_ftl ftl,cgform_head head"); sql.append(" where ftl.cgform_id=head.id"); @@ -47,7 +48,8 @@ public class CgformFtlServiceImpl extends CommonServiceImpl implements CgformFtl } - public int getNextVarsion(String cgformId) { + @Override + public int getNextVarsion(String cgformId) { StringBuilder sql = new StringBuilder(""); sql.append("select (max(ftl_version)+1) as varsion from cgform_ftl"); sql.append(" where cgform_id = ? "); @@ -60,7 +62,8 @@ public class CgformFtlServiceImpl extends CommonServiceImpl implements CgformFtl } - public boolean hasActive(String cgformId) { + @Override + public boolean hasActive(String cgformId) { StringBuilder sql = new StringBuilder(""); sql.append("select * from cgform_ftl"); sql.append(" where ftl_status = '1' "); diff --git a/src/main/java/org/jeecgframework/web/cgform/service/impl/config/CgFormFieldServiceImpl.java b/src/main/java/org/jeecgframework/web/cgform/service/impl/config/CgFormFieldServiceImpl.java index 138e198d2f9b9e797f50ae0255f4b6e80d65479d..b02e3daa6ff2836d59b33a35ba77511c2b50a8c0 100644 --- a/src/main/java/org/jeecgframework/web/cgform/service/impl/config/CgFormFieldServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/cgform/service/impl/config/CgFormFieldServiceImpl.java @@ -76,7 +76,8 @@ public class CgFormFieldServiceImpl extends CommonServiceImpl implements private CgFormIndexServiceI cgFormIndexService; - public synchronized void updateTable(CgFormHeadEntity t, String sign,boolean isChange) { + @Override + public synchronized void updateTable(CgFormHeadEntity t, String sign, boolean isChange) { CgFormFieldEntity column; boolean databaseFieldIsChange = false; for (int i = 0; i < t.getColumns().size(); i++) { @@ -146,6 +147,7 @@ public class CgFormFieldServiceImpl extends CommonServiceImpl implements + @Override public void saveTable(CgFormHeadEntity cgFormHead) { cgFormHead.setJformVersion("1"); cgFormHead.setIsDbSynch("N"); @@ -169,6 +171,7 @@ public class CgFormFieldServiceImpl extends CommonServiceImpl implements * @param a */ + @Override public void saveTable(CgFormHeadEntity cgFormHead, String a) { cgFormHead.setId((String) this.getSession().save(cgFormHead)); CgFormFieldEntity column; @@ -184,6 +187,7 @@ public class CgFormFieldServiceImpl extends CommonServiceImpl implements } + @Override public Boolean judgeTableIsExit(String tableName) { Connection conn = null; ResultSet rs = null; @@ -223,7 +227,8 @@ public class CgFormFieldServiceImpl extends CommonServiceImpl implements * * @throws BusinessException */ - public boolean dbSynch(CgFormHeadEntity cgFormHead,String synMethod) + @Override + public boolean dbSynch(CgFormHeadEntity cgFormHead, String synMethod) throws BusinessException { try { if(SYN_NORMAL.equals(synMethod)){ @@ -281,6 +286,7 @@ public class CgFormFieldServiceImpl extends CommonServiceImpl implements } + @Override public void deleteCgForm(CgFormHeadEntity cgFormHead) { if (judgeTableIsExit(cgFormHead.getTableName())) { String sql = getTableUtil().dropTableSQL(cgFormHead.getTableName()); @@ -300,6 +306,7 @@ public class CgFormFieldServiceImpl extends CommonServiceImpl implements } + @Override public List> getCgFormFieldByTableName(String tableName) { List> list = cgFormFieldDao.getCgFormFieldByTableName(tableName); return list; @@ -322,6 +329,7 @@ public class CgFormFieldServiceImpl extends CommonServiceImpl implements } + @Override public Map getCgFormFieldByFormId(String formid) { StringBuilder hql = new StringBuilder(""); hql.append("from CgFormFieldEntity f"); @@ -337,6 +345,7 @@ public class CgFormFieldServiceImpl extends CommonServiceImpl implements } + @Override public Map getAllCgFormFieldByTableName( String tableName) { StringBuilder hql = new StringBuilder(""); @@ -353,6 +362,7 @@ public class CgFormFieldServiceImpl extends CommonServiceImpl implements } + @Override @Ehcache public Map getAllCgFormFieldByTableName( String tableName, String version) { @@ -370,6 +380,7 @@ public class CgFormFieldServiceImpl extends CommonServiceImpl implements } + @Override public CgFormHeadEntity getCgFormHeadByTableName(String tableName) { StringBuilder hql = new StringBuilder(""); hql.append("from CgFormHeadEntity f"); @@ -382,8 +393,9 @@ public class CgFormFieldServiceImpl extends CommonServiceImpl implements } + @Override public List> getSubTableData(String mainTableName, - String subTableName, Object mainTableId) { + String subTableName, Object mainTableId) { mainTableName = PublicUtil.replaceTableName(mainTableName); subTableName = PublicUtil.replaceTableName(subTableName); @@ -418,6 +430,7 @@ public class CgFormFieldServiceImpl extends CommonServiceImpl implements } + @Override public boolean appendSubTableStr4Main(CgFormHeadEntity entity) { // step.1 获取本表的名称 String thisSubTable = entity.getTableName(); @@ -455,6 +468,7 @@ public class CgFormFieldServiceImpl extends CommonServiceImpl implements } + @Override public boolean removeSubTableStr4Main(CgFormHeadEntity entity) { if (entity == null) { return false; @@ -499,9 +513,11 @@ public class CgFormFieldServiceImpl extends CommonServiceImpl implements } + @Override public void sortSubTableStr(CgFormHeadEntity entity) { - if (entity == null) - return; + if (entity == null) { + return; + } CgFormHeadEntity main = null; List columns = entity.getColumns(); for (CgFormFieldEntity fieldE : columns) { @@ -521,14 +537,16 @@ public class CgFormFieldServiceImpl extends CommonServiceImpl implements String subTableStr = main.getSubTableStr(); if(StringUtils.isNotEmpty(subTableStr)){ String [] subTables = subTableStr.split(","); - if (subTables.length <= 1) - return; + if (subTables.length <= 1) { + return; + } List subList = new ArrayList(); for(String subTable : subTables){ CgFormHeadEntity sub = this.getCgFormHeadByTableName(subTable); subList.add(sub); } Collections.sort(subList, new Comparator() { + @Override public int compare(CgFormHeadEntity arg0, CgFormHeadEntity arg1) { Integer tabOrder0 = arg0.getTabOrder(); if (tabOrder0 == null) { @@ -552,6 +570,7 @@ public class CgFormFieldServiceImpl extends CommonServiceImpl implements } + @Override public String getCgFormVersionByTableName(String tableName) { String version = cgFormVersionDao .getCgFormVersionByTableName(tableName); @@ -560,6 +579,7 @@ public class CgFormFieldServiceImpl extends CommonServiceImpl implements } + @Override public String getCgFormVersionById(String id) { String version = cgFormVersionDao.getCgFormVersionById(id); return StringUtil.isEmpty(version) ? "0" : version; @@ -572,6 +592,7 @@ public class CgFormFieldServiceImpl extends CommonServiceImpl implements * @param version * @return */ + @Override public Map getFtlFormConfig(String tableName, String version) { Map data = new HashMap(); Map field = new HashMap(); @@ -723,6 +744,7 @@ public class CgFormFieldServiceImpl extends CommonServiceImpl implements * @param version * @return */ + @Override @Ehcache public CgFormHeadEntity getCgFormHeadByTableName(String tableName, String version) { @@ -737,6 +759,7 @@ public class CgFormFieldServiceImpl extends CommonServiceImpl implements } + @Override public synchronized boolean updateVersion(String formId) { try { int newV = Integer.parseInt(cgFormVersionDao @@ -751,6 +774,7 @@ public class CgFormFieldServiceImpl extends CommonServiceImpl implements } + @Override public List getHiddenCgFormFieldByTableName( String tableName) { StringBuilder hql = new StringBuilder(""); @@ -771,6 +795,7 @@ public class CgFormFieldServiceImpl extends CommonServiceImpl implements } + @Override public boolean checkTableExist(String tableName) { boolean result =true; try{ diff --git a/src/main/java/org/jeecgframework/web/cgform/service/impl/config/CgFormIndexServiceImpl.java b/src/main/java/org/jeecgframework/web/cgform/service/impl/config/CgFormIndexServiceImpl.java index 66aa27d34a27dabba6c1629b4c6ea5cb6f62ed26..bd85823d78d3595f6db0b69fd6118d7425243659 100644 --- a/src/main/java/org/jeecgframework/web/cgform/service/impl/config/CgFormIndexServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/cgform/service/impl/config/CgFormIndexServiceImpl.java @@ -17,20 +17,23 @@ import org.springframework.transaction.annotation.Transactional; public class CgFormIndexServiceImpl extends CommonServiceImpl implements CgFormIndexServiceI { private static final Logger logger = Logger.getLogger(CgFormIndexServiceImpl.class); - public void delete(T entity) { + @Override + public void delete(T entity) { super.delete(entity); //执行删除操作配置的sql增强 this.doDelSql((CgFormIndexEntity)entity); } - public Serializable save(T entity) { + @Override + public Serializable save(T entity) { Serializable t = super.save(entity); //执行新增操作配置的sql增强 this.doAddSql((CgFormIndexEntity)entity); return t; } - public void saveOrUpdate(T entity) { + @Override + public void saveOrUpdate(T entity) { super.saveOrUpdate(entity); //执行更新操作配置的sql增强 this.doUpdateSql((CgFormIndexEntity)entity); @@ -38,26 +41,29 @@ public class CgFormIndexServiceImpl extends CommonServiceImpl implements CgFormI /** * 默认按钮-sql增强-新增操作 - * @param id + * @param t * @return */ - public boolean doAddSql(CgFormIndexEntity t){ + @Override + public boolean doAddSql(CgFormIndexEntity t){ return true; } /** * 默认按钮-sql增强-更新操作 - * @param id + * @param t * @return */ - public boolean doUpdateSql(CgFormIndexEntity t){ + @Override + public boolean doUpdateSql(CgFormIndexEntity t){ return true; } /** * 默认按钮-sql增强-删除操作 - * @param id + * @param t * @return */ - public boolean doDelSql(CgFormIndexEntity t){ + @Override + public boolean doDelSql(CgFormIndexEntity t){ return true; } diff --git a/src/main/java/org/jeecgframework/web/cgform/service/impl/config/DbTableMysqlHandleImpl.java b/src/main/java/org/jeecgframework/web/cgform/service/impl/config/DbTableMysqlHandleImpl.java index 9c772e8943d3c6ec4a01a7a5481e6ee46d03614d..177ef1400b5efb1cfd8bc600550acf67a9ddb09d 100644 --- a/src/main/java/org/jeecgframework/web/cgform/service/impl/config/DbTableMysqlHandleImpl.java +++ b/src/main/java/org/jeecgframework/web/cgform/service/impl/config/DbTableMysqlHandleImpl.java @@ -12,22 +12,26 @@ import org.jeecgframework.web.cgform.service.impl.config.util.ColumnMeta; public class DbTableMysqlHandleImpl implements DbTableHandleI { - public String getAddColumnSql(ColumnMeta columnMeta) { + @Override + public String getAddColumnSql(ColumnMeta columnMeta) { return " ADD COLUMN "+getAddFieldDesc(columnMeta)+";"; } - public String getReNameFieldName(ColumnMeta columnMeta) { + @Override + public String getReNameFieldName(ColumnMeta columnMeta) { return "CHANGE COLUMN "+columnMeta.getOldColumnName() +" "+getRenameFieldDesc(columnMeta)+ " ;"; } - public String getUpdateColumnSql(ColumnMeta cgformcolumnMeta,ColumnMeta datacolumnMeta) { + @Override + public String getUpdateColumnSql(ColumnMeta cgformcolumnMeta, ColumnMeta datacolumnMeta) { return " MODIFY COLUMN "+getUpdateFieldDesc(cgformcolumnMeta,datacolumnMeta)+";"; } - public String getMatchClassTypeByDataType(String dataType,int digits) { + @Override + public String getMatchClassTypeByDataType(String dataType, int digits) { String result =""; if (dataType.equalsIgnoreCase("varchar")) { result="string"; @@ -50,12 +54,14 @@ public class DbTableMysqlHandleImpl implements DbTableHandleI { } - public String dropTableSQL(String tableName) { + @Override + public String dropTableSQL(String tableName) { return " DROP TABLE IF EXISTS "+tableName+" ;"; } - public String getDropColumnSql(String fieldName) { + @Override + public String getDropColumnSql(String fieldName) { return " DROP COLUMN "+fieldName+";"; } /** @@ -109,13 +115,15 @@ public class DbTableMysqlHandleImpl implements DbTableHandleI { * Mysql注释是和修改的sql一起的,所以返回空字符串就可以了 */ - public String getCommentSql(ColumnMeta columnMeta) { + @Override + public String getCommentSql(ColumnMeta columnMeta) { return ""; } - public String getSpecialHandle(ColumnMeta cgformcolumnMeta, - ColumnMeta datacolumnMeta) { + @Override + public String getSpecialHandle(ColumnMeta cgformcolumnMeta, + ColumnMeta datacolumnMeta) { return null; } diff --git a/src/main/java/org/jeecgframework/web/cgform/service/impl/config/DbTableOracleHandleImpl.java b/src/main/java/org/jeecgframework/web/cgform/service/impl/config/DbTableOracleHandleImpl.java index b3db81e8946b89e610a6723885a815ca9b9f7de8..269adf8477f2458d42bbb192af261d319382b141 100644 --- a/src/main/java/org/jeecgframework/web/cgform/service/impl/config/DbTableOracleHandleImpl.java +++ b/src/main/java/org/jeecgframework/web/cgform/service/impl/config/DbTableOracleHandleImpl.java @@ -13,22 +13,26 @@ import org.jeecgframework.web.cgform.service.impl.config.util.ColumnMeta; public class DbTableOracleHandleImpl implements DbTableHandleI { - public String getAddColumnSql(ColumnMeta columnMeta) { + @Override + public String getAddColumnSql(ColumnMeta columnMeta) { return " ADD "+getAddFieldDesc(columnMeta)+""; } - public String getReNameFieldName(ColumnMeta columnMeta) { + @Override + public String getReNameFieldName(ColumnMeta columnMeta) { return "RENAME COLUMN "+columnMeta.getOldColumnName() +" TO "+columnMeta.getColumnName()+""; } - public String getUpdateColumnSql(ColumnMeta cgformcolumnMeta,ColumnMeta datacolumnMeta) { + @Override + public String getUpdateColumnSql(ColumnMeta cgformcolumnMeta, ColumnMeta datacolumnMeta) { return " MODIFY "+getUpdateFieldDesc(cgformcolumnMeta,datacolumnMeta)+""; } - public String getMatchClassTypeByDataType(String dataType,int digits) { + @Override + public String getMatchClassTypeByDataType(String dataType, int digits) { String result =""; if (dataType.equalsIgnoreCase("varchar2")) { result="string"; @@ -49,12 +53,14 @@ public class DbTableOracleHandleImpl implements DbTableHandleI { } - public String dropTableSQL(String tableName) { + @Override + public String dropTableSQL(String tableName) { return " DROP TABLE "+tableName.toLowerCase()+" "; } - public String getDropColumnSql(String fieldName) { + @Override + public String getDropColumnSql(String fieldName) { return " DROP COLUMN "+fieldName.toUpperCase()+""; } @@ -107,13 +113,15 @@ public class DbTableOracleHandleImpl implements DbTableHandleI { } - public String getCommentSql(ColumnMeta columnMeta) { + @Override + public String getCommentSql(ColumnMeta columnMeta) { return "COMMENT ON COLUMN "+columnMeta.getTableName()+"."+columnMeta.getColumnName()+" IS '" +columnMeta.getComment()+"'"; } - public String getSpecialHandle(ColumnMeta cgformcolumnMeta, - ColumnMeta datacolumnMeta) { + @Override + public String getSpecialHandle(ColumnMeta cgformcolumnMeta, + ColumnMeta datacolumnMeta) { return null; } diff --git a/src/main/java/org/jeecgframework/web/cgform/service/impl/config/DbTablePostgresHandleImpl.java b/src/main/java/org/jeecgframework/web/cgform/service/impl/config/DbTablePostgresHandleImpl.java index a98f7410e5318cdd4c6fcf6c3a927981f14f7d31..a6710088aa18ff34e894c1137968b2b2ed4df0fe 100644 --- a/src/main/java/org/jeecgframework/web/cgform/service/impl/config/DbTablePostgresHandleImpl.java +++ b/src/main/java/org/jeecgframework/web/cgform/service/impl/config/DbTablePostgresHandleImpl.java @@ -14,28 +14,33 @@ import org.jeecgframework.web.cgform.service.impl.config.util.ColumnMeta; public class DbTablePostgresHandleImpl implements DbTableHandleI { - public String getAddColumnSql(ColumnMeta columnMeta) { + @Override + public String getAddColumnSql(ColumnMeta columnMeta) { return " ADD COLUMN "+getAddFieldDesc(columnMeta)+";"; } - public String getReNameFieldName(ColumnMeta columnMeta) { + @Override + public String getReNameFieldName(ColumnMeta columnMeta) { return " RENAME COLUMN "+columnMeta.getOldColumnName() +" to "+columnMeta.getColumnName()+";"; } - public String getUpdateColumnSql(ColumnMeta cgformcolumnMeta,ColumnMeta datacolumnMeta)throws DBException { + @Override + public String getUpdateColumnSql(ColumnMeta cgformcolumnMeta, ColumnMeta datacolumnMeta)throws DBException { return " ALTER COLUMN "+getUpdateFieldDesc(cgformcolumnMeta,datacolumnMeta)+";"; } - public String getSpecialHandle(ColumnMeta cgformcolumnMeta, - ColumnMeta datacolumnMeta) { + @Override + public String getSpecialHandle(ColumnMeta cgformcolumnMeta, + ColumnMeta datacolumnMeta) { return " ALTER COLUMN "+getUpdateFieldDefault(cgformcolumnMeta,datacolumnMeta)+";"; } - public String getMatchClassTypeByDataType(String dataType,int digits) { + @Override + public String getMatchClassTypeByDataType(String dataType, int digits) { String result =""; if (dataType.equalsIgnoreCase("varchar")) { result="string"; @@ -61,12 +66,14 @@ public class DbTablePostgresHandleImpl implements DbTableHandleI { } - public String dropTableSQL(String tableName) { + @Override + public String dropTableSQL(String tableName) { return " DROP TABLE "+tableName+" ;"; } - public String getDropColumnSql(String fieldName) { + @Override + public String getDropColumnSql(String fieldName) { return " DROP COLUMN "+fieldName+";"; } @@ -158,7 +165,8 @@ public class DbTablePostgresHandleImpl implements DbTableHandleI { } - public String getCommentSql(ColumnMeta columnMeta) { + @Override + public String getCommentSql(ColumnMeta columnMeta) { return "COMMENT ON COLUMN "+columnMeta.getTableName()+"."+columnMeta.getColumnName()+" IS '" +columnMeta.getComment()+"'"; } diff --git a/src/main/java/org/jeecgframework/web/cgform/service/impl/config/DbTableServiceMysqlImpl.java b/src/main/java/org/jeecgframework/web/cgform/service/impl/config/DbTableServiceMysqlImpl.java index ee9f910b9ff00cf9822b47ad2bf99867fa77b02d..9806643d9fb2c9bfd9ba78def0bcf598170a355b 100644 --- a/src/main/java/org/jeecgframework/web/cgform/service/impl/config/DbTableServiceMysqlImpl.java +++ b/src/main/java/org/jeecgframework/web/cgform/service/impl/config/DbTableServiceMysqlImpl.java @@ -25,7 +25,8 @@ public class DbTableServiceMysqlImpl implements DbTableServiceI { - public String createTableSQL(CgFormHeadEntity cgFormHead) { + @Override + public String createTableSQL(CgFormHeadEntity cgFormHead) { StringBuilder sb = new StringBuilder(); sb.append("CREATE TABLE "); sb.append(cgFormHead.getTableName()+" ("); @@ -47,12 +48,14 @@ public class DbTableServiceMysqlImpl implements DbTableServiceI { } - public String dropTableSQL(CgFormHeadEntity tableProperty) { + @Override + public String dropTableSQL(CgFormHeadEntity tableProperty) { return " DROP TABLE IF EXISTS "+tableProperty.getTableName()+" ;"; } - public String updateTableSQL(CgFormHeadEntity cgFormHead, JdbcTemplate jdbcTemplate) { + @Override + public String updateTableSQL(CgFormHeadEntity cgFormHead, JdbcTemplate jdbcTemplate) { String sql = "select column_name,data_type,column_comment,numeric_precision,numeric_scale,character_maximum_length," + "is_nullable nullable from information_schema.columns where table_name = '"+cgFormHead.getTableName()+"'and table_schema = '"+CodeResourceUtil.DATABASE_NAME+"';"; @@ -167,7 +170,8 @@ public class DbTableServiceMysqlImpl implements DbTableServiceI { } - public String createIsExitSql(String tableName) { + @Override + public String createIsExitSql(String tableName) { return "SELECT COUNT(*) FROM information_schema.TABLES WHERE TABLE_NAME='"+tableName+"' and table_schema = '"+CodeResourceUtil.DATABASE_NAME+"';"; } diff --git a/src/main/java/org/jeecgframework/web/cgform/service/impl/config/TableSQLServerHandleImpl.java b/src/main/java/org/jeecgframework/web/cgform/service/impl/config/TableSQLServerHandleImpl.java index 1a09e1bd37bbb72591d89bbe5d7516d119ce6453..b13a48c62e77e0951e6376b62c9d05ae0619fb9c 100644 --- a/src/main/java/org/jeecgframework/web/cgform/service/impl/config/TableSQLServerHandleImpl.java +++ b/src/main/java/org/jeecgframework/web/cgform/service/impl/config/TableSQLServerHandleImpl.java @@ -13,24 +13,28 @@ import org.jeecgframework.web.cgform.service.impl.config.util.ColumnMeta; public class TableSQLServerHandleImpl implements DbTableHandleI { - public String getAddColumnSql(ColumnMeta columnMeta) { + @Override + public String getAddColumnSql(ColumnMeta columnMeta) { return " ADD "+getAddFieldDesc(columnMeta)+";"; } - public String getReNameFieldName(ColumnMeta columnMeta) { + @Override + public String getReNameFieldName(ColumnMeta columnMeta) { //sp_rename 'TOA_E_ARTICLE.version','processVersion','COLUMN'; return " sp_rename '"+columnMeta.getTableName()+"."+columnMeta.getOldColumnName()+"', '"+columnMeta.getColumnName()+"', 'COLUMN';"; //return "ALTER COLUMN "+columnMeta.getOldColumnName() +" "+getRenameFieldDesc(columnMeta)+";"; } - public String getUpdateColumnSql(ColumnMeta cgformcolumnMeta,ColumnMeta datacolumnMeta) { + @Override + public String getUpdateColumnSql(ColumnMeta cgformcolumnMeta, ColumnMeta datacolumnMeta) { return " ALTER COLUMN "+getUpdateFieldDesc(cgformcolumnMeta,datacolumnMeta)+";"; } - public String getMatchClassTypeByDataType(String dataType,int digits) { + @Override + public String getMatchClassTypeByDataType(String dataType, int digits) { String result =""; if (dataType.equalsIgnoreCase("varchar")) { result="string"; @@ -49,12 +53,14 @@ public class TableSQLServerHandleImpl implements DbTableHandleI { } - public String dropTableSQL(String tableName) { + @Override + public String dropTableSQL(String tableName) { return " DROP TABLE "+tableName+" ;"; } - public String getDropColumnSql(String fieldName) { + @Override + public String getDropColumnSql(String fieldName) { return " DROP COLUMN "+fieldName+";"; } @@ -109,7 +115,8 @@ public class TableSQLServerHandleImpl implements DbTableHandleI { } - public String getCommentSql(ColumnMeta columnMeta) { + @Override + public String getCommentSql(ColumnMeta columnMeta) { StringBuffer commentSql = new StringBuffer("EXECUTE "); if(StringUtil.isEmpty(columnMeta.getOldColumnName())){ commentSql.append("sp_addextendedproperty"); @@ -126,8 +133,9 @@ public class TableSQLServerHandleImpl implements DbTableHandleI { } - public String getSpecialHandle(ColumnMeta cgformcolumnMeta, - ColumnMeta datacolumnMeta) { + @Override + public String getSpecialHandle(ColumnMeta cgformcolumnMeta, + ColumnMeta datacolumnMeta) { return null; } diff --git a/src/main/java/org/jeecgframework/web/cgform/service/impl/config/util/ColumnMeta.java b/src/main/java/org/jeecgframework/web/cgform/service/impl/config/util/ColumnMeta.java index 4b170fb284ff5512d863d8694d9494e030a94847..1bedd93389e1bf2ec3309a6fe35b882bc4812c84 100644 --- a/src/main/java/org/jeecgframework/web/cgform/service/impl/config/util/ColumnMeta.java +++ b/src/main/java/org/jeecgframework/web/cgform/service/impl/config/util/ColumnMeta.java @@ -16,7 +16,8 @@ public class ColumnMeta { private String oldColumnName;//原来的字段名 - public boolean equals(Object obj) { + @Override + public boolean equals(Object obj) { if (obj == this) { return true; } @@ -87,7 +88,8 @@ public class ColumnMeta { } - public int hashCode() { + @Override + public int hashCode() { return columnSize + colunmType.hashCode()*columnName.hashCode(); } public void setColumnName(String columnName) { @@ -113,7 +115,8 @@ public class ColumnMeta { this.oldColumnName = oldColumnName; } - public String toString() { + @Override + public String toString() { return columnName+","+colunmType+","+isNullable+","+columnSize; } public String getColumnId() { diff --git a/src/main/java/org/jeecgframework/web/cgform/service/impl/config/util/FieldNumComparator.java b/src/main/java/org/jeecgframework/web/cgform/service/impl/config/util/FieldNumComparator.java index 43f06fe4f6fec9973ab8e6747d3d04e7cd4feecd..fc806fc6d8cf3d012136a9ff1b7f90acb9e4e568 100644 --- a/src/main/java/org/jeecgframework/web/cgform/service/impl/config/util/FieldNumComparator.java +++ b/src/main/java/org/jeecgframework/web/cgform/service/impl/config/util/FieldNumComparator.java @@ -11,9 +11,11 @@ import org.jeecgframework.web.cgform.entity.config.CgFormFieldEntity; public class FieldNumComparator implements Comparator { + @Override public int compare(CgFormFieldEntity o1, CgFormFieldEntity o2) { - if (o1 == null || o1.getOrderNum() == null || o2 == null || o2.getOrderNum() == null) - return -1; + if (o1 == null || o1.getOrderNum() == null || o2 == null || o2.getOrderNum() == null) { + return -1; + } Integer thisVal = o1.getOrderNum(); Integer anotherVal = o2.getOrderNum(); return (thisVal < anotherVal ? -1 : (thisVal == anotherVal ? 0 : 1)); diff --git a/src/main/java/org/jeecgframework/web/cgform/service/impl/enhance/CgformEnhanceJavaServiceImpl.java b/src/main/java/org/jeecgframework/web/cgform/service/impl/enhance/CgformEnhanceJavaServiceImpl.java index e8dbebd96bb181b3821f59ceae79c1127ba7e277..25c75eba3338f5bb04109cd14d9b1dfc0ee38018 100644 --- a/src/main/java/org/jeecgframework/web/cgform/service/impl/enhance/CgformEnhanceJavaServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/cgform/service/impl/enhance/CgformEnhanceJavaServiceImpl.java @@ -16,20 +16,23 @@ import org.springframework.transaction.annotation.Transactional; public class CgformEnhanceJavaServiceImpl extends CommonServiceImpl implements CgformEnhanceJavaServiceI { - public void delete(T entity) { + @Override + public void delete(T entity) { super.delete(entity); //执行删除操作配置的sql增强 this.doDelSql((CgformEnhanceJavaEntity)entity); } - public Serializable save(T entity) { + @Override + public Serializable save(T entity) { Serializable t = super.save(entity); //执行新增操作配置的sql增强 this.doAddSql((CgformEnhanceJavaEntity)entity); return t; } - public void saveOrUpdate(T entity) { + @Override + public void saveOrUpdate(T entity) { super.saveOrUpdate(entity); //执行更新操作配置的sql增强 this.doUpdateSql((CgformEnhanceJavaEntity)entity); @@ -40,7 +43,8 @@ public class CgformEnhanceJavaServiceImpl extends CommonServiceImpl implements C * @param * @return */ - public boolean doAddSql(CgformEnhanceJavaEntity t){ + @Override + public boolean doAddSql(CgformEnhanceJavaEntity t){ return true; } /** @@ -48,7 +52,8 @@ public class CgformEnhanceJavaServiceImpl extends CommonServiceImpl implements C * @param * @return */ - public boolean doUpdateSql(CgformEnhanceJavaEntity t){ + @Override + public boolean doUpdateSql(CgformEnhanceJavaEntity t){ return true; } /** @@ -56,7 +61,8 @@ public class CgformEnhanceJavaServiceImpl extends CommonServiceImpl implements C * @param * @return */ - public boolean doDelSql(CgformEnhanceJavaEntity t){ + @Override + public boolean doDelSql(CgformEnhanceJavaEntity t){ return true; } /** @@ -110,14 +116,16 @@ public class CgformEnhanceJavaServiceImpl extends CommonServiceImpl implements C try { if("class".equals(cgJavaType)){ Class clazz = Class.forName(cgJavaValue); - if(clazz==null || clazz.newInstance()==null) - return false; + if(clazz==null || clazz.newInstance()==null) { + return false; + } } if("spring".equals(cgJavaType)){ Object obj = ApplicationContextUtil.getContext().getBean(cgJavaValue); - if(obj==null) - return false; + if(obj==null) { + return false; + } } } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/org/jeecgframework/web/cgform/service/impl/enhance/CgformEnhanceJsServiceImpl.java b/src/main/java/org/jeecgframework/web/cgform/service/impl/enhance/CgformEnhanceJsServiceImpl.java index 47b1f6b4a1b273c1bf4f346e0da8c177697f02c2..f8f6f723c4092d9bc5be0e7402b1a37ee00d12d5 100644 --- a/src/main/java/org/jeecgframework/web/cgform/service/impl/enhance/CgformEnhanceJsServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/cgform/service/impl/enhance/CgformEnhanceJsServiceImpl.java @@ -20,7 +20,8 @@ public class CgformEnhanceJsServiceImpl extends CommonServiceImpl implements Cgf * @return */ - public CgformEnhanceJsEntity getCgformEnhanceJsByTypeFormId(String cgJsType, String formId) { + @Override + public CgformEnhanceJsEntity getCgformEnhanceJsByTypeFormId(String cgJsType, String formId) { StringBuilder hql = new StringBuilder(""); hql.append(" from CgformEnhanceJsEntity t"); hql.append(" where t.formId='").append(formId).append("'"); diff --git a/src/main/java/org/jeecgframework/web/cgform/service/impl/generate/DBTempletLoaderWord.java b/src/main/java/org/jeecgframework/web/cgform/service/impl/generate/DBTempletLoaderWord.java index 355e295548a0afc0c440bfe9eb77fb42a96e6583..fb3d7ec9cc371d621e17f9459c94ba371e8e07b4 100644 --- a/src/main/java/org/jeecgframework/web/cgform/service/impl/generate/DBTempletLoaderWord.java +++ b/src/main/java/org/jeecgframework/web/cgform/service/impl/generate/DBTempletLoaderWord.java @@ -45,7 +45,8 @@ public class DBTempletLoaderWord implements TemplateLoader { @Autowired private CgformTemplateServiceI cgformTemplateService; - public Object findTemplateSource(String name) throws IOException { + @Override + public Object findTemplateSource(String name) throws IOException { //update by Robin postgreSQL 修正大小写的问题 2013-03-13 name = name.replace("_zh_cn", "").replace("_ZH_CN", "").replace("_zh_CN", ""); name = name.replace("_en_us", "").replace("_EN_US", "").replace("_en_US", ""); @@ -56,12 +57,14 @@ public class DBTempletLoaderWord implements TemplateLoader { } - public long getLastModified(Object templateSource) { + @Override + public long getLastModified(Object templateSource) { return 0; } - public Reader getReader(Object templateSource, String encoding) throws IOException { + @Override + public Reader getReader(Object templateSource, String encoding) throws IOException { Reader br = new StringReader(""); if (templateSource instanceof InputStreamReader) { br = new BufferedReader((InputStreamReader)templateSource); @@ -95,7 +98,9 @@ public class DBTempletLoaderWord implements TemplateLoader { if(name.lastIndexOf(".ftl")==-1){//判断是否为include的模板 //如果是主表直接走一对多模板 CgFormHeadEntity head = cgFormFieldService.getCgFormHeadByTableName(name); - if(head==null)return null; + if(head==null) { + return null; + } CgformTemplateEntity entity=cgformTemplateService.findByCode(head.getFormTemplate()); @@ -147,7 +152,8 @@ public class DBTempletLoaderWord implements TemplateLoader { } - public void closeTemplateSource(Object templateSource) throws IOException { + @Override + public void closeTemplateSource(Object templateSource) throws IOException { } diff --git a/src/main/java/org/jeecgframework/web/cgform/service/impl/generate/TempletContextWord.java b/src/main/java/org/jeecgframework/web/cgform/service/impl/generate/TempletContextWord.java index f135ca6687a4703afffef8ff06d2a3aab5f4b409..2a55150cfe3d35f2cb122dbc529adfc43754dbd6 100644 --- a/src/main/java/org/jeecgframework/web/cgform/service/impl/generate/TempletContextWord.java +++ b/src/main/java/org/jeecgframework/web/cgform/service/impl/generate/TempletContextWord.java @@ -71,8 +71,9 @@ public class TempletContextWord { @PostConstruct public void init() { - if (tags == null) - return; + if (tags == null) { + return; + } for (String key : tags.keySet()) { freemarker.setSharedVariable(key, tags.get(key)); } @@ -113,7 +114,7 @@ public class TempletContextWord { /** * 从缓存中读取ftl模板 - * @param template + * @param tableName * @param encoding * @return */ @@ -153,8 +154,8 @@ public class TempletContextWord { } /** * 预处理一些 - * @param html - * @param cgFormHead + * @param tableName + * @param mode * @return */ public String autoFormGenerateHtml(String tableName,String id,String mode) { @@ -254,7 +255,6 @@ public class TempletContextWord { /** * 获取表配置中存储的风格模板 * @param templateName - * @param request * @param data * @return */ diff --git a/src/main/java/org/jeecgframework/web/cgform/service/impl/upload/CgUploadServiceImpl.java b/src/main/java/org/jeecgframework/web/cgform/service/impl/upload/CgUploadServiceImpl.java index ec392b9d1aae79710a068dd877a23c1e49ca0635..da51b25fdb733f8f30088456b6b06a01d5d75b90 100644 --- a/src/main/java/org/jeecgframework/web/cgform/service/impl/upload/CgUploadServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/cgform/service/impl/upload/CgUploadServiceImpl.java @@ -18,7 +18,8 @@ public class CgUploadServiceImpl extends CommonServiceImpl implements CgUploadSe @Autowired private CgFormUploadDao cgFormUploadDao; - public void deleteFile(CgUploadEntity file) { + @Override + public void deleteFile(CgUploadEntity file) { //step.1 删除附件 String sql = "select * from t_s_attachment where id = ?"; Map attachmentMap = commonDao.findOneForJdbc(sql, file.getId()); @@ -36,7 +37,8 @@ public class CgUploadServiceImpl extends CommonServiceImpl implements CgUploadSe } - public void writeBack(String cgFormId,String cgFormName,String cgFormField,String fileId,String fileUrl) { + @Override + public void writeBack(String cgFormId, String cgFormName, String cgFormField, String fileId, String fileUrl) { try{ cgFormUploadDao.updateBackFileInfo(cgFormId, cgFormName, cgFormField, fileId, fileUrl); }catch (Exception e) { diff --git a/src/main/java/org/jeecgframework/web/cgform/service/migrate/MigrateForm.java b/src/main/java/org/jeecgframework/web/cgform/service/migrate/MigrateForm.java index 34aecb539e60969607d6e0d4e1fe7287825e348d..95a52afabfabf5ff9e75a9ed9f718364e98250fe 100644 --- a/src/main/java/org/jeecgframework/web/cgform/service/migrate/MigrateForm.java +++ b/src/main/java/org/jeecgframework/web/cgform/service/migrate/MigrateForm.java @@ -245,7 +245,7 @@ public class MigrateForm { /** * 执行sql并返回插入sql语句 * - * @param sqlRsmd + * @param jdbcTemplate * @param listSQL * @throws SQLException */ @@ -268,7 +268,6 @@ public class MigrateForm { * 获取列名和列值 * * @param listSQL - * @param sqlRowSet * @param jdbcTemplate * @return * @throws SQLException @@ -312,11 +311,14 @@ public class MigrateForm { if (Types.CHAR == sqlRsmd.getColumnType(i) || Types.VARCHAR == sqlRsmd.getColumnType(i)) { ColumnValue.append("'").append(value).append("',"); } else if (Types.SMALLINT == sqlRsmd.getColumnType(i) || Types.INTEGER == sqlRsmd.getColumnType(i) || Types.BIGINT == sqlRsmd.getColumnType(i) || Types.FLOAT == sqlRsmd.getColumnType(i) || Types.DOUBLE == sqlRsmd.getColumnType(i) || Types.NUMERIC == sqlRsmd.getColumnType(i) || Types.DECIMAL == sqlRsmd.getColumnType(i)) { - if ("".equals(value)) value = "0"; + if ("".equals(value)) { + value = "0"; + } ColumnValue.append(value).append(","); } else if (Types.DATE == sqlRsmd.getColumnType(i) || Types.TIME == sqlRsmd.getColumnType(i) || Types.TIMESTAMP == sqlRsmd.getColumnType(i)) { - if ("".equals(value)) - value = "2000-01-01"; + if ("".equals(value)) { + value = "2000-01-01"; + } ColumnValue.append("'").append(value).append("',"); } else { ColumnValue.append(value).append(","); @@ -326,11 +328,14 @@ public class MigrateForm { if (Types.CHAR == sqlRsmd.getColumnType(i) || Types.VARCHAR == sqlRsmd.getColumnType(i) || Types.LONGVARCHAR == sqlRsmd.getColumnType(i)) { ColumnValue.append("'").append(value).append("'"); } else if (Types.SMALLINT == sqlRsmd.getColumnType(i) || Types.INTEGER == sqlRsmd.getColumnType(i) || Types.BIGINT == sqlRsmd.getColumnType(i) || Types.FLOAT == sqlRsmd.getColumnType(i) || Types.DOUBLE == sqlRsmd.getColumnType(i) || Types.NUMERIC == sqlRsmd.getColumnType(i) || Types.DECIMAL == sqlRsmd.getColumnType(i)) { - if ("".equals(value)) value = "0"; + if ("".equals(value)) { + value = "0"; + } ColumnValue.append(value); } else if (Types.DATE == sqlRsmd.getColumnType(i) || Types.TIME == sqlRsmd.getColumnType(i) || Types.TIMESTAMP == sqlRsmd.getColumnType(i)) { - if ("".equals(value)) - value = "2000-01-01"; + if ("".equals(value)) { + value = "2000-01-01"; + } ColumnValue.append("'").append(value).append("'"); } else { ColumnValue.append(value).append(""); @@ -340,11 +345,14 @@ public class MigrateForm { if (Types.CHAR == sqlRsmd.getColumnType(i) || Types.VARCHAR == sqlRsmd.getColumnType(i) || Types.LONGVARCHAR == sqlRsmd.getColumnType(i)) { ColumnValue.append("'").append(value).append("'").append(","); } else if (Types.SMALLINT == sqlRsmd.getColumnType(i) || Types.INTEGER == sqlRsmd.getColumnType(i) || Types.BIGINT == sqlRsmd.getColumnType(i) || Types.FLOAT == sqlRsmd.getColumnType(i) || Types.DOUBLE == sqlRsmd.getColumnType(i) || Types.NUMERIC == sqlRsmd.getColumnType(i) || Types.DECIMAL == sqlRsmd.getColumnType(i)) { - if ("".equals(value)) value = "0"; + if ("".equals(value)) { + value = "0"; + } ColumnValue.append(value).append(","); } else if (Types.DATE == sqlRsmd.getColumnType(i) || Types.TIME == sqlRsmd.getColumnType(i) || Types.TIMESTAMP == sqlRsmd.getColumnType(i)) { - if ("".equals(value)) - value = "2000-01-01"; + if ("".equals(value)) { + value = "2000-01-01"; + } ColumnValue.append("'").append(value).append("',"); } else if (Types.BLOB == sqlRsmd.getColumnType(i) || Types.LONGVARCHAR == sqlRsmd.getColumnType(i) || Types.LONGNVARCHAR == sqlRsmd.getColumnType(i) || Types.BINARY == sqlRsmd.getColumnType(i) || Types.LONGVARBINARY == sqlRsmd.getColumnType(i) || Types.VARBINARY == sqlRsmd.getColumnType(i)) { String ls_tmp = getBlob(ls_id, tableName, sqlRsmd.getColumnName(i), jdbcTemplate); @@ -443,7 +451,7 @@ public class MigrateForm { * 字段主键 * @param tableName * 表名 - * @param ColumnName + * @param columnName * 字段名 * @param jdbcTemplate */ @@ -453,6 +461,7 @@ public class MigrateForm { // 查询并获得输入流 jdbcTemplate.query(ls_sql, new RowCallbackHandler() { + @Override public void processRow(ResultSet rs) throws SQLException { inStream = rs.getBinaryStream(columnName); } @@ -492,13 +501,15 @@ public class MigrateForm { String hs = ""; String stmp = ""; for (int n = 0; n < b.length; n++) { - if (b[n] == 0) - break; // 判断数据结束 + if (b[n] == 0) { + break; // 判断数据结束 + } stmp = (Integer.toHexString(b[n] & 0XFF)); - if (stmp.length() == 1) - hs = hs + "0" + stmp; - else - hs = hs + stmp; + if (stmp.length() == 1) { + hs = hs + "0" + stmp; + } else { + hs = hs + stmp; + } } return hs.toUpperCase(); } @@ -713,7 +724,9 @@ public class MigrateForm { PropertyDescriptor[] pds = BeanUtils.getPropertyDescriptors(clazz); for (PropertyDescriptor pd : pds) { if(null != ignores && ignores.size()>0){ - if(ignores.contains(pd.getName())) continue; + if(ignores.contains(pd.getName())) { + continue; + } } if (pd.getWriteMethod() != null) { if(tableField.length()>0 && clazzProperties.length()>0){ @@ -738,7 +751,9 @@ public class MigrateForm { PropertyDescriptor[] pds = BeanUtils.getPropertyDescriptors(clazz); for (PropertyDescriptor pd : pds) { if(null != ignores && ignores.size()>0){ - if(ignores.contains(pd.getName())) continue; + if(ignores.contains(pd.getName())) { + continue; + } } if(pd.getName().toLowerCase().equals("id")){// || pd.getPropertyType().equals(List.class) continue; diff --git a/src/main/java/org/jeecgframework/web/cgform/service/template/CgformTemplateServiceI.java b/src/main/java/org/jeecgframework/web/cgform/service/template/CgformTemplateServiceI.java index bb31b5eafc48a440b4d866541c4aab08ed78df8e..a7f768fabee22221a068e8ea1489d46565c118af 100644 --- a/src/main/java/org/jeecgframework/web/cgform/service/template/CgformTemplateServiceI.java +++ b/src/main/java/org/jeecgframework/web/cgform/service/template/CgformTemplateServiceI.java @@ -8,11 +8,14 @@ import java.util.List; public interface CgformTemplateServiceI extends CommonService{ - public void delete(T entity); + @Override + public void delete(T entity); - public Serializable save(T entity); + @Override + public Serializable save(T entity); - public void saveOrUpdate(T entity); + @Override + public void saveOrUpdate(T entity); /** * 默认按钮-sql增强-新增操作 diff --git a/src/main/java/org/jeecgframework/web/cgform/service/template/impl/CgformTemplateServiceImpl.java b/src/main/java/org/jeecgframework/web/cgform/service/template/impl/CgformTemplateServiceImpl.java index 4e499645f4844cba0f9bca7aff581b59877e2955..fcb9812dd7e93572993b2b60407f791372d4a632 100644 --- a/src/main/java/org/jeecgframework/web/cgform/service/template/impl/CgformTemplateServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/cgform/service/template/impl/CgformTemplateServiceImpl.java @@ -15,20 +15,23 @@ import java.util.UUID; public class CgformTemplateServiceImpl extends CommonServiceImpl implements CgformTemplateServiceI { - public void delete(T entity) { + @Override + public void delete(T entity) { super.delete(entity); //执行删除操作配置的sql增强 this.doDelSql((CgformTemplateEntity)entity); } - public Serializable save(T entity) { + @Override + public Serializable save(T entity) { Serializable t = super.save(entity); //执行新增操作配置的sql增强 this.doAddSql((CgformTemplateEntity)entity); return t; } - public void saveOrUpdate(T entity) { + @Override + public void saveOrUpdate(T entity) { super.saveOrUpdate(entity); //执行更新操作配置的sql增强 this.doUpdateSql((CgformTemplateEntity)entity); @@ -39,7 +42,8 @@ public class CgformTemplateServiceImpl extends CommonServiceImpl implements Cgfo * @param * @return */ - public boolean doAddSql(CgformTemplateEntity t){ + @Override + public boolean doAddSql(CgformTemplateEntity t){ return true; } /** @@ -47,7 +51,8 @@ public class CgformTemplateServiceImpl extends CommonServiceImpl implements Cgfo * @param * @return */ - public boolean doUpdateSql(CgformTemplateEntity t){ + @Override + public boolean doUpdateSql(CgformTemplateEntity t){ return true; } /** @@ -55,7 +60,8 @@ public class CgformTemplateServiceImpl extends CommonServiceImpl implements Cgfo * @param * @return */ - public boolean doDelSql(CgformTemplateEntity t){ + @Override + public boolean doDelSql(CgformTemplateEntity t){ return true; } diff --git a/src/main/java/org/jeecgframework/web/cgform/util/TemplateUtil.java b/src/main/java/org/jeecgframework/web/cgform/util/TemplateUtil.java index 4a6af4359cc35fc38ed42a386af1326736e361ba..15ceb4cfda4268b2bbbc050b60bed21e0c176bf5 100644 --- a/src/main/java/org/jeecgframework/web/cgform/util/TemplateUtil.java +++ b/src/main/java/org/jeecgframework/web/cgform/util/TemplateUtil.java @@ -246,8 +246,9 @@ public class TemplateUtil { { // region 计算统计值 float tempTdValue = 0; - if (SumValueDic.containsKey(i)) - tempTdValue = SumValueDic.get(i); + if (SumValueDic.containsKey(i)) { + tempTdValue = SumValueDic.get(i); + } try { float resultTdTemp = 0; resultTdTemp = Float.parseFloat(tdValue); diff --git a/src/main/java/org/jeecgframework/web/cgreport/controller/core/CgReportController.java b/src/main/java/org/jeecgframework/web/cgreport/controller/core/CgReportController.java index a77c8940a516ed70cbdaa2f0c521d7921d60cbbd..6f62bdf330d7053cf4d00cec7b03b21497a62a84 100644 --- a/src/main/java/org/jeecgframework/web/cgreport/controller/core/CgReportController.java +++ b/src/main/java/org/jeecgframework/web/cgreport/controller/core/CgReportController.java @@ -304,7 +304,7 @@ public class CgReportController extends BaseController { String dbKey=(String)configM.get("db_source"); List> result=null; - Long size=0l; + Long size= 0L; if(StringUtils.isNotBlank(dbKey)){ result= DynamicDBUtil.findList(dbKey,SqlUtil.jeecgCreatePageSql(dbKey,querySql,queryparams,p,r)); Map map=(Map)DynamicDBUtil.findOne(dbKey,SqlUtil.getCountSql(querySql,null)); @@ -436,7 +436,7 @@ public class CgReportController extends BaseController { /** * 装载数据字典 * @param m 要放入freemarker的数据 - * @param bean 读取出来的动态配置数据 + * @param cgReportMap 读取出来的动态配置数据 */ @SuppressWarnings("unchecked") private void loadDic(Map m, Map cgReportMap) { diff --git a/src/main/java/org/jeecgframework/web/cgreport/service/core/CgreportConfigHeadServiceI.java b/src/main/java/org/jeecgframework/web/cgreport/service/core/CgreportConfigHeadServiceI.java index b4523a25bb9d2e147888aa231ff331f786f58bd5..18fb8dfbf77142fbab6dea2991519b0e794028cd 100644 --- a/src/main/java/org/jeecgframework/web/cgreport/service/core/CgreportConfigHeadServiceI.java +++ b/src/main/java/org/jeecgframework/web/cgreport/service/core/CgreportConfigHeadServiceI.java @@ -10,7 +10,8 @@ import org.jeecgframework.web.cgreport.entity.core.CgreportConfigItemEntity; public interface CgreportConfigHeadServiceI extends CommonService{ - public void delete(T entity); + @Override + public void delete(T entity); /** * 添加一对多 * @@ -27,19 +28,19 @@ public interface CgreportConfigHeadServiceI extends CommonService{ /** * 默认按钮-sql增强-新增操作 - * @param id + * @param t * @return */ public boolean doAddSql(CgreportConfigHeadEntity t); /** * 默认按钮-sql增强-更新操作 - * @param id + * @param t * @return */ public boolean doUpdateSql(CgreportConfigHeadEntity t); /** * 默认按钮-sql增强-删除操作 - * @param id + * @param t * @return */ public boolean doDelSql(CgreportConfigHeadEntity t); diff --git a/src/main/java/org/jeecgframework/web/cgreport/service/impl/core/CgReportServiceImpl.java b/src/main/java/org/jeecgframework/web/cgreport/service/impl/core/CgReportServiceImpl.java index 0a5a3421f48a2af8e8742f6f497cbdede5c79c59..75ee35f727dd1ceb8311ad6bf2d77ab7e66bf6d0 100644 --- a/src/main/java/org/jeecgframework/web/cgreport/service/impl/core/CgReportServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/cgreport/service/impl/core/CgReportServiceImpl.java @@ -32,7 +32,8 @@ public class CgReportServiceImpl extends CommonServiceImpl implements private CgReportDao cgReportDao; - public Map queryCgReportConfig(String reportId) { + @Override + public Map queryCgReportConfig(String reportId) { Map cgReportM = new HashMap(0); Map mainM = queryCgReportMainConfig(reportId); List> itemsM = queryCgReportItems(reportId); @@ -43,7 +44,8 @@ public class CgReportServiceImpl extends CommonServiceImpl implements return cgReportM; } - public Map queryCgReportMainConfig(String reportId){ + @Override + public Map queryCgReportMainConfig(String reportId){ // String sql = JeecgSqlUtil.getMethodSql(JeecgSqlUtil.getMethodUrl()); // Map parameters = new LinkedHashMap(); // parameters.put("id", reportId); @@ -53,7 +55,8 @@ public class CgReportServiceImpl extends CommonServiceImpl implements return cgReportDao.queryCgReportMainConfig(reportId); } - public List> queryCgReportItems(String reportId){ + @Override + public List> queryCgReportItems(String reportId){ // String sql = JeecgSqlUtil.getMethodSql(JeecgSqlUtil.getMethodUrl()); // Map parameters = new LinkedHashMap(); // parameters.put("configId", reportId); @@ -77,7 +80,8 @@ public class CgReportServiceImpl extends CommonServiceImpl implements return list; } - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public List> queryByCgReportSql(String sql, Map params, int page, int rows) { @@ -116,7 +120,8 @@ public class CgReportServiceImpl extends CommonServiceImpl implements } return sqlB.toString(); } - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public long countQueryByCgReportSql(String sql, Map params) { String querySql = getFullSql(sql,params); @@ -124,7 +129,8 @@ public class CgReportServiceImpl extends CommonServiceImpl implements long result = jdbcDao.findForLong(querySql,new HashMap(0)); return result; } - @SuppressWarnings( "unchecked" ) + @Override + @SuppressWarnings( "unchecked" ) public List getSqlFields(String sql) { if(oConvertUtils.isEmpty(sql)){ diff --git a/src/main/java/org/jeecgframework/web/cgreport/service/impl/core/CgreportConfigHeadServiceImpl.java b/src/main/java/org/jeecgframework/web/cgreport/service/impl/core/CgreportConfigHeadServiceImpl.java index 2453a5fc341f2c716b9fd5f855553f98626367ae..8d3107e4b8839ab8a88e7aff77060adca230552e 100644 --- a/src/main/java/org/jeecgframework/web/cgreport/service/impl/core/CgreportConfigHeadServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/cgreport/service/impl/core/CgreportConfigHeadServiceImpl.java @@ -20,14 +20,16 @@ import org.jeecgframework.web.cgreport.entity.core.CgreportConfigParamEntity; @Transactional public class CgreportConfigHeadServiceImpl extends CommonServiceImpl implements CgreportConfigHeadServiceI { - public void delete(T entity) { + @Override + public void delete(T entity) { super.delete(entity); //执行删除操作配置的sql增强 this.doDelSql((CgreportConfigHeadEntity)entity); } - public void addMain(CgreportConfigHeadEntity cgreportConfigHead, - List cgreportConfigItemList,List cgreportConfigParamList){ + @Override + public void addMain(CgreportConfigHeadEntity cgreportConfigHead, + List cgreportConfigItemList, List cgreportConfigParamList){ //保存主信息 this.save(cgreportConfigHead); @@ -50,8 +52,9 @@ public class CgreportConfigHeadServiceImpl extends CommonServiceImpl implements } - public void updateMain(CgreportConfigHeadEntity cgreportConfigHead, - List cgreportConfigItemList,List cgreportConfigParamList) { + @Override + public void updateMain(CgreportConfigHeadEntity cgreportConfigHead, + List cgreportConfigItemList, List cgreportConfigParamList) { //保存主表信息 this.saveOrUpdate(cgreportConfigHead); //=================================================================================== @@ -133,7 +136,8 @@ public class CgreportConfigHeadServiceImpl extends CommonServiceImpl implements } - public void delMain(CgreportConfigHeadEntity cgreportConfigHead) { + @Override + public void delMain(CgreportConfigHeadEntity cgreportConfigHead) { //删除主表信息 this.delete(cgreportConfigHead); //=================================================================================== @@ -153,26 +157,29 @@ public class CgreportConfigHeadServiceImpl extends CommonServiceImpl implements /** * 默认按钮-sql增强-新增操作 - * @param id + * @param t * @return */ - public boolean doAddSql(CgreportConfigHeadEntity t){ + @Override + public boolean doAddSql(CgreportConfigHeadEntity t){ return true; } /** * 默认按钮-sql增强-更新操作 - * @param id + * @param t * @return */ - public boolean doUpdateSql(CgreportConfigHeadEntity t){ + @Override + public boolean doUpdateSql(CgreportConfigHeadEntity t){ return true; } /** * 默认按钮-sql增强-删除操作 - * @param id + * @param t * @return */ - public boolean doDelSql(CgreportConfigHeadEntity t){ + @Override + public boolean doDelSql(CgreportConfigHeadEntity t){ return true; } diff --git a/src/main/java/org/jeecgframework/web/graphreport/service/core/JformGraphreportHeadServiceI.java b/src/main/java/org/jeecgframework/web/graphreport/service/core/JformGraphreportHeadServiceI.java index 849072ee89369fc4e9e90870e88be86f6f8fec10..9ac2ccde8efb2f1d040962349784ee24eb9fa2a1 100644 --- a/src/main/java/org/jeecgframework/web/graphreport/service/core/JformGraphreportHeadServiceI.java +++ b/src/main/java/org/jeecgframework/web/graphreport/service/core/JformGraphreportHeadServiceI.java @@ -9,7 +9,8 @@ import java.io.Serializable; public interface JformGraphreportHeadServiceI extends CommonService{ - public void delete(T entity); + @Override + public void delete(T entity); /** * 添加一对多 * @@ -26,19 +27,19 @@ public interface JformGraphreportHeadServiceI extends CommonService{ /** * 默认按钮-sql增强-新增操作 - * @param id + * @param t * @return */ public boolean doAddSql(JformGraphreportHeadEntity t); /** * 默认按钮-sql增强-更新操作 - * @param id + * @param t * @return */ public boolean doUpdateSql(JformGraphreportHeadEntity t); /** * 默认按钮-sql增强-删除操作 - * @param id + * @param t * @return */ public boolean doDelSql(JformGraphreportHeadEntity t); diff --git a/src/main/java/org/jeecgframework/web/graphreport/service/impl/core/GraphReportServiceImpl.java b/src/main/java/org/jeecgframework/web/graphreport/service/impl/core/GraphReportServiceImpl.java index 872b98c9148c427f9736035a12216d2a09703fc8..eb0bff99ac6cad69e562f8e06a490bd6ca238418 100644 --- a/src/main/java/org/jeecgframework/web/graphreport/service/impl/core/GraphReportServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/graphreport/service/impl/core/GraphReportServiceImpl.java @@ -32,7 +32,8 @@ public class GraphReportServiceImpl extends CommonServiceImpl implements - public Map queryCgReportConfig(String reportId) { + @Override + public Map queryCgReportConfig(String reportId) { Map cgReportM = new HashMap(0); Map mainM = jdbcDao.findForJdbc("SELECT * from jform_graphreport_head where code=?", new Object[]{reportId}).get(0); List> itemsM = jdbcDao.findForJdbc("SELECT * from jform_graphreport_item where cgreport_head_id=? order by order_num asc", new Object[]{mainM.get("id")}); @@ -62,7 +63,8 @@ public class GraphReportServiceImpl extends CommonServiceImpl implements // } - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public List> queryByCgReportSql(String sql, Map params, int page, int rows) { sql = handleElInSQL(sql, params); @@ -151,7 +153,8 @@ public class GraphReportServiceImpl extends CommonServiceImpl implements return sqlB.toString(); } - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public long countQueryByCgReportSql(String sql, Map params) { String querySql = getFullSql(sql,params); querySql = "SELECT COUNT(*) FROM ("+querySql+") t2"; @@ -159,7 +162,8 @@ public class GraphReportServiceImpl extends CommonServiceImpl implements return result; } - @SuppressWarnings( "unchecked" ) + @Override + @SuppressWarnings( "unchecked" ) public List getSqlFields(String sql) { if(oConvertUtils.isEmpty(sql)){ return null; diff --git a/src/main/java/org/jeecgframework/web/graphreport/service/impl/core/JformGraphreportHeadServiceImpl.java b/src/main/java/org/jeecgframework/web/graphreport/service/impl/core/JformGraphreportHeadServiceImpl.java index 044be1b82d5727cca7cb70c0f841658524b1fa6b..689bc67f31b8332599e9f1e3082705d61da0cf6b 100644 --- a/src/main/java/org/jeecgframework/web/graphreport/service/impl/core/JformGraphreportHeadServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/graphreport/service/impl/core/JformGraphreportHeadServiceImpl.java @@ -18,14 +18,16 @@ import java.util.UUID; @Transactional public class JformGraphreportHeadServiceImpl extends CommonServiceImpl implements JformGraphreportHeadServiceI { - public void delete(T entity) { + @Override + public void delete(T entity) { super.delete(entity); //执行删除操作配置的sql增强 this.doDelSql((JformGraphreportHeadEntity)entity); } - public void addMain(JformGraphreportHeadEntity jformGraphreportHead, - List jformGraphreportItemList){ + @Override + public void addMain(JformGraphreportHeadEntity jformGraphreportHead, + List jformGraphreportItemList){ //保存主信息 this.save(jformGraphreportHead); @@ -40,8 +42,9 @@ public class JformGraphreportHeadServiceImpl extends CommonServiceImpl implement } - public void updateMain(JformGraphreportHeadEntity jformGraphreportHead, - List jformGraphreportItemList) { + @Override + public void updateMain(JformGraphreportHeadEntity jformGraphreportHead, + List jformGraphreportItemList) { //保存主表信息 this.saveOrUpdate(jformGraphreportHead); //=================================================================================== @@ -87,7 +90,8 @@ public class JformGraphreportHeadServiceImpl extends CommonServiceImpl implement } - public void delMain(JformGraphreportHeadEntity jformGraphreportHead) { + @Override + public void delMain(JformGraphreportHeadEntity jformGraphreportHead) { //删除主表信息 this.delete(jformGraphreportHead); //=================================================================================== @@ -106,7 +110,8 @@ public class JformGraphreportHeadServiceImpl extends CommonServiceImpl implement * @param * @return */ - public boolean doAddSql(JformGraphreportHeadEntity t){ + @Override + public boolean doAddSql(JformGraphreportHeadEntity t){ return true; } /** @@ -114,7 +119,8 @@ public class JformGraphreportHeadServiceImpl extends CommonServiceImpl implement * @param * @return */ - public boolean doUpdateSql(JformGraphreportHeadEntity t){ + @Override + public boolean doUpdateSql(JformGraphreportHeadEntity t){ return true; } /** @@ -122,7 +128,8 @@ public class JformGraphreportHeadServiceImpl extends CommonServiceImpl implement * @param * @return */ - public boolean doDelSql(JformGraphreportHeadEntity t){ + @Override + public boolean doDelSql(JformGraphreportHeadEntity t){ return true; } diff --git a/src/main/java/org/jeecgframework/web/system/controller/core/LogController.java b/src/main/java/org/jeecgframework/web/system/controller/core/LogController.java index 68400f4f20f079c0beadc412fbd213bf6076d749..cd6604453bd0f4d691e30fb11133326499a8eb35 100644 --- a/src/main/java/org/jeecgframework/web/system/controller/core/LogController.java +++ b/src/main/java/org/jeecgframework/web/system/controller/core/LogController.java @@ -248,8 +248,9 @@ public class LogController extends BaseController { } else if (type.equals("application/pdf")) { ext = "pdf"; t = (Transcoder) new PDFTranscoder(); - } else if (type.equals("image/svg+xml")) - ext = "svg"; + } else if (type.equals("image/svg+xml")) { + ext = "svg"; + } response.addHeader("Content-Disposition", "attachment; filename=" + new String(filename.getBytes("GBK"),"ISO-8859-1") + "." + ext); response.addHeader("Content-Type", type); @@ -271,8 +272,9 @@ public class LogController extends BaseController { "UTF-8"); writer.append(svg); writer.close(); - } else - out.print("Invalid type: " + type); + } else { + out.print("Invalid type: " + type); + } } else { response.addHeader("Content-Type", "text/html"); out diff --git a/src/main/java/org/jeecgframework/web/system/listener/InitListener.java b/src/main/java/org/jeecgframework/web/system/listener/InitListener.java index 82de9a88c66f84d3edc8ad647f5ec939389c3f7d..ed5739912fe80a19813d2b726dfbcfd235b5954a 100644 --- a/src/main/java/org/jeecgframework/web/system/listener/InitListener.java +++ b/src/main/java/org/jeecgframework/web/system/listener/InitListener.java @@ -17,12 +17,14 @@ import org.springframework.web.context.support.WebApplicationContextUtils; public class InitListener implements javax.servlet.ServletContextListener { - public void contextDestroyed(ServletContextEvent arg0) { + @Override + public void contextDestroyed(ServletContextEvent arg0) { } - public void contextInitialized(ServletContextEvent event) { + @Override + public void contextInitialized(ServletContextEvent event) { WebApplicationContext webApplicationContext = WebApplicationContextUtils.getWebApplicationContext(event.getServletContext()); SystemService systemService = (SystemService) webApplicationContext.getBean("systemService"); // MenuInitService menuInitService = (MenuInitService) webApplicationContext.getBean("menuInitService"); diff --git a/src/main/java/org/jeecgframework/web/system/listener/OnlineListener.java b/src/main/java/org/jeecgframework/web/system/listener/OnlineListener.java index cd687a3f6d1840a0047ea20445b97f7b174cd01e..00c5bf55919e8af8c5d3ac55894c8f2206dc02c1 100644 --- a/src/main/java/org/jeecgframework/web/system/listener/OnlineListener.java +++ b/src/main/java/org/jeecgframework/web/system/listener/OnlineListener.java @@ -25,11 +25,13 @@ public class OnlineListener implements ServletContextListener,HttpSessionListene } - public void sessionCreated(HttpSessionEvent httpSessionEvent) { + @Override + public void sessionCreated(HttpSessionEvent httpSessionEvent) { } - public void sessionDestroyed(HttpSessionEvent httpSessionEvent) { + @Override + public void sessionDestroyed(HttpSessionEvent httpSessionEvent) { try { ClientManager.getInstance().removeClinet(httpSessionEvent.getSession().getId()); } catch (Exception e) { @@ -41,7 +43,8 @@ public class OnlineListener implements ServletContextListener,HttpSessionListene * 服务器初始化 */ - public void contextInitialized(ServletContextEvent evt) { + @Override + public void contextInitialized(ServletContextEvent evt) { ctx = WebApplicationContextUtils.getWebApplicationContext(evt.getServletContext()); } @@ -50,7 +53,8 @@ public class OnlineListener implements ServletContextListener,HttpSessionListene } - public void contextDestroyed(ServletContextEvent paramServletContextEvent) { + @Override + public void contextDestroyed(ServletContextEvent paramServletContextEvent) { } diff --git a/src/main/java/org/jeecgframework/web/system/manager/ClientManager.java b/src/main/java/org/jeecgframework/web/system/manager/ClientManager.java index d5e8350ce52d64ebd83dffaabc9ee51588c5b6fc..e6dced9ecfbba99a2d116a2d42856874a2937bf6 100644 --- a/src/main/java/org/jeecgframework/web/system/manager/ClientManager.java +++ b/src/main/java/org/jeecgframework/web/system/manager/ClientManager.java @@ -124,8 +124,9 @@ public class ClientManager { HashMap onLineClients = (HashMap) EhcacheUtil.get(CACHENAME,OnlineClientsKey); return onLineClients.values(); } - else - return new ArrayList(); + else { + return new ArrayList(); + } } } diff --git a/src/main/java/org/jeecgframework/web/system/manager/ClientSort.java b/src/main/java/org/jeecgframework/web/system/manager/ClientSort.java index d7a5e4272c88791979deaa92503c79fe2f79815a..07514498870e8a9d8c084a78d959548f890a884e 100644 --- a/src/main/java/org/jeecgframework/web/system/manager/ClientSort.java +++ b/src/main/java/org/jeecgframework/web/system/manager/ClientSort.java @@ -7,7 +7,8 @@ import org.jeecgframework.web.system.pojo.base.Client; public class ClientSort implements Comparator { - public int compare(Client prev, Client now) { + @Override + public int compare(Client prev, Client now) { return (int) (now.getLogindatetime().getTime()-prev.getLogindatetime().getTime()); } diff --git a/src/main/java/org/jeecgframework/web/system/pojo/base/TSOperation.java b/src/main/java/org/jeecgframework/web/system/pojo/base/TSOperation.java index c40b93d206e3c1accc7becb8a0f1e01442f312f2..ad256a5653cca45349912918f3d65e4645c86853 100644 --- a/src/main/java/org/jeecgframework/web/system/pojo/base/TSOperation.java +++ b/src/main/java/org/jeecgframework/web/system/pojo/base/TSOperation.java @@ -91,12 +91,15 @@ public class TSOperation extends IdEntity implements java.io.Serializable { @Override public boolean equals(Object obj) { - if(this == obj) - return false; - if(obj == null) - return false; - if(getClass() != obj.getClass() ) - return false; + if(this == obj) { + return false; + } + if(obj == null) { + return false; + } + if(getClass() != obj.getClass() ) { + return false; + } TSOperation other = (TSOperation)obj; if (getId().equals(other.getId())){ return true; diff --git a/src/main/java/org/jeecgframework/web/system/service/NoticeAuthorityRoleServiceI.java b/src/main/java/org/jeecgframework/web/system/service/NoticeAuthorityRoleServiceI.java index a00d33633b0476788b6f208b49bbb1d07f52ddcc..ffa23abfde3355f65edc271bd1de5299f07cb423 100644 --- a/src/main/java/org/jeecgframework/web/system/service/NoticeAuthorityRoleServiceI.java +++ b/src/main/java/org/jeecgframework/web/system/service/NoticeAuthorityRoleServiceI.java @@ -6,27 +6,30 @@ import org.jeecgframework.web.system.pojo.base.TSNoticeAuthorityRole; public interface NoticeAuthorityRoleServiceI extends CommonService{ - public void delete(T entity); + @Override + public void delete(T entity); - public Serializable save(T entity); + @Override + public Serializable save(T entity); - public void saveOrUpdate(T entity); + @Override + public void saveOrUpdate(T entity); /** * 默认按钮-sql增强-新增操作 - * @param id + * @param t * @return */ public boolean doAddSql(TSNoticeAuthorityRole t); /** * 默认按钮-sql增强-更新操作 - * @param id + * @param t * @return */ public boolean doUpdateSql(TSNoticeAuthorityRole t); /** * 默认按钮-sql增强-删除操作 - * @param id + * @param t * @return */ public boolean doDelSql(TSNoticeAuthorityRole t); diff --git a/src/main/java/org/jeecgframework/web/system/service/NoticeAuthorityUserServiceI.java b/src/main/java/org/jeecgframework/web/system/service/NoticeAuthorityUserServiceI.java index 05677b9415ee441c968889a5d0e744e96dc59d97..5e94c846904c6762157f416ebacb131218222022 100644 --- a/src/main/java/org/jeecgframework/web/system/service/NoticeAuthorityUserServiceI.java +++ b/src/main/java/org/jeecgframework/web/system/service/NoticeAuthorityUserServiceI.java @@ -8,27 +8,30 @@ import org.jeecgframework.web.system.pojo.base.TSNoticeAuthorityUser; public interface NoticeAuthorityUserServiceI extends CommonService{ - public void delete(T entity); + @Override + public void delete(T entity); - public Serializable save(T entity); + @Override + public Serializable save(T entity); - public void saveOrUpdate(T entity); + @Override + public void saveOrUpdate(T entity); /** * 默认按钮-sql增强-新增操作 - * @param id + * @param t * @return */ public boolean doAddSql(TSNoticeAuthorityUser t); /** * 默认按钮-sql增强-更新操作 - * @param id + * @param t * @return */ public boolean doUpdateSql(TSNoticeAuthorityUser t); /** * 默认按钮-sql增强-删除操作 - * @param id + * @param t * @return */ public boolean doDelSql(TSNoticeAuthorityUser t); diff --git a/src/main/java/org/jeecgframework/web/system/service/NoticeService.java b/src/main/java/org/jeecgframework/web/system/service/NoticeService.java index 7533b2b5aed1f55b9cc8e4c335c4bfad6f8730ba..33df0cf4cf6ec7cb3c11dd9059fe6398000457af 100644 --- a/src/main/java/org/jeecgframework/web/system/service/NoticeService.java +++ b/src/main/java/org/jeecgframework/web/system/service/NoticeService.java @@ -37,27 +37,30 @@ public interface NoticeService extends CommonService{ */ public void addNoticeAuthorityUser(String noticeId, String userid); +@Override public void delete(T entity); - public Serializable save(T entity); + @Override + public Serializable save(T entity); - public void saveOrUpdate(T entity); + @Override + public void saveOrUpdate(T entity); /** * 默认按钮-sql增强-新增操作 - * @param id + * @param t * @return */ public boolean doAddSql(TSNotice t); /** * 默认按钮-sql增强-更新操作 - * @param id + * @param t * @return */ public boolean doUpdateSql(TSNotice t); /** * 默认按钮-sql增强-删除操作 - * @param id + * @param t * @return */ public boolean doDelSql(TSNotice t); diff --git a/src/main/java/org/jeecgframework/web/system/service/impl/DeclareServiceImpl.java b/src/main/java/org/jeecgframework/web/system/service/impl/DeclareServiceImpl.java index 328d9ca8967d51524518f6815b6ffdc0c2276487..edfe3bdbe16c5805a438d8b46d2c8b3a68a5920d 100644 --- a/src/main/java/org/jeecgframework/web/system/service/impl/DeclareServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/system/service/impl/DeclareServiceImpl.java @@ -14,7 +14,8 @@ import org.springframework.transaction.annotation.Transactional; @Transactional public class DeclareServiceImpl extends CommonServiceImpl implements DeclareService { - public List getAttachmentsByCode(String businessKey,String description) + @Override + public List getAttachmentsByCode(String businessKey, String description) { String hql="from TSAttachment t where t.businessKey='"+businessKey+"' and t.description='"+description+"'"; return commonDao.findByQueryString(hql); diff --git a/src/main/java/org/jeecgframework/web/system/service/impl/DynamicDataSourceServiceImpl.java b/src/main/java/org/jeecgframework/web/system/service/impl/DynamicDataSourceServiceImpl.java index d69c5ae1d8b2839140c27051e5d25e6ad05e5f7c..af453046db16ad7abbe3673e7020a0acf691e376 100644 --- a/src/main/java/org/jeecgframework/web/system/service/impl/DynamicDataSourceServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/system/service/impl/DynamicDataSourceServiceImpl.java @@ -15,6 +15,7 @@ import org.jeecgframework.web.system.pojo.base.DynamicDataSourceEntity; public class DynamicDataSourceServiceImpl extends CommonServiceImpl implements DynamicDataSourceServiceI { /**初始化数据库信息，TOMCAT启动时直接加入到内存中**/ + @Override public List initDynamicDataSource() { ResourceUtil.dynamicDataSourceMap.clear(); @@ -32,6 +33,7 @@ public class DynamicDataSourceServiceImpl extends CommonServiceImpl implements D return dynamicDataSourceEntity; } + @Override public void refleshCache() { initDynamicDataSource(); } @@ -40,8 +42,9 @@ public class DynamicDataSourceServiceImpl extends CommonServiceImpl implements D public DynamicDataSourceEntity getDynamicDataSourceEntityForDbKey(String dbKey){ List dynamicDataSourceEntitys = commonDao.findHql("from DynamicDataSourceEntity where dbKey = ?", dbKey); - if(dynamicDataSourceEntitys.size()>0) - return dynamicDataSourceEntitys.get(0); + if(dynamicDataSourceEntitys.size()>0) { + return dynamicDataSourceEntitys.get(0); + } return null; } diff --git a/src/main/java/org/jeecgframework/web/system/service/impl/MenuInitServiceImpl.java b/src/main/java/org/jeecgframework/web/system/service/impl/MenuInitServiceImpl.java index f073009671006e03023ee76645adc6e80488bb07..eb796d61cd9d106372884a15904ced9389591842 100644 --- a/src/main/java/org/jeecgframework/web/system/service/impl/MenuInitServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/system/service/impl/MenuInitServiceImpl.java @@ -31,7 +31,8 @@ public class MenuInitServiceImpl extends CommonServiceImpl implements private static final String MENU_TYPE_CSS = ".";//采用Css样式方式的code前缀 - public void initMenu() { + @Override + public void initMenu() { // 1.扫描项目下，所有class，判断带有标签@AutoMenu // TODO // 2.循环判断@AutoMenu在系统中是否存在,如果不存在进行插入，如果存在不再插入 diff --git a/src/main/java/org/jeecgframework/web/system/service/impl/MutiLangServiceImpl.java b/src/main/java/org/jeecgframework/web/system/service/impl/MutiLangServiceImpl.java index 8f28ded6be2004670c0e1955e7ef37623fc4585f..e55b8bea449a1da7abd10a62e9cbd0c9889dda35 100644 --- a/src/main/java/org/jeecgframework/web/system/service/impl/MutiLangServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/system/service/impl/MutiLangServiceImpl.java @@ -22,7 +22,8 @@ public class MutiLangServiceImpl extends CommonServiceImpl implements MutiLangSe private HttpServletRequest request; /**初始化语言信息，TOMCAT启动时直接加入到内存中**/ - public void initAllMutiLang() { + @Override + public void initAllMutiLang() { List mutiLang = this.commonDao.loadAll(MutiLangEntity.class); for (MutiLangEntity mutiLangEntity : mutiLang) { @@ -33,20 +34,23 @@ public class MutiLangServiceImpl extends CommonServiceImpl implements MutiLangSe /** * 更新缓存，插入缓存 */ - public void putMutiLang(String langKey,String langCode,String langContext) { + @Override + public void putMutiLang(String langKey, String langCode, String langContext) { ResourceUtil.mutiLangMap.put(langKey + "_" + langCode, langContext); } /** * 更新缓存，插入缓存 */ - public void putMutiLang(MutiLangEntity mutiLangEntity) { + @Override + public void putMutiLang(MutiLangEntity mutiLangEntity) { ResourceUtil.mutiLangMap.put(mutiLangEntity.getLangKey() + "_" + mutiLangEntity.getLangCode(), mutiLangEntity.getLangContext()); } /**取 o_muti_lang.lang_key 的值返回当前语言的值**/ - public String getLang(String langKey) + @Override + public String getLang(String langKey) { String language = BrowserUtils.getBrowserLanguage(request); @@ -68,7 +72,8 @@ public class MutiLangServiceImpl extends CommonServiceImpl implements MutiLangSe return langContext; } - public String getLang(String lanKey, String langArg) { + @Override + public String getLang(String lanKey, String langArg) { String langContext = StringUtil.getEmptyString(); if(StringUtil.isEmpty(langArg)) { @@ -89,7 +94,8 @@ public class MutiLangServiceImpl extends CommonServiceImpl implements MutiLangSe } /** 刷新多语言cach **/ - public void refleshMutiLangCach() { + @Override + public void refleshMutiLangCach() { ResourceUtil.mutiLangMap.clear(); initAllMutiLang(); } diff --git a/src/main/java/org/jeecgframework/web/system/service/impl/NoticeAuthorityRoleServiceImpl.java b/src/main/java/org/jeecgframework/web/system/service/impl/NoticeAuthorityRoleServiceImpl.java index 381d28fcfc7fa461113d47aa96c51d13a94cca97..c9a14d6124dc7f9cc99d09c38838c83804095e6a 100644 --- a/src/main/java/org/jeecgframework/web/system/service/impl/NoticeAuthorityRoleServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/system/service/impl/NoticeAuthorityRoleServiceImpl.java @@ -15,20 +15,23 @@ import org.springframework.transaction.annotation.Transactional; public class NoticeAuthorityRoleServiceImpl extends CommonServiceImpl implements NoticeAuthorityRoleServiceI { - public void delete(T entity) { + @Override + public void delete(T entity) { super.delete(entity); //执行删除操作配置的sql增强 this.doDelSql((TSNoticeAuthorityRole)entity); } - public Serializable save(T entity) { + @Override + public Serializable save(T entity) { Serializable t = super.save(entity); //执行新增操作配置的sql增强 this.doAddSql((TSNoticeAuthorityRole)entity); return t; } - public void saveOrUpdate(T entity) { + @Override + public void saveOrUpdate(T entity) { super.saveOrUpdate(entity); //执行更新操作配置的sql增强 this.doUpdateSql((TSNoticeAuthorityRole)entity); @@ -36,26 +39,29 @@ public class NoticeAuthorityRoleServiceImpl extends CommonServiceImpl implements /** * 默认按钮-sql增强-新增操作 - * @param id + * @param t * @return */ - public boolean doAddSql(TSNoticeAuthorityRole t){ + @Override + public boolean doAddSql(TSNoticeAuthorityRole t){ return true; } /** * 默认按钮-sql增强-更新操作 - * @param id + * @param t * @return */ - public boolean doUpdateSql(TSNoticeAuthorityRole t){ + @Override + public boolean doUpdateSql(TSNoticeAuthorityRole t){ return true; } /** * 默认按钮-sql增强-删除操作 - * @param id + * @param t * @return */ - public boolean doDelSql(TSNoticeAuthorityRole t){ + @Override + public boolean doDelSql(TSNoticeAuthorityRole t){ return true; } @@ -75,7 +81,8 @@ public class NoticeAuthorityRoleServiceImpl extends CommonServiceImpl implements /** * 检查通知公告授权角色是否存在 */ - public boolean checkAuthorityRole(String noticeId, String roleid) { + @Override + public boolean checkAuthorityRole(String noticeId, String roleid) { CriteriaQuery cq = new CriteriaQuery(TSNoticeAuthorityRole.class); //查询条件组装器 cq.eq("role.id", roleid); diff --git a/src/main/java/org/jeecgframework/web/system/service/impl/NoticeAuthorityUserServiceImpl.java b/src/main/java/org/jeecgframework/web/system/service/impl/NoticeAuthorityUserServiceImpl.java index 3a981d1e690aa15075cb3d3c7377a28b25dc0d26..19ef1e6b4730902cfa672bc64a10e2a18be1d584 100644 --- a/src/main/java/org/jeecgframework/web/system/service/impl/NoticeAuthorityUserServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/system/service/impl/NoticeAuthorityUserServiceImpl.java @@ -15,20 +15,23 @@ import org.springframework.transaction.annotation.Transactional; public class NoticeAuthorityUserServiceImpl extends CommonServiceImpl implements NoticeAuthorityUserServiceI { - public void delete(T entity) { + @Override + public void delete(T entity) { super.delete(entity); //执行删除操作配置的sql增强 this.doDelSql((TSNoticeAuthorityUser)entity); } - public Serializable save(T entity) { + @Override + public Serializable save(T entity) { Serializable t = super.save(entity); //执行新增操作配置的sql增强 this.doAddSql((TSNoticeAuthorityUser)entity); return t; } - public void saveOrUpdate(T entity) { + @Override + public void saveOrUpdate(T entity) { super.saveOrUpdate(entity); //执行更新操作配置的sql增强 this.doUpdateSql((TSNoticeAuthorityUser)entity); @@ -36,26 +39,29 @@ public class NoticeAuthorityUserServiceImpl extends CommonServiceImpl implements /** * 默认按钮-sql增强-新增操作 - * @param id + * @param t * @return */ - public boolean doAddSql(TSNoticeAuthorityUser t){ + @Override + public boolean doAddSql(TSNoticeAuthorityUser t){ return true; } /** * 默认按钮-sql增强-更新操作 - * @param id + * @param t * @return */ - public boolean doUpdateSql(TSNoticeAuthorityUser t){ + @Override + public boolean doUpdateSql(TSNoticeAuthorityUser t){ return true; } /** * 默认按钮-sql增强-删除操作 - * @param id + * @param t * @return */ - public boolean doDelSql(TSNoticeAuthorityUser t){ + @Override + public boolean doDelSql(TSNoticeAuthorityUser t){ return true; } @@ -75,7 +81,8 @@ public class NoticeAuthorityUserServiceImpl extends CommonServiceImpl implements /** * 检查通知公告授权用户是否存在 */ - public boolean checkAuthorityUser(String noticeId, String userid) { + @Override + public boolean checkAuthorityUser(String noticeId, String userid) { CriteriaQuery cq = new CriteriaQuery(TSNoticeAuthorityUser.class); cq.eq("user.id", userid); cq.eq("noticeId", noticeId); diff --git a/src/main/java/org/jeecgframework/web/system/service/impl/NoticeServiceImpl.java b/src/main/java/org/jeecgframework/web/system/service/impl/NoticeServiceImpl.java index 471470d6148f739ab56a03a527387a30bca830fa..f0b49fac6a2611b7d7f2929c986b753449e96738 100644 --- a/src/main/java/org/jeecgframework/web/system/service/impl/NoticeServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/system/service/impl/NoticeServiceImpl.java @@ -23,7 +23,7 @@ public class NoticeServiceImpl extends CommonServiceImpl implements NoticeServic /** * - * @param noticeTilte 标题 + * @param noticeTitle 标题 * @param noticeContent 内容 * @param noticeType 类型 * @param noticeLevel 级别 @@ -31,9 +31,10 @@ public class NoticeServiceImpl extends CommonServiceImpl implements NoticeServic * @param createUser 创建者 * @return */ - public String addNotice(String noticeTitle, String noticeContent, - String noticeType, String noticeLevel, Date noticeTerm, - String createUser) { + @Override + public String addNotice(String noticeTitle, String noticeContent, + String noticeType, String noticeLevel, Date noticeTerm, + String createUser) { String noticeId=null; TSNotice notice = new TSNotice(); notice.setNoticeTitle(noticeTitle); @@ -51,7 +52,8 @@ public class NoticeServiceImpl extends CommonServiceImpl implements NoticeServic /** * 追加通告授权用户 */ - public void addNoticeAuthorityUser(String noticeId, String userid) { + @Override + public void addNoticeAuthorityUser(String noticeId, String userid) { if(noticeId != null && userid!=null){ TSNoticeAuthorityUser entity = new TSNoticeAuthorityUser(); entity.setNoticeId(noticeId); @@ -62,7 +64,8 @@ public class NoticeServiceImpl extends CommonServiceImpl implements NoticeServic } } - public void delete(T entity) { + @Override + public void delete(T entity) { TSNotice notice = (TSNotice)entity; super.deleteAllEntitie(super.findByProperty(TSNoticeReadUser.class, "noticeId", notice.getId())); @@ -74,14 +77,16 @@ public class NoticeServiceImpl extends CommonServiceImpl implements NoticeServic } - public Serializable save(T entity) { + @Override + public Serializable save(T entity) { Serializable t = super.save(entity); //执行新增操作配置的sql增强 this.doAddSql((TSNotice)entity); return t; } - public void saveOrUpdate(T entity) { + @Override + public void saveOrUpdate(T entity) { super.saveOrUpdate(entity); //执行更新操作配置的sql增强 this.doUpdateSql((TSNotice)entity); @@ -89,26 +94,29 @@ public class NoticeServiceImpl extends CommonServiceImpl implements NoticeServic /** * 默认按钮-sql增强-新增操作 - * @param id + * @param t * @return */ - public boolean doAddSql(TSNotice t){ + @Override + public boolean doAddSql(TSNotice t){ return true; } /** * 默认按钮-sql增强-更新操作 - * @param id + * @param t * @return */ - public boolean doUpdateSql(TSNotice t){ + @Override + public boolean doUpdateSql(TSNotice t){ return true; } /** * 默认按钮-sql增强-删除操作 - * @param id + * @param t * @return */ - public boolean doDelSql(TSNotice t){ + @Override + public boolean doDelSql(TSNotice t){ return true; } diff --git a/src/main/java/org/jeecgframework/web/system/service/impl/SystemServiceImpl.java b/src/main/java/org/jeecgframework/web/system/service/impl/SystemServiceImpl.java index dc337a20fa80383f9db55bfb62c6c16b9011fea5..799f4ce1059b4dfc98f657f8ab83980779e1aa47 100644 --- a/src/main/java/org/jeecgframework/web/system/service/impl/SystemServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/system/service/impl/SystemServiceImpl.java @@ -43,11 +43,13 @@ public class SystemServiceImpl extends CommonServiceImpl implements SystemServic @Autowired private JeecgDictDao jeecgDictDao; + @Override public TSUser checkUserExits(TSUser user) throws Exception { return this.commonDao.getUserByUserIdAndUserNameExits(user); } - public List queryDict(String dicTable, String dicCode,String dicText){ + @Override + public List queryDict(String dicTable, String dicCode, String dicText){ List dictList = null; //step.1 如果没有字典表则使用系统字典表 if(StringUtil.isEmpty(dicTable)){ @@ -65,6 +67,7 @@ public class SystemServiceImpl extends CommonServiceImpl implements SystemServic /** * 添加日志 */ + @Override public void addLog(String logcontent, Short loglevel, Short operatetype) { HttpServletRequest request = ContextHolderUtils.getRequest(); String broswer = BrowserUtils.checkBrowse(request); @@ -88,6 +91,7 @@ public class SystemServiceImpl extends CommonServiceImpl implements SystemServic * @param typename * @return */ + @Override public TSType getType(String typecode, String typename, TSTypegroup tsTypegroup) { //TSType actType = commonDao.findUniqueByProperty(TSType.class, "typecode", typecode,tsTypegroup.getId()); List ls = commonDao.findHql("from TSType where typecode = ? and typegroupid = ?",typecode,tsTypegroup.getId()); @@ -108,10 +112,11 @@ public class SystemServiceImpl extends CommonServiceImpl implements SystemServic /** * 根据类型分组编码和名称获取TypeGroup,如果为空则创建一个 * - * @param typecode - * @param typename + * @param typegroupcode + * @param typgroupename * @return */ + @Override public TSTypegroup getTypeGroup(String typegroupcode, String typgroupename) { TSTypegroup tsTypegroup = commonDao.findUniqueByProperty(TSTypegroup.class, "typegroupcode", typegroupcode); if (tsTypegroup == null) { @@ -124,12 +129,14 @@ public class SystemServiceImpl extends CommonServiceImpl implements SystemServic } + @Override public TSTypegroup getTypeGroupByCode(String typegroupCode) { TSTypegroup tsTypegroup = commonDao.findUniqueByProperty(TSTypegroup.class, "typegroupcode", typegroupCode); return tsTypegroup; } + @Override public void initAllTypeGroups() { List typeGroups = this.commonDao.loadAll(TSTypegroup.class); for (TSTypegroup tsTypegroup : typeGroups) { @@ -140,6 +147,7 @@ public class SystemServiceImpl extends CommonServiceImpl implements SystemServic } + @Override public void refleshTypesCach(TSType type) { TSTypegroup tsTypegroup = type.getTSTypegroup(); TSTypegroup typeGroupEntity = this.commonDao.get(TSTypegroup.class, tsTypegroup.getId()); @@ -148,6 +156,7 @@ public class SystemServiceImpl extends CommonServiceImpl implements SystemServic } + @Override public void refleshTypeGroupCach() { ResourceUtil.allTypeGroups.clear(); List typeGroups = this.commonDao.loadAll(TSTypegroup.class); @@ -163,6 +172,7 @@ public class SystemServiceImpl extends CommonServiceImpl implements SystemServic * @param functionId * @return */ + @Override public Set getOperationCodesByRoleIdAndFunctionId(String roleId, String functionId) { Set operationCodes = new HashSet(); TSRole role = commonDao.get(TSRole.class, roleId); @@ -185,10 +195,11 @@ public class SystemServiceImpl extends CommonServiceImpl implements SystemServic /** * 根据用户ID 和 菜单Id 获取 具有操作权限的按钮Codes - * @param roleId + * @param userId * @param functionId * @return */ + @Override public Set getOperationCodesByUserIdAndFunctionId(String userId, String functionId) { Set operationCodes = new HashSet(); List rUsers = findByProperty(TSRoleUser.class, "TSUser.id", userId); @@ -214,8 +225,8 @@ public class SystemServiceImpl extends CommonServiceImpl implements SystemServic /** * 获取页面控件权限控制的 * JS片段 - * @param out */ + @Override public String getAuthFilterJS() { StringBuilder out = new StringBuilder(); out.append("