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
paramList,File pdfFileName, String modeType, JSONObject data, PageSize pageSize, String modelName, String modeTypeSrc, String templatePath) {
+ private void printOneByOne(List paramList,File pdfFileName, String modeType, JSONObject data, PageSize pageSize, String modelName, String modeTypeSrc, String templatePath,int fontSize,String fontName) {
try {
if ("PDF".equalsIgnoreCase(modeType)) {
- pdfModelUitl.pdfMdelFromRender(paramList,pdfFileName,data,modelName,templatePath);
+ pdfModelUitl.pdfMdelFromRender(paramList,pdfFileName,data,modelName,templatePath, fontSize, fontName);
log.info("处理PDF模版");
} else if ("freemarker".equalsIgnoreCase(modeType)) {
log.info("处理freemarker模版");
@@ -296,7 +299,7 @@ public class WinPrintServerControler extends BaseController {
/**
* 多以合并
*/
- private void printMutilPage(List paramList, List dataList, String modelName, PageSize pageSize, String fileName, String modeTypeSrc, String templatePath,String modelType) {
+ private void printMutilPage(List paramList, List dataList, String modelName, PageSize pageSize, String fileName, String modeTypeSrc, String templatePath,String modelType, int fontSize, String fontName) {
try {
PdfDocument destDoc = new PdfDocument(new PdfWriter(fileName));
destDoc.setDefaultPageSize(pageSize);
@@ -305,7 +308,7 @@ public class WinPrintServerControler extends BaseController {
try {
File tempFile = File.createTempFile("temp_" + String.valueOf(System.currentTimeMillis()), ".pdf");
if("PDF".equalsIgnoreCase(modelType)){
- pdfModelUitl.pdfMdelFromRender(paramList,tempFile,pdata,modelName,templatePath);
+ pdfModelUitl.pdfMdelFromRender(paramList,tempFile,pdata,modelName,templatePath, fontSize, fontName);
}else{
Map modelData = new HashMap<>();
paramList.forEach(item -> {
diff --git a/win-admin/src/main/java/com/win/web/controller/print/WinPrintServerControlerTest.java b/win-admin/src/main/java/com/win/web/controller/print/WinPrintServerControlerTest.java
index e381fd7..a279ed4 100644
--- a/win-admin/src/main/java/com/win/web/controller/print/WinPrintServerControlerTest.java
+++ b/win-admin/src/main/java/com/win/web/controller/print/WinPrintServerControlerTest.java
@@ -177,10 +177,11 @@ public class WinPrintServerControlerTest extends BaseController {
}
private void putJob(String fileName,String printerName,PrintRequestAttributeVo vo) throws PrintException, IOException {
FileInputStream fileIn = new FileInputStream(fileName);
- DocPrintJob pringJobByName = PrinterUtil.getPringJobByName(printerName);
- DocFlavor docFlavor = PrinterUtil.getDocFlavor(EnumDocFlavor.IS_AUTOSENSE);
- PrintRequestAttributeSet printRequestAttribute = PrinterUtil.getPrintRequestAttribute(vo,"test");
- PrinterUtil.sendJobtoPrinter(pringJobByName, PrinterUtil.getSimpleDoc(fileIn, docFlavor), printRequestAttribute);
+ PrinterUtil printerUtil=new PrinterUtil();
+ DocPrintJob pringJobByName = printerUtil.getPringJobByName(printerName);
+ DocFlavor docFlavor = printerUtil.getDocFlavor(EnumDocFlavor.IS_AUTOSENSE);
+ PrintRequestAttributeSet printRequestAttribute = printerUtil.getPrintRequestAttribute(vo,"test");
+ printerUtil.sendJobtoPrinter(pringJobByName, printerUtil.getSimpleDoc(fileIn, docFlavor), printRequestAttribute);
fileIn.close();
}
/**
diff --git a/win-print/pom.xml b/win-print/pom.xml
index f743abe..3714d0c 100644
--- a/win-print/pom.xml
+++ b/win-print/pom.xml
@@ -77,7 +77,13 @@
2.2.21
compile
-
+
+
+ org.apache.pdfbox
+ pdfbox
+
+
+
diff --git a/win-print/src/main/java/com/win/print/controller/WinPrintClientPrintersController.java b/win-print/src/main/java/com/win/print/controller/WinPrintClientPrintersController.java
index 656052b..e443d4a 100644
--- a/win-print/src/main/java/com/win/print/controller/WinPrintClientPrintersController.java
+++ b/win-print/src/main/java/com/win/print/controller/WinPrintClientPrintersController.java
@@ -130,4 +130,5 @@ public class WinPrintClientPrintersController extends BaseController
{
return toAjax(winPrintClientPrintersService.deleteWinPrintClientPrintersByIds(ids));
}
+
}
diff --git a/win-print/src/main/java/com/win/print/controller/WinPrintTasksLogsController.java b/win-print/src/main/java/com/win/print/controller/WinPrintTasksLogsController.java
index a93cdf1..a1ccddf 100644
--- a/win-print/src/main/java/com/win/print/controller/WinPrintTasksLogsController.java
+++ b/win-print/src/main/java/com/win/print/controller/WinPrintTasksLogsController.java
@@ -141,9 +141,10 @@ public class WinPrintTasksLogsController extends BaseController {
@ResponseBody
public AjaxResult print(@PathVariable("id") Long id) {
WinPrintTasksLogs tasksLog = winPrintTasksLogsService.selectWinPrintTasksLogsById(id);
- if (ObjectUtil.isNotEmpty(tasksLog)) {
+ if (null!=tasksLog) {
tasksLog.setPrintTime(DateUtil.date());
tasksLog.setTaskStatus("0");
+ winPrintTasksLogsService.updateWinPrintTasksLogs(tasksLog);
return AjaxResult.success("打印已经发送到打印机！");
} else {
return AjaxResult.error("打印失败！没有可以补打的记录！");
@@ -156,24 +157,24 @@ public class WinPrintTasksLogsController extends BaseController {
public AjaxResult doprint(@RequestParam("id") Long id,@RequestParam("printer") String printer) {
WinPrintTasksLogs tasksLog = winPrintTasksLogsService.selectWinPrintTasksLogsById(id);
if (ObjectUtil.isNotEmpty(tasksLog)) {
- try {
- FileInputStream fileIn = new FileInputStream(printer);
- DocPrintJob pringJobByName = PrinterUtil.getPringJobByName(tasksLog.getPrinterName());
- DocFlavor docFlavor = PrinterUtil.getDocFlavor(EnumDocFlavor.IS_AUTOSENSE);
- PrintRequestAttributeVo printAttribute = iSettingsService.getPrintAttribute(tasksLog.getSettingCode(), tasksLog.getModelPage(), tasksLog.getIsPageRolated(), tasksLog.getCopyCounts());
- PrintRequestAttributeSet printRequestAttribute = PrinterUtil.getPrintRequestAttribute(printAttribute, tasksLog.getTaskId());
- PrinterUtil.sendJobtoPrinter(pringJobByName, PrinterUtil.getSimpleDoc(fileIn, docFlavor), printRequestAttribute);
- fileIn.close();
- return AjaxResult.success("打印已经发送到打印机！");
- } catch (FileNotFoundException fe) {
- return AjaxResult.error("打印失败！打印文件不存在或者已经被删除！");
- } catch (SecurityException se) {
- return AjaxResult.error("打印失败！打印文件访问受限！");
- } catch (PrintException e) {
- return AjaxResult.error("打印失败！打印机错误！");
- } catch (IOException e) {
- return AjaxResult.error("打印失败！文件IO错误！");
- }
+// try {
+// FileInputStream fileIn = new FileInputStream(printer);
+//// DocPrintJob pringJobByName = PrinterUtil.getPringJobByName(tasksLog.getPrinterName());
+//// DocFlavor docFlavor = PrinterUtil.getDocFlavor(EnumDocFlavor.IS_AUTOSENSE);
+//// PrintRequestAttributeVo printAttribute = iSettingsService.getPrintAttribute(tasksLog.getSettingCode(), tasksLog.getModelPage(), tasksLog.getIsPageRolated(), tasksLog.getCopyCounts());
+//// PrintRequestAttributeSet printRequestAttribute = PrinterUtil.getPrintRequestAttribute(printAttribute, tasksLog.getTaskId());
+//// PrinterUtil.sendJobtoPrinter(pringJobByName, PrinterUtil.getSimpleDoc(fileIn, docFlavor), printRequestAttribute);
+// fileIn.close();
+// return AjaxResult.success("打印已经发送到打印机！");
+// } catch (FileNotFoundException fe) {
+// return AjaxResult.error("打印失败！打印文件不存在或者已经被删除！");
+// } catch (SecurityException se) {
+// return AjaxResult.error("打印失败！打印文件访问受限！");
+// } catch (PrintException e) {
+// return AjaxResult.error("打印失败！打印机错误！");
+// } catch (IOException e) {
+ return AjaxResult.error("打印失败！文件IO错误！");
+// }
} else {
return AjaxResult.error("打印失败！没有可以补打的记录！");
diff --git a/win-print/src/main/java/com/win/print/domain/WinPrintModel.java b/win-print/src/main/java/com/win/print/domain/WinPrintModel.java
index ed010fa..867a114 100644
--- a/win-print/src/main/java/com/win/print/domain/WinPrintModel.java
+++ b/win-print/src/main/java/com/win/print/domain/WinPrintModel.java
@@ -69,6 +69,12 @@ public class WinPrintModel extends BaseEntity
private String mPageValue;
@Excel(name = "是否横向")
private String isPageRotate;
+ @Excel(name = "字体名称")
+ private String fontName;
+ @Excel(name = "字体大小")
+ private int fontSize;
+ @Excel(name = "是否加粗")
+ private String fontBlock;
private String mData;
/** 模版参数管理信息 */
private List winPrintModelParamsList;
@@ -243,6 +249,30 @@ public class WinPrintModel extends BaseEntity
this.mData = mData;
}
+ public String getFontName() {
+ return fontName;
+ }
+
+ public void setFontName(String fontName) {
+ this.fontName = fontName;
+ }
+
+ public int getFontSize() {
+ return fontSize;
+ }
+
+ public void setFontSize(int fontSize) {
+ this.fontSize = fontSize;
+ }
+
+ public String getFontBlock() {
+ return fontBlock;
+ }
+
+ public void setFontBlock(String fontBlock) {
+ this.fontBlock = fontBlock;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
diff --git a/win-print/src/main/java/com/win/print/service/PrintService.java b/win-print/src/main/java/com/win/print/service/PrintService.java
deleted file mode 100644
index dc2c91d..0000000
--- a/win-print/src/main/java/com/win/print/service/PrintService.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.win.print.service;
-public class PrintService {
-// // 传入文件和打印机名称
-// public void print(File[] files, String printerName) throws PrintException, IOException {
-// List streams = fileStreams(files);
-// if (CollUtil.isEmpty(streams)) {
-// log.warn("缺少打印文件");
-// throw new NullPointerException("缺少打印文件");
-// }
-//
-// DocFlavor flavor = getDocFlavor();
-// PrintRequestAttributeSet aset = getPrintRequestAttribute();
-//
-// for (InputStream in : streams) {
-// DocPrintJob docPrintJob = getPrintJob(printerName);
-// docPrintJob.print(new SimpleDoc(in, flavor, null), aset);
-// }
-// }
-//
-// private List fileStreams(File[] files) {
-// if (ArrayUtil.isEmpty(files)) {
-// log.warn("缺少打印文件");
-// throw new NullPointerException("缺少打印文件");
-// }
-// List ins = new ArrayList<>();
-// try {
-// for (File file : files) {
-// ins.add(new FileInputStream(file));
-// }
-// } catch (FileNotFoundException e) {
-// log.warn("打印文件缺失：{}", e.getMessage());
-// }
-// return ins;
-// }
-//
-// private DocFlavor getDocFlavor() {
-// // 设置打印格式，如果未确定类型，可选择autosense
-// return DocFlavor.INPUT_STREAM.AUTOSENSE;
-// }
-//
-// private PrintRequestAttributeSet getPrintRequestAttribute() {
-// // 设置打印参数
-// PrintRequestAttributeSet aset = new HashPrintRequestAttributeSet();
-// aset.add(new Copies(1)); //份数
-// //aset.add(MediaSize.ISO.A4); //纸张
-// // aset.add(Finishings.STAPLE);//装订
-// aset.add(Sides.DUPLEX);//单双面
-// return aset;
-// }
-//
-// private DocPrintJob getPrintJob(String printerName) {
-// if (printerName == null) {
-// log.warn("请选择打印机");
-// throw new NullPointerException("请选择打印机");
-// }
-// //获得本台电脑连接的所有打印机
-// PrintService[] printServices = PrinterJob.lookupPrintServices();
-// if (printServices == null || printServices.length == 0) {
-// log.warn("打印失败，未找到可用打印机，请检查。");
-// throw new NullPointerException("打印失败，未找到可用打印机，请检查。");
-// }
-// //匹配指定打印机
-// PrintService printService = null;
-// for (PrintService service : printServices) {
-// if (printerName.equals(service.getName())) {
-// printService = service;
-// break;
-// }
-// }
-// if (printService == null) {
-// String format = StrUtil.format("打印失败，未找到名称为 [{}] 的打印机，请检查。", printerName);
-// log.warn(format);
-// throw new NullPointerException(format);
-// }
-// return printService.createPrintJob();
-// }
-}
\ No newline at end of file
diff --git a/win-print/src/main/java/com/win/print/service/PrintServiceWin.java b/win-print/src/main/java/com/win/print/service/PrintServiceWin.java
new file mode 100644
index 0000000..1e4add1
--- /dev/null
+++ b/win-print/src/main/java/com/win/print/service/PrintServiceWin.java
@@ -0,0 +1,95 @@
+package com.win.print.service;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.StrUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.print.*;
+import javax.print.attribute.HashPrintRequestAttributeSet;
+import javax.print.attribute.PrintRequestAttributeSet;
+import javax.print.attribute.standard.Copies;
+import javax.print.attribute.standard.Sides;
+import java.awt.print.PrinterJob;
+import java.io.*;
+import java.util.ArrayList;
+import java.util.List;
+
+public class PrintServiceWin {
+ private static final Logger log = LoggerFactory.getLogger(PrintTaskProcesser.class);
+ // 传入文件和打印机名称
+ public void print(File[] files, String printerName) throws PrintException, IOException {
+ List streams = fileStreams(files);
+ if (CollUtil.isEmpty(streams)) {
+ log.warn("缺少打印文件");
+ throw new NullPointerException("缺少打印文件");
+ }
+
+ DocFlavor flavor = getDocFlavor();
+ PrintRequestAttributeSet aset = getPrintRequestAttribute();
+
+ for (InputStream in : streams) {
+ DocPrintJob docPrintJob = getPrintJob(printerName);
+ docPrintJob.print(new SimpleDoc(in, flavor, null), aset);
+ }
+ }
+
+ private List fileStreams(File[] files) {
+ if (ArrayUtil.isEmpty(files)) {
+ log.warn("缺少打印文件");
+ throw new NullPointerException("缺少打印文件");
+ }
+ List ins = new ArrayList<>();
+ try {
+ for (File file : files) {
+ ins.add(new FileInputStream(file));
+ }
+ } catch (FileNotFoundException e) {
+ log.warn("打印文件缺失：{}", e.getMessage());
+ }
+ return ins;
+ }
+
+ private DocFlavor getDocFlavor() {
+ // 设置打印格式，如果未确定类型，可选择autosense
+ return DocFlavor.INPUT_STREAM.AUTOSENSE;
+ }
+
+ private PrintRequestAttributeSet getPrintRequestAttribute() {
+ // 设置打印参数
+ PrintRequestAttributeSet aset = new HashPrintRequestAttributeSet();
+ aset.add(new Copies(1)); //份数
+ //aset.add(MediaSize.ISO.A4); //纸张
+ // aset.add(Finishings.STAPLE);//装订
+ aset.add(Sides.DUPLEX);//单双面
+ return aset;
+ }
+
+ private DocPrintJob getPrintJob(String printerName) {
+ if (printerName == null) {
+ log.warn("请选择打印机");
+ throw new NullPointerException("请选择打印机");
+ }
+ //获得本台电脑连接的所有打印机
+ PrintService[] printServices = PrinterJob.lookupPrintServices();
+ if (printServices == null || printServices.length == 0) {
+ log.warn("打印失败，未找到可用打印机，请检查。");
+ throw new NullPointerException("打印失败，未找到可用打印机，请检查。");
+ }
+ //匹配指定打印机
+ PrintService printService = null;
+ for (PrintService service : printServices) {
+ if (printerName.equals(service.getName())) {
+ printService = service;
+ break;
+ }
+ }
+ if (printService == null) {
+ String format = StrUtil.format("打印失败，未找到名称为 [{}] 的打印机，请检查。", printerName);
+ log.warn(format);
+ throw new NullPointerException(format);
+ }
+ return printService.createPrintJob();
+ }
+}
\ No newline at end of file
diff --git a/win-print/src/main/java/com/win/print/service/PrintTaskProcesser.java b/win-print/src/main/java/com/win/print/service/PrintTaskProcesser.java
index 2de9510..f88c5fd 100644
--- a/win-print/src/main/java/com/win/print/service/PrintTaskProcesser.java
+++ b/win-print/src/main/java/com/win/print/service/PrintTaskProcesser.java
@@ -1,31 +1,35 @@
package com.win.print.service;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.http.HttpRequest;
-import cn.hutool.http.HttpResponse;
-import cn.hutool.http.HttpUtil;
-import com.itextpdf.io.IOException;
-import com.win.common.config.WinConfig;
-import com.win.common.utils.http.HttpUtils;
-import com.win.print.domain.*;
-import com.win.print.util.PrintTaskCacheUtil;
+import cn.hutool.core.io.FileUtil;
+import com.itextpdf.kernel.pdf.PdfDocument;
+import com.itextpdf.kernel.pdf.PdfReader;
+import com.itextpdf.kernel.pdf.PdfStream;
+import com.win.print.domain.PrintRequestAttributeVo;
+import com.win.print.domain.WinPrintTasksLogs;
+import com.win.print.util.DataUnitl;
+import com.win.print.util.PdfPrintUtil;
import com.win.print.util.PrinterUtil;
import com.win.print.util.WinPrintJobListener;
import jakarta.annotation.Resource;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.printing.PDFPrintable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
-
-import javax.print.DocFlavor;
-import javax.print.DocPrintJob;
+import javax.print.*;
import javax.print.attribute.PrintRequestAttributeSet;
-
+import java.awt.*;
+import java.awt.print.PrinterException;
+import java.io.File;
import java.io.FileInputStream;
+import java.io.IOException;
import java.io.InputStream;
+import java.net.URL;
+import java.net.URLStreamHandler;
+import java.util.Optional;
/**
* 打印队列的处理和日志处理
@@ -44,37 +48,49 @@ public class PrintTaskProcesser {
* */
@Value("${win.clientCode}")
private String clientCode;
+ @Value("${win.path.print}")
+ private String printFilepath; //生成的打印文件存储路径
@Scheduled(fixedRate = 3000)
- public void process(){
+ public void process() throws IOException, PrinterException, PrintException {
WinPrintTasksLogs tasksLogs = iPrintTasksLogsService.selectWinPrintTasksLogsByClientCode(clientCode);
if(null!=tasksLogs){
- try {
- String url=tasksLogs.getIpAddr()+"/"+tasksLogs.getDataFile();
- HttpRequest get = HttpUtil.createGet(url);
- HttpResponse response = get.execute();
- InputStream inputStream = response.bodyStream();
- //FileInputStream fileIn = new FileInputStream(tasksLogs.getDataFile());
- DocPrintJob pringJobByName = PrinterUtil.getPringJobByName(tasksLogs.getPrinterName());
- DocFlavor docFlavor = PrinterUtil.getDocFlavor(EnumDocFlavor.IS_AUTOSENSE);
- PrintRequestAttributeVo printAttribute = iSettingsService.getPrintAttribute(tasksLogs.getSettingCode(), tasksLogs.getModelPage(), tasksLogs.getIsPageRolated(), tasksLogs.getCopyCounts());
- PrintRequestAttributeSet printRequestAttribute = PrinterUtil.getPrintRequestAttribute(printAttribute,tasksLogs.getTaskId());
- PrinterUtil.sendJobtoPrinter(pringJobByName, PrinterUtil.getSimpleDoc(inputStream, docFlavor), printRequestAttribute);
- //fileIn.close();
- log.info("PrintTaskProcesser-打印任务成功发送！",tasksLogs.getTaskId());
- iPrintTasksLogsService.setStatusLock(tasksLogs.getId(),"1");
- inputStream.close();
- }catch(Exception e){
- log.error("PrintTaskProcesser-error",e.toString());
- iPrintTasksLogsService.setStatusLock(tasksLogs.getId(),"2");
+ String filePath = DataUnitl.getWorkingDir(printFilepath)+"/"+tasksLogs.getDataFile();
+ File file=new File(filePath);
+ String type = Optional.ofNullable(FileUtil.getType(file)).orElse("");
+ PrinterUtil printerUtil = new PrinterUtil();
+ PrintService printService = printerUtil.getPrintService(tasksLogs.getPrinterName());
+ PrintRequestAttributeVo printAttribute = iSettingsService.getPrintAttribute(tasksLogs.getSettingCode(), tasksLogs.getModelPage(), tasksLogs.getIsPageRolated(), tasksLogs.getCopyCounts());
+ PrintRequestAttributeSet printRequestAttribute = printerUtil.getPrintRequestAttribute(printAttribute,"winTask");
+ if("pdf".equalsIgnoreCase(type)){
+ PdfPrintUtil pdfPrintUtil=new PdfPrintUtil();
+ pdfPrintUtil.print(file,printService,printRequestAttribute);
+ }else{
+ DocPrintJob pringJobByName = printService.createPrintJob();
+ Doc simpleDoc = new SimpleDoc(new FileInputStream(file), getDocFlavor(type), null);
+ pringJobByName.print(simpleDoc, printRequestAttribute);
+ iPrintTasksLogsService.setStatusLock(tasksLogs.getId(), "1");
}
-
+ log.info("打印{}文档,文件名称：{}", type,filePath);
+ log.info("{}-打印任务成功发送到打印机！",tasksLogs.getTaskId());
+ iPrintTasksLogsService.setStatusLock(tasksLogs.getId(),"1");
}else{
- //log.info("PrintTaskProcesser-打印任务池无任务！");
+ log.info("*****打印服务任务运行中*****");
}
}
- /*
- * 获取打印机配置
- * */
-
+ private DocFlavor getDocFlavor(String type){
+ if("JPEG".equalsIgnoreCase(type)|| "JPG".equalsIgnoreCase(type)){
+ return DocFlavor.INPUT_STREAM.JPEG;
+ }
+ if("GIF".equalsIgnoreCase(type)){
+ return DocFlavor.INPUT_STREAM.GIF;
+ }
+ if("PNG".equalsIgnoreCase(type)){
+ return DocFlavor.INPUT_STREAM.PNG;
+ }
+ if("TXT".equalsIgnoreCase(type)||"HTML".equalsIgnoreCase(type)){
+ return DocFlavor.INPUT_STREAM.TEXT_HTML_UTF_8;
+ }
+ return DocFlavor.INPUT_STREAM.AUTOSENSE;
+ }
}
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 860dfb3..f31e95a 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
@@ -63,7 +63,7 @@ public class PdfModelUitl {
* 待填充的PDF模板文档
*/
- public void pdfMdelFromRender(List paramsList,File tempFile, JSONObject data, String modelName, String templatePath) throws IOException {
+ public void pdfMdelFromRender(List paramsList,File tempFile, JSONObject data, String modelName, String templatePath,int fontSize,String fontName) throws IOException {
PdfReader reader = new PdfReader(templatePath+"/"+modelName);
PdfWriter writer = new PdfWriter(tempFile);
PdfDocument pdf = new PdfDocument(reader, writer);
@@ -76,23 +76,14 @@ public class PdfModelUitl {
String value = Optional.ofNullable(data.getString(item.getParamCode())).orElse("");
if(null!=field) {
Rectangle rtl = field.getWidgets().get(0).getRectangle().toRectangle(); // 获取表单域的xy坐标
- field.setFont(defaultFont());
- if(Optional.ofNullable(field.getFontSize()).isEmpty()){
- field.setFontSize(16);
- }
+ field.setFont(getFont(fontName));
+ field.setFontSize(fontSize);
+
+ //field.setFontSizeAutoScale()
if ("QRIMG".equals(item.getParamType())) {
//渲染Qr图片
if(!value.isEmpty() && !value.isBlank()) {
try {
-// 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(value, (int)rtl.getWidth(), (int)rtl.getHeight());
byte[] imgBytes = qrCodeService.getImgBuffer("png", bufferedImage);
com.itextpdf.layout.element.Image image =new com.itextpdf.layout.element.Image(ImageDataFactory.create(imgBytes));//getImage(field, bufferedImage, rtl);
@@ -281,6 +272,7 @@ public class PdfModelUitl {
//PdfFontFactory.register(DEFAULT_FONT_PATH);
//baseFont = PdfFontFactory.createFont(DEFAULT_FONT_PATH, PdfEncodings.IDENTITY_H);
baseFont=PdfFontFactory.createFont("STSong-Light", "UniGB-UCS2-H");
+ //baseFont=PdfFontFactory.createFont("SimHei", "UniGB-UCS2-H");
} catch (Exception e) {
throw new RuntimeException("无法获取默认字体：" + e.getMessage(),e);
}
@@ -292,23 +284,23 @@ public class PdfModelUitl {
* @return PdfFont
*/
String extendPath = "D:\\fonts\\";
- private PdfFont getFont(PdfFont font) {
- String fontName = font.getFontProgram().getFontNames().getFontName();
- String fontKey = FONTS_MAP.get(fontName);
- if(fontKey==null){
- font = defaultFont();
- }else {
- try {
- if(fontKey.toLowerCase().endsWith("ttc")){
- font = PdfFontFactory.createFont(this.extendPath + fontKey + ",0", PdfEncodings.IDENTITY_H);
- }else {
- font = PdfFontFactory.createFont(this.extendPath + fontKey, PdfEncodings.IDENTITY_H);
- }
- } catch (IOException e) {
- font = defaultFont();
- e.printStackTrace();
- }
- }
+ private PdfFont getFont(String fontName) {
+ PdfFont font = defaultFont();
+// String fontKey = FONTS_MAP.get(fontName);
+// if(fontKey==null){
+// font = defaultFont();
+// }else {
+// try {
+// if(fontKey.toLowerCase().endsWith("ttc")){
+// font = PdfFontFactory.createFont(this.extendPath + fontKey + ",0", PdfEncodings.IDENTITY_H);
+// }else {
+// font = PdfFontFactory.createFont(this.extendPath + fontKey, PdfEncodings.IDENTITY_H);
+// }
+// } catch (IOException e) {
+// font = defaultFont();
+// e.printStackTrace();
+// }
+// }
return font;
}
/**
diff --git a/win-print/src/main/java/com/win/print/util/PdfPrintUtil.java b/win-print/src/main/java/com/win/print/util/PdfPrintUtil.java
new file mode 100644
index 0000000..e3f6ef0
--- /dev/null
+++ b/win-print/src/main/java/com/win/print/util/PdfPrintUtil.java
@@ -0,0 +1,41 @@
+package com.win.print.util;
+
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.printing.PDFPageable;
+import org.apache.pdfbox.printing.PDFPrintable;
+
+import javax.print.PrintService;
+import javax.print.attribute.PrintRequestAttributeSet;
+
+import java.awt.print.*;
+import java.io.File;
+import java.io.IOException;
+
+public class PdfPrintUtil {
+ public void print(File pdfFile, PrintService printService, PrintRequestAttributeSet attrs) throws IOException {
+ // 加载PDF文档
+ PDDocument document = PDDocument.load(pdfFile);
+ try {
+ // 创建一个打印任务
+ PrinterJob job = PrinterJob.getPrinterJob();
+ PDFPrintable pdfPrintable = new PDFPrintable(document);
+ // 查找并设置打印机
+ if (printService != null) {
+ job.setPrintService(printService);
+ }
+ job.setPrintable(pdfPrintable);
+ job.setJobName("标签打印");
+ job.setCopies(1);
+ // 执行打印
+ job.print(attrs);
+ } catch (PrinterException printerException) {
+ throw new RuntimeException(printerException);
+ } finally {
+ // 关闭PDF文档
+ document.close();
+ }
+
+ }
+
+}
diff --git a/win-print/src/main/java/com/win/print/util/PrinterUtil.java b/win-print/src/main/java/com/win/print/util/PrinterUtil.java
index e0fbeb8..9dd78bf 100644
--- a/win-print/src/main/java/com/win/print/util/PrinterUtil.java
+++ b/win-print/src/main/java/com/win/print/util/PrinterUtil.java
@@ -21,7 +21,11 @@ import java.awt.print.PrinterJob;
public class PrinterUtil {
private static final Logger log = LoggerFactory.getLogger(PrinterUtil.class);
- public static DocPrintJob getPringJobByName(String printerName) {
+ public DocPrintJob getPringJobByName(String printerName) {
+
+ return getPrintService(printerName).createPrintJob();
+ }
+ public PrintService getPrintService(String printerName) {
PrintService printService = null;
//获得本台电脑连接的所有打印机
PrintService[] printServices = PrinterJob.lookupPrintServices();
@@ -45,9 +49,8 @@ public class PrinterUtil {
}
}
}
- return printService.createPrintJob();
+ return printService;
}
-
/**
* Copies: 指定要打印的副本数量。
* OrientationRequested: 指定页面的方向，如横向或纵向。
@@ -58,29 +61,29 @@ public class PrinterUtil {
* PrinterResolution: 指定打印机的分辨率。
* Chromaticity: 指定颜色模式，如彩色或黑白。
*/
- public static PrintRequestAttributeSet getPrintRequestAttribute(PrintRequestAttributeVo atrrSet,String jobName) {
+ public PrintRequestAttributeSet getPrintRequestAttribute(PrintRequestAttributeVo atrrSet,String jobName) {
// 设置打印参数
PrintRequestAttributeSet aset = new HashPrintRequestAttributeSet();
aset.add(new Copies(atrrSet.getCopyCount())); //份数
- aset.add(atrrSet.getPaperType().getMediaSizeName());
+// aset.add(atrrSet.getPaperType().getMediaSizeName());
aset.add(new JobName(jobName,null));
- if (atrrSet.getIsDuplicates()) {
- aset.add(Sides.DUPLEX);//单双面
- } else {
- aset.add(Sides.ONE_SIDED);
- }
- if (atrrSet.getIsPortrait()) {
- aset.add(OrientationRequested.PORTRAIT);//横向
- } else {
- aset.add(OrientationRequested.LANDSCAPE);//纵向
- }
+// if (atrrSet.getIsDuplicates()) {
+// aset.add(Sides.DUPLEX);//单双面
+// } else {
+// aset.add(Sides.ONE_SIDED);
+// }
+// if (atrrSet.getIsPortrait()) {
+// aset.add(OrientationRequested.PORTRAIT);//横向
+// } else {
+// aset.add(OrientationRequested.LANDSCAPE);//纵向
+// }
return aset;
}
/**
* 打印的文件数据类型
**/
- public static DocFlavor getDocFlavor(EnumDocFlavor flavorType) {
+ public DocFlavor getDocFlavor(EnumDocFlavor flavorType) {
// 设置打印格式，如果未确定类型，可选择autosense
DocFlavor.INPUT_STREAM type;
switch (flavorType) {
@@ -120,16 +123,14 @@ public class PrinterUtil {
* 获取打印文档
* */
- public static Doc getSimpleDoc(Object printData, DocFlavor docFlavor) throws PrintException {
- if(ObjectUtil.isEmpty(printData) || ObjectUtil.isEmpty(docFlavor) ){
- throw new PrintException("空的打印内容！不能打印！");
- }
+ public Doc getSimpleDoc(Object printData, DocFlavor docFlavor) throws PrintException {
return new SimpleDoc(printData,docFlavor,null);
}
+
/**
* 发送作业到打印机
*/
- public static boolean sendJobtoPrinter(DocPrintJob printJob, PrintJobListener printJobListener, Doc doc, PrintRequestAttributeSet propertySet) {
+ public boolean sendJobtoPrinter(DocPrintJob printJob, PrintJobListener printJobListener, Doc doc, PrintRequestAttributeSet propertySet) {
try {
printJob.addPrintJobListener(printJobListener);
printJob.print(doc, propertySet);
@@ -138,7 +139,7 @@ public class PrinterUtil {
return false;
}
}
- public static boolean sendJobtoPrinterNormal(DocPrintJob printJob, Doc doc, PrintRequestAttributeSet propertySet) {
+ public boolean sendJobtoPrinterNormal(DocPrintJob printJob, Doc doc, PrintRequestAttributeSet propertySet) {
try {
printJob.print(doc, propertySet);
return true;
@@ -146,7 +147,7 @@ public class PrinterUtil {
return false;
}
}
- public static boolean sendJobtoPrinter(DocPrintJob printJob, Doc doc, PrintRequestAttributeSet propertySet) {
+ public boolean sendJobtoPrinter(DocPrintJob printJob, Doc doc, PrintRequestAttributeSet propertySet) {
WinPrintJobListener printJobListener=new WinPrintJobListener();
try {
printJob.addPrintJobListener(printJobListener);
@@ -156,7 +157,7 @@ public class PrinterUtil {
return false;
}
}
- public static MediaSize getStardMediaSize(String pageName){
+ public static MediaSize getStardMediaSize(String pageName){
if("A0".equals(pageName)){
return MediaSize.ISO.A0;
}
diff --git a/win-print/src/main/java/com/win/print/util/WinPrintJobListener.java b/win-print/src/main/java/com/win/print/util/WinPrintJobListener.java
index 2c58d7e..1628ad7 100644
--- a/win-print/src/main/java/com/win/print/util/WinPrintJobListener.java
+++ b/win-print/src/main/java/com/win/print/util/WinPrintJobListener.java
@@ -24,7 +24,7 @@ public class WinPrintJobListener implements javax.print.event.PrintJobListener {
@Override
public void printJobFailed(PrintJobEvent pje) {
- log.warn("通知客户该作业未成功完成，必须重新提交。");
+ log.warn("通知客户该作业未成功完成，必须重新提交{}。",pje.getPrintJob());
}
@Override
diff --git a/win-print/src/main/resources/mapper/print/WinPrintClientPrintersMapper.xml b/win-print/src/main/resources/mapper/print/WinPrintClientPrintersMapper.xml
index ecd0ff1..8f2d404 100644
--- a/win-print/src/main/resources/mapper/print/WinPrintClientPrintersMapper.xml
+++ b/win-print/src/main/resources/mapper/print/WinPrintClientPrintersMapper.xml
@@ -109,7 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
delete from win_print_client_printers where id in
-
+
#{id}
diff --git a/win-print/src/main/resources/mapper/print/WinPrintModelMapper.xml b/win-print/src/main/resources/mapper/print/WinPrintModelMapper.xml
index e5baa09..e754758 100644
--- a/win-print/src/main/resources/mapper/print/WinPrintModelMapper.xml
+++ b/win-print/src/main/resources/mapper/print/WinPrintModelMapper.xml
@@ -22,6 +22,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select tenant_id, revision, created_by, created_time, updated_by, updated_time, id, m_name, m_code, m_type, m_filename, is_dyparam,m_type_src,m_page_size,m_page_value,is_page_rotate,m_data from win_print_model
+ select tenant_id, revision, created_by, created_time, updated_by, updated_time, id, m_name, m_code, m_type, m_filename, is_dyparam,m_type_src,m_page_size,m_page_value,is_page_rotate,m_data,font_name,font_size,font_block from win_print_model
@@ -102,7 +105,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
m_page_value,
is_page_rotate,
m_data,
-
+ font_name,
+ font_size,
+ font_block,
#{tenantId},
@@ -121,6 +126,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{mPageValue},
#{isPageRotate},
#{mData},
+ #{fontName},
+ #{fontSize},
+ #{fontBlock},
@@ -143,6 +151,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
m_page_value=#{mPageValue},
is_page_rotate=#{isPageRotate},
m_data=#{mData},
+ font_name=#{fontName},
+ font_size=#{fontSize},
+ font_block=#{fontBlock},
where id = #{id}
diff --git a/win-print/src/main/resources/templates/print/logmanager/logmanager.html b/win-print/src/main/resources/templates/print/logmanager/logmanager.html
index 89973dd..93cdf76 100644
--- a/win-print/src/main/resources/templates/print/logmanager/logmanager.html
+++ b/win-print/src/main/resources/templates/print/logmanager/logmanager.html
@@ -102,7 +102,7 @@
title: '客户端编码'
},
{
- field: 'taskID',
+ field: 'taskId',
title: '任务ID'
},
{
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 ab3a174..e780c14 100644
--- a/win-print/src/main/resources/templates/print/modelmanager/add.html
+++ b/win-print/src/main/resources/templates/print/modelmanager/add.html
@@ -97,7 +97,14 @@
-
+
diff --git a/win-print/src/main/resources/templates/print/modelmanager/edit.html b/win-print/src/main/resources/templates/print/modelmanager/edit.html
index c2a3dd8..d1cf1d6 100644
--- a/win-print/src/main/resources/templates/print/modelmanager/edit.html
+++ b/win-print/src/main/resources/templates/print/modelmanager/edit.html
@@ -89,7 +89,14 @@
-
+
![](\\\"http://img.baidu.com/hi/youa/y_0034.gif\\\")
图文混排方法![](\\\"http://img.baidu.com/hi/youa/y_0040.gif\\\")