机器设备修改

src/main/java/com/minpay/mt/machine/action/MachineManageAction.java

@@ -1,5 +1,6 @@
 package com.minpay.mt.machine.action;
 
+import com.itextpdf.text.pdf.qrcode.WriterException;
 import com.min.util.CommonUtil;
 import com.minpay.common.bean.User;
 import com.minpay.common.constant.Constant;
@@ -7,6 +8,7 @@ import com.minpay.common.format.IFormatService;
 import com.minpay.common.service.IPropertiesService;
 import com.minpay.common.service.IPublicService;
 import com.minpay.common.util.DateUtil;
+import com.minpay.common.util.UpLoadFile;
 import com.minpay.db.table.mapper.VmEquipmentInfMapper;
 import com.minpay.db.table.mapper.VmProEquRelMapper;
 import com.minpay.db.table.model.VmEquipmentInf;
@@ -14,6 +16,7 @@ import com.minpay.db.table.model.VmEquipmentInfExample;
 import com.minpay.db.table.model.VmProEquRel;
 import com.minpay.db.table.model.VmProEquRelExample;
 import com.minpay.db.table.own.mapper.MachineManageMapper;
+import com.minpay.huicai.util.EquCodeCreateUtil;
 import com.startup.minpay.frame.business.IMINAction;
 import com.startup.minpay.frame.business.res.MINActionResult;
 import com.startup.minpay.frame.constant.IMINBusinessConstant;
@@ -28,6 +31,7 @@ import com.startup.minpay.frame.target.MINAction;
 import com.startup.minpay.frame.target.MINComponent;
 import com.startup.minpay.frame.target.MINParam;
 
+import java.io.*;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -102,6 +106,8 @@ public class MachineManageAction implements IMINAction {
 
     /**一键设置商品价格*/
     public final static String	EDIT_PROEQUREL_PRICE			= "editProEquRelPrice";
+    /** 生成包含字符串信息的二维码图片**/
+    public static final String CREATE_QRCODE = "createQrCode";
     private boolean contains;
 
 
@@ -1183,4 +1189,63 @@ public class MachineManageAction implements IMINAction {
         }
         return res;
     }
+    /**
+     * 生成包含字符串信息的二维码图片
+     * @param flash 是否刷新
+     */
+    @MINAction(value = CREATE_QRCODE, transaction = IMINTransactionEnum.CMT)
+    public static MINActionResult createQrCode(
+            @MINParam(key = "flash") String flash,
+            @MINParam(key = "equId") String equId,
+            MINSession session)throws MINBusinessException, FileNotFoundException, WriterException, IOException {
+        MINActionResult res = new MINActionResult();
+        //获取当前用户信息
+        User u = session.getUser();
+        //获取用户id
+        String userId = u.getBranchId();
+        //刷新，生成
+        //开发环境修改配置
+        String basePath = "/home/images/"+ userId+".jpg"; //与nginx配置相同
+        String os = System.getProperty("os.name");
+        if(os.toLowerCase().startsWith("win")){
+            System.out.println(os + " can't gunzip");
+            basePath = "D:/images/"+ userId+".jpg"; //与nginx配置相同
+        }
+
+        File file = new File(basePath);
+        //获取父目录
+        File fileParent = file.getParentFile();
+        //判断是否存在
+        if (!fileParent.exists()) {
+            fileParent.mkdirs();
+        }
+        //获取渠道号
+        String channel = "V01";
+        String address = Service.lookup(IPropertiesService.class)
+                .getSystemProperties().get(channel+"_TO_MACHINE_ERWERMA").getKey();// 为nginx根路径
+        // 加密客户号
+        OutputStream outputStream = new FileOutputStream(file);
+        String serviceUrl = Service.lookup(IPropertiesService.class)
+                .getSystemProperties().get(channel+"_TO_MACHINE_ERWERMA").getKey();
+        serviceUrl = "http://".concat(serviceUrl.concat("/admin/h5/index.html?equId=").concat(equId));
+        //String urlString = URLEncoder.encode(, "GBK");
+
+        // 生成二维码图片到本地
+        try {
+            EquCodeCreateUtil.createQrCode(outputStream,serviceUrl,900,"JPEG");
+        } catch (com.google.zxing.WriterException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        outputStream.close();
+        // 上传图片到服务器
+        InputStream inputSteam = new FileInputStream(file);
+        String url = UpLoadFile.uploadImg(inputSteam,"jpg",channel,"00");
+
+        inputSteam.close();
+        // 删除本地图片
+        file.delete();
+        res.set("url", url);
+        return res;
+    }
 }

src/main/webapp/admin/machineManage/addEquproduct.html

@@ -183,9 +183,7 @@
 	  				data : data.field ,
 	  				success : function(data) {
 	  					 layer.alert('操作成功!',  function(){
-	  						 
-	  						 window.parent.location.reload(); 
-	  		                 parent. layer.close(layer.index);  
+							 deleteTabPage('201001-03-04');
 	  					}); 	
 	  				},
 	  				error : function(data) {

src/main/webapp/admin/machineManage/addEquproductPrice.html

@@ -115,9 +115,9 @@
 	  				data : data.field ,
 	  				success : function(data) {
 	  					 layer.alert('操作成功!',  function(){
-	  						 
-	  						 window.parent.location.reload(); 
-	  		                 parent. layer.close(layer.index);  
+
+	  						 window.parent.location.reload();
+	  		                 parent. layer.close(layer.index);
 	  					}); 	
 	  				},
 	  				error : function(data) {

src/main/webapp/admin/machineManage/addmachine.html

@@ -201,10 +201,7 @@
 					data :  data.field ,
 					success : function(data) {
 						 layer.alert('保存成功!',  function(){
-							 //window.parent.location.reload(); 
-							// window.parent.reload.click(); 
-			                 window.parent.location.reload(); 
-	  		                 parent. layer.close(layer.index);  
+                             deleteTabPage('201001-01');
 						}); 	
 					},
 					error : function(data2) {

src/main/webapp/admin/machineManage/editEquproduct.html

@@ -216,9 +216,8 @@
 	  				data : data.field ,
 	  				success : function(data) {
 	  					 layer.alert('操作成功!',  function(){
-	  						 
-	  						 window.parent.location.reload(); 
-	  		                 parent. layer.close(layer.index);  
+
+							 deleteTabPage('201001-03-05');
 	  					}); 	
 	  				},
 	  				error : function(data) {

src/main/webapp/admin/machineManage/erWm.html

@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <title>设备管理</title>
+    <script src="../../js/min-loader-next.js"></script>
+</head>
+
+<body>
+<div class="form-input  demoTable"  >
+<img style="margin: 30px;" id="equCode" height="200px" width="200px" src="">
+	<p> <button class="layui-btn" onclick="createCode()" >生成二维码</button>
+<!--	<button class="layui-btn" onclick="downCode()" >下载二维码</button></p>-->
+</div>
+<script>
+	var rowData = layui.sessionData("ROW_DATA").NOW_ROW;
+	 $("#equCode").attr("src",rowData.equCode);
+	layui.use('laydate', function(){
+		var laydate = layui.laydate;
+	 	/* laydate.render({
+	        elem: '#date'
+	    });
+	    laydate.render({
+	        elem: '#date1'
+	    }); */
+		//日期范围
+		laydate.render({
+		    elem: '#dates'
+		   ,range: true
+		   ,format:'yyyyMMdd'
+		});
+	})
+
+
+	//生成二维码
+	function createCode() {
+		$.request({
+			action : '../../MachineManageAction/createQrCode',
+			data : { equId: rowData.id,flash:"1"},
+			success : function(data) {
+
+				$("#equCode").attr("src",data.url);
+debugger;
+			}
+		});
+	}
+	//下载二维码
+	/* function downCode() {
+		var code = $("#equCode")[0].src;
+		window.open(code);
+	} */
+	function downCode() {
+		var url = $("#equCode")[0].src;
+		window.open("../../EquipmentManageAction/downEqucode?MINView=JSON&url=" + url+"&machineNo=" + rowData.machineNo);
+	}
+
+</script>
+     
+  
+  
+</body>
+
+</html>

src/main/webapp/admin/machineManage/machineManage.html

@@ -43,6 +43,7 @@
 
 <!--操作功能-->
 <script type="text/html" id="barDemo">
+	<a class="layui-btn layui-btn-xs" lay-event="equCode">二维码</a>
 	<a class="layui-btn layui-btn-xs" lay-event="detail">查看货道</a>
 	<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
 	{{#  if(d.songStatus == '00'){ }}
@@ -176,6 +177,16 @@
 				});
 			}else if(layEvent == 'edit'){ //编辑
 				editDetail(data);
+			}else if(layEvent =='equCode'){//二维码
+				layui.sessionData("ROW_DATA", {key:"NOW_ROW", value:data});
+				layer.open({
+					type: 2,
+					title: '查看二维码',
+					shadeClose: true,
+					shade: 0.6,
+					area: ['50%', '80%'],
+					content: 'erWm.html'
+				});
 			}
 		});