打印相关

guoxunbo#552
ZTT820 · Apr 6, 2021 · 938bfc7 · 938bfc7
1 parent a07c62e
commit 938bfc7
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 12 deletions.
diff --git a/newbiest-mm/src/main/java/com/newbiest/mms/print/DefaultPrintStrategy.java b/newbiest-mm/src/main/java/com/newbiest/mms/print/DefaultPrintStrategy.java
@@ -1,5 +1,6 @@
 package com.newbiest.mms.print;
 
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.newbiest.base.exception.ClientParameterException;
 import com.newbiest.base.utils.CollectionUtils;
@@ -14,7 +15,6 @@
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
@@ -73,24 +73,24 @@ public Map<String, Object> buildParameters(PrintContext printContext) {
             for (LabelTemplateParameter parameter : labelTemplateParameters) {
                 Object value = null;
                 if (printContext.getParameterMap().containsKey(parameter.getName())) {
-                    value = parameterMap.get(parameter.getName());
+                    value = printContext.getParameterMap().get(parameter.getName());
                 } else {
                     try {
                         value = PropertyUtils.getProperty(printContext.getBaseObject(), parameter.getName());
-                        if (value != null) {
-                            if (value instanceof Date) {
-                                SimpleDateFormat sdf = new SimpleDateFormat(DateUtils.DEFAULT_DATE_PATTERN);
-                                value = sdf.format(value);
-                            }
-                            value = String.valueOf(value);
-                        } else {
-                            value = parameter.getDefaultValue();
-                        }
                     } catch (Exception e) {
                         // 此处异常不处理
                         log.warn(e.getMessage(), e);
                     }
                 }
+                if (value != null) {
+                    if (value instanceof Date) {
+                        SimpleDateFormat sdf = new SimpleDateFormat(DateUtils.DEFAULT_DATE_PATTERN);
+                        value = sdf.format(value);
+                    }
+                    value = String.valueOf(value);
+                } else {
+                    value = parameter.getDefaultValue();
+                }
                 parameterMap.put(parameter.getName(), value);
             }
         }
@@ -103,13 +103,20 @@ public void printWithBartender(PrintContext printContext) {
         String destination = printContext.getLabelTemplate().getBartenderDestination(printContext.getWorkStation());
         Map<String, Object> params = buildParameters(printContext);
 
+        List<String> paramStr = Lists.newArrayList();
+        for (String key : params.keySet()) {
+            paramStr.add(key + "=" + params.get(key));
+        }
+
         HttpHeaders headers = new HttpHeaders();
         HttpEntity entity = new HttpEntity(headers);
 
+
         if (log.isDebugEnabled()) {
             log.debug("Start to send print data to bartender. The destination is [ " + destination + "] and the parameter is [ " + params + "] ");
         }
-        HttpEntity<byte[]> responseEntity = restTemplate.exchange(destination, HttpMethod.GET, entity, byte[].class, params);
+        destination = destination + "?" + StringUtils.join(paramStr, "&");
+        HttpEntity<byte[]> responseEntity = restTemplate.getForEntity(destination, byte[].class);
         String response = new String(responseEntity.getBody(), StringUtils.getUtf8Charset());
         if (log.isDebugEnabled()) {
             log.debug(String.format("Get response from bartender. Response is [%s]", response));

diff --git a/newbiest-mm/src/main/resources/db/changelog/1.0.5/db.changelog-mms.yaml b/newbiest-mm/src/main/resources/db/changelog/1.0.5/db.changelog-mms.yaml
@@ -23,3 +23,6 @@ databaseChangeLog:
   - include:
       file: db.changelog-0.0.1.label_template_para.yaml
       relativeToChangelogFile: true
+  - include:
+      file: db.changelog-modifyDataType-0.0.1.label_template.yaml
+      relativeToChangelogFile: true
diff --git a/...c/main/resources/db/changelog/1.0.5/db.changelog-modifyDataType-0.0.1.label_template.yaml b/...c/main/resources/db/changelog/1.0.5/db.changelog-modifyDataType-0.0.1.label_template.yaml
@@ -0,0 +1,10 @@
+databaseChangeLog:
+  - changeSet:
+      id:  modifyDataType-0.0.1.mms-lbl-template
+      author:  Tao Zhou
+      remarks: MMS_LBL_TEMPLATE  modifyDataType
+      changes:
+        -  modifyDataType:
+             columnName: DESTINATION
+             newDataType: varchar(128)
+             tableName: MMS_LBL_TEMPLATE