人脸+消费

eladmin-activity/src/main/java/me/zhengjie/modules/activiti/rest/ActivitiController.java

@@ -107,7 +107,7 @@ public class ActivitiController implements ModelDataJsonConstants {
 
             //保存模型
             repositoryService.saveModel(modelData);
-            repositoryService.addModelEditorSource(modelData.getId(), editorNode.toString().getBytes("utf-8"));
+            repositoryService.addModelEditorSource(modelData.getId(), editorNode.toString().getBytes(StandardCharsets.UTF_8));
             System.out.println("request.getContextPath() ==>> " + request.getContextPath());
             response.sendRedirect("/static/modeler.html?modelId=" + modelData.getId());
         } catch (Exception e) {
@@ -146,7 +146,7 @@ public class ActivitiController implements ModelDataJsonConstants {
 
         //保存模型
         repositoryService.saveModel(modelData);
-        repositoryService.addModelEditorSource(modelData.getId(), editorNode.toString().getBytes("utf-8"));
+        repositoryService.addModelEditorSource(modelData.getId(), editorNode.toString().getBytes(StandardCharsets.UTF_8));
         return new ResponseEntity<>(modelData.getId(), HttpStatus.OK);
     }
 
@@ -179,7 +179,7 @@ public class ActivitiController implements ModelDataJsonConstants {
                 }
                 modelNode.put(MODEL_ID, model.getId());
                 ObjectNode editorJsonNode = (ObjectNode) objectMapper.readTree(
-                        new String(repositoryService.getModelEditorSource(model.getId()), "utf-8"));
+                        new String(repositoryService.getModelEditorSource(model.getId()), StandardCharsets.UTF_8));
                 modelNode.putPOJO("model", editorJsonNode);
 
             } catch (Exception e) {
@@ -209,9 +209,9 @@ public class ActivitiController implements ModelDataJsonConstants {
 
             repositoryService.saveModel(model);
 
-            repositoryService.addModelEditorSource(model.getId(), json_xml.getBytes("utf-8"));
+            repositoryService.addModelEditorSource(model.getId(), json_xml.getBytes(StandardCharsets.UTF_8));
 
-            InputStream svgStream = new ByteArrayInputStream(svg_xml.getBytes("utf-8"));
+            InputStream svgStream = new ByteArrayInputStream(svg_xml.getBytes(StandardCharsets.UTF_8));
             TranscoderInput input = new TranscoderInput(svgStream);
 
             PNGTranscoder transcoder = new PNGTranscoder();

eladmin-activity/src/main/resources/static/diagram-viewer/js/ActivitiRest.js

@@ -35,7 +35,7 @@ var ActivitiRest = {
 				var processDefinitionDiagramLayout = data;
 				if (!processDefinitionDiagramLayout) {
 					console.error("Process definition diagram layout '" + processDefinitionId + "' not found");
-					return;
+
 				} else {
 					callback.apply({processDefinitionDiagramLayout: processDefinitionDiagramLayout});
 				}
@@ -60,7 +60,7 @@ var ActivitiRest = {
 				var highLights = data;
 				if (!highLights) {
 					console.log("highLights not found");
-					return;
+
 				} else {
 					callback.apply({highLights: highLights});
 				}

eladmin-activity/src/main/resources/static/diagram-viewer/js/Polyline.js

@@ -16,7 +16,7 @@ function Anchor(uuid, type, x, y) {
 	this.x = x
 	this.y = y
 	this.type = (type == ANCHOR_TYPE.middle) ? ANCHOR_TYPE.middle : ANCHOR_TYPE.main;
-};
+}
 Anchor.prototype = {
 	uuid: null,
 	x: 0,
@@ -51,7 +51,7 @@ function Polyline(uuid, points, strokeWidth) {
 	this.closePath = false;
 	
 	this.init();
-};
+}
 
 Polyline.prototype = {
 	id: null,
@@ -126,7 +126,7 @@ Polyline.prototype = {
 	},
 	
 	getAnchors: function(){
-		// âåðíóòü îòñîðòèðîâàííûé ìàññèâ
+		// ������� ��������������� ������
 		// ????
 		return this.anchors;
 	},
@@ -155,7 +155,7 @@ Polyline.prototype = {
 		} else if (!index) {
 			index = this.anchors.length;
 		} else {
-			// ïåðåáðàòü anchors, ñäâèíóòü ïîçèöèþ äëÿ êàæäîãî, íà÷èíàÿ ñ index
+			// ��������� anchors, �������� ������� ��� �������, ������� � index
 			//var anchor = this.getAnchor()
 			for(var i=0; i < this.getAnchorsCount(); i++){
 				var anchor = this.anchors[i];
@@ -239,7 +239,7 @@ Polyline.prototype = {
 				
 				if (AO < 2*this.radius && i>1) {
 					targetX = anchor.x - this.getLineLengthX(i-1)/2;
-					targetY = anchor.y - this.getLineLengthY(i-1)/2;;
+					targetY = anchor.y - this.getLineLengthY(i-1)/2;
 				}
 					
 				// pivot point of next line
@@ -254,7 +254,7 @@ Polyline.prototype = {
 					
 				if (AO < 2*this.radius && i<this.getAnchorsCount()-2) {
 					nextSrcX = anchor.x + this.getLineLengthX(i)/2;
-					nextSrcY = anchor.y + this.getLineLengthY(i)/2;;
+					nextSrcY = anchor.y + this.getLineLengthY(i)/2;
 				}
 					
 				
@@ -341,7 +341,7 @@ function Polygone(points, strokeWidth) {
 	
 	this.closePath = true;
 	this.init();
-};
+}
 
 
 /*

eladmin-activity/src/main/resources/static/diagram-viewer/js/ProcessDiagramCanvas.js

@@ -106,7 +106,7 @@ function OBJ(type){
 	this.c = null;
 	this.type = type;
 	this.nestedElements = [];
-};
+}
 OBJ.prototype = {
 	
 };
@@ -2023,7 +2023,7 @@ ProcessDiagramCanvas.prototype = {
 				}
 			}
 			i++;
-		};
+		}
 		//console.log(layouts);
 		
 		measurer.rafaelTextObject.attr({"text": layouts.join("\n")});

eladmin-activity/src/main/resources/static/diagram-viewer/js/jquery/jquery.js

@@ -2479,7 +2479,7 @@ jQuery.extend({
 
 			if ( value === null ) {
 				jQuery.removeAttr( elem, name );
-				return;
+
 
 			} else if ( hooks && "set" in hooks && notxml && (ret = hooks.set( elem, value, name )) !== undefined ) {
 				return ret;

eladmin-activity/src/main/resources/static/diagram-viewer/js/textlayout.js

@@ -326,7 +326,7 @@
 						}
 					}
 					i++;
-				};
+				}
 				console.log(layouts);
 				
 				measurer.rafaelTextObject.attr({"text": layouts.join("\n")});

eladmin-activity/src/main/resources/static/editor-app/editor/oryx.debug.js

@@ -703,7 +703,7 @@ var DataManager = {
 			children.each( function(child) {
 				resource.removeChild(child);
 			});
-		};
+		}
 	},
 	
 	__persistShape: function(shape) {
@@ -933,7 +933,7 @@ var DataManager = {
 			
 			var children = $A(node.childNodes);
 			var attributes = $A(node.attributes);
-			var clazz = new String(node.getAttribute('class'));
+			var clazz = String(node.getAttribute('class'));
 			var ignore = clazz.split(' ').member('transient');
 
 			// ignore transients.
@@ -1081,7 +1081,7 @@ var DataManager = {
 		if(continueFrom.nodeType != continueFrom.ELEMENT_NODE)
 			return false;
 		
-		var classes = new String(continueFrom.getAttribute('class'));
+		var classes = String(continueFrom.getAttribute('class'));
 		var children = $A(continueFrom.childNodes);
 		
 		if(classes.include(triple.predicate.prefix + '-' + triple.predicate.name)) {
@@ -1220,7 +1220,7 @@ var DataManager = {
 
 Kickstart.register(DataManager.init);
 
-function assert(expr, m) { if(!expr) throw m; };
+function assert(expr, m) { if(!expr) throw m; }
 
 function DMCommand(action, triple) {
 	
@@ -1275,7 +1275,7 @@ function DMCommandHandler(nextHandler) {
 	 * @param {Object} command The command object to process.
 	 */
 	this.process = function(command) { return false; };
-};
+}
 
 /**
  * This Handler manages the addition and the removal of meta elements in the
@@ -1298,7 +1298,7 @@ function MetaTagHandler(next) {
 		}
 		
 	};
-};
+}
 
 var chain =	new MetaTagHandler();
 var command = new DMCommand(TRIPLE_ADD, new ERDF.Triple(
@@ -2298,7 +2298,7 @@ ORYX = Object.extend(ORYX, {
 						// get all attributes from the node and set to global properties
 						var attributes = $A(prop.attributes)
 						attributes.each(function(attr){property[attr.nodeName] = attr.nodeValue});				
-						if(attributes.length > 0) { globalProperties.push(property) };				
+						if(attributes.length > 0) { globalProperties.push(property) }
 					});
 				});
 
@@ -2335,7 +2335,7 @@ ORYX = Object.extend(ORYX, {
 						// Get all Attributes from the Node			
 						var attributes = $A(prop.attributes)
 						attributes.each(function(attr){property[attr.nodeName] = attr.nodeValue});				
-						if(attributes.length > 0) { properties.push(property) };	
+						if(attributes.length > 0) { properties.push(property) }
 					
 					});
 					
@@ -3065,7 +3065,7 @@ ORYX.Core.SVG.MinMaxPathHandler = Clazz.extend({
 	 * closePath - z or Z
 	 */
 	closePath: function() {
-	    return;// do nothing
+	    // do nothing
 	}
 
 });/*
@@ -3341,7 +3341,7 @@ ORYX.Core.SVG.PointsPathHandler = Clazz.extend({
 	 * closePath - z or Z
 	 */
 	closePath: function() {
-	    return;// do nothing
+	    // do nothing
 	}
 
 });/*
@@ -5061,7 +5061,7 @@ ORYX.Core.SVG.Label = Clazz.extend({
 		
 		if (!fontSize) {
 			//because this only works in firefox 3, all other browser use the default line height
-			if (tspans[0] && /Firefox[\/\s](\d+\.\d+)/.test(navigator.userAgent) && new Number(RegExp.$1) >= 3) {
+			if (tspans[0] && /Firefox[\/\s](\d+\.\d+)/.test(navigator.userAgent) && Number(RegExp.$1) >= 3) {
 				fontSize = tspans[0].getExtentOfChar(0).height;
 			}
 			else {
@@ -5524,7 +5524,7 @@ ORYX.Core.Math.getPointOfIntersectionPointLine = function(
 		}
 	}
 	
-	pointOfIntersection = new Object();
+	pointOfIntersection = {};
 	pointOfIntersection.x = lineP1.x + u * (lineP2.x - lineP1.x);
 	pointOfIntersection.y = lineP1.y + u * (lineP2.y - lineP1.y);	
 	
@@ -5821,7 +5821,7 @@ ORYX.Core.StencilSet.Stencil = {
 			throw "ORYX.Core.StencilSet.Stencil(construct): Title is not defined.";
 		}
 
-		if(!this._jsonStencil.description) { this._jsonStencil.description = ""; };
+		if(!this._jsonStencil.description) { this._jsonStencil.description = ""; }
 		if(!this._jsonStencil.groups) { this._jsonStencil.groups = []; }
 		if(!this._jsonStencil.roles) { this._jsonStencil.roles = []; }
 		
@@ -6901,7 +6901,7 @@ ORYX.Core.StencilSet.Rules = {
 			stencilsets.each(function(ss){
 				this.initializeRules(ss);
 			}.bind(this));
-			return;
+
 		}
 		else {
 			this._stencilSets.push(stencilSet);
@@ -9010,7 +9010,7 @@ ORYX.Core.Bounds = {
 		if( (this.a.x === undefined) && (this.a.y === undefined) &&
 			(this.b.x === undefined) && (this.b.y === undefined)) {
 			return b;
-		};
+		}
 		
 		var cx = Math.min(this.a.x,b.a.x);
 		var cy = Math.min(this.a.y,b.a.y);
@@ -9864,7 +9864,7 @@ ORYX.Core.AbstractShape = ORYX.Core.UIObject.extend(
 			switch(prefix + "-" + name){
 				case 'raziel-parent': 
 							// Set parent
-							if(!this.parent) {break};
+							if(!this.parent) {break}
 							
 							// Set outgoing Shape
 							var parent = this.getCanvas().getChildShapeByResourceId(value);
@@ -10627,7 +10627,7 @@ ORYX.Core.Canvas = ORYX.Core.AbstractShape.extend({
 	},
 
 	setSize: function(size, dontSetBounds) {
-		if(!size || !size.width || !size.height){return;};
+		if(!size || !size.width || !size.height){return;}
 		
 		if(this.rootNode.parentNode){
 			this.rootNode.parentNode.style.width = size.width + 'px';
@@ -12302,11 +12302,11 @@ ORYX.Editor = {
 		
 		// prevent event from bubbling, return.
 		//Event.stop(event);
-		return;
+
 	},
 
 	_handleMouseMove: function(event, uiObj) {
-		return;
+
 	},
 
 	_handleMouseUp: function(event, uiObj) {
@@ -12323,11 +12323,11 @@ ORYX.Editor = {
 	},
 
 	_handleMouseHover: function(event, uiObj) {
-		return;
+
 	},
 
 	_handleMouseOut: function(event, uiObj) {
-		return;
+
 	},
 
 	/**
@@ -14669,7 +14669,7 @@ ORYX.Core.Node = {
 		var outgoing = data.findAll(function(ser){ return (ser.prefix+"-"+ser.name) == 'raziel-outgoing'});
 		outgoing.each((function(obj){
 			// TODO: Look at Canvas
-			if(!this.parent) {return};
+			if(!this.parent) {return}
 								
 			// Set outgoing Shape
 			var next = this.getCanvas().getChildShapeByResourceId(obj.value);
@@ -15471,7 +15471,7 @@ ORYX.Core.Edge = {
 			this.relativizePoint(startPoint);
 			this.relativizePoint(endPoint);
 			
-			var newNodePosition = new Object();
+			var newNodePosition = {};
 			
 			/* Calculate new x-coordinate */
 			newNodePosition.x = startPoint.x 
@@ -15504,17 +15504,17 @@ ORYX.Core.Edge = {
 	 */
 	calculatePositionOfAttachedChildNode: function(node) {
 		/* Initialize position */
-		var position = new Object();
+		var position = {};
 		position.x = 0;
 		position.y = 0;
 		
 		/* Case: Node was just added */
 		if(!this.attachedNodePositionData[node.getId()]) {
-			this.attachedNodePositionData[node.getId()] = new Object();
+			this.attachedNodePositionData[node.getId()] = {};
 			this.attachedNodePositionData[node.getId()]
 					.relativDistanceFromDocker1 = 0;
 			this.attachedNodePositionData[node.getId()].node = node;
-			this.attachedNodePositionData[node.getId()].segment = new Object();
+			this.attachedNodePositionData[node.getId()].segment = {};
 			this.findEdgeSegmentForNode(node);
 		}else if(node.isChanged) {
 			this.findEdgeSegmentForNode(node);
@@ -16684,7 +16684,7 @@ ORYX.Core.Edge = {
 		var outgoing = data.findAll(function(ser){ return (ser.prefix+"-"+ser.name) == 'raziel-outgoing'});
 		outgoing.each((function(obj){
 			// TODO: Look at Canvas
-			if(!this.parent) {return};
+			if(!this.parent) {return}
 								
 			// Set outgoing Shape
 			var next = this.getCanvas().getChildShapeByResourceId(obj.value);
@@ -17259,7 +17259,7 @@ ORYX.Plugins.AbstractPlugin = Clazz.extend({
 						edge.removeUnusedDockers();
 						if (this.isBendPointIncluded(edge)){
 							this.plugin.doLayout(edge);
-							return;
+
 						}
 					}.bind(this));
 				
@@ -17495,7 +17495,7 @@ ORYX.Plugins.AbstractLayouter = ORYX.Plugins.AbstractPlugin.extend({
  */
 
 if (!ORYX.Plugins) 
-    ORYX.Plugins = new Object();
+    ORYX.Plugins = {};
 
 ORYX.Plugins.Edit = Clazz.extend({
     
@@ -17979,7 +17979,7 @@ ORYX.Plugins.Edit.DeleteCommand = ORYX.Core.Command.extend({
  * @name ORYX.Plugins
 */
 if(!ORYX.Plugins)
-	ORYX.Plugins = new Object();
+	ORYX.Plugins = {};
 
 /**
  * The view plugin offers all of zooming functionality accessible over the 
@@ -18204,8 +18204,8 @@ ORYX.Plugins.View = Clazz.extend(ORYX.Plugins.View);
  * pursuant to a written agreement and any use of this program without such an
  * agreement is prohibited.
  */
-if(!Signavio){ var Signavio = {} };
-	if (!Signavio.Core) { Signavio.Core = {} };
+if(!Signavio){ var Signavio = {} }
+	if (!Signavio.Core) { Signavio.Core = {} }
 	Signavio.Core.Version = "1.0";
 			/*
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
@@ -18218,19 +18218,19 @@ if(!Signavio){ var Signavio = {} };
  */
 
 if (!Signavio) {
-	var Signavio = new Object();
+	var Signavio = {};
 }
 
 if (!Signavio.Plugins) {
-	Signavio.Plugins = new Object();
+	Signavio.Plugins = {};
 }
 
 if (!Signavio.Plugins.Utils) {
-	Signavio.Plugins.Utils = new Object();
+	Signavio.Plugins.Utils = {};
 }
 
 if (!Signavio.Helper) {
-	Signavio.Helper = new Object();
+	Signavio.Helper = {};
 }
 
 
@@ -18271,7 +18271,7 @@ new function() {
  */
 
 if (!ORYX.Plugins) {
-    ORYX.Plugins = new Object();
+    ORYX.Plugins = {};
 }
 
 /**
@@ -18350,7 +18350,7 @@ ORYX.Plugins.Loading = Clazz.extend(ORYX.Plugins.Loading);
  * agreement is prohibited.
  */
 if (!ORYX.Plugins) {
-    ORYX.Plugins = new Object();
+    ORYX.Plugins = {};
 }
 
 /*
@@ -18580,7 +18580,7 @@ ORYX.Plugins.CanvasResizeButton = Clazz.extend({
  */
 
 if (!ORYX.Plugins) 
-    ORYX.Plugins = new Object();
+    ORYX.Plugins = {};
 
 ORYX.Plugins.RenameShapes = Clazz.extend({
 
@@ -18858,7 +18858,7 @@ ORYX.Plugins.RenameShapes = Clazz.extend({
  */
 
 if(!ORYX.Plugins)
-	ORYX.Plugins = new Object();
+	ORYX.Plugins = {};
 
 /**
  * Supports EPCs by offering a syntax check and export and import ability..
@@ -18992,12 +18992,12 @@ Array.prototype.insertFrom = function(from, to){
 	newA.push(el);
 	if(old.length > to ){
 		newA 	= newA.concat(old.slice(to))
-	};
+	}
 	return newA;
 }
 
 if(!ORYX.Plugins)
-	ORYX.Plugins = new Object();
+	ORYX.Plugins = {};
 
 ORYX.Plugins.Arrangement = ORYX.Plugins.AbstractPlugin.extend({
 
@@ -19446,7 +19446,7 @@ ORYX.Plugins.Arrangement = ORYX.Plugins.AbstractPlugin.extend({
  */
 
 if (!ORYX.Plugins) 
-    ORYX.Plugins = new Object();
+    ORYX.Plugins = {};
 
 ORYX.Plugins.Save = Clazz.extend({
 	
@@ -19517,7 +19517,7 @@ ORYX.Plugins.Save = Clazz.extend({
  */
 
 if(!ORYX.Plugins) 
-	ORYX.Plugins = new Object();
+	ORYX.Plugins = {};
 
 ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 
@@ -19587,7 +19587,7 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 	handleMouseDown: function(event, uiObj) {
 		// If the selection Bounds not intialized and the uiObj is not member of current selectio
 		// then return
-		if(!this.dragBounds || !this.currentShapes.member(uiObj) || !this.toMoveShapes.length) {return;};
+		if(!this.dragBounds || !this.currentShapes.member(uiObj) || !this.toMoveShapes.length) {return;}
 		
 		// Start Dragging
 		this.dragEnable = true;
@@ -19615,7 +19615,7 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 		// Register on Global Mouse-UP Event
 		document.documentElement.addEventListener(ORYX.CONFIG.EVENT_MOUSEUP, this.callbackMouseUp, true);			
 
-		return;
+
 	},
 
 	/**
@@ -19735,7 +19735,7 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 		document.documentElement.removeEventListener(ORYX.CONFIG.EVENT_MOUSEUP, this.callbackMouseUp, true);	
 		document.documentElement.removeEventListener(ORYX.CONFIG.EVENT_MOUSEMOVE, this.callbackMouseMove, false);				
 			
-		return;
+
 	},
 
 	/**
@@ -19744,7 +19744,7 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 	*/
 	handleMouseMove: function(event) {
 		// If dragging is not enabled, go return
-		if(!this.dragEnable) { return };
+		if(!this.dragEnable) { return }
 		// If Dragging is initialized
 		if(this.dragIntialized) {
 			// Raise Event: Drag will be started
@@ -19910,7 +19910,7 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 
 		// Stop the Event
 		//Event.stop(event);
-		return;
+
 	},
 	
 //	/**
@@ -20815,10 +20815,10 @@ ORYX.Plugins.Resizer = Clazz.extend({
 
 		var upL = this.bounds.upperLeft();
 		
-		if(this.bounds.width() < this.minSize.width)	{ this.bounds.set(upL.x, upL.y, upL.x + this.minSize.width, upL.y + this.bounds.height());};
-		if(this.bounds.height() < this.minSize.height)	{ this.bounds.set(upL.x, upL.y, upL.x + this.bounds.width(), upL.y + this.minSize.height);};
-		if(this.bounds.width() > this.maxSize.width)	{ this.bounds.set(upL.x, upL.y, upL.x + this.maxSize.width, upL.y + this.bounds.height());};
-		if(this.bounds.height() > this.maxSize.height)	{ this.bounds.set(upL.x, upL.y, upL.x + this.bounds.width(), upL.y + this.maxSize.height);};
+		if(this.bounds.width() < this.minSize.width)	{ this.bounds.set(upL.x, upL.y, upL.x + this.minSize.width, upL.y + this.bounds.height());}
+		if(this.bounds.height() < this.minSize.height)	{ this.bounds.set(upL.x, upL.y, upL.x + this.bounds.width(), upL.y + this.minSize.height);}
+		if(this.bounds.width() > this.maxSize.width)	{ this.bounds.set(upL.x, upL.y, upL.x + this.maxSize.width, upL.y + this.bounds.height());}
+		if(this.bounds.height() > this.maxSize.height)	{ this.bounds.set(upL.x, upL.y, upL.x + this.bounds.width(), upL.y + this.maxSize.height);}
 
 		var a = this.canvasNode.getScreenCTM();
 	    
@@ -21052,7 +21052,7 @@ ORYX.Core.Command.Move = ORYX.Core.Command.extend({
  */
 
 if(!ORYX.Plugins)
-	ORYX.Plugins = new Object();
+	ORYX.Plugins = {};
 
 ORYX.Plugins.DragDocker = Clazz.extend({
 
@@ -21384,7 +21384,7 @@ ORYX.Plugins.DragDocker = Clazz.extend({
 				this.docker.parent.dockers.each((function(docker){
 					if (this.docker == docker) {
 						return
-					};
+					}
 					
 					var center = docker.referencePoint ? docker.getAbsoluteReferencePoint() : docker.bounds.center();
 					
@@ -21606,7 +21606,7 @@ ORYX.Plugins.DragDocker = Clazz.extend({
  */
 
 if(!ORYX.Plugins)
-	ORYX.Plugins = new Object();
+	ORYX.Plugins = {};
 
 ORYX.Plugins.AddDocker = Clazz.extend({
 
@@ -21738,7 +21738,7 @@ ORYX.Plugins.AddDocker = Clazz.extend({
  */
 
 if(!ORYX.Plugins)
-	ORYX.Plugins = new Object();
+	ORYX.Plugins = {};
 
  ORYX.Plugins.SelectionFrame = Clazz.extend({
 
@@ -21946,7 +21946,7 @@ if(!ORYX.Plugins)
  */
 
 if(!ORYX.Plugins)
-	ORYX.Plugins = new Object(); 
+	ORYX.Plugins = {};
 
 ORYX.Plugins.ShapeHighlighting = Clazz.extend({
 
@@ -22185,7 +22185,7 @@ ORYX.Plugins.HighlightingSelectedShapes = Clazz.extend({
  */
 
 if (!ORYX.Plugins) 
-    ORYX.Plugins = new Object();
+    ORYX.Plugins = {};
 
 ORYX.Plugins.Overlay = Clazz.extend({
 
@@ -22500,7 +22500,7 @@ ORYX.Plugins.Overlay = Clazz.extend({
  */
 
 if (!ORYX.Plugins) 
-    ORYX.Plugins = new Object();
+    ORYX.Plugins = {};
 
 ORYX.Plugins.KeysMove = ORYX.Plugins.AbstractPlugin.extend({
 
@@ -23105,7 +23105,7 @@ new function(){
  */
 
 if(!ORYX.Plugins)
-	ORYX.Plugins = new Object();
+	ORYX.Plugins = {};
 
 new function(){
 	

eladmin-activity/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/es5-shim.js

@@ -813,7 +813,7 @@ if (!Date.parse || "Date.parse is buggy") {
                 return date;
             }
             return NativeDate.apply(this, arguments);
-        };
+        }
 
         // 15.9.1.15 Date Time String Format.
         var isoDateExpression = new RegExp("^" +

eladmin-activity/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-array.js

@@ -11,7 +11,7 @@ describe('Array', function() {
         });
         o.length = arr.length;
         return o;
-    };
+    }
 
     describe('forEach', function() {
         "use strict";
@@ -792,7 +792,7 @@ describe('Array', function() {
                     i++;
                     if(i <= 4) {
                         arr.push(a+3);
-                    };
+                    }
                     return b;
                 });
                 expect(arr).toEqual([1,2,3,4,5]);
@@ -861,7 +861,7 @@ describe('Array', function() {
                     i++;
                     if(i <= 4) {
                         arr[i+2] = a+3;
-                    };
+                    }
                     return b;
                 });
                 expect(arr).toEqual({
@@ -940,7 +940,7 @@ describe('Array', function() {
                     i++;
                     if(i <= 4) {
                         arr.push(a+3);
-                    };
+                    }
                     return b;
                 });
                 expect(arr).toEqual([1,2,3,6,5]);
@@ -1017,7 +1017,7 @@ describe('Array', function() {
                     i++;
                     if(i <= 4) {
                         arr[i+2] = a+3;
-                    };
+                    }
                     return b;
                 });
                 expect(arr).toEqual({

eladmin-activity/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-function.js

@@ -16,7 +16,7 @@ describe('Function', function() {
                 this.push(a);
             }, this);
             return this;
-        };
+        }
         
         beforeEach(function() {
             actual = [];

eladmin-activity/src/main/resources/static/editor-app/libs/json3_3.2.6/lib/json3.js

@@ -71,8 +71,8 @@
               stringify(0) === "0" &&
               // FF 3.1b1, b2, and JSON 2 serialize wrapped primitives as object
               // literals.
-              stringify(new Number()) === "0" &&
-              stringify(new String()) == '""' &&
+              stringify(Number()) === "0" &&
+              stringify(String()) == '""' &&
               // FF 3.1b1, 2 throw an error if the value is `null`, `undefined`, or
               // does not define a canonical JSON representation (this applies to
               // objects with `toJSON` properties as well, *unless* they are nested

eladmin-activity/src/main/resources/static/editor-app/libs/path_parser.js

@@ -15,7 +15,7 @@ PathParser.PARAMCOUNT={A:7,C:6,H:1,L:2,M:2,Q:4,S:4,T:2,V:1,Z:0};
 PathParser.METHODNAME={A:"arcAbs",a:"arcRel",C:"curvetoCubicAbs",c:"curvetoCubicRel",H:"linetoHorizontalAbs",h:"linetoHorizontalRel",L:"linetoAbs",l:"linetoRel",M:"movetoAbs",m:"movetoRel",Q:"curvetoQuadraticAbs",q:"curvetoQuadraticRel",S:"curvetoCubicSmoothAbs",s:"curvetoCubicSmoothRel",T:"curvetoQuadraticSmoothAbs",t:"curvetoQuadraticSmoothRel",V:"linetoVerticalAbs",v:"linetoVerticalRel",Z:"closePath",z:"closePath"}
 function PathParser(){this._lexer=new PathLexer();this._handler=null;}
 PathParser.prototype.parsePath=function(path){if(path==null||path.namespaceURI!=Svg.NAMESPACE||path.localName!="path")throw new Error("PathParser.parsePath: The first parameter must be an SVG path element");this.parseData(path.getAttributeNS(null,"d"));};
-PathParser.prototype.parseData=function(pathData){if(typeof(pathData)!="string")throw new Error("PathParser.parseData: The first parameter must be a string");if(this._handler!=null&&this._handler.beginParse!=null)this._handler.beginParse();var lexer=this._lexer;lexer.setPathData(pathData);var mode="BOP";var token=lexer.getNextToken();while(!token.typeis(PathToken.EOD)){var param_count;var params=new Array();switch(token.type){case PathToken.COMMAND:if(mode=="BOP"&&token.text!="M"&&token.text!="m")throw new Error("PathParser.parseData: a path must begin with a moveto command");mode=token.text;param_count=PathParser.PARAMCOUNT[token.text.toUpperCase()];token=lexer.getNextToken();break;case PathToken.NUMBER:break;default:throw new Error("PathParser.parseData: unrecognized token type: "+token.type);}for(var i=0;i<param_count;i++){switch(token.type){case PathToken.COMMAND:throw new Error("PathParser.parseData: parameter must be a number: "+token.text);case PathToken.NUMBER:params[i]=token.text-0;break;default:throw new Errot("PathParser.parseData: unrecognized token type: "+token.type);}token=lexer.getNextToken();}if(this._handler!=null){var handler=this._handler;var method=PathParser.METHODNAME[mode];if(handler[method]!=null)handler[method].apply(handler,params);}if(mode=="M")mode="L";if(mode=="m")mode="l";}};
+PathParser.prototype.parseData=function(pathData){if(typeof(pathData)!="string")throw new Error("PathParser.parseData: The first parameter must be a string");if(this._handler!=null&&this._handler.beginParse!=null)this._handler.beginParse();var lexer=this._lexer;lexer.setPathData(pathData);var mode="BOP";var token=lexer.getNextToken();while(!token.typeis(PathToken.EOD)){var param_count;var params=[];switch(token.type){case PathToken.COMMAND:if(mode=="BOP"&&token.text!="M"&&token.text!="m")throw new Error("PathParser.parseData: a path must begin with a moveto command");mode=token.text;param_count=PathParser.PARAMCOUNT[token.text.toUpperCase()];token=lexer.getNextToken();break;case PathToken.NUMBER:break;default:throw new Error("PathParser.parseData: unrecognized token type: "+token.type);}for(var i=0;i<param_count;i++){switch(token.type){case PathToken.COMMAND:throw new Error("PathParser.parseData: parameter must be a number: "+token.text);case PathToken.NUMBER:params[i]=token.text-0;break;default:throw new Errot("PathParser.parseData: unrecognized token type: "+token.type);}token=lexer.getNextToken();}if(this._handler!=null){var handler=this._handler;var method=PathParser.METHODNAME[mode];if(handler[method]!=null)handler[method].apply(handler,params);}if(mode=="M")mode="L";if(mode=="m")mode="l";}};
 PathParser.prototype.setHandler=function(handler){this._handler=handler;};
 PathLexer.VERSION=1.0;
 function PathLexer(pathData){if(pathData==null)pathData="";this.setPathData(pathData);}

eladmin-activity/src/main/resources/static/editor-app/libs/prototype-1.5.1.js

@@ -39,7 +39,7 @@ var Class = {
   }
 }
 
-var Abstract = new Object();
+var Abstract = {};
 
 Object.extend = function(destination, source) {
   for (var property in source) {
@@ -876,7 +876,7 @@ Object.extend(Hash.prototype, {
 function $H(object) {
   if (object instanceof Hash) return object;
   return new Hash(object);
-};
+}
 
 // Safari iterates over shadowed properties
 if (function() {
@@ -1953,7 +1953,7 @@ Abstract.Insertion.prototype = {
   }
 }
 
-var Insertion = new Object();
+var Insertion = {};
 
 Insertion.Before = Class.create();
 Insertion.Before.prototype = Object.extend(new Abstract.Insertion('beforeBegin'), {
@@ -2934,7 +2934,7 @@ Form.EventObserver.prototype = Object.extend(new Abstract.EventObserver(), {
   }
 });
 if (!window.Event) {
-  var Event = new Object();
+  var Event = {};
 }
 
 Object.extend(Event, {

eladmin-common/pom.xml

@@ -36,5 +36,10 @@
             <groupId>org.springframework.amqp</groupId>
             <artifactId>spring-rabbit</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.13</version>
+        </dependency>
     </dependencies>
 </project>

eladmin-common/src/main/java/me/zhengjie/utils/BeanMapUtils.java

@@ -0,0 +1,264 @@
+package me.zhengjie.utils;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.util.EntityUtils;
+
+import java.beans.BeanInfo;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.io.*;
+import java.lang.reflect.Method;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.*;
+
+public class BeanMapUtils {
+
+    /**
+     * Map转实体
+     * @param type
+     * @param map
+     * @return
+     * @throws Exception
+     */
+    public static Object convertMap(Class type, Map map) throws Exception {
+        BeanInfo beanInfo = Introspector.getBeanInfo(type);
+        Object obj = type.newInstance();
+        PropertyDescriptor[] propertyDescriptors =  beanInfo.getPropertyDescriptors();
+        for (PropertyDescriptor descriptor : propertyDescriptors) {
+            String propertyName = descriptor.getName();
+            if (map.containsKey(propertyName)) {
+                Object value = map.get(propertyName);
+                descriptor.getWriteMethod().invoke(obj, value);
+            }
+        }
+        return obj;
+    }
+
+    /**
+     * 实体类转Map共通方法
+     *
+     * @param bean 实体类
+     * @return Map
+     * @throws Exception
+     */
+    public static Map convertBean(Object bean) throws Exception {
+        Class type = bean.getClass();
+        Map returnMap = new HashMap();
+        BeanInfo beanInfo = Introspector.getBeanInfo(type);
+        PropertyDescriptor[] propertyDescriptors =  beanInfo.getPropertyDescriptors();
+        for (PropertyDescriptor descriptor : propertyDescriptors) {
+            String propertyName = descriptor.getName();
+            if (!propertyName.equals("class")) {
+                Method readMethod = descriptor.getReadMethod();
+                Object result = readMethod.invoke(bean);
+                if (result != null) {
+                    returnMap.put(propertyName, result);
+                } else {
+                    returnMap.put(propertyName, "");
+                }
+            }
+        }
+        return returnMap;
+    }
+
+    /**
+        * 随机生成UUID
+        * @return
+        */
+    public static synchronized String getUUID(){
+        UUID uuid = UUID.randomUUID();
+        String str = uuid.toString();
+        return str;
+    }
+
+    /**
+     * 发送post请求(raw)
+     * @param url 接口地址
+     * @param json raw中json参数
+     * @return 请求结果
+     * @throws ClientProtocolException
+     * @throws IOException
+     */
+    public static synchronized String sendPost(String url,String json)throws ClientProtocolException, IOException {
+        HttpClient httpClient = new DefaultHttpClient();
+        HttpPost post = new HttpPost(url);
+        StringEntity postingString = new StringEntity(json);// json传递
+        post.setEntity(postingString);
+        post.setHeader("Content-type", "application/json");
+        HttpResponse response = httpClient.execute(post);
+        String content = EntityUtils.toString(response.getEntity());
+        return content;
+    }
+
+    /**
+     *
+     * @param httpUrl  请求的url
+     * @param param  form表单的参数（key,value形式）
+     * @return
+     */
+    public static String doPostForm(String httpUrl, Map param) {
+
+        HttpURLConnection connection = null;
+        InputStream is = null;
+        OutputStream os = null;
+        BufferedReader br = null;
+        String result = null;
+        try {
+            URL url = new URL(httpUrl);
+            // 通过远程url连接对象打开连接
+            connection = (HttpURLConnection) url.openConnection();
+            // 设置连接请求方式
+            connection.setRequestMethod("POST");
+            // 设置连接主机服务器超时时间：15000毫秒
+            connection.setConnectTimeout(15000);
+            // 设置读取主机服务器返回数据超时时间：60000毫秒
+            connection.setReadTimeout(60000);
+
+            // 默认值为：false，当向远程服务器传送数据/写数据时，需要设置为true
+            connection.setDoOutput(true);
+            // 默认值为：true，当前向远程服务读取数据时，设置为true，该参数可有可无
+            connection.setDoInput(true);
+            // 设置传入参数的格式:请求参数应该是 name1=value1&name2=value2 的形式。
+            connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+            // 设置鉴权信息：Authorization: Bearer da3efcbf-0845-4fe3-8aba-ee040be542c0
+            //connection.setRequestProperty("Authorization", "Bearer da3efcbf-0845-4fe3-8aba-ee040be542c0");
+            // 通过连接对象获取一个输出流
+            os = connection.getOutputStream();
+            // 通过输出流对象将参数写出去/传输出去,它是通过字节数组写出的(form表单形式的参数实质也是key,value值的拼接，类似于get请求参数的拼接)
+            os.write(createLinkString(param).getBytes());
+            // 通过连接对象获取一个输入流，向远程读取
+            if (connection.getResponseCode() == 200) {
+
+                is = connection.getInputStream();
+                // 对输入流对象进行包装:charset根据工作项目组的要求来设置
+                br = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+
+                StringBuffer sbf = new StringBuffer();
+                String temp = null;
+                // 循环遍历一行一行读取数据
+                while ((temp = br.readLine()) != null) {
+                    sbf.append(temp);
+                    sbf.append("\r\n");
+                }
+                result = sbf.toString();
+            }
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            // 关闭资源
+            if (null != br) {
+                try {
+                    br.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if (null != os) {
+                try {
+                    os.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if (null != is) {
+                try {
+                    is.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            // 断开与远程地址url的连接
+            connection.disconnect();
+        }
+        return result;
+    }
+
+    /**
+     * 向指定URL发送GET方法的请求
+     *
+     * @param url
+     *            发送请求的URL
+     * @param param
+     *            请求参数，请求参数应该是 name1=value1&name2=value2 的形式。
+     * @return URL 所代表远程资源的响应结果
+     */
+    public static String sendGet(String url, String param) {
+        String result = "";
+        BufferedReader in = null;
+        try {
+            String urlNameString = url + "?" + param;
+            URL realUrl = new URL(urlNameString);
+            // 打开和URL之间的连接
+            URLConnection connection = realUrl.openConnection();
+            // 设置通用的请求属性
+            connection.setRequestProperty("accept", "*/*");
+            connection.setRequestProperty("connection", "Keep-Alive");
+            connection.setRequestProperty("user-agent",
+                    "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
+            // 建立实际的连接
+            connection.connect();
+            // 获取所有响应头字段
+            Map<String, List<String>> map = connection.getHeaderFields();
+            // 遍历所有的响应头字段
+            for (String key : map.keySet()) {
+                System.out.println(key + "--->" + map.get(key));
+            }
+            // 定义 BufferedReader输入流来读取URL的响应
+            in = new BufferedReader(new InputStreamReader(
+                    connection.getInputStream()));
+            String line;
+            while ((line = in.readLine()) != null) {
+                result += line;
+            }
+        } catch (Exception e) {
+            System.out.println("发送GET请求出现异常！" + e);
+            e.printStackTrace();
+        }
+        // 使用finally块来关闭输入流
+        finally {
+            try {
+                if (in != null) {
+                    in.close();
+                }
+            } catch (Exception e2) {
+                e2.printStackTrace();
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 把数组所有元素排序，并按照“参数=参数值”的模式用“&”字符拼接成字符串
+     * @param params 需要排序并参与字符拼接的参数组
+     * @return 拼接后字符串
+     */
+    public static String createLinkString(Map<String, String> params) {
+
+        List<String> keys = new ArrayList<String>(params.keySet());
+        Collections.sort(keys);
+
+        StringBuilder prestr = new StringBuilder();
+        for (int i = 0; i < keys.size(); i++) {
+            String key = keys.get(i);
+            String value = params.get(key);
+            if (i == keys.size() - 1) {// 拼接时，不包括最后一个&字符
+                prestr.append(key).append("=").append(value);
+            } else {
+                prestr.append(key).append("=").append(value).append("&");
+            }
+        }
+
+        return prestr.toString();
+    }
+
+}

eladmin-common/src/main/java/me/zhengjie/utils/EncryptUtils.java

@@ -107,7 +107,7 @@ public class EncryptUtils {
         MessageDigest sha = null;
         try {
             sha = MessageDigest.getInstance("SHA");
-            byte[] byteArray = str.getBytes("UTF-8");
+            byte[] byteArray = str.getBytes(StandardCharsets.UTF_8);
             byte[] md5Bytes = sha.digest(byteArray);
             StringBuffer hexValue = new StringBuffer();
             for (int i = 0; i < md5Bytes.length; i++) {
@@ -119,7 +119,7 @@ public class EncryptUtils {
             }
             return hexValue.toString();
         } catch (Exception e) {
-            System.out.println(e.toString());
+            System.out.println(e);
             e.printStackTrace();
             return "";
         }

eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java

@@ -25,6 +25,8 @@ import org.apache.poi.xssf.streaming.SXSSFSheet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.multipart.MultipartFile;
+import sun.misc.BASE64Decoder;
+
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -84,6 +86,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
     public static final String OTHER = "其他";
 
 
+
     /**
      * MultipartFile转File
      */
@@ -104,6 +107,8 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
         return file;
     }
 
+
+
     /**
      * 获取文件扩展名，不带 .
      */
@@ -170,6 +175,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
         return file;
     }
 
+
     /**
      * 将文件名解析成文件的上传路径
      */

eladmin-system/pom.xml

@@ -20,11 +20,11 @@
 
     <dependencies>
         <!-- rabbitmq -->
-        <dependency>
-            <groupId>com.rabbitmq</groupId>
-            <artifactId>amqp-client</artifactId>
-            <version>3.4.1</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.rabbitmq</groupId>-->
+<!--            <artifactId>amqp-client</artifactId>-->
+<!--            <version>3.4.1</version>-->
+<!--        </dependency>-->
 
         <!-- 代码生成模块 -->
         <dependency>
@@ -104,10 +104,10 @@
             <artifactId>oshi-core</artifactId>
             <version>5.3.6</version>
         </dependency>
-        <dependency>
-            <groupId>com.rabbitmq</groupId>
-            <artifactId>amqp-client</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.rabbitmq</groupId>-->
+<!--            <artifactId>amqp-client</artifactId>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-test</artifactId>

eladmin-system/src/main/java/me/zhengjie/config/rabbitmq/RabbitmqConfig.java

@@ -50,8 +50,8 @@ public class RabbitmqConfig {
         connectionFactory.setPort(rabbitProperties.getPort());
         connectionFactory.setUsername(rabbitProperties.getUsername());
         connectionFactory.setPassword(rabbitProperties.getPassword());
-        connectionFactory.setPublisherReturns(true);
-        connectionFactory.setVirtualHost(vHost);
+//        connectionFactory.setPublisherReturns(true);
+        connectionFactory.setVirtualHost(vHost);//vHost
         return connectionFactory;
     }
     /**
@@ -61,13 +61,13 @@ public class RabbitmqConfig {
      */
     public RabbitTemplate rabbitTemplate(ConnectionFactory connectionFactory) {
         RabbitTemplate rabbitTemplate = new RabbitTemplate(connectionFactory);
-        rabbitTemplate.setMessageConverter(this.messageConverter());
-        // 触发setReturnCallback回调必须设置mandatory=true, 否则Exchange没有找到Queue就会丢弃掉消息, 而不会触发回调
-        rabbitTemplate.setMandatory(true);
-        // 消息是否从Exchange路由到Queue, 注意: 这是一个失败回调, 只有消息从Exchange路由到Queue失败才会回调这个方法
-        rabbitTemplate.setReturnCallback((message, replyCode, replyText, exchange, routingKey) -> {
-            log.info("消息从Exchange路由到Queue失败: exchange: {}, route: {}, replyCode: {}, replyText: {}, message: {}", exchange, routingKey, replyCode, replyText, message);
-        });
+//        rabbitTemplate.setMessageConverter(this.messageConverter());
+//        // 触发setReturnCallback回调必须设置mandatory=true, 否则Exchange没有找到Queue就会丢弃掉消息, 而不会触发回调
+//        rabbitTemplate.setMandatory(true);
+//        // 消息是否从Exchange路由到Queue, 注意: 这是一个失败回调, 只有消息从Exchange路由到Queue失败才会回调这个方法
+//        rabbitTemplate.setReturnCallback((message, replyCode, replyText, exchange, routingKey) -> {
+//            log.info("消息从Exchange路由到Queue失败: exchange: {}, route: {}, replyCode: {}, replyText: {}, message: {}", exchange, routingKey, replyCode, replyText, message);
+//        });
 
         return rabbitTemplate;
     }

eladmin-system/src/main/java/me/zhengjie/config/rabbitmq/cuisine/CuisineConsumer.java

@@ -12,14 +12,15 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
 
 @Data
 @Configuration
 public class CuisineConsumer {
     @Autowired
     private RabbitmqConfig rabbitmqConfig;
-    public static final String NAME = "schedule_produce";
-    public final static String MODULE_NAME = "returnC";
+    public static final String NAME = "schedule_consume";//schedule_produce
+    public final static String MODULE_NAME = "scheduleC";
 
     public final static String CONNECTION_CON = MODULE_NAME+RabbitmqConfig.CONNECTION;
     public final static String TEMPLATE_CON = MODULE_NAME+ RabbitmqConfig.TEMPLATE;
@@ -30,38 +31,45 @@ public class CuisineConsumer {
     public final static String BINDING_CON = MODULE_NAME+RabbitmqConfig.BINDING;
 
     @Bean(name = CONNECTION_CON)
+    @Primary
     public ConnectionFactory connectionFactory(){
         return rabbitmqConfig.connectionFactory(NAME);
     }
 
     @Bean(name = TEMPLATE_CON)
+    @Primary
     public RabbitTemplate rabbitTemplate(@Qualifier(CONNECTION_CON) ConnectionFactory connectionFactory ) {
         return rabbitmqConfig.rabbitTemplate(connectionFactory);
     }
 
     @Bean(name = LISTENER_CON)
+    @Primary
     public SimpleRabbitListenerContainerFactory listenerFactory(
             SimpleRabbitListenerContainerFactoryConfigurer configurer,
             @Qualifier(CONNECTION_CON) ConnectionFactory connectionFactory) {
         return rabbitmqConfig.listenerFactory(configurer,connectionFactory);
     }
 
-    @Bean(ADMIN_CON)
+    @Bean(name = ADMIN_CON)
+    @Primary
     AmqpAdmin amqpAdmin(@Qualifier(CONNECTION_CON) ConnectionFactory connectionFactory) {
         return new RabbitAdmin(connectionFactory);
     }
 
     @Bean(EXCHANGE_CON)
+    @Primary
     public DirectExchange exchange(@Qualifier(ADMIN_CON) AmqpAdmin amqpAdmin) {
         return rabbitmqConfig.exchange(NAME,amqpAdmin);
     }
 
     @Bean(QUEUE_CON)
+    @Primary
     Queue queue(@Qualifier(ADMIN_CON)AmqpAdmin amqpAdmin) {
         return rabbitmqConfig.queue(NAME,amqpAdmin);
     }
 
     @Bean(BINDING_CON)
+    @Primary
     Binding bindingPersonDirect(@Qualifier(ADMIN_CON)AmqpAdmin amqpAdmin) {
         Binding binding = BindingBuilder.bind(queue(amqpAdmin)).to(exchange(amqpAdmin)).with(NAME);
         binding.setAdminsThatShouldDeclare(amqpAdmin);

eladmin-system/src/main/java/me/zhengjie/config/rabbitmq/cuisine/CuisineProduce.java

@@ -12,14 +12,15 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
 
 @Data
 @Configuration
 public class CuisineProduce {
     @Autowired
     private RabbitmqConfig rabbitmqConfig;
-    public static final String NAME = "schedule_consume";
-    private final static String MODULE_NAME = "returnC";
+    public static final String NAME = "schedule_produce";
+    private final static String MODULE_NAME = "scheduleP";
 
     public final static String CONNECTION = MODULE_NAME+RabbitmqConfig.CONNECTION;
     public final static String TEMPLATE = MODULE_NAME+ RabbitmqConfig.TEMPLATE;
@@ -46,9 +47,13 @@ public class CuisineProduce {
         return rabbitmqConfig.listenerFactory(configurer,connectionFactory);
     }
 
-    @Bean(ADMIN)
+    @Bean(name = ADMIN)
     AmqpAdmin amqpAdmin(@Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return new RabbitAdmin(connectionFactory);
+        RabbitAdmin rabbitAdmin = new RabbitAdmin(connectionFactory);
+        rabbitAdmin.setAutoStartup(true);
+        rabbitAdmin.declareExchange(exchange(rabbitAdmin));
+        rabbitAdmin.declareQueue(queue(rabbitAdmin));
+        return rabbitAdmin;
     }
 
     @Bean(EXCHANGE)

eladmin-system/src/main/java/me/zhengjie/config/rabbitmq/order/OrderConsumer.java

@@ -1,70 +1,78 @@
-package me.zhengjie.config.rabbitmq.order;
-
-import lombok.Data;
-import me.zhengjie.config.rabbitmq.RabbitmqConfig;
-import org.springframework.amqp.core.*;
-import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
-import org.springframework.amqp.rabbit.connection.ConnectionFactory;
-import org.springframework.amqp.rabbit.core.RabbitAdmin;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Data
-@Configuration
-public class OrderConsumer {
-    @Autowired
-    private RabbitmqConfig rabbitmqConfig;
-    public static final String NAME_ORDER = "dish_trade_produce";
-    public final static String MODULE_NAME_ORDER = "returnC";
-
-    public final static String CONNECTION_ORDER_CON = MODULE_NAME_ORDER+RabbitmqConfig.CONNECTION;
-    public final static String TEMPLATE_ORDER_CON = MODULE_NAME_ORDER+ RabbitmqConfig.TEMPLATE;
-    public final static String LISTENER_ORDER_CON = MODULE_NAME_ORDER+RabbitmqConfig.LISTENER;
-    public final static String ADMIN_ORDER_CON = MODULE_NAME_ORDER+RabbitmqConfig.ADMIN;
-    public final static String EXCHANGE_ORDER_CON = MODULE_NAME_ORDER+RabbitmqConfig.EXCHANGE;
-    public final static String QUEUE_ORDER_CON = MODULE_NAME_ORDER+RabbitmqConfig.QUEUE;
-    public final static String BINDING_ORDER_CON = MODULE_NAME_ORDER+RabbitmqConfig.BINDING;
-
-    @Bean(name = CONNECTION_ORDER_CON)
-    public ConnectionFactory connectionFactory(){
-        return rabbitmqConfig.connectionFactory(NAME_ORDER);
-    }
-
-    @Bean(name = TEMPLATE_ORDER_CON)
-    public RabbitTemplate rabbitTemplate(@Qualifier(CONNECTION_ORDER_CON) ConnectionFactory connectionFactory ) {
-        return rabbitmqConfig.rabbitTemplate(connectionFactory);
-    }
-
-    @Bean(name = LISTENER_ORDER_CON)
-    public SimpleRabbitListenerContainerFactory listenerFactory(
-            SimpleRabbitListenerContainerFactoryConfigurer configurer,
-            @Qualifier(CONNECTION_ORDER_CON) ConnectionFactory connectionFactory) {
-        return rabbitmqConfig.listenerFactory(configurer,connectionFactory);
-    }
-
-    @Bean(ADMIN_ORDER_CON)
-    AmqpAdmin amqpAdmin(@Qualifier(CONNECTION_ORDER_CON) ConnectionFactory connectionFactory) {
-        return new RabbitAdmin(connectionFactory);
-    }
-
-    @Bean(EXCHANGE_ORDER_CON)
-    public DirectExchange exchange(@Qualifier(ADMIN_ORDER_CON) AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.exchange(NAME_ORDER,amqpAdmin);
-    }
-
-    @Bean(QUEUE_ORDER_CON)
-    Queue queue(@Qualifier(ADMIN_ORDER_CON)AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.queue(NAME_ORDER,amqpAdmin);
-    }
-
-    @Bean(BINDING_ORDER_CON)
-    Binding bindingPersonDirect(@Qualifier(ADMIN_ORDER_CON)AmqpAdmin amqpAdmin) {
-        Binding binding = BindingBuilder.bind(queue(amqpAdmin)).to(exchange(amqpAdmin)).with(NAME_ORDER);
-        binding.setAdminsThatShouldDeclare(amqpAdmin);
-        return binding;
-    }
-}
+//package me.zhengjie.config.rabbitmq.order;
+//
+//import lombok.Data;
+//import me.zhengjie.config.rabbitmq.RabbitmqConfig;
+//import org.springframework.amqp.core.*;
+//import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
+//import org.springframework.amqp.rabbit.connection.ConnectionFactory;
+//import org.springframework.amqp.rabbit.core.RabbitAdmin;
+//import org.springframework.amqp.rabbit.core.RabbitTemplate;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.beans.factory.annotation.Qualifier;
+//import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.context.annotation.Primary;
+//
+//@Data
+//@Configuration
+//public class OrderConsumer {
+//    @Autowired
+//    private RabbitmqConfig rabbitmqConfig;
+//    public static final String NAME_ORDER = "dish_trade_produce";
+//    public final static String MODULE_NAME_ORDER = "dishTp";
+//
+//    public final static String CONNECTION_ORDER_CON = MODULE_NAME_ORDER+RabbitmqConfig.CONNECTION;
+//    public final static String TEMPLATE_ORDER_CON = MODULE_NAME_ORDER+ RabbitmqConfig.TEMPLATE;
+//    public final static String LISTENER_ORDER_CON = MODULE_NAME_ORDER+RabbitmqConfig.LISTENER;
+//    public final static String ADMIN_ORDER_CON = MODULE_NAME_ORDER+RabbitmqConfig.ADMIN;
+//    public final static String EXCHANGE_ORDER_CON = MODULE_NAME_ORDER+RabbitmqConfig.EXCHANGE;
+//    public final static String QUEUE_ORDER_CON = MODULE_NAME_ORDER+RabbitmqConfig.QUEUE;
+//    public final static String BINDING_ORDER_CON = MODULE_NAME_ORDER+RabbitmqConfig.BINDING;
+//
+//    @Bean(name = CONNECTION_ORDER_CON)
+//    @Primary
+//    public ConnectionFactory connectionFactory(){
+//        return rabbitmqConfig.connectionFactory(NAME_ORDER);
+//    }
+//
+//    @Bean(name = TEMPLATE_ORDER_CON)
+//    @Primary
+//    public RabbitTemplate rabbitTemplate(@Qualifier(CONNECTION_ORDER_CON) ConnectionFactory connectionFactory ) {
+//        return rabbitmqConfig.rabbitTemplate(connectionFactory);
+//    }
+//
+//    @Bean(name = LISTENER_ORDER_CON)
+//    @Primary
+//    public SimpleRabbitListenerContainerFactory listenerFactory(
+//            SimpleRabbitListenerContainerFactoryConfigurer configurer,
+//            @Qualifier(CONNECTION_ORDER_CON) ConnectionFactory connectionFactory) {
+//        return rabbitmqConfig.listenerFactory(configurer,connectionFactory);
+//    }
+//
+//    @Bean(name = ADMIN_ORDER_CON)
+//    @Primary
+//    AmqpAdmin amqpAdmin(@Qualifier(CONNECTION_ORDER_CON) ConnectionFactory connectionFactory) {
+//        return new RabbitAdmin(connectionFactory);
+//    }
+//
+//    @Bean(EXCHANGE_ORDER_CON)
+//    @Primary
+//    public DirectExchange exchange(@Qualifier(ADMIN_ORDER_CON) AmqpAdmin amqpAdmin) {
+//        return rabbitmqConfig.exchange(NAME_ORDER,amqpAdmin);
+//    }
+//
+//    @Bean(QUEUE_ORDER_CON)
+//    @Primary
+//    Queue queue(@Qualifier(ADMIN_ORDER_CON)AmqpAdmin amqpAdmin) {
+//        return rabbitmqConfig.queue(NAME_ORDER,amqpAdmin);
+//    }
+//
+//    @Bean(BINDING_ORDER_CON)
+//    @Primary
+//    Binding bindingPersonDirect(@Qualifier(ADMIN_ORDER_CON)AmqpAdmin amqpAdmin) {
+//        Binding binding = BindingBuilder.bind(queue(amqpAdmin)).to(exchange(amqpAdmin)).with(NAME_ORDER);
+//        binding.setAdminsThatShouldDeclare(amqpAdmin);
+//        return binding;
+//    }
+//}

eladmin-system/src/main/java/me/zhengjie/config/rabbitmq/order/OrederProduce.java → eladmin-system/src/main/java/me/zhengjie/config/rabbitmq/order/OrderProduce.java

@@ -15,11 +15,11 @@ import org.springframework.context.annotation.Configuration;
 
 @Data
 @Configuration
-public class OrederProduce {
+public class OrderProduce {
     @Autowired
     private RabbitmqConfig rabbitmqConfig;
     public static final String NAME_ORDER = "dish_trade_produce";
-    public final static String MODULE_NAME_ORDER = "returnC";
+    public final static String MODULE_NAME_ORDER = "dish_t_p";
 
     public final static String CONNECTION_ORDER = MODULE_NAME_ORDER+RabbitmqConfig.CONNECTION;
     public final static String TEMPLATE_ORDER = MODULE_NAME_ORDER+ RabbitmqConfig.TEMPLATE;

eladmin-system/src/main/java/me/zhengjie/config/rabbitmq/test/ListenerTemplate.java

@@ -1,24 +1,37 @@
 package me.zhengjie.config.rabbitmq.test;
 
+import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.util.IdUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import me.zhengjie.config.rabbitmq.cuisine.CuisineConsumer;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alipay.api.domain.OrderItem;
 import me.zhengjie.config.rabbitmq.cuisine.CuisineProduce;
-import me.zhengjie.config.rabbitmq.order.OrderConsumer;
-import me.zhengjie.config.rabbitmq.order.OrederProduce;
+import me.zhengjie.config.rabbitmq.order.OrderProduce;
 import me.zhengjie.modules.dm.daypc.domain.DmDayPc;
 import me.zhengjie.modules.dm.daypc.service.DmDayPcService;
+import me.zhengjie.modules.dm.food.domain.DmFood;
 import me.zhengjie.modules.dm.food.service.DmFoodService;
+import me.zhengjie.modules.dm.order.domain.DmOrderItem;
+import me.zhengjie.modules.dm.order.domain.DmOrderPayment;
+import me.zhengjie.modules.dm.order.domain.DmOrderRecord;
+import me.zhengjie.modules.dm.order.service.DmOrderItemService;
+import me.zhengjie.modules.dm.order.service.DmOrderPaymentService;
 import me.zhengjie.modules.dm.order.service.DmOrderRecordService;
 import me.zhengjie.modules.dm.order.service.dto.DmExpenseCalendar;
+import me.zhengjie.modules.system.domain.Dept;
+import me.zhengjie.modules.system.domain.User;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.amqp.core.Message;
+import org.springframework.stereotype.Component;
 
-import java.sql.Timestamp;
+import java.io.UnsupportedEncodingException;
 import java.util.List;
+import java.util.UUID;
 
-@Configurable
+@Component
 public class ListenerTemplate {
     @Autowired
     DmDayPcService dmDayPcService;
@@ -26,46 +39,114 @@ public class ListenerTemplate {
     DmFoodService dmFoodService;
     @Autowired
     DmOrderRecordService dmOrderRecordService;
+    @Autowired
+    DmOrderItemService dmOrderItemService;
+    @Autowired
+    DmOrderPaymentService dmOrderPaymentService;
 
-    @RabbitListener(queues = CuisineConsumer.NAME, containerFactory = CuisineConsumer.LISTENER_CON)
-    public void dealDeclareMessage(Message message) {
-        System.out.println("接受到的消息pc"+message);
-        String str = String.valueOf(message);
-        if (str!=null){
-            System.out.println("receive:"+str);
-        }else {
-            System.out.println("receive(null):"+ str);
-        }
+    @RabbitListener(queues = CuisineProduce.NAME, containerFactory = CuisineProduce.LISTENER)
+    public void dealDeclareMessage(Message message) throws UnsupportedEncodingException {
+        String str = new String(message.getBody(),"utf-8");
+        System.out.println("receivePc:"+str);
+        JSONObject jsonObject = JSONObject.parseObject(str);
+        JSONArray array = jsonObject.getJSONArray("list");
+        System.out.println("listData"+array);
         try {
-            List<DmDayPc> list = JSONArray.parseArray(str, DmDayPc.class);
-            for (DmDayPc dmDayPc : list) {
-                dmDayPc.setPcdate(new Timestamp(System.currentTimeMillis()));
+            for (int i = 0; i < array.size(); i++) {
+                Snowflake snowflake = IdUtil.createSnowflake(1, 1);
+                JSONObject attendance = array.getJSONObject(i);
+                DmDayPc dmDayPc = new DmDayPc();
+
+                dmDayPc.setId(snowflake.nextId());
+                dmDayPc.setTimes(attendance.getString("times"));
+                dmDayPc.setPrice(attendance.getBigDecimal("price"));
+                dmDayPc.setQtyBook(attendance.getString("qty_book"));
+                dmDayPc.setWindow(attendance.getInteger("window"));
+                dmDayPc.setState(attendance.getString("state"));
+                dmDayPc.setName(attendance.getString("name"));
+                dmDayPc.setCate(attendance.getInteger("cate"));
+                dmDayPc.setPid(attendance.getLong("pid"));
+                dmDayPc.setGoods(attendance.getString("goods"));
+                dmDayPc.setBarcode(attendance.getString("barcode"));
+                dmDayPc.setNo(attendance.getString("no"));
+                dmDayPc.setPinyin(attendance.getString("pinyin"));
+                dmDayPc.setPstate(attendance.getInteger("pstate"));
+                dmDayPc.setWindowName(attendance.getString("window_name"));
+                dmDayPc.setCateName(attendance.getString("cate_name"));
+
                 dmDayPcService.create(dmDayPc);
-                System.out.println("新增food===" + dmDayPc.getFood());
-                dmFoodService.create(dmDayPc.getFood());
+                System.out.println("新增dmDayPc===" + dmDayPc);
+                DmFood dmFood = new DmFood();
+                dmFood.setId(dmDayPc.getPid());
+                dmFood.setName(dmDayPc.getName());
+                dmFood.setPrice(dmDayPc.getPrice());
+                dmFood.setType(dmDayPc.getCate().toString());
+                dmFood.setPstate(dmDayPc.getPstate());
+                dmFoodService.create(dmFood);
             }
         }catch (Exception ex){
-
+            ex.printStackTrace();
         }
     }
 
-    @RabbitListener(queues = OrderConsumer.NAME_ORDER, containerFactory = OrderConsumer.LISTENER_ORDER_CON)
-    public void dealDeclareOrderMessage(Message message) {
-        System.out.println("接受到的消息order"+message);
-        String str = String.valueOf(message);
-        if (str!=null){
-            System.out.println("receiveOrder:"+str);
-        }else {
-            System.out.println("receiveOrder(null):"+ str);
-        }
+    @RabbitListener(queues = OrderProduce.NAME_ORDER, containerFactory = OrderProduce.LISTENER_ORDER)
+    public void dealDeclareOrderMessage(Message message) throws UnsupportedEncodingException {
+        String str = new String(message.getBody(),"utf-8");
+        System.out.println("receiveOrder:"+str);
         try {
-            List<DmExpenseCalendar> dmOrderItem = JSONArray.parseArray(str, DmExpenseCalendar.class);
-            for (DmExpenseCalendar dmExpenseCalendar : dmOrderItem) {
-                dmOrderRecordService.createOrderItem(dmExpenseCalendar);
-                dmOrderRecordService.createOrderRecord(dmExpenseCalendar);
+            JSONObject attendance = JSONObject.parseObject(str);
+            DmOrderRecord dmExpenseCalendar = new DmOrderRecord();
+
+            dmExpenseCalendar.setSeq(attendance.getLong("seq"));
+            dmExpenseCalendar.setCreateDate(attendance.getTimestamp("create_date"));
+            dmExpenseCalendar.setCard(attendance.getString("card"));
+            dmExpenseCalendar.setCardNo(attendance.getString("card_no"));
+            dmExpenseCalendar.setType(attendance.getInteger("type"));
+            dmExpenseCalendar.setPart(attendance.getInteger("part"));
+            dmExpenseCalendar.setTerm(attendance.getInteger("term"));
+            dmExpenseCalendar.setShop(attendance.getInteger("shop"));
+            dmExpenseCalendar.setTermName(attendance.getString("term_name"));
+            dmExpenseCalendar.setShopName(attendance.getString("shop_name"));
+            dmExpenseCalendar.setAmt(attendance.getDouble("amt"));
+            dmExpenseCalendar.setBalance(attendance.getDouble("balance"));
+            dmExpenseCalendar.setAccount(attendance.getInteger("account"));
+            dmExpenseCalendar.setUserName(attendance.getString("name"));
+            dmExpenseCalendar.setMob(attendance.getString("mob"));
+            dmExpenseCalendar.setTel(attendance.getString("tel"));
+            dmExpenseCalendar.setCardProfile(attendance.getInteger("card_profile"));
+
+            String bh = UUID.randomUUID().toString();
+            DmOrderItem orderItem1 = new DmOrderItem();
+            orderItem1.setBh(bh);
+            dmExpenseCalendar.setOrderItem(orderItem1);//关联编号
+            JSONArray item = attendance.getJSONArray("details");
+            for (int i = 0; i < item.size(); i++) {
+                JSONObject userData = item.getJSONObject(i);
+                DmOrderItem dmOrderItem = new DmOrderItem();
+                DmFood dmFood = new DmFood();
+                dmFood.setId(userData.getLong("pid"));
+                dmOrderItem.setFood(dmFood);
+                dmOrderItem.setBh(bh);
+                dmOrderItem.setName(userData.getString("name"));
+                dmOrderItem.setPrice(userData.getString("price"));
+                dmOrderItem.setAmt(userData.getDouble("amt"));
+                dmOrderItemService.create(dmOrderItem);
             }
+            JSONArray payment = attendance.getJSONArray("payments");
+            for (int i = 0; i < payment.size(); i++) {
+                JSONObject userData = payment.getJSONObject(i);
+                DmOrderPayment dmOrderPayment = new DmOrderPayment();
+                dmOrderPayment.setBh(bh);
+                dmOrderPayment.setType(userData.getString("type"));
+                dmOrderPayment.setAmt(userData.getDouble("amt"));
+                dmOrderPayment.setBalance(userData.getDouble("balance"));
+                dmOrderPayment.setUid(userData.getString("uid"));
+                dmOrderPaymentService.create(dmOrderPayment);
+            }
+            dmOrderRecordService.create(dmExpenseCalendar);
         }catch (Exception ex){
-
+            ex.printStackTrace();
         }
     }
+
 }

eladmin-system/src/main/java/me/zhengjie/config/rabbitmq/test/SendTemplate.java

@@ -1,12 +1,11 @@
 package me.zhengjie.config.rabbitmq.test;
 
+
 import me.zhengjie.config.rabbitmq.cuisine.CuisineConsumer;
 import me.zhengjie.config.rabbitmq.cuisine.CuisineProduce;
-import me.zhengjie.config.rabbitmq.order.OrderConsumer;
-import me.zhengjie.config.rabbitmq.order.OrederProduce;
+import me.zhengjie.config.rabbitmq.order.OrderProduce;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
@@ -14,20 +13,21 @@ import org.springframework.stereotype.Component;
 public class SendTemplate {
 
     @Autowired
-    @Qualifier(CuisineProduce.TEMPLATE)
+    @Qualifier(CuisineConsumer.TEMPLATE_CON)
     private RabbitTemplate rabbitTemplate;
 
     @Autowired
-    @Qualifier(OrederProduce.TEMPLATE_ORDER)
+    @Qualifier(OrderProduce.TEMPLATE_ORDER)
     private RabbitTemplate rabbitTemplate1;
 
     public void sendMessage(Object message){
-        rabbitTemplate.convertAndSend(CuisineProduce.NAME, CuisineProduce.NAME, message);
-        System.out.println("排菜信息获取----消息发送到rabbitmq");
+        rabbitTemplate.convertAndSend(CuisineConsumer.NAME, CuisineConsumer.NAME, message.toString());
+        System.out.println("世贸发送消息----消息发送到rabbitmq");
+        System.out.println(message);
     }
 
-    public void sendOrederMessage(Object message){
-        rabbitTemplate1.convertAndSend(OrederProduce.NAME_ORDER, OrederProduce.NAME_ORDER, message);
-        System.out.println("消费记录获取----消息发送到rabbitmq");
+    public void  sendOrederMessage(Object message){
+        rabbitTemplate1.convertAndSend(OrderProduce.NAME_ORDER, OrderProduce.NAME_ORDER, message.toString());
+        System.out.println("雄伟发送消息----消息发送到rabbitmq");
     }
 }

eladmin-system/src/main/java/me/zhengjie/config/thread/ThreadPoolConfig.java

@@ -74,16 +74,16 @@ public class ThreadPoolConfig {
 //        return executor;
 //    }
 
-    @Bean("brianThreadPool")
-    public SimpleRabbitListenerContainerFactory containerFactory(SimpleRabbitListenerContainerFactoryConfigurer configurer, ConnectionFactory connectionFactory) {
-        SimpleRabbitListenerContainerFactory factory = new SimpleRabbitListenerContainerFactory();
-//        factory.setConcurrentConsumers(10);  //设置线程数
-//        factory.setMaxConcurrentConsumers(10); //最大线程数
-        //核心线程数
-        factory.setConcurrentConsumers(corePoolSize);
-        //最大线程数
-        factory.setMaxConcurrentConsumers(maxPoolSize);
-        configurer.configure(factory, connectionFactory);
-        return factory;
-    }
+//    @Bean("brianThreadPool")
+//    public SimpleRabbitListenerContainerFactory containerFactory(SimpleRabbitListenerContainerFactoryConfigurer configurer, ConnectionFactory connectionFactory) {
+//        SimpleRabbitListenerContainerFactory factory = new SimpleRabbitListenerContainerFactory();
+////        factory.setConcurrentConsumers(10);  //设置线程数
+////        factory.setMaxConcurrentConsumers(10); //最大线程数
+//        //核心线程数
+//        factory.setConcurrentConsumers(corePoolSize);
+//        //最大线程数
+//        factory.setMaxConcurrentConsumers(maxPoolSize);
+//        configurer.configure(factory, connectionFactory);
+//        return factory;
+//    }
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/camera/rest/DmCameraController.java

@@ -91,6 +91,6 @@ public class DmCameraController {
     @ApiOperation("判断dmCamera是否存在相同Code")
     public ResponseEntity<Object> checkCode(@RequestBody Map<String,String> params) {
         int count  = dmCameraService.checkCode(params.get("code"),params.get("id")==null?null:Long.parseLong(params.get("id")));
-        return new ResponseEntity<>(count>0?true:false,HttpStatus.OK);
+        return new ResponseEntity<>(count > 0,HttpStatus.OK);
     }
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/camera/service/impl/DmCameraServiceImpl.java

@@ -115,5 +115,5 @@ public class DmCameraServiceImpl implements DmCameraService {
     }
 
     @Override
-    public int checkCode(String code,Long id){ return dmCameraRepository.checkCode(code,id); };
+    public int checkCode(String code,Long id){ return dmCameraRepository.checkCode(code,id); }
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/daypc/domain/DmDayPc.java

@@ -19,8 +19,10 @@ import lombok.Data;
 import cn.hutool.core.bean.BeanUtil;
 import io.swagger.annotations.ApiModelProperty;
 import cn.hutool.core.bean.copier.CopyOptions;
+import me.zhengjie.base.BaseEntity;
 import me.zhengjie.modules.dm.food.domain.DmFood;
 import me.zhengjie.modules.dm.rfidTableware.domain.DmRfidTableware;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.*;
 import javax.validation.constraints.*;
@@ -41,18 +43,18 @@ import java.util.Date;
 public class DmDayPc implements Serializable {
 
     @Id
-    @Column(name = "id")
-    @ApiModelProperty(value = "id")
+    @Column(name = "pcid")
+    @ApiModelProperty(value = "pcid")
     private Long id;
 
-    @OneToOne
-    @JoinColumn(name = "pid")
+//    @OneToOne
+    @Column(name = "pid")
     @ApiModelProperty(value = "菜品id")
-    private DmFood food;
-//    private Integer pid;
+//    private DmFood food;
+    private Long pid;
 
     @OneToOne
-    @JoinColumn(name = "cpid")
+    @JoinColumn(name = "id",referencedColumnName = "id")
     @ApiModelProperty(value = "餐盘id")
     private DmRfidTableware rfidTableware;
 //    private Integer cpid;
@@ -61,6 +63,26 @@ public class DmDayPc implements Serializable {
     @ApiModelProperty(value = "菜品名称")
     private String name;
 
+    @Column(name = "state")
+    @ApiModelProperty(value = "state")
+    private String state;
+
+    @Column(name = "goods")
+    @ApiModelProperty(value = "goods")
+    private String goods;
+
+    @Column(name = "barcode")
+    @ApiModelProperty(value = "barcode")
+    private String barcode;
+
+    @Column(name = "no")
+    @ApiModelProperty(value = "no")
+    private String no;
+
+    @Column(name = "pinyin")
+    @ApiModelProperty(value = "pinyin")
+    private String pinyin;
+
     @Column(name = "price")
     @ApiModelProperty(value = "价格")
     private BigDecimal price;
@@ -69,6 +91,10 @@ public class DmDayPc implements Serializable {
     @ApiModelProperty(value = "餐别")
     private String times;
 
+    @Column(name = "qty_book")
+    @ApiModelProperty(value = "餐别")
+    private String qtyBook;
+
     @Column(name = "cate")
     @ApiModelProperty(value = "菜品分类id")
     private Integer cate;
@@ -91,11 +117,12 @@ public class DmDayPc implements Serializable {
 
     @Column(name = "seq")
     @ApiModelProperty(value = "流水号")
-    private String seq;
+    private Long seq;
 
-    @Column(name = "pcdate")
+    @Column(name = "date")
     @ApiModelProperty(value = "日期")
-    private Timestamp pcdate;
+    @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    private Timestamp date;
 
     @Column(name = "shopname")
     @ApiModelProperty(value = "餐厅名称")
@@ -104,8 +131,4 @@ public class DmDayPc implements Serializable {
     public void copy(DmDayPc source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }
-    @PrePersist
-    public void prePersist() {
-        this.pcdate = new Timestamp(new Date().getTime());
-    }
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/daypc/repository/DmDayPcRepository.java

@@ -31,12 +31,12 @@ import java.util.Map;
 **/
 public interface DmDayPcRepository extends JpaRepository<DmDayPc, Long>, JpaSpecificationExecutor<DmDayPc> {
 
-    @Query(value = "SELECT DISTINCT a.`id`, `pid`, `cpid`, a.`name`, a.`price`, `times`, `cate`, `cate_name`, `window`, `window_name`, `pstate`, " +
-            "`seq`, `pcdate`, `shopname`,0 as `food.id`,null as `food.code`,null as `food.name`,null as `food.type`,null as `food.price`," +
-            "null as `food.picture`,null as `food.remark`,null as `food.create_by`,null as `food.update_by`,null as `food.create_time`," +
-            "null as `food.update_time`,0 as `food.num` FROM dm_day_pc a " +
-            "LEFT JOIN dm_food b ON a.pid=b.id " +
-            "WHERE date_format(pcdate,'%Y-%m-%d') = date_format(now(),'%Y-%m-%d') ",nativeQuery = true)
+    @Query(value = "SELECT DISTINCT a.`pcid`, `pid`, a.`id`, a.`name`, a.`price`, `times`, `cate`, `cate_name`," +
+            " `window`, `window_name`, a.`pstate`, `seq`, `date`, `shopname`,0 as `food.id`,null as `food.code`," +
+            "null as `food.name`,null as `food.type`,null as `food.price`,null as `food.picture`,null as `food.remark`," +
+            "null as `food.create_by`,null as `food.update_by`,null as `food.create_time`,null as `food.update_time`," +
+            "0 as `food.num` FROM dm_day_pc a LEFT JOIN dm_food b ON a.pid=b.id " +
+            "WHERE date_format(date,'%Y-%m-%d') = date_format(now(),'%Y-%m-%d') ",nativeQuery = true)
     List<DmDayPc> foodRepository();
 
     /**

eladmin-system/src/main/java/me/zhengjie/modules/dm/daypc/rest/DmDayPcController.java

@@ -42,7 +42,6 @@ import javax.servlet.http.HttpServletResponse;
 public class DmDayPcController {
 
     private final DmDayPcService dmDayPcService;
-//    private final SendMsg sendMsg;
 
     @Log("导出数据")
     @ApiOperation("导出数据")

eladmin-system/src/main/java/me/zhengjie/modules/dm/daypc/rest/ReceiveMsg.java

@@ -1,126 +1,126 @@
-package me.zhengjie.modules.dm.daypc.rest;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.databind.ObjectMapper;
-//import com.rabbitmq.client.*;
-import com.rabbitmq.client.Connection;
-import lombok.SneakyThrows;
-import me.zhengjie.config.thread.ThreadPoolConfig;
-import me.zhengjie.modules.dm.daypc.domain.DmDayPc;
-import me.zhengjie.modules.dm.daypc.service.DmDayPcService;
-import me.zhengjie.modules.dm.food.domain.DmFood;
-import me.zhengjie.modules.dm.food.service.DmFoodService;
-import me.zhengjie.utils.ConnectionUtil;
-import org.springframework.amqp.core.AcknowledgeMode;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-import org.springframework.stereotype.Component;
-
-import java.io.*;
-import java.sql.*;
-import java.text.*;
-import java.util.*;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-
-@Component
-public class ReceiveMsg {
-//    private final static String SCHEDULE_PRODUCE = "schedule_produce";
-    @Autowired
-    private DmDayPcService dmDayPcService;
-    @Autowired
-    private DmFoodService dmFoodService;
-    @Autowired
-    RabbitTemplate rabbitTemplate;
-    private static String isEable = "0";
-
-//    //每天10点执行
-//    @Scheduled(cron = "0 0 10 * * ?")
-//    //异步执行,指定线程池(配置类里配置)
-//    @Async("threadPoolTaskExecutor1")
-//    public void timer(){
-//        isEable = "1";
-//    }
+//package me.zhengjie.modules.dm.daypc.rest;
 //
-//    //每五分钟执行一次
-//    @Scheduled(cron = "0 */5 * * * ?")
-//    @Async("threadPoolTaskExecutor2")
-//    public void timer2(){
-//        if(isEable!=null&&isEable=="1"){
-//            receive();
-//            isEable = "0";
-//        }
-//    }
-
-    /**
-     * 消费者
-     */
-//    @RabbitListener(queues = "schedule_produce",containerFactory = "brianThreadPool")
-    public void receive(byte[] msg){
-//        Connection connection = ConnectionUtil.getConnection();
-//        try {
-//            Channel channel = connection.createChannel();
-//            //通过consumer来处理数据
-//            Consumer consumer = new DefaultConsumer(channel){
-//                @SneakyThrows
-//                @Override
-//                public void handleDelivery(String consumerTag, Envelope envelope, AMQP.BasicProperties properties, byte[] body) throws IOException {
-//                    //body就是从队列中获取的数据
-                    String str = new String(msg);
-
-                    if (str!=null){
-                        System.out.println("receive:"+str);
-                    }else {
-                        System.out.println("receive(null):"+ str);
-                    }
-                    try {
-                        List<DmDayPc> list = JSONArray.parseArray(str, DmDayPc.class);
-                        for (DmDayPc dmDayPc : list) {
-                            dmDayPc.setPcdate(new Timestamp(System.currentTimeMillis()));
-                            dmDayPcService.create(dmDayPc);
-                            System.out.println("新增food===" + dmDayPc.getFood());
-                            dmFoodService.create(dmDayPc.getFood());
-                        }
-                    }catch (Exception ex){
-
-                    }
-//                }
-//            };
-//            //参数1：接收哪个队列的数据
-//            //参数2：消息确认 是否应答，收到消息是否回复
-//            //参数3：
-//            System.out.println();
-//            channel.basicConsume("schedule_produce",true,consumer);
-//        } catch (IOException e) {
-//            e.printStackTrace();
-//        }
-    }
-
-//    public SimpleRabbitListenerContainerFactory firstListenerFactory(
-//            SimpleRabbitListenerContainerFactoryConfigurer configurer,
-//            @Qualifier("firstConnectionFactory") ConnectionFactory connectionFactory) {
-//        SimpleRabbitListenerContainerFactory listenerContainerFactory = new SimpleRabbitListenerContainerFactory();
-//        //设置手动ack
-//        listenerContainerFactory.setAcknowledgeMode(AcknowledgeMode.MANUAL);
-//        configurer.configure(listenerContainerFactory, connectionFactory);
-//        return listenerContainerFactory;
-//    }
-
-//    public  Object getObjectFromBytes(byte[] objBytes) throws Exception {
-//        if (objBytes == null || objBytes.length == 0) {
-//            return null;
-//        }
-//        ByteArrayInputStream bi = new ByteArrayInputStream(objBytes);
-//        ObjectInputStream oi = new ObjectInputStream(bi);
-//        return oi.readObject();
+//import com.alibaba.fastjson.JSON;
+//import com.alibaba.fastjson.JSONArray;
+//import com.alibaba.fastjson.JSONObject;
+//import com.fasterxml.jackson.databind.ObjectMapper;
+////import com.rabbitmq.client.*;
+//import com.rabbitmq.client.Connection;
+//import lombok.SneakyThrows;
+//import me.zhengjie.config.thread.ThreadPoolConfig;
+//import me.zhengjie.modules.dm.daypc.domain.DmDayPc;
+//import me.zhengjie.modules.dm.daypc.service.DmDayPcService;
+//import me.zhengjie.modules.dm.food.domain.DmFood;
+//import me.zhengjie.modules.dm.food.service.DmFoodService;
+//import me.zhengjie.utils.ConnectionUtil;
+//import org.springframework.amqp.core.AcknowledgeMode;
+//import org.springframework.amqp.rabbit.annotation.RabbitListener;
+//import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
+//import org.springframework.amqp.rabbit.core.RabbitTemplate;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.beans.factory.annotation.Qualifier;
+//import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
+//import org.springframework.scheduling.annotation.Async;
+//import org.springframework.scheduling.annotation.Scheduled;
+//import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+//import org.springframework.stereotype.Component;
+//
+//import java.io.*;
+//import java.sql.*;
+//import java.text.*;
+//import java.util.*;
+//import java.util.concurrent.ExecutionException;
+//import java.util.concurrent.Future;
+//
+//@Component
+//public class ReceiveMsg {
+////    private final static String SCHEDULE_PRODUCE = "schedule_produce";
+//    @Autowired
+//    private DmDayPcService dmDayPcService;
+//    @Autowired
+//    private DmFoodService dmFoodService;
+////    @Autowired
+////    RabbitTemplate rabbitTemplate;
+//    private static String isEable = "0";
+//
+////    //每天10点执行
+////    @Scheduled(cron = "0 0 10 * * ?")
+////    //异步执行,指定线程池(配置类里配置)
+////    @Async("threadPoolTaskExecutor1")
+////    public void timer(){
+////        isEable = "1";
+////    }
+////
+////    //每五分钟执行一次
+////    @Scheduled(cron = "0 */5 * * * ?")
+////    @Async("threadPoolTaskExecutor2")
+////    public void timer2(){
+////        if(isEable!=null&&isEable=="1"){
+////            receive();
+////            isEable = "0";
+////        }
+////    }
+//
+//    /**
+//     * 消费者
+//     */
+////    @RabbitListener(queues = "schedule_produce",containerFactory = "brianThreadPool")
+//    public void receive(byte[] msg){
+////        Connection connection = ConnectionUtil.getConnection();
+////        try {
+////            Channel channel = connection.createChannel();
+////            //通过consumer来处理数据
+////            Consumer consumer = new DefaultConsumer(channel){
+////                @SneakyThrows
+////                @Override
+////                public void handleDelivery(String consumerTag, Envelope envelope, AMQP.BasicProperties properties, byte[] body) throws IOException {
+////                    //body就是从队列中获取的数据
+//                    String str = new String(msg);
+//
+//                    if (str!=null){
+//                        System.out.println("receive:"+str);
+//                    }else {
+//                        System.out.println("receive(null):"+ str);
+//                    }
+//                    try {
+//                        List<DmDayPc> list = JSONArray.parseArray(str, DmDayPc.class);
+//                        for (DmDayPc dmDayPc : list) {
+//                            dmDayPc.setPcdate(new Timestamp(System.currentTimeMillis()));
+//                            dmDayPcService.create(dmDayPc);
+//                            System.out.println("新增food===" + dmDayPc.getFood());
+//                            dmFoodService.create(dmDayPc.getFood());
+//                        }
+//                    }catch (Exception ex){
+//
+//                    }
+////                }
+////            };
+////            //参数1：接收哪个队列的数据
+////            //参数2：消息确认 是否应答，收到消息是否回复
+////            //参数3：
+////            System.out.println();
+////            channel.basicConsume("schedule_produce",true,consumer);
+////        } catch (IOException e) {
+////            e.printStackTrace();
+////        }
 //    }
-}
+//
+////    public SimpleRabbitListenerContainerFactory firstListenerFactory(
+////            SimpleRabbitListenerContainerFactoryConfigurer configurer,
+////            @Qualifier("firstConnectionFactory") ConnectionFactory connectionFactory) {
+////        SimpleRabbitListenerContainerFactory listenerContainerFactory = new SimpleRabbitListenerContainerFactory();
+////        //设置手动ack
+////        listenerContainerFactory.setAcknowledgeMode(AcknowledgeMode.MANUAL);
+////        configurer.configure(listenerContainerFactory, connectionFactory);
+////        return listenerContainerFactory;
+////    }
+//
+////    public  Object getObjectFromBytes(byte[] objBytes) throws Exception {
+////        if (objBytes == null || objBytes.length == 0) {
+////            return null;
+////        }
+////        ByteArrayInputStream bi = new ByteArrayInputStream(objBytes);
+////        ObjectInputStream oi = new ObjectInputStream(bi);
+////        return oi.readObject();
+////    }
+//}

eladmin-system/src/main/java/me/zhengjie/modules/dm/daypc/rest/SendMsg.java

@@ -1,106 +1,106 @@
-package me.zhengjie.modules.dm.daypc.rest;
-
-import com.alibaba.fastjson.JSON;
-import com.rabbitmq.client.BuiltinExchangeType;
-import com.rabbitmq.client.Channel;
-import com.rabbitmq.client.Connection;
-import me.zhengjie.modules.dm.daypc.domain.DmDayPc;
-import me.zhengjie.modules.dm.daypc.service.DmDayPcService;
-import me.zhengjie.modules.dm.daypc.service.dto.DmDayPcDto;
-import me.zhengjie.utils.ConnectionUtil;
-import me.zhengjie.utils.SpringContextHolder;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.amqp.core.AmqpTemplate;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeoutException;
-
-//@SpringBootTest
-//@RunWith(SpringRunner.class)
-@Component
-public class SendMsg {
-    @Autowired
-    RabbitTemplate rabbitTemplate;
-    @Autowired
-    DmDayPcService dmDayPcService;
-    private static String isEable = "0";
-
-    //每天10点执行
-//    @Scheduled(cron = "0 0 10 * * ?")
-//    //异步执行,指定线程池(配置类里配置)
-//    @Async("threadPoolTaskExecutor1")
-//    public void timer(){
-//        isEable = "1";
-//    }
+//package me.zhengjie.modules.dm.daypc.rest;
 //
-//    //每五分钟执行一次
-//    @Scheduled(cron = "0 */5 * * * ?")
-//    @Async("threadPoolTaskExecutor2")
-//    public void timer2(){
-//        if(isEable!=null&&isEable=="1"){
-//            send();
-//            isEable = "0";
-//        }
-//    }
-
-
-
-//    @Test
-    public void send(){
-        //获取连接
-//        Connection connection = ConnectionUtil.getConnection();
-//        try {
-
-//            List<DmDayPc> dmDayPc = dmDayPcService.foodRepository();
-        String userString = "sendtest";
-//            String userString = JSON.toJSONString(dmDayPc);
-//            Channel channel = connection.createChannel();
-//            String exchangeName = "schedule_produce";//交换机
-//            channel.exchangeDeclare(exchangeName, BuiltinExchangeType.DIRECT, true,false, null);
-//            String queue1Name = "schedule_produce";//队列名称
-//            channel.queueDeclare(queue1Name, true, false, false, null);
-//            channel.queueBind(queue1Name, exchangeName, "schedule_produce");// 队列绑定hello路由
-//            channel.basicPublish(exchangeName, "schedule_produce", null, userString.getBytes());
-        /**
-         * 参数：
-         * 1、交换机名称
-         * 2、routingKey
-         * 3、消息内容
-         */
-//            rabbitTemplate.convertAndSend("schedule_produce", "inform.email", userString.getBytes(StandardCharsets.UTF_8));
-//            System.out.println("sned排菜:"+dmDayPc);
-            System.out.println("sned排菜string:"+userString);
-//            channel.close();
-//            connection.close();
-//        } catch (IOException | TimeoutException e) {
-//            e.printStackTrace();
-//        }
-    }
-
-    //对象转化为字节码
-//    public  byte[] getBytesFromObject(Serializable obj) throws Exception {
-//        if (obj == null) {
-//            return null;
-//        }
-//        ByteArrayOutputStream bo = new ByteArrayOutputStream();
-//        ObjectOutputStream oo = new ObjectOutputStream(bo);
-//        oo.writeObject(obj);
-//        return bo.toByteArray();
+//import com.alibaba.fastjson.JSON;
+//import com.rabbitmq.client.BuiltinExchangeType;
+//import com.rabbitmq.client.Channel;
+//import com.rabbitmq.client.Connection;
+//import me.zhengjie.modules.dm.daypc.domain.DmDayPc;
+//import me.zhengjie.modules.dm.daypc.service.DmDayPcService;
+//import me.zhengjie.modules.dm.daypc.service.dto.DmDayPcDto;
+//import me.zhengjie.utils.ConnectionUtil;
+//import me.zhengjie.utils.SpringContextHolder;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//import org.springframework.amqp.core.AmqpTemplate;
+//import org.springframework.amqp.rabbit.annotation.RabbitListener;
+//import org.springframework.amqp.rabbit.core.RabbitTemplate;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.test.context.SpringBootTest;
+//import org.springframework.scheduling.annotation.Async;
+//import org.springframework.scheduling.annotation.Scheduled;
+//import org.springframework.stereotype.Component;
+//import org.springframework.test.context.junit4.SpringRunner;
+//
+//import java.io.ByteArrayOutputStream;
+//import java.io.IOException;
+//import java.io.ObjectOutputStream;
+//import java.io.Serializable;
+//import java.nio.charset.StandardCharsets;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//import java.util.concurrent.TimeoutException;
+//
+////@SpringBootTest
+////@RunWith(SpringRunner.class)
+//@Component
+//public class SendMsg {
+////    @Autowired
+////    RabbitTemplate rabbitTemplate;
+//    @Autowired
+//    DmDayPcService dmDayPcService;
+//    private static String isEable = "0";
+//
+//    //每天10点执行
+////    @Scheduled(cron = "0 0 10 * * ?")
+////    //异步执行,指定线程池(配置类里配置)
+////    @Async("threadPoolTaskExecutor1")
+////    public void timer(){
+////        isEable = "1";
+////    }
+////
+////    //每五分钟执行一次
+////    @Scheduled(cron = "0 */5 * * * ?")
+////    @Async("threadPoolTaskExecutor2")
+////    public void timer2(){
+////        if(isEable!=null&&isEable=="1"){
+////            send();
+////            isEable = "0";
+////        }
+////    }
+//
+//
+//
+////    @Test
+//    public void send(){
+//        //获取连接
+////        Connection connection = ConnectionUtil.getConnection();
+////        try {
+//
+////            List<DmDayPc> dmDayPc = dmDayPcService.foodRepository();
+//        String userString = "sendtest";
+////            String userString = JSON.toJSONString(dmDayPc);
+////            Channel channel = connection.createChannel();
+////            String exchangeName = "schedule_produce";//交换机
+////            channel.exchangeDeclare(exchangeName, BuiltinExchangeType.DIRECT, true,false, null);
+////            String queue1Name = "schedule_produce";//队列名称
+////            channel.queueDeclare(queue1Name, true, false, false, null);
+////            channel.queueBind(queue1Name, exchangeName, "schedule_produce");// 队列绑定hello路由
+////            channel.basicPublish(exchangeName, "schedule_produce", null, userString.getBytes());
+//        /**
+//         * 参数：
+//         * 1、交换机名称
+//         * 2、routingKey
+//         * 3、消息内容
+//         */
+////            rabbitTemplate.convertAndSend("schedule_produce", "inform.email", userString.getBytes(StandardCharsets.UTF_8));
+////            System.out.println("sned排菜:"+dmDayPc);
+//            System.out.println("sned排菜string:"+userString);
+////            channel.close();
+////            connection.close();
+////        } catch (IOException | TimeoutException e) {
+////            e.printStackTrace();
+////        }
 //    }
-}
+//
+//    //对象转化为字节码
+////    public  byte[] getBytesFromObject(Serializable obj) throws Exception {
+////        if (obj == null) {
+////            return null;
+////        }
+////        ByteArrayOutputStream bo = new ByteArrayOutputStream();
+////        ObjectOutputStream oo = new ObjectOutputStream(bo);
+////        oo.writeObject(obj);
+////        return bo.toByteArray();
+////    }
+//}

eladmin-system/src/main/java/me/zhengjie/modules/dm/daypc/service/dto/DmDayPcDto.java

@@ -15,6 +15,7 @@
 */
 package me.zhengjie.modules.dm.daypc.service.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.sql.Timestamp;
 import java.math.BigDecimal;
@@ -24,6 +25,8 @@ import com.alibaba.fastjson.serializer.ToStringSerializer;
 import me.zhengjie.modules.dm.food.domain.DmFood;
 import me.zhengjie.modules.dm.rfidTableware.domain.DmRfidTableware;
 
+import javax.persistence.Column;
+
 /**
 * @website https://el-admin.vip
 * @description /
@@ -38,8 +41,8 @@ public class DmDayPcDto implements Serializable {
     private Long id;
 
     /** 菜品id */
-//    private Integer pid;
-    private DmFood food;
+    private Long pid;
+//    private DmFood food;
 
     /** 餐盘id */
 //    private Integer cpid;
@@ -48,12 +51,24 @@ public class DmDayPcDto implements Serializable {
     /** 菜品名称 */
     private String name;
 
+    private String state;
+
+    private String goods;
+
+    private String barcode;
+
+    private String no;
+
+    private String pinyin;
+
     /** 价格 */
     private BigDecimal price;
 
     /** 餐别 */
     private String times;
 
+    private String qtyBook;
+
     /** 菜品分类id */
     private Integer cate;
 
@@ -70,10 +85,10 @@ public class DmDayPcDto implements Serializable {
     private Integer pstate;
 
     /** 流水号 */
-    private String seq;
+    private Long seq;
 
     /** 日期 */
-    private Timestamp pcdate;
+    private Timestamp date;
 
     /** 餐厅名称 */
     private String shopname;

eladmin-system/src/main/java/me/zhengjie/modules/dm/daypc/service/dto/DmDayPcQueryCriteria.java

@@ -31,8 +31,8 @@ public class DmDayPcQueryCriteria{
     /** 模糊 */
 //    @Query(type = Query.Type.INNER_LIKE)
 //    private Integer cpid;
-    @Query(propName = "cpid", type = Query.Type.INNER_LIKE, joinName = "rfidTableware")
-    private Integer cpid;
+    @Query(propName = "name",  joinName = "rfidTableware")//type = Query.Type.INNER_LIKE,
+    private String rfName;
 
     /** 模糊 */
     @Query(type = Query.Type.INNER_LIKE)
@@ -47,6 +47,6 @@ public class DmDayPcQueryCriteria{
     private String cateName;
 
     /** 精确 */
-    @Query
-    private Timestamp pcdate;
+    @Query(type = Query.Type.BETWEEN)
+    private List<Timestamp> date;
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/daypc/service/impl/DmDayPcServiceImpl.java

@@ -78,61 +78,6 @@ public class DmDayPcServiceImpl implements DmDayPcService {
         return dmDayPcMapper.toDto(dmDayPcRepository.save(resources));
     }
 
-    /**
-     * 生产者
-     * @throws Exception
-     */
-//    public void rabbitDayPcScz() throws Exception{
-//        // 获取到连接以及mq通道
-//        Connection connections = ConnectionUtil.getConnection();
-//        // 从连接中创建通道
-//        Channel channel = connections.createChannel();
-//        // 声明（创建）队列
-//        channel.queueDeclare(SCHEDULE_PRODUCE, false, false, false, null);
-//        // 消息内容
-//        List list = queryAll(null);
-//        byte[] bytes = new byte[list.size()];
-//        int i = 0;
-//        Iterator<Byte> iterator = list.iterator();
-//        while (iterator.hasNext()) {
-//            bytes[i] = iterator.next();
-//            i++;
-//        }
-//        System.out.println("生产者"+bytes);
-//        channel.basicPublish("", SCHEDULE_PRODUCE, null, bytes);
-//        //关闭通道和连接
-//        channel.close();
-//        connections.close();
-//    }
-
-    /**
-     * 消费者
-     * @throws Exception
-     */
-//    public void rabbitDayPcXfz() throws Exception {
-//        // 获取到连接以及mq通道
-//        Connection connection = ConnectionUtil.getConnection();
-//        // 从连接中创建通道
-//        Channel channel = connection.createChannel();
-//        // 声明队列
-//        channel.queueDeclare(SCHEDULE_PRODUCE, false, false, false, null);
-//        // 定义队列的消费者
-//        QueueingConsumer consumer = new QueueingConsumer(channel);
-//        // 监听队列
-//        channel.basicConsume(SCHEDULE_PRODUCE, true, consumer);
-//        // 获取消息
-//        List abyte = null;
-//        while (true) {
-//            QueueingConsumer.Delivery delivery = consumer.nextDelivery();
-//            byte[] bytes = delivery.getBody();
-//            abyte = new ArrayList();
-//            for (byte b: bytes) {
-//                abyte.add(b);
-//            }
-//            System.out.println("消费者"+abyte);
-//        }
-//    }
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(DmDayPc resources) {
@@ -154,8 +99,8 @@ public class DmDayPcServiceImpl implements DmDayPcService {
         List<Map<String, Object>> list = new ArrayList<>();
         for (DmDayPcDto dmDayPc : all) {
             Map<String,Object> map = new LinkedHashMap<>();
-            map.put("菜品id", dmDayPc.getFood().getId());//.getPid()
-            map.put("餐盘id", dmDayPc.getRfidTableware().getId());//.getCpid()
+            map.put("菜品id", dmDayPc.getPid());//.getPid()
+//            map.put("餐盘id", dmDayPc.getRfidTableware().getId());//.getCpid()
             map.put("菜品名称", dmDayPc.getName());
             map.put("价格", dmDayPc.getPrice());
             map.put("餐别", dmDayPc.getTimes());
@@ -165,7 +110,7 @@ public class DmDayPcServiceImpl implements DmDayPcService {
             map.put("档口名称", dmDayPc.getWindowName());
             map.put("菜品状态", dmDayPc.getPstate());
             map.put("流水号", dmDayPc.getSeq());
-            map.put("日期", dmDayPc.getPcdate());
+            map.put("日期", dmDayPc.getDate());
             map.put("餐厅名称", dmDayPc.getShopname());
             list.add(map);
         }

eladmin-system/src/main/java/me/zhengjie/modules/dm/device/rest/DmDeviceController.java

@@ -91,7 +91,7 @@ public class DmDeviceController {
     @ApiOperation("判断dmDevice是否存在相同Code")
     public ResponseEntity<Object> checkCode(@RequestBody Map<String,String> params) {
         int count  = dmDeviceService.checkCode(params.get("code"),params.get("id")==null?null:Long.parseLong(params.get("id")));
-        return new ResponseEntity<>(count>0?true:false,HttpStatus.OK);
+        return new ResponseEntity<>(count > 0,HttpStatus.OK);
     }
 
 

eladmin-system/src/main/java/me/zhengjie/modules/dm/device/service/impl/DmDeviceServiceImpl.java

@@ -121,5 +121,5 @@ public class DmDeviceServiceImpl implements DmDeviceService {
     }
 
     @Override
-    public int checkCode(String code,Long id){ return dmDeviceRepository.checkCode(code,id); };
+    public int checkCode(String code,Long id){ return dmDeviceRepository.checkCode(code,id); }
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/food/domain/DmFood.java

@@ -47,17 +47,14 @@ public class DmFood extends BaseEntity implements Serializable {
     private Long id;
 
     @Column(name = "code",nullable = false)
-    @NotBlank
     @ApiModelProperty(value = "编号")
     private String code;
 
     @Column(name = "name",nullable = false)
-    @NotBlank
     @ApiModelProperty(value = "名称")
     private String name;
 
     @Column(name = "price",nullable = false)
-    @NotNull
     @ApiModelProperty(value = "单价")
     private BigDecimal price;
 
@@ -73,6 +70,10 @@ public class DmFood extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "类型")
     private String type;
 
+    @Column(name = "pstate")
+    @ApiModelProperty(value = "菜品状态")
+    private Integer pstate;
+
     public void copy(DmFood source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }

eladmin-system/src/main/java/me/zhengjie/modules/dm/food/service/dto/DmFoodDto.java

@@ -53,4 +53,6 @@ public class DmFoodDto extends BaseDTO implements Serializable {
 
     /** 描述 */
     private String remark;
+
+    private Integer pstate;
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/domain/DmOrderItem.java

@@ -91,6 +91,10 @@ public class DmOrderItem implements Serializable {
     @ApiModelProperty(value = "流水号")
     private Long seq;
 
+    @Column(name = "tel")
+    @ApiModelProperty(value = "tel")
+    private String tel;
+
     @Column(name = "amt")
     @ApiModelProperty(value = "商品售价")
     private Double amt;

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/domain/DmOrderPayment.java

@@ -0,0 +1,47 @@
+package me.zhengjie.modules.dm.order.domain;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+@Entity
+@Data
+@Table(name="dm_order_payment")
+public class DmOrderPayment implements Serializable {
+
+    @Id
+    @Column(name = "id")
+    @ApiModelProperty(value = "id")
+    private Integer id;
+
+    @Column(name = "bh")
+    @ApiModelProperty(value = "编号")
+    private String bh;
+
+    @Column(name = "type")
+    @ApiModelProperty(value = "type")
+    private String type;
+
+    @Column(name = "amt")
+    @ApiModelProperty(value = "商品售价")
+    private Double amt;
+
+    @Column(name = "balance")
+    @ApiModelProperty(value = "余额")
+    private Double balance;
+
+    @Column(name = "uid")
+    @ApiModelProperty(value = "uid")
+    private String uid;
+
+    public void copy(DmOrderPayment source){
+        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
+    }
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/domain/DmOrderRecord.java

@@ -131,6 +131,14 @@ public class DmOrderRecord implements Serializable {
     @ApiModelProperty(value = "金额")
     private Double amt;
 
+    @Column(name = "tel")
+    @ApiModelProperty(value = "tel")
+    private String tel;
+
+    @Column(name = "card_profile")
+    @ApiModelProperty(value = "card_profile")
+    private Integer cardProfile;
+
     @Column(name = "balance")
     @ApiModelProperty(value = "卡余额")
     private Double balance;

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/repository/DmOrderItemRepository.java

@@ -18,6 +18,10 @@ package me.zhengjie.modules.dm.order.repository;
 import me.zhengjie.modules.dm.order.domain.DmOrderItem;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
+import java.util.Map;
 
 /**
 * @website https://el-admin.vip
@@ -25,4 +29,8 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 * @date 2021-09-15
 **/
 public interface DmOrderItemRepository extends JpaRepository<DmOrderItem, Long>, JpaSpecificationExecutor<DmOrderItem> {
+    //最受欢迎菜品(三种)
+    @Query(value = "SELECT name,SUM(num) as num FROM dm_order_item " +
+            "GROUP BY pid ORDER BY num DESC LIMIT 0,3 ",nativeQuery = true)
+    List<Map<String,Object>> hyFood();
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/repository/DmOrderPaymentRepository.java

@@ -0,0 +1,8 @@
+package me.zhengjie.modules.dm.order.repository;
+
+import me.zhengjie.modules.dm.order.domain.DmOrderPayment;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface DmOrderPaymentRepository extends JpaRepository<DmOrderPayment, Integer>, JpaSpecificationExecutor<DmOrderPayment> {
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/repository/DmOrderRecordRepository.java

@@ -77,5 +77,10 @@ public interface DmOrderRecordRepository extends JpaRepository<DmOrderRecord, Lo
             "VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10) ",nativeQuery = true)
     void insertDmOrderItem(String bh,Long pid,String code,String name,String price,Integer num,String money,Long seq,Double amt,String pjType);
 
-
+    /**
+     * 食堂营业额
+     * @return
+     */
+    @Query(value = "SELECT SUM(amt) FROM dm_order_record ",nativeQuery = true)
+    Integer countOrderAmt();
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/rest/DmOrderPaymentController.java

@@ -0,0 +1,41 @@
+package me.zhengjie.modules.dm.order.rest;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import me.zhengjie.annotation.Log;
+import me.zhengjie.modules.dm.order.domain.DmOrderPayment;
+import me.zhengjie.modules.dm.order.domain.DmOrderRecord;
+import me.zhengjie.modules.dm.order.service.DmOrderPaymentService;
+import me.zhengjie.modules.dm.order.service.dto.DmOrderPaymentQueryCriteria;
+import me.zhengjie.modules.dm.order.service.dto.DmOrderRecordQueryCriteria;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "orderPayment管理")
+@RequestMapping("/api/dmOrderPayment")
+public class DmOrderPaymentController {
+    private final DmOrderPaymentService dmOrderPaymentService;
+
+    @GetMapping
+    @Log("查询order")
+    @ApiOperation("查询order")
+    @PreAuthorize("@el.check('dmOrderPayment:list')")
+    public ResponseEntity<Object> query(DmOrderPaymentQueryCriteria criteria, Pageable pageable){
+        return new ResponseEntity<>(dmOrderPaymentService.queryAll(criteria,pageable), HttpStatus.OK);
+    }
+
+    @PostMapping
+    @Log("新增order")
+    @ApiOperation("新增order")
+    @PreAuthorize("@el.check('dmOrderPayment:add')")
+    public ResponseEntity<Object> create(@Validated @RequestBody DmOrderPayment resources){
+        return new ResponseEntity<>(dmOrderPaymentService.create(resources),HttpStatus.CREATED);
+    }
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/rest/DmOrderRecordController.java

@@ -16,7 +16,6 @@
 package me.zhengjie.modules.dm.order.rest;
 
 import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.dm.daypc.rest.SendMsg;
 import me.zhengjie.modules.dm.order.domain.DmOrderRecord;
 import me.zhengjie.modules.dm.order.service.DmOrderRecordService;
 import me.zhengjie.modules.dm.order.service.dto.DmOrderRecordQueryCriteria;
@@ -42,7 +41,6 @@ import javax.servlet.http.HttpServletResponse;
 @RequestMapping("/api/dmOrderRecord")
 public class DmOrderRecordController {
 
-    private final SendMsg sendMsg;
     private final DmOrderRecordService dmOrderRecordService;
 
     @Log("导出数据")
@@ -61,14 +59,6 @@ public class DmOrderRecordController {
         return new ResponseEntity<>(dmOrderRecordService.queryAll(criteria,pageable),HttpStatus.OK);
     }
 
-    @GetMapping(value = "sendOrder")
-    @Log("查询order")
-    @ApiOperation("查询order")
-    public ResponseEntity<Object> send(){
-        sendMsg.send();
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
     @GetMapping(value = "/queryDetails")
     @Log("查询order")
     @ApiOperation("查询order")

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/rest/OrderReceiveMsg.java

@@ -1,96 +1,96 @@
-package me.zhengjie.modules.dm.order.rest;
-
-import com.alibaba.fastjson.JSONArray;
-import com.rabbitmq.client.*;
-import lombok.SneakyThrows;
-import me.zhengjie.modules.dm.daypc.domain.DmDayPc;
-import me.zhengjie.modules.dm.daypc.service.DmDayPcService;
-import me.zhengjie.modules.dm.order.domain.DmOrderItem;
-import me.zhengjie.modules.dm.order.domain.DmOrderRecord;
-import me.zhengjie.modules.dm.order.service.DmOrderItemService;
-import me.zhengjie.modules.dm.order.service.DmOrderRecordService;
-import me.zhengjie.modules.dm.order.service.dto.DmExpenseCalendar;
-import me.zhengjie.modules.dm.order.service.dto.DmOrderItemDto;
-import me.zhengjie.utils.ConnectionUtil;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.sql.Timestamp;
-import java.util.List;
-
-@Component
-public class OrderReceiveMsg {
-    @Autowired
-    private DmOrderRecordService dmOrderRecordService;
-    private static String isEable = "0";
-
-    //每天10点执行
-//    @Scheduled(cron = "0 0 10 * * ?")
-//    //异步执行,指定线程池(配置类里配置)
-//    @Async("threadPoolTaskExecutor1")
-//    public void timer(){
-//        isEable = "1";
-//    }
+//package me.zhengjie.modules.dm.order.rest;
 //
-//    //每五分钟执行一次
-//    @Scheduled(cron = "0 */5 * * * ?")
-//    @Async("threadPoolTaskExecutor2")
-//    public void timer2(){
-//        if(isEable!=null&&isEable=="1"){
-//            receive();
-//            isEable = "0";
-//        }
-//    }
-
-    /**
-     * 消费者
-     */
-//    @RabbitListener(queues = "dish_trade_produce",containerFactory = "brianThreadPool")
-    public void receive(byte[] body){
-//        Connection connection = ConnectionUtil.getConnection();
-//        try {
-//            Channel channel = connection.createChannel();
-//            //通过consumer来处理数据
-//            Consumer consumer = new DefaultConsumer(channel){
-//                @SneakyThrows
-//                @Override
-//                public void handleDelivery(String consumerTag, Envelope envelope, AMQP.BasicProperties properties, byte[] body) throws IOException {
-                    //body就是从队列中获取的数据
-                    String str = new String(body);
-                    if (str!=null){
-                        System.out.println("receiveOrder:"+str);
-                    }else {
-                        System.out.println("receiveOrder(null):"+ str);
-                    }
-                    try {
-                        List<DmExpenseCalendar> dmOrderItem = JSONArray.parseArray(str, DmExpenseCalendar.class);
-                        for (DmExpenseCalendar dmExpenseCalendar : dmOrderItem) {
-                            dmOrderRecordService.createOrderItem(dmExpenseCalendar);
-                            dmOrderRecordService.createOrderRecord(dmExpenseCalendar);
-                        }
-                    }catch (Exception ex){
-
-                    }
-//                }
-//            }
-//            channel.basicConsume("dish_trade_produce",true,consumer);
-//        } catch (IOException e) {
-//            e.printStackTrace();
-//        }
-    }
-
-//    public  Object getObjectFromBytes(byte[] objBytes) throws Exception {
-//        if (objBytes == null || objBytes.length == 0) {
-//            return null;
-//        }
-//        ByteArrayInputStream bi = new ByteArrayInputStream(objBytes);
-//        ObjectInputStream oi = new ObjectInputStream(bi);
-//        return oi.readObject();
+//import com.alibaba.fastjson.JSONArray;
+//import com.rabbitmq.client.*;
+//import lombok.SneakyThrows;
+//import me.zhengjie.modules.dm.daypc.domain.DmDayPc;
+//import me.zhengjie.modules.dm.daypc.service.DmDayPcService;
+//import me.zhengjie.modules.dm.order.domain.DmOrderItem;
+//import me.zhengjie.modules.dm.order.domain.DmOrderRecord;
+//import me.zhengjie.modules.dm.order.service.DmOrderItemService;
+//import me.zhengjie.modules.dm.order.service.DmOrderRecordService;
+//import me.zhengjie.modules.dm.order.service.dto.DmExpenseCalendar;
+//import me.zhengjie.modules.dm.order.service.dto.DmOrderItemDto;
+//import me.zhengjie.utils.ConnectionUtil;
+//import org.springframework.amqp.rabbit.annotation.RabbitListener;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.scheduling.annotation.Async;
+//import org.springframework.scheduling.annotation.Scheduled;
+//import org.springframework.stereotype.Component;
+//
+//import java.io.ByteArrayInputStream;
+//import java.io.IOException;
+//import java.io.ObjectInputStream;
+//import java.sql.Timestamp;
+//import java.util.List;
+//
+//@Component
+//public class OrderReceiveMsg {
+//    @Autowired
+//    private DmOrderRecordService dmOrderRecordService;
+//    private static String isEable = "0";
+//
+//    //每天10点执行
+////    @Scheduled(cron = "0 0 10 * * ?")
+////    //异步执行,指定线程池(配置类里配置)
+////    @Async("threadPoolTaskExecutor1")
+////    public void timer(){
+////        isEable = "1";
+////    }
+////
+////    //每五分钟执行一次
+////    @Scheduled(cron = "0 */5 * * * ?")
+////    @Async("threadPoolTaskExecutor2")
+////    public void timer2(){
+////        if(isEable!=null&&isEable=="1"){
+////            receive();
+////            isEable = "0";
+////        }
+////    }
+//
+//    /**
+//     * 消费者
+//     */
+////    @RabbitListener(queues = "dish_trade_produce",containerFactory = "brianThreadPool")
+//    public void receive(byte[] body){
+////        Connection connection = ConnectionUtil.getConnection();
+////        try {
+////            Channel channel = connection.createChannel();
+////            //通过consumer来处理数据
+////            Consumer consumer = new DefaultConsumer(channel){
+////                @SneakyThrows
+////                @Override
+////                public void handleDelivery(String consumerTag, Envelope envelope, AMQP.BasicProperties properties, byte[] body) throws IOException {
+//                    //body就是从队列中获取的数据
+//                    String str = new String(body);
+//                    if (str!=null){
+//                        System.out.println("receiveOrder:"+str);
+//                    }else {
+//                        System.out.println("receiveOrder(null):"+ str);
+//                    }
+//                    try {
+//                        List<DmExpenseCalendar> dmOrderItem = JSONArray.parseArray(str, DmExpenseCalendar.class);
+//                        for (DmExpenseCalendar dmExpenseCalendar : dmOrderItem) {
+//                            dmOrderRecordService.createOrderItem(dmExpenseCalendar);
+//                            dmOrderRecordService.createOrderRecord(dmExpenseCalendar);
+//                        }
+//                    }catch (Exception ex){
+//
+//                    }
+////                }
+////            }
+////            channel.basicConsume("dish_trade_produce",true,consumer);
+////        } catch (IOException e) {
+////            e.printStackTrace();
+////        }
 //    }
-}
+//
+////    public  Object getObjectFromBytes(byte[] objBytes) throws Exception {
+////        if (objBytes == null || objBytes.length == 0) {
+////            return null;
+////        }
+////        ByteArrayInputStream bi = new ByteArrayInputStream(objBytes);
+////        ObjectInputStream oi = new ObjectInputStream(bi);
+////        return oi.readObject();
+////    }
+//}

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/rest/OrderSendMsg.java

@@ -1,91 +1,91 @@
-package me.zhengjie.modules.dm.order.rest;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.rabbitmq.client.BuiltinExchangeType;
-import com.rabbitmq.client.Channel;
-import com.rabbitmq.client.Connection;
-import me.zhengjie.modules.dm.order.service.DmOrderRecordService;
-import me.zhengjie.modules.dm.order.service.dto.DmExpenseCalendar;
-import me.zhengjie.utils.ConnectionUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeoutException;
-
-@Component
-public class OrderSendMsg {
-    @Autowired
-    private DmOrderRecordService dmOrderRecordService;
-    private static String isEable = "0";
-
-    //每天10点执行
-//    @Scheduled(cron = "0 0 10 * * ?")
-//    //异步执行,指定线程池(配置类里配置)
-//    @Async("threadPoolTaskExecutor1")
-//    public void timer(){
-//        isEable = "1";
-//    }
+//package me.zhengjie.modules.dm.order.rest;
 //
-//    //每五分钟执行一次
-//    @Scheduled(cron = "0 */5 * * * ?")
-//    @Async("threadPoolTaskExecutor2")
-//    public void timer2(){
-//        if(isEable!=null&&isEable=="1"){
-//            send();
-//            isEable = "0";
-//        }
-//    }
-
-//    public void send(){
-//        //获取连接
-//        Connection connection = ConnectionUtil.getConnection();
-//        try {
-////            String userString1 = JSON.toJSONString(dmOrderItemService.queryAll(null));
-////            String userString2 = JSON.toJSONString(dmOrderRecordService.selectOrderRecord());
-//            List<Map<String,Object>> map = dmOrderRecordService.selectOrderRecord();
-//            JSONArray jsonArray = new JSONArray();
-//            jsonArray.addAll(map);
-//            List<DmExpenseCalendar> list = jsonArray.toJavaList(DmExpenseCalendar.class);
-//            String userString2 = JSON.toJSONString(list);
-//            Channel channel = connection.createChannel();
-//            String exchangeName = "dish_trade_produce";//交换机
-//            channel.exchangeDeclare(exchangeName, BuiltinExchangeType.DIRECT, true,false, null);
-//            String queue1Name = "dish_trade_produce";//队列名称
-//            channel.queueDeclare(queue1Name, true, false, false, null);
-//            channel.queueBind(queue1Name, exchangeName, "dish_trade_produce");// 队列绑定hello路由
+//import com.alibaba.fastjson.JSON;
+//import com.alibaba.fastjson.JSONArray;
+//import com.rabbitmq.client.BuiltinExchangeType;
+//import com.rabbitmq.client.Channel;
+//import com.rabbitmq.client.Connection;
+//import me.zhengjie.modules.dm.order.service.DmOrderRecordService;
+//import me.zhengjie.modules.dm.order.service.dto.DmExpenseCalendar;
+//import me.zhengjie.utils.ConnectionUtil;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.scheduling.annotation.Async;
+//import org.springframework.scheduling.annotation.Scheduled;
+//import org.springframework.stereotype.Component;
 //
-////            byte[] bytes = new byte[2];
-////            bytes = userString1.getBytes();
-////            bytes[1] = (Byte)
-////            channel.basicPublish(exchangeName, "dish_trade_produce", null, userString1.getBytes());
-//            channel.basicPublish(exchangeName, "dish_trade_produce", null, userString2.getBytes());
-////            System.out.println("userString1"+userString1);
-//            System.out.println("order消费记录:"+userString2);
+//import java.io.ByteArrayOutputStream;
+//import java.io.IOException;
+//import java.io.ObjectOutputStream;
+//import java.io.Serializable;
+//import java.util.List;
+//import java.util.Map;
+//import java.util.concurrent.TimeoutException;
 //
-//            channel.close();
-//            connection.close();
-//        } catch (IOException | TimeoutException e) {
-//            e.printStackTrace();
-//        }
-//    }
-
-    //对象转化为字节码
-//    public  byte[] getBytesFromObject(Serializable obj) throws Exception {
-//        if (obj == null) {
-//            return null;
-//        }
-//        ByteArrayOutputStream bo = new ByteArrayOutputStream();
-//        ObjectOutputStream oo = new ObjectOutputStream(bo);
-//        oo.writeObject(obj);
-//        return bo.toByteArray();
-//    }
-}
+//@Component
+//public class OrderSendMsg {
+//    @Autowired
+//    private DmOrderRecordService dmOrderRecordService;
+//    private static String isEable = "0";
+//
+//    //每天10点执行
+////    @Scheduled(cron = "0 0 10 * * ?")
+////    //异步执行,指定线程池(配置类里配置)
+////    @Async("threadPoolTaskExecutor1")
+////    public void timer(){
+////        isEable = "1";
+////    }
+////
+////    //每五分钟执行一次
+////    @Scheduled(cron = "0 */5 * * * ?")
+////    @Async("threadPoolTaskExecutor2")
+////    public void timer2(){
+////        if(isEable!=null&&isEable=="1"){
+////            send();
+////            isEable = "0";
+////        }
+////    }
+//
+////    public void send(){
+////        //获取连接
+////        Connection connection = ConnectionUtil.getConnection();
+////        try {
+//////            String userString1 = JSON.toJSONString(dmOrderItemService.queryAll(null));
+//////            String userString2 = JSON.toJSONString(dmOrderRecordService.selectOrderRecord());
+////            List<Map<String,Object>> map = dmOrderRecordService.selectOrderRecord();
+////            JSONArray jsonArray = new JSONArray();
+////            jsonArray.addAll(map);
+////            List<DmExpenseCalendar> list = jsonArray.toJavaList(DmExpenseCalendar.class);
+////            String userString2 = JSON.toJSONString(list);
+////            Channel channel = connection.createChannel();
+////            String exchangeName = "dish_trade_produce";//交换机
+////            channel.exchangeDeclare(exchangeName, BuiltinExchangeType.DIRECT, true,false, null);
+////            String queue1Name = "dish_trade_produce";//队列名称
+////            channel.queueDeclare(queue1Name, true, false, false, null);
+////            channel.queueBind(queue1Name, exchangeName, "dish_trade_produce");// 队列绑定hello路由
+////
+//////            byte[] bytes = new byte[2];
+//////            bytes = userString1.getBytes();
+//////            bytes[1] = (Byte)
+//////            channel.basicPublish(exchangeName, "dish_trade_produce", null, userString1.getBytes());
+////            channel.basicPublish(exchangeName, "dish_trade_produce", null, userString2.getBytes());
+//////            System.out.println("userString1"+userString1);
+////            System.out.println("order消费记录:"+userString2);
+////
+////            channel.close();
+////            connection.close();
+////        } catch (IOException | TimeoutException e) {
+////            e.printStackTrace();
+////        }
+////    }
+//
+//    //对象转化为字节码
+////    public  byte[] getBytesFromObject(Serializable obj) throws Exception {
+////        if (obj == null) {
+////            return null;
+////        }
+////        ByteArrayOutputStream bo = new ByteArrayOutputStream();
+////        ObjectOutputStream oo = new ObjectOutputStream(bo);
+////        oo.writeObject(obj);
+////        return bo.toByteArray();
+////    }
+//}

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/service/DmOrderItemService.java

@@ -32,6 +32,8 @@ import javax.servlet.http.HttpServletResponse;
 **/
 public interface DmOrderItemService {
 
+    List<Map<String,Object>> hyFood();
+
     /**
     * 查询数据分页
     * @param criteria 条件

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/service/DmOrderPaymentService.java

@@ -0,0 +1,62 @@
+package me.zhengjie.modules.dm.order.service;
+
+import me.zhengjie.modules.dm.order.domain.DmOrderPayment;
+import me.zhengjie.modules.dm.order.service.dto.DmOrderPaymentDto;
+import me.zhengjie.modules.dm.order.service.dto.DmOrderPaymentQueryCriteria;
+import org.springframework.data.domain.Pageable;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+public interface DmOrderPaymentService {
+    /**
+     * 查询数据分页
+     * @param criteria 条件
+     * @param pageable 分页参数
+     * @return Map<String,Object>
+     */
+    Map<String,Object> queryAll(DmOrderPaymentQueryCriteria criteria, Pageable pageable);
+
+    /**
+     * 查询所有数据不分页
+     * @param criteria 条件参数
+     * @return List<DmOrderItemDto>
+     */
+    List<DmOrderPaymentDto> queryAll(DmOrderPaymentQueryCriteria criteria);
+
+    /**
+     * 根据ID查询
+     * @param id ID
+     * @return DmOrderItemDto
+     */
+    DmOrderPaymentDto findById(Integer id);
+
+    /**
+     * 创建
+     * @param resources /
+     * @return DmOrderItemDto
+     */
+    DmOrderPaymentDto create(DmOrderPayment resources);
+
+    /**
+     * 编辑
+     * @param resources /
+     */
+    void update(DmOrderPayment resources);
+
+    /**
+     * 多选删除
+     * @param ids /
+     */
+    void deleteAll(Integer[] ids);
+
+    /**
+     * 导出数据
+     * @param all 待导出的数据
+     * @param response /
+     * @throws IOException /
+     */
+    void download(List<DmOrderPaymentDto> all, HttpServletResponse response) throws IOException;
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/service/DmOrderRecordService.java

@@ -105,4 +105,6 @@ public interface DmOrderRecordService {
      */
     void createOrderRecord(DmExpenseCalendar resources);
     void createOrderItem(DmExpenseCalendar resources);
+
+    Integer countOrderAmt();
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/service/dto/DmExpenseCalendar.java

@@ -59,6 +59,8 @@ public class DmExpenseCalendar implements Serializable {
     //卡no
     private String cardNo;
 
+    private Integer cardProfile;
+
     //餐别 1-早餐,2-午餐,3-晚餐,4-夜宵
     private Integer part;
 
@@ -87,6 +89,8 @@ public class DmExpenseCalendar implements Serializable {
     //支付类型 11-主账户、21-补贴账户、 2-现金、 3-银联、30-扫码支付、31-微信、32-支付宝
     private Integer type;
 
+    private String tel;
+
     /** 防止精度丢失 */
 //    @JSONField(serializeUsing = ToStringSerializer.class)
     private Long orderItemId;

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/service/dto/DmOrderItemDto.java

@@ -50,6 +50,8 @@ public class DmOrderItemDto implements Serializable {
     private DmFood food;
 //    private Long pid;
 
+    private String tel;
+
     private String code;
 
     /** 商品名称 */

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/service/dto/DmOrderPaymentDto.java

@@ -0,0 +1,22 @@
+package me.zhengjie.modules.dm.order.service.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import java.io.Serializable;
+
+@Data
+public class DmOrderPaymentDto implements Serializable {
+    private Integer id;
+
+    private String bh;
+
+    private String type;
+
+    private Double amt;
+
+    private Double balance;
+
+    private String uid;
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/service/dto/DmOrderPaymentQueryCriteria.java

@@ -0,0 +1,7 @@
+package me.zhengjie.modules.dm.order.service.dto;
+
+import lombok.Data;
+
+@Data
+public class DmOrderPaymentQueryCriteria {
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/service/dto/DmOrderRecordDto.java

@@ -50,6 +50,9 @@ public class DmOrderRecordDto implements Serializable {
     //用户唯一识别号
     private String mob;
 
+    private String tel;
+
+    private Integer cardProfile;
     //用户工号
     private String userCode;
 

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/service/impl/DmOrderItemServiceImpl.java

@@ -52,6 +52,11 @@ public class DmOrderItemServiceImpl implements DmOrderItemService {
     private final DmOrderItemRepository dmOrderItemRepository;
     private final DmOrderItemMapper dmOrderItemMapper;
 
+    @Override
+    public List<Map<String, Object>> hyFood() {
+        return dmOrderItemRepository.hyFood();
+    }
+
     @Override
     public Map<String,Object> queryAll(DmOrderItemQueryCriteria criteria, Pageable pageable){
         Page<DmOrderItem> page = dmOrderItemRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/service/impl/DmOrderPaymentServiceImpl.java

@@ -0,0 +1,76 @@
+package me.zhengjie.modules.dm.order.service.impl;
+
+import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.util.IdUtil;
+import lombok.RequiredArgsConstructor;
+import me.zhengjie.modules.dm.order.domain.DmOrderItem;
+import me.zhengjie.modules.dm.order.domain.DmOrderPayment;
+import me.zhengjie.modules.dm.order.domain.DmOrderRecord;
+import me.zhengjie.modules.dm.order.repository.DmOrderPaymentRepository;
+import me.zhengjie.modules.dm.order.service.DmOrderPaymentService;
+import me.zhengjie.modules.dm.order.service.dto.DmOrderPaymentDto;
+import me.zhengjie.modules.dm.order.service.dto.DmOrderPaymentQueryCriteria;
+import me.zhengjie.modules.dm.order.service.mapstruct.DmOrderPaymentMapper;
+import me.zhengjie.utils.PageUtil;
+import me.zhengjie.utils.QueryHelp;
+import me.zhengjie.utils.ValidationUtil;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@RequiredArgsConstructor
+public class DmOrderPaymentServiceImpl implements DmOrderPaymentService {
+    private final DmOrderPaymentRepository dmOrderPaymentRepository;
+    private final DmOrderPaymentMapper dmOrderPaymentMapper;
+
+    @Override
+    public Map<String, Object> queryAll(DmOrderPaymentQueryCriteria criteria, Pageable pageable) {
+        Page<DmOrderPayment> page = dmOrderPaymentRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
+        return PageUtil.toPage(page.map(dmOrderPaymentMapper::toDto));
+    }
+
+    @Override
+    public List<DmOrderPaymentDto> queryAll(DmOrderPaymentQueryCriteria criteria) {
+        return dmOrderPaymentMapper.toDto(dmOrderPaymentRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
+    }
+
+    @Override
+    public DmOrderPaymentDto findById(Integer id) {
+        DmOrderPayment dmOrderRecord = dmOrderPaymentRepository.findById(id).orElseGet(DmOrderPayment::new);
+        ValidationUtil.isNull(dmOrderRecord.getId(),"DmOrderPayment","id",id);
+        return dmOrderPaymentMapper.toDto(dmOrderRecord);
+    }
+
+    @Override
+    public DmOrderPaymentDto create(DmOrderPayment resources) {
+        Snowflake snowflake = IdUtil.createSnowflake(1, 1);
+        resources.setId((int) snowflake.nextId());
+        return dmOrderPaymentMapper.toDto(dmOrderPaymentRepository.save(resources));
+    }
+
+    @Override
+    public void update(DmOrderPayment resources) {
+        DmOrderPayment dmOrderRecord = dmOrderPaymentRepository.findById(resources.getId()).orElseGet(DmOrderPayment::new);
+        ValidationUtil.isNull( dmOrderRecord.getId(),"DmOrderPayment","id",resources.getId());
+        dmOrderRecord.copy(resources);
+        dmOrderPaymentRepository.save(dmOrderRecord);
+    }
+
+    @Override
+    public void deleteAll(Integer[] ids) {
+        for (Integer id : ids) {
+            dmOrderPaymentRepository.deleteById(id);
+        }
+    }
+
+    @Override
+    public void download(List<DmOrderPaymentDto> all, HttpServletResponse response) throws IOException {
+
+    }
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/service/impl/DmOrderRecordServiceImpl.java

@@ -153,4 +153,9 @@ public class DmOrderRecordServiceImpl implements DmOrderRecordService {
         dmOrderRecordRepository.insertDmOrderItem(resources.getBh(),resources.getPid(),resources.getCode(),resources.getName(),resources.getPrice(),resources.getNum(),resources.getOrderItemMoney(),resources.getOrderItemSeq(),resources.getOrderItemAmt(),resources.getPjType());
     }
 
+    @Override
+    public Integer countOrderAmt() {
+        return dmOrderRecordRepository.countOrderAmt();
+    }
+
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/service/mapstruct/DmOrderPaymentMapper.java

@@ -0,0 +1,11 @@
+package me.zhengjie.modules.dm.order.service.mapstruct;
+
+import me.zhengjie.base.BaseMapper;
+import me.zhengjie.modules.dm.order.domain.DmOrderPayment;
+import me.zhengjie.modules.dm.order.service.dto.DmOrderPaymentDto;
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+
+@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
+public interface DmOrderPaymentMapper extends BaseMapper<DmOrderPaymentDto, DmOrderPayment> {
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/user/domain/DmUser.java

@@ -90,6 +90,9 @@ public class DmUser extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "是否是审批人")
     private Boolean isApprover = false;
 
+    @Column(name = "face_id")
+    @ApiModelProperty(value = "人脸照片")
+    private String faceid;
     /*@Column(name = "create_by")
     @ApiModelProperty(value = "创建者")
     private String createBy;

eladmin-system/src/main/java/me/zhengjie/modules/dm/user/rest/DmUserController.java

@@ -47,7 +47,7 @@ import javax.servlet.http.HttpServletResponse;
 **/
 @RestController
 @RequiredArgsConstructor
-@Api(tags = "IOT会议系统-用户管理")
+@Api(tags = "IOT餐饮系统-用户管理")
 @RequestMapping("/api/dmUser")
 public class DmUserController {
 

eladmin-system/src/main/java/me/zhengjie/modules/dm/user/service/dto/DmUserDto.java

@@ -60,4 +60,6 @@ public class DmUserDto extends BaseDTO implements Serializable {
     /** 是否是审批人 */
     private Boolean isApprover;
 
+    private String faceid;
+
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/user/service/impl/DmUserServiceImpl.java

@@ -15,6 +15,7 @@
 */
 package me.zhengjie.modules.dm.user.service.impl;
 
+import cn.hutool.core.lang.Snowflake;
 import me.zhengjie.exception.EntityExistException;
 import me.zhengjie.modules.dm.user.domain.DmUser;
 import me.zhengjie.modules.system.domain.User;
@@ -78,6 +79,8 @@ public class DmUserServiceImpl implements DmUserService {
     @Transactional(rollbackFor = Exception.class)
     public DmUserDto create(DmUser resources) {
 //        resources.setId(IdUtil.simpleUUID());
+        Snowflake snowflake = IdUtil.createSnowflake(1, 1);
+        resources.setId(String.valueOf(snowflake.nextId()));
         //判断邮箱是否重复
         DmUser user = dmUserRepository.findByEmail(resources.getEmail());
         if (user != null) {

eladmin-system/src/main/java/me/zhengjie/modules/dm/video/domain/DmVideo.java

@@ -0,0 +1,38 @@
+package me.zhengjie.modules.dm.video.domain;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import me.zhengjie.modules.dm.user.domain.DmUser;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Data
+@Table(name="dm_video")
+public class DmVideo implements Serializable {
+
+    @Id
+    @Column(name = "id")
+    @ApiModelProperty(value = "id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    @Column(name = "path")
+    @ApiModelProperty(value = "视频路径")
+    private String path;
+
+    public DmVideo(String path) {
+        this.path = path;
+    }
+
+    public DmVideo() {
+
+    }
+
+    public void copy(DmVideo source){
+        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
+    }
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/video/repository/DmVideoRepository.java

@@ -0,0 +1,8 @@
+package me.zhengjie.modules.dm.video.repository;
+
+import me.zhengjie.modules.dm.video.domain.DmVideo;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface DmVideoRepository extends JpaRepository<DmVideo, Integer>, JpaSpecificationExecutor<DmVideo> {
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/video/rest/DmVideoController.java

@@ -0,0 +1,45 @@
+package me.zhengjie.modules.dm.video.rest;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import me.zhengjie.annotation.Log;
+import me.zhengjie.domain.LocalStorage;
+import me.zhengjie.exception.BadRequestException;
+import me.zhengjie.modules.dm.video.domain.DmVideo;
+import me.zhengjie.modules.dm.video.service.DmVideoService;
+import me.zhengjie.modules.dm.video.service.dto.DmVideoQueryCriteria;
+import me.zhengjie.utils.FileUtil;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "IOT餐饮系统-首页视频管理")
+@RequestMapping("/api/dmVideo")
+public class DmVideoController {
+    private final DmVideoService dmVideoService;
+
+    @GetMapping(value = "getVideo")
+    @Log("查询video")
+    @ApiOperation("查询video")
+    public ResponseEntity<Object> query(){
+        return new ResponseEntity<>(dmVideoService.queryAll(null), HttpStatus.OK);
+    }
+
+    @PostMapping("/pictures")
+    @ApiOperation("上传图片")
+    public ResponseEntity<Object> upload(@RequestParam MultipartFile file){
+        // 判断文件是否为图片
+        String suffix = FileUtil.getExtensionName(file.getOriginalFilename());
+        if(!FileUtil.VIDEO.equals(FileUtil.getFileType(suffix))){
+            throw new BadRequestException("只能上传视频");
+        }
+        DmVideo video = dmVideoService.create(null, file);
+        return new ResponseEntity<>(video, HttpStatus.OK);
+    }
+
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/video/service/DmVideoService.java

@@ -0,0 +1,38 @@
+package me.zhengjie.modules.dm.video.service;
+
+import me.zhengjie.domain.LocalStorage;
+import me.zhengjie.modules.dm.user.service.dto.DmUserDto;
+import me.zhengjie.modules.dm.user.service.dto.DmUserQueryCriteria;
+import me.zhengjie.modules.dm.video.domain.DmVideo;
+import me.zhengjie.modules.dm.video.service.dto.DmVideoDto;
+import me.zhengjie.modules.dm.video.service.dto.DmVideoQueryCriteria;
+import org.springframework.data.domain.Pageable;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+import java.util.Map;
+
+public interface DmVideoService {
+    /**
+     * 查询数据分页
+     * @param criteria 条件
+     * @param pageable 分页参数
+     * @return Map<String,Object>
+     */
+    Map<String,Object> queryAll(DmVideoQueryCriteria criteria, Pageable pageable);
+
+    /**
+     * 查询所有数据不分页
+     * @param criteria 条件参数
+     * @return List<DmUserDto>
+     */
+    List<DmVideoDto> queryAll(DmVideoQueryCriteria criteria);
+
+    /**
+     * 新增
+     * @param name 文件名称
+     * @param file 文件
+     * @return
+     */
+    DmVideo create(String name, MultipartFile file);
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/video/service/dto/DmVideoDto.java

@@ -0,0 +1,15 @@
+package me.zhengjie.modules.dm.video.service.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import java.io.Serializable;
+
+@Data
+public class DmVideoDto implements Serializable {
+
+    private Integer id;
+
+    private String path;
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/video/service/dto/DmVideoQueryCriteria.java

@@ -0,0 +1,7 @@
+package me.zhengjie.modules.dm.video.service.dto;
+
+import lombok.Data;
+
+@Data
+public class DmVideoQueryCriteria {
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/video/service/impl/DmVideoServiceImpl.java

@@ -0,0 +1,68 @@
+package me.zhengjie.modules.dm.video.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import lombok.RequiredArgsConstructor;
+import me.zhengjie.config.FileProperties;
+import me.zhengjie.domain.LocalStorage;
+import me.zhengjie.exception.BadRequestException;
+import me.zhengjie.modules.dm.video.domain.DmVideo;
+import me.zhengjie.modules.dm.video.repository.DmVideoRepository;
+import me.zhengjie.modules.dm.video.service.DmVideoService;
+import me.zhengjie.modules.dm.video.service.dto.DmVideoDto;
+import me.zhengjie.modules.dm.video.service.dto.DmVideoQueryCriteria;
+import me.zhengjie.modules.dm.video.service.mapstruct.DmVideoMapper;
+import me.zhengjie.utils.FileUtil;
+import me.zhengjie.utils.PageUtil;
+import me.zhengjie.utils.QueryHelp;
+import me.zhengjie.utils.StringUtils;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@RequiredArgsConstructor
+public class DmVideoServiceImpl implements DmVideoService {
+    private final DmVideoRepository dmVideoRepository;
+    private final DmVideoMapper dmVideoMapper;
+    private final FileProperties properties;
+
+    @Override
+    public Map<String, Object> queryAll(DmVideoQueryCriteria criteria, Pageable pageable) {
+        Page<DmVideo> page = dmVideoRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
+        return PageUtil.toPage(page.map(dmVideoMapper::toDto));
+    }
+
+    @Override
+    public List<DmVideoDto> queryAll(DmVideoQueryCriteria criteria) {
+        return dmVideoMapper.toDto(dmVideoRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public DmVideo create(String name, MultipartFile multipartFile) {
+        FileUtil.checkSize(properties.getMaxSize(), multipartFile.getSize());
+        String suffix = FileUtil.getExtensionName(multipartFile.getOriginalFilename());
+        String type = FileUtil.getFileType(suffix);
+        File file = FileUtil.upload(multipartFile, properties.getPath().getPath() + type +  File.separator);
+        if(ObjectUtil.isNull(file)){
+            throw new BadRequestException("上传失败");
+        }
+        try {
+            name = StringUtils.isBlank(name) ? FileUtil.getFileNameNoEx(multipartFile.getOriginalFilename()) : name;
+            String path = type+"/"+file.getName();
+            DmVideo dmVideo = new DmVideo(
+                    path
+            );
+            return dmVideoRepository.save(dmVideo);
+        }catch (Exception e){
+            FileUtil.del(file);
+            throw e;
+        }
+    }
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/video/service/mapstruct/DmVideoMapper.java

@@ -0,0 +1,11 @@
+package me.zhengjie.modules.dm.video.service.mapstruct;
+
+import me.zhengjie.base.BaseMapper;
+import me.zhengjie.modules.dm.video.domain.DmVideo;
+import me.zhengjie.modules.dm.video.service.dto.DmVideoDto;
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+
+@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
+public interface DmVideoMapper extends BaseMapper<DmVideoDto, DmVideo> {
+}

eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java

@@ -198,7 +198,7 @@ public class DeployServiceImpl implements DeployService {
 		sb.append("mkdir -p ").append(backupPath);
 		sb.append("mv -f ").append(fileSavePath);
 		sb.append(appName).append(" ").append(backupPath);
-		log.info("备份应用脚本:" + sb.toString());
+		log.info("备份应用脚本:" + sb);
 		executeShellUtil.execute(sb.toString());
 		//还原信息入库
 		DeployHistory deployHistory = new DeployHistory();

eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/ScpClientUtil.java

@@ -31,7 +31,7 @@ import java.util.logging.Logger;
  */
 public class ScpClientUtil {
 
-	static private Map<String,ScpClientUtil> instance = Maps.newHashMap();
+	static private final Map<String,ScpClientUtil> instance = Maps.newHashMap();
 
 	static synchronized public ScpClientUtil getInstance(String ip, int port, String username, String password) {
 		if (instance.get(ip) == null) {
@@ -96,10 +96,10 @@ public class ScpClientUtil {
 		}
 	}
 
-	private String ip;
-	private int port;
-	private String username;
-	private String password;
+	private final String ip;
+	private final int port;
+	private final String username;
+	private final String password;
 
 
 }

eladmin-system/src/main/java/me/zhengjie/modules/mnt/websocket/WebSocketServer.java

@@ -37,7 +37,7 @@ public class WebSocketServer {
 	/**
 	 * concurrent包的线程安全Set，用来存放每个客户端对应的MyWebSocket对象。
 	 */
-	private static CopyOnWriteArraySet<WebSocketServer> webSocketSet = new CopyOnWriteArraySet<WebSocketServer>();
+	private static final CopyOnWriteArraySet<WebSocketServer> webSocketSet = new CopyOnWriteArraySet<WebSocketServer>();
 
 	/**
 	 * 与某个客户端的连接会话，需要通过它来给客户端发送数据

eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/DayPcDataTask.java

@@ -1,85 +1,49 @@
-//package me.zhengjie.modules.quartz.task;
-//
-//import com.alibaba.fastjson.JSON;
-//import com.alibaba.fastjson.JSONArray;
-//import com.rabbitmq.client.*;
-//import lombok.RequiredArgsConstructor;
-//import lombok.SneakyThrows;
-//import lombok.extern.slf4j.Slf4j;
-//import me.zhengjie.modules.dm.daypc.domain.DmDayPc;
-//import me.zhengjie.modules.dm.daypc.service.DmDayPcService;
-//import me.zhengjie.modules.dm.food.service.DmFoodService;
-//import me.zhengjie.utils.ConnectionUtil;
-//import org.springframework.amqp.rabbit.core.RabbitTemplate;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.scheduling.annotation.Async;
-//import org.springframework.scheduling.annotation.Scheduled;
-//import org.springframework.stereotype.Component;
-//
-//import java.io.ByteArrayOutputStream;
-//import java.io.IOException;
-//import java.io.ObjectOutputStream;
-//import java.io.Serializable;
-//import java.sql.Timestamp;
-//import java.util.List;
-//import java.util.concurrent.TimeoutException;
-//
-//@Slf4j
-//@RequiredArgsConstructor
-//@Component
-//public class DayPcDataTask {
-//    private final DmFoodService dmFoodService;
-//    private final DmDayPcService dmDayPcService;
-//    private static String isEable = "0";
-////
-////    public void runSend1(){
-////        isEable = "1";
-////    }
-////
-////    public void runSend2(){
-////        if(isEable!=null&&isEable=="1"){
-////            send();
-////            isEable = "0";
-////        }
-////    }
-////
-////    public void runReceive1(){
-////        isEable = "1";
-////    }
-////
-//    @Scheduled(cron = "0 */5 * * * ?")
-//    @Async("threadPoolTaskExecutor2")
-//    public void runReceive2(){
-////        if(isEable!=null&&isEable=="1"){
-//            receive();
-////            isEable = "0";
-////        }
-//    }
-////
-////    /**
-////     * 生产者
-////     */
-////    public void send(){
-////        //获取连接
-////        Connection connection = ConnectionUtil.getConnection();
-////        try {
-////            List<DmDayPc> dmDayPc = dmDayPcService.foodRepository();
-////            String userString = JSON.toJSONString(dmDayPc);
-////            Channel channel = connection.createChannel();
-////            String exchangeName = "schedule_consume";//交换机
-////            channel.exchangeDeclare(exchangeName, BuiltinExchangeType.DIRECT, true,false, null);
-////            String queue1Name = "schedule_consume";//队列名称
-////            channel.queueDeclare(queue1Name, true, false, false, null);
-////            channel.queueBind(queue1Name, exchangeName, "schedule_consume");// 队列绑定hello路由
-////            channel.basicPublish(exchangeName, "schedule_consume", null, userString.getBytes());
-////            System.out.println("sned排菜:"+dmDayPc);
-////            channel.close();
-////            connection.close();
-////        } catch (IOException | TimeoutException e) {
-////            e.printStackTrace();
-////        }
-////    }
-////
+package me.zhengjie.modules.quartz.task;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import me.zhengjie.modules.test.TestController;
+import org.springframework.stereotype.Component;
+
+import java.text.ParseException;
+
+@Slf4j
+@RequiredArgsConstructor
+@Component
+public class DayPcDataTask {
+
+    public void run() throws ParseException {
+        log.info("run 执行开始");
+        send();
+        log.info("run 执行结束");
+    }
+
+    /**
+     * 排菜生产者
+     */
+    public void send() throws ParseException {
+        TestController controller = new TestController();
+        controller.testSend();
+        //获取连接
+//        Connection connection = ConnectionUtil.getConnection();
+//        try {
+//            List<DmDayPc> dmDayPc = dmDayPcService.foodRepository();
+//            String userString = JSON.toJSONString(dmDayPc);
+//            Channel channel = connection.createChannel();
+//            String exchangeName = "schedule_consume";//交换机
+//            channel.exchangeDeclare(exchangeName, BuiltinExchangeType.DIRECT, true,false, null);
+//            String queue1Name = "schedule_consume";//队列名称
+//            channel.queueDeclare(queue1Name, true, false, false, null);
+//            channel.queueBind(queue1Name, exchangeName, "schedule_consume");// 队列绑定hello路由
+//            channel.basicPublish(exchangeName, "schedule_consume", null, userString.getBytes());
+//            System.out.println("sned排菜:"+dmDayPc);
+//            channel.close();
+//            connection.close();
+//        } catch (IOException | TimeoutException e) {
+//            e.printStackTrace();
+//        }
+    }
+
 //    /**
 //     * 消费者
 //     */
@@ -119,4 +83,4 @@
 //            e.printStackTrace();
 //        }
 //    }
-//}
+}

eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/VideoDataTask.java

@@ -0,0 +1,65 @@
+package me.zhengjie.modules.quartz.task;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alipay.api.FileItem;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import me.zhengjie.exception.BadRequestException;
+import me.zhengjie.modules.dm.video.domain.DmVideo;
+import me.zhengjie.modules.dm.video.service.DmVideoService;
+import me.zhengjie.utils.BeanMapUtils;
+import me.zhengjie.utils.FileUtil;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
+import sun.misc.BASE64Decoder;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+@RequiredArgsConstructor
+@Component
+public class VideoDataTask {
+    private final DmVideoService dmVideoService;
+
+    public void run(){
+        log.info("deptsync 执行开始");
+        videoSync();
+        log.info("deptsync 执行结束");
+    }
+
+    private void videoSync(){
+        String url = "http://xxx:xxx/xxx";
+
+//        JSONObject dataJSON = JSONObject.parseObject(BeanMapUtils.doPostForm(url,null));
+        String postData = BeanMapUtils.doPostForm(url,null);
+        MultipartFile dataJSON = JSONObject.parseObject(postData,MultipartFile.class);
+        JSONObject jsonObject = JSONObject.parseObject(postData);
+        JSONArray content = jsonObject.getJSONArray("data");
+        // 判断文件是否为图片
+        String suffix = FileUtil.getExtensionName(dataJSON.getOriginalFilename());
+        if(!FileUtil.VIDEO.equals(FileUtil.getFileType(suffix))){
+            throw new BadRequestException("只能上传图片");
+        }
+
+        for (int i = 0; i < content.size(); i++) {
+            MultipartFile file = JSONObject.parseObject(content.getString(i), MultipartFile.class);
+            dmVideoService.create(null,file);
+        }
+
+        //按页获取
+//        for (int k = 0; k < pageTotal; k++) {
+//            JSONObject newGenerateProcDataJson = getData(url,data);
+//            JSONObject dataJSON = newGenerateProcDataJson.getJSONObject("data");
+//            JSONArray data1 = dataJSON.getJSONArray("data");
+//            for (int i = 0; i < data1.size(); i++) {
+//                DmPlateTraffic dmPlateTraffic = JSONObject.parseObject(data1.getString(i), DmPlateTraffic.class);
+//                dmPlateTrafficRepository.save(dmPlateTraffic);
+//            }
+//        }
+    }
+
+}

eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/ZkDataSyncTask.java

@@ -30,6 +30,7 @@ import me.zhengjie.modules.system.repository.DeptRepository;
 import me.zhengjie.modules.system.repository.UserRepository;
 import me.zhengjie.modules.system.service.DeptService;
 import me.zhengjie.utils.SecurityUtils;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Component;
 
 import java.text.DateFormat;
@@ -52,6 +53,7 @@ public class ZkDataSyncTask {
     private final UserRepository userRepository;
     private final DmUserRepository dmUserRepository;
     private final DeptRepository deptRepository;
+    private final PasswordEncoder passwordEncoder;
 
     public void run(){
         log.info("deptsync 执行开始");
@@ -202,6 +204,9 @@ public class ZkDataSyncTask {
                 JSONObject userData = content.getJSONObject(i);
 
                 user.setId(userData.getString("id"));
+                user.setUsername(userData.getString("username"));
+                user.setPassword(passwordEncoder.encode("12345678"));
+                user.setOrgPassword("12345678");
                 Set<Job> jobs = new HashSet<>(JSONArray.parseArray(userData.getString("jobs"),Job.class));
                 user.setJobs(jobs);
                 Set<Role> roles = new HashSet<>(JSONArray.parseArray(userData.getString("roles"),Role.class));
@@ -219,6 +224,9 @@ public class ZkDataSyncTask {
                 dmUser.setContacts(user.getPhone());
                 dmUser.setName(user.getNickName());
                 dmUser.setSex(user.getGender());
+
+                JSONObject dmUserObject = userData.getJSONObject("dmUser");
+                dmUser.setFaceid(dmUserObject.getString("faceid"));
                 DmUser newDmUser = dmUserRepository.save(dmUser);
                 user.setDmUser(newDmUser);
                 userRepository.save(user);
@@ -253,6 +261,9 @@ public class ZkDataSyncTask {
                 JSONObject userData = content.getJSONObject(i);
 
                 user.setId(userData.getString("id"));
+                user.setUsername(userData.getString("username"));
+                user.setPassword(passwordEncoder.encode("12345678"));
+                user.setOrgPassword("12345678");
                 Set<Job> jobs = new HashSet<>(JSONArray.parseArray(userData.getString("jobs"),Job.class));
                 user.setJobs(jobs);
                 Set<Role> roles = new HashSet<>(JSONArray.parseArray(userData.getString("roles"),Role.class));
@@ -270,6 +281,9 @@ public class ZkDataSyncTask {
                 dmUser.setContacts(user.getPhone());
                 dmUser.setName(user.getNickName());
                 dmUser.setSex(user.getGender());
+
+                JSONObject dmUserObject = userData.getJSONObject("dmUser");
+                dmUser.setFaceid(dmUserObject.getString("faceid"));
                 DmUser newDmUser = dmUserRepository.save(dmUser);
                 user.setDmUser(newDmUser);
                 userRepository.save(user);

eladmin-system/src/main/java/me/zhengjie/modules/test/TestController.java

@@ -1,13 +1,15 @@
 package me.zhengjie.modules.test;
 
-
-import me.zhengjie.config.rabbitmq.cuisine.CuisineConsumer;
+import com.alibaba.fastjson.JSONObject;
 import me.zhengjie.config.rabbitmq.test.SendTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -19,12 +21,32 @@ public class TestController {
     public SendTemplate sendTemplate;
 
     @GetMapping("/send")
-    public void testSend(){
+    public void testSend() throws ParseException {
+        Map<String,Object> map = new HashMap<>();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+        Date date = new Date();
+        String timestamp =sdf.format(date);
+        System.out.println("timestamp:"+timestamp);
+
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        String dateNowStr = simpleDateFormat.format(date);
+        System.out.println("时间date"+dateNowStr);
+
+        map.put("seq",Long.valueOf(timestamp));
+        map.put("date",dateNowStr);
+        map.put("shopname","餐厅");
+        JSONObject jsonObject = new JSONObject(map);
+        sendTemplate.sendMessage(jsonObject);
+        System.out.println("消息發送成功success"+jsonObject);
+    }
+
+    @GetMapping("/send1")
+    public void testSend1(){
         Map<String,Object> map = new HashMap<>();
         map.put("seq",1);
-        map.put("date","2021-12-9");
+        map.put("date","2021-12-09 00:00:00");
         map.put("shopname","111");
-        sendTemplate.sendMessage(map);
-        System.out.println("消息發送成功"+"success");
+        sendTemplate.sendOrederMessage(map);
+        System.out.println("消息發送成功success"+map);
     }
 }

eladmin-system/src/main/java/me/zhengjie/modules/thirdparty/v1/OpenApiController.java

@@ -3,6 +3,7 @@ package me.zhengjie.modules.thirdparty.v1;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
+import me.zhengjie.annotation.AnonymousAccess;
 import me.zhengjie.annotation.Log;
 import me.zhengjie.annotation.rest.AnonymousPostMapping;
 import me.zhengjie.base.BaseResponse;
@@ -14,6 +15,10 @@ import me.zhengjie.modules.dm.daypc.service.DmDayPcService;
 import me.zhengjie.modules.dm.daypc.service.dto.DmDayPcQueryCriteria;
 import me.zhengjie.modules.dm.foodPj.domain.DmFoodPj;
 import me.zhengjie.modules.dm.foodPj.service.DmFoodPjService;
+import me.zhengjie.modules.dm.order.domain.DmOrderItem;
+import me.zhengjie.modules.dm.order.domain.DmOrderRecord;
+import me.zhengjie.modules.dm.order.repository.DmOrderItemRepository;
+import me.zhengjie.modules.dm.order.repository.DmOrderRecordRepository;
 import me.zhengjie.modules.dm.service.domain.DmServicePj;
 import me.zhengjie.modules.dm.service.service.DmServicePjService;
 import me.zhengjie.modules.dmApp.domain.AppFoodPj;
@@ -41,14 +46,15 @@ public class OpenApiController {
     private final AppFoodPjService appFoodPjService;
     private final DmFoodPjService dmFoodPjService;
     private final LocalStorageService localStorageService;
+    private final DmOrderRecordRepository dmOrderRecordRepository;
+    private final DmOrderItemRepository orderItemRepository;
 
     @Log("获取今日菜品-App")
     @ApiOperation("获取今日菜品-App")
     @AnonymousPostMapping(value = "/foodRepository")
     public BaseResponse<Object> foodRepository(@RequestBody QueryPageParams<DmDayPcQueryCriteria> criteria, Pageable pageable){
         SecurityUtils.CheckApiAuth(criteria);
-        List<DmDayPc> map = dmDayPcService.foodRepository();
-        return new BaseResponse<>(map);
+        return new BaseResponse<>(dmDayPcService.foodRepository());
     }
 
     @AnonymousPostMapping(value = "/createApp")
@@ -56,7 +62,6 @@ public class OpenApiController {
     @ApiOperation("新增服务评价")
     public BaseResponse<Object> createApp(@RequestBody QueryPageParams<DmServicePj> resources){
         SecurityUtils.CheckApiAuth(resources);
-//        dmServicePjService.createApp(resources.getQuery());
         return new BaseResponse<>(dmServicePjService.createApp(resources.getQuery()));
     }
 
@@ -74,7 +79,6 @@ public class OpenApiController {
     @ApiOperation("新增菜品评价")
     public BaseResponse<Object> createFoodPj(@RequestBody QueryPageParams<DmFoodPj> resources){
         SecurityUtils.CheckApiAuth(resources);
-//        dmFoodPjService.createApp(resources.getQuery());
         return new BaseResponse<>(dmFoodPjService.createApp(resources.getQuery()));
     }
 
@@ -95,4 +99,36 @@ public class OpenApiController {
         return new BaseResponse<>(localStorage);
     }
 
+    @AnonymousAccess
+    @GetMapping(value = "/countOrderAmt")
+    @Log("pc端运营食堂营业额")
+    @ApiOperation("pc端运营食堂营业额")
+    public ResponseEntity<Object> countOrderAmt(){
+        return new ResponseEntity<>(dmOrderRecordRepository.countOrderAmt(),HttpStatus.OK);
+    }
+
+    @AnonymousAccess
+    @GetMapping(value = "/hyFood")
+    @Log("pc端运营最受欢迎菜品")
+    @ApiOperation("pc端运营最受欢迎菜品")
+    public ResponseEntity<Object> hyFood(){
+        return new ResponseEntity<>(orderItemRepository.hyFood(),HttpStatus.OK);
+    }
+
+    @AnonymousPostMapping(value = "/countOrderAmtApp")
+    @Log("App端运营食堂营业额")
+    @ApiOperation("App端运营食堂营业额")
+    public BaseResponse<Object> countOrderAmtApp(@RequestBody QueryPageParams<DmOrderRecord> criteria){
+        SecurityUtils.CheckApiAuth(criteria);
+        return new BaseResponse<>(dmOrderRecordRepository.countOrderAmt());
+    }
+
+    @AnonymousPostMapping(value = "/hyFoodApp")
+    @Log("App端运营最受欢迎菜品")
+    @ApiOperation("App端运营最受欢迎菜品")
+    public BaseResponse<Object> hyFoodApp(@RequestBody QueryPageParams<DmOrderItem> criteria){
+        SecurityUtils.CheckApiAuth(criteria);
+        return new BaseResponse<>(orderItemRepository.hyFood());
+    }
+
 }