From 5becebd7f4e554a63889f08f92ccc76a8560fee2 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Fri, 16 Dec 2022 10:31:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=84=E5=90=88=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E7=9A=84=E4=BA=8C=E7=BB=B4=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DepositoryRecordController.java | 32 ++++--- .../controller/GroupController.java | 40 +++++++-- .../controller/PageController.java | 2 + .../depository_manage/mapper/GroupMapper.java | 30 +++++-- .../depository_manage/mapper/GroupMapper.xml | 15 ++++ .../depository_manage/pojo/RestResponse.java | 2 + .../service/GroupService.java | 23 +++++ .../service/impl/GroupServiceImpl.java | 30 +++++++ .../utils/CreateQrCodeUtil.java | 64 ++++++++++++- .../resources/templates/index_mobile.html | 1 - .../pages/application/application-in.html | 83 ++++++++--------- .../pages/application/application_multi.html | 5 +- .../templates/pages/group/group_edit.html | 89 +++++++++++++++++++ .../depository_manage/TestForOther.java | 23 ++--- target/classes/templates/index_mobile.html | 1 - .../pages/application/application_multi.html | 5 +- .../templates/pages/chart/chart-out_back.html | 3 - .../pages/chart/chart-stock_back.html | 4 +- 18 files changed, 357 insertions(+), 95 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java index 449fb6d9..838b5d3f 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java @@ -33,8 +33,6 @@ public class DepositoryRecordController { @Autowired private CompanyService companyService; @Autowired - private RedisTemplate redisTemplate; - @Autowired private RedisTemplate redisTemplateForHash; @Autowired private PlaceService placeService; @@ -620,19 +618,19 @@ public class DepositoryRecordController { List mids = (List) map.get("mids"); List depositoryIds = (List) map.get("depositoryIds"); List placeCodes = (List) map.get("placeCodes"); - List nowmids = redisTemplate.opsForList().range("mids"+userToken.getId(), 0, -1); + List nowmids = redisTemplateForHash.opsForList().range("mids"+userToken.getId(), 0, -1); for (int i = 0; i < mids.size(); i++) { if(nowmids.contains(mids.get(i))){ continue; } - redisTemplate.opsForList().leftPush("mids"+userToken.getId(), mids.get(i)); - redisTemplate.opsForList().leftPush("depositoryIds"+userToken.getId(), depositoryIds.get(i)); - redisTemplate.opsForList().leftPush("placeCodes"+userToken.getId(), placeCodes.get(i)); + redisTemplateForHash.opsForList().leftPush("mids"+userToken.getId(), mids.get(i).toString()); + redisTemplateForHash.opsForList().leftPush("depositoryIds"+userToken.getId(), depositoryIds.get(i).toString()); + redisTemplateForHash.opsForList().leftPush("placeCodes"+userToken.getId(), placeCodes.get(i).toString()); } - redisTemplate.expire("mids"+userToken.getId(),24 * 60 * 60, TimeUnit.SECONDS); - redisTemplate.expire("depositoryIds"+userToken.getId(),24 * 60 * 60, TimeUnit.SECONDS); - redisTemplate.expire("placeCodes"+userToken.getId(),24 * 60 * 60, TimeUnit.SECONDS); + redisTemplateForHash.expire("mids"+userToken.getId(),24 * 60 * 60, TimeUnit.SECONDS); + redisTemplateForHash.expire("depositoryIds"+userToken.getId(),24 * 60 * 60, TimeUnit.SECONDS); + redisTemplateForHash.expire("placeCodes"+userToken.getId(),24 * 60 * 60, TimeUnit.SECONDS); return CrudUtil.postHandle(1,1); } @@ -645,17 +643,17 @@ public class DepositoryRecordController { @PostMapping("/deleteApplicationToRedis") public RestResponse deleteApplicationToRedis(@RequestBody Map map,HttpServletRequest request){ UserByPort userToken= (UserByPort) request.getAttribute("userToken"); - List mids = (List) map.get("mids"); + List mids = (List) map.get("iids"); List depositoryIds = (List) map.get("depositoryIds"); List placeCodes = (List) map.get("placeCodes"); for (int i = 0; i < mids.size(); i++) { - redisTemplate.opsForList().remove("mids"+userToken.getId(),1,mids.get(i)); + redisTemplateForHash.opsForList().remove("mids"+userToken.getId(),1,mids.get(i).toString()); } for (int i = 0; i < depositoryIds.size(); i++) { - redisTemplate.opsForList().remove("depositoryIds"+userToken.getId(),1,depositoryIds.get(i)); + redisTemplateForHash.opsForList().remove("depositoryIds"+userToken.getId(),1,depositoryIds.get(i).toString()); } for (int i = 0; i < placeCodes.size(); i++) { - redisTemplate.opsForList().remove("placeCodes"+userToken.getId(),1,placeCodes.get(i)); + redisTemplateForHash.opsForList().remove("placeCodes"+userToken.getId(),1,placeCodes.get(i).toString()); } return CrudUtil.postHandle(1,1); } @@ -833,18 +831,18 @@ public class DepositoryRecordController { Integer start = (page - 1) * pagesize; Integer end = page * 10; UserByPort userToken= (UserByPort) request.getAttribute("userToken"); - Long size = redisTemplate.boundListOps("mids"+userToken.getId()).size(); + Long size = redisTemplateForHash.boundListOps("mids"+userToken.getId()).size(); if(end > size){ end = ObjectFormatUtil.toInteger(size); } List list = new ArrayList<>(); for (int i = start; i < end; i++) { // 获取物料编号 - Integer mid =ObjectFormatUtil.toInteger(redisTemplate.opsForList().index("mids"+userToken.getId(),i)); + Integer mid =ObjectFormatUtil.toInteger(redisTemplateForHash.opsForList().index("mids"+userToken.getId(),i)); // 获取仓库编号 - Integer depositoryId =ObjectFormatUtil.toInteger(redisTemplate.opsForList().index("depositoryIds"+userToken.getId(),i)); + Integer depositoryId =ObjectFormatUtil.toInteger(redisTemplateForHash.opsForList().index("depositoryIds"+userToken.getId(),i)); // 获取库位编码 - String placeCode =(String)(redisTemplate.opsForList().index("placeCodes"+userToken.getId(),i)); + String placeCode =(String)(redisTemplateForHash.opsForList().index("placeCodes"+userToken.getId(),i)); // 获取物料信息 Inventory materialById = materialService.findInventoryByMid(mid); // 获取仓库信息 diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java b/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java index f88c16e0..ef222cb9 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java @@ -1,9 +1,9 @@ package com.dreamchaser.depository_manage.controller; +import cn.hutool.core.lang.Snowflake; import com.alibaba.fastjson.JSONObject; import com.dreamchaser.depository_manage.entity.*; import com.dreamchaser.depository_manage.exception.MyException; -import com.dreamchaser.depository_manage.pojo.ApplicationModel; import com.dreamchaser.depository_manage.pojo.GroupInfoP; import com.dreamchaser.depository_manage.pojo.RestResponse; import com.dreamchaser.depository_manage.pojo.StatusInfo; @@ -12,15 +12,12 @@ import com.dreamchaser.depository_manage.service.GroupService; import com.dreamchaser.depository_manage.service.MaterialService; import com.dreamchaser.depository_manage.service.impl.QyWxOperationService; import com.dreamchaser.depository_manage.utils.*; -import com.sun.org.apache.xpath.internal.operations.Bool; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; -import java.sql.Time; +import java.io.IOException; import java.util.*; import java.util.concurrent.TimeUnit; @@ -452,6 +449,12 @@ public class GroupController { } + /** + * 用于构造组合出库单 + * @param map 出库数据 + * @param request + * @return + */ @PostMapping("/applicationOutForGroup") public RestResponse applicationOutForGroup(@RequestBody Map map, HttpServletRequest request) { UserByPort userToken = (UserByPort) request.getAttribute("userToken"); @@ -520,6 +523,33 @@ public class GroupController { } + // 构造组合二维码 + @PostMapping("/createQrCode") + public RestResponse createQrCode(@RequestBody Map map) { + // 通过雪花算法计算随机数 + Snowflake snowflake = new Snowflake(10, 10, true); + String qrCode = snowflake.nextIdStr(); + + Integer gid = ObjectFormatUtil.toInteger(map.get("gid")); + + String qrCodeByMcode = groupService.findQrCodeByGid(gid); + + if (qrCodeByMcode == null) { + Map param = new HashMap<>(); + param.put("gid", gid); + param.put("code", qrCode); + groupService.addQrCodeByGroup(param); + } else { + qrCode = qrCodeByMcode; + } + try { + // 二维码保存信息 + return RestResponse.CreateQrCode(qrCode); + } catch (IOException e) { + return new RestResponse("err: " + e.getMessage(), 678, new StatusInfo("失败", "请联系开发人员")); + } + + } /** * 用于判断当前组合的数量是否合法 diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index 9026abb3..c07ad8ac 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -812,7 +812,9 @@ public class PageController { public ModelAndView groupEdit(Integer id){ ModelAndView mv = new ModelAndView(); mv.setViewName("pages/group/group_edit"); + Group group = groupService.findGroupOnlyById(id); mv.addObject("id",id); + mv.addObject("record",group); return mv; } diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/GroupMapper.java b/src/main/java/com/dreamchaser/depository_manage/mapper/GroupMapper.java index 000d81de..4532b628 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/GroupMapper.java +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/GroupMapper.java @@ -12,7 +12,6 @@ import java.util.Map; @Mapper public interface GroupMapper { - /** * 用于查找所有组合（不包含其他） * @return @@ -20,6 +19,14 @@ public interface GroupMapper { List findAllGroupOnly(String gname); + + /** + * 根据组合id获取具体信息 + * @param gid 组合id + * @return + */ + Group findGroupOnlyById(Integer gid); + /** * 用于查找所有组合 * @return @@ -33,12 +40,6 @@ public interface GroupMapper { */ GroupInfo findGroupById(Integer id); - /** - * 根据主键查询组合（不包含其他数据） - * @param id 主键 - * @return - */ - Group findGroupOnlyById(Integer id); /** @@ -168,4 +169,19 @@ public interface GroupMapper { */ Integer delGroup(Integer id); + + /** + * 用于添加组合与二维码的对应关系 + * @param map 具体添加数据 + * @return + */ + Integer addQrCodeByGroup(Map map); + + /** + * 用于通过组合id查询对应的码值 + * @param gid 组合id + * @return + */ + String findQrCodeByGid(Integer gid); + } diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/GroupMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/GroupMapper.xml index 29dad8ef..4f77f691 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/GroupMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/GroupMapper.xml @@ -316,6 +316,21 @@ where id = #{id} + + + + insert into gidandcode(id,gid,code) + values ( + #{id}, + #{gid}, + #{code} + ) + + update diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/RestResponse.java b/src/main/java/com/dreamchaser/depository_manage/pojo/RestResponse.java index eb222a86..70b7abd5 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/RestResponse.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/RestResponse.java @@ -78,6 +78,8 @@ public class RestResponse implements Serializable { return new RestResponse(qrCode,200,new StatusInfo("成功！","二维码生成成功")); } + + /** * 将base64编码转为图片 * @param imgStr diff --git a/src/main/java/com/dreamchaser/depository_manage/service/GroupService.java b/src/main/java/com/dreamchaser/depository_manage/service/GroupService.java index c8dbbf60..240a58d7 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/GroupService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/GroupService.java @@ -20,6 +20,27 @@ public interface GroupService { */ List findAllGroup(); + /** + * 根据组合id获取具体信息 + * @param gid 组合id + * @return + */ + Group findGroupOnlyById(Integer gid); + + /** + * 用于通过组合id查询对应的码值 + * @param gid 组合id + * @return + */ + String findQrCodeByGid(Integer gid); + + /** + * 用于添加组合与二维码的对应关系 + * @param map 具体添加数据 + * @return + */ + Integer addQrCodeByGroup(Map map); + /** * 根据组合id查询对应组合 * @param id 组合id @@ -179,4 +200,6 @@ public interface GroupService { */ List findGroupInfoByGid(Integer gid); + + } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java index 6196561b..07a1829b 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java @@ -54,6 +54,36 @@ public class GroupServiceImpl implements GroupService { return null; } + /** + * 根据组合id获取具体信息 + * @param gid 组合id + * @return + */ + @Override + public Group findGroupOnlyById(Integer gid) { + return groupMapper.findGroupOnlyById(gid); + } + + /** + * 根据组合id查询对应组合 + * @param gid 组合id + * @return + */ + @Override + public String findQrCodeByGid(Integer gid) { + return groupMapper.findQrCodeByGid(gid); + } + + /** + * 用于添加组合与二维码的对应关系 + * @param map 具体添加数据 + * @return + */ + @Override + public Integer addQrCodeByGroup(Map map) { + return groupMapper.addQrCodeByGroup(map); + } + /** * 根据组合id查询对应组合 * diff --git a/src/main/java/com/dreamchaser/depository_manage/utils/CreateQrCodeUtil.java b/src/main/java/com/dreamchaser/depository_manage/utils/CreateQrCodeUtil.java index 4d546376..11d4b2be 100644 --- a/src/main/java/com/dreamchaser/depository_manage/utils/CreateQrCodeUtil.java +++ b/src/main/java/com/dreamchaser/depository_manage/utils/CreateQrCodeUtil.java @@ -3,10 +3,16 @@ package com.dreamchaser.depository_manage.utils; import cn.hutool.core.codec.Base64; import com.google.zxing.BarcodeFormat; import com.google.zxing.EncodeHintType; +import com.google.zxing.MultiFormatWriter; +import com.google.zxing.WriterException; import com.google.zxing.client.j2se.MatrixToImageWriter; import com.google.zxing.common.BitMatrix; +import com.google.zxing.oned.Code128Writer; +import com.google.zxing.oned.EAN13Writer; +import com.google.zxing.pdf417.encoder.BarcodeMatrix; import com.google.zxing.qrcode.QRCodeWriter; import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; +import org.apache.http.util.TextUtils; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; @@ -15,13 +21,25 @@ import javax.servlet.ServletOutputStream; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.HashMap; import java.util.Hashtable; +import java.util.Map; /* - ** 二维码生成 + ** 二维码生成或条形码生成 */ public class CreateQrCodeUtil { + + /** + * 生成二维码 + * @param content 对应数据 + * @param width 宽 + * @param height 高 + * @return base64格式的字符串 + * @throws IOException + */ public static String createQrCode(String content, int width, int height) throws IOException { String resultImage = ""; if (!StringUtils.isEmpty(content)) { @@ -56,5 +74,49 @@ public class CreateQrCodeUtil { } + /** + * 用于创建code_128类型的条形码 + * @param content 条形码存储的数据 + * @param height 高度 + * @param width 宽度 + * @return base64格式的字符串 + */ + public static String CreateBarCodeCode128(String content, int height, int width){ + String resultImage = ""; + if (!StringUtils.isEmpty(content)) { + ServletOutputStream stream = null; + ByteArrayOutputStream os = new ByteArrayOutputStream(); + Hashtable hints = new Hashtable(); + hints.put(EncodeHintType.CHARACTER_SET, "utf-8"); // 指定字符编码为“utf-8” + hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.M); // 指定二维码的纠错等级为中级 + hints.put(EncodeHintType.MARGIN, 2); // 设置图片的边距 + Code128Writer writer = new Code128Writer(); + BitMatrix bitMatrix = null; + try { + bitMatrix = writer.encode(content, BarcodeFormat.CODE_128, width, height,hints); + } catch (WriterException e) { + e.printStackTrace(); + } + BufferedImage bufferedImage = MatrixToImageWriter.toBufferedImage(bitMatrix); + try { + ImageIO.write(bufferedImage, "png", os); + } catch (IOException e) { + e.printStackTrace(); + } + /** + * 原生转码前面没有 data:image/png;base64 这些字段，返回给前端是无法被解析，可以让前端加，也可以在下面加上 + */ + resultImage = new String("data:image/png;base64," + Base64.encode(os.toByteArray())); + return resultImage; + } + return null; + } + + + + + + + } diff --git a/src/main/resources/templates/index_mobile.html b/src/main/resources/templates/index_mobile.html index 79752f1e..c5861702 100644 --- a/src/main/resources/templates/index_mobile.html +++ b/src/main/resources/templates/index_mobile.html @@ -39,7 +39,6 @@ .layui-nav-item { color: #1b1d21; - height: 35px !important; line-height: 35px !important; } .layui-layout-admin .layui-body{ diff --git a/src/main/resources/templates/pages/application/application-in.html b/src/main/resources/templates/pages/application/application-in.html index 15cd6216..91ccd433 100644 --- a/src/main/resources/templates/pages/application/application-in.html +++ b/src/main/resources/templates/pages/application/application-in.html @@ -598,49 +598,52 @@ }, end: function () { var mid = materialId.value; - $.ajax({ - url: "/material/findMatrialById?mid=" + mid, - type: "get", - dataType: 'json', - contentType: "application/json;charset=utf-8", - success: function (d) { - var material = d.data.materialById; - var code = material.code; - if (code === undefined) { - code = ""; - } - codeValue.value = code; - priceValue.value = material.price; - var materialAndBarCodeList = material["materialAndBarCodeList"]; - if (materialAndBarCodeList.length > 0) { - // 如果有对应的条形码 - var barCodeInput = barCodeItem.childNodes[1].childNodes[1]; - var barCodeImg = barCodeItem.childNodes[1].childNodes[3]; - var id = barCodeInput.id; - $("#" + id).remove(); - // barCodeInput.style = "display:none"; - var idNumber = materialId.name.split("mid")[1]; - var barCodeSelect = ` + if(mid !== ''){ + $.ajax({ + url: "/material/findMatrialById?mid=" + mid, + type: "get", + dataType: 'json', + contentType: "application/json;charset=utf-8", + success: function (d) { + var material = d.data.materialById; + var code = material.code; + if (code === undefined) { + code = ""; + } + codeValue.value = code; + priceValue.value = material.price; + var materialAndBarCodeList = material["materialAndBarCodeList"]; + if (materialAndBarCodeList.length > 0) { + // 如果有对应的条形码 + var barCodeInput = barCodeItem.childNodes[1].childNodes[1]; + var barCodeImg = barCodeItem.childNodes[1].childNodes[3]; + var id = barCodeInput.id; + $("#" + id).remove(); + // barCodeInput.style = "display:none"; + var idNumber = materialId.name.split("mid")[1]; + var barCodeSelect = ` `; - $("#" + barCodeImg.id).before(barCodeSelect); - form.render(); - $.each(materialAndBarCodeList, function (index, item) { - $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 - }); - form.render(); - } - var shelfLife = material.shelfLife; - if (shelfLife !== null && shelfLife !== undefined) { - $("#" + "producedDateItem" + idNumber).show(); - $("#" + "producedDate" + idNumber).attr("lay-verify", "required"); - } else { - $("#" + "producedDateItem" + idNumber).hide(); - form.render(); + $("#" + barCodeImg.id).before(barCodeSelect); + form.render(); + $.each(materialAndBarCodeList, function (index, item) { + $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 + }); + form.render(); + } + var shelfLife = material.shelfLife; + if (shelfLife !== null && shelfLife !== undefined) { + $("#" + "producedDateItem" + idNumber).show(); + $("#" + "producedDate" + idNumber).attr("lay-verify", "required"); + } else { + $("#" + "producedDateItem" + idNumber).hide(); + form.render(); + } } - } - }); + }); + } + } }); @@ -895,8 +898,6 @@ } }); }; - - // 用于扫描入库位置 scanLocationByQrCode = function (obj) { parent.wx.scanQRCode({ diff --git a/src/main/resources/templates/pages/application/application_multi.html b/src/main/resources/templates/pages/application/application_multi.html index 40362284..8491a42e 100644 --- a/src/main/resources/templates/pages/application/application_multi.html +++ b/src/main/resources/templates/pages/application/application_multi.html @@ -88,11 +88,11 @@ //监听表格复选框选择 table.on('checkbox(currentTableFilter)', function (obj) { - console.log(obj) + // console.log(obj) }); table.on('edit(currentTableFilter)', function(obj){ //注：edit是固定事件名，test是table原始容器的属性 lay-filter="对应的值" - console.log(obj.data); //所在行的所有相关数据 + // console.log(obj.data); //所在行的所有相关数据 }); /** @@ -300,7 +300,6 @@ } else if(obj.event === 'selectDepository'){ - console.log(data) } }); }); diff --git a/src/main/resources/templates/pages/group/group_edit.html b/src/main/resources/templates/pages/group/group_edit.html index 0eebfd98..52c239f4 100644 --- a/src/main/resources/templates/pages/group/group_edit.html +++ b/src/main/resources/templates/pages/group/group_edit.html @@ -13,6 +13,42 @@
+ +
+ 基本信息 +
+
+
+ +
+ + +
+
+ +
+ +
+ +
+
+ + + + +
+
+
+ diff --git a/src/test/java/com/dreamchaser/depository_manage/TestForOther.java b/src/test/java/com/dreamchaser/depository_manage/TestForOther.java index 0d560114..5667686c 100644 --- a/src/test/java/com/dreamchaser/depository_manage/TestForOther.java +++ b/src/test/java/com/dreamchaser/depository_manage/TestForOther.java @@ -1,16 +1,16 @@ package com.dreamchaser.depository_manage; -import com.dreamchaser.depository_manage.entity.Depository; -import com.dreamchaser.depository_manage.entity.UserByPort; -import com.dreamchaser.depository_manage.service.DepositoryService; -import com.dreamchaser.depository_manage.utils.LinkInterfaceUtil; +import com.dreamchaser.depository_manage.utils.CreateQrCodeUtil; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; +import sun.misc.BASE64Decoder; -import java.util.List; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; /** @@ -21,11 +21,14 @@ import java.util.List; public class TestForOther { - @Autowired - DepositoryService depositoryService; - @Test - public void Test(){ + public void Test() throws IOException { + try { + String s = CreateQrCodeUtil.CreateBarCodeCode128("1603198268619399168", 100, 200); + System.out.println(s); + } catch (Exception e) { + e.printStackTrace(); + } } } diff --git a/target/classes/templates/index_mobile.html b/target/classes/templates/index_mobile.html index 79752f1e..c5861702 100644 --- a/target/classes/templates/index_mobile.html +++ b/target/classes/templates/index_mobile.html @@ -39,7 +39,6 @@ .layui-nav-item { color: #1b1d21; - height: 35px !important; line-height: 35px !important; } .layui-layout-admin .layui-body{ diff --git a/target/classes/templates/pages/application/application_multi.html b/target/classes/templates/pages/application/application_multi.html index 40362284..8491a42e 100644 --- a/target/classes/templates/pages/application/application_multi.html +++ b/target/classes/templates/pages/application/application_multi.html @@ -88,11 +88,11 @@ //监听表格复选框选择 table.on('checkbox(currentTableFilter)', function (obj) { - console.log(obj) + // console.log(obj) }); table.on('edit(currentTableFilter)', function(obj){ //注：edit是固定事件名，test是table原始容器的属性 lay-filter="对应的值" - console.log(obj.data); //所在行的所有相关数据 + // console.log(obj.data); //所在行的所有相关数据 }); /** @@ -300,7 +300,6 @@ } else if(obj.event === 'selectDepository'){ - console.log(data) } }); }); diff --git a/target/classes/templates/pages/chart/chart-out_back.html b/target/classes/templates/pages/chart/chart-out_back.html index f9ec0a14..c5d86502 100644 --- a/target/classes/templates/pages/chart/chart-out_back.html +++ b/target/classes/templates/pages/chart/chart-out_back.html @@ -278,9 +278,6 @@ xAxis: {type: 'category'}, yAxis: {}, series: [ - {type: 'bar'}, - {type: 'bar'}, - {type: 'bar'} ] }; diff --git a/target/classes/templates/pages/chart/chart-stock_back.html b/target/classes/templates/pages/chart/chart-stock_back.html index 2a0ba065..ab70b59c 100644 --- a/target/classes/templates/pages/chart/chart-stock_back.html +++ b/target/classes/templates/pages/chart/chart-stock_back.html @@ -207,8 +207,6 @@ xAxis: {type: 'category'}, yAxis: {}, series: [ - {type: 'bar'}, - {type: 'bar'} ] }; @@ -249,7 +247,7 @@ }, success: function (result) { layer.close(this.layerIndex); - if (result.code == 0) { + if (result.code === 0) { echartsRecords.setOption(optionRecords); echartsPies.setOption(optionPies); echartsDataset.setOption(optionDataset);