映射类型

api/.vscode/launch.json

@@ -16,9 +16,9 @@
             "-p 4600",
             "-f http://localhost:4600",
             // 研发
-            // "-g postgres://postgres:123@10.8.30.32:5432/orational_service",
+            "-g postgres://postgres:123@10.8.30.32:5432/orational_service",
             // 测试
-            "-g postgres://FashionAdmin:123456@10.8.30.156:5432/POMS",
+            // "-g postgres://FashionAdmin:123456@10.8.30.156:5432/POMS",
             "-k 10.8.30.72:29092,10.8.30.73:29092,10.8.30.74:29092",
             "--iotaProxy http://10.8.30.157:17007",
             "--redisHost 10.8.30.112",

api/app/lib/controllers/project/bind.js

@@ -7,7 +7,7 @@ async function bindAnxin2pep (ctx) {
       const models = ctx.fs.dc.models;
       const { clickHouse } = ctx.app.fs
       const { userId, pepUserId } = ctx.fs.api
-      const { bindId, name, pepProjectId, anxinProjectId = [], appId = [] } = ctx.request.body
+      const { bindId, name, pepProjectId, anxinProjectId = [], appId = [], mappingClass } = ctx.request.body
 
       if (name && pepProjectId) {
          throw '项企项目与自定义项目名称仅可选择一项'
@@ -18,7 +18,7 @@ async function bindAnxin2pep (ctx) {
 
       let storageData = {
          name, pepProjectId, anxinProjectId,
-         updateTime: now,
+         updateTime: now, mappingClass,
          del: false,
       }
 
@@ -111,6 +111,7 @@ async function bindAnxin2pep (ctx) {
                   },
                   transaction
                })
+               bindId_ = existRes.id
             } else {
                // 没有删除 重复添加
                throw '当前项企项目已绑定'

api/app/lib/models/project_correlation.js

@@ -78,6 +78,15 @@ module.exports = dc => {
       field: "update_time",
       autoIncrement: false
     },
+    mappingClass: {
+      type: DataTypes.STRING,
+      allowNull: true,
+      defaultValue: null,
+      comment: null,
+      primaryKey: false,
+      field: "mapping_class",
+      autoIncrement: false
+    },
   }, {
     tableName: "project_correlation",
     comment: "",

script/0.0.9/schema/1.alter_project_correlation.sql

@@ -0,0 +1,4 @@
+alter table project_correlation
+	add mapping_class varchar(32);
+
+comment on column project_correlation.mapping_class is '映射分类参数 例如：智慧类：wisdom，监测类：monitor，其他：other';

web/client/src/sections/install/components/systemModal.jsx

@@ -235,6 +235,29 @@ function adminModal (props) {
                            })
                         }
                      </Form.Select>
+                     <Form.Select
+                        label="添加映射分类:"
+                        field="mappingClass"
+                        multiple
+                        filter
+                        placeholder="请选择映射类型"
+                        style={{ width: 425 }}
+                        initValue={appArr || []}
+                        showClear
+                        renderSelectedItem={renderMultipleWithCustomTag}
+                     >
+                        {
+                           [
+                              { name: '智慧类', value: 'wisdom' },
+                              { name: '监测类', value: 'monitor' },
+                              { name: '其他', value: 'other' }
+                           ].map(item => {
+                              return <Form.Select.Option key={item.value} value={item.value}>
+                                 {item.name}
+                              </Form.Select.Option>
+                           })
+                        }
+                     </Form.Select>
                   </div>
                </Form>
             </div>