Merge branch 'master' of http://218.85.55.253:3000/miaxis/hzgzpt

hzgzpt-admin/src/main/java/com/miaxis/app/controller/report/ReportInfoController.java

@@ -0,0 +1,129 @@
+package com.miaxis.app.controller.report;
+
+import com.miaxis.app.file.vo.FileVo;
+import com.miaxis.app.report.domain.ReportInfo;
+import com.miaxis.app.report.dto.ReportInfoDTO;
+import com.miaxis.app.report.service.IReportImagesService;
+import com.miaxis.app.report.service.IReportInfoService;
+import com.miaxis.common.aliyunOSS.AliyunConfig;
+import com.miaxis.common.aliyunOSS.AliyunUpload;
+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 io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 【举报信息】Controller
+ *
+ * @author miaxis
+ * @date 2021-01-06
+ */
+@RestController
+@RequestMapping(Constants.OPEN_PREFIX+"/report/info")
+@Api(tags={"【app-举报信息】"})
+public class ReportInfoController extends BaseController{
+    @Autowired
+    private IReportInfoService reportInfoService;
+
+    @Autowired
+    private IReportImagesService reportImagesService;
+
+
+    /**
+     * 查询举报信息列表
+     */
+    //@PreAuthorize("@ss.hasPermi('report:info:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询举报信息列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<ReportInfo> list(@ModelAttribute ReportInfo reportInfo){
+        startPage();
+        List<ReportInfo> list = reportInfoService.selectReportInfoList(reportInfo);
+        return toResponsePageInfo(list);
+    }
+
+
+    /**
+     * 获取举报信息详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('report:info:query')")
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取举报信息详细信息")
+    public Response<ReportInfo> getInfo(
+            @ApiParam(name = "id", value = "举报信息参数", required = true)
+            @PathVariable("id") Long id
+    ){
+        return Response.success(reportInfoService.selectReportInfoById(id));
+    }
+
+    /**
+     * 新增举报信息
+     */
+    //@PreAuthorize("@ss.hasPermi('report:info:add')")
+    @Log(title = "举报信息", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增举报信息")
+    public Response add(@RequestBody ReportInfoDTO reportInfoDTO){
+        reportInfoService.insertReportInfo(reportInfoDTO);
+        return Response.success();
+    }
+
+    /**
+     * 修改举报信息
+     */
+    //@PreAuthorize("@ss.hasPermi('report:info:edit')")
+    @Log(title = "举报信息", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改举报信息")
+    public Response<Integer> edit(@RequestBody ReportInfo reportInfo){
+        return toResponse(reportInfoService.updateReportInfo(reportInfo));
+    }
+
+    /**
+     * 删除举报信息
+     */
+    //@PreAuthorize("@ss.hasPermi('report:info: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(reportInfoService.deleteReportInfoByIds(ids));
+    }
+
+
+
+    /**
+     * 上传举报照片
+     */
+    @Log(title = "上传举报照片", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping("/image")
+    @ApiOperation("上传举报信息")
+    public Response<FileVo> uploadImage(MultipartFile multFile) throws IOException {
+        String savePath = AliyunConfig.GZPT_REPORT
+                + new SimpleDateFormat("yyyyMMdd").format(new Date()) + "/report/";
+        String fileName = System.currentTimeMillis() + ".jpg";//文件名
+        String fileUrl = AliyunUpload.uploadForStream(multFile.getInputStream(), savePath, fileName);
+        FileVo fileVo = new FileVo();
+        fileVo.setFileName(fileName);
+        fileVo.setFilePath(savePath+fileName);
+        fileVo.setFileUrl(fileUrl);
+        return Response.success(fileVo);
+    }
+}

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

@@ -12,7 +12,7 @@ import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.domain.entity.SysUser;
 import com.miaxis.common.core.domain.entity.UserInfo;
 import com.miaxis.common.core.page.ResponsePageInfo;
-import com.miaxis.common.enums.PictureType;
+import com.miaxis.common.enums.PictureTypeEnum;
 import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.utils.SecurityUtils;
 import io.swagger.annotations.*;
@@ -114,12 +114,14 @@ public class UserInfoController extends BaseController{
     })
     public Response uploadIdCardAndHeadPicture(String type,MultipartFile multFile) throws IOException {
         String prefix = "";
-        if ("1".equals(type)){
-            prefix = PictureType.IDCARDFRONT.getPrefix();
-        }else if ("2".equals(type)){
-            prefix = PictureType.IDCARDREVERSE.getPrefix();
-        }else if ("3".equals(type)){
-            prefix = PictureType.FACES.getPrefix();
+        if (PictureTypeEnum.IDCARDFRONT.getCode().equals(type)){
+            prefix = PictureTypeEnum.IDCARDFRONT.getPrefix();
+        }else if (PictureTypeEnum.IDCARDFRONT.getCode().equals(type)){
+            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-dev.yml

@@ -10,12 +10,12 @@ spring:
                 username: root
                 password: miaxis110
             # 从库数据源
-            slave:
+            xueshi:
                 # 从数据源开关/默认关闭
-                enabled: false
-                url:
-                username:
-                password:
+                enabled: true
+                url: jdbc:mysql://192.168.8.213:3306/hzgzpt-xueshi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+                username: root
+                password: miaxis110
             # 初始连接数
             initialSize: 5
             # 最小连接池数量

hzgzpt-common/src/main/java/com/miaxis/common/aliyunOSS/AliyunConfig.java

@@ -11,7 +11,9 @@ public class AliyunConfig {
 	/** 用户图片文件*/
 	public static String GZPT_USER = GZPT_PATH + "user/";
 
+	/** 举报照片图片文件目录*/
+	public static String GZPT_REPORT = GZPT_PATH + "report/";
+
+
 
-	
 }
- 

hzgzpt-common/src/main/java/com/miaxis/common/enums/DataSourceTypeEnum.java

@@ -13,7 +13,7 @@ public enum DataSourceTypeEnum
     MASTER,
 
     /**
-     * 从库
+     * 学时库
      */
-    SLAVE
+    XUESHI
 }

hzgzpt-common/src/main/java/com/miaxis/common/enums/PictureType.java → hzgzpt-common/src/main/java/com/miaxis/common/enums/PictureTypeEnum.java

@@ -6,7 +6,7 @@ package com.miaxis.common.enums;
  * @Date 2021/1/5
  * @Version 1.0
  */
-public enum PictureType {
+public enum PictureTypeEnum {
 
     IDCARDFRONT("1", "身份证正面","idCardFront"),
     IDCARDREVERSE("2", "身份证反面","idCardReverse"),
@@ -16,7 +16,7 @@ public enum PictureType {
     private final String info;
     private final String prefix;
 
-    PictureType(String code, String info,String prefix)
+    PictureTypeEnum(String code, String info, String prefix)
     {
         this.code = code;
         this.info = info;

hzgzpt-common/src/main/java/com/miaxis/common/utils/StringUtils.java

@@ -3,10 +3,12 @@ package com.miaxis.common.utils;
 import com.miaxis.common.core.text.StrFormatter;
 
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * 字符串工具类
- * 
+ *
  * @author miaxis
  */
 public class StringUtils extends org.apache.commons.lang3.StringUtils
@@ -19,7 +21,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 
     /**
      * 获取参数不为空值
-     * 
+     *
      * @param value defaultValue 要判断的value
      * @return value 返回值
      */
@@ -30,7 +32,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 
     /**
      * * 判断一个Collection是否为空， 包含List，Set，Queue
-     * 
+     *
      * @param coll 要判断的Collection
      * @return true：为空 false：非空
      */
@@ -41,7 +43,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 
     /**
      * * 判断一个Collection是否非空，包含List，Set，Queue
-     * 
+     *
      * @param coll 要判断的Collection
      * @return true：非空 false：空
      */
@@ -52,7 +54,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 
     /**
      * * 判断一个对象数组是否为空
-     * 
+     *
      * @param objects 要判断的对象数组
      ** @return true：为空 false：非空
      */
@@ -63,7 +65,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 
     /**
      * * 判断一个对象数组是否非空
-     * 
+     *
      * @param objects 要判断的对象数组
      * @return true：非空 false：空
      */
@@ -74,7 +76,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 
     /**
      * * 判断一个Map是否为空
-     * 
+     *
      * @param map 要判断的Map
      * @return true：为空 false：非空
      */
@@ -85,7 +87,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 
     /**
      * * 判断一个Map是否为空
-     * 
+     *
      * @param map 要判断的Map
      * @return true：非空 false：空
      */
@@ -96,7 +98,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 
     /**
      * * 判断一个字符串是否为空串
-     * 
+     *
      * @param str String
      * @return true：为空 false：非空
      */
@@ -107,7 +109,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 
     /**
      * * 判断一个字符串是否为非空串
-     * 
+     *
      * @param str String
      * @return true：非空串 false：空串
      */
@@ -118,7 +120,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 
     /**
      * * 判断一个对象是否为空
-     * 
+     *
      * @param object Object
      * @return true：为空 false：非空
      */
@@ -129,7 +131,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 
     /**
      * * 判断一个对象是否非空
-     * 
+     *
      * @param object Object
      * @return true：非空 false：空
      */
@@ -140,7 +142,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 
     /**
      * * 判断一个对象是否是数组类型（Java基本型别的数组）
-     * 
+     *
      * @param object 对象
      * @return true：是数组 false：不是数组
      */
@@ -159,7 +161,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 
     /**
      * 截取字符串
-     * 
+     *
      * @param str 字符串
      * @param start 开始
      * @return 结果
@@ -190,7 +192,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 
     /**
      * 截取字符串
-     * 
+     *
      * @param str 字符串
      * @param start 开始
      * @param end 结束
@@ -242,7 +244,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
      * 通常使用：format("this is {} for {}", "a", "b") -> this is a for b<br>
      * 转义{}： format("this is \\{} for {}", "a", "b") -> this is \{} for a<br>
      * 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b<br>
-     * 
+     *
      * @param template 文本模板，被替换的部分用 {} 表示
      * @param params 参数值
      * @return 格式化后的文本
@@ -258,7 +260,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 
     /**
      * 字符串转set
-     * 
+     *
      * @param str 字符串
      * @param sep 分隔符
      * @return set集合
@@ -270,7 +272,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 
     /**
      * 字符串转list
-     * 
+     *
      * @param str 字符串
      * @param sep 分隔符
      * @param filterBlank 过滤纯空白
@@ -358,7 +360,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 
     /**
      * 是否包含字符串
-     * 
+     *
      * @param str 验证字符串
      * @param strs 字符串组
      * @return 包含返回true
@@ -380,7 +382,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
 
     /**
      * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。 例如：HELLO_WORLD->HelloWorld
-     * 
+     *
      * @param name 转换前的下划线大写方式命名的字符串
      * @return 转换后的驼峰式命名的字符串
      */
@@ -452,4 +454,16 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
     {
         return (T) obj;
     }
-}
+
+
+
+
+    //验证手机号码合法性验证方法
+    public static boolean isMobiPhoneNum(String telNum) {
+        String regex = "^((13[0-9])|(15[0-9])|(18[0-9]))\\d{8}$";
+        Pattern p = Pattern.compile(regex,Pattern.CASE_INSENSITIVE);
+        Matcher m = p.matcher(telNum);
+        return m.matches();
+
+    }
+}

hzgzpt-framework/src/main/java/com/miaxis/framework/config/DruidConfig.java

@@ -39,10 +39,10 @@ public class DruidConfig
     }
 
     @Bean
-    @ConfigurationProperties("spring.datasource.druid.slave")
+    @ConfigurationProperties("spring.datasource.druid.xueshi")
     //控制配置类是否生效 enabled为true时生效
-    @ConditionalOnProperty(prefix = "spring.datasource.druid.slave", name = "enabled", havingValue = "true")
-    public DataSource slaveDataSource(DruidProperties druidProperties)
+    @ConditionalOnProperty(prefix = "spring.datasource.druid.xueshi", name = "enabled", havingValue = "true")
+    public DataSource xueshiDataSource(DruidProperties druidProperties)
     {
         DruidDataSource dataSource = DruidDataSourceBuilder.create().build();
         return druidProperties.dataSource(dataSource);
@@ -54,7 +54,7 @@ public class DruidConfig
     {
         Map<Object, Object> targetDataSources = new HashMap<>();
         targetDataSources.put(DataSourceTypeEnum.MASTER.name(), masterDataSource);
-        setDataSource(targetDataSources, DataSourceTypeEnum.SLAVE.name(), "slaveDataSource");
+        setDataSource(targetDataSources, DataSourceTypeEnum.XUESHI.name(), "xueshiDataSource");
         return new DynamicDataSource(masterDataSource, targetDataSources);
     }
 

hzgzpt-generator/src/main/resources/generator.yml

@@ -1,10 +1,10 @@
 # 代码生成
-gen: 
+gen:
   # 作者
   author: miaxis
   # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
-  packageName: com.miaxis.system
+  packageName: com.miaxis.app.xxx
   # 自动去除表前缀，默认是false
   autoRemovePre: false
   # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）
-  tablePrefix: sys_
+  tablePrefix: sys_

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

@@ -17,6 +17,7 @@ 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;
 /**
  * ${functionName}对象 ${tableName}

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

@@ -0,0 +1,88 @@
+package com.miaxis.app.report.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+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;
+/**
+ * 用户照片对象 report_images
+ *
+ * @author miaxis
+ * @date 2021-01-06
+ */
+@Data
+@TableName("report_images")
+@ApiModel(value = "ReportImages", description = "用户照片对象 report_images")
+public class ReportImages extends BaseBusinessEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** 自增id */
+    @TableId(value = "id")
+    @ApiModelProperty(value = "自增id")
+    private Long id;
+
+    /** 举报id */
+    @Excel(name = "举报id")
+    @TableField("report_id")
+    @ApiModelProperty(value = "举报id")
+    private Long reportId;
+
+    /** 照片url(访问地址) */
+    @Excel(name = "照片url(访问地址)")
+    @TableField("file_url")
+    @ApiModelProperty(value = "照片url(访问地址)")
+    private String fileUrl;
+
+    /** 文件路径 */
+    @Excel(name = "文件路径")
+    @TableField("file_path")
+    @ApiModelProperty(value = "文件路径")
+    private String filePath;
+
+    public void setId(Long id){
+        this.id = id;
+    }
+
+    public Long getId(){
+        return id;
+    }
+    public void setReportId(Long reportId){
+        this.reportId = reportId;
+    }
+
+    public Long getReportId(){
+        return reportId;
+    }
+    public void setFileUrl(String fileUrl){
+        this.fileUrl = fileUrl;
+    }
+
+    public String getFileUrl(){
+        return fileUrl;
+    }
+    public void setFilePath(String filePath){
+        this.filePath = filePath;
+    }
+
+    public String getFilePath(){
+        return filePath;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("reportId", getReportId())
+            .append("fileUrl", getFileUrl())
+            .append("filePath", getFilePath())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

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

@@ -0,0 +1,102 @@
+package com.miaxis.app.report.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+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;
+/**
+ * 举报信息对象 report_info
+ *
+ * @author miaxis
+ * @date 2021-01-06
+ */
+@Data
+@TableName("report_info")
+@ApiModel(value = "ReportInfo", description = "举报信息对象 report_info")
+public class ReportInfo extends BaseBusinessEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** 自增id */
+    @TableId(value = "id")
+    @ApiModelProperty(value = "自增id")
+    private Long id;
+
+    /** 电话号码 */
+    @Excel(name = "电话号码")
+    @TableField("mobile")
+    @ApiModelProperty(value = "电话号码")
+    private String mobile;
+
+    /** 反馈内容 */
+    @Excel(name = "反馈内容")
+    @TableField("report_content")
+    @ApiModelProperty(value = "反馈内容")
+    private String reportContent;
+
+    /** 反馈类型 1-驾校相关 2-缴费问题 3-客户服务 4-题库问题 5-app体验 99-其他 */
+    @Excel(name = "反馈类型 1-驾校相关 2-缴费问题 3-客户服务 4-题库问题 5-app体验 99-其他")
+    @TableField("report_type")
+    @ApiModelProperty(value = "反馈类型 1-驾校相关 2-缴费问题 3-客户服务 4-题库问题 5-app体验 99-其他")
+    private Integer reportType;
+
+    /** 投诉状态 1-未处理 2-已处理 */
+    @Excel(name = "投诉状态 1-未处理 2-已处理")
+    @TableField("status")
+    @ApiModelProperty(value = "投诉状态 1-未处理 2-已处理")
+    private Integer status;
+
+    public void setId(Long id){
+        this.id = id;
+    }
+
+    public Long getId(){
+        return id;
+    }
+    public void setMobile(String mobile){
+        this.mobile = mobile;
+    }
+
+    public String getMobile(){
+        return mobile;
+    }
+    public void setReportContent(String reportContent){
+        this.reportContent = reportContent;
+    }
+
+    public String getReportContent(){
+        return reportContent;
+    }
+    public void setReportType(Integer reportType){
+        this.reportType = reportType;
+    }
+
+    public Integer getReportType(){
+        return reportType;
+    }
+    public void setStatus(Integer status){
+        this.status = status;
+    }
+
+    public Integer getStatus(){
+        return status;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("mobile", getMobile())
+            .append("reportContent", getReportContent())
+            .append("reportType", getReportType())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("status", getStatus())
+            .toString();
+    }
+}

hzgzpt-service-app/src/main/java/com/miaxis/app/report/dto/ReportInfoDTO.java

@@ -0,0 +1,58 @@
+package com.miaxis.app.report.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.miaxis.app.file.vo.FileVo;
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 新增举报信息
+ *
+ * @author miaxis
+ * @date 2021-01-06
+ */
+@Data
+@TableName("report_info")
+@ApiModel(value = "ReportInfo", description = "举报信息对象 report_info")
+public class ReportInfoDTO extends BaseBusinessEntity {
+    private static final long serialVersionUID = 1L;
+
+
+
+    /** 电话号码 */
+    @Excel(name = "电话号码")
+    @TableField("mobile")
+    @ApiModelProperty(value = "电话号码")
+    private String mobile;
+
+    /** 反馈内容 */
+    @Excel(name = "反馈内容")
+    @TableField("report_content")
+    @ApiModelProperty(value = "反馈内容")
+    private String reportContent;
+
+    /** 反馈类型 1-驾校相关 2-缴费问题 3-客户服务 4-题库问题 5-app体验 99-其他 */
+    @Excel(name = "反馈类型 1-驾校相关 2-缴费问题 3-客户服务 4-题库问题 5-app体验 99-其他")
+    @TableField("report_type")
+    @ApiModelProperty(value = "反馈类型 1-驾校相关 2-缴费问题 3-客户服务 4-题库问题 5-app体验 99-其他")
+    private Integer reportType;
+
+    /** 投诉状态 0-未处理 1-已处理 */
+    @Excel(name = "投诉状态 0-未处理 1-已处理")
+    @TableField("status")
+    @ApiModelProperty(value = "投诉状态 0-未处理 1-已处理")
+    private Integer status ;
+
+    @ApiModelProperty(value = "图片")
+    private List<FileVo> images ;
+
+
+
+
+}

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

@@ -0,0 +1,61 @@
+package com.miaxis.app.report.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.app.report.domain.ReportImages;
+
+/**
+ * 用户照片Mapper接口
+ *
+ * @author miaxis
+ * @date 2021-01-06
+ */
+public interface ReportImagesMapper extends BaseMapper<ReportImages> {
+    /**
+     * 查询用户照片
+     *
+     * @param id 用户照片ID
+     * @return 用户照片
+     */
+    public ReportImages selectReportImagesById(Long id);
+
+    /**
+     * 查询用户照片列表
+     *
+     * @param reportImages 用户照片
+     * @return 用户照片集合
+     */
+    public List<ReportImages> selectReportImagesList(ReportImages reportImages);
+
+    /**
+     * 新增用户照片
+     *
+     * @param reportImages 用户照片
+     * @return 结果
+     */
+    public int insertReportImages(ReportImages reportImages);
+
+    /**
+     * 修改用户照片
+     *
+     * @param reportImages 用户照片
+     * @return 结果
+     */
+    public int updateReportImages(ReportImages reportImages);
+
+    /**
+     * 删除用户照片
+     *
+     * @param id 用户照片ID
+     * @return 结果
+     */
+    public int deleteReportImagesById(Long id);
+
+    /**
+     * 批量删除用户照片
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteReportImagesByIds(Long[] ids);
+}

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

@@ -0,0 +1,62 @@
+package com.miaxis.app.report.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.app.report.domain.ReportInfo;
+
+import java.util.List;
+
+/**
+ * 举报信息Mapper接口
+ *
+ * @author miaxis
+ * @date 2021-01-06
+ */
+public interface ReportInfoMapper extends BaseMapper<ReportInfo> {
+    /**
+     * 查询举报信息
+     *
+     * @param id 举报信息ID
+     * @return 举报信息
+     */
+    public ReportInfo selectReportInfoById(Long id);
+
+    /**
+     * 查询举报信息列表
+     *
+     * @param reportInfo 举报信息
+     * @return 举报信息集合
+     */
+    public List<ReportInfo> selectReportInfoList(ReportInfo reportInfo);
+
+    /**
+     * 新增举报信息
+     *
+     * @param reportInfo 举报信息
+     * @return 结果
+     */
+    public long insertReportInfo(ReportInfo reportInfo);
+
+    /**
+     * 修改举报信息
+     *
+     * @param reportInfo 举报信息
+     * @return 结果
+     */
+    public int updateReportInfo(ReportInfo reportInfo);
+
+    /**
+     * 删除举报信息
+     *
+     * @param id 举报信息ID
+     * @return 结果
+     */
+    public int deleteReportInfoById(Long id);
+
+    /**
+     * 批量删除举报信息
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteReportInfoByIds(Long[] ids);
+}

hzgzpt-service-app/src/main/java/com/miaxis/app/report/service/IReportImagesService.java

@@ -0,0 +1,62 @@
+package com.miaxis.app.report.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.app.report.domain.ReportImages;
+
+import java.util.List;
+
+/**
+ * 用户照片Service接口
+ *
+ * @author miaxis
+ * @date 2021-01-06
+ */
+public interface IReportImagesService extends IService<ReportImages>{
+    /**
+     * 查询用户照片
+     *
+     * @param id 用户照片ID
+     * @return 用户照片
+     */
+    public ReportImages selectReportImagesById(Long id);
+
+    /**
+     * 查询用户照片列表
+     *
+     * @param reportImages 用户照片
+     * @return 用户照片集合
+     */
+    public List<ReportImages> selectReportImagesList(ReportImages reportImages);
+
+    /**
+     * 新增用户照片
+     *
+     * @param reportImages 用户照片
+     * @return 结果
+     */
+    public int insertReportImages(ReportImages reportImages);
+
+    /**
+     * 修改用户照片
+     *
+     * @param reportImages 用户照片
+     * @return 结果
+     */
+    public int updateReportImages(ReportImages reportImages);
+
+    /**
+     * 批量删除用户照片
+     *
+     * @param ids 需要删除的用户照片ID
+     * @return 结果
+     */
+    public int deleteReportImagesByIds(Long[] ids);
+
+    /**
+     * 删除用户照片信息
+     *
+     * @param id 用户照片ID
+     * @return 结果
+     */
+    public int deleteReportImagesById(Long id);
+}

hzgzpt-service-app/src/main/java/com/miaxis/app/report/service/IReportInfoService.java

@@ -0,0 +1,62 @@
+package com.miaxis.app.report.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.app.report.domain.ReportInfo;
+import com.miaxis.app.report.dto.ReportInfoDTO;
+
+import java.util.List;
+
+/**
+ * 举报信息Service接口
+ *
+ * @author miaxis
+ * @date 2021-01-06
+ */
+public interface IReportInfoService extends IService<ReportInfo>{
+    /**
+     * 查询举报信息
+     *
+     * @param id 举报信息ID
+     * @return 举报信息
+     */
+    public ReportInfo selectReportInfoById(Long id);
+
+    /**
+     * 查询举报信息列表
+     *
+     * @param reportInfo 举报信息
+     * @return 举报信息集合
+     */
+    public List<ReportInfo> selectReportInfoList(ReportInfo reportInfo);
+
+    /**
+     * 新增举报信息
+     *
+     * @return 结果
+     */
+    public void insertReportInfo(ReportInfoDTO reportInfoDTO);
+
+    /**
+     * 修改举报信息
+     *
+     * @param reportInfo 举报信息
+     * @return 结果
+     */
+    public int updateReportInfo(ReportInfo reportInfo);
+
+    /**
+     * 批量删除举报信息
+     *
+     * @param ids 需要删除的举报信息ID
+     * @return 结果
+     */
+    public int deleteReportInfoByIds(Long[] ids);
+
+    /**
+     * 删除举报信息信息
+     *
+     * @param id 举报信息ID
+     * @return 结果
+     */
+    public int deleteReportInfoById(Long id);
+}

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

@@ -0,0 +1,90 @@
+package com.miaxis.app.report.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.miaxis.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.miaxis.app.report.mapper.ReportImagesMapper;
+import com.miaxis.app.report.domain.ReportImages;
+import com.miaxis.app.report.service.IReportImagesService;
+
+/**
+ * 用户照片Service业务层处理
+ *
+ * @author miaxis
+ * @date 2021-01-06
+ */
+@Service
+public class ReportImagesServiceImpl extends ServiceImpl<ReportImagesMapper, ReportImages> implements IReportImagesService {
+    @Autowired
+    private ReportImagesMapper reportImagesMapper;
+
+    /**
+     * 查询用户照片
+     *
+     * @param id 用户照片ID
+     * @return 用户照片
+     */
+    @Override
+    public ReportImages selectReportImagesById(Long id){
+        return reportImagesMapper.selectReportImagesById(id);
+    }
+
+    /**
+     * 查询用户照片列表
+     *
+     * @param reportImages 用户照片
+     * @return 用户照片
+     */
+    @Override
+    public List<ReportImages> selectReportImagesList(ReportImages reportImages){
+        return reportImagesMapper.selectReportImagesList(reportImages);
+    }
+
+    /**
+     * 新增用户照片
+     *
+     * @param reportImages 用户照片
+     * @return 结果
+     */
+    @Override
+    public int insertReportImages(ReportImages reportImages){
+        reportImages.setCreateTime(DateUtils.getNowDate());
+        return reportImagesMapper.insertReportImages(reportImages);
+    }
+
+    /**
+     * 修改用户照片
+     *
+     * @param reportImages 用户照片
+     * @return 结果
+     */
+    @Override
+    public int updateReportImages(ReportImages reportImages){
+        reportImages.setUpdateTime(DateUtils.getNowDate());
+        return reportImagesMapper.updateReportImages(reportImages);
+    }
+
+    /**
+     * 批量删除用户照片
+     *
+     * @param ids 需要删除的用户照片ID
+     * @return 结果
+     */
+    @Override
+    public int deleteReportImagesByIds(Long[] ids){
+        return reportImagesMapper.deleteReportImagesByIds(ids);
+    }
+
+    /**
+     * 删除用户照片信息
+     *
+     * @param id 用户照片ID
+     * @return 结果
+     */
+    @Override
+    public int deleteReportImagesById(Long id){
+        return reportImagesMapper.deleteReportImagesById(id);
+    }
+}

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

@@ -0,0 +1,120 @@
+package com.miaxis.app.report.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.miaxis.app.file.vo.FileVo;
+import com.miaxis.app.report.domain.ReportImages;
+import com.miaxis.app.report.domain.ReportInfo;
+import com.miaxis.app.report.dto.ReportInfoDTO;
+import com.miaxis.app.report.mapper.ReportInfoMapper;
+import com.miaxis.app.report.service.IReportImagesService;
+import com.miaxis.app.report.service.IReportInfoService;
+import com.miaxis.common.exception.CustomException;
+import com.miaxis.common.utils.DateUtils;
+import com.miaxis.common.utils.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 举报信息Service业务层处理
+ *
+ * @author miaxis
+ * @date 2021-01-06
+ */
+@Service
+public class ReportInfoServiceImpl extends ServiceImpl<ReportInfoMapper, ReportInfo> implements IReportInfoService {
+    @Autowired
+    private ReportInfoMapper reportInfoMapper;
+
+
+    @Autowired
+    private IReportImagesService reportImagesService;
+
+    /**
+     * 查询举报信息
+     *
+     * @param id 举报信息ID
+     * @return 举报信息
+     */
+    @Override
+    public ReportInfo selectReportInfoById(Long id){
+        return reportInfoMapper.selectReportInfoById(id);
+    }
+
+    /**
+     * 查询举报信息列表
+     *
+     * @param reportInfo 举报信息
+     * @return 举报信息
+     */
+    @Override
+    public List<ReportInfo> selectReportInfoList(ReportInfo reportInfo){
+        return reportInfoMapper.selectReportInfoList(reportInfo);
+    }
+
+    /**
+     * 新增举报信息
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public void insertReportInfo(ReportInfoDTO reportInfoDTO){
+        if (!StringUtils.isMobiPhoneNum(reportInfoDTO.getMobile())){
+            throw new CustomException("手机号格式不正确");
+        }
+        if (!StringUtils.isMobiPhoneNum(reportInfoDTO.getReportContent())){
+            throw new CustomException("内容不能为空");
+        }
+        ReportInfo reportInfo = new ReportInfo();
+        BeanUtils.copyProperties(reportInfoDTO,reportInfo);
+        reportInfoMapper.insertReportInfo(reportInfo);
+        List<FileVo> images = reportInfoDTO.getImages();
+        List<ReportImages> reportImagesList = images.stream().map(o->toReportImages(o,reportInfo.getId())).collect(Collectors.toList());
+        reportImagesService.saveBatch(reportImagesList);
+    }
+
+    private ReportImages toReportImages(FileVo o, Long id) {
+        ReportImages reportImages = new ReportImages();
+        BeanUtils.copyProperties(o,reportImages);
+        reportImages.setReportId(id);
+        return  reportImages;
+    }
+
+    /**
+     * 修改举报信息
+     *
+     * @param reportInfo 举报信息
+     * @return 结果
+     */
+    @Override
+    public int updateReportInfo(ReportInfo reportInfo){
+        reportInfo.setUpdateTime(DateUtils.getNowDate());
+        return reportInfoMapper.updateReportInfo(reportInfo);
+    }
+
+    /**
+     * 批量删除举报信息
+     *
+     * @param ids 需要删除的举报信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteReportInfoByIds(Long[] ids){
+        return reportInfoMapper.deleteReportInfoByIds(ids);
+    }
+
+    /**
+     * 删除举报信息信息
+     *
+     * @param id 举报信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteReportInfoById(Long id){
+        return reportInfoMapper.deleteReportInfoById(id);
+    }
+}

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

@@ -1,9 +1,5 @@
 package com.miaxis.app.school.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.miaxis.common.annotation.Excel;
 import com.miaxis.common.core.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -16,7 +12,6 @@ import lombok.Data;
  * @date 2020-12-28
  */
 @Data
-@TableName("school_evaluate")
 @ApiModel(value = "SchoolEvaluate", description = "驾校评价对象 school_evaluate")
 public class SchoolEvaluateDto extends BaseBusinessEntity {
     private static final long serialVersionUID = 1L;

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

@@ -161,8 +161,8 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
             throw new CustomException("验证码错误,请重新输入!");
         }
 
-        UserInfo userInfo = new UserInfo();
         //用户信息表
+        UserInfo userInfo = new UserInfo();
         userInfo.setName(userDto.getName());
         userInfo.setSex(userDto.getSex());
         userInfo.setSfzmlx(1l);
@@ -193,6 +193,7 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
         userPay.setPayStatus(0l);
         userPayMapper.insert(userPay);
 
+
         //用户图片信息
         List<UserImages> userImagesList = new ArrayList<>();
         for (int i = 0; i < 3; i++) {

hzgzpt-service-app/src/main/resources/mapper/report/ReportImagesMapper.xml

@@ -0,0 +1,75 @@
+<?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.report.mapper.ReportImagesMapper">
+    
+    <resultMap type="ReportImages" id="ReportImagesResult">
+        <result property="id"    column="id"    />
+        <result property="reportId"    column="report_id"    />
+        <result property="fileUrl"    column="file_url"    />
+        <result property="filePath"    column="file_path"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectReportImagesVo">
+        select id, report_id, file_url, file_path, create_time, update_time from report_images
+    </sql>
+
+    <select id="selectReportImagesList" parameterType="ReportImages" resultMap="ReportImagesResult">
+        <include refid="selectReportImagesVo"/>
+        <where>  
+            <if test="reportId != null "> and report_id = #{reportId}</if>
+            <if test="fileUrl != null  and fileUrl != ''"> and file_url = #{fileUrl}</if>
+            <if test="filePath != null  and filePath != ''"> and file_path = #{filePath}</if>
+        </where>
+    </select>
+    
+    <select id="selectReportImagesById" parameterType="Long" resultMap="ReportImagesResult">
+        <include refid="selectReportImagesVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertReportImages" parameterType="ReportImages" useGeneratedKeys="true" keyProperty="id">
+        insert into report_images
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="reportId != null">report_id,</if>
+            <if test="fileUrl != null">file_url,</if>
+            <if test="filePath != null">file_path,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="reportId != null">#{reportId},</if>
+            <if test="fileUrl != null">#{fileUrl},</if>
+            <if test="filePath != null">#{filePath},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateReportImages" parameterType="ReportImages">
+        update report_images
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="reportId != null">report_id = #{reportId},</if>
+            <if test="fileUrl != null">file_url = #{fileUrl},</if>
+            <if test="filePath != null">file_path = #{filePath},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteReportImagesById" parameterType="Long">
+        delete from report_images where id = #{id}
+    </delete>
+
+    <delete id="deleteReportImagesByIds" parameterType="String">
+        delete from report_images where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    
+</mapper>

hzgzpt-service-app/src/main/resources/mapper/report/ReportInfoMapper.xml

@@ -0,0 +1,80 @@
+<?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.report.mapper.ReportInfoMapper">
+    
+    <resultMap type="ReportInfo" id="ReportInfoResult">
+        <result property="id"    column="id"    />
+        <result property="mobile"    column="mobile"    />
+        <result property="reportContent"    column="report_content"    />
+        <result property="reportType"    column="report_type"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="status"    column="status"    />
+    </resultMap>
+
+    <sql id="selectReportInfoVo">
+        select id, mobile, report_content, report_type, create_time, update_time, status from report_info
+    </sql>
+
+    <select id="selectReportInfoList" parameterType="ReportInfo" resultMap="ReportInfoResult">
+        <include refid="selectReportInfoVo"/>
+        <where>  
+            <if test="mobile != null  and mobile != ''"> and mobile = #{mobile}</if>
+            <if test="reportContent != null  and reportContent != ''"> and report_content = #{reportContent}</if>
+            <if test="reportType != null "> and report_type = #{reportType}</if>
+            <if test="status != null "> and status = #{status}</if>
+        </where>
+    </select>
+    
+    <select id="selectReportInfoById" parameterType="Long" resultMap="ReportInfoResult">
+        <include refid="selectReportInfoVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertReportInfo" parameterType="ReportInfo" useGeneratedKeys="true" keyProperty="id">
+        insert into report_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="mobile != null">mobile,</if>
+            <if test="reportContent != null">report_content,</if>
+            <if test="reportType != null">report_type,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="status != null">status,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="mobile != null">#{mobile},</if>
+            <if test="reportContent != null">#{reportContent},</if>
+            <if test="reportType != null">#{reportType},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="status != null">#{status},</if>
+         </trim>
+    </insert>
+
+    <update id="updateReportInfo" parameterType="ReportInfo">
+        update report_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="mobile != null">mobile = #{mobile},</if>
+            <if test="reportContent != null">report_content = #{reportContent},</if>
+            <if test="reportType != null">report_type = #{reportType},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="status != null">status = #{status},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteReportInfoById" parameterType="Long">
+        delete from report_info where id = #{id}
+    </delete>
+
+    <delete id="deleteReportInfoByIds" parameterType="String">
+        delete from report_info where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    
+</mapper>