drew 6 yıl önce
ebeveyn
işleme
44380cc139
32 değiştirilmiş dosya ile 1653 ekleme ve 16 silme
  1. 4 0
      src/main/java/com/izouma/awesomeAdmin/domain/AccessRecord.java
  2. 26 0
      src/main/java/com/izouma/awesomeAdmin/domain/Area.java
  3. 3 1
      src/main/java/com/izouma/awesomeAdmin/domain/BaseEntity.java
  4. 34 0
      src/main/java/com/izouma/awesomeAdmin/domain/Building.java
  5. 25 0
      src/main/java/com/izouma/awesomeAdmin/domain/Department.java
  6. 45 0
      src/main/java/com/izouma/awesomeAdmin/domain/Device.java
  7. 47 0
      src/main/java/com/izouma/awesomeAdmin/domain/Floor.java
  8. 55 0
      src/main/java/com/izouma/awesomeAdmin/domain/Staff.java
  9. 42 0
      src/main/java/com/izouma/awesomeAdmin/domain/Vehicle.java
  10. 18 0
      src/main/java/com/izouma/awesomeAdmin/enums/DeviceType.java
  11. 16 0
      src/main/java/com/izouma/awesomeAdmin/enums/DoorDirection.java
  12. 8 0
      src/main/java/com/izouma/awesomeAdmin/repo/AreaRepo.java
  13. 8 0
      src/main/java/com/izouma/awesomeAdmin/repo/BuildingRepo.java
  14. 8 0
      src/main/java/com/izouma/awesomeAdmin/repo/FloorRepo.java
  15. 14 0
      src/main/java/com/izouma/awesomeAdmin/service/AreaService.java
  16. 14 0
      src/main/java/com/izouma/awesomeAdmin/service/BuildingService.java
  17. 14 0
      src/main/java/com/izouma/awesomeAdmin/service/FloorService.java
  18. 60 0
      src/main/java/com/izouma/awesomeAdmin/web/AreaController.java
  19. 2 7
      src/main/java/com/izouma/awesomeAdmin/web/AuthorityController.java
  20. 60 0
      src/main/java/com/izouma/awesomeAdmin/web/BuildingController.java
  21. 60 0
      src/main/java/com/izouma/awesomeAdmin/web/FloorController.java
  22. 1 0
      src/main/resources/genjson/Area.json
  23. 1 0
      src/main/resources/genjson/Building.json
  24. 1 0
      src/main/resources/genjson/Floor.json
  25. 2 7
      src/main/resources/templates/ListViewTemplate.ftl
  26. 65 1
      src/main/vue/src/router.js
  27. 98 0
      src/main/vue/src/views/AreaEdit.vue
  28. 210 0
      src/main/vue/src/views/AreaList.vue
  29. 129 0
      src/main/vue/src/views/BuildingEdit.vue
  30. 211 0
      src/main/vue/src/views/BuildingList.vue
  31. 160 0
      src/main/vue/src/views/FloorEdit.vue
  32. 212 0
      src/main/vue/src/views/FloorList.vue

+ 4 - 0
src/main/java/com/izouma/awesomeAdmin/domain/AccessRecord.java

@@ -0,0 +1,4 @@
+package com.izouma.awesomeAdmin.domain;
+
+public class AccessRecord {
+}

+ 26 - 0
src/main/java/com/izouma/awesomeAdmin/domain/Area.java

@@ -0,0 +1,26 @@
+package com.izouma.awesomeAdmin.domain;
+
+import com.izouma.awesomeAdmin.annotations.Searchable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+
+@Data
+@Entity
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel("区域")
+public class Area extends BaseEntity {
+    @Searchable
+    @ApiModelProperty("名称")
+    private String name;
+
+    @ApiModelProperty("备注")
+    private String remark;
+}

+ 3 - 1
src/main/java/com/izouma/awesomeAdmin/domain/BaseEntity.java

@@ -3,6 +3,7 @@ package com.izouma.awesomeAdmin.domain;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.hibernate.envers.Audited;
 import org.springframework.data.annotation.CreatedBy;
 import org.springframework.data.annotation.CreatedDate;
@@ -17,7 +18,7 @@ import java.time.LocalDateTime;
 @Audited
 @EntityListeners(AuditingEntityListener.class)
 @JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonIgnoreProperties(ignoreUnknown = true, value = {"hibernateLazyInitializer", "handler"})
 public abstract class BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
@@ -55,6 +56,7 @@ public abstract class BaseEntity {
         this.createdBy = createdBy;
     }
 
+    @JsonProperty("createdAt")
     public LocalDateTime getCreatedAt() {
         return createdAt;
     }

+ 34 - 0
src/main/java/com/izouma/awesomeAdmin/domain/Building.java

@@ -0,0 +1,34 @@
+package com.izouma.awesomeAdmin.domain;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.izouma.awesomeAdmin.annotations.Searchable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+
+@Data
+@Entity
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel("楼栋")
+public class Building extends BaseEntity {
+    @Searchable
+    @ApiModelProperty("名称")
+    private String name;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("区域")
+    private Long areaId;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "areaId", insertable = false, updatable = false)
+    private Area area;
+}

+ 25 - 0
src/main/java/com/izouma/awesomeAdmin/domain/Department.java

@@ -0,0 +1,25 @@
+package com.izouma.awesomeAdmin.domain;
+
+import com.izouma.awesomeAdmin.annotations.Searchable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+
+@Data
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel("部门")
+public class Department extends BaseEntity {
+    @Column(nullable = false, unique = true, length = 50)
+    @Searchable
+    @ApiModelProperty(value = "部门名称", name = "name")
+    private String name;
+}

+ 45 - 0
src/main/java/com/izouma/awesomeAdmin/domain/Device.java

@@ -0,0 +1,45 @@
+package com.izouma.awesomeAdmin.domain;
+
+import com.izouma.awesomeAdmin.annotations.Searchable;
+import com.izouma.awesomeAdmin.enums.DeviceType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+
+@Data
+@Entity
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel("门禁设备")
+public class Device extends BaseEntity {
+    @Searchable
+    @ApiModelProperty("名称")
+    private String name;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("区域")
+    private Long areaId;
+
+    @ApiModelProperty("楼栋")
+    private Long buildingId;
+
+    @ApiModelProperty("楼层")
+    private Long floorId;
+
+    @Enumerated(EnumType.STRING)
+    @ApiModelProperty("设备类型")
+    private DeviceType type;
+
+    @ApiModelProperty("设备类型")
+    private String ipAddress;
+}

+ 47 - 0
src/main/java/com/izouma/awesomeAdmin/domain/Floor.java

@@ -0,0 +1,47 @@
+package com.izouma.awesomeAdmin.domain;
+
+import com.izouma.awesomeAdmin.annotations.Searchable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@Entity
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel("楼层")
+public class Floor extends BaseEntity {
+    @Searchable
+    @ApiModelProperty("名称")
+    private String name;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("区域")
+    private Long areaId;
+
+    @ApiModelProperty("楼栋")
+    private Long buildingId;
+
+    @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+    @JoinColumn(name = "floorId", insertable = false, updatable = false)
+    @ApiModelProperty("所有设备")
+    List<Device> devices = new ArrayList<>();
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "areaId", insertable = false, updatable = false)
+    private Area area;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "buildingId", insertable = false, updatable = false)
+    private Building building;
+}

+ 55 - 0
src/main/java/com/izouma/awesomeAdmin/domain/Staff.java

@@ -0,0 +1,55 @@
+package com.izouma.awesomeAdmin.domain;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.izouma.awesomeAdmin.annotations.Searchable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+import java.util.HashSet;
+import java.util.Set;
+
+@Data
+@Entity
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel("员工")
+public class Staff extends BaseEntity {
+    @Column(length = 20)
+    @Searchable
+    @ApiModelProperty("姓名")
+    private String name;
+
+    @Column(length = 20)
+    @Searchable
+    @ApiModelProperty("身份证")
+    private String idNo;
+
+    @Column(length = 20)
+    @Searchable
+    @ApiModelProperty("手机号")
+    private String phone;
+
+    @ApiModelProperty("性别")
+    private String sex;
+
+    @ManyToMany(fetch = FetchType.LAZY, cascade = {CascadeType.DETACH})
+    @JoinTable(
+            name = "staff_department",
+            joinColumns = {@JoinColumn(name = "staff_id", referencedColumnName = "id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))},
+            inverseJoinColumns = {@JoinColumn(name = "department_id", referencedColumnName = "id", foreignKey = @ForeignKey(name = "none", value = ConstraintMode.NO_CONSTRAINT))})
+    @ExcelIgnore
+    @ApiModelProperty(value = "部门", name = "departments")
+    private Set<Department> departments = new HashSet<>();
+
+    @ApiModelProperty("邮箱")
+    private String email;
+
+    @ApiModelProperty("职位")
+    private String position;
+}

+ 42 - 0
src/main/java/com/izouma/awesomeAdmin/domain/Vehicle.java

@@ -0,0 +1,42 @@
+package com.izouma.awesomeAdmin.domain;
+
+import com.izouma.awesomeAdmin.annotations.Searchable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+
+@Data
+@Entity
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel("车辆")
+public class Vehicle extends BaseEntity {
+    @Column(length = 20)
+    @Searchable
+    @ApiModelProperty("姓名")
+    private String name;
+
+    @Column(length = 20)
+    @Searchable
+    @ApiModelProperty("身份证")
+    private String idNo;
+
+    @Column(length = 20)
+    @Searchable
+    @ApiModelProperty("手机号")
+    private String phone;
+
+    @Column(length = 20)
+    @Searchable
+    @ApiModelProperty("车牌号")
+    private String plateNumber;
+
+
+}

+ 18 - 0
src/main/java/com/izouma/awesomeAdmin/enums/DeviceType.java

@@ -0,0 +1,18 @@
+package com.izouma.awesomeAdmin.enums;
+
+public enum DeviceType {
+    NFC("刷卡"),
+    QR("二维码"),
+    FACE("人脸识别"),
+    LPR("车牌识别");
+
+    private final String description;
+
+    DeviceType(String description) {
+        this.description = description;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+}

+ 16 - 0
src/main/java/com/izouma/awesomeAdmin/enums/DoorDirection.java

@@ -0,0 +1,16 @@
+package com.izouma.awesomeAdmin.enums;
+
+public enum DoorDirection {
+    ENTRANCE("入口"),
+    EXIT("出口");
+
+    private final String description;
+
+    DoorDirection(String description) {
+        this.description = description;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+}

+ 8 - 0
src/main/java/com/izouma/awesomeAdmin/repo/AreaRepo.java

@@ -0,0 +1,8 @@
+package com.izouma.awesomeAdmin.repo;
+
+import com.izouma.awesomeAdmin.domain.Area;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface AreaRepo extends JpaRepository<Area, Long>, JpaSpecificationExecutor<Area> {
+}

+ 8 - 0
src/main/java/com/izouma/awesomeAdmin/repo/BuildingRepo.java

@@ -0,0 +1,8 @@
+package com.izouma.awesomeAdmin.repo;
+
+import com.izouma.awesomeAdmin.domain.Building;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface BuildingRepo extends JpaRepository<Building, Long>, JpaSpecificationExecutor<Building> {
+}

+ 8 - 0
src/main/java/com/izouma/awesomeAdmin/repo/FloorRepo.java

@@ -0,0 +1,8 @@
+package com.izouma.awesomeAdmin.repo;
+
+import com.izouma.awesomeAdmin.domain.Floor;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface FloorRepo extends JpaRepository<Floor, Long>, JpaSpecificationExecutor<Floor> {
+}

+ 14 - 0
src/main/java/com/izouma/awesomeAdmin/service/AreaService.java

@@ -0,0 +1,14 @@
+package com.izouma.awesomeAdmin.service;
+
+import com.izouma.awesomeAdmin.domain.Area;
+import com.izouma.awesomeAdmin.repo.AreaRepo;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class AreaService {
+
+    private AreaRepo areaRepo;
+
+}

+ 14 - 0
src/main/java/com/izouma/awesomeAdmin/service/BuildingService.java

@@ -0,0 +1,14 @@
+package com.izouma.awesomeAdmin.service;
+
+import com.izouma.awesomeAdmin.domain.Building;
+import com.izouma.awesomeAdmin.repo.BuildingRepo;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class BuildingService {
+
+    private BuildingRepo buildingRepo;
+
+}

+ 14 - 0
src/main/java/com/izouma/awesomeAdmin/service/FloorService.java

@@ -0,0 +1,14 @@
+package com.izouma.awesomeAdmin.service;
+
+import com.izouma.awesomeAdmin.domain.Floor;
+import com.izouma.awesomeAdmin.repo.FloorRepo;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class FloorService {
+
+    private FloorRepo floorRepo;
+
+}

+ 60 - 0
src/main/java/com/izouma/awesomeAdmin/web/AreaController.java

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

+ 2 - 7
src/main/java/com/izouma/awesomeAdmin/web/AuthorityController.java

@@ -2,6 +2,7 @@ package com.izouma.awesomeAdmin.web;
 
 import com.izouma.awesomeAdmin.repo.AuthorityRepo;
 import com.izouma.awesomeAdmin.security.Authority;
+import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -11,8 +12,8 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/authority")
+@AllArgsConstructor
 public class AuthorityController extends BaseController {
-    @Autowired
     private AuthorityRepo authorityRepo;
 
     @PreAuthorize("hasRole('ADMIN')")
@@ -27,10 +28,4 @@ public class AuthorityController extends BaseController {
         return authorityRepo.save(authority);
     }
 
-    @PostConstruct
-    public void init() {
-        authorityRepo.save(new Authority(Authority.NAMES.ROLE_ADMIN.name()));
-        authorityRepo.save(new Authority(Authority.NAMES.ROLE_USER.name()));
-        authorityRepo.save(new Authority(Authority.NAMES.ROLE_DEV.name()));
-    }
 }

+ 60 - 0
src/main/java/com/izouma/awesomeAdmin/web/BuildingController.java

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

+ 60 - 0
src/main/java/com/izouma/awesomeAdmin/web/FloorController.java

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

+ 1 - 0
src/main/resources/genjson/Area.json

@@ -0,0 +1 @@
+{"tableName":"Area","className":"Area","remark":"区域","genTable":true,"genClass":true,"genList":true,"genForm":true,"genRouter":false,"javaPath":"/Users/drew/Projects/Java/wisFactory/src/main/java/com/izouma/awesomeAdmin","viewPath":"/Users/drew/Projects/Java/wisFactory/src/main/vue/src/views","routerPath":"/Users/drew/Projects/Java/wisFactory/src/main/vue/src","resourcesPath":"/Users/drew/Projects/Java/wisFactory/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"name","modelName":"name","remark":"名称","showInList":true,"showInForm":true,"formType":"singleLineText","required":true},{"name":"remark","modelName":"remark","remark":"备注","showInList":true,"showInForm":true,"formType":"singleLineText"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.awesomeAdmin","tablePackage":"com.izouma.awesomeAdmin.domain.Area"}

+ 1 - 0
src/main/resources/genjson/Building.json

@@ -0,0 +1 @@
+{"tableName":"Building","className":"Building","remark":"楼栋","genTable":true,"genClass":true,"genList":true,"genForm":true,"genRouter":false,"javaPath":"/Users/drew/Projects/Java/wisFactory/src/main/java/com/izouma/awesomeAdmin","viewPath":"/Users/drew/Projects/Java/wisFactory/src/main/vue/src/views","routerPath":"/Users/drew/Projects/Java/wisFactory/src/main/vue/src","resourcesPath":"/Users/drew/Projects/Java/wisFactory/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"name","modelName":"name","remark":"名称","showInList":true,"showInForm":true,"formType":"singleLineText","required":true},{"name":"remark","modelName":"remark","remark":"备注","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"areaId","modelName":"areaId","remark":"区域","showInList":true,"showInForm":true,"formType":"select","required":true,"apiFlag":"2","optionsMethod":"/area/all","optionsValue":"id","optionsLabel":"name"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.awesomeAdmin","tablePackage":"com.izouma.awesomeAdmin.domain.Building"}

+ 1 - 0
src/main/resources/genjson/Floor.json

@@ -0,0 +1 @@
+{"tableName":"Floor","className":"Floor","remark":"楼层","genTable":true,"genClass":true,"genList":true,"genForm":true,"genRouter":false,"javaPath":"/Users/drew/Projects/Java/wisFactory/src/main/java/com/izouma/awesomeAdmin","viewPath":"/Users/drew/Projects/Java/wisFactory/src/main/vue/src/views","routerPath":"/Users/drew/Projects/Java/wisFactory/src/main/vue/src","resourcesPath":"/Users/drew/Projects/Java/wisFactory/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"name","modelName":"name","remark":"名称","showInList":true,"showInForm":true,"formType":"singleLineText","required":true},{"name":"remark","modelName":"remark","remark":"备注","showInList":true,"showInForm":true,"formType":"singleLineText","required":false},{"name":"areaId","modelName":"areaId","remark":"区域","showInList":true,"showInForm":true,"formType":"select","required":true,"apiFlag":"2","optionsMethod":"/area/all","optionsValue":"id","optionsLabel":"name"},{"name":"buildingId","modelName":"buildingId","remark":"楼栋","showInList":true,"showInForm":true,"formType":"select","required":true,"validate":false,"apiFlag":"2","optionsMethod":"/building/all","optionsValue":"id","optionsLabel":"name"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.awesomeAdmin","tablePackage":"com.izouma.awesomeAdmin.domain.Floor"}

+ 2 - 7
src/main/resources/templates/ListViewTemplate.ftl

@@ -100,9 +100,6 @@
     export default {
         name: '${model.className}List',
         mixins: [pageableTable],
-        created() {
-            this.getData();
-        },
         data() {
             return {
                 multipleMode: false,
@@ -203,10 +200,8 @@
                     this.$message.success('删除成功');
                     this.getData();
                 }).catch(action => {
-                    if (action === 'cancel') {
-                        this.$message.info('删除取消');
-                    } else {
-                        this.$message.error('删除失败');
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
                     }
                 })
             },

+ 65 - 1
src/main/vue/src/router.js

@@ -62,7 +62,71 @@ const router = new Router({
                     path: '/sysConfigList',
                     name: 'sysConfigList',
                     component: () => import(/* webpackChunkName: "sysConfigList" */ '@/views/SysConfigList.vue'),
-                }
+                },
+                {
+                    path: '/areaEdit',
+                    name: 'AreaEdit',
+                    component: () => import(/* webpackChunkName: "areaEdit" */ '@/views/AreaEdit.vue'),
+                    meta: {
+                       title: '地区编辑',
+                    },
+                },
+                {
+                    path: '/areaList',
+                    name: 'AreaList',
+                    component: () => import(/* webpackChunkName: "areaList" */ '@/views/AreaList.vue'),
+                    meta: {
+                       title: '地区',
+                    },
+               },
+                {
+                    path: '/areaEdit',
+                    name: 'AreaEdit',
+                    component: () => import(/* webpackChunkName: "areaEdit" */ '@/views/AreaEdit.vue'),
+                    meta: {
+                       title: '地区编辑',
+                    },
+                },
+                {
+                    path: '/areaList',
+                    name: 'AreaList',
+                    component: () => import(/* webpackChunkName: "areaList" */ '@/views/AreaList.vue'),
+                    meta: {
+                       title: '地区',
+                    },
+               },
+                {
+                    path: '/buildingEdit',
+                    name: 'BuildingEdit',
+                    component: () => import(/* webpackChunkName: "buildingEdit" */ '@/views/BuildingEdit.vue'),
+                    meta: {
+                       title: '楼栋编辑',
+                    },
+                },
+                {
+                    path: '/buildingList',
+                    name: 'BuildingList',
+                    component: () => import(/* webpackChunkName: "buildingList" */ '@/views/BuildingList.vue'),
+                    meta: {
+                       title: '楼栋',
+                    },
+               },
+                {
+                    path: '/floorEdit',
+                    name: 'FloorEdit',
+                    component: () => import(/* webpackChunkName: "floorEdit" */ '@/views/FloorEdit.vue'),
+                    meta: {
+                       title: '楼层编辑',
+                    },
+                },
+                {
+                    path: '/floorList',
+                    name: 'FloorList',
+                    component: () => import(/* webpackChunkName: "floorList" */ '@/views/FloorList.vue'),
+                    meta: {
+                       title: '楼层',
+                    },
+               }
                 /**INSERT_LOCATION**/,
             ],
         },

+ 98 - 0
src/main/vue/src/views/AreaEdit.vue

@@ -0,0 +1,98 @@
+<template>
+    <div class="edit-view">
+        <el-form :model="formData" :rules="rules" ref="form" label-width="52px" 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="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: 'AreaEdit',
+        created() {
+            if (this.$route.query.id) {
+                this.$http
+                    .get('area/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: {
+                        name: [
+                            {
+                                required: true,
+                                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('/area/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(`/area/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>

+ 210 - 0
src/main/vue/src/views/AreaList.vue

@@ -0,0 +1,210 @@
+<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="100">
+            </el-table-column>
+            <el-table-column prop="name" 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: "AreaList",
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: "",
+            url: "/area/all",
+            downloading: false
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        beforeGetData() {
+            if (this.search) {
+                return { search: this.search };
+            }
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: "/areaEdit",
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: "/areaEdit",
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get("/area/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(`/area/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success("删除成功");
+                    this.getData();
+                })
+                .catch(action => {
+                    if (action === "cancel") {
+                        this.$message.info("删除取消");
+                    } else {
+                        this.$message.error("删除失败");
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+</style>

+ 129 - 0
src/main/vue/src/views/BuildingEdit.vue

@@ -0,0 +1,129 @@
+<template>
+    <div class="edit-view">
+        <el-form :model="formData" :rules="rules" ref="form" label-width="52px" 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="remark" label="备注">
+                            <el-input v-model="formData.remark"></el-input>
+                </el-form-item>
+                <el-form-item prop="areaId" label="区域">
+                            <el-select v-model="formData.areaId" clearable filterable  placeholder="请选择">
+                                <el-option
+                                        v-for="item in areaIdOptions"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value">
+                                </el-option>
+                            </el-select>
+                </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: 'BuildingEdit',
+        created() {
+            if (this.$route.query.id) {
+                this.$http
+                    .get('building/get/'+this.$route.query.id)
+                    .then(res => {
+                        this.formData = res;
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    });
+            }
+            this.$http.get('/area/all').then(res => {
+                if (res.content.length > 0) {
+                res.content.forEach(item => {
+                        this.areaIdOptions.push({
+                            label: item.name,
+                            value: item.id
+                        });
+                    })
+                }
+            }).catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
+        },
+        data() {
+            return {
+                saving: false,
+                formData: {
+                },
+                rules: {
+                        name: [
+                            {
+                                required: true,
+                                message: '请输入名称',
+                                trigger: 'blur'
+                            },
+                    ],
+                        areaId: [
+                            {
+                                required: true,
+                                message: '请输入区域',
+                                trigger: 'blur'
+                            },
+                    ],
+                },
+                            areaIdOptions:[],
+            }
+        },
+        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('/building/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(`/building/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>

+ 211 - 0
src/main/vue/src/views/BuildingList.vue

@@ -0,0 +1,211 @@
+<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="100">
+            </el-table-column>
+            <el-table-column prop="name" label="名称"> </el-table-column>
+            <el-table-column prop="remark" label="备注"> </el-table-column>
+            <el-table-column prop="areaId" 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: "BuildingList",
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: "",
+            url: "/building/all",
+            downloading: false
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        beforeGetData() {
+            if (this.search) {
+                return { search: this.search };
+            }
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: "/buildingEdit",
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: "/buildingEdit",
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get("/building/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(`/building/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success("删除成功");
+                    this.getData();
+                })
+                .catch(action => {
+                    if (action === "cancel") {
+                        this.$message.info("删除取消");
+                    } else {
+                        this.$message.error("删除失败");
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+</style>

+ 160 - 0
src/main/vue/src/views/FloorEdit.vue

@@ -0,0 +1,160 @@
+<template>
+    <div class="edit-view">
+        <el-form :model="formData" :rules="rules" ref="form" label-width="52px" 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="remark" label="备注">
+                            <el-input v-model="formData.remark"></el-input>
+                </el-form-item>
+                <el-form-item prop="areaId" label="区域">
+                            <el-select v-model="formData.areaId" clearable filterable  placeholder="请选择">
+                                <el-option
+                                        v-for="item in areaIdOptions"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value">
+                                </el-option>
+                            </el-select>
+                </el-form-item>
+                <el-form-item prop="buildingId" label="楼栋">
+                            <el-select v-model="formData.buildingId" clearable filterable  placeholder="请选择">
+                                <el-option
+                                        v-for="item in buildingIdOptions"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value">
+                                </el-option>
+                            </el-select>
+                </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: 'FloorEdit',
+        created() {
+            if (this.$route.query.id) {
+                this.$http
+                    .get('floor/get/'+this.$route.query.id)
+                    .then(res => {
+                        this.formData = res;
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    });
+            }
+            this.$http.get('/area/all').then(res => {
+                if (res.content.length > 0) {
+                res.content.forEach(item => {
+                        this.areaIdOptions.push({
+                            label: item.name,
+                            value: item.id
+                        });
+                    })
+                }
+            }).catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
+            this.$http.get('/building/all').then(res => {
+                if (res.content.length > 0) {
+                res.content.forEach(item => {
+                        this.buildingIdOptions.push({
+                            label: item.name,
+                            value: item.id
+                        });
+                    })
+                }
+            }).catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
+        },
+        data() {
+            return {
+                saving: false,
+                formData: {
+                },
+                rules: {
+                        name: [
+                            {
+                                required: true,
+                                message: '请输入名称',
+                                trigger: 'blur'
+                            },
+                    ],
+                        areaId: [
+                            {
+                                required: true,
+                                message: '请输入区域',
+                                trigger: 'blur'
+                            },
+                    ],
+                        buildingId: [
+                            {
+                                required: true,
+                                message: '请输入楼栋',
+                                trigger: 'blur'
+                            },
+                    ],
+                },
+                            areaIdOptions:[],
+                            buildingIdOptions:[],
+            }
+        },
+        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('/floor/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(`/floor/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>

+ 212 - 0
src/main/vue/src/views/FloorList.vue

@@ -0,0 +1,212 @@
+<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="100">
+            </el-table-column>
+            <el-table-column prop="name" label="名称"> </el-table-column>
+            <el-table-column prop="remark" label="备注"> </el-table-column>
+            <el-table-column prop="areaId" label="区域"> </el-table-column>
+            <el-table-column prop="buildingId" 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: "FloorList",
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: "",
+            url: "/floor/all",
+            downloading: false
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        beforeGetData() {
+            if (this.search) {
+                return { search: this.search };
+            }
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: "/floorEdit",
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: "/floorEdit",
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get("/floor/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(`/floor/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success("删除成功");
+                    this.getData();
+                })
+                .catch(action => {
+                    if (action === "cancel") {
+                        this.$message.info("删除取消");
+                    } else {
+                        this.$message.error("删除失败");
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+</style>