Bläddra i källkod

解决代码冲突

syh 5 år sedan
förälder
incheckning
8787b38713

+ 2 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/MaterialTopServiceImpl.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.ctop.service.impl;
 
 import cn.com.ctop.common.module.utils.CtopAdConstant;
+import cn.com.ctop.common.module.utils.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -22,6 +23,7 @@ public class MaterialTopServiceImpl  implements IMaterialTopService {
     public IPage<MaterialTopVO> selectByPage(String endDate, String startDate, String target, String order, int pageNo, int pageSize) {
         QueryWrapper<MaterialTopVO> wrapper = new QueryWrapper();
         wrapper.ge("stat_date", startDate).le("stat_date", endDate);
+        target = StringUtils.humpToLine2(target);
         if(order.equals(CtopAdConstant.COMMON_ORDER_TYPE_ASC)){
             wrapper.orderByAsc(target);
         }else{

+ 1 - 1
jeecg-boot-module-system/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: test
+    active: @activatedProperties@
   application:
     name: system-web
 #分页pageHelper

+ 56 - 0
module-common/src/main/java/cn/com/ctop/common/module/utils/StringUtils.java

@@ -21,6 +21,62 @@ public class StringUtils {
         return list;
     }
 
+    /**
+     * 将下划线风格转换为驼峰风格
+     * @param inputString
+     * @return
+     */
+    public static String underlineToCamehunp(String inputString){
+        StringBuilder sb = new StringBuilder();
+        boolean nextUppercase = false;
+        for (int i = 0; i < inputString.length(); i++) {
+            char c = inputString.charAt(i);
+            if (c == '_') {
+                if (sb.length()>0) {
+                    nextUppercase = true;
+                }
+            }else {
+                if (nextUppercase) {
+                    sb.append(Character.toUpperCase(c));
+                    nextUppercase = false;
+                }else {
+                    sb.append(Character.toLowerCase(c));
+                }
+            }
+        }
+        return sb.toString();
+    }
+    private static Pattern linePattern = Pattern.compile("_(\\w)");
+    /** 下划线转驼峰 */
+    public static String lineToHump(String str) {
+        str = str.toLowerCase();
+        Matcher matcher = linePattern.matcher(str);
+        StringBuffer sb = new StringBuffer();
+        while (matcher.find()) {
+            matcher.appendReplacement(sb, matcher.group(1).toUpperCase());
+        }
+        matcher.appendTail(sb);
+        return sb.toString();
+    }
+
+    /** 驼峰转下划线(简单写法,效率低于{@link #humpToLine2(String)}) */
+    public static String humpToLine(String str) {
+        return str.replaceAll("[A-Z]", "_$0").toLowerCase();
+    }
+
+    private static Pattern humpPattern = Pattern.compile("[A-Z]");
+
+    /** 驼峰转下划线,效率比上面高 */
+    public static String humpToLine2(String str) {
+        Matcher matcher = humpPattern.matcher(str);
+        StringBuffer sb = new StringBuffer();
+        while (matcher.find()) {
+            matcher.appendReplacement(sb, "_" + matcher.group(0).toLowerCase());
+        }
+        matcher.appendTail(sb);
+        return sb.toString();
+    }
+
     public static String replaceBlank(String str) {
         String dest = "";
         if (str!=null) {