common新增字典

kmall-common/pom.xml

@@ -18,7 +18,7 @@
         <qiniu-version>[7.2.0, 7.2.99]</qiniu-version>
         <aliyun-oss-version>2.5.0</aliyun-oss-version>
         <qcloud-cos-version>4.4</qcloud-cos-version>
-        <jackson.version>2.5.0</jackson.version>
+        <jackson.version>2.5.1</jackson.version>
         <jackson.core.version>2.7.3</jackson.core.version>
         <poi.version>3.15</poi.version>
         <poi.ooxml.version>3.15</poi.ooxml.version>
@@ -71,6 +71,11 @@
             <artifactId>jackson-databind</artifactId>
             <version>${jackson.version}</version>
         </dependency>
+        <!--<dependency>-->
+            <!--<groupId>com.fasterxml.jackson.dataformat</groupId>-->
+            <!--<artifactId>jackson-dataformat-xml</artifactId>-->
+            <!--<version>2.8.10</version>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>dom4j</groupId>

kmall-common/src/main/java/com/kmall/common/constant/Dict.java

@@ -1463,4 +1463,37 @@ public class Dict {
             this.itemName = itemName;
         }
     }
+
+    /**
+     * 商品库存数量变化后是否已共享,0：否，1：是(下单、退款、取消订单触发)
+     */
+    public enum isGoodsShareStock {
+        item_0("0", "否"),
+        item_1("1", "是");
+
+        private String item;
+        private String itemName;
+
+        isGoodsShareStock(String item, String itemName) {
+            this.item = item;
+            this.itemName = itemName;
+        }
+
+        public String getItem() {
+            return item;
+        }
+
+        public void setItem(String item) {
+            this.item = item;
+        }
+
+        public String getItemName() {
+            return itemName;
+        }
+
+        public void setItemName(String itemName) {
+            this.itemName = itemName;
+        }
+    }
+
 }

kmall-common/src/main/java/com/kmall/common/fileserver/util/FileManager.java

@@ -57,7 +57,7 @@ public class FileManager implements Serializable {
      * <strong>方法概要： 文件上传</strong> <br>
      * <strong>创建时间： 2016-9-26 上午10:26:11</strong> <br>
      *
-     * @param FastDFSFile file
+     * @param attach file
      * @return fileAbsolutePath
      * @author Wang Liang
      */

kmall-common/src/main/java/com/kmall/common/utils/DateUtils.java

@@ -201,7 +201,7 @@ public class DateUtils {
     }
 
     /**
-     * true为开始时间小于结束时间，false为开始时间大于结束时间
+     * true为开始时间小于或等于结束时间，false为开始时间大于结束时间
      * @param startDate
      * @param endDate
      * @return
@@ -238,6 +238,8 @@ public class DateUtils {
 //        System.out.println(DateUtils.getDateFormat(str));
 //        System.out.println(DateUtils.addDay(2));
 
+        System.out.println(DateUtils.compareDate(new Date(), new Date()));
         System.out.println(new BigDecimal("11").compareTo(new BigDecimal("11")));
+        System.out.println(BigDecimal.valueOf(Double.valueOf("0.112")));
     }
 }

kmall-common/src/main/java/com/kmall/common/utils/JacksonStringUnicodeSerializer.java

@@ -45,7 +45,7 @@ public class JacksonStringUnicodeSerializer extends JsonSerializer<String> {
 	        gen.writeRaw(',');
 	        break;
 	      case JsonWriteContext.STATUS_EXPECT_NAME:
-	        throw new JsonParseException(null, "Can not write string value here");
+	        throw new JsonParseException("Can not write string value here", null);
 	    }
 	    gen.writeRaw('"');//写入JSON中字符串的开头引号
 	    for (char c : str.toCharArray()) {

kmall-common/src/main/java/com/kmall/common/utils/file/FileUploadUtil.java

@@ -14,6 +14,12 @@ import org.apache.http.protocol.HTTP;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
+import javax.imageio.IIOImage;
+import javax.imageio.ImageIO;
+import javax.imageio.ImageWriteParam;
+import javax.imageio.ImageWriter;
+import java.awt.image.BufferedImage;
+import java.awt.image.ColorModel;
 import java.io.*;
 import java.nio.file.Files;
 
@@ -73,6 +79,7 @@ public class FileUploadUtil {
                 IOUtils.copy(input, os);
                 MultipartFile multipartFile = new CommonsMultipartFile(fileItem);
                 String url = FileManager.upload(multipartFile);
+//                compressPic(url, url);
                 return url;
             }
         }catch (Exception e){
@@ -80,7 +87,61 @@ public class FileUploadUtil {
         }
         return "";
     }
+    public static boolean compressPic(String srcFilePath, String descFilePath) throws IOException {
+        File file = null;
+        BufferedImage src = null;
+        FileOutputStream out = null;
+        ImageWriter imgWrier;
+        ImageWriteParam imgWriteParams;
 
+        // 指定写图片的方式为 jpg
+        imgWrier = ImageIO.getImageWritersByFormatName("jpg").next();
+        imgWriteParams = new javax.imageio.plugins.jpeg.JPEGImageWriteParam(
+                null);
+        // 要使用压缩，必须指定压缩方式为MODE_EXPLICIT
+        imgWriteParams.setCompressionMode(imgWriteParams.MODE_EXPLICIT);
+        // 这里指定压缩的程度，参数qality是取值0~1范围内，
+        imgWriteParams.setCompressionQuality((float)1);
+        imgWriteParams.setProgressiveMode(imgWriteParams.MODE_DISABLED);
+        ColorModel colorModel = ImageIO.read(new File(srcFilePath)).getColorModel();// ColorModel.getRGBdefault();
+        // 指定压缩时使用的色彩模式
+//        imgWriteParams.setDestinationType(new javax.imageio.ImageTypeSpecifier(
+//                colorModel, colorModel.createCompatibleSampleModel(16, 16)));
+        imgWriteParams.setDestinationType(new javax.imageio.ImageTypeSpecifier(
+                colorModel, colorModel.createCompatibleSampleModel(16, 16)));
+
+        try {
+            if (isBlank(srcFilePath)) {
+                return false;
+            } else {
+                file = new File(srcFilePath);
+                System.out.println(file.length());
+                src = ImageIO.read(file);
+                out = new FileOutputStream(descFilePath);
+
+                imgWrier.reset();
+                // 必须先指定 out值，才能调用write方法, ImageOutputStream可以通过任何
+                // OutputStream构造
+                imgWrier.setOutput(ImageIO.createImageOutputStream(out));
+                // 调用write方法，就可以向输入流写图片
+                imgWrier.write(null, new IIOImage(src, null, null),
+                        imgWriteParams);
+                out.flush();
+                out.close();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+        return true;
+    }
+
+    public static boolean isBlank(String string) {
+        if (string == null || string.length() == 0 || string.trim().equals("")) {
+            return true;
+        }
+        return false;
+    }
 
     private static void deleteFile(File dirFile){
         if(dirFile.exists()){