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

                                                                                                 # Conflicts:
                                                                                                 #	common/common-entity/src/main/java/com/yihu/jw/entity/base/doctor/BaseDoctorBackgroundDO.java

business/base-service/src/main/java/com/yihu/jw/hospital/message/dao/BaseBannerDoctorDao.java

@@ -20,4 +20,6 @@ public interface BaseBannerDoctorDao extends PagingAndSortingRepository<BaseBann
    Integer getTotalBannerCount(String doctor);
    @Query( value = "SELECT * from base_banner_doctor t where t.doctor = ?1 and t.patient_id =?2 and t.relation_code =?3" ,nativeQuery = true)
    List<BaseBannerDoctorDO> getBanners(String doctor,String patientId,String relationCode);
    @Query( value = "SELECT * from base_banner_doctor t where t.banner_id = ?1 limit 0,1" ,nativeQuery = true)
    BaseBannerDoctorDO getBannerById(String id);
}

business/base-service/src/main/java/com/yihu/jw/hospital/message/dao/BaseUserMessageDao.java

@@ -27,6 +27,9 @@ public interface BaseUserMessageDao extends PagingAndSortingRepository<BaseUserM
    Integer getMessageNotReadCount(String doctor);
    @Query(value = "select * from base_user_message t where t.receiver = ?1 and t.is_read = 0 order by t.update_time desc limit ?2,?3",nativeQuery = true)
    List<BaseUserMessageDO> getMessageNotRead(String doctor,Integer page ,Integer pageSize);
    @Query(value = "select * from base_user_message t where t.receiver = ?1 and t.is_read = 0 order by t.update_time desc",nativeQuery = true)
    List<BaseUserMessageDO> getMessageNotReadNotPage(String doctor);

business/base-service/src/main/java/com/yihu/jw/hospital/message/service/BaseBannerDoctorService.java

@@ -12,6 +12,7 @@ import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang.StringUtils;
import org.apache.xmlbeans.impl.xb.xsdschema.Public;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
@@ -65,6 +66,7 @@ public class BaseBannerDoctorService extends BaseJpaService<BaseBannerDoctorDO,
            }
            BaseUserMessageDO baseUserMessageDO = new BaseUserMessageDO();
            baseUserMessageDO.setReceiver(doctor);
            baseUserMessageDO.setContent(content);
            baseUserMessageDO.setReceiverName(doctorName);
            baseUserMessageDO.setRelationCode(relationCode);
            baseUserMessageDO.setSender(patientId);
@@ -96,12 +98,25 @@ public class BaseBannerDoctorService extends BaseJpaService<BaseBannerDoctorDO,
    }
    //未读消息改为已读的接口
    public void isRead(String messageId){
        BaseUserMessageDO baseUserMessageDO = baseUserMessageDao.findOne(messageId);
        if (null!=baseUserMessageDO){
            baseUserMessageDO.setIsRead(1);
            baseUserMessageDao.save(baseUserMessageDO);
    @Transactional
    public void isRead(String messageId,String doctor){
        if(StringUtils.isNotEmpty(messageId)){
            BaseUserMessageDO baseUserMessageDO = baseUserMessageDao.findOne(messageId);
            if (null!=baseUserMessageDO){
                baseUserMessageDO.setIsRead(1);
                baseUserMessageDao.save(baseUserMessageDO);
            }
        }else {
            List<BaseUserMessageDO> list = baseUserMessageDao.getMessageNotReadNotPage(doctor);
            if (list.size()>0){
                for (BaseUserMessageDO baseUserMessageDO:list){
                    baseUserMessageDO.setIsRead(1);
                    baseUserMessageDao.save(baseUserMessageDO);
                }
            }
        }
    }
    //获取未读消息
    public JSONObject getMessageNotRead(String doctor,Integer page,Integer pageSize){

business/base-service/src/main/java/com/yihu/jw/hospital/message/service/BaseBannerService.java

@@ -1,8 +1,10 @@
package com.yihu.jw.hospital.message.service;
import com.yihu.jw.entity.hospital.message.BaseBannerDO;
import com.yihu.jw.entity.hospital.message.BaseBannerDoctorDO;
import com.yihu.jw.entity.hospital.message.SystemMessageDO;
import com.yihu.jw.hospital.message.dao.BaseBannerDao;
import com.yihu.jw.hospital.message.dao.BaseBannerDoctorDao;
import com.yihu.jw.hospital.message.dao.SystemMessageDao;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.MixEnvelop;
@@ -13,6 +15,7 @@ import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang.StringUtils;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
@@ -24,6 +27,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.persistence.criteria.CriteriaBuilder;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -35,6 +39,8 @@ public class BaseBannerService extends BaseJpaService<BaseBannerDO, BaseBannerDa
    private JdbcTemplate jdbcTemplate;
    @Autowired
    private HibenateUtils hibenateUtils;
    @Autowired
    private BaseBannerDoctorDao baseBannerDoctorDao;
    /**
     * 医生锦旗管理查询
     * @param
@@ -74,6 +80,15 @@ public class BaseBannerService extends BaseJpaService<BaseBannerDO, BaseBannerDa
            String updateTime = map.get("update_time").toString();
            map.put("create_time",DateUtil.dateToStrLong(DateUtil.strToDateLong(createTime)));
            map.put("update_time",DateUtil.dateToStrLong(DateUtil.strToDateLong(updateTime)));
            String bannerId = map.get("id").toString();
            BaseBannerDoctorDO baseBannerDoctorDO = baseBannerDoctorDao.getBannerById(bannerId);
            if (null!=baseBannerDoctorDO){
                //1不能删除
                map.put("deleteFlag",1);
            }else {
                //2可以删除
                map.put("deleteFlag",2);
            }
        }
        return MixEnvelop.getSuccessListWithPage(BaseHospitalRequestMapping.Prescription.api_success, list, page, pageSize, count);
    }

business/base-service/src/main/java/com/yihu/jw/hospital/message/service/BaseUserMsgService.java

@@ -99,7 +99,7 @@ public class BaseUserMsgService extends BaseJpaService<BaseUserMessageDO, BaseUs
    @Transactional
    public void responseMessage(String contentId,String content, String reciverId, String senderId,Integer isDoctor) {
        BaseUserMessageDO baseUserMessageDOS = baseUserMessageDao.findOne(contentId);
        if(null!=baseUserMessageDOS){
        if(null!=baseUserMessageDOS&&1==isDoctor){
            baseUserMessageDOS.setStatus(2);
            baseUserMessageDOS.setIsRead(1);
        }
@@ -223,11 +223,13 @@ public class BaseUserMsgService extends BaseJpaService<BaseUserMessageDO, BaseUs
            BasePatientDO patientDO = basePatientDao.findById(map.get("sender").toString());
            if(baseUserMsgDO.getRelationType()==2){
                List<BaseBannerDoctorDO> ba =  baseBannerDoctorDao.getBanners(baseUserMsgDO.getReceiver(),baseUserMsgDO.getSender(),baseUserMsgDO.getRelationCode());
                List<BaseBannerDO> bannerLits= new ArrayList<>();
                for (BaseBannerDoctorDO bannerDoctorDO:ba){
                    BaseBannerDO bannerDO = bannerDao.findOne(bannerDoctorDO.getBannerId());
                    bannerDoctorDO.setBaseBannerDO(bannerDO);
                    bannerLits.add(bannerDO);
                }
                baseUserMsgDO.setBannerList(ba);
                baseUserMsgDO.setBaseBannerDOS(bannerLits);
                //baseUserMsgDO.setBannerList(ba);
            }
            String icon = null;
            if (null!=patientDO){

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/message/BaseBannerDoctorDO.java

@@ -6,6 +6,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List;
/**
 * @author zmk
@@ -56,7 +57,7 @@ public class BaseBannerDoctorDO extends UuidIdentityEntityWithOperator {
    private Integer relationType;
    @Transient
    private BaseBannerDO baseBannerDO;
    private List<BaseBannerDO> baseBannerDO;
    public Integer getRelationType() {
        return relationType;
@@ -130,12 +131,13 @@ public class BaseBannerDoctorDO extends UuidIdentityEntityWithOperator {
        this.doctorName = doctorName;
    }
    @Transient
    public BaseBannerDO getBaseBannerDO() {
    public List<BaseBannerDO> getBaseBannerDO() {
        return baseBannerDO;
    }
    public void setBaseBannerDO(BaseBannerDO baseBannerDO) {
    public void setBaseBannerDO(List<BaseBannerDO> baseBannerDO) {
        this.baseBannerDO = baseBannerDO;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/message/BaseUserMessageDO.java

@@ -72,6 +72,20 @@ public class BaseUserMessageDO extends UuidIdentityEntityWithOperator {
     */
    private Integer isRead;
    /**
     * 返回锦旗集合
     */
    @Transient
    private List<BaseBannerDO> baseBannerDOS;
    @Transient
    public List<BaseBannerDO> getBaseBannerDOS() {
        return baseBannerDOS;
    }
    public void setBaseBannerDOS(List<BaseBannerDO> baseBannerDOS) {
        this.baseBannerDOS = baseBannerDOS;
    }
    public Integer getIsRead() {
        return isRead;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/iot/equipment/IotEquipmentDetailDO.java

@@ -0,0 +1,168 @@
package com.yihu.jw.entity.iot.equipment;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Entity;
import javax.persistence.Table;
@Entity
@Table(name = "iot_equipment_detail")
public class IotEquipmentDetailDO extends UuidIdentityEntityWithOperator {
    /*
     *设备名称
     */
    private String deviceName;
    /*
     *设备型号
     */
    private String deviceModel;
    /*
     *设备编码
     */
    private String deviceCode;
    /*
     *品牌
     */
    private String manufacturerCode;
    /*
     *厂商名称
     */
    private String manufacturer;
    /*
     *厂商地址
     */
    private String address;
    /*
     *代表人
     */
    private String representative;
    /*
     *申请人
     */
    private String applicantName;
    /*
     *申请人电话
     */
    private String applicantTel;
    /*
     *'所属居委会编码
     */
    private String neighborhoodCommitteeCode;
    /*
     *所属居委会名称
     */
    private String neighborhoodCommitteeName;
    /*
     *地址
     */
    private String localAdd;
    /*
     *所属区域
     */
    private String belongAre;
    public String getDeviceName() {
        return deviceName;
    }
    public void setDeviceName(String deviceName) {
        this.deviceName = deviceName;
    }
    public String getDeviceModel() {
        return deviceModel;
    }
    public void setDeviceModel(String deviceModel) {
        this.deviceModel = deviceModel;
    }
    public String getDeviceCode() {
        return deviceCode;
    }
    public void setDeviceCode(String deviceCode) {
        this.deviceCode = deviceCode;
    }
    public String getManufacturerCode() {
        return manufacturerCode;
    }
    public void setManufacturerCode(String manufacturerCode) {
        this.manufacturerCode = manufacturerCode;
    }
    public String getManufacturer() {
        return manufacturer;
    }
    public void setManufacturer(String manufacturer) {
        this.manufacturer = manufacturer;
    }
    public String getAddress() {
        return address;
    }
    public void setAddress(String address) {
        this.address = address;
    }
    public String getRepresentative() {
        return representative;
    }
    public void setRepresentative(String representative) {
        this.representative = representative;
    }
    public String getApplicantName() {
        return applicantName;
    }
    public void setApplicantName(String applicantName) {
        this.applicantName = applicantName;
    }
    public String getApplicantTel() {
        return applicantTel;
    }
    public void setApplicantTel(String applicantTel) {
        this.applicantTel = applicantTel;
    }
    public String getNeighborhoodCommitteeCode() {
        return neighborhoodCommitteeCode;
    }
    public void setNeighborhoodCommitteeCode(String neighborhoodCommitteeCode) {
        this.neighborhoodCommitteeCode = neighborhoodCommitteeCode;
    }
    public String getNeighborhoodCommitteeName() {
        return neighborhoodCommitteeName;
    }
    public void setNeighborhoodCommitteeName(String neighborhoodCommitteeName) {
        this.neighborhoodCommitteeName = neighborhoodCommitteeName;
    }
    public String getLocalAdd() {
        return localAdd;
    }
    public void setLocalAdd(String localAdd) {
        this.localAdd = localAdd;
    }
    public String getBelongAre() {
        return belongAre;
    }
    public void setBelongAre(String belongAre) {
        this.belongAre = belongAre;
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/message/BannerDoctorController.java

@@ -60,17 +60,19 @@ public class BannerDoctorController extends EnvelopRestEndpoint {
    public Envelop getNotRead(@ApiParam(name = "doctor", value = "doctor", required = false)
                              @RequestParam(value = "doctor", required = false)String doctor,
                              @ApiParam(name = "page", value = "page", required = false)
                              @RequestParam(value = "page", required = false)Integer page,
                              @RequestParam(value = "page", required = false,defaultValue = "1")Integer page,
                              @ApiParam(name = "pageSize", value = "pageSize", required = false)
                                  @RequestParam(value = "pageSize", required = false)Integer pageSize){
                                  @RequestParam(value = "pageSize", required = false,defaultValue = "10")Integer pageSize){
        JSONObject jsonObject = baseBannerDoctorService.getMessageNotRead(doctor,page,pageSize);
        return success(jsonObject);
    }
    @ApiOperation("修改消息已读状态")
    @PostMapping(value= BaseHospitalRequestMapping.DoctorBanner.changeIsRead)
    public Envelop changeIsRead(@ApiParam(name = "id", value = "id", required = false)
                              @RequestParam(value = "id", required = false)String id){
         baseBannerDoctorService.isRead(id);
                              @RequestParam(value = "id", required = false)String id,
                                @ApiParam(name = "doctor", value = "doctor", required = false)
                                @RequestParam(value = "doctor", required = false)String doctor){
         baseBannerDoctorService.isRead(id,doctor);
        return success("success");
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/dao/equipment/IotEquipmentDetailDao.java

@@ -0,0 +1,11 @@
package com.yihu.iot.dao.equipment;
import com.yihu.jw.entity.hospital.message.BaseUserMessageDO;
import com.yihu.jw.entity.iot.equipment.IotEquipmentDetailDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface IotEquipmentDetailDao extends PagingAndSortingRepository<IotEquipmentDetailDO, String>, JpaSpecificationExecutor<IotEquipmentDetailDO> {
}

svr/svr-iot/src/main/java/com/yihu/iot/service/equipment/IotEqtDetailService.java

@@ -0,0 +1,64 @@
package com.yihu.iot.service.equipment;
import com.yihu.iot.dao.equipment.IotEquipmentDetailDao;
import com.yihu.iot.model.BaseResultModel;
import com.yihu.jw.entity.hospital.message.BaseBannerDoctorDO;
import com.yihu.jw.entity.iot.equipment.IotEquipmentDetailDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class IotEqtDetailService  extends BaseJpaService<IotEquipmentDetailDO, IotEquipmentDetailDao> {
    @Autowired
    private IotEquipmentDetailDao iotEquipmentDetailDao;
    public void updateEquipment(IotEquipmentDetailDO iotEquipmentDetailDO){
       IotEquipmentDetailDO io =  iotEquipmentDetailDao.findOne(iotEquipmentDetailDO.getId());
       if(null!=io){
         io.setAddress(iotEquipmentDetailDO.getAddress());
         io.setApplicantName(iotEquipmentDetailDO.getApplicantName());
         io.setApplicantTel(iotEquipmentDetailDO.getApplicantTel());
         io.setBelongAre(iotEquipmentDetailDO.getBelongAre());
         io.setDeviceCode(iotEquipmentDetailDO.getDeviceCode());
         io.setDeviceModel(iotEquipmentDetailDO.getDeviceModel());
         io.setDeviceName(iotEquipmentDetailDO.getDeviceModel());
         io.setLocalAdd(iotEquipmentDetailDO.getLocalAdd());
         io.setManufacturer(iotEquipmentDetailDO.getManufacturer());
         io.setManufacturerCode(iotEquipmentDetailDO.getManufacturerCode());
         io.setNeighborhoodCommitteeCode(iotEquipmentDetailDO.getNeighborhoodCommitteeCode());
         io.setNeighborhoodCommitteeName(iotEquipmentDetailDO.getNeighborhoodCommitteeName());
         io.setRepresentative(iotEquipmentDetailDO.getRepresentative());
         iotEquipmentDetailDao.save(io);
       }
    }
    public void deleteEquipment(String id){
        IotEquipmentDetailDO io = iotEquipmentDetailDao.findOne(id);
        if(null!=io){
            iotEquipmentDetailDao.delete(id);
        }
    }
    public void createEquipment(IotEquipmentDetailDO iotEquipmentDetailDO){
            IotEquipmentDetailDO io =  new IotEquipmentDetailDO();
            io.setAddress(iotEquipmentDetailDO.getAddress());
            io.setApplicantName(iotEquipmentDetailDO.getApplicantName());
            io.setApplicantTel(iotEquipmentDetailDO.getApplicantTel());
            io.setBelongAre(iotEquipmentDetailDO.getBelongAre());
            io.setDeviceCode(iotEquipmentDetailDO.getDeviceCode());
            io.setDeviceModel(iotEquipmentDetailDO.getDeviceModel());
            io.setDeviceName(iotEquipmentDetailDO.getDeviceModel());
            io.setLocalAdd(iotEquipmentDetailDO.getLocalAdd());
            io.setManufacturer(iotEquipmentDetailDO.getManufacturer());
            io.setManufacturerCode(iotEquipmentDetailDO.getManufacturerCode());
            io.setNeighborhoodCommitteeCode(iotEquipmentDetailDO.getNeighborhoodCommitteeCode());
            io.setNeighborhoodCommitteeName(iotEquipmentDetailDO.getNeighborhoodCommitteeName());
            io.setRepresentative(iotEquipmentDetailDO.getRepresentative());
            iotEquipmentDetailDao.save(io);
    }
    public void getEquipment(){
    }
}