Преглед на файлове

增加 拓扑图 代理配置。

sybotan преди 4 години
родител
ревизия
0a8b831963
променени са 5 файла, в които са добавени 88 реда и са изтрити 48 реда
  1. 45 46
      docs/.vuepress/components/TableDesig.vue
  2. 10 1
      docs/.vuepress/config.js
  3. 8 1
      docs/dev/database/index.js
  4. 1 0
      docs/dev/database/labsl/README.md
  5. 24 0
      docs/dev/database/labsl/table.md

+ 45 - 46
docs/.vuepress/components/TableDesig.vue

@@ -3,19 +3,19 @@
     <el-button style="margin-top:10px" @click="genEntrty">生成实体类</el-button>
     <el-button style="margin-top:10px" @click="genControler">生成接口类</el-button>
     <el-table
-      :data="tableData.ColumnList"
+      :data="tableData.columnList"
       :header-cell-style="headerStyle"
       border
       stripe
       fit
       style="width: 100%;margin-top: 25px;"
     >
-      <el-table-column fixed prop="ColumnName" label="字段名" width="150"></el-table-column>
-      <el-table-column prop="Description" min-width="200" label="说明"></el-table-column>
-      <el-table-column prop="ColumnType" min-width="120" label="类型"></el-table-column>
-      <el-table-column prop="CharMaxLength" min-width="60" label="长度"></el-table-column>
-      <el-table-column prop="Nullable" align="center" label="不是 null"></el-table-column>
-      <el-table-column prop="Default" min-width="260" label="默认值"></el-table-column>
+      <el-table-column fixed prop="columnName" label="字段名" width="150"></el-table-column>
+      <el-table-column prop="description" min-width="200" label="说明"></el-table-column>
+      <el-table-column prop="columnType" min-width="120" label="类型"></el-table-column>
+      <el-table-column prop="charMaxLength" min-width="60" label="长度"></el-table-column>
+      <el-table-column prop="nullable" align="center" label="不是 null"></el-table-column>
+      <el-table-column prop="default" min-width="260" label="默认值"></el-table-column>
     </el-table>
   </div>
 </template>
@@ -67,16 +67,14 @@ export default {
       let strBuild = new SStringBuilder();
       const table = this.toHump(this.table);
       strBuild.append(
-        `package cn.sagacloud.server.datacenter.models.entities
+        `package com.persagy.server.models
 
-import cn.sagacloud.server.datacenter.models.entities.base.BaseInfo
-import cn.sagacloud.server.datacenter.models.entities.task.SchemeUtils
-import com.alibaba.fastjson.annotation.JSONField
-import com.sybotan.service.models.annotations.SCascade
+import com.persagy.service.models.SBaseEntity
 import io.swagger.annotations.ApiModel
 import io.swagger.annotations.ApiModelProperty
+import java.io.Serializable
+import java.util.*
 import javax.persistence.Column
-import javax.persistence.Id
 import javax.persistence.Table
 
 /**
@@ -84,28 +82,31 @@ import javax.persistence.Table
  *
  * @author  自动生成
  */
-@ApiModel(description = "资产信息实体类")
+@ApiModel(description = "${this.tableName}信息实体类")
 @Table(name = "${this.schema}.${this.table}")
-open class ${table} : BaseInfo(),Comparator<${table}> {
+open class ${table} : Serializable,SBaseEntity() {
 `
       );
-      this.tableData.ColumnList.forEach(element => {
-        strBuild.append(`    /** ${element.Description} */`);
-        if (element.Nullable == "YES") {
-          strBuild.append(
-            `    @ApiModelProperty(value = "${element.Description}")`
-          );
-        } else {
+      this.tableData.columnList.forEach(element => {
+        console.log(element)
+        if(element.columnName != "create_time" && element.columnName != "last_update") {
+          strBuild.append(`    /** ${element.description} */`);
+          if (element.nullable == "YES") {
+            strBuild.append(
+                    `    @ApiModelProperty(value = "${element.description}")`
+            );
+          } else {
+            strBuild.append(
+                    `    @ApiModelProperty(value = "${element.description}", required = true)`
+            );
+          }
+          strBuild.append(`    @Column(name = "${element.columnName}")`);
           strBuild.append(
-            `    @ApiModelProperty(value = "${element.Description}", required = true)`
+                  `    var ${this.toSmallHump(element.columnName)}: ${this.typeToName(
+                          element.columnType
+                  )}? = null\n`
           );
         }
-        strBuild.append(`    @Column(name = "${element.ColumnName}")`);
-        strBuild.append(
-          `    var ${this.toSmallHump(element.ColumnName)}: ${this.typeToName(
-            element.ColumnType
-          )}? = null\n`
-        );
       });
 
       strBuild.append(`} // Class ${table}`);
@@ -117,21 +118,19 @@ open class ${table} : BaseInfo(),Comparator<${table}> {
       this.getUrlData();
       let strBuild = new SStringBuilder();
       const className = `${this.toHump(this.table)}Controller`;
-      strBuild.append(`package cn.sagacloud.server.datacenter.controllers
+      strBuild.append(`package com.persagy.server.controller
 
-import cn.sagacloud.server.datacenter.models.entities.Property
-import cn.sagacloud.server.datacenter.services.${this.toHump(this.table)}Service
-import com.sybotan.base.extensions.toJson
-import com.sybotan.database.SFilter
-import com.sybotan.service.SPageContext
-import com.sybotan.service.models.requests.SCountRequest
-import com.sybotan.service.models.requests.SCreateRequest
-import com.sybotan.service.models.requests.SQueryRequest
-import com.sybotan.service.models.requests.SUpdateRequest
-import com.sybotan.service.models.responses.SBaseResponse
-import com.sybotan.service.models.responses.SCountResponse
-import com.sybotan.service.models.responses.SCreateResponse
-import com.sybotan.service.models.responses.SQueryResponse
+import com.persagy.mybatis.SMybatisDao
+import com.persagy.server.models.Test01
+import com.persagy.service.SObjectService
+import com.persagy.service.models.requests.SCountRequest
+import com.persagy.service.models.requests.SCreateRequest
+import com.persagy.service.models.requests.SQueryRequest
+import com.persagy.service.models.requests.SUpdateRequest
+import com.persagy.service.models.responses.SBaseResponse
+import com.persagy.service.models.responses.SCountResponse
+import com.persagy.service.models.responses.SCreateResponse
+import com.persagy.service.models.responses.SQueryResponse
 import io.swagger.annotations.Api
 import io.swagger.annotations.ApiOperation
 import org.slf4j.LoggerFactory
@@ -148,7 +147,7 @@ import org.springframework.web.bind.annotation.RestController
  */
 @Api(tags = ["${this.tableName}"])
 @RestController
-@RequestMapping("/object/${this.table}")
+@RequestMapping("/${this.table}")
 open class ${className} {
     companion object {
         /** 日志 */
@@ -157,7 +156,7 @@ open class ${className} {
 
 
     /** 服务 */
-    val service = SBaseService(SMybatisDao(${this.toHump(this.table)}::class.java))
+    val service = SObjectService(SMybatisDao(${this.toHump(this.table)}::class.java))
 
 
      /**
@@ -223,7 +222,7 @@ open class ${className} {
     @ApiOperation(value = "根据条件查询统计数量", notes = "")
     @PostMapping(value = ["/count"])
     fun count(@RequestBody request: SCountRequest): SCountResponse {
-        return servicee.count(request)
+        return service.count(request)
     } // Function count()
     `);
       strBuild.append(`} // Class ${className}`);

+ 10 - 1
docs/.vuepress/config.js

@@ -84,7 +84,8 @@ module.exports = {
                         text: "数据库设计",
                         items: [
                             { text: "数据中心", link: "/dev/database/data-center/" },
-                            { text: "系统图", link: "/dev/database/topo/" }
+                            { text: "系统图", link: "/dev/database/topo/" },
+                            { text: "蜡笔深林", link: "/dev/database/labsl/" }
                         ]
                     },
                     {
@@ -163,6 +164,14 @@ module.exports = {
                 pathRewrite: {
                     '^/datacenter': '',
                 }
+            },
+            '/labsl': {
+                target: 'http://60.205.177.43:8080/labsl',
+                changeOrigin: true,
+                secure: false,
+                pathRewrite: {
+                    '^/labsl': '',
+                }
             }
         }
     }

+ 8 - 1
docs/dev/database/index.js

@@ -1,5 +1,12 @@
 const content = [
     {
+        title: "蜡笔森林",
+        path: "/dev/database/labsl/",
+        children: [
+            ["/dev/database/labsl/table", "表设计"]
+        ]
+    },
+    {
         title: "数据中心",
         path: "/dev/database/data-center/",
         children: [
@@ -45,7 +52,7 @@ const content = [
             // ,
             // ["/dev/database/pointConfig/view", "视图设计"]
         ]
-    }
+    },
 ];
 
 module.exports = content;

+ 1 - 0
docs/dev/database/labsl/README.md

@@ -0,0 +1 @@
+# 蜡笔森林数据库设计

+ 24 - 0
docs/dev/database/labsl/table.md

@@ -0,0 +1,24 @@
+# 表设计
+
+## 测试表
+<TableDesig :sys="'labsl'" :schema="'test'" :table="'test01'":tableName="'测试表'"/>
+
+## 图 - graph
+
+<TableDesig :sys="'labsl'" :schema="'labsl'" :table="'graph'":tableName="'图'"/>
+
+## 对象 - node
+
+<TableDesig :sys="'labsl'" :schema="'labsl'" :table="'node'":tableName="'对象'"/>
+
+## 对象锚点信息表 - anchor
+
+<TableDesig :sys="'labsl'" :schema="'labsl'" :table="'anchor'":tableName="'对象锚点信息表'"/>
+
+## 关联关系表 - relation
+
+<TableDesig :sys="'labsl'" :schema="'labsl'" :table="'relation'" :tableName="'关联关系表'"/>
+
+
+
+