[] 修改id生成策略的路径

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

@@ -70,8 +70,7 @@ public class ModelController {
     @ApiOperation("得到所有数据表信息")
     @PostMapping("/getAllEntity")
     public ResponseEntity getAllEntity(@RequestBody SearchTableInfoVo searchTableInfoVo) {
-        Page<TableInfo> tableInfos;
-        tableInfos = modelService.pageAllEntities(searchTableInfoVo);
+        Page<TableInfo> tableInfos = modelService.pageAllEntities(searchTableInfoVo);
         return ResultUtil.success(tableInfos, "数据查询成功！");
     }
     /**
@@ -171,14 +170,16 @@ public class ModelController {
 
 
     /**
-     * @param complexQueryVo
+     * @param cqv
      * @return 复杂查询
      */
     @ApiOperation("复杂查询")
     @PostMapping("/complexQuery")
-    public ResponseEntity complexQuery(@RequestBody complexQueryVo complexQueryVo) {
-        List list = modelService.complexQuery(complexQueryVo.getTableName(), complexQueryVo.getColumnNames(), complexQueryVo.getQueryConditions(), complexQueryVo.getGroupByColumn()
-        );
+    public ResponseEntity complexQuery(@RequestBody complexQueryVo cqv) {
+        List list = modelService.complexQuery(cqv.getTableName(),
+                cqv.getColumnNames(),
+                cqv.getQueryConditions(),
+                cqv.getGroupByColumn());
         if (list != null) {
             return ResultUtil.success(list, "查询成功!");
         }
@@ -186,13 +187,13 @@ public class ModelController {
     }
 
     /**
-     * @param complexQueryVo
+     * @param cqv
      * @return 复杂查询
      */
     @ApiOperation("复杂查询(分类)")
     @PostMapping("/complexQuery/group")
-    public ResponseEntity complexQueryWithGroup(@RequestBody complexQueryVo complexQueryVo) {
-      CustomPage customPage = modelService.complexQueryWithGroup(complexQueryVo.getTableName(), complexQueryVo.getGroupCondition(), complexQueryVo.getColumnNames(), complexQueryVo.getQueryConditions(), complexQueryVo.getGroupByColumn(), complexQueryVo.getPage(), complexQueryVo.getSize());
+    public ResponseEntity complexQueryWithGroup(@RequestBody complexQueryVo cqv) {
+      CustomPage customPage = modelService.complexQueryWithGroup(cqv.getTableName(), cqv.getGroupCondition(), cqv.getColumnNames(), cqv.getQueryConditions(), cqv.getGroupByColumn(), cqv.getPage(), cqv.getSize());
         if (customPage.getContents() != null) {
             return ResultUtil.success(customPage, "查询成功!");
         }

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

@@ -161,7 +161,7 @@ public class ModelImpl implements ModelService {
         tableInfoDao.save(tableInfo);
         //构建字段
         //默认存储ID字段
-        ColumnInfo cId = new ColumnInfo(0, "id", "主键", "java.lang.Integer", 11, tableInfo.getModelName().toUpperCase(), tableInfo.getId(), "主键");
+        ColumnInfo cId = new ColumnInfo(0, "ID", "主键", "java.lang.Integer", 11, tableInfo.getModelName().toUpperCase(), tableInfo.getId(), "主键");
         columnInfoDao.save(cId);
         for (ColumnVO columnVO : dataList) {
             ColumnInfo columnInfo = new ColumnInfo(

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

@@ -59,7 +59,7 @@ public class CreateTableUtil {
                 "    <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" +
-                "  <generator  class=\"com.tykj.datawarehouse.base.entity.XMQGenerator\"  >\n" +
+                "  <generator  class=\"com.tykj.base.entity.XMQGenerator\"  >\n" +
                 "<param name=\"sequence\">SEQUENCE_" + tableVO.getModelName().toLowerCase().toUpperCase() + "</param>" +
                 "</generator>" +
                 "        </id>\n";

src/main/resources/application.yml

@@ -3,7 +3,7 @@ spring:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
   datasource:
-    username: punish
+    username: ANNUAL_PERFORMANCE_EVALUATION_INDEX_SYSTEM
     password: 123456
     url: jdbc:oscar://192.168.102.200:2003/OSRDB
     driver-class-name: com.oscar.Driver
@@ -23,4 +23,4 @@ spring:
     database-platform: org.hibernate.dialect.OscarDialect
 
 server:
-  port: 8089
\ No newline at end of file
+  port: 8088
\ No newline at end of file