3 Commits de8472c8cc ... 939cf60895

Author SHA1 Message Date
  shudong 939cf60895 优化算费返回提示消息;新增获取毫秒数的方法 1 year ago
  shudong 5aa79250d7 Merge remote-tracking branch 'origin/master' 1 year ago
  shudong de125ea7cb 优化算费返回提示消息 1 year ago

+ 14 - 2
collect-fees/collect-fees-service/src/main/java/com/tofly/fees/common/util/DateUtils.java

@@ -85,8 +85,20 @@ public class DateUtils {
      * @param dateEnd   结束时间
      * @return 秒数差值(结束时间-开始时间)
      */
-    public static long getSecond(Date dateBegin, Date dateEnd) {
+    public static double getSecond(Date dateBegin, Date dateEnd) {
+        long timeValue = getMillisecond(dateBegin, dateEnd);
+        return timeValue / 1000.0;
+    }
+
+    /**
+     * 计算两个日期的相差毫秒数
+     *
+     * @param dateBegin 开始时间
+     * @param dateEnd   结束时间
+     * @return 毫秒数值(结束时间-开始时间)
+     */
+    public static long getMillisecond(Date dateBegin, Date dateEnd) {
         long timeValue = dateEnd.getTime() - dateBegin.getTime();
-        return timeValue / 1000;
+        return timeValue;
     }
 }

+ 6 - 4
collect-fees/collect-fees-service/src/main/java/com/tofly/fees/meterreadingmgt/controller/BwMeterReadPlanController.java

@@ -359,16 +359,18 @@ public class BwMeterReadPlanController extends BaseController {
         //结束时间
         Date dtEnd = new Date();
         //获取时间运行的秒数
-        long secNum = DateUtils.getSecond(dtBegin, dtEnd);
+        double secNum = DateUtils.getSecond(dtBegin, dtEnd);
+        //保留2位小数
+        String strSecNum = String.format("%.2f", secNum);
 
         String strMsg = "";
         if (intSuccessNum == 0) {
-            strMsg = MessageFormat.format("算费失败:已算费0条抄表记录!共耗时{0}秒!", secNum);
+            strMsg = MessageFormat.format("算费失败:已算费0条抄表记录!共耗时{0}秒!", strSecNum);
         } else {
-            strMsg = MessageFormat.format("算费成功:成功算费{0}个用户,共耗时{1}秒!", intSuccessNum, secNum);
+            strMsg = MessageFormat.format("算费成功:成功算费{0}个用户,共耗时{1}秒!", intSuccessNum, strSecNum);
         }
         LogHelper.excuteCustom(BwMeterReadPlan.class, "抄表算费:按选中抄表册", strMsg);
-        return (intSuccessNum == 0) ? ResultRespone.failed(strMsg) : ResultRespone.success(strMsg);
+        return (intSuccessNum == 0) ? ResultRespone.failed(false, strMsg) : ResultRespone.success(true, strMsg);
     }
 
     /**