用户表/资讯表字段补全

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

@@ -13,6 +13,7 @@
         <result column="zx_field" property="zxField"/>
         <result column="zx_address" property="zxAddress"/>
         <result column="img_url" property="imgUrl"/>
+        <result column="zx_date" property="zxDate"/>
     </resultMap>
     <sql id="table">
         shop_zx

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

@@ -40,6 +40,7 @@
 
     <sql id="updateCondition">
         <if test="userId != null">user_id = #{userId},</if>
+        <if test="userName != null">user_id = #{userName},</if>
         <if test="password != null">password =#{password},</if>
         <if test="headImage != null">head_image =#{headImage},</if>
         <if test="userLevel != null">user_level =#{userLevel},</if>
@@ -55,6 +56,7 @@
     <sql id="criteria">
         <if test="id != null">id = #{id}</if>
         <if test="userId != null">and user_id = #{userId}</if>
+        <if test="userName != null">and user_id = #{userName}</if>
         <if test="password != null">and password =#{password}</if>
         <if test="headImage != null">and head_image =#{headImage}</if>
         <if test="userLevel != null">and user_level =#{userLevel}</if>

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

@@ -31,7 +31,7 @@ public class User extends Model<User> implements Serializable{
     /**
      * 用户名称
      */
-    @ApiModelProperty(name = "userName", value = "用户名称")
+    @ApiModelProperty(name = "user_name", value = "用户名称")
     private Integer userName;
 
     /**

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UploadServiceImpl.java

@@ -14,6 +14,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.math.BigInteger;
 import java.net.MalformedURLException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -54,6 +55,13 @@ public class UploadServiceImpl implements UploadService {
     public Map<String, Object> uploadVideo(MultipartFile file,HttpServletRequest request,String userId,String zxField, String zxAddress) throws Exception {
         Map<String, Object> resultMap=new HashMap<String, Object>();
 
+        /**
+         * 生成当前时间戳
+         */
+        BigInteger zxDate= BigInteger.valueOf(System.currentTimeMillis());
+        /**
+         * http://路径
+         */
         String basePath = request.getScheme() + "://" + request.getServerName()
                 + ":" + request.getServerPort()+"/upload/video/";
 

wisenergy-web-admin/src/main/resources/application-dev.yml

@@ -62,7 +62,7 @@ uploadFile:
   location: /opt/images/upload_flowChart/ #自定义上传文件服务器硬盘保存路径  ，linux服务器保存路径 /home/changfa/app/wxbjgkpt/upload_flowChart/
 file:
   upload:
-    path: /opt/images/
+    path: /opt/upload/video/
 jwt:
   # 加密秘钥
   secret: f4e2e52034348f86b67cde581c0f9eb5