Skip to content

Commit

Permalink
根据SID生成条形码，并显示在SKU画面提供下载链接
Browse files Browse the repository at this point in the history
  • Loading branch information
@wukonggg
wukonggg committed Jul 13, 2016
1 parent 2888ab6 commit 10f9cf2
Show file tree
Hide file tree
Showing 9 changed files with 93 additions and 23 deletions.
2 changes: 1 addition & 1 deletion VERSION.TXT
View file
Expand Up @@ -5,7 +5,7 @@


==============================================
[now]mz-gallery-0.6.1 [publish on 2016.07.xx]
[now]mz-gallery-0.6.1 [publish on 2016.07.13]
1.调整SID策略，使用sequence的方式，sequence基于category+序列数字
2.根据SID生成条形码，并显示在SKU画面提供下载链接

Expand Down
5 changes: 5 additions & 0 deletions pom.xml
View file
Expand Up @@ -47,6 +47,11 @@
<artifactId>wukong-util</artifactId>
<version>0.1.4a</version>
</dependency>
<dependency>
<groupId>band.wukong.practice</groupId>
<artifactId>wkp-barcode</artifactId>
<version>0.1.0a</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
Expand Down
17 changes: 17 additions & 0 deletions src/main/java/band/wukong/mz/g/AppConf.java
View file
@@ -0,0 +1,17 @@
package band.wukong.mz.g;

import org.nutz.ioc.impl.PropertiesProxy;

/**
* 通过js文件被ioc容器识别
*
* @author wukong(wukonggg@139.com)
*/
public class AppConf extends PropertiesProxy {

public static final String BARCODE_IMAGE_PATH = "barcode.image.path";
public static final String BARCODE_IMAGE_WIDTH = "barcode.image.width";
public static final String BARCODE_IMAGE_HEIGHT = "barcode.image.height";
public static final String BARCODE_IMAGE_FORMAT = "barcode.image.format";

}
33 changes: 29 additions & 4 deletions src/main/java/band/wukong/mz/g/sku/module/SkuModule.java
View file
@@ -1,6 +1,7 @@
package band.wukong.mz.g.sku.module;

import band.wukong.mz.base.exception.AppRuntimeException;
import band.wukong.mz.g.AppConf;
import band.wukong.mz.g.category.SimpleCateConst;
import band.wukong.mz.g.category.bean.Category;
import band.wukong.mz.g.sku.SkuMoreHelper;
Expand All @@ -11,9 +12,12 @@
import band.wukong.mz.g.sku.service.SkuMoreViewService;
import band.wukong.mz.g.sku.service.SkuPropTypeService;
import band.wukong.mz.g.sku.service.SkuService;
import band.wukong.practice.barcode.zxing.BarcodeTool;
import com.google.zxing.BarcodeFormat;
import org.nutz.dao.QueryResult;
import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.lang.Files;
import org.nutz.lang.Strings;
import org.nutz.lang.util.NutMap;
import org.nutz.log.Log;
Expand All @@ -25,10 +29,10 @@
import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.io.IOException;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.nio.file.FileSystem;
import java.nio.file.FileSystems;
import java.nio.file.Path;
import java.util.*;

/**
* As you see...
Expand Down Expand Up @@ -56,6 +60,8 @@ public class SkuModule {
@Inject("refer:skuPropTypeService")
private SkuPropTypeService sptService;

@Inject("app_conf")
private AppConf appConf;

@At("/list")
@Ok("jsp:view.sku.sku_list")
Expand Down Expand Up @@ -135,6 +141,25 @@ public Object save(@Param("..") Sku sku, @Param("inputFile") File img,
return re.setv("ok", true);
}

@At("/printBarcode")
@Ok("raw:txt")
public Object printBarcode(@Param("barcode") String barcode) {
log.debug("Input params - barcode: \n" + barcode);

int width = appConf.getInt(AppConf.BARCODE_IMAGE_WIDTH);
int height = appConf.getInt(AppConf.BARCODE_IMAGE_HEIGHT);
String format = appConf.get(AppConf.BARCODE_IMAGE_FORMAT);
String way = appConf.get(AppConf.BARCODE_IMAGE_PATH);
way = way.replace("$name", UUID.randomUUID().toString());

FileSystem fileSystem = FileSystems.getDefault();
Path path = fileSystem.getPath(way);

BarcodeTool.encode(barcode, BarcodeFormat.CODE_128, width, height, path, format);

return Files.findFile(way);
}

@At("/mod")
@Ok("jsp:view.sku.sku_mod")
public Object mod(@Param("id") Long id) {
Expand Down
4 changes: 4 additions & 0 deletions src/main/resources/custom/app.properties
View file
@@ -0,0 +1,4 @@
barcode.image.path=D:/Lab/ws-wukong-app/mz-g-main/lin/barcode-$name.png
barcode.image.width=200
barcode.image.height=20
barcode.image.format=png
9 changes: 9 additions & 0 deletions src/main/resources/ioc/app.js
View file
@@ -0,0 +1,9 @@
var ioc = {
app_conf : {
type : "band.wukong.mz.g.AppConf",
//type : "org.nutz.ioc.impl.PropertiesProxy",
fields : {
paths : ["custom/app.properties"]
}
}
};
5 changes: 0 additions & 5 deletions src/main/resources/ioc/beans.js
View file

This file was deleted.

24 changes: 12 additions & 12 deletions src/main/resources/ioc/db.js
View file
@@ -1,9 +1,9 @@
var ioc = {
config : {
db_conf : {
type : "org.nutz.ioc.impl.PropertiesProxy",
fields : {
// paths : ["custom/db.properties"]
paths : ["custom/"]
paths : ["custom/db.properties"]
//paths : ["custom/"]
}
},
dataSource: {
Expand All @@ -12,15 +12,15 @@ var ioc = {
depose: 'close'
},
fields: {
driverClassName : {java : "$config.get('db.driver')"},
url : {java : "$config.get('db.url')"},
username : {java : "$config.get('db.username')"},
password : {java : "$config.get('db.password')"},
testWhileIdle : {java : "$config.get('db.testWhileIdle')"},
validationQuery : {java : "$config.get('db.validationQuery')"},
maxActive : {java : "$config.get('db.maxActive')"},
filters : {java : "$config.get('db.maxActive')"},
connectionProperties : {java : "$config.get('db.connectionProperties')"}
driverClassName : {java : "$db_conf.get('db.driver')"},
url : {java : "$db_conf.get('db.url')"},
username : {java : "$db_conf.get('db.username')"},
password : {java : "$db_conf.get('db.password')"},
testWhileIdle : {java : "$db_conf.get('db.testWhileIdle')"},
validationQuery : {java : "$db_conf.get('db.validationQuery')"},
maxActive : {java : "$db_conf.get('db.maxActive')"},
filters : {java : "$db_conf.get('db.maxActive')"},
connectionProperties : {java : "$db_conf.get('db.connectionProperties')"}
/*
initialSize: 1,
minIdle: 1,
Expand Down
17 changes: 16 additions & 1 deletion src/main/webapp/WEB-INF/view/sku/sku_list.jsp
View file
Expand Up @@ -44,6 +44,7 @@
<!-- content start -->
<form id="frmMain" name="frmMain" class="am-form" method="post">
<input type="hidden" id="id" name="id" value="">
<input type="hidden" id="barcode" name="barcode" value="">
<div class="admin-content">
<jsp:include page="../base/admin_breadcrumb.jsp">
<jsp:param name="info1" value="Stock"/>
Expand Down Expand Up @@ -96,7 +97,7 @@
<th>名称</th>
<th>款型</th>
<th>SKU编码</th>
<th style="width: 150px;">操作</th>
<th style="width: 250px;">操作</th>
</tr>
</thead>
<tbody>
Expand All @@ -111,6 +112,10 @@
<td>
<div class="am-btn-toolbar">
<div class="am-btn-group am-btn-group-xs">
<button name="btnPrintBarcode_${sc.id}" value="${sc.sid}"
class="am-btn am-btn-default am-btn-xs">
<span class="am-icon-print"></span> 打印条码
</button>
<button name="btnMod_${sc.id}" value="${sc.id}"
class="am-btn am-btn-default am-btn-xs am-text-secondary">
<span class="am-icon-pencil-square-o"></span> 编辑
Expand Down Expand Up @@ -162,16 +167,26 @@
$("#btnList").click(function() {
var form = $("#frmMain");
form.attr("action", "${base}/stock/sku/list.io");
form.attr("target", "_self");
form.submit();
});
$("#btnAdd").click(function() {
document.location.href = "${base}/stock/sku/add_s1.io";
});
//绑定打印条码事件
$("button[name^='btnPrintBarcode_']").click(function() {
$("#barcode").val($(this).val());
var form = $("#frmMain");
form.attr("action", "${base}/stock/sku/printBarcode.io");
form.attr("target", "_blank");
form.submit();
});
//绑定修改事件
$("button[name^='btnMod_']").click(function() {
$("#id").val($(this).val());
var form = $("#frmMain");
form.attr("action", "${base}/stock/sku/mod.io");
form.attr("target", "_self");
form.submit();
});
//绑定删除事件
Expand Down

0 comments on commit 10f9cf2

Please sign in to comment.