Merge remote-tracking branch 'origin/master'

# Conflicts:
#	hzgzpt-admin/src/test/java/com/miaxis/test/NormalTest.java

hzgzpt-admin/src/main/java/com/miaxis/HzgzptApplication.java

@@ -3,12 +3,14 @@ package com.miaxis;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 
 /**
  * 启动程序
- * 
+ *
  * @author miaxis
  */
+@EnableFeignClients
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
 public class HzgzptApplication
 {

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

@@ -1,21 +1,17 @@
 package com.miaxis.app.controller.school;
 
 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.constant.Constants;
 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 org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -28,13 +24,13 @@ import java.util.List;
 @RequestMapping(Constants.OPEN_PREFIX+"/school/region")
 @Api(tags={"【app-驾校训练场】"})
 public class SchoolRegionController extends BaseController{
+
     @Autowired
     private ISchoolRegionService schoolRegionService;
 
     /**
      * 查询驾校训练场列表
      */
-    @PreAuthorize("@ss.hasPermi('school:region:list')")
     @GetMapping("/list")
     @ApiOperation("查询驾校训练场列表")
     @ApiImplicitParams({
@@ -43,85 +39,60 @@ public class SchoolRegionController extends BaseController{
     })
     public ResponsePageInfo<SchoolRegion> list(@ModelAttribute SchoolRegion schoolRegion){
         startPage();
-        List<SchoolRegion> list = schoolRegionService.selectSchoolRegionList(schoolRegion);
-        return toResponsePageInfo(list);
-    }
-
-    /**
-     * 查询驾校训练场列表(图片距离)
-     */
-    @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.selectSchoolRegionUrlList(schoolRegionDTO);
+        List<SchoolRegion> list = schoolRegionService.queryList(schoolRegion);
         return toResponsePageInfo(list);
     }
 
-
     /**
      * 导出驾校训练场列表
      */
-   // @PreAuthorize("@ss.hasPermi('school:region: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);
+        List<SchoolRegion> list = schoolRegionService.queryList(schoolRegion);
+        ExcelUtil<SchoolRegion> util = new ExcelUtil<>(SchoolRegion.class);
         return util.exportExcel(list, "region");
     }
 
     /**
      * 获取驾校训练场详细信息
      */
-    //@PreAuthorize("@ss.hasPermi('school:region: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));
+        return Response.success(schoolRegionService.getById(id));
     }
 
     /**
      * 新增驾校训练场
      */
-    //@PreAuthorize("@ss.hasPermi('school:region:add')")
-    @Log(title = "驾校训练场", businessType = BusinessTypeEnum.INSERT)
     @PostMapping
     @ApiOperation("新增驾校训练场")
     public Response<Integer> add(@RequestBody SchoolRegion schoolRegion){
-        return toResponse(schoolRegionService.insertSchoolRegion(schoolRegion));
+        return toResponse(schoolRegionService.save(schoolRegion) ? 1 : 0);
     }
 
     /**
      * 修改驾校训练场
      */
-    //@PreAuthorize("@ss.hasPermi('school:region:edit')")
-    @Log(title = "驾校训练场", businessType = BusinessTypeEnum.UPDATE)
     @PutMapping
     @ApiOperation("修改驾校训练场")
     public Response<Integer> edit(@RequestBody SchoolRegion schoolRegion){
-        return toResponse(schoolRegionService.updateSchoolRegion(schoolRegion));
+        return toResponse(schoolRegionService.updateById(schoolRegion) ? 1 : 0);
     }
 
     /**
      * 删除驾校训练场
      */
-    //@PreAuthorize("@ss.hasPermi('school:region:remove')")
-    @Log(title = "驾校训练场", businessType = BusinessTypeEnum.DELETE)
-	@DeleteMapping("/{ids}")
+    @DeleteMapping("/{ids}")
     @ApiOperation("删除驾校训练场")
     public  Response<Integer> remove(
             @ApiParam(name = "ids", value = "驾校训练场ids参数", required = true)
             @PathVariable Long[] ids
     ){
-        return toResponse(schoolRegionService.deleteSchoolRegionByIds(ids));
+        return toResponse(schoolRegionService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
     }
 }

hzgzpt-admin/src/main/java/com/miaxis/app/controller/user/UserInfoController.java

@@ -120,8 +120,6 @@ public class UserInfoController extends BaseController{
             prefix = PictureTypeEnum.IDCARDREVERSE.getPrefix();
         }else if (PictureTypeEnum.FACES.getCode().equals(type)){
             prefix = PictureTypeEnum.FACES.getPrefix();
-        }else if (PictureTypeEnum.FACES.getCode().equals(type)){
-            prefix = PictureTypeEnum.FACES.getPrefix();
         }else {
             throw new CustomException("类型错误!");
         }

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

@@ -193,3 +193,10 @@ xss:
 # --------------------------------------------短信验证-------------------------------------
 sms_user_name: "jsjp"
 sms_password: "t7nwh7"
+
+
+
+# --------------------------------------------短信验证-------------------------------------
+feign:
+  jgpt_ipport: http://localhost:8080/
+

hzgzpt-admin/src/test/java/com/miaxis/test/NormalTest.java

@@ -3,6 +3,9 @@ package com.miaxis.test;
 import com.miaxis.HzgzptApplication;
 import com.miaxis.app.test.inf.ITestService;
 import com.miaxis.app.xxx.service.ITMClassRecordDetailService;
+import com.miaxis.app.school.domain.SchoolInfo;
+import com.miaxis.app.feign.ITMTrainRecordDataService;
+import com.miaxis.common.core.page.ResponsePageInfo;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;

hzgzpt-common/pom.xml

@@ -36,6 +36,8 @@
         </dependency>
 
 
+
+
         <!-- pagehelper 分页插件 -->
         <dependency>
             <groupId>com.github.pagehelper</groupId>
@@ -180,6 +182,11 @@
             <artifactId>aliyun-sdk-oss</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

hzgzpt-common/src/main/java/com/miaxis/common/core/domain/ResponseEnum.java

@@ -104,9 +104,9 @@ public enum ResponseEnum {
     UPDATE_PASSWORD_ERROR_OLD_REPEAT(9057,"新密码和旧密码重复，请重新修改密码"),
     UPDATE_PASSWORD_ERROR(9058,"修改密码异常，请联系管理员"),
     /**登录模块**/
-    LOGIN_SUCCESS(9100,"登录成功"),
+    LOGIN_SUCCESS(200,"登录成功"),
     LOGIN_FAIL(9101,"登录失败"),
-    LOGOUT_SUCCESS(9102,"退出成功"),
+    LOGOUT_SUCCESS(200,"退出成功"),
     LOGOUT_FAIL(9103,"退出失败"),
     /**其他**/
     DEMO_MODE(9114,"演示模式，不允许操作"),

hzgzpt-common/src/main/java/com/miaxis/common/core/domain/entity/UserInfo.java

@@ -1,19 +1,18 @@
 package com.miaxis.common.core.domain.entity;
 
-import java.util.Date;
+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 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 com.miaxis.common.core.domain.BaseBusinessEntity;
 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 com.miaxis.common.core.domain.BaseBusinessEntity;
 import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
 /**
  * 用户对象 user_info
  *
@@ -28,7 +27,7 @@ public class UserInfo extends BaseBusinessEntity{
 
     /** $column.columnComment */
     @TableId(value = "id")
-    @ApiModelProperty(value = "$column.columnComment")
+    @ApiModelProperty(value = "主键")
     private Long id;
 
     /** 驾校全国统一编号 */
@@ -134,156 +133,5 @@ public class UserInfo extends BaseBusinessEntity{
     @ApiModelProperty(value = "驾校班型Id")
     private Long schoolClassTypeId;
 
-    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 setName(String name){
-        this.name = name;
-    }
-
-    public String getName(){
-        return name;
-    }
-    public void setSex(Long sex){
-        this.sex = sex;
-    }
-
-    public Long getSex(){
-        return sex;
-    }
-    public void setCardtype(Long cardtype){
-        this.cardtype = cardtype;
-    }
-
-    public Long getCardtype(){
-        return cardtype;
-    }
-    public void setIdcard(String idcard){
-        this.idcard = idcard;
-    }
-
-    public String getIdcard(){
-        return idcard;
-    }
-    public void setBirthday(Date birthday){
-        this.birthday = birthday;
-    }
-
-    public Date getBirthday(){
-        return birthday;
-    }
-    public void setPhone(String phone){
-        this.phone = phone;
-    }
-
-    public String getPhone(){
-        return phone;
-    }
-    public void setPassword(String password){
-        this.password = password;
-    }
-
-    public String getPassword(){
-        return password;
-    }
-    public void setWechar(String wechar){
-        this.wechar = wechar;
-    }
-
-    public String getWechar(){
-        return wechar;
-    }
-    public void setOpenid(String openid){
-        this.openid = openid;
-    }
-
-    public String getOpenid(){
-        return openid;
-    }
-    public void setBusitype(String busitype){
-        this.busitype = busitype;
-    }
-
-    public String getBusitype(){
-        return busitype;
-    }
-    public void setPerdritype(String perdritype){
-        this.perdritype = perdritype;
-    }
-
-    public String getPerdritype(){
-        return perdritype;
-    }
-    public void setTraintype(String traintype){
-        this.traintype = traintype;
-    }
-
-    public String getTraintype(){
-        return traintype;
-    }
-    public void setCoachnum(String coachnum){
-        this.coachnum = coachnum;
-    }
-
-    public String getCoachnum(){
-        return coachnum;
-    }
-    public void setStatus(Integer status){
-        this.status = status;
-    }
-
-    public Integer getStatus(){
-        return status;
-    }
-    public void setPhoto(Long photo){
-        this.photo = photo;
-    }
-
-    public Long getPhoto(){
-        return photo;
-    }
-    public void setSchoolClassTypeId(Long schoolClassTypeId){
-        this.schoolClassTypeId = schoolClassTypeId;
-    }
-
-    public Long getSchoolClassTypeId(){
-        return schoolClassTypeId;
-    }
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("inscode", getInscode())
-            .append("name", getName())
-            .append("sex", getSex())
-            .append("cardtype", getCardtype())
-            .append("idcard", getIdcard())
-            .append("birthday", getBirthday())
-            .append("phone", getPhone())
-            .append("password", getPassword())
-            .append("wechar", getWechar())
-            .append("openid", getOpenid())
-            .append("busitype", getBusitype())
-            .append("perdritype", getPerdritype())
-            .append("traintype", getTraintype())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .append("coachnum", getCoachnum())
-            .append("status", getStatus())
-            .append("photo", getPhoto())
-            .append("schoolClassTypeId", getSchoolClassTypeId())
-            .toString();
-    }
 }

hzgzpt-generator/src/main/resources/vm/java/controller.java.vm

@@ -2,6 +2,7 @@ package ${packageName}.controller;
 
 import com.miaxis.common.constant.Constants;
 import java.util.List;
+import java.util.Arrays;
 import io.swagger.annotations.*;
 import com.miaxis.common.core.domain.Response;
 import org.springframework.security.access.prepost.PreAuthorize;

hzgzpt-service-app/src/main/java/com/miaxis/app/feign/ITMTrainRecordDataService.java

@@ -0,0 +1,30 @@
+package com.miaxis.app.feign;
+
+
+import com.miaxis.app.school.domain.SchoolInfo;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(name="iMTrainRecordDataService",
+        url = "${feign.jgpt_ipport}",
+        fallback = ITMTrainRecordDataService.TMTrainRecordDataServiceImpl.class
+)
+public interface  ITMTrainRecordDataService {
+    @RequestMapping(value = "/open-api/school/info/list", method = RequestMethod.GET)
+    ResponsePageInfo<SchoolInfo> selectSchoolInfoList(@RequestParam("schoolInfo") SchoolInfo schoolInfo);
+    /**
+     * 容错处理类，当调用失败时，简单返回空字符串
+     */
+    @Component
+    public class TMTrainRecordDataServiceImpl implements ITMTrainRecordDataService {
+        @Override
+        public ResponsePageInfo<SchoolInfo> selectSchoolInfoList(@RequestParam("schoolInfo") SchoolInfo schoolInfo) {
+            System.out.println("调用失败");
+            return null;
+        }
+    }
+}

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

@@ -1,29 +1,27 @@
 package com.miaxis.app.school.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.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.BaseEntity;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
 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.math.BigDecimal;
+import java.util.Date;
 /**
  * 驾校训练场对象 school_region
  *
  * @author zhangbin
- * @date 2020-12-28
+ * @date 2021-01-14
  */
 @Data
 @TableName("school_region")
 @ApiModel(value = "SchoolRegion", description = "驾校训练场对象 school_region")
-public class SchoolRegion extends BaseBusinessEntity {
+public class SchoolRegion extends BaseBusinessEntity{
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
@@ -103,6 +101,13 @@ public class SchoolRegion extends BaseBusinessEntity {
     @ApiModelProperty(value = "审核状态： 0：待审核 1：同意启用 2：不同意启用")
     private Long flag;
 
+    /** $column.columnComment */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "${column.columnComment}", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("audit_date")
+    @ApiModelProperty(value = "$column.columnComment")
+    private Date auditDate;
+
     /** 区县编号 */
     @Excel(name = "区县编号")
     @TableField("area_code")
@@ -121,140 +126,4 @@ public class SchoolRegion extends BaseBusinessEntity {
     @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,10 +1,7 @@
 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 com.miaxis.app.school.dto.SchoolRegionDTO;
-import com.miaxis.app.school.dto.SchoolRegionVO;
 
 /**
  * 驾校训练场Mapper接口
@@ -13,58 +10,5 @@ import com.miaxis.app.school.dto.SchoolRegionVO;
  * @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);
-
-    /**
-     * 查询驾校训练场列表(图片距离)
-     * @param schoolRegionDTO
-     * @return
-     */
-    List<SchoolRegionVO> selectSchoolRegionUrlList(SchoolRegionDTO schoolRegionDTO);
 }

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

@@ -1,10 +1,9 @@
 package com.miaxis.app.school.service;
 
-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 com.miaxis.app.school.domain.SchoolRegion;
+
+import java.util.List;
 
 /**
  * 驾校训练场Service接口
@@ -13,58 +12,9 @@ import com.miaxis.app.school.dto.SchoolRegionVO;
  * @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);
 
     /**
-     *
-     * @param schoolRegionDTO
-     * @return
+     * 查询列表
      */
-    public List<SchoolRegionVO> selectSchoolRegionUrlList(SchoolRegionDTO schoolRegionDTO);
+    List<SchoolRegion> queryList(SchoolRegion schoolRegion);
 }

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

@@ -1,17 +1,17 @@
 package com.miaxis.app.school.service.impl;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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.mapper.SchoolRegionMapper;
-import com.miaxis.app.school.domain.SchoolRegion;
 import com.miaxis.app.school.service.ISchoolRegionService;
-import com.miaxis.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 /**
  * 驾校训练场Service业务层处理
  *
@@ -20,84 +20,61 @@ import org.springframework.stereotype.Service;
  */
 @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);
-    }
+    @Resource
+    private SchoolRegionMapper schoolRegionMapper;
 
-    /**
-     * 查询驾校训练场列表(图片距离)
-     * @param schoolRegionDTO
-     * @return
-     */
     @Override
-    public List<SchoolRegionVO> selectSchoolRegionUrlList(SchoolRegionDTO schoolRegionDTO) {
-        return schoolRegionMapper.selectSchoolRegionUrlList(schoolRegionDTO);
+    public List<SchoolRegion> queryList(SchoolRegion schoolRegion) {
+        LambdaQueryWrapper<SchoolRegion> lqw = Wrappers.lambdaQuery();
+        if (StringUtils.isNotBlank(schoolRegion.getInscode())){
+            lqw.eq(SchoolRegion::getInscode ,schoolRegion.getInscode());
+        }
+        if (StringUtils.isNotBlank(schoolRegion.getSeq())){
+            lqw.eq(SchoolRegion::getSeq ,schoolRegion.getSeq());
+        }
+        if (StringUtils.isNotBlank(schoolRegion.getName())){
+            lqw.like(SchoolRegion::getName ,schoolRegion.getName());
+        }
+        if (StringUtils.isNotBlank(schoolRegion.getAddress())){
+            lqw.eq(SchoolRegion::getAddress ,schoolRegion.getAddress());
+        }
+        if (schoolRegion.getArea() != null){
+            lqw.eq(SchoolRegion::getArea ,schoolRegion.getArea());
+        }
+        if (schoolRegion.getType() != null){
+            lqw.eq(SchoolRegion::getType ,schoolRegion.getType());
+        }
+        if (StringUtils.isNotBlank(schoolRegion.getVehicletype())){
+            lqw.eq(SchoolRegion::getVehicletype ,schoolRegion.getVehicletype());
+        }
+        if (StringUtils.isNotBlank(schoolRegion.getPolygon())){
+            lqw.eq(SchoolRegion::getPolygon ,schoolRegion.getPolygon());
+        }
+        if (schoolRegion.getTotalvehnum() != null){
+            lqw.eq(SchoolRegion::getTotalvehnum ,schoolRegion.getTotalvehnum());
+        }
+        if (schoolRegion.getCurvehnum() != null){
+            lqw.eq(SchoolRegion::getCurvehnum ,schoolRegion.getCurvehnum());
+        }
+        if (schoolRegion.getStatus() != null){
+            lqw.eq(SchoolRegion::getStatus ,schoolRegion.getStatus());
+        }
+        if (schoolRegion.getFlag() != null){
+            lqw.eq(SchoolRegion::getFlag ,schoolRegion.getFlag());
+        }
+        if (schoolRegion.getAuditDate() != null){
+            lqw.eq(SchoolRegion::getAuditDate ,schoolRegion.getAuditDate());
+        }
+        if (StringUtils.isNotBlank(schoolRegion.getAreaCode())){
+            lqw.eq(SchoolRegion::getAreaCode ,schoolRegion.getAreaCode());
+        }
+        if (schoolRegion.getPoiLon() != null){
+            lqw.eq(SchoolRegion::getPoiLon ,schoolRegion.getPoiLon());
+        }
+        if (schoolRegion.getPoiLat() != null){
+            lqw.eq(SchoolRegion::getPoiLat ,schoolRegion.getPoiLat());
+        }
+        return this.list(lqw);
     }
 }

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

@@ -0,0 +1,108 @@
+package com.miaxis.app.train.controller;
+
+import com.miaxis.app.train.domain.TMTrainRecord;
+import com.miaxis.app.train.service.ITMTrainRecordService;
+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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 【训练明细（终端上次明细）】Controller
+ *
+ * @author miaxis
+ * @date 2021-01-14
+ */
+@RestController
+@RequestMapping("/train/record")
+@Api(tags={"【app-训练明细（终端上次明细）】"})
+public class TMTrainRecordController extends BaseController{
+    @Autowired
+    private ITMTrainRecordService tMTrainRecordService;
+
+    /**
+     * 查询训练明细（终端上次明细）列表
+     */
+    //@PreAuthorize("@ss.hasPermi('train:record: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<TMTrainRecord> list(@ModelAttribute TMTrainRecord tMTrainRecord){
+        startPage();
+        List<TMTrainRecord> list = tMTrainRecordService.queryList(tMTrainRecord);
+        return toResponsePageInfo(list);
+    }
+
+    /**
+     * 导出训练明细（终端上次明细）列表
+     */
+   // @PreAuthorize("@ss.hasPermi('train:record:export')")
+    @Log(title = "训练明细（终端上次明细）", businessType = BusinessTypeEnum.EXPORT)
+    @GetMapping("/export")
+    @ApiOperation("导出训练明细（终端上次明细）列表Excel")
+    public Response<String> export(@ModelAttribute TMTrainRecord tMTrainRecord){
+        List<TMTrainRecord> list = tMTrainRecordService.queryList(tMTrainRecord);
+        ExcelUtil<TMTrainRecord> util = new ExcelUtil<TMTrainRecord>(TMTrainRecord.class);
+        return util.exportExcel(list, "record");
+    }
+
+    /**
+     * 获取训练明细（终端上次明细）详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('train:record:query')")
+    @GetMapping(value = "/{rnum}")
+    @ApiOperation("获取训练明细（终端上次明细）详细信息")
+    public Response<TMTrainRecord> getInfo(
+            @ApiParam(name = "rnum", value = "训练明细（终端上次明细）参数", required = true)
+            @PathVariable("rnum") String rnum
+    ){
+        return Response.success(tMTrainRecordService.getById(rnum));
+    }
+
+    /**
+     * 新增训练明细（终端上次明细）
+     */
+    //@PreAuthorize("@ss.hasPermi('train:record:add')")
+    @Log(title = "训练明细（终端上次明细）", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增训练明细（终端上次明细）")
+    public Response<Integer> add(@RequestBody TMTrainRecord tMTrainRecord){
+        return toResponse(tMTrainRecordService.save(tMTrainRecord) ? 1 : 0);
+    }
+
+    /**
+     * 修改训练明细（终端上次明细）
+     */
+    //@PreAuthorize("@ss.hasPermi('train:record:edit')")
+    @Log(title = "训练明细（终端上次明细）", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改训练明细（终端上次明细）")
+    public Response<Integer> edit(@RequestBody TMTrainRecord tMTrainRecord){
+        return toResponse(tMTrainRecordService.updateById(tMTrainRecord) ? 1 : 0);
+    }
+
+    /**
+     * 删除训练明细（终端上次明细）
+     */
+    //@PreAuthorize("@ss.hasPermi('train:record:remove')")
+    @Log(title = "训练明细（终端上次明细）", businessType = BusinessTypeEnum.DELETE)
+	@DeleteMapping("/{rnums}")
+    @ApiOperation("删除训练明细（终端上次明细）")
+    public  Response<Integer> remove(
+            @ApiParam(name = "rnums", value = "训练明细（终端上次明细）ids参数", required = true)
+            @PathVariable String[] rnums
+    ){
+        return toResponse(tMTrainRecordService.removeByIds(Arrays.asList(rnums)) ? 1 : 0);
+    }
+}

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

@@ -0,0 +1,613 @@
+package com.miaxis.app.train.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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 org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+/**
+ * 训练明细（终端上次明细）对象 t_m_train_record
+ *
+ * @author miaxis
+ * @date 2021-01-14
+ */
+@Data
+@TableName("t_m_train_record")
+@ApiModel(value = "TMTrainRecord", description = "训练明细（终端上次明细）对象 t_m_train_record")
+public class TMTrainRecord extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+    /** 学时记录编号,16位计时设备编码+6位日期码+4位序列号 */
+    @Excel(name = "学时记录编号,16位计时设备编码+6位日期码+4位序列号")
+    @TableField("rnum")
+    @ApiModelProperty(value = "学时记录编号,16位计时设备编码+6位日期码+4位序列号")
+    private String rnum;
+
+    /** 教练员编号 */
+    @Excel(name = "教练员编号")
+    @TableField("coachnum")
+    @ApiModelProperty(value = "教练员编号")
+    private String coachnum;
+
+    /** 学员编号 */
+    @Excel(name = "学员编号")
+    @TableField("stunum")
+    @ApiModelProperty(value = "学员编号")
+    private String stunum;
+
+    /** 上报类型,0x01：自动上报；0x02：应中心要求上报。如果是应中心要求上传，则本次上传作业的作业序号保持与请求上传消息的作业序号一致，后续分段上传的作业序号也保持一致。 */
+    @Excel(name = "上报类型,0x01：自动上报；0x02：应中心要求上报。如果是应中心要求上传，则本次上传作业的作业序号保持与请求上传消息的作业序号一致，后续分段上传的作业序号也保持一致。")
+    @TableField("uploadtype")
+    @ApiModelProperty(value = "上报类型,0x01：自动上报；0x02：应中心要求上报。如果是应中心要求上传，则本次上传作业的作业序号保持与请求上传消息的作业序号一致，后续分段上传的作业序号也保持一致。")
+    private Integer uploadtype;
+
+    /** 课堂ID,标识学员的一次培训过程，计时平台自行使用 */
+    @Excel(name = "课堂ID,标识学员的一次培训过程，计时平台自行使用")
+    @TableField("lessonid")
+    @ApiModelProperty(value = "课堂ID,标识学员的一次培训过程，计时平台自行使用")
+    private Long lessonid;
+
+    /** 记录产生时间,格式： HHmmss，1min最后1s的时间 */
+    @Excel(name = "记录产生时间,格式： HHmmss，1min最后1s的时间")
+    @TableField("recordtime")
+    @ApiModelProperty(value = "记录产生时间,格式： HHmmss，1min最后1s的时间")
+    private String recordtime;
+
+    /** 培训课程 */
+    @Excel(name = "培训课程")
+    @TableField("trainlesson")
+    @ApiModelProperty(value = "培训课程")
+    private String trainlesson;
+
+    /** 记录状态 0正常记录，1-异常记录 */
+    @Excel(name = "记录状态 0正常记录，1-异常记录")
+    @TableField("recordstatus")
+    @ApiModelProperty(value = "记录状态 0正常记录，1-异常记录")
+    private Integer recordstatus;
+
+    /** 1min内车辆达到的最大卫星定位速度，1/10km/h */
+    @Excel(name = "1min内车辆达到的最大卫星定位速度，1/10km/h")
+    @TableField("maxspeed")
+    @ApiModelProperty(value = "1min内车辆达到的最大卫星定位速度，1/10km/h")
+    private Integer maxspeed;
+
+    /** 里程 1min内行驶的总里程 0.1公里 */
+    @Excel(name = "里程 1min内行驶的总里程 0.1公里")
+    @TableField("miles")
+    @ApiModelProperty(value = "里程 1min内行驶的总里程 0.1公里")
+    private Integer miles;
+
+    /** gps记录ID */
+    @Excel(name = "gps记录ID")
+    @TableField("gpsid")
+    @ApiModelProperty(value = "gps记录ID")
+    private Long gpsid;
+
+    /**    */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "  ", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("crdate")
+    @ApiModelProperty(value = "  ")
+    private Date crdate;
+
+    /** 是否被统计过 */
+    @Excel(name = "是否被统计过")
+    @TableField("is_count")
+    @ApiModelProperty(value = "是否被统计过")
+    private Integer isCount;
+
+    /** 审核结果 0:未审核 1：合格 2：不合格 */
+    @Excel(name = "审核结果 0:未审核 1：合格 2：不合格")
+    @TableField("audit_status")
+    @ApiModelProperty(value = "审核结果 0:未审核 1：合格 2：不合格")
+    private Integer auditStatus;
+
+    /** 监管平台审核不合格原因 */
+    @Excel(name = "监管平台审核不合格原因")
+    @TableField("audit_reason")
+    @ApiModelProperty(value = "监管平台审核不合格原因")
+    private String auditReason;
+
+    /** 审核类型 0：未审核 1：自动审核 2：手动审核 */
+    @Excel(name = "审核类型 0：未审核 1：自动审核 2：手动审核")
+    @TableField("audit_type")
+    @ApiModelProperty(value = "审核类型 0：未审核 1：自动审核 2：手动审核")
+    private Integer auditType;
+
+    /** 学员姓名 */
+    @Excel(name = "学员姓名")
+    @TableField("stuname")
+    @ApiModelProperty(value = "学员姓名")
+    private String stuname;
+
+    /** 教练姓名 */
+    @Excel(name = "教练姓名")
+    @TableField("coachname")
+    @ApiModelProperty(value = "教练姓名")
+    private String coachname;
+
+    /** 培训机构编号 */
+    @Excel(name = "培训机构编号")
+    @TableField("inscode")
+    @ApiModelProperty(value = "培训机构编号")
+    private String inscode;
+
+    /** 培训机构名称 */
+    @Excel(name = "培训机构名称")
+    @TableField("insname")
+    @ApiModelProperty(value = "培训机构名称")
+    private String insname;
+
+    /** 阶段送审ID */
+    @Excel(name = "阶段送审ID")
+    @TableField("stage_id")
+    @ApiModelProperty(value = "阶段送审ID")
+    private Long stageId;
+
+    /**    */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "  ", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("traintime")
+    @ApiModelProperty(value = "  ")
+    private Date traintime;
+
+    /**    */
+    @Excel(name = "  ")
+    @TableField("photo")
+    @ApiModelProperty(value = "  ")
+    private Long photo;
+
+    /**    */
+    @Excel(name = "  ")
+    @TableField("lat")
+    @ApiModelProperty(value = "  ")
+    private Long lat;
+
+    /**    */
+    @Excel(name = "  ")
+    @TableField("lng")
+    @ApiModelProperty(value = "  ")
+    private Long lng;
+
+    /**    */
+    @Excel(name = "  ")
+    @TableField("engine_rpm")
+    @ApiModelProperty(value = "  ")
+    private Integer engineRpm;
+
+    /**    */
+    @Excel(name = "  ")
+    @TableField("gpsspeed")
+    @ApiModelProperty(value = "  ")
+    private Integer gpsspeed;
+
+    /**    */
+    @Excel(name = "  ")
+    @TableField("driverspeed")
+    @ApiModelProperty(value = "  ")
+    private Integer driverspeed;
+
+    /**    */
+    @Excel(name = "  ")
+    @TableField("gps_status")
+    @ApiModelProperty(value = "  ")
+    private Long gpsStatus;
+
+    /**    */
+    @Excel(name = "  ")
+    @TableField("is_photo_sync")
+    @ApiModelProperty(value = "  ")
+    private Integer isPhotoSync;
+
+    /**    */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "  ", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("is_sync_date")
+    @ApiModelProperty(value = "  ")
+    private Date isSyncDate;
+
+    /** 车牌号 */
+    @Excel(name = "车牌号")
+    @TableField("licnum")
+    @ApiModelProperty(value = "车牌号")
+    private String licnum;
+
+    /** 审核时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("audit_date")
+    @ApiModelProperty(value = "审核时间")
+    private Date auditDate;
+
+    /**    */
+    @Excel(name = "  ")
+    @TableField("is_analyze")
+    @ApiModelProperty(value = "  ")
+    private Integer isAnalyze;
+
+    /** 过滤规则id */
+    @Excel(name = "过滤规则id")
+    @TableField("audit_reason_id")
+    @ApiModelProperty(value = "过滤规则id")
+    private Integer auditReasonId;
+
+    /**    */
+    @Excel(name = "  ")
+    @TableField("is_abnormal")
+    @ApiModelProperty(value = "  ")
+    private Long isAbnormal;
+
+    /**    */
+    @Excel(name = "  ")
+    @TableField("carnum")
+    @ApiModelProperty(value = "  ")
+    private String carnum;
+
+    /**    */
+    @Excel(name = "  ")
+    @TableField("stu_idcard")
+    @ApiModelProperty(value = "  ")
+    private String stuIdcard;
+
+    /**    */
+    @Excel(name = "  ")
+    @TableField("coach_idcard")
+    @ApiModelProperty(value = "  ")
+    private String coachIdcard;
+
+    /**    */
+    @Excel(name = "  ")
+    @TableField("devnum")
+    @ApiModelProperty(value = "  ")
+    private String devnum;
+
+    /**    */
+    @Excel(name = "  ")
+    @TableField("abnormal_seq")
+    @ApiModelProperty(value = "  ")
+    private String abnormalSeq;
+
+    public void setRnum(String rnum){
+        this.rnum = rnum;
+    }
+
+    public String getRnum(){
+        return rnum;
+    }
+    public void setCoachnum(String coachnum){
+        this.coachnum = coachnum;
+    }
+
+    public String getCoachnum(){
+        return coachnum;
+    }
+    public void setStunum(String stunum){
+        this.stunum = stunum;
+    }
+
+    public String getStunum(){
+        return stunum;
+    }
+    public void setUploadtype(Integer uploadtype){
+        this.uploadtype = uploadtype;
+    }
+
+    public Integer getUploadtype(){
+        return uploadtype;
+    }
+    public void setLessonid(Long lessonid){
+        this.lessonid = lessonid;
+    }
+
+    public Long getLessonid(){
+        return lessonid;
+    }
+    public void setRecordtime(String recordtime){
+        this.recordtime = recordtime;
+    }
+
+    public String getRecordtime(){
+        return recordtime;
+    }
+    public void setTrainlesson(String trainlesson){
+        this.trainlesson = trainlesson;
+    }
+
+    public String getTrainlesson(){
+        return trainlesson;
+    }
+    public void setRecordstatus(Integer recordstatus){
+        this.recordstatus = recordstatus;
+    }
+
+    public Integer getRecordstatus(){
+        return recordstatus;
+    }
+    public void setMaxspeed(Integer maxspeed){
+        this.maxspeed = maxspeed;
+    }
+
+    public Integer getMaxspeed(){
+        return maxspeed;
+    }
+    public void setMiles(Integer miles){
+        this.miles = miles;
+    }
+
+    public Integer getMiles(){
+        return miles;
+    }
+    public void setGpsid(Long gpsid){
+        this.gpsid = gpsid;
+    }
+
+    public Long getGpsid(){
+        return gpsid;
+    }
+    public void setCrdate(Date crdate){
+        this.crdate = crdate;
+    }
+
+    public Date getCrdate(){
+        return crdate;
+    }
+    public void setIsCount(Integer isCount){
+        this.isCount = isCount;
+    }
+
+    public Integer getIsCount(){
+        return isCount;
+    }
+    public void setAuditStatus(Integer auditStatus){
+        this.auditStatus = auditStatus;
+    }
+
+    public Integer getAuditStatus(){
+        return auditStatus;
+    }
+    public void setAuditReason(String auditReason){
+        this.auditReason = auditReason;
+    }
+
+    public String getAuditReason(){
+        return auditReason;
+    }
+    public void setAuditType(Integer auditType){
+        this.auditType = auditType;
+    }
+
+    public Integer getAuditType(){
+        return auditType;
+    }
+    public void setStuname(String stuname){
+        this.stuname = stuname;
+    }
+
+    public String getStuname(){
+        return stuname;
+    }
+    public void setCoachname(String coachname){
+        this.coachname = coachname;
+    }
+
+    public String getCoachname(){
+        return coachname;
+    }
+    public void setInscode(String inscode){
+        this.inscode = inscode;
+    }
+
+    public String getInscode(){
+        return inscode;
+    }
+    public void setInsname(String insname){
+        this.insname = insname;
+    }
+
+    public String getInsname(){
+        return insname;
+    }
+    public void setStageId(Long stageId){
+        this.stageId = stageId;
+    }
+
+    public Long getStageId(){
+        return stageId;
+    }
+    public void setTraintime(Date traintime){
+        this.traintime = traintime;
+    }
+
+    public Date getTraintime(){
+        return traintime;
+    }
+    public void setPhoto(Long photo){
+        this.photo = photo;
+    }
+
+    public Long getPhoto(){
+        return photo;
+    }
+    public void setLat(Long lat){
+        this.lat = lat;
+    }
+
+    public Long getLat(){
+        return lat;
+    }
+    public void setLng(Long lng){
+        this.lng = lng;
+    }
+
+    public Long getLng(){
+        return lng;
+    }
+    public void setEngineRpm(Integer engineRpm){
+        this.engineRpm = engineRpm;
+    }
+
+    public Integer getEngineRpm(){
+        return engineRpm;
+    }
+    public void setGpsspeed(Integer gpsspeed){
+        this.gpsspeed = gpsspeed;
+    }
+
+    public Integer getGpsspeed(){
+        return gpsspeed;
+    }
+    public void setDriverspeed(Integer driverspeed){
+        this.driverspeed = driverspeed;
+    }
+
+    public Integer getDriverspeed(){
+        return driverspeed;
+    }
+    public void setGpsStatus(Long gpsStatus){
+        this.gpsStatus = gpsStatus;
+    }
+
+    public Long getGpsStatus(){
+        return gpsStatus;
+    }
+    public void setIsPhotoSync(Integer isPhotoSync){
+        this.isPhotoSync = isPhotoSync;
+    }
+
+    public Integer getIsPhotoSync(){
+        return isPhotoSync;
+    }
+    public void setIsSyncDate(Date isSyncDate){
+        this.isSyncDate = isSyncDate;
+    }
+
+    public Date getIsSyncDate(){
+        return isSyncDate;
+    }
+    public void setLicnum(String licnum){
+        this.licnum = licnum;
+    }
+
+    public String getLicnum(){
+        return licnum;
+    }
+    public void setAuditDate(Date auditDate){
+        this.auditDate = auditDate;
+    }
+
+    public Date getAuditDate(){
+        return auditDate;
+    }
+    public void setIsAnalyze(Integer isAnalyze){
+        this.isAnalyze = isAnalyze;
+    }
+
+    public Integer getIsAnalyze(){
+        return isAnalyze;
+    }
+    public void setAuditReasonId(Integer auditReasonId){
+        this.auditReasonId = auditReasonId;
+    }
+
+    public Integer getAuditReasonId(){
+        return auditReasonId;
+    }
+    public void setIsAbnormal(Long isAbnormal){
+        this.isAbnormal = isAbnormal;
+    }
+
+    public Long getIsAbnormal(){
+        return isAbnormal;
+    }
+    public void setCarnum(String carnum){
+        this.carnum = carnum;
+    }
+
+    public String getCarnum(){
+        return carnum;
+    }
+    public void setStuIdcard(String stuIdcard){
+        this.stuIdcard = stuIdcard;
+    }
+
+    public String getStuIdcard(){
+        return stuIdcard;
+    }
+    public void setCoachIdcard(String coachIdcard){
+        this.coachIdcard = coachIdcard;
+    }
+
+    public String getCoachIdcard(){
+        return coachIdcard;
+    }
+    public void setDevnum(String devnum){
+        this.devnum = devnum;
+    }
+
+    public String getDevnum(){
+        return devnum;
+    }
+    public void setAbnormalSeq(String abnormalSeq){
+        this.abnormalSeq = abnormalSeq;
+    }
+
+    public String getAbnormalSeq(){
+        return abnormalSeq;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("rnum", getRnum())
+            .append("coachnum", getCoachnum())
+            .append("stunum", getStunum())
+            .append("uploadtype", getUploadtype())
+            .append("lessonid", getLessonid())
+            .append("recordtime", getRecordtime())
+            .append("trainlesson", getTrainlesson())
+            .append("recordstatus", getRecordstatus())
+            .append("maxspeed", getMaxspeed())
+            .append("miles", getMiles())
+            .append("gpsid", getGpsid())
+            .append("crdate", getCrdate())
+            .append("isCount", getIsCount())
+            .append("auditStatus", getAuditStatus())
+            .append("auditReason", getAuditReason())
+            .append("auditType", getAuditType())
+            .append("stuname", getStuname())
+            .append("coachname", getCoachname())
+            .append("inscode", getInscode())
+            .append("insname", getInsname())
+            .append("stageId", getStageId())
+            .append("traintime", getTraintime())
+            .append("photo", getPhoto())
+            .append("lat", getLat())
+            .append("lng", getLng())
+            .append("engineRpm", getEngineRpm())
+            .append("gpsspeed", getGpsspeed())
+            .append("driverspeed", getDriverspeed())
+            .append("gpsStatus", getGpsStatus())
+            .append("isPhotoSync", getIsPhotoSync())
+            .append("isSyncDate", getIsSyncDate())
+            .append("licnum", getLicnum())
+            .append("auditDate", getAuditDate())
+            .append("isAnalyze", getIsAnalyze())
+            .append("auditReasonId", getAuditReasonId())
+            .append("isAbnormal", getIsAbnormal())
+            .append("carnum", getCarnum())
+            .append("stuIdcard", getStuIdcard())
+            .append("coachIdcard", getCoachIdcard())
+            .append("devnum", getDevnum())
+            .append("abnormalSeq", getAbnormalSeq())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

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

@@ -0,0 +1,15 @@
+package com.miaxis.app.train.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.app.train.domain.TMTrainRecord;
+
+/**
+ * 训练明细（终端上次明细）Mapper接口
+ *
+ * @author miaxis
+ * @date 2021-01-14
+ */
+public interface TMTrainRecordMapper extends BaseMapper<TMTrainRecord> {
+
+}

hzgzpt-service-app/src/main/java/com/miaxis/app/train/service/ITMTrainRecordService.java

@@ -0,0 +1,19 @@
+package com.miaxis.app.train.service;
+
+import java.util.List;
+import com.miaxis.app.train.domain.TMTrainRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 训练明细（终端上次明细）Service接口
+ *
+ * @author miaxis
+ * @date 2021-01-14
+ */
+public interface ITMTrainRecordService extends IService<TMTrainRecord>{
+    /**
+     * 查询列表
+     */
+    List<TMTrainRecord> queryList(TMTrainRecord tMTrainRecord);
+
+}

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

@@ -0,0 +1,151 @@
+package com.miaxis.app.train.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.miaxis.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.apache.commons.lang3.StringUtils;
+import com.miaxis.app.train.mapper.TMTrainRecordMapper;
+import com.miaxis.app.train.domain.TMTrainRecord;
+import com.miaxis.app.train.service.ITMTrainRecordService;
+
+/**
+ * 训练明细（终端上次明细）Service业务层处理
+ *
+ * @author miaxis
+ * @date 2021-01-14
+ */
+@Service
+public class TMTrainRecordServiceImpl extends ServiceImpl<TMTrainRecordMapper, TMTrainRecord> implements ITMTrainRecordService {
+    @Override
+    public List<TMTrainRecord> queryList(TMTrainRecord tMTrainRecord) {
+        LambdaQueryWrapper<TMTrainRecord> lqw = Wrappers.lambdaQuery();
+                        if (StringUtils.isNotBlank(tMTrainRecord.getRnum())){
+            lqw.eq(TMTrainRecord::getRnum ,tMTrainRecord.getRnum());
+        }
+                                    if (StringUtils.isNotBlank(tMTrainRecord.getCoachnum())){
+            lqw.eq(TMTrainRecord::getCoachnum ,tMTrainRecord.getCoachnum());
+        }
+                                    if (StringUtils.isNotBlank(tMTrainRecord.getStunum())){
+            lqw.eq(TMTrainRecord::getStunum ,tMTrainRecord.getStunum());
+        }
+                                    if (tMTrainRecord.getUploadtype() != null){
+            lqw.eq(TMTrainRecord::getUploadtype ,tMTrainRecord.getUploadtype());
+        }
+                                    if (tMTrainRecord.getLessonid() != null){
+            lqw.eq(TMTrainRecord::getLessonid ,tMTrainRecord.getLessonid());
+        }
+                                    if (StringUtils.isNotBlank(tMTrainRecord.getRecordtime())){
+            lqw.eq(TMTrainRecord::getRecordtime ,tMTrainRecord.getRecordtime());
+        }
+                                    if (StringUtils.isNotBlank(tMTrainRecord.getTrainlesson())){
+            lqw.eq(TMTrainRecord::getTrainlesson ,tMTrainRecord.getTrainlesson());
+        }
+                                    if (tMTrainRecord.getRecordstatus() != null){
+            lqw.eq(TMTrainRecord::getRecordstatus ,tMTrainRecord.getRecordstatus());
+        }
+                                    if (tMTrainRecord.getMaxspeed() != null){
+            lqw.eq(TMTrainRecord::getMaxspeed ,tMTrainRecord.getMaxspeed());
+        }
+                                    if (tMTrainRecord.getMiles() != null){
+            lqw.eq(TMTrainRecord::getMiles ,tMTrainRecord.getMiles());
+        }
+                                    if (tMTrainRecord.getGpsid() != null){
+            lqw.eq(TMTrainRecord::getGpsid ,tMTrainRecord.getGpsid());
+        }
+                                    if (tMTrainRecord.getCrdate() != null){
+            lqw.eq(TMTrainRecord::getCrdate ,tMTrainRecord.getCrdate());
+        }
+                                    if (tMTrainRecord.getIsCount() != null){
+            lqw.eq(TMTrainRecord::getIsCount ,tMTrainRecord.getIsCount());
+        }
+                                    if (tMTrainRecord.getAuditStatus() != null){
+            lqw.eq(TMTrainRecord::getAuditStatus ,tMTrainRecord.getAuditStatus());
+        }
+                                    if (StringUtils.isNotBlank(tMTrainRecord.getAuditReason())){
+            lqw.eq(TMTrainRecord::getAuditReason ,tMTrainRecord.getAuditReason());
+        }
+                                    if (tMTrainRecord.getAuditType() != null){
+            lqw.eq(TMTrainRecord::getAuditType ,tMTrainRecord.getAuditType());
+        }
+                                    if (StringUtils.isNotBlank(tMTrainRecord.getStuname())){
+            lqw.like(TMTrainRecord::getStuname ,tMTrainRecord.getStuname());
+        }
+                                    if (StringUtils.isNotBlank(tMTrainRecord.getCoachname())){
+            lqw.like(TMTrainRecord::getCoachname ,tMTrainRecord.getCoachname());
+        }
+                                    if (StringUtils.isNotBlank(tMTrainRecord.getInscode())){
+            lqw.eq(TMTrainRecord::getInscode ,tMTrainRecord.getInscode());
+        }
+                                    if (StringUtils.isNotBlank(tMTrainRecord.getInsname())){
+            lqw.like(TMTrainRecord::getInsname ,tMTrainRecord.getInsname());
+        }
+                                    if (tMTrainRecord.getStageId() != null){
+            lqw.eq(TMTrainRecord::getStageId ,tMTrainRecord.getStageId());
+        }
+                                    if (tMTrainRecord.getTraintime() != null){
+            lqw.eq(TMTrainRecord::getTraintime ,tMTrainRecord.getTraintime());
+        }
+                                    if (tMTrainRecord.getPhoto() != null){
+            lqw.eq(TMTrainRecord::getPhoto ,tMTrainRecord.getPhoto());
+        }
+                                    if (tMTrainRecord.getLat() != null){
+            lqw.eq(TMTrainRecord::getLat ,tMTrainRecord.getLat());
+        }
+                                    if (tMTrainRecord.getLng() != null){
+            lqw.eq(TMTrainRecord::getLng ,tMTrainRecord.getLng());
+        }
+                                    if (tMTrainRecord.getEngineRpm() != null){
+            lqw.eq(TMTrainRecord::getEngineRpm ,tMTrainRecord.getEngineRpm());
+        }
+                                    if (tMTrainRecord.getGpsspeed() != null){
+            lqw.eq(TMTrainRecord::getGpsspeed ,tMTrainRecord.getGpsspeed());
+        }
+                                    if (tMTrainRecord.getDriverspeed() != null){
+            lqw.eq(TMTrainRecord::getDriverspeed ,tMTrainRecord.getDriverspeed());
+        }
+                                    if (tMTrainRecord.getGpsStatus() != null){
+            lqw.eq(TMTrainRecord::getGpsStatus ,tMTrainRecord.getGpsStatus());
+        }
+                                    if (tMTrainRecord.getIsPhotoSync() != null){
+            lqw.eq(TMTrainRecord::getIsPhotoSync ,tMTrainRecord.getIsPhotoSync());
+        }
+                                    if (tMTrainRecord.getIsSyncDate() != null){
+            lqw.eq(TMTrainRecord::getIsSyncDate ,tMTrainRecord.getIsSyncDate());
+        }
+                                    if (StringUtils.isNotBlank(tMTrainRecord.getLicnum())){
+            lqw.eq(TMTrainRecord::getLicnum ,tMTrainRecord.getLicnum());
+        }
+                                    if (tMTrainRecord.getAuditDate() != null){
+            lqw.eq(TMTrainRecord::getAuditDate ,tMTrainRecord.getAuditDate());
+        }
+                                    if (tMTrainRecord.getIsAnalyze() != null){
+            lqw.eq(TMTrainRecord::getIsAnalyze ,tMTrainRecord.getIsAnalyze());
+        }
+                                    if (tMTrainRecord.getAuditReasonId() != null){
+            lqw.eq(TMTrainRecord::getAuditReasonId ,tMTrainRecord.getAuditReasonId());
+        }
+                                    if (tMTrainRecord.getIsAbnormal() != null){
+            lqw.eq(TMTrainRecord::getIsAbnormal ,tMTrainRecord.getIsAbnormal());
+        }
+                                    if (StringUtils.isNotBlank(tMTrainRecord.getCarnum())){
+            lqw.eq(TMTrainRecord::getCarnum ,tMTrainRecord.getCarnum());
+        }
+                                    if (StringUtils.isNotBlank(tMTrainRecord.getStuIdcard())){
+            lqw.eq(TMTrainRecord::getStuIdcard ,tMTrainRecord.getStuIdcard());
+        }
+                                    if (StringUtils.isNotBlank(tMTrainRecord.getCoachIdcard())){
+            lqw.eq(TMTrainRecord::getCoachIdcard ,tMTrainRecord.getCoachIdcard());
+        }
+                                    if (StringUtils.isNotBlank(tMTrainRecord.getDevnum())){
+            lqw.eq(TMTrainRecord::getDevnum ,tMTrainRecord.getDevnum());
+        }
+                                    if (StringUtils.isNotBlank(tMTrainRecord.getAbnormalSeq())){
+            lqw.eq(TMTrainRecord::getAbnormalSeq ,tMTrainRecord.getAbnormalSeq());
+        }
+                    return this.list(lqw);
+    }
+}

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

@@ -20,31 +20,7 @@ public interface UserInfoMapper extends BaseMapper<UserInfo> {
      * @param id 用户信息ID
      * @return 用户信息
      */
-    public UserInfo selectUserInfoById(Long id);
-
-    /**
-     * 查询用户信息列表
-     *
-     * @param userInfo 用户信息
-     * @return 用户信息集合
-     */
-    public List<UserInfo> selectUserInfoList(UserInfo userInfo);
-
-    /**
-     * 新增用户信息
-     *
-     * @param userInfo 用户信息
-     * @return 结果
-     */
-    public int insertUserInfo(UserInfo userInfo);
-
-    /**
-     * 修改用户信息
-     *
-     * @param userInfo 用户信息
-     * @return 结果
-     */
-    public int updateUserInfo(UserInfo userInfo);
+    UserInfo selectUserInfoById(Long id);
 
     /**
      * 删除用户信息
@@ -52,7 +28,7 @@ public interface UserInfoMapper extends BaseMapper<UserInfo> {
      * @param id 用户信息ID
      * @return 结果
      */
-    public int deleteUserInfoById(Long id);
+    int deleteUserInfoById(Long id);
 
     /**
      * 批量删除用户信息
@@ -60,7 +36,7 @@ public interface UserInfoMapper extends BaseMapper<UserInfo> {
      * @param ids 需要删除的数据ID
      * @return 结果
      */
-    public int deleteUserInfoByIds(Long[] ids);
+    int deleteUserInfoByIds(Long[] ids);
 
     /**
      * 获取我的报名信息
@@ -69,5 +45,5 @@ public interface UserInfoMapper extends BaseMapper<UserInfo> {
      */
     UserVo getMyRegistrationInformation(@Param("userId") String userId);
 
-    UserInfo selectUserInfoByMobile(String mobile);
+    UserInfo selectUserInfoByMobile(String phone);
 }

hzgzpt-service-app/src/main/java/com/miaxis/app/user/service/IUserInfoService.java

@@ -19,7 +19,7 @@ public interface IUserInfoService extends IService<UserInfo>{
      * @param id 用户信息ID
      * @return 用户信息
      */
-    public UserInfo selectUserInfoById(Long id);
+    UserInfo selectUserInfoById(Long id);
 
     /**
      * 修改用户信息
@@ -27,7 +27,7 @@ public interface IUserInfoService extends IService<UserInfo>{
      * @param userInfo 用户信息
      * @return 结果
      */
-    public int updateUserInfo(UserInfo userInfo);
+    int updateUserInfo(UserInfo userInfo);
 
     /**
      * 批量删除用户信息
@@ -35,7 +35,7 @@ public interface IUserInfoService extends IService<UserInfo>{
      * @param ids 需要删除的用户信息ID
      * @return 结果
      */
-    public int deleteUserInfoByIds(Long[] ids);
+    int deleteUserInfoByIds(Long[] ids);
 
 
     /**

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

@@ -21,6 +21,7 @@ import com.miaxis.common.utils.DateUtils;
 import com.miaxis.common.utils.RedisPrefixUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -88,8 +89,7 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
      */
     @Override
     public int updateUserInfo(UserInfo userInfo){
-        userInfo.setUpdateTime(DateUtils.getNowDate());
-        return userInfoMapper.updateUserInfo(userInfo);
+        return userInfoMapper.updateById(userInfo);
     }
 
     /**
@@ -166,7 +166,6 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
         UserInfo userInfo = new UserInfo();
         BeanUtils.copyProperties(userDto,userInfo);
         userInfo.setCardtype(1l);
-        userInfo.setStatus(0);
         userInfoMapper.insert(userInfo);
 
 

hzgzpt-service-app/src/main/java/com/miaxis/app/user/vo/UserVo.java

@@ -29,5 +29,5 @@ public class UserVo extends BaseBusinessEntity {
     private String className;
 
     @ApiModelProperty(value = "驾校班型价格")
-    private String classPrice;
+    private String Price;
 }

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

@@ -1,108 +0,0 @@
-package com.miaxis.app.xxx.controller;
-
-import com.miaxis.app.xxx.domain.TMClassRecordDetail;
-import com.miaxis.app.xxx.service.ITMClassRecordDetailService;
-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 org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 【电子教学日志】Controller
- *
- * @author miaxis
- * @date 2021-01-11
- */
-@RestController
-@RequestMapping("/xxx/detail")
-@Api(tags={"【app-电子教学日志】"})
-public class TMClassRecordDetailController extends BaseController{
-    @Autowired
-    private ITMClassRecordDetailService tMClassRecordDetailService;
-
-    /**
-     * 查询电子教学日志列表
-     */
-    //@PreAuthorize("@ss.hasPermi('xxx:detail: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<TMClassRecordDetail> list(@ModelAttribute TMClassRecordDetail tMClassRecordDetail){
-        startPage();
-        List<TMClassRecordDetail> list = tMClassRecordDetailService.queryList(tMClassRecordDetail);
-        return toResponsePageInfo(list);
-    }
-
-    /**
-     * 导出电子教学日志列表
-     */
-   // @PreAuthorize("@ss.hasPermi('xxx:detail:export')")
-    @Log(title = "电子教学日志", businessType = BusinessTypeEnum.EXPORT)
-    @GetMapping("/export")
-    @ApiOperation("导出电子教学日志列表Excel")
-    public Response<String> export(@ModelAttribute TMClassRecordDetail tMClassRecordDetail){
-        List<TMClassRecordDetail> list = tMClassRecordDetailService.queryList(tMClassRecordDetail);
-        ExcelUtil<TMClassRecordDetail> util = new ExcelUtil<TMClassRecordDetail>(TMClassRecordDetail.class);
-        return util.exportExcel(list, "detail");
-    }
-
-    /**
-     * 获取电子教学日志详细信息
-     */
-    //@PreAuthorize("@ss.hasPermi('xxx:detail:query')")
-    @GetMapping(value = "/{id}")
-    @ApiOperation("获取电子教学日志详细信息")
-    public Response<TMClassRecordDetail> getInfo(
-            @ApiParam(name = "id", value = "电子教学日志参数", required = true)
-            @PathVariable("id") Long id
-    ){
-        return Response.success(tMClassRecordDetailService.getById(id));
-    }
-
-    /**
-     * 新增电子教学日志
-     */
-    //@PreAuthorize("@ss.hasPermi('xxx:detail:add')")
-    @Log(title = "电子教学日志", businessType = BusinessTypeEnum.INSERT)
-    @PostMapping
-    @ApiOperation("新增电子教学日志")
-    public Response<Integer> add(@RequestBody TMClassRecordDetail tMClassRecordDetail){
-        return toResponse(tMClassRecordDetailService.save(tMClassRecordDetail) ? 1 : 0);
-    }
-
-    /**
-     * 修改电子教学日志
-     */
-    //@PreAuthorize("@ss.hasPermi('xxx:detail:edit')")
-    @Log(title = "电子教学日志", businessType = BusinessTypeEnum.UPDATE)
-    @PutMapping
-    @ApiOperation("修改电子教学日志")
-    public Response<Integer> edit(@RequestBody TMClassRecordDetail tMClassRecordDetail){
-        return toResponse(tMClassRecordDetailService.updateById(tMClassRecordDetail) ? 1 : 0);
-    }
-
-    /**
-     * 删除电子教学日志
-     */
-    //@PreAuthorize("@ss.hasPermi('xxx:detail: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(tMClassRecordDetailService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
-    }
-}

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

@@ -1,727 +0,0 @@
-package com.miaxis.app.xxx.domain;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-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 org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import java.math.BigDecimal;
-import java.util.Date;
-/**
- * 电子教学日志对象 t_m_class_record_detail
- *
- * @author miaxis
- * @date 2021-01-11
- */
-@Data
-@TableName("t_m_class_record_detail")
-@ApiModel(value = "TMClassRecordDetail", description = "电子教学日志对象 t_m_class_record_detail")
-public class TMClassRecordDetail extends BaseBusinessEntity{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键 */
-    @TableField("id")
-    @ApiModelProperty(value = "主键")
-    private Long id;
-
-    /** 电子教学日志编号 */
-    @Excel(name = "电子教学日志编号")
-    @TableField("recnum")
-    @ApiModelProperty(value = "电子教学日志编号")
-    private String recnum;
-
-    /** 培训机构编号 */
-    @Excel(name = "培训机构编号")
-    @TableField("inscode")
-    @ApiModelProperty(value = "培训机构编号")
-    private String inscode;
-
-    /** 学员编号 */
-    @Excel(name = "学员编号")
-    @TableField("stunum")
-    @ApiModelProperty(value = "学员编号")
-    private String stunum;
-
-    /** 教练员编号 */
-    @Excel(name = "教练员编号")
-    @TableField("coachnum")
-    @ApiModelProperty(value = "教练员编号")
-    private String coachnum;
-
-    /** 教练车编号 */
-    @Excel(name = "教练车编号")
-    @TableField("carnum")
-    @ApiModelProperty(value = "教练车编号")
-    private String carnum;
-
-    /** 计时终端编号 */
-    @Excel(name = "计时终端编号")
-    @TableField("simunum")
-    @ApiModelProperty(value = "计时终端编号")
-    private String simunum;
-
-    /** 平台编号 */
-    @Excel(name = "平台编号")
-    @TableField("platnum")
-    @ApiModelProperty(value = "平台编号")
-    private String platnum;
-
-    /** 课程编码 */
-    @Excel(name = "课程编码")
-    @TableField("subjcode")
-    @ApiModelProperty(value = "课程编码")
-    private String subjcode;
-
-    /** 签到照片 */
-    @Excel(name = "签到照片")
-    @TableField("photo1")
-    @ApiModelProperty(value = "签到照片")
-    private String photo1;
-
-    /** 随机照片 */
-    @Excel(name = "随机照片")
-    @TableField("photo2")
-    @ApiModelProperty(value = "随机照片")
-    private String photo2;
-
-    /** 签退照片 */
-    @Excel(name = "签退照片")
-    @TableField("photo3")
-    @ApiModelProperty(value = "签退照片")
-    private String photo3;
-
-    /** 培训开始时间 YYYYMMDDHHmmss */
-    @Excel(name = "培训开始时间 YYYYMMDDHHmmss")
-    @TableField("starttime")
-    @ApiModelProperty(value = "培训开始时间 YYYYMMDDHHmmss")
-    private String starttime;
-
-    /** 培训结束时间 YYYYMMDDHHmmss */
-    @Excel(name = "培训结束时间 YYYYMMDDHHmmss")
-    @TableField("endtime")
-    @ApiModelProperty(value = "培训结束时间 YYYYMMDDHHmmss")
-    private String endtime;
-
-    /** 培训学时 min */
-    @Excel(name = "培训学时 min")
-    @TableField("duration")
-    @ApiModelProperty(value = "培训学时 min")
-    private String duration;
-
-    /** 培训平均速度 km/h */
-    @Excel(name = "培训平均速度 km/h")
-    @TableField("avevelocity")
-    @ApiModelProperty(value = "培训平均速度 km/h")
-    private Long avevelocity;
-
-    /** 教练员点评 */
-    @Excel(name = "教练员点评")
-    @TableField("coacmt")
-    @ApiModelProperty(value = "教练员点评")
-    private String coacmt;
-
-    /** 阶段送审ID */
-    @Excel(name = "阶段送审ID")
-    @TableField("stage_id")
-    @ApiModelProperty(value = "阶段送审ID")
-    private Long stageId;
-
-    /** 审核状态 0-未审核 1-通过 2-不通过 */
-    @Excel(name = "审核状态 0-未审核 1-通过 2-不通过")
-    @TableField("audit_status")
-    @ApiModelProperty(value = "审核状态 0-未审核 1-通过 2-不通过")
-    private Integer auditStatus;
-
-    /** 审核原因 */
-    @Excel(name = "审核原因")
-    @TableField("audit_reason")
-    @ApiModelProperty(value = "审核原因")
-    private String auditReason;
-
-    /** 审核类型 0：未审核 1：自动审核 2：手动审核 */
-    @Excel(name = "审核类型 0：未审核 1：自动审核 2：手动审核")
-    @TableField("audit_type")
-    @ApiModelProperty(value = "审核类型 0：未审核 1：自动审核 2：手动审核")
-    private Integer auditType;
-
-    /** $column.columnComment */
-    @Excel(name = "${column.columnComment}")
-    @TableField("face_matching")
-    @ApiModelProperty(value = "$column.columnComment")
-    private Integer faceMatching;
-
-    /** $column.columnComment */
-    @Excel(name = "${column.columnComment}")
-    @TableField("iscreate")
-    @ApiModelProperty(value = "$column.columnComment")
-    private Integer iscreate;
-
-    /** $column.columnComment */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "${column.columnComment}", width = 30, dateFormat = "yyyy-MM-dd")
-    @TableField("crdate")
-    @ApiModelProperty(value = "$column.columnComment")
-    private Date crdate;
-
-    /** $column.columnComment */
-    @Excel(name = "${column.columnComment}")
-    @TableField("stuname")
-    @ApiModelProperty(value = "$column.columnComment")
-    private String stuname;
-
-    /** $column.columnComment */
-    @Excel(name = "${column.columnComment}")
-    @TableField("stu_idcard")
-    @ApiModelProperty(value = "$column.columnComment")
-    private String stuIdcard;
-
-    /** $column.columnComment */
-    @Excel(name = "${column.columnComment}")
-    @TableField("coachname")
-    @ApiModelProperty(value = "$column.columnComment")
-    private String coachname;
-
-    /** $column.columnComment */
-    @Excel(name = "${column.columnComment}")
-    @TableField("licnum")
-    @ApiModelProperty(value = "$column.columnComment")
-    private String licnum;
-
-    /** $column.columnComment */
-    @Excel(name = "${column.columnComment}")
-    @TableField("insname")
-    @ApiModelProperty(value = "$column.columnComment")
-    private String insname;
-
-    /** $column.columnComment */
-    @Excel(name = "${column.columnComment}")
-    @TableField("district")
-    @ApiModelProperty(value = "$column.columnComment")
-    private String district;
-
-    /** 培训里程 km */
-    @Excel(name = "培训里程 km")
-    @TableField("mileage")
-    @ApiModelProperty(value = "培训里程 km")
-    private BigDecimal mileage;
-
-    /** 审核时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
-    @TableField("audit_date")
-    @ApiModelProperty(value = "审核时间")
-    private Date auditDate;
-
-    /** $column.columnComment */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "${column.columnComment}", width = 30, dateFormat = "yyyy-MM-dd")
-    @TableField("starttime_date")
-    @ApiModelProperty(value = "$column.columnComment")
-    private Date starttimeDate;
-
-    /** $column.columnComment */
-    @Excel(name = "${column.columnComment}")
-    @TableField("is_abnormal")
-    @ApiModelProperty(value = "$column.columnComment")
-    private Long isAbnormal;
-
-    /** $column.columnComment */
-    @Excel(name = "${column.columnComment}")
-    @TableField("recarry")
-    @ApiModelProperty(value = "$column.columnComment")
-    private String recarry;
-
-    /** $column.columnComment */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "${column.columnComment}", width = 30, dateFormat = "yyyy-MM-dd")
-    @TableField("analyze_date")
-    @ApiModelProperty(value = "$column.columnComment")
-    private Date analyzeDate;
-
-    /** $column.columnComment */
-    @Excel(name = "${column.columnComment}")
-    @TableField("is_analyze")
-    @ApiModelProperty(value = "$column.columnComment")
-    private Integer isAnalyze;
-
-    /** $column.columnComment */
-    @Excel(name = "${column.columnComment}")
-    @TableField("isrelated_photo")
-    @ApiModelProperty(value = "$column.columnComment")
-    private Integer isrelatedPhoto;
-
-    /** $column.columnComment */
-    @Excel(name = "${column.columnComment}")
-    @TableField("photo4")
-    @ApiModelProperty(value = "$column.columnComment")
-    private Long photo4;
-
-    /** $column.columnComment */
-    @Excel(name = "${column.columnComment}")
-    @TableField("photo5")
-    @ApiModelProperty(value = "$column.columnComment")
-    private Long photo5;
-
-    /** $column.columnComment */
-    @Excel(name = "${column.columnComment}")
-    @TableField("is_workorder")
-    @ApiModelProperty(value = "$column.columnComment")
-    private Integer isWorkorder;
-
-    /** $column.columnComment */
-    @Excel(name = "${column.columnComment}")
-    @TableField("submit_user")
-    @ApiModelProperty(value = "$column.columnComment")
-    private String submitUser;
-
-    /** $column.columnComment */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "${column.columnComment}", width = 30, dateFormat = "yyyy-MM-dd")
-    @TableField("submit_date")
-    @ApiModelProperty(value = "$column.columnComment")
-    private Date submitDate;
-
-    /** $column.columnComment */
-    @Excel(name = "${column.columnComment}")
-    @TableField("is_toerror")
-    @ApiModelProperty(value = "$column.columnComment")
-    private Integer isToerror;
-
-    /** $column.columnComment */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "${column.columnComment}", width = 30, dateFormat = "yyyy-MM-dd")
-    @TableField("toerrordate")
-    @ApiModelProperty(value = "$column.columnComment")
-    private Date toerrordate;
-
-    /** 人脸比对不通过 */
-    @Excel(name = "人脸比对不通过")
-    @TableField("face_not_pass")
-    @ApiModelProperty(value = "人脸比对不通过")
-    private Integer faceNotPass;
-
-    /** $column.columnComment */
-    @Excel(name = "${column.columnComment}")
-    @TableField("abnormal_seq")
-    @ApiModelProperty(value = "$column.columnComment")
-    private String abnormalSeq;
-
-    /** $column.columnComment */
-    @Excel(name = "${column.columnComment}")
-    @TableField("is_uploadgj")
-    @ApiModelProperty(value = "$column.columnComment")
-    private Integer isUploadgj;
-
-    /** $column.columnComment */
-    @Excel(name = "${column.columnComment}")
-    @TableField("need_spotc")
-    @ApiModelProperty(value = "$column.columnComment")
-    private Integer needSpotc;
-
-    public void setId(Long id){
-        this.id = id;
-    }
-
-    public Long getId(){
-        return id;
-    }
-    public void setRecnum(String recnum){
-        this.recnum = recnum;
-    }
-
-    public String getRecnum(){
-        return recnum;
-    }
-    public void setInscode(String inscode){
-        this.inscode = inscode;
-    }
-
-    public String getInscode(){
-        return inscode;
-    }
-    public void setStunum(String stunum){
-        this.stunum = stunum;
-    }
-
-    public String getStunum(){
-        return stunum;
-    }
-    public void setCoachnum(String coachnum){
-        this.coachnum = coachnum;
-    }
-
-    public String getCoachnum(){
-        return coachnum;
-    }
-    public void setCarnum(String carnum){
-        this.carnum = carnum;
-    }
-
-    public String getCarnum(){
-        return carnum;
-    }
-    public void setSimunum(String simunum){
-        this.simunum = simunum;
-    }
-
-    public String getSimunum(){
-        return simunum;
-    }
-    public void setPlatnum(String platnum){
-        this.platnum = platnum;
-    }
-
-    public String getPlatnum(){
-        return platnum;
-    }
-    public void setSubjcode(String subjcode){
-        this.subjcode = subjcode;
-    }
-
-    public String getSubjcode(){
-        return subjcode;
-    }
-    public void setPhoto1(String photo1){
-        this.photo1 = photo1;
-    }
-
-    public String getPhoto1(){
-        return photo1;
-    }
-    public void setPhoto2(String photo2){
-        this.photo2 = photo2;
-    }
-
-    public String getPhoto2(){
-        return photo2;
-    }
-    public void setPhoto3(String photo3){
-        this.photo3 = photo3;
-    }
-
-    public String getPhoto3(){
-        return photo3;
-    }
-    public void setStarttime(String starttime){
-        this.starttime = starttime;
-    }
-
-    public String getStarttime(){
-        return starttime;
-    }
-    public void setEndtime(String endtime){
-        this.endtime = endtime;
-    }
-
-    public String getEndtime(){
-        return endtime;
-    }
-    public void setDuration(String duration){
-        this.duration = duration;
-    }
-
-    public String getDuration(){
-        return duration;
-    }
-    public void setAvevelocity(Long avevelocity){
-        this.avevelocity = avevelocity;
-    }
-
-    public Long getAvevelocity(){
-        return avevelocity;
-    }
-    public void setCoacmt(String coacmt){
-        this.coacmt = coacmt;
-    }
-
-    public String getCoacmt(){
-        return coacmt;
-    }
-    public void setStageId(Long stageId){
-        this.stageId = stageId;
-    }
-
-    public Long getStageId(){
-        return stageId;
-    }
-    public void setAuditStatus(Integer auditStatus){
-        this.auditStatus = auditStatus;
-    }
-
-    public Integer getAuditStatus(){
-        return auditStatus;
-    }
-    public void setAuditReason(String auditReason){
-        this.auditReason = auditReason;
-    }
-
-    public String getAuditReason(){
-        return auditReason;
-    }
-    public void setAuditType(Integer auditType){
-        this.auditType = auditType;
-    }
-
-    public Integer getAuditType(){
-        return auditType;
-    }
-    public void setFaceMatching(Integer faceMatching){
-        this.faceMatching = faceMatching;
-    }
-
-    public Integer getFaceMatching(){
-        return faceMatching;
-    }
-    public void setIscreate(Integer iscreate){
-        this.iscreate = iscreate;
-    }
-
-    public Integer getIscreate(){
-        return iscreate;
-    }
-    public void setCrdate(Date crdate){
-        this.crdate = crdate;
-    }
-
-    public Date getCrdate(){
-        return crdate;
-    }
-    public void setStuname(String stuname){
-        this.stuname = stuname;
-    }
-
-    public String getStuname(){
-        return stuname;
-    }
-    public void setStuIdcard(String stuIdcard){
-        this.stuIdcard = stuIdcard;
-    }
-
-    public String getStuIdcard(){
-        return stuIdcard;
-    }
-    public void setCoachname(String coachname){
-        this.coachname = coachname;
-    }
-
-    public String getCoachname(){
-        return coachname;
-    }
-    public void setLicnum(String licnum){
-        this.licnum = licnum;
-    }
-
-    public String getLicnum(){
-        return licnum;
-    }
-    public void setInsname(String insname){
-        this.insname = insname;
-    }
-
-    public String getInsname(){
-        return insname;
-    }
-    public void setDistrict(String district){
-        this.district = district;
-    }
-
-    public String getDistrict(){
-        return district;
-    }
-    public void setMileage(BigDecimal mileage){
-        this.mileage = mileage;
-    }
-
-    public BigDecimal getMileage(){
-        return mileage;
-    }
-    public void setAuditDate(Date auditDate){
-        this.auditDate = auditDate;
-    }
-
-    public Date getAuditDate(){
-        return auditDate;
-    }
-    public void setStarttimeDate(Date starttimeDate){
-        this.starttimeDate = starttimeDate;
-    }
-
-    public Date getStarttimeDate(){
-        return starttimeDate;
-    }
-    public void setIsAbnormal(Long isAbnormal){
-        this.isAbnormal = isAbnormal;
-    }
-
-    public Long getIsAbnormal(){
-        return isAbnormal;
-    }
-    public void setRecarry(String recarry){
-        this.recarry = recarry;
-    }
-
-    public String getRecarry(){
-        return recarry;
-    }
-    public void setAnalyzeDate(Date analyzeDate){
-        this.analyzeDate = analyzeDate;
-    }
-
-    public Date getAnalyzeDate(){
-        return analyzeDate;
-    }
-    public void setIsAnalyze(Integer isAnalyze){
-        this.isAnalyze = isAnalyze;
-    }
-
-    public Integer getIsAnalyze(){
-        return isAnalyze;
-    }
-    public void setIsrelatedPhoto(Integer isrelatedPhoto){
-        this.isrelatedPhoto = isrelatedPhoto;
-    }
-
-    public Integer getIsrelatedPhoto(){
-        return isrelatedPhoto;
-    }
-    public void setPhoto4(Long photo4){
-        this.photo4 = photo4;
-    }
-
-    public Long getPhoto4(){
-        return photo4;
-    }
-    public void setPhoto5(Long photo5){
-        this.photo5 = photo5;
-    }
-
-    public Long getPhoto5(){
-        return photo5;
-    }
-    public void setIsWorkorder(Integer isWorkorder){
-        this.isWorkorder = isWorkorder;
-    }
-
-    public Integer getIsWorkorder(){
-        return isWorkorder;
-    }
-    public void setSubmitUser(String submitUser){
-        this.submitUser = submitUser;
-    }
-
-    public String getSubmitUser(){
-        return submitUser;
-    }
-    public void setSubmitDate(Date submitDate){
-        this.submitDate = submitDate;
-    }
-
-    public Date getSubmitDate(){
-        return submitDate;
-    }
-    public void setIsToerror(Integer isToerror){
-        this.isToerror = isToerror;
-    }
-
-    public Integer getIsToerror(){
-        return isToerror;
-    }
-    public void setToerrordate(Date toerrordate){
-        this.toerrordate = toerrordate;
-    }
-
-    public Date getToerrordate(){
-        return toerrordate;
-    }
-    public void setFaceNotPass(Integer faceNotPass){
-        this.faceNotPass = faceNotPass;
-    }
-
-    public Integer getFaceNotPass(){
-        return faceNotPass;
-    }
-    public void setAbnormalSeq(String abnormalSeq){
-        this.abnormalSeq = abnormalSeq;
-    }
-
-    public String getAbnormalSeq(){
-        return abnormalSeq;
-    }
-    public void setIsUploadgj(Integer isUploadgj){
-        this.isUploadgj = isUploadgj;
-    }
-
-    public Integer getIsUploadgj(){
-        return isUploadgj;
-    }
-    public void setNeedSpotc(Integer needSpotc){
-        this.needSpotc = needSpotc;
-    }
-
-    public Integer getNeedSpotc(){
-        return needSpotc;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("recnum", getRecnum())
-            .append("inscode", getInscode())
-            .append("stunum", getStunum())
-            .append("coachnum", getCoachnum())
-            .append("carnum", getCarnum())
-            .append("simunum", getSimunum())
-            .append("platnum", getPlatnum())
-            .append("subjcode", getSubjcode())
-            .append("photo1", getPhoto1())
-            .append("photo2", getPhoto2())
-            .append("photo3", getPhoto3())
-            .append("starttime", getStarttime())
-            .append("endtime", getEndtime())
-            .append("duration", getDuration())
-            .append("avevelocity", getAvevelocity())
-            .append("coacmt", getCoacmt())
-            .append("stageId", getStageId())
-            .append("auditStatus", getAuditStatus())
-            .append("auditReason", getAuditReason())
-            .append("auditType", getAuditType())
-            .append("faceMatching", getFaceMatching())
-            .append("iscreate", getIscreate())
-            .append("crdate", getCrdate())
-            .append("stuname", getStuname())
-            .append("stuIdcard", getStuIdcard())
-            .append("coachname", getCoachname())
-            .append("licnum", getLicnum())
-            .append("insname", getInsname())
-            .append("district", getDistrict())
-            .append("mileage", getMileage())
-            .append("auditDate", getAuditDate())
-            .append("starttimeDate", getStarttimeDate())
-            .append("isAbnormal", getIsAbnormal())
-            .append("recarry", getRecarry())
-            .append("analyzeDate", getAnalyzeDate())
-            .append("isAnalyze", getIsAnalyze())
-            .append("isrelatedPhoto", getIsrelatedPhoto())
-            .append("photo4", getPhoto4())
-            .append("photo5", getPhoto5())
-            .append("isWorkorder", getIsWorkorder())
-            .append("submitUser", getSubmitUser())
-            .append("submitDate", getSubmitDate())
-            .append("isToerror", getIsToerror())
-            .append("toerrordate", getToerrordate())
-            .append("faceNotPass", getFaceNotPass())
-            .append("abnormalSeq", getAbnormalSeq())
-            .append("isUploadgj", getIsUploadgj())
-            .append("needSpotc", getNeedSpotc())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
-}

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

@@ -1,15 +0,0 @@
-package com.miaxis.app.xxx.mapper;
-
-import java.util.List;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.app.xxx.domain.TMClassRecordDetail;
-
-/**
- * 电子教学日志Mapper接口
- *
- * @author miaxis
- * @date 2021-01-11
- */
-public interface TMClassRecordDetailMapper extends BaseMapper<TMClassRecordDetail> {
-
-}

hzgzpt-service-app/src/main/java/com/miaxis/app/xxx/service/ITMClassRecordDetailService.java

@@ -1,19 +0,0 @@
-package com.miaxis.app.xxx.service;
-
-import java.util.List;
-import com.miaxis.app.xxx.domain.TMClassRecordDetail;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * 电子教学日志Service接口
- *
- * @author miaxis
- * @date 2021-01-11
- */
-public interface ITMClassRecordDetailService extends IService<TMClassRecordDetail>{
-    /**
-     * 查询列表
-     */
-    List<TMClassRecordDetail> queryList(TMClassRecordDetail tMClassRecordDetail);
-
-}

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

@@ -1,172 +0,0 @@
-package com.miaxis.app.xxx.service.impl;
-
-import java.util.List;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.miaxis.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.apache.commons.lang3.StringUtils;
-import com.miaxis.app.xxx.mapper.TMClassRecordDetailMapper;
-import com.miaxis.app.xxx.domain.TMClassRecordDetail;
-import com.miaxis.app.xxx.service.ITMClassRecordDetailService;
-
-/**
- * 电子教学日志Service业务层处理
- *
- * @author miaxis
- * @date 2021-01-11
- */
-@Service
-public class TMClassRecordDetailServiceImpl extends ServiceImpl<TMClassRecordDetailMapper, TMClassRecordDetail> implements ITMClassRecordDetailService {
-    @Override
-    public List<TMClassRecordDetail> queryList(TMClassRecordDetail tMClassRecordDetail) {
-        LambdaQueryWrapper<TMClassRecordDetail> lqw = Wrappers.lambdaQuery();
-                        if (StringUtils.isNotBlank(tMClassRecordDetail.getRecnum())){
-            lqw.eq(TMClassRecordDetail::getRecnum ,tMClassRecordDetail.getRecnum());
-        }
-                                    if (StringUtils.isNotBlank(tMClassRecordDetail.getInscode())){
-            lqw.eq(TMClassRecordDetail::getInscode ,tMClassRecordDetail.getInscode());
-        }
-                                    if (StringUtils.isNotBlank(tMClassRecordDetail.getStunum())){
-            lqw.eq(TMClassRecordDetail::getStunum ,tMClassRecordDetail.getStunum());
-        }
-                                    if (StringUtils.isNotBlank(tMClassRecordDetail.getCoachnum())){
-            lqw.eq(TMClassRecordDetail::getCoachnum ,tMClassRecordDetail.getCoachnum());
-        }
-                                    if (StringUtils.isNotBlank(tMClassRecordDetail.getCarnum())){
-            lqw.eq(TMClassRecordDetail::getCarnum ,tMClassRecordDetail.getCarnum());
-        }
-                                    if (StringUtils.isNotBlank(tMClassRecordDetail.getSimunum())){
-            lqw.eq(TMClassRecordDetail::getSimunum ,tMClassRecordDetail.getSimunum());
-        }
-                                    if (StringUtils.isNotBlank(tMClassRecordDetail.getPlatnum())){
-            lqw.eq(TMClassRecordDetail::getPlatnum ,tMClassRecordDetail.getPlatnum());
-        }
-                                    if (StringUtils.isNotBlank(tMClassRecordDetail.getSubjcode())){
-            lqw.eq(TMClassRecordDetail::getSubjcode ,tMClassRecordDetail.getSubjcode());
-        }
-                                    if (StringUtils.isNotBlank(tMClassRecordDetail.getPhoto1())){
-            lqw.eq(TMClassRecordDetail::getPhoto1 ,tMClassRecordDetail.getPhoto1());
-        }
-                                    if (StringUtils.isNotBlank(tMClassRecordDetail.getPhoto2())){
-            lqw.eq(TMClassRecordDetail::getPhoto2 ,tMClassRecordDetail.getPhoto2());
-        }
-                                    if (StringUtils.isNotBlank(tMClassRecordDetail.getPhoto3())){
-            lqw.eq(TMClassRecordDetail::getPhoto3 ,tMClassRecordDetail.getPhoto3());
-        }
-                                    if (StringUtils.isNotBlank(tMClassRecordDetail.getStarttime())){
-            lqw.eq(TMClassRecordDetail::getStarttime ,tMClassRecordDetail.getStarttime());
-        }
-                                    if (StringUtils.isNotBlank(tMClassRecordDetail.getEndtime())){
-            lqw.eq(TMClassRecordDetail::getEndtime ,tMClassRecordDetail.getEndtime());
-        }
-                                    if (StringUtils.isNotBlank(tMClassRecordDetail.getDuration())){
-            lqw.eq(TMClassRecordDetail::getDuration ,tMClassRecordDetail.getDuration());
-        }
-                                    if (tMClassRecordDetail.getAvevelocity() != null){
-            lqw.eq(TMClassRecordDetail::getAvevelocity ,tMClassRecordDetail.getAvevelocity());
-        }
-                                    if (StringUtils.isNotBlank(tMClassRecordDetail.getCoacmt())){
-            lqw.eq(TMClassRecordDetail::getCoacmt ,tMClassRecordDetail.getCoacmt());
-        }
-                                    if (tMClassRecordDetail.getStageId() != null){
-            lqw.eq(TMClassRecordDetail::getStageId ,tMClassRecordDetail.getStageId());
-        }
-                                    if (tMClassRecordDetail.getAuditStatus() != null){
-            lqw.eq(TMClassRecordDetail::getAuditStatus ,tMClassRecordDetail.getAuditStatus());
-        }
-                                    if (StringUtils.isNotBlank(tMClassRecordDetail.getAuditReason())){
-            lqw.eq(TMClassRecordDetail::getAuditReason ,tMClassRecordDetail.getAuditReason());
-        }
-                                    if (tMClassRecordDetail.getAuditType() != null){
-            lqw.eq(TMClassRecordDetail::getAuditType ,tMClassRecordDetail.getAuditType());
-        }
-                                    if (tMClassRecordDetail.getFaceMatching() != null){
-            lqw.eq(TMClassRecordDetail::getFaceMatching ,tMClassRecordDetail.getFaceMatching());
-        }
-                                    if (tMClassRecordDetail.getIscreate() != null){
-            lqw.eq(TMClassRecordDetail::getIscreate ,tMClassRecordDetail.getIscreate());
-        }
-                                    if (tMClassRecordDetail.getCrdate() != null){
-            lqw.eq(TMClassRecordDetail::getCrdate ,tMClassRecordDetail.getCrdate());
-        }
-                                    if (StringUtils.isNotBlank(tMClassRecordDetail.getStuname())){
-            lqw.like(TMClassRecordDetail::getStuname ,tMClassRecordDetail.getStuname());
-        }
-                                    if (StringUtils.isNotBlank(tMClassRecordDetail.getStuIdcard())){
-            lqw.eq(TMClassRecordDetail::getStuIdcard ,tMClassRecordDetail.getStuIdcard());
-        }
-                                    if (StringUtils.isNotBlank(tMClassRecordDetail.getCoachname())){
-            lqw.like(TMClassRecordDetail::getCoachname ,tMClassRecordDetail.getCoachname());
-        }
-                                    if (StringUtils.isNotBlank(tMClassRecordDetail.getLicnum())){
-            lqw.eq(TMClassRecordDetail::getLicnum ,tMClassRecordDetail.getLicnum());
-        }
-                                    if (StringUtils.isNotBlank(tMClassRecordDetail.getInsname())){
-            lqw.like(TMClassRecordDetail::getInsname ,tMClassRecordDetail.getInsname());
-        }
-                                    if (StringUtils.isNotBlank(tMClassRecordDetail.getDistrict())){
-            lqw.eq(TMClassRecordDetail::getDistrict ,tMClassRecordDetail.getDistrict());
-        }
-                                    if (tMClassRecordDetail.getMileage() != null){
-            lqw.eq(TMClassRecordDetail::getMileage ,tMClassRecordDetail.getMileage());
-        }
-                                    if (tMClassRecordDetail.getAuditDate() != null){
-            lqw.eq(TMClassRecordDetail::getAuditDate ,tMClassRecordDetail.getAuditDate());
-        }
-                                    if (tMClassRecordDetail.getStarttimeDate() != null){
-            lqw.eq(TMClassRecordDetail::getStarttimeDate ,tMClassRecordDetail.getStarttimeDate());
-        }
-                                    if (tMClassRecordDetail.getIsAbnormal() != null){
-            lqw.eq(TMClassRecordDetail::getIsAbnormal ,tMClassRecordDetail.getIsAbnormal());
-        }
-                                    if (StringUtils.isNotBlank(tMClassRecordDetail.getRecarry())){
-            lqw.eq(TMClassRecordDetail::getRecarry ,tMClassRecordDetail.getRecarry());
-        }
-                                    if (tMClassRecordDetail.getAnalyzeDate() != null){
-            lqw.eq(TMClassRecordDetail::getAnalyzeDate ,tMClassRecordDetail.getAnalyzeDate());
-        }
-                                    if (tMClassRecordDetail.getIsAnalyze() != null){
-            lqw.eq(TMClassRecordDetail::getIsAnalyze ,tMClassRecordDetail.getIsAnalyze());
-        }
-                                    if (tMClassRecordDetail.getIsrelatedPhoto() != null){
-            lqw.eq(TMClassRecordDetail::getIsrelatedPhoto ,tMClassRecordDetail.getIsrelatedPhoto());
-        }
-                                    if (tMClassRecordDetail.getPhoto4() != null){
-            lqw.eq(TMClassRecordDetail::getPhoto4 ,tMClassRecordDetail.getPhoto4());
-        }
-                                    if (tMClassRecordDetail.getPhoto5() != null){
-            lqw.eq(TMClassRecordDetail::getPhoto5 ,tMClassRecordDetail.getPhoto5());
-        }
-                                    if (tMClassRecordDetail.getIsWorkorder() != null){
-            lqw.eq(TMClassRecordDetail::getIsWorkorder ,tMClassRecordDetail.getIsWorkorder());
-        }
-                                    if (StringUtils.isNotBlank(tMClassRecordDetail.getSubmitUser())){
-            lqw.eq(TMClassRecordDetail::getSubmitUser ,tMClassRecordDetail.getSubmitUser());
-        }
-                                    if (tMClassRecordDetail.getSubmitDate() != null){
-            lqw.eq(TMClassRecordDetail::getSubmitDate ,tMClassRecordDetail.getSubmitDate());
-        }
-                                    if (tMClassRecordDetail.getIsToerror() != null){
-            lqw.eq(TMClassRecordDetail::getIsToerror ,tMClassRecordDetail.getIsToerror());
-        }
-                                    if (tMClassRecordDetail.getToerrordate() != null){
-            lqw.eq(TMClassRecordDetail::getToerrordate ,tMClassRecordDetail.getToerrordate());
-        }
-                                    if (tMClassRecordDetail.getFaceNotPass() != null){
-            lqw.eq(TMClassRecordDetail::getFaceNotPass ,tMClassRecordDetail.getFaceNotPass());
-        }
-                                    if (StringUtils.isNotBlank(tMClassRecordDetail.getAbnormalSeq())){
-            lqw.eq(TMClassRecordDetail::getAbnormalSeq ,tMClassRecordDetail.getAbnormalSeq());
-        }
-                                    if (tMClassRecordDetail.getIsUploadgj() != null){
-            lqw.eq(TMClassRecordDetail::getIsUploadgj ,tMClassRecordDetail.getIsUploadgj());
-        }
-                                    if (tMClassRecordDetail.getNeedSpotc() != null){
-            lqw.eq(TMClassRecordDetail::getNeedSpotc ,tMClassRecordDetail.getNeedSpotc());
-        }
-                    return this.list(lqw);
-    }
-}

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

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.miaxis.app.school.mapper.SchoolRegionMapper">
-    
+
     <resultMap type="SchoolRegion" id="SchoolRegionResult">
         <result property="id"    column="id"    />
         <result property="inscode"    column="inscode"    />
@@ -18,134 +18,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="curvehnum"    column="curvehnum"    />
         <result property="status"    column="status"    />
         <result property="flag"    column="flag"    />
+        <result property="auditDate"    column="audit_date"    />
         <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="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.create_time,sr.update_time,sr.poi_lon lon,sr.poi_lat lat,
-        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( ) * ( #{lon}- sr.poi_lon ) / 360 ), 2 ) + COS( PI( ) * 30.186584 / 180 ) * COS( #{lat} * PI( ) / 180 ) * POW( SIN( PI( ) * ( #{lat}- sr.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, 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="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>
-            <if test="address != null  and address != ''"> and address = #{address}</if>
-            <if test="area != null "> and area = #{area}</if>
-            <if test="type != null "> and type = #{type}</if>
-            <if test="vehicletype != null  and vehicletype != ''"> and vehicletype = #{vehicletype}</if>
-            <if test="polygon != null  and polygon != ''"> and polygon = #{polygon}</if>
-            <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="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>
-    
-    <select id="selectSchoolRegionById" parameterType="Long" resultMap="SchoolRegionResult">
-        <include refid="selectSchoolRegionVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertSchoolRegion" parameterType="SchoolRegion">
-        insert into school_region
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="inscode != null">inscode,</if>
-            <if test="seq != null">seq,</if>
-            <if test="name != null">name,</if>
-            <if test="address != null">address,</if>
-            <if test="area != null">area,</if>
-            <if test="type != null">type,</if>
-            <if test="vehicletype != null">vehicletype,</if>
-            <if test="polygon != null">polygon,</if>
-            <if test="totalvehnum != null">totalvehnum,</if>
-            <if test="curvehnum != null">curvehnum,</if>
-            <if test="status != null">status,</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="inscode != null">#{inscode},</if>
-            <if test="seq != null">#{seq},</if>
-            <if test="name != null">#{name},</if>
-            <if test="address != null">#{address},</if>
-            <if test="area != null">#{area},</if>
-            <if test="type != null">#{type},</if>
-            <if test="vehicletype != null">#{vehicletype},</if>
-            <if test="polygon != null">#{polygon},</if>
-            <if test="totalvehnum != null">#{totalvehnum},</if>
-            <if test="curvehnum != null">#{curvehnum},</if>
-            <if test="status != null">#{status},</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>
-    </insert>
-
-    <update id="updateSchoolRegion" parameterType="SchoolRegion">
-        update school_region
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="inscode != null">inscode = #{inscode},</if>
-            <if test="seq != null">seq = #{seq},</if>
-            <if test="name != null">name = #{name},</if>
-            <if test="address != null">address = #{address},</if>
-            <if test="area != null">area = #{area},</if>
-            <if test="type != null">type = #{type},</if>
-            <if test="vehicletype != null">vehicletype = #{vehicletype},</if>
-            <if test="polygon != null">polygon = #{polygon},</if>
-            <if test="totalvehnum != null">totalvehnum = #{totalvehnum},</if>
-            <if test="curvehnum != null">curvehnum = #{curvehnum},</if>
-            <if test="status != null">status = #{status},</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>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteSchoolRegionById" parameterType="Long">
-        delete from school_region where id = #{id}
-    </delete>
-
-    <delete id="deleteSchoolRegionByIds" parameterType="String">
-        delete from school_region where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
     
 </mapper>

hzgzpt-service-app/src/main/resources/mapper/train/TMTrainRecordMapper.xml

@@ -0,0 +1,53 @@
+<?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.train.mapper.TMTrainRecordMapper">
+
+    <resultMap type="TMTrainRecord" id="TMTrainRecordResult">
+        <result property="rnum"    column="rnum"    />
+        <result property="coachnum"    column="coachnum"    />
+        <result property="stunum"    column="stunum"    />
+        <result property="uploadtype"    column="uploadtype"    />
+        <result property="lessonid"    column="lessonid"    />
+        <result property="recordtime"    column="recordtime"    />
+        <result property="trainlesson"    column="trainlesson"    />
+        <result property="recordstatus"    column="recordstatus"    />
+        <result property="maxspeed"    column="maxspeed"    />
+        <result property="miles"    column="miles"    />
+        <result property="gpsid"    column="gpsid"    />
+        <result property="crdate"    column="crdate"    />
+        <result property="isCount"    column="is_count"    />
+        <result property="auditStatus"    column="audit_status"    />
+        <result property="auditReason"    column="audit_reason"    />
+        <result property="auditType"    column="audit_type"    />
+        <result property="stuname"    column="stuname"    />
+        <result property="coachname"    column="coachname"    />
+        <result property="inscode"    column="inscode"    />
+        <result property="insname"    column="insname"    />
+        <result property="stageId"    column="stage_id"    />
+        <result property="traintime"    column="traintime"    />
+        <result property="photo"    column="photo"    />
+        <result property="lat"    column="lat"    />
+        <result property="lng"    column="lng"    />
+        <result property="engineRpm"    column="engine_rpm"    />
+        <result property="gpsspeed"    column="gpsspeed"    />
+        <result property="driverspeed"    column="driverspeed"    />
+        <result property="gpsStatus"    column="gps_status"    />
+        <result property="isPhotoSync"    column="is_photo_sync"    />
+        <result property="isSyncDate"    column="is_sync_date"    />
+        <result property="licnum"    column="licnum"    />
+        <result property="auditDate"    column="audit_date"    />
+        <result property="isAnalyze"    column="is_analyze"    />
+        <result property="auditReasonId"    column="audit_reason_id"    />
+        <result property="isAbnormal"    column="is_abnormal"    />
+        <result property="carnum"    column="carnum"    />
+        <result property="stuIdcard"    column="stu_idcard"    />
+        <result property="coachIdcard"    column="coach_idcard"    />
+        <result property="devnum"    column="devnum"    />
+        <result property="abnormalSeq"    column="abnormal_seq"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+</mapper>

hzgzpt-service-app/src/main/resources/mapper/user/UserInfoMapper.xml

@@ -27,4 +27,45 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="schoolClassTypeId"    column="school_class_type_id"    />
     </resultMap>
 
+    <sql id="selectUserInfoVo">
+        select id, name, sex, cardtype, idcard, birthday, phone, password,  wechar, openid, busitype, perdritype, traintype, create_time, update_time, coachnum, status,photo,school_class_type_id from user_info
+    </sql>
+
+
+    <select id="selectUserInfoById" parameterType="Long" resultMap="UserInfoResult">
+        <include refid="selectUserInfoVo"/>
+        where id = #{id}
+    </select>
+
+    <select id="selectUserInfoByMobile"  resultMap="UserInfoResult">
+        <include refid="selectUserInfoVo"/>
+        where phone = #{phone}
+    </select>
+
+    <delete id="deleteUserInfoById" parameterType="Long">
+        delete from user_info where id = #{id}
+    </delete>
+
+    <delete id="deleteUserInfoByIds" parameterType="String">
+        delete from user_info where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <select id="getMyRegistrationInformation" resultType="UserVo">
+        SELECT
+        u.name,
+        u.phone,
+        DATE_FORMAT(u.create_time,'%Y-%m-%d %H:%i:%s') AS createDate,
+        s.name as schoolName,
+        sct.class_name as className,
+        sct.total_price as price
+        FROM
+        user_info u
+        LEFT JOIN school_info s ON s.inscode = u.inscode
+        LEFT JOIN school_class_type sct ON sct.id = u.school_class_type_id
+        where u.id = #{userId}
+    </select>
+
 </mapper>

hzgzpt-service-app/src/main/resources/mapper/user/UserRegisterMapper.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.system.mapper.UserRegisterMapper">
+<mapper namespace="com.miaxis.app.user.mapper.UserRegisterMapper">
     
     <resultMap type="UserRegister" id="UserRegisterResult">
         <result property="id"    column="id"    />

hzgzpt-service-app/src/main/resources/mapper/xxx/TMClassRecordDetailMapper.xml

@@ -1,61 +0,0 @@
-<?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.xxx.mapper.TMClassRecordDetailMapper">
-
-    <resultMap type="TMClassRecordDetail" id="TMClassRecordDetailResult">
-        <result property="id"    column="id"    />
-        <result property="recnum"    column="recnum"    />
-        <result property="inscode"    column="inscode"    />
-        <result property="stunum"    column="stunum"    />
-        <result property="coachnum"    column="coachnum"    />
-        <result property="carnum"    column="carnum"    />
-        <result property="simunum"    column="simunum"    />
-        <result property="platnum"    column="platnum"    />
-        <result property="subjcode"    column="subjcode"    />
-        <result property="photo1"    column="photo1"    />
-        <result property="photo2"    column="photo2"    />
-        <result property="photo3"    column="photo3"    />
-        <result property="starttime"    column="starttime"    />
-        <result property="endtime"    column="endtime"    />
-        <result property="duration"    column="duration"    />
-        <result property="avevelocity"    column="avevelocity"    />
-        <result property="coacmt"    column="coacmt"    />
-        <result property="stageId"    column="stage_id"    />
-        <result property="auditStatus"    column="audit_status"    />
-        <result property="auditReason"    column="audit_reason"    />
-        <result property="auditType"    column="audit_type"    />
-        <result property="faceMatching"    column="face_matching"    />
-        <result property="iscreate"    column="iscreate"    />
-        <result property="crdate"    column="crdate"    />
-        <result property="stuname"    column="stuname"    />
-        <result property="stuIdcard"    column="stu_idcard"    />
-        <result property="coachname"    column="coachname"    />
-        <result property="licnum"    column="licnum"    />
-        <result property="insname"    column="insname"    />
-        <result property="district"    column="district"    />
-        <result property="mileage"    column="mileage"    />
-        <result property="auditDate"    column="audit_date"    />
-        <result property="starttimeDate"    column="starttime_date"    />
-        <result property="isAbnormal"    column="is_abnormal"    />
-        <result property="recarry"    column="recarry"    />
-        <result property="analyzeDate"    column="analyze_date"    />
-        <result property="isAnalyze"    column="is_analyze"    />
-        <result property="isrelatedPhoto"    column="isrelated_photo"    />
-        <result property="photo4"    column="photo4"    />
-        <result property="photo5"    column="photo5"    />
-        <result property="isWorkorder"    column="is_workorder"    />
-        <result property="submitUser"    column="submit_user"    />
-        <result property="submitDate"    column="submit_date"    />
-        <result property="isToerror"    column="is_toerror"    />
-        <result property="toerrordate"    column="toerrordate"    />
-        <result property="faceNotPass"    column="face_not_pass"    />
-        <result property="abnormalSeq"    column="abnormal_seq"    />
-        <result property="isUploadgj"    column="is_uploadgj"    />
-        <result property="needSpotc"    column="need_spotc"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
-    </resultMap>
-
-</mapper>

hzgzpt-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -92,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="getStudentByMobile" parameterType="String" resultType="com.miaxis.common.core.domain.entity.UserInfo">
 		select * from user_info
-		where mobile = #{mobile}
+		where phone = #{phone}
 	</select>
 	<select id="getStudentByName" parameterType="String" resultType="com.miaxis.common.core.domain.entity.UserInfo">
 		select * from user_info

pom.xml

@@ -3,14 +3,14 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	
+
     <groupId>com.miaxis</groupId>
     <artifactId>hzgzpt</artifactId>
     <version>3.2.1</version>
 
     <name>hzgzpt</name>
     <description>管理系统</description>
-    
+
     <properties>
         <ruoyi.version>3.2.1</ruoyi.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -33,12 +33,13 @@
         <mybatis-plus.version>3.4.1</mybatis-plus.version>
         <hutool.version>5.4.0</hutool.version>
         <com.aliyun.oss.version>2.8.3</com.aliyun.oss.version>
+        <feign.version>2.1.3.RELEASE</feign.version>
     </properties>
-	
+
     <!-- 依赖声明 -->
     <dependencyManagement>
         <dependencies>
-        
+
             <!-- SpringBoot的依赖配置-->
             <dependency>
                 <groupId>org.springframework.boot</groupId>
@@ -47,21 +48,21 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            
+
             <!--阿里数据库连接池 -->
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>druid-spring-boot-starter</artifactId>
                 <version>${druid.version}</version>
             </dependency>
-	        
+
             <!-- 解析客户端操作系统、浏览器等 -->
             <dependency>
                 <groupId>eu.bitwalker</groupId>
                 <artifactId>UserAgentUtils</artifactId>
                 <version>${bitwalker.version}</version>
             </dependency>
-			
+
             <!-- pagehelper 分页插件 -->
             <dependency>
                 <groupId>com.github.pagehelper</groupId>
@@ -74,7 +75,7 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-			
+
             <!-- 获取系统信息 -->
             <dependency>
                 <groupId>com.github.oshi</groupId>
@@ -93,7 +94,7 @@
                 <artifactId>jna-platform</artifactId>
                 <version>${jna.version}</version>
             </dependency>
-			
+
             <!-- swagger2-->
             <dependency>
                 <groupId>io.springfox</groupId>
@@ -110,49 +111,49 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-			
+
             <!-- swagger2-UI-->
             <dependency>
                 <groupId>io.springfox</groupId>
                 <artifactId>springfox-swagger-ui</artifactId>
                 <version>${swagger.version}</version>
             </dependency>
-            
+
             <!--io常用工具类 -->
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
                 <version>${commons.io.version}</version>
             </dependency>
-	
+
             <!--文件上传工具类 -->
             <dependency>
                 <groupId>commons-fileupload</groupId>
                 <artifactId>commons-fileupload</artifactId>
                 <version>${commons.fileupload.version}</version>
             </dependency>
-			
+
             <!-- excel工具 -->
             <dependency>
                 <groupId>org.apache.poi</groupId>
                 <artifactId>poi-ooxml</artifactId>
                 <version>${poi.version}</version>
             </dependency>
-			
+
             <!--velocity代码生成使用模板 -->
             <dependency>
                 <groupId>org.apache.velocity</groupId>
                 <artifactId>velocity</artifactId>
                 <version>${velocity.version}</version>
             </dependency>
-	        
+
             <!-- 阿里JSON解析器 -->
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>fastjson</artifactId>
                 <version>${fastjson.version}</version>
             </dependency>
-			
+
             <!--Token生成与解析-->
             <dependency>
                 <groupId>io.jsonwebtoken</groupId>
@@ -203,14 +204,14 @@
                 <artifactId>hzgzpt-framework</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
-			
+
             <!-- 系统模块-->
             <dependency>
                 <groupId>com.miaxis</groupId>
                 <artifactId>hzgzpt-system</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
-			
+
             <!-- 通用工具-->
             <dependency>
                 <groupId>com.miaxis</groupId>
@@ -225,6 +226,13 @@
                 <version>${com.aliyun.oss.version}</version>
             </dependency>
 
+            <!--openfein的依赖-->
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-starter-openfeign</artifactId>
+                <version>${feign.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 
@@ -315,4 +323,4 @@
         </profile>
     </profiles>
 
-</project>
+</project>