mother son bug

java110-core/src/main/java/com/java110/core/client/OutRestTemplate.java

@@ -11,6 +11,7 @@ import com.java110.utils.constant.ServiceConstant;
 import com.java110.utils.factory.ApplicationContextFactory;
 import com.java110.utils.util.DateUtil;
 import com.java110.utils.util.ExceptionUtil;
+import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
@@ -80,7 +81,7 @@ public class OutRestTemplate extends RestTemplate {
 
         String logServiceCode = MappingCache.getValue(MappingConstant.DOMAIN_SYSTEM_SWITCH,MappingCache.CALL_OUT_LOG);
 
-        if("OFF".equals(logServiceCode.toLowerCase()) || url.startsWith(ServiceConstant.BOOT_SERVICE_ORDER_URL)){
+        if(StringUtil.isEmpty(logServiceCode) || "OFF".equalsIgnoreCase(logServiceCode) || url.startsWith(ServiceConstant.BOOT_SERVICE_ORDER_URL)){
             return;
         }
 

java110-core/src/main/java/com/java110/core/factory/YidongSendMessageFactory.java

@@ -94,17 +94,64 @@ public class YidongSendMessageFactory {
         return result;
     }
 
-    public static void sendMessage(String tel, String code) {
+//    public static void sendMessage(String tel, String code) {
+//
+//        String apId = MappingCache.getValue(YIDONG_SMS_DOMAIN, "apId");
+//        String secretKey = MappingCache.getValue(YIDONG_SMS_DOMAIN, "secretKey");
+//        String ecName = MappingCache.getValue(YIDONG_SMS_DOMAIN, "ecName");
+//        String sign = MappingCache.getValue(YIDONG_SMS_DOMAIN, "sign");
+//        String addSerial = MappingCache.getValue(YIDONG_SMS_DOMAIN, "addSerial");
+//        String templateId = MappingCache.getValue(YIDONG_SMS_DOMAIN, "templateId");
+//        String url = MappingCache.getValue(YIDONG_SMS_DOMAIN, "yidong_url");
+//
+//        String mac = getMac(ecName, apId, secretKey, templateId, tel, code, sign, addSerial);
+//
+//        //开始发送验证码
+//        String reqParam = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
+//                "<WsSubmitTempletReq>\n" +
+//                "  <apId>" + apId + "</apId>\n" +
+//                "  <secretKey>" + secretKey + "</secretKey>\n" +
+//                "  <ecName>" + ecName + "</ecName>\n" +
+//                "  <mobiles>\n" +
+//                "    <string>" + tel + "</string>\n" +
+//                "  </mobiles>\n" +
+//                "  <params>\n" +
+//                "    <string>" + code + "</string>\n" +
+//                "  </params>\n" +
+//                "  <sign>" + sign + "</sign>\n" +
+//                "  <addSerial>" + addSerial + "</addSerial>\n" +
+//                "  <mac>" + mac + "</mac>\n" +
+//                "  <templateId>" + templateId + "</templateId>\n" +
+//                "</WsSubmitTempletReq>";
+//
+//        reqParam = WEBSERVICE_BODY.replace("REQUESTBODY",reqParam);
+//        logger.debug("请求移动公司请求报文：{}",reqParam);
+//        HttpHeaders httpHeaders = new HttpHeaders();
+//        httpHeaders.add("Content-Type","text/xml;charset=UTF-8");
+//        outRestTemplate = ApplicationContextFactory.getBean("outRestTemplate",OutRestTemplate.class);
+//        HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity(reqParam, httpHeaders);
+//        try {
+//            ResponseEntity<String> responseEntity = outRestTemplate.exchange(url, HttpMethod.POST, httpEntity, String.class);
+//            logger.debug("移动公司返回报文,{}",responseEntity);
+//        }catch (HttpStatusCodeException e){
+//            logger.error("调用异常",e);
+//        }catch (Exception e){
+//            logger.error("调用异常",e);
+//        }
+//
+//    }
 
+    public static void sendMessage(String tel, String code) {
         String apId = MappingCache.getValue(YIDONG_SMS_DOMAIN, "apId");
         String secretKey = MappingCache.getValue(YIDONG_SMS_DOMAIN, "secretKey");
         String ecName = MappingCache.getValue(YIDONG_SMS_DOMAIN, "ecName");
         String sign = MappingCache.getValue(YIDONG_SMS_DOMAIN, "sign");
         String addSerial = MappingCache.getValue(YIDONG_SMS_DOMAIN, "addSerial");
-        String templateId = MappingCache.getValue(YIDONG_SMS_DOMAIN, "templateId");
         String url = MappingCache.getValue(YIDONG_SMS_DOMAIN, "yidong_url");
 
-        String mac = getMac(ecName, apId, secretKey, templateId, tel, code, sign, addSerial);
+        String param = "您的验证码是："+code+",验证码有效期5分钟";
+
+        String mac = getMac(ecName, apId, secretKey, tel, param, sign, addSerial);
 
         //开始发送验证码
         String reqParam = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
@@ -115,16 +162,13 @@ public class YidongSendMessageFactory {
                 "  <mobiles>\n" +
                 "    <string>" + tel + "</string>\n" +
                 "  </mobiles>\n" +
-                "  <params>\n" +
-                "    <string>" + code + "</string>\n" +
-                "  </params>\n" +
+                "    <content>" + param + "</string>\n" +
                 "  <sign>" + sign + "</sign>\n" +
                 "  <addSerial>" + addSerial + "</addSerial>\n" +
                 "  <mac>" + mac + "</mac>\n" +
-                "  <templateId>" + templateId + "</templateId>\n" +
                 "</WsSubmitTempletReq>";
 
-        reqParam = WEBSERVICE_BODY.replace("REQUESTBODY",reqParam);
+        reqParam = WEBSERVICE_BODY2.replace("REQUESTBODY",reqParam);
         logger.debug("请求移动公司请求报文：{}",reqParam);
         HttpHeaders httpHeaders = new HttpHeaders();
         httpHeaders.add("Content-Type","text/xml;charset=UTF-8");
@@ -139,6 +183,7 @@ public class YidongSendMessageFactory {
             logger.error("调用异常",e);
         }
 
+
     }
 
     private static String getMac(String ecName, String apId, String secretKey, String templateId, String tel, String code, String sign, String addSerial) {

service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnersCmd.java

@@ -219,6 +219,9 @@ public class QueryOwnersCmd extends Cmd {
         List<OwnerDto> ownerDtos = new ArrayList<>();
         if (total > 0) {
             List<OwnerDto> ownerDtoList = ownerInnerServiceSMOImpl.queryOwnersByCondition(tmpOwnerDto);
+            // 查询统计数据
+            ownerDtoList = queryOwnerStatisticsBMOImpl.query(ownerDtoList);
+
             List<Map> mark = getPrivilegeOwnerList("/roomCreateFee", userId);
             for (OwnerDto ownerDto : ownerDtoList) {
                 //对业主身份证号隐藏处理