From e2a64d426613fb5f662ea65f0125cc1d92a583d1 Mon Sep 17 00:00:00 2001
From: Huang <516821420@qq.com>
Date: Mon, 12 Nov 2018 11:11:37 +0800
Subject: [PATCH] no commit message
---
JeeSpringCloud/jeespring-web/pom.xml | 109 +
.../src/main/java/com/JeeSpringDriver.java | 77 +
.../src/main/java/com/JeeSpringRunPrint.java | 169 +
.../src/main/java/com/JeeSpringServlet.java | 23 +
.../modules/ylttrip/dao/TfTicketDao.java | 18 +
.../modules/ylttrip/entity/TfTicket.java | 343 +
.../ylttrip/rest/TfTicketRestController.java | 303 +
.../ylttrip/service/ITfTicketService.java | 16 +
.../ylttrip/service/TfTicketService.java | 166 +
.../ylttrip/web/TfTicketController.java | 326 +
.../modules/test/dao/one/FormLeaveDao.java | 18 +
.../test/dao/onetomany/TestDataChild2Dao.java | 18 +
.../test/dao/onetomany/TestDataChild3Dao.java | 18 +
.../test/dao/onetomany/TestDataChildDao.java | 18 +
.../test/dao/onetomany/TestDataMainDao.java | 18 +
.../modules/test/dao/tree/TestTreeDao.java | 19 +
.../modules/test/entity/one/FormLeave.java | 91 +
.../test/entity/onetomany/TestDataChild.java | 81 +
.../test/entity/onetomany/TestDataChild2.java | 80 +
.../test/entity/onetomany/TestDataChild3.java | 80 +
.../test/entity/onetomany/TestDataMain.java | 156 +
.../modules/test/entity/tree/TestTree.java | 82 +
.../rest/one/FormLeaveRestController.java | 301 +
.../onetomany/TestDataMainRestController.java | 301 +
.../test/service/one/FormLeaveService.java | 192 +
.../test/service/one/IFormLeaveService.java | 16 +
.../onetomany/ITestDataMainService.java | 16 +
.../onetomany/TestDataMainService.java | 280 +
.../test/service/tree/TestTreeService.java | 50 +
.../test/web/one/FormLeaveController.java | 293 +
.../web/onetomany/TestDataMainController.java | 293 +
.../test/web/tree/TestTreeController.java | 138 +
.../src/main/resources/act/build.xml | 29 +
.../deployments/oa/test_audit/test_audit.bar | Bin 0 -> 21268 bytes
.../resources/act/designs/oa/leave/leave.bpmn | 141 +
.../resources/act/designs/oa/leave/leave.png | Bin 0 -> 13056 bytes
.../act/designs/oa/test_audit/test_audit.bpmn | 171 +
.../act/designs/oa/test_audit/test_audit.png | Bin 0 -> 21531 bytes
.../src/main/resources/application.yml | 212 +
.../src/main/resources/ckfinder.xml | 91 +
.../src/main/resources/ehcache.xml | 28 +
.../main/resources/httpsConfig/keystore.p12 | Bin 0 -> 2604 bytes
...45\217\260pps\346\226\207\344\273\266.txt" | 1 +
.../src/main/resources/keystore.p12 | Bin 0 -> 2604 bytes
.../modules/test/one/FormLeaveDao.xml | 265 +
.../test/onetomany/TestDataChild2Dao.xml | 264 +
.../test/onetomany/TestDataChild3Dao.xml | 266 +
.../test/onetomany/TestDataChildDao.xml | 266 +
.../test/onetomany/TestDataMainDao.xml | 283 +
.../modules/test/tree/TestTreeDao.xml | 147 +
.../mappings/modules/ylttrip/TfTicketDao.xml | 377 +
.../src/main/resources/mybatis-config.xml | 52 +
.../resources/spring-context-activiti.xml | 61 +
.../src/main/resources/stencilset.json | 1319 +
.../main/webapp/WEB-INF/lib/QRCode-1.5.jar | Bin 0 -> 1099539 bytes
.../WEB-INF/lib/UserAgentUtils-1.13.jar | Bin 0 -> 32768 bytes
.../webapp/WEB-INF/lib/analyzer-2012_u6.jar | Bin 0 -> 1165347 bytes
.../webapp/WEB-INF/lib/apache-ant-zip-2.3.jar | Bin 0 -> 23863 bytes
.../main/webapp/WEB-INF/lib/ckfinder-2.3.jar | Bin 0 -> 168337 bytes
.../lib/ckfinderplugin-fileeditor-2.3.jar | Bin 0 -> 3576 bytes
.../lib/ckfinderplugin-imageresize-2.3.jar | Bin 0 -> 9025 bytes
.../webapp/WEB-INF/lib/ojdbc14-10.2.0.4.0.jar | Bin 0 -> 1555682 bytes
.../WEB-INF/lib/thumbnailator-0.4.2.jar | Bin 0 -> 91609 bytes
.../src/main/webapp/WEB-INF/tags/act/act.txt | 0
.../webapp/WEB-INF/tags/act/histoicFlow.tag | 16 +
.../WEB-INF/tags/cms/frontArticleHitsTop.tag | 7 +
.../WEB-INF/tags/cms/frontCategoryList.tag | 22 +
.../WEB-INF/tags/cms/frontCurrentPosition.tag | 6 +
.../main/webapp/WEB-INF/tags/sys/ckeditor.tag | 13 +
.../main/webapp/WEB-INF/tags/sys/ckfinder.tag | 91 +
.../webapp/WEB-INF/tags/sys/iconselect.tag | 34 +
.../main/webapp/WEB-INF/tags/sys/message.tag | 20 +
.../webapp/WEB-INF/tags/sys/tableSort.tag | 33 +
.../webapp/WEB-INF/tags/sys/treeselect.tag | 102 +
.../webapp/WEB-INF/tags/sys/validateCode.tag | 10 +
.../main/webapp/WEB-INF/tags/table/addRow.tag | 16 +
.../main/webapp/WEB-INF/tags/table/delRow.tag | 45 +
.../webapp/WEB-INF/tags/table/editRow.tag | 44 +
.../webapp/WEB-INF/tags/table/exportExcel.tag | 33 +
.../webapp/WEB-INF/tags/table/importExcel.tag | 38 +
.../main/webapp/WEB-INF/tags/table/page.tag | 5 +
.../webapp/WEB-INF/tags/table/sortColumn.tag | 37 +
.../src/main/webapp/WEB-INF/tlds/echarts.tld | 308 +
.../src/main/webapp/WEB-INF/tlds/fnc.tld | 102 +
.../src/main/webapp/WEB-INF/tlds/fns.tld | 283 +
.../src/main/webapp/WEB-INF/tlds/menu.tld | 27 +
.../src/main/webapp/WEB-INF/tlds/shiros.tld | 176 +
.../main/webapp/WEB-INF/views/base/home.jsp | 198 +
.../main/webapp/WEB-INF/views/base/index.jsp | 619 +
.../main/webapp/WEB-INF/views/base/login.jsp | 102 +
.../webapp/WEB-INF/views/base/register.jsp | 110 +
.../main/webapp/WEB-INF/views/error/400.jsp | 67 +
.../main/webapp/WEB-INF/views/error/403.jsp | 43 +
.../main/webapp/WEB-INF/views/error/404.jsp | 39 +
.../main/webapp/WEB-INF/views/error/500.jsp | 57 +
.../WEB-INF/views/error/error_fileupload.jsp | 2 +
.../webapp/WEB-INF/views/include/btnGroup.jsp | 11 +
.../webapp/WEB-INF/views/include/dialog.jsp | 2 +
.../webapp/WEB-INF/views/include/echarts.jsp | 26 +
.../webapp/WEB-INF/views/include/footJs.jsp | 8 +
.../webapp/WEB-INF/views/include/head.jsp | 68 +
.../webapp/WEB-INF/views/include/headCss.jsp | 30 +
.../webapp/WEB-INF/views/include/headJs.jsp | 46 +
.../webapp/WEB-INF/views/include/headMeta.jsp | 15 +
.../main/webapp/WEB-INF/views/include/im.jsp | 15 +
.../webapp/WEB-INF/views/include/menu.jsp | 19 +
.../webapp/WEB-INF/views/include/supcan.jsp | 3 +
.../WEB-INF/views/include/tableNoData.jsp | 4 +
.../webapp/WEB-INF/views/include/taglib.jsp | 17 +
.../WEB-INF/views/include/treetable.jsp | 2 +
.../webapp/WEB-INF/views/include/treeview.jsp | 2 +
.../webapp/WEB-INF/views/layouts/blank.jsp | 15 +
.../webapp/WEB-INF/views/layouts/default.jsp | 30 +
.../views/modules/act/actModelCreate.jsp | 105 +
.../views/modules/act/actModelList.jsp | 128 +
.../views/modules/act/actProcessDeploy.jsp | 66 +
.../views/modules/act/actProcessList.jsp | 138 +
.../modules/act/actProcessRunningList.jsp | 117 +
.../WEB-INF/views/modules/act/actTaskForm.jsp | 42 +
.../views/modules/act/actTaskHistoricFlow.jsp | 15 +
.../views/modules/act/actTaskHistoricList.jsp | 119 +
.../WEB-INF/views/modules/act/actTaskMap.jsp | 26 +
.../views/modules/act/actTaskProcessList.jsp | 99 +
.../views/modules/act/actTaskTodoList.jsp | 151 +
.../WEB-INF/views/modules/cms/articleForm.jsp | 245 +
.../WEB-INF/views/modules/cms/articleList.jsp | 140 +
.../views/modules/cms/articleSelectList.jsp | 79 +
.../views/modules/cms/categoryForm.jsp | 176 +
.../views/modules/cms/categoryList.jsp | 99 +
.../WEB-INF/views/modules/cms/cmsIndex.jsp | 39 +
.../WEB-INF/views/modules/cms/cmsNone.jsp | 10 +
.../WEB-INF/views/modules/cms/cmsTree.jsp | 74 +
.../WEB-INF/views/modules/cms/commentList.jsp | 113 +
.../views/modules/cms/front/include/head.jsp | 14 +
.../modules/cms/front/include/taglib.jsp | 16 +
.../cms/front/themes/basic/frontComment.jsp | 91 +
.../cms/front/themes/basic/frontGuestbook.jsp | 119 +
.../cms/front/themes/basic/frontIndex.jsp | 387 +
.../front/themes/basic/frontIndex_back.jsp | 43 +
.../cms/front/themes/basic/frontList.jsp | 56 +
.../front/themes/basic/frontListCategory.jsp | 62 +
.../cms/front/themes/basic/frontMap.jsp | 50 +
.../cms/front/themes/basic/frontSearch.jsp | 101 +
.../front/themes/basic/frontViewArticle.jsp | 72 +
.../front/themes/basic/layouts/default.jsp | 61 +
.../themes/basic/layouts/default_footer.jsp | 10 +
.../themes/basic/layouts/default_head.jsp | 47 +
.../cms/front/themes/weixin/frontComment.jsp | 90 +
.../front/themes/weixin/frontGuestbook.jsp | 195 +
.../cms/front/themes/weixin/frontIndex.jsp | 56 +
.../cms/front/themes/weixin/frontList.jsp | 56 +
.../front/themes/weixin/frontListCategory.jsp | 53 +
.../cms/front/themes/weixin/frontMap.jsp | 48 +
.../cms/front/themes/weixin/frontSearch.jsp | 99 +
.../front/themes/weixin/frontViewArticle.jsp | 159 +
.../front/themes/weixin/layouts/default.jsp | 17 +
.../views/modules/cms/guestbookForm.jsp | 113 +
.../views/modules/cms/guestbookList.jsp | 114 +
.../WEB-INF/views/modules/cms/linkForm.jsp | 108 +
.../WEB-INF/views/modules/cms/linkList.jsp | 52 +
.../WEB-INF/views/modules/cms/siteForm.jsp | 97 +
.../WEB-INF/views/modules/cms/siteList.jsp | 106 +
.../WEB-INF/views/modules/cms/siteSelect.jsp | 70 +
.../views/modules/cms/statsArticle.jsp | 119 +
.../WEB-INF/views/modules/cms/tplForm.jsp | 52 +
.../WEB-INF/views/modules/cms/tplHelp.jsp | 41 +
.../WEB-INF/views/modules/cms/tplIndex.jsp | 31 +
.../WEB-INF/views/modules/cms/tplTree.jsp | 59 +
.../WEB-INF/views/modules/echarts/bar.jsp | 25 +
.../echarts/chinaWeatherDataBeanForm.jsp | 102 +
.../echarts/chinaWeatherDataBeanList.jsp | 186 +
.../WEB-INF/views/modules/echarts/line.jsp | 27 +
.../views/modules/echarts/lineDoubleNum.jsp | 14 +
.../views/modules/echarts/lineTimeLine.jsp | 31 +
.../WEB-INF/views/modules/echarts/pie.jsp | 10 +
.../views/modules/echarts/pieClassForm.jsp | 66 +
.../views/modules/echarts/pieClassList.jsp | 141 +
.../WEB-INF/views/modules/echarts/radar.jsp | 21 +
.../WEB-INF/views/modules/gen/genCodeForm.jsp | 123 +
.../views/modules/gen/genSchemeForm.jsp | 126 +
.../views/modules/gen/genSchemeList.jsp | 51 +
.../views/modules/gen/genTableForm.jsp | 1333 +
.../views/modules/gen/genTableList.jsp | 157 +
.../views/modules/gen/importTableFromDB.jsp | 91 +
.../views/modules/iim/chatHistoryList.jsp | 171 +
.../WEB-INF/views/modules/iim/contacts.jsp | 108 +
.../views/modules/iim/mailBoxDetail.jsp | 156 +
.../WEB-INF/views/modules/iim/mailBoxList.jsp | 223 +
.../views/modules/iim/mailComposeDetail.jsp | 156 +
.../views/modules/iim/mailComposeList.jsp | 189 +
.../views/modules/iim/mailDraftDetail.jsp | 223 +
.../views/modules/iim/mailDraftList.jsp | 209 +
.../modules/iim/mail_compose_success.jsp | 33 +
.../WEB-INF/views/modules/iim/mail_reply.jsp | 230 +
.../WEB-INF/views/modules/iim/mail_send.jsp | 219 +
.../WEB-INF/views/modules/iim/myCalendar.jsp | 128 +
.../views/modules/iim/myCalendarForm-add.jsp | 158 +
.../views/modules/iim/myCalendarForm-edit.jsp | 168 +
.../WEB-INF/views/modules/iim/myFriends.jsp | 120 +
.../WEB-INF/views/modules/iim/search_user.jsp | 93 +
.../WEB-INF/views/modules/job/sysJobForm.jsp | 118 +
.../views/modules/job/sysJobFormTwo.jsp | 77 +
.../WEB-INF/views/modules/job/sysJobList.jsp | 202 +
.../views/modules/job/sysJobListVue.jsp | 282 +
.../views/modules/job/sysJobLogForm.jsp | 105 +
.../views/modules/job/sysJobLogFormTwo.jsp | 72 +
.../views/modules/job/sysJobLogList.jsp | 194 +
.../views/modules/job/sysJobLogListVue.jsp | 305 +
.../views/modules/job/sysJobLogSelect.jsp | 290 +
.../views/modules/job/sysJobLogTotal.jsp | 114 +
.../views/modules/job/sysJobLogTotalMap.jsp | 206 +
.../views/modules/job/sysJobSelect.jsp | 288 +
.../WEB-INF/views/modules/job/sysJobTotal.jsp | 125 +
.../views/modules/job/sysJobTotalMap.jsp | 217 +
...3\345\222\214\345\244\204\347\220\206.txt" | 2 +
.../WEB-INF/views/modules/monitor/info.jsp | 158 +
.../WEB-INF/views/modules/monitor/monitor.jsp | 2 +
.../views/modules/monitor/systemInfo.jsp | 69 +
.../views/modules/mvvmoa/formLeavemForm.jsp | 67 +
.../views/modules/mvvmoa/formLeavemList.jsp | 146 +
.../WEB-INF/views/modules/oa/notice.html | 38 +
.../WEB-INF/views/modules/oa/notice_add.html | 39 +
.../WEB-INF/views/modules/oa/notice_edit.html | 39 +
.../WEB-INF/views/modules/oa/oaNotifyForm.jsp | 151 +
.../WEB-INF/views/modules/oa/oaNotifyList.jsp | 156 +
.../views/modules/oa/testAuditAudit.jsp | 122 +
.../views/modules/oa/testAuditForm.jsp | 145 +
.../views/modules/oa/testAuditList.jsp | 106 +
.../views/modules/oa/testAuditView.jsp | 106 +
.../WEB-INF/views/modules/sys/areaForm.jsp | 89 +
.../WEB-INF/views/modules/sys/areaList.jsp | 112 +
.../WEB-INF/views/modules/sys/dictForm.jsp | 52 +
.../WEB-INF/views/modules/sys/dictList.jsp | 115 +
.../WEB-INF/views/modules/sys/logList.jsp | 137 +
.../WEB-INF/views/modules/sys/menuForm.jsp | 140 +
.../WEB-INF/views/modules/sys/menuList.jsp | 128 +
.../WEB-INF/views/modules/sys/menuTree.jsp | 48 +
.../views/modules/sys/menuTreeselect.jsp | 20 +
.../WEB-INF/views/modules/sys/officeForm.jsp | 198 +
.../WEB-INF/views/modules/sys/officeIndex.jsp | 97 +
.../WEB-INF/views/modules/sys/officeList.jsp | 102 +
.../WEB-INF/views/modules/sys/roleAssign.jsp | 127 +
.../WEB-INF/views/modules/sys/roleAuth.jsp | 114 +
.../WEB-INF/views/modules/sys/roleForm.jsp | 238 +
.../WEB-INF/views/modules/sys/roleList.jsp | 124 +
.../views/modules/sys/selectUserToRole.jsp | 114 +
.../views/modules/sys/sysConfigForm.jsp | 68 +
.../views/modules/sys/sysConfigList.jsp | 139 +
.../views/modules/sys/sysConfigSelect.jsp | 227 +
.../views/modules/sys/sysConfigTreeForm.jsp | 113 +
.../views/modules/sys/sysConfigTreeList.jsp | 175 +
.../views/modules/sys/sysDictTreeForm.jsp | 114 +
.../views/modules/sys/sysDictTreeList.jsp | 170 +
.../WEB-INF/views/modules/sys/sysHome.jsp | 188 +
.../WEB-INF/views/modules/sys/sysLogin.jsp | 159 +
.../WEB-INF/views/modules/sys/sysRegister.jsp | 110 +
.../views/modules/sys/sysServerForm.jsp | 140 +
.../views/modules/sys/sysServerList.jsp | 221 +
.../views/modules/sys/sysServerListVue.jsp | 289 +
.../views/modules/sys/sysServerSelect.jsp | 293 +
.../views/modules/sys/sysServerTotal.jsp | 124 +
.../views/modules/sys/sysServerTotalMap.jsp | 216 +
.../views/modules/sys/sysUserOnlineForm.jsp | 134 +
.../views/modules/sys/sysUserOnlineList.jsp | 217 +
.../modules/sys/sysUserOnlineListVue.jsp | 284 +
.../views/modules/sys/sysUserOnlineSelect.jsp | 302 +
.../views/modules/sys/sysUserOnlineTotal.jsp | 131 +
.../modules/sys/sysUserOnlineTotalMap.jsp | 223 +
.../views/modules/sys/systemConfig.jsp | 140 +
.../views/modules/sys/tagIconselect.jsp | 955 +
.../views/modules/sys/tagTreeselect.jsp | 181 +
.../WEB-INF/views/modules/sys/userForm.jsp | 216 +
.../views/modules/sys/userImageEdit.jsp | 492 +
.../WEB-INF/views/modules/sys/userIndex.jsp | 98 +
.../WEB-INF/views/modules/sys/userInfo.jsp | 254 +
.../views/modules/sys/userInfoEdit.jsp | 45 +
.../WEB-INF/views/modules/sys/userList.jsp | 141 +
.../views/modules/sys/userModifyPwd.jsp | 44 +
.../views/modules/test/one/formLeaveForm.jsp | 93 +
.../modules/test/one/formLeaveFormTwo.jsp | 95 +
.../views/modules/test/one/formLeaveList.jsp | 162 +
.../modules/test/one/formLeaveListVue.jsp | 136 +
.../modules/test/one/formLeaveSelect.jsp | 216 +
.../views/modules/test/one/formLeaveTotal.jsp | 99 +
.../modules/test/one/formLeaveTotalMap.jsp | 190 +
.../test/onetomany/testDataMainForm.jsp | 414 +
.../test/onetomany/testDataMainFormTwo.jsp | 416 +
.../test/onetomany/testDataMainList.jsp | 186 +
.../test/onetomany/testDataMainListVue.jsp | 160 +
.../test/onetomany/testDataMainSelect.jsp | 254 +
.../test/onetomany/testDataMainTotal.jsp | 114 +
.../test/onetomany/testDataMainTotalMap.jsp | 199 +
.../views/modules/test/tree/testTreeForm.jsp | 76 +
.../views/modules/test/tree/testTreeList.jsp | 127 +
.../modules/usercenter/sysUserCenterForm.jsp | 66 +
.../modules/usercenter/sysUserCenterList.jsp | 215 +
.../usercenter/sysUserCenterSelect.jsp | 293 +
.../WEB-INF/views/modules/utils/map.jsp | 130 +
.../views/modules/utils/mapUserCenter.jsp | 161 +
.../views/modules/ylttrip/tfTicketForm.jsp | 176 +
.../views/modules/ylttrip/tfTicketFormTwo.jsp | 178 +
.../views/modules/ylttrip/tfTicketList.jsp | 277 +
.../views/modules/ylttrip/tfTicketListVue.jsp | 231 +
.../views/modules/ylttrip/tfTicketSelect.jsp | 326 +
.../views/modules/ylttrip/tfTicketTotal.jsp | 184 +
.../modules/ylttrip/tfTicketTotalMap.jsp | 234 +
.../jeespring-web/src/main/webapp/a.txt | 0
.../webapp/act/diagram-viewer/images/bg.png | Bin 0 -> 3383 bytes
.../act/diagram-viewer/images/breadcrumbs.png | Bin 0 -> 580 bytes
.../act/diagram-viewer/images/checker-bg.png | Bin 0 -> 108 bytes
.../images/deployer/blue/message_catch.png | Bin 0 -> 438 bytes
.../images/deployer/business_rule.png | Bin 0 -> 227 bytes
.../images/deployer/error_catch.png | Bin 0 -> 1307 bytes
.../images/deployer/error_throw.png | Bin 0 -> 830 bytes
.../diagram-viewer/images/deployer/manual.png | Bin 0 -> 3319 bytes
.../images/deployer/message_catch.png | Bin 0 -> 410 bytes
.../images/deployer/message_throw.png | Bin 0 -> 367 bytes
.../images/deployer/receive.png | Bin 0 -> 344 bytes
.../diagram-viewer/images/deployer/script.png | Bin 0 -> 601 bytes
.../diagram-viewer/images/deployer/send.png | Bin 0 -> 361 bytes
.../images/deployer/service.png | Bin 0 -> 1445 bytes
.../images/deployer/signal_catch.png | Bin 0 -> 953 bytes
.../images/deployer/signal_throw.png | Bin 0 -> 687 bytes
.../diagram-viewer/images/deployer/timer.png | Bin 0 -> 6280 bytes
.../diagram-viewer/images/deployer/user.png | Bin 0 -> 775 bytes
.../main/webapp/act/diagram-viewer/index.html | 131 +
.../act/diagram-viewer/js/ActivitiRest.js | 74 +
.../act/diagram-viewer/js/ActivityImpl.js | 1 +
.../webapp/act/diagram-viewer/js/Color.js | 603 +
.../diagram-viewer/js/LineBreakMeasurer.js | 270 +
.../webapp/act/diagram-viewer/js/Polyline.js | 387 +
.../diagram-viewer/js/ProcessDiagramCanvas.js | 2172 ++
.../js/ProcessDiagramGenerator.js | 1102 +
.../js/jquery/jquery.asyncqueue.js | 125 +
.../act/diagram-viewer/js/jquery/jquery.js | 9266 ++++++
.../js/jquery/jquery.progressbar.js | 131 +
.../webapp/act/diagram-viewer/js/jstools.js | 23 +
.../act/diagram-viewer/js/raphael.2.1.1.js | 10 +
.../webapp/act/diagram-viewer/js/raphael.js | 10 +
.../diagram-viewer/js/raphael_uncompressed.js | 5815 ++++
.../act/diagram-viewer/js/textlayout.js | 441 +
.../main/webapp/act/diagram-viewer/style.css | 1 +
.../act/process-editor/editor-app/app-cfg.js | 25 +
.../act/process-editor/editor-app/app.js | 433 +
.../properties-assignment-controller.js | 150 +
...perties-condition-expression-controller.js | 58 +
.../properties-custom-controllers.js | 18 +
.../properties-default-controllers.js | 115 +
.../properties-event-listeners-controller.js | 266 +
...operties-execution-listeners-controller.js | 326 +
.../properties-fields-controller.js | 192 +
.../properties-form-properties-controller.js | 276 +
.../properties-in-parameters-controller.js | 158 +
...operties-message-definitions-controller.js | 137 +
.../properties-message-scope-controller.js | 48 +
.../properties-multiinstance-controller.js | 34 +
.../properties-out-parameters-controller.js | 158 +
...roperties-sequenceflow-order-controller.js | 130 +
...roperties-signal-definitions-controller.js | 136 +
.../properties-signal-scope-controller.js | 47 +
.../properties-task-listeners-controller.js | 325 +
.../editor-app/configuration/properties.js | 99 +
.../assignment-display-template.html | 4 +
.../properties/assignment-popup.html | 44 +
.../properties/assignment-write-template.html | 4 +
.../properties/boolean-property-template.html | 4 +
...condition-expression-display-template.html | 2 +
.../condition-expression-popup.html | 29 +
.../condition-expression-write-template.html | 4 +
.../default-value-display-template.html | 4 +
.../event-listeners-display-template.html | 3 +
.../properties/event-listeners-popup.html | 115 +
.../event-listeners-write-template.html | 4 +
.../execution-listeners-display-template.html | 3 +
.../properties/execution-listeners-popup.html | 101 +
.../execution-listeners-write-template.html | 4 +
.../properties/feedback-popup.html | 17 +
.../properties/fields-display-template.html | 3 +
.../properties/fields-popup.html | 61 +
.../properties/fields-write-template.html | 4 +
.../form-properties-display-template.html | 3 +
.../properties/form-properties-popup.html | 117 +
.../form-properties-write-template.html | 4 +
.../in-parameters-display-template.html | 3 +
.../properties/in-parameters-popup.html | 53 +
.../in-parameters-write-template.html | 4 +
.../message-definitions-display-template.html | 2 +
.../properties/message-definitions-popup.html | 50 +
.../message-definitions-write-template.html | 3 +
.../message-property-write-template.html | 4 +
...multiinstance-property-write-template.html | 8 +
.../out-parameters-display-template.html | 3 +
.../properties/out-parameters-popup.html | 53 +
.../out-parameters-write-template.html | 4 +
.../sequenceflow-order-display-template.html | 3 +
.../properties/sequenceflow-order-popup.html | 47 +
.../sequenceflow-order-write-template.html | 4 +
.../signal-definitions-display-template.html | 3 +
.../properties/signal-definitions-popup.html | 58 +
.../signal-definitions-write-template.html | 4 +
.../signal-property-write-template.html | 4 +
.../string-property-write-mode-template.html | 8 +
...subprocess-reference-display-template.html | 3 +
.../subprocess-reference-popup.html | 43 +
.../subprocess-reference-write-template.html | 4 +
.../task-listeners-display-template.html | 3 +
.../properties/task-listeners-popup.html | 102 +
.../task-listeners-write-template.html | 4 +
.../configuration/properties/text-popup.html | 17 +
.../text-property-write-template.html | 4 +
.../configuration/toolbar-custom-actions.js | 18 +
.../configuration/toolbar-default-actions.js | 433 +
.../editor-app/configuration/toolbar.js | 175 +
.../editor-app/configuration/url-config.js | 34 +
.../editor-app/css/style-common.css | 1517 +
.../editor-app/css/style-editor.css | 639 +
.../process-editor/editor-app/css/style.css | 477 +
.../editor-app/editor-config.js | 32 +
.../editor-app/editor-controller.js | 65 +
.../process-editor/editor-app/editor-utils.js | 135 +
.../act/process-editor/editor-app/editor.html | 136 +
.../editor-app/editor/css/editor.css | 202 +
.../editor-app/editor/i18n/translation_de.js | 383 +
.../editor/i18n/translation_en_us.js | 423 +
.../editor/i18n/translation_signavio_de.js | 106 +
.../editor/i18n/translation_signavio_en_us.js | 108 +
.../editor-app/editor/oryx.debug.js | 24510 ++++++++++++++++
.../process-editor/editor-app/editor/oryx.js | 30 +
.../act/process-editor/editor-app/eventbus.js | 133 +
.../fonts/activiti-admin-webfont.eot | Bin 0 -> 5029 bytes
.../fonts/activiti-admin-webfont.svg | 43 +
.../fonts/activiti-admin-webfont.ttf | Bin 0 -> 8628 bytes
.../fonts/activiti-admin-webfont.woff | Bin 0 -> 5624 bytes
.../fonts/glyphicons-halflings-regular.eot | Bin 0 -> 20290 bytes
.../fonts/glyphicons-halflings-regular.svg | 229 +
.../fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 41236 bytes
.../fonts/glyphicons-halflings-regular.woff | Bin 0 -> 23292 bytes
.../editor-app/header-controller.js | 31 +
.../process-editor/editor-app/i18n/en.json | 291 +
.../editor-app/images/bpmn-error.png | Bin 0 -> 492 bytes
.../editor-app/images/bpmn-warning.png | Bin 0 -> 469 bytes
.../editor-app/images/datadefinition.png | Bin 0 -> 778 bytes
.../editor-app/images/delete.png | Bin 0 -> 304 bytes
.../editor-app/images/loading.gif | Bin 0 -> 17550 bytes
.../editor-app/images/logo-2x.png | Bin 0 -> 9386 bytes
.../process-editor/editor-app/images/logo.png | Bin 0 -> 4427 bytes
.../editor-app/images/nw-handle-dark.gif | Bin 0 -> 839 bytes
.../editor-app/images/se-handle-dark.gif | Bin 0 -> 838 bytes
.../editor-app/images/shapemenu_highlight.png | Bin 0 -> 462 bytes
.../editor-app/images/wrench.png | Bin 0 -> 374 bytes
.../angular-cookies.min.js | 8 +
.../angular-cookies.min.js.map | 8 +
.../libs/angular-dragdrop.min-1.0.3.js | 9 +
.../angular-dragdrop.min.js | 29 +
.../angular-mocks_1.2.13/angular-mocks.js | 2136 ++
.../angular-resource.js | 596 +
.../angular-resource.min.js | 13 +
.../angular-resource.min.js.map | 8 +
.../angular-route_1.2.13/angular-route.js | 921 +
.../angular-route_1.2.13/angular-route.min.js | 14 +
.../angular-route.min.js.map | 8 +
.../angular-sanitize.js | 625 +
.../angular-sanitize.min.js | 14 +
.../angular-sanitize.min.js.map | 8 +
.../angular-scroll.min.js | 1 +
.../angular-strap_2.0.5/angular-strap.min.js | 9 +
.../angular-strap.tpl.min.js | 8 +
.../.bower.json | 19 +
.../angular-translate-loader-static-files.js | 31 +
...gular-translate-loader-static-files.min.js | 6 +
.../.bower.json | 20 +
.../angular-translate-storage-cookie.js | 19 +
.../angular-translate-storage-cookie.min.js | 6 +
.../angular-translate.js | 960 +
.../angular-translate.min.js | 6 +
.../angular_1.2.13/angular-animate.min.js | 27 +
.../libs/angular_1.2.13/angular.min.js | 204 +
.../daterangepicker-bs3.css | 267 +
.../daterangepicker.js | 1026 +
.../bootstrap_3.1.1/css/bootstrap-theme.css | 347 +
.../css/bootstrap-theme.css.map | 1 +
.../css/bootstrap-theme.min.css | 7 +
.../libs/bootstrap_3.1.1/css/bootstrap.css | 5785 ++++
.../bootstrap_3.1.1/css/bootstrap.css.map | 1 +
.../bootstrap_3.1.1/css/bootstrap.min.css | 7 +
.../fonts/glyphicons-halflings-regular.eot | Bin 0 -> 20335 bytes
.../fonts/glyphicons-halflings-regular.svg | 229 +
.../fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 41280 bytes
.../fonts/glyphicons-halflings-regular.woff | Bin 0 -> 23320 bytes
.../libs/bootstrap_3.1.1/js/bootstrap.js | 1951 ++
.../libs/bootstrap_3.1.1/js/bootstrap.min.js | 6 +
.../libs/es5-shim-15.3.4.5/.bower.json | 14 +
.../libs/es5-shim-15.3.4.5/.gitignore | 2 +
.../editor-app/libs/es5-shim-15.3.4.5/CHANGES | 93 +
.../libs/es5-shim-15.3.4.5/CONTRIBUTORS.md | 25 +
.../editor-app/libs/es5-shim-15.3.4.5/LICENSE | 19 +
.../libs/es5-shim-15.3.4.5/README.md | 161 +
.../libs/es5-shim-15.3.4.5/es5-sham.js | 444 +
.../libs/es5-shim-15.3.4.5/es5-sham.map | 1 +
.../libs/es5-shim-15.3.4.5/es5-sham.min.js | 4 +
.../libs/es5-shim-15.3.4.5/es5-shim.js | 1314 +
.../libs/es5-shim-15.3.4.5/es5-shim.map | 1 +
.../libs/es5-shim-15.3.4.5/es5-shim.min.js | 4 +
.../libs/es5-shim-15.3.4.5/package.json | 34 +
.../es5-shim-15.3.4.5/tests/helpers/h-kill.js | 64 +
.../tests/helpers/h-matchers.js | 34 +
.../libs/es5-shim-15.3.4.5/tests/helpers/h.js | 3 +
.../libs/es5-shim-15.3.4.5/tests/index.html | 64 +
.../es5-shim-15.3.4.5/tests/index.min.html | 63 +
.../tests/lib/jasmine-html.js | 190 +
.../es5-shim-15.3.4.5/tests/lib/jasmine.css | 166 +
.../es5-shim-15.3.4.5/tests/lib/jasmine.js | 2477 ++
.../tests/lib/jasmine_favicon.png | Bin 0 -> 905 bytes
.../libs/es5-shim-15.3.4.5/tests/lib/json2.js | 478 +
.../es5-shim-15.3.4.5/tests/spec/s-array.js | 1223 +
.../es5-shim-15.3.4.5/tests/spec/s-date.js | 152 +
.../tests/spec/s-function.js | 147 +
.../es5-shim-15.3.4.5/tests/spec/s-number.js | 14 +
.../es5-shim-15.3.4.5/tests/spec/s-object.js | 181 +
.../es5-shim-15.3.4.5/tests/spec/s-string.js | 204 +
.../libs/jquery-ui-1.10.3.custom.min.js | 6 +
.../libs/jquery.autogrow-textarea.js | 61 +
.../editor-app/libs/jquery_1.11.0/jquery.js | 9789 ++++++
.../libs/jquery_1.11.0/jquery.min.js | 4 +
.../libs/jquery_1.11.0/jquery.min.map | 1 +
.../editor-app/libs/json3_3.2.6/LICENSE | 20 +
.../editor-app/libs/json3_3.2.6/lib/json3.js | 861 +
.../libs/json3_3.2.6/lib/json3.min.js | 18 +
.../libs/momentjs_2.5.1/momentjs.min.js | 6 +
.../editor-app/libs/mousetrap-1.4.5.min.js | 9 +
.../editor-app/libs/ng-grid-2.0.7-min.js | 2 +
.../editor-app/libs/ng-grid-2.0.7.min.css | 1 +
.../editor-app/libs/path_parser.js | 30 +
.../editor-app/libs/prototype-1.5.1.js | 3272 +++
.../editor-app/libs/ui-utils.min-0.0.4.js | 7 +
.../partials/root-stencil-item-template.html | 11 +
.../partials/stencil-item-template.html | 27 +
.../act/process-editor/editor-app/plugins.xml | 58 +
.../editor-app/popups/icon-template.html | 3 +
.../editor-app/popups/save-model.html | 41 +
.../editor-app/popups/select-shape.html | 20 +
.../editor-app/popups/unsaved-changes.html | 22 +
.../editor-app/select-shape-controller.js | 314 +
.../editor-app/stencil-controller.js | 1435 +
.../activity/event.subprocess.collapsed.png | Bin 0 -> 309 bytes
.../icons/activity/event.subprocess.png | Bin 0 -> 274 bytes
.../icons/activity/expanded.subprocess.png | Bin 0 -> 273 bytes
.../activity/list/type.business.rule.png | Bin 0 -> 209 bytes
.../icons/activity/list/type.camel.png | Bin 0 -> 608 bytes
.../icons/activity/list/type.manual.png | Bin 0 -> 405 bytes
.../bpmn2.0/icons/activity/list/type.mule.png | Bin 0 -> 705 bytes
.../icons/activity/list/type.receive.png | Bin 0 -> 297 bytes
.../icons/activity/list/type.script.png | Bin 0 -> 300 bytes
.../bpmn2.0/icons/activity/list/type.send.png | Bin 0 -> 440 bytes
.../icons/activity/list/type.service.png | Bin 0 -> 530 bytes
.../icons/activity/list/type.shell.png | Bin 0 -> 325 bytes
.../bpmn2.0/icons/activity/list/type.user.png | Bin 0 -> 405 bytes
.../bpmn2.0/icons/activity/subprocess.png | Bin 0 -> 282 bytes
.../bpmn2.0/icons/activity/task.png | Bin 0 -> 255 bytes
.../icons/artifact/text.annotation.png | Bin 0 -> 367 bytes
.../bpmn2.0/icons/catching/cancel.png | Bin 0 -> 3241 bytes
.../bpmn2.0/icons/catching/compensation.png | Bin 0 -> 3256 bytes
.../bpmn2.0/icons/catching/error.png | Bin 0 -> 698 bytes
.../bpmn2.0/icons/catching/message.png | Bin 0 -> 549 bytes
.../bpmn2.0/icons/catching/signal.png | Bin 0 -> 627 bytes
.../bpmn2.0/icons/catching/timer.png | Bin 0 -> 573 bytes
.../connector/association.undirected.png | Bin 0 -> 413 bytes
.../connector/association.unidirectional.png | Bin 0 -> 3032 bytes
.../bpmn2.0/icons/connector/messageflow.png | Bin 0 -> 3121 bytes
.../bpmn2.0/icons/connector/sequenceflow.png | Bin 0 -> 346 bytes
.../bpmn2.0/icons/dataobject/data.store.png | Bin 0 -> 3184 bytes
.../stencilsets/bpmn2.0/icons/diagram.png | Bin 0 -> 206 bytes
.../bpmn2.0/icons/endevent/cancel.png | Bin 0 -> 3280 bytes
.../bpmn2.0/icons/endevent/error.png | Bin 0 -> 757 bytes
.../bpmn2.0/icons/endevent/none.png | Bin 0 -> 467 bytes
.../bpmn2.0/icons/endevent/terminate.png | Bin 0 -> 3166 bytes
.../bpmn2.0/icons/gateway/eventbased.png | Bin 0 -> 492 bytes
.../icons/gateway/exclusive.databased.png | Bin 0 -> 462 bytes
.../bpmn2.0/icons/gateway/inclusive.png | Bin 0 -> 432 bytes
.../bpmn2.0/icons/gateway/parallel.png | Bin 0 -> 329 bytes
.../bpmn2.0/icons/startevent/error.png | Bin 0 -> 698 bytes
.../bpmn2.0/icons/startevent/message.png | Bin 0 -> 549 bytes
.../bpmn2.0/icons/startevent/none.png | Bin 0 -> 450 bytes
.../bpmn2.0/icons/startevent/signal.png | Bin 0 -> 3201 bytes
.../bpmn2.0/icons/startevent/timer.png | Bin 0 -> 573 bytes
.../bpmn2.0/icons/swimlane/lane.png | Bin 0 -> 187 bytes
.../bpmn2.0/icons/swimlane/pool.png | Bin 0 -> 189 bytes
.../bpmn2.0/icons/throwing/none.png | Bin 0 -> 582 bytes
.../bpmn2.0/icons/throwing/signal.png | Bin 0 -> 747 bytes
.../editor-app/toolbar-controller.js | 162 +
.../webapp/act/process-editor/modeler.jsp | 142 +
591 files changed, 133053 insertions(+)
create mode 100644 JeeSpringCloud/jeespring-web/pom.xml
create mode 100644 JeeSpringCloud/jeespring-web/src/main/java/com/JeeSpringDriver.java
create mode 100644 JeeSpringCloud/jeespring-web/src/main/java/com/JeeSpringRunPrint.java
create mode 100644 JeeSpringCloud/jeespring-web/src/main/java/com/JeeSpringServlet.java
create mode 100644 JeeSpringCloud/jeespring-web/src/main/java/com/company/project/modules/ylttrip/dao/TfTicketDao.java
create mode 100644 JeeSpringCloud/jeespring-web/src/main/java/com/company/project/modules/ylttrip/entity/TfTicket.java
create mode 100644 JeeSpringCloud/jeespring-web/src/main/java/com/company/project/modules/ylttrip/rest/TfTicketRestController.java
create mode 100644 JeeSpringCloud/jeespring-web/src/main/java/com/company/project/modules/ylttrip/service/ITfTicketService.java
create mode 100644 JeeSpringCloud/jeespring-web/src/main/java/com/company/project/modules/ylttrip/service/TfTicketService.java
create mode 100644 JeeSpringCloud/jeespring-web/src/main/java/com/company/project/modules/ylttrip/web/TfTicketController.java
create mode 100644 JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/dao/one/FormLeaveDao.java
create mode 100644 JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/dao/onetomany/TestDataChild2Dao.java
create mode 100644 JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/dao/onetomany/TestDataChild3Dao.java
create mode 100644 JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/dao/onetomany/TestDataChildDao.java
create mode 100644 JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/dao/onetomany/TestDataMainDao.java
create mode 100644 JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/dao/tree/TestTreeDao.java
create mode 100644 JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/entity/one/FormLeave.java
create mode 100644 JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/entity/onetomany/TestDataChild.java
create mode 100644 JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/entity/onetomany/TestDataChild2.java
create mode 100644 JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/entity/onetomany/TestDataChild3.java
create mode 100644 JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/entity/onetomany/TestDataMain.java
create mode 100644 JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/entity/tree/TestTree.java
create mode 100644 JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/rest/one/FormLeaveRestController.java
create mode 100644 JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/rest/onetomany/TestDataMainRestController.java
create mode 100644 JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/service/one/FormLeaveService.java
create mode 100644 JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/service/one/IFormLeaveService.java
create mode 100644 JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/service/onetomany/ITestDataMainService.java
create mode 100644 JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/service/onetomany/TestDataMainService.java
create mode 100644 JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/service/tree/TestTreeService.java
create mode 100644 JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/web/one/FormLeaveController.java
create mode 100644 JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/web/onetomany/TestDataMainController.java
create mode 100644 JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/web/tree/TestTreeController.java
create mode 100644 JeeSpringCloud/jeespring-web/src/main/resources/act/build.xml
create mode 100644 JeeSpringCloud/jeespring-web/src/main/resources/act/deployments/oa/test_audit/test_audit.bar
create mode 100644 JeeSpringCloud/jeespring-web/src/main/resources/act/designs/oa/leave/leave.bpmn
create mode 100644 JeeSpringCloud/jeespring-web/src/main/resources/act/designs/oa/leave/leave.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/resources/act/designs/oa/test_audit/test_audit.bpmn
create mode 100644 JeeSpringCloud/jeespring-web/src/main/resources/act/designs/oa/test_audit/test_audit.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/resources/application.yml
create mode 100644 JeeSpringCloud/jeespring-web/src/main/resources/ckfinder.xml
create mode 100644 JeeSpringCloud/jeespring-web/src/main/resources/ehcache.xml
create mode 100644 JeeSpringCloud/jeespring-web/src/main/resources/httpsConfig/keystore.p12
create mode 100644 "JeeSpringCloud/jeespring-web/src/main/resources/httpsConfig/\347\224\237\346\210\220\345\220\216\345\217\260pps\346\226\207\344\273\266.txt"
create mode 100644 JeeSpringCloud/jeespring-web/src/main/resources/keystore.p12
create mode 100644 JeeSpringCloud/jeespring-web/src/main/resources/mappings/modules/test/one/FormLeaveDao.xml
create mode 100644 JeeSpringCloud/jeespring-web/src/main/resources/mappings/modules/test/onetomany/TestDataChild2Dao.xml
create mode 100644 JeeSpringCloud/jeespring-web/src/main/resources/mappings/modules/test/onetomany/TestDataChild3Dao.xml
create mode 100644 JeeSpringCloud/jeespring-web/src/main/resources/mappings/modules/test/onetomany/TestDataChildDao.xml
create mode 100644 JeeSpringCloud/jeespring-web/src/main/resources/mappings/modules/test/onetomany/TestDataMainDao.xml
create mode 100644 JeeSpringCloud/jeespring-web/src/main/resources/mappings/modules/test/tree/TestTreeDao.xml
create mode 100644 JeeSpringCloud/jeespring-web/src/main/resources/mappings/modules/ylttrip/TfTicketDao.xml
create mode 100644 JeeSpringCloud/jeespring-web/src/main/resources/mybatis-config.xml
create mode 100644 JeeSpringCloud/jeespring-web/src/main/resources/spring-context-activiti.xml
create mode 100644 JeeSpringCloud/jeespring-web/src/main/resources/stencilset.json
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/lib/QRCode-1.5.jar
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/lib/UserAgentUtils-1.13.jar
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/lib/analyzer-2012_u6.jar
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/lib/apache-ant-zip-2.3.jar
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/lib/ckfinder-2.3.jar
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/lib/ckfinderplugin-fileeditor-2.3.jar
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/lib/ckfinderplugin-imageresize-2.3.jar
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/lib/ojdbc14-10.2.0.4.0.jar
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/lib/thumbnailator-0.4.2.jar
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/tags/act/act.txt
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/tags/act/histoicFlow.tag
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/tags/cms/frontArticleHitsTop.tag
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/tags/cms/frontCategoryList.tag
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/tags/cms/frontCurrentPosition.tag
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/tags/sys/ckeditor.tag
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/tags/sys/ckfinder.tag
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/tags/sys/iconselect.tag
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/tags/sys/message.tag
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/tags/sys/tableSort.tag
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/tags/sys/treeselect.tag
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/tags/sys/validateCode.tag
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/tags/table/addRow.tag
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/tags/table/delRow.tag
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/tags/table/editRow.tag
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/tags/table/exportExcel.tag
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/tags/table/importExcel.tag
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/tags/table/page.tag
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/tags/table/sortColumn.tag
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/tlds/echarts.tld
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/tlds/fnc.tld
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/tlds/fns.tld
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/tlds/menu.tld
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/tlds/shiros.tld
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/base/home.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/base/index.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/base/login.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/base/register.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/error/400.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/error/403.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/error/404.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/error/500.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/error/error_fileupload.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/include/btnGroup.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/include/dialog.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/include/echarts.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/include/footJs.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/include/head.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/include/headCss.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/include/headJs.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/include/headMeta.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/include/im.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/include/menu.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/include/supcan.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/include/tableNoData.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/include/taglib.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/include/treetable.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/include/treeview.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/layouts/blank.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/layouts/default.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/act/actModelCreate.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/act/actModelList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/act/actProcessDeploy.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/act/actProcessList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/act/actProcessRunningList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/act/actTaskForm.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/act/actTaskHistoricFlow.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/act/actTaskHistoricList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/act/actTaskMap.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/act/actTaskProcessList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/act/actTaskTodoList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/articleForm.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/articleList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/articleSelectList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/categoryForm.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/categoryList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/cmsIndex.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/cmsNone.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/cmsTree.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/commentList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/front/include/head.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/front/include/taglib.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/front/themes/basic/frontComment.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/front/themes/basic/frontGuestbook.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/front/themes/basic/frontIndex.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/front/themes/basic/frontIndex_back.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/front/themes/basic/frontList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/front/themes/basic/frontListCategory.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/front/themes/basic/frontMap.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/front/themes/basic/frontSearch.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/front/themes/basic/frontViewArticle.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/front/themes/basic/layouts/default.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/front/themes/basic/layouts/default_footer.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/front/themes/basic/layouts/default_head.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/front/themes/weixin/frontComment.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/front/themes/weixin/frontGuestbook.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/front/themes/weixin/frontIndex.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/front/themes/weixin/frontList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/front/themes/weixin/frontListCategory.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/front/themes/weixin/frontMap.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/front/themes/weixin/frontSearch.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/front/themes/weixin/frontViewArticle.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/front/themes/weixin/layouts/default.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/guestbookForm.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/guestbookList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/linkForm.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/linkList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/siteForm.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/siteList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/siteSelect.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/statsArticle.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/tplForm.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/tplHelp.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/tplIndex.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/cms/tplTree.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/echarts/bar.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/echarts/chinaWeatherDataBeanForm.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/echarts/chinaWeatherDataBeanList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/echarts/line.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/echarts/lineDoubleNum.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/echarts/lineTimeLine.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/echarts/pie.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/echarts/pieClassForm.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/echarts/pieClassList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/echarts/radar.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/gen/genCodeForm.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/gen/genSchemeForm.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/gen/genSchemeList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/gen/genTableForm.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/gen/genTableList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/gen/importTableFromDB.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/iim/chatHistoryList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/iim/contacts.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/iim/mailBoxDetail.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/iim/mailBoxList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/iim/mailComposeDetail.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/iim/mailComposeList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/iim/mailDraftDetail.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/iim/mailDraftList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/iim/mail_compose_success.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/iim/mail_reply.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/iim/mail_send.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/iim/myCalendar.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/iim/myCalendarForm-add.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/iim/myCalendarForm-edit.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/iim/myFriends.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/iim/search_user.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/job/sysJobForm.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/job/sysJobFormTwo.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/job/sysJobList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/job/sysJobListVue.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/job/sysJobLogForm.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/job/sysJobLogFormTwo.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/job/sysJobLogList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/job/sysJobLogListVue.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/job/sysJobLogSelect.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/job/sysJobLogTotal.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/job/sysJobLogTotalMap.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/job/sysJobSelect.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/job/sysJobTotal.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/job/sysJobTotalMap.jsp
create mode 100644 "JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/jsp\350\257\264\346\230\216\345\277\205\347\234\213\345\222\214\345\244\204\347\220\206.txt"
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/monitor/info.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/monitor/monitor.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/monitor/systemInfo.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/mvvmoa/formLeavemForm.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/mvvmoa/formLeavemList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/oa/notice.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/oa/notice_add.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/oa/notice_edit.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/oa/oaNotifyForm.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/oa/oaNotifyList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/oa/testAuditAudit.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/oa/testAuditForm.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/oa/testAuditList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/oa/testAuditView.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/areaForm.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/areaList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/dictForm.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/dictList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/logList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/menuForm.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/menuList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/menuTree.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/menuTreeselect.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/officeForm.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/officeIndex.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/officeList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/roleAssign.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/roleAuth.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/roleForm.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/roleList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/selectUserToRole.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/sysConfigForm.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/sysConfigList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/sysConfigSelect.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/sysConfigTreeForm.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/sysConfigTreeList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/sysDictTreeForm.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/sysDictTreeList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/sysHome.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/sysLogin.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/sysRegister.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/sysServerForm.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/sysServerList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/sysServerListVue.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/sysServerSelect.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/sysServerTotal.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/sysServerTotalMap.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/sysUserOnlineForm.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/sysUserOnlineList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/sysUserOnlineListVue.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/sysUserOnlineSelect.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/sysUserOnlineTotal.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/sysUserOnlineTotalMap.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/systemConfig.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/tagIconselect.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/tagTreeselect.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/userForm.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/userImageEdit.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/userIndex.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/userInfo.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/userInfoEdit.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/userList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/sys/userModifyPwd.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/test/one/formLeaveForm.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/test/one/formLeaveFormTwo.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/test/one/formLeaveList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/test/one/formLeaveListVue.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/test/one/formLeaveSelect.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/test/one/formLeaveTotal.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/test/one/formLeaveTotalMap.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/test/onetomany/testDataMainForm.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/test/onetomany/testDataMainFormTwo.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/test/onetomany/testDataMainList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/test/onetomany/testDataMainListVue.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/test/onetomany/testDataMainSelect.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/test/onetomany/testDataMainTotal.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/test/onetomany/testDataMainTotalMap.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/test/tree/testTreeForm.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/test/tree/testTreeList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/usercenter/sysUserCenterForm.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/usercenter/sysUserCenterList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/usercenter/sysUserCenterSelect.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/utils/map.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/utils/mapUserCenter.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/ylttrip/tfTicketForm.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/ylttrip/tfTicketFormTwo.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/ylttrip/tfTicketList.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/ylttrip/tfTicketListVue.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/ylttrip/tfTicketSelect.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/ylttrip/tfTicketTotal.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/WEB-INF/views/modules/ylttrip/tfTicketTotalMap.jsp
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/a.txt
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/images/bg.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/images/breadcrumbs.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/images/checker-bg.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/images/deployer/blue/message_catch.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/images/deployer/business_rule.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/images/deployer/error_catch.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/images/deployer/error_throw.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/images/deployer/manual.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/images/deployer/message_catch.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/images/deployer/message_throw.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/images/deployer/receive.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/images/deployer/script.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/images/deployer/send.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/images/deployer/service.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/images/deployer/signal_catch.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/images/deployer/signal_throw.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/images/deployer/timer.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/images/deployer/user.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/index.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/js/ActivitiRest.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/js/ActivityImpl.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/js/Color.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/js/LineBreakMeasurer.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/js/Polyline.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/js/ProcessDiagramCanvas.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/js/ProcessDiagramGenerator.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/js/jquery/jquery.asyncqueue.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/js/jquery/jquery.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/js/jquery/jquery.progressbar.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/js/jstools.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/js/raphael.2.1.1.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/js/raphael.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/js/raphael_uncompressed.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/js/textlayout.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/diagram-viewer/style.css
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/app-cfg.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/app.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties-assignment-controller.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties-condition-expression-controller.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties-custom-controllers.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties-default-controllers.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties-event-listeners-controller.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties-execution-listeners-controller.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties-fields-controller.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties-form-properties-controller.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties-in-parameters-controller.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties-message-definitions-controller.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties-message-scope-controller.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties-multiinstance-controller.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties-out-parameters-controller.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties-sequenceflow-order-controller.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties-signal-definitions-controller.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties-signal-scope-controller.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties-task-listeners-controller.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/assignment-display-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/assignment-popup.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/assignment-write-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/boolean-property-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/condition-expression-display-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/condition-expression-popup.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/condition-expression-write-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/default-value-display-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/event-listeners-display-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/event-listeners-popup.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/event-listeners-write-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/execution-listeners-display-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/execution-listeners-popup.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/execution-listeners-write-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/feedback-popup.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/fields-display-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/fields-popup.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/fields-write-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/form-properties-display-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/form-properties-popup.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/form-properties-write-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/in-parameters-display-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/in-parameters-popup.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/in-parameters-write-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/message-definitions-display-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/message-definitions-popup.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/message-definitions-write-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/message-property-write-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/multiinstance-property-write-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/out-parameters-display-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/out-parameters-popup.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/out-parameters-write-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/sequenceflow-order-display-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/sequenceflow-order-popup.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/sequenceflow-order-write-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/signal-definitions-display-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/signal-definitions-popup.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/signal-definitions-write-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/signal-property-write-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/string-property-write-mode-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/subprocess-reference-display-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/subprocess-reference-popup.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/subprocess-reference-write-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/task-listeners-display-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/task-listeners-popup.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/task-listeners-write-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/text-popup.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/properties/text-property-write-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/toolbar-custom-actions.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/toolbar-default-actions.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/toolbar.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/configuration/url-config.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/css/style-common.css
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/css/style-editor.css
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/css/style.css
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/editor-config.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/editor-controller.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/editor-utils.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/editor.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/editor/css/editor.css
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/editor/i18n/translation_de.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/editor/i18n/translation_en_us.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/editor/i18n/translation_signavio_de.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/editor/i18n/translation_signavio_en_us.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/editor/oryx.debug.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/editor/oryx.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/eventbus.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/fonts/activiti-admin-webfont.eot
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/fonts/activiti-admin-webfont.svg
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/fonts/activiti-admin-webfont.ttf
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/fonts/activiti-admin-webfont.woff
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/fonts/glyphicons-halflings-regular.eot
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/fonts/glyphicons-halflings-regular.svg
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/fonts/glyphicons-halflings-regular.ttf
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/fonts/glyphicons-halflings-regular.woff
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/header-controller.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/i18n/en.json
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/images/bpmn-error.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/images/bpmn-warning.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/images/datadefinition.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/images/delete.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/images/loading.gif
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/images/logo-2x.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/images/logo.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/images/nw-handle-dark.gif
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/images/se-handle-dark.gif
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/images/shapemenu_highlight.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/images/wrench.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/angular-cookies_1.2.13/angular-cookies.min.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/angular-cookies_1.2.13/angular-cookies.min.js.map
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/angular-dragdrop.min-1.0.3.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/angular-dragdrop_1.0.7/angular-dragdrop.min.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/angular-mocks_1.2.13/angular-mocks.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/angular-resource_1.2.13/angular-resource.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/angular-resource_1.2.13/angular-resource.min.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/angular-resource_1.2.13/angular-resource.min.js.map
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/angular-route_1.2.13/angular-route.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/angular-route_1.2.13/angular-route.min.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/angular-route_1.2.13/angular-route.min.js.map
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/angular-sanitize_1.2.13/angular-sanitize.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/angular-sanitize_1.2.13/angular-sanitize.min.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/angular-sanitize_1.2.13/angular-sanitize.min.js.map
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/angular-scroll_0.5.7/angular-scroll.min.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/angular-strap_2.0.5/angular-strap.min.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/angular-strap_2.0.5/angular-strap.tpl.min.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/angular-translate-loader-static-files/.bower.json
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/angular-translate-loader-static-files/angular-translate-loader-static-files.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/angular-translate-loader-static-files/angular-translate-loader-static-files.min.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/angular-translate-storage-cookie/.bower.json
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/angular-translate-storage-cookie/angular-translate-storage-cookie.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/angular-translate-storage-cookie/angular-translate-storage-cookie.min.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/angular-translate_2.4.2/angular-translate.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/angular-translate_2.4.2/angular-translate.min.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/angular_1.2.13/angular-animate.min.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/angular_1.2.13/angular.min.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/bootstrap-daterangepicker_1.3.7/daterangepicker-bs3.css
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/bootstrap-daterangepicker_1.3.7/daterangepicker.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/bootstrap_3.1.1/css/bootstrap-theme.css
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/bootstrap_3.1.1/css/bootstrap-theme.css.map
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/bootstrap_3.1.1/css/bootstrap-theme.min.css
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/bootstrap_3.1.1/css/bootstrap.css
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/bootstrap_3.1.1/css/bootstrap.css.map
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/bootstrap_3.1.1/css/bootstrap.min.css
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.eot
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.svg
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.ttf
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.woff
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/bootstrap_3.1.1/js/bootstrap.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/bootstrap_3.1.1/js/bootstrap.min.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/es5-shim-15.3.4.5/.bower.json
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/es5-shim-15.3.4.5/.gitignore
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/es5-shim-15.3.4.5/CHANGES
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/es5-shim-15.3.4.5/CONTRIBUTORS.md
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/es5-shim-15.3.4.5/LICENSE
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/es5-shim-15.3.4.5/README.md
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/es5-shim-15.3.4.5/es5-sham.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/es5-shim-15.3.4.5/es5-sham.map
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/es5-shim-15.3.4.5/es5-sham.min.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/es5-shim-15.3.4.5/es5-shim.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/es5-shim-15.3.4.5/es5-shim.map
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/es5-shim-15.3.4.5/es5-shim.min.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/es5-shim-15.3.4.5/package.json
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/es5-shim-15.3.4.5/tests/helpers/h-kill.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/es5-shim-15.3.4.5/tests/helpers/h-matchers.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/es5-shim-15.3.4.5/tests/helpers/h.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/es5-shim-15.3.4.5/tests/index.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/es5-shim-15.3.4.5/tests/index.min.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine-html.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine.css
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine_favicon.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/es5-shim-15.3.4.5/tests/lib/json2.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-array.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-date.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-function.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-number.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-object.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-string.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/jquery-ui-1.10.3.custom.min.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/jquery.autogrow-textarea.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/jquery_1.11.0/jquery.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/jquery_1.11.0/jquery.min.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/jquery_1.11.0/jquery.min.map
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/json3_3.2.6/LICENSE
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/json3_3.2.6/lib/json3.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/json3_3.2.6/lib/json3.min.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/momentjs_2.5.1/momentjs.min.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/mousetrap-1.4.5.min.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/ng-grid-2.0.7-min.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/ng-grid-2.0.7.min.css
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/path_parser.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/prototype-1.5.1.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/libs/ui-utils.min-0.0.4.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/partials/root-stencil-item-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/partials/stencil-item-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/plugins.xml
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/popups/icon-template.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/popups/save-model.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/popups/select-shape.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/popups/unsaved-changes.html
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/select-shape-controller.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencil-controller.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/activity/event.subprocess.collapsed.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/activity/event.subprocess.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/activity/expanded.subprocess.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.business.rule.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.camel.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.manual.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.mule.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.receive.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.script.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.send.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.service.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.shell.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.user.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/activity/subprocess.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/activity/task.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/artifact/text.annotation.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/catching/cancel.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/catching/compensation.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/catching/error.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/catching/message.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/catching/signal.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/catching/timer.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/connector/association.undirected.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/connector/association.unidirectional.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/connector/messageflow.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/connector/sequenceflow.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/dataobject/data.store.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/diagram.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/endevent/cancel.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/endevent/error.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/endevent/none.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/endevent/terminate.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/gateway/eventbased.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/gateway/exclusive.databased.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/gateway/inclusive.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/gateway/parallel.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/startevent/error.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/startevent/message.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/startevent/none.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/startevent/signal.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/startevent/timer.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/swimlane/lane.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/swimlane/pool.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/throwing/none.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/stencilsets/bpmn2.0/icons/throwing/signal.png
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/editor-app/toolbar-controller.js
create mode 100644 JeeSpringCloud/jeespring-web/src/main/webapp/act/process-editor/modeler.jsp
diff --git a/JeeSpringCloud/jeespring-web/pom.xml b/JeeSpringCloud/jeespring-web/pom.xml
new file mode 100644
index 0000000..158cda2
--- /dev/null
+++ b/JeeSpringCloud/jeespring-web/pom.xml
@@ -0,0 +1,109 @@
+
+
+ 4.0.0
+ com.jeespring
+ jeespring-web
+ jeespring-web
+ jeespring-web
+ 3.0.0
+ war
+
+ com.jeespring
+ jeespring
+ 1.0.0
+ ../pom.xml
+
+
+
+
+ com.jeespring
+ jeespring-cms
+ 1.0.0
+
+
+ com.jeespring
+ jeespring-company
+ 1.0.0
+
+
+ com.jeespring
+ jeespring-framework
+ 1.0.0
+
+
+
+
+
+ com.ckfinder
+ apache-ant-zip
+ 2.3
+ system
+ ${project.basedir}/src/main/webapp/WEB-INF/lib/apache-ant-zip-2.3.jar
+
+
+ com.ckfinder
+ ckfinder
+ 2.3
+ system
+ ${project.basedir}/src/main/webapp/WEB-INF/lib/ckfinder-2.3.jar
+
+
+ com.ckfinder
+ ckfinderplugin-fileeditor
+ 2.3
+ system
+ ${project.basedir}/src/main/webapp/WEB-INF/lib/ckfinderplugin-fileeditor-2.3.jar
+
+
+ com.ckfinder
+ ckfinderplugin-imageresize
+ 2.3
+ system
+ ${project.basedir}/src/main/webapp/WEB-INF/lib/ckfinderplugin-imageresize-2.3.jar
+
+
+ com.swetake
+ qrcode
+ 1.5
+ system
+ ${project.basedir}/src/main/webapp/WEB-INF/lib/QRCode-1.5.jar
+
+
+ bitwalker
+ UserAgentUtils
+ 1.13
+ system
+ ${project.basedir}/src/main/webapp/WEB-INF/lib/UserAgentUtils-1.13.jar
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+ slf4j-log4j12
+
+
+
+
+
+
\ No newline at end of file
diff --git a/JeeSpringCloud/jeespring-web/src/main/java/com/JeeSpringDriver.java b/JeeSpringCloud/jeespring-web/src/main/java/com/JeeSpringDriver.java
new file mode 100644
index 0000000..c03f9c3
--- /dev/null
+++ b/JeeSpringCloud/jeespring-web/src/main/java/com/JeeSpringDriver.java
@@ -0,0 +1,77 @@
+/**
+ * Copyright © 2012-2016 JeeSpring All rights reserved.
+ */
+package com;
+
+import com.jeespring.common.websocket.WebSockertFilter;
+import com.jeespring.modules.sys.service.SystemService;
+import org.apache.catalina.connector.Connector;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
+import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+/**
+ * jeespring
+ * springboot的启动类
+ * * * @author 黄炳桂 516821420@qq.com
+ * Created on 2017/1/8 16:20
+ *
+ * @EnableAutoConfiguration(exclude = {
+ * org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration.class,
+ * org.activiti.spring.boot.SecurityAutoConfiguration.class,
+ * })
+ * 使用lazyInit缩短Spring Boot启动时间//, lazyInit = true
+ */
+@EnableCaching
+@SpringBootApplication
+@ServletComponentScan(basePackages = {"com.jeespring", "com.company","cn.xxx"})
+@ComponentScan(basePackages = {"com.jeespring", "com.company","cn.xxx"})
+@MapperScan(basePackages={"com.jeespring.modules.**.dao","com.company.project.modules.*.dao","cn.xxx.xxx.modules.*.dao"})
+@EnableScheduling
+@ComponentScan
+@EnableAutoConfiguration
+@Configuration
+public class JeeSpringDriver {
+
+ @Value("${http.port}")
+ private Integer port;
+
+ public static void main(String[] args) {
+ //Spring boot run
+ new SpringApplicationBuilder(JeeSpringDriver.class).web(true).run(args);
+ SystemService.printKeyLoadMessage();
+ //IM WebSocker
+ WebSockertFilter w = new WebSockertFilter();
+ w.startWebsocketChatServer();
+ JeeSpringRunPrint.runPrint();
+ }
+
+ @Bean
+ public EmbeddedServletContainerFactory servletContainer() {
+ TomcatEmbeddedServletContainerFactory tomcat = new TomcatEmbeddedServletContainerFactory();
+ // 添加http
+ tomcat.addAdditionalTomcatConnectors(createStandardConnector());
+ return tomcat;
+ }
+
+ /**
+ * 配置http
+ * @return Connector
+ */
+ private Connector createStandardConnector() {
+ Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
+ connector.setPort(port);
+ return connector;
+ }
+
+}
diff --git a/JeeSpringCloud/jeespring-web/src/main/java/com/JeeSpringRunPrint.java b/JeeSpringCloud/jeespring-web/src/main/java/com/JeeSpringRunPrint.java
new file mode 100644
index 0000000..235db06
--- /dev/null
+++ b/JeeSpringCloud/jeespring-web/src/main/java/com/JeeSpringRunPrint.java
@@ -0,0 +1,169 @@
+package com;
+
+public class JeeSpringRunPrint {
+
+ public static void runPrint(){
+ printGods();
+ printAnimalsGods();
+ printLadyGods();
+ printPoetries();
+ }
+
+ private static void printGods() {
+ System.out.println(
+ "--------------- 佛祖保佑 神兽护体 女神助攻 流量冲天 ---------------\n" +
+ " _ooOoo_ \n" +
+ " o8888888o \n" +
+ " 88\" . \"88 \n" +
+ " (| ^_^ |) \n" +
+ " O\\ = /O \n" +
+ " ____/`---'\\____ \n" +
+ " .' \\\\| |// `. \n" +
+ " / \\||| : |||// \\ \n" +
+ " / _||||| -:- |||||- \\ \n" +
+ " | | \\\\\\ - /// | | \n" +
+ " | \\_| ''\\---/'' | | \n" +
+ " \\ .-\\__ `-` ___/-. / \n" +
+ " ___`. .' /--.--\\ `. . ___ \n" +
+ " .\"\" '< `.___\\_<|>_/___.' >'\"\". \n" +
+ " | | : `- \\`.;`\\ _ /`;.`/ - ` : | | \n" +
+ " \\ \\ `-. \\_ __\\ /__ _/ .-` / / \n" +
+ " ========`-.____`-.___\\_____/___.-`____.-'======== \n" +
+ " `=---=' \n" +
+ " ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n" +
+ " 佛祖保佑 永不宕机 永无BUG 流量冲天 \n" +
+ "");
+ }
+
+ private static void printAnimalsGods(){
+ System.out.println(
+ "\n" +
+ " ┏┓ ┏┓+ + \n" +
+ " ┏┛┻━━━━━━━┛┻┓ + + \n" +
+ " ┃ ┃ \n" +
+ " ┃ ━ ┃ ++ + + + \n" +
+ " █████━█████ ┃+ \n" +
+ " ┃ ┃ + \n" +
+ " ┃ ┻ ┃ \n" +
+ " ┃ ┃ + + \n" +
+ " ┗━━┓ ┏━━━━┛ \n" +
+ " ┃ ┃ \n" +
+ " ┃ ┃ + + + + \n" +
+ " ┃ ┃ \n" +
+ " ┃ ┃ + 神兽护体,流量冲天 \n" +
+ " ┃ ┃ 永不宕机,代码无bug \n" +
+ " ┃ ┃ + \n" +
+ " ┃ ┗━━━━━┓ + + \n" +
+ " ┃ ┣┓ \n" +
+ " ┃ ┏┛ \n" +
+ " ┗┓┓┏━━━┳┓┏┛ + + + + \n" +
+ " ┃┫┫ ┃┫┫ \n" +
+ " ┗┻┛ ┗┻┛+ + + + \n" +
+ "");
+ System.out.println(
+ "\n" +
+ " ┏┓ ┏┓ \n" +
+ " ┏┛┻━━━━━━┛┻┓ \n" +
+ " ┃ ┃ \n" +
+ " ┃ ━ ┃ \n" +
+ " ┃ ┳┛ ┗┳ ┃ \n" +
+ " ┃ ┃ \n" +
+ " ┃ ┻ ┃ \n" +
+ " ┃ ┃ \n" +
+ " ┗━┓ ┏━━━┛ \n" +
+ " ┃ ┃ 神兽护体 流量冲天 \n" +
+ " ┃ ┃ 永不宕机 代码无BUG！ \n" +
+ " ┃ ┗━━━━━━━━━┓ \n" +
+ " ┃ ┣┓ \n" +
+ " ┃ ┏┛ \n" +
+ " ┗━┓ ┓ ┏━━━┳ ┓ ┏━┛ \n" +
+ " ┃ ┫ ┫ ┃ ┫ ┫ \n" +
+ " ┗━┻━┛ ┗━┻━┛ \n" +
+ "");
+ }
+
+ private static void printLadyGods(){
+ System.out.println(
+ "\n" +
+ " .::::. \n" +
+ " .::::::::. \n" +
+ " ::::::::::: \n" +
+ " ..:::::::::::' \n" +
+ " '::::::::::::' \n" +
+ " .:::::::::: \n" +
+ " '::::::::::::::.. 女神助攻,流量冲天 \n" +
+ " ..::::::::::::. 永不宕机,代码无bug \n" +
+ " ``:::::::::::::::: \n" +
+ " ::::``:::::::::' .:::. \n" +
+ " ::::' ':::::' .::::::::. \n" +
+ " .::::' :::: .:::::::'::::. \n" +
+ " .:::' ::::: .:::::::::' ':::::. \n" +
+ " .::' :::::.:::::::::' ':::::. \n" +
+ " .::' ::::::::::::::' ``::::. \n" +
+ " ...::: ::::::::::::' ``::. \n" +
+ " ```` ':. ':::::::::' ::::.. \n" +
+ " '.:::::' ':'````.. \n" +
+ "");
+ }
+
+ private static void printPoetries() {
+ System.out.println(
+ "\n" +
+ " 唐伯虎:\n" +
+ " 桃花庵歌 \n" +
+ " 桃花坞里桃花庵，桃花庵下桃花仙； \n" +
+ " 桃花仙人种桃树，又摘桃花卖酒钱。 \n" +
+ " 酒醒只在花前坐，酒醉还来花下眠； \n" +
+ " 半醒半醉日复日，花落花开年复年。 \n" +
+ " 但愿老死花酒间，不愿鞠躬车马前； \n" +
+ " 车尘马足富者趣，酒盏花枝贫者缘。 \n" +
+ " 若将富贵比贫贱，一在平地一在天； \n" +
+ " 若将贫贱比车马，他得驱驰我得闲。 \n" +
+ " 别人笑我太疯癫，我笑他人看不穿； \n" +
+ " 不见五陵豪杰墓，无花无酒锄作田。 \n" +
+ "");
+ System.out.println(
+ "\n" +
+ " 曹操:\n" +
+ " 短歌行 \n" +
+ " 对酒当歌，人生几何？譬如朝露，去日苦多。 \n" +
+ " 概当以慷，忧思难忘。何以解忧？唯有杜康。 \n" +
+ " 青青子衿，悠悠我心。但为君故，沈吟至今。 \n" +
+ " 呦呦鹿鸣，食野之苹。我有嘉宾，鼓瑟吹笙。 \n" +
+ " 明明如月，何时可掇？忧从中来，不可断绝。 \n" +
+ " 越陌度阡，枉用相存。契阔谈咽，心念旧恩。 \n" +
+ " 月明星稀，乌鹊南飞。绕树三匝，何枝可依。 \n" +
+ " 山不厌高，海不厌深，周公吐哺，天下归心。 \n" +
+ "");
+ System.out.println(
+ "\n" +
+ " 关羽： \n" +
+ " 咏关公 \n" +
+ " 桃园结义薄云天，偃月青龙刀刃寒。 \n" +
+ " 一骑绝尘走千里，五关斩将震坤乾。 \n" +
+ " 忠心报国为梁栋，肝胆护兄铸铁肩。 \n" +
+ " 一去麦城无复返，英魂庙里化青烟。 \n" +
+ "");
+ System.out.println(
+ "\n" +
+ " 程序员: \n" +
+ " 程序开发行 \n" +
+ " 写字楼里写字间，写字间里程序员； \n" +
+ " 程序人员做开发，又拿程序换活钱。 \n" +
+ " 上班只在网上坐，下班还来网下眠； \n" +
+ " 奔驰宝马贵者趣，公交自行程序员。 \n" +
+ " 不见满街漂亮妹，哪个归得程序员； \n" +
+ " 别人笑我忒疯癫，我笑他人看不穿。 \n" +
+ " 年复一年代码圈，精益求精产品圈； \n" +
+ " 至情之人同成长，缔造和谐至情间。 \n" +
+ " 千锤百炼飞冲天，辉煌有为戏人间； \n" +
+ " 谈笑风生社会圈，享天福天下归心。 \n" +
+ " JeeSpring官方QQ群：328910546 \n" +
+ " JeeSpring官方QQ群(VIP)：558699173 \n" +
+ " JeeSpring官方架构群：464865153 \n" +
+ " JeeSpring是官方分布式微服务集群开源框架，使用前端HTML或后端模板引擎+mvvm+spring mvc+spring boot+spring cloud、mybatis、alibaba dubbo 分布式、\n" +
+ " 微服务、集群、工作流、代码生成（前端界面、底层代码、dubbo、微服务的生成）等核心技术。\n" +
+ " 开源中国 https://gitee.com/JeeHuangBingGui/jeeSpringCloud\n" +
+ "");
+ }
+}
diff --git a/JeeSpringCloud/jeespring-web/src/main/java/com/JeeSpringServlet.java b/JeeSpringCloud/jeespring-web/src/main/java/com/JeeSpringServlet.java
new file mode 100644
index 0000000..32134f6
--- /dev/null
+++ b/JeeSpringCloud/jeespring-web/src/main/java/com/JeeSpringServlet.java
@@ -0,0 +1,23 @@
+/**
+ * Copyright © 2012-2016 JeeSpring All rights reserved.
+ */
+package com;
+
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.support.SpringBootServletInitializer;
+
+/**
+ * Web程序启动类
+ *
+ * @author 黄炳桂 516821420@qq.com
+ * @date 2017-05-21 9:43
+ */
+public class JeeSpringServlet extends SpringBootServletInitializer
+{
+
+ @Override
+ protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
+ return builder.sources(JeeSpringDriver.class);
+ }
+
+}
diff --git a/JeeSpringCloud/jeespring-web/src/main/java/com/company/project/modules/ylttrip/dao/TfTicketDao.java b/JeeSpringCloud/jeespring-web/src/main/java/com/company/project/modules/ylttrip/dao/TfTicketDao.java
new file mode 100644
index 0000000..99d1a72
--- /dev/null
+++ b/JeeSpringCloud/jeespring-web/src/main/java/com/company/project/modules/ylttrip/dao/TfTicketDao.java
@@ -0,0 +1,18 @@
+/**
+ * * Copyright © 2015-2020 JeeSpringCloud All rights reserved..
+ */
+package com.company.project.modules.ylttrip.dao;
+
+import com.jeespring.common.persistence.InterfaceBaseDao;
+import org.apache.ibatis.annotations.Mapper;
+import com.company.project.modules.ylttrip.entity.TfTicket;
+
+/**
+ * 订单DAO接口
+ * @author JeeSpring
+ * @version 2018-11-07
+ */
+@Mapper
+public interface TfTicketDao extends InterfaceBaseDao {
+
+}
\ No newline at end of file
diff --git a/JeeSpringCloud/jeespring-web/src/main/java/com/company/project/modules/ylttrip/entity/TfTicket.java b/JeeSpringCloud/jeespring-web/src/main/java/com/company/project/modules/ylttrip/entity/TfTicket.java
new file mode 100644
index 0000000..e12ac19
--- /dev/null
+++ b/JeeSpringCloud/jeespring-web/src/main/java/com/company/project/modules/ylttrip/entity/TfTicket.java
@@ -0,0 +1,343 @@
+/**
+ * * Copyright © 2015-2020 JeeSpringCloud All rights reserved..
+ */
+package com.company.project.modules.ylttrip.entity;
+
+import org.hibernate.validator.constraints.Length;
+import com.jeespring.modules.sys.entity.User;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.jeespring.common.persistence.AbstractBaseEntity;
+import com.jeespring.common.utils.excel.annotation.ExcelField;
+import com.jeespring.modules.sys.utils.DictUtils;
+
+/**
+ * 订单Entity
+ * @author JeeSpring
+ * @version 2018-11-07
+ */
+public class TfTicket extends AbstractBaseEntity {
+
+ private static final long serialVersionUID = 1L;
+ private String ticketNo; // 订单编号
+ private String goodsNo; // 商品编号
+ private String goodsItemId; // 种类编号
+ private String goodsItemName; // 种类名称
+ private Long goodsNum; // 商品数量
+ private Double sumGoodsNum; // sum商品数量
+ private Double price; // 商品单价
+ private Double sumPrice; // sum商品单价
+ private Double salePrice; // 订单金额
+ private Double sumSalePrice; // sum订单金额
+ private com.jeespring.modules.sys.entity.User user; // 下单人
+ private java.util.Date orderDate; // 下单时间
+ private String state; // 订单状态
+ private String stateLabel; // 订单状态Label
+ private String statePicture; // 订单状态Picture
+ private java.util.Date stateDate; // 状态时间
+ private String custName; // 客户姓名
+ private String linkPhone; // 联系电话
+ private String address; // 收货地址
+ private Long payType; // 付款方式
+ private String payTypeLabel; // 付款方式Label
+ private String payTypePicture; // 付款方式Picture
+ private String logistId; // 物流编号
+ private String logistComp; // 物流公司
+ private String checkinCode; // 入园号
+ private String reserveId; // 票务系统订单号
+ private String remark; // 订单备注
+ private java.util.Date beginOrderDate; // 开始 下单时间
+ private java.util.Date endOrderDate; // 结束 下单时间
+ private java.util.Date beginStateDate; // 开始 状态时间
+ private java.util.Date endStateDate; // 结束 状态时间
+
+ public TfTicket() {
+ super();
+ }
+
+ public TfTicket(String id){
+ super(id);
+ }
+
+ @Length(min=1, max=25, message="订单编号长度必须介于 1 和 25 之间")
+ @ExcelField(title="订单编号", align=2, sort=1)
+ public String getTicketNo() {
+ return ticketNo;
+ }
+
+ public void setTicketNo(String ticketNo) {
+ this.ticketNo = ticketNo;
+ }
+
+
+ @Length(min=0, max=25, message="商品编号长度必须介于 0 和 25 之间")
+ @ExcelField(title="商品编号", align=2, sort=2)
+ public String getGoodsNo() {
+ return goodsNo;
+ }
+
+ public void setGoodsNo(String goodsNo) {
+ this.goodsNo = goodsNo;
+ }
+
+
+ @Length(min=0, max=255, message="种类编号长度必须介于 0 和 255 之间")
+ @ExcelField(title="种类编号", align=2, sort=3)
+ public String getGoodsItemId() {
+ return goodsItemId;
+ }
+
+ public void setGoodsItemId(String goodsItemId) {
+ this.goodsItemId = goodsItemId;
+ }
+
+
+ @Length(min=0, max=255, message="种类名称长度必须介于 0 和 255 之间")
+ @ExcelField(title="种类名称", align=2, sort=4)
+ public String getGoodsItemName() {
+ return goodsItemName;
+ }
+
+ public void setGoodsItemName(String goodsItemName) {
+ this.goodsItemName = goodsItemName;
+ }
+
+
+ @ExcelField(title="商品数量", align=2, sort=5)
+ public Long getGoodsNum() {
+ return goodsNum;
+ }
+
+ public void setGoodsNum(Long goodsNum) {
+ this.goodsNum = goodsNum;
+ }
+
+ public Double getSumGoodsNum() {
+ return sumGoodsNum;
+ }
+
+ public void setSumGoodsNum(Double goodsNum) {
+ this.sumGoodsNum = goodsNum;
+ }
+
+ @ExcelField(title="商品单价", align=2, sort=6)
+ public Double getPrice() {
+ return price;
+ }
+
+ public void setPrice(Double price) {
+ this.price = price;
+ }
+
+ public Double getSumPrice() {
+ return sumPrice;
+ }
+
+ public void setSumPrice(Double price) {
+ this.sumPrice = price;
+ }
+
+ @ExcelField(title="订单金额", align=2, sort=7)
+ public Double getSalePrice() {
+ return salePrice;
+ }
+
+ public void setSalePrice(Double salePrice) {
+ this.salePrice = salePrice;
+ }
+
+ public Double getSumSalePrice() {
+ return sumSalePrice;
+ }
+
+ public void setSumSalePrice(Double salePrice) {
+ this.sumSalePrice = salePrice;
+ }
+
+ @ExcelField(title="下单人", fieldType=User.class, value="user.name", align=2, sort=8)
+ public User getUser() {
+ return user;
+ }
+
+ public void setUser(User user) {
+ this.user = user;
+ }
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ExcelField(title="下单时间", align=2, sort=9)
+ public Date getOrderDate() {
+ return orderDate;
+ }
+
+ public void setOrderDate(Date orderDate) {
+ this.orderDate = orderDate;
+ }
+
+
+ @Length(min=0, max=2, message="订单状态长度必须介于 0 和 2 之间")
+ @ExcelField(title="订单状态", dictType="STATE", align=2, sort=10)
+ public String getState() {
+ return state;
+ }
+
+ public void setState(String state) {
+ this.state = state;
+ }
+
+
+ public String getStateLabel() {
+ return DictUtils.getDictLabel(state,"STATE","");
+ }
+ public String getStatePicture() {
+ return DictUtils.getDictPicture(state,"STATE","");
+ }
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ExcelField(title="状态时间", align=2, sort=11)
+ public Date getStateDate() {
+ return stateDate;
+ }
+
+ public void setStateDate(Date stateDate) {
+ this.stateDate = stateDate;
+ }
+
+
+ @Length(min=0, max=50, message="客户姓名长度必须介于 0 和 50 之间")
+ @ExcelField(title="客户姓名", align=2, sort=12)
+ public String getCustName() {
+ return custName;
+ }
+
+ public void setCustName(String custName) {
+ this.custName = custName;
+ }
+
+
+ @Length(min=0, max=50, message="联系电话长度必须介于 0 和 50 之间")
+ @ExcelField(title="联系电话", align=2, sort=13)
+ public String getLinkPhone() {
+ return linkPhone;
+ }
+
+ public void setLinkPhone(String linkPhone) {
+ this.linkPhone = linkPhone;
+ }
+
+
+ @Length(min=0, max=500, message="收货地址长度必须介于 0 和 500 之间")
+ @ExcelField(title="收货地址", align=2, sort=14)
+ public String getAddress() {
+ return address;
+ }
+
+ public void setAddress(String address) {
+ this.address = address;
+ }
+
+
+ @ExcelField(title="付款方式", dictType="PAY_TYPE", align=2, sort=15)
+ public Long getPayType() {
+ return payType;
+ }
+
+ public void setPayType(Long payType) {
+ this.payType = payType;
+ }
+
+
+ public String getPayTypeLabel() {
+ return DictUtils.getDictLabel(payType,"PAY_TYPE","");
+ }
+ public String getPayTypePicture() {
+ return DictUtils.getDictPicture(payType,"PAY_TYPE","");
+ }
+ @Length(min=0, max=25, message="物流编号长度必须介于 0 和 25 之间")
+ @ExcelField(title="物流编号", align=2, sort=16)
+ public String getLogistId() {
+ return logistId;
+ }
+
+ public void setLogistId(String logistId) {
+ this.logistId = logistId;
+ }
+
+
+ @Length(min=0, max=200, message="物流公司长度必须介于 0 和 200 之间")
+ @ExcelField(title="物流公司", align=2, sort=17)
+ public String getLogistComp() {
+ return logistComp;
+ }
+
+ public void setLogistComp(String logistComp) {
+ this.logistComp = logistComp;
+ }
+
+
+ @Length(min=0, max=255, message="入园号长度必须介于 0 和 255 之间")
+ @ExcelField(title="入园号", align=2, sort=18)
+ public String getCheckinCode() {
+ return checkinCode;
+ }
+
+ public void setCheckinCode(String checkinCode) {
+ this.checkinCode = checkinCode;
+ }
+
+
+ @Length(min=0, max=30, message="票务系统订单号长度必须介于 0 和 30 之间")
+ @ExcelField(title="票务系统订单号", align=2, sort=20)
+ public String getReserveId() {
+ return reserveId;
+ }
+
+ public void setReserveId(String reserveId) {
+ this.reserveId = reserveId;
+ }
+
+
+ @Length(min=0, max=500, message="订单备注长度必须介于 0 和 500 之间")
+ @ExcelField(title="订单备注", align=2, sort=21)
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+
+ public Date getBeginOrderDate() {
+ return beginOrderDate;
+ }
+
+ public void setBeginOrderDate(Date beginOrderDate) {
+ this.beginOrderDate = beginOrderDate;
+ }
+
+ public Date getEndOrderDate() {
+ return endOrderDate;
+ }
+
+ public void setEndOrderDate(Date endOrderDate) {
+ this.endOrderDate = endOrderDate;
+ }
+
+ public Date getBeginStateDate() {
+ return beginStateDate;
+ }
+
+ public void setBeginStateDate(Date beginStateDate) {
+ this.beginStateDate = beginStateDate;
+ }
+
+ public Date getEndStateDate() {
+ return endStateDate;
+ }
+
+ public void setEndStateDate(Date endStateDate) {
+ this.endStateDate = endStateDate;
+ }
+
+}
\ No newline at end of file
diff --git a/JeeSpringCloud/jeespring-web/src/main/java/com/company/project/modules/ylttrip/rest/TfTicketRestController.java b/JeeSpringCloud/jeespring-web/src/main/java/com/company/project/modules/ylttrip/rest/TfTicketRestController.java
new file mode 100644
index 0000000..b4e6b11
--- /dev/null
+++ b/JeeSpringCloud/jeespring-web/src/main/java/com/company/project/modules/ylttrip/rest/TfTicketRestController.java
@@ -0,0 +1,303 @@
+/**
+ * * Copyright © 2015-2020 JeeSpringCloud All rights reserved..
+ */
+package com.company.project.modules.ylttrip.rest;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.google.common.collect.Lists;
+import com.jeespring.common.utils.DateUtils;
+import com.jeespring.common.config.Global;
+import com.jeespring.common.persistence.Page;
+import com.jeespring.common.web.AbstractBaseController;
+import com.jeespring.common.utils.StringUtils;
+import com.jeespring.common.utils.excel.ExportExcel;
+import com.jeespring.common.utils.excel.ImportExcel;
+import com.company.project.modules.ylttrip.entity.TfTicket;
+import com.company.project.modules.ylttrip.service.ITfTicketService;
+import org.springframework.web.bind.annotation.RestController;
+import com.jeespring.common.web.Result;
+import com.jeespring.common.web.ResultFactory;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 订单Controller
+ * @author JeeSpring
+ * @version 2018-11-07
+ */
+@RestController
+@RequestMapping(value = "/rest/ylttrip/tfTicket")
+@Api(value="订单接口", description="订单接口")
+public class TfTicketRestController extends AbstractBaseController {
+
+ //调用dubbo服务器是，要去Reference注解,注解Autowired
+ //@Reference(version = "1.0.0")
+ @Autowired
+ private ITfTicketService tfTicketService;
+
+ /**
+ * 订单信息
+ */
+ @RequestMapping(value = {"get"},method ={RequestMethod.POST,RequestMethod.GET})
+ @ApiOperation(value="订单信息(Content-Type为text/html)", notes="订单信息(Content-Type为text/html)")
+ @ApiImplicitParam(name = "id", value = "订单id", required = false, dataType = "String",paramType="query")
+ public Result getRequestParam(@RequestParam(required=false) String id) {
+ return get(id);
+ }
+
+ @RequestMapping(value = {"get/json"},method ={RequestMethod.POST})
+ @ApiOperation(value="订单信息(Content-Type为application/json)", notes="订单信息(Content-Type为application/json)")
+ @ApiImplicitParam(name = "id", value = "订单id", required = false, dataType = "String",paramType="body")
+ public Result getRequestBody(@RequestBody(required=false) String id) {
+ return get(id);
+ }
+
+ private Result get(String id) {
+ TfTicket entity = null;
+ if (StringUtils.isNotBlank(id)){
+ entity = tfTicketService.getCache(id);
+ //entity = tfTicketService.get(id);
+ }
+ if (entity == null){
+ entity = new TfTicket();
+ }
+ Result result = ResultFactory.getSuccessResult();
+ result.setResultObject(entity);
+ return result;
+ }
+
+ /**
+ * 订单列表(不包含页信息)
+ */
+ //RequiresPermissions("ylttrip:tfTicket:findList")
+ @RequestMapping(value = {"findList"},method ={RequestMethod.POST,RequestMethod.GET})
+ @ApiOperation(value="订单列表(不包含页信息)(Content-Type为text/html)", notes="订单列表(不包含页信息)(Content-Type为text/html)")
+ @ApiImplicitParam(name = "tfTicket", value = "订单", dataType = "TfTicket",paramType="query")
+ public Result findListRequestParam(TfTicket tfTicket, HttpServletRequest request, HttpServletResponse response, Model model) {
+ return findList( tfTicket,model);
+ }
+
+ @RequestMapping(value = {"findList/json"},method ={RequestMethod.POST})
+ @ApiOperation(value="订单列表(不包含页信息)(Content-Type为application/json)", notes="订单列表(不包含页信息)(Content-Type为application/json)")
+ @ApiImplicitParam(name = "tfTicket", value = "订单", dataType = "TfTicket",paramType="body")
+ public Result findListRequestBody(@RequestBody TfTicket tfTicket, Model model) {
+ return findList( tfTicket,model);
+ }
+
+ private Result findList(TfTicket tfTicket, Model model) {
+ List list = tfTicketService.findListCache(tfTicket);
+ //List list = tfTicketService.findList(tfTicket);
+ Result result = ResultFactory.getSuccessResult();
+ result.setResultObject(list);
+ return result;
+ }
+
+ /**
+ * 订单列表(包含页信息)
+ */
+ //RequiresPermissions("ylttrip:tfTicket:list")
+ @RequestMapping(value = {"list"},method ={RequestMethod.POST,RequestMethod.GET})
+ @ApiOperation(value="订单列表(包含页信息)(Content-Type为text/html)", notes="订单列表(包含页信息)(Content-Type为text/html)")
+ @ApiImplicitParam(name = "tfTicket", value = "订单", dataType = "TfTicket",paramType="query")
+ public Result listRequestParam(TfTicket tfTicket, HttpServletRequest request, HttpServletResponse response, Model model) {
+ return list(tfTicket,model);
+ }
+
+ @RequestMapping(value = {"list/json"},method ={RequestMethod.POST})
+ @ApiOperation(value="订单列表(包含页信息)(Content-Type为application/json)", notes="订单列表(包含页信息)(Content-Type为application/json)")
+ @ApiImplicitParam(name = "tfTicket", value = "订单", dataType = "TfTicket",paramType="body")
+ public Result listRequestBody(@RequestBody TfTicket tfTicket, Model model) {
+ return list(tfTicket,model);
+ }
+
+ private Result list(TfTicket tfTicket, Model model) {
+ Page page = tfTicketService.findPageCache(new Page(tfTicket.getPageNo(),tfTicket.getPageSize(),tfTicket.getOrderBy()), tfTicket);
+ //Page page = tfTicketService.findPage(new Page(tfTicket.getPageNo(),tfTicket.getPageSize(),tfTicket.getOrderBy()), tfTicket);
+ Result result = ResultFactory.getSuccessResult();
+ result.setResultObject(page);
+ return result;
+ }
+
+ /**
+ * 订单获取列表第一条记录
+ */
+ //RequiresPermissions("ylttrip:tfTicket:listFrist")
+ @RequestMapping(value = {"listFrist"},method ={RequestMethod.POST,RequestMethod.GET})
+ @ApiOperation(value="订单获取列表第一条记录(Content-Type为text/html)", notes="订单获取列表第一条记录(Content-Type为text/html)")
+ @ApiImplicitParam(name = "tfTicket", value = "订单", dataType = "TfTicket",paramType="query")
+ public Result listFristRequestParam(TfTicket tfTicket, HttpServletRequest request, HttpServletResponse response, Model model) {
+ return listFrist(tfTicket,model);
+ }
+
+ @RequestMapping(value = {"listFrist/json"},method ={RequestMethod.POST})
+ @ApiOperation(value="订单获取列表第一条记录(Content-Type为application/json)", notes="订单获取列表第一条记录(Content-Type为application/json)")
+ @ApiImplicitParam(name = "tfTicket", value = "订单", dataType = "TfTicket",paramType="body")
+ public Result listFristRequestBody(@RequestBody TfTicket tfTicket, Model model) {
+ return listFrist(tfTicket,model);
+ }
+
+ private Result listFrist(TfTicket tfTicket, Model model) {
+ Page page = tfTicketService.findPageCache(new Page(tfTicket.getPageNo(),tfTicket.getPageSize(),tfTicket.getOrderBy()), tfTicket);
+ //Page page = tfTicketService.findPage(new Page(tfTicket.getPageNo(),tfTicket.getPageSize(),tfTicket.getOrderBy()), tfTicket);
+ Result result = ResultFactory.getSuccessResult();
+ if(page.getList().size()>0){
+ result.setResultObject(page.getList().get(0));
+ }else{
+ result=ResultFactory.getErrorResult("没有记录！");
+ }
+ return result;
+ }
+
+ /**
+ * 保存订单
+ */
+ //RequiresPermissions(value={"ylttrip:tfTicket:add","ylttrip:tfTicket:edit"},logical=Logical.OR)
+ @RequestMapping(value = "save",method ={RequestMethod.POST,RequestMethod.GET})
+ @ApiOperation(value="保存订单(Content-Type为text/html)", notes="保存订单(Content-Type为text/html)")
+ @ApiImplicitParam(name = "tfTicket", value = "订单", dataType = "TfTicket",paramType="query")
+ public Result saveRequestParam(TfTicket tfTicket, Model model, RedirectAttributes redirectAttributes) {
+ return save(tfTicket,model,redirectAttributes);
+ }
+
+ @RequestMapping(value = "save/json",method ={RequestMethod.POST})
+ @ApiOperation(value="保存订单(Content-Type为application/json)", notes="保存订单(Content-Type为application/json)")
+ @ApiImplicitParam(name = "tfTicket", value = "订单", dataType = "TfTicket",paramType="body")
+ public Result saveRequestBody(@RequestBody TfTicket tfTicket, Model model, RedirectAttributes redirectAttributes) {
+ return save(tfTicket,model,redirectAttributes);
+ }
+
+ private Result save(TfTicket tfTicket, Model model, RedirectAttributes redirectAttributes) {
+ if (!beanValidator(model, tfTicket)){
+ Result result = ResultFactory.getErrorResult("数据验证失败");
+ }
+ tfTicketService.save(tfTicket);
+ Result result = ResultFactory.getSuccessResult("保存订单成功");
+ return result;
+ }
+
+ /**
+ * 删除订单
+ */
+ //RequiresPermissions("ylttrip:tfTicket:del")
+ @RequestMapping(value = "delete",method ={RequestMethod.POST,RequestMethod.GET})
+ @ApiOperation(value="删除订单(Content-Type为text/html)", notes="删除订单(Content-Type为text/html)")
+ @ApiImplicitParam(name = "tfTicket", value = "订单", dataType = "TfTicket",paramType="query")
+ public Result deleteRequestParam(TfTicket tfTicket, RedirectAttributes redirectAttributes) {
+ return delete(tfTicket,redirectAttributes);
+ }
+
+ @RequestMapping(value = "delete/json",method ={RequestMethod.POST})
+ @ApiOperation(value="删除订单(Content-Type为application/json)", notes="删除订单(Content-Type为application/json)")
+ @ApiImplicitParam(name = "tfTicket", value = "订单", dataType = "TfTicket",paramType="body")
+ public Result deleteRequestBody(@RequestBody TfTicket tfTicket, RedirectAttributes redirectAttributes) {
+ return delete(tfTicket,redirectAttributes);
+ }
+
+ private Result delete(TfTicket tfTicket, RedirectAttributes redirectAttributes) {
+ tfTicketService.delete(tfTicket);
+ Result result = ResultFactory.getSuccessResult("删除订单成功");
+ return result;
+ }
+
+ /**
+ * 删除订单（逻辑删除，更新del_flag字段为1,在表包含字段del_flag时，可以调用此方法，将数据隐藏）
+ */
+ @RequestMapping(value = "deleteByLogic",method ={RequestMethod.POST,RequestMethod.GET})
+ @ApiOperation(value="逻辑删除订单(Content-Type为text/html)", notes="逻辑删除订单(Content-Type为text/html)")
+ @ApiImplicitParam(name = "tfTicket", value = "订单", dataType = "TfTicket",paramType="query")
+ public Result deleteByLogicRequestParam(TfTicket tfTicket, RedirectAttributes redirectAttributes) {
+ return deleteByLogic(tfTicket,redirectAttributes);
+ }
+
+ /**
+ * 删除订单（逻辑删除，更新del_flag字段为1,在表包含字段del_flag时，可以调用此方法，将数据隐藏）
+ */
+ @RequestMapping(value = "deleteByLogic/json",method ={RequestMethod.POST})
+ @ApiOperation(value="逻辑删除订单(Content-Type为application/json)", notes="逻辑删除订单(Content-Type为application/json)")
+ @ApiImplicitParam(name = "tfTicket", value = "订单", dataType = "TfTicket",paramType="body")
+ public Result deleteByLogicRequestBody(@RequestBody TfTicket tfTicket, RedirectAttributes redirectAttributes) {
+ return deleteByLogic(tfTicket,redirectAttributes);
+ }
+
+ private Result deleteByLogic(TfTicket tfTicket, RedirectAttributes redirectAttributes) {
+ tfTicketService.deleteByLogic(tfTicket);
+ Result result = ResultFactory.getSuccessResult("删除订单成功");
+ return result;
+ }
+
+ /**
+ * 批量删除订单
+ */
+ //RequiresPermissions("ylttrip:tfTicket:del")
+ @RequestMapping(value = "deleteAll",method ={RequestMethod.POST,RequestMethod.GET})
+ @ApiOperation(value="批量删除订单(Content-Type为text/html)", notes="批量删除订单(Content-Type为text/html)")
+ @ApiImplicitParam(name = "ids", value = "订单ids,用,隔开", required = false, dataType = "String",paramType="query")
+ public Result deleteAllRequestParam(String ids, RedirectAttributes redirectAttributes) {
+ return deleteAll(ids,redirectAttributes);
+ }
+
+ @RequestMapping(value = "deleteAll/json",method ={RequestMethod.POST})
+ @ApiOperation(value="批量删除订单(Content-Type为application/json)", notes="批量删除订单(Content-Type为application/json)")
+ @ApiImplicitParam(name = "ids", value = "订单ids,用,隔开", required = false, dataType = "String",paramType="body")
+ public Result deleteAllRequestBody(@RequestBody String ids, RedirectAttributes redirectAttributes) {
+ return deleteAll(ids,redirectAttributes);
+ }
+
+ private Result deleteAll(String ids, RedirectAttributes redirectAttributes) {
+ String idArray[] =ids.split(",");
+ for(String id : idArray){
+ tfTicketService.delete(tfTicketService.get(id));
+ }
+ Result result = ResultFactory.getSuccessResult("删除订单成功");
+ return result;
+ }
+
+ /**
+ * 批量删除订单（逻辑删除，更新del_flag字段为1,在表包含字段del_flag时，可以调用此方法，将数据隐藏）
+ */
+ @RequestMapping(value = "deleteAllByLogic",method ={RequestMethod.POST,RequestMethod.GET})
+ @ApiOperation(value="逻辑批量删除订单(Content-Type为text/html)", notes="逻辑批量删除订单(Content-Type为text/html)")
+ @ApiImplicitParam(name = "ids", value = "订单ids,用,隔开", required = false, dataType = "String",paramType="query")
+ public Result deleteAllByLogicRequestParam(String ids, RedirectAttributes redirectAttributes) {
+ return deleteAllByLogic(ids,redirectAttributes);
+ }
+
+ /**
+ * 批量删除订单（逻辑删除，更新del_flag字段为1,在表包含字段del_flag时，可以调用此方法，将数据隐藏）
+ */
+ @RequestMapping(value = "deleteAllByLogic/json",method ={RequestMethod.POST})
+ @ApiOperation(value="逻辑批量删除订单(Content-Type为application/json)", notes="逻辑批量删除订单(Content-Type为application/json)")
+ @ApiImplicitParam(name = "ids", value = "订单ids,用,隔开", required = false, dataType = "String",paramType="body")
+ public Result deleteAllByLogicRequestBody(@RequestBody String ids, RedirectAttributes redirectAttributes) {
+ return deleteAllByLogic(ids,redirectAttributes);
+ }
+
+ private Result deleteAllByLogic(String ids, RedirectAttributes redirectAttributes) {
+ String idArray[] =ids.split(",");
+ for(String id : idArray){
+ tfTicketService.deleteByLogic(tfTicketService.get(id));
+ }
+ Result result = ResultFactory.getSuccessResult("删除订单成功");
+ return result;
+ }
+
+}
\ No newline at end of file
diff --git a/JeeSpringCloud/jeespring-web/src/main/java/com/company/project/modules/ylttrip/service/ITfTicketService.java b/JeeSpringCloud/jeespring-web/src/main/java/com/company/project/modules/ylttrip/service/ITfTicketService.java
new file mode 100644
index 0000000..a6e584d
--- /dev/null
+++ b/JeeSpringCloud/jeespring-web/src/main/java/com/company/project/modules/ylttrip/service/ITfTicketService.java
@@ -0,0 +1,16 @@
+/**
+ * * Copyright © 2015-2020 JeeSpringCloud All rights reserved..
+ */
+package com.company.project.modules.ylttrip.service;
+
+import com.jeespring.common.persistence.InterfaceBaseService;
+import com.jeespring.modules.server.entity.SysServer;
+import com.company.project.modules.ylttrip.entity.TfTicket;
+
+/**
+ * I订单Service
+ * @author JeeSpring
+ * @version 2018-11-07
+ */
+public interface ITfTicketService extends InterfaceBaseService {
+}
\ No newline at end of file
diff --git a/JeeSpringCloud/jeespring-web/src/main/java/com/company/project/modules/ylttrip/service/TfTicketService.java b/JeeSpringCloud/jeespring-web/src/main/java/com/company/project/modules/ylttrip/service/TfTicketService.java
new file mode 100644
index 0000000..cbdc38b
--- /dev/null
+++ b/JeeSpringCloud/jeespring-web/src/main/java/com/company/project/modules/ylttrip/service/TfTicketService.java
@@ -0,0 +1,166 @@
+/**
+ * * Copyright © 2015-2020 JeeSpringCloud All rights reserved..
+ */
+package com.company.project.modules.ylttrip.service;
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.jeespring.common.persistence.Page;
+import com.jeespring.common.service.AbstractBaseService;
+import com.company.project.modules.ylttrip.entity.TfTicket;
+import com.company.project.modules.ylttrip.dao.TfTicketDao;
+import com.company.project.modules.ylttrip.service.ITfTicketService;
+import com.alibaba.fastjson.JSON;
+import com.jeespring.common.redis.RedisUtils;
+import com.jeespring.common.security.MD5Tools;
+//import com.alibaba.dubbo.config.annotation.Service;
+import com.jeespring.common.config.Global;
+
+/**
+ * 订单Service
+ * @author JeeSpring
+ * @version 2018-11-07
+ */
+ //启用dubbo服务器时，要去掉下面注解
+ //com.alibaba.dubbo.config.annotation.Service(interfaceClass = ISysServerService.class,version = "1.0.0", timeout = 60000)
+@org.springframework.stereotype.Service
+@Transactional(readOnly = true)
+public class TfTicketService extends AbstractBaseService implements ITfTicketService{
+
+ /**
+ * redis caches
+ */
+ @Autowired
+ private RedisUtils redisUtils;
+
+ public TfTicket get(String id) {
+ //获取数据库数据
+ TfTicket tfTicket=super.get(id);
+ return tfTicket;
+ }
+
+ public TfTicket getCache(String id) {
+ //获取缓存数据
+ TfTicket tfTicket=(TfTicket)redisUtils.get(RedisUtils.getIdKey(TfTicketService.class.getName(),id));
+ if( tfTicket!=null) return tfTicket;
+ //获取数据库数据
+ tfTicket=super.get(id);
+ //设置缓存数据
+ redisUtils.set(RedisUtils.getIdKey(TfTicketService.class.getName(),id),tfTicket);
+ return tfTicket;
+ }
+
+ public List total(TfTicket tfTicket) {
+ //获取数据库数据
+ List tfTicketList=super.total(tfTicket);
+ return tfTicketList;
+ }
+
+ public List totalCache(TfTicket tfTicket) {
+ //获取缓存数据
+ String totalKey = RedisUtils.getTotalKey(TfTicketService.class.getName(),JSON.toJSONString(tfTicket));
+ List tfTicketList=(List)redisUtils.get(totalKey);
+ if(tfTicketList!=null) return tfTicketList;
+ //获取数据库数据
+ tfTicketList=super.total(tfTicket);
+ //设置缓存数据
+ redisUtils.set(totalKey,tfTicketList);
+ return tfTicketList;
+ }
+
+ public List findList(TfTicket tfTicket) {
+ //获取数据库数据
+ List tfTicketList=super.findList(tfTicket);
+ //设置缓存数据
+ return tfTicketList;
+ }
+
+ public List findListCache(TfTicket tfTicket) {
+ //获取缓存数据
+ String findListKey = RedisUtils.getFindListKey(TfTicketService.class.getName(),JSON.toJSONString(tfTicket));
+ List tfTicketList=(List)redisUtils.get(findListKey);
+ if(tfTicketList!=null) return tfTicketList;
+ //获取数据库数据
+ tfTicketList=super.findList(tfTicket);
+ //设置缓存数据
+ redisUtils.set(findListKey,tfTicketList);
+ return tfTicketList;
+ }
+
+ public TfTicket findListFirst(TfTicket tfTicket) {;
+ //获取数据库数据
+ List tfTicketList=super.findList(tfTicket);
+ if(tfTicketList.size()>0) tfTicket=tfTicketList.get(0);
+ return tfTicket;
+ }
+
+ public TfTicket findListFirstCache(TfTicket tfTicket) {
+ //获取缓存数据
+ String findListFirstKey = RedisUtils.getFindListFirstKey(TfTicketService.class.getName(),JSON.toJSONString(tfTicket));
+ TfTicket tfTicketRedis=(TfTicket)redisUtils.get(findListFirstKey);
+ if(tfTicketRedis!=null) return tfTicketRedis;
+ //获取数据库数据
+ List tfTicketList=super.findList(tfTicket);
+ if(tfTicketList.size()>0) tfTicket=tfTicketList.get(0);
+ else tfTicket=new TfTicket();
+ //设置缓存数据
+ redisUtils.set(findListFirstKey,tfTicket);
+ return tfTicket;
+ }
+
+ public Page findPage(Page page, TfTicket tfTicket) {
+ //获取数据库数据
+ Page pageReuslt=super.findPage(page, tfTicket);
+ return pageReuslt;
+ }
+
+ public Page findPageCache(Page page, TfTicket tfTicket) {
+ //获取缓存数据
+ String findPageKey = RedisUtils.getFindPageKey(TfTicketService.class.getName(),JSON.toJSONString(page)+JSON.toJSONString(tfTicket));
+ Page pageReuslt=(Page)redisUtils.get(findPageKey);
+ if(pageReuslt!=null) return pageReuslt;
+ //获取数据库数据
+ pageReuslt=super.findPage(page, tfTicket);
+ //设置缓存数据
+ redisUtils.set(findPageKey,pageReuslt);
+ return pageReuslt;
+ }
+
+ @Transactional(readOnly = false)
+ public void save(TfTicket tfTicket) {
+ //保存数据库记录
+ super.save(tfTicket);
+ //设置清除缓存数据
+ redisUtils.remove(RedisUtils.getIdKey(TfTicketService.class.getName(),tfTicket.getId()));
+ //清除列表和页面缓存数据
+ redisUtils.removePattern(RedisUtils.getFindListKeyPattern(TfTicketService.class.getName()));
+ redisUtils.removePattern(RedisUtils.getFinPageKeyPattern(TfTicketService.class.getName()));
+ }
+
+ @Transactional(readOnly = false)
+ public void delete(TfTicket tfTicket) {
+ //清除记录缓存数据
+ redisUtils.remove(RedisUtils.getIdKey(TfTicketService.class.getName(),tfTicket.getId()));
+ //删除数据库记录
+ super.delete(tfTicket);
+ //清除列表和页面缓存数据
+ redisUtils.removePattern(RedisUtils.getFindListKeyPattern(TfTicketService.class.getName()));
+ redisUtils.removePattern(RedisUtils.getFinPageKeyPattern(TfTicketService.class.getName()));
+ }
+
+ @Transactional(readOnly = false)
+ public void deleteByLogic(TfTicket tfTicket) {
+ //清除记录缓存数据
+ redisUtils.remove(RedisUtils.getIdKey(TfTicketService.class.getName(),tfTicket.getId()));
+ //逻辑删除数据库记录
+ super.deleteByLogic(tfTicket);
+ //清除列表和页面缓存数据
+ redisUtils.removePattern(RedisUtils.getFindListKeyPattern(TfTicketService.class.getName()));
+ redisUtils.removePattern(RedisUtils.getFinPageKeyPattern(TfTicketService.class.getName()));
+ }
+
+}
\ No newline at end of file
diff --git a/JeeSpringCloud/jeespring-web/src/main/java/com/company/project/modules/ylttrip/web/TfTicketController.java b/JeeSpringCloud/jeespring-web/src/main/java/com/company/project/modules/ylttrip/web/TfTicketController.java
new file mode 100644
index 0000000..8e3e78d
--- /dev/null
+++ b/JeeSpringCloud/jeespring-web/src/main/java/com/company/project/modules/ylttrip/web/TfTicketController.java
@@ -0,0 +1,326 @@
+/**
+ * * Copyright © 2015-2020 JeeSpringCloud All rights reserved..
+ */
+package com.company.project.modules.ylttrip.web;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.google.common.collect.Lists;
+import com.jeespring.common.utils.DateUtils;
+import com.jeespring.common.config.Global;
+import com.jeespring.common.persistence.Page;
+import com.jeespring.common.web.AbstractBaseController;
+import com.jeespring.common.utils.StringUtils;
+import com.jeespring.common.utils.excel.ExportExcel;
+import com.jeespring.common.utils.excel.ImportExcel;
+import com.company.project.modules.ylttrip.entity.TfTicket;
+import com.company.project.modules.ylttrip.service.TfTicketService;
+import com.company.project.modules.ylttrip.service.ITfTicketService;
+import com.alibaba.dubbo.config.annotation.Reference;
+
+/**
+ * 订单Controller
+ * @author JeeSpring
+ * @version 2018-11-07
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/ylttrip/tfTicket")
+public class TfTicketController extends AbstractBaseController {
+
+ //调用dubbo服务器是，要去Reference注解,注解Autowired
+ //@Reference(version = "1.0.0")
+ @Autowired
+ private ITfTicketService tfTicketService;
+
+ @ModelAttribute
+ public TfTicket get(@RequestParam(required=false) String id) {
+ TfTicket entity = null;
+ if (StringUtils.isNotBlank(id)){
+ entity = tfTicketService.getCache(id);
+ //entity = tfTicketService.get(id);
+ }
+ if (entity == null){
+ entity = new TfTicket();
+ }
+ return entity;
+ }
+
+ /**
+ * 订单统计页面
+ */
+ @RequiresPermissions("ylttrip:tfTicket:total")
+ @RequestMapping(value = {"total"})
+ public String totalView(TfTicket tfTicket, HttpServletRequest request, HttpServletResponse response, Model model) {
+ total(tfTicket,request,response,model);
+ return "modules/ylttrip/tfTicketTotal";
+ }
+ private void total(TfTicket tfTicket, HttpServletRequest request, HttpServletResponse response, Model model) {
+ if(StringUtils.isEmpty(tfTicket.getTotalType())){
+ tfTicket.setTotalType("%Y-%m-%d");
+ }
+ //X轴的数据
+ List xAxisData= new ArrayList();
+ //Y轴的数据
+ Map> yAxisData = new HashMap>();
+ List countList = new ArrayList();
+ List sumList = new ArrayList();
+ List sumGoodsNumList = new ArrayList();
+ List sumPriceList = new ArrayList();
+ List sumSalePriceList = new ArrayList();
+ if(tfTicket.getOrderBy()==""){
+ tfTicket.setOrderBy("totalDate");
+ }
+ List list = tfTicketService.totalCache(tfTicket);
+ //List list = tfTicketService.total(tfTicket);
+ model.addAttribute("list", list);
+ for(TfTicket tfTicketItem:list){
+ //x轴数据
+ xAxisData.add( tfTicketItem.getTotalDate());
+ countList.add(Double.valueOf(tfTicketItem.getTotalCount()));
+ if(tfTicketItem.getSumGoodsNum()!=null)
+ sumGoodsNumList.add(Double.valueOf(tfTicketItem.getSumGoodsNum()));
+ else
+ tfTicketItem.setSumGoodsNum(0D);
+ if(tfTicketItem.getSumPrice()!=null)
+ sumPriceList.add(Double.valueOf(tfTicketItem.getSumPrice()));
+ else
+ tfTicketItem.setSumPrice(0D);
+ if(tfTicketItem.getSumSalePrice()!=null)
+ sumSalePriceList.add(Double.valueOf(tfTicketItem.getSumSalePrice()));
+ else
+ tfTicketItem.setSumSalePrice(0D);
+ }
+ yAxisData.put("数量", countList);
+ yAxisData.put("商品数量", sumGoodsNumList);
+ yAxisData.put("商品单价", sumPriceList);
+ yAxisData.put("订单金额", sumSalePriceList);
+ request.setAttribute("xAxisData", xAxisData);
+ request.setAttribute("yAxisData", yAxisData);
+ model.addAttribute("sumTotalCount", list.stream().mapToInt(TfTicket::getTotalCount).sum());
+ model.addAttribute("sumGoodsNum", list.stream().mapToDouble(TfTicket::getSumGoodsNum).sum());
+ model.addAttribute("sumPrice", list.stream().mapToDouble(TfTicket::getSumPrice).sum());
+ model.addAttribute("sumSalePrice", list.stream().mapToDouble(TfTicket::getSumSalePrice).sum());
+
+ //饼图数据
+ Map orientData= new HashMap();
+ Map orientDataSumGoodsNum= new HashMap();
+ Map orientDataSumPrice= new HashMap();
+ Map orientDataSumSalePrice= new HashMap();
+ for(TfTicket tfTicketItem:list){
+ orientData.put(tfTicketItem.getTotalDate(), tfTicketItem.getTotalCount());
+ orientDataSumGoodsNum.put(tfTicketItem.getTotalDate(), Double.valueOf(tfTicketItem.getSumGoodsNum()));
+ orientDataSumPrice.put(tfTicketItem.getTotalDate(), Double.valueOf(tfTicketItem.getSumPrice()));
+ orientDataSumSalePrice.put(tfTicketItem.getTotalDate(), Double.valueOf(tfTicketItem.getSumSalePrice()));
+ }
+ model.addAttribute("orientData", orientData);
+ model.addAttribute("orientDataSumGoodsNum", orientDataSumGoodsNum);
+ model.addAttribute("orientDataSumPrice", orientDataSumPrice);
+ model.addAttribute("orientDataSumSalePrice", orientDataSumSalePrice);
+ }
+ @RequiresPermissions("ylttrip:tfTicket:total")
+ @RequestMapping(value = {"totalMap"})
+ public String totalMap(TfTicket tfTicket, HttpServletRequest request, HttpServletResponse response, Model model) {
+ if(StringUtils.isEmpty(tfTicket.getTotalType())){
+ tfTicket.setTotalType("%Y-%m-%d");
+ }
+ List list = tfTicketService.totalCache(tfTicket);
+ //List list = tfTicketService.total(tfTicket);
+ model.addAttribute("sumTotalCount", list.stream().mapToInt(TfTicket::getTotalCount).sum());
+ model.addAttribute("sumGoodsNum", list.stream().mapToDouble(TfTicket::getSumGoodsNum).sum());
+ model.addAttribute("sumPrice", list.stream().mapToDouble(TfTicket::getSumPrice).sum());
+ model.addAttribute("sumSalePrice", list.stream().mapToDouble(TfTicket::getSumSalePrice).sum());
+ model.addAttribute("list", list);
+ return "modules/ylttrip/tfTicketTotalMap";
+ }
+
+ /**
+ * 订单列表页面
+ */
+ @RequiresPermissions("ylttrip:tfTicket:list")
+ @RequestMapping(value = {"list", ""})
+ public String list(TfTicket tfTicket, HttpServletRequest request, HttpServletResponse response, Model model) {
+ Page page = tfTicketService.findPageCache(new Page(request, response), tfTicket);
+ //Page page = tfTicketService.findPage(new Page(request, response), tfTicket);
+ model.addAttribute("page", page);
+ tfTicket.setOrderBy("totalDate");
+ total(tfTicket,request,response,model);
+ return "modules/ylttrip/tfTicketList";
+ }
+
+ /**
+ * 订单列表页面
+ */
+ @RequiresPermissions("ylttrip:tfTicket:list")
+ @RequestMapping(value = {"listVue"})
+ public String listVue(TfTicket tfTicket, HttpServletRequest request, HttpServletResponse response, Model model) {
+ Page page = tfTicketService.findPageCache(new Page(request, response), tfTicket);
+ //Page page = tfTicketService.findPage(new Page(request, response), tfTicket);
+ model.addAttribute("page", page);
+ return "modules/ylttrip/tfTicketListVue";
+ }
+
+ /**
+ * 订单列表页面
+ */
+ //RequiresPermissions("ylttrip:tfTicket:select")
+ @RequestMapping(value = {"select"})
+ public String select(TfTicket tfTicket, HttpServletRequest request, HttpServletResponse response, Model model) {
+ Page page = tfTicketService.findPageCache(new Page(request, response), tfTicket);
+ //Page page = tfTicketService.findPage(new Page(request, response), tfTicket);
+ model.addAttribute("page", page);
+ return "modules/ylttrip/tfTicketSelect";
+ }
+
+ /**
+ * 查看，增加，编辑订单表单页面
+ */
+ @RequiresPermissions(value={"ylttrip:tfTicket:view","ylttrip:tfTicket:add","ylttrip:tfTicket:edit"},logical=Logical.OR)
+ @RequestMapping(value = "form")
+ public String form(TfTicket tfTicket, Model model, HttpServletRequest request, HttpServletResponse response) {
+ model.addAttribute("action", request.getParameter("action"));
+ model.addAttribute("tfTicket", tfTicket);
+ if(request.getParameter("ViewFormType")!=null && request.getParameter("ViewFormType").equals("FormTwo"))
+ return "modules/ylttrip/tfTicketFormTwo";
+ return "modules/ylttrip/tfTicketForm";
+ }
+
+ /**
+ * 保存订单
+ */
+ @RequiresPermissions(value={"ylttrip:tfTicket:add","ylttrip:tfTicket:edit"},logical=Logical.OR)
+ @RequestMapping(value = "save")
+ public String save(TfTicket tfTicket, Model model, RedirectAttributes redirectAttributes, HttpServletRequest request, HttpServletResponse response) {
+ if (!beanValidator(model, tfTicket)){
+ return form(tfTicket, model,request,response);
+ }
+ tfTicketService.save(tfTicket);
+ addMessage(redirectAttributes, "保存订单成功");
+ return "redirect:"+Global.getAdminPath()+"/ylttrip/tfTicket/?repage";
+ }
+
+ /**
+ * 删除订单
+ */
+ @RequiresPermissions("ylttrip:tfTicket:del")
+ @RequestMapping(value = "delete")
+ public String delete(TfTicket tfTicket, RedirectAttributes redirectAttributes) {
+ tfTicketService.delete(tfTicket);
+ addMessage(redirectAttributes, "删除订单成功");
+ return "redirect:"+Global.getAdminPath()+"/ylttrip/tfTicket/?repage";
+ }
+
+ /**
+ * 删除订单（逻辑删除，更新del_flag字段为1,在表包含字段del_flag时，可以调用此方法，将数据隐藏）
+ */
+ @RequiresPermissions(value={"ylttrip:tfTicket:del","ylttrip:tfTicket:delByLogic"},logical=Logical.OR)
+ @RequestMapping(value = "deleteByLogic")
+ public String deleteByLogic(TfTicket tfTicket, RedirectAttributes redirectAttributes) {
+ tfTicketService.deleteByLogic(tfTicket);
+ addMessage(redirectAttributes, "逻辑删除订单成功");
+ return "redirect:"+Global.getAdminPath()+"/ylttrip/tfTicket/?repage";
+ }
+
+ /**
+ * 批量删除订单
+ */
+ @RequiresPermissions("ylttrip:tfTicket:del")
+ @RequestMapping(value = "deleteAll")
+ public String deleteAll(String ids, RedirectAttributes redirectAttributes) {
+ String idArray[] =ids.split(",");
+ for(String id : idArray){
+ tfTicketService.delete(tfTicketService.get(id));
+ }
+ addMessage(redirectAttributes, "删除订单成功");
+ return "redirect:"+Global.getAdminPath()+"/ylttrip/tfTicket/?repage";
+ }
+
+ /**
+ * 批量删除订单（逻辑删除，更新del_flag字段为1,在表包含字段del_flag时，可以调用此方法，将数据隐藏）
+ */
+ @RequiresPermissions(value={"ylttrip:tfTicket:del","ylttrip:tfTicket:delByLogic"},logical=Logical.OR)
+ @RequestMapping(value = "deleteAllByLogic")
+ public String deleteAllByLogic(String ids, RedirectAttributes redirectAttributes) {
+ String idArray[] =ids.split(",");
+ for(String id : idArray){
+ tfTicketService.deleteByLogic(tfTicketService.get(id));
+ }
+ addMessage(redirectAttributes, "删除订单成功");
+ return "redirect:"+Global.getAdminPath()+"/ylttrip/tfTicket/?repage";
+ }
+
+ /**
+ * 导出excel文件
+ */
+ @RequiresPermissions("ylttrip:tfTicket:export")
+ @RequestMapping(value = "export", method=RequestMethod.POST)
+ public String exportFile(TfTicket tfTicket, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
+ try {
+ String fileName = "订单"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
+ Page page = tfTicketService.findPage(new Page(request, response, -1), tfTicket);
+ new ExportExcel("订单", TfTicket.class).setDataList(page.getList()).write(response, fileName).dispose();
+ return null;
+ } catch (Exception e) {
+ addMessage(redirectAttributes, "导出订单记录失败！失败信息："+e.getMessage());
+ }
+ return "redirect:"+Global.getAdminPath()+"/ylttrip/tfTicket/?repage";
+ }
+
+ /**
+ * 导入Excel数据
+
+ */
+ @RequiresPermissions("ylttrip:tfTicket:import")
+ @RequestMapping(value = "import", method=RequestMethod.POST)
+ public String importFile(MultipartFile file, RedirectAttributes redirectAttributes) {
+ try {
+ int successNum = 0;
+ ImportExcel ei = new ImportExcel(file, 1, 0);
+ List list = ei.getDataList(TfTicket.class);
+ for (TfTicket tfTicket : list){
+ tfTicketService.save(tfTicket);
+ }
+ successNum=list.size();
+ addMessage(redirectAttributes, "已成功导入 "+successNum+" 条订单记录");
+ } catch (Exception e) {
+ addMessage(redirectAttributes, "导入订单失败！失败信息："+e.getMessage());
+ }
+ return "redirect:"+Global.getAdminPath()+"/ylttrip/tfTicket/?repage";
+ }
+
+ /**
+ * 下载导入订单数据模板
+ */
+ @RequiresPermissions("ylttrip:tfTicket:import")
+ @RequestMapping(value = "import/template")
+ public String importFileTemplate(HttpServletResponse response, RedirectAttributes redirectAttributes) {
+ try {
+ String fileName = "订单数据导入模板.xlsx";
+ List list = Lists.newArrayList();
+ new ExportExcel("订单数据", TfTicket.class, 1).setDataList(list).write(response, fileName).dispose();
+ return null;
+ } catch (Exception e) {
+ addMessage(redirectAttributes, "导入模板下载失败！失败信息："+e.getMessage());
+ }
+ return "redirect:"+Global.getAdminPath()+"/ylttrip/tfTicket/?repage";
+ }
+
+
+}
\ No newline at end of file
diff --git a/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/dao/one/FormLeaveDao.java b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/dao/one/FormLeaveDao.java
new file mode 100644
index 0000000..b31f56f
--- /dev/null
+++ b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/dao/one/FormLeaveDao.java
@@ -0,0 +1,18 @@
+/**
+ * * Copyright © 2015-2020 JeeSpringCloud All rights reserved..
+ */
+package com.jeespring.modules.test.dao.one;
+
+import com.jeespring.common.persistence.InterfaceBaseDao;
+import org.apache.ibatis.annotations.Mapper;
+import com.jeespring.modules.test.entity.one.FormLeave;
+
+/**
+ * 请假DAO接口
+ * @author JeeSpring
+ * @version 2018-10-12
+ */
+@Mapper
+public interface FormLeaveDao extends InterfaceBaseDao {
+
+}
\ No newline at end of file
diff --git a/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/dao/onetomany/TestDataChild2Dao.java b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/dao/onetomany/TestDataChild2Dao.java
new file mode 100644
index 0000000..3d543e9
--- /dev/null
+++ b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/dao/onetomany/TestDataChild2Dao.java
@@ -0,0 +1,18 @@
+/**
+ * * Copyright © 2015-2020 JeeSpringCloud All rights reserved..
+ */
+package com.jeespring.modules.test.dao.onetomany;
+
+import com.jeespring.common.persistence.InterfaceBaseDao;
+import org.apache.ibatis.annotations.Mapper;
+import com.jeespring.modules.test.entity.onetomany.TestDataChild2;
+
+/**
+ * 订票DAO接口
+ * @author JeeSpring
+ * @version 2018-10-12
+ */
+@Mapper
+public interface TestDataChild2Dao extends InterfaceBaseDao {
+
+}
\ No newline at end of file
diff --git a/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/dao/onetomany/TestDataChild3Dao.java b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/dao/onetomany/TestDataChild3Dao.java
new file mode 100644
index 0000000..42ef6d5
--- /dev/null
+++ b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/dao/onetomany/TestDataChild3Dao.java
@@ -0,0 +1,18 @@
+/**
+ * * Copyright © 2015-2020 JeeSpringCloud All rights reserved..
+ */
+package com.jeespring.modules.test.dao.onetomany;
+
+import com.jeespring.common.persistence.InterfaceBaseDao;
+import org.apache.ibatis.annotations.Mapper;
+import com.jeespring.modules.test.entity.onetomany.TestDataChild3;
+
+/**
+ * 订票DAO接口
+ * @author JeeSpring
+ * @version 2018-10-12
+ */
+@Mapper
+public interface TestDataChild3Dao extends InterfaceBaseDao {
+
+}
\ No newline at end of file
diff --git a/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/dao/onetomany/TestDataChildDao.java b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/dao/onetomany/TestDataChildDao.java
new file mode 100644
index 0000000..ff01a77
--- /dev/null
+++ b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/dao/onetomany/TestDataChildDao.java
@@ -0,0 +1,18 @@
+/**
+ * * Copyright © 2015-2020 JeeSpringCloud All rights reserved..
+ */
+package com.jeespring.modules.test.dao.onetomany;
+
+import com.jeespring.common.persistence.InterfaceBaseDao;
+import org.apache.ibatis.annotations.Mapper;
+import com.jeespring.modules.test.entity.onetomany.TestDataChild;
+
+/**
+ * 订票DAO接口
+ * @author JeeSpring
+ * @version 2018-10-12
+ */
+@Mapper
+public interface TestDataChildDao extends InterfaceBaseDao {
+
+}
\ No newline at end of file
diff --git a/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/dao/onetomany/TestDataMainDao.java b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/dao/onetomany/TestDataMainDao.java
new file mode 100644
index 0000000..19483a0
--- /dev/null
+++ b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/dao/onetomany/TestDataMainDao.java
@@ -0,0 +1,18 @@
+/**
+ * * Copyright © 2015-2020 JeeSpringCloud All rights reserved..
+ */
+package com.jeespring.modules.test.dao.onetomany;
+
+import com.jeespring.common.persistence.InterfaceBaseDao;
+import org.apache.ibatis.annotations.Mapper;
+import com.jeespring.modules.test.entity.onetomany.TestDataMain;
+
+/**
+ * 订票DAO接口
+ * @author JeeSpring
+ * @version 2018-10-12
+ */
+@Mapper
+public interface TestDataMainDao extends InterfaceBaseDao {
+
+}
\ No newline at end of file
diff --git a/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/dao/tree/TestTreeDao.java b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/dao/tree/TestTreeDao.java
new file mode 100644
index 0000000..39b8c22
--- /dev/null
+++ b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/dao/tree/TestTreeDao.java
@@ -0,0 +1,19 @@
+/**
+ * * Copyright © 2015-2020 JeeSpringCloud All rights reserved..
+ */
+package com.jeespring.modules.test.dao.tree;
+
+import com.jeespring.common.persistence.TreeDao;
+import com.jeespring.common.persistence.annotation.MyBatisDao;
+import org.apache.ibatis.annotations.Mapper;
+import com.jeespring.modules.test.entity.tree.TestTree;
+
+/**
+ * 树DAO接口
+ * @author JeeSpring
+ * @version 2018-10-11
+ */
+@Mapper
+public interface TestTreeDao extends TreeDao {
+
+}
\ No newline at end of file
diff --git a/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/entity/one/FormLeave.java b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/entity/one/FormLeave.java
new file mode 100644
index 0000000..bd5e794
--- /dev/null
+++ b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/entity/one/FormLeave.java
@@ -0,0 +1,91 @@
+/**
+ * * Copyright © 2015-2020 JeeSpringCloud All rights reserved..
+ */
+package com.jeespring.modules.test.entity.one;
+
+import com.jeespring.modules.sys.entity.User;
+import javax.validation.constraints.NotNull;
+import com.jeespring.modules.sys.entity.Office;
+import com.jeespring.modules.sys.entity.Area;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.jeespring.common.persistence.AbstractBaseEntity;
+import com.jeespring.common.utils.excel.annotation.ExcelField;
+import com.jeespring.modules.sys.utils.DictUtils;
+
+/**
+ * 请假Entity
+ * @author JeeSpring
+ * @version 2018-10-12
+ */
+public class FormLeave extends AbstractBaseEntity {
+
+ private static final long serialVersionUID = 1L;
+ private com.jeespring.modules.sys.entity.User user; // 员工
+ private com.jeespring.modules.sys.entity.Office office; // 归属部门
+ private com.jeespring.modules.sys.entity.Area area; // 归属区域
+ private java.util.Date beginDate; // 请假开始日期
+ private java.util.Date endDate; // 请假结束日期
+
+ public FormLeave() {
+ super();
+ }
+
+ public FormLeave(String id){
+ super(id);
+ }
+
+ @NotNull(message="员工不能为空")
+ @ExcelField(title="员工", fieldType=User.class, value="user.name", align=2, sort=1)
+ public User getUser() {
+ return user;
+ }
+
+ public void setUser(User user) {
+ this.user = user;
+ }
+ @NotNull(message="归属部门不能为空")
+ @ExcelField(title="归属部门", fieldType=Office.class, value="office.name", align=2, sort=2)
+ public Office getOffice() {
+ return office;
+ }
+
+ public void setOffice(Office office) {
+ this.office = office;
+ }
+ @ExcelField(title="归属区域", fieldType=Area.class, value="area.name", align=2, sort=3)
+ public Area getArea() {
+ return area;
+ }
+
+ public void setArea(Area area) {
+ this.area = area;
+ }
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @NotNull(message="请假开始日期不能为空")
+ @ExcelField(title="请假开始日期", align=2, sort=4)
+ public Date getBeginDate() {
+ return beginDate;
+ }
+
+ public void setBeginDate(Date beginDate) {
+ this.beginDate = beginDate;
+ }
+
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @NotNull(message="请假结束日期不能为空")
+ @ExcelField(title="请假结束日期", align=2, sort=5)
+ public Date getEndDate() {
+ return endDate;
+ }
+
+ public void setEndDate(Date endDate) {
+ this.endDate = endDate;
+ }
+
+
+}
\ No newline at end of file
diff --git a/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/entity/onetomany/TestDataChild.java b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/entity/onetomany/TestDataChild.java
new file mode 100644
index 0000000..ca47547
--- /dev/null
+++ b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/entity/onetomany/TestDataChild.java
@@ -0,0 +1,81 @@
+/**
+ * * Copyright © 2015-2020 JeeSpringCloud All rights reserved..
+ */
+package com.jeespring.modules.test.entity.onetomany;
+
+import com.jeespring.modules.sys.entity.Area;
+import javax.validation.constraints.NotNull;
+import org.hibernate.validator.constraints.Length;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.jeespring.common.persistence.AbstractBaseEntity;
+import com.jeespring.common.utils.excel.annotation.ExcelField;
+import com.jeespring.modules.sys.utils.DictUtils;
+
+/**
+ * 订票Entity
+ * @author JeeSpring
+ * @version 2018-10-12
+ */
+public class TestDataChild extends AbstractBaseEntity {
+
+ private static final long serialVersionUID = 1L;
+ private com.jeespring.modules.sys.entity.Area start; // 出发地
+ private com.jeespring.modules.sys.entity.Area end; // 目的地
+ private Double price; // 代理价格
+ private TestDataMain testDataMain; // 业务主表ID 父类testDataMain.id
+
+ public TestDataChild() {
+ super();
+ }
+
+ public TestDataChild(String id){
+ super(id);
+ }
+
+ public TestDataChild(TestDataMain testDataMain){
+ this.testDataMain = testDataMain;
+ }
+
+ @NotNull(message="出发地不能为空")
+ @ExcelField(title="出发地", fieldType=Area.class, value="start.name", align=2, sort=1)
+ public Area getStart() {
+ return start;
+ }
+
+ public void setStart(Area start) {
+ this.start = start;
+ }
+ @NotNull(message="目的地不能为空")
+ @ExcelField(title="目的地", fieldType=Area.class, value="end.name", align=2, sort=2)
+ public Area getEnd() {
+ return end;
+ }
+
+ public void setEnd(Area end) {
+ this.end = end;
+ }
+ @NotNull(message="代理价格不能为空")
+ @ExcelField(title="代理价格", align=2, sort=3)
+ public Double getPrice() {
+ return price;
+ }
+
+ public void setPrice(Double price) {
+ this.price = price;
+ }
+
+
+ @Length(min=0, max=64, message="业务主表ID长度必须介于 0 和 64 之间")
+ @JsonIgnore
+ @JSONField(serialize=false)
+ public TestDataMain getTestDataMain() {
+ return testDataMain;
+ }
+
+ public void setTestDataMain(TestDataMain testDataMain) {
+ this.testDataMain = testDataMain;
+ }
+
+}
\ No newline at end of file
diff --git a/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/entity/onetomany/TestDataChild2.java b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/entity/onetomany/TestDataChild2.java
new file mode 100644
index 0000000..d0b7d4a
--- /dev/null
+++ b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/entity/onetomany/TestDataChild2.java
@@ -0,0 +1,80 @@
+/**
+ * * Copyright © 2015-2020 JeeSpringCloud All rights reserved..
+ */
+package com.jeespring.modules.test.entity.onetomany;
+
+import com.jeespring.modules.sys.entity.Area;
+import javax.validation.constraints.NotNull;
+import org.hibernate.validator.constraints.Length;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.jeespring.common.persistence.AbstractBaseEntity;
+import com.jeespring.common.utils.excel.annotation.ExcelField;
+import com.jeespring.modules.sys.utils.DictUtils;
+
+/**
+ * 订票Entity
+ * @author JeeSpring
+ * @version 2018-10-12
+ */
+public class TestDataChild2 extends AbstractBaseEntity {
+
+ private static final long serialVersionUID = 1L;
+ private com.jeespring.modules.sys.entity.Area start; // 出发地
+ private com.jeespring.modules.sys.entity.Area end; // 目的地
+ private Double price; // 代理价格
+ private TestDataMain testDataMain; // 外键 父类testDataMain.id
+
+ public TestDataChild2() {
+ super();
+ }
+
+ public TestDataChild2(String id){
+ super(id);
+ }
+
+ public TestDataChild2(TestDataMain testDataMain){
+ this.testDataMain = testDataMain;
+ }
+
+ @NotNull(message="出发地不能为空")
+ @ExcelField(title="出发地", fieldType=Area.class, value="start.name", align=2, sort=1)
+ public Area getStart() {
+ return start;
+ }
+
+ public void setStart(Area start) {
+ this.start = start;
+ }
+ @NotNull(message="目的地不能为空")
+ @ExcelField(title="目的地", fieldType=Area.class, value="end.name", align=2, sort=2)
+ public Area getEnd() {
+ return end;
+ }
+
+ public void setEnd(Area end) {
+ this.end = end;
+ }
+ @ExcelField(title="代理价格", align=2, sort=3)
+ public Double getPrice() {
+ return price;
+ }
+
+ public void setPrice(Double price) {
+ this.price = price;
+ }
+
+
+ @Length(min=1, max=64, message="外键长度必须介于 1 和 64 之间")
+ @JsonIgnore
+ @JSONField(serialize=false)
+ public TestDataMain getTestDataMain() {
+ return testDataMain;
+ }
+
+ public void setTestDataMain(TestDataMain testDataMain) {
+ this.testDataMain = testDataMain;
+ }
+
+}
\ No newline at end of file
diff --git a/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/entity/onetomany/TestDataChild3.java b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/entity/onetomany/TestDataChild3.java
new file mode 100644
index 0000000..7fb9a47
--- /dev/null
+++ b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/entity/onetomany/TestDataChild3.java
@@ -0,0 +1,80 @@
+/**
+ * * Copyright © 2015-2020 JeeSpringCloud All rights reserved..
+ */
+package com.jeespring.modules.test.entity.onetomany;
+
+import com.jeespring.modules.sys.entity.Area;
+import javax.validation.constraints.NotNull;
+import org.hibernate.validator.constraints.Length;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.jeespring.common.persistence.AbstractBaseEntity;
+import com.jeespring.common.utils.excel.annotation.ExcelField;
+import com.jeespring.modules.sys.utils.DictUtils;
+
+/**
+ * 订票Entity
+ * @author JeeSpring
+ * @version 2018-10-12
+ */
+public class TestDataChild3 extends AbstractBaseEntity {
+
+ private static final long serialVersionUID = 1L;
+ private com.jeespring.modules.sys.entity.Area start; // 出发地
+ private com.jeespring.modules.sys.entity.Area end; // 目的地
+ private Double price; // 代理价格
+ private TestDataMain testDataMain; // 外键 父类testDataMain.id
+
+ public TestDataChild3() {
+ super();
+ }
+
+ public TestDataChild3(String id){
+ super(id);
+ }
+
+ public TestDataChild3(TestDataMain testDataMain){
+ this.testDataMain = testDataMain;
+ }
+
+ @NotNull(message="出发地不能为空")
+ @ExcelField(title="出发地", fieldType=Area.class, value="start.name", align=2, sort=1)
+ public Area getStart() {
+ return start;
+ }
+
+ public void setStart(Area start) {
+ this.start = start;
+ }
+ @NotNull(message="目的地不能为空")
+ @ExcelField(title="目的地", fieldType=Area.class, value="end.name", align=2, sort=2)
+ public Area getEnd() {
+ return end;
+ }
+
+ public void setEnd(Area end) {
+ this.end = end;
+ }
+ @ExcelField(title="代理价格", align=2, sort=3)
+ public Double getPrice() {
+ return price;
+ }
+
+ public void setPrice(Double price) {
+ this.price = price;
+ }
+
+
+ @Length(min=1, max=64, message="外键长度必须介于 1 和 64 之间")
+ @JsonIgnore
+ @JSONField(serialize=false)
+ public TestDataMain getTestDataMain() {
+ return testDataMain;
+ }
+
+ public void setTestDataMain(TestDataMain testDataMain) {
+ this.testDataMain = testDataMain;
+ }
+
+}
\ No newline at end of file
diff --git a/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/entity/onetomany/TestDataMain.java b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/entity/onetomany/TestDataMain.java
new file mode 100644
index 0000000..2d0d646
--- /dev/null
+++ b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/entity/onetomany/TestDataMain.java
@@ -0,0 +1,156 @@
+/**
+ * * Copyright © 2015-2020 JeeSpringCloud All rights reserved..
+ */
+package com.jeespring.modules.test.entity.onetomany;
+
+import com.jeespring.modules.sys.entity.User;
+import javax.validation.constraints.NotNull;
+import com.jeespring.modules.sys.entity.Office;
+import com.jeespring.modules.sys.entity.Area;
+import org.hibernate.validator.constraints.Length;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.List;
+import com.google.common.collect.Lists;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.jeespring.common.persistence.AbstractBaseEntity;
+import com.jeespring.common.utils.excel.annotation.ExcelField;
+import com.jeespring.modules.sys.utils.DictUtils;
+
+/**
+ * 订票Entity
+ * @author JeeSpring
+ * @version 2018-10-12
+ */
+public class TestDataMain extends AbstractBaseEntity {
+
+ private static final long serialVersionUID = 1L;
+ private com.jeespring.modules.sys.entity.User user; // 归属用户
+ private com.jeespring.modules.sys.entity.Office office; // 归属部门
+ private com.jeespring.modules.sys.entity.Area area; // 归属区域
+ private String name; // 名称
+ private String sex; // 性别
+ private String sexLabel; // 性别Label
+ private String sexPicture; // 性别Picture
+ private java.util.Date inDate; // 加入日期
+ private java.util.Date beginInDate; // 开始 加入日期
+ private java.util.Date endInDate; // 结束 加入日期
+ private List testDataChildList = Lists.newArrayList(); // 子表列表
+ private List testDataChild2List = Lists.newArrayList(); // 子表列表
+ private List testDataChild3List = Lists.newArrayList(); // 子表列表
+
+ public TestDataMain() {
+ super();
+ }
+
+ public TestDataMain(String id){
+ super(id);
+ }
+
+ @NotNull(message="归属用户不能为空")
+ @ExcelField(title="归属用户", fieldType=User.class, value="user.name", align=2, sort=1)
+ public User getUser() {
+ return user;
+ }
+
+ public void setUser(User user) {
+ this.user = user;
+ }
+ @NotNull(message="归属部门不能为空")
+ @ExcelField(title="归属部门", fieldType=Office.class, value="office.name", align=2, sort=2)
+ public Office getOffice() {
+ return office;
+ }
+
+ public void setOffice(Office office) {
+ this.office = office;
+ }
+ @NotNull(message="归属区域不能为空")
+ @ExcelField(title="归属区域", fieldType=Area.class, value="area.name", align=2, sort=3)
+ public Area getArea() {
+ return area;
+ }
+
+ public void setArea(Area area) {
+ this.area = area;
+ }
+ @Length(min=1, max=100, message="名称长度必须介于 1 和 100 之间")
+ @ExcelField(title="名称", align=2, sort=4)
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+
+ @Length(min=1, max=1, message="性别长度必须介于 1 和 1 之间")
+ @ExcelField(title="性别", dictType="sex", align=2, sort=5)
+ public String getSex() {
+ return sex;
+ }
+
+ public void setSex(String sex) {
+ this.sex = sex;
+ }
+
+
+ public String getSexLabel() {
+ return DictUtils.getDictLabel(sex,"sex","");
+ }
+ public String getSexPicture() {
+ return DictUtils.getDictPicture(sex,"sex","");
+ }
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @NotNull(message="加入日期不能为空")
+ @ExcelField(title="加入日期", align=2, sort=6)
+ public Date getInDate() {
+ return inDate;
+ }
+
+ public void setInDate(Date inDate) {
+ this.inDate = inDate;
+ }
+
+
+ public Date getBeginInDate() {
+ return beginInDate;
+ }
+
+ public void setBeginInDate(Date beginInDate) {
+ this.beginInDate = beginInDate;
+ }
+
+ public Date getEndInDate() {
+ return endInDate;
+ }
+
+ public void setEndInDate(Date endInDate) {
+ this.endInDate = endInDate;
+ }
+
+ public List getTestDataChildList() {
+ return testDataChildList;
+ }
+
+ public void setTestDataChildList(List testDataChildList) {
+ this.testDataChildList = testDataChildList;
+ }
+ public List getTestDataChild2List() {
+ return testDataChild2List;
+ }
+
+ public void setTestDataChild2List(List testDataChild2List) {
+ this.testDataChild2List = testDataChild2List;
+ }
+ public List getTestDataChild3List() {
+ return testDataChild3List;
+ }
+
+ public void setTestDataChild3List(List testDataChild3List) {
+ this.testDataChild3List = testDataChild3List;
+ }
+}
\ No newline at end of file
diff --git a/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/entity/tree/TestTree.java b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/entity/tree/TestTree.java
new file mode 100644
index 0000000..d28a7bd
--- /dev/null
+++ b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/entity/tree/TestTree.java
@@ -0,0 +1,82 @@
+/**
+ * * Copyright © 2015-2020 JeeSpringCloud All rights reserved..
+ */
+package com.jeespring.modules.test.entity.tree;
+
+import org.hibernate.validator.constraints.Length;
+import javax.validation.constraints.NotNull;
+import com.fasterxml.jackson.annotation.JsonBackReference;
+
+import com.jeespring.common.persistence.TreeEntity;
+
+/**
+ * 树Entity
+ * @author JeeSpring
+ * @version 2018-10-11
+ */
+public class TestTree extends TreeEntity {
+
+ private static final long serialVersionUID = 1L;
+ private String name; // 名称
+ private Integer sort; // 排序
+ private TestTree parent; // 父级编号
+ private String parentIds; // 所有父级编号
+
+ public TestTree() {
+ super();
+ }
+
+ public TestTree(String id){
+ super(id);
+ }
+
+ @Override
+ @Length(min=1, max=100, message="名称长度必须介于 1 和 100 之间")
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Override
+ @NotNull(message="排序不能为空")
+ public Integer getSort() {
+ return sort;
+ }
+
+ @Override
+ public void setSort(Integer sort) {
+ this.sort = sort;
+ }
+
+ @Override
+ @JsonBackReference
+ @NotNull(message="父级编号不能为空")
+ public TestTree getParent() {
+ return parent;
+ }
+
+ @Override
+ public void setParent(TestTree parent) {
+ this.parent = parent;
+ }
+
+ @Override
+ @Length(min=1, max=2000, message="所有父级编号长度必须介于 1 和 2000 之间")
+ public String getParentIds() {
+ return parentIds;
+ }
+
+ @Override
+ public void setParentIds(String parentIds) {
+ this.parentIds = parentIds;
+ }
+
+ @Override
+ public String getParentId() {
+ return parent != null && parent.getId() != null ? parent.getId() : "0";
+ }
+}
\ No newline at end of file
diff --git a/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/rest/one/FormLeaveRestController.java b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/rest/one/FormLeaveRestController.java
new file mode 100644
index 0000000..87f28d6
--- /dev/null
+++ b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/rest/one/FormLeaveRestController.java
@@ -0,0 +1,301 @@
+/**
+ * * Copyright © 2015-2020 JeeSpringCloud All rights reserved..
+ */
+package com.jeespring.modules.test.rest.one;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.google.common.collect.Lists;
+import com.jeespring.common.utils.DateUtils;
+import com.jeespring.common.config.Global;
+import com.jeespring.common.persistence.Page;
+import com.jeespring.common.web.AbstractBaseController;
+import com.jeespring.common.utils.StringUtils;
+import com.jeespring.common.utils.excel.ExportExcel;
+import com.jeespring.common.utils.excel.ImportExcel;
+import com.jeespring.modules.test.entity.one.FormLeave;
+import com.jeespring.modules.test.service.one.IFormLeaveService;
+import org.springframework.web.bind.annotation.RestController;
+import com.jeespring.common.web.Result;
+import com.jeespring.common.web.ResultFactory;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 请假Controller
+ * @author JeeSpring
+ * @version 2018-10-12
+ */
+@RestController
+@RequestMapping(value = "/rest/test/one/formLeave")
+@Api(value="请假接口", description="请假接口")
+public class FormLeaveRestController extends AbstractBaseController {
+
+ @Autowired
+ private IFormLeaveService formLeaveService;
+
+ /**
+ * 请假信息
+ */
+ @RequestMapping(value = {"get"},method ={RequestMethod.POST,RequestMethod.GET})
+ @ApiOperation(value="请假信息(Content-Type为text/html)", notes="请假信息(Content-Type为text/html)")
+ @ApiImplicitParam(name = "id", value = "请假id", required = false, dataType = "String",paramType="query")
+ public Result getRequestParam(@RequestParam(required=false) String id) {
+ return get(id);
+ }
+
+ @RequestMapping(value = {"get/json"},method ={RequestMethod.POST})
+ @ApiOperation(value="请假信息(Content-Type为application/json)", notes="请假信息(Content-Type为application/json)")
+ @ApiImplicitParam(name = "id", value = "请假id", required = false, dataType = "String",paramType="body")
+ public Result getRequestBody(@RequestBody(required=false) String id) {
+ return get(id);
+ }
+
+ private Result get(String id) {
+ FormLeave entity = null;
+ if (StringUtils.isNotBlank(id)){
+ entity = formLeaveService.getCache(id);
+ //entity = formLeaveService.get(id);
+ }
+ if (entity == null){
+ entity = new FormLeave();
+ }
+ Result result = ResultFactory.getSuccessResult();
+ result.setResultObject(entity);
+ return result;
+ }
+
+ /**
+ * 请假列表(不包含页信息)
+ */
+ //RequiresPermissions("test:one:formLeave:findList")
+ @RequestMapping(value = {"findList"},method ={RequestMethod.POST,RequestMethod.GET})
+ @ApiOperation(value="请假列表(不包含页信息)(Content-Type为text/html)", notes="请假列表(不包含页信息)(Content-Type为text/html)")
+ @ApiImplicitParam(name = "formLeave", value = "请假", dataType = "FormLeave",paramType="query")
+ public Result findListRequestParam(FormLeave formLeave, HttpServletRequest request, HttpServletResponse response, Model model) {
+ return findList( formLeave,model);
+ }
+
+ @RequestMapping(value = {"findList/json"},method ={RequestMethod.POST})
+ @ApiOperation(value="请假列表(不包含页信息)(Content-Type为application/json)", notes="请假列表(不包含页信息)(Content-Type为application/json)")
+ @ApiImplicitParam(name = "formLeave", value = "请假", dataType = "FormLeave",paramType="body")
+ public Result findListRequestBody(@RequestBody FormLeave formLeave, Model model) {
+ return findList( formLeave,model);
+ }
+
+ private Result findList(FormLeave formLeave, Model model) {
+ List list = formLeaveService.findListCache(formLeave);
+ //List list = formLeaveService.findList(formLeave);
+ Result result = ResultFactory.getSuccessResult();
+ result.setResultObject(list);
+ return result;
+ }
+
+ /**
+ * 请假列表(包含页信息)
+ */
+ //RequiresPermissions("test:one:formLeave:list")
+ @RequestMapping(value = {"list"},method ={RequestMethod.POST,RequestMethod.GET})
+ @ApiOperation(value="请假列表(包含页信息)(Content-Type为text/html)", notes="请假列表(包含页信息)(Content-Type为text/html)")
+ @ApiImplicitParam(name = "formLeave", value = "请假", dataType = "FormLeave",paramType="query")
+ public Result listRequestParam(FormLeave formLeave, HttpServletRequest request, HttpServletResponse response, Model model) {
+ return list(formLeave,model);
+ }
+
+ @RequestMapping(value = {"list/json"},method ={RequestMethod.POST})
+ @ApiOperation(value="请假列表(包含页信息)(Content-Type为application/json)", notes="请假列表(包含页信息)(Content-Type为application/json)")
+ @ApiImplicitParam(name = "formLeave", value = "请假", dataType = "FormLeave",paramType="body")
+ public Result listRequestBody(@RequestBody FormLeave formLeave, Model model) {
+ return list(formLeave,model);
+ }
+
+ private Result list(FormLeave formLeave, Model model) {
+ Page page = formLeaveService.findPageCache(new Page(formLeave.getPageNo(),formLeave.getPageSize(),formLeave.getOrderBy()), formLeave);
+ //Page page = formLeaveService.findPage(new Page(formLeave.getPageNo(),formLeave.getPageSize(),formLeave.getOrderBy()), formLeave);
+ Result result = ResultFactory.getSuccessResult();
+ result.setResultObject(page);
+ return result;
+ }
+
+ /**
+ * 请假获取列表第一条记录
+ */
+ //RequiresPermissions("test:one:formLeave:listFrist")
+ @RequestMapping(value = {"listFrist"},method ={RequestMethod.POST,RequestMethod.GET})
+ @ApiOperation(value="请假获取列表第一条记录(Content-Type为text/html)", notes="请假获取列表第一条记录(Content-Type为text/html)")
+ @ApiImplicitParam(name = "formLeave", value = "请假", dataType = "FormLeave",paramType="query")
+ public Result listFristRequestParam(FormLeave formLeave, HttpServletRequest request, HttpServletResponse response, Model model) {
+ return listFrist(formLeave,model);
+ }
+
+ @RequestMapping(value = {"listFrist/json"},method ={RequestMethod.POST})
+ @ApiOperation(value="请假获取列表第一条记录(Content-Type为application/json)", notes="请假获取列表第一条记录(Content-Type为application/json)")
+ @ApiImplicitParam(name = "formLeave", value = "请假", dataType = "FormLeave",paramType="body")
+ public Result listFristRequestBody(@RequestBody FormLeave formLeave, Model model) {
+ return listFrist(formLeave,model);
+ }
+
+ private Result listFrist(FormLeave formLeave, Model model) {
+ Page page = formLeaveService.findPageCache(new Page(formLeave.getPageNo(),formLeave.getPageSize(),formLeave.getOrderBy()), formLeave);
+ //Page page = formLeaveService.findPage(new Page(formLeave.getPageNo(),formLeave.getPageSize(),formLeave.getOrderBy()), formLeave);
+ Result result = ResultFactory.getSuccessResult();
+ if(page.getList().size()>0){
+ result.setResultObject(page.getList().get(0));
+ }else{
+ result=ResultFactory.getErrorResult("没有记录！");
+ }
+ return result;
+ }
+
+ /**
+ * 保存请假
+ */
+ //RequiresPermissions(value={"test:one:formLeave:add","test:one:formLeave:edit"},logical=Logical.OR)
+ @RequestMapping(value = "save",method ={RequestMethod.POST,RequestMethod.GET})
+ @ApiOperation(value="保存请假(Content-Type为text/html)", notes="保存请假(Content-Type为text/html)")
+ @ApiImplicitParam(name = "formLeave", value = "请假", dataType = "FormLeave",paramType="query")
+ public Result saveRequestParam(FormLeave formLeave, Model model, RedirectAttributes redirectAttributes) {
+ return save(formLeave,model,redirectAttributes);
+ }
+
+ @RequestMapping(value = "save/json",method ={RequestMethod.POST})
+ @ApiOperation(value="保存请假(Content-Type为application/json)", notes="保存请假(Content-Type为application/json)")
+ @ApiImplicitParam(name = "formLeave", value = "请假", dataType = "FormLeave",paramType="body")
+ public Result saveRequestBody(@RequestBody FormLeave formLeave, Model model, RedirectAttributes redirectAttributes) {
+ return save(formLeave,model,redirectAttributes);
+ }
+
+ private Result save(FormLeave formLeave, Model model, RedirectAttributes redirectAttributes) {
+ if (!beanValidator(model, formLeave)){
+ Result result = ResultFactory.getErrorResult("数据验证失败");
+ }
+ formLeaveService.save(formLeave);
+ Result result = ResultFactory.getSuccessResult("保存请假成功");
+ return result;
+ }
+
+ /**
+ * 删除请假
+ */
+ //RequiresPermissions("test:one:formLeave:del")
+ @RequestMapping(value = "delete",method ={RequestMethod.POST,RequestMethod.GET})
+ @ApiOperation(value="删除请假(Content-Type为text/html)", notes="删除请假(Content-Type为text/html)")
+ @ApiImplicitParam(name = "formLeave", value = "请假", dataType = "FormLeave",paramType="query")
+ public Result deleteRequestParam(FormLeave formLeave, RedirectAttributes redirectAttributes) {
+ return delete(formLeave,redirectAttributes);
+ }
+
+ @RequestMapping(value = "delete/json",method ={RequestMethod.POST})
+ @ApiOperation(value="删除请假(Content-Type为application/json)", notes="删除请假(Content-Type为application/json)")
+ @ApiImplicitParam(name = "formLeave", value = "请假", dataType = "FormLeave",paramType="body")
+ public Result deleteRequestBody(@RequestBody FormLeave formLeave, RedirectAttributes redirectAttributes) {
+ return delete(formLeave,redirectAttributes);
+ }
+
+ private Result delete(FormLeave formLeave, RedirectAttributes redirectAttributes) {
+ formLeaveService.delete(formLeave);
+ Result result = ResultFactory.getSuccessResult("删除请假成功");
+ return result;
+ }
+
+ /**
+ * 删除请假（逻辑删除，更新del_flag字段为1,在表包含字段del_flag时，可以调用此方法，将数据隐藏）
+ */
+ @RequestMapping(value = "deleteByLogic",method ={RequestMethod.POST,RequestMethod.GET})
+ @ApiOperation(value="逻辑删除请假(Content-Type为text/html)", notes="逻辑删除请假(Content-Type为text/html)")
+ @ApiImplicitParam(name = "formLeave", value = "请假", dataType = "FormLeave",paramType="query")
+ public Result deleteByLogicRequestParam(FormLeave formLeave, RedirectAttributes redirectAttributes) {
+ return deleteByLogic(formLeave,redirectAttributes);
+ }
+
+ /**
+ * 删除请假（逻辑删除，更新del_flag字段为1,在表包含字段del_flag时，可以调用此方法，将数据隐藏）
+ */
+ @RequestMapping(value = "deleteByLogic/json",method ={RequestMethod.POST})
+ @ApiOperation(value="逻辑删除请假(Content-Type为application/json)", notes="逻辑删除请假(Content-Type为application/json)")
+ @ApiImplicitParam(name = "formLeave", value = "请假", dataType = "FormLeave",paramType="body")
+ public Result deleteByLogicRequestBody(@RequestBody FormLeave formLeave, RedirectAttributes redirectAttributes) {
+ return deleteByLogic(formLeave,redirectAttributes);
+ }
+
+ private Result deleteByLogic(FormLeave formLeave, RedirectAttributes redirectAttributes) {
+ formLeaveService.deleteByLogic(formLeave);
+ Result result = ResultFactory.getSuccessResult("删除请假成功");
+ return result;
+ }
+
+ /**
+ * 批量删除请假
+ */
+ //RequiresPermissions("test:one:formLeave:del")
+ @RequestMapping(value = "deleteAll",method ={RequestMethod.POST,RequestMethod.GET})
+ @ApiOperation(value="批量删除请假(Content-Type为text/html)", notes="批量删除请假(Content-Type为text/html)")
+ @ApiImplicitParam(name = "ids", value = "请假ids,用,隔开", required = false, dataType = "String",paramType="query")
+ public Result deleteAllRequestParam(String ids, RedirectAttributes redirectAttributes) {
+ return deleteAll(ids,redirectAttributes);
+ }
+
+ @RequestMapping(value = "deleteAll/json",method ={RequestMethod.POST})
+ @ApiOperation(value="批量删除请假(Content-Type为application/json)", notes="批量删除请假(Content-Type为application/json)")
+ @ApiImplicitParam(name = "ids", value = "请假ids,用,隔开", required = false, dataType = "String",paramType="body")
+ public Result deleteAllRequestBody(@RequestBody String ids, RedirectAttributes redirectAttributes) {
+ return deleteAll(ids,redirectAttributes);
+ }
+
+ private Result deleteAll(String ids, RedirectAttributes redirectAttributes) {
+ String[] idArray = ids.split(",");
+ for(String id : idArray){
+ formLeaveService.delete(formLeaveService.get(id));
+ }
+ Result result = ResultFactory.getSuccessResult("删除请假成功");
+ return result;
+ }
+
+ /**
+ * 批量删除请假（逻辑删除，更新del_flag字段为1,在表包含字段del_flag时，可以调用此方法，将数据隐藏）
+ */
+ @RequestMapping(value = "deleteAllByLogic",method ={RequestMethod.POST,RequestMethod.GET})
+ @ApiOperation(value="逻辑批量删除请假(Content-Type为text/html)", notes="逻辑批量删除请假(Content-Type为text/html)")
+ @ApiImplicitParam(name = "ids", value = "请假ids,用,隔开", required = false, dataType = "String",paramType="query")
+ public Result deleteAllByLogicRequestParam(String ids, RedirectAttributes redirectAttributes) {
+ return deleteAllByLogic(ids,redirectAttributes);
+ }
+
+ /**
+ * 批量删除请假（逻辑删除，更新del_flag字段为1,在表包含字段del_flag时，可以调用此方法，将数据隐藏）
+ */
+ @RequestMapping(value = "deleteAllByLogic/json",method ={RequestMethod.POST})
+ @ApiOperation(value="逻辑批量删除请假(Content-Type为application/json)", notes="逻辑批量删除请假(Content-Type为application/json)")
+ @ApiImplicitParam(name = "ids", value = "请假ids,用,隔开", required = false, dataType = "String",paramType="body")
+ public Result deleteAllByLogicRequestBody(@RequestBody String ids, RedirectAttributes redirectAttributes) {
+ return deleteAllByLogic(ids,redirectAttributes);
+ }
+
+ private Result deleteAllByLogic(String ids, RedirectAttributes redirectAttributes) {
+ String[] idArray = ids.split(",");
+ for(String id : idArray){
+ formLeaveService.deleteByLogic(formLeaveService.get(id));
+ }
+ Result result = ResultFactory.getSuccessResult("删除请假成功");
+ return result;
+ }
+
+}
\ No newline at end of file
diff --git a/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/rest/onetomany/TestDataMainRestController.java b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/rest/onetomany/TestDataMainRestController.java
new file mode 100644
index 0000000..58aa691
--- /dev/null
+++ b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/rest/onetomany/TestDataMainRestController.java
@@ -0,0 +1,301 @@
+/**
+ * * Copyright © 2015-2020 JeeSpringCloud All rights reserved..
+ */
+package com.jeespring.modules.test.rest.onetomany;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.google.common.collect.Lists;
+import com.jeespring.common.utils.DateUtils;
+import com.jeespring.common.config.Global;
+import com.jeespring.common.persistence.Page;
+import com.jeespring.common.web.AbstractBaseController;
+import com.jeespring.common.utils.StringUtils;
+import com.jeespring.common.utils.excel.ExportExcel;
+import com.jeespring.common.utils.excel.ImportExcel;
+import com.jeespring.modules.test.entity.onetomany.TestDataMain;
+import com.jeespring.modules.test.service.onetomany.ITestDataMainService;
+import org.springframework.web.bind.annotation.RestController;
+import com.jeespring.common.web.Result;
+import com.jeespring.common.web.ResultFactory;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 订票Controller
+ * @author JeeSpring
+ * @version 2018-10-12
+ */
+@RestController
+@RequestMapping(value = "/rest/test/onetomany/testDataMain")
+@Api(value="订票接口", description="订票接口")
+public class TestDataMainRestController extends AbstractBaseController {
+
+ @Autowired
+ private ITestDataMainService testDataMainService;
+
+ /**
+ * 订票信息
+ */
+ @RequestMapping(value = {"get"},method ={RequestMethod.POST,RequestMethod.GET})
+ @ApiOperation(value="订票信息(Content-Type为text/html)", notes="订票信息(Content-Type为text/html)")
+ @ApiImplicitParam(name = "id", value = "订票id", required = false, dataType = "String",paramType="query")
+ public Result getRequestParam(@RequestParam(required=false) String id) {
+ return get(id);
+ }
+
+ @RequestMapping(value = {"get/json"},method ={RequestMethod.POST})
+ @ApiOperation(value="订票信息(Content-Type为application/json)", notes="订票信息(Content-Type为application/json)")
+ @ApiImplicitParam(name = "id", value = "订票id", required = false, dataType = "String",paramType="body")
+ public Result getRequestBody(@RequestBody(required=false) String id) {
+ return get(id);
+ }
+
+ private Result get(String id) {
+ TestDataMain entity = null;
+ if (StringUtils.isNotBlank(id)){
+ entity = testDataMainService.getCache(id);
+ //entity = testDataMainService.get(id);
+ }
+ if (entity == null){
+ entity = new TestDataMain();
+ }
+ Result result = ResultFactory.getSuccessResult();
+ result.setResultObject(entity);
+ return result;
+ }
+
+ /**
+ * 订票列表(不包含页信息)
+ */
+ //RequiresPermissions("test:onetomany:testDataMain:findList")
+ @RequestMapping(value = {"findList"},method ={RequestMethod.POST,RequestMethod.GET})
+ @ApiOperation(value="订票列表(不包含页信息)(Content-Type为text/html)", notes="订票列表(不包含页信息)(Content-Type为text/html)")
+ @ApiImplicitParam(name = "testDataMain", value = "订票", dataType = "TestDataMain",paramType="query")
+ public Result findListRequestParam(TestDataMain testDataMain, HttpServletRequest request, HttpServletResponse response, Model model) {
+ return findList( testDataMain,model);
+ }
+
+ @RequestMapping(value = {"findList/json"},method ={RequestMethod.POST})
+ @ApiOperation(value="订票列表(不包含页信息)(Content-Type为application/json)", notes="订票列表(不包含页信息)(Content-Type为application/json)")
+ @ApiImplicitParam(name = "testDataMain", value = "订票", dataType = "TestDataMain",paramType="body")
+ public Result findListRequestBody(@RequestBody TestDataMain testDataMain, Model model) {
+ return findList( testDataMain,model);
+ }
+
+ private Result findList(TestDataMain testDataMain, Model model) {
+ List list = testDataMainService.findListCache(testDataMain);
+ //List list = testDataMainService.findList(testDataMain);
+ Result result = ResultFactory.getSuccessResult();
+ result.setResultObject(list);
+ return result;
+ }
+
+ /**
+ * 订票列表(包含页信息)
+ */
+ //RequiresPermissions("test:onetomany:testDataMain:list")
+ @RequestMapping(value = {"list"},method ={RequestMethod.POST,RequestMethod.GET})
+ @ApiOperation(value="订票列表(包含页信息)(Content-Type为text/html)", notes="订票列表(包含页信息)(Content-Type为text/html)")
+ @ApiImplicitParam(name = "testDataMain", value = "订票", dataType = "TestDataMain",paramType="query")
+ public Result listRequestParam(TestDataMain testDataMain, HttpServletRequest request, HttpServletResponse response, Model model) {
+ return list(testDataMain,model);
+ }
+
+ @RequestMapping(value = {"list/json"},method ={RequestMethod.POST})
+ @ApiOperation(value="订票列表(包含页信息)(Content-Type为application/json)", notes="订票列表(包含页信息)(Content-Type为application/json)")
+ @ApiImplicitParam(name = "testDataMain", value = "订票", dataType = "TestDataMain",paramType="body")
+ public Result listRequestBody(@RequestBody TestDataMain testDataMain, Model model) {
+ return list(testDataMain,model);
+ }
+
+ private Result list(TestDataMain testDataMain, Model model) {
+ Page page = testDataMainService.findPageCache(new Page(testDataMain.getPageNo(),testDataMain.getPageSize(),testDataMain.getOrderBy()), testDataMain);
+ //Page page = testDataMainService.findPage(new Page(testDataMain.getPageNo(),testDataMain.getPageSize(),testDataMain.getOrderBy()), testDataMain);
+ Result result = ResultFactory.getSuccessResult();
+ result.setResultObject(page);
+ return result;
+ }
+
+ /**
+ * 订票获取列表第一条记录
+ */
+ //RequiresPermissions("test:onetomany:testDataMain:listFrist")
+ @RequestMapping(value = {"listFrist"},method ={RequestMethod.POST,RequestMethod.GET})
+ @ApiOperation(value="订票获取列表第一条记录(Content-Type为text/html)", notes="订票获取列表第一条记录(Content-Type为text/html)")
+ @ApiImplicitParam(name = "testDataMain", value = "订票", dataType = "TestDataMain",paramType="query")
+ public Result listFristRequestParam(TestDataMain testDataMain, HttpServletRequest request, HttpServletResponse response, Model model) {
+ return listFrist(testDataMain,model);
+ }
+
+ @RequestMapping(value = {"listFrist/json"},method ={RequestMethod.POST})
+ @ApiOperation(value="订票获取列表第一条记录(Content-Type为application/json)", notes="订票获取列表第一条记录(Content-Type为application/json)")
+ @ApiImplicitParam(name = "testDataMain", value = "订票", dataType = "TestDataMain",paramType="body")
+ public Result listFristRequestBody(@RequestBody TestDataMain testDataMain, Model model) {
+ return listFrist(testDataMain,model);
+ }
+
+ private Result listFrist(TestDataMain testDataMain, Model model) {
+ Page page = testDataMainService.findPageCache(new Page(testDataMain.getPageNo(),testDataMain.getPageSize(),testDataMain.getOrderBy()), testDataMain);
+ //Page page = testDataMainService.findPage(new Page(testDataMain.getPageNo(),testDataMain.getPageSize(),testDataMain.getOrderBy()), testDataMain);
+ Result result = ResultFactory.getSuccessResult();
+ if(page.getList().size()>0){
+ result.setResultObject(page.getList().get(0));
+ }else{
+ result=ResultFactory.getErrorResult("没有记录！");
+ }
+ return result;
+ }
+
+ /**
+ * 保存订票
+ */
+ //RequiresPermissions(value={"test:onetomany:testDataMain:add","test:onetomany:testDataMain:edit"},logical=Logical.OR)
+ @RequestMapping(value = "save",method ={RequestMethod.POST,RequestMethod.GET})
+ @ApiOperation(value="保存订票(Content-Type为text/html)", notes="保存订票(Content-Type为text/html)")
+ @ApiImplicitParam(name = "testDataMain", value = "订票", dataType = "TestDataMain",paramType="query")
+ public Result saveRequestParam(TestDataMain testDataMain, Model model, RedirectAttributes redirectAttributes) {
+ return save(testDataMain,model,redirectAttributes);
+ }
+
+ @RequestMapping(value = "save/json",method ={RequestMethod.POST})
+ @ApiOperation(value="保存订票(Content-Type为application/json)", notes="保存订票(Content-Type为application/json)")
+ @ApiImplicitParam(name = "testDataMain", value = "订票", dataType = "TestDataMain",paramType="body")
+ public Result saveRequestBody(@RequestBody TestDataMain testDataMain, Model model, RedirectAttributes redirectAttributes) {
+ return save(testDataMain,model,redirectAttributes);
+ }
+
+ private Result save(TestDataMain testDataMain, Model model, RedirectAttributes redirectAttributes) {
+ if (!beanValidator(model, testDataMain)){
+ Result result = ResultFactory.getErrorResult("数据验证失败");
+ }
+ testDataMainService.save(testDataMain);
+ Result result = ResultFactory.getSuccessResult("保存订票成功");
+ return result;
+ }
+
+ /**
+ * 删除订票
+ */
+ //RequiresPermissions("test:onetomany:testDataMain:del")
+ @RequestMapping(value = "delete",method ={RequestMethod.POST,RequestMethod.GET})
+ @ApiOperation(value="删除订票(Content-Type为text/html)", notes="删除订票(Content-Type为text/html)")
+ @ApiImplicitParam(name = "testDataMain", value = "订票", dataType = "TestDataMain",paramType="query")
+ public Result deleteRequestParam(TestDataMain testDataMain, RedirectAttributes redirectAttributes) {
+ return delete(testDataMain,redirectAttributes);
+ }
+
+ @RequestMapping(value = "delete/json",method ={RequestMethod.POST})
+ @ApiOperation(value="删除订票(Content-Type为application/json)", notes="删除订票(Content-Type为application/json)")
+ @ApiImplicitParam(name = "testDataMain", value = "订票", dataType = "TestDataMain",paramType="body")
+ public Result deleteRequestBody(@RequestBody TestDataMain testDataMain, RedirectAttributes redirectAttributes) {
+ return delete(testDataMain,redirectAttributes);
+ }
+
+ private Result delete(TestDataMain testDataMain, RedirectAttributes redirectAttributes) {
+ testDataMainService.delete(testDataMain);
+ Result result = ResultFactory.getSuccessResult("删除订票成功");
+ return result;
+ }
+
+ /**
+ * 删除订票（逻辑删除，更新del_flag字段为1,在表包含字段del_flag时，可以调用此方法，将数据隐藏）
+ */
+ @RequestMapping(value = "deleteByLogic",method ={RequestMethod.POST,RequestMethod.GET})
+ @ApiOperation(value="逻辑删除订票(Content-Type为text/html)", notes="逻辑删除订票(Content-Type为text/html)")
+ @ApiImplicitParam(name = "testDataMain", value = "订票", dataType = "TestDataMain",paramType="query")
+ public Result deleteByLogicRequestParam(TestDataMain testDataMain, RedirectAttributes redirectAttributes) {
+ return deleteByLogic(testDataMain,redirectAttributes);
+ }
+
+ /**
+ * 删除订票（逻辑删除，更新del_flag字段为1,在表包含字段del_flag时，可以调用此方法，将数据隐藏）
+ */
+ @RequestMapping(value = "deleteByLogic/json",method ={RequestMethod.POST})
+ @ApiOperation(value="逻辑删除订票(Content-Type为application/json)", notes="逻辑删除订票(Content-Type为application/json)")
+ @ApiImplicitParam(name = "testDataMain", value = "订票", dataType = "TestDataMain",paramType="body")
+ public Result deleteByLogicRequestBody(@RequestBody TestDataMain testDataMain, RedirectAttributes redirectAttributes) {
+ return deleteByLogic(testDataMain,redirectAttributes);
+ }
+
+ private Result deleteByLogic(TestDataMain testDataMain, RedirectAttributes redirectAttributes) {
+ testDataMainService.deleteByLogic(testDataMain);
+ Result result = ResultFactory.getSuccessResult("删除订票成功");
+ return result;
+ }
+
+ /**
+ * 批量删除订票
+ */
+ //RequiresPermissions("test:onetomany:testDataMain:del")
+ @RequestMapping(value = "deleteAll",method ={RequestMethod.POST,RequestMethod.GET})
+ @ApiOperation(value="批量删除订票(Content-Type为text/html)", notes="批量删除订票(Content-Type为text/html)")
+ @ApiImplicitParam(name = "ids", value = "订票ids,用,隔开", required = false, dataType = "String",paramType="query")
+ public Result deleteAllRequestParam(String ids, RedirectAttributes redirectAttributes) {
+ return deleteAll(ids,redirectAttributes);
+ }
+
+ @RequestMapping(value = "deleteAll/json",method ={RequestMethod.POST})
+ @ApiOperation(value="批量删除订票(Content-Type为application/json)", notes="批量删除订票(Content-Type为application/json)")
+ @ApiImplicitParam(name = "ids", value = "订票ids,用,隔开", required = false, dataType = "String",paramType="body")
+ public Result deleteAllRequestBody(@RequestBody String ids, RedirectAttributes redirectAttributes) {
+ return deleteAll(ids,redirectAttributes);
+ }
+
+ private Result deleteAll(String ids, RedirectAttributes redirectAttributes) {
+ String[] idArray = ids.split(",");
+ for(String id : idArray){
+ testDataMainService.delete(testDataMainService.get(id));
+ }
+ Result result = ResultFactory.getSuccessResult("删除订票成功");
+ return result;
+ }
+
+ /**
+ * 批量删除订票（逻辑删除，更新del_flag字段为1,在表包含字段del_flag时，可以调用此方法，将数据隐藏）
+ */
+ @RequestMapping(value = "deleteAllByLogic",method ={RequestMethod.POST,RequestMethod.GET})
+ @ApiOperation(value="逻辑批量删除订票(Content-Type为text/html)", notes="逻辑批量删除订票(Content-Type为text/html)")
+ @ApiImplicitParam(name = "ids", value = "订票ids,用,隔开", required = false, dataType = "String",paramType="query")
+ public Result deleteAllByLogicRequestParam(String ids, RedirectAttributes redirectAttributes) {
+ return deleteAllByLogic(ids,redirectAttributes);
+ }
+
+ /**
+ * 批量删除订票（逻辑删除，更新del_flag字段为1,在表包含字段del_flag时，可以调用此方法，将数据隐藏）
+ */
+ @RequestMapping(value = "deleteAllByLogic/json",method ={RequestMethod.POST})
+ @ApiOperation(value="逻辑批量删除订票(Content-Type为application/json)", notes="逻辑批量删除订票(Content-Type为application/json)")
+ @ApiImplicitParam(name = "ids", value = "订票ids,用,隔开", required = false, dataType = "String",paramType="body")
+ public Result deleteAllByLogicRequestBody(@RequestBody String ids, RedirectAttributes redirectAttributes) {
+ return deleteAllByLogic(ids,redirectAttributes);
+ }
+
+ private Result deleteAllByLogic(String ids, RedirectAttributes redirectAttributes) {
+ String[] idArray = ids.split(",");
+ for(String id : idArray){
+ testDataMainService.deleteByLogic(testDataMainService.get(id));
+ }
+ Result result = ResultFactory.getSuccessResult("删除订票成功");
+ return result;
+ }
+
+}
\ No newline at end of file
diff --git a/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/service/one/FormLeaveService.java b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/service/one/FormLeaveService.java
new file mode 100644
index 0000000..aa2a302
--- /dev/null
+++ b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/service/one/FormLeaveService.java
@@ -0,0 +1,192 @@
+/**
+ * * Copyright © 2015-2020 JeeSpringCloud All rights reserved..
+ */
+package com.jeespring.modules.test.service.one;
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.jeespring.common.persistence.Page;
+import com.jeespring.common.service.AbstractBaseService;
+import com.jeespring.modules.test.entity.one.FormLeave;
+import com.jeespring.modules.test.dao.one.FormLeaveDao;
+import com.jeespring.modules.test.service.one.IFormLeaveService;
+import com.alibaba.fastjson.JSON;
+import com.jeespring.common.redis.RedisUtils;
+import com.jeespring.common.security.MD5Tools;
+//import com.alibaba.dubbo.config.annotation.Service;
+import com.jeespring.common.config.Global;
+
+/**
+ * 请假Service
+ * @author JeeSpring
+ * @version 2018-10-12
+ */
+ //启用dubbo服务器时，要去掉下面注解
+ //com.alibaba.dubbo.config.annotation.Service(interfaceClass = ISysServerService.class,version = "1.0.0", timeout = 60000)
+@org.springframework.stereotype.Service
+@Transactional(readOnly = true)
+public class FormLeaveService extends AbstractBaseService implements IFormLeaveService{
+
+ /**
+ * redis caches
+ */
+ @Autowired
+ private RedisUtils redisUtils;
+
+ @Override
+ public FormLeave get(String id) {
+ //获取数据库数据
+ FormLeave formLeave=super.get(id);
+ return formLeave;
+ }
+
+ @Override
+ public FormLeave getCache(String id) {
+ //获取缓存数据
+ FormLeave formLeave=(FormLeave)redisUtils.get(RedisUtils.getIdKey(FormLeaveService.class.getName(),id));
+ if( formLeave!=null) {
+ return formLeave;
+ }
+ //获取数据库数据
+ formLeave=super.get(id);
+ //设置缓存数据
+ redisUtils.set(RedisUtils.getIdKey(FormLeaveService.class.getName(),id),formLeave);
+ return formLeave;
+ }
+
+ @Override
+ public List total(FormLeave formLeave) {
+ //获取数据库数据
+ List formLeaveList=super.total(formLeave);
+ return formLeaveList;
+ }
+
+ @Override
+ public List totalCache(FormLeave formLeave) {
+ //获取缓存数据
+ String totalKey = RedisUtils.getTotalKey(FormLeaveService.class.getName(),JSON.toJSONString(formLeave));
+ List formLeaveList=(List)redisUtils.get(totalKey);
+ if(formLeaveList!=null) {
+ return formLeaveList;
+ }
+ //获取数据库数据
+ formLeaveList=super.total(formLeave);
+ //设置缓存数据
+ redisUtils.set(totalKey,formLeaveList);
+ return formLeaveList;
+ }
+
+ @Override
+ public List findList(FormLeave formLeave) {
+ //获取数据库数据
+ List formLeaveList=super.findList(formLeave);
+ //设置缓存数据
+ return formLeaveList;
+ }
+
+ @Override
+ public List findListCache(FormLeave formLeave) {
+ //获取缓存数据
+ String findListKey = RedisUtils.getFindListKey(FormLeaveService.class.getName(),JSON.toJSONString(formLeave));
+ List formLeaveList=(List)redisUtils.get(findListKey);
+ if(formLeaveList!=null) {
+ return formLeaveList;
+ }
+ //获取数据库数据
+ formLeaveList=super.findList(formLeave);
+ //设置缓存数据
+ redisUtils.set(findListKey,formLeaveList);
+ return formLeaveList;
+ }
+
+ public FormLeave findListFirst(FormLeave formLeave) {;
+ //获取数据库数据
+ List formLeaveList=super.findList(formLeave);
+ if(formLeaveList.size()>0) {
+ formLeave = formLeaveList.get(0);
+ }
+ return formLeave;
+ }
+
+ public FormLeave findListFirstCache(FormLeave formLeave) {
+ //获取缓存数据
+ String findListFirstKey = RedisUtils.getFindListFirstKey(FormLeaveService.class.getName(),JSON.toJSONString(formLeave));
+ FormLeave formLeaveRedis=(FormLeave)redisUtils.get(findListFirstKey);
+ if(formLeaveRedis!=null) {
+ return formLeaveRedis;
+ }
+ //获取数据库数据
+ List formLeaveList=super.findList(formLeave);
+ if(formLeaveList.size()>0) {
+ formLeave = formLeaveList.get(0);
+ } else {
+ formLeave = new FormLeave();
+ }
+ //设置缓存数据
+ redisUtils.set(findListFirstKey,formLeave);
+ return formLeave;
+ }
+
+ @Override
+ public Page findPage(Page page, FormLeave formLeave) {
+ //获取数据库数据
+ Page pageReuslt=super.findPage(page, formLeave);
+ return pageReuslt;
+ }
+
+ @Override
+ public Page findPageCache(Page page, FormLeave formLeave) {
+ //获取缓存数据
+ String findPageKey = RedisUtils.getFindPageKey(FormLeaveService.class.getName(),JSON.toJSONString(page)+JSON.toJSONString(formLeave));
+ Page pageReuslt=(Page)redisUtils.get(findPageKey);
+ if(pageReuslt!=null) {
+ return pageReuslt;
+ }
+ //获取数据库数据
+ pageReuslt=super.findPage(page, formLeave);
+ //设置缓存数据
+ redisUtils.set(findPageKey,pageReuslt);
+ return pageReuslt;
+ }
+
+ @Override
+ @Transactional(readOnly = false)
+ public void save(FormLeave formLeave) {
+ //保存数据库记录
+ super.save(formLeave);
+ //设置清除缓存数据
+ redisUtils.remove(RedisUtils.getIdKey(FormLeaveService.class.getName(),formLeave.getId()));
+ //清除列表和页面缓存数据
+ redisUtils.removePattern(RedisUtils.getFindListKeyPattern(FormLeaveService.class.getName()));
+ redisUtils.removePattern(RedisUtils.getFinPageKeyPattern(FormLeaveService.class.getName()));
+ }
+
+ @Override
+ @Transactional(readOnly = false)
+ public void delete(FormLeave formLeave) {
+ //清除记录缓存数据
+ redisUtils.remove(RedisUtils.getIdKey(FormLeaveService.class.getName(),formLeave.getId()));
+ //删除数据库记录
+ super.delete(formLeave);
+ //清除列表和页面缓存数据
+ redisUtils.removePattern(RedisUtils.getFindListKeyPattern(FormLeaveService.class.getName()));
+ redisUtils.removePattern(RedisUtils.getFinPageKeyPattern(FormLeaveService.class.getName()));
+ }
+
+ @Override
+ @Transactional(readOnly = false)
+ public void deleteByLogic(FormLeave formLeave) {
+ //清除记录缓存数据
+ redisUtils.remove(RedisUtils.getIdKey(FormLeaveService.class.getName(),formLeave.getId()));
+ //逻辑删除数据库记录
+ super.deleteByLogic(formLeave);
+ //清除列表和页面缓存数据
+ redisUtils.removePattern(RedisUtils.getFindListKeyPattern(FormLeaveService.class.getName()));
+ redisUtils.removePattern(RedisUtils.getFinPageKeyPattern(FormLeaveService.class.getName()));
+ }
+
+}
\ No newline at end of file
diff --git a/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/service/one/IFormLeaveService.java b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/service/one/IFormLeaveService.java
new file mode 100644
index 0000000..c81abc0
--- /dev/null
+++ b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/service/one/IFormLeaveService.java
@@ -0,0 +1,16 @@
+/**
+ * * Copyright © 2015-2020 JeeSpringCloud All rights reserved..
+ */
+package com.jeespring.modules.test.service.one;
+
+import com.jeespring.common.persistence.InterfaceBaseService;
+import com.jeespring.modules.server.entity.SysServer;
+import com.jeespring.modules.test.entity.one.FormLeave;
+
+/**
+ * I请假Service
+ * @author JeeSpring
+ * @version 2018-10-12
+ */
+public interface IFormLeaveService extends InterfaceBaseService {
+}
\ No newline at end of file
diff --git a/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/service/onetomany/ITestDataMainService.java b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/service/onetomany/ITestDataMainService.java
new file mode 100644
index 0000000..2665bdd
--- /dev/null
+++ b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/service/onetomany/ITestDataMainService.java
@@ -0,0 +1,16 @@
+/**
+ * * Copyright © 2015-2020 JeeSpringCloud All rights reserved..
+ */
+package com.jeespring.modules.test.service.onetomany;
+
+import com.jeespring.common.persistence.InterfaceBaseService;
+import com.jeespring.modules.server.entity.SysServer;
+import com.jeespring.modules.test.entity.onetomany.TestDataMain;
+
+/**
+ * I订票Service
+ * @author JeeSpring
+ * @version 2018-10-12
+ */
+public interface ITestDataMainService extends InterfaceBaseService {
+}
\ No newline at end of file
diff --git a/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/service/onetomany/TestDataMainService.java b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/service/onetomany/TestDataMainService.java
new file mode 100644
index 0000000..13ae415
--- /dev/null
+++ b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/service/onetomany/TestDataMainService.java
@@ -0,0 +1,280 @@
+/**
+ * * Copyright © 2015-2020 JeeSpringCloud All rights reserved..
+ */
+package com.jeespring.modules.test.service.onetomany;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.jeespring.common.persistence.Page;
+import com.jeespring.common.service.AbstractBaseService;
+import com.jeespring.common.utils.StringUtils;
+import com.alibaba.fastjson.JSON;
+import com.jeespring.common.redis.RedisUtils;
+import com.jeespring.common.security.MD5Tools;
+import com.jeespring.modules.test.entity.onetomany.TestDataMain;
+import com.jeespring.modules.test.dao.onetomany.TestDataMainDao;
+import com.jeespring.modules.test.entity.onetomany.TestDataChild;
+import com.jeespring.modules.test.dao.onetomany.TestDataChildDao;
+import com.jeespring.modules.test.entity.onetomany.TestDataChild2;
+import com.jeespring.modules.test.dao.onetomany.TestDataChild2Dao;
+import com.jeespring.modules.test.entity.onetomany.TestDataChild3;
+import com.jeespring.modules.test.dao.onetomany.TestDataChild3Dao;
+//import com.alibaba.dubbo.config.annotation.Service;
+import com.jeespring.common.config.Global;
+
+/**
+ * 订票Service
+ * @author JeeSpring
+ * @version 2018-10-12
+ */
+ //com.alibaba.dubbo.config.annotation.Service(interfaceClass = ISysServerService.class,version = "1.0.0", timeout = 60000)
+@org.springframework.stereotype.Service
+@Transactional(readOnly = true)
+public class TestDataMainService extends AbstractBaseService implements ITestDataMainService{
+
+ /**
+ * redis caches
+ */
+ @Autowired
+ private RedisUtils redisUtils;
+
+ @Autowired
+ private TestDataChildDao testDataChildDao;
+ @Autowired
+ private TestDataChild2Dao testDataChild2Dao;
+ @Autowired
+ private TestDataChild3Dao testDataChild3Dao;
+
+ @Override
+ public TestDataMain get(String id) {
+ //获取数据库数据
+ TestDataMain testDataMain = super.get(id);
+ if(testDataMain ==null) {
+ return new TestDataMain();
+ }
+ testDataMain.setTestDataChildList(testDataChildDao.findList(new TestDataChild(testDataMain)));
+ testDataMain.setTestDataChild2List(testDataChild2Dao.findList(new TestDataChild2(testDataMain)));
+ testDataMain.setTestDataChild3List(testDataChild3Dao.findList(new TestDataChild3(testDataMain)));
+ return testDataMain;
+ }
+
+ @Override
+ public TestDataMain getCache(String id) {
+ //获取缓存数据
+ TestDataMain testDataMain=(TestDataMain)redisUtils.get(RedisUtils.getIdKey(TestDataMainService.class.getName(),id));
+ if( testDataMain!=null) {
+ return testDataMain;
+ }
+ //获取数据库数据
+ testDataMain = super.get(id);
+ if(testDataMain ==null) {
+ return new TestDataMain();
+ }
+ testDataMain.setTestDataChildList(testDataChildDao.findList(new TestDataChild(testDataMain)));
+ testDataMain.setTestDataChild2List(testDataChild2Dao.findList(new TestDataChild2(testDataMain)));
+ testDataMain.setTestDataChild3List(testDataChild3Dao.findList(new TestDataChild3(testDataMain)));
+ //设置缓存数据
+ redisUtils.set(RedisUtils.getIdKey(TestDataMainService.class.getName(),id),testDataMain);
+ return testDataMain;
+ }
+
+ @Override
+ public List total(TestDataMain testDataMain) {
+ //获取数据库数据
+ List testDataMainList=super.total(testDataMain);
+ return testDataMainList;
+ }
+
+ @Override
+ public List totalCache(TestDataMain testDataMain) {
+ //获取缓存数据
+ String totalKey = RedisUtils.getTotalKey(TestDataMainService.class.getName(),JSON.toJSONString(testDataMain));
+ List testDataMainList=(List)redisUtils.get(totalKey);
+ if(testDataMainList!=null) {
+ return testDataMainList;
+ }
+ //获取数据库数据
+ testDataMainList=super.total(testDataMain);
+ //设置缓存数据
+ redisUtils.set(totalKey,testDataMainList);
+ return testDataMainList;
+ }
+
+ public TestDataMain findListFirst(TestDataMain testDataMain) {
+ //获取数据库数据
+ List testDataMainList=super.findList(testDataMain);
+ if(testDataMainList.size()>0) {
+ testDataMain = testDataMainList.get(0);
+ }
+ return testDataMain;
+ }
+
+ public TestDataMain findListFirstCache(TestDataMain testDataMain) {
+ //获取缓存数据
+ String findListFirstKey = RedisUtils.getFindListFirstKey(TestDataMainService.class.getName(),JSON.toJSONString(testDataMain));
+ TestDataMain testDataMainRedis=(TestDataMain)redisUtils.get(findListFirstKey);
+ if(testDataMainRedis!=null) {
+ return testDataMainRedis;
+ }
+ //获取数据库数据
+ List testDataMainList=super.findList(testDataMain);
+ if(testDataMainList.size()>0) {
+ testDataMain = testDataMainList.get(0);
+ } else {
+ testDataMain = new TestDataMain();
+ }
+ //设置缓存数据
+ redisUtils.set(findListFirstKey,testDataMain);
+ return testDataMain;
+ }
+
+ @Override
+ public List findList(TestDataMain testDataMain) {
+ //获取缓存数据
+ String findListKey = RedisUtils.getFindListKey(TestDataMainService.class.getName(),JSON.toJSONString(testDataMain));
+ List testDataMainList=(List)redisUtils.get(findListKey);
+ if(testDataMainList!=null) {
+ return testDataMainList;
+ }
+ //获取数据库数据
+ testDataMainList=super.findList(testDataMain);
+ //设置缓存数据
+ redisUtils.set(findListKey,testDataMainList);
+ return testDataMainList;
+ }
+
+ @Override
+ public List findListCache(TestDataMain testDataMain) {
+ //获取缓存数据
+ String findListKey = RedisUtils.getFindListKey(TestDataMainService.class.getName(),JSON.toJSONString(testDataMain));
+ List testDataMainList=(List)redisUtils.get(findListKey);
+ if(testDataMainList!=null) {
+ return testDataMainList;
+ }
+ //获取数据库数据
+ testDataMainList=super.findList(testDataMain);
+ //设置缓存数据
+ redisUtils.set(findListKey,testDataMainList);
+ return testDataMainList;
+ }
+
+ @Override
+ public Page findPage(Page page, TestDataMain testDataMain) {
+ //获取数据库数据
+ Page pageReuslt=super.findPage(page, testDataMain);
+ return pageReuslt;
+ }
+
+ @Override
+ public Page findPageCache(Page page, TestDataMain testDataMain) {
+ //获取缓存数据
+ String findPageKey = RedisUtils.getFindPageKey(TestDataMainService.class.getName(),JSON.toJSONString(page)+JSON.toJSONString(testDataMain));
+ Page pageReuslt=(Page)redisUtils.get(findPageKey);
+ if(pageReuslt!=null) {
+ return pageReuslt;
+ }
+ //获取数据库数据
+ pageReuslt=super.findPage(page, testDataMain);
+ //设置缓存数据
+ redisUtils.set(findPageKey,pageReuslt);
+ return pageReuslt;
+ }
+
+ @Override
+ @Transactional(readOnly = false)
+ public void save(TestDataMain testDataMain) {
+ //保存数据库记录
+ super.save(testDataMain);
+ for (TestDataChild testDataChild : testDataMain.getTestDataChildList()){
+ if (testDataChild.getId() == null){
+ continue;
+ }
+ if (TestDataChild.DEL_FLAG_NORMAL.equals(testDataChild.getDelFlag())){
+ if (StringUtils.isBlank(testDataChild.getId())){
+ testDataChild.setTestDataMain(testDataMain);
+ testDataChild.preInsert();
+ testDataChildDao.insert(testDataChild);
+ }else{
+ testDataChild.preUpdate();
+ testDataChildDao.update(testDataChild);
+ }
+ }else{
+ testDataChildDao.delete(testDataChild);
+ }
+ }
+ for (TestDataChild2 testDataChild2 : testDataMain.getTestDataChild2List()){
+ if (testDataChild2.getId() == null){
+ continue;
+ }
+ if (TestDataChild2.DEL_FLAG_NORMAL.equals(testDataChild2.getDelFlag())){
+ if (StringUtils.isBlank(testDataChild2.getId())){
+ testDataChild2.setTestDataMain(testDataMain);
+ testDataChild2.preInsert();
+ testDataChild2Dao.insert(testDataChild2);
+ }else{
+ testDataChild2.preUpdate();
+ testDataChild2Dao.update(testDataChild2);
+ }
+ }else{
+ testDataChild2Dao.delete(testDataChild2);
+ }
+ }
+ for (TestDataChild3 testDataChild3 : testDataMain.getTestDataChild3List()){
+ if (testDataChild3.getId() == null){
+ continue;
+ }
+ if (TestDataChild3.DEL_FLAG_NORMAL.equals(testDataChild3.getDelFlag())){
+ if (StringUtils.isBlank(testDataChild3.getId())){
+ testDataChild3.setTestDataMain(testDataMain);
+ testDataChild3.preInsert();
+ testDataChild3Dao.insert(testDataChild3);
+ }else{
+ testDataChild3.preUpdate();
+ testDataChild3Dao.update(testDataChild3);
+ }
+ }else{
+ testDataChild3Dao.delete(testDataChild3);
+ }
+ }
+ //设置清除缓存数据
+ redisUtils.remove(RedisUtils.getIdKey(TestDataMainService.class.getName(),testDataMain.getId()));
+ //清除列表和页面缓存数据
+ redisUtils.removePattern(RedisUtils.getFindListKeyPattern(TestDataMainService.class.getName()));
+ redisUtils.removePattern(RedisUtils.getFinPageKeyPattern(TestDataMainService.class.getName()));
+ }
+
+ @Override
+ @Transactional(readOnly = false)
+ public void delete(TestDataMain testDataMain) {
+ //清除记录缓存数据
+ redisUtils.remove(RedisUtils.getIdKey(TestDataMainService.class.getName(),testDataMain.getId()));
+ //删除数据库记录
+ super.delete(testDataMain);
+ testDataChildDao.delete(new TestDataChild(testDataMain));
+ testDataChild2Dao.delete(new TestDataChild2(testDataMain));
+ testDataChild3Dao.delete(new TestDataChild3(testDataMain));
+ //清除列表和页面缓存数据
+ redisUtils.removePattern(RedisUtils.getFindListKeyPattern(TestDataMainService.class.getName()));
+ redisUtils.removePattern(RedisUtils.getFinPageKeyPattern(TestDataMainService.class.getName()));
+ }
+
+ @Override
+ @Transactional(readOnly = false)
+ public void deleteByLogic(TestDataMain testDataMain) {
+ //清除记录缓存数据
+ redisUtils.remove(RedisUtils.getIdKey(TestDataMainService.class.getName(),testDataMain.getId()));
+ //逻辑删除数据库记录
+ super.deleteByLogic(testDataMain);
+ testDataChildDao.deleteByLogic(new TestDataChild(testDataMain));
+ testDataChild2Dao.deleteByLogic(new TestDataChild2(testDataMain));
+ testDataChild3Dao.deleteByLogic(new TestDataChild3(testDataMain));
+ //清除列表和页面缓存数据
+ redisUtils.removePattern(RedisUtils.getFindListKeyPattern(TestDataMainService.class.getName()));
+ redisUtils.removePattern(RedisUtils.getFinPageKeyPattern(TestDataMainService.class.getName()));
+ }
+
+}
\ No newline at end of file
diff --git a/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/service/tree/TestTreeService.java b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/service/tree/TestTreeService.java
new file mode 100644
index 0000000..69089bc
--- /dev/null
+++ b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/service/tree/TestTreeService.java
@@ -0,0 +1,50 @@
+/**
+ * * Copyright © 2015-2020 JeeSpringCloud All rights reserved..
+ */
+package com.jeespring.modules.test.service.tree;
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.jeespring.common.service.TreeService;
+import com.jeespring.common.utils.StringUtils;
+import com.jeespring.modules.test.entity.tree.TestTree;
+import com.jeespring.modules.test.dao.tree.TestTreeDao;
+
+/**
+ * 树Service
+ * @author JeeSpring
+ * @version 2018-10-11
+ */
+@Service
+@Transactional(readOnly = true)
+public class TestTreeService extends TreeService {
+
+ @Override
+ public TestTree get(String id) {
+ return super.get(id);
+ }
+
+ @Override
+ public List findList(TestTree testTree) {
+ if (StringUtils.isNotBlank(testTree.getParentIds())){
+ testTree.setParentIds(","+testTree.getParentIds()+",");
+ }
+ return super.findList(testTree);
+ }
+
+ @Override
+ @Transactional(readOnly = false)
+ public void save(TestTree testTree) {
+ super.save(testTree);
+ }
+
+ @Override
+ @Transactional(readOnly = false)
+ public void delete(TestTree testTree) {
+ super.delete(testTree);
+ }
+
+}
\ No newline at end of file
diff --git a/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/web/one/FormLeaveController.java b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/web/one/FormLeaveController.java
new file mode 100644
index 0000000..77099f4
--- /dev/null
+++ b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/web/one/FormLeaveController.java
@@ -0,0 +1,293 @@
+/**
+ * * Copyright © 2015-2020 JeeSpringCloud All rights reserved..
+ */
+package com.jeespring.modules.test.web.one;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.google.common.collect.Lists;
+import com.jeespring.common.utils.DateUtils;
+import com.jeespring.common.config.Global;
+import com.jeespring.common.persistence.Page;
+import com.jeespring.common.web.AbstractBaseController;
+import com.jeespring.common.utils.StringUtils;
+import com.jeespring.common.utils.excel.ExportExcel;
+import com.jeespring.common.utils.excel.ImportExcel;
+import com.jeespring.modules.test.entity.one.FormLeave;
+import com.jeespring.modules.test.service.one.FormLeaveService;
+import com.jeespring.modules.test.service.one.IFormLeaveService;
+import com.alibaba.dubbo.config.annotation.Reference;
+
+/**
+ * 请假Controller
+ * @author JeeSpring
+ * @version 2018-10-12
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/test/one/formLeave")
+public class FormLeaveController extends AbstractBaseController {
+
+ //调用dubbo服务器是，要去Reference注解,注解Autowired
+ //@Reference(version = "1.0.0")
+ @Autowired
+ private IFormLeaveService formLeaveService;
+
+ @ModelAttribute
+ public FormLeave get(@RequestParam(required=false) String id) {
+ FormLeave entity = null;
+ if (StringUtils.isNotBlank(id)){
+ entity = formLeaveService.getCache(id);
+ //entity = formLeaveService.get(id);
+ }
+ if (entity == null){
+ entity = new FormLeave();
+ }
+ return entity;
+ }
+
+ /**
+ * 请假统计页面
+ */
+ @RequiresPermissions("test:one:formLeave:total")
+ @RequestMapping(value = {"total"})
+ public String totalView(FormLeave formLeave, HttpServletRequest request, HttpServletResponse response, Model model) {
+ total(formLeave,request,response,model);
+ return "modules/test/one/formLeaveTotal";
+ }
+ private void total(FormLeave formLeave, HttpServletRequest request, HttpServletResponse response, Model model) {
+ if(StringUtils.isEmpty(formLeave.getTotalType())){
+ formLeave.setTotalType("%Y-%m-%d");
+ }
+ //X轴的数据
+ List xAxisData= new ArrayList();
+ //Y轴的数据
+ Map> yAxisData = new HashMap>();
+ List countList = new ArrayList();
+ List sumList = new ArrayList();
+ if(formLeave.getOrderBy()==""){
+ formLeave.setOrderBy("totalDate");
+ }
+ List list = formLeaveService.totalCache(formLeave);
+ //List list = formLeaveService.total(formLeave);
+ model.addAttribute("list", list);
+ for(FormLeave formLeaveItem:list){
+ //x轴数据
+ xAxisData.add( formLeaveItem.getTotalDate());
+ countList.add(Double.valueOf(formLeaveItem.getTotalCount()));
+ }
+ yAxisData.put("数量", countList);
+ request.setAttribute("xAxisData", xAxisData);
+ request.setAttribute("yAxisData", yAxisData);
+ model.addAttribute("sumTotalCount", list.stream().mapToInt(FormLeave::getTotalCount).sum());
+
+ //饼图数据
+ Map orientData= new HashMap();
+ for(FormLeave formLeaveItem:list){
+ orientData.put(formLeaveItem.getTotalDate(), formLeaveItem.getTotalCount());
+ }
+ model.addAttribute("orientData", orientData);
+ }
+ @RequiresPermissions("test:one:formLeave:total")
+ @RequestMapping(value = {"totalMap"})
+ public String totalMap(FormLeave formLeave, HttpServletRequest request, HttpServletResponse response, Model model) {
+ if(StringUtils.isEmpty(formLeave.getTotalType())){
+ formLeave.setTotalType("%Y-%m-%d");
+ }
+ List list = formLeaveService.totalCache(formLeave);
+ //List list = formLeaveService.total(formLeave);
+ model.addAttribute("sumTotalCount", list.stream().mapToInt(FormLeave::getTotalCount).sum());
+ model.addAttribute("list", list);
+ return "modules/test/one/formLeaveTotalMap";
+ }
+
+ /**
+ * 请假列表页面
+ */
+ @RequiresPermissions("test:one:formLeave:list")
+ @RequestMapping(value = {"list", ""})
+ public String list(FormLeave formLeave, HttpServletRequest request, HttpServletResponse response, Model model) {
+ Page page = formLeaveService.findPageCache(new Page(request, response), formLeave);
+ //Page page = formLeaveService.findPage(new Page(request, response), formLeave);
+ model.addAttribute("page", page);
+ formLeave.setOrderBy("totalDate");
+ total(formLeave,request,response,model);
+ return "modules/test/one/formLeaveList";
+ }
+
+ /**
+ * 请假列表页面
+ */
+ @RequiresPermissions("test:one:formLeave:list")
+ @RequestMapping(value = {"listVue"})
+ public String listVue(FormLeave formLeave, HttpServletRequest request, HttpServletResponse response, Model model) {
+ Page page = formLeaveService.findPageCache(new Page(request, response), formLeave);
+ //Page page = formLeaveService.findPage(new Page(request, response), formLeave);
+ model.addAttribute("page", page);
+ return "modules/test/one/formLeaveListVue";
+ }
+
+ /**
+ * 请假列表页面
+ */
+ //RequiresPermissions("test:one:formLeave:select")
+ @RequestMapping(value = {"select"})
+ public String select(FormLeave formLeave, HttpServletRequest request, HttpServletResponse response, Model model) {
+ Page page = formLeaveService.findPageCache(new Page(request, response), formLeave);
+ //Page page = formLeaveService.findPage(new Page(request, response), formLeave);
+ model.addAttribute("page", page);
+ return "modules/test/one/formLeaveSelect";
+ }
+
+ /**
+ * 查看，增加，编辑请假表单页面
+ */
+ @RequiresPermissions(value={"test:one:formLeave:view","test:one:formLeave:add","test:one:formLeave:edit"},logical=Logical.OR)
+ @RequestMapping(value = "form")
+ public String form(FormLeave formLeave, Model model, HttpServletRequest request, HttpServletResponse response) {
+ model.addAttribute("action", request.getParameter("action"));
+ model.addAttribute("formLeave", formLeave);
+ if(request.getParameter("ViewFormType")!=null && "FormTwo".equals(request.getParameter("ViewFormType"))) {
+ return "modules/test/one/formLeaveFormTwo";
+ }
+ return "modules/test/one/formLeaveForm";
+ }
+
+ /**
+ * 保存请假
+ */
+ @RequiresPermissions(value={"test:one:formLeave:add","test:one:formLeave:edit"},logical=Logical.OR)
+ @RequestMapping(value = "save")
+ public String save(FormLeave formLeave, Model model, RedirectAttributes redirectAttributes, HttpServletRequest request, HttpServletResponse response) {
+ if (!beanValidator(model, formLeave)){
+ return form(formLeave, model,request,response);
+ }
+ formLeaveService.save(formLeave);
+ addMessage(redirectAttributes, "保存请假成功");
+ return "redirect:"+Global.getAdminPath()+"/test/one/formLeave/?repage";
+ }
+
+ /**
+ * 删除请假
+ */
+ @RequiresPermissions("test:one:formLeave:del")
+ @RequestMapping(value = "delete")
+ public String delete(FormLeave formLeave, RedirectAttributes redirectAttributes) {
+ formLeaveService.delete(formLeave);
+ addMessage(redirectAttributes, "删除请假成功");
+ return "redirect:"+Global.getAdminPath()+"/test/one/formLeave/?repage";
+ }
+
+ /**
+ * 删除请假（逻辑删除，更新del_flag字段为1,在表包含字段del_flag时，可以调用此方法，将数据隐藏）
+ */
+ @RequiresPermissions(value={"test:one:formLeave:del","test:one:formLeave:delByLogic"},logical=Logical.OR)
+ @RequestMapping(value = "deleteByLogic")
+ public String deleteByLogic(FormLeave formLeave, RedirectAttributes redirectAttributes) {
+ formLeaveService.deleteByLogic(formLeave);
+ addMessage(redirectAttributes, "逻辑删除请假成功");
+ return "redirect:"+Global.getAdminPath()+"/test/one/formLeave/?repage";
+ }
+
+ /**
+ * 批量删除请假
+ */
+ @RequiresPermissions("test:one:formLeave:del")
+ @RequestMapping(value = "deleteAll")
+ public String deleteAll(String ids, RedirectAttributes redirectAttributes) {
+ String[] idArray = ids.split(",");
+ for(String id : idArray){
+ formLeaveService.delete(formLeaveService.get(id));
+ }
+ addMessage(redirectAttributes, "删除请假成功");
+ return "redirect:"+Global.getAdminPath()+"/test/one/formLeave/?repage";
+ }
+
+ /**
+ * 批量删除请假（逻辑删除，更新del_flag字段为1,在表包含字段del_flag时，可以调用此方法，将数据隐藏）
+ */
+ @RequiresPermissions(value={"test:one:formLeave:del","test:one:formLeave:delByLogic"},logical=Logical.OR)
+ @RequestMapping(value = "deleteAllByLogic")
+ public String deleteAllByLogic(String ids, RedirectAttributes redirectAttributes) {
+ String[] idArray = ids.split(",");
+ for(String id : idArray){
+ formLeaveService.deleteByLogic(formLeaveService.get(id));
+ }
+ addMessage(redirectAttributes, "删除请假成功");
+ return "redirect:"+Global.getAdminPath()+"/test/one/formLeave/?repage";
+ }
+
+ /**
+ * 导出excel文件
+ */
+ @RequiresPermissions("test:one:formLeave:export")
+ @RequestMapping(value = "export", method=RequestMethod.POST)
+ public String exportFile(FormLeave formLeave, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
+ try {
+ String fileName = "请假"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
+ Page page = formLeaveService.findPage(new Page(request, response, -1), formLeave);
+ new ExportExcel("请假", FormLeave.class).setDataList(page.getList()).write(response, fileName).dispose();
+ return null;
+ } catch (Exception e) {
+ addMessage(redirectAttributes, "导出请假记录失败！失败信息："+e.getMessage());
+ }
+ return "redirect:"+Global.getAdminPath()+"/test/one/formLeave/?repage";
+ }
+
+ /**
+ * 导入Excel数据
+
+ */
+ @RequiresPermissions("test:one:formLeave:import")
+ @RequestMapping(value = "import", method=RequestMethod.POST)
+ public String importFile(MultipartFile file, RedirectAttributes redirectAttributes) {
+ try {
+ int successNum = 0;
+ ImportExcel ei = new ImportExcel(file, 1, 0);
+ List list = ei.getDataList(FormLeave.class);
+ for (FormLeave formLeave : list){
+ formLeaveService.save(formLeave);
+ }
+ addMessage(redirectAttributes, "已成功导入 "+successNum+" 条请假记录");
+ } catch (Exception e) {
+ addMessage(redirectAttributes, "导入请假失败！失败信息："+e.getMessage());
+ }
+ return "redirect:"+Global.getAdminPath()+"/test/one/formLeave/?repage";
+ }
+
+ /**
+ * 下载导入请假数据模板
+ */
+ @RequiresPermissions("test:one:formLeave:import")
+ @RequestMapping(value = "import/template")
+ public String importFileTemplate(HttpServletResponse response, RedirectAttributes redirectAttributes) {
+ try {
+ String fileName = "请假数据导入模板.xlsx";
+ List list = Lists.newArrayList();
+ new ExportExcel("请假数据", FormLeave.class, 1).setDataList(list).write(response, fileName).dispose();
+ return null;
+ } catch (Exception e) {
+ addMessage(redirectAttributes, "导入模板下载失败！失败信息："+e.getMessage());
+ }
+ return "redirect:"+Global.getAdminPath()+"/test/one/formLeave/?repage";
+ }
+
+
+}
\ No newline at end of file
diff --git a/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/web/onetomany/TestDataMainController.java b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/web/onetomany/TestDataMainController.java
new file mode 100644
index 0000000..100ff1c
--- /dev/null
+++ b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/web/onetomany/TestDataMainController.java
@@ -0,0 +1,293 @@
+/**
+ * * Copyright © 2015-2020 JeeSpringCloud All rights reserved..
+ */
+package com.jeespring.modules.test.web.onetomany;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.google.common.collect.Lists;
+import com.jeespring.common.utils.DateUtils;
+import com.jeespring.common.config.Global;
+import com.jeespring.common.persistence.Page;
+import com.jeespring.common.web.AbstractBaseController;
+import com.jeespring.common.utils.StringUtils;
+import com.jeespring.common.utils.excel.ExportExcel;
+import com.jeespring.common.utils.excel.ImportExcel;
+import com.jeespring.modules.test.entity.onetomany.TestDataMain;
+import com.jeespring.modules.test.service.onetomany.TestDataMainService;
+import com.jeespring.modules.test.service.onetomany.ITestDataMainService;
+import com.alibaba.dubbo.config.annotation.Reference;
+
+/**
+ * 订票Controller
+ * @author JeeSpring
+ * @version 2018-10-12
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/test/onetomany/testDataMain")
+public class TestDataMainController extends AbstractBaseController {
+
+ //调用dubbo服务器是，要去Reference注解,注解Autowired
+ //@Reference(version = "1.0.0")
+ @Autowired
+ private ITestDataMainService testDataMainService;
+
+ @ModelAttribute
+ public TestDataMain get(@RequestParam(required=false) String id) {
+ TestDataMain entity = null;
+ if (StringUtils.isNotBlank(id)){
+ entity = testDataMainService.getCache(id);
+ //entity = testDataMainService.get(id);
+ }
+ if (entity == null){
+ entity = new TestDataMain();
+ }
+ return entity;
+ }
+
+ /**
+ * 订票统计页面
+ */
+ @RequiresPermissions("test:onetomany:testDataMain:total")
+ @RequestMapping(value = {"total"})
+ public String totalView(TestDataMain testDataMain, HttpServletRequest request, HttpServletResponse response, Model model) {
+ total(testDataMain,request,response,model);
+ return "modules/test/onetomany/testDataMainTotal";
+ }
+ private void total(TestDataMain testDataMain, HttpServletRequest request, HttpServletResponse response, Model model) {
+ if(StringUtils.isEmpty(testDataMain.getTotalType())){
+ testDataMain.setTotalType("%Y-%m-%d");
+ }
+ //X轴的数据
+ List xAxisData= new ArrayList();
+ //Y轴的数据
+ Map> yAxisData = new HashMap>();
+ List countList = new ArrayList();
+ List sumList = new ArrayList();
+ if(testDataMain.getOrderBy()==""){
+ testDataMain.setOrderBy("totalDate");
+ }
+ List list = testDataMainService.totalCache(testDataMain);
+ //List list = testDataMainService.total(testDataMain);
+ model.addAttribute("list", list);
+ for(TestDataMain testDataMainItem:list){
+ //x轴数据
+ xAxisData.add( testDataMainItem.getTotalDate());
+ countList.add(Double.valueOf(testDataMainItem.getTotalCount()));
+ }
+ yAxisData.put("数量", countList);
+ request.setAttribute("xAxisData", xAxisData);
+ request.setAttribute("yAxisData", yAxisData);
+ model.addAttribute("sumTotalCount", list.stream().mapToInt(TestDataMain::getTotalCount).sum());
+
+ //饼图数据
+ Map orientData= new HashMap();
+ for(TestDataMain testDataMainItem:list){
+ orientData.put(testDataMainItem.getTotalDate(), testDataMainItem.getTotalCount());
+ }
+ model.addAttribute("orientData", orientData);
+ }
+ @RequiresPermissions("test:onetomany:testDataMain:total")
+ @RequestMapping(value = {"totalMap"})
+ public String totalMap(TestDataMain testDataMain, HttpServletRequest request, HttpServletResponse response, Model model) {
+ if(StringUtils.isEmpty(testDataMain.getTotalType())){
+ testDataMain.setTotalType("%Y-%m-%d");
+ }
+ List list = testDataMainService.totalCache(testDataMain);
+ //List list = testDataMainService.total(testDataMain);
+ model.addAttribute("sumTotalCount", list.stream().mapToInt(TestDataMain::getTotalCount).sum());
+ model.addAttribute("list", list);
+ return "modules/test/onetomany/testDataMainTotalMap";
+ }
+
+ /**
+ * 订票列表页面
+ */
+ @RequiresPermissions("test:onetomany:testDataMain:list")
+ @RequestMapping(value = {"list", ""})
+ public String list(TestDataMain testDataMain, HttpServletRequest request, HttpServletResponse response, Model model) {
+ Page page = testDataMainService.findPageCache(new Page(request, response), testDataMain);
+ //Page page = testDataMainService.findPage(new Page(request, response), testDataMain);
+ model.addAttribute("page", page);
+ testDataMain.setOrderBy("totalDate");
+ total(testDataMain,request,response,model);
+ return "modules/test/onetomany/testDataMainList";
+ }
+
+ /**
+ * 订票列表页面
+ */
+ @RequiresPermissions("test:onetomany:testDataMain:list")
+ @RequestMapping(value = {"listVue"})
+ public String listVue(TestDataMain testDataMain, HttpServletRequest request, HttpServletResponse response, Model model) {
+ Page page = testDataMainService.findPageCache(new Page(request, response), testDataMain);
+ //Page page = testDataMainService.findPage(new Page(request, response), testDataMain);
+ model.addAttribute("page", page);
+ return "modules/test/onetomany/testDataMainListVue";
+ }
+
+ /**
+ * 订票列表页面
+ */
+ //RequiresPermissions("test:onetomany:testDataMain:select")
+ @RequestMapping(value = {"select"})
+ public String select(TestDataMain testDataMain, HttpServletRequest request, HttpServletResponse response, Model model) {
+ Page page = testDataMainService.findPageCache(new Page(request, response), testDataMain);
+ //Page page = testDataMainService.findPage(new Page(request, response), testDataMain);
+ model.addAttribute("page", page);
+ return "modules/test/onetomany/testDataMainSelect";
+ }
+
+ /**
+ * 查看，增加，编辑订票表单页面
+ */
+ @RequiresPermissions(value={"test:onetomany:testDataMain:view","test:onetomany:testDataMain:add","test:onetomany:testDataMain:edit"},logical=Logical.OR)
+ @RequestMapping(value = "form")
+ public String form(TestDataMain testDataMain, Model model, HttpServletRequest request, HttpServletResponse response) {
+ model.addAttribute("action", request.getParameter("action"));
+ model.addAttribute("testDataMain", testDataMain);
+ if(request.getParameter("ViewFormType")!=null && "FormTwo".equals(request.getParameter("ViewFormType"))) {
+ return "modules/test/onetomany/testDataMainFormTwo";
+ }
+ return "modules/test/onetomany/testDataMainForm";
+ }
+
+ /**
+ * 保存订票
+ */
+ @RequiresPermissions(value={"test:onetomany:testDataMain:add","test:onetomany:testDataMain:edit"},logical=Logical.OR)
+ @RequestMapping(value = "save")
+ public String save(TestDataMain testDataMain, Model model, RedirectAttributes redirectAttributes, HttpServletRequest request, HttpServletResponse response) {
+ if (!beanValidator(model, testDataMain)){
+ return form(testDataMain, model,request,response);
+ }
+ testDataMainService.save(testDataMain);
+ addMessage(redirectAttributes, "保存订票成功");
+ return "redirect:"+Global.getAdminPath()+"/test/onetomany/testDataMain/?repage";
+ }
+
+ /**
+ * 删除订票
+ */
+ @RequiresPermissions("test:onetomany:testDataMain:del")
+ @RequestMapping(value = "delete")
+ public String delete(TestDataMain testDataMain, RedirectAttributes redirectAttributes) {
+ testDataMainService.delete(testDataMain);
+ addMessage(redirectAttributes, "删除订票成功");
+ return "redirect:"+Global.getAdminPath()+"/test/onetomany/testDataMain/?repage";
+ }
+
+ /**
+ * 删除订票（逻辑删除，更新del_flag字段为1,在表包含字段del_flag时，可以调用此方法，将数据隐藏）
+ */
+ @RequiresPermissions(value={"test:onetomany:testDataMain:del","test:onetomany:testDataMain:delByLogic"},logical=Logical.OR)
+ @RequestMapping(value = "deleteByLogic")
+ public String deleteByLogic(TestDataMain testDataMain, RedirectAttributes redirectAttributes) {
+ testDataMainService.deleteByLogic(testDataMain);
+ addMessage(redirectAttributes, "逻辑删除订票成功");
+ return "redirect:"+Global.getAdminPath()+"/test/onetomany/testDataMain/?repage";
+ }
+
+ /**
+ * 批量删除订票
+ */
+ @RequiresPermissions("test:onetomany:testDataMain:del")
+ @RequestMapping(value = "deleteAll")
+ public String deleteAll(String ids, RedirectAttributes redirectAttributes) {
+ String[] idArray = ids.split(",");
+ for(String id : idArray){
+ testDataMainService.delete(testDataMainService.get(id));
+ }
+ addMessage(redirectAttributes, "删除订票成功");
+ return "redirect:"+Global.getAdminPath()+"/test/onetomany/testDataMain/?repage";
+ }
+
+ /**
+ * 批量删除订票（逻辑删除，更新del_flag字段为1,在表包含字段del_flag时，可以调用此方法，将数据隐藏）
+ */
+ @RequiresPermissions(value={"test:onetomany:testDataMain:del","test:onetomany:testDataMain:delByLogic"},logical=Logical.OR)
+ @RequestMapping(value = "deleteAllByLogic")
+ public String deleteAllByLogic(String ids, RedirectAttributes redirectAttributes) {
+ String[] idArray = ids.split(",");
+ for(String id : idArray){
+ testDataMainService.deleteByLogic(testDataMainService.get(id));
+ }
+ addMessage(redirectAttributes, "删除订票成功");
+ return "redirect:"+Global.getAdminPath()+"/test/onetomany/testDataMain/?repage";
+ }
+
+ /**
+ * 导出excel文件
+ */
+ @RequiresPermissions("test:onetomany:testDataMain:export")
+ @RequestMapping(value = "export", method=RequestMethod.POST)
+ public String exportFile(TestDataMain testDataMain, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
+ try {
+ String fileName = "订票"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
+ Page page = testDataMainService.findPage(new Page(request, response, -1), testDataMain);
+ new ExportExcel("订票", TestDataMain.class).setDataList(page.getList()).write(response, fileName).dispose();
+ return null;
+ } catch (Exception e) {
+ addMessage(redirectAttributes, "导出订票记录失败！失败信息："+e.getMessage());
+ }
+ return "redirect:"+Global.getAdminPath()+"/test/onetomany/testDataMain/?repage";
+ }
+
+ /**
+ * 导入Excel数据
+
+ */
+ @RequiresPermissions("test:onetomany:testDataMain:import")
+ @RequestMapping(value = "import", method=RequestMethod.POST)
+ public String importFile(MultipartFile file, RedirectAttributes redirectAttributes) {
+ try {
+ int successNum = 0;
+ ImportExcel ei = new ImportExcel(file, 1, 0);
+ List list = ei.getDataList(TestDataMain.class);
+ for (TestDataMain testDataMain : list){
+ testDataMainService.save(testDataMain);
+ }
+ addMessage(redirectAttributes, "已成功导入 "+successNum+" 条订票记录");
+ } catch (Exception e) {
+ addMessage(redirectAttributes, "导入订票失败！失败信息："+e.getMessage());
+ }
+ return "redirect:"+Global.getAdminPath()+"/test/onetomany/testDataMain/?repage";
+ }
+
+ /**
+ * 下载导入订票数据模板
+ */
+ @RequiresPermissions("test:onetomany:testDataMain:import")
+ @RequestMapping(value = "import/template")
+ public String importFileTemplate(HttpServletResponse response, RedirectAttributes redirectAttributes) {
+ try {
+ String fileName = "订票数据导入模板.xlsx";
+ List list = Lists.newArrayList();
+ new ExportExcel("订票数据", TestDataMain.class, 1).setDataList(list).write(response, fileName).dispose();
+ return null;
+ } catch (Exception e) {
+ addMessage(redirectAttributes, "导入模板下载失败！失败信息："+e.getMessage());
+ }
+ return "redirect:"+Global.getAdminPath()+"/test/onetomany/testDataMain/?repage";
+ }
+
+
+}
\ No newline at end of file
diff --git a/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/web/tree/TestTreeController.java b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/web/tree/TestTreeController.java
new file mode 100644
index 0000000..004d8d5
--- /dev/null
+++ b/JeeSpringCloud/jeespring-web/src/main/java/com/jeespring/modules/test/web/tree/TestTreeController.java
@@ -0,0 +1,138 @@
+/**
+ * * Copyright © 2015-2020 JeeSpringCloud All rights reserved..
+ */
+package com.jeespring.modules.test.web.tree;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.jeespring.common.config.Global;
+import com.jeespring.common.web.AbstractBaseController;
+import com.jeespring.common.utils.StringUtils;
+import com.jeespring.modules.test.entity.tree.TestTree;
+import com.jeespring.modules.test.service.tree.TestTreeService;
+
+/**
+ * 树Controller
+ * @author JeeSpring
+ * @version 2018-10-11
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/test/tree/testTree")
+public class TestTreeController extends AbstractBaseController {
+
+ @Autowired
+ private TestTreeService testTreeService;
+
+ @ModelAttribute
+ public TestTree get(@RequestParam(required=false) String id) {
+ TestTree entity = null;
+ if (StringUtils.isNotBlank(id)){
+ entity = testTreeService.get(id);
+ }
+ if (entity == null){
+ entity = new TestTree();
+ }
+ return entity;
+ }
+
+ /**
+ * 树列表页面
+ */
+ //@RequiresPermissions("test:tree:testTree:list")
+ @RequestMapping(value = {"list", ""})
+ public String list(TestTree testTree, HttpServletRequest request, HttpServletResponse response, Model model) {
+ List list = testTreeService.findList(testTree);
+ model.addAttribute("list", list);
+ return "modules/test/tree/testTreeList";
+ }
+
+ /**
+ * 查看，增加，编辑树表单页面
+ */
+ //@RequiresPermissions(value={"test:tree:testTree:view","test:tree:testTree:add","test:tree:testTree:edit"},logical=Logical.OR)
+ @RequestMapping(value = "form")
+ public String form(TestTree testTree, Model model) {
+ if (testTree.getParent()!=null && StringUtils.isNotBlank(testTree.getParent().getId())){
+ testTree.setParent(testTreeService.get(testTree.getParent().getId()));
+ // 获取排序号，最末节点排序号+30
+ if (StringUtils.isBlank(testTree.getId())){
+ TestTree testTreeChild = new TestTree();
+ testTreeChild.setParent(new TestTree(testTree.getParent().getId()));
+ List list = testTreeService.findList(testTree);
+ if (list.size() > 0){
+ testTree.setSort(list.get(list.size()-1).getSort());
+ if (testTree.getSort() != null){
+ testTree.setSort(testTree.getSort() + 30);
+ }
+ }
+ }
+ }
+ if (testTree.getSort() == null){
+ testTree.setSort(30);
+ }
+ model.addAttribute("testTree", testTree);
+ return "modules/test/tree/testTreeForm";
+ }
+
+ /**
+ * 保存树
+ */
+ //@RequiresPermissions(value={"test:tree:testTree:add","test:tree:testTree:edit"},logical=Logical.OR)
+ @RequestMapping(value = "save")
+ public String save(TestTree testTree, Model model, RedirectAttributes redirectAttributes) {
+ if (!beanValidator(model, testTree)){
+ return form(testTree, model);
+ }
+ testTreeService.save(testTree);
+ addMessage(redirectAttributes, "保存树成功");
+ return "redirect:"+Global.getAdminPath()+"/test/tree/testTree/?repage";
+ }
+
+ /**
+ * 删除树
+ */
+ //@RequiresPermissions("test:tree:testTree:del")
+ @RequestMapping(value = "delete")
+ public String delete(TestTree testTree, RedirectAttributes redirectAttributes) {
+ testTreeService.delete(testTree);
+ addMessage(redirectAttributes, "删除树成功");
+ return "redirect:"+Global.getAdminPath()+"/test/tree/testTree/?repage";
+ }
+
+ //@RequiresPermissions("user")
+ @ResponseBody
+ @RequestMapping(value = "treeData")
+ public List> treeData(@RequestParam(required=false) String extId, HttpServletResponse response) {
+ List> mapList = Lists.newArrayList();
+ List list = testTreeService.findList(new TestTree());
+ for (int i=0; i map = Maps.newHashMap();
+ map.put("id", e.getId());
+ map.put("pId", e.getParentId());
+ map.put("name", e.getName());
+ mapList.add(map);
+ }
+ }
+ return mapList;
+ }
+
+}
\ No newline at end of file
diff --git a/JeeSpringCloud/jeespring-web/src/main/resources/act/build.xml b/JeeSpringCloud/jeespring-web/src/main/resources/act/build.xml
new file mode 100644
index 0000000..eb9a020
--- /dev/null
+++ b/JeeSpringCloud/jeespring-web/src/main/resources/act/build.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+ Activiti打包程序，请输入命令后操作！
+
+
+
+
+ 打包流程定义：请假流程
+
+
+
+
+
+
+
+ 打包流程定义：测试审核流程
+
+
+
+
+
+
diff --git a/JeeSpringCloud/jeespring-web/src/main/resources/act/deployments/oa/test_audit/test_audit.bar b/JeeSpringCloud/jeespring-web/src/main/resources/act/deployments/oa/test_audit/test_audit.bar
new file mode 100644
index 0000000000000000000000000000000000000000..86a542df1959f81e036ba499b7135d0fd77e7a7f
GIT binary patch
literal 21268
zcmV)FK)=6GO9KQ7000OG0E}6ZM#nRdBDV+t04Fg302KfL0CZ(@bYEe0WNCCRVsLG4
zGB7T9ZEVe3|BD;f5&yl=|3MW2|MX7p`+IxbIqdG+Ev0s18W#c~92;q^6S|)+udGDZW54N$o=Z8Q-1#UvyT|N~>FG^>o&e1OITlnwj^R&&->d
zeY@Ux^#x-)CKwCKYu8^l!L{m8XZ@hxn$p{6
z12u{PhQ1tUXrEZVZ&)>F%~O$@K3=%NCmXMWzQr
zjrx2wV{%Gs2ZZrtxi^=a`b%96OBR3WOB%0{=>slzIjR%5f8-rkD#8m**SX@ix`>dE5|Pal4E
z{OG~S@Be%9__OCnUkvY5E3JNT5ZCvT=$##qOL}|p&>)zE;PsN=cHB+|RtJ}v!Q;C}
z$DckN8mv|_Q0s%#ijq!mvl?}~JBPWSZgqOQzl;wztF=xv0Pdy$Yw7K3En6~fHzo_h
zMYi1O(?6el{g=^lW9hwq+`Ad|-yKNrLayIB9OL`^tK;wf{`|{-z4-XwClCI1`sAO_
zet2|pFOM~Xm^9ll2*2{)0POp7EKe~xH2LiNr>Bn|9DnjPK$>YX*>1JpZN_=m4(dC5
z{nqXH=TQ>xM~6dBTMgt>?Rg@U2oq)y7YZYfGm0efn8rQ{xeUvY(G1#)`*)7-fAj3g
zljBeCKY#qu$&bASE*WswF3pah&C7l(kCi`boM7ELK+I?%XOYNg-V>(%35#kVFd4)?_1
z*78t_q_I-cjz75r;eGMVo#Uhbt%f?ls)a`la$L#~r%WQxV1ta(+IMBZaKIN($BgG2
zDG3saV#K+|NE0EE;@S%^RU!<+B6X}l-EvTh)bVNRPCj^g`t(nyckdL6!MTWHpbxKi`brJHywS2gn6|M=t2PyhI>CAyjXV`@C=8V3;uyOR?~
z12Sz8r7jahI)(_p$UiUeznq6Np-|UTJ|-^c1Oei%>m%*!5QQ=z4ig?Tt|~$)AX%>R
z%uY%f2<&SQNniP?Ga7k76bd}o91VFJiR0x4qB@H&)w+6^bu%RdTySZ#(pAESX|
zm3-jy@iDiULQ62P8zu6Y)`)9gBCT+Mu%n=s5k>-cQNt!O?K=_!k3KYP23y@xPq?TC)Nu3bwj-q32V~Ai`Ap$Wu@We5k)zQbCPkWf{M8gh#W-WzBdE
zGe8h>7ltPad}tV`T+gQn2ZK%(NX_)PSO4x0CtrShdhb8akG?AqV-=fX$-b<-xJqaT
zYmT@~D_a=2a7%HNj+fXNpBP$N8Lei^0v+tq@)5d{XbJV5DQJ1zV3-yJ;fOje_dE^z
zn#!`uxHKP^r!vkiX(Am=LXKGAfImjV4hmtKCZS|*7!XOdQ^v>Ao%53O!G!O_p7#;K
zQbCD_!Paqzk9L-
zjoRq6YIrp~>|0OI^h_&i_M+VZL%Hj%+=*6ZHm7xCCu+x)^hU4~@5b$9`UosDHV~U(
zYTDQv+fnz7vC%V2W@jL=HM}`C0Y(OgkLzA%uifZZw&PZF8*~|7g8=Ne8p(EcaghCS
zxLKuKtWD;gl$x_pY(WmvZyMrMtmgrwItOrg0RSB(MhKaZD?*q}hSMO=7K3>>MII-?
zbOe-QX9Se6RZ)2+Z-zL}q|98HDhJb%Ba{SZbi!lonpg=+`;qoc;@avh^p)pxn`gOA
z`6RjVDkDN?hJ-H0sqs|mjDeC2C}XPvYCkU(gJPw3&Y&#AP$avUpx8~0#h_T}oiiv(UO-SL1LB#u6ptB~42|X&
z6B@h0vKSgGy_fDR=bM^>MsrpYTD@1vJWXwES*x9Ow6(q;9dyV>erT
zQZ7_Us8fVXxNr9mQgGi&t=u1~Gxw!f?7gF%b4i!ZuS;@ecj8vy%1UhkS9}?+h+yZE
zE*(yn9jX+oij7*iKT6MQU<<^FZNWt0EEWCSW55cdZ})nl;J%gGg3Ua4)L$U}BUVbguTTnX
zS*a~(6mz3LTU=g5rL_Crq}Wz%)D|TFysbZbrkWi1t*}zqedAE@-b!sj<(s(AZ3^XB
z94hh3+_(D{q2RuinzcX7Vxpdi>yii6CB3(MEmiQ|N^QZz)ZDH=TU=el&bNDOTMWL9
z+JY{rmTD6d@gK2G*nKNgoG5M7tSg0Hs#27mU*+7Nx<7cQH+rd9e2)k}Y}9i9Z=1PTBE2nYalZjnW0dO(+HNdN#FQ~&@D0001VWpi|2VRd9_bS`jiXT-Y;IMe+f
zH%`(?I^5k-36;APA#wz0dY|8)_r5*7X{0B-D_)NcDzkJawpl^mO6k^6q=5kHnJwxN1a`7e0Zc`2qIt#58
z!=H;P$KQVUt-!$cS^g~xi`-)!Le>f&jvZ2ba$xUH(Y^LNK83vsf0=Mu{`$6|KkQ#9
zf->K1y7H<0fc@cN7EGI>K7Qux+v`f#-?ZES5*vmYjW(?|O5+@DA8nu3B*mS4|NT!G
zEqk{D|N6&d+1k?%D}p~h9~sP7XwffOjT$<>{`8$sf;*-uUTz?@%~xQJ@FkGo?+Rc4
z7-sQTX}ei}HzV0&ee*-Na)4`AZ@ci?mkVN_#cJIvcligcKdW*_X=RC{^U^1`tRKrr
zm}#xjT7P7cT_%w6gdMv63Rt!_8
z9D}eMJ5&k&m-ZNz;<7LWgmN&6KpS0`EQi#Ug)Ym|>;d&NW_8Z?{E+GIk09PMk9S!Z
zJWXHBXGiy;jMN14
z`(1}o^>6)(t)KyceHmrxG3cyJxdHd3WZH$Ek31G(PJcn0kJQyfAD$}1!s*~AQk;2UxxUa)qJG|TJ+1i9yrcC1Qcv0`$i&?m|AUgz~o5tp33Q=wZ~FQk2O-
z1}v%SKevgfUq}dXOe8lNS6={B_4m1L?f31E)B4I(
zpMZlOvnFXLVVFFDA57jk1|0M})^v1M{hfucGC7%Cz4oB(MpvRwAn(D9@;Qyba}yID
zU#G9`T4SjfWdS7M!}eWIDAlgsdAHMdE9OapK*m~#)y8V)M8Wx`W4;~VCR
zjvKmd=NVsblHt1EzU+R$A8zDP73);K#)*CO%!eKw{u3!viHhFqnBrN7Ez*F*lDNS+N8@34SY>{2t
z7th>Pt!a|XG_yQ{dCPk^!G2k}mr
z;ySS?N_fkGH