111

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/BaseMqttCallbackRecordDO.java

@@ -0,0 +1,47 @@
package com.yihu.jw.entity.care.device;
import com.yihu.jw.entity.UuidIdentityEntityWithCreateTime;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * mqtt回调记录
 * Created by yeshijie on 2023/1/13.
 */
@Entity
@Table(name = "base_mqtt_callback_record")
public class BaseMqttCallbackRecordDO extends UuidIdentityEntityWithCreateTime {
    private String deviceId;//设备id
    private String topic;//回调的topic
    private String payload;//回调内容
    @Column(name = "device_id")
    public String getDeviceId() {
        return deviceId;
    }
    public void setDeviceId(String deviceId) {
        this.deviceId = deviceId;
    }
    @Column(name = "topic")
    public String getTopic() {
        return topic;
    }
    public void setTopic(String topic) {
        this.topic = topic;
    }
    @Column(name = "payload")
    public String getPayload() {
        return payload;
    }
    public void setPayload(String payload) {
        this.payload = payload;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/menu/BaseMenuManageService.java

@@ -10,19 +10,12 @@ import com.yihu.jw.base.dao.menu.BaseMenuShowDao;
import com.yihu.jw.entity.base.menu.BaseLinkDictDO;
import com.yihu.jw.entity.base.menu.BaseMenuDictDO;
import com.yihu.jw.entity.base.menu.BaseMenuShowDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleDictDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.utils.StringUtil;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
@@ -183,7 +176,9 @@ public class BaseMenuManageService {
                    baseMenuDictDO.setParentName(parentDo.getName());
                }
                WlyyHospitalSysDictDO menuFunction = wlyyHospitalSysDictDao.findOneByDictNameAndDictCode("menuFunction",baseMenuDictDO.getFunctionType());
                baseMenuDictDO.setFunctionName(menuFunction.getDictValue());
                if(menuFunction!=null){
                    baseMenuDictDO.setFunctionName(menuFunction.getDictValue());
                }
            }else {
                WlyyHospitalSysDictDO menuLocation = wlyyHospitalSysDictDao.findOneByDictNameAndDictCode("menuLocation",baseMenuDictDO.getMenuLocation());
                if (menuLocation==null||menuLocation.getDictValue() == null){

svr/svr-cloud-device/src/main/java/com/yihu/jw/care/common/PostConstructUtil.java

@@ -1,6 +1,5 @@
package com.yihu.jw.care.common;
import com.yihu.jw.care.netdevsdk.NetDevSdkService;
import com.yihu.jw.care.util.MQTTClientUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -25,8 +24,8 @@ public class PostConstructUtil {
    @Autowired
    private MQTTClientUtil mqttClientUtil;
    @Autowired
    private NetDevSdkService netDevSdkService;
//    @Autowired
//    private NetDevSdkService netDevSdkService;
    @PostConstruct
    public void init(){

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

@@ -130,7 +130,7 @@ public class PatientDeviceService {
        if ("4".equals(devices.get(0).getCategoryCode())){//手表
            Device device = deviceDao.findOne(devices.get(0).getDeviceId());
            if (device!=null){
                if ("X1".equals(device.getModel())){
                if ("X1".equals(device.getModel())||"X3".equals(device.getModel())){
                    url = MessageFormat.format(AqgConfig.X1sos_numbers, deviceSn,seqid);
                }
            }
@@ -203,7 +203,7 @@ public class PatientDeviceService {
        if ("4".equals(devices.get(0).getCategoryCode())){//手表
            Device device = deviceDao.findOne(devices.get(0).getDeviceId());
            if (device!=null){
                if ("X1".equals(device.getModel())){
                if ("X1".equals(device.getModel())||"X3".equals(device.getModel())){
                    url = MessageFormat.format(AqgConfig.X1fence_area, deviceSn,fenceNO);
                }
            }