云应用相关的业务代码

src/main/java/com/hwstudio/antaile/controller/AtlTimeController.java

@@ -600,4 +600,10 @@ public class AtlTimeController extends BaseController {
         }
         return this.atlTimeService.updateByTimeId(sysAtlTime);
     }
+
+    @ApiOperation("查询时光纪创建天数")
+    @RequestMapping(value = "/selectAtlTimeCreateDateById", method = RequestMethod.GET)
+    public JsonResult selectAtlTimeCreateDateById(@ApiParam(value = "时光纪id", required = true) @RequestParam(value = "timeId", required = true) Long timeId) {
+        return this.atlTimeService.selectAtlTimeCreateDateById(timeId);
+    }
 }

src/main/java/com/hwstudio/antaile/service/AtlTimeArticleServie.java

@@ -220,12 +220,7 @@ public class AtlTimeArticleServie {
                     }
                     atlTimeArticleFile.setCoverUrl(coverUrl);
                 } else {
-//                    String audioUrl = AliCloudUtil.downloadOSS(atlTimeArticleFile.getFileUrl());
-//                    Double sum = MomoUtils.getAudioDuration(audioUrl);
-//                    atlTimeArticleFile.setAudioDuration(sum);
                     atlTimeArticleFile.setType(2);
-
-//                    MomoUtils.deleteFile(new File(audioUrl));
                 }
                 atlTimeArticleFileMapper.insert(atlTimeArticleFile);
             }

src/main/java/com/hwstudio/antaile/service/AtlTimeService.java

@@ -15,6 +15,7 @@ import com.hwstudio.antaile.mbg.po.SysAtlTime;
 import com.hwstudio.antaile.queryparam.QueryAtlTimeByBlessIdAndIdxParam;
 import com.hwstudio.antaile.queryparam.QueryAtlTimeCountParam;
 import com.hwstudio.antaile.utils.CommonPage;
+import com.hwstudio.antaile.utils.DateUtil;
 import com.hwstudio.antaile.utils.JsonResult;
 import com.hwstudio.antaile.vo.AtlFineVo;
 import com.hwstudio.antaile.vo.AtlPrivateVo;
@@ -881,12 +882,29 @@ public class AtlTimeService {
      * @return
      */
     public JsonResult updateByTimeId(SysAtlTime sysAtlTime) {
-        if(sysAtlTime.getId() == null){
+        if (sysAtlTime.getId() == null) {
             return JsonResult.failed("传入时光纪id为空");
         }
         this.sysAtlTimeMapper.updateByPrimaryKeySelective(sysAtlTime);
         return JsonResult.success("操作成功");
     }
 
+    /**
+     * 查询时光纪创建天数
+     *
+     * @param timeId
+     * @return
+     */
+    public JsonResult selectAtlTimeCreateDateById(Long timeId) {
+        SysAtlTime sysAtlTime = this.sysAtlTimeMapper.selectByPrimaryKey(timeId);
+        if (sysAtlTime == null) {
+            return JsonResult.failed("传入时光纪id不存在");
+        }
+        Map<String, Object> dataMap = new HashMap<>();
+        dataMap.put("atlTimeObject", sysAtlTime);
+        dataMap.put("days", DateUtil.getDateDayDiffer(sysAtlTime.getCreateDate(), new Date()));
+        return JsonResult.success("获取成功", dataMap);
+    }
+
 }
 

src/main/java/com/hwstudio/antaile/service/AtlWxService.java

@@ -6,6 +6,7 @@ import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
 import com.github.binarywang.wxpay.config.WxPayConfig;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.WxPayService;
+import com.hwstudio.antaile.common.BeanUtils;
 import com.hwstudio.antaile.common.Constants;
 import com.hwstudio.antaile.dto.AccessTokenParam;
 import com.hwstudio.antaile.dto.LoginUserDto;
@@ -142,7 +143,7 @@ public class AtlWxService {
             loginUserDto.setAvatarUrl(atlUser.getAvaterImageUrl());
             loginUserDto.setNickName(atlUser.getNickName());
             loginUserDto.setPhone(atlUser.getMobilePhone());
-            loginUserDto.setWebappOpenId(atlUser.getOpenId());
+            loginUserDto.setOpenId(openid);
             loginUserDto.setUserId(atlUser.getId());
             return JsonResult.success("登录成功", loginUserDto);
         }
@@ -189,6 +190,8 @@ public class AtlWxService {
             atlUser.setLoginPassword(DigestUtils.md5Hex(wxInsertUserParam.getLoginPassword()));
             atlUser.setUnionid(userMap.get("unionid") + "");
             this.atlUserMapper.updateUser(atlUser);
+            //赋值给insertAtlUser对象
+            BeanUtils.copyProperties(atlUser,insertAtlUser );
         } else {
             //向数据库写入会员信息
             insertAtlUser.setNickName(userMap.get("nickname") + "");

src/main/java/com/hwstudio/antaile/utils/DateUtil.java

 package com.hwstudio.antaile.utils;
 
 import java.text.DateFormat;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
@@ -16,10 +17,11 @@ public class DateUtil {
 
     /**
      * 获取格林威治天文台的标准时间
+     *
      * @param date
      * @return
      */
-    public static String getISO8601Timestamp(Date date){
+    public static String getISO8601Timestamp(Date date) {
         TimeZone tz = TimeZone.getTimeZone("UTC");
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
         df.setTimeZone(tz);
@@ -29,6 +31,7 @@ public class DateUtil {
 
     /**
      * 获取后几天日期
+     *
      * @param date
      * @return
      */
@@ -48,14 +51,51 @@ public class DateUtil {
 
     /**
      * 获取精确到秒的时间戳
+     *
      * @param date
      * @return
      */
-    public static int getSecondTimestamp(Date date){
+    public static int getSecondTimestamp(Date date) {
         if (null == date) {
             return 0;
         }
-        String timestamp = String.valueOf(date.getTime()/1000);
+        String timestamp = String.valueOf(date.getTime() / 1000);
         return Integer.valueOf(timestamp);
     }
+
+    /**
+     * 准确确计算两个date日期相差天数
+     *
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    public static int getDateDayDiffer(Date startDate, Date endDate) {
+        //判断是否跨年
+        SimpleDateFormat yearFormat = new SimpleDateFormat("yyyy");
+        String startYear = yearFormat.format(startDate);
+        String endYear = yearFormat.format(endDate);
+        if (startYear.equals(endYear)) {
+            /*  使用Calendar跨年的情况会出现问题    */
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(startDate);
+            int startDay = calendar.get(Calendar.DAY_OF_YEAR);
+            calendar.setTime(endDate);
+            int endDay = calendar.get(Calendar.DAY_OF_YEAR);
+            return endDay - startDay;
+        } else {
+            /*  跨年不会出现问题，需要注意不满24小时情况（2016-03-18 11:59:59 和 2016-03-19 00:00:01的话差值为 0）  */
+            //  只格式化日期，消除不满24小时影响
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            long startDateTime = 0;
+            long endDateTime = 0;
+            try {
+                startDateTime = dateFormat.parse(dateFormat.format(startDate)).getTime();
+                endDateTime = dateFormat.parse(dateFormat.format(endDate)).getTime();
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+            return (int) ((endDateTime - startDateTime) / (1000 * 3600 * 24));
+        }
+    }
 }

src/main/java/com/hwstudio/antaile/vo/AtlTimeArticleFileVo.java

 package com.hwstudio.antaile.vo;
 
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @Name:
@@ -19,39 +16,34 @@ import java.util.Map;
 @ApiModel
 public class AtlTimeArticleFileVo {
 
-    @ApiModelProperty(value="主键id  更新时必填")
+    @ApiModelProperty(value = "主键id  更新时必填")
     private Long id;
-
-    @ApiModelProperty(value="时光纪id 新增时必填")
+    @ApiModelProperty(value = "时光纪id 新增时必填")
     private Long timeId;
-
-    @ApiModelProperty(value="内容")
+    @ApiModelProperty(value = "内容")
     private String content;
-
-    @ApiModelProperty(value="文件地址列表  数组格式{['id','';'url','']}")
+    @ApiModelProperty(value = "文件地址列表  数组格式{['id','';'url','']}")
     private String fileUrl;
-
-    @ApiModelProperty(value="类型 1-文章 2-图片 3-视频 4-音频")
+    @ApiModelProperty(value = "类型 1-文章 2-图片 3-视频 4-音频")
     private Integer type;
-
-    @ApiModelProperty(value="问题")
+    @ApiModelProperty(value = "问题")
     private String question;
-
-    @ApiModelProperty(value="答案")
+    @ApiModelProperty(value = "答案")
     private String answer;
-
-    @ApiModelProperty(value="隐私设置")
+    @ApiModelProperty(value = "隐私设置")
     private Integer privacySetting;
-
-    @ApiModelProperty(value="视频封面图")
+    @ApiModelProperty(value = "视频封面图")
     private String coverUrl;
-
-    @ApiModelProperty(value="音频时长")
+    @ApiModelProperty(value = "音频时长")
     private Double audioDuration;
-
     @ApiModelProperty(value = "文件时间")
     private Date fileDate;
-
     @ApiModelProperty(value = "标题")
     private String title;
+    @ApiModelProperty(value = "作者")
+    private String author;
+    @ApiModelProperty(value = "发生时间")
+    private Date occurTime;
+    @ApiModelProperty(value = "标签，多个根据逗号隔开")
+    private String label;
 }