From ad045a95e087be9da5858364ed3bfdc11e96c625 Mon Sep 17 00:00:00 2001 From: o2null Date: Mon, 12 Jul 2021 16:32:35 +0800 Subject: [PATCH] =?UTF-8?q?applicationServer=20codeSafe=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- o2server/configSample/organization.json | 4 +- .../assemble/common/date/DateOperation.java | 536 +++++++------- .../common/excel/reader/Excel2007Reader.java | 138 ++-- .../excel/writer/AbstractExcel2007Writer.java | 94 ++- .../common/excel/writer/Excel2003Writer.java | 2 +- .../control/service/UserManagerService.java | 403 +++++------ .../assemble/common/date/DateOperation.java | 669 +++++++++--------- .../service/Calendar_EventServiceAdv.java | 32 +- .../x/calendar/common/date/DateOperation.java | 666 ++++++++--------- .../excel/writer/AbstractExcel2007Writer.java | 148 ++-- .../jaxrs/appdictdesign/ActionListPaging.java | 8 +- .../jaxrs/script/ActionListPaging.java | 21 +- .../control/queue/QueueDocumentUpdate.java | 29 +- .../com/x/file/assemble/control/FileUtil.java | 2 + .../control/jaxrs/worktime/DateOperation.java | 536 +++++++------- .../assemble/common/date/DateOperation.java | 654 +++++++++-------- .../assemble/communicate/mq/ActiveMQ.java | 224 +++--- .../assemble/common/date/DateOperation.java | 655 +++++++++-------- .../jaxrs/authentication/BaseAction.java | 72 +- .../control/jaxrs/ActionApplication.java | 3 +- .../jaxrs/function/ActionCreatePassword.java | 110 +-- .../function/ActionListAllPersonName.java | 70 +- .../jaxrs/function/ActionSetPassword.java | 80 +-- .../control/jaxrs/function/ActionSetText.java | 90 +-- .../jaxrs/function/FunctionAction.java | 220 +++--- .../jaxrs/personcard/ActionCreateCode.java | 166 +++-- .../jaxrs/password/ActionChangePassword.java | 3 - .../jaxrs/person/ActionSetPassword.java | 55 +- .../personal/jaxrs/regist/ActionCreate.java | 9 +- .../designer/jaxrs/script/ActionDelete.java | 2 +- .../designer/jaxrs/script/ActionGet.java | 7 +- .../jaxrs/script/ActionListPaging.java | 24 +- .../jaxrs/script/ActionManagerList.java | 38 +- .../designer/jaxrs/script/BaseAction.java | 2 +- .../applicationdict/ActionListPaging.java | 12 +- .../jaxrs/script/ActionManagerList.java | 38 +- .../attachment/ActionUploadWorkInfo.java | 27 +- .../jaxrs/task/ActionListMyFilterPaging.java | 52 +- .../task/ActionManageListFilterPaging.java | 35 +- .../x/query/assemble/designer/Business.java | 9 +- .../designer/factory/ImportModelFactory.java | 17 +- .../designer/factory/ProcessFactory.java | 13 +- .../designer/factory/StatementFactory.java | 12 +- .../designer/factory/TableFactory.java | 12 +- .../designer/jaxrs/ActionApplication.java | 2 +- .../designer/jaxrs/DesignerJaxrsFilter.java | 4 +- .../jaxrs/ImportModelJaxrsFilter.java | 5 +- .../designer/jaxrs/QueryJaxrsFilter.java | 1 - .../designer/jaxrs/StatJaxrsFilter.java | 1 - .../designer/jaxrs/TableJaxrsFilter.java | 1 - .../designer/jaxrs/ViewJaxrsFilter.java | 1 - .../designer/jaxrs/designer/ActionSearch.java | 15 +- .../jaxrs/designer/DesignerAction.java | 23 +- .../jaxrs/designer/ExceptionFieldEmpty.java | 1 - .../jaxrs/importmodel/ActionCreate.java | 3 +- .../jaxrs/importmodel/ActionEdit.java | 3 +- .../importmodel/ActionListWithQuery.java | 4 +- .../jaxrs/importmodel/BaseAction.java | 10 +- .../jaxrs/importmodel/ImportModelAction.java | 24 +- .../designer/jaxrs/input/ActionCover.java | 29 +- .../designer/jaxrs/input/ActionCreate.java | 18 +- .../jaxrs/input/ActionPrepareCover.java | 18 +- .../jaxrs/input/ActionPrepareCreate.java | 14 +- .../input/ExceptionEntityExistForCreate.java | 1 - .../input/ExceptionQueryAccessDenied.java | 1 - .../jaxrs/input/ExceptionQueryExist.java | 1 - .../jaxrs/input/ExceptionQueryNotExist.java | 1 - .../input/ExceptionQueryNotExistForCover.java | 1 - .../jaxrs/neural/ActionDeleteModel.java | 2 +- .../jaxrs/neural/ExceptionEntryEmpty.java | 1 - .../jaxrs/neural/ExceptionGenerating.java | 1 - .../jaxrs/neural/ExceptionLearning.java | 1 - .../designer/jaxrs/output/ActionList.java | 14 +- .../designer/jaxrs/output/ActionSelect.java | 18 +- .../jaxrs/output/ActionSelectFile.java | 7 +- .../designer/jaxrs/output/BaseAction.java | 2 +- .../jaxrs/output/ExceptionFlagNotExist.java | 1 - .../output/ExceptionQueryAccessDenied.java | 1 - .../jaxrs/output/ExceptionQueryNotExist.java | 1 - .../jaxrs/output/ExceptionRevealNotExist.java | 1 - .../jaxrs/output/ExceptionSelectNotExist.java | 1 - .../jaxrs/output/ExceptionStatNotExist.java | 1 - .../jaxrs/output/ExceptionViewNotExist.java | 1 - .../designer/jaxrs/query/ActionCreate.java | 2 +- .../designer/jaxrs/query/ActionDelete.java | 10 +- .../designer/jaxrs/query/ActionEdit.java | 2 +- .../query/ActionGetEntityProperties.java | 22 +- .../designer/jaxrs/query/ActionSetIcon.java | 2 +- .../jaxrs/query/ExceptionAccessDenied.java | 1 - .../jaxrs/query/ExceptionAliasExist.java | 1 - .../jaxrs/query/ExceptionIdExist.java | 1 - .../jaxrs/query/ExceptionNameExist.java | 1 - .../query/ExceptionQueryAccessDenied.java | 1 - .../jaxrs/query/ExceptionQueryNotExist.java | 1 - .../designer/jaxrs/reveal/ActionCreate.java | 2 +- .../designer/jaxrs/reveal/ActionEdit.java | 2 +- .../jaxrs/reveal/ExceptionAccessDenied.java | 1 - .../jaxrs/reveal/ExceptionAliasExist.java | 1 - .../jaxrs/reveal/ExceptionNameExist.java | 1 - .../reveal/ExceptionQueryAccessDenied.java | 1 - .../jaxrs/reveal/ExceptionQueryNotExist.java | 1 - .../jaxrs/reveal/ExceptionRevealNotExist.java | 1 - .../designer/jaxrs/stat/ActionCreate.java | 3 +- .../designer/jaxrs/stat/ActionDelete.java | 1 - .../designer/jaxrs/stat/ActionEdit.java | 3 +- .../jaxrs/stat/ExceptionAccessDenied.java | 1 - .../jaxrs/stat/ExceptionAliasExist.java | 1 - .../jaxrs/stat/ExceptionNameExist.java | 1 - .../stat/ExceptionQueryAccessDenied.java | 1 - .../jaxrs/stat/ExceptionQueryNotExist.java | 1 - .../jaxrs/stat/ExceptionStatNotExist.java | 1 - .../jaxrs/stat/ExceptionViewNotExist.java | 1 - .../jaxrs/statement/ActionCreate.java | 3 +- .../jaxrs/statement/ActionDelete.java | 1 - .../designer/jaxrs/statement/ActionEdit.java | 3 +- .../jaxrs/statement/ActionExecute.java | 2 +- .../jaxrs/statement/ActionExecuteV2.java | 22 +- .../jaxrs/statement/ActionListWithQuery.java | 1 - .../designer/jaxrs/statement/BaseAction.java | 1 - .../jaxrs/statement/ExceptionEntityClass.java | 1 - .../ExceptionModifyOfficialTable.java | 1 - .../designer/jaxrs/table/ActionBuildAll.java | 8 +- .../designer/jaxrs/table/ActionCreate.java | 3 +- .../designer/jaxrs/table/ActionDelete.java | 1 - .../designer/jaxrs/table/ActionEdit.java | 5 +- .../designer/jaxrs/table/ActionExecute.java | 2 +- .../designer/jaxrs/table/ActionGet.java | 2 - .../jaxrs/table/ActionRowCountWhere.java | 2 - .../designer/jaxrs/table/ActionRowDelete.java | 2 - .../jaxrs/table/ActionRowDeleteBatch.java | 1 - .../designer/jaxrs/table/ActionRowExport.java | 6 +- .../designer/jaxrs/table/ActionRowGet.java | 1 - .../designer/jaxrs/table/ActionRowSave.java | 18 +- .../designer/jaxrs/table/ActionRowUpdate.java | 1 - .../jaxrs/table/ActionStatusBuild.java | 3 +- .../jaxrs/table/ActionStatusDraft.java | 1 - .../jaxrs/table/ExceptionCompileError.java | 1 - .../jaxrs/table/ExceptionEnhanceError.java | 1 - .../jaxrs/table/ExceptionFieldEmpty.java | 1 - .../jaxrs/table/ExceptionFieldName.java | 1 - .../designer/jaxrs/view/ActionBundle.java | 4 +- .../designer/jaxrs/view/ActionCreate.java | 5 +- .../designer/jaxrs/view/ActionDelete.java | 1 - .../designer/jaxrs/view/ActionEdit.java | 5 +- .../designer/jaxrs/view/ActionSimulate.java | 8 +- .../designer/jaxrs/view/BaseAction.java | 23 +- .../jaxrs/view/ExceptionAccessDenied.java | 1 - .../jaxrs/view/ExceptionAliasExist.java | 1 - .../jaxrs/view/ExceptionDataEmpty.java | 1 - .../jaxrs/view/ExceptionNameExist.java | 1 - .../view/ExceptionQueryAccessDenied.java | 1 - .../jaxrs/view/ExceptionQueryNotExist.java | 1 - .../jaxrs/view/ExceptionTypeValue.java | 1 - .../jaxrs/view/ExceptionViewNotExist.java | 1 - .../processing/jaxrs/design/ActionSearch.java | 75 +- 155 files changed, 3368 insertions(+), 3158 deletions(-) diff --git a/o2server/configSample/organization.json b/o2server/configSample/organization.json index 722f21ad28..35eebfe312 100644 --- a/o2server/configSample/organization.json +++ b/o2server/configSample/organization.json @@ -3,6 +3,6 @@ "pickPersonWithName": false, "pickIdentityWithName": false, "###unitLevelOrderNumberDigits": "unit中unitLevelOrderNumber扩充位数,\u003c\u003d0不扩充.###", - "###pickPersonWithName": "人员识别过程中过程为先查找 distinguishedName 再查找中间的 unique 如果还是没有查找到是否要通过那么进行查找.###", - "###pickIdentityWithName": "身份识别过程中过程为先查找 distinguishedName 再查找中间的 unique 如果还是没有查找到是否要通过那么进行查找.###" + "###pickPersonWithName": "zhangsan@123@P人员识别过程中过程为先查找 distinguishedName 再查找中间的 unique 如果还是没有查找到是否要通过名称进行查找.###", + "###pickIdentityWithName": "zhangsan@456@I身份识别过程中过程为先查找 distinguishedName 再查找中间的 unique 如果还是没有查找到是否要通过名称进行查找.###" } \ No newline at end of file diff --git a/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/common/date/DateOperation.java b/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/common/date/DateOperation.java index 30b8dae2c8..22db74642f 100644 --- a/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/common/date/DateOperation.java +++ b/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/common/date/DateOperation.java @@ -7,10 +7,10 @@ import java.util.Calendar; import java.util.Date; import java.util.List; - public class DateOperation { /** * 根据样式得到格式化对象SimpleDateFormat + * * @param date * @param style * @return @@ -36,115 +36,132 @@ public class DateOperation { * @param date * @return HH:mm:ss */ - public String getTime(Date date) { + public String getTime(Date date) { return format2.format(date); } - public Date getDateFromString(String dateString, String style) throws Exception{ + public Date getDateFromString(String dateString, String style) throws Exception { Date date = null; - if(style==null||"".equals(style.trim())){ + if (style == null || "".equals(style.trim())) { date = format1.parse(dateString); - }else if("yyyy-MM-dd HH:mm:ss".equalsIgnoreCase(style.trim())){ + } else if ("yyyy-MM-dd HH:mm:ss".equalsIgnoreCase(style.trim())) { date = format3.parse(dateString); - }else if("yyyy-MM-dd HH:mm".equalsIgnoreCase(style.trim())){ + } else if ("yyyy-MM-dd HH:mm".equalsIgnoreCase(style.trim())) { date = format3_2.parse(dateString); - }else if("yyyy/MM/dd HH:mm:ss".equalsIgnoreCase(style.trim())){ + } else if ("yyyy/MM/dd HH:mm:ss".equalsIgnoreCase(style.trim())) { date = format3_1.parse(dateString); - }else if("yyyy/MM/dd".equalsIgnoreCase(style.trim())){ + } else if ("yyyy/MM/dd".equalsIgnoreCase(style.trim())) { date = format4.parse(dateString); - }else if("yyyy-MM-dd".equalsIgnoreCase(style.trim())){ + } else if ("yyyy-MM-dd".equalsIgnoreCase(style.trim())) { date = format1.parse(dateString); - }else if("yyyyMMdd".equalsIgnoreCase(style.trim())){ + } else if ("yyyyMMdd".equalsIgnoreCase(style.trim())) { date = format5.parse(dateString); - }else if("yyyyMMddHHmmss".equalsIgnoreCase(style.trim())){ + } else if ("yyyyMMddHHmmss".equalsIgnoreCase(style.trim())) { date = format7.parse(dateString); - }else if("HH:mm:ss".equalsIgnoreCase(style.trim())){ + } else if ("HH:mm:ss".equalsIgnoreCase(style.trim())) { date = format2.parse(dateString); - }else if("HH:mm".equalsIgnoreCase(style.trim())){ + } else if ("HH:mm".equalsIgnoreCase(style.trim())) { date = format2_1.parse(dateString); - }else{ + } else { throw new Exception("对不起，您输入的日期style系统无法识别，请检查您的参数输入！"); } return date; } - + /** - * 将字符串转换为日期格式 - * 会尝试多种格式转换，转换成功后返回结果 + * 将字符串转换为日期格式 会尝试多种格式转换，转换成功后返回结果 + * * @param dateString * @return * @throws Exception */ - public Date getDateFromString( String dateString ) throws Exception{ + public Date getDateFromString(String dateString) throws Exception { Date date = null; - try{ - date = getDateFromString( dateString, "yyyy-MM-dd HH:mm:ss" ); + try { + date = getDateFromString(dateString, "yyyy-MM-dd HH:mm:ss"); return date; - }catch(Exception e){} + } catch (Exception e) { + e.printStackTrace(); + } - try{ - date = getDateFromString( dateString, "yyyy-MM-dd HH:mm" ); + try { + date = getDateFromString(dateString, "yyyy-MM-dd HH:mm"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyy/MM/dd HH:mm:ss" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "yyyy/MM/dd HH:mm:ss"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyy-MM-dd" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "yyyy-MM-dd"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyy/MM/dd" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "yyyy/MM/dd"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyyMMdd" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "yyyyMMdd"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyyMMddHHmmss" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "yyyyMMddHHmmss"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "HH:mm:ss" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "HH:mm:ss"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "HH:mm" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "HH:mm"); return date; - }catch(Exception e){} - + } catch (Exception e) { + e.printStackTrace(); + } + return date; } - - - public String getDateStringFromDate(Date date, String style) throws Exception{ + + public String getDateStringFromDate(Date date, String style) throws Exception { String dateString = null; - if(style==null||"".equals(style.trim())){ + if (style == null || "".equals(style.trim())) { dateString = format1.format(date); - }else if("yyyy-MM-dd HH:mm:ss".equalsIgnoreCase(style.trim())){ + } else if ("yyyy-MM-dd HH:mm:ss".equalsIgnoreCase(style.trim())) { dateString = format3.format(date); - }else if("yyyy/MM/dd HH:mm:ss".equalsIgnoreCase(style.trim())){ + } else if ("yyyy/MM/dd HH:mm:ss".equalsIgnoreCase(style.trim())) { dateString = format3_1.format(date); - }else if("yyyy/MM/dd".equalsIgnoreCase(style.trim())){ + } else if ("yyyy/MM/dd".equalsIgnoreCase(style.trim())) { dateString = format4.format(date); - }else if("yyyy-MM-dd".equalsIgnoreCase(style.trim())){ + } else if ("yyyy-MM-dd".equalsIgnoreCase(style.trim())) { dateString = format1.format(date); - }else if("yyyyMMdd".equalsIgnoreCase(style.trim())){ + } else if ("yyyyMMdd".equalsIgnoreCase(style.trim())) { dateString = format5.format(date); - }else if("yyyyMMddHHmmss".equalsIgnoreCase(style.trim())){ + } else if ("yyyyMMddHHmmss".equalsIgnoreCase(style.trim())) { dateString = format7.format(date); - }else if("HH:mm:ss".equalsIgnoreCase(style.trim())){ + } else if ("HH:mm:ss".equalsIgnoreCase(style.trim())) { dateString = format2.format(date); - }else{ + } else { throw new Exception("对不起，您输入的日期style系统无法识别，请检查您的参数输入！style=" + style); } return dateString; @@ -152,24 +169,26 @@ public class DateOperation { /** * 得到某日期加上或减去天数后的日期,day为负数时减去 + * * @param dateString * @param day * @param style * @return * @throws Exception */ - public String getDayAdd(String dateString, int day, String style) throws Exception { + public String getDayAdd(String dateString, int day, String style) throws Exception { Date date = getDateFromString(dateString, style); return getDayAdd(date, day); } /** * 得到某日期加上或减去天数后的日期,day为负数时减去 + * * @param date * @param day * @return */ - public String getDayAdd(Date date, int day) { + public String getDayAdd(Date date, int day) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); calendar.add(Calendar.DATE, day); @@ -183,7 +202,7 @@ public class DateOperation { * @param month * @return "yyyy-MM-dd" */ - public String getMonthAdd(Date date, int month) { + public String getMonthAdd(Date date, int month) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); calendar.add(Calendar.MONTH, month); @@ -192,11 +211,12 @@ public class DateOperation { /** * 得到某日期加上或减去分钟后的日期,min为负数时减去 + * * @param date * @param min * @return */ - public String getMinutesAdd(Date date, int min) { + public String getMinutesAdd(Date date, int min) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); calendar.add(Calendar.MINUTE, min); @@ -205,21 +225,23 @@ public class DateOperation { /** * 得到某日期的日 + * * @param date * @return */ - public String getDay(Date date) { - try{ + public String getDay(Date date) { + try { return format10.format(date); - }catch(Exception e){ + } catch (Exception e) { return "0"; } } + public int getDayNumber(Date date) { String result = null; - try{ + try { result = format10.format(date); - }catch(Exception e){ + } catch (Exception e) { result = "0"; } return Integer.parseInt(result); @@ -227,21 +249,23 @@ public class DateOperation { /** * 得到某日期的月份 + * * @param date * @return */ - public String getMonth(Date date) { - try{ + public String getMonth(Date date) { + try { return format9.format(date); - }catch(Exception e){ + } catch (Exception e) { return "0"; } } + public int getMonthNumber(Date date) { String result = null; - try{ + try { result = format9.format(date); - }catch(Exception e){ + } catch (Exception e) { result = "0"; } return Integer.parseInt(result); @@ -249,21 +273,23 @@ public class DateOperation { /** * 得到某日期的年份 + * * @param date * @return */ - public String getYear(Date date) { - try{ + public String getYear(Date date) { + try { return format8.format(date); - }catch(Exception e){ + } catch (Exception e) { return "0"; } } + public int getYearNumber(Date date) { String result = null; - try{ + try { result = format8.format(date); - }catch(Exception e){ + } catch (Exception e) { result = "0"; } return Integer.parseInt(result); @@ -271,43 +297,47 @@ public class DateOperation { /** * 得到某日期的小时 + * * @param date * @return */ - public String getHour(Date date) { - try{ + public String getHour(Date date) { + try { return format11.format(date); - }catch(Exception e){ + } catch (Exception e) { return "0"; } } /** * 得到某日期的分钟 + * * @param date * @return */ - public String getMinites(Date date) { + public String getMinites(Date date) { return format12.format(date); } /** * 得到某日期的秒 + * * @param date * @return */ - public String getSeconds(Date date) { + public String getSeconds(Date date) { return format13.format(date); } /** * 得到某年有多少天 + * * @param date * @return * @throws ParseException */ @SuppressWarnings("static-access") - public int getDaysForYear(String date) throws ParseException { + public int getDaysForYear(String date) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(format1.parse(date)); return calendar.get(calendar.DAY_OF_YEAR); @@ -315,12 +345,13 @@ public class DateOperation { /** * 得到某年有多少天 + * * @param date * @return * @throws ParseException */ @SuppressWarnings("static-access") - public int getDaysForYear(Date date) throws ParseException { + public int getDaysForYear(Date date) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); return calendar.get(calendar.DAY_OF_YEAR); @@ -328,12 +359,13 @@ public class DateOperation { /** * 得到某年有多少天 + * * @param year * @return * @throws ParseException */ @SuppressWarnings("static-access") - public int getDaysForYear_YYYY(String year) throws ParseException { + public int getDaysForYear_YYYY(String year) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(format8.parse(year)); return calendar.get(calendar.DAY_OF_YEAR); @@ -341,24 +373,26 @@ public class DateOperation { /** * 得到某月有多少天 + * * @param date * @return * @throws ParseException */ - public int getDaysForMonth(String date) throws ParseException { + public int getDaysForMonth(String date) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(format1.parse(date)); - return calendar.getActualMaximum( Calendar.DAY_OF_MONTH); + return calendar.getActualMaximum(Calendar.DAY_OF_MONTH); } /** * 得到某月有多少天 + * * @param date * @return * @throws ParseException */ @SuppressWarnings("static-access") - public int getDaysForMonth_MM(String date) throws ParseException { + public int getDaysForMonth_MM(String date) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(format14.parse(date)); return calendar.get(calendar.DAY_OF_MONTH); @@ -366,11 +400,12 @@ public class DateOperation { /** * 得到某月有多少天 + * * @param date * @return * @throws ParseException */ - public int getDaysForMonth(Date date) throws ParseException { + public int getDaysForMonth(Date date) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); return calendar.get(Calendar.DAY_OF_MONTH); @@ -381,7 +416,7 @@ public class DateOperation { * * @return */ - public String getNowDate() { + public String getNowDate() { return format1.format(new Date()); } @@ -390,45 +425,49 @@ public class DateOperation { * * @return */ - public String getNowTime() { + public String getNowTime() { return format2.format(new Date()); } + /** - * 得到当前的时间 - * yyyyMMddHHmmss + * 得到当前的时间 yyyyMMddHHmmss + * * @return */ - public String getNowTimeChar() { + public String getNowTimeChar() { return format7.format(new Date()); } + /** - * 得到当前的时间 - * yyyy-MM-dd HH:mm:ss + * 得到当前的时间 yyyy-MM-dd HH:mm:ss + * * @return */ - public String getNowDateTime() { + public String getNowDateTime() { return format3.format(new Date()); } + /** * 得到两个时间之前的分差 + * * @param date1 yyyy-MM-dd HH:mm:ss * @param date2 yyyy-MM-dd HH:mm:ss * @return - * @throws ParseException + * @throws ParseException */ - public long getDeff(String date1,String date2) throws ParseException { + public long getDeff(String date1, String date2) throws ParseException { long dayNumber = 0; // 1小时=60分钟=3600秒=3600000 long mins = 60L * 1000L; // long day= 24L * 60L * 60L * 1000L;计算天数之差 SimpleDateFormat df = null; - if(date1.length() == 19){ + if (date1.length() == 19) { df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - }else if(date1.length() == 10){ + } else if (date1.length() == 10) { df = new SimpleDateFormat("yyyy-MM-dd"); - }else if(date1.length() == 8){ + } else if (date1.length() == 8) { df = new SimpleDateFormat("HH:mm:ss"); - }else{ + } else { df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); } java.util.Date d1 = df.parse(date1); @@ -436,13 +475,15 @@ public class DateOperation { dayNumber = (d2.getTime() - d1.getTime()) / mins; return dayNumber; } + /** * 得到两个时间之前的分差 + * * @param date1 yyyy-MM-dd HH:mm:ss * @param date2 yyyy-MM-dd HH:mm:ss * @return */ - public long getDeff(Date date1,Date date2) { + public long getDeff(Date date1, Date date2) { long dayNumber = 0; long mins = 60L * 1000L; dayNumber = (date2.getTime() - date1.getTime()) / mins; @@ -451,16 +492,17 @@ public class DateOperation { /** * 日期格式转换 从YYYY-MM-DD转换到YYYYMMDD + * * @param dateString * @return * @throws ParseException */ - public String changeDateFormat(String dateString) throws ParseException{ + public String changeDateFormat(String dateString) throws ParseException { Date date; String reslut = null; try { - if("".equals(dateString)){ - dateString="0000-00-00"; + if ("".equals(dateString)) { + dateString = "0000-00-00"; } date = format1.parse(dateString); reslut = format5.format(date); @@ -469,41 +511,40 @@ public class DateOperation { } return reslut; } - + /** 格式 yyyy-MM-dd */ - public final SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd"); + public final SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd"); /** 格式 HH:mm:ss */ - public final SimpleDateFormat format2 = new SimpleDateFormat("HH:mm:ss"); - public final SimpleDateFormat format2_1 = new SimpleDateFormat("HH:mm"); + public final SimpleDateFormat format2 = new SimpleDateFormat("HH:mm:ss"); + public final SimpleDateFormat format2_1 = new SimpleDateFormat("HH:mm"); /** 格式 yyyy-MM-dd HH:mm:ss */ - public final SimpleDateFormat format3 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - public final SimpleDateFormat format3_2 = new SimpleDateFormat("yyyy-MM-dd HH:mm"); - public final SimpleDateFormat format3_1 = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); + public final SimpleDateFormat format3 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public final SimpleDateFormat format3_2 = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + public final SimpleDateFormat format3_1 = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); /** 格式 yyyy/MM/dd */ - public final SimpleDateFormat format4 = new SimpleDateFormat("yyyy/MM/dd"); + public final SimpleDateFormat format4 = new SimpleDateFormat("yyyy/MM/dd"); /** 格式 yyyyMMdd */ - public final SimpleDateFormat format5 = new SimpleDateFormat("yyyyMMdd"); + public final SimpleDateFormat format5 = new SimpleDateFormat("yyyyMMdd"); /** 格式 HHmmss */ - public final SimpleDateFormat format6 = new SimpleDateFormat("HHmmss"); + public final SimpleDateFormat format6 = new SimpleDateFormat("HHmmss"); /** 格式 yyyyMMddHHmmss */ - public final SimpleDateFormat format7 = new SimpleDateFormat("yyyyMMddHHmmss"); + public final SimpleDateFormat format7 = new SimpleDateFormat("yyyyMMddHHmmss"); /** 格式 yyyy */ - public final SimpleDateFormat format8 = new SimpleDateFormat("yyyy"); + public final SimpleDateFormat format8 = new SimpleDateFormat("yyyy"); /** 格式 MM */ - public final SimpleDateFormat format9 = new SimpleDateFormat("MM"); + public final SimpleDateFormat format9 = new SimpleDateFormat("MM"); /** 格式 dd */ - public final SimpleDateFormat format10 = new SimpleDateFormat("dd"); + public final SimpleDateFormat format10 = new SimpleDateFormat("dd"); /** 格式 HH */ - public final SimpleDateFormat format11 = new SimpleDateFormat("HH"); + public final SimpleDateFormat format11 = new SimpleDateFormat("HH"); /** 格式 mm */ - public final SimpleDateFormat format12 = new SimpleDateFormat("mm"); + public final SimpleDateFormat format12 = new SimpleDateFormat("mm"); /** 格式 ss */ - public final SimpleDateFormat format13 = new SimpleDateFormat("ss"); + public final SimpleDateFormat format13 = new SimpleDateFormat("ss"); /** 格式 ss */ - public final SimpleDateFormat format14 = new SimpleDateFormat("yyyy-MM"); - - - public String getStartOfWeek(String dateString) throws Exception{ + public final SimpleDateFormat format14 = new SimpleDateFormat("yyyy-MM"); + + public String getStartOfWeek(String dateString) throws Exception { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); Date date = format.parse(dateString); Calendar cal = Calendar.getInstance(); @@ -513,11 +554,11 @@ public class DateOperation { if (0 == tmp) { tmp = 7; } - cal.add(Calendar.DATE, -(tmp-1)); + cal.add(Calendar.DATE, -(tmp - 1)); return getDateStringFromDate(cal.getTime(), "yyyy-MM-dd") + " 00:00:00"; } - - public String getEndOfWeek(String dateString) throws Exception{ + + public String getEndOfWeek(String dateString) throws Exception { Date date = getDateFromString(getStartOfWeek(dateString), "yyyy-MM-dd HH:mm:ss"); Calendar cal = Calendar.getInstance(); cal.setTime(date); @@ -525,113 +566,115 @@ public class DateOperation { cal.add(Calendar.DATE, 6); return getDateStringFromDate(cal.getTime(), "yyyy-MM-dd") + " 23:59:59"; } - - - + /** * 将时间格式转换为 **月**日**时**分的格式 + * * @param dateString * @param style * @return * @throws Exception */ - public String getDateCNString( String dateString, String style ) throws Exception{ + public String getDateCNString(String dateString, String style) throws Exception { StringBuffer ch_date_string = new StringBuffer(); Date _date = null; - _date = getDateFromString( dateString, style ); - if(_date == null ){ + _date = getDateFromString(dateString, style); + if (_date == null) { _date = new Date(); } - String year = getYear( _date ); - String month = getMonth( _date ); - String day = getDay( _date ); - String hour = getHour( _date ); - String min = getMinites( _date ); - ch_date_string.append( year ); - ch_date_string.append( "年" ); - ch_date_string.append( month ); - ch_date_string.append( "月" ); - ch_date_string.append( day ); - ch_date_string.append( "日" ); - ch_date_string.append( hour ); - ch_date_string.append( "时" ); - ch_date_string.append( min ); - ch_date_string.append( "分" ); + String year = getYear(_date); + String month = getMonth(_date); + String day = getDay(_date); + String hour = getHour(_date); + String min = getMinites(_date); + ch_date_string.append(year); + ch_date_string.append("年"); + ch_date_string.append(month); + ch_date_string.append("月"); + ch_date_string.append(day); + ch_date_string.append("日"); + ch_date_string.append(hour); + ch_date_string.append("时"); + ch_date_string.append(min); + ch_date_string.append("分"); return ch_date_string.toString(); } - + /** * 将时间格式转换为 **月**日**时**分**秒 的格式 + * * @param dateString * @param style * @return * @throws Exception */ - public String getDateCNString2( String dateString, String style ) throws Exception{ + public String getDateCNString2(String dateString, String style) throws Exception { StringBuffer ch_date_string = new StringBuffer(); Date _date = null; - _date = getDateFromString( dateString, style ); - if(_date == null ){ + _date = getDateFromString(dateString, style); + if (_date == null) { _date = new Date(); } - String year = getYear( _date ); - String month = getMonth( _date ); - String day = getDay( _date ); - String hour = getHour( _date ); - String min = getMinites( _date ); - String sec = getSeconds( _date ); - ch_date_string.append( year ); - ch_date_string.append( "年" ); - ch_date_string.append( month ); - ch_date_string.append( "月" ); - ch_date_string.append( day ); - ch_date_string.append( "日" ); - ch_date_string.append( hour ); - ch_date_string.append( "时" ); - ch_date_string.append( min ); - ch_date_string.append( "分" ); - ch_date_string.append( sec ); - ch_date_string.append( "秒" ); + String year = getYear(_date); + String month = getMonth(_date); + String day = getDay(_date); + String hour = getHour(_date); + String min = getMinites(_date); + String sec = getSeconds(_date); + ch_date_string.append(year); + ch_date_string.append("年"); + ch_date_string.append(month); + ch_date_string.append("月"); + ch_date_string.append(day); + ch_date_string.append("日"); + ch_date_string.append(hour); + ch_date_string.append("时"); + ch_date_string.append(min); + ch_date_string.append("分"); + ch_date_string.append(sec); + ch_date_string.append("秒"); return ch_date_string.toString(); } - + /** - * 获取日期在一年中的周数 - * 结果从1开始 + * 获取日期在一年中的周数 结果从1开始 + * * @param dateString yyyy-mm-dd * @return - * @throws Exception + * @throws Exception */ - public int getWeekNumOfYear( String dateString ) throws Exception{ - Date date = getDateFromString( dateString , "yyyy-MM-dd"); + public int getWeekNumOfYear(String dateString) throws Exception { + Date date = getDateFromString(dateString, "yyyy-MM-dd"); Calendar cal = Calendar.getInstance(); cal.setTime(date); - cal.setFirstDayOfWeek(2); //设置每周的第一天是星期一 + cal.setFirstDayOfWeek(2); // 设置每周的第一天是星期一 return cal.get(Calendar.WEEK_OF_YEAR); } - + /** * 判断是否周末 + * * @param recordDate * @return */ - public boolean isWeekend( Date recordDate ) { + public boolean isWeekend(Date recordDate) { Calendar cal = Calendar.getInstance(); - cal.setTime( recordDate ); - if(cal.get(Calendar.DAY_OF_WEEK)==Calendar.SATURDAY||cal.get(Calendar.DAY_OF_WEEK)==Calendar.SUNDAY){ - return true; - } + cal.setTime(recordDate); + if (cal.get(Calendar.DAY_OF_WEEK) == Calendar.SATURDAY || cal.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) { + return true; + } return false; } - - public long getMinutes( Date date1, Date data2){ - long l=data2.getTime()-date1.getTime(); - long min=((l/(60*1000))); - return min; + + public long getMinutes(Date date1, Date data2) { + long l = data2.getTime() - date1.getTime(); + long min = ((l / (60 * 1000))); + return min; } /** * 根据提供的年份月份，获取当月所有的日期字符串：yyyy-mm-dd + * * @param s_year * @param _month * @return @@ -642,108 +685,117 @@ public class DateOperation { int year = 0; int month = 0; int days = 0; - try{ - year = Integer.parseInt( s_year ); - }catch(Exception e){ + try { + year = Integer.parseInt(s_year); + } catch (Exception e) { e.printStackTrace(); } - try{ - month = Integer.parseInt( _month ); - }catch(Exception e){ + try { + month = Integer.parseInt(_month); + } catch (Exception e) { e.printStackTrace(); } - cal.set(year, month-1, 1); + cal.set(year, month - 1, 1); days = cal.getActualMaximum(Calendar.DATE); - for( int i =1; i<= days ; i++){ - result.add( s_year + "-" + (month<10?"0"+month:month) + "-" + (i<10?"0"+i:i)); + for (int i = 1; i <= days; i++) { + result.add(s_year + "-" + (month < 10 ? "0" + month : month) + "-" + (i < 10 ? "0" + i : i)); } return result; } - + /** * 根据提供的两个时间之间所有的日期字符串：yyyy-mm-dd + * * @param startDate * @param endDate * @return - * @throws Exception + * @throws Exception */ - public List listDateStringBetweenDate( Date startDate, Date endDate ) throws Exception { + public List listDateStringBetweenDate(Date startDate, Date endDate) throws Exception { List result = new ArrayList(); Calendar cal = Calendar.getInstance(); - startDate = getDateFromString( getDateStringFromDate( startDate, "yyyy-MM-dd") ); - endDate = getDateFromString( getDateStringFromDate( endDate, "yyyy-MM-dd") + " 23:59:59"); - cal.setTime( startDate ); - while( cal.getTime().before(endDate)){ - result.add( getDateStringFromDate( cal.getTime(), "yyyy-MM-dd")); + startDate = getDateFromString(getDateStringFromDate(startDate, "yyyy-MM-dd")); + endDate = getDateFromString(getDateStringFromDate(endDate, "yyyy-MM-dd") + " 23:59:59"); + cal.setTime(startDate); + while (cal.getTime().before(endDate)) { + result.add(getDateStringFromDate(cal.getTime(), "yyyy-MM-dd")); cal.add(Calendar.DATE, 1); } return result; } - + /** * 获取日期所在月份的第一天 + * * @param recordDate * @return - * @throws Exception + * @throws Exception */ public Date getFirstDateInMonth(Date recordDate) throws Exception { String year = format8.format(recordDate); String month = format9.format(recordDate); - return getDateFromString( year + "-" + month + "-01" ); + return getDateFromString(year + "-" + month + "-01"); } - + /** * 获取日期所在月份的第一天 + * * @param recordDate yyyy-MM-dd * @return - * @throws Exception + * @throws Exception */ public String getFirstDateStringInMonth(Date recordDate) throws Exception { String year = format8.format(recordDate); String month = format9.format(recordDate); return year + "-" + month + "-01"; } - + /** * 获取当月的最后一日 + * * @param date * @return */ - public static Date getLastDayOfMonth(Date date) { - Calendar calendar = convert(date); - //calendar.set(Calendar.DATE, calendar.getMaximum(Calendar.DATE)); + public static Date getLastDayOfMonth(Date date) { + Calendar calendar = convert(date); + // calendar.set(Calendar.DATE, calendar.getMaximum(Calendar.DATE)); calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH)); return calendar.getTime(); - } - /** - * 将日期转换为日历 - * @param date 日期 - * @return 日历 - */ - private static Calendar convert(Date date) { - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - return calendar; - } + } + + /** + * 将日期转换为日历 + * + * @param date 日期 + * @return 日历 + */ + private static Calendar convert(Date date) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + return calendar; + } + /** * 获取日期所在月份的第一天 + * * @param recordDate * @return - * @throws Exception + * @throws Exception */ public Date getLastDateInMonth(Date recordDate) throws Exception { - Date lastDate = getLastDayOfMonth( recordDate ); - return getDateFromString( getDateStringFromDate( lastDate, "yyyy-MM-dd") ); + Date lastDate = getLastDayOfMonth(recordDate); + return getDateFromString(getDateStringFromDate(lastDate, "yyyy-MM-dd")); } - + /** * 获取日期所在月份的第一天 + * * @param recordDate yyyy-MM-dd * @return - * @throws Exception + * @throws Exception */ public String getLastDateStringInMonth(Date recordDate) throws Exception { Date lastDate = getLastDayOfMonth(recordDate); - return getDateStringFromDate( lastDate, "yyyy-MM-dd"); + return getDateStringFromDate(lastDate, "yyyy-MM-dd"); } } diff --git a/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/common/excel/reader/Excel2007Reader.java b/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/common/excel/reader/Excel2007Reader.java index cb88354caa..606b4840c9 100644 --- a/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/common/excel/reader/Excel2007Reader.java +++ b/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/common/excel/reader/Excel2007Reader.java @@ -20,57 +20,64 @@ import org.xml.sax.XMLReader; import org.xml.sax.helpers.DefaultHandler; import org.xml.sax.helpers.XMLReaderFactory; +import com.x.base.core.project.logger.Logger; +import com.x.base.core.project.logger.LoggerFactory; + /** * 抽象Excel2007读取器，excel2007的底层数据结构是xml文件，采用SAX的事件驱动的方法解析 - * xml，需要继承DefaultHandler，在遇到文件内容时，事件会触发，这种做法可以大大降低 - * 内存的耗费，特别使用于大数据量的文件。 + * xml，需要继承DefaultHandler，在遇到文件内容时，事件会触发，这种做法可以大大降低 内存的耗费，特别使用于大数据量的文件。 * */ + public class Excel2007Reader extends DefaultHandler { - //共享字符串表 + + private static Logger logger = LoggerFactory.getLogger(Excel2007Reader.class); + // 共享字符串表 private SharedStringsTable sst; - //上一次的内容 + // 上一次的内容 private String lastContents; - + private boolean nextIsString; private int sheetIndex = -1; - + private List rowlist = new ArrayList(); - //当前行 + // 当前行 private int curRow = 0; - //当前列 + // 当前列 private int curCol = 0; - //日期标志 + // 日期标志 private boolean dateFlag; - //数字标志 + // 数字标志 private boolean numberFlag; - + private boolean isTElement; - + private String fileKey; private int startRow; private IRowReader rowReader; - - public void setRowReader( IRowReader rowReader, String fileKey, int startRow ){ + + public void setRowReader(IRowReader rowReader, String fileKey, int startRow) { this.rowReader = rowReader; this.fileKey = fileKey; this.startRow = startRow; } - - /**只遍历一个电子表格，其中sheetId为要遍历的sheet索引，从1开始，1-3 + + /** + * 只遍历一个电子表格，其中sheetId为要遍历的sheet索引，从1开始，1-3 + * * @param filename * @param sheetId * @throws Exception */ - public void processOneSheet(String filename,int sheetId) throws Exception { + public void processOneSheet(String filename, int sheetId) throws Exception { OPCPackage pkg = OPCPackage.open(filename); XSSFReader r = new XSSFReader(pkg); SharedStringsTable sst = r.getSharedStringsTable(); XMLReader parser = fetchSheetParser(sst); - + // 根据 rId# 或 rSheet# 查找sheet - InputStream sheet2 = r.getSheet("rId"+sheetId); + InputStream sheet2 = r.getSheet("rId" + sheetId); sheetIndex++; InputSource sheetSource = new InputSource(sheet2); parser.parse(sheetSource); @@ -79,11 +86,12 @@ public class Excel2007Reader extends DefaultHandler { /** * 遍历工作簿中所有的电子表格 + * * @param filename - * @param fileKey + * @param fileKey * @throws Exception */ - public void process( String filename ) throws Exception { + public void process(String filename) throws Exception { OPCPackage pkg = OPCPackage.open(filename); XSSFReader r = new XSSFReader(pkg); SharedStringsTable sst = r.getSharedStringsTable(); @@ -94,20 +102,21 @@ public class Excel2007Reader extends DefaultHandler { sheetIndex++; InputStream sheet = sheets.next(); InputSource sheetSource = new InputSource(sheet); - parser.parse( sheetSource ); + parser.parse(sheetSource); sheet.close(); } - //数据读取完成 + // 数据读取完成 } - + /** * 遍历工作簿中所有的电子表格 + * * @param filename - * @param fileKey + * @param fileKey * @throws Exception */ - public void process( InputStream is ) throws Exception { - OPCPackage pkg = OPCPackage.open( is ); + public void process(InputStream is) throws Exception { + OPCPackage pkg = OPCPackage.open(is); XSSFReader r = new XSSFReader(pkg); SharedStringsTable sst = r.getSharedStringsTable(); XMLReader parser = fetchSheetParser(sst); @@ -117,7 +126,7 @@ public class Excel2007Reader extends DefaultHandler { sheetIndex++; InputStream sheet = sheets.next(); InputSource sheetSource = new InputSource(sheet); - parser.parse( sheetSource ); + parser.parse(sheetSource); sheet.close(); } } @@ -130,7 +139,7 @@ public class Excel2007Reader extends DefaultHandler { } public void startElement(String uri, String localName, String name, Attributes attributes) throws SAXException { - + // c => 单元格 if ("c".equals(name)) { // 如果下一个元素是 SST 的索引，则将nextIsString标记为true @@ -140,48 +149,46 @@ public class Excel2007Reader extends DefaultHandler { } else { nextIsString = false; } - //日期格式 + // 日期格式 String cellDateType = attributes.getValue("s"); - if ("1".equals(cellDateType)){ + if ("1".equals(cellDateType)) { dateFlag = true; } else { dateFlag = false; } String cellNumberType = attributes.getValue("s"); - if("2".equals(cellNumberType)){ + if ("2".equals(cellNumberType)) { numberFlag = true; } else { numberFlag = false; } - + } - //当元素为t时 - if("t".equals(name)){ + // 当元素为t时 + if ("t".equals(name)) { isTElement = true; } else { isTElement = false; } - + // 置空 lastContents = ""; } - public void endElement(String uri, String localName, String name) - throws SAXException { - + public void endElement(String uri, String localName, String name) throws SAXException { + // 根据SST的索引值的到单元格的真正要存储的字符串 // 这时characters()方法可能会被调用多次 if (nextIsString) { try { int idx = Integer.parseInt(lastContents); - lastContents = new XSSFRichTextString(sst.getEntryAt(idx)) - .toString(); + lastContents = new XSSFRichTextString(sst.getEntryAt(idx)).toString(); } catch (Exception e) { - + logger.error(e); } - } - //t元素也包含字符串 - if(isTElement){ + } + // t元素也包含字符串 + if (isTElement) { String value = lastContents.trim(); rowlist.add(curCol, value); curCol++; @@ -190,44 +197,43 @@ public class Excel2007Reader extends DefaultHandler { // 将单元格内容加入rowlist中，在这之前先去掉字符串前后的空白符 } else if ("v".equals(name)) { String value = lastContents.trim(); - value = value.equals("")?" ":value; - //日期格式处理 - if(dateFlag){ - try{ + value = value.equals("") ? " " : value; + // 日期格式处理 + if (dateFlag) { + try { Date date = HSSFDateUtil.getJavaDate(Double.valueOf(value)); SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy"); value = dateFormat.format(date); - }catch(Exception e){ - + } catch (Exception e) { + logger.error(e); } - } - //数字类型处理 - if(numberFlag){ - try{ + } + // 数字类型处理 + if (numberFlag) { + try { BigDecimal bd = new BigDecimal(value); - value = bd.setScale(3,BigDecimal.ROUND_UP).toString(); - }catch(Exception e){ - + value = bd.setScale(3, BigDecimal.ROUND_UP).toString(); + } catch (Exception e) { + logger.error(e); } } rowlist.add(curCol, value); curCol++; - }else { - //如果标签名称为 row ，这说明已到行尾，调用 optRows() 方法 + } else { + // 如果标签名称为 row ，这说明已到行尾，调用 optRows() 方法 if (name.equals("row")) { - - rowReader.getRows(sheetIndex,curRow,rowlist, this.fileKey, this.startRow ); + + rowReader.getRows(sheetIndex, curRow, rowlist, this.fileKey, this.startRow); rowlist.clear(); curRow++; curCol = 0; } } - + } - public void characters(char[] ch, int start, int length) - throws SAXException { - //得到单元格内容的值 + public void characters(char[] ch, int start, int length) throws SAXException { + // 得到单元格内容的值 lastContents += new String(ch, start, length); } } diff --git a/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/common/excel/writer/AbstractExcel2007Writer.java b/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/common/excel/writer/AbstractExcel2007Writer.java index d531af84c0..d0806a2cd6 100644 --- a/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/common/excel/writer/AbstractExcel2007Writer.java +++ b/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/common/excel/writer/AbstractExcel2007Writer.java @@ -20,20 +20,20 @@ import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; /** - * 抽象excel2007读入器，先构建.xlsx一张模板，改写模板中的sheet.xml,使用这种方法 - * 写入.xlsx文件，不需要太大的内存 + * 抽象excel2007读入器，先构建.xlsx一张模板，改写模板中的sheet.xml,使用这种方法 写入.xlsx文件，不需要太大的内存 * */ public abstract class AbstractExcel2007Writer { - + private SpreadsheetWriter sw; /** * 写入电子表格的主要流程 + * * @param fileName * @throws Exception */ - public void process(String fileName) throws Exception{ + public void process(String fileName) throws Exception { // 建立工作簿和电子表格对象 XSSFWorkbook wb = new XSSFWorkbook(); XSSFSheet sheet = wb.createSheet("sheet1"); @@ -44,29 +44,30 @@ public abstract class AbstractExcel2007Writer { FileOutputStream os = new FileOutputStream("template.xlsx"); wb.write(os); os.close(); - + // 生成xml文件 File tmp = File.createTempFile("sheet", ".xml"); Writer fw = new FileWriter(tmp); sw = new SpreadsheetWriter(fw); generate(); fw.close(); - + // 使用产生的数据替换模板 File templateFile = new File("template.xlsx"); FileOutputStream out = new FileOutputStream(fileName); substitute(templateFile, tmp, sheetRef.substring(1), out); out.close(); - //删除文件之前调用一下垃圾回收器，否则无法删除模板文件 + // 删除文件之前调用一下垃圾回收器，否则无法删除模板文件 System.gc(); // 删除临时模板文件 - if (templateFile.isFile()&&templateFile.exists()){ + if (templateFile.isFile() && templateFile.exists()) { templateFile.delete(); } } /** * 类使用者应该使用此方法进行写操作 + * * @throws Exception */ public abstract void generate() throws Exception; @@ -99,34 +100,32 @@ public abstract class AbstractExcel2007Writer { * * @param zipfile the template file * @param tmpfile the XML file with the sheet data - * @param entry the name of the sheet entry to substitute, e.g. xl/worksheets/sheet1.xml - * @param out the stream to write the result to + * @param entry the name of the sheet entry to substitute, e.g. + * xl/worksheets/sheet1.xml + * @param out the stream to write the result to */ - private static void substitute(File zipfile, File tmpfile, String entry, - OutputStream out) throws IOException { - ZipFile zip = new ZipFile(zipfile); - ZipOutputStream zos = new ZipOutputStream(out); - - @SuppressWarnings("unchecked") - Enumeration en = (Enumeration) zip.entries(); - while (en.hasMoreElements()) { - ZipEntry ze = en.nextElement(); - if (!ze.getName().equals(entry)) { - zos.putNextEntry(new ZipEntry(ze.getName())); - InputStream is = zip.getInputStream(ze); + private static void substitute(File zipfile, File tmpfile, String entry, OutputStream out) throws IOException { + try (ZipFile zip = new ZipFile(zipfile); ZipOutputStream zos = new ZipOutputStream(out)) { + + @SuppressWarnings("unchecked") + Enumeration en = (Enumeration) zip.entries(); + while (en.hasMoreElements()) { + ZipEntry ze = en.nextElement(); + if (!ze.getName().equals(entry)) { + zos.putNextEntry(new ZipEntry(ze.getName())); + InputStream is = zip.getInputStream(ze); + copyStream(is, zos); + is.close(); + } + } + zos.putNextEntry(new ZipEntry(entry)); + try (InputStream is = new FileInputStream(tmpfile)) { copyStream(is, zos); - is.close(); } } - zos.putNextEntry(new ZipEntry(entry)); - InputStream is = new FileInputStream(tmpfile); - copyStream(is, zos); - is.close(); - zos.close(); } - private static void copyStream(InputStream in, OutputStream out) - throws IOException { + private static void copyStream(InputStream in, OutputStream out) throws IOException { byte[] chunk = new byte[1024]; int count; while ((count = in.read(chunk)) >= 0) { @@ -149,8 +148,8 @@ public abstract class AbstractExcel2007Writer { public void beginSheet() throws IOException { _out.write("" - + ""); - _out.write(""+LINE_SEPARATOR); + + ""); + _out.write("" + LINE_SEPARATOR); } public void endSheet() throws IOException { @@ -164,7 +163,7 @@ public abstract class AbstractExcel2007Writer { * @param rownum 以0开始 */ public void insertRow(int rownum) throws IOException { - _out.write(""+LINE_SEPARATOR); + _out.write("" + LINE_SEPARATOR); this._rownum = rownum; } @@ -172,37 +171,33 @@ public abstract class AbstractExcel2007Writer { * 插入行结束标志 */ public void endRow() throws IOException { - _out.write(""+LINE_SEPARATOR); + _out.write("" + LINE_SEPARATOR); } /** * 插入新列 + * * @param columnIndex * @param value * @param styleIndex * @throws IOException */ - public void createCell(int columnIndex, String value, int styleIndex) - throws IOException { - String ref = new CellReference(_rownum, columnIndex) - .formatAsString(); + public void createCell(int columnIndex, String value, int styleIndex) throws IOException { + String ref = new CellReference(_rownum, columnIndex).formatAsString(); _out.write(""); - _out.write(""+XMLEncoder.encode(value)+""); + _out.write("" + XMLEncoder.encode(value) + ""); _out.write(""); } - public void createCell(int columnIndex, String value) - throws IOException { + public void createCell(int columnIndex, String value) throws IOException { createCell(columnIndex, value, -1); } - public void createCell(int columnIndex, double value, int styleIndex) - throws IOException { - String ref = new CellReference(_rownum, columnIndex) - .formatAsString(); + public void createCell(int columnIndex, double value, int styleIndex) throws IOException { + String ref = new CellReference(_rownum, columnIndex).formatAsString(); _out.write(""); } - public void createCell(int columnIndex, double value) - throws IOException { + public void createCell(int columnIndex, double value) throws IOException { createCell(columnIndex, value, -1); } - public void createCell(int columnIndex, Calendar value, int styleIndex) - throws IOException { - createCell(columnIndex, DateUtil.getExcelDate(value, false), - styleIndex); + public void createCell(int columnIndex, Calendar value, int styleIndex) throws IOException { + createCell(columnIndex, DateUtil.getExcelDate(value, false), styleIndex); } } } \ No newline at end of file diff --git a/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/common/excel/writer/Excel2003Writer.java b/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/common/excel/writer/Excel2003Writer.java index 3788b09da2..75179b1376 100644 --- a/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/common/excel/writer/Excel2003Writer.java +++ b/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/common/excel/writer/Excel2003Writer.java @@ -18,7 +18,7 @@ public class Excel2003Writer { try{ writeExcel("tes2003.xls"); } catch (IOException e) { - + e.printStackTrace(); } } diff --git a/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/UserManagerService.java b/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/UserManagerService.java index 4083ae68e8..33a8bd0ca2 100644 --- a/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/UserManagerService.java +++ b/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/UserManagerService.java @@ -13,54 +13,52 @@ import java.util.List; /** * 用户组织顶层组织信息管理服务类 + * * @author LIYI * */ public class UserManagerService { - public List listIdentitiesWithPerson( String personName ) throws Exception { + public List listIdentitiesWithPerson(String personName) throws Exception { Business business = null; try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { business = new Business(emc); - return business.organization().identity().listWithPerson( personName ); - } catch ( Exception e ) { - throw e; + return business.organization().identity().listWithPerson(personName); } } + /** - * 根据员工获取所在组织 - * 如果用户有多个身份，则取组织级别最大的组织名称 + * 根据员工获取所在组织 如果用户有多个身份，则取组织级别最大的组织名称 + * * @param personName dn * @return unit 也是 dn - * @throws Exception + * @throws Exception */ - public String getUnitNameWithPersonName( String personName ) throws Exception{ - List unitNames = null; + public String getUnitNameWithPersonName(String personName) throws Exception { + List unitNames = null; Business business = null; Integer level = 0; String result = null; Unit unit = null; try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { business = new Business(emc); - unitNames = business.organization().unit().listWithPerson( personName ); - if( ListTools.isNotEmpty( unitNames ) ) { - for( String unitName : unitNames ) { - if( StringUtils.isNotEmpty( unitName ) && !"null".equals( unitName ) ) { - unit = business.organization().unit().getObject( unitName ); - if( level < unit.getLevel() ) { + unitNames = business.organization().unit().listWithPerson(personName); + if (ListTools.isNotEmpty(unitNames)) { + for (String unitName : unitNames) { + if (StringUtils.isNotEmpty(unitName) && !"null".equals(unitName)) { + unit = business.organization().unit().getObject(unitName); + if (level < unit.getLevel()) { level = unit.getLevel(); result = unitName; } } } } - } catch ( Exception e ) { - throw e; } return result; } - public Unit getUnitWithPersonName( String personName ) throws Exception{ + public Unit getUnitWithPersonName(String personName) throws Exception { List unitNames = null; Business business = null; Integer level = 0; @@ -68,136 +66,132 @@ public class UserManagerService { Unit unit = null; try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { business = new Business(emc); - unitNames = business.organization().unit().listWithPerson( personName ); - if( ListTools.isNotEmpty( unitNames ) ) { - for( String unitName : unitNames ) { - if( StringUtils.isNotEmpty( unitName ) && !"null".equals( unitName ) ) { - unit = business.organization().unit().getObject( unitName ); - if( level < unit.getLevel() ) { + unitNames = business.organization().unit().listWithPerson(personName); + if (ListTools.isNotEmpty(unitNames)) { + for (String unitName : unitNames) { + if (StringUtils.isNotEmpty(unitName) && !"null".equals(unitName)) { + unit = business.organization().unit().getObject(unitName); + if (level < unit.getLevel()) { level = unit.getLevel(); result = unit; } } } } - } catch ( Exception e ) { - throw e; } return unit; } - + /** * 根据身份名称获取组织名称 + * * @param identity * @return - * @throws Exception + * @throws Exception */ - public String getUnitNameWithIdentity( String identity ) throws Exception{ + public String getUnitNameWithIdentity(String identity) throws Exception { Business business = null; try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { business = new Business(emc); - if( StringUtils.equalsAnyIgnoreCase( "xadmin", identity ) || StringUtils.equalsAnyIgnoreCase( "cipher", identity ) ){ + if (StringUtils.equalsAnyIgnoreCase("xadmin", identity) + || StringUtils.equalsAnyIgnoreCase("cipher", identity)) { return null; } - return business.organization().unit().getWithIdentity( identity ); - } catch ( Exception e ) { - throw e; + return business.organization().unit().getWithIdentity(identity); } } /** * 根据身份名称获取组织名称 + * * @param identity * @return * @throws Exception */ - public Unit getUnitWithIdentity( String identity ) throws Exception{ + public Unit getUnitWithIdentity(String identity) throws Exception { Business business = null; try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { business = new Business(emc); - if( StringUtils.equalsAnyIgnoreCase( "xadmin", identity ) || StringUtils.equalsAnyIgnoreCase( "cipher", identity ) ){ + if (StringUtils.equalsAnyIgnoreCase("xadmin", identity) + || StringUtils.equalsAnyIgnoreCase("cipher", identity)) { return null; } - String name = business.organization().unit().getWithIdentity( identity ); + String name = business.organization().unit().getWithIdentity(identity); return business.organization().unit().getObject(name); - } catch ( Exception e ) { - throw e; } } - + /** * 根据身份名称获取顶层组织名称 + * * @param identity * @return - * @throws Exception + * @throws Exception */ - public String getTopUnitNameByIdentity( String identity ) throws Exception{ + public String getTopUnitNameByIdentity(String identity) throws Exception { Business business = null; try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { business = new Business(emc); - String unitName = business.organization().unit().getWithIdentityWithLevel( identity, 1 ); - if( StringUtils.isEmpty( unitName )) { + String unitName = business.organization().unit().getWithIdentityWithLevel(identity, 1); + if (StringUtils.isEmpty(unitName)) { unitName = getUnitNameWithIdentity(identity); } return unitName; - } catch ( Exception e ) { - throw e; } } - + /** * 检查组织名称是否有效 + * * @param unitName * @return - * @throws Exception + * @throws Exception */ - public String checkUnitNameExists( String unitName ) throws Exception { - if( unitName == null || unitName.isEmpty() ){ - throw new Exception( "name is null!" ); + public String checkUnitNameExists(String unitName) throws Exception { + if (unitName == null || unitName.isEmpty()) { + throw new Exception("name is null!"); } Business business = null; try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { business = new Business(emc); - return business.organization().unit().get( unitName ); - } catch ( Exception e ) { - throw e; + return business.organization().unit().get(unitName); } } - + /** * 根据员工姓名获取顶层组织名称，多个身份只取第一个身份 + * * @param personName * @return - * @throws Exception + * @throws Exception */ - public String getTopUnitNameWithPersonName( String personName ) throws Exception{ + public String getTopUnitNameWithPersonName(String personName) throws Exception { String identity = null; String topUnitName = null; Business business = null; try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { business = new Business(emc); - //兼容一下传过来的personName有可能是个人，有可能是身份 - personName = business.organization().person().get( personName ); - identity = getIdentityWithPerson( personName ); - if( StringUtils.isNotEmpty( identity ) ){ - topUnitName = business.organization().unit().getWithIdentityWithLevel( identity, 1 ); + // 兼容一下传过来的personName有可能是个人，有可能是身份 + personName = business.organization().person().get(personName); + identity = getIdentityWithPerson(personName); + if (StringUtils.isNotEmpty(identity)) { + topUnitName = business.organization().unit().getWithIdentityWithLevel(identity, 1); } - if( StringUtils.isEmpty( topUnitName )) { + if (StringUtils.isEmpty(topUnitName)) { topUnitName = getUnitNameWithIdentity(identity); } return topUnitName; - } catch ( Exception e ) { - throw e; } } + /** * 根据个人姓名获取所有身份中组织等级最高的一个身份 * * @param personName * @return - * @throws Exception + * @throws Exception */ - private String getIdentityWithPerson( String personName ) throws Exception { + private String getIdentityWithPerson(String personName) throws Exception { List identities = null; String unitName = null; Integer level = 0; @@ -206,135 +200,129 @@ public class UserManagerService { Business business = null; try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { business = new Business(emc); - //兼容一下传过来的personName有可能是个人，有可能是身份 - personName = business.organization().person().get( personName ); - identities = business.organization().identity().listWithPerson( personName ); - if( identities != null && !identities.isEmpty() ) { - for( String identity : identities ) { - unitName = business.organization().unit().getWithIdentity( identity ); - unit = business.organization().unit().getObject( unitName ); - if( level < unit.getLevel() ) { + // 兼容一下传过来的personName有可能是个人，有可能是身份 + personName = business.organization().person().get(personName); + identities = business.organization().identity().listWithPerson(personName); + if (identities != null && !identities.isEmpty()) { + for (String identity : identities) { + unitName = business.organization().unit().getWithIdentity(identity); + unit = business.organization().unit().getObject(unitName); + if (level < unit.getLevel()) { level = unit.getLevel(); resultIdentity = identity; } } } return resultIdentity; - } catch ( Exception e ) { - throw e; } } + /** * 获取上级组织名称 + * * @param unitName * @return - * @throws Exception + * @throws Exception */ - public String getParentUnitWithUnitName( String unitName ) throws Exception { + public String getParentUnitWithUnitName(String unitName) throws Exception { Unit currentUnit = null; Unit parentUnit = null; String parentUnitName = null; Business business = null; try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { business = new Business(emc); - currentUnit = business.organization().unit().getObject( unitName ); - if( currentUnit != null ) { + currentUnit = business.organization().unit().getObject(unitName); + if (currentUnit != null) { parentUnitName = currentUnit.getSuperior(); - if( StringUtils.isNotEmpty( parentUnitName ) && !"0".equals( parentUnitName ) ) { + if (StringUtils.isNotEmpty(parentUnitName) && !"0".equals(parentUnitName)) { try { - parentUnit = business.organization().unit().getObject( currentUnit.getSuperior() ); - if( parentUnit == null ) { + parentUnit = business.organization().unit().getObject(currentUnit.getSuperior()); + if (parentUnit == null) { return null; - }else { + } else { return parentUnit.getDistinguishedName(); } - }catch( NullPointerException e ) { + } catch (NullPointerException e) { } } } - } catch ( Exception e ) { - throw e; } return null; } - + /** * 根据组织名称获取顶层组织名称(递归) + * * @param unitName * @return - * @throws Exception + * @throws Exception */ - public String getTopUnitNameWithUnitName( String unitName ) throws Exception{ + public String getTopUnitNameWithUnitName(String unitName) throws Exception { Unit currentUnit = null; Unit parentUnit = null; String parentUnitName = null; Business business = null; try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { business = new Business(emc); - currentUnit = business.organization().unit().getObject( unitName ); - if( currentUnit != null ) { + currentUnit = business.organization().unit().getObject(unitName); + if (currentUnit != null) { parentUnitName = currentUnit.getSuperior(); - if( StringUtils.isNotEmpty( parentUnitName ) && !"0".equals( parentUnitName ) ) { + if (StringUtils.isNotEmpty(parentUnitName) && !"0".equals(parentUnitName)) { try { - parentUnit = business.organization().unit().getObject( parentUnitName ); - }catch( NullPointerException e ) { + parentUnit = business.organization().unit().getObject(parentUnitName); + } catch (NullPointerException e) { } } - if( parentUnit == null ) { + if (parentUnit == null) { return currentUnit.getDistinguishedName(); - }else { - return getTopUnitNameWithUnitName( parentUnit.getDistinguishedName() ); + } else { + return getTopUnitNameWithUnitName(parentUnit.getDistinguishedName()); } - }else { + } else { throw new Exception("unit is not exists:" + unitName); } - } catch ( Exception e ) { - throw e; } } - public Unit getTopUnitWithUnitName( String unitName ) throws Exception{ + public Unit getTopUnitWithUnitName(String unitName) throws Exception { Unit currentUnit = null; Unit parentUnit = null; String parentUnitName = null; Business business = null; try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { business = new Business(emc); - currentUnit = business.organization().unit().getObject( unitName ); - if( currentUnit != null ) { + currentUnit = business.organization().unit().getObject(unitName); + if (currentUnit != null) { parentUnitName = currentUnit.getSuperior(); - if( StringUtils.isNotEmpty( parentUnitName ) && !"0".equals( parentUnitName ) ) { + if (StringUtils.isNotEmpty(parentUnitName) && !"0".equals(parentUnitName)) { try { - parentUnit = business.organization().unit().getObject( parentUnitName ); - }catch( NullPointerException e ) { + parentUnit = business.organization().unit().getObject(parentUnitName); + } catch (NullPointerException e) { } } - if( parentUnit == null ) { + if (parentUnit == null) { return currentUnit; - }else { - return getTopUnitWithUnitName( parentUnit.getDistinguishedName() ); + } else { + return getTopUnitWithUnitName(parentUnit.getDistinguishedName()); } - }else { + } else { throw new Exception("unit is not exists:" + unitName); } - } catch ( Exception e ) { - throw e; } } /** * 根据上级组织名称获取所有下级组织名称列表 + * * @param parentUnitName * @return - * @throws Exception + * @throws Exception */ - public List listSubUnitNameWithParent(String parentUnitName ) throws Exception { + public List listSubUnitNameWithParent(String parentUnitName) throws Exception { Business business = null; try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { business = new Business(emc); - return business.organization().unit().listWithUnitSubNested( parentUnitName ); - } catch ( Exception e ) { - throw e; + return business.organization().unit().listWithUnitSubNested(parentUnitName); } } @@ -343,27 +331,24 @@ public class UserManagerService { try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { business = new Business(emc); return business.organization().person().listAllObject(); - } catch ( Exception e ) { - throw e; } } /** * 根据人员姓名获取人员姓名 + * * @param name * @return * @throws Exception */ - public Person getPersonObjByName( String name ) throws Exception { - if( StringUtils.isEmpty( name ) ){ - throw new Exception( "identityName is null!" ); + public Person getPersonObjByName(String name) throws Exception { + if (StringUtils.isEmpty(name)) { + throw new Exception("identityName is null!"); } Business business = null; try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { business = new Business(emc); return business.organization().person().getObject(name); - } catch ( Exception e ) { - throw e; } } @@ -382,10 +367,10 @@ public class UserManagerService { // 兼容一下传过来的perosnName有可能是个人，有可能是身份 personName = business.organization().person().get(personName); identities = business.organization().identity().listWithPerson(personName); - if (ListTools.isNotEmpty( identities )) { - if( identities.size() == 1 ) { + if (ListTools.isNotEmpty(identities)) { + if (identities.size() == 1) { return identities.get(0); - }else{ + } else { for (String identity : identities) { Identity obj = business.organization().identity().getObject(identity); if (obj.getMajor()) { @@ -396,198 +381,184 @@ public class UserManagerService { return identities.get(0); } return null; - } catch (Exception e) { - throw e; } } /** * 根据人员身份信息获取人员姓名 + * * @param identityName * @return * @throws Exception */ - public String getPersonNameByIdentity( String identityName ) throws Exception { - if( identityName == null || identityName.isEmpty() ){ - throw new Exception( "identityName is null!" ); + public String getPersonNameByIdentity(String identityName) throws Exception { + if (identityName == null || identityName.isEmpty()) { + throw new Exception("identityName is null!"); } Business business = null; try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { business = new Business(emc); - return business.organization().person().getWithIdentity( identityName ); - } catch ( Exception e ) { - throw e; + return business.organization().person().getWithIdentity(identityName); } } - + /** * 检查人员是否存在 + * * @param personName * @return * @throws Exception */ - public String checkPersonExists( String personName ) throws Exception { - if( personName == null || personName.isEmpty() ){ - throw new Exception( "personName is null!" ); + public String checkPersonExists(String personName) throws Exception { + if (personName == null || personName.isEmpty()) { + throw new Exception("personName is null!"); } Business business = null; try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { business = new Business(emc); - return business.organization().person().get( personName ); - } catch ( Exception e ) { - throw e; + return business.organization().person().get(personName); } } - + public List listUnitNamesWithPerson(String personName) throws Exception { - if( personName == null || personName.isEmpty() ){ - throw new Exception( "personName is null!" ); + if (personName == null || personName.isEmpty()) { + throw new Exception("personName is null!"); } Business business = null; try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { business = new Business(emc); - return business.organization().unit().listWithPerson( personName ); - } catch ( Exception e ) { - throw e; + return business.organization().unit().listWithPerson(personName); } } - public List listAttributeWithPersonWithName(String personName, String attributeName ) throws Exception { - if( personName == null || personName.isEmpty() ){ - throw new Exception( "personName is null!" ); + + public List listAttributeWithPersonWithName(String personName, String attributeName) throws Exception { + if (personName == null || personName.isEmpty()) { + throw new Exception("personName is null!"); } - if( attributeName == null || attributeName.isEmpty() ){ - throw new Exception( "attributeName is null!" ); + if (attributeName == null || attributeName.isEmpty()) { + throw new Exception("attributeName is null!"); } Business business = null; try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { business = new Business(emc); - return business.organization().personAttribute().listAttributeWithPersonWithName( personName, attributeName ); - } catch ( Exception e ) { - throw e; + return business.organization().personAttribute().listAttributeWithPersonWithName(personName, attributeName); } } + /** * 根据个人获取汇报对象 + * * @param personName * @return * @throws Exception */ public String getReporterWithPerson(String personName) throws Exception { - if( StringUtils.isEmpty( personName ) ){ - throw new Exception( "personName is null!" ); + if (StringUtils.isEmpty(personName)) { + throw new Exception("personName is null!"); } Person person = null; Business business = null; try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { business = new Business(emc); - person = business.organization().person().getObject( personName ); - if( person != null ) { - if( person.getSuperior() != null ) { - return business.organization().person().get( person.getSuperior() ); + person = business.organization().person().getObject(personName); + if (person != null) { + if (person.getSuperior() != null) { + return business.organization().person().get(person.getSuperior()); } } - } catch ( Exception e ) { - throw e; } return null; } - - public List getUnitDutyWithUnitWithDuty( String unitName, String dutyName ) throws Exception { - if( unitName == null || unitName.isEmpty() ){ - throw new Exception( "unitName is null!" ); + + public List getUnitDutyWithUnitWithDuty(String unitName, String dutyName) throws Exception { + if (unitName == null || unitName.isEmpty()) { + throw new Exception("unitName is null!"); } - if( dutyName == null || dutyName.isEmpty() ){ - throw new Exception( "dutyName is null!" ); + if (dutyName == null || dutyName.isEmpty()) { + throw new Exception("dutyName is null!"); } Business business = null; try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { business = new Business(emc); - return business.organization().unitDuty().listIdentityWithUnitWithName( unitName, dutyName ); - } catch ( Exception e ) { - throw e; + return business.organization().unitDuty().listIdentityWithUnitWithName(unitName, dutyName); } } - - public List getUnitDutyWithPersonWithDuty( String personName, String dutyName ) throws Exception { - if( personName == null || personName.isEmpty() ){ - throw new Exception( "personName is null!" ); + + public List getUnitDutyWithPersonWithDuty(String personName, String dutyName) throws Exception { + if (personName == null || personName.isEmpty()) { + throw new Exception("personName is null!"); } - if( dutyName == null || dutyName.isEmpty() ){ - throw new Exception( "dutyName is null!" ); + if (dutyName == null || dutyName.isEmpty()) { + throw new Exception("dutyName is null!"); } String unitName = null; Business business = null; try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { business = new Business(emc); try { - unitName = getUnitNameWithPersonName( personName ); - }catch( NullPointerException ex ) { - throw new Exception("根据个人查询组织信息发生异常。person:" + personName ); + unitName = getUnitNameWithPersonName(personName); + } catch (NullPointerException ex) { + throw new Exception("根据个人查询组织信息发生异常。person:" + personName); } - if( unitName == null || unitName.isEmpty() ) { + if (unitName == null || unitName.isEmpty()) { try { - unitName = getUnitNameWithIdentity( personName ); - }catch( NullPointerException ex ) { - throw new Exception("根据个人查询组织信息发生异常。person:" + personName ); + unitName = getUnitNameWithIdentity(personName); + } catch (NullPointerException ex) { + throw new Exception("根据个人查询组织信息发生异常。person:" + personName); } } - if( unitName == null || unitName.isEmpty() ) { + if (unitName == null || unitName.isEmpty()) { return null; - }else { + } else { try { - return business.organization().unitDuty().listIdentityWithUnitWithName( unitName, dutyName ); - }catch( NullPointerException ex ) { - throw new Exception("根据组织查询组织职位时发生异常。unitName:" + unitName + ", dutyName:" + dutyName ); + return business.organization().unitDuty().listIdentityWithUnitWithName(unitName, dutyName); + } catch (NullPointerException ex) { + throw new Exception("根据组织查询组织职位时发生异常。unitName:" + unitName + ", dutyName:" + dutyName); } } - } catch ( Exception e ) { - throw e; } } - - public List getUnitDutyWithIdentityWithDuty( String identity, String dutyName ) throws Exception { - if( identity == null || identity.isEmpty() ){ - throw new Exception( "identity is null!" ); + + public List getUnitDutyWithIdentityWithDuty(String identity, String dutyName) throws Exception { + if (identity == null || identity.isEmpty()) { + throw new Exception("identity is null!"); } - if( dutyName == null || dutyName.isEmpty() ){ - throw new Exception( "dutyName is null!" ); + if (dutyName == null || dutyName.isEmpty()) { + throw new Exception("dutyName is null!"); } String unitName = null; Business business = null; try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { business = new Business(emc); try { - unitName = getUnitNameWithIdentity( identity ); - }catch( NullPointerException ex ) { - throw new Exception("根据个人身份查询组织信息发生异常。identity:" + identity ); + unitName = getUnitNameWithIdentity(identity); + } catch (NullPointerException ex) { + throw new Exception("根据个人身份查询组织信息发生异常。identity:" + identity); } - if( unitName == null || unitName.isEmpty() ) { - throw new Exception("根据个人身份未查询到所属的组织信息。identity:" + identity ); - }else { + if (unitName == null || unitName.isEmpty()) { + throw new Exception("根据个人身份未查询到所属的组织信息。identity:" + identity); + } else { try { - return business.organization().unitDuty().listIdentityWithUnitWithName( unitName, dutyName ); - }catch( NullPointerException ex ) { - throw new Exception("根据组织查询组织职位时发生异常。unitName:" + unitName + ", dutyName:" + dutyName ); + return business.organization().unitDuty().listIdentityWithUnitWithName(unitName, dutyName); + } catch (NullPointerException ex) { + throw new Exception("根据组织查询组织职位时发生异常。unitName:" + unitName + ", dutyName:" + dutyName); } } - } catch ( Exception e ) { - throw e; } } + public String getUnitLevelNameWithName(String unitName) throws Exception { - if( unitName == null || unitName.isEmpty() ){ - throw new Exception( "unitName is null!" ); + if (unitName == null || unitName.isEmpty()) { + throw new Exception("unitName is null!"); } Unit unit = null; Business business = null; try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { business = new Business(emc); unit = business.organization().unit().getObject(unitName); - if( unit != null ) { + if (unit != null) { return unit.getLevelName(); } - } catch ( Exception e ) { - throw e; } return null; } diff --git a/o2server/x_bbs_assemble_control/src/main/java/com/x/bbs/assemble/common/date/DateOperation.java b/o2server/x_bbs_assemble_control/src/main/java/com/x/bbs/assemble/common/date/DateOperation.java index 8ac12a5cbd..c6e7cce8c3 100644 --- a/o2server/x_bbs_assemble_control/src/main/java/com/x/bbs/assemble/common/date/DateOperation.java +++ b/o2server/x_bbs_assemble_control/src/main/java/com/x/bbs/assemble/common/date/DateOperation.java @@ -10,13 +10,13 @@ import java.util.List; import com.x.base.core.project.logger.Logger; import com.x.base.core.project.logger.LoggerFactory; +public class DateOperation { + private static Logger logger = LoggerFactory.getLogger(DateOperation.class); -public class DateOperation { - - private static Logger logger = LoggerFactory.getLogger( DateOperation.class); /** * 根据样式得到格式化对象SimpleDateFormat + * * @param date * @param style * @return @@ -42,133 +42,150 @@ public class DateOperation { * @param date * @return HH:mm:ss */ - public String getTime(Date date) { + public String getTime(Date date) { return format2.format(date); } - public Date getDateFromString(String dateString, String style) throws Exception{ + public Date getDateFromString(String dateString, String style) throws Exception { Date date = null; - if(style==null||"".equals(style.trim())){ + if (style == null || "".equals(style.trim())) { date = format1.parse(dateString); - }else if( "yyyy-MM-dd HH:mm:ss".equalsIgnoreCase(style.trim())){ + } else if ("yyyy-MM-dd HH:mm:ss".equalsIgnoreCase(style.trim())) { date = format3.parse(dateString); - }else if( "yyyy-MM-dd HH:mm".equalsIgnoreCase(style.trim())){ + } else if ("yyyy-MM-dd HH:mm".equalsIgnoreCase(style.trim())) { date = format3_2.parse(dateString); - }else if( "yyyy/MM/dd HH:mm:ss".equalsIgnoreCase(style.trim())){ + } else if ("yyyy/MM/dd HH:mm:ss".equalsIgnoreCase(style.trim())) { date = format3_1.parse(dateString); - }else if( "yyyy/MM/dd".equalsIgnoreCase(style.trim())){ + } else if ("yyyy/MM/dd".equalsIgnoreCase(style.trim())) { date = format4.parse(dateString); - }else if( "yyyy-MM-dd".equalsIgnoreCase(style.trim())){ + } else if ("yyyy-MM-dd".equalsIgnoreCase(style.trim())) { date = format1.parse(dateString); - }else if( "yyyyMMdd".equalsIgnoreCase(style.trim())){ + } else if ("yyyyMMdd".equalsIgnoreCase(style.trim())) { date = format5.parse(dateString); - }else if( "yyyyMMddHHmmss".equalsIgnoreCase(style.trim())){ + } else if ("yyyyMMddHHmmss".equalsIgnoreCase(style.trim())) { date = format7.parse(dateString); - }else if( "HH:mm:ss".equalsIgnoreCase(style.trim())){ + } else if ("HH:mm:ss".equalsIgnoreCase(style.trim())) { date = format2.parse(dateString); - }else if( "HH:mm".equalsIgnoreCase(style.trim())){ + } else if ("HH:mm".equalsIgnoreCase(style.trim())) { date = format2_1.parse(dateString); - }else{ - throw new Exception( "对不起，您输入的日期style系统无法识别，请检查您的参数输入！" ); + } else { + throw new Exception("对不起，您输入的日期style系统无法识别，请检查您的参数输入！"); } return date; } - + /** - * 将字符串转换为日期格式 - * 会尝试多种格式转换，转换成功后返回结果 + * 将字符串转换为日期格式 会尝试多种格式转换，转换成功后返回结果 + * * @param dateString * @return * @throws Exception */ - public Date getDateFromString( String dateString ) throws Exception{ + public Date getDateFromString(String dateString) throws Exception { Date date = null; - try{ - date = getDateFromString( dateString, "yyyy-MM-dd HH:mm:ss" ); + try { + date = getDateFromString(dateString, "yyyy-MM-dd HH:mm:ss"); return date; - }catch(Exception e){} + } catch (Exception e) { + e.printStackTrace(); + } - try{ - date = getDateFromString( dateString, "yyyy-MM-dd HH:mm" ); + try { + date = getDateFromString(dateString, "yyyy-MM-dd HH:mm"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyy/MM/dd HH:mm:ss" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "yyyy/MM/dd HH:mm:ss"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyy-MM-dd" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "yyyy-MM-dd"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyy/MM/dd" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "yyyy/MM/dd"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyyMMdd" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "yyyyMMdd"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyyMMddHHmmss" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "yyyyMMddHHmmss"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "HH:mm:ss" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "HH:mm:ss"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "HH:mm" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "HH:mm"); return date; - }catch(Exception e){} - - throw new Exception( "the style of date has error, date:" + dateString ); + } catch (Exception e) { + e.printStackTrace(); + } + + throw new Exception("the style of date has error, date:" + dateString); } - - - public String getDateStringFromDate(Date date, String style) throws Exception{ + + public String getDateStringFromDate(Date date, String style) throws Exception { String dateString = null; - if(style==null||"".equals(style.trim())){ + if (style == null || "".equals(style.trim())) { dateString = format1.format(date); - }else if( "yyyy-MM-dd HH:mm:ss".equalsIgnoreCase(style.trim())){ + } else if ("yyyy-MM-dd HH:mm:ss".equalsIgnoreCase(style.trim())) { dateString = format3.format(date); - }else if( "yyyy/MM/dd HH:mm:ss".equalsIgnoreCase(style.trim())){ + } else if ("yyyy/MM/dd HH:mm:ss".equalsIgnoreCase(style.trim())) { dateString = format3_1.format(date); - }else if( "yyyy/MM/dd".equalsIgnoreCase(style.trim())){ + } else if ("yyyy/MM/dd".equalsIgnoreCase(style.trim())) { dateString = format4.format(date); - }else if( "yyyy-MM-dd".equalsIgnoreCase(style.trim())){ + } else if ("yyyy-MM-dd".equalsIgnoreCase(style.trim())) { dateString = format1.format(date); - }else if( "yyyyMMdd".equalsIgnoreCase(style.trim())){ + } else if ("yyyyMMdd".equalsIgnoreCase(style.trim())) { dateString = format5.format(date); - }else if( "yyyyMMddHHmmss".equalsIgnoreCase(style.trim())){ + } else if ("yyyyMMddHHmmss".equalsIgnoreCase(style.trim())) { dateString = format7.format(date); - }else if( "HH:mm:ss".equalsIgnoreCase(style.trim())){ + } else if ("HH:mm:ss".equalsIgnoreCase(style.trim())) { dateString = format2.format(date); - }else{ - throw new Exception( "对不起，您输入的日期style系统无法识别，请检查您的参数输入！style=" + style); + } else { + throw new Exception("对不起，您输入的日期style系统无法识别，请检查您的参数输入！style=" + style); } return dateString; } - + /** * 得到某日期加上或减去天数后的日期,day为负数时减去 * * @param date * @param month * @return "yyyy-MM-dd" - * @throws Exception + * @throws Exception */ - public String getDayAdd(String dateString, int day, String style) throws Exception { + public String getDayAdd(String dateString, int day, String style) throws Exception { Date date = getDateFromString(dateString, style); return getDayAdd(date, day); } - + /** * 得到某日期加上或减去天数后的日期,day为负数时减去 * @@ -176,7 +193,7 @@ public class DateOperation { * @param month * @return "yyyy-MM-dd" */ - public String getDayAdd(Date date, int day) { + public String getDayAdd(Date date, int day) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); calendar.add(Calendar.DATE, day); @@ -190,13 +207,13 @@ public class DateOperation { * @param month * @return "yyyy-MM-dd" */ - public String getMonthAdd(Date date, int month) { + public String getMonthAdd(Date date, int month) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); calendar.add(Calendar.MONTH, month); return format1.format(calendar.getTime()); } - + /** * 得到某日期加上或减去分钟后的日期,min为负数时减去 * @@ -204,54 +221,56 @@ public class DateOperation { * @param month * @return "yyyy-MM-dd HH:mi:ss" */ - public String getMinutesAdd(Date date, int min) { + public String getMinutesAdd(Date date, int min) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); calendar.add(Calendar.MINUTE, min); return format3.format(calendar.getTime()); } + /** * 得到某日期的日 * - * @param Date - * date + * @param Date date * @return */ - public String getDay(Date date) { - try{ + public String getDay(Date date) { + try { return format10.format(date); - }catch(Exception e){ + } catch (Exception e) { return "0"; } } + public int getDayNumber(Date date) { String result = null; - try{ + try { result = format10.format(date); - }catch(Exception e){ + } catch (Exception e) { result = "0"; } return Integer.parseInt(result); } + /** * 得到某日期的月份 * - * @param Date - * date + * @param Date date * @return */ - public String getMonth(Date date) { - try{ + public String getMonth(Date date) { + try { return format9.format(date); - }catch(Exception e){ + } catch (Exception e) { return "0"; } } + public int getMonthNumber(Date date) { String result = null; - try{ + try { result = format9.format(date); - }catch(Exception e){ + } catch (Exception e) { result = "0"; } return Integer.parseInt(result); @@ -260,70 +279,70 @@ public class DateOperation { /** * 得到某日期的年份 * - * @param Date - * date + * @param Date date * @return */ - public String getYear(Date date) { - try{ + public String getYear(Date date) { + try { return format8.format(date); - }catch(Exception e){ + } catch (Exception e) { return "0"; } } + public int getYearNumber(Date date) { String result = null; - try{ + try { result = format8.format(date); - }catch(Exception e){ + } catch (Exception e) { result = "0"; } return Integer.parseInt(result); } + /** * 得到某日期的小时 * - * @param Date - * date + * @param Date date * @return */ - public String getHour(Date date) { - try{ + public String getHour(Date date) { + try { return format11.format(date); - }catch(Exception e){ + } catch (Exception e) { return "0"; } } + /** * 得到某日期的分钟 * - * @param Date - * date + * @param Date date * @return */ - public String getMinites(Date date) { + public String getMinites(Date date) { return format12.format(date); } + /** * 得到某日期的秒 * - * @param Date - * date + * @param Date date * @return */ - public String getSeconds(Date date) { + public String getSeconds(Date date) { return format13.format(date); } + /** * 得到某年有多少天 * - * @param String - * date "yyyy-MM-dd" + * @param String date "yyyy-MM-dd" * @return * @throws ParseException */ @SuppressWarnings("static-access") - public int getDaysForYear(String date) throws ParseException { + public int getDaysForYear(String date) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(format1.parse(date)); return calendar.get(calendar.DAY_OF_YEAR); @@ -332,13 +351,12 @@ public class DateOperation { /** * 得到某年有多少天 * - * @param Date - * date + * @param Date date * @return * @throws ParseException */ @SuppressWarnings("static-access") - public int getDaysForYear(Date date) throws ParseException { + public int getDaysForYear(Date date) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); return calendar.get(calendar.DAY_OF_YEAR); @@ -347,13 +365,12 @@ public class DateOperation { /** * 得到某年有多少天 * - * @param String - * year "yyyy" + * @param String year "yyyy" * @return * @throws ParseException */ @SuppressWarnings("static-access") - public int getDaysForYear_YYYY(String year) throws ParseException { + public int getDaysForYear_YYYY(String year) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(format8.parse(year)); return calendar.get(calendar.DAY_OF_YEAR); @@ -362,27 +379,25 @@ public class DateOperation { /** * 得到某月有多少天 * - * @param String - * date "yyyy-MM-dd" + * @param String date "yyyy-MM-dd" * @return * @throws ParseException */ - public int getDaysForMonth(String date) throws ParseException { + public int getDaysForMonth(String date) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(format1.parse(date)); - return calendar.getActualMaximum( Calendar.DAY_OF_MONTH); + return calendar.getActualMaximum(Calendar.DAY_OF_MONTH); } /** * 得到某月有多少天 * - * @param String - * date "yyyy-MM" + * @param String date "yyyy-MM" * @return * @throws ParseException */ @SuppressWarnings("static-access") - public int getDaysForMonth_MM(String date) throws ParseException { + public int getDaysForMonth_MM(String date) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(format14.parse(date)); return calendar.get(calendar.DAY_OF_MONTH); @@ -391,12 +406,11 @@ public class DateOperation { /** * 得到某月有多少天 * - * @param Date - * date + * @param Date date * @return * @throws ParseException */ - public int getDaysForMonth(Date date) throws ParseException { + public int getDaysForMonth(Date date) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); return calendar.get(Calendar.DAY_OF_MONTH); @@ -407,7 +421,7 @@ public class DateOperation { * * @return */ - public String getNowDate() { + public String getNowDate() { return format1.format(new Date()); } @@ -416,63 +430,69 @@ public class DateOperation { * * @return */ - public String getNowTime() { + public String getNowTime() { return format2.format(new Date()); } + /** - * 得到当前的时间 - * yyyyMMddHHmmss + * 得到当前的时间 yyyyMMddHHmmss + * * @return */ - public String getNowTimeChar() { + public String getNowTimeChar() { return format7.format(new Date()); } + /** - * 得到当前的时间 - * yyyy-MM-dd HH:mm:ss + * 得到当前的时间 yyyy-MM-dd HH:mm:ss + * * @return */ - public String getNowDateTime() { + public String getNowDateTime() { return format3.format(new Date()); } + /** * 得到两个时间之前的分差 + * * @param date1 yyyy-MM-dd HH:mm:ss * @param date2 yyyy-MM-dd HH:mm:ss * @return */ - public long getDeff(String date1,String date2) { + public long getDeff(String date1, String date2) { long dayNumber = 0; // 1小时=60分钟=3600秒=3600000 long mins = 60L * 1000L; // long day= 24L * 60L * 60L * 1000L;计算天数之差 SimpleDateFormat df = null; - if(date1.length() == 19){ - df = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ); - }else if(date1.length() == 10){ - df = new SimpleDateFormat( "yyyy-MM-dd" ); - }else if(date1.length() == 8){ - df = new SimpleDateFormat( "HH:mm:ss" ); - }else{ - df = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ); + if (date1.length() == 19) { + df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + } else if (date1.length() == 10) { + df = new SimpleDateFormat("yyyy-MM-dd"); + } else if (date1.length() == 8) { + df = new SimpleDateFormat("HH:mm:ss"); + } else { + df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); } try { java.util.Date d1 = df.parse(date1); java.util.Date d2 = df.parse(date2); dayNumber = (d2.getTime() - d1.getTime()) / mins; } catch (Exception e) { - logger.warn( "系统获取得到两个时间之前的分差发生异常"); + logger.warn("系统获取得到两个时间之前的分差发生异常"); logger.error(e); } return dayNumber; } + /** * 得到两个时间之前的分差 + * * @param date1 yyyy-MM-dd HH:mm:ss * @param date2 yyyy-MM-dd HH:mm:ss * @return */ - public long getDeff(Date date1,Date date2) { + public long getDeff(Date date1, Date date2) { long dayNumber = 0; // 1小时=60分钟=3600秒=3600000 long mins = 60L * 1000L; @@ -480,76 +500,76 @@ public class DateOperation { try { dayNumber = (date2.getTime() - date1.getTime()) / mins; } catch (Exception e) { - logger.warn( "系统获取得到两个时间之前的分差发生异常"); + logger.warn("系统获取得到两个时间之前的分差发生异常"); logger.error(e); } return dayNumber; } + /** * - * 日期格式转换 - * 从YYYY-MM-DD转换到YYYYMMDD + * 日期格式转换 从YYYY-MM-DD转换到YYYYMMDD + * * @param date - * @throws ParseException + * @throws ParseException */ - public String changeDateFormat(String dateString){ + public String changeDateFormat(String dateString) { Date date; String reslut = null; try { - if( "".equals(dateString)){ - dateString="0000-00-00"; + if ("".equals(dateString)) { + dateString = "0000-00-00"; } date = format1.parse(dateString); reslut = format5.format(date); } catch (ParseException e) { try { - date = format1.parse( "0000-00-00" ); + date = format1.parse("0000-00-00"); } catch (ParseException e1) { - logger.warn( "系统日期格式转换发生异常" ); + logger.warn("系统日期格式转换发生异常"); logger.error(e); } - logger.warn( "系统日期格式转换发生异常"); + logger.warn("系统日期格式转换发生异常"); logger.error(e); } - + return reslut; } - + /** 格式 yyyy-MM-dd */ - public final SimpleDateFormat format1 = new SimpleDateFormat( "yyyy-MM-dd" ); + public final SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd"); /** 格式 HH:mm:ss */ - public final SimpleDateFormat format2 = new SimpleDateFormat( "HH:mm:ss" ); - public final SimpleDateFormat format2_1 = new SimpleDateFormat( "HH:mm" ); + public final SimpleDateFormat format2 = new SimpleDateFormat("HH:mm:ss"); + public final SimpleDateFormat format2_1 = new SimpleDateFormat("HH:mm"); /** 格式 yyyy-MM-dd HH:mm:ss */ - public final SimpleDateFormat format3 = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ); - public final SimpleDateFormat format3_2 = new SimpleDateFormat( "yyyy-MM-dd HH:mm" ); - public final SimpleDateFormat format3_1 = new SimpleDateFormat( "yyyy/MM/dd HH:mm:ss" ); + public final SimpleDateFormat format3 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public final SimpleDateFormat format3_2 = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + public final SimpleDateFormat format3_1 = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); /** 格式 yyyy/MM/dd */ - public final SimpleDateFormat format4 = new SimpleDateFormat( "yyyy/MM/dd" ); + public final SimpleDateFormat format4 = new SimpleDateFormat("yyyy/MM/dd"); /** 格式 yyyyMMdd */ - public final SimpleDateFormat format5 = new SimpleDateFormat( "yyyyMMdd" ); + public final SimpleDateFormat format5 = new SimpleDateFormat("yyyyMMdd"); /** 格式 HHmmss */ - public final SimpleDateFormat format6 = new SimpleDateFormat( "HHmmss" ); + public final SimpleDateFormat format6 = new SimpleDateFormat("HHmmss"); /** 格式 yyyyMMddHHmmss */ - public final SimpleDateFormat format7 = new SimpleDateFormat( "yyyyMMddHHmmss" ); + public final SimpleDateFormat format7 = new SimpleDateFormat("yyyyMMddHHmmss"); /** 格式 yyyy */ - public final SimpleDateFormat format8 = new SimpleDateFormat( "yyyy" ); + public final SimpleDateFormat format8 = new SimpleDateFormat("yyyy"); /** 格式 MM */ - public final SimpleDateFormat format9 = new SimpleDateFormat( "MM" ); + public final SimpleDateFormat format9 = new SimpleDateFormat("MM"); /** 格式 dd */ - public final SimpleDateFormat format10 = new SimpleDateFormat( "dd" ); + public final SimpleDateFormat format10 = new SimpleDateFormat("dd"); /** 格式 HH */ - public final SimpleDateFormat format11 = new SimpleDateFormat( "HH" ); + public final SimpleDateFormat format11 = new SimpleDateFormat("HH"); /** 格式 mm */ - public final SimpleDateFormat format12 = new SimpleDateFormat( "mm" ); + public final SimpleDateFormat format12 = new SimpleDateFormat("mm"); /** 格式 ss */ - public final SimpleDateFormat format13 = new SimpleDateFormat( "ss" ); + public final SimpleDateFormat format13 = new SimpleDateFormat("ss"); /** 格式 ss */ - public final SimpleDateFormat format14 = new SimpleDateFormat( "yyyy-MM" ); - - - public String getStartOfWeek(String dateString){ - SimpleDateFormat format = new SimpleDateFormat( "yyyy-MM-dd" ); + public final SimpleDateFormat format14 = new SimpleDateFormat("yyyy-MM"); + + public String getStartOfWeek(String dateString) { + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); try { Date date = format.parse(dateString); Calendar cal = Calendar.getInstance(); @@ -559,179 +579,181 @@ public class DateOperation { if (0 == tmp) { tmp = 7; } - cal.add(Calendar.DATE, -(tmp-1)); - return getDateStringFromDate(cal.getTime(), "yyyy-MM-dd" ) + " 00:00:00"; + cal.add(Calendar.DATE, -(tmp - 1)); + return getDateStringFromDate(cal.getTime(), "yyyy-MM-dd") + " 00:00:00"; } catch (ParseException e) { - logger.warn( "系统getStartOfWeek日期格式转换发生异常"); + logger.warn("系统getStartOfWeek日期格式转换发生异常"); logger.error(e); } catch (Exception e) { - logger.warn( "系统getStartOfWeek发生异常"); + logger.warn("系统getStartOfWeek发生异常"); logger.error(e); } return null; } - - public String getEndOfWeek(String dateString){ + + public String getEndOfWeek(String dateString) { try { - Date date = getDateFromString(getStartOfWeek(dateString), "yyyy-MM-dd HH:mm:ss" ); + Date date = getDateFromString(getStartOfWeek(dateString), "yyyy-MM-dd HH:mm:ss"); Calendar cal = Calendar.getInstance(); cal.setTime(date); cal.setFirstDayOfWeek(Calendar.MONDAY); cal.add(Calendar.DATE, 6); - return getDateStringFromDate(cal.getTime(), "yyyy-MM-dd" ) + " 23:59:59"; + return getDateStringFromDate(cal.getTime(), "yyyy-MM-dd") + " 23:59:59"; } catch (ParseException e) { - logger.warn( "系统getEndOfWeek日期格式转换发生异常"); + logger.warn("系统getEndOfWeek日期格式转换发生异常"); logger.error(e); } catch (Exception e) { - logger.warn( "系统getEndOfWeek发生异常"); + logger.warn("系统getEndOfWeek发生异常"); logger.error(e); } return null; } - - - + /** * 将时间格式转换为 **月**日**时**分的格式 + * * @param dateString * @param style * @return * @throws Exception */ - public String getDateCNString( String dateString, String style ) throws Exception{ + public String getDateCNString(String dateString, String style) throws Exception { StringBuffer ch_date_string = new StringBuffer(); Date _date = null; - try{ - _date = getDateFromString( dateString, style ); - }catch(Exception e){ - logger.warn( "系统getDateCNString日期格式转换发生异常"); + try { + _date = getDateFromString(dateString, style); + } catch (Exception e) { + logger.warn("系统getDateCNString日期格式转换发生异常"); logger.error(e); } - if(_date == null ){ + if (_date == null) { _date = new Date(); } - String year = getYear( _date ); - String month = getMonth( _date ); - String day = getDay( _date ); - String hour = getHour( _date ); - String min = getMinites( _date ); - ch_date_string.append( year ); - ch_date_string.append( "年" ); - ch_date_string.append( month ); - ch_date_string.append( "月" ); - ch_date_string.append( day ); - ch_date_string.append( "日" ); - ch_date_string.append( hour ); - ch_date_string.append( "时" ); - ch_date_string.append( min ); - ch_date_string.append( "分" ); + String year = getYear(_date); + String month = getMonth(_date); + String day = getDay(_date); + String hour = getHour(_date); + String min = getMinites(_date); + ch_date_string.append(year); + ch_date_string.append("年"); + ch_date_string.append(month); + ch_date_string.append("月"); + ch_date_string.append(day); + ch_date_string.append("日"); + ch_date_string.append(hour); + ch_date_string.append("时"); + ch_date_string.append(min); + ch_date_string.append("分"); return ch_date_string.toString(); } - + /** * 将时间格式转换为 **月**日**时**分**秒 的格式 + * * @param dateString * @param style * @return * @throws Exception */ - public String getDateCNString2( String dateString, String style ) throws Exception{ + public String getDateCNString2(String dateString, String style) throws Exception { StringBuffer ch_date_string = new StringBuffer(); Date _date = null; - try{ - _date = getDateFromString( dateString, style ); - }catch(Exception e){ - logger.warn( "系统getDateCNString2日期格式转换发生异常"); + try { + _date = getDateFromString(dateString, style); + } catch (Exception e) { + logger.warn("系统getDateCNString2日期格式转换发生异常"); logger.error(e); } - if(_date == null ){ + if (_date == null) { _date = new Date(); } - String year = getYear( _date ); - String month = getMonth( _date ); - String day = getDay( _date ); - String hour = getHour( _date ); - String min = getMinites( _date ); - String sec = getSeconds( _date ); - ch_date_string.append( year ); - ch_date_string.append( "年" ); - ch_date_string.append( month ); - ch_date_string.append( "月" ); - ch_date_string.append( day ); - ch_date_string.append( "日" ); - ch_date_string.append( hour ); - ch_date_string.append( "时" ); - ch_date_string.append( min ); - ch_date_string.append( "分" ); - ch_date_string.append( sec ); - ch_date_string.append( "秒" ); + String year = getYear(_date); + String month = getMonth(_date); + String day = getDay(_date); + String hour = getHour(_date); + String min = getMinites(_date); + String sec = getSeconds(_date); + ch_date_string.append(year); + ch_date_string.append("年"); + ch_date_string.append(month); + ch_date_string.append("月"); + ch_date_string.append(day); + ch_date_string.append("日"); + ch_date_string.append(hour); + ch_date_string.append("时"); + ch_date_string.append(min); + ch_date_string.append("分"); + ch_date_string.append(sec); + ch_date_string.append("秒"); return ch_date_string.toString(); } - + /** - * 获取日期在一年中的周数 - * 结果从1开始 + * 获取日期在一年中的周数 结果从1开始 + * * @param dateString yyyy-mm-dd * @return */ - public int getWeekNumOfYear( String dateString ){ + public int getWeekNumOfYear(String dateString) { try { - Date date = getDateFromString( dateString , "yyyy-MM-dd" ); + Date date = getDateFromString(dateString, "yyyy-MM-dd"); Calendar cal = Calendar.getInstance(); cal.setTime(date); - cal.setFirstDayOfWeek(2);//设置每周的第一天是星期一 - return cal.get( Calendar.WEEK_OF_YEAR ); + cal.setFirstDayOfWeek(2);// 设置每周的第一天是星期一 + return cal.get(Calendar.WEEK_OF_YEAR); } catch (ParseException e) { - logger.warn( "系统getWeekNumOfYear日期格式转换发生异常"); + logger.warn("系统getWeekNumOfYear日期格式转换发生异常"); logger.error(e); } catch (Exception e) { - logger.warn( "系统getWeekNumOfYear发生异常"); + logger.warn("系统getWeekNumOfYear发生异常"); logger.error(e); } return -1; } - + /** - * 获取日期在一年中的周数 - * 结果从1开始 + * 获取日期在一年中的周数 结果从1开始 + * * @param dateString yyyy-mm-dd * @return */ - public int getWeekNumOfYear( Date date ){ + public int getWeekNumOfYear(Date date) { try { Calendar cal = Calendar.getInstance(); cal.setTime(date); - cal.setFirstDayOfWeek(2);//设置每周的第一天是星期一 - return cal.get( Calendar.WEEK_OF_YEAR ); + cal.setFirstDayOfWeek(2);// 设置每周的第一天是星期一 + return cal.get(Calendar.WEEK_OF_YEAR); } catch (Exception e) { - logger.warn( "系统getWeekNumOfYear发生异常"); + logger.warn("系统getWeekNumOfYear发生异常"); logger.error(e); } return -1; } - + /** * 判断是否周末 + * * @param recordDate * @return */ public boolean isWeekend(Date date) { Calendar cal = Calendar.getInstance(); - cal.setTime( date ); - if(cal.get(Calendar.DAY_OF_WEEK)==Calendar.SATURDAY||cal.get(Calendar.DAY_OF_WEEK)==Calendar.SUNDAY){ - return true; - } + cal.setTime(date); + if (cal.get(Calendar.DAY_OF_WEEK) == Calendar.SATURDAY || cal.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) { + return true; + } return false; } - - public long getMinutes( Date date1, Date data2){ - long l=data2.getTime()-date1.getTime(); - long min=((l/(60*1000))); - return min; + + public long getMinutes(Date date1, Date data2) { + long l = data2.getTime() - date1.getTime(); + long min = ((l / (60 * 1000))); + return min; } /** * 根据提供的年份月份，获取当月所有的日期字符串：yyyy-mm-dd + * * @param s_year * @param _month * @return @@ -742,144 +764,155 @@ public class DateOperation { int year = 0; int month = 0; int days = 0; - try{ - year = Integer.parseInt( s_year ); - }catch(Exception e){ + try { + year = Integer.parseInt(s_year); + } catch (Exception e) { e.printStackTrace(); } - try{ - month = Integer.parseInt( _month ); - }catch(Exception e){ + try { + month = Integer.parseInt(_month); + } catch (Exception e) { e.printStackTrace(); } - cal.set(year, month-1, 1); + cal.set(year, month - 1, 1); days = cal.getActualMaximum(Calendar.DATE); - for( int i =1; i<= days ; i++){ - result.add( s_year + "-" + (month<10?"0"+month:month) + "-" + (i<10?"0"+i:i)); + for (int i = 1; i <= days; i++) { + result.add(s_year + "-" + (month < 10 ? "0" + month : month) + "-" + (i < 10 ? "0" + i : i)); } return result; } - + /** * 根据提供的两个时间之间所有的日期字符串：yyyy-mm-dd + * * @param startDate * @param endDate * @return - * @throws Exception + * @throws Exception */ - public List listDateStringBetweenDate( Date startDate, Date endDate ) throws Exception { + public List listDateStringBetweenDate(Date startDate, Date endDate) throws Exception { List result = new ArrayList(); Calendar cal = Calendar.getInstance(); - startDate = getDateFromString( getDateStringFromDate( startDate, "yyyy-MM-dd" ) ); - endDate = getDateFromString( getDateStringFromDate( endDate, "yyyy-MM-dd" ) + " 23:59:59" ); - cal.setTime( startDate ); - while( cal.getTime().before(endDate)){ - //logger.debug( getDateStringFromDate( cal.getTime(), "yyyy-MM-dd" ) ); - result.add( getDateStringFromDate( cal.getTime(), "yyyy-MM-dd" )); + startDate = getDateFromString(getDateStringFromDate(startDate, "yyyy-MM-dd")); + endDate = getDateFromString(getDateStringFromDate(endDate, "yyyy-MM-dd") + " 23:59:59"); + cal.setTime(startDate); + while (cal.getTime().before(endDate)) { + // logger.debug( getDateStringFromDate( cal.getTime(), "yyyy-MM-dd" ) ); + result.add(getDateStringFromDate(cal.getTime(), "yyyy-MM-dd")); cal.add(Calendar.DATE, 1); } return result; } - + /** * 获取日期所在月份的第一天 + * * @param recordDate * @return - * @throws Exception + * @throws Exception */ public Date getFirstDateInMonth(Date recordDate) throws Exception { String year = format8.format(recordDate); String month = format9.format(recordDate); - return getDateFromString( year + "-" + month + "-01" ); + return getDateFromString(year + "-" + month + "-01"); } - + /** * 获取日期所在月份的第一天 + * * @param recordDate yyyy-MM-dd * @return - * @throws Exception + * @throws Exception */ public String getFirstDateStringInMonth(Date recordDate) throws Exception { String year = format8.format(recordDate); String month = format9.format(recordDate); return year + "-" + month + "-01"; } - + /** * 获取当月的最后一日 + * * @param date * @return */ - public static Date getLastDayOfMonth(Date date) { - Calendar calendar = convert(date); - calendar.set(Calendar.DATE, calendar.getMaximum(Calendar.DATE)); - return calendar.getTime(); - } - /** - * 将日期转换为日历 - * @param date 日期 - * @return 日历 - */ - private static Calendar convert(Date date) { - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - return calendar; - } + public static Date getLastDayOfMonth(Date date) { + Calendar calendar = convert(date); + calendar.set(Calendar.DATE, calendar.getMaximum(Calendar.DATE)); + return calendar.getTime(); + } + + /** + * 将日期转换为日历 + * + * @param date 日期 + * @return 日历 + */ + private static Calendar convert(Date date) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + return calendar; + } + /** * 获取日期所在月份的第一天 + * * @param recordDate * @return - * @throws Exception + * @throws Exception */ public Date getLastDateInMonth(Date recordDate) throws Exception { Date lastDate = getLastDayOfMonth(recordDate); - return getDateFromString( getDateStringFromDate( lastDate, "yyyy-MM-dd" ) ); + return getDateFromString(getDateStringFromDate(lastDate, "yyyy-MM-dd")); } - + /** * 获取日期所在月份的第一天 + * * @param recordDate yyyy-MM-dd * @return - * @throws Exception + * @throws Exception */ public String getLastDateStringInMonth(Date recordDate) throws Exception { Date lastDate = getLastDayOfMonth(recordDate); - return getDateStringFromDate( lastDate, "yyyy-MM-dd" ); + return getDateStringFromDate(lastDate, "yyyy-MM-dd"); } /** * 获取今天开始的时间 + * * @return */ public Date getTodayStartTime() { String todayDateTime = getNowDate() + " 00:00:00"; try { - return getDateFromString( todayDateTime ); + return getDateFromString(todayDateTime); } catch (Exception e) { return new Date(); } } - + /** * 获取今天结束的时间 + * * @return */ public Date getTodayEndTime() { String todayDateTime = getNowDate() + " 23:59:59"; try { - return getDateFromString( todayDateTime ); + return getDateFromString(todayDateTime); } catch (Exception e) { return new Date(); } } - public boolean isTheSameDate( Date today, Date createTime ) { - if( today == null || createTime == null ){ + public boolean isTheSameDate(Date today, Date createTime) { + if (today == null || createTime == null) { return false; } - String date1 = getDate( today, "yyyy-MM-dd" ); - String date2 = getDate( createTime, "yyyy-MM-dd" ); - if( date1.equalsIgnoreCase( date2 )){ + String date1 = getDate(today, "yyyy-MM-dd"); + String date2 = getDate(createTime, "yyyy-MM-dd"); + if (date1.equalsIgnoreCase(date2)) { return true; } return false; diff --git a/o2server/x_calendar_assemble_control/src/main/java/com/x/calendar/assemble/control/service/Calendar_EventServiceAdv.java b/o2server/x_calendar_assemble_control/src/main/java/com/x/calendar/assemble/control/service/Calendar_EventServiceAdv.java index d7f6e8f9d7..40bf42ebc4 100644 --- a/o2server/x_calendar_assemble_control/src/main/java/com/x/calendar/assemble/control/service/Calendar_EventServiceAdv.java +++ b/o2server/x_calendar_assemble_control/src/main/java/com/x/calendar/assemble/control/service/Calendar_EventServiceAdv.java @@ -1,7 +1,6 @@ package com.x.calendar.assemble.control.service; import java.io.ByteArrayOutputStream; -import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; import java.time.Duration; @@ -9,8 +8,6 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import com.x.base.core.project.tools.StringTools; -import com.x.calendar.core.entity.Calendar_EventComment; import org.apache.commons.lang3.StringUtils; import com.x.base.core.container.EntityManagerContainer; @@ -23,12 +20,12 @@ import com.x.base.core.project.tools.ListTools; import com.x.calendar.assemble.control.Business; import com.x.calendar.common.date.DateOperation; import com.x.calendar.core.entity.Calendar_Event; +import com.x.calendar.core.entity.Calendar_EventComment; import com.x.calendar.core.entity.Calendar_EventRepeatMaster; import net.fortuna.ical4j.data.CalendarOutputter; import net.fortuna.ical4j.model.Calendar; import net.fortuna.ical4j.model.DateTime; -import net.fortuna.ical4j.model.Dur; import net.fortuna.ical4j.model.Recur; import net.fortuna.ical4j.model.TimeZone; import net.fortuna.ical4j.model.TimeZoneRegistry; @@ -828,12 +825,12 @@ public class Calendar_EventServiceAdv { * @throws ValidationException * @throws IOException */ - public void writeiCal(Calendar_Event o2_calendar_event, String path) throws ValidationException, IOException { - Calendar calendar = parseToiCal(o2_calendar_event); - FileOutputStream fout = new FileOutputStream("D://2.ics"); - CalendarOutputter outputter = new CalendarOutputter(); - outputter.output(calendar, fout); - } +// public void writeiCal(Calendar_Event o2_calendar_event, String path) throws ValidationException, IOException { +// Calendar calendar = parseToiCal(o2_calendar_event); +// FileOutputStream fout = new FileOutputStream("D://2.ics"); +// CalendarOutputter outputter = new CalendarOutputter(); +// outputter.output(calendar, fout); +// } /** * 将一个日程事件写为一个ical文件 @@ -859,9 +856,10 @@ public class Calendar_EventServiceAdv { public String getiCalContent(Calendar_Event o2_calendar_event) throws ValidationException, IOException { Calendar calendar = parseToiCal(o2_calendar_event); CalendarOutputter calendarOutputter = new CalendarOutputter(false); - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - calendarOutputter.output(calendar, baos); - return new String(baos.toByteArray(), "utf-8"); + try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) { + calendarOutputter.output(calendar, baos); + return new String(baos.toByteArray(), "utf-8"); + } } /** @@ -877,8 +875,6 @@ public class Calendar_EventServiceAdv { } try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { return calendar_EventService.listNeedAlarmEventIds(emc, date); - } catch (Exception e) { - throw e; } } @@ -957,9 +953,7 @@ public class Calendar_EventServiceAdv { } try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { return calendar_EventService.destoryWithBundle(emc, bundle); - } catch (Exception e) { - throw e; - } + } } /** @@ -975,8 +969,6 @@ public class Calendar_EventServiceAdv { } try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { return emc.find(commentId, Calendar_EventComment.class); - } catch (Exception e) { - throw e; } } } diff --git a/o2server/x_calendar_assemble_control/src/main/java/com/x/calendar/common/date/DateOperation.java b/o2server/x_calendar_assemble_control/src/main/java/com/x/calendar/common/date/DateOperation.java index 0961311e75..b349230c1f 100644 --- a/o2server/x_calendar_assemble_control/src/main/java/com/x/calendar/common/date/DateOperation.java +++ b/o2server/x_calendar_assemble_control/src/main/java/com/x/calendar/common/date/DateOperation.java @@ -12,17 +12,19 @@ import com.x.base.core.project.logger.LoggerFactory; /** * - * @包 名 ：com.land.util.date + * @包 名 ：com.land.util.date * @文件名 ：DateUtil.java - * @作 者 ：O2LEE - * @单 位 ：浙江兰德纵横网络技术有限公司 - * @日 期 ：2013-06-07 + * @作 者 ：O2LEE + * @单 位 ：浙江兰德纵横网络技术有限公司 + * @日 期 ：2013-06-07 */ public class DateOperation { - - private Logger logger = LoggerFactory.getLogger( DateOperation.class ); + + private Logger logger = LoggerFactory.getLogger(DateOperation.class); + /** * 根据样式得到格式化对象SimpleDateFormat + * * @param date * @param style * @return @@ -48,118 +50,131 @@ public class DateOperation { * @param date * @return HH:mm:ss */ - public String getTime(Date date) { + public String getTime(Date date) { return format2.format(date); } - public Date getDateFromString(String dateString, String style) throws Exception{ + public Date getDateFromString(String dateString, String style) throws Exception { Date date = null; - if(style==null||"".equals(style.trim())){ + if (style == null || "".equals(style.trim())) { date = format1.parse(dateString); - }else if("yyyy-MM-dd HH:mm:ss".equals(style.trim())){ + } else if ("yyyy-MM-dd HH:mm:ss".equals(style.trim())) { date = format3.parse(dateString); - }else if("yyyy/MM/dd HH:mm:ss".equals(style.trim())){ + } else if ("yyyy/MM/dd HH:mm:ss".equals(style.trim())) { date = format3_1.parse(dateString); - }else if("yyyy/MM/dd".equals(style.trim())){ + } else if ("yyyy/MM/dd".equals(style.trim())) { date = format4.parse(dateString); - }else if("yyyy-MM-dd".equals(style.trim())){ + } else if ("yyyy-MM-dd".equals(style.trim())) { date = format1.parse(dateString); - }else if("yyyyMMdd".equals(style.trim())){ + } else if ("yyyyMMdd".equals(style.trim())) { date = format5.parse(dateString); - }else if("yyyyMMddHHmmss".equals(style.trim())){ + } else if ("yyyyMMddHHmmss".equals(style.trim())) { date = format7.parse(dateString); - }else if("HH:mm:ss".equals(style.trim())){ + } else if ("HH:mm:ss".equals(style.trim())) { date = format2.parse(dateString); - }else{ + } else { throw new Exception("对不起，您输入的日期style系统无法识别，请检查您的参数输入！"); } return date; } - + /** - * 将字符串转换为日期格式 - * 会尝试多种格式转换，转换成功后返回结果 + * 将字符串转换为日期格式 会尝试多种格式转换，转换成功后返回结果 + * * @param dateString * @return * @throws Exception */ - public Date getDateFromString( String dateString ) throws Exception{ + public Date getDateFromString(String dateString) throws Exception { Date date = null; - try{ - date = getDateFromString( dateString, "yyyy-MM-dd HH:mm:ss" ); + try { + date = getDateFromString(dateString, "yyyy-MM-dd HH:mm:ss"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyy/MM/dd HH:mm:ss" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "yyyy/MM/dd HH:mm:ss"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyy-MM-dd" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "yyyy-MM-dd"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyy/MM/dd" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "yyyy/MM/dd"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyyMMdd" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "yyyyMMdd"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyyMMddHHmmss" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "yyyyMMddHHmmss"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "HH:mm:ss" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "HH:mm:ss"); return date; - }catch(Exception e){} + } catch (Exception e) { + e.printStackTrace(); + } return date; } - - - public String getDateFromDate(Date date, String style) throws Exception{ + + public String getDateFromDate(Date date, String style) throws Exception { String dateString = null; - if(style==null||"".equals(style.trim())){ + if (style == null || "".equals(style.trim())) { dateString = format1.format(date); - }else if("yyyy-MM-dd HH:mm:ss".equals(style.trim())){ + } else if ("yyyy-MM-dd HH:mm:ss".equals(style.trim())) { dateString = format3.format(date); - }else if("yyyy/MM/dd HH:mm:ss".equals(style.trim())){ + } else if ("yyyy/MM/dd HH:mm:ss".equals(style.trim())) { dateString = format3_1.format(date); - }else if("yyyy/MM/dd".equals(style.trim())){ + } else if ("yyyy/MM/dd".equals(style.trim())) { dateString = format4.format(date); - }else if("yyyy-MM-dd".equals(style.trim())){ + } else if ("yyyy-MM-dd".equals(style.trim())) { dateString = format1.format(date); - }else if("yyyyMMdd".equals(style.trim())){ + } else if ("yyyyMMdd".equals(style.trim())) { dateString = format5.format(date); - }else if("yyyyMMddHHmmss".equals(style.trim())){ + } else if ("yyyyMMddHHmmss".equals(style.trim())) { dateString = format7.format(date); - }else if("HH:mm:ss".equals(style.trim())){ + } else if ("HH:mm:ss".equals(style.trim())) { dateString = format2.format(date); - }else{ + } else { throw new Exception("对不起，您输入的日期style系统无法识别，请检查您的参数输入！style=" + style); } return dateString; } - + /** * 得到某日期加上或减去天数后的日期,day为负数时减去 * * @param date * @param month * @return "yyyy-MM-dd" - * @throws Exception + * @throws Exception */ - public String getDayAdd(String dateString, int day, String style) throws Exception { + public String getDayAdd(String dateString, int day, String style) throws Exception { Date date = getDateFromString(dateString, style); return getDayAdd(date, day); } - + /** * 得到某日期加上或减去天数后的日期,day为负数时减去 * @@ -167,13 +182,13 @@ public class DateOperation { * @param month * @return "yyyy-MM-dd" */ - public String getDayAdd(Date date, int day) { + public String getDayAdd(Date date, int day) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); calendar.add(Calendar.DATE, day); return format1.format(calendar.getTime()); } - + /** * 得到某日期加上或减去天数后的日期,day为负数时减去 * @@ -181,7 +196,7 @@ public class DateOperation { * @param month * @return "yyyy-MM-dd" */ - public Date getDayAddDate(Date date, int day) { + public Date getDayAddDate(Date date, int day) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); calendar.add(Calendar.DATE, day); @@ -196,9 +211,9 @@ public class DateOperation { * @return "yyyy-MM-dd" */ public String getMonthAdd(Date date, int month) { - return format1.format( getMonthAddDate( date, month ) ); + return format1.format(getMonthAddDate(date, month)); } - + /** * 得到某日期加上或减去月份后的日期,month为负数时减去 * @@ -206,13 +221,13 @@ public class DateOperation { * @param month * @return "yyyy-MM-dd" */ - public Date getMonthAddDate( Date date, int month ) { + public Date getMonthAddDate(Date date, int month) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); calendar.add(Calendar.MONTH, month); return calendar.getTime(); } - + /** * 得到某日期加上或减去分钟后的日期,min为负数时减去 * @@ -220,9 +235,10 @@ public class DateOperation { * @param month * @return "yyyy-MM-dd HH:mi:ss" */ - public String getMinutesAdd(Date date, int min) { - return format3.format(getMinutesAddDate( date, min )); + public String getMinutesAdd(Date date, int min) { + return format3.format(getMinutesAddDate(date, min)); } + /** * 得到某日期加上或减去分钟后的日期,min为负数时减去 * @@ -230,70 +246,71 @@ public class DateOperation { * @param month * @return "yyyy-MM-dd HH:mi:ss" */ - public Date getMinutesAddDate(Date date, int min) { + public Date getMinutesAddDate(Date date, int min) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); calendar.add(Calendar.MINUTE, min); return calendar.getTime(); } + /** * 得到某日期的日 * - * @param Date - * date + * @param Date date * @return */ - public String getDay(Date date) { - try{ + public String getDay(Date date) { + try { return format10.format(date); - }catch(Exception e){ + } catch (Exception e) { return "0"; } } + public int getDayNumber(Date date) { String result = null; - try{ + try { result = format10.format(date); - }catch(Exception e){ + } catch (Exception e) { result = "0"; } return Integer.parseInt(result); } + /** * 得到某日期的月份 * - * @param Date - * date + * @param Date date * @return */ - public String getMonth(Date date) { - try{ + public String getMonth(Date date) { + try { return format9.format(date); - }catch(Exception e){ + } catch (Exception e) { return "0"; } } - + /** * 得到某日期的年份-月份：yyyy-MM * * @param Date date * @return */ - public String getYearAndMonth( Date date ) { - try{ + public String getYearAndMonth(Date date) { + try { return format_year_month.format(date); - }catch(Exception e){ + } catch (Exception e) { System.out.println("date is not valid, date:" + date); return null; } } - + public int getMonthNumber(Date date) { String result = null; - try{ + try { result = format9.format(date); - }catch(Exception e){ + } catch (Exception e) { result = "0"; } return Integer.parseInt(result); @@ -302,70 +319,70 @@ public class DateOperation { /** * 得到某日期的年份 * - * @param Date - * date + * @param Date date * @return */ - public String getYear(Date date) { - try{ + public String getYear(Date date) { + try { return format8.format(date); - }catch(Exception e){ + } catch (Exception e) { return "0"; } } + public int getYearNumber(Date date) { String result = null; - try{ + try { result = format8.format(date); - }catch(Exception e){ + } catch (Exception e) { result = "0"; } return Integer.parseInt(result); } + /** * 得到某日期的小时 * - * @param Date - * date + * @param Date date * @return */ - public String getHour(Date date) { - try{ + public String getHour(Date date) { + try { return format11.format(date); - }catch(Exception e){ + } catch (Exception e) { return "0"; } } + /** * 得到某日期的分钟 * - * @param Date - * date + * @param Date date * @return */ - public String getMinites(Date date) { + public String getMinites(Date date) { return format12.format(date); } + /** * 得到某日期的秒 * - * @param Date - * date + * @param Date date * @return */ - public String getSeconds(Date date) { + public String getSeconds(Date date) { return format13.format(date); } + /** * 得到某年有多少天 * - * @param String - * date "yyyy-MM-dd" + * @param String date "yyyy-MM-dd" * @return * @throws ParseException */ @SuppressWarnings("static-access") - public int getDaysForYear(String date) throws ParseException { + public int getDaysForYear(String date) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(format1.parse(date)); return calendar.get(calendar.DAY_OF_YEAR); @@ -374,13 +391,12 @@ public class DateOperation { /** * 得到某年有多少天 * - * @param Date - * date + * @param Date date * @return * @throws ParseException */ @SuppressWarnings("static-access") - public int getDaysForYear(Date date) throws ParseException { + public int getDaysForYear(Date date) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); return calendar.get(calendar.DAY_OF_YEAR); @@ -389,13 +405,12 @@ public class DateOperation { /** * 得到某年有多少天 * - * @param String - * year "yyyy" + * @param String year "yyyy" * @return * @throws ParseException */ @SuppressWarnings("static-access") - public int getDaysForYear_YYYY(String year) throws ParseException { + public int getDaysForYear_YYYY(String year) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(format8.parse(year)); return calendar.get(calendar.DAY_OF_YEAR); @@ -404,13 +419,12 @@ public class DateOperation { /** * 得到某月有多少天 * - * @param String - * date "yyyy-MM-dd" + * @param String date "yyyy-MM-dd" * @return * @throws ParseException */ @SuppressWarnings("static-access") - public int getDaysForMonth(String date) throws ParseException { + public int getDaysForMonth(String date) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(format1.parse(date)); return calendar.get(calendar.DAY_OF_MONTH); @@ -419,13 +433,12 @@ public class DateOperation { /** * 得到某月有多少天 * - * @param String - * date "yyyy-MM" + * @param String date "yyyy-MM" * @return * @throws ParseException */ @SuppressWarnings("static-access") - public int getDaysForMonth_MM(String date) throws ParseException { + public int getDaysForMonth_MM(String date) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(format14.parse(date)); return calendar.get(calendar.DAY_OF_MONTH); @@ -434,22 +447,21 @@ public class DateOperation { /** * 得到某月有多少天 * - * @param Date - * date + * @param Date date * @return * @throws ParseException */ - public int getDaysForMonth(Date date) throws ParseException { + public int getDaysForMonth(Date date) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); return calendar.get(Calendar.DAY_OF_MONTH); } - + public int getMaxDayByYearMonth(int year, int month) { - Calendar calendar = Calendar.getInstance(); - calendar.set(Calendar.YEAR, year ); - calendar.set(Calendar.MONTH, month -1 ); - return calendar.getActualMaximum(Calendar.DATE); + Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.YEAR, year); + calendar.set(Calendar.MONTH, month - 1); + return calendar.getActualMaximum(Calendar.DATE); } /** @@ -457,7 +469,7 @@ public class DateOperation { * * @return */ - public String getNowDate() { + public String getNowDate() { return format1.format(new Date()); } @@ -466,44 +478,48 @@ public class DateOperation { * * @return */ - public String getNowTime() { + public String getNowTime() { return format2.format(new Date()); } + /** - * 得到当前的时间 - * yyyyMMddHHmmss + * 得到当前的时间 yyyyMMddHHmmss + * * @return */ - public String getNowTimeChar() { + public String getNowTimeChar() { return format7.format(new Date()); } + /** - * 得到当前的时间 - * yyyy-MM-dd HH:mm:ss + * 得到当前的时间 yyyy-MM-dd HH:mm:ss + * * @return */ - public String getNowDateTime() { + public String getNowDateTime() { return format3.format(new Date()); } + /** * 得到两个时间之前的分差 + * * @param date1 yyyy-MM-dd HH:mm:ss * @param date2 yyyy-MM-dd HH:mm:ss * @return */ - public long getDeff(String date1,String date2) { + public long getDeff(String date1, String date2) { long dayNumber = 0; // 1小时=60分钟=3600秒=3600000 long mins = 60L * 1000L; // long day= 24L * 60L * 60L * 1000L;计算天数之差 SimpleDateFormat df = null; - if(date1.length() == 19){ + if (date1.length() == 19) { df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - }else if(date1.length() == 10){ + } else if (date1.length() == 10) { df = new SimpleDateFormat("yyyy-MM-dd"); - }else if(date1.length() == 8){ + } else if (date1.length() == 8) { df = new SimpleDateFormat("HH:mm:ss"); - }else{ + } else { df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); } try { @@ -511,18 +527,20 @@ public class DateOperation { java.util.Date d2 = df.parse(date2); dayNumber = (d2.getTime() - d1.getTime()) / mins; } catch (Exception e) { - logger.warn( "系统获取得到两个时间之前的分差发生异常"); + logger.warn("系统获取得到两个时间之前的分差发生异常"); logger.error(e); } return dayNumber; } + /** * 得到两个时间之前的分差 + * * @param date1 yyyy-MM-dd HH:mm:ss * @param date2 yyyy-MM-dd HH:mm:ss * @return */ - public long getDeff(Date date1,Date date2) { + public long getDeff(Date date1, Date date2) { long dayNumber = 0; // 1小时=60分钟=3600秒=3600000 long mins = 60L * 1000L; @@ -530,24 +548,25 @@ public class DateOperation { try { dayNumber = (date2.getTime() - date1.getTime()) / mins; } catch (Exception e) { - logger.warn( "系统获取得到两个时间之前的分差发生异常" ); + logger.warn("系统获取得到两个时间之前的分差发生异常"); logger.error(e); } return dayNumber; } + /** * - * 日期格式转换 - * 从YYYY-MM-DD转换到YYYYMMDD + * 日期格式转换 从YYYY-MM-DD转换到YYYYMMDD + * * @param date - * @throws ParseException + * @throws ParseException */ - public String changeDateFormat(String dateString){ + public String changeDateFormat(String dateString) { Date date; String reslut = null; try { - if("".equals(dateString)){ - dateString="0000-00-00"; + if ("".equals(dateString)) { + dateString = "0000-00-00"; } date = format1.parse(dateString); reslut = format5.format(date); @@ -555,50 +574,49 @@ public class DateOperation { try { date = format1.parse("0000-00-00"); } catch (ParseException e1) { - logger.warn( "系统日期格式转换发生异常"); + logger.warn("系统日期格式转换发生异常"); logger.error(e); } - logger.warn( "系统日期格式转换发生异常"); + logger.warn("系统日期格式转换发生异常"); logger.error(e); } - + return reslut; } - + /** 格式 yyyy-MM-dd */ - public final SimpleDateFormat format_year_month = new SimpleDateFormat("yyyy-MM"); + public final SimpleDateFormat format_year_month = new SimpleDateFormat("yyyy-MM"); /** 格式 yyyy-MM-dd */ - public final SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd"); + public final SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd"); /** 格式 HH:mm:ss */ - public final SimpleDateFormat format2 = new SimpleDateFormat("HH:mm:ss"); + public final SimpleDateFormat format2 = new SimpleDateFormat("HH:mm:ss"); /** 格式 yyyy-MM-dd HH:mm:ss */ - public final SimpleDateFormat format3 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - public final SimpleDateFormat format3_1 = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); + public final SimpleDateFormat format3 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public final SimpleDateFormat format3_1 = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); /** 格式 yyyy/MM/dd */ - public final SimpleDateFormat format4 = new SimpleDateFormat("yyyy/MM/dd"); + public final SimpleDateFormat format4 = new SimpleDateFormat("yyyy/MM/dd"); /** 格式 yyyyMMdd */ - public final SimpleDateFormat format5 = new SimpleDateFormat("yyyyMMdd"); + public final SimpleDateFormat format5 = new SimpleDateFormat("yyyyMMdd"); /** 格式 HHmmss */ - public final SimpleDateFormat format6 = new SimpleDateFormat("HHmmss"); + public final SimpleDateFormat format6 = new SimpleDateFormat("HHmmss"); /** 格式 yyyyMMddHHmmss */ - public final SimpleDateFormat format7 = new SimpleDateFormat("yyyyMMddHHmmss"); + public final SimpleDateFormat format7 = new SimpleDateFormat("yyyyMMddHHmmss"); /** 格式 yyyy */ - public final SimpleDateFormat format8 = new SimpleDateFormat("yyyy"); + public final SimpleDateFormat format8 = new SimpleDateFormat("yyyy"); /** 格式 MM */ - public final SimpleDateFormat format9 = new SimpleDateFormat("MM"); + public final SimpleDateFormat format9 = new SimpleDateFormat("MM"); /** 格式 dd */ - public final SimpleDateFormat format10 = new SimpleDateFormat("dd"); + public final SimpleDateFormat format10 = new SimpleDateFormat("dd"); /** 格式 HH */ - public final SimpleDateFormat format11 = new SimpleDateFormat("HH"); + public final SimpleDateFormat format11 = new SimpleDateFormat("HH"); /** 格式 mm */ - public final SimpleDateFormat format12 = new SimpleDateFormat("mm"); + public final SimpleDateFormat format12 = new SimpleDateFormat("mm"); /** 格式 ss */ - public final SimpleDateFormat format13 = new SimpleDateFormat("ss"); + public final SimpleDateFormat format13 = new SimpleDateFormat("ss"); /** 格式 ss */ - public final SimpleDateFormat format14 = new SimpleDateFormat("yyyy-MM"); - - - public String getStartOfWeek(String dateString){ + public final SimpleDateFormat format14 = new SimpleDateFormat("yyyy-MM"); + + public String getStartOfWeek(String dateString) { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); try { Date date = format.parse(dateString); @@ -609,19 +627,19 @@ public class DateOperation { if (0 == tmp) { tmp = 7; } - cal.add(Calendar.DATE, -(tmp-1)); + cal.add(Calendar.DATE, -(tmp - 1)); return getDateFromDate(cal.getTime(), "yyyy-MM-dd") + " 00:00:00"; } catch (ParseException e) { - logger.warn( "系统getStartOfWeek日期格式转换发生异常"); + logger.warn("系统getStartOfWeek日期格式转换发生异常"); logger.error(e); } catch (Exception e) { - logger.warn( "系统getStartOfWeek发生异常"); + logger.warn("系统getStartOfWeek发生异常"); logger.error(e); } return null; } - - public String getEndOfWeek(String dateString){ + + public String getEndOfWeek(String dateString) { try { Date date = getDateFromString(getStartOfWeek(dateString), "yyyy-MM-dd HH:mm:ss"); Calendar cal = Calendar.getInstance(); @@ -630,185 +648,180 @@ public class DateOperation { cal.add(Calendar.DATE, 6); return getDateFromDate(cal.getTime(), "yyyy-MM-dd") + " 23:59:59"; } catch (ParseException e) { - logger.warn( "系统getEndOfWeek日期格式转换发生异常"); + logger.warn("系统getEndOfWeek日期格式转换发生异常"); logger.error(e); } catch (Exception e) { - logger.warn( "系统getEndOfWeek发生异常"); + logger.warn("系统getEndOfWeek发生异常"); logger.error(e); } return null; } - - - + /** * 将时间格式转换为 **月**日**时**分的格式 + * * @param dateString * @param style * @return * @throws Exception */ - public String getDateCNString( String dateString, String style ) throws Exception{ + public String getDateCNString(String dateString, String style) throws Exception { StringBuffer ch_date_string = new StringBuffer(); Date _date = null; - try{ - _date = getDateFromString( dateString, style ); - }catch(Exception e){ - logger.warn( "系统getDateCNString日期格式转换发生异常"); + try { + _date = getDateFromString(dateString, style); + } catch (Exception e) { + logger.warn("系统getDateCNString日期格式转换发生异常"); logger.error(e); } - if(_date == null ){ + if (_date == null) { _date = new Date(); } - String year = getYear( _date ); - String month = getMonth( _date ); - String day = getDay( _date ); - String hour = getHour( _date ); - String min = getMinites( _date ); - ch_date_string.append( year ); - ch_date_string.append( "年" ); - ch_date_string.append( month ); - ch_date_string.append( "月" ); - ch_date_string.append( day ); - ch_date_string.append( "日" ); - ch_date_string.append( hour ); - ch_date_string.append( "时" ); - ch_date_string.append( min ); - ch_date_string.append( "分" ); + String year = getYear(_date); + String month = getMonth(_date); + String day = getDay(_date); + String hour = getHour(_date); + String min = getMinites(_date); + ch_date_string.append(year); + ch_date_string.append("年"); + ch_date_string.append(month); + ch_date_string.append("月"); + ch_date_string.append(day); + ch_date_string.append("日"); + ch_date_string.append(hour); + ch_date_string.append("时"); + ch_date_string.append(min); + ch_date_string.append("分"); return ch_date_string.toString(); } - + /** * 将时间格式转换为 **月**日**时**分**秒 的格式 + * * @param dateString * @param style * @return * @throws Exception */ - public String getDateCNString2( String dateString, String style ) throws Exception{ + public String getDateCNString2(String dateString, String style) throws Exception { StringBuffer ch_date_string = new StringBuffer(); Date _date = null; - try{ - _date = getDateFromString( dateString, style ); - }catch(Exception e){ - logger.warn( "系统getDateCNString2日期格式转换发生异常"); + try { + _date = getDateFromString(dateString, style); + } catch (Exception e) { + logger.warn("系统getDateCNString2日期格式转换发生异常"); logger.error(e); } - if(_date == null ){ + if (_date == null) { _date = new Date(); } - String year = getYear( _date ); - String month = getMonth( _date ); - String day = getDay( _date ); - String hour = getHour( _date ); - String min = getMinites( _date ); - String sec = getSeconds( _date ); - ch_date_string.append( year ); - ch_date_string.append( "年" ); - ch_date_string.append( month ); - ch_date_string.append( "月" ); - ch_date_string.append( day ); - ch_date_string.append( "日" ); - ch_date_string.append( hour ); - ch_date_string.append( "时" ); - ch_date_string.append( min ); - ch_date_string.append( "分" ); - ch_date_string.append( sec ); - ch_date_string.append( "秒" ); + String year = getYear(_date); + String month = getMonth(_date); + String day = getDay(_date); + String hour = getHour(_date); + String min = getMinites(_date); + String sec = getSeconds(_date); + ch_date_string.append(year); + ch_date_string.append("年"); + ch_date_string.append(month); + ch_date_string.append("月"); + ch_date_string.append(day); + ch_date_string.append("日"); + ch_date_string.append(hour); + ch_date_string.append("时"); + ch_date_string.append(min); + ch_date_string.append("分"); + ch_date_string.append(sec); + ch_date_string.append("秒"); return ch_date_string.toString(); } - + /** - * 获取日期在一年中的周数 - * 结果从1开始 + * 获取日期在一年中的周数 结果从1开始 + * * @param dateString yyyy-mm-dd * @return */ - public int getWeekNumOfYear( String dateString ){ + public int getWeekNumOfYear(String dateString) { try { - Date date = getDateFromString( dateString , "yyyy-MM-dd"); + Date date = getDateFromString(dateString, "yyyy-MM-dd"); Calendar cal = Calendar.getInstance(); cal.setTime(date); - cal.setFirstDayOfWeek(2);//设置每周的第一天是星期一 - //月份有问题(这里的月份开始计数为0) - //本年的第几天,在计算时间间隔的时候有用 - //System.out.println("一年中的天数:" + cal.get(Calendar.DAY_OF_YEAR)); - //System.out.println("一年中的周数:" + cal.get(Calendar.WEEK_OF_YEAR)); - //即本月的第几周 - //System.out.println("一月中的周数:" + cal.get(Calendar.WEEK_OF_MONTH)); - //即一周中的第几天(这里是以周日为第一天的) - //System.out.println("一周中的天数:" + cal.get(Calendar.DAY_OF_WEEK)); + cal.setFirstDayOfWeek(2);// 设置每周的第一天是星期一 + // 月份有问题(这里的月份开始计数为0) + // 本年的第几天,在计算时间间隔的时候有用 + // System.out.println("一年中的天数:" + cal.get(Calendar.DAY_OF_YEAR)); + // System.out.println("一年中的周数:" + cal.get(Calendar.WEEK_OF_YEAR)); + // 即本月的第几周 + // System.out.println("一月中的周数:" + cal.get(Calendar.WEEK_OF_MONTH)); + // 即一周中的第几天(这里是以周日为第一天的) + // System.out.println("一周中的天数:" + cal.get(Calendar.DAY_OF_WEEK)); return cal.get(Calendar.WEEK_OF_YEAR); } catch (ParseException e) { - logger.warn( "系统getWeekNumOfYear日期格式转换发生异常"); + logger.warn("系统getWeekNumOfYear日期格式转换发生异常"); logger.error(e); } catch (Exception e) { - logger.warn( "系统getWeekNumOfYear发生异常"); + logger.warn("系统getWeekNumOfYear发生异常"); logger.error(e); } return -1; } - public Date getFirstDayInMonth( Date date ) { - int year = getYearNumber( date ); - int month = getMonthNumber( date ); + public Date getFirstDayInMonth(Date date) { + int year = getYearNumber(date); + int month = getMonthNumber(date); Calendar cal = Calendar.getInstance(); - cal.set( year, month - 1, 1 ); + cal.set(year, month - 1, 1); return cal.getTime(); } - - public Date getEndDayInMonth( Date date ) { - int year = getYearNumber( date ); - int month = getMonthNumber( date ); + + public Date getEndDayInMonth(Date date) { + int year = getYearNumber(date); + int month = getMonthNumber(date); Calendar cal = Calendar.getInstance(); - cal.set( year, month, 1 ); - cal.add(Calendar.DATE, -1); - cal.set( cal.get(Calendar.YEAR), - cal.get(Calendar.MONTH), - cal.get(Calendar.DATE), - 23, - 59, - 59 - ); + cal.set(year, month, 1); + cal.add(Calendar.DATE, -1); + cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DATE), 23, 59, 59); return cal.getTime(); } /** * 计算两个日期或者时间之间的月份列表：yyyy-MM + * * @param startTime * @param endTime * @return */ - public List listMonthsBetweenDate(Date minTime, Date maxTime) { - if( maxTime == null ) { + public List listMonthsBetweenDate(Date minTime, Date maxTime) { + if (maxTime == null) { maxTime = new Date(); } - ArrayList result = new ArrayList(); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");//格式化为年月 - Calendar min = Calendar.getInstance(); - Calendar max = Calendar.getInstance(); - - min.setTime(minTime); - min.set(min.get(Calendar.YEAR), min.get(Calendar.MONTH), 1); - - max.setTime(maxTime); - max.set(max.get(Calendar.YEAR), max.get(Calendar.MONTH), 2); - - result = addMonthToStrList( sdf.format(minTime), result ); - result = addMonthToStrList( sdf.format(maxTime), result ); - Calendar curr = min; - while (curr.before(max)) { - result = addMonthToStrList( sdf.format(curr.getTime()), result ); - curr.add(Calendar.MONTH, 1); - } + ArrayList result = new ArrayList(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");// 格式化为年月 + Calendar min = Calendar.getInstance(); + Calendar max = Calendar.getInstance(); + + min.setTime(minTime); + min.set(min.get(Calendar.YEAR), min.get(Calendar.MONTH), 1); + + max.setTime(maxTime); + max.set(max.get(Calendar.YEAR), max.get(Calendar.MONTH), 2); + + result = addMonthToStrList(sdf.format(minTime), result); + result = addMonthToStrList(sdf.format(maxTime), result); + Calendar curr = min; + while (curr.before(max)) { + result = addMonthToStrList(sdf.format(curr.getTime()), result); + curr.add(Calendar.MONTH, 1); + } return result; } private ArrayList addMonthToStrList(String monthString, ArrayList result) { - if( result == null ) { + if (result == null) { result = new ArrayList<>(); } - if( !result.contains( monthString )) { + if (!result.contains(monthString)) { result.add(monthString); } return result; @@ -816,63 +829,67 @@ public class DateOperation { /** * 根据时间获取当天的开始时间 yyyy-MM-dd 00:00:00 + * * @param startTime * @return - * @throws Exception + * @throws Exception */ public Date getBeginTimeInDay(Date startTime) throws Exception { - if( startTime == null ) { + if (startTime == null) { startTime = new Date(); } - return getDateFromString(format1.format( startTime ) + " 00:00:00"); + return getDateFromString(format1.format(startTime) + " 00:00:00"); } - + /** * 根据时间获取当天的开始时间 yyyy-MM-dd 00:00:00 + * * @param startTime * @return - * @throws Exception + * @throws Exception */ public Date getEndTimeInDay(Date endTime) throws Exception { - if( endTime == null ) { + if (endTime == null) { endTime = new Date(); } - return getDateFromString(format1.format( endTime ) + " 23:59:59"); + return getDateFromString(format1.format(endTime) + " 23:59:59"); } /** * 计算两个时间之间涉及的日期列表 + * * @param startTime * @param endTime * @return */ public List listDaysBetweenDate(Date startTime, Date endTime) { - if( endTime == null ) { + if (endTime == null) { endTime = new Date(); } - ArrayList result = new ArrayList(); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");//格式化为年月日 - Calendar min = Calendar.getInstance(); - Calendar max = Calendar.getInstance(); - - min.setTime(startTime); - min.set(min.get(Calendar.YEAR), min.get(Calendar.MONTH), min.get( Calendar.DATE) ); - - max.setTime(endTime); - max.set(max.get(Calendar.YEAR), max.get(Calendar.MONTH), max.get( Calendar.DATE)); - - result = addMonthToStrList( sdf.format(startTime), result ); - result = addMonthToStrList( sdf.format(endTime), result ); - Calendar curr = min; - while (curr.before(max)) { - result = addMonthToStrList( sdf.format(curr.getTime()), result ); - curr.add(Calendar.DATE, 1); - } + ArrayList result = new ArrayList(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");// 格式化为年月日 + Calendar min = Calendar.getInstance(); + Calendar max = Calendar.getInstance(); + + min.setTime(startTime); + min.set(min.get(Calendar.YEAR), min.get(Calendar.MONTH), min.get(Calendar.DATE)); + + max.setTime(endTime); + max.set(max.get(Calendar.YEAR), max.get(Calendar.MONTH), max.get(Calendar.DATE)); + + result = addMonthToStrList(sdf.format(startTime), result); + result = addMonthToStrList(sdf.format(endTime), result); + Calendar curr = min; + while (curr.before(max)) { + result = addMonthToStrList(sdf.format(curr.getTime()), result); + curr.add(Calendar.DATE, 1); + } return result; } /** * 根据开始时间，和需要变动的时间来生成一个新的时间 + * * @param startTime * @param day * @param hour @@ -882,18 +899,17 @@ public class DateOperation { */ public Date caculateNewDate(Date startTime, int day, int hour, int min, int sec) { Calendar cal = Calendar.getInstance(); - cal.setTime( startTime ); - cal.add( Calendar.DATE, day ); - cal.add( Calendar.HOUR, hour ); - cal.add( Calendar.MINUTE, min ); - cal.add( Calendar.SECOND, sec ); + cal.setTime(startTime); + cal.add(Calendar.DATE, day); + cal.add(Calendar.HOUR, hour); + cal.add(Calendar.MINUTE, min); + cal.add(Calendar.SECOND, sec); return cal.getTime(); } - - public static void main(String[] args) throws Exception{ + public static void main(String[] args) throws Exception { DateOperation dateOperation = new DateOperation(); - Date time = dateOperation.caculateNewDate(dateOperation.getDateFromString("2018-05-19 08:00:00"), 0,0,-15,0); - System.out.println( time ); + Date time = dateOperation.caculateNewDate(dateOperation.getDateFromString("2018-05-19 08:00:00"), 0, 0, -15, 0); + System.out.println(time); } } diff --git a/o2server/x_calendar_assemble_control/src/main/java/com/x/calendar/common/excel/writer/AbstractExcel2007Writer.java b/o2server/x_calendar_assemble_control/src/main/java/com/x/calendar/common/excel/writer/AbstractExcel2007Writer.java index 6b7f596fa3..cc98fdb133 100644 --- a/o2server/x_calendar_assemble_control/src/main/java/com/x/calendar/common/excel/writer/AbstractExcel2007Writer.java +++ b/o2server/x_calendar_assemble_control/src/main/java/com/x/calendar/common/excel/writer/AbstractExcel2007Writer.java @@ -20,91 +20,93 @@ import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; /** - * 抽象excel2007读入器，先构建.xlsx一张模板，改写模板中的sheet.xml,使用这种方法 - * 写入.xlsx文件，不需要太大的内存 + * 抽象excel2007读入器，先构建.xlsx一张模板，改写模板中的sheet.xml,使用这种方法 写入.xlsx文件，不需要太大的内存 * */ public abstract class AbstractExcel2007Writer { - + private SpreadsheetWriter sw; /** * 写入电子表格的主要流程 + * * @param fileName * @throws Exception */ @SuppressWarnings("resource") - public void process( String fileName ) throws Exception{ + public void process(String fileName) throws Exception { // 建立工作簿和电子表格对象 XSSFWorkbook wb = new XSSFWorkbook(); - XSSFSheet sheet = wb.createSheet( "sheet1" ); + XSSFSheet sheet = wb.createSheet("sheet1"); // 持有电子表格数据的xml文件名 例如 /xl/worksheets/sheet1.xml String sheetRef = sheet.getPackagePart().getPartName().getName(); // 保存模板 - FileOutputStream os = new FileOutputStream( "template.xlsx" ); + FileOutputStream os = new FileOutputStream("template.xlsx"); wb.write(os); os.close(); - + // 生成xml文件 - File tmp = File.createTempFile( "sheet", ".xml" ); + File tmp = File.createTempFile("sheet", ".xml"); Writer fw = new FileWriter(tmp); sw = new SpreadsheetWriter(fw); generate(); fw.close(); - + // 使用产生的数据替换模板 - File templateFile = new File( "template.xlsx" ); + File templateFile = new File("template.xlsx"); FileOutputStream out = new FileOutputStream(fileName); substitute(templateFile, tmp, sheetRef.substring(1), out); out.close(); - //删除文件之前调用一下垃圾回收器，否则无法删除模板文件 + // 删除文件之前调用一下垃圾回收器，否则无法删除模板文件 System.gc(); // 删除临时模板文件 - if (templateFile.isFile()&&templateFile.exists()){ + if (templateFile.isFile() && templateFile.exists()) { templateFile.delete(); } } - + /** * 写入电子表格的主要流程 + * * @param fileName * @throws Exception */ @SuppressWarnings("resource") - public void process( OutputStream out ) throws Exception{ + public void process(OutputStream out) throws Exception { // 建立工作簿和电子表格对象 XSSFWorkbook wb = new XSSFWorkbook(); - XSSFSheet sheet = wb.createSheet( "sheet1" ); + XSSFSheet sheet = wb.createSheet("sheet1"); // 持有电子表格数据的xml文件名 例如 /xl/worksheets/sheet1.xml String sheetRef = sheet.getPackagePart().getPartName().getName(); // 保存模板 - FileOutputStream os = new FileOutputStream( "template.xlsx" ); + FileOutputStream os = new FileOutputStream("template.xlsx"); wb.write(os); os.close(); - + // 生成xml文件 - File tmp = File.createTempFile( "sheet", ".xml" ); + File tmp = File.createTempFile("sheet", ".xml"); Writer fw = new FileWriter(tmp); sw = new SpreadsheetWriter(fw); generate(); fw.close(); - + // 使用产生的数据替换模板 - File templateFile = new File( "template.xlsx" ); + File templateFile = new File("template.xlsx"); substitute(templateFile, tmp, sheetRef.substring(1), out); out.close(); - //删除文件之前调用一下垃圾回收器，否则无法删除模板文件 + // 删除文件之前调用一下垃圾回收器，否则无法删除模板文件 System.gc(); // 删除临时模板文件 - if (templateFile.isFile()&&templateFile.exists()){ + if (templateFile.isFile() && templateFile.exists()) { templateFile.delete(); } } /** * 类使用者应该使用此方法进行写操作 + * * @throws Exception */ public abstract void generate() throws Exception; @@ -137,35 +139,32 @@ public abstract class AbstractExcel2007Writer { * * @param zipfile the template file * @param tmpfile the XML file with the sheet data - * @param entry the name of the sheet entry to substitute, e.g. xl/worksheets/sheet1.xml - * @param out the stream to write the result to + * @param entry the name of the sheet entry to substitute, e.g. + * xl/worksheets/sheet1.xml + * @param out the stream to write the result to */ @SuppressWarnings("resource") - private static void substitute(File zipfile, File tmpfile, String entry, - OutputStream out) throws IOException { - ZipFile zip = new ZipFile(zipfile); - ZipOutputStream zos = new ZipOutputStream(out); - - @SuppressWarnings( "unchecked" ) - Enumeration en = (Enumeration) zip.entries(); - while (en.hasMoreElements()) { - ZipEntry ze = en.nextElement(); - if (!ze.getName().equals(entry)) { - zos.putNextEntry(new ZipEntry(ze.getName())); - InputStream is = zip.getInputStream(ze); + private static void substitute(File zipfile, File tmpfile, String entry, OutputStream out) throws IOException { + try (ZipFile zip = new ZipFile(zipfile); ZipOutputStream zos = new ZipOutputStream(out)) { + @SuppressWarnings("unchecked") + Enumeration en = (Enumeration) zip.entries(); + while (en.hasMoreElements()) { + ZipEntry ze = en.nextElement(); + if (!ze.getName().equals(entry)) { + zos.putNextEntry(new ZipEntry(ze.getName())); + InputStream is = zip.getInputStream(ze); + copyStream(is, zos); + is.close(); + } + } + zos.putNextEntry(new ZipEntry(entry)); + try (InputStream is = new FileInputStream(tmpfile)) { copyStream(is, zos); - is.close(); } } - zos.putNextEntry(new ZipEntry(entry)); - InputStream is = new FileInputStream(tmpfile); - copyStream(is, zos); - is.close(); - zos.close(); } - private static void copyStream(InputStream in, OutputStream out) - throws IOException { + private static void copyStream(InputStream in, OutputStream out) throws IOException { byte[] chunk = new byte[1024]; int count; while ((count = in.read(chunk)) >= 0) { @@ -180,21 +179,21 @@ public abstract class AbstractExcel2007Writer { public static class SpreadsheetWriter { private final Writer _out; private int _rownum; - private static String LINE_SEPARATOR = System.getProperty( "line.separator" ); + private static String LINE_SEPARATOR = System.getProperty("line.separator"); public SpreadsheetWriter(Writer out) { _out = out; } public void beginSheet() throws IOException { - _out.write( "" - + "" ); - _out.write( ""+LINE_SEPARATOR); + _out.write("" + + ""); + _out.write("" + LINE_SEPARATOR); } public void endSheet() throws IOException { - _out.write( "" ); - _out.write( "" ); + _out.write(""); + _out.write(""); } /** @@ -203,7 +202,7 @@ public abstract class AbstractExcel2007Writer { * @param rownum 以0开始 */ public void insertRow(int rownum) throws IOException { - _out.write( ""+LINE_SEPARATOR); + _out.write("" + LINE_SEPARATOR); this._rownum = rownum; } @@ -211,54 +210,47 @@ public abstract class AbstractExcel2007Writer { * 插入行结束标志 */ public void endRow() throws IOException { - _out.write( ""+LINE_SEPARATOR); + _out.write("" + LINE_SEPARATOR); } /** * 插入新列 + * * @param columnIndex * @param value * @param styleIndex * @throws IOException */ - public void createCell(int columnIndex, String value, int styleIndex) - throws IOException { - String ref = new CellReference(_rownum, columnIndex) - .formatAsString(); - _out.write( "" ); - _out.write( ""+XMLEncoder.encode(value)+"" ); - _out.write( "" ); + _out.write(" s=\"" + styleIndex + "\""); + _out.write(">"); + _out.write("" + XMLEncoder.encode(value) + ""); + _out.write(""); } - public void createCell(int columnIndex, String value) - throws IOException { + public void createCell(int columnIndex, String value) throws IOException { createCell(columnIndex, value, -1); } - public void createCell(int columnIndex, double value, int styleIndex) - throws IOException { - String ref = new CellReference(_rownum, columnIndex) - .formatAsString(); - _out.write( "" ); - _out.write( "" + value + "" ); - _out.write( "" ); + _out.write(" s=\"" + styleIndex + "\""); + _out.write(">"); + _out.write("" + value + ""); + _out.write(""); } - public void createCell(int columnIndex, double value) - throws IOException { + public void createCell(int columnIndex, double value) throws IOException { createCell(columnIndex, value, -1); } - public void createCell(int columnIndex, Calendar value, int styleIndex) - throws IOException { - createCell(columnIndex, DateUtil.getExcelDate(value, false), - styleIndex); + public void createCell(int columnIndex, Calendar value, int styleIndex) throws IOException { + createCell(columnIndex, DateUtil.getExcelDate(value, false), styleIndex); } } } \ No newline at end of file diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdictdesign/ActionListPaging.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdictdesign/ActionListPaging.java index e1435cd849..aabf35668d 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdictdesign/ActionListPaging.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdictdesign/ActionListPaging.java @@ -27,16 +27,18 @@ class ActionListPaging extends BaseAction { ActionResult> result = new ActionResult<>(); EntityManager em = emc.get(AppDict.class); CriteriaBuilder cb = em.getCriteriaBuilder(); - Predicate p = cb.conjunction();; + Predicate p = cb.conjunction(); + ; List wos = emc.fetchDescPaging(AppDict.class, Wo.copier, p, page, size, AppDict.sequence_FIELDNAME); wos.stream().forEach(wo -> { try { - AppInfo appInfo = emc.find( wo.getAppId(), AppInfo.class ); - if(appInfo != null){ + AppInfo appInfo = emc.find(wo.getAppId(), AppInfo.class); + if (appInfo != null) { wo.setAppName(appInfo.getAppName()); wo.setAppAlias(appInfo.getAppAlias()); } } catch (Exception e) { + logger.error(e); } }); result.setData(wos); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/ActionListPaging.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/ActionListPaging.java index f6fa74a12f..2e86ee4878 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/ActionListPaging.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/ActionListPaging.java @@ -1,5 +1,11 @@ package com.x.cms.assemble.control.jaxrs.script; +import java.util.List; + +import javax.persistence.EntityManager; +import javax.persistence.criteria.CriteriaBuilder; +import javax.persistence.criteria.Predicate; + import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.entity.JpaObject; @@ -8,16 +14,16 @@ import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; +import com.x.base.core.project.logger.Logger; +import com.x.base.core.project.logger.LoggerFactory; import com.x.base.core.project.tools.ListTools; import com.x.cms.core.entity.AppInfo; import com.x.cms.core.entity.element.Script; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.Predicate; -import java.util.List; - class ActionListPaging extends BaseAction { + + private static Logger logger = LoggerFactory.getLogger(ActionListPaging.class); + ActionResult> execute(EffectivePerson effectivePerson, Integer page, Integer size) throws Exception { try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { ActionResult> result = new ActionResult<>(); @@ -27,11 +33,12 @@ class ActionListPaging extends BaseAction { List wos = emc.fetchDescPaging(Script.class, Wo.copier, p, page, size, Script.sequence_FIELDNAME); wos.stream().forEach(wo -> { try { - AppInfo appInfo = emc.find( wo.getAppId(), AppInfo.class ); - if(appInfo != null){ + AppInfo appInfo = emc.find(wo.getAppId(), AppInfo.class); + if (appInfo != null) { wo.setAppName(appInfo.getAppName()); } } catch (Exception e) { + logger.error(e); } }); result.setData(wos); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/queue/QueueDocumentUpdate.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/queue/QueueDocumentUpdate.java index beabe1b608..e860938c8f 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/queue/QueueDocumentUpdate.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/queue/QueueDocumentUpdate.java @@ -2,6 +2,8 @@ package com.x.cms.assemble.control.queue; import com.x.base.core.project.x_hotpic_assemble_control; import com.x.base.core.project.annotation.FieldDescribe; +import com.x.base.core.project.logger.Logger; +import com.x.base.core.project.logger.LoggerFactory; import com.x.base.core.project.queue.AbstractQueue; import com.x.cms.assemble.control.ThisApplication; import com.x.cms.core.entity.Document; @@ -11,23 +13,24 @@ import com.x.cms.core.entity.Document; * */ public class QueueDocumentUpdate extends AbstractQueue { - - public void execute( Document document ) throws Exception { + + private static Logger logger = LoggerFactory.getLogger(QueueDocumentUpdate.class); + + public void execute(Document document) throws Exception { WrapInHotPictureInfo hotPictureInfo = new WrapInHotPictureInfo(); - hotPictureInfo.setApplication( "CMS" ); - hotPictureInfo.setTitle( document.getTitle() ); - hotPictureInfo.setInfoId( document.getId() ); + hotPictureInfo.setApplication("CMS"); + hotPictureInfo.setTitle(document.getTitle()); + hotPictureInfo.setInfoId(document.getId()); try { - ThisApplication.context().applications().postQuery( - x_hotpic_assemble_control.class, "changeTitle", hotPictureInfo - ); - }catch( Exception e ) { + ThisApplication.context().applications().postQuery(x_hotpic_assemble_control.class, "changeTitle", + hotPictureInfo); + } catch (Exception e) { + logger.error(e); } } - - - public static class WrapInHotPictureInfo{ - + + public static class WrapInHotPictureInfo { + @FieldDescribe("应用名称") private String application = ""; diff --git a/o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/FileUtil.java b/o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/FileUtil.java index 25ff1d6552..075acdc5fc 100644 --- a/o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/FileUtil.java +++ b/o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/FileUtil.java @@ -91,6 +91,7 @@ public class FileUtil { try { is.close(); } catch (IOException e) { + e.printStackTrace(); } } } @@ -119,6 +120,7 @@ public class FileUtil { try { is.close(); } catch (IOException e) { + e.printStackTrace(); } } } diff --git a/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/worktime/DateOperation.java b/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/worktime/DateOperation.java index 9b841d3f9a..ca3c52b80b 100644 --- a/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/worktime/DateOperation.java +++ b/o2server/x_general_assemble_control/src/main/java/com/x/general/assemble/control/jaxrs/worktime/DateOperation.java @@ -7,10 +7,10 @@ import java.util.Calendar; import java.util.Date; import java.util.List; - public class DateOperation { /** * 根据样式得到格式化对象SimpleDateFormat + * * @param date * @param style * @return @@ -36,115 +36,132 @@ public class DateOperation { * @param date * @return HH:mm:ss */ - public String getTime(Date date) { + public String getTime(Date date) { return format2.format(date); } - public Date getDateFromString(String dateString, String style) throws Exception{ + public Date getDateFromString(String dateString, String style) throws Exception { Date date = null; - if(style==null||"".equals(style.trim())){ + if (style == null || "".equals(style.trim())) { date = format1.parse(dateString); - }else if("yyyy-MM-dd HH:mm:ss".equalsIgnoreCase(style.trim())){ + } else if ("yyyy-MM-dd HH:mm:ss".equalsIgnoreCase(style.trim())) { date = format3.parse(dateString); - }else if("yyyy-MM-dd HH:mm".equalsIgnoreCase(style.trim())){ + } else if ("yyyy-MM-dd HH:mm".equalsIgnoreCase(style.trim())) { date = format3_2.parse(dateString); - }else if("yyyy/MM/dd HH:mm:ss".equalsIgnoreCase(style.trim())){ + } else if ("yyyy/MM/dd HH:mm:ss".equalsIgnoreCase(style.trim())) { date = format3_1.parse(dateString); - }else if("yyyy/MM/dd".equalsIgnoreCase(style.trim())){ + } else if ("yyyy/MM/dd".equalsIgnoreCase(style.trim())) { date = format4.parse(dateString); - }else if("yyyy-MM-dd".equalsIgnoreCase(style.trim())){ + } else if ("yyyy-MM-dd".equalsIgnoreCase(style.trim())) { date = format1.parse(dateString); - }else if("yyyyMMdd".equalsIgnoreCase(style.trim())){ + } else if ("yyyyMMdd".equalsIgnoreCase(style.trim())) { date = format5.parse(dateString); - }else if("yyyyMMddHHmmss".equalsIgnoreCase(style.trim())){ + } else if ("yyyyMMddHHmmss".equalsIgnoreCase(style.trim())) { date = format7.parse(dateString); - }else if("HH:mm:ss".equalsIgnoreCase(style.trim())){ + } else if ("HH:mm:ss".equalsIgnoreCase(style.trim())) { date = format2.parse(dateString); - }else if("HH:mm".equalsIgnoreCase(style.trim())){ + } else if ("HH:mm".equalsIgnoreCase(style.trim())) { date = format2_1.parse(dateString); - }else{ + } else { throw new Exception("对不起，您输入的日期style系统无法识别，请检查您的参数输入！"); } return date; } - + /** - * 将字符串转换为日期格式 - * 会尝试多种格式转换，转换成功后返回结果 + * 将字符串转换为日期格式 会尝试多种格式转换，转换成功后返回结果 + * * @param dateString * @return * @throws Exception */ - public Date getDateFromString( String dateString ) throws Exception{ + public Date getDateFromString(String dateString) throws Exception { Date date = null; - try{ - date = getDateFromString( dateString, "yyyy-MM-dd HH:mm:ss" ); + try { + date = getDateFromString(dateString, "yyyy-MM-dd HH:mm:ss"); return date; - }catch(Exception e){} + } catch (Exception e) { + e.printStackTrace(); + } - try{ - date = getDateFromString( dateString, "yyyy-MM-dd HH:mm" ); + try { + date = getDateFromString(dateString, "yyyy-MM-dd HH:mm"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyy/MM/dd HH:mm:ss" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "yyyy/MM/dd HH:mm:ss"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyy-MM-dd" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "yyyy-MM-dd"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyy/MM/dd" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "yyyy/MM/dd"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyyMMdd" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "yyyyMMdd"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyyMMddHHmmss" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "yyyyMMddHHmmss"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "HH:mm:ss" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "HH:mm:ss"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "HH:mm" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "HH:mm"); return date; - }catch(Exception e){} - + } catch (Exception e) { + e.printStackTrace(); + } + return date; } - - - public String getDateStringFromDate(Date date, String style) throws Exception{ + + public String getDateStringFromDate(Date date, String style) throws Exception { String dateString = null; - if(style==null||"".equals(style.trim())){ + if (style == null || "".equals(style.trim())) { dateString = format1.format(date); - }else if("yyyy-MM-dd HH:mm:ss".equalsIgnoreCase(style.trim())){ + } else if ("yyyy-MM-dd HH:mm:ss".equalsIgnoreCase(style.trim())) { dateString = format3.format(date); - }else if("yyyy/MM/dd HH:mm:ss".equalsIgnoreCase(style.trim())){ + } else if ("yyyy/MM/dd HH:mm:ss".equalsIgnoreCase(style.trim())) { dateString = format3_1.format(date); - }else if("yyyy/MM/dd".equalsIgnoreCase(style.trim())){ + } else if ("yyyy/MM/dd".equalsIgnoreCase(style.trim())) { dateString = format4.format(date); - }else if("yyyy-MM-dd".equalsIgnoreCase(style.trim())){ + } else if ("yyyy-MM-dd".equalsIgnoreCase(style.trim())) { dateString = format1.format(date); - }else if("yyyyMMdd".equalsIgnoreCase(style.trim())){ + } else if ("yyyyMMdd".equalsIgnoreCase(style.trim())) { dateString = format5.format(date); - }else if("yyyyMMddHHmmss".equalsIgnoreCase(style.trim())){ + } else if ("yyyyMMddHHmmss".equalsIgnoreCase(style.trim())) { dateString = format7.format(date); - }else if("HH:mm:ss".equalsIgnoreCase(style.trim())){ + } else if ("HH:mm:ss".equalsIgnoreCase(style.trim())) { dateString = format2.format(date); - }else{ + } else { throw new Exception("对不起，您输入的日期style系统无法识别，请检查您的参数输入！style=" + style); } return dateString; @@ -152,24 +169,26 @@ public class DateOperation { /** * 得到某日期加上或减去天数后的日期,day为负数时减去 + * * @param dateString * @param day * @param style * @return * @throws Exception */ - public String getDayAdd(String dateString, int day, String style) throws Exception { + public String getDayAdd(String dateString, int day, String style) throws Exception { Date date = getDateFromString(dateString, style); return getDayAdd(date, day); } /** * 得到某日期加上或减去天数后的日期,day为负数时减去 + * * @param date * @param day * @return */ - public String getDayAdd(Date date, int day) { + public String getDayAdd(Date date, int day) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); calendar.add(Calendar.DATE, day); @@ -183,7 +202,7 @@ public class DateOperation { * @param month * @return "yyyy-MM-dd" */ - public String getMonthAdd(Date date, int month) { + public String getMonthAdd(Date date, int month) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); calendar.add(Calendar.MONTH, month); @@ -192,11 +211,12 @@ public class DateOperation { /** * 得到某日期加上或减去分钟后的日期,min为负数时减去 + * * @param date * @param min * @return */ - public String getMinutesAdd(Date date, int min) { + public String getMinutesAdd(Date date, int min) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); calendar.add(Calendar.MINUTE, min); @@ -205,21 +225,23 @@ public class DateOperation { /** * 得到某日期的日 + * * @param date * @return */ - public String getDay(Date date) { - try{ + public String getDay(Date date) { + try { return format10.format(date); - }catch(Exception e){ + } catch (Exception e) { return "0"; } } + public int getDayNumber(Date date) { String result = null; - try{ + try { result = format10.format(date); - }catch(Exception e){ + } catch (Exception e) { result = "0"; } return Integer.parseInt(result); @@ -227,21 +249,23 @@ public class DateOperation { /** * 得到某日期的月份 + * * @param date * @return */ - public String getMonth(Date date) { - try{ + public String getMonth(Date date) { + try { return format9.format(date); - }catch(Exception e){ + } catch (Exception e) { return "0"; } } + public int getMonthNumber(Date date) { String result = null; - try{ + try { result = format9.format(date); - }catch(Exception e){ + } catch (Exception e) { result = "0"; } return Integer.parseInt(result); @@ -249,21 +273,23 @@ public class DateOperation { /** * 得到某日期的年份 + * * @param date * @return */ - public String getYear(Date date) { - try{ + public String getYear(Date date) { + try { return format8.format(date); - }catch(Exception e){ + } catch (Exception e) { return "0"; } } + public int getYearNumber(Date date) { String result = null; - try{ + try { result = format8.format(date); - }catch(Exception e){ + } catch (Exception e) { result = "0"; } return Integer.parseInt(result); @@ -271,43 +297,47 @@ public class DateOperation { /** * 得到某日期的小时 + * * @param date * @return */ - public String getHour(Date date) { - try{ + public String getHour(Date date) { + try { return format11.format(date); - }catch(Exception e){ + } catch (Exception e) { return "0"; } } /** * 得到某日期的分钟 + * * @param date * @return */ - public String getMinites(Date date) { + public String getMinites(Date date) { return format12.format(date); } /** * 得到某日期的秒 + * * @param date * @return */ - public String getSeconds(Date date) { + public String getSeconds(Date date) { return format13.format(date); } /** * 得到某年有多少天 + * * @param date * @return * @throws ParseException */ @SuppressWarnings("static-access") - public int getDaysForYear(String date) throws ParseException { + public int getDaysForYear(String date) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(format1.parse(date)); return calendar.get(calendar.DAY_OF_YEAR); @@ -315,12 +345,13 @@ public class DateOperation { /** * 得到某年有多少天 + * * @param date * @return * @throws ParseException */ @SuppressWarnings("static-access") - public int getDaysForYear(Date date) throws ParseException { + public int getDaysForYear(Date date) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); return calendar.get(calendar.DAY_OF_YEAR); @@ -328,12 +359,13 @@ public class DateOperation { /** * 得到某年有多少天 + * * @param year * @return * @throws ParseException */ @SuppressWarnings("static-access") - public int getDaysForYear_YYYY(String year) throws ParseException { + public int getDaysForYear_YYYY(String year) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(format8.parse(year)); return calendar.get(calendar.DAY_OF_YEAR); @@ -341,24 +373,26 @@ public class DateOperation { /** * 得到某月有多少天 + * * @param date * @return * @throws ParseException */ - public int getDaysForMonth(String date) throws ParseException { + public int getDaysForMonth(String date) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(format1.parse(date)); - return calendar.getActualMaximum( Calendar.DAY_OF_MONTH); + return calendar.getActualMaximum(Calendar.DAY_OF_MONTH); } /** * 得到某月有多少天 + * * @param date * @return * @throws ParseException */ @SuppressWarnings("static-access") - public int getDaysForMonth_MM(String date) throws ParseException { + public int getDaysForMonth_MM(String date) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(format14.parse(date)); return calendar.get(calendar.DAY_OF_MONTH); @@ -366,11 +400,12 @@ public class DateOperation { /** * 得到某月有多少天 + * * @param date * @return * @throws ParseException */ - public int getDaysForMonth(Date date) throws ParseException { + public int getDaysForMonth(Date date) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); return calendar.get(Calendar.DAY_OF_MONTH); @@ -381,7 +416,7 @@ public class DateOperation { * * @return */ - public String getNowDate() { + public String getNowDate() { return format1.format(new Date()); } @@ -390,45 +425,49 @@ public class DateOperation { * * @return */ - public String getNowTime() { + public String getNowTime() { return format2.format(new Date()); } + /** - * 得到当前的时间 - * yyyyMMddHHmmss + * 得到当前的时间 yyyyMMddHHmmss + * * @return */ - public String getNowTimeChar() { + public String getNowTimeChar() { return format7.format(new Date()); } + /** - * 得到当前的时间 - * yyyy-MM-dd HH:mm:ss + * 得到当前的时间 yyyy-MM-dd HH:mm:ss + * * @return */ - public String getNowDateTime() { + public String getNowDateTime() { return format3.format(new Date()); } + /** * 得到两个时间之前的分差 + * * @param date1 yyyy-MM-dd HH:mm:ss * @param date2 yyyy-MM-dd HH:mm:ss * @return - * @throws ParseException + * @throws ParseException */ - public long getDeff(String date1,String date2) throws ParseException { + public long getDeff(String date1, String date2) throws ParseException { long dayNumber = 0; // 1小时=60分钟=3600秒=3600000 long mins = 60L * 1000L; // long day= 24L * 60L * 60L * 1000L;计算天数之差 SimpleDateFormat df = null; - if(date1.length() == 19){ + if (date1.length() == 19) { df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - }else if(date1.length() == 10){ + } else if (date1.length() == 10) { df = new SimpleDateFormat("yyyy-MM-dd"); - }else if(date1.length() == 8){ + } else if (date1.length() == 8) { df = new SimpleDateFormat("HH:mm:ss"); - }else{ + } else { df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); } Date d1 = df.parse(date1); @@ -436,13 +475,15 @@ public class DateOperation { dayNumber = (d2.getTime() - d1.getTime()) / mins; return dayNumber; } + /** * 得到两个时间之前的分差 + * * @param date1 yyyy-MM-dd HH:mm:ss * @param date2 yyyy-MM-dd HH:mm:ss * @return */ - public long getDeff(Date date1,Date date2) { + public long getDeff(Date date1, Date date2) { long dayNumber = 0; long mins = 60L * 1000L; dayNumber = (date2.getTime() - date1.getTime()) / mins; @@ -451,16 +492,17 @@ public class DateOperation { /** * 日期格式转换 从YYYY-MM-DD转换到YYYYMMDD + * * @param dateString * @return * @throws ParseException */ - public String changeDateFormat(String dateString) throws ParseException{ + public String changeDateFormat(String dateString) throws ParseException { Date date; String reslut = null; try { - if("".equals(dateString)){ - dateString="0000-00-00"; + if ("".equals(dateString)) { + dateString = "0000-00-00"; } date = format1.parse(dateString); reslut = format5.format(date); @@ -469,41 +511,40 @@ public class DateOperation { } return reslut; } - + /** 格式 yyyy-MM-dd */ - public final SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd"); + public final SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd"); /** 格式 HH:mm:ss */ - public final SimpleDateFormat format2 = new SimpleDateFormat("HH:mm:ss"); - public final SimpleDateFormat format2_1 = new SimpleDateFormat("HH:mm"); + public final SimpleDateFormat format2 = new SimpleDateFormat("HH:mm:ss"); + public final SimpleDateFormat format2_1 = new SimpleDateFormat("HH:mm"); /** 格式 yyyy-MM-dd HH:mm:ss */ - public final SimpleDateFormat format3 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - public final SimpleDateFormat format3_2 = new SimpleDateFormat("yyyy-MM-dd HH:mm"); - public final SimpleDateFormat format3_1 = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); + public final SimpleDateFormat format3 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public final SimpleDateFormat format3_2 = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + public final SimpleDateFormat format3_1 = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); /** 格式 yyyy/MM/dd */ - public final SimpleDateFormat format4 = new SimpleDateFormat("yyyy/MM/dd"); + public final SimpleDateFormat format4 = new SimpleDateFormat("yyyy/MM/dd"); /** 格式 yyyyMMdd */ - public final SimpleDateFormat format5 = new SimpleDateFormat("yyyyMMdd"); + public final SimpleDateFormat format5 = new SimpleDateFormat("yyyyMMdd"); /** 格式 HHmmss */ - public final SimpleDateFormat format6 = new SimpleDateFormat("HHmmss"); + public final SimpleDateFormat format6 = new SimpleDateFormat("HHmmss"); /** 格式 yyyyMMddHHmmss */ - public final SimpleDateFormat format7 = new SimpleDateFormat("yyyyMMddHHmmss"); + public final SimpleDateFormat format7 = new SimpleDateFormat("yyyyMMddHHmmss"); /** 格式 yyyy */ - public final SimpleDateFormat format8 = new SimpleDateFormat("yyyy"); + public final SimpleDateFormat format8 = new SimpleDateFormat("yyyy"); /** 格式 MM */ - public final SimpleDateFormat format9 = new SimpleDateFormat("MM"); + public final SimpleDateFormat format9 = new SimpleDateFormat("MM"); /** 格式 dd */ - public final SimpleDateFormat format10 = new SimpleDateFormat("dd"); + public final SimpleDateFormat format10 = new SimpleDateFormat("dd"); /** 格式 HH */ - public final SimpleDateFormat format11 = new SimpleDateFormat("HH"); + public final SimpleDateFormat format11 = new SimpleDateFormat("HH"); /** 格式 mm */ - public final SimpleDateFormat format12 = new SimpleDateFormat("mm"); + public final SimpleDateFormat format12 = new SimpleDateFormat("mm"); /** 格式 ss */ - public final SimpleDateFormat format13 = new SimpleDateFormat("ss"); + public final SimpleDateFormat format13 = new SimpleDateFormat("ss"); /** 格式 ss */ - public final SimpleDateFormat format14 = new SimpleDateFormat("yyyy-MM"); - - - public String getStartOfWeek(String dateString) throws Exception{ + public final SimpleDateFormat format14 = new SimpleDateFormat("yyyy-MM"); + + public String getStartOfWeek(String dateString) throws Exception { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); Date date = format.parse(dateString); Calendar cal = Calendar.getInstance(); @@ -513,11 +554,11 @@ public class DateOperation { if (0 == tmp) { tmp = 7; } - cal.add(Calendar.DATE, -(tmp-1)); + cal.add(Calendar.DATE, -(tmp - 1)); return getDateStringFromDate(cal.getTime(), "yyyy-MM-dd") + " 00:00:00"; } - - public String getEndOfWeek(String dateString) throws Exception{ + + public String getEndOfWeek(String dateString) throws Exception { Date date = getDateFromString(getStartOfWeek(dateString), "yyyy-MM-dd HH:mm:ss"); Calendar cal = Calendar.getInstance(); cal.setTime(date); @@ -525,113 +566,115 @@ public class DateOperation { cal.add(Calendar.DATE, 6); return getDateStringFromDate(cal.getTime(), "yyyy-MM-dd") + " 23:59:59"; } - - - + /** * 将时间格式转换为 **月**日**时**分的格式 + * * @param dateString * @param style * @return * @throws Exception */ - public String getDateCNString( String dateString, String style ) throws Exception{ + public String getDateCNString(String dateString, String style) throws Exception { StringBuffer ch_date_string = new StringBuffer(); Date _date = null; - _date = getDateFromString( dateString, style ); - if(_date == null ){ + _date = getDateFromString(dateString, style); + if (_date == null) { _date = new Date(); } - String year = getYear( _date ); - String month = getMonth( _date ); - String day = getDay( _date ); - String hour = getHour( _date ); - String min = getMinites( _date ); - ch_date_string.append( year ); - ch_date_string.append( "年" ); - ch_date_string.append( month ); - ch_date_string.append( "月" ); - ch_date_string.append( day ); - ch_date_string.append( "日" ); - ch_date_string.append( hour ); - ch_date_string.append( "时" ); - ch_date_string.append( min ); - ch_date_string.append( "分" ); + String year = getYear(_date); + String month = getMonth(_date); + String day = getDay(_date); + String hour = getHour(_date); + String min = getMinites(_date); + ch_date_string.append(year); + ch_date_string.append("年"); + ch_date_string.append(month); + ch_date_string.append("月"); + ch_date_string.append(day); + ch_date_string.append("日"); + ch_date_string.append(hour); + ch_date_string.append("时"); + ch_date_string.append(min); + ch_date_string.append("分"); return ch_date_string.toString(); } - + /** * 将时间格式转换为 **月**日**时**分**秒 的格式 + * * @param dateString * @param style * @return * @throws Exception */ - public String getDateCNString2( String dateString, String style ) throws Exception{ + public String getDateCNString2(String dateString, String style) throws Exception { StringBuffer ch_date_string = new StringBuffer(); Date _date = null; - _date = getDateFromString( dateString, style ); - if(_date == null ){ + _date = getDateFromString(dateString, style); + if (_date == null) { _date = new Date(); } - String year = getYear( _date ); - String month = getMonth( _date ); - String day = getDay( _date ); - String hour = getHour( _date ); - String min = getMinites( _date ); - String sec = getSeconds( _date ); - ch_date_string.append( year ); - ch_date_string.append( "年" ); - ch_date_string.append( month ); - ch_date_string.append( "月" ); - ch_date_string.append( day ); - ch_date_string.append( "日" ); - ch_date_string.append( hour ); - ch_date_string.append( "时" ); - ch_date_string.append( min ); - ch_date_string.append( "分" ); - ch_date_string.append( sec ); - ch_date_string.append( "秒" ); + String year = getYear(_date); + String month = getMonth(_date); + String day = getDay(_date); + String hour = getHour(_date); + String min = getMinites(_date); + String sec = getSeconds(_date); + ch_date_string.append(year); + ch_date_string.append("年"); + ch_date_string.append(month); + ch_date_string.append("月"); + ch_date_string.append(day); + ch_date_string.append("日"); + ch_date_string.append(hour); + ch_date_string.append("时"); + ch_date_string.append(min); + ch_date_string.append("分"); + ch_date_string.append(sec); + ch_date_string.append("秒"); return ch_date_string.toString(); } - + /** - * 获取日期在一年中的周数 - * 结果从1开始 + * 获取日期在一年中的周数 结果从1开始 + * * @param dateString yyyy-mm-dd * @return - * @throws Exception + * @throws Exception */ - public int getWeekNumOfYear( String dateString ) throws Exception{ - Date date = getDateFromString( dateString , "yyyy-MM-dd"); + public int getWeekNumOfYear(String dateString) throws Exception { + Date date = getDateFromString(dateString, "yyyy-MM-dd"); Calendar cal = Calendar.getInstance(); cal.setTime(date); - cal.setFirstDayOfWeek(2); //设置每周的第一天是星期一 + cal.setFirstDayOfWeek(2); // 设置每周的第一天是星期一 return cal.get(Calendar.WEEK_OF_YEAR); } - + /** * 判断是否周末 + * * @param recordDate * @return */ - public boolean isWeekend( Date recordDate ) { + public boolean isWeekend(Date recordDate) { Calendar cal = Calendar.getInstance(); - cal.setTime( recordDate ); - if(cal.get(Calendar.DAY_OF_WEEK)==Calendar.SATURDAY||cal.get(Calendar.DAY_OF_WEEK)==Calendar.SUNDAY){ - return true; - } + cal.setTime(recordDate); + if (cal.get(Calendar.DAY_OF_WEEK) == Calendar.SATURDAY || cal.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) { + return true; + } return false; } - - public long getMinutes( Date date1, Date data2){ - long l=data2.getTime()-date1.getTime(); - long min=((l/(60*1000))); - return min; + + public long getMinutes(Date date1, Date data2) { + long l = data2.getTime() - date1.getTime(); + long min = ((l / (60 * 1000))); + return min; } /** * 根据提供的年份月份，获取当月所有的日期字符串：yyyy-mm-dd + * * @param s_year * @param _month * @return @@ -642,108 +685,117 @@ public class DateOperation { int year = 0; int month = 0; int days = 0; - try{ - year = Integer.parseInt( s_year ); - }catch(Exception e){ + try { + year = Integer.parseInt(s_year); + } catch (Exception e) { e.printStackTrace(); } - try{ - month = Integer.parseInt( _month ); - }catch(Exception e){ + try { + month = Integer.parseInt(_month); + } catch (Exception e) { e.printStackTrace(); } - cal.set(year, month-1, 1); + cal.set(year, month - 1, 1); days = cal.getActualMaximum(Calendar.DATE); - for( int i =1; i<= days ; i++){ - result.add( s_year + "-" + (month<10?"0"+month:month) + "-" + (i<10?"0"+i:i)); + for (int i = 1; i <= days; i++) { + result.add(s_year + "-" + (month < 10 ? "0" + month : month) + "-" + (i < 10 ? "0" + i : i)); } return result; } - + /** * 根据提供的两个时间之间所有的日期字符串：yyyy-mm-dd + * * @param startDate * @param endDate * @return - * @throws Exception + * @throws Exception */ - public List listDateStringBetweenDate( Date startDate, Date endDate ) throws Exception { + public List listDateStringBetweenDate(Date startDate, Date endDate) throws Exception { List result = new ArrayList(); Calendar cal = Calendar.getInstance(); - startDate = getDateFromString( getDateStringFromDate( startDate, "yyyy-MM-dd") ); - endDate = getDateFromString( getDateStringFromDate( endDate, "yyyy-MM-dd") + " 23:59:59"); - cal.setTime( startDate ); - while( cal.getTime().before(endDate)){ - result.add( getDateStringFromDate( cal.getTime(), "yyyy-MM-dd")); + startDate = getDateFromString(getDateStringFromDate(startDate, "yyyy-MM-dd")); + endDate = getDateFromString(getDateStringFromDate(endDate, "yyyy-MM-dd") + " 23:59:59"); + cal.setTime(startDate); + while (cal.getTime().before(endDate)) { + result.add(getDateStringFromDate(cal.getTime(), "yyyy-MM-dd")); cal.add(Calendar.DATE, 1); } return result; } - + /** * 获取日期所在月份的第一天 + * * @param recordDate * @return - * @throws Exception + * @throws Exception */ public Date getFirstDateInMonth(Date recordDate) throws Exception { String year = format8.format(recordDate); String month = format9.format(recordDate); - return getDateFromString( year + "-" + month + "-01" ); + return getDateFromString(year + "-" + month + "-01"); } - + /** * 获取日期所在月份的第一天 + * * @param recordDate yyyy-MM-dd * @return - * @throws Exception + * @throws Exception */ public String getFirstDateStringInMonth(Date recordDate) throws Exception { String year = format8.format(recordDate); String month = format9.format(recordDate); return year + "-" + month + "-01"; } - + /** * 获取当月的最后一日 + * * @param date * @return */ - public static Date getLastDayOfMonth(Date date) { - Calendar calendar = convert(date); - //calendar.set(Calendar.DATE, calendar.getMaximum(Calendar.DATE)); + public static Date getLastDayOfMonth(Date date) { + Calendar calendar = convert(date); + // calendar.set(Calendar.DATE, calendar.getMaximum(Calendar.DATE)); calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH)); return calendar.getTime(); - } - /** - * 将日期转换为日历 - * @param date 日期 - * @return 日历 - */ - private static Calendar convert(Date date) { - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - return calendar; - } + } + + /** + * 将日期转换为日历 + * + * @param date 日期 + * @return 日历 + */ + private static Calendar convert(Date date) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + return calendar; + } + /** * 获取日期所在月份的第一天 + * * @param recordDate * @return - * @throws Exception + * @throws Exception */ public Date getLastDateInMonth(Date recordDate) throws Exception { - Date lastDate = getLastDayOfMonth( recordDate ); - return getDateFromString( getDateStringFromDate( lastDate, "yyyy-MM-dd") ); + Date lastDate = getLastDayOfMonth(recordDate); + return getDateFromString(getDateStringFromDate(lastDate, "yyyy-MM-dd")); } - + /** * 获取日期所在月份的第一天 + * * @param recordDate yyyy-MM-dd * @return - * @throws Exception + * @throws Exception */ public String getLastDateStringInMonth(Date recordDate) throws Exception { Date lastDate = getLastDayOfMonth(recordDate); - return getDateStringFromDate( lastDate, "yyyy-MM-dd"); + return getDateStringFromDate(lastDate, "yyyy-MM-dd"); } } diff --git a/o2server/x_hotpic_assemble_control/src/main/java/com/x/hotpic/assemble/common/date/DateOperation.java b/o2server/x_hotpic_assemble_control/src/main/java/com/x/hotpic/assemble/common/date/DateOperation.java index 20ed81243f..3c42aac16f 100644 --- a/o2server/x_hotpic_assemble_control/src/main/java/com/x/hotpic/assemble/common/date/DateOperation.java +++ b/o2server/x_hotpic_assemble_control/src/main/java/com/x/hotpic/assemble/common/date/DateOperation.java @@ -11,10 +11,12 @@ import com.x.base.core.project.logger.Logger; import com.x.base.core.project.logger.LoggerFactory; public class DateOperation { - - private Logger logger = LoggerFactory.getLogger( DateOperation.class); + + private Logger logger = LoggerFactory.getLogger(DateOperation.class); + /** * 根据样式得到格式化对象SimpleDateFormat + * * @param date * @param style * @return @@ -40,133 +42,150 @@ public class DateOperation { * @param date * @return HH:mm:ss */ - public String getTime(Date date) { + public String getTime(Date date) { return format2.format(date); } - public Date getDateFromString(String dateString, String style) throws Exception{ + public Date getDateFromString(String dateString, String style) throws Exception { Date date = null; - if(style==null||"".equals(style.trim())){ + if (style == null || "".equals(style.trim())) { date = format1.parse(dateString); - }else if( "yyyy-MM-dd HH:mm:ss".equalsIgnoreCase(style.trim())){ + } else if ("yyyy-MM-dd HH:mm:ss".equalsIgnoreCase(style.trim())) { date = format3.parse(dateString); - }else if( "yyyy-MM-dd HH:mm".equalsIgnoreCase(style.trim())){ + } else if ("yyyy-MM-dd HH:mm".equalsIgnoreCase(style.trim())) { date = format3_2.parse(dateString); - }else if( "yyyy/MM/dd HH:mm:ss".equalsIgnoreCase(style.trim())){ + } else if ("yyyy/MM/dd HH:mm:ss".equalsIgnoreCase(style.trim())) { date = format3_1.parse(dateString); - }else if( "yyyy/MM/dd".equalsIgnoreCase(style.trim())){ + } else if ("yyyy/MM/dd".equalsIgnoreCase(style.trim())) { date = format4.parse(dateString); - }else if( "yyyy-MM-dd".equalsIgnoreCase(style.trim())){ + } else if ("yyyy-MM-dd".equalsIgnoreCase(style.trim())) { date = format1.parse(dateString); - }else if( "yyyyMMdd".equalsIgnoreCase(style.trim())){ + } else if ("yyyyMMdd".equalsIgnoreCase(style.trim())) { date = format5.parse(dateString); - }else if( "yyyyMMddHHmmss".equalsIgnoreCase(style.trim())){ + } else if ("yyyyMMddHHmmss".equalsIgnoreCase(style.trim())) { date = format7.parse(dateString); - }else if( "HH:mm:ss".equalsIgnoreCase(style.trim())){ + } else if ("HH:mm:ss".equalsIgnoreCase(style.trim())) { date = format2.parse(dateString); - }else if( "HH:mm".equalsIgnoreCase(style.trim())){ + } else if ("HH:mm".equalsIgnoreCase(style.trim())) { date = format2_1.parse(dateString); - }else{ - throw new Exception( "对不起，您输入的日期style系统无法识别，请检查您的参数输入！" ); + } else { + throw new Exception("对不起，您输入的日期style系统无法识别，请检查您的参数输入！"); } return date; } - + /** - * 将字符串转换为日期格式 - * 会尝试多种格式转换，转换成功后返回结果 + * 将字符串转换为日期格式 会尝试多种格式转换，转换成功后返回结果 + * * @param dateString * @return * @throws Exception */ - public Date getDateFromString( String dateString ) throws Exception{ + public Date getDateFromString(String dateString) throws Exception { Date date = null; - try{ - date = getDateFromString( dateString, "yyyy-MM-dd HH:mm:ss" ); + try { + date = getDateFromString(dateString, "yyyy-MM-dd HH:mm:ss"); return date; - }catch(Exception e){} + } catch (Exception e) { + e.printStackTrace(); + } - try{ - date = getDateFromString( dateString, "yyyy-MM-dd HH:mm" ); + try { + date = getDateFromString(dateString, "yyyy-MM-dd HH:mm"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyy/MM/dd HH:mm:ss" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "yyyy/MM/dd HH:mm:ss"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyy-MM-dd" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "yyyy-MM-dd"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyy/MM/dd" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "yyyy/MM/dd"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyyMMdd" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "yyyyMMdd"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyyMMddHHmmss" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "yyyyMMddHHmmss"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "HH:mm:ss" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "HH:mm:ss"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "HH:mm" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "HH:mm"); return date; - }catch(Exception e){} - - throw new Exception( "the style of date has error, date:" + dateString ); + } catch (Exception e) { + e.printStackTrace(); + } + + throw new Exception("the style of date has error, date:" + dateString); } - - - public String getDateStringFromDate(Date date, String style) throws Exception{ + + public String getDateStringFromDate(Date date, String style) throws Exception { String dateString = null; - if(style==null||"".equals(style.trim())){ + if (style == null || "".equals(style.trim())) { dateString = format1.format(date); - }else if( "yyyy-MM-dd HH:mm:ss".equalsIgnoreCase(style.trim())){ + } else if ("yyyy-MM-dd HH:mm:ss".equalsIgnoreCase(style.trim())) { dateString = format3.format(date); - }else if( "yyyy/MM/dd HH:mm:ss".equalsIgnoreCase(style.trim())){ + } else if ("yyyy/MM/dd HH:mm:ss".equalsIgnoreCase(style.trim())) { dateString = format3_1.format(date); - }else if( "yyyy/MM/dd".equalsIgnoreCase(style.trim())){ + } else if ("yyyy/MM/dd".equalsIgnoreCase(style.trim())) { dateString = format4.format(date); - }else if( "yyyy-MM-dd".equalsIgnoreCase(style.trim())){ + } else if ("yyyy-MM-dd".equalsIgnoreCase(style.trim())) { dateString = format1.format(date); - }else if( "yyyyMMdd".equalsIgnoreCase(style.trim())){ + } else if ("yyyyMMdd".equalsIgnoreCase(style.trim())) { dateString = format5.format(date); - }else if( "yyyyMMddHHmmss".equalsIgnoreCase(style.trim())){ + } else if ("yyyyMMddHHmmss".equalsIgnoreCase(style.trim())) { dateString = format7.format(date); - }else if( "HH:mm:ss".equalsIgnoreCase(style.trim())){ + } else if ("HH:mm:ss".equalsIgnoreCase(style.trim())) { dateString = format2.format(date); - }else{ - throw new Exception( "对不起，您输入的日期style系统无法识别，请检查您的参数输入！style=" + style); + } else { + throw new Exception("对不起，您输入的日期style系统无法识别，请检查您的参数输入！style=" + style); } return dateString; } - + /** * 得到某日期加上或减去天数后的日期,day为负数时减去 * * @param date * @param month * @return "yyyy-MM-dd" - * @throws Exception + * @throws Exception */ - public String getDayAdd(String dateString, int day, String style) throws Exception { + public String getDayAdd(String dateString, int day, String style) throws Exception { Date date = getDateFromString(dateString, style); return getDayAdd(date, day); } - + /** * 得到某日期加上或减去天数后的日期,day为负数时减去 * @@ -174,7 +193,7 @@ public class DateOperation { * @param month * @return "yyyy-MM-dd" */ - public String getDayAdd(Date date, int day) { + public String getDayAdd(Date date, int day) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); calendar.add(Calendar.DATE, day); @@ -188,13 +207,13 @@ public class DateOperation { * @param month * @return "yyyy-MM-dd" */ - public String getMonthAdd(Date date, int month) { + public String getMonthAdd(Date date, int month) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); calendar.add(Calendar.MONTH, month); return format1.format(calendar.getTime()); } - + /** * 得到某日期加上或减去分钟后的日期,min为负数时减去 * @@ -202,54 +221,56 @@ public class DateOperation { * @param month * @return "yyyy-MM-dd HH:mi:ss" */ - public String getMinutesAdd(Date date, int min) { + public String getMinutesAdd(Date date, int min) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); calendar.add(Calendar.MINUTE, min); return format3.format(calendar.getTime()); } + /** * 得到某日期的日 * - * @param Date - * date + * @param Date date * @return */ - public String getDay(Date date) { - try{ + public String getDay(Date date) { + try { return format10.format(date); - }catch(Exception e){ + } catch (Exception e) { return "0"; } } + public int getDayNumber(Date date) { String result = null; - try{ + try { result = format10.format(date); - }catch(Exception e){ + } catch (Exception e) { result = "0"; } return Integer.parseInt(result); } + /** * 得到某日期的月份 * - * @param Date - * date + * @param Date date * @return */ - public String getMonth(Date date) { - try{ + public String getMonth(Date date) { + try { return format9.format(date); - }catch(Exception e){ + } catch (Exception e) { return "0"; } } + public int getMonthNumber(Date date) { String result = null; - try{ + try { result = format9.format(date); - }catch(Exception e){ + } catch (Exception e) { result = "0"; } return Integer.parseInt(result); @@ -258,70 +279,70 @@ public class DateOperation { /** * 得到某日期的年份 * - * @param Date - * date + * @param Date date * @return */ - public String getYear(Date date) { - try{ + public String getYear(Date date) { + try { return format8.format(date); - }catch(Exception e){ + } catch (Exception e) { return "0"; } } + public int getYearNumber(Date date) { String result = null; - try{ + try { result = format8.format(date); - }catch(Exception e){ + } catch (Exception e) { result = "0"; } return Integer.parseInt(result); } + /** * 得到某日期的小时 * - * @param Date - * date + * @param Date date * @return */ - public String getHour(Date date) { - try{ + public String getHour(Date date) { + try { return format11.format(date); - }catch(Exception e){ + } catch (Exception e) { return "0"; } } + /** * 得到某日期的分钟 * - * @param Date - * date + * @param Date date * @return */ - public String getMinites(Date date) { + public String getMinites(Date date) { return format12.format(date); } + /** * 得到某日期的秒 * - * @param Date - * date + * @param Date date * @return */ - public String getSeconds(Date date) { + public String getSeconds(Date date) { return format13.format(date); } + /** * 得到某年有多少天 * - * @param String - * date "yyyy-MM-dd" + * @param String date "yyyy-MM-dd" * @return * @throws ParseException */ @SuppressWarnings("static-access") - public int getDaysForYear(String date) throws ParseException { + public int getDaysForYear(String date) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(format1.parse(date)); return calendar.get(calendar.DAY_OF_YEAR); @@ -330,13 +351,12 @@ public class DateOperation { /** * 得到某年有多少天 * - * @param Date - * date + * @param Date date * @return * @throws ParseException */ @SuppressWarnings("static-access") - public int getDaysForYear(Date date) throws ParseException { + public int getDaysForYear(Date date) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); return calendar.get(calendar.DAY_OF_YEAR); @@ -345,13 +365,12 @@ public class DateOperation { /** * 得到某年有多少天 * - * @param String - * year "yyyy" + * @param String year "yyyy" * @return * @throws ParseException */ @SuppressWarnings("static-access") - public int getDaysForYear_YYYY(String year) throws ParseException { + public int getDaysForYear_YYYY(String year) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(format8.parse(year)); return calendar.get(calendar.DAY_OF_YEAR); @@ -360,27 +379,25 @@ public class DateOperation { /** * 得到某月有多少天 * - * @param String - * date "yyyy-MM-dd" + * @param String date "yyyy-MM-dd" * @return * @throws ParseException */ - public int getDaysForMonth(String date) throws ParseException { + public int getDaysForMonth(String date) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(format1.parse(date)); - return calendar.getActualMaximum( Calendar.DAY_OF_MONTH); + return calendar.getActualMaximum(Calendar.DAY_OF_MONTH); } /** * 得到某月有多少天 * - * @param String - * date "yyyy-MM" + * @param String date "yyyy-MM" * @return * @throws ParseException */ @SuppressWarnings("static-access") - public int getDaysForMonth_MM(String date) throws ParseException { + public int getDaysForMonth_MM(String date) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(format14.parse(date)); return calendar.get(calendar.DAY_OF_MONTH); @@ -389,12 +406,11 @@ public class DateOperation { /** * 得到某月有多少天 * - * @param Date - * date + * @param Date date * @return * @throws ParseException */ - public int getDaysForMonth(Date date) throws ParseException { + public int getDaysForMonth(Date date) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); return calendar.get(Calendar.DAY_OF_MONTH); @@ -405,7 +421,7 @@ public class DateOperation { * * @return */ - public String getNowDate() { + public String getNowDate() { return format1.format(new Date()); } @@ -414,63 +430,69 @@ public class DateOperation { * * @return */ - public String getNowTime() { + public String getNowTime() { return format2.format(new Date()); } + /** - * 得到当前的时间 - * yyyyMMddHHmmss + * 得到当前的时间 yyyyMMddHHmmss + * * @return */ - public String getNowTimeChar() { + public String getNowTimeChar() { return format7.format(new Date()); } + /** - * 得到当前的时间 - * yyyy-MM-dd HH:mm:ss + * 得到当前的时间 yyyy-MM-dd HH:mm:ss + * * @return */ - public String getNowDateTime() { + public String getNowDateTime() { return format3.format(new Date()); } + /** * 得到两个时间之前的分差 + * * @param date1 yyyy-MM-dd HH:mm:ss * @param date2 yyyy-MM-dd HH:mm:ss * @return */ - public long getDeff(String date1,String date2) { + public long getDeff(String date1, String date2) { long dayNumber = 0; // 1小时=60分钟=3600秒=3600000 long mins = 60L * 1000L; // long day= 24L * 60L * 60L * 1000L;计算天数之差 SimpleDateFormat df = null; - if(date1.length() == 19){ - df = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ); - }else if(date1.length() == 10){ - df = new SimpleDateFormat( "yyyy-MM-dd" ); - }else if(date1.length() == 8){ - df = new SimpleDateFormat( "HH:mm:ss" ); - }else{ - df = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ); + if (date1.length() == 19) { + df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + } else if (date1.length() == 10) { + df = new SimpleDateFormat("yyyy-MM-dd"); + } else if (date1.length() == 8) { + df = new SimpleDateFormat("HH:mm:ss"); + } else { + df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); } try { java.util.Date d1 = df.parse(date1); java.util.Date d2 = df.parse(date2); dayNumber = (d2.getTime() - d1.getTime()) / mins; } catch (Exception e) { - logger.warn( "系统获取得到两个时间之前的分差发生异常" ); + logger.warn("系统获取得到两个时间之前的分差发生异常"); logger.error(e); } return dayNumber; } + /** * 得到两个时间之前的分差 + * * @param date1 yyyy-MM-dd HH:mm:ss * @param date2 yyyy-MM-dd HH:mm:ss * @return */ - public long getDeff(Date date1,Date date2) { + public long getDeff(Date date1, Date date2) { long dayNumber = 0; // 1小时=60分钟=3600秒=3600000 long mins = 60L * 1000L; @@ -478,76 +500,76 @@ public class DateOperation { try { dayNumber = (date2.getTime() - date1.getTime()) / mins; } catch (Exception e) { - logger.warn( "系统获取得到两个时间之前的分差发生异常"); + logger.warn("系统获取得到两个时间之前的分差发生异常"); logger.error(e); } return dayNumber; } + /** * - * 日期格式转换 - * 从YYYY-MM-DD转换到YYYYMMDD + * 日期格式转换 从YYYY-MM-DD转换到YYYYMMDD + * * @param date - * @throws ParseException + * @throws ParseException */ - public String changeDateFormat(String dateString){ + public String changeDateFormat(String dateString) { Date date; String reslut = null; try { - if( "".equals(dateString)){ - dateString="0000-00-00"; + if ("".equals(dateString)) { + dateString = "0000-00-00"; } date = format1.parse(dateString); reslut = format5.format(date); } catch (ParseException e) { try { - date = format1.parse( "0000-00-00" ); + date = format1.parse("0000-00-00"); } catch (ParseException e1) { - logger.warn( "系统日期格式转换发生异常" ); + logger.warn("系统日期格式转换发生异常"); logger.error(e); } - logger.warn( "系统日期格式转换发生异常"); + logger.warn("系统日期格式转换发生异常"); logger.error(e); } - + return reslut; } - + /** 格式 yyyy-MM-dd */ - public final SimpleDateFormat format1 = new SimpleDateFormat( "yyyy-MM-dd" ); + public final SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd"); /** 格式 HH:mm:ss */ - public final SimpleDateFormat format2 = new SimpleDateFormat( "HH:mm:ss" ); - public final SimpleDateFormat format2_1 = new SimpleDateFormat( "HH:mm" ); + public final SimpleDateFormat format2 = new SimpleDateFormat("HH:mm:ss"); + public final SimpleDateFormat format2_1 = new SimpleDateFormat("HH:mm"); /** 格式 yyyy-MM-dd HH:mm:ss */ - public final SimpleDateFormat format3 = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ); - public final SimpleDateFormat format3_2 = new SimpleDateFormat( "yyyy-MM-dd HH:mm" ); - public final SimpleDateFormat format3_1 = new SimpleDateFormat( "yyyy/MM/dd HH:mm:ss" ); + public final SimpleDateFormat format3 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public final SimpleDateFormat format3_2 = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + public final SimpleDateFormat format3_1 = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); /** 格式 yyyy/MM/dd */ - public final SimpleDateFormat format4 = new SimpleDateFormat( "yyyy/MM/dd" ); + public final SimpleDateFormat format4 = new SimpleDateFormat("yyyy/MM/dd"); /** 格式 yyyyMMdd */ - public final SimpleDateFormat format5 = new SimpleDateFormat( "yyyyMMdd" ); + public final SimpleDateFormat format5 = new SimpleDateFormat("yyyyMMdd"); /** 格式 HHmmss */ - public final SimpleDateFormat format6 = new SimpleDateFormat( "HHmmss" ); + public final SimpleDateFormat format6 = new SimpleDateFormat("HHmmss"); /** 格式 yyyyMMddHHmmss */ - public final SimpleDateFormat format7 = new SimpleDateFormat( "yyyyMMddHHmmss" ); + public final SimpleDateFormat format7 = new SimpleDateFormat("yyyyMMddHHmmss"); /** 格式 yyyy */ - public final SimpleDateFormat format8 = new SimpleDateFormat( "yyyy" ); + public final SimpleDateFormat format8 = new SimpleDateFormat("yyyy"); /** 格式 MM */ - public final SimpleDateFormat format9 = new SimpleDateFormat( "MM" ); + public final SimpleDateFormat format9 = new SimpleDateFormat("MM"); /** 格式 dd */ - public final SimpleDateFormat format10 = new SimpleDateFormat( "dd" ); + public final SimpleDateFormat format10 = new SimpleDateFormat("dd"); /** 格式 HH */ - public final SimpleDateFormat format11 = new SimpleDateFormat( "HH" ); + public final SimpleDateFormat format11 = new SimpleDateFormat("HH"); /** 格式 mm */ - public final SimpleDateFormat format12 = new SimpleDateFormat( "mm" ); + public final SimpleDateFormat format12 = new SimpleDateFormat("mm"); /** 格式 ss */ - public final SimpleDateFormat format13 = new SimpleDateFormat( "ss" ); + public final SimpleDateFormat format13 = new SimpleDateFormat("ss"); /** 格式 ss */ - public final SimpleDateFormat format14 = new SimpleDateFormat( "yyyy-MM" ); - - - public String getStartOfWeek(String dateString){ - SimpleDateFormat format = new SimpleDateFormat( "yyyy-MM-dd" ); + public final SimpleDateFormat format14 = new SimpleDateFormat("yyyy-MM"); + + public String getStartOfWeek(String dateString) { + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); try { Date date = format.parse(dateString); Calendar cal = Calendar.getInstance(); @@ -557,179 +579,181 @@ public class DateOperation { if (0 == tmp) { tmp = 7; } - cal.add(Calendar.DATE, -(tmp-1)); - return getDateStringFromDate(cal.getTime(), "yyyy-MM-dd" ) + " 00:00:00"; + cal.add(Calendar.DATE, -(tmp - 1)); + return getDateStringFromDate(cal.getTime(), "yyyy-MM-dd") + " 00:00:00"; } catch (ParseException e) { - logger.warn( "系统getStartOfWeek日期格式转换发生异常"); + logger.warn("系统getStartOfWeek日期格式转换发生异常"); logger.error(e); } catch (Exception e) { - logger.warn( "系统getStartOfWeek发生异常"); + logger.warn("系统getStartOfWeek发生异常"); logger.error(e); } return null; } - - public String getEndOfWeek(String dateString){ + + public String getEndOfWeek(String dateString) { try { - Date date = getDateFromString(getStartOfWeek(dateString), "yyyy-MM-dd HH:mm:ss" ); + Date date = getDateFromString(getStartOfWeek(dateString), "yyyy-MM-dd HH:mm:ss"); Calendar cal = Calendar.getInstance(); cal.setTime(date); cal.setFirstDayOfWeek(Calendar.MONDAY); cal.add(Calendar.DATE, 6); - return getDateStringFromDate(cal.getTime(), "yyyy-MM-dd" ) + " 23:59:59"; + return getDateStringFromDate(cal.getTime(), "yyyy-MM-dd") + " 23:59:59"; } catch (ParseException e) { - logger.warn( "系统getEndOfWeek日期格式转换发生异常"); + logger.warn("系统getEndOfWeek日期格式转换发生异常"); logger.error(e); } catch (Exception e) { - logger.warn( "系统getEndOfWeek发生异常"); + logger.warn("系统getEndOfWeek发生异常"); logger.error(e); } return null; } - - - + /** * 将时间格式转换为 **月**日**时**分的格式 + * * @param dateString * @param style * @return * @throws Exception */ - public String getDateCNString( String dateString, String style ) throws Exception{ + public String getDateCNString(String dateString, String style) throws Exception { StringBuffer ch_date_string = new StringBuffer(); Date _date = null; - try{ - _date = getDateFromString( dateString, style ); - }catch(Exception e){ - logger.warn( "系统getDateCNString日期格式转换发生异常"); + try { + _date = getDateFromString(dateString, style); + } catch (Exception e) { + logger.warn("系统getDateCNString日期格式转换发生异常"); logger.error(e); } - if(_date == null ){ + if (_date == null) { _date = new Date(); } - String year = getYear( _date ); - String month = getMonth( _date ); - String day = getDay( _date ); - String hour = getHour( _date ); - String min = getMinites( _date ); - ch_date_string.append( year ); - ch_date_string.append( "年" ); - ch_date_string.append( month ); - ch_date_string.append( "月" ); - ch_date_string.append( day ); - ch_date_string.append( "日" ); - ch_date_string.append( hour ); - ch_date_string.append( "时" ); - ch_date_string.append( min ); - ch_date_string.append( "分" ); + String year = getYear(_date); + String month = getMonth(_date); + String day = getDay(_date); + String hour = getHour(_date); + String min = getMinites(_date); + ch_date_string.append(year); + ch_date_string.append("年"); + ch_date_string.append(month); + ch_date_string.append("月"); + ch_date_string.append(day); + ch_date_string.append("日"); + ch_date_string.append(hour); + ch_date_string.append("时"); + ch_date_string.append(min); + ch_date_string.append("分"); return ch_date_string.toString(); } - + /** * 将时间格式转换为 **月**日**时**分**秒 的格式 + * * @param dateString * @param style * @return * @throws Exception */ - public String getDateCNString2( String dateString, String style ) throws Exception{ + public String getDateCNString2(String dateString, String style) throws Exception { StringBuffer ch_date_string = new StringBuffer(); Date _date = null; - try{ - _date = getDateFromString( dateString, style ); - }catch(Exception e){ - logger.warn( "系统getDateCNString2日期格式转换发生异常"); + try { + _date = getDateFromString(dateString, style); + } catch (Exception e) { + logger.warn("系统getDateCNString2日期格式转换发生异常"); logger.error(e); } - if(_date == null ){ + if (_date == null) { _date = new Date(); } - String year = getYear( _date ); - String month = getMonth( _date ); - String day = getDay( _date ); - String hour = getHour( _date ); - String min = getMinites( _date ); - String sec = getSeconds( _date ); - ch_date_string.append( year ); - ch_date_string.append( "年" ); - ch_date_string.append( month ); - ch_date_string.append( "月" ); - ch_date_string.append( day ); - ch_date_string.append( "日" ); - ch_date_string.append( hour ); - ch_date_string.append( "时" ); - ch_date_string.append( min ); - ch_date_string.append( "分" ); - ch_date_string.append( sec ); - ch_date_string.append( "秒" ); + String year = getYear(_date); + String month = getMonth(_date); + String day = getDay(_date); + String hour = getHour(_date); + String min = getMinites(_date); + String sec = getSeconds(_date); + ch_date_string.append(year); + ch_date_string.append("年"); + ch_date_string.append(month); + ch_date_string.append("月"); + ch_date_string.append(day); + ch_date_string.append("日"); + ch_date_string.append(hour); + ch_date_string.append("时"); + ch_date_string.append(min); + ch_date_string.append("分"); + ch_date_string.append(sec); + ch_date_string.append("秒"); return ch_date_string.toString(); } - + /** - * 获取日期在一年中的周数 - * 结果从1开始 + * 获取日期在一年中的周数 结果从1开始 + * * @param dateString yyyy-mm-dd * @return */ - public int getWeekNumOfYear( String dateString ){ + public int getWeekNumOfYear(String dateString) { try { - Date date = getDateFromString( dateString , "yyyy-MM-dd" ); + Date date = getDateFromString(dateString, "yyyy-MM-dd"); Calendar cal = Calendar.getInstance(); cal.setTime(date); - cal.setFirstDayOfWeek(2);//设置每周的第一天是星期一 - return cal.get( Calendar.WEEK_OF_YEAR ); + cal.setFirstDayOfWeek(2);// 设置每周的第一天是星期一 + return cal.get(Calendar.WEEK_OF_YEAR); } catch (ParseException e) { - logger.warn( "系统getWeekNumOfYear日期格式转换发生异常"); + logger.warn("系统getWeekNumOfYear日期格式转换发生异常"); logger.error(e); } catch (Exception e) { - logger.warn( "系统getWeekNumOfYear发生异常"); + logger.warn("系统getWeekNumOfYear发生异常"); logger.error(e); } return -1; } - + /** - * 获取日期在一年中的周数 - * 结果从1开始 + * 获取日期在一年中的周数 结果从1开始 + * * @param dateString yyyy-mm-dd * @return */ - public int getWeekNumOfYear( Date date ){ + public int getWeekNumOfYear(Date date) { try { Calendar cal = Calendar.getInstance(); cal.setTime(date); - cal.setFirstDayOfWeek(2);//设置每周的第一天是星期一 - return cal.get( Calendar.WEEK_OF_YEAR ); + cal.setFirstDayOfWeek(2);// 设置每周的第一天是星期一 + return cal.get(Calendar.WEEK_OF_YEAR); } catch (Exception e) { - logger.warn( "系统getWeekNumOfYear发生异常"); + logger.warn("系统getWeekNumOfYear发生异常"); logger.error(e); } return -1; } - + /** * 判断是否周末 + * * @param recordDate * @return */ public boolean isWeekend(Date date) { Calendar cal = Calendar.getInstance(); - cal.setTime( date ); - if(cal.get(Calendar.DAY_OF_WEEK)==Calendar.SATURDAY||cal.get(Calendar.DAY_OF_WEEK)==Calendar.SUNDAY){ - return true; - } + cal.setTime(date); + if (cal.get(Calendar.DAY_OF_WEEK) == Calendar.SATURDAY || cal.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) { + return true; + } return false; } - - public long getMinutes( Date date1, Date data2){ - long l=data2.getTime()-date1.getTime(); - long min=((l/(60*1000))); - return min; + + public long getMinutes(Date date1, Date data2) { + long l = data2.getTime() - date1.getTime(); + long min = ((l / (60 * 1000))); + return min; } /** * 根据提供的年份月份，获取当月所有的日期字符串：yyyy-mm-dd + * * @param s_year * @param _month * @return @@ -740,119 +764,129 @@ public class DateOperation { int year = 0; int month = 0; int days = 0; - try{ - year = Integer.parseInt( s_year ); - }catch(Exception e){ + try { + year = Integer.parseInt(s_year); + } catch (Exception e) { e.printStackTrace(); } - try{ - month = Integer.parseInt( _month ); - }catch(Exception e){ + try { + month = Integer.parseInt(_month); + } catch (Exception e) { e.printStackTrace(); } - cal.set(year, month-1, 1); + cal.set(year, month - 1, 1); days = cal.getActualMaximum(Calendar.DATE); - for( int i =1; i<= days ; i++){ - result.add( s_year + "-" + (month<10?"0"+month:month) + "-" + (i<10?"0"+i:i)); + for (int i = 1; i <= days; i++) { + result.add(s_year + "-" + (month < 10 ? "0" + month : month) + "-" + (i < 10 ? "0" + i : i)); } return result; } - + /** * 根据提供的两个时间之间所有的日期字符串：yyyy-mm-dd + * * @param startDate * @param endDate * @return - * @throws Exception + * @throws Exception */ - public List listDateStringBetweenDate( Date startDate, Date endDate ) throws Exception { + public List listDateStringBetweenDate(Date startDate, Date endDate) throws Exception { List result = new ArrayList(); Calendar cal = Calendar.getInstance(); - startDate = getDateFromString( getDateStringFromDate( startDate, "yyyy-MM-dd" ) ); - endDate = getDateFromString( getDateStringFromDate( endDate, "yyyy-MM-dd" ) + " 23:59:59" ); - cal.setTime( startDate ); - while( cal.getTime().before(endDate)){ - //logger.debug( getDateStringFromDate( cal.getTime(), "yyyy-MM-dd" ) ); - result.add( getDateStringFromDate( cal.getTime(), "yyyy-MM-dd" )); + startDate = getDateFromString(getDateStringFromDate(startDate, "yyyy-MM-dd")); + endDate = getDateFromString(getDateStringFromDate(endDate, "yyyy-MM-dd") + " 23:59:59"); + cal.setTime(startDate); + while (cal.getTime().before(endDate)) { + // logger.debug( getDateStringFromDate( cal.getTime(), "yyyy-MM-dd" ) ); + result.add(getDateStringFromDate(cal.getTime(), "yyyy-MM-dd")); cal.add(Calendar.DATE, 1); } return result; } - + /** * 获取日期所在月份的第一天 + * * @param recordDate * @return - * @throws Exception + * @throws Exception */ public Date getFirstDateInMonth(Date recordDate) throws Exception { String year = format8.format(recordDate); String month = format9.format(recordDate); - return getDateFromString( year + "-" + month + "-01" ); + return getDateFromString(year + "-" + month + "-01"); } - + /** * 获取日期所在月份的第一天 + * * @param recordDate yyyy-MM-dd * @return - * @throws Exception + * @throws Exception */ public String getFirstDateStringInMonth(Date recordDate) throws Exception { String year = format8.format(recordDate); String month = format9.format(recordDate); return year + "-" + month + "-01"; } - + /** * 获取当月的最后一日 + * * @param date * @return */ - public static Date getLastDayOfMonth(Date date) { - Calendar calendar = convert(date); - calendar.set(Calendar.DATE, calendar.getMaximum(Calendar.DATE)); - return calendar.getTime(); - } - /** - * 将日期转换为日历 - * @param date 日期 - * @return 日历 - */ - private static Calendar convert(Date date) { - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - return calendar; - } + public static Date getLastDayOfMonth(Date date) { + Calendar calendar = convert(date); + calendar.set(Calendar.DATE, calendar.getMaximum(Calendar.DATE)); + return calendar.getTime(); + } + + /** + * 将日期转换为日历 + * + * @param date 日期 + * @return 日历 + */ + private static Calendar convert(Date date) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + return calendar; + } + /** * 获取日期所在月份的第一天 + * * @param recordDate * @return - * @throws Exception + * @throws Exception */ public Date getLastDateInMonth(Date recordDate) throws Exception { Date lastDate = getLastDayOfMonth(recordDate); - return getDateFromString( getDateStringFromDate( lastDate, "yyyy-MM-dd" ) ); + return getDateFromString(getDateStringFromDate(lastDate, "yyyy-MM-dd")); } - + /** * 获取日期所在月份的第一天 + * * @param recordDate yyyy-MM-dd * @return - * @throws Exception + * @throws Exception */ public String getLastDateStringInMonth(Date recordDate) throws Exception { Date lastDate = getLastDayOfMonth(recordDate); - return getDateStringFromDate( lastDate, "yyyy-MM-dd" ); + return getDateStringFromDate(lastDate, "yyyy-MM-dd"); } /** * 获取今天开始的时间 + * * @return */ public Date getTodayStartTime() { String todayDateTime = getNowDate() + " 00:00:00"; try { - return getDateFromString( todayDateTime ); + return getDateFromString(todayDateTime); } catch (Exception e) { return new Date(); } diff --git a/o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/mq/ActiveMQ.java b/o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/mq/ActiveMQ.java index df47de79d0..18be329026 100644 --- a/o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/mq/ActiveMQ.java +++ b/o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/mq/ActiveMQ.java @@ -27,88 +27,86 @@ import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactory; public class ActiveMQ implements MQInterface { - + private static Logger logger = LoggerFactory.getLogger(ActiveMQ.class); private Connection connection = null; private MessageProducer producer = null; private Session session = null; - + private ActiveMQ() { try { - MQActive configMQ = Config.mq().getActiveMQ(); - logger.info("MqActive initialize....."); - String queueName=configMQ.getQueueName(); - String url=configMQ.getUrl(); - url = url.trim(); - - String protocol = url.substring(0, 3); - if(protocol.equalsIgnoreCase("tcp")) { - ConnectionFactory factory=new ActiveMQConnectionFactory(url); - this.connection= factory.createConnection(); - this.connection.start(); - - this.session= this.connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - Destination destination=session.createQueue(queueName); - this.producer = session.createProducer(destination); - - }else { - String keyStore = configMQ.getKeyStore(); - String keyStorePassword = configMQ.getKeyStorePassword(); - String trustStore = configMQ.getTrustStore(); - - ActiveMQSslConnectionFactory sslConnectionFactory = new ActiveMQSslConnectionFactory(); - sslConnectionFactory.setBrokerURL(url); - sslConnectionFactory.setKeyAndTrustManagers(this.loadKeyManager(keyStore, keyStorePassword), this.loadTrustManager(trustStore), - new java.security.SecureRandom()); - this.connection = sslConnectionFactory.createConnection(); - this.connection.start(); - - this.session = this.connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - Destination destination = session.createQueue(queueName); - this.producer = session.createProducer(destination); - } - + MQActive configMQ = Config.mq().getActiveMQ(); + logger.info("MqActive initialize....."); + String queueName = configMQ.getQueueName(); + String url = configMQ.getUrl(); + url = url.trim(); + + String protocol = url.substring(0, 3); + if (protocol.equalsIgnoreCase("tcp")) { + ConnectionFactory factory = new ActiveMQConnectionFactory(url); + this.connection = factory.createConnection(); + this.connection.start(); + + this.session = this.connection.createSession(false, Session.AUTO_ACKNOWLEDGE); + Destination destination = session.createQueue(queueName); + this.producer = session.createProducer(destination); + + } else { + String keyStore = configMQ.getKeyStore(); + String keyStorePassword = configMQ.getKeyStorePassword(); + String trustStore = configMQ.getTrustStore(); + + ActiveMQSslConnectionFactory sslConnectionFactory = new ActiveMQSslConnectionFactory(); + sslConnectionFactory.setBrokerURL(url); + sslConnectionFactory.setKeyAndTrustManagers(this.loadKeyManager(keyStore, keyStorePassword), + this.loadTrustManager(trustStore), new java.security.SecureRandom()); + this.connection = sslConnectionFactory.createConnection(); + this.connection.start(); + + this.session = this.connection.createSession(false, Session.AUTO_ACKNOWLEDGE); + Destination destination = session.createQueue(queueName); + this.producer = session.createProducer(destination); + } + } catch (Exception e) { e.printStackTrace(); logger.error(e); } - + + } + + private static class MQHolder { + private static ActiveMQ instance = new ActiveMQ(); + } + + public static ActiveMQ getInstance() { + return MQHolder.instance; + } + + public static void main(String[] args) { + ActiveMQ MQClient = getInstance(); + Message msg = new Message(); + msg.setBody("body"); + msg.setConsumed(false); + msg.setCreateTime(new Date()); + msg.setPerson("person"); + MQClient.sendMessage(msg); } - - private static class MQHolder{ - private static ActiveMQ instance = new ActiveMQ(); - } - - - public static ActiveMQ getInstance(){ - return MQHolder.instance; - } - - - public static void main(String[] args) { - ActiveMQ MQClient = getInstance(); - Message msg = new Message(); - msg.setBody("body"); - msg.setConsumed(false); - msg.setCreateTime(new Date()); - msg.setPerson("person"); - MQClient.sendMessage(msg); - } @Override public boolean sendMessage(Message message) { - try { - Gson gson = new Gson(); - String msg = gson.toJson(message); - TextMessage textMessage= this.session.createTextMessage(msg); - this.producer.send(textMessage); - } catch (Exception e) { - e.printStackTrace(); - logger.error(e); - return false; - } finally { - - } + try { + Gson gson = new Gson(); + String msg = gson.toJson(message); + TextMessage textMessage = this.session.createTextMessage(msg); + this.producer.send(textMessage); + } catch (Exception e) { + e.printStackTrace(); + logger.error(e); + return false; + } finally { + + } return true; } @@ -117,49 +115,53 @@ public class ActiveMQ implements MQInterface { logger.info("MqActive destroy....."); this.connection.close(); } catch (JMSException e) { - e.printStackTrace(); - logger.error(e); + e.printStackTrace(); + logger.error(e); } } - - - /** - * 加载证书文件 - * @param trustStore - * @return - * @throws java.security.NoSuchAlgorithmException - * @throws java.security.KeyStoreException - * @throws java.io.IOException - * @throws java.security.GeneralSecurityException - */ - public static TrustManager[] loadTrustManager(String trustStore) throws java.security.NoSuchAlgorithmException, java.security.KeyStoreException, - java.io.IOException, java.security.GeneralSecurityException { - KeyStore ks = KeyStore. getInstance("JKS"); - ks.load( new FileInputStream(trustStore), null); - TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory. getDefaultAlgorithm()); - tmf.init(ks); - return tmf.getTrustManagers(); - } - - /** - * 加载密钥文件 - * @param keyStore - * @param keyStorePassword - * @return - * @throws java.security.NoSuchAlgorithmException - * @throws java.security.KeyStoreException - * @throws java.security.GeneralSecurityException - * @throws java.security.cert.CertificateException - * @throws java.io.IOException - * @throws java.security.UnrecoverableKeyException - */ - public static KeyManager[] loadKeyManager(String keyStore, String keyStorePassword) throws java.security.NoSuchAlgorithmException, - java.security.KeyStoreException, java.security.GeneralSecurityException, java.security.cert.CertificateException, java.io.IOException, - java.security.UnrecoverableKeyException { - KeyStore ks = KeyStore. getInstance("JKS"); - ks.load( new FileInputStream(keyStore), keyStorePassword.toCharArray()); - KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory. getDefaultAlgorithm()); - kmf.init(ks, keyStorePassword.toCharArray()); - return kmf.getKeyManagers(); - } + + /** + * 加载证书文件 + * + * @param trustStore + * @return + * @throws java.security.NoSuchAlgorithmException + * @throws java.security.KeyStoreException + * @throws java.io.IOException + * @throws java.security.GeneralSecurityException + */ + public static TrustManager[] loadTrustManager(String trustStore) throws java.security.NoSuchAlgorithmException, + java.security.KeyStoreException, java.io.IOException, java.security.GeneralSecurityException { + KeyStore ks = KeyStore.getInstance("JKS"); + try (FileInputStream fis = new FileInputStream(trustStore)) { + ks.load(fis, null); + } + TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); + tmf.init(ks); + return tmf.getTrustManagers(); + } + + /** + * 加载密钥文件 + * + * @param keyStore + * @param keyStorePassword + * @return + * @throws java.security.NoSuchAlgorithmException + * @throws java.security.KeyStoreException + * @throws java.security.GeneralSecurityException + * @throws java.security.cert.CertificateException + * @throws java.io.IOException + * @throws java.security.UnrecoverableKeyException + */ + public static KeyManager[] loadKeyManager(String keyStore, String keyStorePassword) + throws java.security.NoSuchAlgorithmException, java.security.KeyStoreException, + java.security.GeneralSecurityException, java.security.cert.CertificateException, java.io.IOException, + java.security.UnrecoverableKeyException { + KeyStore ks = KeyStore.getInstance("JKS"); + ks.load(new FileInputStream(keyStore), keyStorePassword.toCharArray()); + KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm()); + kmf.init(ks, keyStorePassword.toCharArray()); + return kmf.getKeyManagers(); + } } \ No newline at end of file diff --git a/o2server/x_mind_assemble_control/src/main/java/com/x/mind/assemble/common/date/DateOperation.java b/o2server/x_mind_assemble_control/src/main/java/com/x/mind/assemble/common/date/DateOperation.java index 592e27d848..f040d1b2a0 100644 --- a/o2server/x_mind_assemble_control/src/main/java/com/x/mind/assemble/common/date/DateOperation.java +++ b/o2server/x_mind_assemble_control/src/main/java/com/x/mind/assemble/common/date/DateOperation.java @@ -10,12 +10,13 @@ import java.util.List; import com.x.base.core.project.logger.Logger; import com.x.base.core.project.logger.LoggerFactory; - public class DateOperation { - - private Logger logger = LoggerFactory.getLogger( DateOperation.class); + + private Logger logger = LoggerFactory.getLogger(DateOperation.class); + /** * 根据样式得到格式化对象SimpleDateFormat + * * @param date * @param style * @return @@ -41,133 +42,150 @@ public class DateOperation { * @param date * @return HH:mm:ss */ - public String getTime(Date date) { + public String getTime(Date date) { return format2.format(date); } - public Date getDateFromString(String dateString, String style) throws Exception{ + public Date getDateFromString(String dateString, String style) throws Exception { Date date = null; - if(style==null||"".equals(style.trim())){ + if (style == null || "".equals(style.trim())) { date = format1.parse(dateString); - }else if( "yyyy-MM-dd HH:mm:ss".equalsIgnoreCase(style.trim())){ + } else if ("yyyy-MM-dd HH:mm:ss".equalsIgnoreCase(style.trim())) { date = format3.parse(dateString); - }else if( "yyyy-MM-dd HH:mm".equalsIgnoreCase(style.trim())){ + } else if ("yyyy-MM-dd HH:mm".equalsIgnoreCase(style.trim())) { date = format3_2.parse(dateString); - }else if( "yyyy/MM/dd HH:mm:ss".equalsIgnoreCase(style.trim())){ + } else if ("yyyy/MM/dd HH:mm:ss".equalsIgnoreCase(style.trim())) { date = format3_1.parse(dateString); - }else if( "yyyy/MM/dd".equalsIgnoreCase(style.trim())){ + } else if ("yyyy/MM/dd".equalsIgnoreCase(style.trim())) { date = format4.parse(dateString); - }else if( "yyyy-MM-dd".equalsIgnoreCase(style.trim())){ + } else if ("yyyy-MM-dd".equalsIgnoreCase(style.trim())) { date = format1.parse(dateString); - }else if( "yyyyMMdd".equalsIgnoreCase(style.trim())){ + } else if ("yyyyMMdd".equalsIgnoreCase(style.trim())) { date = format5.parse(dateString); - }else if( "yyyyMMddHHmmss".equalsIgnoreCase(style.trim())){ + } else if ("yyyyMMddHHmmss".equalsIgnoreCase(style.trim())) { date = format7.parse(dateString); - }else if( "HH:mm:ss".equalsIgnoreCase(style.trim())){ + } else if ("HH:mm:ss".equalsIgnoreCase(style.trim())) { date = format2.parse(dateString); - }else if( "HH:mm".equalsIgnoreCase(style.trim())){ + } else if ("HH:mm".equalsIgnoreCase(style.trim())) { date = format2_1.parse(dateString); - }else{ - throw new Exception( "对不起，您输入的日期style系统无法识别，请检查您的参数输入！" ); + } else { + throw new Exception("对不起，您输入的日期style系统无法识别，请检查您的参数输入！"); } return date; } - + /** - * 将字符串转换为日期格式 - * 会尝试多种格式转换，转换成功后返回结果 + * 将字符串转换为日期格式 会尝试多种格式转换，转换成功后返回结果 + * * @param dateString * @return * @throws Exception */ - public Date getDateFromString( String dateString ) throws Exception{ + public Date getDateFromString(String dateString) throws Exception { Date date = null; - try{ - date = getDateFromString( dateString, "yyyy-MM-dd HH:mm:ss" ); + try { + date = getDateFromString(dateString, "yyyy-MM-dd HH:mm:ss"); return date; - }catch(Exception e){} + } catch (Exception e) { + e.printStackTrace(); + } - try{ - date = getDateFromString( dateString, "yyyy-MM-dd HH:mm" ); + try { + date = getDateFromString(dateString, "yyyy-MM-dd HH:mm"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyy/MM/dd HH:mm:ss" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "yyyy/MM/dd HH:mm:ss"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyy-MM-dd" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "yyyy-MM-dd"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyy/MM/dd" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "yyyy/MM/dd"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyyMMdd" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "yyyyMMdd"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "yyyyMMddHHmmss" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "yyyyMMddHHmmss"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "HH:mm:ss" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "HH:mm:ss"); return date; - }catch(Exception e){} - - try{ - date = getDateFromString( dateString, "HH:mm" ); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + date = getDateFromString(dateString, "HH:mm"); return date; - }catch(Exception e){} - - throw new Exception( "the style of date has error, date:" + dateString ); + } catch (Exception e) { + e.printStackTrace(); + } + + throw new Exception("the style of date has error, date:" + dateString); } - - - public String getDateStringFromDate(Date date, String style) throws Exception{ + + public String getDateStringFromDate(Date date, String style) throws Exception { String dateString = null; - if(style==null||"".equals(style.trim())){ + if (style == null || "".equals(style.trim())) { dateString = format1.format(date); - }else if( "yyyy-MM-dd HH:mm:ss".equalsIgnoreCase(style.trim())){ + } else if ("yyyy-MM-dd HH:mm:ss".equalsIgnoreCase(style.trim())) { dateString = format3.format(date); - }else if( "yyyy/MM/dd HH:mm:ss".equalsIgnoreCase(style.trim())){ + } else if ("yyyy/MM/dd HH:mm:ss".equalsIgnoreCase(style.trim())) { dateString = format3_1.format(date); - }else if( "yyyy/MM/dd".equalsIgnoreCase(style.trim())){ + } else if ("yyyy/MM/dd".equalsIgnoreCase(style.trim())) { dateString = format4.format(date); - }else if( "yyyy-MM-dd".equalsIgnoreCase(style.trim())){ + } else if ("yyyy-MM-dd".equalsIgnoreCase(style.trim())) { dateString = format1.format(date); - }else if( "yyyyMMdd".equalsIgnoreCase(style.trim())){ + } else if ("yyyyMMdd".equalsIgnoreCase(style.trim())) { dateString = format5.format(date); - }else if( "yyyyMMddHHmmss".equalsIgnoreCase(style.trim())){ + } else if ("yyyyMMddHHmmss".equalsIgnoreCase(style.trim())) { dateString = format7.format(date); - }else if( "HH:mm:ss".equalsIgnoreCase(style.trim())){ + } else if ("HH:mm:ss".equalsIgnoreCase(style.trim())) { dateString = format2.format(date); - }else{ - throw new Exception( "对不起，您输入的日期style系统无法识别，请检查您的参数输入！style=" + style); + } else { + throw new Exception("对不起，您输入的日期style系统无法识别，请检查您的参数输入！style=" + style); } return dateString; } - + /** * 得到某日期加上或减去天数后的日期,day为负数时减去 * * @param date * @param month * @return "yyyy-MM-dd" - * @throws Exception + * @throws Exception */ - public String getDayAdd(String dateString, int day, String style) throws Exception { + public String getDayAdd(String dateString, int day, String style) throws Exception { Date date = getDateFromString(dateString, style); return getDayAdd(date, day); } - + /** * 得到某日期加上或减去天数后的日期,day为负数时减去 * @@ -175,7 +193,7 @@ public class DateOperation { * @param month * @return "yyyy-MM-dd" */ - public String getDayAdd(Date date, int day) { + public String getDayAdd(Date date, int day) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); calendar.add(Calendar.DATE, day); @@ -189,13 +207,13 @@ public class DateOperation { * @param month * @return "yyyy-MM-dd" */ - public String getMonthAdd(Date date, int month) { + public String getMonthAdd(Date date, int month) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); calendar.add(Calendar.MONTH, month); return format1.format(calendar.getTime()); } - + /** * 得到某日期加上或减去分钟后的日期,min为负数时减去 * @@ -203,54 +221,56 @@ public class DateOperation { * @param month * @return "yyyy-MM-dd HH:mi:ss" */ - public String getMinutesAdd(Date date, int min) { + public String getMinutesAdd(Date date, int min) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); calendar.add(Calendar.MINUTE, min); return format3.format(calendar.getTime()); } + /** * 得到某日期的日 * - * @param Date - * date + * @param Date date * @return */ - public String getDay(Date date) { - try{ + public String getDay(Date date) { + try { return format10.format(date); - }catch(Exception e){ + } catch (Exception e) { return "0"; } } + public int getDayNumber(Date date) { String result = null; - try{ + try { result = format10.format(date); - }catch(Exception e){ + } catch (Exception e) { result = "0"; } return Integer.parseInt(result); } + /** * 得到某日期的月份 * - * @param Date - * date + * @param Date date * @return */ - public String getMonth(Date date) { - try{ + public String getMonth(Date date) { + try { return format9.format(date); - }catch(Exception e){ + } catch (Exception e) { return "0"; } } + public int getMonthNumber(Date date) { String result = null; - try{ + try { result = format9.format(date); - }catch(Exception e){ + } catch (Exception e) { result = "0"; } return Integer.parseInt(result); @@ -259,70 +279,70 @@ public class DateOperation { /** * 得到某日期的年份 * - * @param Date - * date + * @param Date date * @return */ - public String getYear(Date date) { - try{ + public String getYear(Date date) { + try { return format8.format(date); - }catch(Exception e){ + } catch (Exception e) { return "0"; } } + public int getYearNumber(Date date) { String result = null; - try{ + try { result = format8.format(date); - }catch(Exception e){ + } catch (Exception e) { result = "0"; } return Integer.parseInt(result); } + /** * 得到某日期的小时 * - * @param Date - * date + * @param Date date * @return */ - public String getHour(Date date) { - try{ + public String getHour(Date date) { + try { return format11.format(date); - }catch(Exception e){ + } catch (Exception e) { return "0"; } } + /** * 得到某日期的分钟 * - * @param Date - * date + * @param Date date * @return */ - public String getMinites(Date date) { + public String getMinites(Date date) { return format12.format(date); } + /** * 得到某日期的秒 * - * @param Date - * date + * @param Date date * @return */ - public String getSeconds(Date date) { + public String getSeconds(Date date) { return format13.format(date); } + /** * 得到某年有多少天 * - * @param String - * date "yyyy-MM-dd" + * @param String date "yyyy-MM-dd" * @return * @throws ParseException */ @SuppressWarnings("static-access") - public int getDaysForYear(String date) throws ParseException { + public int getDaysForYear(String date) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(format1.parse(date)); return calendar.get(calendar.DAY_OF_YEAR); @@ -331,13 +351,12 @@ public class DateOperation { /** * 得到某年有多少天 * - * @param Date - * date + * @param Date date * @return * @throws ParseException */ @SuppressWarnings("static-access") - public int getDaysForYear(Date date) throws ParseException { + public int getDaysForYear(Date date) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); return calendar.get(calendar.DAY_OF_YEAR); @@ -346,13 +365,12 @@ public class DateOperation { /** * 得到某年有多少天 * - * @param String - * year "yyyy" + * @param String year "yyyy" * @return * @throws ParseException */ @SuppressWarnings("static-access") - public int getDaysForYear_YYYY(String year) throws ParseException { + public int getDaysForYear_YYYY(String year) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(format8.parse(year)); return calendar.get(calendar.DAY_OF_YEAR); @@ -361,27 +379,25 @@ public class DateOperation { /** * 得到某月有多少天 * - * @param String - * date "yyyy-MM-dd" + * @param String date "yyyy-MM-dd" * @return * @throws ParseException */ - public int getDaysForMonth(String date) throws ParseException { + public int getDaysForMonth(String date) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(format1.parse(date)); - return calendar.getActualMaximum( Calendar.DAY_OF_MONTH); + return calendar.getActualMaximum(Calendar.DAY_OF_MONTH); } /** * 得到某月有多少天 * - * @param String - * date "yyyy-MM" + * @param String date "yyyy-MM" * @return * @throws ParseException */ @SuppressWarnings("static-access") - public int getDaysForMonth_MM(String date) throws ParseException { + public int getDaysForMonth_MM(String date) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(format14.parse(date)); return calendar.get(calendar.DAY_OF_MONTH); @@ -390,12 +406,11 @@ public class DateOperation { /** * 得到某月有多少天 * - * @param Date - * date + * @param Date date * @return * @throws ParseException */ - public int getDaysForMonth(Date date) throws ParseException { + public int getDaysForMonth(Date date) throws ParseException { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); return calendar.get(Calendar.DAY_OF_MONTH); @@ -406,7 +421,7 @@ public class DateOperation { * * @return */ - public String getNowDate() { + public String getNowDate() { return format1.format(new Date()); } @@ -415,63 +430,69 @@ public class DateOperation { * * @return */ - public String getNowTime() { + public String getNowTime() { return format2.format(new Date()); } + /** - * 得到当前的时间 - * yyyyMMddHHmmss + * 得到当前的时间 yyyyMMddHHmmss + * * @return */ - public String getNowTimeChar() { + public String getNowTimeChar() { return format7.format(new Date()); } + /** - * 得到当前的时间 - * yyyy-MM-dd HH:mm:ss + * 得到当前的时间 yyyy-MM-dd HH:mm:ss + * * @return */ - public String getNowDateTime() { + public String getNowDateTime() { return format3.format(new Date()); } + /** * 得到两个时间之前的分差 + * * @param date1 yyyy-MM-dd HH:mm:ss * @param date2 yyyy-MM-dd HH:mm:ss * @return */ - public long getDeff(String date1,String date2) { + public long getDeff(String date1, String date2) { long dayNumber = 0; // 1小时=60分钟=3600秒=3600000 long mins = 60L * 1000L; // long day= 24L * 60L * 60L * 1000L;计算天数之差 SimpleDateFormat df = null; - if(date1.length() == 19){ - df = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ); - }else if(date1.length() == 10){ - df = new SimpleDateFormat( "yyyy-MM-dd" ); - }else if(date1.length() == 8){ - df = new SimpleDateFormat( "HH:mm:ss" ); - }else{ - df = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ); + if (date1.length() == 19) { + df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + } else if (date1.length() == 10) { + df = new SimpleDateFormat("yyyy-MM-dd"); + } else if (date1.length() == 8) { + df = new SimpleDateFormat("HH:mm:ss"); + } else { + df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); } try { java.util.Date d1 = df.parse(date1); java.util.Date d2 = df.parse(date2); dayNumber = (d2.getTime() - d1.getTime()) / mins; } catch (Exception e) { - logger.warn( "系统获取得到两个时间之前的分差发生异常" ); + logger.warn("系统获取得到两个时间之前的分差发生异常"); logger.error(e); } return dayNumber; } + /** * 得到两个时间之前的分差 + * * @param date1 yyyy-MM-dd HH:mm:ss * @param date2 yyyy-MM-dd HH:mm:ss * @return */ - public long getDiff(Date date1,Date date2) { + public long getDiff(Date date1, Date date2) { long dayNumber = 0; // 1小时=60分钟=3600秒=3600000 long mins = 60L * 1000L; @@ -479,76 +500,76 @@ public class DateOperation { try { dayNumber = (date2.getTime() - date1.getTime()) / mins; } catch (Exception e) { - logger.warn( "系统获取得到两个时间之前的分差发生异常"); + logger.warn("系统获取得到两个时间之前的分差发生异常"); logger.error(e); } return dayNumber; } + /** * - * 日期格式转换 - * 从YYYY-MM-DD转换到YYYYMMDD + * 日期格式转换 从YYYY-MM-DD转换到YYYYMMDD + * * @param date - * @throws ParseException + * @throws ParseException */ - public String changeDateFormat(String dateString){ + public String changeDateFormat(String dateString) { Date date; String reslut = null; try { - if( "".equals(dateString)){ - dateString="0000-00-00"; + if ("".equals(dateString)) { + dateString = "0000-00-00"; } date = format1.parse(dateString); reslut = format5.format(date); } catch (ParseException e) { try { - date = format1.parse( "0000-00-00" ); + date = format1.parse("0000-00-00"); } catch (ParseException e1) { - logger.warn( "系统日期格式转换发生异常" ); + logger.warn("系统日期格式转换发生异常"); logger.error(e); } - logger.warn( "系统日期格式转换发生异常"); + logger.warn("系统日期格式转换发生异常"); logger.error(e); } - + return reslut; } - + /** 格式 yyyy-MM-dd */ - public final SimpleDateFormat format1 = new SimpleDateFormat( "yyyy-MM-dd" ); + public final SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd"); /** 格式 HH:mm:ss */ - public final SimpleDateFormat format2 = new SimpleDateFormat( "HH:mm:ss" ); - public final SimpleDateFormat format2_1 = new SimpleDateFormat( "HH:mm" ); + public final SimpleDateFormat format2 = new SimpleDateFormat("HH:mm:ss"); + public final SimpleDateFormat format2_1 = new SimpleDateFormat("HH:mm"); /** 格式 yyyy-MM-dd HH:mm:ss */ - public final SimpleDateFormat format3 = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ); - public final SimpleDateFormat format3_2 = new SimpleDateFormat( "yyyy-MM-dd HH:mm" ); - public final SimpleDateFormat format3_1 = new SimpleDateFormat( "yyyy/MM/dd HH:mm:ss" ); + public final SimpleDateFormat format3 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public final SimpleDateFormat format3_2 = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + public final SimpleDateFormat format3_1 = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); /** 格式 yyyy/MM/dd */ - public final SimpleDateFormat format4 = new SimpleDateFormat( "yyyy/MM/dd" ); + public final SimpleDateFormat format4 = new SimpleDateFormat("yyyy/MM/dd"); /** 格式 yyyyMMdd */ - public final SimpleDateFormat format5 = new SimpleDateFormat( "yyyyMMdd" ); + public final SimpleDateFormat format5 = new SimpleDateFormat("yyyyMMdd"); /** 格式 HHmmss */ - public final SimpleDateFormat format6 = new SimpleDateFormat( "HHmmss" ); + public final SimpleDateFormat format6 = new SimpleDateFormat("HHmmss"); /** 格式 yyyyMMddHHmmss */ - public final SimpleDateFormat format7 = new SimpleDateFormat( "yyyyMMddHHmmss" ); + public final SimpleDateFormat format7 = new SimpleDateFormat("yyyyMMddHHmmss"); /** 格式 yyyy */ - public final SimpleDateFormat format8 = new SimpleDateFormat( "yyyy" ); + public final SimpleDateFormat format8 = new SimpleDateFormat("yyyy"); /** 格式 MM */ - public final SimpleDateFormat format9 = new SimpleDateFormat( "MM" ); + public final SimpleDateFormat format9 = new SimpleDateFormat("MM"); /** 格式 dd */ - public final SimpleDateFormat format10 = new SimpleDateFormat( "dd" ); + public final SimpleDateFormat format10 = new SimpleDateFormat("dd"); /** 格式 HH */ - public final SimpleDateFormat format11 = new SimpleDateFormat( "HH" ); + public final SimpleDateFormat format11 = new SimpleDateFormat("HH"); /** 格式 mm */ - public final SimpleDateFormat format12 = new SimpleDateFormat( "mm" ); + public final SimpleDateFormat format12 = new SimpleDateFormat("mm"); /** 格式 ss */ - public final SimpleDateFormat format13 = new SimpleDateFormat( "ss" ); + public final SimpleDateFormat format13 = new SimpleDateFormat("ss"); /** 格式 ss */ - public final SimpleDateFormat format14 = new SimpleDateFormat( "yyyy-MM" ); - - - public String getStartOfWeek(String dateString){ - SimpleDateFormat format = new SimpleDateFormat( "yyyy-MM-dd" ); + public final SimpleDateFormat format14 = new SimpleDateFormat("yyyy-MM"); + + public String getStartOfWeek(String dateString) { + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); try { Date date = format.parse(dateString); Calendar cal = Calendar.getInstance(); @@ -558,179 +579,181 @@ public class DateOperation { if (0 == tmp) { tmp = 7; } - cal.add(Calendar.DATE, -(tmp-1)); - return getDateStringFromDate(cal.getTime(), "yyyy-MM-dd" ) + " 00:00:00"; + cal.add(Calendar.DATE, -(tmp - 1)); + return getDateStringFromDate(cal.getTime(), "yyyy-MM-dd") + " 00:00:00"; } catch (ParseException e) { - logger.warn( "系统getStartOfWeek日期格式转换发生异常"); + logger.warn("系统getStartOfWeek日期格式转换发生异常"); logger.error(e); } catch (Exception e) { - logger.warn( "系统getStartOfWeek发生异常"); + logger.warn("系统getStartOfWeek发生异常"); logger.error(e); } return null; } - - public String getEndOfWeek(String dateString){ + + public String getEndOfWeek(String dateString) { try { - Date date = getDateFromString(getStartOfWeek(dateString), "yyyy-MM-dd HH:mm:ss" ); + Date date = getDateFromString(getStartOfWeek(dateString), "yyyy-MM-dd HH:mm:ss"); Calendar cal = Calendar.getInstance(); cal.setTime(date); cal.setFirstDayOfWeek(Calendar.MONDAY); cal.add(Calendar.DATE, 6); - return getDateStringFromDate(cal.getTime(), "yyyy-MM-dd" ) + " 23:59:59"; + return getDateStringFromDate(cal.getTime(), "yyyy-MM-dd") + " 23:59:59"; } catch (ParseException e) { - logger.warn( "系统getEndOfWeek日期格式转换发生异常"); + logger.warn("系统getEndOfWeek日期格式转换发生异常"); logger.error(e); } catch (Exception e) { - logger.warn( "系统getEndOfWeek发生异常"); + logger.warn("系统getEndOfWeek发生异常"); logger.error(e); } return null; } - - - + /** * 将时间格式转换为 **月**日**时**分的格式 + * * @param dateString * @param style * @return * @throws Exception */ - public String getDateCNString( String dateString, String style ) throws Exception{ + public String getDateCNString(String dateString, String style) throws Exception { StringBuffer ch_date_string = new StringBuffer(); Date _date = null; - try{ - _date = getDateFromString( dateString, style ); - }catch(Exception e){ - logger.warn( "系统getDateCNString日期格式转换发生异常"); + try { + _date = getDateFromString(dateString, style); + } catch (Exception e) { + logger.warn("系统getDateCNString日期格式转换发生异常"); logger.error(e); } - if(_date == null ){ + if (_date == null) { _date = new Date(); } - String year = getYear( _date ); - String month = getMonth( _date ); - String day = getDay( _date ); - String hour = getHour( _date ); - String min = getMinites( _date ); - ch_date_string.append( year ); - ch_date_string.append( "年" ); - ch_date_string.append( month ); - ch_date_string.append( "月" ); - ch_date_string.append( day ); - ch_date_string.append( "日" ); - ch_date_string.append( hour ); - ch_date_string.append( "时" ); - ch_date_string.append( min ); - ch_date_string.append( "分" ); + String year = getYear(_date); + String month = getMonth(_date); + String day = getDay(_date); + String hour = getHour(_date); + String min = getMinites(_date); + ch_date_string.append(year); + ch_date_string.append("年"); + ch_date_string.append(month); + ch_date_string.append("月"); + ch_date_string.append(day); + ch_date_string.append("日"); + ch_date_string.append(hour); + ch_date_string.append("时"); + ch_date_string.append(min); + ch_date_string.append("分"); return ch_date_string.toString(); } - + /** * 将时间格式转换为 **月**日**时**分**秒 的格式 + * * @param dateString * @param style * @return * @throws Exception */ - public String getDateCNString2( String dateString, String style ) throws Exception{ + public String getDateCNString2(String dateString, String style) throws Exception { StringBuffer ch_date_string = new StringBuffer(); Date _date = null; - try{ - _date = getDateFromString( dateString, style ); - }catch(Exception e){ - logger.warn( "系统getDateCNString2日期格式转换发生异常"); + try { + _date = getDateFromString(dateString, style); + } catch (Exception e) { + logger.warn("系统getDateCNString2日期格式转换发生异常"); logger.error(e); } - if(_date == null ){ + if (_date == null) { _date = new Date(); } - String year = getYear( _date ); - String month = getMonth( _date ); - String day = getDay( _date ); - String hour = getHour( _date ); - String min = getMinites( _date ); - String sec = getSeconds( _date ); - ch_date_string.append( year ); - ch_date_string.append( "年" ); - ch_date_string.append( month ); - ch_date_string.append( "月" ); - ch_date_string.append( day ); - ch_date_string.append( "日" ); - ch_date_string.append( hour ); - ch_date_string.append( "时" ); - ch_date_string.append( min ); - ch_date_string.append( "分" ); - ch_date_string.append( sec ); - ch_date_string.append( "秒" ); + String year = getYear(_date); + String month = getMonth(_date); + String day = getDay(_date); + String hour = getHour(_date); + String min = getMinites(_date); + String sec = getSeconds(_date); + ch_date_string.append(year); + ch_date_string.append("年"); + ch_date_string.append(month); + ch_date_string.append("月"); + ch_date_string.append(day); + ch_date_string.append("日"); + ch_date_string.append(hour); + ch_date_string.append("时"); + ch_date_string.append(min); + ch_date_string.append("分"); + ch_date_string.append(sec); + ch_date_string.append("秒"); return ch_date_string.toString(); } - + /** - * 获取日期在一年中的周数 - * 结果从1开始 + * 获取日期在一年中的周数 结果从1开始 + * * @param dateString yyyy-mm-dd * @return */ - public int getWeekNumOfYear( String dateString ){ + public int getWeekNumOfYear(String dateString) { try { - Date date = getDateFromString( dateString , "yyyy-MM-dd" ); + Date date = getDateFromString(dateString, "yyyy-MM-dd"); Calendar cal = Calendar.getInstance(); cal.setTime(date); - cal.setFirstDayOfWeek(2);//设置每周的第一天是星期一 - return cal.get( Calendar.WEEK_OF_YEAR ); + cal.setFirstDayOfWeek(2);// 设置每周的第一天是星期一 + return cal.get(Calendar.WEEK_OF_YEAR); } catch (ParseException e) { - logger.warn( "系统getWeekNumOfYear日期格式转换发生异常"); + logger.warn("系统getWeekNumOfYear日期格式转换发生异常"); logger.error(e); } catch (Exception e) { - logger.warn( "系统getWeekNumOfYear发生异常"); + logger.warn("系统getWeekNumOfYear发生异常"); logger.error(e); } return -1; } - + /** - * 获取日期在一年中的周数 - * 结果从1开始 + * 获取日期在一年中的周数 结果从1开始 + * * @param dateString yyyy-mm-dd * @return */ - public int getWeekNumOfYear( Date date ){ + public int getWeekNumOfYear(Date date) { try { Calendar cal = Calendar.getInstance(); cal.setTime(date); - cal.setFirstDayOfWeek(2);//设置每周的第一天是星期一 - return cal.get( Calendar.WEEK_OF_YEAR ); + cal.setFirstDayOfWeek(2);// 设置每周的第一天是星期一 + return cal.get(Calendar.WEEK_OF_YEAR); } catch (Exception e) { - logger.warn( "系统getWeekNumOfYear发生异常"); + logger.warn("系统getWeekNumOfYear发生异常"); logger.error(e); } return -1; } - + /** * 判断是否周末 + * * @param recordDate * @return */ public boolean isWeekend(Date date) { Calendar cal = Calendar.getInstance(); - cal.setTime( date ); - if(cal.get(Calendar.DAY_OF_WEEK)==Calendar.SATURDAY||cal.get(Calendar.DAY_OF_WEEK)==Calendar.SUNDAY){ - return true; - } + cal.setTime(date); + if (cal.get(Calendar.DAY_OF_WEEK) == Calendar.SATURDAY || cal.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) { + return true; + } return false; } - - public long getMinutes( Date date1, Date data2){ - long l=data2.getTime()-date1.getTime(); - long min=((l/(60*1000))); - return min; + + public long getMinutes(Date date1, Date data2) { + long l = data2.getTime() - date1.getTime(); + long min = ((l / (60 * 1000))); + return min; } /** * 根据提供的年份月份，获取当月所有的日期字符串：yyyy-mm-dd + * * @param s_year * @param _month * @return @@ -741,119 +764,129 @@ public class DateOperation { int year = 0; int month = 0; int days = 0; - try{ - year = Integer.parseInt( s_year ); - }catch(Exception e){ + try { + year = Integer.parseInt(s_year); + } catch (Exception e) { e.printStackTrace(); } - try{ - month = Integer.parseInt( _month ); - }catch(Exception e){ + try { + month = Integer.parseInt(_month); + } catch (Exception e) { e.printStackTrace(); } - cal.set(year, month-1, 1); + cal.set(year, month - 1, 1); days = cal.getActualMaximum(Calendar.DATE); - for( int i =1; i<= days ; i++){ - result.add( s_year + "-" + (month<10?"0"+month:month) + "-" + (i<10?"0"+i:i)); + for (int i = 1; i <= days; i++) { + result.add(s_year + "-" + (month < 10 ? "0" + month : month) + "-" + (i < 10 ? "0" + i : i)); } return result; } - + /** * 根据提供的两个时间之间所有的日期字符串：yyyy-mm-dd + * * @param startDate * @param endDate * @return - * @throws Exception + * @throws Exception */ - public List listDateStringBetweenDate( Date startDate, Date endDate ) throws Exception { + public List listDateStringBetweenDate(Date startDate, Date endDate) throws Exception { List result = new ArrayList(); Calendar cal = Calendar.getInstance(); - startDate = getDateFromString( getDateStringFromDate( startDate, "yyyy-MM-dd" ) ); - endDate = getDateFromString( getDateStringFromDate( endDate, "yyyy-MM-dd" ) + " 23:59:59" ); - cal.setTime( startDate ); - while( cal.getTime().before(endDate)){ - //logger.debug( getDateStringFromDate( cal.getTime(), "yyyy-MM-dd" ) ); - result.add( getDateStringFromDate( cal.getTime(), "yyyy-MM-dd" )); + startDate = getDateFromString(getDateStringFromDate(startDate, "yyyy-MM-dd")); + endDate = getDateFromString(getDateStringFromDate(endDate, "yyyy-MM-dd") + " 23:59:59"); + cal.setTime(startDate); + while (cal.getTime().before(endDate)) { + // logger.debug( getDateStringFromDate( cal.getTime(), "yyyy-MM-dd" ) ); + result.add(getDateStringFromDate(cal.getTime(), "yyyy-MM-dd")); cal.add(Calendar.DATE, 1); } return result; } - + /** * 获取日期所在月份的第一天 + * * @param recordDate * @return - * @throws Exception + * @throws Exception */ public Date getFirstDateInMonth(Date recordDate) throws Exception { String year = format8.format(recordDate); String month = format9.format(recordDate); - return getDateFromString( year + "-" + month + "-01" ); + return getDateFromString(year + "-" + month + "-01"); } - + /** * 获取日期所在月份的第一天 + * * @param recordDate yyyy-MM-dd * @return - * @throws Exception + * @throws Exception */ public String getFirstDateStringInMonth(Date recordDate) throws Exception { String year = format8.format(recordDate); String month = format9.format(recordDate); return year + "-" + month + "-01"; } - + /** * 获取当月的最后一日 + * * @param date * @return */ - public static Date getLastDayOfMonth(Date date) { - Calendar calendar = convert(date); - calendar.set(Calendar.DATE, calendar.getMaximum(Calendar.DATE)); - return calendar.getTime(); - } - /** - * 将日期转换为日历 - * @param date 日期 - * @return 日历 - */ - private static Calendar convert(Date date) { - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - return calendar; - } + public static Date getLastDayOfMonth(Date date) { + Calendar calendar = convert(date); + calendar.set(Calendar.DATE, calendar.getMaximum(Calendar.DATE)); + return calendar.getTime(); + } + + /** + * 将日期转换为日历 + * + * @param date 日期 + * @return 日历 + */ + private static Calendar convert(Date date) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + return calendar; + } + /** * 获取日期所在月份的第一天 + * * @param recordDate * @return - * @throws Exception + * @throws Exception */ public Date getLastDateInMonth(Date recordDate) throws Exception { Date lastDate = getLastDayOfMonth(recordDate); - return getDateFromString( getDateStringFromDate( lastDate, "yyyy-MM-dd" ) ); + return getDateFromString(getDateStringFromDate(lastDate, "yyyy-MM-dd")); } - + /** * 获取日期所在月份的第一天 + * * @param recordDate yyyy-MM-dd * @return - * @throws Exception + * @throws Exception */ public String getLastDateStringInMonth(Date recordDate) throws Exception { Date lastDate = getLastDayOfMonth(recordDate); - return getDateStringFromDate( lastDate, "yyyy-MM-dd" ); + return getDateStringFromDate(lastDate, "yyyy-MM-dd"); } /** * 获取今天开始的时间 + * * @return */ public Date getTodayStartTime() { String todayDateTime = getNowDate() + " 00:00:00"; try { - return getDateFromString( todayDateTime ); + return getDateFromString(todayDateTime); } catch (Exception e) { return new Date(); } diff --git a/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/BaseAction.java b/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/BaseAction.java index 6d162727df..88b5046e23 100644 --- a/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/BaseAction.java +++ b/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/BaseAction.java @@ -1,6 +1,9 @@ package com.x.organization.assemble.authentication.jaxrs.authentication; -import java.util.*; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.Date; +import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -8,6 +11,9 @@ import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.StringUtils; + import com.x.base.core.entity.JpaObject; import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.bean.NameValuePair; @@ -30,9 +36,6 @@ import com.x.organization.assemble.authentication.wrapout.WrapOutAuthentication; import com.x.organization.core.entity.Identity; import com.x.organization.core.entity.Person; -import org.apache.commons.lang3.BooleanUtils; -import org.apache.commons.lang3.StringUtils; - abstract class BaseAction extends StandardJaxrsAction { private static Logger logger = LoggerFactory.getLogger(BaseAction.class); @@ -71,7 +74,7 @@ abstract class BaseAction extends StandardJaxrsAction { EffectivePerson effectivePerson = new EffectivePerson(person.getDistinguishedName(), tokenType, Config.token().getCipher()); if ((null != request) && (null != response)) { - if(!isMoaTerminal(request)) { + if (!isMoaTerminal(request)) { String clientIp = HttpToken.remoteAddress(request); logger.debug("{} client ip is : {}", person.getDistinguishedName(), clientIp); if (!this.checkIp(clientIp, person.getIpAddress())) { @@ -164,13 +167,16 @@ abstract class BaseAction extends StandardJaxrsAction { } } - // private List listRole(Business business, String personId) throws Exception { - // List roles = new ArrayList<>(); - // for (Role o : business.entityManagerContainer().fetch(business.role().listWithPerson(personId), Role.class, - // ListTools.toList(Role.DISTINGUISHEDNAME))) { - // roles.add(o.getDistinguishedName()); - // } - // return roles; + // private List listRole(Business business, String personId) throws + // Exception { + // List roles = new ArrayList<>(); + // for (Role o : + // business.entityManagerContainer().fetch(business.role().listWithPerson(personId), + // Role.class, + // ListTools.toList(Role.DISTINGUISHEDNAME))) { + // roles.add(o.getDistinguishedName()); + // } + // return roles; // } private List listIdentity(Business business, String personId) throws Exception { @@ -207,13 +213,13 @@ abstract class BaseAction extends StandardJaxrsAction { String parameter = fillTokenParameter(oauthClient.getTokenParameter(), oauthClient, redirectUri, code); logger.debug("token post address:{}.", address); logger.debug("token post parameter:{}.", parameter); - + List heads = null; - //if (StringUtils.equalsIgnoreCase(oauthClient.getTokenType(), "form")) { - heads = new ArrayList<>(); - heads.add(new NameValuePair("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8")); - //} - + // if (StringUtils.equalsIgnoreCase(oauthClient.getTokenType(), "form")) { + heads = new ArrayList<>(); + heads.add(new NameValuePair("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8")); + // } + String str = HttpConnection.postAsString(address, heads, parameter); return str; } @@ -289,57 +295,59 @@ abstract class BaseAction extends StandardJaxrsAction { } } - protected boolean checkIp(String clientIp, String ipAddress){ + protected boolean checkIp(String clientIp, String ipAddress) { boolean returnValue = true; - if(StringUtils.isNotEmpty(clientIp) && StringUtils.isNotEmpty(ipAddress)){ + if (StringUtils.isNotEmpty(clientIp) && StringUtils.isNotEmpty(ipAddress)) { try { String[] ipAddressArr = StringUtils.split(ipAddress, ","); for (String regIp : ipAddressArr) { - if(StringUtils.isNotEmpty(regIp)) { + if (StringUtils.isNotEmpty(regIp)) { Pattern pattern = Pattern.compile(regIp.trim()); Matcher matcher = pattern.matcher(clientIp); returnValue = matcher.find(); - if(returnValue){ + if (returnValue) { break; } } } } catch (Exception e) { + logger.error(e); } } return returnValue; } - protected boolean isMoaTerminal(HttpServletRequest request){ + protected boolean isMoaTerminal(HttpServletRequest request) { String xClient = request.getHeader("x-client"); - if(StringUtils.isNotBlank(xClient)){ + if (StringUtils.isNotBlank(xClient)) { xClient = xClient.toLowerCase(); if (xClient.indexOf("android") != -1) { - //安卓 + // 安卓 return true; } if (xClient.indexOf("ios") != -1) { - //安卓 + // 安卓 return true; } } String userAgent = request.getHeader("User-Agent"); - if(StringUtils.isNotBlank(userAgent)) { + if (StringUtils.isNotBlank(userAgent)) { userAgent = userAgent.toLowerCase(); if (userAgent.indexOf("micromessenger") != -1) { - //微信 + // 微信 return true; } if (userAgent.indexOf("dingtalk") != -1) { - //钉钉 + // 钉钉 return true; } if (userAgent.indexOf("android") != -1) { - //安卓 + // 安卓 return true; } - if (userAgent.indexOf("iphone") != -1 || userAgent.indexOf("ipad") != -1 || userAgent.indexOf("ipod") != -1) { - //苹果 + if (userAgent.indexOf("iphone") != -1 || userAgent.indexOf("ipad") != -1 + || userAgent.indexOf("ipod") != -1) { + // 苹果 return true; } } diff --git a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/ActionApplication.java b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/ActionApplication.java index 8eea1abf30..042a0f2a28 100644 --- a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/ActionApplication.java +++ b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/ActionApplication.java @@ -6,7 +6,6 @@ import javax.ws.rs.ApplicationPath; import com.x.base.core.project.jaxrs.AbstractActionApplication; import com.x.organization.assemble.control.jaxrs.export.ExportAction; -import com.x.organization.assemble.control.jaxrs.function.FunctionAction; import com.x.organization.assemble.control.jaxrs.group.GroupAction; import com.x.organization.assemble.control.jaxrs.identity.IdentityAction; import com.x.organization.assemble.control.jaxrs.inputperson.InputPersonAction; @@ -29,7 +28,7 @@ public class ActionApplication extends AbstractActionApplication { classes.add(IdentityAction.class); classes.add(GroupAction.class); classes.add(RoleAction.class); - classes.add(FunctionAction.class); + // classes.add(FunctionAction.class); classes.add(LoginRecordAction.class); classes.add(InputPersonAction.class); classes.add(UnitAction.class); diff --git a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/function/ActionCreatePassword.java b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/function/ActionCreatePassword.java index 303837349b..b905d147e9 100644 --- a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/function/ActionCreatePassword.java +++ b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/function/ActionCreatePassword.java @@ -1,55 +1,55 @@ -package com.x.organization.assemble.control.jaxrs.function; - -import java.util.List; -import java.util.Objects; - -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; - -import org.apache.commons.beanutils.PropertyUtils; -import org.apache.commons.lang3.StringUtils; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.project.config.Config; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.WrapOutCount; -import com.x.base.core.project.tools.Crypto; -import com.x.organization.core.entity.Person; - -public class ActionCreatePassword { - - protected ActionResult execute(String attribute) throws Exception { - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - ActionResult result = new ActionResult<>(); - if (!StringUtils.equals(attribute, "password")) { - EntityManager em = emc.beginTransaction(Person.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(Person.class); - Root root = cq.from(Person.class); - cq.select(root); - List list = em.createQuery(cq).getResultList(); - for (Person o : list) { - Object obj = PropertyUtils.getProperty(o, attribute); - if (null == obj) { - throw new Exception("person{name:" + o.getName() + "} can not create password."); - } - String str = Objects.toString(obj); - if (StringUtils.isEmpty(str)) { - throw new Exception("person{name:" + o.getName() + "} can not create empty password."); - } - String value = Crypto.encrypt(str, Config.token().getKey()); - PropertyUtils.setProperty(o, "password", value); - } - emc.commit(); - WrapOutCount wrap = new WrapOutCount(); - wrap.setCount(list.size()); - result.setData(wrap); - } - return result; - } - } - -} +//package com.x.organization.assemble.control.jaxrs.function; +// +//import java.util.List; +//import java.util.Objects; +// +//import javax.persistence.EntityManager; +//import javax.persistence.criteria.CriteriaBuilder; +//import javax.persistence.criteria.CriteriaQuery; +//import javax.persistence.criteria.Root; +// +//import org.apache.commons.beanutils.PropertyUtils; +//import org.apache.commons.lang3.StringUtils; +// +//import com.x.base.core.container.EntityManagerContainer; +//import com.x.base.core.container.factory.EntityManagerContainerFactory; +//import com.x.base.core.project.config.Config; +//import com.x.base.core.project.http.ActionResult; +//import com.x.base.core.project.http.WrapOutCount; +//import com.x.base.core.project.tools.Crypto; +//import com.x.organization.core.entity.Person; +// +//public class ActionCreatePassword { +// +// protected ActionResult execute(String attribute) throws Exception { +// try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { +// ActionResult result = new ActionResult<>(); +// if (!StringUtils.equals(attribute, "password")) { +// EntityManager em = emc.beginTransaction(Person.class); +// CriteriaBuilder cb = em.getCriteriaBuilder(); +// CriteriaQuery cq = cb.createQuery(Person.class); +// Root root = cq.from(Person.class); +// cq.select(root); +// List list = em.createQuery(cq).getResultList(); +// for (Person o : list) { +// Object obj = PropertyUtils.getProperty(o, attribute); +// if (null == obj) { +// throw new Exception("person{name:" + o.getName() + "} can not create password."); +// } +// String str = Objects.toString(obj); +// if (StringUtils.isEmpty(str)) { +// throw new Exception("person{name:" + o.getName() + "} can not create empty password."); +// } +// String value = Crypto.encrypt(str, Config.token().getKey()); +// PropertyUtils.setProperty(o, "password", value); +// } +// emc.commit(); +// WrapOutCount wrap = new WrapOutCount(); +// wrap.setCount(list.size()); +// result.setData(wrap); +// } +// return result; +// } +// } +// +//} diff --git a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/function/ActionListAllPersonName.java b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/function/ActionListAllPersonName.java index 6ef7db7a5d..4ffc4ade55 100644 --- a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/function/ActionListAllPersonName.java +++ b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/function/ActionListAllPersonName.java @@ -1,35 +1,35 @@ -package com.x.organization.assemble.control.jaxrs.function; - -import java.util.ArrayList; -import java.util.List; - -import javax.persistence.EntityManager; -import javax.persistence.Tuple; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.project.http.WrapInStringList; -import com.x.organization.assemble.control.Business; -import com.x.organization.core.entity.Person; - -public class ActionListAllPersonName { - - protected List execute(Business business, WrapInStringList wrapIn) throws Exception { - EntityManagerContainer emc = business.entityManagerContainer(); - EntityManager em = emc.get(Person.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(Tuple.class); - Root root = cq.from(Person.class); - List> selections = new ArrayList<>(); - for (String str : wrapIn.getValueList()) { - selections.add(root.get(str)); - } - cq.multiselect(selections); - List wraps = em.createQuery(cq).getResultList(); - return wraps; - } - -} +//package com.x.organization.assemble.control.jaxrs.function; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import javax.persistence.EntityManager; +//import javax.persistence.Tuple; +//import javax.persistence.criteria.CriteriaBuilder; +//import javax.persistence.criteria.CriteriaQuery; +//import javax.persistence.criteria.Root; +//import javax.persistence.criteria.Selection; +// +//import com.x.base.core.container.EntityManagerContainer; +//import com.x.base.core.project.http.WrapInStringList; +//import com.x.organization.assemble.control.Business; +//import com.x.organization.core.entity.Person; +// +//public class ActionListAllPersonName { +// +// protected List execute(Business business, WrapInStringList wrapIn) throws Exception { +// EntityManagerContainer emc = business.entityManagerContainer(); +// EntityManager em = emc.get(Person.class); +// CriteriaBuilder cb = em.getCriteriaBuilder(); +// CriteriaQuery cq = cb.createQuery(Tuple.class); +// Root root = cq.from(Person.class); +// List> selections = new ArrayList<>(); +// for (String str : wrapIn.getValueList()) { +// selections.add(root.get(str)); +// } +// cq.multiselect(selections); +// List wraps = em.createQuery(cq).getResultList(); +// return wraps; +// } +// +//} diff --git a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/function/ActionSetPassword.java b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/function/ActionSetPassword.java index 829595317f..c3960deb37 100644 --- a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/function/ActionSetPassword.java +++ b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/function/ActionSetPassword.java @@ -1,40 +1,40 @@ -package com.x.organization.assemble.control.jaxrs.function; - -import com.x.base.core.project.cache.CacheManager; -import org.apache.commons.lang3.StringUtils; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.project.cache.ApplicationCache; -import com.x.base.core.project.exception.ExceptionWhen; -import com.x.base.core.project.http.WrapInString; -import com.x.base.core.project.http.WrapOutId; -import com.x.organization.assemble.control.Business; -import com.x.organization.core.entity.Person; - -public class ActionSetPassword { - - protected WrapOutId execute(Business business, String name, WrapInString wrapIn) throws Exception { - EntityManagerContainer emc = business.entityManagerContainer(); - String personId = business.person().getWithName(name, null); - if (StringUtils.isEmpty(personId)) { - personId = business.person().getWithUnique(name, null); - } - if (StringUtils.isEmpty(personId)) { - throw new Exception("can not find person:" + name); - } else { - if (StringUtils.isEmpty(wrapIn.getValue())) { - throw new Exception("new password is empty"); - } - Person person = emc.find(personId, Person.class, ExceptionWhen.not_found); - emc.beginTransaction(Person.class); - business.person().setPassword(person, wrapIn.getValue(),false); - emc.check(person, CheckPersistType.all); - emc.commit(); - CacheManager.notify(Person.class); - WrapOutId wrap = new WrapOutId(person.getId()); - return wrap; - } - } - -} +//package com.x.organization.assemble.control.jaxrs.function; +// +//import com.x.base.core.project.cache.CacheManager; +//import org.apache.commons.lang3.StringUtils; +// +//import com.x.base.core.container.EntityManagerContainer; +//import com.x.base.core.entity.annotation.CheckPersistType; +//import com.x.base.core.project.cache.ApplicationCache; +//import com.x.base.core.project.exception.ExceptionWhen; +//import com.x.base.core.project.http.WrapInString; +//import com.x.base.core.project.http.WrapOutId; +//import com.x.organization.assemble.control.Business; +//import com.x.organization.core.entity.Person; +// +//public class ActionSetPassword { +// +// protected WrapOutId execute(Business business, String name, WrapInString wrapIn) throws Exception { +// EntityManagerContainer emc = business.entityManagerContainer(); +// String personId = business.person().getWithName(name, null); +// if (StringUtils.isEmpty(personId)) { +// personId = business.person().getWithUnique(name, null); +// } +// if (StringUtils.isEmpty(personId)) { +// throw new Exception("can not find person:" + name); +// } else { +// if (StringUtils.isEmpty(wrapIn.getValue())) { +// throw new Exception("new password is empty"); +// } +// Person person = emc.find(personId, Person.class, ExceptionWhen.not_found); +// emc.beginTransaction(Person.class); +// business.person().setPassword(person, wrapIn.getValue(),false); +// emc.check(person, CheckPersistType.all); +// emc.commit(); +// CacheManager.notify(Person.class); +// WrapOutId wrap = new WrapOutId(person.getId()); +// return wrap; +// } +// } +// +//} diff --git a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/function/ActionSetText.java b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/function/ActionSetText.java index ada3e4d797..cd7c828e46 100644 --- a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/function/ActionSetText.java +++ b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/function/ActionSetText.java @@ -1,45 +1,45 @@ -package com.x.organization.assemble.control.jaxrs.function; - -import java.util.List; - -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; - -import org.apache.commons.beanutils.PropertyUtils; -import org.apache.commons.lang3.StringUtils; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.WrapOutCount; -import com.x.base.core.project.tools.Crypto; -import com.x.organization.core.entity.Person; - -public class ActionSetText { - - protected ActionResult execute(String attribute, String key) throws Exception { - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - ActionResult result = new ActionResult<>(); - if (!StringUtils.equals(attribute, "password")) { - EntityManager em = emc.beginTransaction(Person.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(Person.class); - Root root = cq.from(Person.class); - cq.select(root); - List list = em.createQuery(cq).getResultList(); - for (Person o : list) { - String value = Crypto.decrypt(o.getPassword(), key); - PropertyUtils.setProperty(o, attribute, value); - } - emc.commit(); - WrapOutCount wrap = new WrapOutCount(); - wrap.setCount(list.size()); - result.setData(wrap); - } - return result; - } - } - -} +//package com.x.organization.assemble.control.jaxrs.function; +// +//import java.util.List; +// +//import javax.persistence.EntityManager; +//import javax.persistence.criteria.CriteriaBuilder; +//import javax.persistence.criteria.CriteriaQuery; +//import javax.persistence.criteria.Root; +// +//import org.apache.commons.beanutils.PropertyUtils; +//import org.apache.commons.lang3.StringUtils; +// +//import com.x.base.core.container.EntityManagerContainer; +//import com.x.base.core.container.factory.EntityManagerContainerFactory; +//import com.x.base.core.project.http.ActionResult; +//import com.x.base.core.project.http.WrapOutCount; +//import com.x.base.core.project.tools.Crypto; +//import com.x.organization.core.entity.Person; +// +//public class ActionSetText { +// +// protected ActionResult execute(String attribute, String key) throws Exception { +// try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { +// ActionResult result = new ActionResult<>(); +// if (!StringUtils.equals(attribute, "password")) { +// EntityManager em = emc.beginTransaction(Person.class); +// CriteriaBuilder cb = em.getCriteriaBuilder(); +// CriteriaQuery cq = cb.createQuery(Person.class); +// Root root = cq.from(Person.class); +// cq.select(root); +// List list = em.createQuery(cq).getResultList(); +// for (Person o : list) { +// String value = Crypto.decrypt(o.getPassword(), key); +// PropertyUtils.setProperty(o, attribute, value); +// } +// emc.commit(); +// WrapOutCount wrap = new WrapOutCount(); +// wrap.setCount(list.size()); +// result.setData(wrap); +// } +// return result; +// } +// } +// +//} diff --git a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/function/FunctionAction.java b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/function/FunctionAction.java index b27d345ecc..80c128cd7a 100644 --- a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/function/FunctionAction.java +++ b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/function/FunctionAction.java @@ -1,110 +1,110 @@ -package com.x.organization.assemble.control.jaxrs.function; - -import java.util.ArrayList; -import java.util.List; - -import javax.persistence.Tuple; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.container.AsyncResponse; -import javax.ws.rs.container.Suspended; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.http.WrapInString; -import com.x.base.core.project.http.WrapInStringList; -import com.x.base.core.project.http.WrapOutCount; -import com.x.base.core.project.http.WrapOutId; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.organization.assemble.control.Business; - -@Path("function") -public class FunctionAction extends StandardJaxrsAction { - - // @HttpMethodDescribe(value = "获取人员指定信息.", response = WrapOutStringList.class) - @POST - @Path("list/person") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void listAllPersonName(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - WrapInStringList wrapIn) { - ActionResult> result = new ActionResult<>(); - List wraps = new ArrayList<>(); - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - Business business = new Business(emc); - wraps = new ActionListAllPersonName().execute(business, wrapIn); - result.setData(wraps); - } catch (Throwable th) { - th.printStackTrace(); - result.error(th); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - // @HttpMethodDescribe(value = "更新指定Person的Password.", request = - // WrapInString.class, response = WrapOutId.class) - @PUT - @Path("person/{name}/set/password") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void setPassword(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @PathParam("name") String name, WrapInString wrapIn) { - ActionResult result = new ActionResult<>(); - WrapOutId wrap = null; - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - Business business = new Business(emc); - wrap = new ActionSetPassword().execute(business, name, wrapIn); - result.setData(wrap); - } catch (Throwable th) { - th.printStackTrace(); - result.error(th); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - // @HttpMethodDescribe(response = WrapOutCount.class, value = "set text") - @GET - @Path("person/set/text/{attribute}/{key}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void setText(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @PathParam("attribute") String attribute, @PathParam("key") String key) { - ActionResult result = new ActionResult<>(); - try { - result = new ActionSetText().execute(attribute, key); - } catch (Throwable th) { - th.printStackTrace(); - result.error(th); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } - - // @HttpMethodDescribe(response = WrapOutCount.class, value = "create password") - @GET - @Path("person/create/password/{attribute}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void createPassword(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @PathParam("attribute") String attribute) { - ActionResult result = new ActionResult<>(); - try { - result = new ActionCreatePassword().execute(attribute); - } catch (Throwable th) { - th.printStackTrace(); - result.error(th); - } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); - } -} \ No newline at end of file +//package com.x.organization.assemble.control.jaxrs.function; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import javax.persistence.Tuple; +//import javax.servlet.http.HttpServletRequest; +//import javax.ws.rs.Consumes; +//import javax.ws.rs.GET; +//import javax.ws.rs.POST; +//import javax.ws.rs.PUT; +//import javax.ws.rs.Path; +//import javax.ws.rs.PathParam; +//import javax.ws.rs.Produces; +//import javax.ws.rs.container.AsyncResponse; +//import javax.ws.rs.container.Suspended; +//import javax.ws.rs.core.Context; +//import javax.ws.rs.core.MediaType; +//import javax.ws.rs.core.Response; +// +//import com.x.base.core.container.EntityManagerContainer; +//import com.x.base.core.container.factory.EntityManagerContainerFactory; +//import com.x.base.core.project.http.ActionResult; +//import com.x.base.core.project.http.HttpMediaType; +//import com.x.base.core.project.http.WrapInString; +//import com.x.base.core.project.http.WrapInStringList; +//import com.x.base.core.project.http.WrapOutCount; +//import com.x.base.core.project.http.WrapOutId; +//import com.x.base.core.project.jaxrs.ResponseFactory; +//import com.x.base.core.project.jaxrs.StandardJaxrsAction; +//import com.x.organization.assemble.control.Business; +// +//@Path("function") +//public class FunctionAction extends StandardJaxrsAction { +// +// // @HttpMethodDescribe(value = "获取人员指定信息.", response = WrapOutStringList.class) +// @POST +// @Path("list/person") +// @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) +// @Consumes(MediaType.APPLICATION_JSON) +// public void listAllPersonName(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, +// WrapInStringList wrapIn) { +// ActionResult> result = new ActionResult<>(); +// List wraps = new ArrayList<>(); +// try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { +// Business business = new Business(emc); +// wraps = new ActionListAllPersonName().execute(business, wrapIn); +// result.setData(wraps); +// } catch (Throwable th) { +// th.printStackTrace(); +// result.error(th); +// } +// asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); +// } +// +// // @HttpMethodDescribe(value = "更新指定Person的Password.", request = +// // WrapInString.class, response = WrapOutId.class) +// @PUT +// @Path("person/{name}/set/password") +// @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) +// @Consumes(MediaType.APPLICATION_JSON) +// public void setPassword(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, +// @PathParam("name") String name, WrapInString wrapIn) { +// ActionResult result = new ActionResult<>(); +// WrapOutId wrap = null; +// try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { +// Business business = new Business(emc); +// wrap = new ActionSetPassword().execute(business, name, wrapIn); +// result.setData(wrap); +// } catch (Throwable th) { +// th.printStackTrace(); +// result.error(th); +// } +// asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); +// } +// +// // @HttpMethodDescribe(response = WrapOutCount.class, value = "set text") +// @GET +// @Path("person/set/text/{attribute}/{key}") +// @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) +// @Consumes(MediaType.APPLICATION_JSON) +// public void setText(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, +// @PathParam("attribute") String attribute, @PathParam("key") String key) { +// ActionResult result = new ActionResult<>(); +// try { +// result = new ActionSetText().execute(attribute, key); +// } catch (Throwable th) { +// th.printStackTrace(); +// result.error(th); +// } +// asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); +// } +// +// // @HttpMethodDescribe(response = WrapOutCount.class, value = "create password") +// @GET +// @Path("person/create/password/{attribute}") +// @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) +// @Consumes(MediaType.APPLICATION_JSON) +// public void createPassword(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, +// @PathParam("attribute") String attribute) { +// ActionResult result = new ActionResult<>(); +// try { +// result = new ActionCreatePassword().execute(attribute); +// } catch (Throwable th) { +// th.printStackTrace(); +// result.error(th); +// } +// asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); +// } +//} \ No newline at end of file diff --git a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/personcard/ActionCreateCode.java b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/personcard/ActionCreateCode.java index 09a56b74ea..a37525d568 100644 --- a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/personcard/ActionCreateCode.java +++ b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/personcard/ActionCreateCode.java @@ -22,13 +22,9 @@ import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.jaxrs.WoFile; import com.x.organization.core.entity.PersonCard; - - - class ActionCreateCode extends BaseAction { - - //个人通讯录生成二维码。 + // 个人通讯录生成二维码。 ActionResult qrcode(EffectivePerson effectivePerson, String flag) throws Exception { try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { ActionResult result = new ActionResult<>(); @@ -36,100 +32,98 @@ class ActionCreateCode extends BaseAction { if (null == personCard) { throw new ExceptionPersonCardNotExist(flag); } - - String fname = personCard.getId()+".png"; - String content = "BEGIN:VCARD\n" + - "VERSION:3.0\n" + - "N:"+personCard.getName()+"\n"; - - if(!personCard.getOfficePhone().equals("")){ - content = content+"TEL:"+personCard.getOfficePhone()+"\n"; + + String fname = personCard.getId() + ".png"; + String content = "BEGIN:VCARD\n" + "VERSION:3.0\n" + "N:" + personCard.getName() + "\n"; + + if (!personCard.getOfficePhone().equals("")) { + content = content + "TEL:" + personCard.getOfficePhone() + "\n"; } - if(!personCard.getMobile().equals("")){ - content = content+"TEL;CELL:"+personCard.getMobile()+"\n"; + if (!personCard.getMobile().equals("")) { + content = content + "TEL;CELL:" + personCard.getMobile() + "\n"; } - if(!personCard.getAddress().equals("")){ - content = content+"ADR;HOME;POSTAL:;;"+personCard.getAddress()+";;;;\n"; + if (!personCard.getAddress().equals("")) { + content = content + "ADR;HOME;POSTAL:;;" + personCard.getAddress() + ";;;;\n"; } - if(!personCard.getGroupType().equals("")){ - content = content+"ORG:"+personCard.getGroupType()+"\n"; - //content = content+"TITLE:"+personCard.getGroupType()+"\n"; + if (!personCard.getGroupType().equals("")) { + content = content + "ORG:" + personCard.getGroupType() + "\n"; + // content = content+"TITLE:"+personCard.getGroupType()+"\n"; } - if(!personCard.getDescription().equals("")){ - content = content+"NOTE:"+personCard.getDescription()+"\n"; + if (!personCard.getDescription().equals("")) { + content = content + "NOTE:" + personCard.getDescription() + "\n"; } - content = content+"END:VCARD"; - - /*content = "BEGIN:VCARD\n" + - "VERSION:1.0\n" + - "N:李德伟\n" + - "EMAIL:1606841559@qq.com\n" + - "TEL:12345678912\n" + - "TEL;CELL:12345678913\n" + - "ADR;HOME;POSTAL:;;文二路391号;杭州市;浙江省;433330;中国\n" + - "ORG:济南\n" + - "TITLE:软件工程师\n" + - "URL:http://blog.csdn.net/lidew521\n" + - "NOTE:呼呼测试下吧。。。\n" + - "END:VCARD";*/ - //getBarCode(content,path); - - Wo wo = new Wo(getBarCodeWo(content), this.contentType(false, fname), this.contentDisposition(false, fname)); + content = content + "END:VCARD"; + + /* + * content = "BEGIN:VCARD\n" + "VERSION:1.0\n" + "N:李德伟\n" + + * "EMAIL:1606841559@qq.com\n" + "TEL:12345678912\n" + "TEL;CELL:12345678913\n" + * + "ADR;HOME;POSTAL:;;文二路391号;杭州市;浙江省;433330;中国\n" + "ORG:济南\n" + + * "TITLE:软件工程师\n" + "URL:http://blog.csdn.net/lidew521\n" + "NOTE:呼呼测试下吧。。。\n" + * + "END:VCARD"; + */ + // getBarCode(content,path); + + Wo wo = new Wo(getBarCodeWo(content), this.contentType(false, fname), + this.contentDisposition(false, fname)); result.setData(wo); return result; } } - + /** - *二维码实现 - * @param msg /二维码包含的信息 - * @param path /二维码存放路径 - */ - public static void getBarCode(String msg,String path){ - try { - File file=new File(path); - OutputStream ous=new FileOutputStream(file); - if(StringUtils.isEmpty(msg) || ous==null) - return; - String format = "png"; - MultiFormatWriter multiFormatWriter = new MultiFormatWriter(); - Map map =new HashMap(); - //设置编码 EncodeHintType类中可以设置MAX_SIZE， ERROR_CORRECTION，CHARACTER_SET，DATA_MATRIX_SHAPE，AZTEC_LAYERS等参数 - map.put(EncodeHintType.CHARACTER_SET,"UTF-8"); - map.put(EncodeHintType.MARGIN,"1"); - //生成二维码 - BitMatrix bitMatrix = new MultiFormatWriter().encode(msg, BarcodeFormat.QR_CODE,300,300,map); - MatrixToImageWriter.writeToStream(bitMatrix,format,ous); - }catch (Exception e) { - e.printStackTrace(); - } + * 二维码实现 + * + * @param msg /二维码包含的信息 + * @param path /二维码存放路径 + */ + public static void getBarCode(String msg, String path) { + File file = new File(path); + try (OutputStream ous = new FileOutputStream(file)) { + if (StringUtils.isEmpty(msg)) { + return; + } + String format = "png"; + MultiFormatWriter multiFormatWriter = new MultiFormatWriter(); + Map map = new HashMap(); + // 设置编码 EncodeHintType类中可以设置MAX_SIZE， + // ERROR_CORRECTION，CHARACTER_SET，DATA_MATRIX_SHAPE，AZTEC_LAYERS等参数 + map.put(EncodeHintType.CHARACTER_SET, "UTF-8"); + map.put(EncodeHintType.MARGIN, "1"); + // 生成二维码 + BitMatrix bitMatrix = new MultiFormatWriter().encode(msg, BarcodeFormat.QR_CODE, 300, 300, map); + MatrixToImageWriter.writeToStream(bitMatrix, format, ous); + } catch (Exception e) { + e.printStackTrace(); + } } - + /** - *二维码实现 - * @param msg /二维码包含的信息 - */ - public static byte[] getBarCodeWo(String msg){ - byte[] bs = null; - try { - String format = "png"; - Map map =new HashMap(); - //设置编码 EncodeHintType类中可以设置MAX_SIZE， ERROR_CORRECTION，CHARACTER_SET，DATA_MATRIX_SHAPE，AZTEC_LAYERS等参数 - map.put(EncodeHintType.CHARACTER_SET,"UTF-8"); - map.put(EncodeHintType.MARGIN,"1"); - //生成二维码 - BitMatrix bitMatrix = new MultiFormatWriter().encode(msg, BarcodeFormat.QR_CODE,300,300,map); - BufferedImage image = MatrixToImageWriter.toBufferedImage(bitMatrix); - ByteArrayOutputStream out = new ByteArrayOutputStream(); - ImageIO.write(image, "gif", out); - bs = out.toByteArray(); - - }catch (Exception e) { - e.printStackTrace(); - } - return bs; + * 二维码实现 + * + * @param msg /二维码包含的信息 + */ + public static byte[] getBarCodeWo(String msg) { + byte[] bs = null; + try { + String format = "png"; + Map map = new HashMap(); + // 设置编码 EncodeHintType类中可以设置MAX_SIZE， + // ERROR_CORRECTION，CHARACTER_SET，DATA_MATRIX_SHAPE，AZTEC_LAYERS等参数 + map.put(EncodeHintType.CHARACTER_SET, "UTF-8"); + map.put(EncodeHintType.MARGIN, "1"); + // 生成二维码 + BitMatrix bitMatrix = new MultiFormatWriter().encode(msg, BarcodeFormat.QR_CODE, 300, 300, map); + BufferedImage image = MatrixToImageWriter.toBufferedImage(bitMatrix); + ByteArrayOutputStream out = new ByteArrayOutputStream(); + ImageIO.write(image, "gif", out); + bs = out.toByteArray(); + + } catch (Exception e) { + e.printStackTrace(); + } + return bs; } - + public static class Wo extends WoFile { public Wo(byte[] bytes, String contentType, String contentDisposition) { diff --git a/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/password/ActionChangePassword.java b/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/password/ActionChangePassword.java index b74722db7e..4987e2153c 100644 --- a/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/password/ActionChangePassword.java +++ b/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/password/ActionChangePassword.java @@ -65,9 +65,6 @@ class ActionChangePassword extends ActionBase { throw new ExceptionInvalidPassword(Config.person().getPasswordRegexHint()); } -// if (PasswordTools.checkPasswordStrength(wi.getNewPassword()) < 4) { -// throw new ExceptionInvalidPassword(); -// } } emc.beginTransaction(Person.class); business.person().setPassword(person, wi.getNewPassword()); diff --git a/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/person/ActionSetPassword.java b/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/person/ActionSetPassword.java index 7e11dc697b..d5efd92bbc 100644 --- a/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/person/ActionSetPassword.java +++ b/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/person/ActionSetPassword.java @@ -53,22 +53,14 @@ class ActionSetPassword extends BaseAction { if (StringUtils.isEmpty(wi.getConfirmPassword())) { throw new ExceptionConfirmPasswordEmpty(); } - /* - if (!StringUtils.equals(wi.getNewPassword(), wi.getConfirmPassword())) { - throw new ExceptionTwicePasswordNotMatch(); - } - if (StringUtils.equals(wi.getNewPassword(), wi.getOldPassword())) { - throw new ExceptionNewPasswordSameAsOldPassword(); - }*/ String oldPassword = wi.getOldPassword(); String newPassword = wi.getNewPassword(); String confirmPassword = wi.getConfirmPassword(); String isEncrypted = wi.getIsEncrypted(); - //RSA解秘 if (!StringUtils.isEmpty(isEncrypted)) { - if(isEncrypted.trim().equalsIgnoreCase("y")) { + if (isEncrypted.trim().equalsIgnoreCase("y")) { oldPassword = this.decryptRSA(oldPassword); newPassword = this.decryptRSA(newPassword); confirmPassword = this.decryptRSA(confirmPassword); @@ -82,7 +74,6 @@ class ActionSetPassword extends BaseAction { throw new ExceptionNewPasswordSameAsOldPassword(); } - if (BooleanUtils.isTrue(Config.person().getSuperPermission()) && StringUtils.equals(Config.token().getPassword(), oldPassword)) { logger.info("user{name:" + person.getName() + "} use superPermission."); @@ -96,7 +87,6 @@ class ActionSetPassword extends BaseAction { } } - emc.beginTransaction(Person.class); business.person().setPassword(person, newPassword); emc.commit(); @@ -110,33 +100,34 @@ class ActionSetPassword extends BaseAction { } } - - public String decryptRSA(String strDecrypt) { - String privateKey; - String decrypt = null; - try { - privateKey = getPrivateKey(); - decrypt = Crypto.rsaDecrypt(strDecrypt, privateKey); - } catch (Exception e) { - e.printStackTrace(); - } - return decrypt; + public String decryptRSA(String strDecrypt) { + String privateKey; + String decrypt = null; + try { + privateKey = getPrivateKey(); + decrypt = Crypto.rsaDecrypt(strDecrypt, privateKey); + } catch (Exception e) { + e.printStackTrace(); } + return decrypt; + } - public String getPrivateKey() { - String privateKey = ""; - try { - privateKey = Config.privateKey(); - byte[] privateKeyB = Base64.decodeBase64(privateKey); - privateKey = new String(Base64.encodeBase64(privateKeyB)); - } catch (Exception e) { - e.printStackTrace(); - } - return privateKey; + public String getPrivateKey() { + String privateKey = ""; + try { + privateKey = Config.privateKey(); + byte[] privateKeyB = Base64.decodeBase64(privateKey); + privateKey = new String(Base64.encodeBase64(privateKeyB)); + } catch (Exception e) { + e.printStackTrace(); } + return privateKey; + } public static class Wi extends GsonPropertyObject { + private static final long serialVersionUID = 1L; + @FieldDescribe("原密码") private String oldPassword; diff --git a/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/regist/ActionCreate.java b/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/regist/ActionCreate.java index 5a8b346714..3f49ce8bbd 100644 --- a/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/regist/ActionCreate.java +++ b/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/regist/ActionCreate.java @@ -30,7 +30,7 @@ class ActionCreate extends BaseAction { Wi wi = this.convertToWrapIn(jsonElement, Wi.class); Business business = new Business(emc); String name = wi.getName(); - String password = wi.getPassword(); + String passwd = wi.getPassword(); String mobile = wi.getMobile(); GenderType genderType = wi.getGenderType(); String codeAnswer = wi.getCodeAnswer(); @@ -61,12 +61,9 @@ class ActionCreate extends BaseAction { throw new ExceptionMailExist(mail); } } - if (!password.matches(Config.person().getPasswordRegex())) { + if (!passwd.matches(Config.person().getPasswordRegex())) { throw new ExceptionInvalidPassword(Config.person().getPasswordRegexHint()); } -// if (PasswordTools.checkPasswordStrength(password) < 4) { -// throw new ExceptionInvalidPassword(); -// } if (null == genderType) { throw new ExceptionInvalidGenderType(); } @@ -82,7 +79,7 @@ class ActionCreate extends BaseAction { throw new ExceptionInvalidCaptcha(); } } - this.register(business, name, password, genderType, mobile, mail); + this.register(business, name, passwd, genderType, mobile, mail); Wo wo = new Wo(); wo.setValue(true); result.setData(wo); diff --git a/o2server/x_portal_assemble_designer/src/main/java/com/x/portal/assemble/designer/jaxrs/script/ActionDelete.java b/o2server/x_portal_assemble_designer/src/main/java/com/x/portal/assemble/designer/jaxrs/script/ActionDelete.java index a995b42c04..09b4a27cc8 100644 --- a/o2server/x_portal_assemble_designer/src/main/java/com/x/portal/assemble/designer/jaxrs/script/ActionDelete.java +++ b/o2server/x_portal_assemble_designer/src/main/java/com/x/portal/assemble/designer/jaxrs/script/ActionDelete.java @@ -8,12 +8,12 @@ import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; -import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.entity.annotation.CheckRemoveType; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.jaxrs.WrapBoolean; diff --git a/o2server/x_portal_assemble_designer/src/main/java/com/x/portal/assemble/designer/jaxrs/script/ActionGet.java b/o2server/x_portal_assemble_designer/src/main/java/com/x/portal/assemble/designer/jaxrs/script/ActionGet.java index f991322c31..fe3a678274 100644 --- a/o2server/x_portal_assemble_designer/src/main/java/com/x/portal/assemble/designer/jaxrs/script/ActionGet.java +++ b/o2server/x_portal_assemble_designer/src/main/java/com/x/portal/assemble/designer/jaxrs/script/ActionGet.java @@ -1,18 +1,19 @@ package com.x.portal.assemble.designer.jaxrs.script; +import java.util.Optional; + import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.entity.JpaObject; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; +import com.x.base.core.project.cache.Cache.CacheKey; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.portal.assemble.designer.Business; import com.x.portal.core.entity.Portal; import com.x.portal.core.entity.Script; -import com.x.base.core.project.cache.Cache.CacheKey; -import com.x.base.core.project.cache.CacheManager; -import java.util.Optional; class ActionGet extends BaseAction { ActionResult execute(EffectivePerson effectivePerson, String id) throws Exception { diff --git a/o2server/x_portal_assemble_designer/src/main/java/com/x/portal/assemble/designer/jaxrs/script/ActionListPaging.java b/o2server/x_portal_assemble_designer/src/main/java/com/x/portal/assemble/designer/jaxrs/script/ActionListPaging.java index 9d42356170..fffa1bfdcb 100644 --- a/o2server/x_portal_assemble_designer/src/main/java/com/x/portal/assemble/designer/jaxrs/script/ActionListPaging.java +++ b/o2server/x_portal_assemble_designer/src/main/java/com/x/portal/assemble/designer/jaxrs/script/ActionListPaging.java @@ -1,5 +1,11 @@ package com.x.portal.assemble.designer.jaxrs.script; +import java.util.List; + +import javax.persistence.EntityManager; +import javax.persistence.criteria.CriteriaBuilder; +import javax.persistence.criteria.Predicate; + import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.entity.JpaObject; @@ -8,36 +14,36 @@ import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; +import com.x.base.core.project.logger.Logger; +import com.x.base.core.project.logger.LoggerFactory; import com.x.base.core.project.tools.ListTools; import com.x.portal.assemble.designer.Business; import com.x.portal.core.entity.Portal; import com.x.portal.core.entity.Script; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.Predicate; -import java.util.List; - class ActionListPaging extends BaseAction { + + private static Logger logger = LoggerFactory.getLogger(ActionListPaging.class); + ActionResult> execute(EffectivePerson effectivePerson, Integer page, Integer size) throws Exception { try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { Business business = new Business(emc); ActionResult> result = new ActionResult<>(); if (!business.editable(effectivePerson, null)) { - throw new PortalInvisibleException(effectivePerson.getDistinguishedName(), "all", - "all"); + throw new PortalInvisibleException(effectivePerson.getDistinguishedName(), "all", "all"); } EntityManager em = emc.get(Script.class); CriteriaBuilder cb = em.getCriteriaBuilder(); - Predicate p = cb.conjunction();; + Predicate p = cb.conjunction(); List wos = emc.fetchDescPaging(Script.class, Wo.copier, p, page, size, Script.sequence_FIELDNAME); wos.stream().forEach(wo -> { try { Portal portal = emc.find(wo.getPortal(), Portal.class); - if(portal != null){ + if (portal != null) { wo.setPortalName(portal.getName()); } } catch (Exception e) { + logger.error(e); } }); result.setData(wos); diff --git a/o2server/x_portal_assemble_designer/src/main/java/com/x/portal/assemble/designer/jaxrs/script/ActionManagerList.java b/o2server/x_portal_assemble_designer/src/main/java/com/x/portal/assemble/designer/jaxrs/script/ActionManagerList.java index 5339caa957..7cec60131e 100644 --- a/o2server/x_portal_assemble_designer/src/main/java/com/x/portal/assemble/designer/jaxrs/script/ActionManagerList.java +++ b/o2server/x_portal_assemble_designer/src/main/java/com/x/portal/assemble/designer/jaxrs/script/ActionManagerList.java @@ -1,5 +1,10 @@ package com.x.portal.assemble.designer.jaxrs.script; +import java.util.ArrayList; +import java.util.List; + +import org.apache.commons.lang3.StringUtils; + import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -11,55 +16,58 @@ import com.x.base.core.project.exception.ExceptionAccessDenied; import com.x.base.core.project.gson.GsonPropertyObject; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; +import com.x.base.core.project.logger.Logger; +import com.x.base.core.project.logger.LoggerFactory; import com.x.base.core.project.tools.ListTools; import com.x.base.core.project.tools.StringTools; import com.x.portal.core.entity.Portal; import com.x.portal.core.entity.Script; -import org.apache.commons.lang3.StringUtils; - -import java.util.ArrayList; -import java.util.List; class ActionManagerList extends BaseAction { + + private static Logger logger = LoggerFactory.getLogger(ActionManagerList.class); + ActionResult> execute(EffectivePerson effectivePerson, JsonElement jsonElement) throws Exception { - if(!effectivePerson.isManager()){ + if (!effectivePerson.isManager()) { throw new ExceptionAccessDenied(effectivePerson); } Wi wi = this.convertToWrapIn(jsonElement, Wi.class); try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { ActionResult> result = new ActionResult<>(); List wos; - if(ListTools.isEmpty(wi.getAppIdList())){ - wos = emc.fetchAll(Script.class, Wo.copier); - }else{ + if (ListTools.isEmpty(wi.getAppIdList())) { + wos = emc.fetchAll(Script.class, Wo.copier); + } else { wos = emc.fetchIn(Script.class, Wo.copier, Script.portal_FIELDNAME, wi.getAppIdList()); } final List resWos = new ArrayList<>(); wos.stream().forEach(wo -> { try { Portal portal = emc.find(wo.getPortal(), Portal.class); - if(portal != null){ + if (portal != null) { wo.setAppId(portal.getId()); wo.setAppName(portal.getName()); } } catch (Exception e) { + logger.error(e); } - if(StringUtils.isNotBlank(wi.getKeyword())){ - if(StringTools.matchKeyword(wi.getKeyword(), wo.getText(), wi.getCaseSensitive(), wi.getMatchWholeWord(), wi.getMatchRegExp())){ + if (StringUtils.isNotBlank(wi.getKeyword())) { + if (StringTools.matchKeyword(wi.getKeyword(), wo.getText(), wi.getCaseSensitive(), + wi.getMatchWholeWord(), wi.getMatchRegExp())) { resWos.add(wo); } - }else{ + } else { resWos.add(wo); } }); wos.clear(); result.setData(resWos); - result.setCount((long)resWos.size()); + result.setCount((long) resWos.size()); return result; } } - public static class Wi extends GsonPropertyObject{ + public static class Wi extends GsonPropertyObject { @FieldDescribe("搜索关键字.") private String keyword; @FieldDescribe("是否区分大小写.") @@ -117,7 +125,7 @@ class ActionManagerList extends BaseAction { private static final long serialVersionUID = -8095369685452823624L; static WrapCopier copier = WrapCopierFactory.wo(Script.class, Wo.class, - JpaObject.singularAttributeField(Script.class, true, false),null); + JpaObject.singularAttributeField(Script.class, true, false), null); @FieldDescribe("应用Id.") private String appId; diff --git a/o2server/x_portal_assemble_designer/src/main/java/com/x/portal/assemble/designer/jaxrs/script/BaseAction.java b/o2server/x_portal_assemble_designer/src/main/java/com/x/portal/assemble/designer/jaxrs/script/BaseAction.java index 99f41100bb..5081db46bf 100644 --- a/o2server/x_portal_assemble_designer/src/main/java/com/x/portal/assemble/designer/jaxrs/script/BaseAction.java +++ b/o2server/x_portal_assemble_designer/src/main/java/com/x/portal/assemble/designer/jaxrs/script/BaseAction.java @@ -2,11 +2,11 @@ package com.x.portal.assemble.designer.jaxrs.script; import org.apache.commons.lang3.StringUtils; +import com.x.base.core.project.cache.Cache.CacheCategory; import com.x.base.core.project.jaxrs.StandardJaxrsAction; import com.x.base.core.project.tools.ListTools; import com.x.portal.assemble.designer.Business; import com.x.portal.core.entity.Script; -import com.x.base.core.project.cache.Cache.CacheCategory; abstract class BaseAction extends StandardJaxrsAction { diff --git a/o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/jaxrs/applicationdict/ActionListPaging.java b/o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/jaxrs/applicationdict/ActionListPaging.java index f7fe09c39d..97fd55cc71 100644 --- a/o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/jaxrs/applicationdict/ActionListPaging.java +++ b/o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/jaxrs/applicationdict/ActionListPaging.java @@ -28,21 +28,23 @@ class ActionListPaging extends BaseAction { ActionResult> result = new ActionResult<>(); Business business = new Business(emc); if (!business.editable(effectivePerson, null)) { - throw new ExceptionApplicationAccessDenied(effectivePerson.getDistinguishedName(), - "all", "all"); + throw new ExceptionApplicationAccessDenied(effectivePerson.getDistinguishedName(), "all", "all"); } EntityManager em = emc.get(ApplicationDict.class); CriteriaBuilder cb = em.getCriteriaBuilder(); - Predicate p = cb.conjunction();; - List wos = emc.fetchDescPaging(ApplicationDict.class, Wo.copier, p, page, size, ApplicationDict.sequence_FIELDNAME); + Predicate p = cb.conjunction(); + ; + List wos = emc.fetchDescPaging(ApplicationDict.class, Wo.copier, p, page, size, + ApplicationDict.sequence_FIELDNAME); wos.stream().forEach(wo -> { try { Application app = emc.find(wo.getApplication(), Application.class); - if(app != null){ + if (app != null) { wo.setApplicationName(app.getName()); wo.setApplicationAlias(app.getAlias()); } } catch (Exception e) { + logger.error(e); } }); result.setData(wos); diff --git a/o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/jaxrs/script/ActionManagerList.java b/o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/jaxrs/script/ActionManagerList.java index e9dfa34650..7a45dbd326 100644 --- a/o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/jaxrs/script/ActionManagerList.java +++ b/o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/jaxrs/script/ActionManagerList.java @@ -1,5 +1,10 @@ package com.x.processplatform.assemble.designer.jaxrs.script; +import java.util.ArrayList; +import java.util.List; + +import org.apache.commons.lang3.StringUtils; + import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -11,55 +16,58 @@ import com.x.base.core.project.exception.ExceptionAccessDenied; import com.x.base.core.project.gson.GsonPropertyObject; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; +import com.x.base.core.project.logger.Logger; +import com.x.base.core.project.logger.LoggerFactory; import com.x.base.core.project.tools.ListTools; import com.x.base.core.project.tools.StringTools; import com.x.processplatform.core.entity.element.Application; import com.x.processplatform.core.entity.element.Script; -import org.apache.commons.lang3.StringUtils; - -import java.util.ArrayList; -import java.util.List; class ActionManagerList extends BaseAction { + + private static Logger logger = LoggerFactory.getLogger(ActionManagerList.class); + ActionResult> execute(EffectivePerson effectivePerson, JsonElement jsonElement) throws Exception { - if(!effectivePerson.isManager()){ + if (!effectivePerson.isManager()) { throw new ExceptionAccessDenied(effectivePerson); } Wi wi = this.convertToWrapIn(jsonElement, Wi.class); try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { ActionResult> result = new ActionResult<>(); List wos; - if(ListTools.isEmpty(wi.getAppIdList())){ - wos = emc.fetchAll(Script.class, Wo.copier); - }else{ + if (ListTools.isEmpty(wi.getAppIdList())) { + wos = emc.fetchAll(Script.class, Wo.copier); + } else { wos = emc.fetchIn(Script.class, Wo.copier, Script.application_FIELDNAME, wi.getAppIdList()); } final List resWos = new ArrayList<>(); wos.stream().forEach(wo -> { try { Application app = emc.find(wo.getApplication(), Application.class); - if(app != null){ + if (app != null) { wo.setAppId(app.getId()); wo.setAppName(app.getName()); } } catch (Exception e) { + logger.error(e); } - if(StringUtils.isNotBlank(wi.getKeyword())){ - if(StringTools.matchKeyword(wi.getKeyword(), wo.getText(), wi.getCaseSensitive(), wi.getMatchWholeWord(), wi.getMatchRegExp())){ + if (StringUtils.isNotBlank(wi.getKeyword())) { + if (StringTools.matchKeyword(wi.getKeyword(), wo.getText(), wi.getCaseSensitive(), + wi.getMatchWholeWord(), wi.getMatchRegExp())) { resWos.add(wo); } - }else{ + } else { resWos.add(wo); } }); wos.clear(); result.setData(resWos); - result.setCount((long)resWos.size()); + result.setCount((long) resWos.size()); return result; } } - public static class Wi extends GsonPropertyObject{ + public static class Wi extends GsonPropertyObject { @FieldDescribe("搜索关键字.") private String keyword; @FieldDescribe("是否区分大小写.") @@ -117,7 +125,7 @@ class ActionManagerList extends BaseAction { private static final long serialVersionUID = -8095369685452823624L; static WrapCopier copier = WrapCopierFactory.wo(Script.class, Wo.class, - JpaObject.singularAttributeField(Script.class, true, false),null); + JpaObject.singularAttributeField(Script.class, true, false), null); @FieldDescribe("应用Id.") private String appId; diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/ActionUploadWorkInfo.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/ActionUploadWorkInfo.java index 84ad991c04..a30937e733 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/ActionUploadWorkInfo.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/ActionUploadWorkInfo.java @@ -67,7 +67,7 @@ class ActionUploadWorkInfo extends BaseAction { title = work.getTitle(); } String workHtml = wi.getWorkHtml(); - if(StringUtils.isNotBlank(workHtml)){ + if (StringUtils.isNotBlank(workHtml)) { try { workHtml = URLDecoder.decode(workHtml, StandardCharsets.UTF_8.name()); } catch (Exception e) { @@ -88,12 +88,12 @@ class ActionUploadWorkInfo extends BaseAction { public static class Wo extends WoId { } - private String saveHtml(String workId, String flag, String workHtml, String person, String title, - Float pageWidth, Business business) { + private String saveHtml(String workId, String flag, String workHtml, String person, String title, Float pageWidth, + Business business) { try { String name = ""; byte[] bytes; - if(title.length()>60){ + if (title.length() > 60) { title = title.substring(0, 60); } if ("word".equals(flag)) { @@ -168,23 +168,4 @@ class ActionUploadWorkInfo extends BaseAction { } } - public static void main(String[] args) throws Exception { - System.out.println(11); - String fileName = "测试公司函下载哦哦哦哦哦哦哦-表单信息.html"; - File file = new File("/Users/chengjian/Downloads/", fileName); - File outfile = new File(file.getAbsolutePath() + "3.pdf"); - FileInputStream in = new FileInputStream(file); - FileOutputStream out = new FileOutputStream(outfile); - PdfWriter writer = new PdfWriter(out); - PdfDocument pdf = new PdfDocument(writer); - pdf.setDefaultPageSize(new PageSize(1000, PageSize.A4.getHeight())); - ConverterProperties props = new ConverterProperties(); - DefaultFontProvider dfp = new DefaultFontProvider(false, false, false); - dfp.addFont("/Users/chengjian/dev/O2/o2oa/o2server/commons/fonts/NotoSansCJKsc-Regular.otf"); - props.setFontProvider(dfp); - HtmlConverter.convertToPdf(in, pdf, props); - in.close(); - out.close(); - System.out.println(22); - } } diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/ActionListMyFilterPaging.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/ActionListMyFilterPaging.java index 35f21284ce..039541e3eb 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/ActionListMyFilterPaging.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/ActionListMyFilterPaging.java @@ -21,6 +21,8 @@ import com.x.base.core.project.bean.WrapCopierFactory; import com.x.base.core.project.gson.GsonPropertyObject; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; +import com.x.base.core.project.logger.Logger; +import com.x.base.core.project.logger.LoggerFactory; import com.x.base.core.project.tools.DateTools; import com.x.base.core.project.tools.ListTools; import com.x.processplatform.assemble.surface.Business; @@ -29,6 +31,8 @@ import com.x.processplatform.core.entity.content.Task_; class ActionListMyFilterPaging extends BaseAction { + private static Logger logger = LoggerFactory.getLogger(ActionListMyFilterPaging.class); + ActionResult> execute(EffectivePerson effectivePerson, Integer page, Integer size, JsonElement jsonElement) throws Exception { try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { @@ -59,16 +63,16 @@ class ActionListMyFilterPaging extends BaseAction { p = cb.and(p, root.get(Task_.application).in(wi.getApplicationList())); } if (ListTools.isNotEmpty(wi.getProcessList())) { - if(BooleanUtils.isFalse(wi.getRelateEditionProcess())) { + if (BooleanUtils.isFalse(wi.getRelateEditionProcess())) { p = cb.and(p, root.get(Task_.process).in(wi.getProcessList())); - }else{ + } else { p = cb.and(p, root.get(Task_.process).in(business.process().listEditionProcess(wi.getProcessList()))); } } - if(DateTools.isDateTimeOrDate(wi.getStartTime())){ + if (DateTools.isDateTimeOrDate(wi.getStartTime())) { p = cb.and(p, cb.greaterThan(root.get(Task_.startTime), DateTools.parse(wi.getStartTime()))); } - if(DateTools.isDateTimeOrDate(wi.getEndTime())){ + if (DateTools.isDateTimeOrDate(wi.getEndTime())) { p = cb.and(p, cb.lessThan(root.get(Task_.startTime), DateTools.parse(wi.getEndTime()))); } if (ListTools.isNotEmpty(wi.getCreatorUnitList())) { @@ -80,25 +84,27 @@ class ActionListMyFilterPaging extends BaseAction { if (ListTools.isNotEmpty(wi.getActivityNameList())) { p = cb.and(p, root.get(Task_.activityName).in(wi.getActivityNameList())); } - if(StringUtils.isNotBlank(wi.getExpireTime())){ + if (StringUtils.isNotBlank(wi.getExpireTime())) { int expireTime = 0; try { expireTime = Integer.parseInt(wi.getExpireTime()); } catch (NumberFormatException e) { + logger.error(e); } - p = cb.and(p, cb.lessThanOrEqualTo(root.get(Task_.expireTime), DateTools.getAdjustTimeDay(null, 0, -expireTime, 0, 0))); + p = cb.and(p, cb.lessThanOrEqualTo(root.get(Task_.expireTime), + DateTools.getAdjustTimeDay(null, 0, -expireTime, 0, 0))); } - if(StringUtils.isNotBlank(wi.getUrgeTime())){ + if (StringUtils.isNotBlank(wi.getUrgeTime())) { int urgeTime = 0; try { urgeTime = Integer.parseInt(wi.getUrgeTime()); } catch (NumberFormatException e) { } - p = cb.and(p, cb.lessThanOrEqualTo(root.get(Task_.urgeTime), DateTools.getAdjustTimeDay(null, 0, -urgeTime, 0, 0))); + p = cb.and(p, cb.lessThanOrEqualTo(root.get(Task_.urgeTime), + DateTools.getAdjustTimeDay(null, 0, -urgeTime, 0, 0))); } - if(BooleanUtils.isTrue(wi.getExcludeDraft())){ - p = cb.and(p, cb.or(cb.isFalse(root.get(Task_.first)), - cb.isNull(root.get(Task_.first)), + if (BooleanUtils.isTrue(wi.getExcludeDraft())) { + p = cb.and(p, cb.or(cb.isFalse(root.get(Task_.first)), cb.isNull(root.get(Task_.first)), cb.equal(root.get(Task_.workCreateType), Business.WORK_CREATE_TYPE_ASSIGN))); } if (StringUtils.isNotEmpty(wi.getKey())) { @@ -128,16 +134,16 @@ class ActionListMyFilterPaging extends BaseAction { p = cb.and(p, root.get(Task_.application).in(wi.getApplicationList())); } if (ListTools.isNotEmpty(wi.getProcessList())) { - if(BooleanUtils.isFalse(wi.getRelateEditionProcess())) { + if (BooleanUtils.isFalse(wi.getRelateEditionProcess())) { p = cb.and(p, root.get(Task_.process).in(wi.getProcessList())); - }else{ + } else { p = cb.and(p, root.get(Task_.process).in(business.process().listEditionProcess(wi.getProcessList()))); } } - if(DateTools.isDateTimeOrDate(wi.getStartTime())){ + if (DateTools.isDateTimeOrDate(wi.getStartTime())) { p = cb.and(p, cb.greaterThan(root.get(Task_.startTime), DateTools.parse(wi.getStartTime()))); } - if(DateTools.isDateTimeOrDate(wi.getEndTime())){ + if (DateTools.isDateTimeOrDate(wi.getEndTime())) { p = cb.and(p, cb.lessThan(root.get(Task_.startTime), DateTools.parse(wi.getEndTime()))); } if (ListTools.isNotEmpty(wi.getCreatorUnitList())) { @@ -149,25 +155,27 @@ class ActionListMyFilterPaging extends BaseAction { if (ListTools.isNotEmpty(wi.getActivityNameList())) { p = cb.and(p, root.get(Task_.activityName).in(wi.getActivityNameList())); } - if(StringUtils.isNotBlank(wi.getExpireTime())){ + if (StringUtils.isNotBlank(wi.getExpireTime())) { int expireTime = 0; try { expireTime = Integer.parseInt(wi.getExpireTime()); } catch (NumberFormatException e) { + logger.error(e); } - p = cb.and(p, cb.lessThanOrEqualTo(root.get(Task_.expireTime), DateTools.getAdjustTimeDay(null, 0, -expireTime, 0, 0))); + p = cb.and(p, cb.lessThanOrEqualTo(root.get(Task_.expireTime), + DateTools.getAdjustTimeDay(null, 0, -expireTime, 0, 0))); } - if(StringUtils.isNotBlank(wi.getUrgeTime())){ + if (StringUtils.isNotBlank(wi.getUrgeTime())) { int urgeTime = 0; try { urgeTime = Integer.parseInt(wi.getUrgeTime()); } catch (NumberFormatException e) { } - p = cb.and(p, cb.lessThanOrEqualTo(root.get(Task_.urgeTime), DateTools.getAdjustTimeDay(null, 0, -urgeTime, 0, 0))); + p = cb.and(p, cb.lessThanOrEqualTo(root.get(Task_.urgeTime), + DateTools.getAdjustTimeDay(null, 0, -urgeTime, 0, 0))); } - if(BooleanUtils.isTrue(wi.getExcludeDraft())){ - p = cb.and(p, cb.or(cb.isFalse(root.get(Task_.first)), - cb.isNull(root.get(Task_.first)), + if (BooleanUtils.isTrue(wi.getExcludeDraft())) { + p = cb.and(p, cb.or(cb.isFalse(root.get(Task_.first)), cb.isNull(root.get(Task_.first)), cb.equal(root.get(Task_.workCreateType), Business.WORK_CREATE_TYPE_ASSIGN))); } if (StringUtils.isNotEmpty(wi.getKey())) { diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/ActionManageListFilterPaging.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/ActionManageListFilterPaging.java index 02b720cd6b..a336c68304 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/ActionManageListFilterPaging.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/ActionManageListFilterPaging.java @@ -1,5 +1,17 @@ package com.x.processplatform.assemble.surface.jaxrs.task; +import java.util.ArrayList; +import java.util.List; + +import javax.persistence.EntityManager; +import javax.persistence.criteria.CriteriaBuilder; +import javax.persistence.criteria.CriteriaQuery; +import javax.persistence.criteria.Predicate; +import javax.persistence.criteria.Root; + +import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.StringUtils; + import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -10,25 +22,19 @@ import com.x.base.core.project.bean.WrapCopierFactory; import com.x.base.core.project.gson.GsonPropertyObject; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; +import com.x.base.core.project.logger.Logger; +import com.x.base.core.project.logger.LoggerFactory; import com.x.base.core.project.tools.DateTools; import com.x.base.core.project.tools.ListTools; import com.x.base.core.project.tools.StringTools; import com.x.processplatform.assemble.surface.Business; import com.x.processplatform.core.entity.content.Task; import com.x.processplatform.core.entity.content.Task_; -import org.apache.commons.lang3.BooleanUtils; -import org.apache.commons.lang3.StringUtils; - -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; -import java.util.ArrayList; -import java.util.List; class ActionManageListFilterPaging extends BaseAction { + private static Logger logger = LoggerFactory.getLogger(ActionManageListFilterPaging.class); + ActionResult> execute(EffectivePerson effectivePerson, Integer page, Integer size, JsonElement jsonElement) throws Exception { try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { @@ -48,7 +54,7 @@ class ActionManageListFilterPaging extends BaseAction { } } - private Predicate toFilterPredicate(EffectivePerson effectivePerson, Business business, Wi wi) throws Exception { + private Predicate toFilterPredicate(EffectivePerson effectivePerson, Business business, Wi wi) throws Exception { EntityManager em = business.entityManagerContainer().get(Task.class); List person_ids = business.organization().person().list(wi.getCredentialList()); CriteriaBuilder cb = em.getCriteriaBuilder(); @@ -128,6 +134,7 @@ class ActionManageListFilterPaging extends BaseAction { try { expireTime = Integer.parseInt(wi.getExpireTime()); } catch (NumberFormatException e) { + logger.error(e); } p = cb.and(p, cb.lessThanOrEqualTo(root.get(Task_.expireTime), DateTools.getAdjustTimeDay(null, 0, -expireTime, 0, 0))); @@ -137,13 +144,13 @@ class ActionManageListFilterPaging extends BaseAction { try { urgeTime = Integer.parseInt(wi.getUrgeTime()); } catch (NumberFormatException e) { + logger.error(e); } p = cb.and(p, cb.lessThanOrEqualTo(root.get(Task_.urgeTime), DateTools.getAdjustTimeDay(null, 0, -urgeTime, 0, 0))); } - if(BooleanUtils.isTrue(wi.getExcludeDraft())){ - p = cb.and(p, cb.or(cb.isFalse(root.get(Task_.first)), - cb.isNull(root.get(Task_.first)), + if (BooleanUtils.isTrue(wi.getExcludeDraft())) { + p = cb.and(p, cb.or(cb.isFalse(root.get(Task_.first)), cb.isNull(root.get(Task_.first)), cb.equal(root.get(Task_.workCreateType), Business.WORK_CREATE_TYPE_ASSIGN))); } if (StringUtils.isNoneBlank(wi.getKey())) { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/Business.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/Business.java index da7e1b0ac0..a73efda28f 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/Business.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/Business.java @@ -15,7 +15,6 @@ import javax.tools.StandardJavaFileManager; import javax.tools.StandardLocation; import javax.tools.ToolProvider; -import com.x.query.assemble.designer.factory.*; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.io.filefilter.DirectoryFileFilter; @@ -38,6 +37,14 @@ import com.x.base.core.project.tools.JarTools; import com.x.base.core.project.tools.ListTools; import com.x.base.core.project.tools.StringTools; import com.x.organization.core.express.Organization; +import com.x.query.assemble.designer.factory.ImportModelFactory; +import com.x.query.assemble.designer.factory.ProcessFactory; +import com.x.query.assemble.designer.factory.QueryFactory; +import com.x.query.assemble.designer.factory.RevealFactory; +import com.x.query.assemble.designer.factory.StatFactory; +import com.x.query.assemble.designer.factory.StatementFactory; +import com.x.query.assemble.designer.factory.TableFactory; +import com.x.query.assemble.designer.factory.ViewFactory; import com.x.query.assemble.designer.jaxrs.table.ExceptionCompileError; import com.x.query.core.entity.Query; import com.x.query.core.entity.schema.Enhance; diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/factory/ImportModelFactory.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/factory/ImportModelFactory.java index f6675f775d..ad7bf8601b 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/factory/ImportModelFactory.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/factory/ImportModelFactory.java @@ -1,19 +1,20 @@ package com.x.query.assemble.designer.factory; -import com.x.base.core.project.tools.StringTools; -import com.x.query.assemble.designer.AbstractFactory; -import com.x.query.assemble.designer.Business; -import com.x.query.core.entity.ImportModel; -import com.x.query.core.entity.ImportModel_; +import java.util.Comparator; +import java.util.List; +import java.util.stream.Collectors; import javax.persistence.EntityManager; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; -import java.util.Comparator; -import java.util.List; -import java.util.stream.Collectors; + +import com.x.base.core.project.tools.StringTools; +import com.x.query.assemble.designer.AbstractFactory; +import com.x.query.assemble.designer.Business; +import com.x.query.core.entity.ImportModel; +import com.x.query.core.entity.ImportModel_; public class ImportModelFactory extends AbstractFactory { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/factory/ProcessFactory.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/factory/ProcessFactory.java index 5fb39cb1a1..9462023f34 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/factory/ProcessFactory.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/factory/ProcessFactory.java @@ -1,15 +1,20 @@ package com.x.query.assemble.designer.factory; +import java.util.List; + +import javax.persistence.EntityManager; +import javax.persistence.criteria.CriteriaBuilder; +import javax.persistence.criteria.CriteriaQuery; +import javax.persistence.criteria.Predicate; +import javax.persistence.criteria.Root; +import javax.persistence.criteria.Subquery; + import com.x.processplatform.core.entity.element.Process; import com.x.processplatform.core.entity.element.Process_; import com.x.query.assemble.designer.AbstractFactory; import com.x.query.assemble.designer.Business; -import javax.persistence.EntityManager; -import javax.persistence.criteria.*; -import java.util.List; - public class ProcessFactory extends AbstractFactory { public ProcessFactory(Business business) throws Exception { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/factory/StatementFactory.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/factory/StatementFactory.java index 48905efcb3..c65611b7fa 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/factory/StatementFactory.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/factory/StatementFactory.java @@ -4,18 +4,18 @@ import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; -import com.x.base.core.project.tools.StringTools; -import com.x.query.assemble.designer.AbstractFactory; -import com.x.query.assemble.designer.Business; -import com.x.query.core.entity.schema.Statement; -import com.x.query.core.entity.schema.Statement_; - import javax.persistence.EntityManager; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; +import com.x.base.core.project.tools.StringTools; +import com.x.query.assemble.designer.AbstractFactory; +import com.x.query.assemble.designer.Business; +import com.x.query.core.entity.schema.Statement; +import com.x.query.core.entity.schema.Statement_; + public class StatementFactory extends AbstractFactory { public StatementFactory(Business business) throws Exception { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/factory/TableFactory.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/factory/TableFactory.java index 3b55a1e366..25ddfb32f6 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/factory/TableFactory.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/factory/TableFactory.java @@ -4,18 +4,18 @@ import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; -import com.x.base.core.project.tools.StringTools; -import com.x.query.assemble.designer.AbstractFactory; -import com.x.query.assemble.designer.Business; -import com.x.query.core.entity.schema.Table; -import com.x.query.core.entity.schema.Table_; - import javax.persistence.EntityManager; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; +import com.x.base.core.project.tools.StringTools; +import com.x.query.assemble.designer.AbstractFactory; +import com.x.query.assemble.designer.Business; +import com.x.query.core.entity.schema.Table; +import com.x.query.core.entity.schema.Table_; + public class TableFactory extends AbstractFactory { public TableFactory(Business business) throws Exception { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/ActionApplication.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/ActionApplication.java index ead9ee7550..c8d6dbd490 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/ActionApplication.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/ActionApplication.java @@ -5,9 +5,9 @@ import java.util.Set; import javax.ws.rs.ApplicationPath; import com.x.base.core.project.jaxrs.AbstractActionApplication; -import com.x.query.assemble.designer.jaxrs.importmodel.ImportModelAction; import com.x.query.assemble.designer.jaxrs.designer.DesignerAction; import com.x.query.assemble.designer.jaxrs.id.IdAction; +import com.x.query.assemble.designer.jaxrs.importmodel.ImportModelAction; import com.x.query.assemble.designer.jaxrs.input.InputAction; import com.x.query.assemble.designer.jaxrs.neural.NeuralAction; import com.x.query.assemble.designer.jaxrs.output.OutputAction; diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/DesignerJaxrsFilter.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/DesignerJaxrsFilter.java index 7607d0d287..407aff5d62 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/DesignerJaxrsFilter.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/DesignerJaxrsFilter.java @@ -1,9 +1,9 @@ package com.x.query.assemble.designer.jaxrs; -import com.x.base.core.project.jaxrs.CipherManagerJaxrsFilter; - import javax.servlet.annotation.WebFilter; +import com.x.base.core.project.jaxrs.CipherManagerJaxrsFilter; + @WebFilter(urlPatterns = "/jaxrs/designer/*", asyncSupported = true) public class DesignerJaxrsFilter extends CipherManagerJaxrsFilter { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/ImportModelJaxrsFilter.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/ImportModelJaxrsFilter.java index 75b80fe811..7fbec556b3 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/ImportModelJaxrsFilter.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/ImportModelJaxrsFilter.java @@ -1,10 +1,9 @@ package com.x.query.assemble.designer.jaxrs; -import com.x.base.core.project.jaxrs.AnonymousCipherManagerUserJaxrsFilter; -import com.x.base.core.project.jaxrs.CipherManagerUserJaxrsFilter; - import javax.servlet.annotation.WebFilter; +import com.x.base.core.project.jaxrs.CipherManagerUserJaxrsFilter; + @WebFilter(urlPatterns = "/jaxrs/importmodel/*", asyncSupported = true) public class ImportModelJaxrsFilter extends CipherManagerUserJaxrsFilter { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/QueryJaxrsFilter.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/QueryJaxrsFilter.java index c2c646e02c..f89271f08d 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/QueryJaxrsFilter.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/QueryJaxrsFilter.java @@ -2,7 +2,6 @@ package com.x.query.assemble.designer.jaxrs; import javax.servlet.annotation.WebFilter; -import com.x.base.core.project.jaxrs.AnonymousCipherManagerUserJaxrsFilter; import com.x.base.core.project.jaxrs.CipherManagerUserJaxrsFilter; @WebFilter(urlPatterns = "/jaxrs/query/*", asyncSupported = true) diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/StatJaxrsFilter.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/StatJaxrsFilter.java index 3a7a77a439..f1d4fa05fb 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/StatJaxrsFilter.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/StatJaxrsFilter.java @@ -2,7 +2,6 @@ package com.x.query.assemble.designer.jaxrs; import javax.servlet.annotation.WebFilter; -import com.x.base.core.project.jaxrs.AnonymousCipherManagerUserJaxrsFilter; import com.x.base.core.project.jaxrs.CipherManagerUserJaxrsFilter; @WebFilter(urlPatterns = "/jaxrs/stat/*", asyncSupported = true) diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/TableJaxrsFilter.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/TableJaxrsFilter.java index ed2c5144e3..7adf843463 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/TableJaxrsFilter.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/TableJaxrsFilter.java @@ -2,7 +2,6 @@ package com.x.query.assemble.designer.jaxrs; import javax.servlet.annotation.WebFilter; -import com.x.base.core.project.jaxrs.AnonymousCipherManagerUserJaxrsFilter; import com.x.base.core.project.jaxrs.CipherManagerUserJaxrsFilter; @WebFilter(urlPatterns = "/jaxrs/table/*", asyncSupported = true) diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/ViewJaxrsFilter.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/ViewJaxrsFilter.java index 322c5f1b0b..576f15f88e 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/ViewJaxrsFilter.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/ViewJaxrsFilter.java @@ -2,7 +2,6 @@ package com.x.query.assemble.designer.jaxrs; import javax.servlet.annotation.WebFilter; -import com.x.base.core.project.jaxrs.AnonymousCipherManagerUserJaxrsFilter; import com.x.base.core.project.jaxrs.CipherManagerUserJaxrsFilter; @WebFilter(urlPatterns = "/jaxrs/view/*", asyncSupported = true) diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/designer/ActionSearch.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/designer/ActionSearch.java index c60d738011..40df6c7763 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/designer/ActionSearch.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/designer/ActionSearch.java @@ -1,5 +1,13 @@ package com.x.query.assemble.designer.jaxrs.designer; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.TimeUnit; + +import org.apache.commons.lang3.StringUtils; + import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -21,13 +29,6 @@ import com.x.query.core.entity.Stat; import com.x.query.core.entity.View; import com.x.query.core.entity.schema.Statement; import com.x.query.core.entity.schema.Table; -import org.apache.commons.lang3.StringUtils; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.TimeUnit; class ActionSearch extends BaseAction { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/designer/DesignerAction.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/designer/DesignerAction.java index c47d8a5f44..347baad108 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/designer/DesignerAction.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/designer/DesignerAction.java @@ -1,15 +1,6 @@ package com.x.query.assemble.designer.jaxrs.designer; -import com.google.gson.JsonElement; -import com.x.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; +import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.Consumes; @@ -20,7 +11,17 @@ import javax.ws.rs.container.AsyncResponse; import javax.ws.rs.container.Suspended; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; -import java.util.List; + +import com.google.gson.JsonElement; +import com.x.base.core.project.annotation.JaxrsDescribe; +import com.x.base.core.project.annotation.JaxrsMethodDescribe; +import com.x.base.core.project.http.ActionResult; +import com.x.base.core.project.http.EffectivePerson; +import com.x.base.core.project.http.HttpMediaType; +import com.x.base.core.project.jaxrs.ResponseFactory; +import com.x.base.core.project.jaxrs.StandardJaxrsAction; +import com.x.base.core.project.logger.Logger; +import com.x.base.core.project.logger.LoggerFactory; @Path("designer") @JaxrsDescribe("数据中心设计") diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/designer/ExceptionFieldEmpty.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/designer/ExceptionFieldEmpty.java index e2a425b391..e7ec772089 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/designer/ExceptionFieldEmpty.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/designer/ExceptionFieldEmpty.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.designer; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; public class ExceptionFieldEmpty extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/importmodel/ActionCreate.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/importmodel/ActionCreate.java index 5d16ceceb7..14fdab181b 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/importmodel/ActionCreate.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/importmodel/ActionCreate.java @@ -1,5 +1,7 @@ package com.x.query.assemble.designer.jaxrs.importmodel; +import org.apache.commons.lang3.StringUtils; + import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -18,7 +20,6 @@ import com.x.base.core.project.jaxrs.WoId; import com.x.query.assemble.designer.Business; import com.x.query.core.entity.ImportModel; import com.x.query.core.entity.Query; -import org.apache.commons.lang3.StringUtils; class ActionCreate extends BaseAction { ActionResult execute(EffectivePerson effectivePerson, JsonElement jsonElement) throws Exception { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/importmodel/ActionEdit.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/importmodel/ActionEdit.java index b3fe9f109c..8bd1fb91d6 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/importmodel/ActionEdit.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/importmodel/ActionEdit.java @@ -1,5 +1,7 @@ package com.x.query.assemble.designer.jaxrs.importmodel; +import org.apache.commons.lang3.StringUtils; + import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -18,7 +20,6 @@ import com.x.base.core.project.jaxrs.WoId; import com.x.query.assemble.designer.Business; import com.x.query.core.entity.ImportModel; import com.x.query.core.entity.Query; -import org.apache.commons.lang3.StringUtils; class ActionEdit extends BaseAction { ActionResult execute(EffectivePerson effectivePerson, String id, JsonElement jsonElement) throws Exception { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/importmodel/ActionListWithQuery.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/importmodel/ActionListWithQuery.java index 90a84f4c18..45ebc53467 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/importmodel/ActionListWithQuery.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/importmodel/ActionListWithQuery.java @@ -1,5 +1,7 @@ package com.x.query.assemble.designer.jaxrs.importmodel; +import java.util.List; + import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.entity.JpaObject; @@ -13,8 +15,6 @@ import com.x.query.assemble.designer.Business; import com.x.query.core.entity.ImportModel; import com.x.query.core.entity.Query; -import java.util.List; - class ActionListWithQuery extends BaseAction { ActionResult> execute(EffectivePerson effectivePerson, String flag) throws Exception { try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/importmodel/BaseAction.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/importmodel/BaseAction.java index 06fc7f83f1..ce785fdd00 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/importmodel/BaseAction.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/importmodel/BaseAction.java @@ -1,16 +1,16 @@ package com.x.query.assemble.designer.jaxrs.importmodel; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.query.assemble.designer.Business; -import com.x.query.core.entity.ImportModel; -import com.x.query.core.entity.ImportModel_; - import javax.persistence.EntityManager; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; +import com.x.base.core.project.jaxrs.StandardJaxrsAction; +import com.x.query.assemble.designer.Business; +import com.x.query.core.entity.ImportModel; +import com.x.query.core.entity.ImportModel_; + abstract class BaseAction extends StandardJaxrsAction { protected boolean idleName(Business business, ImportModel model) throws Exception { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/importmodel/ImportModelAction.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/importmodel/ImportModelAction.java index dea4c7ee17..03444302a9 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/importmodel/ImportModelAction.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/importmodel/ImportModelAction.java @@ -1,5 +1,21 @@ package com.x.query.assemble.designer.jaxrs.importmodel; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.container.AsyncResponse; +import javax.ws.rs.container.Suspended; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; + import com.google.gson.JsonElement; import com.x.base.core.project.annotation.JaxrsDescribe; import com.x.base.core.project.annotation.JaxrsMethodDescribe; @@ -12,14 +28,6 @@ import com.x.base.core.project.jaxrs.StandardJaxrsAction; import com.x.base.core.project.logger.Logger; import com.x.base.core.project.logger.LoggerFactory; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.*; -import javax.ws.rs.container.AsyncResponse; -import javax.ws.rs.container.Suspended; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import java.util.List; - @Path("importmodel") @JaxrsDescribe("数据导入模型") public class ImportModelAction extends StandardJaxrsAction { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ActionCover.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ActionCover.java index d6add24384..dad6dd7b01 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ActionCover.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ActionCover.java @@ -3,32 +3,33 @@ package com.x.query.assemble.designer.jaxrs.input; import java.util.ArrayList; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; - -import com.x.base.core.project.cache.ApplicationCache; -import com.x.base.core.project.cache.CacheManager; -import com.x.query.core.entity.*; -import com.x.query.core.entity.schema.Statement; -import com.x.query.core.entity.schema.Table; -import com.x.query.core.entity.wrap.*; -import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.StringUtils; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.entity.JpaObject; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.jaxrs.WoId; import com.x.base.core.project.logger.Logger; import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.StringTools; import com.x.query.assemble.designer.Business; +import com.x.query.core.entity.ImportModel; +import com.x.query.core.entity.Query; +import com.x.query.core.entity.Reveal; +import com.x.query.core.entity.Stat; +import com.x.query.core.entity.View; +import com.x.query.core.entity.schema.Statement; +import com.x.query.core.entity.schema.Table; +import com.x.query.core.entity.wrap.WrapImportModel; +import com.x.query.core.entity.wrap.WrapQuery; +import com.x.query.core.entity.wrap.WrapReveal; +import com.x.query.core.entity.wrap.WrapStat; +import com.x.query.core.entity.wrap.WrapStatement; +import com.x.query.core.entity.wrap.WrapTable; +import com.x.query.core.entity.wrap.WrapView; class ActionCover extends BaseAction { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ActionCreate.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ActionCreate.java index 5280b097e1..c8e7ed903d 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ActionCreate.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ActionCreate.java @@ -3,11 +3,12 @@ package com.x.query.assemble.designer.jaxrs.input; import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.StringUtils; + import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.cache.ApplicationCache; import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; @@ -15,11 +16,20 @@ import com.x.base.core.project.jaxrs.WoId; import com.x.base.core.project.logger.Logger; import com.x.base.core.project.logger.LoggerFactory; import com.x.query.assemble.designer.Business; -import com.x.query.core.entity.*; +import com.x.query.core.entity.ImportModel; +import com.x.query.core.entity.Query; +import com.x.query.core.entity.Reveal; +import com.x.query.core.entity.Stat; +import com.x.query.core.entity.View; import com.x.query.core.entity.schema.Statement; import com.x.query.core.entity.schema.Table; -import com.x.query.core.entity.wrap.*; -import org.apache.commons.lang3.StringUtils; +import com.x.query.core.entity.wrap.WrapImportModel; +import com.x.query.core.entity.wrap.WrapQuery; +import com.x.query.core.entity.wrap.WrapReveal; +import com.x.query.core.entity.wrap.WrapStat; +import com.x.query.core.entity.wrap.WrapStatement; +import com.x.query.core.entity.wrap.WrapTable; +import com.x.query.core.entity.wrap.WrapView; class ActionCreate extends BaseAction { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ActionPrepareCover.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ActionPrepareCover.java index a996c0e323..f548ab8ea5 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ActionPrepareCover.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ActionPrepareCover.java @@ -9,10 +9,6 @@ import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; -import com.x.query.core.entity.*; -import com.x.query.core.entity.schema.Statement; -import com.x.query.core.entity.schema.Table; -import com.x.query.core.entity.wrap.*; import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.StringUtils; @@ -28,6 +24,20 @@ import com.x.base.core.project.logger.Logger; import com.x.base.core.project.logger.LoggerFactory; import com.x.base.core.project.tools.ListTools; import com.x.query.assemble.designer.Business; +import com.x.query.core.entity.ImportModel; +import com.x.query.core.entity.Query; +import com.x.query.core.entity.Reveal; +import com.x.query.core.entity.Stat; +import com.x.query.core.entity.View; +import com.x.query.core.entity.schema.Statement; +import com.x.query.core.entity.schema.Table; +import com.x.query.core.entity.wrap.WrapImportModel; +import com.x.query.core.entity.wrap.WrapQuery; +import com.x.query.core.entity.wrap.WrapReveal; +import com.x.query.core.entity.wrap.WrapStat; +import com.x.query.core.entity.wrap.WrapStatement; +import com.x.query.core.entity.wrap.WrapTable; +import com.x.query.core.entity.wrap.WrapView; class ActionPrepareCover extends BaseAction { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ActionPrepareCreate.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ActionPrepareCreate.java index cb2a01509b..ad6716434b 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ActionPrepareCreate.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ActionPrepareCreate.java @@ -13,10 +13,20 @@ import com.x.base.core.project.jaxrs.WrapPair; import com.x.base.core.project.logger.Logger; import com.x.base.core.project.logger.LoggerFactory; import com.x.query.assemble.designer.Business; -import com.x.query.core.entity.*; +import com.x.query.core.entity.ImportModel; +import com.x.query.core.entity.Query; +import com.x.query.core.entity.Reveal; +import com.x.query.core.entity.Stat; +import com.x.query.core.entity.View; import com.x.query.core.entity.schema.Statement; import com.x.query.core.entity.schema.Table; -import com.x.query.core.entity.wrap.*; +import com.x.query.core.entity.wrap.WrapImportModel; +import com.x.query.core.entity.wrap.WrapQuery; +import com.x.query.core.entity.wrap.WrapReveal; +import com.x.query.core.entity.wrap.WrapStat; +import com.x.query.core.entity.wrap.WrapStatement; +import com.x.query.core.entity.wrap.WrapTable; +import com.x.query.core.entity.wrap.WrapView; class ActionPrepareCreate extends BaseAction { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ExceptionEntityExistForCreate.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ExceptionEntityExistForCreate.java index f744fd8422..a2b038bbb5 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ExceptionEntityExistForCreate.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ExceptionEntityExistForCreate.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.input; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionEntityExistForCreate extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ExceptionQueryAccessDenied.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ExceptionQueryAccessDenied.java index 2ba30de5ad..3936ee5cd8 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ExceptionQueryAccessDenied.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ExceptionQueryAccessDenied.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.input; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionQueryAccessDenied extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ExceptionQueryExist.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ExceptionQueryExist.java index b333e2a8bf..9c2348add8 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ExceptionQueryExist.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ExceptionQueryExist.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.input; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionQueryExist extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ExceptionQueryNotExist.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ExceptionQueryNotExist.java index 5c5070801b..ad9cdcf48c 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ExceptionQueryNotExist.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ExceptionQueryNotExist.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.input; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionQueryNotExist extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ExceptionQueryNotExistForCover.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ExceptionQueryNotExistForCover.java index 67b7e0b8ad..fd47fdbfef 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ExceptionQueryNotExistForCover.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ExceptionQueryNotExistForCover.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.input; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionQueryNotExistForCover extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/neural/ActionDeleteModel.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/neural/ActionDeleteModel.java index 241d96c7c4..6efaebf981 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/neural/ActionDeleteModel.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/neural/ActionDeleteModel.java @@ -1,6 +1,5 @@ package com.x.query.assemble.designer.jaxrs.neural; -import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.x.base.core.container.EntityManagerContainer; @@ -9,6 +8,7 @@ import com.x.base.core.entity.JpaObject; import com.x.base.core.entity.annotation.CheckRemoveType; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.exception.ExceptionEntityNotExist; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/neural/ExceptionEntryEmpty.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/neural/ExceptionEntryEmpty.java index 30b418277d..9015b3ccb8 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/neural/ExceptionEntryEmpty.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/neural/ExceptionEntryEmpty.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.neural; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionEntryEmpty extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/neural/ExceptionGenerating.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/neural/ExceptionGenerating.java index 1194235a08..1c631ee8c1 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/neural/ExceptionGenerating.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/neural/ExceptionGenerating.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.neural; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionGenerating extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/neural/ExceptionLearning.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/neural/ExceptionLearning.java index a3cc1470b4..ca52d760da 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/neural/ExceptionLearning.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/neural/ExceptionLearning.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.neural; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionLearning extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ActionList.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ActionList.java index a4f36ef3b1..a161e3449a 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ActionList.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ActionList.java @@ -13,10 +13,20 @@ import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.tools.ListTools; import com.x.query.assemble.designer.Business; -import com.x.query.core.entity.*; +import com.x.query.core.entity.ImportModel; +import com.x.query.core.entity.Query; +import com.x.query.core.entity.Reveal; +import com.x.query.core.entity.Stat; +import com.x.query.core.entity.View; import com.x.query.core.entity.schema.Statement; import com.x.query.core.entity.schema.Table; -import com.x.query.core.entity.wrap.*; +import com.x.query.core.entity.wrap.WrapImportModel; +import com.x.query.core.entity.wrap.WrapQuery; +import com.x.query.core.entity.wrap.WrapReveal; +import com.x.query.core.entity.wrap.WrapStat; +import com.x.query.core.entity.wrap.WrapStatement; +import com.x.query.core.entity.wrap.WrapTable; +import com.x.query.core.entity.wrap.WrapView; class ActionList extends BaseAction { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ActionSelect.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ActionSelect.java index 2a668aab05..9edff921b5 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ActionSelect.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ActionSelect.java @@ -4,17 +4,27 @@ import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.project.annotation.FieldDescribe; +import com.x.base.core.project.cache.Cache.CacheKey; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.gson.XGsonBuilder; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.tools.StringTools; import com.x.query.assemble.designer.Business; -import com.x.query.core.entity.*; +import com.x.query.core.entity.ImportModel; +import com.x.query.core.entity.Query; +import com.x.query.core.entity.Reveal; +import com.x.query.core.entity.Stat; +import com.x.query.core.entity.View; import com.x.query.core.entity.schema.Statement; import com.x.query.core.entity.schema.Table; -import com.x.query.core.entity.wrap.*; -import com.x.base.core.project.cache.Cache.CacheKey; -import com.x.base.core.project.cache.CacheManager; +import com.x.query.core.entity.wrap.WrapImportModel; +import com.x.query.core.entity.wrap.WrapQuery; +import com.x.query.core.entity.wrap.WrapReveal; +import com.x.query.core.entity.wrap.WrapStat; +import com.x.query.core.entity.wrap.WrapStatement; +import com.x.query.core.entity.wrap.WrapTable; +import com.x.query.core.entity.wrap.WrapView; class ActionSelect extends BaseAction { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ActionSelectFile.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ActionSelectFile.java index 7c2976f605..bf0abe7fe7 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ActionSelectFile.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ActionSelectFile.java @@ -1,14 +1,15 @@ package com.x.query.assemble.designer.jaxrs.output; +import java.util.Optional; + import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; +import com.x.base.core.project.cache.Cache.CacheKey; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.jaxrs.WoFile; import com.x.base.core.project.tools.DefaultCharset; -import com.x.base.core.project.cache.Cache.CacheKey; -import com.x.base.core.project.cache.CacheManager; -import java.util.Optional; class ActionSelectFile extends BaseAction { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/BaseAction.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/BaseAction.java index 6d69326fc1..bd055421bb 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/BaseAction.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/BaseAction.java @@ -1,9 +1,9 @@ package com.x.query.assemble.designer.jaxrs.output; +import com.x.base.core.project.cache.Cache.CacheCategory; import com.x.base.core.project.gson.GsonPropertyObject; import com.x.base.core.project.jaxrs.StandardJaxrsAction; import com.x.query.core.entity.wrap.WrapQuery; -import com.x.base.core.project.cache.Cache.CacheCategory; abstract class BaseAction extends StandardJaxrsAction { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ExceptionFlagNotExist.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ExceptionFlagNotExist.java index cc280f7674..14ce4fe34e 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ExceptionFlagNotExist.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ExceptionFlagNotExist.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.output; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionFlagNotExist extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ExceptionQueryAccessDenied.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ExceptionQueryAccessDenied.java index e3c4c41771..d720e765dc 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ExceptionQueryAccessDenied.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ExceptionQueryAccessDenied.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.output; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionQueryAccessDenied extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ExceptionQueryNotExist.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ExceptionQueryNotExist.java index 2e4b6b3452..bde1c96243 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ExceptionQueryNotExist.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ExceptionQueryNotExist.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.output; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionQueryNotExist extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ExceptionRevealNotExist.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ExceptionRevealNotExist.java index 04731c51dc..353cae18f6 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ExceptionRevealNotExist.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ExceptionRevealNotExist.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.output; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionRevealNotExist extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ExceptionSelectNotExist.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ExceptionSelectNotExist.java index 7cd21cec66..e0925065e4 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ExceptionSelectNotExist.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ExceptionSelectNotExist.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.output; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionSelectNotExist extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ExceptionStatNotExist.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ExceptionStatNotExist.java index 7a215d818e..88f5ae3485 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ExceptionStatNotExist.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ExceptionStatNotExist.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.output; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionStatNotExist extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ExceptionViewNotExist.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ExceptionViewNotExist.java index cd1a9c611e..058b50efb0 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ExceptionViewNotExist.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/output/ExceptionViewNotExist.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.output; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionViewNotExist extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ActionCreate.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ActionCreate.java index 8b9d977fbb..4c0b217700 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ActionCreate.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ActionCreate.java @@ -2,7 +2,6 @@ package com.x.query.assemble.designer.jaxrs.query; import java.util.Date; -import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.google.gson.JsonElement; @@ -12,6 +11,7 @@ import com.x.base.core.entity.JpaObject; import com.x.base.core.entity.annotation.CheckPersistType; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.jaxrs.WoId; diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ActionDelete.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ActionDelete.java index 88cd631034..6e3fd0086c 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ActionDelete.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ActionDelete.java @@ -18,7 +18,15 @@ import com.x.base.core.project.jaxrs.WoId; import com.x.base.core.project.logger.Logger; import com.x.base.core.project.logger.LoggerFactory; import com.x.query.assemble.designer.Business; -import com.x.query.core.entity.*; +import com.x.query.core.entity.ImportModel; +import com.x.query.core.entity.ImportModel_; +import com.x.query.core.entity.Query; +import com.x.query.core.entity.Reveal; +import com.x.query.core.entity.Reveal_; +import com.x.query.core.entity.Stat; +import com.x.query.core.entity.Stat_; +import com.x.query.core.entity.View; +import com.x.query.core.entity.View_; import com.x.query.core.entity.schema.Statement; import com.x.query.core.entity.schema.Statement_; import com.x.query.core.entity.schema.Table; diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ActionEdit.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ActionEdit.java index 22efe4c875..8bc19584c1 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ActionEdit.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ActionEdit.java @@ -2,7 +2,6 @@ package com.x.query.assemble.designer.jaxrs.query; import java.util.Date; -import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.google.gson.JsonElement; @@ -12,6 +11,7 @@ import com.x.base.core.entity.JpaObject; import com.x.base.core.entity.annotation.CheckPersistType; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.jaxrs.WoId; diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ActionGetEntityProperties.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ActionGetEntityProperties.java index 2c133b2394..422d20bdc9 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ActionGetEntityProperties.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ActionGetEntityProperties.java @@ -1,5 +1,17 @@ package com.x.query.assemble.designer.jaxrs.query; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.List; + +import javax.persistence.Column; +import javax.persistence.Lob; + +import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.reflect.FieldUtils; +import org.apache.openjpa.persistence.jdbc.Strategy; + import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.entity.JpaObject; @@ -13,16 +25,6 @@ import com.x.base.core.project.http.EffectivePerson; import com.x.query.assemble.designer.Business; import com.x.query.core.entity.schema.Statement; import com.x.query.core.entity.schema.Table; -import org.apache.commons.lang3.BooleanUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.reflect.FieldUtils; -import org.apache.openjpa.persistence.jdbc.Strategy; - -import javax.persistence.Column; -import javax.persistence.Lob; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.List; class ActionGetEntityProperties extends BaseAction { ActionResult> execute(EffectivePerson effectivePerson, String entity, String entityCategory) throws Exception { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ActionSetIcon.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ActionSetIcon.java index 341d8bec65..69fe20aff7 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ActionSetIcon.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ActionSetIcon.java @@ -6,13 +6,13 @@ import java.io.ByteArrayOutputStream; import javax.imageio.ImageIO; -import com.x.base.core.project.cache.CacheManager; import org.apache.commons.codec.binary.Base64; import org.glassfish.jersey.media.multipart.FormDataContentDisposition; import org.imgscalr.Scalr; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.jaxrs.WoId; diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ExceptionAccessDenied.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ExceptionAccessDenied.java index 6f3edeca0e..01fcc6927a 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ExceptionAccessDenied.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ExceptionAccessDenied.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.query; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionAccessDenied extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ExceptionAliasExist.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ExceptionAliasExist.java index d7be358e0e..cdb540e062 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ExceptionAliasExist.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ExceptionAliasExist.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.query; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionAliasExist extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ExceptionIdExist.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ExceptionIdExist.java index 85a934dc5e..e44c3cc190 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ExceptionIdExist.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ExceptionIdExist.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.query; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionIdExist extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ExceptionNameExist.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ExceptionNameExist.java index 346c462a08..801ed0c562 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ExceptionNameExist.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ExceptionNameExist.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.query; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionNameExist extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ExceptionQueryAccessDenied.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ExceptionQueryAccessDenied.java index 7dbc008dc6..a73c40ba27 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ExceptionQueryAccessDenied.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ExceptionQueryAccessDenied.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.query; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionQueryAccessDenied extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ExceptionQueryNotExist.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ExceptionQueryNotExist.java index b218b65739..b6cd59725c 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ExceptionQueryNotExist.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/query/ExceptionQueryNotExist.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.query; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionQueryNotExist extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/reveal/ActionCreate.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/reveal/ActionCreate.java index e089d3dcff..9ada904241 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/reveal/ActionCreate.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/reveal/ActionCreate.java @@ -1,6 +1,5 @@ package com.x.query.assemble.designer.jaxrs.reveal; -import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.google.gson.JsonElement; @@ -10,6 +9,7 @@ import com.x.base.core.entity.JpaObject; import com.x.base.core.entity.annotation.CheckPersistType; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.jaxrs.WoId; diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/reveal/ActionEdit.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/reveal/ActionEdit.java index 850a275092..7be21611db 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/reveal/ActionEdit.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/reveal/ActionEdit.java @@ -1,6 +1,5 @@ package com.x.query.assemble.designer.jaxrs.reveal; -import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.google.gson.JsonElement; @@ -10,6 +9,7 @@ import com.x.base.core.entity.JpaObject; import com.x.base.core.entity.annotation.CheckPersistType; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.jaxrs.WoId; diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/reveal/ExceptionAccessDenied.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/reveal/ExceptionAccessDenied.java index a8279d6298..2e6eee3df4 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/reveal/ExceptionAccessDenied.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/reveal/ExceptionAccessDenied.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.reveal; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionAccessDenied extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/reveal/ExceptionAliasExist.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/reveal/ExceptionAliasExist.java index 82d6bbe6d7..90e563f417 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/reveal/ExceptionAliasExist.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/reveal/ExceptionAliasExist.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.reveal; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionAliasExist extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/reveal/ExceptionNameExist.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/reveal/ExceptionNameExist.java index 19f95730d5..bf04eb5e53 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/reveal/ExceptionNameExist.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/reveal/ExceptionNameExist.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.reveal; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionNameExist extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/reveal/ExceptionQueryAccessDenied.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/reveal/ExceptionQueryAccessDenied.java index 4397b0fc74..a82633e5fb 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/reveal/ExceptionQueryAccessDenied.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/reveal/ExceptionQueryAccessDenied.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.reveal; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionQueryAccessDenied extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/reveal/ExceptionQueryNotExist.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/reveal/ExceptionQueryNotExist.java index 1d8ecfdcf0..4748b89b8a 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/reveal/ExceptionQueryNotExist.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/reveal/ExceptionQueryNotExist.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.reveal; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionQueryNotExist extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/reveal/ExceptionRevealNotExist.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/reveal/ExceptionRevealNotExist.java index 3bfc002af0..914761bed9 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/reveal/ExceptionRevealNotExist.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/reveal/ExceptionRevealNotExist.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.reveal; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionRevealNotExist extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ActionCreate.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ActionCreate.java index e0d8b220d2..d5c81f0840 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ActionCreate.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ActionCreate.java @@ -1,6 +1,5 @@ package com.x.query.assemble.designer.jaxrs.stat; -import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.google.gson.JsonElement; @@ -10,7 +9,7 @@ import com.x.base.core.entity.JpaObject; import com.x.base.core.entity.annotation.CheckPersistType; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.gson.GsonPropertyObject; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ActionDelete.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ActionDelete.java index 6265958822..063af84ed6 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ActionDelete.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ActionDelete.java @@ -3,7 +3,6 @@ package com.x.query.assemble.designer.jaxrs.stat; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.entity.annotation.CheckRemoveType; -import com.x.base.core.project.cache.ApplicationCache; import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ActionEdit.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ActionEdit.java index cde46f287b..1483419ce3 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ActionEdit.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ActionEdit.java @@ -1,6 +1,5 @@ package com.x.query.assemble.designer.jaxrs.stat; -import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.google.gson.JsonElement; @@ -10,7 +9,7 @@ import com.x.base.core.entity.JpaObject; import com.x.base.core.entity.annotation.CheckPersistType; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.jaxrs.WoId; diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ExceptionAccessDenied.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ExceptionAccessDenied.java index c3c354f4fb..a006536360 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ExceptionAccessDenied.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ExceptionAccessDenied.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.stat; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionAccessDenied extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ExceptionAliasExist.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ExceptionAliasExist.java index 1a3d46f67f..7996d75f73 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ExceptionAliasExist.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ExceptionAliasExist.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.stat; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionAliasExist extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ExceptionNameExist.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ExceptionNameExist.java index cd0f21e323..2619cdb6e4 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ExceptionNameExist.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ExceptionNameExist.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.stat; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionNameExist extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ExceptionQueryAccessDenied.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ExceptionQueryAccessDenied.java index 709a9d7f92..7fc26d9fa9 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ExceptionQueryAccessDenied.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ExceptionQueryAccessDenied.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.stat; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionQueryAccessDenied extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ExceptionQueryNotExist.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ExceptionQueryNotExist.java index 6a818a3892..d19179ed91 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ExceptionQueryNotExist.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ExceptionQueryNotExist.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.stat; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionQueryNotExist extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ExceptionStatNotExist.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ExceptionStatNotExist.java index 35936f6521..bdcd6f3266 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ExceptionStatNotExist.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ExceptionStatNotExist.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.stat; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionStatNotExist extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ExceptionViewNotExist.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ExceptionViewNotExist.java index 07e473e16e..5af9a3ffc7 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ExceptionViewNotExist.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/stat/ExceptionViewNotExist.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.stat; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionViewNotExist extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/ActionCreate.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/ActionCreate.java index 6d88bbcf6c..5416baf4b7 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/ActionCreate.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/ActionCreate.java @@ -2,7 +2,6 @@ package com.x.query.assemble.designer.jaxrs.statement; import java.util.Date; -import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.google.gson.JsonElement; @@ -12,7 +11,7 @@ import com.x.base.core.entity.JpaObject; import com.x.base.core.entity.annotation.CheckPersistType; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.exception.ExceptionAccessDenied; import com.x.base.core.project.exception.ExceptionDuplicateFlag; import com.x.base.core.project.exception.ExceptionEntityFieldEmpty; diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/ActionDelete.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/ActionDelete.java index 1024c22889..033e27cbdc 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/ActionDelete.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/ActionDelete.java @@ -2,7 +2,6 @@ package com.x.query.assemble.designer.jaxrs.statement; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.project.cache.ApplicationCache; import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.exception.ExceptionAccessDenied; import com.x.base.core.project.exception.ExceptionEntityNotExist; diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/ActionEdit.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/ActionEdit.java index 3bd2638b64..b60bac89c2 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/ActionEdit.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/ActionEdit.java @@ -2,7 +2,6 @@ package com.x.query.assemble.designer.jaxrs.statement; import java.util.Date; -import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.google.gson.JsonElement; @@ -12,7 +11,7 @@ import com.x.base.core.entity.JpaObject; import com.x.base.core.entity.annotation.CheckPersistType; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.exception.ExceptionAccessDenied; import com.x.base.core.project.exception.ExceptionDuplicateFlag; import com.x.base.core.project.exception.ExceptionEntityFieldEmpty; diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/ActionExecute.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/ActionExecute.java index e6610904bb..d80db7befe 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/ActionExecute.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/ActionExecute.java @@ -9,13 +9,13 @@ import javax.script.Bindings; import javax.script.ScriptContext; import javax.script.SimpleScriptContext; -import com.x.base.core.entity.dynamic.DynamicBaseEntity; import org.apache.commons.lang3.StringUtils; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.entity.JpaObject; +import com.x.base.core.entity.dynamic.DynamicBaseEntity; import com.x.base.core.entity.dynamic.DynamicEntity; import com.x.base.core.project.exception.ExceptionAccessDenied; import com.x.base.core.project.exception.ExceptionEntityNotExist; diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/ActionExecuteV2.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/ActionExecuteV2.java index e88278ac76..5ef2955561 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/ActionExecuteV2.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/ActionExecuteV2.java @@ -1,5 +1,17 @@ package com.x.query.assemble.designer.jaxrs.statement; +import java.util.List; +import java.util.Objects; + +import javax.persistence.EntityManager; +import javax.persistence.Parameter; +import javax.persistence.Query; +import javax.script.Bindings; +import javax.script.ScriptContext; +import javax.script.SimpleScriptContext; + +import org.apache.commons.lang3.StringUtils; + import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -22,16 +34,6 @@ import com.x.query.assemble.designer.ThisApplication; import com.x.query.core.entity.schema.Statement; import com.x.query.core.entity.schema.Table; import com.x.query.core.express.statement.Runtime; -import org.apache.commons.lang3.StringUtils; - -import javax.persistence.EntityManager; -import javax.persistence.Parameter; -import javax.persistence.Query; -import javax.script.Bindings; -import javax.script.ScriptContext; -import javax.script.SimpleScriptContext; -import java.util.List; -import java.util.Objects; class ActionExecuteV2 extends BaseAction { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/ActionListWithQuery.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/ActionListWithQuery.java index 85e98abde2..65404e93ef 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/ActionListWithQuery.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/ActionListWithQuery.java @@ -14,7 +14,6 @@ import com.x.base.core.project.http.EffectivePerson; import com.x.query.assemble.designer.Business; import com.x.query.core.entity.Query; import com.x.query.core.entity.schema.Statement; -import com.x.query.core.entity.schema.Table; class ActionListWithQuery extends BaseAction { ActionResult> execute(EffectivePerson effectivePerson, String flag) throws Exception { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/BaseAction.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/BaseAction.java index ecb52ee1e7..5e40f8964d 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/BaseAction.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/BaseAction.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.statement; import java.util.HashMap; -import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/ExceptionEntityClass.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/ExceptionEntityClass.java index d5f7218bc6..952a064f8d 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/ExceptionEntityClass.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/ExceptionEntityClass.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.statement; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionEntityClass extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/ExceptionModifyOfficialTable.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/ExceptionModifyOfficialTable.java index 2a8ed4d14e..aefeaf07f0 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/ExceptionModifyOfficialTable.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/statement/ExceptionModifyOfficialTable.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.statement; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionModifyOfficialTable extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionBuildAll.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionBuildAll.java index 69d33c4e46..ca6fc55534 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionBuildAll.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionBuildAll.java @@ -1,8 +1,12 @@ package com.x.query.assemble.designer.jaxrs.table; +import java.util.Date; +import java.util.List; + import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.project.Application; +import com.x.base.core.project.x_query_assemble_designer; import com.x.base.core.project.connection.CipherConnectionAction; import com.x.base.core.project.exception.ExceptionAccessDenied; import com.x.base.core.project.http.ActionResult; @@ -11,13 +15,9 @@ import com.x.base.core.project.jaxrs.WrapBoolean; import com.x.base.core.project.logger.Logger; import com.x.base.core.project.logger.LoggerFactory; import com.x.base.core.project.tools.ListTools; -import com.x.base.core.project.x_query_assemble_designer; import com.x.query.assemble.designer.Business; import com.x.query.assemble.designer.ThisApplication; -import java.util.Date; -import java.util.List; - class ActionBuildAll extends BaseAction { private static Logger logger = LoggerFactory.getLogger(ActionBuildAll.class); diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionCreate.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionCreate.java index 22c85344ad..7c58d3d82d 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionCreate.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionCreate.java @@ -2,7 +2,6 @@ package com.x.query.assemble.designer.jaxrs.table; import java.util.Date; -import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.google.gson.JsonElement; @@ -14,7 +13,7 @@ import com.x.base.core.entity.dynamic.DynamicEntity; import com.x.base.core.entity.dynamic.DynamicEntity.Field; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.exception.ExceptionAccessDenied; import com.x.base.core.project.exception.ExceptionDuplicateFlag; import com.x.base.core.project.exception.ExceptionEntityFieldEmpty; diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionDelete.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionDelete.java index 2eb7006a83..587db9ce9d 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionDelete.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionDelete.java @@ -5,7 +5,6 @@ import java.util.List; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.entity.annotation.CheckRemoveType; -import com.x.base.core.project.cache.ApplicationCache; import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.exception.ExceptionEntityNotExist; import com.x.base.core.project.http.ActionResult; diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionEdit.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionEdit.java index 7e0a3e9c7e..06fa9e418b 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionEdit.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionEdit.java @@ -2,7 +2,6 @@ package com.x.query.assemble.designer.jaxrs.table; import java.util.Date; -import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.google.gson.JsonElement; @@ -14,9 +13,7 @@ import com.x.base.core.entity.dynamic.DynamicEntity; import com.x.base.core.entity.dynamic.DynamicEntity.Field; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.cache.ApplicationCache; -import com.x.base.core.project.exception.ExceptionDuplicateFlag; -import com.x.base.core.project.exception.ExceptionEntityFieldEmpty; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.exception.ExceptionEntityNotExist; import com.x.base.core.project.gson.XGsonBuilder; import com.x.base.core.project.http.ActionResult; diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionExecute.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionExecute.java index 4773b65422..88f9334f52 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionExecute.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionExecute.java @@ -3,13 +3,13 @@ package com.x.query.assemble.designer.jaxrs.table; import javax.persistence.EntityManager; import javax.persistence.Query; -import com.x.base.core.entity.dynamic.DynamicBaseEntity; import org.apache.commons.lang3.StringUtils; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.entity.JpaObject; +import com.x.base.core.entity.dynamic.DynamicBaseEntity; import com.x.base.core.entity.dynamic.DynamicEntity; import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.exception.ExceptionEntityNotExist; diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionGet.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionGet.java index e3efc2b81d..2aafd75969 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionGet.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionGet.java @@ -5,12 +5,10 @@ import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.entity.JpaObject; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.exception.ExceptionAccessDenied; import com.x.base.core.project.exception.ExceptionEntityNotExist; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.query.assemble.designer.Business; -import com.x.query.core.entity.Query; import com.x.query.core.entity.schema.Table; class ActionGet extends BaseAction { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionRowCountWhere.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionRowCountWhere.java index 45bdc56059..fc8c818069 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionRowCountWhere.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionRowCountWhere.java @@ -8,13 +8,11 @@ import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.entity.JpaObject; import com.x.base.core.entity.dynamic.DynamicEntity; -import com.x.base.core.project.exception.ExceptionAccessDenied; import com.x.base.core.project.exception.ExceptionEntityNotExist; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.jaxrs.WrapLong; import com.x.query.assemble.designer.Business; -import com.x.query.core.entity.Query; import com.x.query.core.entity.schema.Table; class ActionRowCountWhere extends BaseAction { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionRowDelete.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionRowDelete.java index 107dd1373b..d7da4033ba 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionRowDelete.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionRowDelete.java @@ -4,13 +4,11 @@ import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.entity.JpaObject; import com.x.base.core.entity.dynamic.DynamicEntity; -import com.x.base.core.project.exception.ExceptionAccessDenied; import com.x.base.core.project.exception.ExceptionEntityNotExist; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.jaxrs.WrapBoolean; import com.x.query.assemble.designer.Business; -import com.x.query.core.entity.Query; import com.x.query.core.entity.schema.Table; class ActionRowDelete extends BaseAction { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionRowDeleteBatch.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionRowDeleteBatch.java index 382027e984..fbb44119c7 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionRowDeleteBatch.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionRowDeleteBatch.java @@ -13,7 +13,6 @@ import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.entity.JpaObject; import com.x.base.core.entity.dynamic.DynamicEntity; -import com.x.base.core.project.exception.ExceptionAccessDenied; import com.x.base.core.project.exception.ExceptionEntityNotExist; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionRowExport.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionRowExport.java index 4b82a2b9e5..96e21e6890 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionRowExport.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionRowExport.java @@ -1,5 +1,8 @@ package com.x.query.assemble.designer.jaxrs.table; +import javax.persistence.EntityManager; +import javax.persistence.Query; + import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.entity.JpaObject; @@ -14,9 +17,6 @@ import com.x.base.core.project.tools.DefaultCharset; import com.x.query.assemble.designer.Business; import com.x.query.core.entity.schema.Table; -import javax.persistence.EntityManager; -import javax.persistence.Query; - class ActionRowExport extends BaseAction { private static Logger logger = LoggerFactory.getLogger(ActionRowExport.class); diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionRowGet.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionRowGet.java index 6161d85a50..4f82e41100 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionRowGet.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionRowGet.java @@ -4,7 +4,6 @@ import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.entity.JpaObject; import com.x.base.core.entity.dynamic.DynamicEntity; -import com.x.base.core.project.exception.ExceptionAccessDenied; import com.x.base.core.project.exception.ExceptionEntityNotExist; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionRowSave.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionRowSave.java index 98a6458799..2ec63e1870 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionRowSave.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionRowSave.java @@ -1,5 +1,8 @@ package com.x.query.assemble.designer.jaxrs.table; +import java.util.ArrayList; +import java.util.List; + import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -10,13 +13,15 @@ import com.x.base.core.project.exception.ExceptionEntityNotExist; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.jaxrs.WrapStringList; +import com.x.base.core.project.logger.Logger; +import com.x.base.core.project.logger.LoggerFactory; import com.x.query.assemble.designer.Business; import com.x.query.core.entity.schema.Table; -import java.util.ArrayList; -import java.util.List; - class ActionRowSave extends BaseAction { + + private static Logger logger = LoggerFactory.getLogger(ActionRowSave.class); + ActionResult execute(EffectivePerson effectivePerson, String tableFlag, JsonElement jsonElement) throws Exception { try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { @@ -36,7 +41,7 @@ class ActionRowSave extends BaseAction { JpaObject jo = gson.fromJson(o, cls); try { JpaObject oldjo = emc.find(jo.getId(), cls); - if(oldjo!=null) { + if (oldjo != null) { jo.copyTo(oldjo, JpaObject.FieldsUnmodify); jo = oldjo; } @@ -48,11 +53,12 @@ class ActionRowSave extends BaseAction { JpaObject jo = gson.fromJson(jsonElement, cls); try { JpaObject oldjo = emc.find(jo.getId(), cls); - if(oldjo!=null) { + if (oldjo != null) { jo.copyTo(oldjo, JpaObject.FieldsUnmodify); jo = oldjo; } } catch (Exception e) { + e.printStackTrace(); } os.add(jo); } @@ -63,7 +69,7 @@ class ActionRowSave extends BaseAction { emc.commit(); Wo wo = new Wo(); for (Object o : os) { - wo.addValue(((JpaObject)o).getId(), true); + wo.addValue(((JpaObject) o).getId(), true); } result.setData(wo); return result; diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionRowUpdate.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionRowUpdate.java index c49d1babd2..08184af6f6 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionRowUpdate.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionRowUpdate.java @@ -6,7 +6,6 @@ import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.entity.JpaObject; import com.x.base.core.entity.annotation.CheckPersistType; import com.x.base.core.entity.dynamic.DynamicEntity; -import com.x.base.core.project.exception.ExceptionAccessDenied; import com.x.base.core.project.exception.ExceptionEntityNotExist; import com.x.base.core.project.gson.XGsonBuilder; import com.x.base.core.project.http.ActionResult; diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionStatusBuild.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionStatusBuild.java index 3b36c1d6d3..e59e764b91 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionStatusBuild.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionStatusBuild.java @@ -1,11 +1,10 @@ package com.x.query.assemble.designer.jaxrs.table; -import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.exception.ExceptionEntityFieldEmpty; import com.x.base.core.project.exception.ExceptionEntityNotExist; import com.x.base.core.project.http.ActionResult; diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionStatusDraft.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionStatusDraft.java index 8953c2b46d..605e2efa16 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionStatusDraft.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionStatusDraft.java @@ -2,7 +2,6 @@ package com.x.query.assemble.designer.jaxrs.table; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.project.cache.ApplicationCache; import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.exception.ExceptionEntityNotExist; import com.x.base.core.project.http.ActionResult; diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ExceptionCompileError.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ExceptionCompileError.java index 3687dbe5ee..b9f6f984bc 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ExceptionCompileError.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ExceptionCompileError.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.table; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; public class ExceptionCompileError extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ExceptionEnhanceError.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ExceptionEnhanceError.java index 35d6717a7a..3d0e09cc6f 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ExceptionEnhanceError.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ExceptionEnhanceError.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.table; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionEnhanceError extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ExceptionFieldEmpty.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ExceptionFieldEmpty.java index 8b909d5cdf..99aa312cbb 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ExceptionFieldEmpty.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ExceptionFieldEmpty.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.table; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionFieldEmpty extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ExceptionFieldName.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ExceptionFieldName.java index e6da3bc061..c535ff25c3 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ExceptionFieldName.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ExceptionFieldName.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.table; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionFieldName extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ActionBundle.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ActionBundle.java index d97221c412..76d85cc7e2 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ActionBundle.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ActionBundle.java @@ -4,8 +4,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.x.base.core.project.config.Config; -import com.x.base.core.project.tools.MD5Tool; import org.apache.commons.collections4.list.TreeList; import org.apache.commons.lang3.StringUtils; @@ -13,12 +11,14 @@ import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.project.annotation.FieldDescribe; +import com.x.base.core.project.config.Config; import com.x.base.core.project.gson.GsonPropertyObject; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.jaxrs.WrapStringList; import com.x.base.core.project.logger.Logger; import com.x.base.core.project.logger.LoggerFactory; +import com.x.base.core.project.tools.MD5Tool; import com.x.query.assemble.designer.Business; import com.x.query.core.entity.View; import com.x.query.core.express.plan.CmsPlan; diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ActionCreate.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ActionCreate.java index 045f16bc77..fcbe49cccf 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ActionCreate.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ActionCreate.java @@ -1,6 +1,5 @@ package com.x.query.assemble.designer.jaxrs.view; -import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.google.gson.JsonElement; @@ -10,15 +9,13 @@ import com.x.base.core.entity.JpaObject; import com.x.base.core.entity.annotation.CheckPersistType; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.jaxrs.WoId; import com.x.query.assemble.designer.Business; import com.x.query.core.entity.Query; import com.x.query.core.entity.View; -import com.x.query.core.express.plan.CmsPlan; -import com.x.query.core.express.plan.ProcessPlatformPlan; class ActionCreate extends BaseAction { ActionResult execute(EffectivePerson effectivePerson, JsonElement jsonElement) throws Exception { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ActionDelete.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ActionDelete.java index b8768d4971..9ca862a79a 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ActionDelete.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ActionDelete.java @@ -3,7 +3,6 @@ package com.x.query.assemble.designer.jaxrs.view; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.entity.annotation.CheckRemoveType; -import com.x.base.core.project.cache.ApplicationCache; import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ActionEdit.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ActionEdit.java index 1ed302984f..ca80f4bd99 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ActionEdit.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ActionEdit.java @@ -1,6 +1,5 @@ package com.x.query.assemble.designer.jaxrs.view; -import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.google.gson.JsonElement; @@ -10,15 +9,13 @@ import com.x.base.core.entity.JpaObject; import com.x.base.core.entity.annotation.CheckPersistType; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.jaxrs.WoId; import com.x.query.assemble.designer.Business; import com.x.query.core.entity.Query; import com.x.query.core.entity.View; -import com.x.query.core.express.plan.CmsPlan; -import com.x.query.core.express.plan.ProcessPlatformPlan; class ActionEdit extends BaseAction { ActionResult execute(EffectivePerson effectivePerson, String id, JsonElement jsonElement) throws Exception { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ActionSimulate.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ActionSimulate.java index 7f845d3011..33b355507a 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ActionSimulate.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ActionSimulate.java @@ -4,10 +4,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.x.base.core.project.config.Config; -import com.x.base.core.project.exception.ExceptionAccessDenied; -import com.x.base.core.project.tools.ListTools; -import com.x.base.core.project.tools.MD5Tool; import org.apache.commons.collections4.list.TreeList; import org.apache.commons.lang3.StringUtils; @@ -15,11 +11,15 @@ import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.project.annotation.FieldDescribe; +import com.x.base.core.project.config.Config; +import com.x.base.core.project.exception.ExceptionAccessDenied; import com.x.base.core.project.gson.GsonPropertyObject; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.logger.Logger; import com.x.base.core.project.logger.LoggerFactory; +import com.x.base.core.project.tools.ListTools; +import com.x.base.core.project.tools.MD5Tool; import com.x.query.assemble.designer.Business; import com.x.query.core.entity.View; import com.x.query.core.express.plan.CmsPlan; diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/BaseAction.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/BaseAction.java index cc879f4b02..74e11d5a36 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/BaseAction.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/BaseAction.java @@ -1,30 +1,29 @@ package com.x.query.assemble.designer.jaxrs.view; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + import javax.persistence.EntityManager; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; -import com.google.gson.reflect.TypeToken; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.tools.ListTools; -import com.x.processplatform.core.entity.element.Process; -import com.x.query.core.express.plan.FilterEntry; -import com.x.query.core.express.plan.ProcessPlatformPlan; -import com.x.query.core.express.plan.Runtime; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; +import com.google.gson.reflect.TypeToken; +import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.jaxrs.StandardJaxrsAction; +import com.x.base.core.project.tools.ListTools; +import com.x.processplatform.core.entity.element.Process; import com.x.query.assemble.designer.Business; -import com.x.query.core.entity.Query; import com.x.query.core.entity.View; import com.x.query.core.entity.View_; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import com.x.query.core.express.plan.FilterEntry; +import com.x.query.core.express.plan.ProcessPlatformPlan; +import com.x.query.core.express.plan.Runtime; abstract class BaseAction extends StandardJaxrsAction { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ExceptionAccessDenied.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ExceptionAccessDenied.java index d7fc24473f..72a53894b8 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ExceptionAccessDenied.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ExceptionAccessDenied.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.view; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionAccessDenied extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ExceptionAliasExist.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ExceptionAliasExist.java index e88989b274..21c87a905e 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ExceptionAliasExist.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ExceptionAliasExist.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.view; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionAliasExist extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ExceptionDataEmpty.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ExceptionDataEmpty.java index e05f424116..de9bc3c96b 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ExceptionDataEmpty.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ExceptionDataEmpty.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.view; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionDataEmpty extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ExceptionNameExist.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ExceptionNameExist.java index d856eb0fc9..4cb6d11ed1 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ExceptionNameExist.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ExceptionNameExist.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.view; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionNameExist extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ExceptionQueryAccessDenied.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ExceptionQueryAccessDenied.java index 4e9dd54200..d66d7b1e60 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ExceptionQueryAccessDenied.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ExceptionQueryAccessDenied.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.view; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionQueryAccessDenied extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ExceptionQueryNotExist.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ExceptionQueryNotExist.java index 3c6cc4efe2..b5f76a1cc0 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ExceptionQueryNotExist.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ExceptionQueryNotExist.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.view; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionQueryNotExist extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ExceptionTypeValue.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ExceptionTypeValue.java index b864701284..d2ccd9dfdd 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ExceptionTypeValue.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ExceptionTypeValue.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.view; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; import com.x.query.core.entity.View; class ExceptionTypeValue extends LanguagePromptException { diff --git a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ExceptionViewNotExist.java b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ExceptionViewNotExist.java index 97b9aa5c87..a8400c9caa 100644 --- a/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ExceptionViewNotExist.java +++ b/o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ExceptionViewNotExist.java @@ -1,7 +1,6 @@ package com.x.query.assemble.designer.jaxrs.view; import com.x.base.core.project.exception.LanguagePromptException; -import com.x.base.core.project.exception.PromptException; class ExceptionViewNotExist extends LanguagePromptException { diff --git a/o2server/x_query_service_processing/src/main/java/com/x/query/service/processing/jaxrs/design/ActionSearch.java b/o2server/x_query_service_processing/src/main/java/com/x/query/service/processing/jaxrs/design/ActionSearch.java index 9babf9f02a..1797b2771b 100644 --- a/o2server/x_query_service_processing/src/main/java/com/x/query/service/processing/jaxrs/design/ActionSearch.java +++ b/o2server/x_query_service_processing/src/main/java/com/x/query/service/processing/jaxrs/design/ActionSearch.java @@ -27,17 +27,16 @@ class ActionSearch extends BaseAction { private static Logger logger = LoggerFactory.getLogger(ActionSearch.class); private static ReentrantLock lock = new ReentrantLock(); - ActionResult execute(EffectivePerson effectivePerson, JsonElement jsonElement) - throws Exception { + ActionResult execute(EffectivePerson effectivePerson, JsonElement jsonElement) throws Exception { ActionResult result = new ActionResult<>(); Wi wi = this.convertToWrapIn(jsonElement, Wi.class); - if(StringUtils.isBlank(wi.getKeyword())){ + if (StringUtils.isBlank(wi.getKeyword())) { throw new ExceptionFieldEmpty("keyword"); } logger.debug("{}搜索设计：{}的关键字：{}", effectivePerson.getDistinguishedName(), wi.getModuleList(), wi.getKeyword()); if (ListTools.isNotEmpty(wi.getModuleList())) { result.setData(search(wi, effectivePerson)); - }else{ + } else { lock.lock(); try { result.setData(search(wi, effectivePerson)); @@ -48,52 +47,53 @@ class ActionSearch extends BaseAction { return result; } - private Wo search(final Wi wi, EffectivePerson effectivePerson) throws Exception{ + private Wo search(final Wi wi, EffectivePerson effectivePerson) throws Exception { Business business = new Business(); final Map> moduleMap = new HashMap<>(); - if(!ListTools.isEmpty(wi.getModuleList())){ - for (Module module: wi.getModuleList()){ - if(module.getModuleType().equalsIgnoreCase(ModuleType.cms.toString()) - && business.isCmsManager(effectivePerson)){ + if (!ListTools.isEmpty(wi.getModuleList())) { + for (Module module : wi.getModuleList()) { + if (module.getModuleType().equalsIgnoreCase(ModuleType.cms.toString()) + && business.isCmsManager(effectivePerson)) { moduleMap.put(ModuleType.cms.toString(), module.getModuleAppList()); } - if(module.getModuleType().equalsIgnoreCase(ModuleType.portal.toString()) - && business.isPortalManager(effectivePerson)){ + if (module.getModuleType().equalsIgnoreCase(ModuleType.portal.toString()) + && business.isPortalManager(effectivePerson)) { moduleMap.put(ModuleType.portal.toString(), module.getModuleAppList()); } - if(module.getModuleType().equalsIgnoreCase(ModuleType.processPlatform.toString()) - && business.isProcessManager(effectivePerson)){ + if (module.getModuleType().equalsIgnoreCase(ModuleType.processPlatform.toString()) + && business.isProcessManager(effectivePerson)) { moduleMap.put(ModuleType.processPlatform.toString(), module.getModuleAppList()); } - if(module.getModuleType().equalsIgnoreCase(ModuleType.query.toString()) - && business.isManager(effectivePerson)){ + if (module.getModuleType().equalsIgnoreCase(ModuleType.query.toString()) + && business.isManager(effectivePerson)) { moduleMap.put(ModuleType.query.toString(), module.getModuleAppList()); } - if(module.getModuleType().equalsIgnoreCase(ModuleType.service.toString()) - && business.isServiceManager(effectivePerson)){ + if (module.getModuleType().equalsIgnoreCase(ModuleType.service.toString()) + && business.isServiceManager(effectivePerson)) { moduleMap.put(ModuleType.service.toString(), module.getModuleAppList()); } } - }else{ + } else { List list = new ArrayList<>(); - if(business.isCmsManager(effectivePerson)) { + if (business.isCmsManager(effectivePerson)) { moduleMap.put(ModuleType.cms.toString(), list); } - if(business.isPortalManager(effectivePerson)) { + if (business.isPortalManager(effectivePerson)) { moduleMap.put(ModuleType.portal.toString(), list); } - if(business.isProcessManager(effectivePerson)) { + if (business.isProcessManager(effectivePerson)) { moduleMap.put(ModuleType.processPlatform.toString(), list); } - if(business.isManager(effectivePerson)) { + if (business.isManager(effectivePerson)) { moduleMap.put(ModuleType.query.toString(), list); } - if(business.isServiceManager(effectivePerson)) { + if (business.isServiceManager(effectivePerson)) { moduleMap.put(ModuleType.service.toString(), list); } } Wo wo = new Wo(); - wo.setProcessPlatformList(searchApp(wi, moduleMap, ModuleType.processPlatform.toString(), x_processplatform_assemble_designer.class)); + wo.setProcessPlatformList(searchApp(wi, moduleMap, ModuleType.processPlatform.toString(), + x_processplatform_assemble_designer.class)); wo.setPortalList(searchApp(wi, moduleMap, ModuleType.portal.toString(), x_portal_assemble_designer.class)); wo.setCmsList(searchApp(wi, moduleMap, ModuleType.cms.toString(), x_cms_assemble_control.class)); wo.setQueryList(searchApp(wi, moduleMap, ModuleType.query.toString(), x_query_assemble_designer.class)); @@ -101,38 +101,43 @@ class ActionSearch extends BaseAction { return wo; } - private List searchApp(final Wi wi, final Map> moduleMap, final String moduleType, final Class applicationClass){ + private List searchApp(final Wi wi, final Map> moduleMap, + final String moduleType, final Class applicationClass) { List swList = null; - if(moduleMap.containsKey(moduleType)) { + if (moduleMap.containsKey(moduleType)) { try { WiDesigner wiDesigner = new WiDesigner(); BeanUtils.copyProperties(wiDesigner, wi); wiDesigner.setModuleAppList(moduleMap.get(moduleType)); - List designerList = ThisApplication.context().applications().postQuery(applicationClass, - Applications.joinQueryUri("designer", "search"), wiDesigner).getDataAsList(WrapDesigner.class); + List designerList = ThisApplication.context().applications() + .postQuery(applicationClass, Applications.joinQueryUri("designer", "search"), wiDesigner) + .getDataAsList(WrapDesigner.class); logger.debug("设计搜索关联{}的匹配设计个数：{}", moduleType, designerList.size()); getSearchRes(wi, designerList); swList = designerList; } catch (Exception e) { logger.error(e); } - if (swList!=null && swList.size() > 2) { + if (swList != null && swList.size() > 2) { try { - SortTools.desc(swList, "designerType","appId"); + SortTools.desc(swList, "designerType", "appId"); } catch (Exception e) { + logger.error(e); } } } return swList; } - private void getSearchRes(final Wi wi, List designerList){ - if (!ListTools.isEmpty(designerList)){ + private void getSearchRes(final Wi wi, List designerList) { + if (!ListTools.isEmpty(designerList)) { for (WrapDesigner designer : designerList) { WrapDesigner.DesignerPattern pattern = designer.getScriptDesigner(); - if(pattern!=null) { - Map lines = patternLines(designer.getDesignerId() + "-" + designer.getUpdateTime().getTime(), - wi.getKeyword(), pattern.getPropertyValue(), wi.getCaseSensitive(), wi.getMatchWholeWord(), wi.getMatchRegExp()); + if (pattern != null) { + Map lines = patternLines( + designer.getDesignerId() + "-" + designer.getUpdateTime().getTime(), wi.getKeyword(), + pattern.getPropertyValue(), wi.getCaseSensitive(), wi.getMatchWholeWord(), + wi.getMatchRegExp()); pattern.setLines(lines); pattern.setPropertyValue(null); } -- GitLab