资讯模块基础类——视频功能修复

wisenergy-mapper/src/main/resources/mapper/ShopZxMapper.xml

@@ -2,17 +2,17 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
     <mapper namespace="cn.wisenergy.mapper.ShopZxMapper">
     <resultMap id="zxMap" type="cn.wisenergy.model.app.shopZx">
-        <id column="zxid" property="zxid"/>
-        <result column="zxUrl" property="zxUrl"/>
-        <result column="zxLikes" property="zxLikes"/>
-        <result column="userid" property="userid"/>
-        <result column="userName" property="userName"/>
+        <id column="zx_id" property="zxid"/>
+        <result column="zx_url" property="zxUrl"/>
+        <result column="zx_likes" property="zxLikes"/>
+        <result column="user_id" property="userid"/>
+        <result column="user_name" property="userName"/>
         <result column="invite_code" property="inviteCode"/>
-        <result column="zxName" property="zxName"/>
-        <result column="zxShenHe" property="zxShenHe"/>
-        <result column="zxField" property="zxField"/>
-        <result column="zxAddress" property="zxAddress"/>
-        <result column="imgUrl" property="imgUrl"/>
+        <result column="zx_name" property="zxName"/>
+        <result column="zx_to_examine" property="zxToExamine"/>
+        <result column="zx_field" property="zxField"/>
+        <result column="zx_address" property="zxAddress"/>
+        <result column="img_url" property="imgUrl"/>
     </resultMap>
     <sql id="table">
         shop_zx
@@ -42,10 +42,10 @@
 
     <!--资讯内容倒叙查询-->
     <select id="findAll" parameterType="java.lang.Integer" resultType="cn.wisenergy.model.app.shopZx">
-    select zxid as zxid,zxUrl as zxUrl,
-    zxLikes as zxLikes,userid as userid,zxName as zxName,
-    zxShenHe as zxShenHe,zxField as zxField,zxDate as zxDate,
-    imgUrl as imgUrl,zxAddress as zxAddress from shop_zx order by zxid desc limit #{pageNum},#{pageSize}
+    select zx_id as zxid,zx_url as zxUrl,
+    zx_likes as zxLikes,user_id as userId,zx_name as zxName,
+    zx_to_examine as zxToExamine,zx_field as zxField,zx_date as zxDate,
+    zx_img_url as imgUrl,zx_address as zxAddress from shop_zx order by zxid desc limit #{pageNum},#{pageSize}
     </select>
 
     <!--资讯总记录数查询-->
@@ -59,7 +59,4 @@
     zxShenHe as zxShenHe,zxField as zxField,zxDate as zxDate,
     imgUrl as imgUrl,zxAddress as zxAddress from shop_zx order by zxid desc limit #{pageNum},#{pageSize}
     </select>
-
-
-
 </mapper>
\ No newline at end of file

wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml

@@ -6,7 +6,7 @@
         <id column="id" property="id"/>
         <result column="user_id" property="userId"/>
         <result column="password" property="password"/>
-        <result column="userName" property="userName"/>
+        <result column="user_name" property="userName"/>
         <result column="head_image" property="headImage"/>
         <result column="user_level" property="userLevel"/>
         <result column="cross_border_line" property="crossBorderLine"/>
@@ -29,7 +29,7 @@
     </sql>
 
     <sql id="cols_exclude_id">
-        user_id,password,userName, head_image,user_level,cross_border_line,id_card_number,fans_nickname,fans_id, invite_code,
+        user_id,password,user_name, head_image,user_level,cross_border_line,id_card_number,fans_nickname,fans_id, invite_code,
         be_invited_code,create_time,update_time
     </sql>
 

wisenergy-model/src/main/java/cn/wisenergy/model/app/shopZx.java

@@ -28,25 +28,25 @@ public class shopZx extends Model<shopZx> implements Serializable {
     /**
      * 资讯主键id
      */
-    @ApiModelProperty(name = "zxid", value = "资讯主键id")
+    @ApiModelProperty(name = "zx_id", value = "资讯主键id")
     private Integer zxid;
 
     /**
      * 视频存放地址
      */
-    @ApiModelProperty(name = "zxUrl", value = "视频/图片存放地址")
+    @ApiModelProperty(name = "zx_url", value = "视频/图片存放地址")
     private String zxUrl;
 
     /**
      * 用户id(作者id
      */
-    @ApiModelProperty(name = "userid", value = "用户id(作者id)")
-    private String userid;
+    @ApiModelProperty(name = "user_id", value = "用户id(作者id)")
+    private String userId;
 
     /**
      * 用户名称
      */
-    @ApiModelProperty(name = "userName", value = "用户id(作者id)")
+    @ApiModelProperty(name = "user_name", value = "用户id(作者id)")
     private String userName;
 
     /**
@@ -57,77 +57,47 @@ public class shopZx extends Model<shopZx> implements Serializable {
     /**
      * 获赞数
      */
-    @ApiModelProperty(name = "zxLikes", value = "获赞数")
+    @ApiModelProperty(name = "zx_likes", value = "获赞数")
     private Integer zxLikes;
 
     /**
      * 视频/图片名称
      */
-    @ApiModelProperty(name = "zxName", value = "视频/图片名称")
+    @ApiModelProperty(name = "zx_name", value = "视频/图片名称")
     private String zxName;
 
     /**
      * 审核字段
      */
-    @ApiModelProperty(name = "zxShenHe", value = "审核字段")
+    @ApiModelProperty(name = "zx_shenHe", value = "审核字段")
     private Integer zxShenHe;
 
     /**
      * 资讯文字输入字段
      */
-    @ApiModelProperty(name = "zxField", value = "资讯文字输入字段")
+    @ApiModelProperty(name = "zx_field", value = "资讯文字输入字段")
     private String zxField;
 
     /**
      * 资讯数据创建时间
      */
-    @ApiModelProperty(name = "zxDate", value = "资讯数据创建时间")
+    @ApiModelProperty(name = "zx_date", value = "资讯数据创建时间")
     private BigInteger zxDate;
 
     /**
      * 图片存放地址imgUrl,zxAddress,zxField,zxName,userid,zxUrl
      */
-    @ApiModelProperty(name = "imgUrl", value = "图片存放地址")
+    @ApiModelProperty(name = "img_url", value = "图片存放地址")
     private String imgUrl;
 
     /**
      * 用户发布地址
      */
-    @ApiModelProperty(name = "zxAddress", value = "用户发布地址")
+    @ApiModelProperty(name = "zx_address", value = "用户发布地址")
     private String zxAddress;
 
     @TableField(exist = false)
     private List<String> askImgList;
 
-//    /**
-//     * 资讯文件名称
-//     */
-//    @ApiModelProperty(name = "fileName", value = "资讯文件名称")
-//    private String fileName;
-//
-//    /**
-//     * 资讯文件地址
-//     */
-//    @ApiModelProperty(name = "fileDownloadUri", value = "资讯文件地址")
-//    private String fileDownloadUri;
-//
-//    /**
-//     * 资讯文件类型
-//     */
-//    @ApiModelProperty(name = "fileType", value = "资讯文件类型")
-//    private String fileType;
-//
-//    /**
-//     * 资讯文件名称
-//     */
-//    @ApiModelProperty(name = "size", value = "资讯文件大小")
-//    private long size;
-//
-//    public shopZx(String fileName, String fileDownloadUri, String fileType, long size) {
-//        this.fileName = fileName;
-//        this.fileDownloadUri = fileDownloadUri;
-//        this.fileType = fileType;
-//        this.size = size;
-//    }
 
 }