[数据模型] 稳定版

src/main/java/com/tykj/datawarehouse/base/consumer/FourComsumer.java

+package com.tykj.datawarehouse.base.consumer;
+
+import java.util.Objects;
+
+
+/**
+ * @Description TODO
+ * @Author WWW
+ * @Date 2021/7/5 17:28
+ */
+
+@FunctionalInterface
+public interface FourComsumer<T, Y, U, I> {
+
+    /**
+     * @param t
+     * @param y
+     * @param u
+     * @param i
+     */
+    void accept(T t, Y y, U u, I i);
+
+    default FourComsumer<T, Y, U, I> andThen(FourComsumer<? super T, ? super Y, ? super U, ? super I> after) {
+        Objects.requireNonNull(after);
+
+        return (l, y, u, i) -> {
+            accept(l, y, u, i);
+            after.accept(l, y, u, i);
+        };
+    }
+
+}

src/main/java/com/tykj/datawarehouse/model/controller/ModelController.java

@@ -12,9 +12,12 @@ import com.tykj.datawarehouse.model.entity.TableInfo;
 import com.tykj.datawarehouse.model.entity.vo.*;
 import com.tykj.datawarehouse.model.service.ModelService;
 import com.tykj.datawarehouse.model.service.impl.ModelHelper;
+import com.tykj.datawarehouse.model.utils.SessionUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.hibernate.Session;
+import org.hibernate.internal.SessionImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.http.HttpStatus;
@@ -49,6 +52,8 @@ public class ModelController {
     private QuoteDao quoteDao;
     @Autowired
     private RuleDao ruleDao;
+    @Autowired
+    SessionUtil sessionUtil;
 
     /**
      * @param
@@ -132,7 +137,8 @@ public class ModelController {
     @ApiOperation(value = "根据表名表插入数据")
     @PostMapping("/insertValues")
     public ResponseEntity insertValues(@RequestBody Map<String, Object> map) {
-        int i = modelService.putValueByEntityName(map, false);
+        SessionImpl session =(SessionImpl) sessionUtil.getSession();
+        int i = modelService.operationValueByEntityName(map,session,session::saveOrUpdate,modelService::validationAllRuleAndQuote);
         if (i == 0) {
             return ResultUtil.success("", "数据插入成功！");
         }
@@ -150,9 +156,10 @@ public class ModelController {
     @ApiOperation(value = "根据表名表插入数据")
     @PostMapping("/insertValueList")
     public ResponseEntity insertValueList(@RequestBody List<Map<String, Object>> mapList) {
-        int i = modelService.putValueByEntityNameList(mapList, false);
+        SessionImpl session =(SessionImpl) sessionUtil.getSession();
+        int i = modelService.operationValueByEntityNameList(mapList,session,session::saveOrUpdate,modelService::validationAllRuleAndQuote);
         if (i == 0) {
-            return ResultUtil.success("", "数据插入成功！");
+            return ResultUtil.success("", "数据删除成功！");
         }
         return ResultUtil.failed("模型类型不支持插入数据！");
     }
@@ -229,11 +236,12 @@ public class ModelController {
     @ApiOperation("删除接口")
     @PostMapping("/deleteValue")
     public ResponseEntity deleteValue(@RequestBody Map<String, Object> map) {
-        int i = modelService.putValueByEntityName(map, true);
+        SessionImpl session =(SessionImpl) sessionUtil.getSession();
+        int i = modelService.operationValueByEntityName(map,session,session::delete,null);
         if (i == 0) {
-            return ResultUtil.success("", "数据删除成功！");
+            return ResultUtil.success("", "数据插入成功！");
         }
-        return ResultUtil.failed("模型类型不支持删除数据！");
+        return ResultUtil.failed("模型类型不支持插入数据！");
     }
 
     @ApiOperation("字段类型")

src/main/java/com/tykj/datawarehouse/model/controller/QuoteController.java

@@ -30,13 +30,21 @@ public class QuoteController {
     @ApiOperation("引用删除")
     @GetMapping("/delete")
     public ResponseEntity deleteQuote(Integer id) {
-        return ResultUtil.success(quoteService.delQuote(id), "删除成功！");
+        Integer integer = quoteService.delQuote(id);
+        if (integer==1){
+            return ResultUtil.success("删除成功！");
+        }
+        return ResultUtil.failed("此id不存在，删除失败");
     }
 
     @ApiOperation("引用更新")
     @PostMapping("/update")
     public ResponseEntity UpdateQuote(@RequestBody UpdateQuoteVO updateQuoteVO) {
-        return ResultUtil.success(quoteService.updateQuote(updateQuoteVO), "更新成功！");
+        int i = quoteService.updateQuote(updateQuoteVO);
+        if (i==0){
+            return ResultUtil.success( "更新/保存成功！");
+        }
+       return ResultUtil.failed( "引用数据重复，导致更新/保存失败！");
     }
 
     @ApiOperation("查找所有引用")
@@ -44,10 +52,11 @@ public class QuoteController {
     public ResponseEntity getAllQuote(@RequestBody SearchQuoteVO searchQuoteVO) {
         return ResultUtil.success(quoteService.getAllQuote(searchQuoteVO), "查询成功！");
     }
+
     @ApiOperation("保存引用")
     @PostMapping("/saveQuote")
     public ResponseEntity saveQuote(@RequestBody Quote quote) {
-        return ResultUtil.success(quoteService.saveQuote(quote) ,"保存成功！");
+        return ResultUtil.success(quoteService.saveQuote(quote), "保存成功！");
     }
 
 }

src/main/java/com/tykj/datawarehouse/model/service/ModelService.java

 package com.tykj.datawarehouse.model.service;
 
 
+import com.tykj.datawarehouse.base.consumer.FourComsumer;
 import com.tykj.datawarehouse.model.entity.ColumnInfo;
 import com.tykj.datawarehouse.model.entity.TableInfo;
 import com.tykj.datawarehouse.model.entity.vo.*;
+import org.hibernate.internal.SessionImpl;
+import org.hibernate.type.Type;
 import org.springframework.data.domain.Page;
 import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Transactional;
@@ -11,6 +14,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.Map;
+import java.util.function.BiConsumer;
 
 /**
  * @ClassName ModelService
@@ -62,15 +66,15 @@ public interface ModelService {
      * @param map
      * @return
      */
-    int putValueByEntityName(Map<String, Object> map,Boolean isDelete);
-
-    /**
-     * 插入一组数据
-     * @param mapList
-     * @return
-     */
-    int putValueByEntityNameList(List<Map<String, Object>> mapList,Boolean isDelete);
-
+    int operationValueByEntityName(Map<String, Object> map,
+                                   SessionImpl session,
+                                   BiConsumer<String,Object> biConsumer,
+                                   FourComsumer<TableInfo, Object, Type, String > valitor);
+
+    int operationValueByEntityNameList(List<Map<String, Object>> mapList,
+                                       SessionImpl session,
+                                       BiConsumer<String,Object> biConsumer,
+                                       FourComsumer<TableInfo, Object, Type , String > valitor);
     /**
      * 根据表名查询所有
      *
@@ -88,7 +92,10 @@ public interface ModelService {
      * @param queryConditions
      * @return
      */
-    List<Map<String, Object>> complexQuery(String tableName, List<String> columnNames, List<QueryCondition> queryConditions,String groupName);
+    List<Map<String, Object>> complexQuery(String tableName,
+                                           List<String> columnNames,
+                                           List<QueryCondition> queryConditions,
+                                           String groupName);
 
     /**
      * 复杂查询（带分类）
@@ -97,7 +104,13 @@ public interface ModelService {
      * @param queryConditions
      * @return
      */
-    CustomPage complexQueryWithGroup(String tableName, GroupCondition groupCondition, List<String>columnNames, List<QueryCondition> queryConditions, String groupByColumn, Integer page, Integer size);
+    CustomPage complexQueryWithGroup(String tableName,
+                                     GroupCondition groupCondition,
+                                     List<String>columnNames,
+                                     List<QueryCondition> queryConditions,
+                                     String groupByColumn,
+                                     Integer page,
+                                     Integer size);
 
 
     /**
@@ -135,4 +148,8 @@ public interface ModelService {
      */
     List<Map<String, Object>> executeQuery(String sql) throws SQLException;
 
+
+
+    void validationAllRuleAndQuote(TableInfo tableInfo, Object value, Type propertyType, String propertyNames);
+
 }

src/main/java/com/tykj/datawarehouse/model/service/QuoteService.java

@@ -19,7 +19,7 @@ public interface QuoteService {
      * 更新quote
      * @param updateQuoteVO
      */
-    List<Quote> updateQuote(UpdateQuoteVO updateQuoteVO);
+    int updateQuote(UpdateQuoteVO updateQuoteVO);
 
     /**
      * 条件查询引用

src/main/java/com/tykj/datawarehouse/model/service/impl/ModelImpl.java

@@ -2,7 +2,7 @@ package com.tykj.datawarehouse.model.service.impl;
 
 import com.github.wenhao.jpa.PredicateBuilder;
 import com.github.wenhao.jpa.Specifications;
-import com.oscar.util.OSQLException;
+import com.tykj.datawarehouse.base.consumer.FourComsumer;
 import com.tykj.datawarehouse.base.result.ApiException;
 import com.tykj.datawarehouse.base.result.ResultUtil;
 import com.tykj.datawarehouse.model.dao.ColumnInfoDao;
@@ -35,13 +35,11 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.sql.SQLException;
-import java.sql.SQLNonTransientException;
-import java.sql.SQLSyntaxErrorException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.*;
+import java.util.function.BiConsumer;
 import java.util.stream.Collectors;
 
 import static com.tykj.datawarehouse.model.utils.CheckUtils.validationQuote;
@@ -107,7 +105,7 @@ public class ModelImpl implements ModelService {
 
     private PredicateBuilder<TableInfo> createPredicateBySearchTableInfoVo(SearchTableInfoVo stv) {
         PredicateBuilder<TableInfo> and = Specifications.and();
-        if ( !isNull(stv)) {
+        if (!isNull(stv)) {
             and.like(!isNull(stv.getModelName()) && isNotEmpty(stv.getModelName()), "modelName", "%" + stv.getModelName() + "%");
             and.like(!isNull(stv.getModelTitle()) && isNotEmpty(stv.getModelTitle()), "modelTitle", "%" + stv.getModelTitle() + "%");
             and.in(!isNull(stv.getModelType()) && stv.getModelType().length > 0, "modelType", stv.getModelType());
@@ -195,40 +193,31 @@ public class ModelImpl implements ModelService {
      * @Date 16:17 2021/3/5
      **/
     @Override
-    public int putValueByEntityName(Map<String, Object> map, Boolean isDelete) {
+    public int operationValueByEntityName(Map<String, Object> map,SessionImpl session, BiConsumer<String,Object> saveOrDelete,FourComsumer<TableInfo, Object, Type , String > valitor) {
+        session.getTransaction().begin();
         for (String tableName :
                 map.keySet()) {
-            SessionImpl session = (SessionImpl) sessionUtil.getSession();
-            session.getTransaction().begin();
             Object values = map.get(tableName);
             if (values instanceof Map) {
                 //插入数据
-                insertValue(tableName, (Map) values, session);
+                operationValue(tableName, (Map) values, session,saveOrDelete,valitor);
             }
-            try {
-                session.getTransaction().commit();
-            } catch (Exception e) {
-                //todo 等会捕捉一下
-                if (e.getMessage().contains("Batch update returned unexpected row count from")) {
-                    throw new ApiException("要操作对象的主键不存在");
-                }
-            } finally {
-                session.close();
+        }
+        try {
+            session.getTransaction().commit();
+        } catch (Exception e) {
+            //todo 等会捕捉一下
+            if (e.getMessage().contains("Batch update returned unexpected row count from")) {
+                throw new ApiException("要操作对象的主键不存在");
             }
+        } finally {
+            session.close();
         }
         return 0;
     }
 
-    /**
-     * @param mapList 数据集合[{"tableName":{"ID":1}},{"tableName":{"ID":2}}]
-     * @return int
-     * @Author WWW
-     * @Description 根据表名新增数据
-     * @Date 16:17 2021/3/5
-     **/
     @Override
-    public int putValueByEntityNameList(List<Map<String, Object>> mapList, Boolean isDelete) {
-        SessionImpl session = (SessionImpl) sessionUtil.getSession();
+    public int operationValueByEntityNameList(List<Map<String, Object>> mapList, SessionImpl session, BiConsumer<String, Object> biConsumer,FourComsumer<TableInfo, Object, Type , String > valitor) {
         session.getTransaction().begin();
         for (Map<String, Object> map : mapList) {
             for (String tableName :
@@ -236,7 +225,7 @@ public class ModelImpl implements ModelService {
                 Object values = map.get(tableName);
                 if (values instanceof Map) {
                     //插入数据
-                    insertValue(tableName, (Map) values, session);
+                    operationValue(tableName, (Map) values, session,biConsumer,valitor);
                 }
             }
         }
@@ -261,9 +250,8 @@ public class ModelImpl implements ModelService {
      * @Description 新增参数的方法
      * @Date 16:17 2021/3/5
      **/
-    public void insertValue(String tableName, Map map, SessionImpl session) {
+    public void operationValue(String tableName, Map map, SessionImpl session, BiConsumer<String,Object> saveOrDelete, FourComsumer<TableInfo, Object, Type , String > valitor) {
         TableInfo tableInfo = tableInfoDao.findByModelName(tableName);
-
         EntityPersister entityPersister = session.getEntityPersister(tableName, map);
         //主键类型推断
         String identifierPropertyName = entityPersister.getIdentifierPropertyName();
@@ -282,10 +270,11 @@ public class ModelImpl implements ModelService {
             //根据目标Type转换
             changeValueToTargetType(map, value, propertyType, propertyNames[i]);
             //验证
-            validationAllRuleAndQuote(tableInfo, value, propertyType, propertyNames[i]);
+            if (valitor!=null){
+                valitor.accept(tableInfo, value, propertyType, propertyNames[i]);
+            }
         }
-
-        session.saveOrUpdate(tableName, map);
+        saveOrDelete.accept(tableName,map);
     }
 
 
@@ -321,6 +310,7 @@ public class ModelImpl implements ModelService {
         }
         return new ArrayList<>();
     }
+
     @Override
     public List<Map<String, Object>> findAllByName(String name, List<OrderCondition> orderConditions) {
         StringBuilder sb = new StringBuilder();
@@ -333,7 +323,7 @@ public class ModelImpl implements ModelService {
             String sql = sb.substring(0, sb.toString().lastIndexOf(","));
             try {
                 return jdbcTemplate.queryForList("select * from  " + name + " order by " + sql);
-            }catch (Exception e){
+            } catch (Exception e) {
                 throw new ApiException("操作数据库失败，请联系管理员");
             }
         }
@@ -410,8 +400,7 @@ public class ModelImpl implements ModelService {
         for (String sql : sqls) {
             try {
                 jdbcTemplate.execute(sql);
-            }
-            catch (Exception exception) {
+            } catch (Exception exception) {
 
                 //todo
                 throw new ApiException("出错");
@@ -590,6 +579,7 @@ public class ModelImpl implements ModelService {
     }
 
 
+
     @Override
     public TableAndColumnInfoVO getTableInfoAndColumnInfoByBatch(Integer[] ids) {
         TableAndColumnInfoVO tableAndColumnInfoVO = new TableAndColumnInfoVO();
@@ -617,6 +607,7 @@ public class ModelImpl implements ModelService {
 
     }
 
+
     void changeValueToTargetType(Map map, Object value, Type propertyType, String propertyName) {
         // TimestampType
         if ("UPDATE_TIME".equals(propertyName)) {
@@ -670,7 +661,8 @@ public class ModelImpl implements ModelService {
         }
     }
 
-    void validationAllRuleAndQuote(TableInfo tableInfo, Object value, Type propertyType, String propertyNames) {
+    @Override
+    public void validationAllRuleAndQuote(TableInfo tableInfo, Object value, Type propertyType, String propertyNames) {
         if (propertyType instanceof StringType) {
             // 通过 tableInfo 的 Id  + columnName 为查询条件 查出 columnInfo
             ColumnInfo columnInfo = columnInfoDao.findByDbIdAndFieldName(tableInfo.getId(), propertyNames);

src/main/java/com/tykj/datawarehouse/model/service/impl/QuoteServiceImpl.java

@@ -32,13 +32,21 @@ public class QuoteServiceImpl implements QuoteService {
 
 
     @Override
-    public  List<Quote> updateQuote(UpdateQuoteVO updateQuoteVO) {
+    public int updateQuote(UpdateQuoteVO updateQuoteVO) {
         List<Quote> quoteList = updateQuoteVO.getQuoteList();
-        for (Quote quote : quoteList) {
-            quote.setColumnId(updateQuoteVO.getId());
-            quoteDao.save(quote);
+
+        try {
+            for (Quote quote : quoteList) {
+                quote.setColumnId(updateQuoteVO.getId());
+                if (existValue(quote.getColumnId(), quote.getValue())) {
+                    quoteDao.save(quote);
+                }
+            }
+            return 0;
+        }
+        catch (Exception e){
+            return 1;
         }
-        return new ArrayList<>();
     }
 
     @Override

src/main/java/com/tykj/datawarehouse/model/utils/CreateTableUtil.java

@@ -57,7 +57,7 @@ public class CreateTableUtil {
                 "<hibernate-mapping>\n" +
                 "    <class entity-name=\"" + tableVO.getModelName().toLowerCase().toUpperCase() + "\" table=\"" + tableVO.getModelName().toLowerCase().toUpperCase() + "\">\n";
 
-        xmlMapping += " <id name=\"id\" type=\"java.lang.Integer\" length=\"11\" unsaved-value=\"null\"  >\n" +
+        xmlMapping += " <id name=\"ID\" type=\"java.lang.Integer\" length=\"11\" unsaved-value=\"null\"  >\n" +
                 "  <generator  class=\"com.tykj.datawarehouse.base.entity.XMQGenerator\"  >\n" +
                 "<param name=\"sequence\">SEQUENCE_" + tableVO.getModelName().toLowerCase().toUpperCase() + "</param>" +
                 "</generator>" +