Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110-core/src/main/java/com/java110/core/base/controller/BaseController.java

@@ -162,7 +162,7 @@ public class BaseController extends AppBase {
         }
 
         //处理req-time
-        if (headers.containsKey("user-id")) {
+        if (headers.containsKey("user-id") && !"-1".equals(headers.get("user-id"))) {
             headers.put("user_id", headers.get("user-id"));
         }
 

java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml

@@ -800,9 +800,9 @@
 
     <!-- 查询费用月统计信息 add by wuxw 2018-07-03 -->
     <select id="queryFeeDetail" parameterType="Map" resultType="Map">
-        select t.obj_name objName,t.fee_name feeName,t.fee_create_time feeCreateTime,t.deadline_time
+        select t.obj_name objName,t.fee_name feeName,t.fee_create_time feeCreateTime,max(t.deadline_time)
         deadlineTime,t.create_time createTime,SUM(t.receivable_amount) receivableAmount,SUM(t.received_amount)
-        receivedAmount,SUM(t.owe_amount) oweAmount
+        receivedAmount,SUM(t.owe_amount) oweAmount,max(t.update_time) updateTime
         from report_fee_month_statistics t
         inner join pay_fee_config pfc on t.config_id = pfc.config_id and pfc.status_cd = '0'
         left join building_room br on t.obj_id = br.room_id and t.obj_type = '3333' and br.status_cd = '0'
@@ -849,7 +849,7 @@
         <if test="endTime !=null">
             and t.create_time &lt;= #{endTime}
         </if>
-        group by t.config_id,t.fee_name,t.fee_create_time,t.obj_id,t.obj_name,t.deadline_time
+        group by t.config_id,t.fee_name,t.fee_create_time,t.obj_id,t.obj_name
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>

service-api/src/main/java/com/java110/api/rest/RestApi.java

@@ -123,7 +123,7 @@ public class RestApi extends BaseController {
             this.getRequestInfo(request, headers);
             headers.put(CommonConstant.HTTP_SERVICE, service);
             headers.put(CommonConstant.HTTP_METHOD, CommonConstant.HTTP_METHOD_GET);
-            logger.debug("api：{} 请求报文为：{},header信息为：{}", "", headers);
+            logger.debug("api：{} 请求报文为：{},header信息为：{}", service, headers);
             responseEntity = apiServiceSMOImpl.service(JSONObject.toJSONString(getParameterStringMap(request)), headers);
         } catch (Throwable e) {
             logger.error("请求get 方法[" + service + "]失败：", e);

service-front/src/main/java/com/java110/front/aop/PageProcessAspect.java

@@ -8,13 +8,7 @@ import com.java110.utils.exception.FilterException;
 import com.java110.utils.util.StringUtil;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.After;
-import org.aspectj.lang.annotation.AfterReturning;
-import org.aspectj.lang.annotation.AfterThrowing;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.annotation.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpMethod;
@@ -141,6 +135,8 @@ public class PageProcessAspect {
         }
         pd = PageData.newInstance().builder(userId, userName, this.getToken(request), reqData, componentCode, componentMethod, url, sessionId, appId, headers);
         pd.setMethod(request.getMethod().equals("GET") ? HttpMethod.GET : HttpMethod.POST);
+
+        logger.debug("切面 获取到的pd=" + JSONObject.toJSONString(pd));
         request.setAttribute(CommonConstant.CONTEXT_PAGE_DATA, pd);
     }