物体配置

src/main/java/com/izouma/nineth/repo/MetaObjectMoveRepo.java

@@ -1,6 +1,7 @@
 package com.izouma.nineth.repo;
 
 import com.izouma.nineth.domain.MetaObjectMove;
+import com.izouma.nineth.domain.MetaResourceVersion;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
@@ -15,4 +16,7 @@ public interface MetaObjectMoveRepo extends JpaRepository<MetaObjectMove, Long>,
     void softDelete(Long id);
 
     MetaObjectMove findByObjectIdAndDel(Long objectId, boolean del);
+
+    @Query(value = "select * from meta_object_move a where a.object_id like ?1 and a.del = false", nativeQuery = true)
+    MetaObjectMove findByObjectId(Long objectId);
 }

src/main/java/com/izouma/nineth/web/MetaObjectMoveController.java

@@ -34,10 +34,9 @@ public class MetaObjectMoveController extends BaseController {
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
     public MetaObjectMove save(@RequestBody MetaObjectMove record) {
-        if (record.getId() != null) {
-            MetaObjectMove orig = metaObjectMoveRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
-            ObjUtils.merge(orig, record);
-            return metaObjectMoveRepo.save(orig);
+        MetaObjectMove metaObjectMove = metaObjectMoveRepo.findByObjectId(record.getObjectId());
+        if (Objects.nonNull(metaObjectMove)) {
+            throw new BusinessException("当前物体id已经存在");
         }
         return metaObjectMoveRepo.save(record);
     }

src/main/vue/src/views/MetaObjectMoveEdit.vue

@@ -2,29 +2,136 @@
     <div class="edit-view">
         <page-title>
             <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
-            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-                删除
-            </el-button>
-            <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+            <template v-if="canEdit">
+                <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+            </template>
         </page-title>
         <div class="edit-view__content-wrapper">
             <div class="edit-view__content-section">
-                <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right"
-                         size="small"
-                         style="max-width: 500px;">
-                        <el-form-item prop="ObjectId" label="物体id">
-                                    <el-input-number type="number" v-model="formData.ObjectId"></el-input-number>
-                        </el-form-item>
-                        <el-form-item prop="metaObjectMoveCoordinateDTOS" label="坐标配置">
-                                    <el-input v-model="formData.metaObjectMoveCoordinateDTOS"></el-input>
-                        </el-form-item>
+                <el-form
+                    :model="formData"
+                    :rules="rules"
+                    ref="form"
+                    label-width="80px"
+                    label-position="right"
+                    size="small"
+                    style="max-width: 500px;"
+                >
+                    <el-form-item prop="objectId" label="物体id">
+                        <el-input v-model="formData.objectId" :disabled="!canEdit"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="startTime" label="开始时间">
+                        <el-date-picker
+                            v-model="formData.startTime"
+                            type="datetime"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            placeholder="请选择日期时间"
+                            :disabled="!canEdit"
+                        ></el-date-picker>
+                    </el-form-item>
+
+                    <el-form-item
+                        prop="metaObjectMoveCoordinateDTOS"
+                        label="坐标配置"
+                        style="width: calc(100vw - 450px)"
+                        size="mini"
+                    >
+                        <el-table :data="formData.metaObjectMoveCoordinateDTOS">
+                            <el-table-column prop="axisX" label="axisX" align="center">
+                                <template v-slot="{ row }">
+                                    <el-input
+                                        v-model="row.axisX"
+                                        style="width: 120px"
+                                        placeholder="请输入axisX"
+                                        :disabled="!canEdit"
+                                    >
+                                    </el-input>
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="axisY" label="axisY" align="center">
+                                <template v-slot="{ row }">
+                                    <el-input
+                                        v-model="row.axisY"
+                                        style="width: 120px"
+                                        placeholder="请输入axisY"
+                                        :disabled="!canEdit"
+                                    >
+                                    </el-input>
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="axisZ" label="axisZ" align="center">
+                                <template v-slot="{ row }">
+                                    <el-input
+                                        v-model="row.axisZ"
+                                        style="width: 120px"
+                                        placeholder="请输入axisZ"
+                                        :disabled="!canEdit"
+                                    >
+                                    </el-input>
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="eulerX" label="eulerX" align="center">
+                                <template v-slot="{ row }">
+                                    <el-input
+                                        v-model="row.eulerX"
+                                        style="width: 120px"
+                                        placeholder="请输入eulerX"
+                                        :disabled="!canEdit"
+                                    >
+                                    </el-input>
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="eulerY" label="eulerY" align="center">
+                                <template v-slot="{ row }">
+                                    <el-input
+                                        v-model="row.eulerY"
+                                        style="width: 120px"
+                                        placeholder="请输入eulerY"
+                                        :disabled="!canEdit"
+                                    >
+                                    </el-input>
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="eulerZ" label="eulerZ" align="center">
+                                <template v-slot="{ row }">
+                                    <el-input
+                                        v-model="row.eulerZ"
+                                        style="width: 120px"
+                                        placeholder="请输入eulerZ"
+                                        :disabled="!canEdit"
+                                    >
+                                    </el-input>
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="time" label="time" align="center">
+                                <template v-slot="{ row }">
+                                    <el-input
+                                        v-model="row.time"
+                                        style="width: 120px"
+                                        placeholder="请输入time"
+                                        :disabled="!canEdit"
+                                    >
+                                    </el-input>
+                                </template>
+                            </el-table-column>
+                            <el-table-column width="80" align="center" v-if="canEdit">
+                                <template v-slot="{ row, $index }">
+                                    <el-button type="danger" plain size="mini" @click="delAward($index)">
+                                        删除
+                                    </el-button>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                    </el-form-item>
+                    <el-form-item v-if="canEdit">
+                        <el-button size="mini" @click="add"> 添加坐标配置 </el-button>
+                    </el-form-item>
                     <el-form-item class="form-submit">
-                        <el-button @click="onSave" :loading="saving" type="primary">
-                            保存
-                        </el-button>
-                        <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
-                            删除
-                        </el-button>
+                        <template v-if="canEdit">
+                            <el-button @click="onSave" :loading="saving" type="primary">
+                                保存
+                            </el-button>
+                        </template>
                         <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
                     </el-form-item>
                 </el-form>
@@ -33,71 +140,195 @@
     </div>
 </template>
 <script>
-    export default {
-        name: 'MetaObjectMoveEdit',
-        created() {
-            if (this.$route.query.id) {
-                this.$http
-                    .get('metaObjectMove/get/' + this.$route.query.id)
-                    .then(res => {
-                        this.formData = res;
-                    })
-                    .catch(e => {
-                        console.log(e);
-                        this.$message.error(e.error);
-                    });
+import { reg } from '../util/regRules';
+export default {
+    name: 'MetaObjectMoveEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('metaObjectMove/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+    },
+    computed: {
+        canEdit() {
+            return !!!this.$route.query.id;
+        }
+    },
+    data() {
+        return {
+            reg,
+            saving: false,
+            formData: {
+                metaObjectMoveCoordinateDTOS: []
+            },
+            rules: {
+                objectId: [
+                    {
+                        required: true,
+                        message: '请输入物体id',
+                        trigger: 'blur'
+                    }
+                ],
+                startTime: [
+                    {
+                        required: true,
+                        message: '请选择开始移动时间',
+                        trigger: 'blur'
+                    }
+                ],
+                metaObjectMoveCoordinateDTOS: [
+                    {
+                        required: true,
+                        validator: (rule, value, callback) => {
+                            if (value) {
+                                if (!(value instanceof Array)) {
+                                    callback(new Error('metaObjectMoveCoordinateDTOS must be array!'));
+                                    return;
+                                } else {
+                                    if (value.length < 2) {
+                                        callback(new Error('坐标配置必须大于2条'));
+                                        return;
+                                    }
+                                    for (let i = 0; i < value.length; i++) {
+                                        if (
+                                            value[i].axisX === '' ||
+                                            value[i].axisX === undefined ||
+                                            value[i].axisX === null
+                                        ) {
+                                            callback(new Error('请填写axisX'));
+                                            return;
+                                        }
+                                        if (
+                                            value[i].axisY === '' ||
+                                            value[i].axisY === undefined ||
+                                            value[i].axisY === null
+                                        ) {
+                                            callback(new Error('请填写axisY'));
+                                            return;
+                                        }
+                                        if (
+                                            value[i].axisZ === '' ||
+                                            value[i].axisZ === undefined ||
+                                            value[i].axisZ === null
+                                        ) {
+                                            callback(new Error('请填写axisZ'));
+                                            return;
+                                        }
+                                        if (
+                                            value[i].eulerX === '' ||
+                                            value[i].eulerX === undefined ||
+                                            value[i].eulerX === null
+                                        ) {
+                                            callback(new Error('请填写eulerX'));
+                                            return;
+                                        }
+                                        if (
+                                            value[i].eulerY === '' ||
+                                            value[i].eulerY === undefined ||
+                                            value[i].eulerY === null
+                                        ) {
+                                            callback(new Error('请填写eulerY'));
+                                            return;
+                                        }
+                                        if (
+                                            value[i].eulerZ === '' ||
+                                            value[i].eulerZ === undefined ||
+                                            value[i].eulerZ === null
+                                        ) {
+                                            callback(new Error('请填写eulerZ'));
+                                            return;
+                                        }
+                                        if (
+                                            value[i].time === '' ||
+                                            value[i].time === undefined ||
+                                            value[i].time === null
+                                        ) {
+                                            callback(new Error('请填写time'));
+                                            return;
+                                        }
+                                        if (i === 0) {
+                                            if (value[i].time !== '0') {
+                                                callback(new Error('time必须从0开始'));
+                                                return;
+                                            }
+                                        } else {
+                                            if (!this.reg.test(value[i].time)) {
+                                                callback(new Error('除起点以外，到达其他坐标时间必须为大于1的整数'));
+                                                return;
+                                            }
+                                            if (value[i].time <= value[i - 1].time) {
+                                                callback(new Error('时间必须为递增'));
+                                                return;
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                            callback();
+                        },
+                        trigger: 'blur'
+                    }
+                ]
             }
+        };
+    },
+    methods: {
+        add() {
+            this.formData.metaObjectMoveCoordinateDTOS.push({});
         },
-        data() {
-            return {
-                saving: false,
-                formData: {
-                },
-                rules: {
-                },
-            }
+        delAward(i) {
+            this.formData.metaObjectMoveCoordinateDTOS.splice(i, 1);
         },
-        methods: {
-            onSave() {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        this.submit();
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            submit() {
-                let data = {...this.formData};
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
 
-                this.saving = true;
-                this.$http
-                    .post('/metaObjectMove/save', data, {body: 'json'})
-                    .then(res => {
-                        this.saving = false;
-                        this.$message.success('成功');
-                        this.$router.go(-1);
-                    })
-                    .catch(e => {
-                        console.log(e);
-                        this.saving = false;
-                        this.$message.error(e.error);
-                    });
-            },
-            onDelete() {
-                this.$confirm('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
-                    return this.$http.post(`/metaObjectMove/del/${this.formData.id}`)
-                }).then(() => {
+            this.saving = true;
+            this.$http
+                .post('/metaObjectMove/save', data, { body: 'json' })
+                .then(res => {
+                    this.saving = false;
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.saving = false;
+                    this.$message.error(e.error);
+                });
+        },
+        onDelete() {
+            this.$confirm('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/metaObjectMove/del/${this.formData.id}`);
+                })
+                .then(() => {
                     this.$message.success('删除成功');
                     this.$router.go(-1);
-                }).catch(e => {
+                })
+                .catch(e => {
                     if (e !== 'cancel') {
                         console.log(e);
                         this.$message.error((e || {}).error || '删除失败');
                     }
-                })
-            },
+                });
         }
     }
+};
 </script>
 <style lang="less" scoped></style>

src/main/vue/src/views/MetaObjectMoveList.vue

@@ -1,47 +1,64 @@
 <template>
-    <div  class="list-view">
+    <div class="list-view">
         <page-title>
-            <el-button @click="addRow" type="primary" icon="el-icon-plus" :disabled="fetchingData || downloading" class="filter-item">
+            <el-button
+                @click="addRow"
+                type="primary"
+                icon="el-icon-plus"
+                :disabled="fetchingData || downloading"
+                class="filter-item"
+            >
                 新增
             </el-button>
-            <el-button @click="download" icon="el-icon-upload2" :loading="downloading" :disabled="fetchingData" class="filter-item">
+            <el-button
+                @click="download"
+                icon="el-icon-upload2"
+                :loading="downloading"
+                :disabled="fetchingData"
+                class="filter-item"
+            >
                 导出
             </el-button>
         </page-title>
         <div class="filters-container">
             <el-input
-                    placeholder="搜索..."
-                    v-model="search"
-                    clearable
-                    class="filter-item search"
-                    @keyup.enter.native="getData"
+                placeholder="搜索..."
+                v-model="search"
+                clearable
+                class="filter-item search"
+                @keyup.enter.native="getData"
             >
                 <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
             </el-input>
         </div>
-        <el-table :data="tableData" row-key="id" ref="table"
-                  header-row-class-name="table-header-row"
-                  header-cell-class-name="table-header-cell"
-                  row-class-name="table-row" cell-class-name="table-cell"
-                  :height="tableHeight" v-loading="fetchingData">
-            <el-table-column v-if="multipleMode" align="center" type="selection"
-                             width="50">
-            </el-table-column>
-            <el-table-column prop="id" label="ID" width="100">
-            </el-table-column>
-                                <el-table-column prop="ObjectId" label="物体id"
->
-                    </el-table-column>
-                    <el-table-column prop="metaObjectMoveCoordinateDTOS" label="坐标配置"
->
-                    </el-table-column>
-            <el-table-column
-                    label="操作"
-                    align="center"
-                    fixed="right"
-                    width="150">
-                <template slot-scope="{row}">
-                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+        <el-table
+            :data="tableData"
+            row-key="id"
+            ref="table"
+            header-row-class-name="table-header-row"
+            header-cell-class-name="table-header-cell"
+            row-class-name="table-row"
+            cell-class-name="table-cell"
+            :height="tableHeight"
+            v-loading="fetchingData"
+        >
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="100"> </el-table-column>
+            <el-table-column prop="objectId" label="物体id"> </el-table-column>
+            <!-- <el-table-column prop="metaObjectMoveCoordinateDTOS" label="坐标配置">
+                <template v-slot="{ row }">
+                    <template v-if="row.metaObjectMoveCoordinateDTOS">
+                        <div v-for="item in row.metaObjectMoveCoordinateDTOS" :key="item.index">
+                            axisX: {{ item.axisX }},axisX: {{ item.axisX }},axisX: {{ item.axisX }},axisX:
+                            {{ item.axisX }},axisX: {{ item.axisX }},axisX: {{ item.axisX }},axisX: {{ item.axisX }}
+                        </div>
+                    </template>
+                </template>
+            </el-table-column> -->
+            <el-table-column prop="startTime" label="物体开始移动时间"> </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" width="150">
+                <template slot-scope="{ row }">
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>查看</el-button>
                     <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
                 </template>
             </el-table-column>
@@ -55,112 +72,116 @@
                     <el-button @click="toggleMultipleMode(false)">取消</el-button>
                 </el-button-group>
             </div> -->
-            <el-pagination background @size-change="onSizeChange"
-                           @current-change="onCurrentChange" :current-page="page"
-                           :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize"
-                           layout="total, sizes, prev, pager, next, jumper"
-                           :total="totalElements">
+            <el-pagination
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements"
+            >
             </el-pagination>
         </div>
-
     </div>
 </template>
 <script>
-    import { mapState } from "vuex";
-    import pageableTable from "@/mixins/pageableTable";
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
 
-    export default {
-        name: 'MetaObjectMoveList',
-        mixins: [pageableTable],
-        data() {
-            return {
-                multipleMode: false,
-                search: "",
-                url: "/metaObjectMove/all",
-                downloading: false,
-            }
+export default {
+    name: 'MetaObjectMoveList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/metaObjectMove/all',
+            downloading: false
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        beforeGetData() {
+            return { search: this.search, query: { del: false } };
         },
-        computed: {
-            selection() {
-                return this.$refs.table.selection.map(i => i.id);
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
             }
         },
-        methods: {
-            beforeGetData() {
-                return { search: this.search, query: { del: false } };
-            },
-            toggleMultipleMode(multipleMode) {
-                this.multipleMode = multipleMode;
-                if (!multipleMode) {
-                    this.$refs.table.clearSelection();
+        addRow() {
+            this.$router.push({
+                path: '/metaObjectMoveEdit',
+                query: {
+                    ...this.$route.query
                 }
-            },
-            addRow() {
-                this.$router.push({
-                    path: "/metaObjectMoveEdit",
-                    query: {
-                        ...this.$route.query
-                    }
-                });
-            },
-            editRow(row) {
-                this.$router.push({
-                    path: "/metaObjectMoveEdit",
-                    query: {
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/metaObjectMoveEdit',
+                query: {
                     id: row.id
-                    }
-                });
-            },
-            download() {
-                this.downloading = true;
-                this.$axios
-                    .get("/metaObjectMove/excel", { 
-                        responseType: "blob",
-                        params: { size: 10000 }
-                    })
-                    .then(res => {
-                        console.log(res);
-                        this.downloading = false;
-                        const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
-                        const link = document.createElement("a");
-                        link.href = downloadUrl;
-                        link.setAttribute(
-                            "download",
-                            res.headers["content-disposition"].split("filename=")[1]
-                        );
-                        document.body.appendChild(link);
-                        link.click();
-                        link.remove();
-                    })
-                    .catch(e => {
-                        console.log(e);
-                        this.downloading = false;
-                        this.$message.error(e.error);
-                    });
-            },
-            operation1() {
-                this.$notify({
-                    title: '提示',
-                    message: this.selection
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/metaObjectMove/excel', {
+                    responseType: 'blob',
+                    params: { size: 10000 }
+                })
+                .then(res => {
+                    console.log(res);
+                    this.downloading = false;
+                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                    const link = document.createElement('a');
+                    link.href = downloadUrl;
+                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+                    document.body.appendChild(link);
+                    link.click();
+                    link.remove();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.downloading = false;
+                    this.$message.error(e.error);
                 });
-            },
-            operation2() {
-                this.$message('操作2');
-            },
-            deleteRow(row) {
-                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
-                    return this.$http.post(`/metaObjectMove/del/${row.id}`)
-                }).then(() => {
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/metaObjectMove/del/${row.id}`);
+                })
+                .then(() => {
                     this.$message.success('删除成功');
                     this.getData();
-                }).catch(e => {
+                })
+                .catch(e => {
                     if (e !== 'cancel') {
                         this.$message.error(e.error);
                     }
-                })
-            },
+                });
         }
     }
+};
 </script>
 <style lang="less" scoped>
 </style>