Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

business/push-service/src/main/java/com/yihu/jw/push/dao/WlyyHttpLogDao.java

@@ -0,0 +1,12 @@
package com.yihu.jw.push.dao;
import com.yihu.jw.entity.hospital.httplog.WlyyHttpLogDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface WlyyHttpLogDao extends PagingAndSortingRepository<WlyyHttpLogDO, String>, JpaSpecificationExecutor<WlyyHttpLogDO> {
}

business/push-service/src/main/java/com/yihu/jw/push/service/GetuiService.java

@@ -19,7 +19,9 @@ import com.getui.push.v2.sdk.dto.req.message.ios.Alert;
import com.getui.push.v2.sdk.dto.req.message.ios.Aps;
import com.getui.push.v2.sdk.dto.req.message.ios.IosDTO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.entity.hospital.httplog.WlyyHttpLogDO;
import com.yihu.jw.push.dao.PushHospitalSysDictDao;
import com.yihu.jw.push.dao.WlyyHttpLogDao;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +46,8 @@ public class GetuiService {
    private StringRedisTemplate redisTemplate;
    @Autowired
    private PushHospitalSysDictDao sysDictDao;
    @Autowired
    private WlyyHttpLogDao httpLogDao;
    private static final Logger logger = LoggerFactory.getLogger(GetuiService.class);
@@ -209,13 +213,20 @@ public class GetuiService {
        // 进行cid单推
        ApiResult<Map<String, Map<String, String>>> apiResult = pushApi.pushToSingleByCid(pushDTO);
        WlyyHttpLogDO httpLogDO = new WlyyHttpLogDO();//报错发送日志
        httpLogDO.setCode(cid);
        httpLogDO.setRequest(json.toJSONString());
        httpLogDO.setResponse(JSONObject.toJSONString(apiResult));
        if (apiResult.isSuccess()) {
            // success
            logger.info("发送成功："+apiResult.getData());
            httpLogDO.setStatus("0");
        } else {
            // failed
            logger.info("code:" + apiResult.getCode() + ", msg: " + apiResult.getMsg());
            httpLogDO.setStatus("1");
        }
        httpLogDao.save(httpLogDO);
    }
    /**