Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,156 @@
+package com.miaxis.app.controller.school;
+
+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.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+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;
+
+/**
+ * 【驾校】Controller
+ *
+ * @author miaxis
+ * @date 2020-12-24
+ */
+@RestController
+@RequestMapping("/school/info")
+@Api(tags={"【app-驾校】"})
+public class SchoolInfoController extends BaseController{
+    @Autowired
+    private ISchoolInfoService schoolInfoService;
+
+    /**
+     * 查询驾校列表
+     */
+    //@PreAuthorize("@ss.hasPermi('school:info: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<SchoolInfo> list(@ModelAttribute SchoolInfo schoolInfo){
+        startPage();
+        List<SchoolInfo> list = schoolInfoService.selectSchoolInfoList(schoolInfo);
+        return toResponsePageInfo(list);
+    }
+
+    /**
+     * 查询驾校url列表
+     */
+    //@PreAuthorize("@ss.hasPermi('school:info:list')")
+    @GetMapping("/urlList")
+    @ApiOperation("查询驾校url列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<SchoolInfoVO> list(@ModelAttribute SchoolInfoDTO schoolInfoDTO){
+        startPage();
+        List<SchoolInfoVO> list = schoolInfoService.selectSchoolInfoUrlList(schoolInfoDTO);
+        return toResponsePageInfo(list);
+    }
+
+
+    /**
+     * 查询驾校信用列表
+     */
+    //@PreAuthorize("@ss.hasPermi('school:info:list')")
+    @GetMapping("/evalList")
+    @ApiOperation("查询驾校信用列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<SchoolInfoEvalVO> list(@ModelAttribute SchoolInfoEvalDTO schoolInfoEvalDTO){
+        startPage();
+        List<SchoolInfoEvalVO> list = schoolInfoService.selectSchoolInfoEvalList(schoolInfoEvalDTO);
+        return toResponsePageInfo(list);
+    }
+
+
+    /**
+     * 导出驾校列表
+     */
+   // @PreAuthorize("@ss.hasPermi('school:info:export')")
+    @Log(title = "驾校", businessType = BusinessTypeEnum.EXPORT)
+    @GetMapping("/export")
+    @ApiOperation("导出驾校列表Excel")
+    public Response<String> export(@ModelAttribute SchoolInfo schoolInfo){
+        List<SchoolInfo> list = schoolInfoService.selectSchoolInfoList(schoolInfo);
+        ExcelUtil<SchoolInfo> util = new ExcelUtil<SchoolInfo>(SchoolInfo.class);
+        return util.exportExcel(list, "info");
+    }
+
+    /**
+     * 获取驾校详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('school:info:query')")
+    @GetMapping(value = "/{inscode}")
+    @ApiOperation("获取驾校详细信息")
+    public Response<SchoolInfo> getInfo(
+            @ApiParam(name = "inscode", value = "驾校参数", required = true)
+            @PathVariable("inscode") String inscode
+    ){
+        return Response.success(schoolInfoService.selectSchoolInfoById(inscode));
+    }
+
+    /**
+     * 新增驾校
+     */
+    //@PreAuthorize("@ss.hasPermi('school:info:add')")
+    @Log(title = "驾校", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增驾校")
+    public Response<Integer> add(@RequestBody SchoolInfo schoolInfo){
+        return toResponse(schoolInfoService.insertSchoolInfo(schoolInfo));
+    }
+
+    /**
+     * 修改驾校
+     */
+    //@PreAuthorize("@ss.hasPermi('school:info:edit')")
+    @Log(title = "驾校", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改驾校")
+    public Response<Integer> edit(@RequestBody SchoolInfo schoolInfo){
+        return toResponse(schoolInfoService.updateSchoolInfo(schoolInfo));
+    }
+
+    /**
+     * 删除驾校
+     */
+    //@PreAuthorize("@ss.hasPermi('school:info:remove')")
+    @Log(title = "驾校", businessType = BusinessTypeEnum.DELETE)
+	@DeleteMapping("/{inscodes}")
+    @ApiOperation("删除驾校")
+    public  Response<Integer> remove(
+            @ApiParam(name = "inscodes", value = "驾校ids参数", required = true)
+            @PathVariable String[] inscodes
+    ){
+        return toResponse(schoolInfoService.deleteSchoolInfoByIds(inscodes));
+    }
+}

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

@@ -3,6 +3,8 @@ 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.core.page.ResponsePageInfo;
 import com.miaxis.common.utils.poi.ExcelUtil;
@@ -40,7 +42,7 @@ public class SchoolRegionController extends BaseController{
     /**
      * 查询驾校训练场列表
      */
-    @PreAuthorize("@ss.hasPermi('system:region:list')")
+    //@PreAuthorize("@ss.hasPermi('system:region:list')")
     @GetMapping("/list")
     @ApiOperation("查询驾校训练场列表")
     @ApiImplicitParams({
@@ -53,6 +55,23 @@ public class SchoolRegionController extends BaseController{
         return toResponsePageInfo(list);
     }
 
+    /**
+     * 查询驾校训练场列表（图片距离）
+     */
+    //@PreAuthorize("@ss.hasPermi('system:region: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<SchoolRegionVO> list(@ModelAttribute SchoolRegionDTO schoolRegionDTO){
+        startPage();
+        List<SchoolRegionVO> list = schoolRegionService.selectSchoolRegionList(schoolRegionDTO);
+        return toResponsePageInfo(list);
+    }
+
+
     /**
      * 导出驾校训练场列表
      */

hzgzpt-admin/src/main/resources/application-prod.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://192.168.8.213:3306/hzgzpt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+                url: jdbc:mysql://218.85.55.253:3306/hzgzpt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
                 username: root
                 password: 123456
             # 从库数据源

hzgzpt-common/src/main/java/com/miaxis/common/utils/uuid/IdUtils.java

@@ -1,5 +1,8 @@
 package com.miaxis.common.utils.uuid;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 /**
  * ID生成器工具类
  * 
@@ -46,4 +49,16 @@ public class IdUtils
     {
         return UUID.fastUUID().toString(true);
     }
+
+
+    /**
+     * 学员ID生成
+     * @return
+     */
+    public static synchronized String getUserId() {
+        Date date =new Date();
+        String userId = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(date);
+        return userId;
+    }
+
 }

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

@@ -0,0 +1,419 @@
+package com.miaxis.app.school.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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_info
+ *
+ * @author miaxis
+ * @date 2020-12-24
+ */
+@Data
+@TableName("school_info")
+@ApiModel(value = "SchoolInfo", description = "驾校对象 school_info")
+public class SchoolInfo extends BaseBusinessEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** 驾校全国统一编号 */
+    @TableId(value = "inscode")
+    @ApiModelProperty(value = "驾校全国统一编号")
+    private String inscode;
+
+    /** 驾校名称 */
+    @Excel(name = "驾校名称")
+    @TableField("name")
+    @ApiModelProperty(value = "驾校名称")
+    private String name;
+
+    /** 驾校简称 */
+    @Excel(name = "驾校简称")
+    @TableField("sname")
+    @ApiModelProperty(value = "驾校简称")
+    private String sname;
+
+    /** 驾校地址 */
+    @Excel(name = "驾校地址")
+    @TableField("address")
+    @ApiModelProperty(value = "驾校地址")
+    private String address;
+
+    /** 法人代表证件号码 */
+    @Excel(name = "法人代表证件号码")
+    @TableField("legal_person_id_number")
+    @ApiModelProperty(value = "法人代表证件号码")
+    private String legalPersonIdNumber;
+
+    /** 经营负责人 */
+    @Excel(name = "经营负责人")
+    @TableField("responsible_person")
+    @ApiModelProperty(value = "经营负责人")
+    private String responsiblePerson;
+
+    /** 法人代表 */
+    @Excel(name = "法人代表")
+    @TableField("legal_person_name")
+    @ApiModelProperty(value = "法人代表")
+    private String legalPersonName;
+
+    /** 行政区划名称 */
+    @Excel(name = "行政区划名称")
+    @TableField("area_name")
+    @ApiModelProperty(value = "行政区划名称")
+    private String areaName;
+
+    /** 行政区划代码 */
+    @Excel(name = "行政区划代码")
+    @TableField("area_code")
+    @ApiModelProperty(value = "行政区划代码")
+    private String areaCode;
+
+    /** 驾校电话 */
+    @Excel(name = "驾校电话")
+    @TableField("tel")
+    @ApiModelProperty(value = "驾校电话")
+    private String tel;
+
+    /** 驾校微信号 */
+    @Excel(name = "驾校微信号")
+    @TableField("wechar")
+    @ApiModelProperty(value = "驾校微信号")
+    private String wechar;
+
+    /** 注册日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "注册日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("registration_date")
+    @ApiModelProperty(value = "注册日期")
+    private Date registrationDate;
+
+    /** 经营许可证号 */
+    @Excel(name = "经营许可证号")
+    @TableField("license_number")
+    @ApiModelProperty(value = "经营许可证号")
+    private String licenseNumber;
+
+    /** 经营许可证字 */
+    @Excel(name = "经营许可证字")
+    @TableField("license_word")
+    @ApiModelProperty(value = "经营许可证字")
+    private String licenseWord;
+
+    /** 有效期起 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "有效期起", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("license_valid_period_from")
+    @ApiModelProperty(value = "有效期起")
+    private Date licenseValidPeriodFrom;
+
+    /** 有效期止 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "有效期止", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("license_valid_period_end")
+    @ApiModelProperty(value = "有效期止")
+    private Date licenseValidPeriodEnd;
+
+    /** 上年度信用等级 */
+    @Excel(name = "上年度信用等级")
+    @TableField("credibility_grade")
+    @ApiModelProperty(value = "上年度信用等级")
+    private String credibilityGrade;
+
+    /** 当前信用得分 */
+    @Excel(name = "当前信用得分")
+    @TableField("credibility_score")
+    @ApiModelProperty(value = "当前信用得分")
+    private String credibilityScore;
+
+    /** 业户车辆总数 */
+    @Excel(name = "业户车辆总数")
+    @TableField("vehicle_sum")
+    @ApiModelProperty(value = "业户车辆总数")
+    private Long vehicleSum;
+
+    /** 注册资金（单位:万元） */
+    @Excel(name = "注册资金", readConverterExp = "单=位:万元")
+    @TableField("regcapital")
+    @ApiModelProperty(value = "注册资金（单位:万元）")
+    private Long regcapital;
+
+    /** 工商执照号 */
+    @Excel(name = "工商执照号")
+    @TableField("bizlicense")
+    @ApiModelProperty(value = "工商执照号")
+    private String bizlicense;
+
+    /** 原始gps经度，单位为1*10-6 度 */
+    @Excel(name = "原始gps经度，单位为1*10-6 度")
+    @TableField("poi_lon")
+    @ApiModelProperty(value = "原始gps经度，单位为1*10-6 度")
+    private BigDecimal poiLon;
+
+    /** 原始gps纬度，单位为1*10-6 度 */
+    @Excel(name = "原始gps纬度，单位为1*10-6 度")
+    @TableField("poi_lat")
+    @ApiModelProperty(value = "原始gps纬度，单位为1*10-6 度")
+    private BigDecimal poiLat;
+
+    /** 逻辑删除标识（1：是；0：否） */
+    @Excel(name = "逻辑删除标识", readConverterExp = "1=：是；0：否")
+    @TableField("removed")
+    @ApiModelProperty(value = "逻辑删除标识（1：是；0：否）")
+    private Long removed;
+
+    /** 初次领证日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "初次领证日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("initial_receipt_date")
+    @ApiModelProperty(value = "初次领证日期")
+    private Date initialReceiptDate;
+
+    /** 业户经营状态 */
+    @Excel(name = "业户经营状态")
+    @TableField("business_status_name")
+    @ApiModelProperty(value = "业户经营状态")
+    private String businessStatusName;
+
+    /** 培训车型 */
+    @Excel(name = "培训车型")
+    @TableField("pxcx")
+    @ApiModelProperty(value = "培训车型")
+    private String pxcx;
+
+    public void setInscode(String inscode){
+        this.inscode = inscode;
+    }
+
+    public String getInscode(){
+        return inscode;
+    }
+    public void setName(String name){
+        this.name = name;
+    }
+
+    public String getName(){
+        return name;
+    }
+    public void setSname(String sname){
+        this.sname = sname;
+    }
+
+    public String getSname(){
+        return sname;
+    }
+    public void setAddress(String address){
+        this.address = address;
+    }
+
+    public String getAddress(){
+        return address;
+    }
+    public void setLegalPersonIdNumber(String legalPersonIdNumber){
+        this.legalPersonIdNumber = legalPersonIdNumber;
+    }
+
+    public String getLegalPersonIdNumber(){
+        return legalPersonIdNumber;
+    }
+    public void setResponsiblePerson(String responsiblePerson){
+        this.responsiblePerson = responsiblePerson;
+    }
+
+    public String getResponsiblePerson(){
+        return responsiblePerson;
+    }
+    public void setLegalPersonName(String legalPersonName){
+        this.legalPersonName = legalPersonName;
+    }
+
+    public String getLegalPersonName(){
+        return legalPersonName;
+    }
+    public void setAreaName(String areaName){
+        this.areaName = areaName;
+    }
+
+    public String getAreaName(){
+        return areaName;
+    }
+    public void setAreaCode(String areaCode){
+        this.areaCode = areaCode;
+    }
+
+    public String getAreaCode(){
+        return areaCode;
+    }
+    public void setTel(String tel){
+        this.tel = tel;
+    }
+
+    public String getTel(){
+        return tel;
+    }
+    public void setWechar(String wechar){
+        this.wechar = wechar;
+    }
+
+    public String getWechar(){
+        return wechar;
+    }
+    public void setRegistrationDate(Date registrationDate){
+        this.registrationDate = registrationDate;
+    }
+
+    public Date getRegistrationDate(){
+        return registrationDate;
+    }
+    public void setLicenseNumber(String licenseNumber){
+        this.licenseNumber = licenseNumber;
+    }
+
+    public String getLicenseNumber(){
+        return licenseNumber;
+    }
+    public void setLicenseWord(String licenseWord){
+        this.licenseWord = licenseWord;
+    }
+
+    public String getLicenseWord(){
+        return licenseWord;
+    }
+    public void setLicenseValidPeriodFrom(Date licenseValidPeriodFrom){
+        this.licenseValidPeriodFrom = licenseValidPeriodFrom;
+    }
+
+    public Date getLicenseValidPeriodFrom(){
+        return licenseValidPeriodFrom;
+    }
+    public void setLicenseValidPeriodEnd(Date licenseValidPeriodEnd){
+        this.licenseValidPeriodEnd = licenseValidPeriodEnd;
+    }
+
+    public Date getLicenseValidPeriodEnd(){
+        return licenseValidPeriodEnd;
+    }
+    public void setCredibilityGrade(String credibilityGrade){
+        this.credibilityGrade = credibilityGrade;
+    }
+
+    public String getCredibilityGrade(){
+        return credibilityGrade;
+    }
+    public void setCredibilityScore(String credibilityScore){
+        this.credibilityScore = credibilityScore;
+    }
+
+    public String getCredibilityScore(){
+        return credibilityScore;
+    }
+    public void setVehicleSum(Long vehicleSum){
+        this.vehicleSum = vehicleSum;
+    }
+
+    public Long getVehicleSum(){
+        return vehicleSum;
+    }
+    public void setRegcapital(Long regcapital){
+        this.regcapital = regcapital;
+    }
+
+    public Long getRegcapital(){
+        return regcapital;
+    }
+    public void setBizlicense(String bizlicense){
+        this.bizlicense = bizlicense;
+    }
+
+    public String getBizlicense(){
+        return bizlicense;
+    }
+    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;
+    }
+    public void setRemoved(Long removed){
+        this.removed = removed;
+    }
+
+    public Long getRemoved(){
+        return removed;
+    }
+    public void setInitialReceiptDate(Date initialReceiptDate){
+        this.initialReceiptDate = initialReceiptDate;
+    }
+
+    public Date getInitialReceiptDate(){
+        return initialReceiptDate;
+    }
+    public void setBusinessStatusName(String businessStatusName){
+        this.businessStatusName = businessStatusName;
+    }
+
+    public String getBusinessStatusName(){
+        return businessStatusName;
+    }
+    public void setPxcx(String pxcx){
+        this.pxcx = pxcx;
+    }
+
+    public String getPxcx(){
+        return pxcx;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("inscode", getInscode())
+            .append("name", getName())
+            .append("sname", getSname())
+            .append("address", getAddress())
+            .append("legalPersonIdNumber", getLegalPersonIdNumber())
+            .append("responsiblePerson", getResponsiblePerson())
+            .append("legalPersonName", getLegalPersonName())
+            .append("areaName", getAreaName())
+            .append("areaCode", getAreaCode())
+            .append("tel", getTel())
+            .append("wechar", getWechar())
+            .append("registrationDate", getRegistrationDate())
+            .append("licenseNumber", getLicenseNumber())
+            .append("licenseWord", getLicenseWord())
+            .append("licenseValidPeriodFrom", getLicenseValidPeriodFrom())
+            .append("licenseValidPeriodEnd", getLicenseValidPeriodEnd())
+            .append("credibilityGrade", getCredibilityGrade())
+            .append("credibilityScore", getCredibilityScore())
+            .append("vehicleSum", getVehicleSum())
+            .append("regcapital", getRegcapital())
+            .append("bizlicense", getBizlicense())
+            .append("poiLon", getPoiLon())
+            .append("poiLat", getPoiLat())
+            .append("removed", getRemoved())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("initialReceiptDate", getInitialReceiptDate())
+            .append("businessStatusName", getBusinessStatusName())
+            .append("pxcx", getPxcx())
+            .toString();
+    }
+}

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

@@ -5,6 +5,7 @@ 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 com.miaxis.common.core.domain.BaseBusinessEntity;
 import com.miaxis.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -21,7 +22,7 @@ import java.util.Date;
 @Data
 @TableName("school_region")
 @ApiModel(value = "SchoolRegion", description = "驾校训练场对象 school_region")
-public class SchoolRegion extends BaseEntity{
+public class SchoolRegion extends BaseBusinessEntity {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
@@ -29,12 +30,6 @@ public class SchoolRegion extends BaseEntity{
     @ApiModelProperty(value = "$column.columnComment")
     private Long id;
 
-    /** 运政ID */
-    @Excel(name = "运政ID")
-    @TableField("school_id")
-    @ApiModelProperty(value = "运政ID")
-    private String schoolId;
-
     /** 驾校全国统一编号 */
     @Excel(name = "驾校全国统一编号")
     @TableField("inscode")
@@ -101,11 +96,6 @@ public class SchoolRegion extends BaseEntity{
     @ApiModelProperty(value = "备案状态： 0：未备案 1：已备案")
     private Long status;
 
-    /** 审核状态： 0：待审核 1：同意启用 2：不同意启用 */
-    @Excel(name = "审核状态： 0：待审核 1：同意启用 2：不同意启用")
-    @TableField("crdate")
-    @ApiModelProperty(value = "审核状态： 0：待审核 1：同意启用 2：不同意启用")
-    private Long crdate;
 
     /** 审核时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")

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

@@ -0,0 +1,43 @@
+package com.miaxis.app.school.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 驾校对象 school_info
+ *
+ * @author miaxis
+ * @date 2020-12-24
+ */
+@Data
+@ApiModel(value = "SchoolInfoDTO", description = "驾校对象 school_infoDTO")
+public class SchoolInfoDTO  {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 驾校名称 */
+    @ApiModelProperty(value = "驾校名称")
+    private String name;
+
+    /** 排序字段 */
+    @ApiModelProperty(value = "排序字段：学员口碑:starts 信用等级:credibility_score 距离:distance")
+    private String orderName;
+
+    /** 排序名称 */
+    @ApiModelProperty(value = "排序名称:降序desc 升序asc")
+    private String orderType;
+
+    /** 当前经度 */
+    @ApiModelProperty(value = "当前经度")
+    private String lon;
+
+    /** 当前纬度 */
+    @ApiModelProperty(value = "当前纬度")
+    private String lat;
+
+    /** 行政区划代码 */
+    @ApiModelProperty(value = "行政区划代码")
+    private String areaCode;
+
+}

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

@@ -0,0 +1,27 @@
+package com.miaxis.app.school.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 驾校对象 school_info
+ *
+ * @author miaxis
+ * @date 2020-12-24
+ */
+@Data
+@ApiModel(value = "SchoolInfoDTO", description = "驾校对象 school_infoDTO")
+public class SchoolInfoEvalDTO {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 驾校名称 */
+    @ApiModelProperty(value = "驾校名称")
+    private String name;
+
+    /** 行政区划代码 */
+    @ApiModelProperty(value = "行政区划代码")
+    private String areaCode;
+
+}

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

@@ -0,0 +1,39 @@
+package com.miaxis.app.school.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 驾校对象返回对象 SchoolInfoEvalVO
+ * 驾校信息排名列表
+ * @author zhangbin
+ * @date 2020-12-24
+ */
+@Data
+@ApiModel(value = "SchoolInfoEvalVO", description = "驾校返回对象 SchoolInfoEvalVO")
+public class SchoolInfoEvalVO extends BaseBusinessEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** 驾校全国统一编号 */
+    @ApiModelProperty(value = "驾校全国统一编号")
+    private String inscode;
+
+    /** 驾校名称 */
+    @ApiModelProperty(value = "驾校名称")
+    private String name;
+
+    /** 评价星级 */
+    @ApiModelProperty(value = "评价星级")
+    private String stars;
+
+    /** 总评价条数 */
+    @ApiModelProperty(value = "总评价条数")
+    private String total;
+
+}

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

@@ -0,0 +1,143 @@
+package com.miaxis.app.school.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 驾校对象返回对象 SchoolInfoVO
+ *
+ * @author miaxis
+ * @date 2020-12-24
+ */
+@Data
+@ApiModel(value = "SchoolInfoVO", description = "驾校返回对象 SchoolInfoVO")
+public class SchoolInfoVO extends BaseBusinessEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** 驾校全国统一编号 */
+    @ApiModelProperty(value = "驾校全国统一编号")
+    private String inscode;
+
+    /** 驾校名称 */
+    @ApiModelProperty(value = "驾校名称")
+    private String name;
+
+    /** 驾校简称 */
+    @ApiModelProperty(value = "驾校简称")
+    private String sname;
+
+    /** 驾校地址 */
+    @ApiModelProperty(value = "驾校地址")
+    private String address;
+
+    /** 法人代表证件号码 */
+    @ApiModelProperty(value = "法人代表证件号码")
+    private String legalPersonIdNumber;
+
+    /** 经营负责人 */
+    @ApiModelProperty(value = "经营负责人")
+    private String responsiblePerson;
+
+    /** 法人代表 */
+    @ApiModelProperty(value = "法人代表")
+    private String legalPersonName;
+
+    /** 行政区划名称 */
+    @ApiModelProperty(value = "行政区划名称")
+    private String areaName;
+
+    /** 行政区划代码 */
+    @ApiModelProperty(value = "行政区划代码")
+    private String areaCode;
+
+    /** 驾校电话 */
+    @ApiModelProperty(value = "驾校电话")
+    private String tel;
+
+    /** 驾校微信号 */
+    @ApiModelProperty(value = "驾校微信号")
+    private String wechar;
+
+    /** 注册日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "注册日期")
+    private Date registrationDate;
+
+    /** 经营许可证号 */
+    @ApiModelProperty(value = "经营许可证号")
+    private String licenseNumber;
+
+    /** 经营许可证字 */
+    @ApiModelProperty(value = "经营许可证字")
+    private String licenseWord;
+
+    /** 有效期起 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "有效期起")
+    private Date licenseValidPeriodFrom;
+
+    /** 有效期止 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "有效期止")
+    private Date licenseValidPeriodEnd;
+
+    /** 上年度信用等级 */
+    @ApiModelProperty(value = "上年度信用等级")
+    private String credibilityGrade;
+
+    /** 当前信用得分 */
+    @ApiModelProperty(value = "当前信用得分")
+    private String credibilityScore;
+
+    /** 业户车辆总数 */
+    @ApiModelProperty(value = "业户车辆总数")
+    private Long vehicleSum;
+
+    /** 注册资金（单位:万元） */
+    @ApiModelProperty(value = "注册资金（单位:万元）")
+    private Long regcapital;
+
+    /** 工商执照号 */
+    @ApiModelProperty(value = "工商执照号")
+    private String bizlicense;
+
+    /** 原始gps经度，单位为1*10-6 度 */
+    @ApiModelProperty(value = "原始gps经度，单位为1*10-6 度")
+    private BigDecimal poiLon;
+
+    /** 原始gps纬度，单位为1*10-6 度 */
+    @ApiModelProperty(value = "原始gps纬度，单位为1*10-6 度")
+    private BigDecimal poiLat;
+
+    /** 逻辑删除标识（1：是；0：否） */
+    @ApiModelProperty(value = "逻辑删除标识（1：是；0：否）")
+    private Long removed;
+
+    /** 初次领证日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "初次领证日期")
+    private Date initialReceiptDate;
+
+    /** 业户经营状态 */
+    @ApiModelProperty(value = "业户经营状态")
+    private String businessStatusName;
+
+    /** 培训车型 */
+    @ApiModelProperty(value = "培训车型")
+    private String pxcx;
+
+    /** 学员口碑 */
+    @ApiModelProperty(value = "学员口碑")
+    private String starts;
+
+    /** 当前距离 */
+    @ApiModelProperty(value = "当前距离")
+    private String distance;
+
+}

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

@@ -0,0 +1,31 @@
+package com.miaxis.app.school.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 驾校对象 school_info
+ *
+ * @author miaxis
+ * @date 2020-12-24
+ */
+@Data
+@ApiModel(value = "SchoolInfoDTO", description = "驾校对象 school_infoDTO")
+public class SchoolRegionDTO {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 当前经度 */
+    @ApiModelProperty(value = "当前经度")
+    private String lon;
+
+    /** 当前纬度 */
+    @ApiModelProperty(value = "当前纬度")
+    private String lat;
+
+    /** 行政区划代码 */
+    @ApiModelProperty(value = "行政区划代码")
+    private String areaCode;
+
+}

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

@@ -0,0 +1,82 @@
+package com.miaxis.app.school.dto;
+
+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 com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 驾校训练场对象 school_region
+ *
+ * @author miaxis
+ * @date 2020-12-23
+ */
+@Data
+@ApiModel(value = "SchoolRegionVO", description = "驾校训练场对象 school_region")
+public class SchoolRegionVO extends BaseBusinessEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    @ApiModelProperty(value = "$column.columnComment")
+    private Long id;
+
+    /** 教学区域名称 */
+    @ApiModelProperty(value = "教学区域名称")
+    private String regionName;
+
+    /** 驾校名称 */
+    @ApiModelProperty(value = "驾校名称")
+    private String schoolName;
+
+    /** 教学区域地址 */
+    @ApiModelProperty(value = "教学区域地址")
+    private String address;
+
+    /** 区县编号 */
+    @ApiModelProperty(value = "区县编号")
+    private String areaCode;
+
+    /** 教学区域面积 */
+    @ApiModelProperty(value = "教学区域面积")
+    private Long area;
+
+    /** 教学区域类型 1：第二部分；2：第三部分 */
+    @ApiModelProperty(value = "教学区域类型 1：第二部分；2：第三部分")
+    private Long type;
+
+    /** 培训车型 */
+    @ApiModelProperty(value = "培训车型")
+    private String vehicletype;
+
+    /** 可容纳车辆数 */
+    @ApiModelProperty(value = "可容纳车辆数")
+    private Long totalvehnum;
+
+    /** 已投放车辆数 */
+    @ApiModelProperty(value = "已投放车辆数")
+    private Long curvehnum;
+
+
+    /** lon经度 */
+    @ApiModelProperty(value = "已投放车辆数")
+    private Double lon;
+
+    /** lat纬度 */
+    @ApiModelProperty(value = "已投放车辆数")
+    private Double  lat;
+
+
+
+    /** 图片url */
+    @ApiModelProperty(value = "图片url")
+    private String url;
+
+}

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

@@ -0,0 +1,84 @@
+package com.miaxis.app.school.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+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;
+
+/**
+ * 驾校Mapper接口
+ *
+ * @author miaxis
+ * @date 2020-12-24
+ */
+public interface SchoolInfoMapper extends BaseMapper<SchoolInfo> {
+    /**
+     * 查询驾校
+     *
+     * @param inscode 驾校ID
+     * @return 驾校
+     */
+    public SchoolInfo selectSchoolInfoById(String inscode);
+
+    /**
+     * 查询驾校列表
+     *
+     * @param schoolInfo 驾校
+     * @return 驾校集合
+     */
+    public List<SchoolInfo> selectSchoolInfoList(SchoolInfo schoolInfo);
+
+
+    /**
+     * 查询驾校列表
+     *
+     * @param schoolInfoDTO 驾校
+     * @return 驾校集合
+     */
+    public List<SchoolInfoVO> selectSchoolInfoUrlList(SchoolInfoDTO schoolInfoDTO);
+
+    /**
+     * 查询驾校信用列表
+     *
+     * @param schoolInfoEvalDTO 驾校
+     * @return 驾校集合
+     */
+    public List<SchoolInfoEvalVO> selectSchoolInfoEvalList(SchoolInfoEvalDTO schoolInfoEvalDTO);
+
+    /**
+     * 新增驾校
+     *
+     * @param schoolInfo 驾校
+     * @return 结果
+     */
+    public int insertSchoolInfo(SchoolInfo schoolInfo);
+
+    /**
+     * 修改驾校
+     *
+     * @param schoolInfo 驾校
+     * @return 结果
+     */
+    public int updateSchoolInfo(SchoolInfo schoolInfo);
+
+    /**
+     * 删除驾校
+     *
+     * @param inscode 驾校ID
+     * @return 结果
+     */
+    public int deleteSchoolInfoById(String inscode);
+
+    /**
+     * 批量删除驾校
+     *
+     * @param inscodes 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSchoolInfoByIds(String[] inscodes);
+}

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

@@ -0,0 +1,83 @@
+package com.miaxis.app.school.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+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 java.util.List;
+
+/**
+ * 驾校Service接口
+ * 
+ * @author miaxis
+ * @date 2020-12-24
+ */
+public interface ISchoolInfoService extends IService<SchoolInfo>{
+    /**
+     * 查询驾校
+     * 
+     * @param inscode 驾校ID
+     * @return 驾校
+     */
+    public SchoolInfo selectSchoolInfoById(String inscode);
+
+    /**
+     * 查询驾校列表
+     * 
+     * @param schoolInfo 驾校
+     * @return 驾校集合
+     */
+    public List<SchoolInfo> selectSchoolInfoList(SchoolInfo schoolInfo);
+
+
+    /**
+     * 查询驾校列表
+     *
+     * @param schoolInfoDTO 驾校
+     * @return 驾校集合
+     */
+    public List<SchoolInfoVO> selectSchoolInfoUrlList(SchoolInfoDTO schoolInfoDTO);
+
+    /**
+     * 查询驾校信用列表
+     *
+     * @param schoolInfoEvalDTO 驾校
+     * @return 驾校集合
+     */
+    public List<SchoolInfoEvalVO> selectSchoolInfoEvalList(SchoolInfoEvalDTO schoolInfoEvalDTO);
+
+    /**
+     * 新增驾校
+     * 
+     * @param schoolInfo 驾校
+     * @return 结果
+     */
+    public int insertSchoolInfo(SchoolInfo schoolInfo);
+
+    /**
+     * 修改驾校
+     * 
+     * @param schoolInfo 驾校
+     * @return 结果
+     */
+    public int updateSchoolInfo(SchoolInfo schoolInfo);
+
+    /**
+     * 批量删除驾校
+     * 
+     * @param inscodes 需要删除的驾校ID
+     * @return 结果
+     */
+    public int deleteSchoolInfoByIds(String[] inscodes);
+
+    /**
+     * 删除驾校信息
+     * 
+     * @param inscode 驾校ID
+     * @return 结果
+     */
+    public int deleteSchoolInfoById(String inscode);
+}

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

@@ -3,6 +3,8 @@ package com.miaxis.app.school.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.miaxis.app.school.domain.SchoolRegion;
+import com.miaxis.app.school.dto.SchoolRegionDTO;
+import com.miaxis.app.school.dto.SchoolRegionVO;
 
 import java.util.List;
 
@@ -29,6 +31,14 @@ public interface ISchoolRegionService extends IService<SchoolRegion> {
      */
     public List<SchoolRegion> selectSchoolRegionList(SchoolRegion schoolRegion);
 
+    /**
+     * 查询驾校训练场图片列表（经纬度距离）
+     *
+     * @param schoolRegionDTO 驾校训练场
+     * @return 驾校训练场集合
+     */
+    public List<SchoolRegionVO> selectSchoolRegionList(SchoolRegionDTO schoolRegionDTO);
+
     /**
      * 新增驾校训练场
      * 

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

@@ -0,0 +1,120 @@
+package com.miaxis.app.school.service.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.miaxis.app.school.mapper.SchoolInfoMapper;
+import com.miaxis.app.school.domain.SchoolInfo;
+import com.miaxis.app.school.service.ISchoolInfoService;
+
+/**
+ * 驾校Service业务层处理
+ *
+ * @author miaxis
+ * @date 2020-12-24
+ */
+@Service
+public class SchoolInfoServiceImpl extends ServiceImpl<SchoolInfoMapper, SchoolInfo> implements ISchoolInfoService {
+    @Autowired
+    private SchoolInfoMapper schoolInfoMapper;
+
+    /**
+     * 查询驾校
+     *
+     * @param inscode 驾校ID
+     * @return 驾校
+     */
+    @Override
+    public SchoolInfo selectSchoolInfoById(String inscode){
+        return schoolInfoMapper.selectSchoolInfoById(inscode);
+    }
+
+    /**
+     * 查询驾校列表
+     *
+     * @param schoolInfo 驾校
+     * @return 驾校
+     */
+    @Override
+    public List<SchoolInfo> selectSchoolInfoList(SchoolInfo schoolInfo){
+        return schoolInfoMapper.selectSchoolInfoList(schoolInfo);
+    }
+
+
+    /**
+     * 查询驾校列表
+     *
+     * @param schoolInfoDTO 驾校
+     * @return 驾校
+     */
+    @Override
+    public List<SchoolInfoVO> selectSchoolInfoUrlList(SchoolInfoDTO schoolInfoDTO){
+        return schoolInfoMapper.selectSchoolInfoUrlList(schoolInfoDTO);
+    }
+
+    /**
+     * 查询驾校列表
+     *
+     * @param schoolInfoEvalDTO 驾校
+     * @return 驾校
+     */
+    @Override
+    public List<SchoolInfoEvalVO> selectSchoolInfoEvalList(SchoolInfoEvalDTO schoolInfoEvalDTO) {
+        return schoolInfoMapper.selectSchoolInfoEvalList(schoolInfoEvalDTO);
+    }
+
+
+    /**
+     * 新增驾校
+     *
+     * @param schoolInfo 驾校
+     * @return 结果
+     */
+    @Override
+    public int insertSchoolInfo(SchoolInfo schoolInfo){
+        schoolInfo.setCreateTime(DateUtils.getNowDate());
+        return schoolInfoMapper.insertSchoolInfo(schoolInfo);
+    }
+
+    /**
+     * 修改驾校
+     *
+     * @param schoolInfo 驾校
+     * @return 结果
+     */
+    @Override
+    public int updateSchoolInfo(SchoolInfo schoolInfo){
+        schoolInfo.setUpdateTime(DateUtils.getNowDate());
+        return schoolInfoMapper.updateSchoolInfo(schoolInfo);
+    }
+
+    /**
+     * 批量删除驾校
+     *
+     * @param inscodes 需要删除的驾校ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSchoolInfoByIds(String[] inscodes){
+        return schoolInfoMapper.deleteSchoolInfoByIds(inscodes);
+    }
+
+    /**
+     * 删除驾校信息
+     *
+     * @param inscode 驾校ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSchoolInfoById(String inscode){
+        return schoolInfoMapper.deleteSchoolInfoById(inscode);
+    }
+}

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

@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.miaxis.app.school.mapper.SchoolInfoMapper">
+    
+    <resultMap type="SchoolInfo" id="SchoolInfoResult">
+        <result property="inscode"    column="inscode"    />
+        <result property="name"    column="name"    />
+        <result property="sname"    column="sname"    />
+        <result property="address"    column="address"    />
+        <result property="legalPersonIdNumber"    column="legal_person_id_number"    />
+        <result property="responsiblePerson"    column="responsible_person"    />
+        <result property="legalPersonName"    column="legal_person_name"    />
+        <result property="areaName"    column="area_name"    />
+        <result property="areaCode"    column="area_code"    />
+        <result property="tel"    column="tel"    />
+        <result property="wechar"    column="wechar"    />
+        <result property="registrationDate"    column="registration_date"    />
+        <result property="licenseNumber"    column="license_number"    />
+        <result property="licenseWord"    column="license_word"    />
+        <result property="licenseValidPeriodFrom"    column="license_valid_period_from"    />
+        <result property="licenseValidPeriodEnd"    column="license_valid_period_end"    />
+        <result property="credibilityGrade"    column="credibility_grade"    />
+        <result property="credibilityScore"    column="credibility_score"    />
+        <result property="vehicleSum"    column="vehicle_sum"    />
+        <result property="regcapital"    column="regcapital"    />
+        <result property="bizlicense"    column="bizlicense"    />
+        <result property="poiLon"    column="poi_lon"    />
+        <result property="poiLat"    column="poi_lat"    />
+        <result property="removed"    column="removed"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="initialReceiptDate"    column="initial_receipt_date"    />
+        <result property="businessStatusName"    column="business_status_name"    />
+        <result property="pxcx"    column="pxcx"    />
+    </resultMap>
+
+    <select id="selectSchoolInfoUrlList" parameterType="com.miaxis.app.school.dto.SchoolInfoDTO" resultType="com.miaxis.app.school.dto.SchoolInfoVO">
+        SELECT s.*,(2 * 6378.137 * ASIN(SQRT(POW( SIN( PI( ) * ( #{lon}- s.poi_lon ) / 360 ), 2 ) + COS( PI( ) * #{lat} / 180 ) * COS( s.poi_lat * PI( ) / 180 ) * POW( SIN( PI( ) * ( #{lat}- s.poi_lat ) / 360 ), 2 )) ) ) AS distance FROM school_info s
+        LEFT JOIN (SELECT * FROM school_images i WHERE i.is_top = 1) i
+        ON s.inscode = i.inscode
+        left join (SELECT inscode,avg(e.START) as starts FROM school_evaluate e GROUP BY inscode) m
+        on s.inscode = m.inscode
+        <where>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="areaCode != null  and areaCode != ''"> and area_code = #{areaCode}</if>
+        </where>
+
+        <if test="orderName!=null and orderType!=null">
+            order by ${orderName} ${orderType}
+        </if>
+    </select>
+
+
+    <select id="selectSchoolInfoEvalList" parameterType="com.miaxis.app.school.dto.SchoolInfoEvalDTO" resultType="com.miaxis.app.school.dto.SchoolInfoEvalVO">
+        SELECT s.inscode,s.name,m.stars,m.total
+        FROM school_info s
+        left join (SELECT inscode,avg(e.STAR) as stars,count(1) as total FROM school_evaluate e GROUP BY inscode) m
+        on s.inscode = m.inscode
+        <where>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="areaCode != null  and areaCode != ''"> and area_code = #{areaCode}</if>
+        </where>
+        order by stars desc
+    </select>
+
+
+
+    <sql id="selectSchoolInfoVo">
+        select inscode, name, sname, address, legal_person_id_number, responsible_person, legal_person_name, area_name, area_code, tel, wechar, registration_date, license_number, license_word, license_valid_period_from, license_valid_period_end, credibility_grade, credibility_score, vehicle_sum, regcapital, bizlicense, poi_lon, poi_lat, removed, create_time, update_time, initial_receipt_date, business_status_name, pxcx from school_info
+    </sql>
+
+    <select id="selectSchoolInfoList" parameterType="SchoolInfo" resultMap="SchoolInfoResult">
+        <include refid="selectSchoolInfoVo"/>
+        <where>  
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="sname != null  and sname != ''"> and sname like concat('%', #{sname}, '%')</if>
+            <if test="address != null  and address != ''"> and address = #{address}</if>
+            <if test="legalPersonIdNumber != null  and legalPersonIdNumber != ''"> and legal_person_id_number = #{legalPersonIdNumber}</if>
+            <if test="responsiblePerson != null  and responsiblePerson != ''"> and responsible_person = #{responsiblePerson}</if>
+            <if test="legalPersonName != null  and legalPersonName != ''"> and legal_person_name like concat('%', #{legalPersonName}, '%')</if>
+            <if test="areaName != null  and areaName != ''"> and area_name like concat('%', #{areaName}, '%')</if>
+            <if test="areaCode != null  and areaCode != ''"> and area_code = #{areaCode}</if>
+            <if test="tel != null  and tel != ''"> and tel = #{tel}</if>
+            <if test="wechar != null  and wechar != ''"> and wechar = #{wechar}</if>
+            <if test="registrationDate != null "> and registration_date = #{registrationDate}</if>
+            <if test="licenseNumber != null  and licenseNumber != ''"> and license_number = #{licenseNumber}</if>
+            <if test="licenseWord != null  and licenseWord != ''"> and license_word = #{licenseWord}</if>
+            <if test="licenseValidPeriodFrom != null "> and license_valid_period_from = #{licenseValidPeriodFrom}</if>
+            <if test="licenseValidPeriodEnd != null "> and license_valid_period_end = #{licenseValidPeriodEnd}</if>
+            <if test="credibilityGrade != null  and credibilityGrade != ''"> and credibility_grade = #{credibilityGrade}</if>
+            <if test="credibilityScore != null  and credibilityScore != ''"> and credibility_score = #{credibilityScore}</if>
+            <if test="vehicleSum != null "> and vehicle_sum = #{vehicleSum}</if>
+            <if test="regcapital != null "> and regcapital = #{regcapital}</if>
+            <if test="bizlicense != null  and bizlicense != ''"> and bizlicense = #{bizlicense}</if>
+            <if test="poiLon != null "> and poi_lon = #{poiLon}</if>
+            <if test="poiLat != null "> and poi_lat = #{poiLat}</if>
+            <if test="removed != null "> and removed = #{removed}</if>
+            <if test="initialReceiptDate != null "> and initial_receipt_date = #{initialReceiptDate}</if>
+            <if test="businessStatusName != null  and businessStatusName != ''"> and business_status_name like concat('%', #{businessStatusName}, '%')</if>
+            <if test="pxcx != null  and pxcx != ''"> and pxcx = #{pxcx}</if>
+        </where>
+    </select>
+    
+    <select id="selectSchoolInfoById" parameterType="String" resultMap="SchoolInfoResult">
+        <include refid="selectSchoolInfoVo"/>
+        where inscode = #{inscode}
+    </select>
+        
+    <insert id="insertSchoolInfo" parameterType="SchoolInfo">
+        insert into school_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="inscode != null">inscode,</if>
+            <if test="name != null">name,</if>
+            <if test="sname != null">sname,</if>
+            <if test="address != null">address,</if>
+            <if test="legalPersonIdNumber != null">legal_person_id_number,</if>
+            <if test="responsiblePerson != null">responsible_person,</if>
+            <if test="legalPersonName != null">legal_person_name,</if>
+            <if test="areaName != null">area_name,</if>
+            <if test="areaCode != null">area_code,</if>
+            <if test="tel != null">tel,</if>
+            <if test="wechar != null">wechar,</if>
+            <if test="registrationDate != null">registration_date,</if>
+            <if test="licenseNumber != null">license_number,</if>
+            <if test="licenseWord != null">license_word,</if>
+            <if test="licenseValidPeriodFrom != null">license_valid_period_from,</if>
+            <if test="licenseValidPeriodEnd != null">license_valid_period_end,</if>
+            <if test="credibilityGrade != null">credibility_grade,</if>
+            <if test="credibilityScore != null">credibility_score,</if>
+            <if test="vehicleSum != null">vehicle_sum,</if>
+            <if test="regcapital != null">regcapital,</if>
+            <if test="bizlicense != null">bizlicense,</if>
+            <if test="poiLon != null">poi_lon,</if>
+            <if test="poiLat != null">poi_lat,</if>
+            <if test="removed != null">removed,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="initialReceiptDate != null">initial_receipt_date,</if>
+            <if test="businessStatusName != null">business_status_name,</if>
+            <if test="pxcx != null">pxcx,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="inscode != null">#{inscode},</if>
+            <if test="name != null">#{name},</if>
+            <if test="sname != null">#{sname},</if>
+            <if test="address != null">#{address},</if>
+            <if test="legalPersonIdNumber != null">#{legalPersonIdNumber},</if>
+            <if test="responsiblePerson != null">#{responsiblePerson},</if>
+            <if test="legalPersonName != null">#{legalPersonName},</if>
+            <if test="areaName != null">#{areaName},</if>
+            <if test="areaCode != null">#{areaCode},</if>
+            <if test="tel != null">#{tel},</if>
+            <if test="wechar != null">#{wechar},</if>
+            <if test="registrationDate != null">#{registrationDate},</if>
+            <if test="licenseNumber != null">#{licenseNumber},</if>
+            <if test="licenseWord != null">#{licenseWord},</if>
+            <if test="licenseValidPeriodFrom != null">#{licenseValidPeriodFrom},</if>
+            <if test="licenseValidPeriodEnd != null">#{licenseValidPeriodEnd},</if>
+            <if test="credibilityGrade != null">#{credibilityGrade},</if>
+            <if test="credibilityScore != null">#{credibilityScore},</if>
+            <if test="vehicleSum != null">#{vehicleSum},</if>
+            <if test="regcapital != null">#{regcapital},</if>
+            <if test="bizlicense != null">#{bizlicense},</if>
+            <if test="poiLon != null">#{poiLon},</if>
+            <if test="poiLat != null">#{poiLat},</if>
+            <if test="removed != null">#{removed},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="initialReceiptDate != null">#{initialReceiptDate},</if>
+            <if test="businessStatusName != null">#{businessStatusName},</if>
+            <if test="pxcx != null">#{pxcx},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSchoolInfo" parameterType="SchoolInfo">
+        update school_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="name != null">name = #{name},</if>
+            <if test="sname != null">sname = #{sname},</if>
+            <if test="address != null">address = #{address},</if>
+            <if test="legalPersonIdNumber != null">legal_person_id_number = #{legalPersonIdNumber},</if>
+            <if test="responsiblePerson != null">responsible_person = #{responsiblePerson},</if>
+            <if test="legalPersonName != null">legal_person_name = #{legalPersonName},</if>
+            <if test="areaName != null">area_name = #{areaName},</if>
+            <if test="areaCode != null">area_code = #{areaCode},</if>
+            <if test="tel != null">tel = #{tel},</if>
+            <if test="wechar != null">wechar = #{wechar},</if>
+            <if test="registrationDate != null">registration_date = #{registrationDate},</if>
+            <if test="licenseNumber != null">license_number = #{licenseNumber},</if>
+            <if test="licenseWord != null">license_word = #{licenseWord},</if>
+            <if test="licenseValidPeriodFrom != null">license_valid_period_from = #{licenseValidPeriodFrom},</if>
+            <if test="licenseValidPeriodEnd != null">license_valid_period_end = #{licenseValidPeriodEnd},</if>
+            <if test="credibilityGrade != null">credibility_grade = #{credibilityGrade},</if>
+            <if test="credibilityScore != null">credibility_score = #{credibilityScore},</if>
+            <if test="vehicleSum != null">vehicle_sum = #{vehicleSum},</if>
+            <if test="regcapital != null">regcapital = #{regcapital},</if>
+            <if test="bizlicense != null">bizlicense = #{bizlicense},</if>
+            <if test="poiLon != null">poi_lon = #{poiLon},</if>
+            <if test="poiLat != null">poi_lat = #{poiLat},</if>
+            <if test="removed != null">removed = #{removed},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="initialReceiptDate != null">initial_receipt_date = #{initialReceiptDate},</if>
+            <if test="businessStatusName != null">business_status_name = #{businessStatusName},</if>
+            <if test="pxcx != null">pxcx = #{pxcx},</if>
+        </trim>
+        where inscode = #{inscode}
+    </update>
+
+    <delete id="deleteSchoolInfoById" parameterType="String">
+        delete from school_info where inscode = #{inscode}
+    </delete>
+
+    <delete id="deleteSchoolInfoByIds" parameterType="String">
+        delete from school_info where inscode in 
+        <foreach item="inscode" collection="array" open="(" separator="," close=")">
+            #{inscode}
+        </foreach>
+    </delete>
+    
+</mapper>

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

@@ -2,11 +2,10 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.miaxis.app.school.mapper.SchoolRegionMapper">
+<mapper namespace="com.miaxis.school.mapper.SchoolRegionMapper">
     
     <resultMap type="SchoolRegion" id="SchoolRegionResult">
         <result property="id"    column="id"    />
-        <result property="schoolId"    column="school_id"    />
         <result property="inscode"    column="inscode"    />
         <result property="seq"    column="seq"    />
         <result property="name"    column="name"    />
@@ -18,21 +17,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="totalvehnum"    column="totalvehnum"    />
         <result property="curvehnum"    column="curvehnum"    />
         <result property="status"    column="status"    />
-        <result property="crdate"    column="crdate"    />
         <result property="flag"    column="flag"    />
         <result property="areaCode"    column="area_code"    />
+        <result property="poiLon"    column="poi_lon"    />
+        <result property="poiLat"    column="poi_lat"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
+    <select id="selectSchoolRegionUrlList" parameterType="SchoolRegionDTO" resultType="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
+        FROM school_region sr
+        left JOIN school_info s ON sr.inscode = s.inscode
+        left join school_region_images sri on sr.id = sri. region_id
+        <where>
+            <if test="areaCode != null  and areaCode != ''"> and area_code = #{areaCode}</if>
+        </where>
+        order by distance desc
+    </select>
+
     <sql id="selectSchoolRegionVo">
-        select id, school_id, inscode, seq, name, address, area, type, vehicletype, polygon, totalvehnum, curvehnum, status, crdate, flag, area_code, create_time, update_time from school_region
+        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>
 
     <select id="selectSchoolRegionList" parameterType="SchoolRegion" resultMap="SchoolRegionResult">
         <include refid="selectSchoolRegionVo"/>
         <where>  
-            <if test="schoolId != null  and schoolId != ''"> and school_id = #{schoolId}</if>
             <if test="inscode != null  and inscode != ''"> and inscode = #{inscode}</if>
             <if test="seq != null  and seq != ''"> and seq = #{seq}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
@@ -44,9 +56,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="totalvehnum != null "> and totalvehnum = #{totalvehnum}</if>
             <if test="curvehnum != null "> and curvehnum = #{curvehnum}</if>
             <if test="status != null "> and status = #{status}</if>
-            <if test="crdate != null "> and crdate = #{crdate}</if>
             <if test="flag != null "> and flag = #{flag}</if>
             <if test="areaCode != null  and areaCode != ''"> and area_code = #{areaCode}</if>
+            <if test="poiLon != null "> and poi_lon = #{poiLon}</if>
+            <if test="poiLat != null "> and poi_lat = #{poiLat}</if>
         </where>
     </select>
     
@@ -59,7 +72,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into school_region
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
-            <if test="schoolId != null">school_id,</if>
             <if test="inscode != null">inscode,</if>
             <if test="seq != null">seq,</if>
             <if test="name != null">name,</if>
@@ -71,15 +83,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="totalvehnum != null">totalvehnum,</if>
             <if test="curvehnum != null">curvehnum,</if>
             <if test="status != null">status,</if>
-            <if test="crdate != null">crdate,</if>
             <if test="flag != null">flag,</if>
             <if test="areaCode != null">area_code,</if>
+            <if test="poiLon != null">poi_lon,</if>
+            <if test="poiLat != null">poi_lat,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
-            <if test="schoolId != null">#{schoolId},</if>
             <if test="inscode != null">#{inscode},</if>
             <if test="seq != null">#{seq},</if>
             <if test="name != null">#{name},</if>
@@ -91,9 +103,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="totalvehnum != null">#{totalvehnum},</if>
             <if test="curvehnum != null">#{curvehnum},</if>
             <if test="status != null">#{status},</if>
-            <if test="crdate != null">#{crdate},</if>
             <if test="flag != null">#{flag},</if>
             <if test="areaCode != null">#{areaCode},</if>
+            <if test="poiLon != null">#{poiLon},</if>
+            <if test="poiLat != null">#{poiLat},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
          </trim>
@@ -102,7 +115,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateSchoolRegion" parameterType="SchoolRegion">
         update school_region
         <trim prefix="SET" suffixOverrides=",">
-            <if test="schoolId != null">school_id = #{schoolId},</if>
             <if test="inscode != null">inscode = #{inscode},</if>
             <if test="seq != null">seq = #{seq},</if>
             <if test="name != null">name = #{name},</if>
@@ -114,9 +126,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="totalvehnum != null">totalvehnum = #{totalvehnum},</if>
             <if test="curvehnum != null">curvehnum = #{curvehnum},</if>
             <if test="status != null">status = #{status},</if>
-            <if test="crdate != null">crdate = #{crdate},</if>
             <if test="flag != null">flag = #{flag},</if>
             <if test="areaCode != null">area_code = #{areaCode},</if>
+            <if test="poiLon != null">poi_lon = #{poiLon},</if>
+            <if test="poiLat != null">poi_lat = #{poiLat},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>