'训练场'

hzgzpt-admin/src/main/java/com/miaxis/app/controller/school/SchoolInfoController.java

@@ -1,33 +1,22 @@
 package com.miaxis.app.controller.school;
 
+import com.miaxis.app.school.domain.SchoolInfo;
 import com.miaxis.app.school.dto.SchoolInfoDTO;
 import com.miaxis.app.school.dto.SchoolInfoEvalDTO;
 import com.miaxis.app.school.dto.SchoolInfoEvalVO;
 import com.miaxis.app.school.dto.SchoolInfoVO;
-import com.miaxis.common.constant.Constants;
-import java.util.List;
-import java.util.Map;
-
-import io.swagger.annotations.*;
-import com.miaxis.common.core.domain.Response;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.ModelAttribute;
+import com.miaxis.app.school.service.ISchoolInfoService;
 import com.miaxis.common.annotation.Log;
 import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.common.enums.BusinessTypeEnum;
-import com.miaxis.app.school.domain.SchoolInfo;
-import com.miaxis.app.school.service.ISchoolInfoService;
 import com.miaxis.common.utils.poi.ExcelUtil;
-import com.miaxis.common.core.page.ResponsePageInfo;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 【驾校】Controller

hzgzpt-admin/src/main/java/com/miaxis/app/controller/school/SchoolRegionController.java

@@ -1,40 +1,30 @@
 package com.miaxis.app.controller.school;
 
-import java.util.List;
-
 import com.miaxis.app.school.domain.SchoolRegion;
 import com.miaxis.app.school.dto.SchoolRegionDTO;
 import com.miaxis.app.school.dto.SchoolRegionVO;
 import com.miaxis.app.school.service.ISchoolRegionService;
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
 import com.miaxis.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.*;
-import com.miaxis.common.core.domain.Response;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import com.miaxis.common.annotation.Log;
-import com.miaxis.common.core.controller.BaseController;
-import com.miaxis.common.enums.BusinessTypeEnum;
+import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 
 /**
  * 【驾校训练场】Controller
  *
- * @author miaxis
- * @date 2020-12-23
+ * @author zhangbin
+ * @date 2020-12-28
  */
 @RestController
-@RequestMapping("/system/region")
-@Api(tags={"【驾校训练场】Controller"})
+@RequestMapping("/school/region")
+@Api(tags={"【app-驾校训练场】"})
 public class SchoolRegionController extends BaseController{
     @Autowired
     private ISchoolRegionService schoolRegionService;
@@ -42,7 +32,7 @@ public class SchoolRegionController extends BaseController{
     /**
      * 查询驾校训练场列表
      */
-    //@PreAuthorize("@ss.hasPermi('system:region:list')")
+    //@PreAuthorize("@ss.hasPermi('school:region:list')")
     @GetMapping("/list")
     @ApiOperation("查询驾校训练场列表")
     @ApiImplicitParams({
@@ -56,18 +46,17 @@ public class SchoolRegionController extends BaseController{
     }
 
     /**
-     * 查询驾校训练场列表（图片距离）
+     * 查询驾校训练场列表(图片距离)
      */
-    //@PreAuthorize("@ss.hasPermi('system:region:list')")
-    @GetMapping("/list")
-    @ApiOperation("查询驾校训练场列表")
+    @GetMapping("/urllist")
+    @ApiOperation("查询驾校训练场列表(图片距离)")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
             @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
     })
     public ResponsePageInfo<SchoolRegionVO> list(@ModelAttribute SchoolRegionDTO schoolRegionDTO){
         startPage();
-        List<SchoolRegionVO> list = schoolRegionService.selectSchoolRegionList(schoolRegionDTO);
+        List<SchoolRegionVO> list = schoolRegionService.selectSchoolRegionUrlList(schoolRegionDTO);
         return toResponsePageInfo(list);
     }
 
@@ -75,7 +64,7 @@ public class SchoolRegionController extends BaseController{
     /**
      * 导出驾校训练场列表
      */
-    @PreAuthorize("@ss.hasPermi('system:region:export')")
+   // @PreAuthorize("@ss.hasPermi('school:region:export')")
     @Log(title = "驾校训练场", businessType = BusinessTypeEnum.EXPORT)
     @GetMapping("/export")
     @ApiOperation("导出驾校训练场列表Excel")
@@ -88,7 +77,7 @@ public class SchoolRegionController extends BaseController{
     /**
      * 获取驾校训练场详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:region:query')")
+    //@PreAuthorize("@ss.hasPermi('school:region:query')")
     @GetMapping(value = "/{id}")
     @ApiOperation("获取驾校训练场详细信息")
     public Response<SchoolRegion> getInfo(
@@ -101,7 +90,7 @@ public class SchoolRegionController extends BaseController{
     /**
      * 新增驾校训练场
      */
-    @PreAuthorize("@ss.hasPermi('system:region:add')")
+    //@PreAuthorize("@ss.hasPermi('school:region:add')")
     @Log(title = "驾校训练场", businessType = BusinessTypeEnum.INSERT)
     @PostMapping
     @ApiOperation("新增驾校训练场")
@@ -112,7 +101,7 @@ public class SchoolRegionController extends BaseController{
     /**
      * 修改驾校训练场
      */
-    @PreAuthorize("@ss.hasPermi('system:region:edit')")
+    //@PreAuthorize("@ss.hasPermi('school:region:edit')")
     @Log(title = "驾校训练场", businessType = BusinessTypeEnum.UPDATE)
     @PutMapping
     @ApiOperation("修改驾校训练场")
@@ -123,7 +112,7 @@ public class SchoolRegionController extends BaseController{
     /**
      * 删除驾校训练场
      */
-    @PreAuthorize("@ss.hasPermi('system:region:remove')")
+    //@PreAuthorize("@ss.hasPermi('school:region:remove')")
     @Log(title = "驾校训练场", businessType = BusinessTypeEnum.DELETE)
 	@DeleteMapping("/{ids}")
     @ApiOperation("删除驾校训练场")

hzgzpt-service-app/src/main/java/com/miaxis/app/controller/SchoolRegionController.java

@@ -1,116 +0,0 @@
-package com.miaxis.app.controller;
-
-import com.miaxis.common.constant.Constants;
-import java.util.List;
-import io.swagger.annotations.*;
-import com.miaxis.common.core.domain.Response;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import com.miaxis.common.annotation.Log;
-import com.miaxis.common.core.controller.BaseController;
-import com.miaxis.common.enums.BusinessTypeEnum;
-import com.miaxis.app.domain.SchoolRegion;
-import com.miaxis.app.service.ISchoolRegionService;
-import com.miaxis.common.utils.poi.ExcelUtil;
-import com.miaxis.common.core.page.ResponsePageInfo;
-
-/**
- * 【驾校训练场】Controller
- *
- * @author zhangbin
- * @date 2020-12-28
- */
-@RestController
-@RequestMapping("/school/school")
-@Api(tags={"【app-驾校训练场】"})
-public class SchoolRegionController extends BaseController{
-    @Autowired
-    private ISchoolRegionService schoolRegionService;
-
-    /**
-     * 查询驾校训练场列表
-     */
-    //@PreAuthorize("@ss.hasPermi('school:school:list')")
-    @GetMapping("/list")
-    @ApiOperation("查询驾校训练场列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
-            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
-    })
-    public ResponsePageInfo<SchoolRegion> list(@ModelAttribute SchoolRegion schoolRegion){
-        startPage();
-        List<SchoolRegion> list = schoolRegionService.selectSchoolRegionList(schoolRegion);
-        return toResponsePageInfo(list);
-    }
-
-    /**
-     * 导出驾校训练场列表
-     */
-   // @PreAuthorize("@ss.hasPermi('school:school:export')")
-    @Log(title = "驾校训练场", businessType = BusinessTypeEnum.EXPORT)
-    @GetMapping("/export")
-    @ApiOperation("导出驾校训练场列表Excel")
-    public Response<String> export(@ModelAttribute SchoolRegion schoolRegion){
-        List<SchoolRegion> list = schoolRegionService.selectSchoolRegionList(schoolRegion);
-        ExcelUtil<SchoolRegion> util = new ExcelUtil<SchoolRegion>(SchoolRegion.class);
-        return util.exportExcel(list, "school");
-    }
-
-    /**
-     * 获取驾校训练场详细信息
-     */
-    //@PreAuthorize("@ss.hasPermi('school:school:query')")
-    @GetMapping(value = "/{id}")
-    @ApiOperation("获取驾校训练场详细信息")
-    public Response<SchoolRegion> getInfo(
-            @ApiParam(name = "id", value = "驾校训练场参数", required = true)
-            @PathVariable("id") Long id
-    ){
-        return Response.success(schoolRegionService.selectSchoolRegionById(id));
-    }
-
-    /**
-     * 新增驾校训练场
-     */
-    //@PreAuthorize("@ss.hasPermi('school:school:add')")
-    @Log(title = "驾校训练场", businessType = BusinessTypeEnum.INSERT)
-    @PostMapping
-    @ApiOperation("新增驾校训练场")
-    public Response<Integer> add(@RequestBody SchoolRegion schoolRegion){
-        return toResponse(schoolRegionService.insertSchoolRegion(schoolRegion));
-    }
-
-    /**
-     * 修改驾校训练场
-     */
-    //@PreAuthorize("@ss.hasPermi('school:school:edit')")
-    @Log(title = "驾校训练场", businessType = BusinessTypeEnum.UPDATE)
-    @PutMapping
-    @ApiOperation("修改驾校训练场")
-    public Response<Integer> edit(@RequestBody SchoolRegion schoolRegion){
-        return toResponse(schoolRegionService.updateSchoolRegion(schoolRegion));
-    }
-
-    /**
-     * 删除驾校训练场
-     */
-    //@PreAuthorize("@ss.hasPermi('school:school:remove')")
-    @Log(title = "驾校训练场", businessType = BusinessTypeEnum.DELETE)
-	@DeleteMapping("/{ids}")
-    @ApiOperation("删除驾校训练场")
-    public  Response<Integer> remove(
-            @ApiParam(name = "ids", value = "驾校训练场ids参数", required = true)
-            @PathVariable Long[] ids
-    ){
-        return toResponse(schoolRegionService.deleteSchoolRegionByIds(ids));
-    }
-}

hzgzpt-service-app/src/main/java/com/miaxis/app/domain/SchoolRegion.java

@@ -1,260 +0,0 @@
-package com.miaxis.app.domain;
-
-import java.math.BigDecimal;
-
-import com.miaxis.common.core.domain.BaseBusinessEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.miaxis.common.annotation.Excel;
-import com.miaxis.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
-/**
- * 驾校训练场对象 school_region
- *
- * @author zhangbin
- * @date 2020-12-28
- */
-@Data
-@TableName("school_region")
-@ApiModel(value = "SchoolRegion", description = "驾校训练场对象 school_region")
-public class SchoolRegion extends BaseBusinessEntity {
-    private static final long serialVersionUID = 1L;
-
-    /** $column.columnComment */
-    @TableId(value = "id")
-    @ApiModelProperty(value = "$column.columnComment")
-    private Long id;
-
-    /** 驾校全国统一编号 */
-    @Excel(name = "驾校全国统一编号")
-    @TableField("inscode")
-    @ApiModelProperty(value = "驾校全国统一编号")
-    private String inscode;
-
-    /** 教学区域编号 计时平台顺序编号 */
-    @Excel(name = "教学区域编号 计时平台顺序编号")
-    @TableField("seq")
-    @ApiModelProperty(value = "教学区域编号 计时平台顺序编号")
-    private String seq;
-
-    /** 教学区域名称 */
-    @Excel(name = "教学区域名称")
-    @TableField("name")
-    @ApiModelProperty(value = "教学区域名称")
-    private String name;
-
-    /** 教学区域地址 */
-    @Excel(name = "教学区域地址")
-    @TableField("address")
-    @ApiModelProperty(value = "教学区域地址")
-    private String address;
-
-    /** 教学区域面积 */
-    @Excel(name = "教学区域面积")
-    @TableField("area")
-    @ApiModelProperty(value = "教学区域面积")
-    private Long area;
-
-    /** 教学区域类型 1：第二部分；2：第三部分 */
-    @Excel(name = "教学区域类型 1：第二部分；2：第三部分")
-    @TableField("type")
-    @ApiModelProperty(value = "教学区域类型 1：第二部分；2：第三部分")
-    private Long type;
-
-    /** 培训车型 */
-    @Excel(name = "培训车型")
-    @TableField("vehicletype")
-    @ApiModelProperty(value = "培训车型")
-    private String vehicletype;
-
-    /** 电子围栏 */
-    @Excel(name = "电子围栏")
-    @TableField("polygon")
-    @ApiModelProperty(value = "电子围栏")
-    private String polygon;
-
-    /** 可容纳车辆数 */
-    @Excel(name = "可容纳车辆数")
-    @TableField("totalvehnum")
-    @ApiModelProperty(value = "可容纳车辆数")
-    private Long totalvehnum;
-
-    /** 已投放车辆数 */
-    @Excel(name = "已投放车辆数")
-    @TableField("curvehnum")
-    @ApiModelProperty(value = "已投放车辆数")
-    private Long curvehnum;
-
-    /** 备案状态： 0：未备案 1：已备案 */
-    @Excel(name = "备案状态： 0：未备案 1：已备案")
-    @TableField("status")
-    @ApiModelProperty(value = "备案状态： 0：未备案 1：已备案")
-    private Long status;
-
-    /** 审核状态： 0：待审核 1：同意启用 2：不同意启用 */
-    @Excel(name = "审核状态： 0：待审核 1：同意启用 2：不同意启用")
-    @TableField("flag")
-    @ApiModelProperty(value = "审核状态： 0：待审核 1：同意启用 2：不同意启用")
-    private Long flag;
-
-    /** 区县编号 */
-    @Excel(name = "区县编号")
-    @TableField("area_code")
-    @ApiModelProperty(value = "区县编号")
-    private String areaCode;
-
-    /** 经度 */
-    @Excel(name = "经度")
-    @TableField("poi_lon")
-    @ApiModelProperty(value = "经度")
-    private BigDecimal poiLon;
-
-    /** 纬度 */
-    @Excel(name = "纬度")
-    @TableField("poi_lat")
-    @ApiModelProperty(value = "纬度")
-    private BigDecimal poiLat;
-
-    public void setId(Long id){
-        this.id = id;
-    }
-
-    public Long getId(){
-        return id;
-    }
-    public void setInscode(String inscode){
-        this.inscode = inscode;
-    }
-
-    public String getInscode(){
-        return inscode;
-    }
-    public void setSeq(String seq){
-        this.seq = seq;
-    }
-
-    public String getSeq(){
-        return seq;
-    }
-    public void setName(String name){
-        this.name = name;
-    }
-
-    public String getName(){
-        return name;
-    }
-    public void setAddress(String address){
-        this.address = address;
-    }
-
-    public String getAddress(){
-        return address;
-    }
-    public void setArea(Long area){
-        this.area = area;
-    }
-
-    public Long getArea(){
-        return area;
-    }
-    public void setType(Long type){
-        this.type = type;
-    }
-
-    public Long getType(){
-        return type;
-    }
-    public void setVehicletype(String vehicletype){
-        this.vehicletype = vehicletype;
-    }
-
-    public String getVehicletype(){
-        return vehicletype;
-    }
-    public void setPolygon(String polygon){
-        this.polygon = polygon;
-    }
-
-    public String getPolygon(){
-        return polygon;
-    }
-    public void setTotalvehnum(Long totalvehnum){
-        this.totalvehnum = totalvehnum;
-    }
-
-    public Long getTotalvehnum(){
-        return totalvehnum;
-    }
-    public void setCurvehnum(Long curvehnum){
-        this.curvehnum = curvehnum;
-    }
-
-    public Long getCurvehnum(){
-        return curvehnum;
-    }
-    public void setStatus(Long status){
-        this.status = status;
-    }
-
-    public Long getStatus(){
-        return status;
-    }
-    public void setFlag(Long flag){
-        this.flag = flag;
-    }
-
-    public Long getFlag(){
-        return flag;
-    }
-    public void setAreaCode(String areaCode){
-        this.areaCode = areaCode;
-    }
-
-    public String getAreaCode(){
-        return areaCode;
-    }
-    public void setPoiLon(BigDecimal poiLon){
-        this.poiLon = poiLon;
-    }
-
-    public BigDecimal getPoiLon(){
-        return poiLon;
-    }
-    public void setPoiLat(BigDecimal poiLat){
-        this.poiLat = poiLat;
-    }
-
-    public BigDecimal getPoiLat(){
-        return poiLat;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("inscode", getInscode())
-            .append("seq", getSeq())
-            .append("name", getName())
-            .append("address", getAddress())
-            .append("area", getArea())
-            .append("type", getType())
-            .append("vehicletype", getVehicletype())
-            .append("polygon", getPolygon())
-            .append("totalvehnum", getTotalvehnum())
-            .append("curvehnum", getCurvehnum())
-            .append("status", getStatus())
-            .append("flag", getFlag())
-            .append("areaCode", getAreaCode())
-            .append("poiLon", getPoiLon())
-            .append("poiLat", getPoiLat())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
-}

hzgzpt-service-app/src/main/java/com/miaxis/app/mapper/SchoolRegionMapper.java

@@ -1,61 +0,0 @@
-package com.miaxis.app.mapper;
-
-import java.util.List;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.app.domain.SchoolRegion;
-
-/**
- * 驾校训练场Mapper接口
- *
- * @author zhangbin
- * @date 2020-12-28
- */
-public interface SchoolRegionMapper extends BaseMapper<SchoolRegion> {
-    /**
-     * 查询驾校训练场
-     *
-     * @param id 驾校训练场ID
-     * @return 驾校训练场
-     */
-    public SchoolRegion selectSchoolRegionById(Long id);
-
-    /**
-     * 查询驾校训练场列表
-     *
-     * @param schoolRegion 驾校训练场
-     * @return 驾校训练场集合
-     */
-    public List<SchoolRegion> selectSchoolRegionList(SchoolRegion schoolRegion);
-
-    /**
-     * 新增驾校训练场
-     *
-     * @param schoolRegion 驾校训练场
-     * @return 结果
-     */
-    public int insertSchoolRegion(SchoolRegion schoolRegion);
-
-    /**
-     * 修改驾校训练场
-     *
-     * @param schoolRegion 驾校训练场
-     * @return 结果
-     */
-    public int updateSchoolRegion(SchoolRegion schoolRegion);
-
-    /**
-     * 删除驾校训练场
-     *
-     * @param id 驾校训练场ID
-     * @return 结果
-     */
-    public int deleteSchoolRegionById(Long id);
-
-    /**
-     * 批量删除驾校训练场
-     *
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteSchoolRegionByIds(Long[] ids);
-}

hzgzpt-service-app/src/main/java/com/miaxis/app/school/domain/SchoolRegion.java

@@ -1,23 +1,24 @@
 package com.miaxis.app.school.domain;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.miaxis.common.annotation.Excel;
+import java.math.BigDecimal;
+
 import com.miaxis.common.core.domain.BaseBusinessEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.miaxis.common.annotation.Excel;
 import com.miaxis.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
-
-import java.util.Date;
-
 /**
  * 驾校训练场对象 school_region
  *
- * @author miaxis
- * @date 2020-12-23
+ * @author zhangbin
+ * @date 2020-12-28
  */
 @Data
 @TableName("school_region")
@@ -96,13 +97,11 @@ public class SchoolRegion extends BaseBusinessEntity {
     @ApiModelProperty(value = "备案状态： 0：未备案 1：已备案")
     private Long status;
 
-
-    /** 审核时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
+    /** 审核状态： 0：待审核 1：同意启用 2：不同意启用 */
+    @Excel(name = "审核状态： 0：待审核 1：同意启用 2：不同意启用")
     @TableField("flag")
-    @ApiModelProperty(value = "审核时间")
-    private Date flag;
+    @ApiModelProperty(value = "审核状态： 0：待审核 1：同意启用 2：不同意启用")
+    private Long flag;
 
     /** 区县编号 */
     @Excel(name = "区县编号")
@@ -110,4 +109,152 @@ public class SchoolRegion extends BaseBusinessEntity {
     @ApiModelProperty(value = "区县编号")
     private String areaCode;
 
+    /** 经度 */
+    @Excel(name = "经度")
+    @TableField("poi_lon")
+    @ApiModelProperty(value = "经度")
+    private BigDecimal poiLon;
+
+    /** 纬度 */
+    @Excel(name = "纬度")
+    @TableField("poi_lat")
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal poiLat;
+
+    public void setId(Long id){
+        this.id = id;
+    }
+
+    public Long getId(){
+        return id;
+    }
+    public void setInscode(String inscode){
+        this.inscode = inscode;
+    }
+
+    public String getInscode(){
+        return inscode;
+    }
+    public void setSeq(String seq){
+        this.seq = seq;
+    }
+
+    public String getSeq(){
+        return seq;
+    }
+    public void setName(String name){
+        this.name = name;
+    }
+
+    public String getName(){
+        return name;
+    }
+    public void setAddress(String address){
+        this.address = address;
+    }
+
+    public String getAddress(){
+        return address;
+    }
+    public void setArea(Long area){
+        this.area = area;
+    }
+
+    public Long getArea(){
+        return area;
+    }
+    public void setType(Long type){
+        this.type = type;
+    }
+
+    public Long getType(){
+        return type;
+    }
+    public void setVehicletype(String vehicletype){
+        this.vehicletype = vehicletype;
+    }
+
+    public String getVehicletype(){
+        return vehicletype;
+    }
+    public void setPolygon(String polygon){
+        this.polygon = polygon;
+    }
+
+    public String getPolygon(){
+        return polygon;
+    }
+    public void setTotalvehnum(Long totalvehnum){
+        this.totalvehnum = totalvehnum;
+    }
+
+    public Long getTotalvehnum(){
+        return totalvehnum;
+    }
+    public void setCurvehnum(Long curvehnum){
+        this.curvehnum = curvehnum;
+    }
+
+    public Long getCurvehnum(){
+        return curvehnum;
+    }
+    public void setStatus(Long status){
+        this.status = status;
+    }
+
+    public Long getStatus(){
+        return status;
+    }
+    public void setFlag(Long flag){
+        this.flag = flag;
+    }
+
+    public Long getFlag(){
+        return flag;
+    }
+    public void setAreaCode(String areaCode){
+        this.areaCode = areaCode;
+    }
+
+    public String getAreaCode(){
+        return areaCode;
+    }
+    public void setPoiLon(BigDecimal poiLon){
+        this.poiLon = poiLon;
+    }
+
+    public BigDecimal getPoiLon(){
+        return poiLon;
+    }
+    public void setPoiLat(BigDecimal poiLat){
+        this.poiLat = poiLat;
+    }
+
+    public BigDecimal getPoiLat(){
+        return poiLat;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("inscode", getInscode())
+            .append("seq", getSeq())
+            .append("name", getName())
+            .append("address", getAddress())
+            .append("area", getArea())
+            .append("type", getType())
+            .append("vehicletype", getVehicletype())
+            .append("polygon", getPolygon())
+            .append("totalvehnum", getTotalvehnum())
+            .append("curvehnum", getCurvehnum())
+            .append("status", getStatus())
+            .append("flag", getFlag())
+            .append("areaCode", getAreaCode())
+            .append("poiLon", getPoiLon())
+            .append("poiLat", getPoiLat())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
 }

hzgzpt-service-app/src/main/java/com/miaxis/app/school/mapper/SchoolRegionMapper.java

@@ -1,16 +1,16 @@
 package com.miaxis.app.school.mapper;
 
-
+import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.app.school.domain.SchoolRegion;
-
-import java.util.List;
+import com.miaxis.app.school.dto.SchoolRegionDTO;
+import com.miaxis.app.school.dto.SchoolRegionVO;
 
 /**
  * 驾校训练场Mapper接口
  *
- * @author miaxis
- * @date 2020-12-23
+ * @author zhangbin
+ * @date 2020-12-28
  */
 public interface SchoolRegionMapper extends BaseMapper<SchoolRegion> {
     /**
@@ -60,4 +60,11 @@ public interface SchoolRegionMapper extends BaseMapper<SchoolRegion> {
      * @return 结果
      */
     public int deleteSchoolRegionByIds(Long[] ids);
+
+    /**
+     * 查询驾校训练场列表(图片距离)
+     * @param schoolRegionDTO
+     * @return
+     */
+    List<SchoolRegionVO> selectSchoolRegionUrlList(SchoolRegionDTO schoolRegionDTO);
 }

hzgzpt-service-app/src/main/java/com/miaxis/app/school/service/ISchoolRegionService.java

@@ -1,20 +1,18 @@
 package com.miaxis.app.school.service;
 
-
-import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
 import com.miaxis.app.school.domain.SchoolRegion;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.miaxis.app.school.dto.SchoolRegionDTO;
 import com.miaxis.app.school.dto.SchoolRegionVO;
 
-import java.util.List;
-
 /**
  * 驾校训练场Service接口
  * 
- * @author miaxis
- * @date 2020-12-23
+ * @author zhangbin
+ * @date 2020-12-28
  */
-public interface ISchoolRegionService extends IService<SchoolRegion> {
+public interface ISchoolRegionService extends IService<SchoolRegion>{
     /**
      * 查询驾校训练场
      * 
@@ -31,14 +29,6 @@ public interface ISchoolRegionService extends IService<SchoolRegion> {
      */
     public List<SchoolRegion> selectSchoolRegionList(SchoolRegion schoolRegion);
 
-    /**
-     * 查询驾校训练场图片列表（经纬度距离）
-     *
-     * @param schoolRegionDTO 驾校训练场
-     * @return 驾校训练场集合
-     */
-    public List<SchoolRegionVO> selectSchoolRegionList(SchoolRegionDTO schoolRegionDTO);
-
     /**
      * 新增驾校训练场
      * 
@@ -70,4 +60,11 @@ public interface ISchoolRegionService extends IService<SchoolRegion> {
      * @return 结果
      */
     public int deleteSchoolRegionById(Long id);
+
+    /**
+     *
+     * @param schoolRegionDTO
+     * @return
+     */
+    public List<SchoolRegionVO> selectSchoolRegionUrlList(SchoolRegionDTO schoolRegionDTO);
 }

hzgzpt-service-app/src/main/java/com/miaxis/app/school/service/impl/SchoolRegionServiceImpl.java

@@ -1,26 +1,25 @@
 package com.miaxis.app.school.service.impl;
 
-
+import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.app.school.domain.SchoolRegion;
-import com.miaxis.app.school.mapper.SchoolRegionMapper;
-import com.miaxis.app.school.service.ISchoolRegionService;
+import com.miaxis.app.school.dto.SchoolRegionDTO;
+import com.miaxis.app.school.dto.SchoolRegionVO;
 import com.miaxis.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
+import com.miaxis.app.school.mapper.SchoolRegionMapper;
+import com.miaxis.app.school.domain.SchoolRegion;
+import com.miaxis.app.school.service.ISchoolRegionService;
 
 /**
  * 驾校训练场Service业务层处理
  *
- * @author miaxis
- * @date 2020-12-23
+ * @author zhangbin
+ * @date 2020-12-28
  */
 @Service
 public class SchoolRegionServiceImpl extends ServiceImpl<SchoolRegionMapper, SchoolRegion> implements ISchoolRegionService {
-    @Resource
+    @Autowired
     private SchoolRegionMapper schoolRegionMapper;
 
     /**
@@ -90,4 +89,14 @@ public class SchoolRegionServiceImpl extends ServiceImpl<SchoolRegionMapper, Sch
     public int deleteSchoolRegionById(Long id){
         return schoolRegionMapper.deleteSchoolRegionById(id);
     }
+
+    /**
+     * 查询驾校训练场列表(图片距离)
+     * @param schoolRegionDTO
+     * @return
+     */
+    @Override
+    public List<SchoolRegionVO> selectSchoolRegionUrlList(SchoolRegionDTO schoolRegionDTO) {
+        return schoolRegionMapper.selectSchoolRegionUrlList(schoolRegionDTO);
+    }
 }

hzgzpt-service-app/src/main/java/com/miaxis/app/service/ISchoolRegionService.java

@@ -1,61 +0,0 @@
-package com.miaxis.app.service;
-
-import java.util.List;
-import com.miaxis.app.domain.SchoolRegion;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * 驾校训练场Service接口
- * 
- * @author zhangbin
- * @date 2020-12-28
- */
-public interface ISchoolRegionService extends IService<SchoolRegion>{
-    /**
-     * 查询驾校训练场
-     * 
-     * @param id 驾校训练场ID
-     * @return 驾校训练场
-     */
-    public SchoolRegion selectSchoolRegionById(Long id);
-
-    /**
-     * 查询驾校训练场列表
-     * 
-     * @param schoolRegion 驾校训练场
-     * @return 驾校训练场集合
-     */
-    public List<SchoolRegion> selectSchoolRegionList(SchoolRegion schoolRegion);
-
-    /**
-     * 新增驾校训练场
-     * 
-     * @param schoolRegion 驾校训练场
-     * @return 结果
-     */
-    public int insertSchoolRegion(SchoolRegion schoolRegion);
-
-    /**
-     * 修改驾校训练场
-     * 
-     * @param schoolRegion 驾校训练场
-     * @return 结果
-     */
-    public int updateSchoolRegion(SchoolRegion schoolRegion);
-
-    /**
-     * 批量删除驾校训练场
-     * 
-     * @param ids 需要删除的驾校训练场ID
-     * @return 结果
-     */
-    public int deleteSchoolRegionByIds(Long[] ids);
-
-    /**
-     * 删除驾校训练场信息
-     * 
-     * @param id 驾校训练场ID
-     * @return 结果
-     */
-    public int deleteSchoolRegionById(Long id);
-}

hzgzpt-service-app/src/main/java/com/miaxis/app/service/impl/SchoolRegionServiceImpl.java

@@ -1,90 +0,0 @@
-package com.miaxis.app.service.impl;
-
-import java.util.List;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.miaxis.app.mapper.SchoolRegionMapper;
-import com.miaxis.app.domain.SchoolRegion;
-import com.miaxis.app.service.ISchoolRegionService;
-
-/**
- * 驾校训练场Service业务层处理
- *
- * @author zhangbin
- * @date 2020-12-28
- */
-@Service
-public class SchoolRegionServiceImpl extends ServiceImpl<SchoolRegionMapper, SchoolRegion> implements ISchoolRegionService {
-    @Autowired
-    private SchoolRegionMapper schoolRegionMapper;
-
-    /**
-     * 查询驾校训练场
-     *
-     * @param id 驾校训练场ID
-     * @return 驾校训练场
-     */
-    @Override
-    public SchoolRegion selectSchoolRegionById(Long id){
-        return schoolRegionMapper.selectSchoolRegionById(id);
-    }
-
-    /**
-     * 查询驾校训练场列表
-     *
-     * @param schoolRegion 驾校训练场
-     * @return 驾校训练场
-     */
-    @Override
-    public List<SchoolRegion> selectSchoolRegionList(SchoolRegion schoolRegion){
-        return schoolRegionMapper.selectSchoolRegionList(schoolRegion);
-    }
-
-    /**
-     * 新增驾校训练场
-     *
-     * @param schoolRegion 驾校训练场
-     * @return 结果
-     */
-    @Override
-    public int insertSchoolRegion(SchoolRegion schoolRegion){
-        schoolRegion.setCreateTime(DateUtils.getNowDate());
-        return schoolRegionMapper.insertSchoolRegion(schoolRegion);
-    }
-
-    /**
-     * 修改驾校训练场
-     *
-     * @param schoolRegion 驾校训练场
-     * @return 结果
-     */
-    @Override
-    public int updateSchoolRegion(SchoolRegion schoolRegion){
-        schoolRegion.setUpdateTime(DateUtils.getNowDate());
-        return schoolRegionMapper.updateSchoolRegion(schoolRegion);
-    }
-
-    /**
-     * 批量删除驾校训练场
-     *
-     * @param ids 需要删除的驾校训练场ID
-     * @return 结果
-     */
-    @Override
-    public int deleteSchoolRegionByIds(Long[] ids){
-        return schoolRegionMapper.deleteSchoolRegionByIds(ids);
-    }
-
-    /**
-     * 删除驾校训练场信息
-     *
-     * @param id 驾校训练场ID
-     * @return 结果
-     */
-    @Override
-    public int deleteSchoolRegionById(Long id){
-        return schoolRegionMapper.deleteSchoolRegionById(id);
-    }
-}

hzgzpt-service-app/src/main/resources/mapper/school/SchoolRegionMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.miaxis.app.mapper.SchoolRegionMapper">
+<mapper namespace="com.miaxis.app.school.mapper.SchoolRegionMapper">
     
     <resultMap type="SchoolRegion" id="SchoolRegionResult">
         <result property="id"    column="id"    />
@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
-    <select id="selectSchoolRegionUrlList" parameterType="SchoolRegionDTO" resultType="SchoolRegionVO">
+    <select id="selectSchoolRegionUrlList" parameterType="com.miaxis.app.school.dto.SchoolRegionDTO" resultType="com.miaxis.app.school.dto.SchoolRegionVO">
         SELECT sr.id,sr.NAME region_name,s.NAME school_name,sr.address,
         sr.area,sr.type,sr.vehicletype,sr.totalvehnum,sr.curvehnum,sr.poi_lon,sr.poi_lat,sri.url,
         (2 * 6378.137 * ASIN(SQRT(POW( SIN( PI( ) * ( 120.211162- s.poi_lon ) / 360 ), 2 ) + COS( PI( ) * 30.186584 / 180 ) * COS( sr.poi_lat * PI( ) / 180 ) * POW( SIN( PI( ) * ( 30.186584- s.poi_lat ) / 360 ), 2 )) ) ) AS distance
@@ -38,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by distance desc
     </select>
 
+
     <sql id="selectSchoolRegionVo">
         select id, inscode, seq, name, address, area, type, vehicletype, polygon, totalvehnum, curvehnum, status, flag, area_code, poi_lon, poi_lat, create_time, update_time from school_region
     </sql>