From b7c179457c61a2a23044f602f1cc5a238ea636cb Mon Sep 17 00:00:00 2001 From: limqhz Date: Sun, 23 May 2021 20:45:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E5=AE=9A=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sv/netty/config/OrderTools.java | 56 ++++++++++++++++++- .../controller/AppVenueLessonController.java | 18 +++++- 2 files changed, 70 insertions(+), 4 deletions(-) diff --git a/api/src/main/java/com/sv/netty/config/OrderTools.java b/api/src/main/java/com/sv/netty/config/OrderTools.java index 28ef79f..c7e8e11 100644 --- a/api/src/main/java/com/sv/netty/config/OrderTools.java +++ b/api/src/main/java/com/sv/netty/config/OrderTools.java @@ -1,8 +1,60 @@ package com.sv.netty.config; public interface OrderTools { - String JS = "(function(global){var Timetables=function(option){this.el=document.querySelector(option.el);this.Timetables=option.timetables||[];this.week=option.week||[];this.merge=typeof option.merge===\"boolean\"?option.merge:true;this.TimetableType=option.timetableType||[];this.leftHandText=[];this.highlightWeek=option.highlightWeek||\"\";this.gridOnClick=typeof option.gridOnClick===\"function\"?option.gridOnClick:undefined;var styles=option.styles||{};this.leftHandWidth=styles.leftHandWidth||40;this.Gheight=styles.Gheight||48;this.defaultPalette=[\"#f05261\",\"#48a8e4\",\"#ffd061\",\"#52db9a\",\"#70d3e6\",\"#52db9a\",\"#3f51b5\",\"#f3d147\",\"#4adbc3\",\"#673ab7\",\"#f3db49\",\"#76bfcd\",\"#b495e1\",\"#ff9800\",\"#8bc34a\"];this.palette=(typeof styles.palette===\"boolean\"&&!styles.palett)?false:(styles.palette||[]).concat(this.defaultPalette);this._init()};Timetables.prototype={_init:function(option){var option=option||{};var style=option.styles||{};var gridOnClick=option.gridOnClick||this.gridOnClick;var merge=typeof option.merge===\"boolean\"?option.merge:this.merge;var highlightWeek=option.highlightWeek||this.highlightWeek;var leftHandText=this.leftHandText;var leftHandWidth=style.leftHandWidth||this.leftHandWidth;var Gheight=style.Gheight||this.Gheight;var palette;if(typeof style.palette===\"boolean\"&&!style.palette){palette=false}else{palette=style.palette?(style.palette||[]).concat(this.defaultPalette):this.palette}var Timetables=option.timetables||this.Timetables;var week=option.week||this.week;var TimetableType=JSON.parse(JSON.stringify(option.timetableType||this.TimetableType));var deepCopyTimetableType=option.timetableType||this.TimetableType;var TimetableTypeLength=TimetableType.length;Timetables.forEach(function(item,index){if(item.lengthweek.length-1){return}var courseItem=document.createElement(\"li\");courseItem.style.cssFloat=\"left\";courseItem.style.width=100/week.length+\"%\";courseItem.style.height=Gheight+\"px\";courseItem.style.boxSizing=\"border-box\";courseItem.style.position=\"relative\";if(merge&&listMerge[i][index].length>1){var mergeDom=document.createElement(\"span\");mergeDom.style.position=\"absolute\";mergeDom.style.zIndex=9;mergeDom.style.width=\"100%\";mergeDom.style.height=Gheight*listMerge[i][index].length+\"px\";mergeDom.style.left=0;mergeDom.style.top=0;if(palette){mergeDom.style.backgroundColor=palette[paletteIndex];mergeDom.style.color=\"#fff\";paletteIndex++;if(paletteIndex>palette.length){paletteIndex=0}}mergeDom.innerText=listMerge[i][index].name;mergeDom.className=\"course-hasContent\";courseItem.appendChild(mergeDom)}else{if(merge&&listMerge[i][index].length===0){courseItem.innerText=\"\"\n" + - " }else{if(item&&palette){courseItem.style.backgroundColor=palette[paletteIndex];courseItem.style.color=\"#fff\";paletteIndex++;if(paletteIndex>palette.length){paletteIndex=0}}else{if(item){courseItem.className=\"course-hasContent\"}}courseItem.innerText=item||\"\"}}courseItem.onclick=function(e){var allList=document.querySelectorAll(\".Courses-content ul li\").forEach(function(v,i){v.classList.remove(\"grid-active\")});this.className=\"grid-active\";var info={name:item,week:week[i],index:index+1,length:merge?listMerge[i][index].length:1};gridOnClick&&gridOnClick(info)};courseItems.appendChild(courseItem)});courseListContent.appendChild(courseItems)});courseWrapper.appendChild(courseListContent);courseWrapper.appendChild(leftHand);this.el.appendChild(courseWrapper);var courseItemDomHeight=(document.querySelector(\".stage_1 li\")||document.querySelector(\".stage_none li\")).offsetHeight;var coursesHeadDomHeight=document.querySelector(\".Courses-head\").offsetHeight;var leftHandTextDom=document.createElement(\"div\");leftHandTextDom.className=\"left-hand-TextDom\";leftHandTextDom.style.height=coursesHeadDomHeight+\"px\";leftHandTextDom.style.boxSizing=\"border-box\";leftHandText.forEach(function(item){var leftHandTextItem=document.createElement(\"div\");leftHandTextItem.innerText=item;leftHandTextDom.appendChild(leftHandTextItem)});leftHand.appendChild(leftHandTextDom);deepCopyTimetableType.forEach(function(item,index){var handItem=document.createElement(\"div\");handItem.style.width=\"100%\";handItem.style.height=courseItemDomHeight*item[1]+\"px\";handItem.style.boxSizing=\"border-box\";if(typeof item[0]===\"object\"){for(var v in item[0]){var handItemInner=document.createElement(\"p\");handItemInner.innerText=item[0][v];handItemInner.style.margin=\"0px\";handItemInner.className=\"left-hand-\"+v;handItem.appendChild(handItemInner)}}else{handItem.innerText=item[0]||\"\"}handItem.className=\"left-hand-\"+(index+1);leftHand.appendChild(handItem)})},setOption:function(option){(option||{}).setNewOption=true;this._init(option)}};if(typeof module!==\"undefined\"&&module.exports){module.exports=Timetables}if(typeof define===\"function\"){define(function(){return Timetables})}global.Timetables=Timetables})(this);"; + String JS = "(function (global) {\n" + + " var Timetables = function (option) { this.el = document.querySelector(option.el); this.Timetables = option.timetables || []; this.week = option.week || []; this.merge = typeof option.merge === \"boolean\" ? option.merge : true; \n" + + " this.TimetableType = option.timetableType || []; this.leftHandText = []; this.highlightWeek = option.highlightWeek || \"\"; this.gridOnClick = typeof option.gridOnClick === \"function\" ? option.gridOnClick : undefined; var styles = option.styles || {}; this.leftHandWidth = styles.leftHandWidth || 40; this.Gheight = styles.Gheight || 48; this._init() }; \n" + + " Timetables.prototype = {\n" + + " _init: function (option) {\n" + + " var option = option || {}; \n" + + " var style = option.styles || {}; \n" + + " var gridOnClick = option.gridOnClick || this.gridOnClick; \n" + + " var merge = typeof option.merge === \"boolean\" ? option.merge : this.merge; var highlightWeek = option.highlightWeek || this.highlightWeek; \n" + + " var leftHandText = this.leftHandText; \n" + + " var leftHandWidth = style.leftHandWidth || this.leftHandWidth; \n" + + " var Gheight = style.Gheight || this.Gheight; var palette; \n" + + " var Timetables = option.timetables || this.Timetables; var week = option.week || this.week; var TimetableType = JSON.parse(JSON.stringify(option.timetableType || this.TimetableType)); \n" + + " console.log(Timetables);\n" + + " var deepCopyTimetableType = option.timetableType || this.TimetableType; \n" + + " var TimetableTypeLength = TimetableType.length; \n" + + " Timetables.forEach(function (item, index) { \n" + + " if (item.length < TimetableTypeLength) { \n" + + " for (var i = 0; i < TimetableTypeLength - item.length; i++) { \n" + + " item.push(\"\") \n" + + " } \n" + + " } \n" + + " }); \n" + + " if (option.setNewOption) { this.el.removeChild(this.el.childNodes[0]) } \n" + + " var courseWrapper = document.createElement(\"div\"); \n" + + " courseWrapper.id = \"courseWrapper\"; \n" + + " courseWrapper.style.position = \"relative\"; \n" + + " courseWrapper.style.paddingLeft = leftHandWidth + \"px\"; \n" + + " courseWrapper.style.border = \"1px solid #dbdbdb\"; \n" + + " TimetableType.forEach(function (item, index) { item.unshift(index + 1) }); \n" + + " var leftHand = document.createElement(\"div\"); leftHand.className = \"Courses-leftHand\"; leftHand.style.position = \"absolute\"; leftHand.style.left = 0; leftHand.style.top = 0; leftHand.style.width = leftHandWidth + \"px\"; \n" + + " var timetable = Timetables[0].map(function (v, i) { return [] }); \n" + + " timetable.forEach(function (item, index) { Timetables.forEach(function (val, i) { timetable[index].push(val[index]) }) }); \n" + + " var listMerge = []; if (merge) { \n" + + " Timetables.forEach(function (list, i) { if (!listMerge[i]) { listMerge[i] = [] } \n" + + " list.forEach(function (item, index) { if (!index) {\n" + + " return listMerge[i].push({ name: item, length: 1 }) \n" + + " } if (item === (listMerge[i][index - 1] || {}).name && item) { \n" + + " var sameIndex = (listMerge[i][index - 1] || {}).sameIndex; if (sameIndex || sameIndex === 0) { listMerge[i][sameIndex].length++; return listMerge[i].push({ name: item, length: 0, sameIndex: sameIndex }) } listMerge[i][index - 1].length++; return listMerge[i].push({ name: item, length: 0, sameIndex: index - 1 }) }\n" + + " else { return listMerge[i].push({ name: item, length: 1 }) } }) }) } var head = document.createElement(\"div\"); head.style.overflow = \"hidden\"; head.className = \"Courses-head\"; \n" + + " week.forEach(function (item, index) { var weekItem = document.createElement(\"div\"); var highlightClass = highlightWeek === (index + 1) ? \"highlight-week \" : \"\"; weekItem.className = highlightClass + \"Courses-head-\" + (index + 1); weekItem.innerText = item; weekItem.style.cssFloat = \"left\"; weekItem.style.boxSizing = \"border-box\"; weekItem.style.whiteSpace = \"nowrap\"; weekItem.style.width = 100 / week.length + \"%\"; head.appendChild(weekItem) }); courseWrapper.appendChild(head); \n" + + " var courseListContent = document.createElement(\"div\"); courseListContent.className = \"Courses-content\"; var paletteIndex = 0; \n" + + " timetable.forEach(function (values, index) {\n" + + " var courseItems = document.createElement(\"ul\"); courseItems.style.listStyle = \"none\"; courseItems.style.padding = \"0px\"; courseItems.style.margin = \"0px\"; courseItems.style.minHeight = Gheight + \"px\"; courseItems.className = \"stage_\" + ((TimetableType[0] || [])[0] || \"none\"); --(TimetableType[0] || [])[2]; if (!((TimetableType[0] || [])[2])) { TimetableType.shift() } values.forEach(function (item, i) {\n" + + " if (i > week.length - 1) { return } var courseItem = document.createElement(\"li\"); courseItem.style.cssFloat = \"left\"; courseItem.style.width = 100 / week.length + \"%\"; courseItem.style.height = Gheight + \"px\"; courseItem.style.boxSizing = \"border-box\"; courseItem.style.position = \"relative\"; \n" + + " if (item) {\n" + + " courseItem.style.backgroundColor = item.split(\"#\")[1]; courseItem.style.color = \"#000\"; courseItem.className = \"course-hasContent\" } \n" + + " courseItem.innerText = item.split(\"#\")[0] || \"\";\n" + + " courseItem.onclick = function (e) { var allList = document.querySelectorAll(\".Courses-content ul li\").forEach(function (v, i) { v.classList.remove(\"grid-active\") }); this.className = \"grid-active\"; var info = { name: item, week: week[i], index: index + 1, length: merge ? listMerge[i][index].length : 1 }; gridOnClick && gridOnClick(info) }; courseItems.appendChild(courseItem)\n" + + " }); courseListContent.appendChild(courseItems)\n" + + " }); courseWrapper.appendChild(courseListContent); courseWrapper.appendChild(leftHand); this.el.appendChild(courseWrapper); var courseItemDomHeight = (document.querySelector(\".stage_1 li\") || document.querySelector(\".stage_none li\")).offsetHeight; var coursesHeadDomHeight = document.querySelector(\".Courses-head\").offsetHeight; var leftHandTextDom = document.createElement(\"div\"); leftHandTextDom.className = \"left-hand-TextDom\"; leftHandTextDom.style.height = coursesHeadDomHeight + \"px\"; leftHandTextDom.style.boxSizing = \"border-box\"; leftHandText.forEach(function (item) { var leftHandTextItem = document.createElement(\"div\"); leftHandTextItem.innerText = item; leftHandTextDom.appendChild(leftHandTextItem) }); leftHand.appendChild(leftHandTextDom); deepCopyTimetableType.forEach(function (item, index) { var handItem = document.createElement(\"div\"); handItem.style.width = \"100%\"; handItem.style.height = courseItemDomHeight * item[1] + \"px\"; handItem.style.boxSizing = \"border-box\"; if (typeof item[0] === \"object\") { for (var v in item[0]) { var handItemInner = document.createElement(\"p\"); handItemInner.innerText = item[0][v]; handItemInner.style.margin = \"0px\"; handItemInner.className = \"left-hand-\" + v; handItem.appendChild(handItemInner) } } else { handItem.innerText = item[0] || \"\" } handItem.className = \"left-hand-\" + (index + 1); leftHand.appendChild(handItem) })\n" + + " }, setOption: function (option) { (option || {}).setNewOption = true; this._init(option) }\n" + + " }; if (typeof module !== \"undefined\" && module.exports) { module.exports = Timetables } if (typeof define === \"function\") { define(function () { return Timetables }) } global.Timetables = Timetables\n" + + " })(this);"; String STYLE = "#coursesTable {\n" + " padding: 15px 10px;\n" + diff --git a/api/src/main/java/com/sv/netty/controller/AppVenueLessonController.java b/api/src/main/java/com/sv/netty/controller/AppVenueLessonController.java index 293497a..3690393 100644 --- a/api/src/main/java/com/sv/netty/controller/AppVenueLessonController.java +++ b/api/src/main/java/com/sv/netty/controller/AppVenueLessonController.java @@ -160,8 +160,22 @@ public class AppVenueLessonController { StringBuffer sb = new StringBuffer(); for (VenueLessonStatus v : collect){ sb.append("'" + v.getLessonName() + "(" + v.getStartTime().substring(0,5) + "-" + v.getEndTime().substring(0,5) + ")"); - sb.append("【总计：" + v.getNum() + "，" + (v.getLimitNum() == 0 ? "已约满】" : "剩余：" + v.getLimitNum()) + "】"); - sb.append("@预订用户：(" + v.getOrderUsers() + ")'"); + int limitNum = v.getLimitNum(); + if (limitNum <= 0){ + sb.append("【满额，剩余：0】"); + sb.append("(" + v.getOrderUsers() + ")"); + sb.append("#DD4822'"); + } else if (limitNum <= 3){ + sb.append("【紧张，剩余："+limitNum + "】'"); + sb.append("(" + v.getOrderUsers() + ")"); + sb.append("#yellow'"); + } else { + sb.append("【可预定，剩余："+limitNum + "】"); + if (v.getSaleNum() != 0){ + sb.append("(" + v.getOrderUsers() + ")"); + sb.append("#2BD5D5'"); + } + } } return sb.toString(); }