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/service/GetuiService.java

@@ -26,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
import java.util.List;
import java.util.Map;
@@ -65,6 +66,17 @@ public class GetuiService {
    /**
     * 初始化接口参数
     */
    @PostConstruct
    public void clientInit(){
        if(pushApi == null){
            synchronized(GetuiService.class){
                if(pushApi == null){
                    pushApi = forceInit();
                }
            }
        }
    }
    private void init(){
        if(redisTemplate.hasKey(key+ ":AppID")){
            AppID = redisTemplate.opsForValue().get(key + ":AppID");
@@ -85,7 +97,7 @@ public class GetuiService {
    /**
     * 如果修改了数据库参数，调用下这个方法
     */
    public void forceInit(){
    public PushApi forceInit(){
        List<WlyyHospitalSysDictDO> dictDOList = sysDictDao.findByDictName(key);
        for (WlyyHospitalSysDictDO wlyyHospitalSysDictDO:dictDOList){
            if (wlyyHospitalSysDictDO.getDictCode().equalsIgnoreCase("AppID")){
@@ -102,7 +114,7 @@ public class GetuiService {
                redisTemplate.opsForValue().set(key + ":MasterSecret",MasterSecret);
            }
        }
        pushApi = getPushApi();
        return getPushApi();
    }
    private PushApi getPushApi(){
@@ -125,7 +137,6 @@ public class GetuiService {
     * type 1 安卓 2 ios
     */
    public void push2(String cid,int type,JSONObject json){
        init();
        //根据cid进行单推
        PushDTO<Audience> pushDTO = new PushDTO<Audience>();
        // 设置推送参数

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/device/DeviceManageService.java

@@ -145,8 +145,12 @@ public class DeviceManageService extends BaseJpaService<BaseDeviceRepairEntity,B
        BaseDoctorDO doctorDO = baseDoctorDao.findById(doctor);
        List<BaseDeviceRepairEntity> baseDeviceRepairEntities = baseDeviceRepairDao.findbydeviceSn(repairEntity.getDeviceSn());
        if (baseDeviceRepairEntities.size()>0){
            return null;
        if (baseDeviceRepairEntities.size() > 0) {
            for (BaseDeviceRepairEntity baseDeviceRepairEntity : baseDeviceRepairEntities) {
                if (baseDeviceRepairEntity.getStatus() == 0) {
                    return null;
                }
            }
        }
        if (2==doctorDO.getLevel()||4==doctorDO.getLevel()){