培训机构

src/main/java/com/izouma/wenlvju/domain/TrainingInstitution.java

@@ -1,6 +1,7 @@
 package com.izouma.wenlvju.domain;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -8,12 +9,15 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import java.math.BigDecimal;
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@Entity
+@ApiModel("培训机构")
 public class TrainingInstitution extends BaseEntity {
     @ApiModelProperty("企业名称")
     private String name;
@@ -35,7 +39,7 @@ public class TrainingInstitution extends BaseEntity {
     @ApiModelProperty(value = "法人姓名")
     private String privacyPolicy;
 
-    @ApiModelProperty(value = "企业联系方式")
+    @ApiModelProperty(value = "短信号码")
     private String phone;
 
     @ApiModelProperty(value = "企业联系方式")
@@ -56,28 +60,53 @@ public class TrainingInstitution extends BaseEntity {
     @ApiModelProperty(value = "培训点数量三楼及以下")
     private int trainingSite;
 
-    @ApiModelProperty(value = "培训点数量死楼及以上")
+    @ApiModelProperty(value = "培训点数量四楼及以上")
     private int trainingSiteFour;
 
     @ApiModelProperty(value = "总面积")
     private double area;
 
     @ApiModelProperty(value = "教室数量")
-    private int numberOfClassroom;
+    private int classroomNum;
 
-    @ApiModelProperty(value = "教师数量")
-    private int numberOfTeacher;
+    @ApiModelProperty(value = "教师总数")
+    private int teacherNum;
 
     @ApiModelProperty(value = "专职数量")
+    private int fullTimeNum;
+
+    @ApiModelProperty(value = "兼职数量")
+    private int partTimeNum;
+
+    @ApiModelProperty(value = "音乐类")
+    private int musicNum;
+
+    @ApiModelProperty(value = "舞蹈类")
+    private int danceNum;
+
+    @ApiModelProperty(value = "美术类")
+    private int artNum;
 
-    private long traningNum;
+    @ApiModelProperty(value = "戏剧戏曲")
+    private int theatreOperaNum;
 
+    @ApiModelProperty(value = "曲艺类")
+    private int folkMusicNum;
+
+    @ApiModelProperty(value = "有教师资格证")
+    private int qualificationNum;
+
+    @ApiModelProperty(value = "年培训人数")
+    private long traineesPerYearNum;
+
+    @ApiModelProperty(value = "是否是艺术水平考级考点")
     private boolean examPoint;
 
+    @ApiModelProperty(value = "艺术水平考级机构名称")
     private String gradingOrganization;
 
+    @Column(columnDefinition = "TEXT")
     @ApiModelProperty(value = "备注")
     private String remark;
 
-
 }

src/main/java/com/izouma/wenlvju/repo/TrainingInstitutionRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.wenlvju.repo;
+
+import com.izouma.wenlvju.domain.TrainingInstitution;
+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 TrainingInstitutionRepo extends JpaRepository<TrainingInstitution, Long>, JpaSpecificationExecutor<TrainingInstitution> {
+    @Query("update TrainingInstitution t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

src/main/java/com/izouma/wenlvju/service/TrainingInstitutionService.java

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

src/main/java/com/izouma/wenlvju/web/TrainingInstitutionController.java

@@ -0,0 +1,60 @@
+package com.izouma.wenlvju.web;
+import com.izouma.wenlvju.domain.TrainingInstitution;
+import com.izouma.wenlvju.service.TrainingInstitutionService;
+import com.izouma.wenlvju.dto.PageQuery;
+import com.izouma.wenlvju.exception.BusinessException;
+import com.izouma.wenlvju.repo.TrainingInstitutionRepo;
+import com.izouma.wenlvju.utils.ObjUtils;
+import com.izouma.wenlvju.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("/trainingInstitution")
+@AllArgsConstructor
+public class TrainingInstitutionController extends BaseController {
+    private TrainingInstitutionService trainingInstitutionService;
+    private TrainingInstitutionRepo trainingInstitutionRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public TrainingInstitution save(@RequestBody TrainingInstitution record) {
+        if (record.getId() != null) {
+            TrainingInstitution orig = trainingInstitutionRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return trainingInstitutionRepo.save(orig);
+        }
+        return trainingInstitutionRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<TrainingInstitution> all(@RequestBody PageQuery pageQuery) {
+        return trainingInstitutionService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public TrainingInstitution get(@PathVariable Long id) {
+        return trainingInstitutionRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        trainingInstitutionRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<TrainingInstitution> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/resources/application.yaml

@@ -15,9 +15,6 @@ spring:
         active: dev
     datasource:
         url: jdbc:mysql://mysql.izouma.com/exam_test?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
-#        url: jdbc:mysql://localhost:3306/exam_test?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
-#        username: root
-#        password: 123456
         username: microball
         password: 2wsx@WSX#EDC
         hikari:

src/main/vue/src/plugins/http.js

@@ -5,9 +5,9 @@ import qs from 'qs';
 let baseUrl = 'http://localhost:8080';
 switch (process.env.NODE_ENV) {
     case 'development':
-        // baseUrl = 'http://localhost:8080';
+        baseUrl = 'http://localhost:8080';
         // baseUrl = 'http://wljtest.izouma.com';
-        baseUrl = 'http://192.168.50.190:8080';
+        // baseUrl = 'http://192.168.50.190:8080';
         break;
     case 'test':
         baseUrl = 'http://localhost:8080';

src/main/vue/src/router.js

@@ -781,6 +781,24 @@ const router = new Router({
                     meta: {
                         title: '节目评审'
                     }
+                },
+                {
+                    path: '/trainingInstitutionEdit',
+                    name: 'TrainingInstitutionEdit',
+                    component: () =>
+                        import(/* webpackChunkName: "trainingInstitutionEdit" */ '@/views/TrainingInstitutionEdit.vue'),
+                    meta: {
+                        title: '培训机构编辑'
+                    }
+                },
+                {
+                    path: '/trainingInstitutionList',
+                    name: 'TrainingInstitutionList',
+                    component: () =>
+                        import(/* webpackChunkName: "trainingInstitutionList" */ '@/views/TrainingInstitutionList.vue'),
+                    meta: {
+                        title: '培训机构'
+                    }
                 }
                 /**INSERT_LOCATION**/
             ]

src/main/vue/src/views/TrainingInstitutionEdit.vue

@@ -0,0 +1,176 @@
+<template>
+    <div class="edit-view">
+        <el-form
+            :model="formData"
+            :rules="rules"
+            ref="form"
+            label-width="178px"
+            label-position="right"
+            size="small"
+            style="max-width: 500px;"
+        >
+            <el-form-item prop="name" label="企业名称">
+                <el-input v-model="formData.name"></el-input>
+            </el-form-item>
+            <el-form-item prop="usscc" label="注册号">
+                <el-input v-model="formData.usscc"></el-input>
+            </el-form-item>
+            <el-form-item prop="businessScope" label="经营范围">
+                <el-input type="textarea" v-model="formData.businessScope"></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="businessPremise" label="生产经营场所">
+                <el-input v-model="formData.businessPremise"></el-input>
+            </el-form-item>
+            <el-form-item prop="privacyPolicy" label="法人姓名">
+                <el-input v-model="formData.privacyPolicy"></el-input>
+            </el-form-item>
+            <el-form-item prop="phone" label="短信号码">
+                <el-input v-model="formData.phone"></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="district" label="所属管区">
+                <el-input v-model="formData.district"></el-input>
+            </el-form-item>
+            <el-form-item prop="registeredCapital" label="注册资本（万）">
+                <el-input-number type="number" v-model="formData.registeredCapital"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="category" label="单位性质">
+                <el-input v-model="formData.category"></el-input>
+            </el-form-item>
+            <el-form-item prop="specialty" label="专业种类">
+                <el-input v-model="formData.specialty"></el-input>
+            </el-form-item>
+            <el-form-item prop="trainingSite" label="培训点数量三楼及以下">
+                <el-input-number type="number" v-model="formData.trainingSite"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="trainingSiteFour" label="培训点数量四楼及以上">
+                <el-input-number type="number" v-model="formData.trainingSiteFour"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="area" label="总面积">
+                <el-input v-model="formData.area"></el-input>
+            </el-form-item>
+            <el-form-item prop="classroomNum" label="教室数量">
+                <el-input-number type="number" v-model="formData.classroomNum"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="teacherNum" label="教师总数">
+                <el-input-number type="number" v-model="formData.teacherNum"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="fullTimeNum" label="专职数量">
+                <el-input-number type="number" v-model="formData.fullTimeNum"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="partTimeNum" label="兼职数量">
+                <el-input-number type="number" v-model="formData.partTimeNum"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="musicNum" label="音乐类">
+                <el-input-number type="number" v-model="formData.musicNum"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="danceNum" label="舞蹈类">
+                <el-input-number type="number" v-model="formData.danceNum"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="artNum" label="美术类">
+                <el-input-number type="number" v-model="formData.artNum"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="theatreOperaNum" label="戏剧戏曲">
+                <el-input-number type="number" v-model="formData.theatreOperaNum"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="folkMusicNum" label="曲艺类">
+                <el-input-number type="number" v-model="formData.folkMusicNum"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="qualificationNum" label="有教师资格证">
+                <el-input-number type="number" v-model="formData.qualificationNum"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="traineesPerYearNum" label="年培训人数">
+                <el-input-number type="number" v-model="formData.traineesPerYearNum"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="examPoint" label="是否是艺术水平考级考点">
+                <el-input v-model="formData.examPoint"></el-input>
+            </el-form-item>
+            <el-form-item prop="gradingOrganization" label="艺术水平考级机构名称">
+                <el-input v-model="formData.gradingOrganization"></el-input>
+            </el-form-item>
+            <el-form-item prop="remark" label="备注">
+                <el-input v-model="formData.remark"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+                <el-button @click="onDelete" :loading="saving" type="danger" v-if="formData.id">删除 </el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+export default {
+    name: 'TrainingInstitutionEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('trainingInstitution/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: {}
+        };
+    },
+    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('/trainingInstitution/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.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/trainingInstitution/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/TrainingInstitutionList.vue

@@ -0,0 +1,184 @@
+<template>
+    <div class="list-view">
+        <div class="filters-container">
+            <el-input placeholder="输入关键字" v-model="search" clearable class="filter-item"></el-input>
+            <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">搜索 </el-button>
+            <el-button @click="addRow" type="primary" icon="el-icon-plus" class="filter-item">添加 </el-button>
+            <el-button
+                @click="download"
+                type="primary"
+                icon="el-icon-download"
+                :loading="downloading"
+                class="filter-item"
+                >导出EXCEL
+            </el-button>
+        </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"
+        >
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="80"> </el-table-column>
+            <el-table-column prop="name" label="企业名称"> </el-table-column>
+            <el-table-column prop="uscc" label="注册号"> </el-table-column>
+            <el-table-column prop="businessScope" label="经营范围"> </el-table-column>
+            <el-table-column prop="address" label="企业住所"> </el-table-column>
+            <el-table-column prop="businessPremise" label="生产经营场所"> </el-table-column>
+            <el-table-column prop="privacyPolicy" label="法人姓名"> </el-table-column>
+            <el-table-column prop="phone" label="短信号码"> </el-table-column>
+            <el-table-column prop="contactPhone" label="企业联系方式"> </el-table-column>
+            <el-table-column prop="district" label="所属管区"> </el-table-column>
+            <el-table-column prop="registeredCapital" label="注册资本（万）"> </el-table-column>
+            <el-table-column prop="category" label="单位性质"> </el-table-column>
+            <el-table-column prop="specialty" label="专业种类"> </el-table-column>
+            <el-table-column prop="trainingSite" label="培训点数量三楼及以下"> </el-table-column>
+            <el-table-column prop="trainingSiteFour" label="培训点数量四楼及以上"> </el-table-column>
+            <el-table-column prop="area" label="总面积"> </el-table-column>
+            <el-table-column prop="classroomNum" label="教室数量"> </el-table-column>
+            <el-table-column prop="teacherNum" label="教师总数"> </el-table-column>
+            <el-table-column prop="fullTimeNum" label="专职数量"> </el-table-column>
+            <el-table-column prop="partTimeNum" label="兼职数量"> </el-table-column>
+            <el-table-column prop="musicNum" label="音乐类"> </el-table-column>
+            <el-table-column prop="danceNum" label="舞蹈类"> </el-table-column>
+            <el-table-column prop="artNum" label="美术类"> </el-table-column>
+            <el-table-column prop="theatreOperaNum" label="戏剧戏曲"> </el-table-column>
+            <el-table-column prop="folkMusicNum" label="曲艺类"> </el-table-column>
+            <el-table-column prop="qualificationNum" label="有教师资格证"> </el-table-column>
+            <el-table-column prop="traineesPerYearNum" label="年培训人数"> </el-table-column>
+            <el-table-column prop="examPoint" label="是否是艺术水平考级考点"> </el-table-column>
+            <el-table-column prop="gradingOrganization" label="艺术水平考级机构名称"> </el-table-column>
+            <el-table-column prop="remark" label="备注"> </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" min-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: 'TrainingInstitutionList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/trainingInstitution/all',
+            downloading: false
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        beforeGetData() {
+            return { search: this.search };
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/trainingInstitutionEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/trainingInstitutionEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/trainingInstitution/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(`/trainingInstitution/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>

src/test/java/com/izouma/wenlvju/repo/UserRepoTest.java

@@ -74,7 +74,7 @@ public class UserRepoTest {
 
     @Test
     public void test3() {
-        System.out.println(jwtTokenUtil.generateToken(JwtUserFactory.create(userRepo.findById(15132L)
+        System.out.println(jwtTokenUtil.generateToken(JwtUserFactory.create(userRepo.findById(10130L)
                 .orElseThrow(new BusinessException("用户不存在")))));
     }