资产邮寄

src/main/java/com/izouma/nineth/domain/AssetPost.java

@@ -1,8 +1,19 @@
 package com.izouma.nineth.domain;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
-public class AssetPost extends BaseEntity{
+import javax.persistence.Entity;
+
+@Data
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("资产邮寄")
+public class AssetPost extends BaseEntity {
     private Long assetId;
 
     @ApiModelProperty("收货人")
@@ -14,5 +25,10 @@ public class AssetPost extends BaseEntity{
     @ApiModelProperty("收货地址")
     private String address;
 
+    @ApiModelProperty("快递")
+    private String courier;
+
+    @ApiModelProperty("快递单号")
+    private String courierId;
 
 }

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

@@ -0,0 +1,16 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.AssetPost;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface AssetPostRepo extends JpaRepository<AssetPost, Long>, JpaSpecificationExecutor<AssetPost> {
+    @Query("update AssetPost t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

src/main/java/com/izouma/nineth/service/AssetPostService.java

@@ -0,0 +1,20 @@
+package com.izouma.nineth.service;
+
+import com.izouma.nineth.domain.AssetPost;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.repo.AssetPostRepo;
+import com.izouma.nineth.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class AssetPostService {
+
+    private AssetPostRepo assetPostRepo;
+
+    public Page<AssetPost> all(PageQuery pageQuery) {
+        return assetPostRepo.findAll(JpaUtils.toSpecification(pageQuery, AssetPost.class), JpaUtils.toPageRequest(pageQuery));
+    }
+}

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

@@ -0,0 +1,60 @@
+package com.izouma.nineth.web;
+import com.izouma.nineth.domain.AssetPost;
+import com.izouma.nineth.service.AssetPostService;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.AssetPostRepo;
+import com.izouma.nineth.utils.ObjUtils;
+import com.izouma.nineth.utils.excel.ExcelUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/assetPost")
+@AllArgsConstructor
+public class AssetPostController extends BaseController {
+    private AssetPostService assetPostService;
+    private AssetPostRepo assetPostRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public AssetPost save(@RequestBody AssetPost record) {
+        if (record.getId() != null) {
+            AssetPost orig = assetPostRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return assetPostRepo.save(orig);
+        }
+        return assetPostRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<AssetPost> all(@RequestBody PageQuery pageQuery) {
+        return assetPostService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public AssetPost get(@PathVariable Long id) {
+        return assetPostRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        assetPostRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<AssetPost> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/resources/genjson/AssetPost.json

@@ -0,0 +1 @@
+{"tableName":"AssetPost","className":"AssetPost","remark":"邮寄衍生品","genTable":true,"genClass":true,"genList":true,"genForm":true,"genRouter":true,"javaPath":"/Users/qiufangchao/Desktop/project/modern_point/src/main/java/com/izouma/nineth","viewPath":"/Users/qiufangchao/Desktop/project/modern_point/src/main/vue/src/views","routerPath":"/Users/qiufangchao/Desktop/project/modern_point/src/main/vue/src","resourcesPath":"/Users/qiufangchao/Desktop/project/modern_point/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"assetId","modelName":"assetId","remark":"资产ID","showInList":true,"showInForm":true,"formType":"number"},{"name":"contactName","modelName":"contactName","remark":"收货人","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"contactPhone","modelName":"contactPhone","remark":"收货电话","showInList":true,"showInForm":true,"formType":"singleLineText","validate":true,"validatorType":"phone"},{"name":"address","modelName":"address","remark":"收货地址","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"courier","modelName":"courier","remark":"快递","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"courierId","modelName":"courierId","remark":"快递单号","showInList":true,"showInForm":true,"formType":"singleLineText"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.nineth","tablePackage":"com.izouma.nineth.domain.AssetPost"}

src/main/vue/src/router.js

@@ -438,7 +438,23 @@ const router = new Router({
                     meta: {
                         title: '转赠订单'
                     }
-                }
+                },
+                {
+                    path: '/assetPostEdit',
+                    name: 'AssetPostEdit',
+                    component: () => import(/* webpackChunkName: "assetPostEdit" */ '@/views/AssetPostEdit.vue'),
+                    meta: {
+                       title: '邮寄衍生品编辑',
+                    },
+                },
+                {
+                    path: '/assetPostList',
+                    name: 'AssetPostList',
+                    component: () => import(/* webpackChunkName: "assetPostList" */ '@/views/AssetPostList.vue'),
+                    meta: {
+                       title: '邮寄衍生品',
+                    },
+               }
                 /**INSERT_LOCATION**/
             ]
         },

src/main/vue/src/views/AssetPostEdit.vue

@@ -0,0 +1,122 @@
+<template>
+    <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>
+        </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="assetId" label="资产ID">
+                                    <el-input-number type="number" v-model="formData.assetId"></el-input-number>
+                        </el-form-item>
+                        <el-form-item prop="contactName" label="收货人">
+                                    <el-input v-model="formData.contactName"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="contactPhone" label="收货电话">
+                                    <el-input v-model="formData.contactPhone"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="address" label="收货地址">
+                                    <el-input v-model="formData.address"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="courier" label="快递">
+                                    <el-input v-model="formData.courier"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="courierId" label="快递单号">
+                                    <el-input v-model="formData.courierId"></el-input>
+                        </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>
+                        <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    export default {
+        name: 'AssetPostEdit',
+        created() {
+            if (this.$route.query.id) {
+                this.$http
+                    .get('assetPost/get/' + this.$route.query.id)
+                    .then(res => {
+                        this.formData = res;
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    });
+            }
+        },
+        data() {
+            return {
+                saving: false,
+                formData: {
+                },
+                rules: {
+                    contactPhone: [
+                        {
+                            pattern: /^1[3-9]\d{9}$/,
+                            message: "请输入正确的手机号",
+                            trigger: "blur"
+                        },
+                    ],
+                },
+            }
+        },
+        methods: {
+            onSave() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.submit();
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            submit() {
+                let data = {...this.formData};
+
+                this.saving = true;
+                this.$http
+                    .post('/assetPost/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(`/assetPost/del/${this.formData.id}`)
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                }).catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error((e || {}).error || '删除失败');
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped></style>

src/main/vue/src/views/AssetPostList.vue

@@ -0,0 +1,178 @@
+<template>
+    <div  class="list-view">
+        <page-title>
+            <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>
+        </page-title>
+        <div class="filters-container">
+            <el-input
+                    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="assetId" label="资产ID"
+>
+                    </el-table-column>
+                    <el-table-column prop="contactName" label="收货人"
+>
+                    </el-table-column>
+                    <el-table-column prop="contactPhone" label="收货电话"
+>
+                    </el-table-column>
+                    <el-table-column prop="address" label="收货地址"
+>
+                    </el-table-column>
+                    <el-table-column prop="courier" label="快递"
+>
+                    </el-table-column>
+                    <el-table-column prop="courierId" 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>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <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>
+        </div>
+
+    </div>
+</template>
+<script>
+    import { mapState } from "vuex";
+    import pageableTable from "@/mixins/pageableTable";
+
+    export default {
+        name: 'AssetPostList',
+        mixins: [pageableTable],
+        data() {
+            return {
+                multipleMode: false,
+                search: "",
+                url: "/assetPost/all",
+                downloading: false,
+            }
+        },
+        computed: {
+            selection() {
+                return this.$refs.table.selection.map(i => i.id);
+            }
+        },
+        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: "/assetPostEdit",
+                    query: {
+                        ...this.$route.query
+                    }
+                });
+            },
+            editRow(row) {
+                this.$router.push({
+                    path: "/assetPostEdit",
+                    query: {
+                    id: row.id
+                    }
+                });
+            },
+            download() {
+                this.downloading = true;
+                this.$axios
+                    .get("/assetPost/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
+                });
+            },
+            operation2() {
+                this.$message('操作2');
+            },
+            deleteRow(row) {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post(`/assetPost/del/${row.id}`)
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                }).catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>