ASN ${asnCode} [此处键入文章标题]
1. 图片居左，文字围绕图片排版
方法：在文字前面插入图片，设置居左对齐，然后即可在右边输入多行文本
2. 图片居右，文字围绕图片排版
方法：在文字前面插入图片，设置居右对齐，然后即可在左边输入多行文本
3. 图片居中环绕排版
方法：亲，这个真心没有办法。。。
还有没有什么其他的环绕方式呢？这里是居右环绕
欢迎大家多多尝试，为UEditor提供更多高质量模板！
占位
占位
占位
占位
占位
\"],\"btSelectAll\":[\"\"]}', '{\"msg\":\"操作成功\",\"code\":0}', 0, NULL, '2024-07-25 16:55:52', 8209);
+INSERT INTO `sys_oper_log` VALUES (163, '打印模版设置', 1, 'com.win.print.controller.WinPrintModelController.addSave()', 'POST', 1, 'admin', '闻荫科技', '/print/modelmanager/add', '127.0.0.1', '内网IP', '{\"mCode\":[\"test_ureport_001\"],\"mName\":[\"测试的报表\"],\"mType\":[\"thymeleaf\"],\"mTypeSrc\":[\"STRING\"],\"mFilename\":[\"ureport.html\"],\"mPageSize\":[\"A5\"],\"isPageRotate\":[\"Y\"],\"mData\":[\"${title}PCMAKR2405901510MAS048PCMAKR2405901510MAS048PCMAKR2405901510MAS048PCMAKR2405901510MAS048PCMAKR2405901510MAS048undefinedceshde shuju dei dhahdhakdf ceshde shuju dei dhahdhakdf ceshde shuju dei dhahdhakdf ceshde shuju dei dhahdhakdf ceshde shuju dei dhahdhakdf ceshde shuju dei dhahdhakdf ceshde shuju dei dhahdhakdf ceshde shuju dei dhahdhakdf ceshde shuju dei dhahdhakdf 45461212ceshde shuju dei dhahdhakdf
\"],\"btSelectAll\":[\"\"]}', '{\"msg\":\"操作成功\",\"code\":0}', 0, NULL, '2024-07-26 16:41:22', 142);
+INSERT INTO `sys_oper_log` VALUES (164, '打印模版设置', 2, 'com.win.print.controller.WinPrintModelController.editSave()', 'POST', 1, 'admin', '闻荫科技', '/print/modelmanager/edit', '127.0.0.1', '内网IP', '{\"id\":[\"4\"],\"mCode\":[\"test_ureport_001\"],\"mName\":[\"测试的报表\"],\"mType\":[\"thymeleaf\"],\"mTypeSrc\":[\"STRING\"],\"mFilename\":[\"ureport.html\"],\"mPageSize\":[\"A5\"],\"isPageRotate\":[\"Y\"],\"mData\":[\"${title}PCMAKR2405901510MAS048PCMAKR2405901510MAS048PCMAKR2405901510MAS048PCMAKR2405901510MAS048PCMAKR2405901510MAS048undefinedceshde shuju dei dhahdhakdf ceshde shuju dei dhahdhakdf ceshde shuju dei dhahdhakdf ceshde shuju dei dhahdhakdf ceshde shuju dei dhahdhakdf ceshde shuju dei dhahdhakdf ceshde shuju dei dhahdhakdf ceshde shuju dei dhahdhakdf ceshde shuju dei dhahdhakdf 45461212ceshde shuju dei dhahdhakdf
\"],\"btSelectAll\":[\"\"]}', '{\"msg\":\"操作成功\",\"code\":0}', 0, NULL, '2024-07-26 16:41:56', 84);
+INSERT INTO `sys_oper_log` VALUES (165, '代码生成', 6, 'com.win.generator.controller.GenController.importTableSave()', 'POST', 1, 'admin', '闻荫科技', '/tool/gen/importTable', '127.0.0.1', '内网IP', '{\"tables\":[\"win_print_client_printers\"]}', '{\"msg\":\"操作成功\",\"code\":0}', 0, NULL, '2024-07-29 09:55:11', 379);
+INSERT INTO `sys_oper_log` VALUES (166, '代码生成', 2, 'com.win.generator.controller.GenController.editSave()', 'POST', 1, 'admin', '闻荫科技', '/tool/gen/edit', '127.0.0.1', '内网IP', '{\"tableId\":[\"8\"],\"tableName\":[\"win_print_client_printers\"],\"tableComment\":[\"客户端打印机对照表\"],\"className\":[\"WinPrintClientPrinters\"],\"functionAuthor\":[\"zhousq\"],\"remark\":[\"\"],\"columns[0].columnId\":[\"100\"],\"columns[0].sort\":[\"1\"],\"columns[0].columnComment\":[\"租户号\"],\"columns[0].javaType\":[\"String\"],\"columns[0].javaField\":[\"tenantId\"],\"columns[0].queryType\":[\"EQ\"],\"columns[0].htmlType\":[\"input\"],\"columns[0].dictType\":[\"\"],\"columns[1].columnId\":[\"101\"],\"columns[1].sort\":[\"2\"],\"columns[1].columnComment\":[\"乐观锁\"],\"columns[1].javaType\":[\"Long\"],\"columns[1].javaField\":[\"revision\"],\"columns[1].queryType\":[\"EQ\"],\"columns[1].htmlType\":[\"input\"],\"columns[1].dictType\":[\"\"],\"columns[2].columnId\":[\"102\"],\"columns[2].sort\":[\"3\"],\"columns[2].columnComment\":[\"创建人\"],\"columns[2].javaType\":[\"String\"],\"columns[2].javaField\":[\"createdBy\"],\"columns[2].queryType\":[\"EQ\"],\"columns[2].htmlType\":[\"input\"],\"columns[2].dictType\":[\"\"],\"columns[3].columnId\":[\"103\"],\"columns[3].sort\":[\"4\"],\"columns[3].columnComment\":[\"创建时间\"],\"columns[3].javaType\":[\"Date\"],\"columns[3].javaField\":[\"createdTime\"],\"columns[3].isList\":[\"1\"],\"columns[3].queryType\":[\"EQ\"],\"columns[3].htmlType\":[\"datetime\"],\"columns[3].dictType\":[\"\"],\"columns[4].columnId\":[\"104\"],\"columns[4].sort\":[\"5\"],\"columns[4].columnComment\":[\"更新人\"],\"columns[4].javaType\":[\"String\"],\"columns[4].javaField\":[\"updatedBy\"],\"columns[4].queryType\":[\"EQ\"],\"columns[4].htmlType\":[\"input\"],\"columns[4].dictType\":[\"\"],\"columns[5].columnId\":[\"105\"],\"columns[5].sort\":[\"6\"],\"columns[5].columnComment\":[\"更新时间\"],\"columns[5].javaType\":[\"Date\"],\"columns[5].javaField\":[\"updatedTime\"],\"columns[5].isList\":[\"1\"],\"columns[5].queryType\":[\"EQ\"],\"columns[5].htmlType\":[\"datetime\"],\"columns[5].dictType\":[\"\"],\"columns[6].columnId\":[\"106\"],\"columns[6].sort\":[\"7\"],\"columns[6].columnComment\":[\"客户端编码\"],\"columns[6].javaType\":[\"String\"],\"columns[6].javaField\":[\"clientCode\"],\"columns[6].isInsert\":[\"1\"],\"columns[6].isEdit\":[\"1\"],\"columns[6].isList\":[\"1\"],\"columns[6].isQuery\":[\"1\"],\"columns[6].queryT', '{\"msg\":\"操作成功\",\"code\":0}', 0, NULL, '2024-07-29 09:57:07', 87);
+INSERT INTO `sys_oper_log` VALUES (167, '代码生成', 8, 'com.win.generator.controller.GenController.download()', 'GET', 1, 'admin', '闻荫科技', '/tool/gen/download/win_print_client_printers', '127.0.0.1', '内网IP', '\"win_print_client_printers\"', NULL, 0, NULL, '2024-07-29 09:57:11', 799);
+INSERT INTO `sys_oper_log` VALUES (168, '菜单管理', 2, 'com.win.web.controller.system.SysMenuController.editSave()', 'POST', 1, 'admin', '闻荫科技', '/system/menu/edit', '127.0.0.1', '内网IP', '{\"menuId\":[\"2011\"],\"parentId\":[\"2000\"],\"menuType\":[\"C\"],\"menuName\":[\"打印客户端配置\"],\"url\":[\"/print/clientinfo\"],\"target\":[\"menuItem\"],\"perms\":[\"print:clientinfo:view\"],\"orderNum\":[\"1\"],\"icon\":[\"#\"],\"visible\":[\"1\"],\"isRefresh\":[\"1\"]}', '{\"msg\":\"操作成功\",\"code\":0}', 0, NULL, '2024-07-29 10:36:36', 72);
+INSERT INTO `sys_oper_log` VALUES (169, '菜单管理', 2, 'com.win.web.controller.system.SysMenuController.editSave()', 'POST', 1, 'admin', '闻荫科技', '/system/menu/edit', '127.0.0.1', '内网IP', '{\"menuId\":[\"2041\"],\"parentId\":[\"2000\"],\"menuType\":[\"C\"],\"menuName\":[\"打印设置管理\"],\"url\":[\"/print/printsettings\"],\"target\":[\"menuItem\"],\"perms\":[\"print:printsettings:view\"],\"orderNum\":[\"1\"],\"icon\":[\"#\"],\"visible\":[\"1\"],\"isRefresh\":[\"1\"]}', '{\"msg\":\"操作成功\",\"code\":0}', 0, NULL, '2024-07-29 10:36:51', 64);
+INSERT INTO `sys_oper_log` VALUES (170, '打印模版设置', 1, 'com.win.print.controller.WinPrintModelController.addSave()', 'POST', 1, 'admin', '闻荫科技', '/print/modelmanager/add', '127.0.0.1', '内网IP', '{\"mCode\":[\"test_pdf_001\"],\"mName\":[\"测试pdf模版\"],\"mType\":[\"pdf\"],\"mTypeSrc\":[\"FILE\"],\"mFilename\":[\"wuliaotest.pdf\"],\"mPageSize\":[\"A5\"],\"isPageRotate\":[\"Y\"],\"index\":[\"1\",\"2\",\"3\",\"4\"],\"winPrintModelParamsList[0].paramCode\":[\"itemCode\"],\"winPrintModelParamsList[0].paramDesc\":[\"物料编码\"],\"winPrintModelParamsList[0].paramType\":[\"STR\"],\"winPrintModelParamsList[1].paramCode\":[\"itemUom\"],\"winPrintModelParamsList[1].paramDesc\":[\"物料包装\"],\"winPrintModelParamsList[1].paramType\":[\"STR\"],\"winPrintModelParamsList[2].paramCode\":[\"printDate\"],\"winPrintModelParamsList[2].paramDesc\":[\"打印日期\"],\"winPrintModelParamsList[2].paramType\":[\"STR\"],\"winPrintModelParamsList[3].paramCode\":[\"qrcode\"],\"winPrintModelParamsList[3].paramDesc\":[\"二维码\"],\"winPrintModelParamsList[3].paramType\":[\"QRIMG\"],\"mData\":[\"\"],\"btSelectAll\":[\"\"],\"btSelectItem\":[\"\"]}', '{\"msg\":\"操作成功\",\"code\":0}', 0, NULL, '2024-07-29 13:13:02', 145);
+INSERT INTO `sys_oper_log` VALUES (171, '代码生成', 2, 'com.win.generator.controller.GenController.synchDb()', 'GET', 1, 'admin', '闻荫科技', '/tool/gen/synchDb/win_print_client_printers', '127.0.0.1', '内网IP', '\"win_print_client_printers\"', '{\"msg\":\"操作成功\",\"code\":0}', 0, NULL, '2024-07-29 19:18:23', 452);
+INSERT INTO `sys_oper_log` VALUES (172, '代码生成', 2, 'com.win.generator.controller.GenController.editSave()', 'POST', 1, 'admin', '闻荫科技', '/tool/gen/edit', '127.0.0.1', '内网IP', '{\"tableId\":[\"8\"],\"tableName\":[\"win_print_client_printers\"],\"tableComment\":[\"客户端打印机对照表\"],\"className\":[\"WinPrintClientPrinters\"],\"functionAuthor\":[\"zhousq\"],\"remark\":[\"\"],\"columns[0].columnId\":[\"100\"],\"columns[0].sort\":[\"1\"],\"columns[0].columnComment\":[\"租户号\"],\"columns[0].javaType\":[\"String\"],\"columns[0].javaField\":[\"tenantId\"],\"columns[0].queryType\":[\"EQ\"],\"columns[0].isRequired\":[\"1\"],\"columns[0].htmlType\":[\"input\"],\"columns[0].dictType\":[\"\"],\"columns[1].columnId\":[\"101\"],\"columns[1].sort\":[\"2\"],\"columns[1].columnComment\":[\"乐观锁\"],\"columns[1].javaType\":[\"Long\"],\"columns[1].javaField\":[\"revision\"],\"columns[1].queryType\":[\"EQ\"],\"columns[1].htmlType\":[\"input\"],\"columns[1].dictType\":[\"\"],\"columns[2].columnId\":[\"102\"],\"columns[2].sort\":[\"3\"],\"columns[2].columnComment\":[\"创建人\"],\"columns[2].javaType\":[\"String\"],\"columns[2].javaField\":[\"createdBy\"],\"columns[2].queryType\":[\"EQ\"],\"columns[2].htmlType\":[\"input\"],\"columns[2].dictType\":[\"\"],\"columns[3].columnId\":[\"103\"],\"columns[3].sort\":[\"4\"],\"columns[3].columnComment\":[\"创建时间\"],\"columns[3].javaType\":[\"Date\"],\"columns[3].javaField\":[\"createdTime\"],\"columns[3].queryType\":[\"EQ\"],\"columns[3].htmlType\":[\"datetime\"],\"columns[3].dictType\":[\"\"],\"columns[4].columnId\":[\"104\"],\"columns[4].sort\":[\"5\"],\"columns[4].columnComment\":[\"更新人\"],\"columns[4].javaType\":[\"String\"],\"columns[4].javaField\":[\"updatedBy\"],\"columns[4].queryType\":[\"EQ\"],\"columns[4].htmlType\":[\"input\"],\"columns[4].dictType\":[\"\"],\"columns[5].columnId\":[\"105\"],\"columns[5].sort\":[\"6\"],\"columns[5].columnComment\":[\"更新时间\"],\"columns[5].javaType\":[\"Date\"],\"columns[5].javaField\":[\"updatedTime\"],\"columns[5].queryType\":[\"EQ\"],\"columns[5].htmlType\":[\"datetime\"],\"columns[5].dictType\":[\"\"],\"columns[6].columnId\":[\"106\"],\"columns[6].sort\":[\"7\"],\"columns[6].columnComment\":[\"客户端编码\"],\"columns[6].javaType\":[\"String\"],\"columns[6].javaField\":[\"clientCode\"],\"columns[6].isInsert\":[\"1\"],\"columns[6].isEdit\":[\"1\"],\"columns[6].isList\":[\"1\"],\"columns[6].isQuery\":[\"1\"],\"columns[6].queryType\":[\"EQ\"],\"columns[6', '{\"msg\":\"操作成功\",\"code\":0}', 0, NULL, '2024-07-29 19:19:30', 96);
+INSERT INTO `sys_oper_log` VALUES (173, '代码生成', 8, 'com.win.generator.controller.GenController.download()', 'GET', 1, 'admin', '闻荫科技', '/tool/gen/download/win_print_client_printers', '127.0.0.1', '内网IP', '\"win_print_client_printers\"', NULL, 0, NULL, '2024-07-29 19:19:34', 767);
+INSERT INTO `sys_oper_log` VALUES (174, '客户端打印机对照', 1, 'com.win.print.controller.WinPrintClientPrintersController.addSave()', 'POST', 1, 'admin', '闻荫科技', '/print/clientPrinters/add', '127.0.0.1', '内网IP', '{\"clientCode\":[\"node_001\"],\"printerName\":[\"大厅 (HP Color LaserJet MFP M277dw)\"],\"printerUuid\":[\"node_001_hp001\"],\"printerNameBusy\":[\"标签打印机01\"]}', NULL, 1, '', '2024-07-29 19:29:43', 88);
+INSERT INTO `sys_oper_log` VALUES (175, '客户端打印机对照', 1, 'com.win.print.controller.WinPrintClientPrintersController.addSave()', 'POST', 1, 'admin', '闻荫科技', '/print/clientPrinters/add', '127.0.0.1', '内网IP', '{\"clientCode\":[\"node_001\"],\"printerName\":[\"大厅 (HP Color LaserJet MFP M277dw)\"],\"printerUuid\":[\"node_001_hp001\"],\"printerNameBusy\":[\"标签打印机01\"]}', NULL, 1, '', '2024-07-29 19:32:35', 97);
+INSERT INTO `sys_oper_log` VALUES (176, '客户端打印机对照', 1, 'com.win.print.controller.WinPrintClientPrintersController.addSave()', 'POST', 1, 'admin', '闻荫科技', '/print/clientPrinters/add', '127.0.0.1', '内网IP', '{\"clientCode\":[\"node_001\"],\"printerName\":[\"大厅 (HP Color LaserJet MFP M277dw)\"],\"printerUuid\":[\"node_001_hp001\"],\"printerNameBusy\":[\"标签打印机01\"]}', NULL, 1, '\r\n### Error updating database. Cause: java.sql.SQLException: Field \'tenant_id\' doesn\'t have a default value\r\n### The error may exist in file [D:\\ideaworkspace\\win-print-server1.1\\win-print\\target\\classes\\mapper\\print\\WinPrintClientPrintersMapper.xml]\r\n### The error may involve com.win.print.mapper.WinPrintClientPrintersMapper.insertWinPrintClientPrinters-Inline\r\n### The error occurred while setting parameters\r\n### SQL: insert into win_print_client_printers ( client_code, printer_name, printer_uuid, printer_name_busy ) values ( ?, ?, ?, ? )\r\n### Cause: java.sql.SQLException: Field \'tenant_id\' doesn\'t have a default value\n; Field \'tenant_id\' doesn\'t have a default value', '2024-07-29 19:49:52', 623);
+INSERT INTO `sys_oper_log` VALUES (177, '客户端打印机对照', 1, 'com.win.print.controller.WinPrintClientPrintersController.addSave()', 'POST', 1, 'admin', '闻荫科技', '/print/clientPrinters/add', '127.0.0.1', '内网IP', '{\"clientCode\":[\"node_001\"],\"printerName\":[\"大厅 (HP Color LaserJet MFP M277dw)\"],\"printerUuid\":[\"node_001_hp001\"],\"printerNameBusy\":[\"标签打印机01\"]}', '{\"msg\":\"操作成功\",\"code\":0}', 0, NULL, '2024-07-29 19:51:08', 49);
+INSERT INTO `sys_oper_log` VALUES (178, '客户端打印机对照', 1, 'com.win.print.controller.WinPrintClientPrintersController.addSave()', 'POST', 1, 'admin', '闻荫科技', '/print/clientPrinters/add', '127.0.0.1', '内网IP', '{\"clientCode\":[\"node_001\"],\"printerName\":[\"大厅 (HP Color LaserJet MFP M277dw)\"],\"printerUuid\":[\"node_001_hp002\"],\"printerNameBusy\":[\"标签打印机02\"]}', '{\"msg\":\"操作成功\",\"code\":0}', 0, NULL, '2024-07-29 19:53:07', 319);
+INSERT INTO `sys_oper_log` VALUES (179, '客户端打印机对照', 2, 'com.win.print.controller.WinPrintClientPrintersController.editSave()', 'POST', 1, 'admin', '闻荫科技', '/print/clientPrinters/edit', '127.0.0.1', '内网IP', '{\"id\":[\"1\"],\"clientCode\":[\"node_001\"],\"printerName\":[\"大厅 (HP Color LaserJet MFP M277dw)\"],\"printerUuid\":[\"node_001_hp001\"],\"printerNameBusy\":[\"标签打印机01\"]}', '{\"msg\":\"操作成功\",\"code\":0}', 0, NULL, '2024-07-29 19:57:31', 88);
+INSERT INTO `sys_oper_log` VALUES (180, '菜单管理', 2, 'com.win.web.controller.system.SysMenuController.editSave()', 'POST', 1, 'admin', '闻荫科技', '/system/menu/edit', '127.0.0.1', '内网IP', '{\"menuId\":[\"2047\"],\"parentId\":[\"2000\"],\"menuType\":[\"C\"],\"menuName\":[\"打印机管理\"],\"url\":[\"/print/clientPrinters\"],\"target\":[\"menuItem\"],\"perms\":[\"print:clientPrinters:view\"],\"orderNum\":[\"1\"],\"icon\":[\"#\"],\"visible\":[\"0\"],\"isRefresh\":[\"1\"]}', '{\"msg\":\"操作成功\",\"code\":0}', 0, NULL, '2024-07-30 08:52:34', 223);
+INSERT INTO `sys_oper_log` VALUES (181, '打印模版设置', 2, 'com.win.print.controller.WinPrintModelController.editSave()', 'POST', 1, 'admin', '闻荫科技', '/print/modelmanager/edit', '127.0.0.1', '内网IP', '{\"id\":[\"5\"],\"mCode\":[\"test_pdf_001\"],\"mName\":[\"测试pdf模版\"],\"mType\":[\"pdf\"],\"mTypeSrc\":[\"FILE\"],\"mFilename\":[\"wuliaotest01.pdf\"],\"mPageSize\":[\"A5\"],\"isPageRotate\":[\"Y\"],\"index\":[\"1\",\"2\",\"3\",\"4\"],\"winPrintModelParamsList[0].paramCode\":[\"itemCode\"],\"winPrintModelParamsList[0].paramDesc\":[\"物料编码\"],\"winPrintModelParamsList[0].paramType\":[\"STR\"],\"winPrintModelParamsList[1].paramCode\":[\"itemUom\"],\"winPrintModelParamsList[1].paramDesc\":[\"物料包装\"],\"winPrintModelParamsList[1].paramType\":[\"STR\"],\"winPrintModelParamsList[2].paramCode\":[\"printDate\"],\"winPrintModelParamsList[2].paramDesc\":[\"打印日期\"],\"winPrintModelParamsList[2].paramType\":[\"STR\"],\"winPrintModelParamsList[3].paramCode\":[\"qrcode\"],\"winPrintModelParamsList[3].paramDesc\":[\"二维码\"],\"winPrintModelParamsList[3].paramType\":[\"QRIMG\"],\"mData\":[\"\"],\"btSelectAll\":[\"\"],\"btSelectItem\":[\"\"]}', '{\"msg\":\"操作成功\",\"code\":0}', 0, NULL, '2024-07-30 10:08:55', 158);
+INSERT INTO `sys_oper_log` VALUES (182, '打印模版设置', 2, 'com.win.print.controller.WinPrintModelController.editSave()', 'POST', 1, 'admin', '闻荫科技', '/print/modelmanager/edit', '127.0.0.1', '内网IP', '{\"id\":[\"5\"],\"mCode\":[\"test_pdf_001\"],\"mName\":[\"测试pdf模版\"],\"mType\":[\"pdf\"],\"mTypeSrc\":[\"FILE\"],\"mFilename\":[\"wuliaotest01.pdf\"],\"mPageSize\":[\"A5\"],\"isPageRotate\":[\"Y\"],\"index\":[\"1\",\"2\",\"3\",\"4\",\"5\"],\"winPrintModelParamsList[0].paramCode\":[\"itemCode\"],\"winPrintModelParamsList[0].paramDesc\":[\"物料编码\"],\"winPrintModelParamsList[0].paramType\":[\"STR\"],\"winPrintModelParamsList[1].paramCode\":[\"itemUom\"],\"winPrintModelParamsList[1].paramDesc\":[\"物料包装\"],\"winPrintModelParamsList[1].paramType\":[\"STR\"],\"winPrintModelParamsList[2].paramCode\":[\"printDate\"],\"winPrintModelParamsList[2].paramDesc\":[\"打印日期\"],\"winPrintModelParamsList[2].paramType\":[\"STR\"],\"winPrintModelParamsList[3].paramCode\":[\"qrcode\"],\"winPrintModelParamsList[3].paramDesc\":[\"二维码\"],\"winPrintModelParamsList[3].paramType\":[\"QRIMG\"],\"winPrintModelParamsList[4].paramCode\":[\"itemName\"],\"winPrintModelParamsList[4].paramDesc\":[\"物料名称\"],\"winPrintModelParamsList[4].paramType\":[\"STR\"],\"mData\":[\"\"],\"btSelectAll\":[\"\"],\"btSelectItem\":[\"\"]}', '{\"msg\":\"操作成功\",\"code\":0}', 0, NULL, '2024-07-30 12:59:58', 117);
+INSERT INTO `sys_oper_log` VALUES (183, '打印模版设置', 1, 'com.win.print.controller.WinPrintModelController.addSave()', 'POST', 1, 'admin', '闻荫科技', '/print/modelmanager/add', '127.0.0.1', '内网IP', '{\"mCode\":[\"test0111\"],\"mName\":[\"test0111\"],\"mType\":[\"pdf\"],\"mTypeSrc\":[\"FILE\"],\"mFilename\":[\"test0111.pdf\"],\"mPageSize\":[\"A5\"],\"isPageRotate\":[\"Y\"],\"index\":[\"1\"],\"winPrintModelParamsList[0].paramCode\":[\"itemCode\"],\"winPrintModelParamsList[0].paramDesc\":[\"模版编码\"],\"winPrintModelParamsList[0].paramType\":[\"STR\"],\"mData\":[\"\"],\"btSelectAll\":[\"\"],\"btSelectItem\":[\"\"]}', '{\"msg\":\"操作成功\",\"code\":0}', 0, NULL, '2024-07-30 15:35:01', 160);
+INSERT INTO `sys_oper_log` VALUES (184, '打印模版设置', 1, 'com.win.print.controller.WinPrintModelController.addSave()', 'POST', 1, 'admin', '闻荫科技', '/print/modelmanager/add', '127.0.0.1', '内网IP', '{\"mCode\":[\"dfdfsd顶顶顶顶\"],\"mName\":[\" 发斯蒂芬斯蒂芬\"],\"mType\":[\"pdf\"],\"mTypeSrc\":[\"FILE\"],\"mFilename\":[\"node_001_tes_20240730161825A001.pdf\"],\"mPageSize\":[\"A5\"],\"isPageRotate\":[\"Y\"],\"mData\":[\"\"],\"btSelectAll\":[\"\"]}', '{\"msg\":\"操作成功\",\"code\":0}', 0, NULL, '2024-07-30 16:21:23', 398);
+INSERT INTO `sys_oper_log` VALUES (185, '打印模版设置', 2, 'com.win.print.controller.WinPrintModelController.editSave()', 'POST', 1, 'admin', '闻荫科技', '/print/modelmanager/edit', '127.0.0.1', '内网IP', '{\"id\":[\"5\"],\"mCode\":[\"test_pdf_001\"],\"mName\":[\"测试pdf模版\"],\"mType\":[\"pdf\"],\"mTypeSrc\":[\"FILE\"],\"mFilename\":[\"wuliaotest01.pdf\"],\"mPageSize\":[\"A5\"],\"isPageRotate\":[\"Y\"],\"index\":[\"1\",\"2\",\"3\",\"4\",\"5\"],\"winPrintModelParamsList[0].paramCode\":[\"itemCode\"],\"winPrintModelParamsList[0].paramDesc\":[\"物料编码\"],\"winPrintModelParamsList[0].paramType\":[\"STR\"],\"winPrintModelParamsList[1].paramCode\":[\"itemUom\"],\"winPrintModelParamsList[1].paramDesc\":[\"物料包装\"],\"winPrintModelParamsList[1].paramType\":[\"STR\"],\"winPrintModelParamsList[2].paramCode\":[\"printDate\"],\"winPrintModelParamsList[2].paramDesc\":[\"打印日期\"],\"winPrintModelParamsList[2].paramType\":[\"STR\"],\"winPrintModelParamsList[3].paramCode\":[\"imageSrc\"],\"winPrintModelParamsList[3].paramDesc\":[\"二维码\"],\"winPrintModelParamsList[3].paramType\":[\"QRIMG\"],\"winPrintModelParamsList[4].paramCode\":[\"itemName\"],\"winPrintModelParamsList[4].paramDesc\":[\"物料名称\"],\"winPrintModelParamsList[4].paramType\":[\"STR\"],\"btSelectAll\":[\"\"],\"btSelectItem\":[\"\"]}', '{\"msg\":\"操作成功\",\"code\":0}', 0, NULL, '2024-07-31 08:57:24', 166);
+INSERT INTO `sys_oper_log` VALUES (186, '打印模版设置', 2, 'com.win.print.controller.WinPrintModelController.editSave()', 'POST', 1, 'admin', '闻荫科技', '/print/modelmanager/edit', '127.0.0.1', '内网IP', '{\"id\":[\"5\"],\"mCode\":[\"test_pdf_001\"],\"mName\":[\"测试pdf模版\"],\"mType\":[\"pdf\"],\"mTypeSrc\":[\"FILE\"],\"mFilename\":[\"wuliaotest01.pdf\"],\"mPageSize\":[\"A5\"],\"isPageRotate\":[\"Y\"],\"index\":[\"1\",\"2\",\"3\",\"4\",\"5\"],\"winPrintModelParamsList[0].paramCode\":[\"itemCode\"],\"winPrintModelParamsList[0].paramDesc\":[\"物料编码\"],\"winPrintModelParamsList[0].paramType\":[\"STR\"],\"winPrintModelParamsList[1].paramCode\":[\"itemUom\"],\"winPrintModelParamsList[1].paramDesc\":[\"物料包装\"],\"winPrintModelParamsList[1].paramType\":[\"STR\"],\"winPrintModelParamsList[2].paramCode\":[\"printDate\"],\"winPrintModelParamsList[2].paramDesc\":[\"打印日期\"],\"winPrintModelParamsList[2].paramType\":[\"STR\"],\"winPrintModelParamsList[3].paramCode\":[\"imageSrc\"],\"winPrintModelParamsList[3].paramDesc\":[\"二维码\"],\"winPrintModelParamsList[3].paramType\":[\"QRIMG\"],\"winPrintModelParamsList[4].paramCode\":[\"itemName\"],\"winPrintModelParamsList[4].paramDesc\":[\"物料名称\"],\"winPrintModelParamsList[4].paramType\":[\"STR\"],\"btSelectAll\":[\"\"],\"btSelectItem\":[\"\"]}', '{\"msg\":\"操作成功\",\"code\":0}', 0, NULL, '2024-07-31 09:23:46', 143);
+INSERT INTO `sys_oper_log` VALUES (187, '打印模版设置', 2, 'com.win.print.controller.WinPrintModelController.editSave()', 'POST', 1, 'admin', '闻荫科技', '/print/modelmanager/edit', '127.0.0.1', '内网IP', '{\"id\":[\"5\"],\"mCode\":[\"test_pdf_001\"],\"mName\":[\"测试pdf模版\"],\"mType\":[\"pdf\"],\"mTypeSrc\":[\"FILE\"],\"mFilename\":[\"wuliaotest01.pdf\"],\"mPageSize\":[\"A5\"],\"isPageRotate\":[\"Y\"],\"index\":[\"1\",\"2\",\"3\",\"4\",\"5\"],\"winPrintModelParamsList[0].paramCode\":[\"itemCode\"],\"winPrintModelParamsList[0].paramName\":[\"物料编码\"],\"winPrintModelParamsList[0].paramDesc\":[\"\"],\"winPrintModelParamsList[0].paramType\":[\"STR\"],\"winPrintModelParamsList[1].paramCode\":[\"itemUom\"],\"winPrintModelParamsList[1].paramName\":[\"物料包装\"],\"winPrintModelParamsList[1].paramDesc\":[\"\"],\"winPrintModelParamsList[1].paramType\":[\"STR\"],\"winPrintModelParamsList[2].paramCode\":[\"printDate\"],\"winPrintModelParamsList[2].paramName\":[\"打印日期\"],\"winPrintModelParamsList[2].paramDesc\":[\"\"],\"winPrintModelParamsList[2].paramType\":[\"STR\"],\"winPrintModelParamsList[3].paramCode\":[\"imageSrc\"],\"winPrintModelParamsList[3].paramName\":[\"二维码\"],\"winPrintModelParamsList[3].paramDesc\":[\"{\\\"width\\\":\\\"200\\\",\\\"height\\\":\\\"200\\\",\\\"type\\\":\\\"png\\\"}\"],\"winPrintModelParamsList[3].paramType\":[\"QRIMG\"],\"winPrintModelParamsList[4].paramCode\":[\"itemName\"],\"winPrintModelParamsList[4].paramName\":[\"物料名称\"],\"winPrintModelParamsList[4].paramDesc\":[\"\"],\"winPrintModelParamsList[4].paramType\":[\"STR\"],\"btSelectAll\":[\"\"],\"btSelectItem\":[\"\"]}', '{\"msg\":\"操作成功\",\"code\":0}', 0, NULL, '2024-07-31 10:51:49', 396);
+INSERT INTO `sys_oper_log` VALUES (188, '打印模版设置', 2, 'com.win.print.controller.WinPrintModelController.editSave()', 'POST', 1, 'admin', '闻荫科技', '/print/modelmanager/edit', '127.0.0.1', '内网IP', '{\"id\":[\"1\"],\"mCode\":[\"test_file_model001\"],\"mName\":[\"test_file_model001\"],\"mType\":[\"thymeleaf\"],\"mTypeSrc\":[\"FILE\"],\"mFilename\":[\"supplier.html\"],\"mPageSize\":[\"A5\"],\"isPageRotate\":[\"Y\"],\"index\":[\"1\",\"2\",\"3\",\"4\",\"5\",\"6\",\"7\",\"8\",\"9\",\"10\",\"11\",\"12\"],\"winPrintModelParamsList[0].paramCode\":[\"itemCode\"],\"winPrintModelParamsList[0].paramName\":[\"物料编号\"],\"winPrintModelParamsList[0].paramDesc\":[\"\"],\"winPrintModelParamsList[0].paramType\":[\"STR\"],\"winPrintModelParamsList[1].paramCode\":[\"itemName\"],\"winPrintModelParamsList[1].paramName\":[\"物料名称\"],\"winPrintModelParamsList[1].paramDesc\":[\"\"],\"winPrintModelParamsList[1].paramType\":[\"STR\"],\"winPrintModelParamsList[2].paramCode\":[\"uomName\"],\"winPrintModelParamsList[2].paramName\":[\"包装名称\"],\"winPrintModelParamsList[2].paramDesc\":[\"\"],\"winPrintModelParamsList[2].paramType\":[\"STR\"],\"winPrintModelParamsList[3].paramCode\":[\"uomCode\"],\"winPrintModelParamsList[3].paramName\":[\"包装编号\"],\"winPrintModelParamsList[3].paramDesc\":[\"\"],\"winPrintModelParamsList[3].paramType\":[\"STR\"],\"winPrintModelParamsList[4].paramCode\":[\"puomCode\"],\"winPrintModelParamsList[4].paramName\":[\"父包装编号\"],\"winPrintModelParamsList[4].paramDesc\":[\"\"],\"winPrintModelParamsList[4].paramType\":[\"STR\"],\"winPrintModelParamsList[5].paramCode\":[\"asnCode\"],\"winPrintModelParamsList[5].paramName\":[\"asn号\"],\"winPrintModelParamsList[5].paramDesc\":[\"\"],\"winPrintModelParamsList[5].paramType\":[\"STR\"],\"winPrintModelParamsList[6].paramCode\":[\"counts\"],\"winPrintModelParamsList[6].paramName\":[\"数量\"],\"winPrintModelParamsList[6].paramDesc\":[\"\"],\"winPrintModelParamsList[6].paramType\":[\"STR\"],\"winPrintModelParamsList[7].paramCode\":[\"imageSrc\"],\"winPrintModelParamsList[7].paramName\":[\"二维码\"],\"winPrintModelParamsList[7].paramDesc\":[\"{\\\"width\\\":\\\"200\\\",\\\"height\\\":\\\"200\\\",\\\"type\\\":\\\"png\\\"}\"],\"winPrintModelParamsList[7].paramType\":[\"QRIMG\"],\"winPrintModelParamsList[8].paramCode\":[\"batchCode\"],\"winPrintModelParamsList[8].paramName\":[\"批次码\"],\"winPrintModelParamsList[8].paramDesc\":[\"\"],\"winPrintModelParamsList[8].par', '{\"msg\":\"操作成功\",\"code\":0}', 0, NULL, '2024-07-31 10:52:41', 101);
+INSERT INTO `sys_oper_log` VALUES (189, '打印模版设置', 2, 'com.win.print.controller.WinPrintModelController.editSave()', 'POST', 1, 'admin', '闻荫科技', '/print/modelmanager/edit', '127.0.0.1', '内网IP', '{\"id\":[\"2\"],\"mCode\":[\"test_string_0001\"],\"mName\":[\"test_string_0001\"],\"mType\":[\"thymeleaf\"],\"mTypeSrc\":[\"STRING\"],\"mFilename\":[\"testmodel.html\"],\"mPageSize\":[\"A5\"],\"isPageRotate\":[\"Y\"],\"index\":[\"1\",\"2\",\"3\",\"4\",\"5\",\"6\",\"7\",\"8\",\"9\",\"10\",\"11\",\"12\"],\"winPrintModelParamsList[0].paramCode\":[\"itemCode\"],\"winPrintModelParamsList[0].paramName\":[\"物料编号\"],\"winPrintModelParamsList[0].paramDesc\":[\"\"],\"winPrintModelParamsList[0].paramType\":[\"STR\"],\"winPrintModelParamsList[1].paramCode\":[\"itemName\"],\"winPrintModelParamsList[1].paramName\":[\"物料名称\"],\"winPrintModelParamsList[1].paramDesc\":[\"\"],\"winPrintModelParamsList[1].paramType\":[\"STR\"],\"winPrintModelParamsList[2].paramCode\":[\"uomName\"],\"winPrintModelParamsList[2].paramName\":[\"包装名称\"],\"winPrintModelParamsList[2].paramDesc\":[\"\"],\"winPrintModelParamsList[2].paramType\":[\"STR\"],\"winPrintModelParamsList[3].paramCode\":[\"uomCode\"],\"winPrintModelParamsList[3].paramName\":[\"包装编号\"],\"winPrintModelParamsList[3].paramDesc\":[\"\"],\"winPrintModelParamsList[3].paramType\":[\"STR\"],\"winPrintModelParamsList[4].paramCode\":[\"puomCode\"],\"winPrintModelParamsList[4].paramName\":[\"父包装编号\"],\"winPrintModelParamsList[4].paramDesc\":[\"\"],\"winPrintModelParamsList[4].paramType\":[\"STR\"],\"winPrintModelParamsList[5].paramCode\":[\"asnCode\"],\"winPrintModelParamsList[5].paramName\":[\"asn号\"],\"winPrintModelParamsList[5].paramDesc\":[\"\"],\"winPrintModelParamsList[5].paramType\":[\"STR\"],\"winPrintModelParamsList[6].paramCode\":[\"counts\"],\"winPrintModelParamsList[6].paramName\":[\"数量\"],\"winPrintModelParamsList[6].paramDesc\":[\"\"],\"winPrintModelParamsList[6].paramType\":[\"STR\"],\"winPrintModelParamsList[7].paramCode\":[\"imageSrc\"],\"winPrintModelParamsList[7].paramName\":[\"二维码\"],\"winPrintModelParamsList[7].paramDesc\":[\"{\\\"width\\\":\\\"200\\\",\\\"height\\\":\\\"200\\\",\\\"type\\\":\\\"png\\\"}\"],\"winPrintModelParamsList[7].paramType\":[\"QRIMG\"],\"winPrintModelParamsList[8].paramCode\":[\"batchCode\"],\"winPrintModelParamsList[8].paramName\":[\"批次码\"],\"winPrintModelParamsList[8].paramDesc\":[\"\"],\"winPrintModelParamsList[8].para', '{\"msg\":\"操作成功\",\"code\":0}', 0, NULL, '2024-07-31 11:00:00', 195);
+INSERT INTO `sys_oper_log` VALUES (190, '打印模版设置', 2, 'com.win.print.controller.WinPrintModelController.editSave()', 'POST', 1, 'admin', '闻荫科技', '/print/modelmanager/edit', '127.0.0.1', '内网IP', '{\"id\":[\"3\"],\"mCode\":[\"dfdfsd\"],\"mName\":[\"dfsdf\"],\"mType\":[\"thymeleaf\"],\"mFilename\":[\"sdfasdf\"],\"mPageSize\":[\"A5\"],\"isPageRotate\":[\"Y\"],\"mData\":[\"<!DOCTYPE html>
<html>
<head>
<!-- <meta name="viewport" content="width=device-width,initial-scale=1.0" />-->
<title></title>
<style>
.box {
font-size: 14px;
display: flex;
margin-top: 0px;
width: 100vw;
height: 100vh;
}
.left {
border: 1px solid #b1b1b1;
border-collapse: collapse;
flex: 1;
width: 100%
}
.left-item {
display: flex;
}
.bold-font{
font-weight: bold;
font-size: 28px;
}
.label {
border-bottom: 1px solid #b1b1b1;
border-right: 1px solid #b1b1b1;
width: 60px;
padding: 0px 5px;
height: 58px;
line-height: 58px;
}
.value {
', '{\"msg\":\"操作成功\",\"code\":0}', 0, NULL, '2024-07-31 12:49:59', 220);
+INSERT INTO `sys_oper_log` VALUES (191, '打印模版设置', 2, 'com.win.print.controller.WinPrintModelController.editSave()', 'POST', 1, 'admin', '闻荫科技', '/print/modelmanager/edit', '127.0.0.1', '内网IP', '{\"id\":[\"3\"],\"mCode\":[\"dfdfsd\"],\"mName\":[\"dfsdf\"],\"mType\":[\"thymeleaf\"],\"mFilename\":[\"sdfasdf\"],\"mData\":[\"\\r\\n\\r\\n
\\r\\n\\r\\n <!DOCTYPE html>
<html>
<head>
<!-- <meta name="viewport" content="width=device-width,initial-scale=1.0" />-->
<title></title>
<style>
.box {
font-size: 14px;
display: flex;
margin-top: 0px;
width: 100vw;
height: 100vh;
}
.left {
border: 1px solid #b1b1b1;
border-collapse: collapse;
flex: 1;
width: 100%
}
.left-item {
display: flex;
}
.bold-font{
font-weight: bold;
font-size: 28px;
}
.label {
border-bottom: 1px solid #b1b1b1;
border-right: 1px solid #b1b1b1;
width: 60px;
padding: 0px 5px;
height: 58px;
line-height: 58px;
}
.value {
', '{\"msg\":\"操作成功\",\"code\":0}', 0, NULL, '2024-07-31 13:02:55', 109);
+INSERT INTO `sys_oper_log` VALUES (195, '打印模版设置', 2, 'com.win.print.controller.WinPrintModelController.editSave()', 'POST', 1, 'admin', '闻荫科技', '/print/modelmanager/edit', '127.0.0.1', '内网IP', '{\"id\":[\"3\"],\"mCode\":[\"dfdfsd\"],\"mName\":[\"dfsdf\"],\"mType\":[\"thymeleaf\"],\"mFilename\":[\"sdfasdf.html\"],\"mPageSize\":[\"A5\"],\"isPageRotate\":[\"Y\"],\"mData\":[\"
\r\n
\r\n \r\n 物品代码 \r\n ${itemCode} \r\n \r\n \r\n 物品名称 \r\n ${itemName} \r\n 批次 \r\n ${batchCode} \r\n \r\n \r\n 包装名称 \r\n ${uomName} \r\n 物料类型 \r\n ${itemType} \r\n \r\n \r\n 包装号 \r\n ${uomCode} \r\n 供应商 \r\n ${supplierCode} \r\n \r\n \r\n 父包装号 \r\n ${puomCode} \r\n 打印时间 \r\n ${printDate} \r\n \r\n \r\n ASN \r\n ${asnCode} \r\n 数量 \r\n ${counts} \r\n \r\n
\r\n\r\n
\r\n
\r\n \r\n 物品代码 \r\n ${itemCode} \r\n \r\n \r\n 物品名称 \r\n ${itemName} \r\n 批次 \r\n ${batchCode} \r\n \r\n \r\n 包装名称 \r\n ${uomName} \r\n 物料类型 \r\n ${itemType} \r\n \r\n \r\n 包装号 \r\n ${uomCode} \r\n 供应商 \r\n ${supplierCode} \r\n \r\n \r\n 父包装号 \r\n ${puomCode} \r\n 打印时间 \r\n ${printDate} \r\n \r\n \r\n ASN \r\n ${asnCode} \r\n 数量 \r\n ${counts} \r\n \r\n
\r\n\r\n
\r\n
\r\n \r\n 物品代码 \r\n ${itemCode} \r\n \r\n \r\n 物品名称 \r\n ${itemName} \r\n 批次 \r\n ${batchCode} \r\n \r\n \r\n 包装名称 \r\n ${uomName} \r\n 物料类型 \r\n ${itemType} \r\n \r\n \r\n 包装号 \r\n ${uomCode} \r\n 供应商 \r\n ${supplierCode} \r\n \r\n \r\n 父包装号 \r\n ${puomCode} \r\n 打印时间 \r\n ${printDate} \r\n \r\n \r\n ASN \r\n ${asnCode} \r\n 数量 \r\n ${counts} \r\n \r\n
\r\n\r\n
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
|
|
|
|
|
|
- org.apache.maven.plugins
- maven-war-plugin
- 3.1.0
+
+ org.apache.maven.plugins
+ maven-war-plugin
+ 3.1.0
false
${project.artifactId}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/win-admin/src/main/java/com/win/web/controller/print/WinPrintServerControler.java b/win-admin/src/main/java/com/win/web/controller/print/WinPrintServerControler.java
index 4df14e3..ccf6029 100644
--- a/win-admin/src/main/java/com/win/web/controller/print/WinPrintServerControler.java
+++ b/win-admin/src/main/java/com/win/web/controller/print/WinPrintServerControler.java
@@ -252,11 +252,15 @@ public class WinPrintServerControler extends BaseController {
log.info("thymeleaf");
Map modelData = new HashMap<>();
paramList.forEach(item -> {
+ String value = Optional.ofNullable(data.getString(item.getParamCode())).orElse("");
if ("QRIMG".equalsIgnoreCase(item.getParamType())) {
- String mg = qrCodeService.getBase64QRCodeSrc(data.getString(item.getParamCode()), 172, 172, "png");
+ if(!value.isEmpty() && !value.isBlank()){
+ Map imageDesc = getImageDesc(item.getParamDesc());
+ String mg = qrCodeService.getBase64QRCodeSrc(value, Integer.valueOf(imageDesc.get("width")), Integer.valueOf(imageDesc.get("height")), imageDesc.get("type"));
modelData.put(item.getParamCode(), Optional.ofNullable(mg).orElse(""));
+ }
} else {
- modelData.put(item.getParamCode(), Optional.ofNullable(data.getString(item.getParamCode())).orElse(""));
+ modelData.put(item.getParamCode(), value);
}
});
@@ -270,6 +274,27 @@ public class WinPrintServerControler extends BaseController {
}
}
+ private Map getImageDesc(String desc){
+ JSONObject jsonObject=JSONObject.parseObject(Optional.ofNullable(desc).orElse("{\"width\":\"172\",\"height\":\"172\",\"type\":\"png\"}")) ;
+ Map map=new HashMap<>();
+ String width="172";
+ String height = "172";
+ String type = "png";
+ try{
+ if(null!=jsonObject){
+ width=Optional.ofNullable(jsonObject.getString("width")).orElse("172");
+ height=Optional.ofNullable(jsonObject.getString("height")).orElse("172");
+ type=Optional.ofNullable(jsonObject.getString("type")).orElse("png");
+ }
+ }catch (NumberFormatException ne){
+ width="172";
+ height = "172";
+ }
+ map.put("width",width);
+ map.put("height",height);
+ map.put("type",type);
+ return map;
+ }
/**
* 多以合并
*/
@@ -286,11 +311,14 @@ public class WinPrintServerControler extends BaseController {
}else{
Map modelData = new HashMap<>();
paramList.forEach(item -> {
+ String value = Optional.ofNullable(pdata.getString(item.getParamCode())).orElse("");
if ("QRIMG".equalsIgnoreCase(item.getParamType())) {
- String mg = qrCodeService.getBase64QRCodeSrc(pdata.getString(item.getParamCode()), 172, 172, "png");
- modelData.put(item.getParamCode(), Optional.ofNullable(mg).orElse(""));
+ if(!value.isEmpty() && !value.isBlank()){
+ Map imageDesc = getImageDesc(item.getParamDesc());
+ String mg = qrCodeService.getBase64QRCodeSrc(value, Integer.valueOf(imageDesc.get("width")), Integer.valueOf(imageDesc.get("height")), imageDesc.get("type"));
+ modelData.put(item.getParamCode(), Optional.ofNullable(mg).orElse(""));}
} else {
- modelData.put(item.getParamCode(), Optional.ofNullable(pdata.getString(item.getParamCode())).orElse(""));
+ modelData.put(item.getParamCode(), value);
}
});
HTMLConvertUitl.html2Pdf_thymeleaf(tempFile, modelData, pageSize, modelName, modeTypeSrc, templatePath);
diff --git a/win-print/pom.xml b/win-print/pom.xml
index de1a3bd..f743abe 100644
--- a/win-print/pom.xml
+++ b/win-print/pom.xml
@@ -77,6 +77,16 @@
2.2.21
compile
+
+
+
+
+
+
+
+
+
+
diff --git a/win-print/src/main/java/com/win/print/domain/WinPrintModelParams.java b/win-print/src/main/java/com/win/print/domain/WinPrintModelParams.java
index b7c73c8..c86acc3 100644
--- a/win-print/src/main/java/com/win/print/domain/WinPrintModelParams.java
+++ b/win-print/src/main/java/com/win/print/domain/WinPrintModelParams.java
@@ -44,7 +44,7 @@ public class WinPrintModelParams extends BaseEntity
private String modelCode;
/** 参数名 */
- @Excel(name = "参数名")
+ @Excel(name = "参数编码")
private String paramCode;
/** 参数描述 */
@@ -54,8 +54,18 @@ public class WinPrintModelParams extends BaseEntity
/** 参数类型 */
@Excel(name = "参数类型")
private String paramType;
+ @Excel(name = "参数名称")
+ private String paramName;
- public void setTenantId(String tenantId)
+ public String getParamName() {
+ return paramName;
+ }
+
+ public void setParamName(String paramName) {
+ this.paramName = paramName;
+ }
+
+ public void setTenantId(String tenantId)
{
this.tenantId = tenantId;
}
diff --git a/win-print/src/main/java/com/win/print/util/HTMLConvertUitl.java b/win-print/src/main/java/com/win/print/util/HTMLConvertUitl.java
index 4b307ab..9f2c6c6 100644
--- a/win-print/src/main/java/com/win/print/util/HTMLConvertUitl.java
+++ b/win-print/src/main/java/com/win/print/util/HTMLConvertUitl.java
@@ -5,6 +5,7 @@ import cn.hutool.extra.template.Template;
import cn.hutool.extra.template.TemplateConfig;
import cn.hutool.extra.template.TemplateEngine;
import cn.hutool.extra.template.TemplateUtil;
+import cn.hutool.extra.template.engine.thymeleaf.ThymeleafEngine;
import com.itextpdf.html2pdf.ConverterProperties;
import com.itextpdf.html2pdf.HtmlConverter;
import com.itextpdf.html2pdf.css.apply.ICssApplierFactory;
@@ -92,13 +93,14 @@ public class HTMLConvertUitl {
TemplateEngine engine=null;
String templateName=modelName;
if("STRING".equalsIgnoreCase(modelTypeSrc)){
- //templateName=modelName;
+ //templateName="temlateString";
engine = TemplateUtil.createEngine(new TemplateConfig(templateName, TemplateConfig.ResourceMode.STRING));
}else if("CLASS".equalsIgnoreCase(modelTypeSrc)){
engine = TemplateUtil.createEngine(new TemplateConfig("templates/models", TemplateConfig.ResourceMode.CLASSPATH));
}else{
engine = TemplateUtil.createEngine(new TemplateConfig(path, TemplateConfig.ResourceMode.FILE));
}
+
Template template = engine.getTemplate(templateName);
return template.render(data);
}
diff --git a/win-print/src/main/java/com/win/print/util/PdfModelUitl.java b/win-print/src/main/java/com/win/print/util/PdfModelUitl.java
index c486902..a714425 100644
--- a/win-print/src/main/java/com/win/print/util/PdfModelUitl.java
+++ b/win-print/src/main/java/com/win/print/util/PdfModelUitl.java
@@ -72,16 +72,26 @@ public class PdfModelUitl {
if (ObjectUtil.isNotEmpty(data)) {
paramsList.forEach(item -> {
PdfFormField field = form.getField(item.getParamCode());
- field.setFont(defaultFont());
- field.setFontSize(12);
- if(ObjectUtil.isNotEmpty(field)) {
+ if(null!=field) {
+ field.setFont(defaultFont());
+ field.setFontSize(12);
if ("QRIMG".equals(item.getParamType())) {
//渲染Qr图片
try {
- BufferedImage bufferedImage = qrCodeService.generateQRCode(Optional.ofNullable(data.getString(item.getParamCode())).orElse(""), 172, 172);
- byte[] pngs = qrCodeService.getImgBuffer("jpeg", bufferedImage);
- com.itextpdf.layout.element.Image image=new com.itextpdf.layout.element.Image(ImageDataFactory.create(pngs));
+ JSONObject jsonObject=JSONObject.parseObject(Optional.ofNullable(item.getParamDesc()).orElse("{\"width\":\"172\",\"height\":\"172\",\"type\":\"png\"}")) ;
+ int width=172;
+ int height = 172;
+ String type = "png";
+ if(null!=jsonObject){
+ width=Integer.valueOf(Optional.ofNullable(jsonObject.getString("width")).orElse("172"));
+ height=Integer.valueOf(Optional.ofNullable(jsonObject.getString("height")).orElse("172"));
+ type=Optional.ofNullable(jsonObject.getString("type")).orElse("png");
+ }
+ BufferedImage bufferedImage = qrCodeService.generateQRCode(Optional.ofNullable(data.getString(item.getParamCode())).orElse(""), width, height);
+ //byte[] pngs = qrCodeService.getImgBuffer("jpeg", bufferedImage);
+ //com.itextpdf.layout.element.Image image=new com.itextpdf.layout.element.Image(ImageDataFactory.create(pngs));
Rectangle rtl = field.getWidgets().get(0).getRectangle().toRectangle(); // 获取表单域的xy坐标
+ com.itextpdf.layout.element.Image image=getImage(field,bufferedImage,rtl);
image.setFixedPosition(rtl.getX(), rtl.getY(),rtl.getWidth()); // 设置图片固定位置
//image.setRelativePosition(rtl.getLeft(),rtl.getTop(), rtl.getRight(),rtl.getBottom());
document.add(image);
@@ -182,7 +192,20 @@ public class PdfModelUitl {
canvas.addImage(img, rtl.getX(), rtl.getY(), true);
}
}
+ ///*pdf 模版图片压缩处理*/
+ private com.itextpdf.layout.element.Image getImage(PdfFormField formField, BufferedImage bufferedImage,Rectangle rtl) throws IOException {
+ byte[] imgBytes = qrCodeService.getImgBuffer("jpeg", bufferedImage);
+ if (Float.compare(bufferedImage.getWidth(), rtl.getWidth()) <= 0 && Float.compare(bufferedImage.getHeight(), rtl.getHeight()) <= 0) {// 不处理
+ return new com.itextpdf.layout.element.Image(ImageDataFactory.create(imgBytes));
+ } else {
+ // 压缩图片。计算得到图片放缩的最大比例
+ float scale = Math.max(bufferedImage.getWidth() / rtl.getWidth(), bufferedImage.getHeight() / rtl.getHeight());
+ // 压缩图片
+ Image scale1 = ImgUtil.scale(ImgUtil.toImage(imgBytes), scale);
+ return new com.itextpdf.layout.element.Image(ImageDataFactory.create(ImgUtil.toBytes(scale1, ImgUtil.IMAGE_TYPE_PNG)));
+ }
+ }
/**
* 根据表单域关键字查找当前关键字所在页对象（PdfPage）
*
diff --git a/win-print/src/main/resources/mapper/print/WinPrintModelMapper.xml b/win-print/src/main/resources/mapper/print/WinPrintModelMapper.xml
index 5927acf..e5baa09 100644
--- a/win-print/src/main/resources/mapper/print/WinPrintModelMapper.xml
+++ b/win-print/src/main/resources/mapper/print/WinPrintModelMapper.xml
@@ -44,6 +44,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
@@ -58,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and m_type = #{mType}
and is_dyparam = #{isDyparam}
and m_type_src = #{mTypeSrc}
+
order by created_time desc
@@ -75,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where m_code = #{code}
- select tenant_id, revision, created_by, created_time, updated_by, updated_time, id, model_code, param_code, param_desc, param_type
+ select tenant_id, revision, created_by, created_time, updated_by, updated_time, id, model_code, param_code, param_desc, param_type,param_name
from win_print_model_params
where model_code = #{m_code}
@@ -167,9 +170,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- insert into win_print_model_params( tenant_id, revision, created_by, created_time, updated_by, updated_time, id, model_code, param_code, param_desc, param_type) values
+ insert into win_print_model_params( tenant_id, revision, created_by, created_time, updated_by, updated_time, id, model_code, param_code, param_desc, param_type,param_name) values
- ( #{item.tenantId}, #{item.revision}, #{item.createdBy}, #{item.createdTime}, #{item.updatedBy}, #{item.updatedTime}, #{item.id}, #{item.modelCode}, #{item.paramCode}, #{item.paramDesc}, #{item.paramType})
+ ( #{item.tenantId}, #{item.revision}, #{item.createdBy}, #{item.createdTime}, #{item.updatedBy}, #{item.updatedTime}, #{item.id}, #{item.modelCode}, #{item.paramCode}, #{item.paramDesc}, #{item.paramType}, #{item.paramName})
diff --git a/win-print/src/main/resources/templates/print/modelmanager/add.html b/win-print/src/main/resources/templates/print/modelmanager/add.html
index 79bcd9d..165da30 100644
--- a/win-print/src/main/resources/templates/print/modelmanager/add.html
+++ b/win-print/src/main/resources/templates/print/modelmanager/add.html
@@ -46,7 +46,7 @@
![](\\\"http://img.baidu.com/hi/youa/y_0034.gif\\\")
图文混排方法![](\\\"http://img.baidu.com/hi/youa/y_0040.gif\\\")