宁波手麻分支合入北仑dev分支4

kernel/src/main/java/com/lantone/qc/kernel/util/CatalogueUtil.java

@@ -31,18 +31,11 @@ import java.util.regex.Pattern;
 @Getter
 @Setter
 public class CatalogueUtil {
-    //初始化加载的所有的质控条目分析对象
     public static Map<String, QCCatalogue> qcCatalogueMap = new HashMap<>();
     public static Map<Integer, String> intMapString =
             ImmutableMap.<Integer, String>builder().put(1, "一").put(2, "二").put(3, "三").put(4, "四").put(5, "五")
                     .put(6, "六").put(7, "七").put(8, "八").put(9, "九").put(0, "零").build();
 
-    /**
-     * 去除特殊字符，判断字符串否未空
-     *
-     * @param content
-     * @return
-     */
     public static boolean isEmpty(String content) {
         return StringUtil.isBlank(removeSpecialChar(content));
     }
@@ -373,12 +366,7 @@ public class CatalogueUtil {
         }
         return false;
     }
-    /**
-     * 将阿拉伯数字字符串变成汉字字符串
-     *
-     * @param content
-     * @return
-     */
+
     public static String int2ChineseNum(String content) {
         StringBuffer sb = new StringBuffer();
         char[] contentArr = content.toCharArray();

public/src/main/java/com/lantone/qc/pub/util/DateUtil.java

@@ -182,59 +182,6 @@ public class DateUtil {
     public static Date now() {
         return new Date();
     }
-    /**
-     * 获取字符串时间的format
-     * @param time
-     * @return
-     */
-    public static String getTimeFormat(String time)
-    {
-        if(StringUtil.isBlank(time))
-        {
-            return null;
-        }
-        String regex = "\\d+";
-        time = time.replaceAll(regex,"");
-        switch (time)
-        {
-            //===========yyyy年MM月dd日HH时mm分ss秒============
-            case "年月日 时分秒":
-                return "yyyy年MM月dd日 HH时mm分ss秒";
-            case "年月日时分秒":
-                return "yyyy年MM月dd日HH时mm分ss秒";
-            case "年月日 时分":
-                return "yyyy年MM月dd日HH时mm分";
-            case "年月日时分":
-                return "yyyy年MM月dd日HH时mm分";
-            case "年月日 时":
-                return "yyyy年MM月dd日 HH时";
-            case "年月日时":
-                return "yyyy年MM月dd日HH时";
-            case "年月日":
-                return "yyyy年MM月dd日";
-            //===========yyyy-MM-dd HH:mm:ss============
-            case "-- ::":
-                return "yyyy-MM-dd HH:mm:ss";
-            case "-- :":
-                return "yyyy-MM-dd HH:mm";
-            case "-- ":
-                return "yyyy-MM-dd HH";
-            case "--":
-                return "yyyy-MM-dd";
-            //===========yyyy/MM/dd HH:mm:ss============
-            case "// ::":
-                return "yyyy/MM/dd HH:mm:ss";
-            case "// :":
-                return "yyyy/MM/dd HH:mm";
-            case "// ":
-                return "yyyy/MM/dd HH";
-            case "//":
-                return "yyyy/MM/dd";
-            default:
-                break;
-        }
-        return null;
-    }
 
     /**
      * 将日期转换成为字符（yyyy-MM-dd HH:mm:ss.SSS）