Browse Source

fix:修复执行新增修改驼峰问题

韩帛霖 1 year ago
parent
commit
9bfdbfbef9

+ 1 - 0
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/SqlInterceptor.java

@@ -53,6 +53,7 @@ public class SqlInterceptor implements Interceptor {
         try {
             SecurityUtils.getDatabaseType();
         } catch (Exception e) {
+            // 如果当前请求携带信息异常,返回前端提示重新登录。
             return "";
         }
         if (SecurityUtils.getDatabaseType().equals("sqlserver"))

+ 10 - 2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CommonServiceImpl.java

@@ -2,6 +2,7 @@ package com.ruoyi.system.service.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
+import com.alibaba.fastjson2.TypeReference;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.entity.CommonEntity;
 import com.ruoyi.system.entity.TableSql;
@@ -44,9 +45,10 @@ public class CommonServiceImpl implements ICommonService {
         List<Map<String, String>> list = commonEntity.getAddListMap();
         List<Map<String, Object>> mapList = new ArrayList<>();
         for (Object obj : list) {
-            System.out.println(obj);
             Map<String, Object> map1 = (Map<String, Object>) obj;
-            mapList.add(map1);
+            map1.keySet().forEach(item -> {
+                mapList.add((Map<String, Object>) JSON.parse(toUnderScoreCase(item) + map1.get(item)));
+            });
         }
         Set<String> fieldNames = new LinkedHashSet<>();
         mapList.stream().forEach(map1 -> {
@@ -62,6 +64,12 @@ public class CommonServiceImpl implements ICommonService {
         String tableName = (String) commonEntity.getBasicMap().get("tableName");
         Map<String, Object> conditions = JSONObject.parseObject(JSON.toJSONString(commonEntity.getConditionMap()));
         Map<String, Object> fields = JSONObject.parseObject(JSON.toJSONString(commonEntity.getCommMap()));
+        Map<String, Object> endfields = null;
+        fields.keySet().forEach(item -> {
+//            Map<String, Object> asd = JSONObject.parseObject("{ \"" + toUnderScoreCase(item) + "\":\"" + fields.get(item) + "\"}", new TypeReference<Map<String, Object>>() {
+//            });
+            endfields.put(toUnderScoreCase(item), fields.get(item));
+        });
         return commonMapper.edit(fields, tableName, conditions);
     }
 

+ 4 - 2
ruoyi-system/src/main/java/com/ruoyi/system/test/ljj.java

@@ -1,6 +1,7 @@
 package com.ruoyi.system.test;
 
 import com.alibaba.fastjson2.JSON;
+import com.ruoyi.common.utils.sql.SqlUtil;
 import org.apache.ibatis.jdbc.SQL;
 
 import java.time.DayOfWeek;
@@ -23,8 +24,9 @@ public class ljj {
 
     public static void main(String[] args) {
 
-        String a = "asdjkl";
-        System.out.println(a.replaceAll("k","QQ"));
+        System.out.println(SqlUtil.isValidOrderBySql("M_F.M_F_ID"));
+//        String a = "asdjkl";
+//        System.out.println(a.replaceAll("k", "QQ"));
 
 
 //        for (int i = 0; i < 10; i++) {