diff --git a/.ssh/id_rsa b/.ssh/id_rsa deleted file mode 100644 index a90890f3..00000000 --- a/.ssh/id_rsa +++ /dev/null @@ -1,38 +0,0 @@ ------BEGIN OPENSSH PRIVATE KEY----- -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 ------END OPENSSH PRIVATE KEY----- diff --git a/.ssh/id_rsa.pub b/.ssh/id_rsa.pub deleted file mode 100644 index 6760f6a1..00000000 --- a/.ssh/id_rsa.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCf7/nwpxVzcWlWS1366M7jRvOW6goFEpfjLMQgVf81+bmeL/kWKf64Q0F2OFv5/IR4TnOwdiQddmIroYg6wXpcnXBw6gHCh9ijBGbOcVBZMf2APa1nc5WEjce/OkuGGSTEKJNFqNw1UGzPguzoa+whmMoX4v/OpMqQ98nMuMLAtSPIgbsenARb/y34NAXAw12ft+5ZwJyPe7g0nGQPYl42r7LyRZtcjj4SMDkgprmNtEGhpTMiYt1i/a9OGZJLwpIy4HrF1nZ0dIfYtQGouhrOieLSd+lQ+zqnz9b1vvLx/nUjYChfByomRx1S+rI8Uoj9MDsWhl8eOMBHqic3FW5VNvWMHuvV15qmTkQQLN6GsoSyuuV/uvDSkuERQfOpW01Me8dhOFMl08issEkShlk8Qaim9uFg0XhWRIxXzLfTC7JRH2TheYt9yw8I5O2iS2+3EvhEfynnWSJUnYTyImZmI1RUPKYApNxCq/IOdLkYjD9qVp3U/V0mJXSCVV09LLs= 1209591330@qq.com diff --git a/.ssh/known_hosts b/.ssh/known_hosts deleted file mode 100644 index 86ab3811..00000000 --- a/.ssh/known_hosts +++ /dev/null @@ -1,3 +0,0 @@ -github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl -github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== -github.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg= diff --git a/.ssh/known_hosts.old b/.ssh/known_hosts.old deleted file mode 100644 index 90150c2b..00000000 --- a/.ssh/known_hosts.old +++ /dev/null @@ -1 +0,0 @@ -github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl diff --git a/apps/dgiot_printer/priv/json/printertemp.json b/apps/dgiot_printer/priv/json/printertemp.json index c5f98b78..fb5c61de 100644 --- a/apps/dgiot_printer/priv/json/printertemp.json +++ b/apps/dgiot_printer/priv/json/printertemp.json @@ -19,6 +19,7 @@ "id": "f9dddd0eeb_amisBMK8t", "name": "amis", "opacity": 0.75, + "fontSize": 12, "draggable": true }, "children": [], @@ -26,7 +27,7 @@ }, { "attrs": { - "x": 3, + "x": 2, "y": 1, "id": "print_paper", "fill": "", @@ -39,6 +40,7 @@ "opacity": 0.75, "fontSize": 15, "draggable": true, + "fontFamily": "宋体", "lineHeight": 0, "strokeWidth": 4 }, @@ -115,12 +117,12 @@ "fill": "rgba(0, 0, 0, 1)", "name": "printer", "text": "班次:", - "fontSize": 12, "type": "label", "width": 300, "height": 20, "stroke": "", "opacity": 0.75, + "fontSize": 12, "draggable": true, "fontFamily": "Calibri", "lineHeight": 0, @@ -319,7 +321,7 @@ }, { "attrs": { - "x": 10, + "x": 9, "y": 210, "id": "596569e7b3_textaiToJ", "fill": "rgba(0, 0, 0, 1)", @@ -327,7 +329,7 @@ "text": "去向:", "type": "label", "width": 300, - "height": 20, + "height": 10, "stroke": "", "opacity": 0.75, "fontSize": 12, @@ -613,14 +615,16 @@ }, { "attrs": { - "x": 20, - "y": 235, - "id": "spunlace_id", + "x": 61, + "y": 270.00534412955466, + "id": "spunlace_id_barcode", "fill": "rgba(0, 0, 0, 1)", "name": "printer", - "text": "条码", - "type": "scancode", + "text": "1234567800jh", + "type": "scancodetext", + "align": 4, "width": 150, + "format": 29, "height": 50, "stroke": "", "opacity": 0.75, @@ -652,6 +656,28 @@ "strokeWidth": 0.1 }, "className": "Text" + }, + { + "attrs": { + "x": 25, + "y": 229, + "id": "spunlace_id", + "fill": "rgba(170, 234, 213, 1)", + "name": "printer", + "text": "1334456456h", + "type": "scancode", + "align": 4, + "width": 150, + "format": 27, + "height": 50, + "stroke": "black", + "opacity": 0.75, + "fontSize": 12, + "draggable": true, + "fontFamily": "宋体", + "strokeWidth": 4 + }, + "className": "Rect" } ], "className": "Layer" diff --git a/apps/dgiot_printer/src/dgiot_printer.erl b/apps/dgiot_printer/src/dgiot_printer.erl index f7168bb3..9e628bb7 100644 --- a/apps/dgiot_printer/src/dgiot_printer.erl +++ b/apps/dgiot_printer/src/dgiot_printer.erl @@ -42,7 +42,8 @@ get_topo(#{<<"profile">> := Profile} = QueryData, ProductId) -> Acc ++ [V#{<<"text">> => Text}] end end, [], StageMap), - QueryData#{<<"profile">> => #{<<"cmd">> => <<"printer">>, <<"data">> => NewProfile}}; + Cmd = maps:get(<<"cmd">>, Profile, <<"printer_barcode">>), + QueryData#{<<"profile">> => #{<<"cmd">> => Cmd, <<"data">> => NewProfile}}; _ -> QueryData end. @@ -131,4 +132,4 @@ get_word(#{<<"id">> := TaskId, <<"cmd">> := Printer, <<"data">> := Data, <<"Home end; _Oth1 -> Profile - end. \ No newline at end of file + end.