PrintPart 修改

app/Http/Controllers/PrintController.php

@@ -19,11 +19,9 @@ class PrintController extends Controller
 
     public function getPrintDataApi(Request $request): array
     {
-        $printStr = "75475934320303";
+        if(!$request->has('printStr')) return ['success'=> false , 'message' => '为空'];
+        dd($request['printStr']);
         $result = app(DeliveryService::class)->getDelivery($request['printStr']);
-        $result = [
-            ["encryptedData"=>"AES:rU904rj6UH2oqfSUb43+Z5CuoOkTVqESmlQ0tcJbrUAuXZFoV8Alh6XzZ02viDHO8CQZFc6Z7G1O/rHrPwUvRV2XnKc/FVCulnA0ItCq5bqMmWnp7SFP+LmSvZBheXaz0zOmC29GXzzV4obhd7B8BaKWsdMqPZIdYWdlTkoSTSzl28ppJ/x9TnjIeef9j6U2jJlp6e0hT/i5kr2QYXl2s9MzpgtvRl881eKG4XewfAVz60kACshDXGvuGMuATt9Us5UGOWqTdcMIGeYF1fCJofrOGkNbEzz1VsMlo3C7y1sVWXgOd35AC/qVsix0rznnnsigmiP7M/Ir+4tzJQkQ9/bVj8t+TzpC8ck3kmqxrqCzVGmjk0KB0HBP+C1TRHIcU6nNkbu3As9vEFCY97bmVsvY4HB/UUipvFvlmJeE/+/4aokTK//5/viaH7X8I2CCWHNfdjZWfe64MIH1yFeXNHfxyitTQyQ/Cap9K7GxsvgpEx+9z9vYXkfzghrE36Gk8Dxe+LJAhOYXfzFzOxU8P0deIuGp6hqsyGBOwzxuy5sndxp5W7oV8xt0f7kEOrPGUQXZthqxNctuXxlyGMr5Z+w5lGGiKgGrEnlE3jau1tC/F3I2fAuazJtL8nNk1PtMKNe1yRkw//tJcGuBrkqG6VQ06LQDzsdDBQ1iunwYxf1URgwOdtC6DBalish71+4SOyiHyiTgnw67CCMEQZ5zfsywBrQzj+KNmL5ayoRborWiMgYN4LEvhkuB8OmcBPtb1u0ie0byUG8Pn44Wns7dKegDAjpr5yHuSCwGYcEDhCb8WVmV4yYK4m+ViXcIaS4Lil0qIDqR1m3uZj0VAY5Snyqw7J8NiQjXtJs1PVtuaAgOIkFqDEdmpDAL/9jkQltrUz1BUdC2sv1YDDQROzRz1FTw5Is8HQWPglEfdiTMIJUvIT9u0u90WC2hqlTkVUZHhhFUG3nN8wIYqqdwBzlm8WpEpQhN+8Z3dUU721awuWIr6qjv226oidVjXlG/hVVT9vZd+V2Roo3uMpYsvvPJbuH5PYG7wAGtXXc4yzICRYIrjCX7xJ2SlJQGbfBObEHBhEDPGnEfPDV9jLZNpgXso54xo2tT5wRzzW1UfvbXVSo3dy6AJ353/6MvbfEhZg74By5llFoj3P00GP4g/cUFajtAxj8Ax9Y+7ZiqhOMeQ2QiAtSdYGSX74yoevG8TTx+X5Cn9tRWEM2Kdlvdfd7kTpc8lXDf3j0RXvRhSUGE+bFH2rsVNhumeiI4//pndho0Dbat5rYhBt3S7QPNcxcLNnfRwezzl+o/OXKr+AJDLUlj+zSTSRUvynPYYKYbWndyeBJxA38rH355S/8xeLW4n2VPRFg02MqE7hVuj4928D3yNqOOZCHyGM5ODT5PrEplTH1exmmJnpFdiBhpmNg4zOqHvXlRwOnNu3EipP+HF0PPRRKHlWYInYRpGDBNb37DRwEDfFQUY6iKg/zsA0aVg1pnE3ndNap+ioOuXTsK++kR+1KJL1gLrn2pZO/X2v1rqPdHP1lVyup7TrfZkpKsL6BQA4FKXWK6JvzSv4Igf8ilSQV1g+aqhz0eNNCKunlYrUG3EO6CQPnTJB1DZT9VLw==","signature"=>"MD:igmNRTCKVIhAL18yj0OsRg==","templateURL"=>"http://cloudprint.cainiao.com/template/standard/300336/9","ver"=>"waybill_print_secret_version_1"]
-        ];
         return ['success' => true,'data' => $result];
     }
 
@@ -33,4 +31,5 @@ class PrintController extends Controller
     }
 
 
+
 }

app/Http/Controllers/PrintPartController.php

@@ -5,8 +5,10 @@ namespace App\Http\Controllers;
 use App\Components\AsyncResponse;
 use App\Order;
 use App\PrintPart;
+use App\PrintPartImage;
 use App\PrintTemplate;
 use App\Services\PrintPartService;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Http;
 
@@ -17,7 +19,7 @@ class PrintPartController extends Controller
     public function index(Request $request)
     {
         $printParts = PrintPart::query()->paginate($request['paginate'] ?? 50);
-        $imgPrintPart = app(PrintPartService::class)->getImagePart();
+        $imgPrintPart = PrintPartImage::query()->with('file')->get();
         return view('/maintenance/expressPrinting/part/index', compact('printParts','imgPrintPart'));
     }
 
@@ -27,7 +29,7 @@ class PrintPartController extends Controller
         return view('/maintenance/expressPrinting/part/create',compact('imgPrintPart'));
     }
 
-    public function storeApi(Request $request): \Illuminate\Http\RedirectResponse
+    public function storeApi(Request $request): RedirectResponse
     {
         PrintPart::query()->create($request->all());
         $this->success('添加成功');
@@ -47,38 +49,4 @@ class PrintPartController extends Controller
         return view("maintenance.expressPrinting.print.index", compact("template", 'items'));
     }
 
-    public function getImagesPartApi(PrintPartService $service)
-    {
-        return ['success' => true, 'data' => $service->getImagePart()];
-    }
-
-    public function pushImagesPartApi(Request $request,PrintPartService $service)
-    {
-        if (is_null($request['name'])) return ['success' => false, 'message' => "文件名未命名"];
-        if (!$request->hasFile('file')) return ['success' => false, 'message' => '未找到上传文件'];
-        if (!$request->has('name')) return ['success' => false, 'message' => "文件名未命名"];
-        return $service->pushImagePart($request->file('file'),$request['name']);
-    }
-
-
-    public function printTemplateApi(Request $request)
-    {
-        $file = $request->file("blob");
-        $content = $file->getContent();
-        $content = base64_encode($content);
-        $files = $request->file("blobs");
-
-        $content = [
-            "type" => "print",
-            "aliasName" => "admin",
-            "printerName" => "admin123",
-            "content" => $content
-        ];
-        if (!$files) return Http::post("http://127.0.0.1:3000", $content);
-        $contents = [];
-        foreach ($files as $item) {
-            $contents[] = base64_encode($item->getContent());
-        }
-        return Http::post("http://127.0.0.1:3000", ['file' => $content, 'files' => $contents]);
-    }
 }

app/Http/Controllers/PrintTemplateController.php

@@ -3,8 +3,9 @@
 namespace App\Http\Controllers;
 
 use App\Components\AsyncResponse;
-use App\PrintPart;
+use App\PrintPartImage;
 use App\PrintTemplate;
+use App\Services\PrintTemplateService;
 use Illuminate\Http\Request;
 
 class PrintTemplateController extends Controller
@@ -16,10 +17,11 @@ class PrintTemplateController extends Controller
         return view('/maintenance/expressPrinting/template/index',compact('templates'));
     }
 
-    public function create(Request $request)
+    public function create(Request $request,PrintTemplateService  $service)
     {
-        $printParts = PrintPart::all();
-        return view('/maintenance/expressPrinting/template/create',compact('printParts'));
+        $printParts = $service->getParts();
+        $printPartImages = PrintPartImage::query()->with('file')->get();
+        return view('/maintenance/expressPrinting/template/create',compact('printParts','printPartImages'));
     }
 
 
@@ -27,7 +29,7 @@ class PrintTemplateController extends Controller
     {
         $data = [
             'name' =>$request['name'],
-            'value'=>json_encode($request['value'],JSON_UNESCAPED_UNICODE)
+            'value'=>$request['value']
         ];
         $printTemplate = PrintTemplate::query()->create($data);
         $this->success(['data' => $printTemplate]);

app/Services/PrintPartService.php

@@ -5,14 +5,10 @@ namespace App\Services;
 use App\Traits\ModelSearchWay;
 use App\Traits\ServiceAppAop;
 use App\PrintPart;
-use Illuminate\Support\Facades\Storage;
 
 class PrintPartService
 {
     use ModelSearchWay;
     use ServiceAppAop;
     protected $modelClass = PrintPart::class;
-
-
-
 }

app/Services/PrintTemplateService.php

@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 namespace App\Services;
 
@@ -8,6 +8,96 @@ use App\PrintTemplate;
 class PrintTemplateService
 {
     use ServiceAppAop;
-    protected $modelClass=PrintTemplate::class;
 
-}
+    protected $modelClass = PrintTemplate::class;
+
+
+    public function getParts(): array
+    {
+        return [
+            [
+                'name' => '背景',
+                'value' => $this->getBg()
+            ],
+            [
+                'name' => '文本框',
+                'value' => $this->getTextBox()
+            ],
+            [
+                'name' => '条纹码',
+                'value' => $this->getStripeCode()
+            ],
+            [
+                'name' => '二维码',
+                'value' => $this->getQrCode()
+            ],
+            [
+                'name' => '图片',
+                'value' => $this->getImage()
+            ]
+        ];
+    }
+
+    private function getTextBox(): array
+    {
+        return [
+            'type' => 'textBox',
+            'border-style' => 'none',
+            'border-width' => 1,
+            'font-size' => 12,
+            'width' => 250,
+            'height' => 50,
+            'left' => '',
+            'top' => '',
+            'white-space' => 'pre',
+            'justify-content' => 'center',
+            // flex-start 开头|flex-end 结尾|center 居中|space-between|space-around|initial|inherit;
+            'align-items' => 'center'
+            // stretch 拉伸平铺|center居中|flex-start 容器开头|flex-end容器结尾|baseline容器基线|initial|inherit
+        ];
+    }
+
+    private function getStripeCode(): array
+    {
+        return [
+            'type' => 'stripeCode',
+            'width' => 404,
+            'left' => 100,
+            'top' => 0,
+            'scale' => 1,
+        ];
+    }
+
+    private function getBg(): array
+    {
+        return [
+            'type' => 'bg',
+            'width' => 600,
+            'height' => 900,
+        ];
+    }
+
+    private function getQrCode(): array
+    {
+        return [
+            'type' => 'qRCode',
+            'width' => 100,
+            'height' => 100,
+            'left' => 0,
+            'top' => 0,
+        ];
+    }
+
+    private function getImage(): array
+    {
+        return [
+            'type' => 'image',
+            'width' => 100,
+            'height' => 100,
+            'left' => 0,
+            'top' => 0,
+            'value' => 'none',
+            'scale' => 1,
+        ];
+    }
+}

bootstrap/cache/services.php

@@ -32,18 +32,19 @@
     28 => 'Laravel\\Tinker\\TinkerServiceProvider',
     29 => 'Laravel\\Ui\\UiServiceProvider',
     30 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
-    31 => 'Carbon\\Laravel\\ServiceProvider',
-    32 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
-    33 => 'Oursdreams\\Export\\ExportServiceProvider',
-    34 => 'Overtrue\\LaravelPinyin\\ServiceProvider',
-    35 => 'Te7aHoudini\\LaravelTrix\\LaravelTrixServiceProvider',
-    36 => 'Yajra\\Oci8\\Oci8ServiceProvider',
-    37 => 'App\\Providers\\AppServiceProvider',
-    38 => 'App\\Providers\\AuthServiceProvider',
-    39 => 'App\\Providers\\BroadcastServiceProvider',
-    40 => 'App\\Providers\\EventServiceProvider',
-    41 => 'App\\Providers\\HorizonServiceProvider',
-    42 => 'App\\Providers\\RouteServiceProvider',
+    31 => 'Milon\\Barcode\\BarcodeServiceProvider',
+    32 => 'Carbon\\Laravel\\ServiceProvider',
+    33 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
+    34 => 'Oursdreams\\Export\\ExportServiceProvider',
+    35 => 'Overtrue\\LaravelPinyin\\ServiceProvider',
+    36 => 'Te7aHoudini\\LaravelTrix\\LaravelTrixServiceProvider',
+    37 => 'Yajra\\Oci8\\Oci8ServiceProvider',
+    38 => 'App\\Providers\\AppServiceProvider',
+    39 => 'App\\Providers\\AuthServiceProvider',
+    40 => 'App\\Providers\\BroadcastServiceProvider',
+    41 => 'App\\Providers\\EventServiceProvider',
+    42 => 'App\\Providers\\HorizonServiceProvider',
+    43 => 'App\\Providers\\RouteServiceProvider',
   ),
   'eager' => 
   array (
@@ -65,18 +66,19 @@
     15 => 'Laravel\\Horizon\\HorizonServiceProvider',
     16 => 'Laravel\\Ui\\UiServiceProvider',
     17 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
-    18 => 'Carbon\\Laravel\\ServiceProvider',
-    19 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
-    20 => 'Oursdreams\\Export\\ExportServiceProvider',
-    21 => 'Overtrue\\LaravelPinyin\\ServiceProvider',
-    22 => 'Te7aHoudini\\LaravelTrix\\LaravelTrixServiceProvider',
-    23 => 'Yajra\\Oci8\\Oci8ServiceProvider',
-    24 => 'App\\Providers\\AppServiceProvider',
-    25 => 'App\\Providers\\AuthServiceProvider',
-    26 => 'App\\Providers\\BroadcastServiceProvider',
-    27 => 'App\\Providers\\EventServiceProvider',
-    28 => 'App\\Providers\\HorizonServiceProvider',
-    29 => 'App\\Providers\\RouteServiceProvider',
+    18 => 'Milon\\Barcode\\BarcodeServiceProvider',
+    19 => 'Carbon\\Laravel\\ServiceProvider',
+    20 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
+    21 => 'Oursdreams\\Export\\ExportServiceProvider',
+    22 => 'Overtrue\\LaravelPinyin\\ServiceProvider',
+    23 => 'Te7aHoudini\\LaravelTrix\\LaravelTrixServiceProvider',
+    24 => 'Yajra\\Oci8\\Oci8ServiceProvider',
+    25 => 'App\\Providers\\AppServiceProvider',
+    26 => 'App\\Providers\\AuthServiceProvider',
+    27 => 'App\\Providers\\BroadcastServiceProvider',
+    28 => 'App\\Providers\\EventServiceProvider',
+    29 => 'App\\Providers\\HorizonServiceProvider',
+    30 => 'App\\Providers\\RouteServiceProvider',
   ),
   'deferred' => 
   array (

routes/web.php

@@ -263,8 +263,14 @@ Route::group(['prefix'=>'maintenance'],function(){
     /** 快递打印 */
     Route::get('/print/index','PrintController@index');
     Route::group(['prefix'=>'expressPrinting'],function(){
-        Route::get('/part','PrintPartController@index');
-        Route::get('/part/create','PrintPartController@create');
+        Route::group(['prefix' => 'part'],function(){
+            Route::get('/','PrintPartController@index');
+            Route::get('/create','PrintPartController@create');
+        });
+        Route::prefix('image')->group(function(){
+            Route::get('index','PrintPartImageController@index');
+
+        });
         Route::group(['prefix'=>'template'],function(){
             Route::get('/index','PrintTemplateController@index');
             Route::get('/create','PrintTemplateController@create');