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

business/base-service/src/main/java/com/yihu/jw/gateway/dao/GcTokenDao.java

@@ -6,6 +6,7 @@ import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.Date;
import java.util.List;
/**
@@ -20,6 +21,9 @@ public interface GcTokenDao extends PagingAndSortingRepository<GcToken, Long>, J
    @Query("from GcToken where accesstoken=?1")
    GcToken findByToken(String token);
    @Query("from GcToken where appid=?1 and outTime >= now()")
    @Query("from GcToken where appid=?1 and outTime >= ?1")
    List<GcToken> findByAppIdByDate(String token,Date date);
    @Query("from GcToken where appid=?1 and outTime >= now () ")
    List<GcToken> findByAppId(String token);
}

business/base-service/src/main/java/com/yihu/jw/gateway/service/GcTokenService.java

@@ -9,13 +9,12 @@ import com.yihu.jw.gateway.dao.GcTokenLogDao;
import com.yihu.jw.util.date.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import java.util.Date;
import java.util.List;
import java.util.UUID;
import java.util.*;
/**
 * Created by chenweida on 2017/8/17.
@@ -26,6 +25,8 @@ public class GcTokenService {
    private GcTokenLogDao tokenLogDao;
    @Autowired
    private GcTokenDao tokenDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    /**
@@ -95,7 +96,24 @@ public class GcTokenService {
        return tokenDao.findByToken(token);
    }
    public List<GcToken> findByAppId(String appid){
        return tokenDao.findByAppId(appid);
    public List<GcToken> findByAppId(String appid,String wxId){
        if (wxId.equalsIgnoreCase("xm_ykyy_wx")){
            String sql = "select ID AS \"id\",APPID as \"appId\",ACCESSTOKEN as \"accessToken\",CREATE_TIME as \"createTime\",to_char(OUT_TIME,'yyyy-MM-dd hh24:mi:ss') as \"outTime\" from GC_TOKEN where APPID = '"+appid+"' and OUT_TIME >= to_date('"+DateUtil.getStringDate()+"','YYYY-MM-DD HH24:MI:SS')";
            List<Map<String,Object>> mapList = jdbcTemplate.queryForList(sql);
            List<GcToken> gcTokens = new ArrayList<>();
            for (Map<String,Object> map:mapList){
                GcToken gcToken = new GcToken();
                gcToken.setId(Integer.parseInt(map.get("id").toString()));
                gcToken.setAccesstoken(map.get("accessToken").toString());
                gcToken.setAppid(map.get("appId").toString());
                gcToken.setOutTime(DateUtil.strToDate(map.get("outTime").toString()));
                gcTokens.add(gcToken);
                System.out.print("gcToken"+gcToken.getOutTime());
            }
            return gcTokens;
        }else {
            return tokenDao.findByAppId(appid);
        }
    }
}

business/base-service/src/main/java/com/yihu/jw/thirdUpload/BaseNsOlineMedDao.java

@@ -1,9 +0,0 @@
package com.yihu.jw.thirdUpload;
import com.yihu.jw.entity.thirdUpload.BaseNsOnlineMedDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface BaseNsOlineMedDao extends PagingAndSortingRepository<BaseNsOnlineMedDO,String>, JpaSpecificationExecutor<BaseNsOnlineMedDO> {
}

business/base-service/src/main/java/com/yihu/jw/thirdUpload/BaseNsOnlineAskDao.java

@@ -1,10 +0,0 @@
package com.yihu.jw.thirdUpload;
import com.yihu.jw.entity.thirdUpload.BaseNsOnlineAskDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface BaseNsOnlineAskDao extends PagingAndSortingRepository<BaseNsOnlineAskDO, String>, JpaSpecificationExecutor<BaseNsOnlineAskDO> {
    //待写查询
}

business/base-service/src/main/java/com/yihu/jw/thirdUpload/BaseNsPrescriptionDao.java

@@ -1,9 +0,0 @@
package com.yihu.jw.thirdUpload;
import com.yihu.jw.entity.thirdUpload.BaseNsOnlineAskDO;
import com.yihu.jw.entity.thirdUpload.BaseNsPrescriptionDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface BaseNsPrescriptionDao extends PagingAndSortingRepository<BaseNsPrescriptionDO, String>, JpaSpecificationExecutor<BaseNsPrescriptionDO> {
}

business/base-service/src/main/java/com/yihu/jw/thirdUpload/BaseNsPrescriptionDrugDao.java

@@ -1,9 +0,0 @@
package com.yihu.jw.thirdUpload;
import com.yihu.jw.entity.thirdUpload.BaseNsOnlineAskDO;
import com.yihu.jw.entity.thirdUpload.BaseNsPrescriptionDrugDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface BaseNsPrescriptionDrugDao extends PagingAndSortingRepository<BaseNsPrescriptionDrugDO, String>, JpaSpecificationExecutor<BaseNsPrescriptionDrugDO> {
}

business/base-service/src/main/java/com/yihu/jw/thirdUpload/service/AchnsDoctorRecordService.java

@@ -1,7 +1,12 @@
package com.yihu.jw.thirdUpload.service;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.core.type.TypeReference;
import com.yihu.jw.doctor.dao.BaseDoctorHospitalDao;
import com.yihu.jw.entity.base.dict.BaseFrequencyDictDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
import com.yihu.jw.entity.thirdUpload.AchnsDoctorRecordDO;
import com.yihu.jw.restmodel.iot.device.IotDeviceImportVO;
import com.yihu.jw.thirdUpload.AchnsDoctorRecordDao;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.mysql.query.BaseJpaService;

business/base-service/src/main/java/com/yihu/jw/thirdUpload/service/BaseNsOlineMedService.java

@@ -1,39 +0,0 @@
package com.yihu.jw.thirdUpload.service;
import com.yihu.jw.entity.thirdUpload.BaseNsOnlineMedDO;
import com.yihu.jw.thirdUpload.BaseNsOlineMedDao;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import static com.yihu.jw.util.common.BeanUtils.getNullPropertyNames;
@Service
public class BaseNsOlineMedService extends BaseJpaService<BaseNsOnlineMedDO, BaseNsOlineMedDao> {
    @Autowired
    private BaseNsOlineMedDao baseNsOlineMedDao;
    public void saveNsOnlinemed(List<BaseNsOnlineMedDO> baseNsOnlineMedDOList)throws Exception{
        for (BaseNsOnlineMedDO baseNsOlineMedDO : baseNsOnlineMedDOList){
            if(StringUtils.isNoneBlank(baseNsOlineMedDO.getId())){
                BaseNsOnlineMedDO old = baseNsOlineMedDao.findOne(baseNsOlineMedDO.getId());
                BeanUtils.copyProperties(baseNsOlineMedDO,old,getNullPropertyNames(baseNsOlineMedDO));
                baseNsOlineMedDao.save(old);
            }else{
                baseNsOlineMedDao.save(baseNsOlineMedDO);
            }
        }
    }
    public void deleteById(String id) {
        BaseNsOnlineMedDO baseNsOnlineMedDO = baseNsOlineMedDao.findOne(id);
        if(baseNsOnlineMedDO != null){
            baseNsOlineMedDao.delete(id);
        }
    }
}

business/base-service/src/main/java/com/yihu/jw/thirdUpload/service/BaseNsOnlineAskService.java

@@ -1,49 +0,0 @@
package com.yihu.jw.thirdUpload.service;
import com.yihu.jw.entity.thirdUpload.BaseNsOnlineAskDO;
import com.yihu.jw.thirdUpload.BaseNsOnlineAskDao;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
import static com.yihu.jw.util.common.BeanUtils.getNullPropertyNames;
@Service
public class BaseNsOnlineAskService extends BaseJpaService<BaseNsOnlineAskDO, BaseNsOnlineAskDao> {
    @Autowired
    private BaseNsOnlineAskDao baseNsOnlineAskDao;
    public void saveNsOlineAsk(List<BaseNsOnlineAskDO> baseNsOnlineAskDOS) throws Exception{
        for (BaseNsOnlineAskDO baseNsOnlineAskDO : baseNsOnlineAskDOS){
            if (StringUtils.isNotBlank(baseNsOnlineAskDO.getId())){
                BaseNsOnlineAskDO old = baseNsOnlineAskDao.findOne(baseNsOnlineAskDO.getId());
                BeanUtils.copyProperties(baseNsOnlineAskDO, old, getNullPropertyNames(baseNsOnlineAskDO));
                //待完善
                baseNsOnlineAskDao.save(old);
            }else{
//                baseNsOnlineAskDO.setCreateTime(new Date());
//                baseNsOnlineAskDO.setUpload("1");
                baseNsOnlineAskDao.save(baseNsOnlineAskDO);
            }
        }
    }
    public void deleteById(String id){
        BaseNsOnlineAskDO baseNsOnlineAskDO =  baseNsOnlineAskDao.findOne(id);
        if (baseNsOnlineAskDO != null){
            baseNsOnlineAskDao.delete(id);
            //baseNsOnlineAskDO.setIs_del("0");
            //baseNsOnlineAskDO.save(baseNsOnlineAskDO);
        }
    }
}

business/base-service/src/main/java/com/yihu/jw/thirdUpload/service/BaseNsPrescriptionAService.java

@@ -1,46 +0,0 @@
package com.yihu.jw.thirdUpload.service;
import com.yihu.jw.entity.thirdUpload.BaseNsPrescriptionDO;
import com.yihu.jw.entity.thirdUpload.BaseNsPrescriptionDrugDO;
import com.yihu.jw.thirdUpload.BaseNsPrescriptionDao;
import com.yihu.jw.thirdUpload.BaseNsPrescriptionDrugDao;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import static com.yihu.jw.util.common.BeanUtils.getNullPropertyNames;
@Service
public class BaseNsPrescriptionAService extends BaseJpaService<BaseNsPrescriptionDO, BaseNsPrescriptionDao> {
    @Autowired
    private BaseNsPrescriptionDao baseNsPrescriptionDao;
    public void savePrescription(List<BaseNsPrescriptionDO> baseNsPrescriptionDOS) throws Exception{
        for (BaseNsPrescriptionDO baseNsPrescriptionDO : baseNsPrescriptionDOS){
            if (StringUtils.isNoneBlank(baseNsPrescriptionDO.getId())){
                BaseNsPrescriptionDO old = baseNsPrescriptionDao.findOne(baseNsPrescriptionDO.getId());
                BeanUtils.copyProperties(baseNsPrescriptionDO, old, getNullPropertyNames(baseNsPrescriptionDO));
                baseNsPrescriptionDao.save(old);
            }else {
                baseNsPrescriptionDao.save(baseNsPrescriptionDO);
            }
        }
    }
    public void deleteById(String id) {
        BaseNsPrescriptionDO baseNsPrescriptionDO = baseNsPrescriptionDao.findOne(id);
        if (baseNsPrescriptionDO != null){
            baseNsPrescriptionDao.delete(id);
        }
    }
}

business/base-service/src/main/java/com/yihu/jw/thirdUpload/service/BaseNsPrescriptionDrugService.java

@@ -1,41 +0,0 @@
package com.yihu.jw.thirdUpload.service;
import com.yihu.jw.entity.thirdUpload.BaseNsPrescriptionDrugDO;
import com.yihu.jw.thirdUpload.BaseNsPrescriptionDrugDao;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import static com.yihu.jw.util.common.BeanUtils.getNullPropertyNames;
@Service
public class BaseNsPrescriptionDrugService extends BaseJpaService<BaseNsPrescriptionDrugDO, BaseNsPrescriptionDrugDao> {
    @Autowired
    private BaseNsPrescriptionDrugDao baseNsPrescriptionDrugDao;
    public void savePrescriptionDrug(List<BaseNsPrescriptionDrugDO> baseNsPrescriptionDrugDOS) throws Exception{
        for (BaseNsPrescriptionDrugDO baseNsPrescriptionDrugDO : baseNsPrescriptionDrugDOS){
            if (StringUtils.isNoneBlank(baseNsPrescriptionDrugDO.getId())){
                BaseNsPrescriptionDrugDO old = baseNsPrescriptionDrugDao.findOne(baseNsPrescriptionDrugDO.getId());
                BeanUtils.copyProperties(baseNsPrescriptionDrugDO, old, getNullPropertyNames(baseNsPrescriptionDrugDO));
                baseNsPrescriptionDrugDao.save(old);
            }else {
                baseNsPrescriptionDrugDao.save(baseNsPrescriptionDrugDO);
            }
        }
    }
    public void deleteById(String id) {
        BaseNsPrescriptionDrugDO baseNsPrescriptionDrugDO = baseNsPrescriptionDrugDao.findOne(id);
        if (baseNsPrescriptionDrugDO != null){
            baseNsPrescriptionDrugDao.delete(id);
        }
    }
}

business/base-service/src/main/java/com/yihu/jw/thirdUpload/service/UpAppointmentOnlineService.java

@@ -1,7 +1,9 @@
package com.yihu.jw.thirdUpload.service;
import com.yihu.jw.entity.thirdUpload.UpAppointmentOnlineDO;
import com.yihu.jw.entity.thirdUpload.UpnsDoctorRecordDO;
import com.yihu.jw.thirdUpload.UpAppointmentOnlineDao;
import com.yihu.jw.thirdUpload.UpnsDoctorRecordDao;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;

business/im-service/src/main/java/com/yihu/jw/im/service/ImService.java

@@ -3886,12 +3886,19 @@ public class ImService {
	 * @throws Exception
	 */
	public List<Map<String,Object>>  getDoctorConsultCount(String doctorids) throws Exception{
		String ids[] = doctorids.replace("'","").split(",");
		String dotorIds = "";
		for (int i=0;i<ids.length;i++){
			dotorIds = "'"+ids[i]+"',";
		}
		dotorIds = dotorIds.substring(0,dotorIds.length()-1);
		//医生角色
		String sql = "SELECT " +
				"count(id) AS \"total\"," +
				"doctor as \"doctor\"" +
				"FROM wlyy_consult_team " +
				"WHERE doctor IN ("+doctorids+") AND (type=1 OR type=15 OR type=9 OR type =16) and status = 0 GROUP BY doctor";
				"WHERE doctor IN ("+dotorIds+") AND (type=1 OR type=15 OR type=9 OR type =16) and status = 0 GROUP BY doctor";
		List<Map<String,Object>> list = hibenateUtils.createSQLQuery(sql);
		return list;
	}

common/common-entity/sql记录

@@ -1430,4 +1430,7 @@ CREATE TABLE `device_data_push_log` (
  `data` varchar(1000) DEFAULT NULL,
  `create_time` datetime DEFAULT NULL,
  PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=449 DEFAULT CHARSET=utf8mb4 COMMENT='设备项目推送数据日志';
) ENGINE=InnoDB AUTO_INCREMENT=449 DEFAULT CHARSET=utf8mb4 COMMENT='设备项目推送数据日志';
--2021-09-07
alter table base_patient modify column archive_type  tinyint(2) DEFAULT NULL COMMENT '档案类型 1老人 2新生儿';

common/common-entity/src/main/java/com/yihu/jw/entity/iot/gateway/GcClientDetails.java

@@ -2,12 +2,10 @@ package com.yihu.jw.entity.iot.gateway;
import com.yihu.jw.entity.IntegerIdentityEntity;
import com.yihu.jw.entity.util.StringFStringEncryptConverter;
import javax.persistence.Column;
import javax.persistence.Convert;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.*;
import java.sql.Timestamp;
import java.util.Date;
@@ -16,7 +14,8 @@ import java.util.Date;
 */
@Entity
@Table(name = "gc_client_details")
public class GcClientDetails extends IdEntity implements java.io.Serializable {
@SequenceGenerator(name="id_generated", sequenceName="GC_CLIENT_DETAILS_SQU")
public class GcClientDetails extends IntegerIdentityEntity implements java.io.Serializable {
    // Fields

common/common-entity/src/main/java/com/yihu/jw/entity/iot/gateway/GcHttpLog.java

@@ -1,7 +1,10 @@
package com.yihu.jw.entity.iot.gateway;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.sql.Timestamp;
import java.util.Date;
@@ -11,7 +14,8 @@ import java.util.Date;
 */
@Entity
@Table(name = "gc_http_log")
public class GcHttpLog extends IdEntity implements java.io.Serializable {
@SequenceGenerator(name="id_generated", sequenceName="GC_HTTP_LOG_SQU")
public class GcHttpLog extends IntegerIdentityEntity implements java.io.Serializable {
    // Fields

common/common-entity/src/main/java/com/yihu/jw/entity/iot/gateway/GcToken.java

@@ -1,7 +1,10 @@
package com.yihu.jw.entity.iot.gateway;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.util.Date;
@@ -10,7 +13,8 @@ import java.util.Date;
 */
@Entity
@Table(name = "gc_token")
public class GcToken extends IdEntity implements java.io.Serializable {
@SequenceGenerator(name="id_generated", sequenceName="GC_TOKEN_SQU")
public class GcToken extends IntegerIdentityEntity implements java.io.Serializable {
    // Fields

common/common-entity/src/main/java/com/yihu/jw/entity/iot/gateway/GcTokenLog.java

@@ -1,7 +1,10 @@
package com.yihu.jw.entity.iot.gateway;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.sql.Timestamp;
import java.util.Date;
@@ -11,7 +14,8 @@ import java.util.Date;
 */
@Entity
@Table(name = "gc_token_log")
public class GcTokenLog extends IdEntity implements java.io.Serializable {
@SequenceGenerator(name="id_generated", sequenceName="GC_TOKEN_LOG_SQU")
public class GcTokenLog extends IntegerIdentityEntity implements java.io.Serializable {
    // Fields

common/common-entity/src/main/java/com/yihu/jw/entity/thirdUpload/BaseNsOnlineAskDO.java

@@ -1,337 +0,0 @@
package com.yihu.jw.entity.thirdUpload;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * Created by wsy on 2021/8/31.
 */
@Entity
@Table(name = "base_ns_online_ask")
public class BaseNsOnlineAskDO extends UuidIdentityEntity {
    /*网络咨询服务信息表*/
    private String idOnlineAsk;     //网络咨询记录唯一标识
    private String netServiceCode;  //互联网医疗服务类型
    private String medClassCode;    //咨询类别
    private String medPopCode;      //咨询属性
    private String orgName;         //医疗机构名称
    private String orgCode;         //医疗机构编码
    private String cdOrgSub;        //医疗机构单位隶属
    private String cdArea;          //医疗机构地区
    private String visitDocName;    //医师姓名
    private String visitDocIdNo;    //医师身份证号
    private String visitDocCode;    //医师唯一标识
    private String visitDeptCode;   //咨询医师所属专业代码
    private String visitDeptName;   //咨询医师所属专业名称
    private String ptNo;             //患者姓名
    private String ptAge;            //患者年龄
    private String costType;         //患者费别
    private String ptBirthdate;     //出生日期
    private String geCode;           //患者性别
    private String ptTel;             //患者联系电话
    private String cardType;        //患者证件类型
    private String idNo;            //患者证件号
    private String ptDistrict;      //患者所在地区
    private String applyTime;       //咨询申请时间
    private String visitTime;       //接诊时间
    private String visitFinishTime;     //结束时间
    private String complaintContent;    //患者咨询内容
    private String procFile;            //诊疗过程文件
    private String price;               //咨询服务价格
    private String fgReply;             //医师是否回复
    private String crtTime;             //数据上传时间
    private String createTime;          //生成时间
    private String upload;              //上传时间
    @Column(name = "id_online_ask")
    public String getIdOnlineAsk() {
        return idOnlineAsk;
    }
    public void setIdOnlineAsk(String idOnlineAsk) {
        this.idOnlineAsk = idOnlineAsk;
    }
    @Column(name = "net_service_code")
    public String getNetServiceCode() {
        return netServiceCode;
    }
    public void setNetServiceCode(String netServiceCode) {
        this.netServiceCode = netServiceCode;
    }
    @Column(name = "med_class_code")
    public String getMedClassCode() {
        return medClassCode;
    }
    public void setMedClassCode(String medClassCode) {
        this.medClassCode = medClassCode;
    }
    @Column(name = "med_pop_code")
    public String getMedPopCode() {
        return medPopCode;
    }
    public void setMedPopCode(String medPopCode) {
        this.medPopCode = medPopCode;
    }
    @Column(name = "org_name")
    public String getOrgName() {
        return orgName;
    }
    public void setOrgName(String orgName) {
        this.orgName = orgName;
    }
    @Column(name = "org_code")
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
    @Column(name = "cd_orgSub")
    public String getCdOrgSub() {
        return cdOrgSub;
    }
    public void setCdOrgSub(String cdOrgSub) {
        this.cdOrgSub = cdOrgSub;
    }
    @Column(name = "cd_area")
    public String getCdArea() {
        return cdArea;
    }
    public void setCdArea(String cdArea) {
        this.cdArea = cdArea;
    }
    @Column(name = "visit_doc_name")
    public String getVisitDocName() {
        return visitDocName;
    }
    public void setVisitDocName(String visitDocName) {
        this.visitDocName = visitDocName;
    }
    @Column(name = "visit_doc_id_no")
    public String getVisitDocIdNo() {
        return visitDocIdNo;
    }
    public void setVisitDocIdNo(String visitDocIdNo) {
        this.visitDocIdNo = visitDocIdNo;
    }
    @Column(name = "visit_doc_code")
    public String getVisitDocCode() {
        return visitDocCode;
    }
    public void setVisitDocCode(String visitDocCode) {
        this.visitDocCode = visitDocCode;
    }
    @Column(name = "visit_dept_code")
    public String getVisitDeptCode() {
        return visitDeptCode;
    }
    public void setVisitDeptCode(String visitDeptCode) {
        this.visitDeptCode = visitDeptCode;
    }
    @Column(name = "visit_dept_name")
    public String getVisitDeptName() {
        return visitDeptName;
    }
    public void setVisitDeptName(String visitDeptName) {
        this.visitDeptName = visitDeptName;
    }
    @Column(name = "pt_no")
    public String getPtNo() {
        return ptNo;
    }
    public void setPtNo(String ptNo) {
        this.ptNo = ptNo;
    }
    @Column(name = "pt_age")
    public String getPtAge() {
        return ptAge;
    }
    public void setPtAge(String ptAge) {
        this.ptAge = ptAge;
    }
    @Column(name = "cost_type")
    public String getCostType() {
        return costType;
    }
    public void setCostType(String costType) {
        this.costType = costType;
    }
    @Column(name = "pt_birthdate")
    public String getPtBirthdate() {
        return ptBirthdate;
    }
    public void setPtBirthdate(String ptBirthdate) {
        this.ptBirthdate = ptBirthdate;
    }
    @Column(name = "ge_code")
    public String getGeCode() {
        return geCode;
    }
    public void setGeCode(String geCode) {
        this.geCode = geCode;
    }
    @Column(name = "pt_tel")
    public String getPtTel() {
        return ptTel;
    }
    public void setPtTel(String ptTel) {
        this.ptTel = ptTel;
    }
    @Column(name = "card_type")
    public String getCardType() {
        return cardType;
    }
    public void setCardType(String cardType) {
        this.cardType = cardType;
    }
    @Column(name = "id_no")
    public String getIdNo() {
        return idNo;
    }
    public void setIdNo(String idNo) {
        this.idNo = idNo;
    }
    @Column(name = "pt_district")
    public String getPtDistrict() {
        return ptDistrict;
    }
    public void setPtDistrict(String ptDistrict) {
        this.ptDistrict = ptDistrict;
    }
    @Column(name = "apply_time")
    public String getApplyTime() {
        return applyTime;
    }
    public void setApplyTime(String applyTime) {
        this.applyTime = applyTime;
    }
    @Column(name = "visit_time")
    public String getVisitTime() {
        return visitTime;
    }
    public void setVisitTime(String visitTime) {
        this.visitTime = visitTime;
    }
    @Column(name = "visit_finish_time")
    public String getVisitFinishTime() {
        return visitFinishTime;
    }
    public void setVisitFinishTime(String visitFinishTime) {
        this.visitFinishTime = visitFinishTime;
    }
    @Column(name = "complaint_content")
    public String getComplaintContent() {
        return complaintContent;
    }
    public void setComplaintContent(String complaintContent) {
        this.complaintContent = complaintContent;
    }
    @Column(name = "proc_file")
    public String getProcFile() {
        return procFile;
    }
    public void setProcFile(String procFile) {
        this.procFile = procFile;
    }
    @Column(name = "price")
    public String getPrice() {
        return price;
    }
    public void setPrice(String price) {
        this.price = price;
    }
    @Column(name = "fg_reply")
    public String getFgReply() {
        return fgReply;
    }
    public void setFgReply(String fgReply) {
        this.fgReply = fgReply;
    }
    @Column(name = "crt_time")
    public String getCrtTime() {
        return crtTime;
    }
    public void setCrtTime(String crtTime) {
        this.crtTime = crtTime;
    }
    @Column(name = "create_time")
    public String getCreateTime() {
        return createTime;
    }
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
    @Column(name = "upload")
    public String getUpload() {
        return upload;
    }
    public void setUpload(String upload) {
        this.upload = upload;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/thirdUpload/BaseNsOnlineMedDO.java

@@ -1,377 +0,0 @@
package com.yihu.jw.entity.thirdUpload;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by wsy on 2021/8/31.
 */
@Entity
@Table(name = "base_ns_online_med")
public class BaseNsOnlineMedDO extends UuidIdentityEntity {
    /*网络诊疗服务信息表*/
    private String idOnlineMed;     //网络诊疗记录唯一标识
    private String netServiceCode;  //互联网医疗服务类型
    private String medClassCode;    //诊疗类别
    private String orgName;         //医疗机构名称
    private String orgCode;         //医疗机构编码
    private String cdOrgSub;        //医疗机构单位隶属
    private String cdArea;          //医疗机构地区
    private String visitDocName;    //医师姓名
    private String visitDocIdNo;    //医师身份证号
    private String visitDocCode;    //医师唯一标识
    private String visitSubjectCode;    //医师所属专业代码
    private String visitSubjectName;    //医师所属专业名称
    private String visitDeptCode;       //医师所属科室代码
    private String visitDeptName;       //医师所属科室名称
    private String ptNo;                //患者姓名
    private String ptAge;               //患者年龄
    private String costType;            //患者费别
    private String ptBirthdate;         //出生日期
    private String geCode;              //患者性别
    private String ptTel;               //患者联系电话
    private String cardType;            //患者证件类型
    private String idNo;                //患者证件号
    private String ptDistrict;          //患者所在地区
    private String ptCardType;          //患者就诊卡类型
    private String ptCardNo;            //患者就诊卡号
    private String applyTime;           //咨询申请时间
    private String visitTime;           //接诊时间
    private String visitFinishTime;     //结束时间
    private String oldDiagCode;         //患者原诊断编码
    private String oldDiagName;         //患者原诊断名称
    private String diagCode;            //患者本次诊断编码
    private String diagName;            //患者本次诊断名称
    private String diseasesType;        //诊断类型
    private String complaintContent;    //患者诊疗内容
    private String procFile;            //诊疗过程文件
    private String price;               //咨询服务价格
    private String fgReply;             //医师是否回复
    private String crtTime;             //数据上传时间
    private String createTime;          //生成时间
    private String upload;               //上传时间
    @Column(name = "id_online_med")
    public String getIdOnlineMed() {
        return idOnlineMed;
    }
    public void setIdOnlineMed(String idOnlineMed) {
        this.idOnlineMed = idOnlineMed;
    }
    @Column(name = "net_service_code")
    public String getNetServiceCode() {
        return netServiceCode;
    }
    public void setNetServiceCode(String netServiceCode) {
        this.netServiceCode = netServiceCode;
    }
    @Column(name = "med_class_code")
    public String getMedClassCode() {
        return medClassCode;
    }
    public void setMedClassCode(String medClassCode) {
        this.medClassCode = medClassCode;
    }
    @Column(name = "org_name")
    public String getOrgName() {
        return orgName;
    }
    public void setOrgName(String orgName) {
        this.orgName = orgName;
    }
    @Column(name = "org_code")
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
    @Column(name = "cd_org_sub")
    public String getCdOrgSub() {
        return cdOrgSub;
    }
    public void setCdOrgSub(String cdOrgSub) {
        this.cdOrgSub = cdOrgSub;
    }
    @Column(name = "cd_area")
    public String getCdArea() {
        return cdArea;
    }
    public void setCdArea(String cdArea) {
        this.cdArea = cdArea;
    }
    @Column(name = "visit_doc_name")
    public String getVisitDocName() {
        return visitDocName;
    }
    public void setVisitDocName(String visitDocName) {
        this.visitDocName = visitDocName;
    }
    @Column(name = "visit_doc_id_no")
    public String getVisitDocIdNo() {
        return visitDocIdNo;
    }
    public void setVisitDocIdNo(String visitDocIdNo) {
        this.visitDocIdNo = visitDocIdNo;
    }
    @Column(name = "visit_doc_code")
    public String getVisitDocCode() {
        return visitDocCode;
    }
    public void setVisitDocCode(String visitDocCode) {
        this.visitDocCode = visitDocCode;
    }
    @Column(name = "visit_subject_code")
    public String getVisitSubjectCode() {
        return visitSubjectCode;
    }
    public void setVisitSubjectCode(String visitSubjectCode) {
        this.visitSubjectCode = visitSubjectCode;
    }
    @Column(name = "visit_subject_name")
    public String getVisitSubjectName() {
        return visitSubjectName;
    }
    public void setVisitSubjectName(String visitSubjectName) {
        this.visitSubjectName = visitSubjectName;
    }
    @Column(name = "visit_dept_code")
    public String getVisitDeptCode() {
        return visitDeptCode;
    }
    public void setVisitDeptCode(String visitDeptCode) {
        this.visitDeptCode = visitDeptCode;
    }
    @Column(name = "visit_dept_name")
    public String getVisitDeptName() {
        return visitDeptName;
    }
    public void setVisitDeptName(String visitDeptName) {
        this.visitDeptName = visitDeptName;
    }
    @Column(name = "pt_no")
    public String getPtNo() {
        return ptNo;
    }
    public void setPtNo(String ptNo) {
        this.ptNo = ptNo;
    }
    @Column(name = "pt_age")
    public String getPtAge() {
        return ptAge;
    }
    public void setPtAge(String ptAge) {
        this.ptAge = ptAge;
    }
    @Column(name = "cost_type")
    public String getCostType() {
        return costType;
    }
    public void setCostType(String costType) {
        this.costType = costType;
    }
    @Column(name = "pt_birth_date")
    public String getPtBirthdate() {
        return ptBirthdate;
    }
    public void setPtBirthdate(String ptBirthdate) {
        this.ptBirthdate = ptBirthdate;
    }
    @Column(name = "ge_code")
    public String getGeCode() {
        return geCode;
    }
    public void setGeCode(String geCode) {
        this.geCode = geCode;
    }
    @Column(name = "pt_tel")
    public String getPtTel() {
        return ptTel;
    }
    public void setPtTel(String ptTel) {
        this.ptTel = ptTel;
    }
    @Column(name = "card_type")
    public String getCardType() {
        return cardType;
    }
    public void setCardType(String cardType) {
        this.cardType = cardType;
    }
    @Column(name = "id_no")
    public String getIdNo() {
        return idNo;
    }
    public void setIdNo(String idNo) {
        this.idNo = idNo;
    }
    @Column(name = "pt_district")
    public String getPtDistrict() {
        return ptDistrict;
    }
    public void setPtDistrict(String ptDistrict) {
        this.ptDistrict = ptDistrict;
    }
    @Column(name = "pt_card_type")
    public String getPtCardType() {
        return ptCardType;
    }
    public void setPtCardType(String ptCardType) {
        this.ptCardType = ptCardType;
    }
    @Column(name = "pt_card_no")
    public String getPtCardNo() {
        return ptCardNo;
    }
    public void setPtCardNo(String ptCardNo) {
        this.ptCardNo = ptCardNo;
    }
    @Column(name = "apply_time")
    public String getApplyTime() {
        return applyTime;
    }
    public void setApplyTime(String applyTime) {
        this.applyTime = applyTime;
    }
    @Column(name = "visit_time")
    public String getVisitTime() {
        return visitTime;
    }
    public void setVisitTime(String visitTime) {
        this.visitTime = visitTime;
    }
    @Column(name = "visit_finish_time")
    public String getVisitFinishTime() {
        return visitFinishTime;
    }
    public void setVisitFinishTime(String visitFinishTime) {
        this.visitFinishTime = visitFinishTime;
    }
    @Column(name = "old_diag_code")
    public String getOldDiagCode() {
        return oldDiagCode;
    }
    public void setOldDiagCode(String oldDiagCode) {
        this.oldDiagCode = oldDiagCode;
    }
    @Column(name = "old_diag_name")
    public String getOldDiagName() {
        return oldDiagName;
    }
    public void setOldDiagName(String oldDiagName) {
        this.oldDiagName = oldDiagName;
    }
    @Column(name = "diag_code")
    public String getDiagCode() {
        return diagCode;
    }
    public void setDiagCode(String diagCode) {
        this.diagCode = diagCode;
    }
    @Column(name = "diag_name")
    public String getDiagName() {
        return diagName;
    }
    public void setDiagName(String diagName) {
        this.diagName = diagName;
    }
    @Column(name = "diseases_type")
    public String getDiseasesType() {
        return diseasesType;
    }
    public void setDiseasesType(String diseasesType) {
        this.diseasesType = diseasesType;
    }
    @Column(name = "complaint_content")
    public String getComplaintContent() {
        return complaintContent;
    }
    public void setComplaintContent(String complaintContent) {
        this.complaintContent = complaintContent;
    }
    @Column(name = "proc_file")
    public String getProcFile() {
        return procFile;
    }
    public void setProcFile(String procFile) {
        this.procFile = procFile;
    }
    @Column(name = "price")
    public String getPrice() {
        return price;
    }
    public void setPrice(String price) {
        this.price = price;
    }
    @Column(name = "fg_reply")
    public String getFgReply() {
        return fgReply;
    }
    public void setFgReply(String fgReply) {
        this.fgReply = fgReply;
    }
    @Column(name = "crt_time")
    public String getCrtTime() {
        return crtTime;
    }
    public void setCrtTime(String crtTime) {
        this.crtTime = crtTime;
    }
    @Column(name = "create_time")
    public String getCreateTime() {
        return createTime;
    }
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
    @Column(name = "upload")
    public String getUpload() {
        return upload;
    }
    public void setUpload(String upload) {
        this.upload = upload;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/thirdUpload/BaseNsPrescriptionDO.java

@@ -1,435 +0,0 @@
package com.yihu.jw.entity.thirdUpload;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by wsy on 2021/9/1.
 */
@Entity
@Table(name = "base_ns_prescription")
public class BaseNsPrescriptionDO extends UuidIdentityEntity {
    /*电子处方表*/
    private String idPrescription;      //记录唯一标识
    private String presNo;              //处方号
    private String presClassCode;       //处方类别编码
    private String presClassName;       //处方类别名称
    private String ptId;                //患者ID
    private String medRdNo;             //就诊号
    private String medClassCode;        //就诊类别编码
    private String medClassName;        //就诊类别名称
    private String ptNo;                //患者姓名
    private String geCode;              //患者性别编码
    private String ptAge;               //患者年龄
    private String birthday;            //出生日期
    private String cardType;            //患者证件类型
    private String idNo;                //患者有效证件号
    private String guarderName;         //监护人姓名
    private String guarderNo;           //监护人身份证号码
    private String ptTel;               //患者联系方式
    private String ptDistrict;          //患者所在地区
    private String allergicHistory;     //患者过敏信息
    private String costType;            //患者费别
    private String insClassCode;        //保险类别编码
    private String insClassName;        //保险类别名称
    private String orgCode;             //医疗机构编码
    private String orgName;             //医疗机构名称
    private String presSubjectCode;     //开方医师所属专业代码（诊疗科目代码）
    private String presSubjectName;     //开方医师所属专业名称（诊疗科目名称）
    private String presDeptCode;        //开方科室编码
    private String presDeptName;        //开方科室名称
    private String presTime;            //开方时间
    private String presDocCode;         //开方医生唯一标识
    private String presDocName;         //开方医生姓名
    private String presDocIdNo;         //开方医生身份证号
    private String trialDocCode;        //审方医生唯一标识
    private String trialDocName;        //审方医生姓名
    private String trialDocIdNo;        //审方医生身份证
    private String trialTime;           //审方时间
    private String diagCode;            //诊断编码
    private String diagName;            //诊断名称
    private String diseasesType;        //疾病分类
    private String mobilityFlag;        //行动不便标志
    private String longMedicalFlag;     //病情稳定需长期服药标志
    private String presEffecDays;       //处方有效期（单位天）
    private String totalPrice;          //总金额
    private String uploadTime;          //上传时间
    private String createTime;          //生成时间
    private String upload;              //上传时间
    @Column(name = "id_prescription")
    public String getIdPrescription() {
        return idPrescription;
    }
    public void setIdPrescription(String idPrescription) {
        this.idPrescription = idPrescription;
    }
    @Column(name = "pres_no")
    public String getPresNo() {
        return presNo;
    }
    public void setPresNo(String presNo) {
        this.presNo = presNo;
    }
    @Column(name = "pres_class_code")
    public String getPresClassCode() {
        return presClassCode;
    }
    public void setPresClassCode(String presClassCode) {
        this.presClassCode = presClassCode;
    }
    @Column(name = "pres_class_name")
    public String getPresClassName() {
        return presClassName;
    }
    public void setPresClassName(String presClassName) {
        this.presClassName = presClassName;
    }
    @Column(name = "pt_id")
    public String getPtId() {
        return ptId;
    }
    public void setPtId(String ptId) {
        this.ptId = ptId;
    }
    @Column(name = "med_rd_no")
    public String getMedRdNo() {
        return medRdNo;
    }
    public void setMedRdNo(String medRdNo) {
        this.medRdNo = medRdNo;
    }
    @Column(name = "med_class_code")
    public String getMedClassCode() {
        return medClassCode;
    }
    public void setMedClassCode(String medClassCode) {
        this.medClassCode = medClassCode;
    }
    @Column(name = "med_class_name")
    public String getMedClassName() {
        return medClassName;
    }
    public void setMedClassName(String medClassName) {
        this.medClassName = medClassName;
    }
    @Column(name = "pt_no")
    public String getPtNo() {
        return ptNo;
    }
    public void setPtNo(String ptNo) {
        this.ptNo = ptNo;
    }
    @Column(name = "ge_code")
    public String getGeCode() {
        return geCode;
    }
    public void setGeCode(String geCode) {
        this.geCode = geCode;
    }
    @Column(name = "pt_age")
    public String getPtAge() {
        return ptAge;
    }
    public void setPtAge(String ptAge) {
        this.ptAge = ptAge;
    }
    @Column(name = "birthday")
    public String getBirthday() {
        return birthday;
    }
    public void setBirthday(String birthday) {
        this.birthday = birthday;
    }
    @Column(name = "card_type")
    public String getCardType() {
        return cardType;
    }
    public void setCardType(String cardType) {
        this.cardType = cardType;
    }
    @Column(name = "id_no")
    public String getIdNo() {
        return idNo;
    }
    public void setIdNo(String idNo) {
        this.idNo = idNo;
    }
    @Column(name = "guarder_name")
    public String getGuarderName() {
        return guarderName;
    }
    public void setGuarderName(String guarderName) {
        this.guarderName = guarderName;
    }
    @Column(name = "guarder_no")
    public String getGuarderNo() {
        return guarderNo;
    }
    public void setGuarderNo(String guarderNo) {
        this.guarderNo = guarderNo;
    }
    @Column(name = "pt_tel")
    public String getPtTel() {
        return ptTel;
    }
    public void setPtTel(String ptTel) {
        this.ptTel = ptTel;
    }
    @Column(name = "pt_district")
    public String getPtDistrict() {
        return ptDistrict;
    }
    public void setPtDistrict(String ptDistrict) {
        this.ptDistrict = ptDistrict;
    }
    @Column(name = "allergic_history")
    public String getAllergicHistory() {
        return allergicHistory;
    }
    public void setAllergicHistory(String allergicHistory) {
        this.allergicHistory = allergicHistory;
    }
    @Column(name = "cost_type")
    public String getCostType() {
        return costType;
    }
    public void setCostType(String costType) {
        this.costType = costType;
    }
    @Column(name = "ins_class_code")
    public String getInsClassCode() {
        return insClassCode;
    }
    public void setInsClassCode(String insClassCode) {
        this.insClassCode = insClassCode;
    }
    @Column(name = "ins_class_name")
    public String getInsClassName() {
        return insClassName;
    }
    public void setInsClassName(String insClassName) {
        this.insClassName = insClassName;
    }
    @Column(name = "org_code")
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
    @Column(name = "org_name")
    public String getOrgName() {
        return orgName;
    }
    public void setOrgName(String orgName) {
        this.orgName = orgName;
    }
    @Column(name = "pres_subject_code")
    public String getPresSubjectCode() {
        return presSubjectCode;
    }
    public void setPresSubjectCode(String presSubjectCode) {
        this.presSubjectCode = presSubjectCode;
    }
    @Column(name = "pres_subject_name")
    public String getPresSubjectName() {
        return presSubjectName;
    }
    public void setPresSubjectName(String presSubjectName) {
        this.presSubjectName = presSubjectName;
    }
    @Column(name = "pres_dept_code")
    public String getPresDeptCode() {
        return presDeptCode;
    }
    public void setPresDeptCode(String presDeptCode) {
        this.presDeptCode = presDeptCode;
    }
    @Column(name = "pres_dept_name")
    public String getPresDeptName() {
        return presDeptName;
    }
    public void setPresDeptName(String presDeptName) {
        this.presDeptName = presDeptName;
    }
    @Column(name = "pres_time")
    public String getPresTime() {
        return presTime;
    }
    public void setPresTime(String presTime) {
        this.presTime = presTime;
    }
    @Column(name = "pres_doc_code")
    public String getPresDocCode() {
        return presDocCode;
    }
    public void setPresDocCode(String presDocCode) {
        this.presDocCode = presDocCode;
    }
    @Column(name = "pres_doc_name")
    public String getPresDocName() {
        return presDocName;
    }
    public void setPresDocName(String presDocName) {
        this.presDocName = presDocName;
    }
    @Column(name = "pres_doc_id_no")
    public String getPresDocIdNo() {
        return presDocIdNo;
    }
    public void setPresDocIdNo(String presDocIdNo) {
        this.presDocIdNo = presDocIdNo;
    }
    @Column(name = "trial_doc_code")
    public String getTrialDocCode() {
        return trialDocCode;
    }
    public void setTrialDocCode(String trialDocCode) {
        this.trialDocCode = trialDocCode;
    }
    @Column(name = "trial_doc_name")
    public String getTrialDocName() {
        return trialDocName;
    }
    public void setTrialDocName(String trialDocName) {
        this.trialDocName = trialDocName;
    }
    @Column(name = "trial_doc_id_no")
    public String getTrialDocIdNo() {
        return trialDocIdNo;
    }
    public void setTrialDocIdNo(String trialDocIdNo) {
        this.trialDocIdNo = trialDocIdNo;
    }
    @Column(name = "trial_time")
    public String getTrialTime() {
        return trialTime;
    }
    public void setTrialTime(String trialTime) {
        this.trialTime = trialTime;
    }
    @Column(name = "diag_code")
    public String getDiagCode() {
        return diagCode;
    }
    public void setDiagCode(String diagCode) {
        this.diagCode = diagCode;
    }
    @Column(name = "diag_name")
    public String getDiagName() {
        return diagName;
    }
    public void setDiagName(String diagName) {
        this.diagName = diagName;
    }
    @Column(name = "diseases_type")
    public String getDiseasesType() {
        return diseasesType;
    }
    public void setDiseasesType(String diseasesType) {
        this.diseasesType = diseasesType;
    }
    @Column(name = "mobility_flag")
    public String getMobilityFlag() {
        return mobilityFlag;
    }
    public void setMobilityFlag(String mobilityFlag) {
        this.mobilityFlag = mobilityFlag;
    }
    @Column(name = "long_medical_flag")
    public String getLongMedicalFlag() {
        return longMedicalFlag;
    }
    public void setLongMedicalFlag(String longMedicalFlag) {
        this.longMedicalFlag = longMedicalFlag;
    }
    @Column(name = "pres_effec_days")
    public String getPresEffecDays() {
        return presEffecDays;
    }
    public void setPresEffecDays(String presEffecDays) {
        this.presEffecDays = presEffecDays;
    }
    @Column(name = "total_price")
    public String getTotalPrice() {
        return totalPrice;
    }
    public void setTotalPrice(String totalPrice) {
        this.totalPrice = totalPrice;
    }
    @Column(name = "upload_time")
    public String getUploadTime() {
        return uploadTime;
    }
    public void setUploadTime(String uploadTime) {
        this.uploadTime = uploadTime;
    }
    @Column(name = "create_time")
    public String getCreateTime() {
        return createTime;
    }
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
    @Column(name = "upload")
    public String getUpload() {
        return upload;
    }
    public void setUpload(String upload) {
        this.upload = upload;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/thirdUpload/BaseNsPrescriptionDrugDO.java

@@ -1,265 +0,0 @@
package com.yihu.jw.entity.thirdUpload;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by wsy on 2021/9/1.
 */
@Entity
@Table(name = "base_ns_prescription_drug")
public class BaseNsPrescriptionDrugDO extends UuidIdentityEntity {
    private String idPrescriptionDrug;      //记录唯一标识流水号
    private String presNo;                  //处方号
    private String cuntryDrugCode;          //批准文号
    private String eletDrugCode;            //国家药品编码
    private String orgCode;                 //医疗机构编码
    private String apprDrugCode;            //药品通用编码
    private String apprDrugName;            //药品通用名称
    private String drugCode;                //药品商品编码
    private String drugName;                //药品商品名称
    private String drugForm;                //药品剂型
    private String prescriptionDays;        //用药天数
    private String dosage;                  //用药剂量-单次
    private String dosageUnit;              //用药剂量单位-单次
    private String totalDosage;             //用药剂量-总量
    private String totalDosageUnit;         //用药剂量单位-总量
    private String medicineFreq;            //用药频率编码
    private String drugUse;                 //药品用法
    private String standardDesc;            //规格
    private String singlePrice;             //单价
    private String drugTotalPrice;          //金额
    private String comments;                //嘱托
    private String antiComments;            //抗菌药说明
    private String decMethName;             //中药煎煮法名称
    private String createTime;              //生成时间
    private String upload;                  //上传时间
    @Column(name = "id_prescription_drug")
    public String getIdPrescriptionDrug() {
        return idPrescriptionDrug;
    }
    public void setIdPrescriptionDrug(String idPrescriptionDrug) {
        this.idPrescriptionDrug = idPrescriptionDrug;
    }
    @Column(name = "pres_no")
    public String getPresNo() {
        return presNo;
    }
    public void setPresNo(String presNo) {
        this.presNo = presNo;
    }
    @Column(name = "cuntry_drug_code")
    public String getCuntryDrugCode() {
        return cuntryDrugCode;
    }
    public void setCuntryDrugCode(String cuntryDrugCode) {
        this.cuntryDrugCode = cuntryDrugCode;
    }
    @Column(name = "elet_drug_code")
    public String getEletDrugCode() {
        return eletDrugCode;
    }
    public void setEletDrugCode(String eletDrugCode) {
        this.eletDrugCode = eletDrugCode;
    }
    @Column(name = "org_code")
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
    @Column(name = "appr_drug_code")
    public String getApprDrugCode() {
        return apprDrugCode;
    }
    public void setApprDrugCode(String apprDrugCode) {
        this.apprDrugCode = apprDrugCode;
    }
    @Column(name = "appr_drug_name")
    public String getApprDrugName() {
        return apprDrugName;
    }
    public void setApprDrugName(String apprDrugName) {
        this.apprDrugName = apprDrugName;
    }
    @Column(name = "drug_code")
    public String getDrugCode() {
        return drugCode;
    }
    public void setDrugCode(String drugCode) {
        this.drugCode = drugCode;
    }
    @Column(name = "drug_name")
    public String getDrugName() {
        return drugName;
    }
    public void setDrugName(String drugName) {
        this.drugName = drugName;
    }
    @Column(name = "drug_form")
    public String getDrugForm() {
        return drugForm;
    }
    public void setDrugForm(String drugForm) {
        this.drugForm = drugForm;
    }
    @Column(name = "prescription_days")
    public String getPrescriptionDays() {
        return prescriptionDays;
    }
    public void setPrescriptionDays(String prescriptionDays) {
        this.prescriptionDays = prescriptionDays;
    }
    @Column(name = "dosage")
    public String getDosage() {
        return dosage;
    }
    public void setDosage(String dosage) {
        this.dosage = dosage;
    }
    @Column(name = "dosage_unit")
    public String getDosageUnit() {
        return dosageUnit;
    }
    public void setDosageUnit(String dosageUnit) {
        this.dosageUnit = dosageUnit;
    }
    @Column(name = "total_dosage")
    public String getTotalDosage() {
        return totalDosage;
    }
    public void setTotalDosage(String totalDosage) {
        this.totalDosage = totalDosage;
    }
    @Column(name = "total_dosage_unit")
    public String getTotalDosageUnit() {
        return totalDosageUnit;
    }
    public void setTotalDosageUnit(String totalDosageUnit) {
        this.totalDosageUnit = totalDosageUnit;
    }
    @Column(name = "medicine_freq")
    public String getMedicineFreq() {
        return medicineFreq;
    }
    public void setMedicineFreq(String medicineFreq) {
        this.medicineFreq = medicineFreq;
    }
    @Column(name = "drug_use")
    public String getDrugUse() {
        return drugUse;
    }
    public void setDrugUse(String drugUse) {
        this.drugUse = drugUse;
    }
    @Column(name = "standard_desc")
    public String getStandardDesc() {
        return standardDesc;
    }
    public void setStandardDesc(String standardDesc) {
        this.standardDesc = standardDesc;
    }
    @Column(name = "single_price")
    public String getSinglePrice() {
        return singlePrice;
    }
    public void setSinglePrice(String singlePrice) {
        this.singlePrice = singlePrice;
    }
    @Column(name = "drug_total_price")
    public String getDrugTotalPrice() {
        return drugTotalPrice;
    }
    public void setDrugTotalPrice(String drugTotalPrice) {
        this.drugTotalPrice = drugTotalPrice;
    }
    @Column(name = "comments")
    public String getComments() {
        return comments;
    }
    public void setComments(String comments) {
        this.comments = comments;
    }
    @Column(name = "anti_comments")
    public String getAntiComments() {
        return antiComments;
    }
    public void setAntiComments(String antiComments) {
        this.antiComments = antiComments;
    }
    @Column(name = "dec_meth_name")
    public String getDecMethName() {
        return decMethName;
    }
    public void setDecMethName(String decMethName) {
        this.decMethName = decMethName;
    }
    @Column(name = "create_time")
    public String getCreateTime() {
        return createTime;
    }
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
    @Column(name = "upload")
    public String getUpload() {
        return upload;
    }
    public void setUpload(String upload) {
        this.upload = upload;
    }
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/hospital/BaseHospitalRequestMapping.java

@@ -1519,62 +1519,4 @@ public class BaseHospitalRequestMapping {
        //发送微信模版消息
        public static final String sendWxTemple = "/sendWxTemple";
    }
    /*
     *   监管平台请求地址
     */
    public static class UpWebTherapySupserviceInfo{
        /*请求前缀*/
        public static final String PREFIX = "/open/gc/regulatory";
        //保存医师唯一标识
        public static final String SAVEACHNS = "/saveAchns";
        //删除医师唯一标识
        public static final String DELETEACHNS = "/deleteAchns";
        //查询医师唯一标识
        public static final String FINDACHNSBYCREATETIME = "/findAchnsByCreateTime";
        //待插入
        //保存网络咨询服务信息
        public static final String SAVENSOLINEASK = "/saveNsOlineAsk";
        //删除网络咨询服务信息
        public static final String DELETESOLINEASK = "/deleteNsOlineAsk";
        //查询网络咨询服务信息
        public static final String FINDNSOLINEASK = "/findNsOlineAsk";
        //保存网络诊疗服务信息
        public static final String SAVENSONLINEMED = "/saveNsonlinemed";
        //删除网络诊疗服务信息
        public static final String DELETENSONLINEMED = "/deleteNsonlinemed";
        //查询网络诊疗服务信息
        public static final String FINDSONLINEMED = "/findNsonlinemed";
        //保存电子处方单信息
        public static final String SAVEPRESCRIPTION = "/savePrescription";
        //删除电子处方单信息
        public static final String DELETEPRESCRIPTION = "/deletePrescription";
        //查询电子处方单信息
        public static final String FINDPRESCRIPTION = "/findPrescription";
        //保存电子处方药品明细信息
        public static final String SAVEPRESCRIPTIONDRUG = "savePrescriptionDrug";
        //删除电子处方单信息
        public static final String DELETEPRESCRIPTIONDRUG = "/deletePrescriptionDrug";
        //查询电子处方单信息
        public static final String FINDPRESCRIPTIONDRUG = "/findPrescriptionDrug";
    }
}

gateway/ag-basic/src/main/java/com/yihu/jw/gateway/filter/BasicZuulFilter.java

@@ -105,7 +105,8 @@ public class BasicZuulFilter extends ZuulFilter {
            url.contains("/open/noLogin/sfroutepushservice")||
            url.contains("/open/noLogin/ylzSettleRecord")||
                url.contains("/weixin")||
                url.contains("/excelControl"))){
                url.contains("/excelControl")||
                url.contains("/open/gc"))){
            logger.info("入参"+ctx.getRequestQueryParams());
            try {
                decrypt(ctx,request);

gateway/ag-basic/src/main/java/com/yihu/jw/gateway/filter/PostFilter.java

@@ -54,10 +54,10 @@ public class PostFilter extends ZuulFilter {
    @Override
    public Object run() {
        RequestContext ctx = RequestContext.getCurrentContext();
        BaseExceptionServerDictDao baseExceptionServiceDictDao = BeanUtil.getBean(BaseExceptionServerDictDao.class);
       /* BaseExceptionServerDictDao baseExceptionServiceDictDao = BeanUtil.getBean(BaseExceptionServerDictDao.class);
        BaseExceptionLogDao baseExceptionLogDao = BeanUtil.getBean(BaseExceptionLogDao.class);
        BaseExceptionService baseExceptionService = BeanUtil.getBean(BaseExceptionService.class);
        logger.info("进入post过滤器");
       */ logger.info("进入post过滤器");
        HttpServletRequest request = ctx.getRequest();
        String url = request.getRequestURI();
        if (url.contains("/excelControl")){
@@ -74,7 +74,7 @@ public class PostFilter extends ZuulFilter {
            bytes = StreamUtils.copyToByteArray(stream);
        }
        String body = new String(bytes,"UTF8");
        String serviceId="";
        /*String serviceId="";
        String responseCode="";
        String exceptionType="";
        List<BaseExceptionServerDictDO> baseExceptionServerDictDOS =baseExceptionServiceDictDao.findServiceAll();
@@ -120,8 +120,8 @@ public class PostFilter extends ZuulFilter {
            }
        }catch (Exception e){
            e.printStackTrace();
        }
        }*/
        logger.info("body",body);
        JSONObject object = new JSONObject();
        object.put("status","200");
        object.put("data", AesEncryptUtils.encrypt(body));
@@ -131,7 +131,8 @@ public class PostFilter extends ZuulFilter {
            url.contains("/open/noLogin/getSFExpressInfoNew")||
            url.contains("/open/noLogin/sfroutepushservice")||
            url.contains("/open/noLogin/ylzSettleRecord")||
                url.contains("/weixin")||url.contains("/oauth/getSsoPublicKey"))){
                url.contains("/weixin")||url.contains("/oauth/getSsoPublicKey")||
                url.contains("/open/gc"))){
            RequestContext.getCurrentContext().setResponseBody(object.toJSONString());
        }else {
            RequestContext.getCurrentContext().setResponseBody(body);

server/svr-authentication/src/main/java/com/yihu/jw/security/oauth2/provider/endpoint/WlyyLoginEndpoint.java

@@ -339,7 +339,7 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
        }
        WlyyUserSimple wlyyUserSimple = userDetailsService.authSuccess(parameters.get("username"));
        if ("pad".equals(parameters.get("clientType"))&&!("1".equals(wlyyUserSimple.getArchiveType())) ){//医养平板端登录限制
        if ("pad".equals(parameters.get("clientType"))&&("2".equals(wlyyUserSimple.getArchiveType())) ){//医养平板端登录限制
            throw new InvalidGrantException("不允许登录该平台");
        }
        wlyyUserSimple.setAccessToken(token.getValue());

svr/svr-base/src/main/java/com/yihu/jw/base/dao/searchClient/BaseSearchNoveltyRepeatDao.java

@@ -1,17 +0,0 @@
package com.yihu.jw.base.dao.searchClient;
import com.yihu.jw.entity.base.searchClient.BaseSearchNoveltyRepeatDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * Created by wsy on 2021/9/4.
 */
public interface BaseSearchNoveltyRepeatDao extends PagingAndSortingRepository<BaseSearchNoveltyRepeatDO,String>{
    @Query(value = "select b from BaseSearchNoveltyRepeatDO b where name = ?1 or subject = ?1 or content = ?1")
    List<BaseSearchNoveltyRepeatDO> findBySearchData(String searchData);
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/statistics/DetectionPlatformEndpoint.java

@@ -35,12 +35,13 @@ public class DetectionPlatformEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private PatientDeviceService patientDeviceService;
    /**************************v1.1.0新增 设备异常动态************************************/
    @GetMapping(value = "getHealthMonitoringListNew")
    @ApiOperation(value = "体征监测/安防监护")
    public PageEnvelop getHealthMonitoringListNew(
            @ApiParam(name="page",value = "page") @RequestParam(required = true) int page,
            @ApiParam(name="size",value = "size") @RequestParam(required = true) int size,
            @ApiParam(name="type",value = "type=1(健康监测)   type=2(安防检测)") @RequestParam(required = true) int type) {
            @ApiParam(name="type",value = "type=1(健康监测)   type=2(安防检测)   type=3(设备异常)") @RequestParam(required = true) int type) {
        try {
            return platformService.getHealthMonitoringListNew(page,size,type);
        } catch (Exception e) {
@@ -157,4 +158,26 @@ public class DetectionPlatformEndpoint extends EnvelopRestEndpoint {
        }
    }
    /********************v1.1.0**************************/
    @GetMapping(value = "getGiveEarlyWarning")
    @ApiOperation(value = "物联网检测大屏，预警部分")
    public ObjEnvelop getGiveEarlyWarning(){
        try {
            return success("查询成功",200, platformService.getDistributionOfWarningTypes());
        }catch (Exception e){
            return failedObjEnvelopException(e);
        }
    }
    @GetMapping(value = "getServiceSituation")
    @ApiOperation(value = "物联网检测大屏，服务情况")
    public ObjEnvelop getServiceSituation(){
        try {
            return success("查询成功",200, platformService.getServiceSituation());
        }catch (Exception e){
            return failedObjEnvelopException(e);
        }
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/assistance/EmergencyAssistanceService.java

@@ -256,9 +256,10 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        //pc管理端端推送消息
        imUtill.sendPcManageMessageToPc("cloudCare_pcManage",message.toString());
        emergencyAssistanceDao.save(assistanceDO);
        return getOrderDetail(assistanceDO.getId(),null);
        result.put("resultFlag", ResponseContant.success);
        result.put("resultMsg",assistanceDO);
        return result;
    }
    public JSONObject getOrderDetail(String orderID,String doctor){
@@ -372,7 +373,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        //附加信息 紧急救助无
        //通知对象
        List<Map<String,Object>> noticePersons = new ArrayList<>();
        JSONArray familyArr =  familyMemberService.getPatientMembers(assistanceDO.getPatient(),null,null,null,null);
        JSONArray familyArr =  familyMemberService.getPatientMembers(assistanceDO.getPatient(),null,null,null,"3");
        String emeCallPhone = "";
        if (assistanceDO.getOrderSource()!=1){//设备发起工单
//            String category = assistanceDO.getOrderSource()==2?"4":"7";

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/consult/ConsultTeamService.java

@@ -207,7 +207,7 @@ public class ConsultTeamService {
            participants.put(patientId, 0);//家庭成员拉入会话
        }
        for (int i=0;i<agentFamilyArr.size();i++){//创建家属系统消息
            JSONObject tmp = familyArr.getJSONObject(i);
            JSONObject tmp = agentFamilyArr.getJSONObject(i);
            String patientId = tmp.getString("id");
            if (patient.equals(patientId)){
                continue;
@@ -419,8 +419,8 @@ public class ConsultTeamService {
            }
            participants.put(patientId, 0);
        }
        for (int i=0;i<familyArr.size();i++){
            JSONObject tmp = familyArr.getJSONObject(i);
        for (int i=0;i<agentFamilyArr.size();i++){
            JSONObject tmp = agentFamilyArr.getJSONObject(i);
            String patientId = tmp.getString("id");
            if (patient.equals(patientId)){
                continue;

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

@@ -51,7 +51,7 @@ public class YunXunDeviceService {
     */
    public void sendInstruction(String sn,String instruction){
        try {
            String url = "http://117.24.13.79:43210/yunxin/sendMessage?deviceSN="+sn+"&message="+instruction;
            String url = "http://www.cityihealth.com:43210/yunxin/sendMessage?deviceSN="+sn+"&message="+instruction;
            String response = httpClientUtil.get(url,"UTF-8");
            logger.info("sendInstruction="+response);
        }catch (Exception e){

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/family/PatientFamilyMemberService.java

@@ -355,6 +355,7 @@ public class PatientFamilyMemberService extends BaseJpaService<BasePatientFamily
            obj.put("familyRelationName", "自己");
            obj.put("isAuthorize", 1);//0:未授权,1:已授权
            obj.put("authorizeStatus", 3);//
            obj.put("archiveType", p.getArchiveType());//
            if (jtSign) {
                obj.put("signType", 1);
@@ -385,7 +386,7 @@ public class PatientFamilyMemberService extends BaseJpaService<BasePatientFamily
                "    and t1.patient = ? " +
                "    and t1.family_member = t2.id ";
        if (StringUtils.isNotBlank(archive_type)){
            sql += " and t2.archive_type='"+archive_type+"' ";
            sql += " and t2.archive_type in ('"+archive_type.replace(",","','")+"') ";
        }
/*        if(isContacts != null){
            sql += " and t1.is_contacts = "+ isContacts;
@@ -417,6 +418,7 @@ public class PatientFamilyMemberService extends BaseJpaService<BasePatientFamily
                obj.put("address", StringUtils.isEmpty(String.valueOf(map.get("address"))) ? "" : map.get("address"));
                obj.put("familyRelation", map.get("family_relation"));
                obj.put("familyRelationName", relations.get(map.get("family_relation")));
                obj.put("archiveType",StringUtils.isEmpty(String.valueOf(map.get("archive_type"))) ?"":map.get("archive_type"));
                if (!StringUtils.isEmpty(doctorCode)) {
                    obj.put("relaholder", relations.get(map.get("family_relation")));

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/security/SecurityMonitoringOrderService.java

@@ -424,7 +424,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
        //通知对象
        List<Map<String,Object>> noticePersons = new ArrayList<>();
        JSONArray familyArr =  familyMemberService.getPatientMembers(orderDO.getPatient(),null,null,null,null);
        JSONArray familyArr =  familyMemberService.getPatientMembers(orderDO.getPatient(),null,null,null,"3");
        for (int i=0;i<familyArr.size();i++){
            String patientId = familyArr.getJSONObject(i).getString("id");
            BasePatientDO patientDO1 = basePatientDao.findById(patientId);

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/statistics/DetectionPlatformService.java

@@ -11,6 +11,7 @@ import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.utils.StringUtil;
import io.swagger.models.auth.In;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -21,6 +22,7 @@ import org.springframework.stereotype.Service;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -60,7 +62,7 @@ public class DetectionPlatformService  {
            sql +=" limit "+page*pageSize+","+pageSize;
            List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
            return PageEnvelop.getSuccessListWithPage("查询成功",list,page,pageSize,count);
        }else {
        }else if (type == 2){
            String sql = " select  '22' as 'OrderType',ord.id,ord.patient,p.name,ord.serve_desc,DATE_FORMAT(ord.create_time,'%Y-%m-%d %H:%i:%S') create_time,ord.`status`,ord.doctor,ord.doctor_name \n" +
                    "from base_security_monitoring_order ord INNER JOIN base_patient p on ord.patient = p.id order by create_time desc ";
            String countSql = "select count(id) from ("+sql+")A ";
@@ -68,6 +70,16 @@ public class DetectionPlatformService  {
            sql +=" limit "+page*pageSize+","+pageSize;
            List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
            return PageEnvelop.getSuccessListWithPage("查询成功",list,page,pageSize,count);
        } else {
            String sql = " SELECT pd.id,pd.device_sn deviceSn,pd.`user`,p.`name`,d.contact_status_time contactStatusTime,CASE pd.category_code WHEN '1' THEN '血糖仪离线' WHEN '2' THEN '血压计离线' WHEN '13' THEN '睡眠带离线'\n" +
                    "WHEN '17' THEN '随身WiFi离线' WHEN '7' THEN '居家安全报警器离线' WHEN '12' THEN '监控器离线' WHEN '14' THEN '气感报警器离线' WHEN '15' THEN '烟感报警器离线' WHEN '16' THEN '智能拐杖离线' WHEN '4' THEN '智能手表离线' \n" +
                    "ELSE '未知' END categoryCode FROM wlyy_devices d,wlyy_patient_device pd,base_patient p\n" +
                    "WHERE d.contact_status = 0 AND pd.del = 0 AND pd.device_sn = d.device_code AND pd.`user` = p.id ORDER BY d.contact_status_time DESC ";
            String countSql = "select count(id) from ("+sql+")A ";
            long count = jdbcTemplate.queryForObject(countSql,long.class);
            sql +=" limit "+page*pageSize+","+pageSize;
            List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
            return PageEnvelop.getSuccessListWithPage("查询成功",list,page,pageSize,count);
        }
    }
@@ -323,4 +335,71 @@ public class DetectionPlatformService  {
        return nightRecordList;  //起夜记录
    }
    public JSONObject getDistributionOfWarningTypes(){
        JSONObject object = new JSONObject();
        /****预警类型分布****/
        String sql = "SELECT hsd.dict_value,aa.count FROM wlyy_hospital_sys_dict hsd LEFT JOIN (SELECT serve_desc,COUNT(1) count FROM base_security_monitoring_order GROUP BY serve_desc)aa ON hsd.dict_value = aa.serve_desc WHERE hsd.dict_name = 'security_server_dict'";
        List<Map<String , Object>> list = jdbcTemplate.queryForList(sql);
        /****工单总量****/
        String sqlAll = "SELECT COUNT(1) count FROM base_security_monitoring_order";
        Integer countAll = jdbcTemplate.queryForObject(sqlAll,Integer.class);
        /****误报警数量****/
        String sql1 = "SELECT COUNT(1) count FROM base_security_monitoring_order WHERE emergency_cancel IS NOT NULL OR emergency_cancel != ''";
        Integer falseAlarmCount = jdbcTemplate.queryForObject(sql1,Integer.class);
        /****响应数量****/
        String responseCountSql = "SELECT COUNT(1) count FROM base_security_monitoring_order WHERE (emergency_cancel IS NOT NULL OR emergency_cancel != '') OR `status` = 0 GROUP BY id";
        List<Map<String,Object>> responseList = jdbcTemplate.queryForList(responseCountSql);
        Integer responseCount = responseList.size();
        object.put("distributionOfWarning",list);
        object.put("countAll",countAll);
        object.put("falseAlarmCount",falseAlarmCount);
        object.put("responseCount",responseCount);
        /****误报警率****/
        object.put("falseAlarmLaw",getRange(falseAlarmCount,countAll));
        /****响应率****/
        object.put("responseLaw",getRange(responseCount,countAll));
        return object;
    }
    public JSONObject getServiceSituation(){
        JSONObject object = new JSONObject();
        /*****设备分类****/
        // SELECT hsd.`value` dict_value,aa.count FROM base_system_dict_entry hsd LEFT JOIN (SELECT serve_desc,COUNT(1) count FROM base_security_monitoring_order GROUP BY serve_desc)aa ON hsd.`value` = aa.serve_desc WHERE hsd.remark = 'security'
        String passportTypeSql = "SELECT sde.`value`,COUNT(d.id) count,GROUP_CONCAT(DISTINCT d.category_code SEPARATOR ',') AS category_code,GROUP_CONCAT(DISTINCT d.model SEPARATOR ',') AS model FROM base_system_dict_entry sde LEFT JOIN dm_device d ON FIND_IN_SET(sde.`code`,d.service_topic) WHERE sde.remark = 'security' GROUP BY sde.`value` ";
        List<Map<String , Object>> passportType = jdbcTemplate.queryForList(passportTypeSql);
        String useSql = "";
        String allSql = "";
        String model = "";
        Integer use = 0;
        Integer putOnFile = 0;
        if (passportType.size() > 0) {
            for (int i=0;i<passportType.size();i++) {
                System.out.println(passportType.get(i).get("value") +"      " + passportType.get(i).get("count") +"      " + passportType.get(i).get("category_code"));
                Long count = (Long) passportType.get(i).get("count");
                model = (String) passportType.get(i).get("model");
                model = model.replace(",","','");
                if ( count.intValue() > 0) {
                    useSql = "SELECT COUNT(1) FROM wlyy_patient_device WHERE category_code IN ("+ passportType.get(i).get("category_code") +") AND del = 0";
                    use = jdbcTemplate.queryForObject(useSql,Integer.class);
                    passportType.get(i).put("use",use);//使用
                    allSql = "SELECT COUNT(1) FROM wlyy_devices WHERE device_model IN ('"+ model +"')";
                    putOnFile = jdbcTemplate.queryForObject(allSql,Integer.class);
                    passportType.get(i).put("putOnFile",putOnFile); //备案
                    passportType.get(i).put("stock",putOnFile - use); //库存
                } else {
                    passportType.get(i).put("putOnFile",0); //备案
                    passportType.get(i).put("stock",0); //库存
                    passportType.get(i).put("use",0); //使用
                }
            }
        }
        object.put("passportType",passportType);
        return object;
    }
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/dao/device/WlyyDeviceDao.java

@@ -0,0 +1,28 @@
package com.yihu.jw.care.dao.device;
import com.yihu.jw.entity.care.device.Device;
import com.yihu.jw.entity.care.device.DeviceDetail;
import com.yihu.jw.restmodel.iot.device.WlyyDeviceVO;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.Date;
/***
 * @ClassName: WlyyDeviceDao
 * @Description:
 * @Auther: shi kejing
 * @Date: 2021/9/6 11:12
 */
public interface WlyyDeviceDao extends PagingAndSortingRepository<DeviceDetail, Long> {
    @Modifying
    @Query("update DeviceDetail o set o.contactStatus = 0 , o.contactStatusTime = ?1 where o.deviceCode = ?2")
    void updateContactStatus(Date contactStatusTime, String orderId);
    @Modifying
    @Query("update DeviceDetail o set o.contactStatus = 1 , o.contactStatusTime = ?1 where o.deviceCode = ?2")
    void updateContactStatus1(Date contactStatusTime, String orderId);
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/event/ApplicationEvent.java

@@ -3,6 +3,7 @@ package com.yihu.jw.care.event;
import com.yihu.jw.care.job.BirthdayReminderJob;
import com.yihu.jw.care.job.QuartzHelper;
import com.yihu.jw.care.job.consult.FinishConsultJob;
import com.yihu.jw.care.job.device.DeviceLostAssociationJob;
import com.yihu.jw.care.job.device.PatientSosContactsJob;
import com.yihu.jw.care.job.message.DoctorSendUnreadJob;
import com.yihu.jw.care.job.message.PatientSendUnreadJob;
@@ -84,6 +85,14 @@ public class ApplicationEvent implements ApplicationListener<ContextRefreshedEve
                logger.info("PATIENT_SOS_CONTACTS_JOB exist");
            }
            if (!quartzHelper.isExistJob("DEVICE_LOST_ASSOCIATION_JOB")) {
                String trigger = SystemConf.getInstance().getSystemProperties().getProperty("DEVICE_LOST_ASSOCIATION_JOB");
                quartzHelper.addJob(DeviceLostAssociationJob.class, trigger, "DEVICE_LOST_ASSOCIATION_JOB", new HashMap<String, Object>());
                logger.info("DEVICE_LOST_ASSOCIATION_JOB success");
            } else {
                logger.info("DEVICE_LOST_ASSOCIATION_JOB exist");
            }
        } catch (Exception e) {
            logger.info(" job start failed");
        }

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

@@ -0,0 +1,37 @@
package com.yihu.jw.care.job.device;
import com.yihu.jw.care.service.device.PatientDeviceService;
import org.quartz.DisallowConcurrentExecution;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
/***
 * @ClassName: DeviceLostAssociationJob
 * @Description: 医养物联网检测大屏失联率
 * @Auther: shi kejing
 * @Date: 2021/9/6 13:37
 */
@DisallowConcurrentExecution
public class DeviceLostAssociationJob implements Job {
    private static Logger logger = LoggerFactory.getLogger(DeviceLostAssociationJob.class);
    @Autowired
    private PatientDeviceService patientDeviceService;
    @Override
    public void execute(JobExecutionContext context) throws JobExecutionException {
        logger.info("DeviceLostAssociationJob start");
        try {
            patientDeviceService.selectAndUpdate();
            logger.info("DeviceLostAssociationJob end");
        } catch (Exception e) {
            logger.info(e.getMessage());
            e.printStackTrace();
        }
    }
}

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

@@ -51,7 +51,7 @@ public class YunXunDeviceService {
     */
    public void sendInstruction(String sn,String instruction){
        try {
            String url = "http://117.24.13.79:43210/yunxin/sendMessage?deviceSN="+sn+"&message="+instruction;
            String url = "http://www.www.cityihealth.com:43210/yunxin/sendMessage?deviceSN="+sn+"&message="+instruction;
            String response = httpClientUtil.get(url,"UTF-8");
            logger.info("sendInstruction="+response);
        }catch (Exception e){

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

@@ -4,8 +4,11 @@ package com.yihu.jw.care.service.device;
import com.yihu.jw.care.config.AqgConfig;
import com.yihu.jw.care.dao.device.DeviceDao;
import com.yihu.jw.care.dao.device.PatientDeviceDao;
import com.yihu.jw.care.dao.device.WlyyDeviceDao;
import com.yihu.jw.entity.care.device.Device;
import com.yihu.jw.entity.care.device.DevicePatientDevice;
import com.yihu.jw.restmodel.iot.device.WlyyDeviceVO;
import com.yihu.jw.restmodel.iot.device.WlyyPatientDeviceVO;
import com.yihu.jw.util.common.GpsUtil;
import com.yihu.jw.util.http.HttpClientUtil;
import org.apache.commons.lang3.StringUtils;
@@ -16,12 +19,14 @@ import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import javax.annotation.PostConstruct;
import java.text.MessageFormat;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.TimeUnit;
@@ -41,6 +46,10 @@ public class PatientDeviceService {
    private GpsUtil gpsUtil;
    @Autowired
    private DeviceDao deviceDao;
    @Autowired
    private WlyyDeviceDao wlyyDeviceDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    Map<Integer, String> relations = new HashMap<>();
@@ -218,4 +227,94 @@ public class PatientDeviceService {
    /******************************************* 爱牵挂设备end *****************************************************/
    /**************************************物联网检测大屏失联率start************************************************/
    public void selectAndUpdate(){
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        String endTime = sdf.format(new Date());
        Calendar device1 = Calendar.getInstance();
        device1.setTime(new Date());
        device1.add(device1.DATE, -30);
        Date nowDate = device1.getTime();
        String startTimeDevice1 = sdf.format(nowDate);
        Calendar device2 = Calendar.getInstance();
        device2.setTime(new Date());
        device2.add(device2.DATE, -2);
        Date nowDate2 = device2.getTime();
        String startTimeDevice2 = sdf.format(nowDate2);
        try {
            /**血糖仪，血压计。30天内有数据上传，则改为未失联**/
            String sql = "SELECT bb.device_sn  FROM (\n" +
                    "SELECT pd.device_sn FROM base.wlyy_patient_device pd  LEFT JOIN wlyy_patient_health_index phi ON pd.device_sn = phi.device_sn WHERE\n" +
                    "phi.record_date BETWEEN '"+startTimeDevice1+"' AND '"+endTime+"' AND phi.del = 1 AND pd.category_code IN (1,2) GROUP BY phi.device_sn\n" +
                    ") aa RIGHT JOIN (SELECT device_sn FROM wlyy_patient_device WHERE category_code IN (1,2)) bb ON aa.device_sn =  bb.device_sn\n" +
                    "WHERE aa.device_sn IS NOT NULL OR aa.device_sn != ''";
            List<Map<String , Object>> list = jdbcTemplate.queryForList(sql);
            if (list.size() > 0) {
                for (int i=0;i<list.size();i++) {
                    wlyyDeviceDao.updateContactStatus1(new Date(), (String) list.get(i).get("device_sn"));
                }
            }
            /**智能拐杖、智能手表。2天内有数据上传，则改为未失联**/
            sql = "SELECT bb.device_sn  FROM (\n" +
                    "SELECT pd.device_sn FROM base.wlyy_patient_device pd  LEFT JOIN wlyy_patient_health_index phi ON pd.device_sn = phi.device_sn WHERE\n" +
                    "phi.record_date BETWEEN '"+startTimeDevice2+"' AND '"+endTime+"' AND phi.del = 1 AND pd.category_code IN (16) GROUP BY phi.device_sn\n" +
                    ") aa RIGHT JOIN (SELECT device_sn FROM wlyy_patient_device WHERE category_code IN (16)) bb ON aa.device_sn =  bb.device_sn\n" +
                    "WHERE aa.device_sn IS NOT NULL OR aa.device_sn != ''";
            list = jdbcTemplate.queryForList(sql);
            if (list.size() > 0) {
                for (int i=0;i<list.size();i++) {
                    wlyyDeviceDao.updateContactStatus1(new Date(), (String) list.get(i).get("device_sn"));
                }
            }
            /**血糖仪**/
            String sql1 = "SELECT bb.device_sn  FROM (\n" +
                    "SELECT pd.device_sn FROM base.wlyy_patient_device pd  LEFT JOIN wlyy_patient_health_index phi ON pd.device_sn = phi.device_sn WHERE\n" +
                    "phi.record_date BETWEEN '"+startTimeDevice1+"' AND '"+endTime+"' AND phi.del = 1 AND pd.category_code = 1 GROUP BY phi.device_sn\n" +
                    ") aa RIGHT JOIN (SELECT device_sn FROM wlyy_patient_device WHERE category_code = 1) bb ON aa.device_sn =  bb.device_sn\n" +
                    "WHERE aa.device_sn IS NULL OR aa.device_sn = ''";
            List<Map<String , Object>> list1 = jdbcTemplate.queryForList(sql1);
            if (list1.size() > 0) {
                for (int i=0;i<list1.size();i++) {
                    wlyyDeviceDao.updateContactStatus(new Date(), (String) list1.get(i).get("device_sn"));
                }
            }
            /**血压计**/
            String sql2 = "SELECT bb.device_sn  FROM (\n" +
                    "SELECT pd.device_sn FROM base.wlyy_patient_device pd  LEFT JOIN wlyy_patient_health_index phi ON pd.device_sn = phi.device_sn WHERE\n" +
                    "phi.record_date BETWEEN '"+startTimeDevice1+"' AND '"+endTime+"' AND phi.del = 1 AND pd.category_code = 2 GROUP BY phi.device_sn\n" +
                    ") aa RIGHT JOIN (SELECT device_sn FROM wlyy_patient_device WHERE category_code = 2) bb ON aa.device_sn =  bb.device_sn\n" +
                    "WHERE aa.device_sn IS NULL OR aa.device_sn = ''";
            List<Map<String , Object>> list2 = jdbcTemplate.queryForList(sql2);
            if (list2.size() > 0) {
                for (int i=0;i<list2.size();i++) {
                    wlyyDeviceDao.updateContactStatus(new Date(), (String) list2.get(i).get("device_sn"));
                }
            }
            /**智能手表**/
            //startTimeDevice2   2天
            /**智能拐杖**/
            String sql3 = "SELECT bb.device_sn  FROM (\n" +
                    "SELECT pd.device_sn FROM base.wlyy_patient_device pd  LEFT JOIN wlyy_patient_health_index phi ON pd.device_sn = phi.device_sn WHERE\n" +
                    "phi.record_date BETWEEN '"+startTimeDevice2+"' AND '"+endTime+"' AND phi.del = 1 AND pd.category_code = 16 GROUP BY phi.device_sn\n" +
                    ") aa RIGHT JOIN (SELECT device_sn FROM wlyy_patient_device WHERE category_code = 16) bb ON aa.device_sn =  bb.device_sn\n" +
                    "WHERE aa.device_sn IS NULL OR aa.device_sn = ''";
            List<Map<String , Object>> list3 = jdbcTemplate.queryForList(sql3);
            if (list3.size() > 0) {
                for (int i=0;i<list3.size();i++) {
                    wlyyDeviceDao.updateContactStatus(new Date(), (String) list3.get(i).get("device_sn"));
                }
            }
        } catch (Exception e) {
            logger.info(e.getMessage());
        }
    }
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/web/JobController.java

@@ -3,6 +3,7 @@ package com.yihu.jw.care.web;
import com.yihu.jw.care.job.BirthdayReminderJob;
import com.yihu.jw.care.job.QuartzHelper;
import com.yihu.jw.care.job.consult.FinishConsultJob;
import com.yihu.jw.care.job.device.DeviceLostAssociationJob;
import com.yihu.jw.care.job.message.DoctorSendUnreadJob;
import com.yihu.jw.care.job.message.PatientSendUnreadJob;
import com.yihu.jw.care.service.BirthdayReminderService;
@@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
import java.util.UUID;
/**
 * 任务启动
@@ -37,6 +39,19 @@ public class JobController extends BaseController {
    @Autowired
    private BirthdayReminderService birthdayReminderService;
    @RequestMapping(value = "/deviceLostAssociationJob", method = RequestMethod.POST)
    @ApiOperation("医养物联网检测大屏失联率")
    public String deviceLostAssociationJob() {
        try {
            quartzHelper.startNow(DeviceLostAssociationJob.class, null, null);
            return write(200, "启动成功");
        } catch (Exception e) {
            error(e);
            return error(-1, e.getMessage());
        }
    }
    @Autowired
    public JobController(JobService jobService, QuartzHelper quartzHelper) {
        this.jobService = jobService;

svr/svr-cloud-job/src/main/resources/system.properties

@@ -1,18 +1,21 @@
#居民24小时未回复的咨询自动关闭 每小时59分开始执行一次
#\u5C45\u6C1124\u5C0F\u65F6\u672A\u56DE\u590D\u7684\u54A8\u8BE2\u81EA\u52A8\u5173\u95ED \u6BCF\u5C0F\u65F659\u5206\u5F00\u59CB\u6267\u884C\u4E00\u6B21
finish_consult_job=0 59 * * * ?
#每天的早上9:00，给所有医生/助老员/教师发送一条短信
#\u6BCF\u5929\u7684\u65E9\u4E0A9:00\uFF0C\u7ED9\u6240\u6709\u533B\u751F/\u52A9\u8001\u5458/\u6559\u5E08\u53D1\u9001\u4E00\u6761\u77ED\u4FE1
DOCTOR_SEND_UNREAD_MES_JOB=0 0 9 * * ?
#每天的早上9:00，给所有居民发送未读消息微信模板
#\u6BCF\u5929\u7684\u65E9\u4E0A9:00\uFF0C\u7ED9\u6240\u6709\u5C45\u6C11\u53D1\u9001\u672A\u8BFB\u6D88\u606F\u5FAE\u4FE1\u6A21\u677F
PATIENT_SEND_UNREAD_MES_JOB=0 0 9 * * ?
#每天的早上9:00，生日祝福提醒短信
#\u6BCF\u5929\u7684\u65E9\u4E0A9:00\uFF0C\u751F\u65E5\u795D\u798F\u63D0\u9192\u77ED\u4FE1
BIRTHDAY_REMINDER_JOB=0 0 9 * * ?
#取消订单支付超时的订单，每3分钟执行一次
#\u53D6\u6D88\u8BA2\u5355\u652F\u4ED8\u8D85\u65F6\u7684\u8BA2\u5355\uFF0C\u6BCF3\u5206\u949F\u6267\u884C\u4E00\u6B21
CANCEL_PAY_ORDER_OVERTIME_JOB=0 0/3 * * * ?
#居民紧急联系人数据同步更新每2分钟执行一次
PATIENT_SOS_CONTACTS_JOB=0 0/2 * * * ?
#\u5C45\u6C11\u7D27\u6025\u8054\u7CFB\u4EBA\u6570\u636E\u540C\u6B65\u66F4\u65B0\u6BCF2\u5206\u949F\u6267\u884C\u4E00\u6B21
PATIENT_SOS_CONTACTS_JOB=0 0/2 * * * ?
#\u533B\u517B\u7269\u8054\u7F51\u68C0\u6D4B\u5927\u5C4F\u5931\u8054\u7387
DEVICE_LOST_ASSOCIATION_JOB=0 30 23 * * ?

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/config/MvcConfig.java

@@ -0,0 +1,47 @@
package com.yihu.jw.hospital.config;
import com.yihu.jw.hospital.interceptor.CrosXssFilter;
import com.yihu.jw.hospital.interceptor.GateWayInterceptor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
/**
 * Created by chenweida on 2017/4/6.
 */
@Configuration
public class MvcConfig extends WebMvcConfigurerAdapter {
    private Logger logger = LoggerFactory.getLogger(MvcConfig.class);
    @Autowired
    private GateWayInterceptor gateWayInterceptor;
    @Override
    public void addInterceptors(InterceptorRegistry registry) {
        // 多个拦截器组成一个拦截器链
        // addPathPatterns 用于添加拦截规则
//         excludePathPatterns 用户排除拦截 ,/third/juye/kit/**
        registry.addInterceptor(gateWayInterceptor).addPathPatterns("/open/gc/**").excludePathPatterns(
                "/open/gc/accesstoken",
                "/open/gc/createGcClientDetails");
        super.addInterceptors(registry);
        logger.info("init gateWayInterceptor");
    }
    @Bean
    public FilterRegistrationBean testFilterRegistration() {
        FilterRegistrationBean registration = new FilterRegistrationBean();
        registration.setFilter(new CrosXssFilter());
        registration.addUrlPatterns("/*");
        registration.setName("CrosXssFilter");
        registration.setOrder(1);
        return registration;
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/gateway/GcTokenController.java

@@ -12,6 +12,7 @@ import com.yihu.jw.hospital.endpoint.gateway.model.BaseResultModel;
import com.yihu.jw.hospital.endpoint.gateway.model.GcClientDetailsModel;
import com.yihu.jw.hospital.endpoint.gateway.model.GcTokenModel;
import com.yihu.jw.hospital.endpoint.gateway.model.ResultOneModel;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import com.yihu.jw.rm.iot.IotRequestMapping;
import com.yihu.jw.util.common.IpUtil;
import io.swagger.annotations.Api;
@@ -38,7 +39,7 @@ import java.util.List;
 * 对外的网关
 */
@Controller
@RequestMapping(value = IotRequestMapping.Common.openThird, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@RequestMapping(value = BaseHospitalRequestMapping.UpWebTherapySupserviceInfo.PREFIX, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@ResponseBody
@Api(description = "token相关服务")
public class GcTokenController {
@@ -50,6 +51,8 @@ public class GcTokenController {
    private GcHttpLogDao httpLogDao;
    @Value("${interceptor.accesstoken.time}")
    private Integer tokenTime;
    @Value("${wechat.id}")
    private String wxId;
    @ApiOperation("获取accesstoken")
    @RequestMapping(value = "accesstoken", method = RequestMethod.POST, produces = "application/json;charset=UTF-8")
@@ -63,7 +66,7 @@ public class GcTokenController {
            ip = IpUtil.getIpAddress(request);
            //查询appId 的token是否过期
            GcToken gcToken = new GcToken();
            List<GcToken> gcTokenList = gcTokenService.findByAppId(appid);
            List<GcToken> gcTokenList = gcTokenService.findByAppId(appid,wxId);
            if(gcTokenList == null || gcTokenList.size() == 0){
                //得到用户
                GcClientDetails clientDetails = clientDetailsService.findByAppId(appid);
@@ -94,9 +97,11 @@ public class GcTokenController {
            }
            GcTokenModel gcTokenModel = new GcTokenModel();
            BeanUtils.copyProperties(gcToken, gcTokenModel);
            System.out.print("token"+gcToken.getOutTime());
            gcTokenModel.setOutTime(gcToken.getOutTime().getTime());
            return new ResultOneModel(gcTokenModel);
        } catch (Exception e) {
            e.printStackTrace();
            saveHttpLog(ip, new JSONObject(request.getParameterMap()).toString(), "", "", request.getRequestURI(), 0, BaseResultModel.statusEm.login_system_error.getMessage());
            return new ResultOneModel(BaseResultModel.statusEm.login_system_error.getCode(), BaseResultModel.statusEm.login_system_error.getMessage());
        }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/interceptor/CrosXssFilter.java

@@ -0,0 +1,38 @@
package com.yihu.jw.hospital.interceptor;
import com.alibaba.fastjson.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
/**
 * Created by yeshijie on 2020/9/2.
 */
//@WebFilter(filterName = "CrosXssFilter", urlPatterns = { "/*" })
public class CrosXssFilter implements Filter {
    private static final Logger logger = LoggerFactory.getLogger(CrosXssFilter.class);
    @Override
    public void init(FilterConfig filterConfig) throws ServletException {
    }
    @Override
    public void doFilter(ServletRequest request, ServletResponse response,
                         FilterChain chain) throws IOException, ServletException {
        request.setCharacterEncoding("utf-8");
        response.setContentType("text/html;charset=utf-8");
        //sql,xss过滤
        HttpServletRequest httpServletRequest=(HttpServletRequest)request;
        logger.info("CrosXssFilter.......orignal url:{},ParameterMap:{}",httpServletRequest.getRequestURI(), JSONObject.toJSONString(httpServletRequest.getParameterMap()));
        XssHttpServletRequestWrapper xssHttpServletRequestWrapper=new XssHttpServletRequestWrapper(
                httpServletRequest);
        chain.doFilter(xssHttpServletRequestWrapper, response);
        logger.info("CrosXssFilter..........doFilter url:{},ParameterMap:{}",xssHttpServletRequestWrapper.getRequestURI(), JSONObject.toJSONString(xssHttpServletRequestWrapper.getParameterMap()));
    }
    @Override
    public void destroy() {
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/interceptor/GateWayInterceptor.java

@@ -0,0 +1,164 @@
package com.yihu.jw.hospital.interceptor;
/**
 * Created by chenweida on 2017/8/17.
 */
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.entity.iot.gateway.GcHttpLog;
import com.yihu.jw.entity.iot.gateway.GcToken;
import com.yihu.jw.gateway.dao.GcHttpLogDao;
import com.yihu.jw.gateway.dao.GcTokenDao;
import com.yihu.jw.hospital.endpoint.gateway.model.BaseResultModel;
import com.yihu.jw.util.common.IpUtil;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Date;
/**
 * 对外的请求拦截
 */
@Component
public class GateWayInterceptor implements HandlerInterceptor {
    private Logger logger = LoggerFactory.getLogger(GateWayInterceptor.class);
    @Autowired
    private GcTokenDao gcTokenDaoDao;
    public static String status = "1";
    @Autowired
    private GcHttpLogDao httpLogDao;
    /**
     * preHandle：预处理回调方法
     *
     * @param request
     * @param response
     * @param handler
     * @return
     * @throws Exception
     */
    @Override
    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
        boolean flag = true;
        String accesstoken = request.getHeader("accesstoken");
        String ip = IpUtil.getIpAddress(request);
        //********************************判断accesstoken********************************
        try {
            if (org.springframework.util.StringUtils.isEmpty(accesstoken)) {
                saveHttpLog(ip, JSONObject.toJSONString(request.getParameterMap()), null, accesstoken, request.getRequestURI(), GcHttpLog.flagEm.error.getCode(), BaseResultModel.statusEm.token_null.getMessage());
                //没权限
                BaseResultModel baseResultModel = new BaseResultModel(BaseResultModel.statusEm.token_null.getCode(), BaseResultModel.statusEm.token_null.getMessage());
                response.getOutputStream().write(JSONObject.toJSONString(baseResultModel).getBytes());
                flag = false;
            }
            GcToken gcToken = gcTokenDaoDao.findByToken(accesstoken);
            if (gcToken == null) {
                saveHttpLog(ip, JSONObject.toJSONString(request.getParameterMap()), null, accesstoken, request.getRequestURI(), GcHttpLog.flagEm.error.getCode(), BaseResultModel.statusEm.token_no_power.getMessage());
                //没权限
                BaseResultModel baseResultModel = new BaseResultModel(BaseResultModel.statusEm.token_no_power.getCode(), BaseResultModel.statusEm.token_no_power.getMessage());
                response.getOutputStream().write(JSONObject.toJSONString(baseResultModel).getBytes());
                flag = false;
            }
            if (gcToken.getDel() == null || gcToken.getDel() == 0) {
                saveHttpLog(ip, JSONObject.toJSONString(request.getParameterMap()), null, accesstoken, request.getRequestURI(), GcHttpLog.flagEm.error.getCode(), BaseResultModel.statusEm.token_out_effect.getMessage());
                //token无效
                BaseResultModel baseResultModel = new BaseResultModel(BaseResultModel.statusEm.token_out_effect.getCode(), BaseResultModel.statusEm.token_out_effect.getMessage());
                response.getOutputStream().write(JSONObject.toJSONString(baseResultModel).getBytes());
                flag = false;
            }
            if (System.currentTimeMillis() > gcToken.getOutTime().getTime()) {
                saveHttpLog(ip, JSONObject.toJSONString(request.getParameterMap()), null, accesstoken, request.getRequestURI(), GcHttpLog.flagEm.error.getCode(), BaseResultModel.statusEm.token_out_time.getMessage());
                //token过期
                BaseResultModel baseResultModel = new BaseResultModel(BaseResultModel.statusEm.token_out_time.getCode(), BaseResultModel.statusEm.token_out_time.getMessage());
                response.getOutputStream().write(JSONObject.toJSONString(baseResultModel).getBytes());
                flag = false;
            }
        } catch (Exception e) {
            saveHttpLog(ip, JSONObject.toJSONString(request.getParameterMap()), null, accesstoken, request.getRequestURI(), GcHttpLog.flagEm.error.getCode(), e.getMessage());
            return false;
        }
        //********************************判断accesstoken********************************
        return flag;
    }
    /**
     * 后处理回调方法
     *
     * @param request
     * @param response
     * @param handler
     * @param modelAndView
     * @throws Exception
     */
    @Override
    public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
        String output = "";
        if (modelAndView != null) {
            output = JSONObject.toJSONString(modelAndView.getModelMap());
        } else {
            Object returnObj = request.getAttribute("returnObj");
            if (returnObj != null) {
                output = JSONObject.toJSONString(returnObj);
            }
        }
        HandlerMethod handlerMethod = (HandlerMethod) handler;
//        response.getOutputStream()
        String token = request.getHeader("accesstoken");
        String ip = IpUtil.getIpAddress(request);
        saveHttpLog(ip,
                JSONObject.toJSONString(request.getParameterMap()),
                output,
                token,
                request.getRequestURI(),
                GcHttpLog.flagEm.success.getCode(),
                null);
    }
    /**
     * 整个请求处理完毕回调方法
     *
     * @param request
     * @param response
     * @param handler
     * @param ex
     * @throws Exception
     */
    @Override
    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
    }
    public void saveHttpLog(String ip, String input, String output, String token, String method, Integer flag, String message) {
        GcHttpLog gcHttpLog = new GcHttpLog();
        gcHttpLog.setCreateTime(new Date());
        gcHttpLog.setIp(ip);
        gcHttpLog.setInput(input);
        if(StringUtils.isNotEmpty(output)&&output.length() > 3000) {
            output = output.substring(0, 3000);
        }
        gcHttpLog.setOutput(output);
        gcHttpLog.setToken(token);
        gcHttpLog.setMethod(method);
        gcHttpLog.setFlag(flag);
        gcHttpLog.setMessage(message);
        httpLogDao.save(gcHttpLog);
    }
    public String getStatus() {
        return status;
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/interceptor/XssHttpServletRequestWrapper.java

@@ -0,0 +1,120 @@
package com.yihu.jw.hospital.interceptor;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
/**
 * Created by yeshijie on 2020/9/1.
 */
public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper {
    private final Logger log = LoggerFactory.getLogger(getClass());
    private static String key = "select|update|and|or|delete|insert|trancate|char|into|substr|ascii|declare|exec|count|master|into|drop|execute|*|%";
    private static Set<String> notAllowedKeyWords = new HashSet<String>(0);
    private static String replacedString="INVALID";
    static {
        String keyStr[] = key.split("\\|");
        for (String str : keyStr) {
            notAllowedKeyWords.add(str);
        }
    }
    private String currentUrl;
    public XssHttpServletRequestWrapper(HttpServletRequest servletRequest) {
        super(servletRequest);
        currentUrl = servletRequest.getRequestURI();
    }
    /**覆盖getParameter方法，将参数名和参数值都做xss过滤。
     * 如果需要获得原始的值，则通过super.getParameterValues(name)来获取
     * getParameterNames,getParameterValues和getParameterMap也可能需要覆盖
     */
    @Override
    public String getParameter(String parameter) {
        String value = super.getParameter(parameter);
        if (value == null) {
            return null;
        }
        return cleanXSS(value);
    }
    @Override
    public String[] getParameterValues(String parameter) {
        String[] values = super.getParameterValues(parameter);
        if (values == null) {
            return null;
        }
        int count = values.length;
        String[] encodedValues = new String[count];
        for (int i = 0; i < count; i++) {
            encodedValues[i] = cleanXSS(values[i]);
        }
        return encodedValues;
    }
    @Override
    public Map<String, String[]> getParameterMap(){
        Map<String, String[]> values=super.getParameterMap();
        if (values == null) {
            return null;
        }
        Map<String, String[]> result=new HashMap<>();
        for(String key:values.keySet()){
            String encodedKey=cleanXSS(key);
            int count=values.get(key).length;
            String[] encodedValues = new String[count];
            for (int i = 0; i < count; i++){
                encodedValues[i]=cleanXSS(values.get(key)[i]);
            }
            result.put(encodedKey,encodedValues);
        }
        return result;
    }
    /**
     * 覆盖getHeader方法，将参数名和参数值都做xss过滤。
     * 如果需要获得原始的值，则通过super.getHeaders(name)来获取
     * getHeaderNames 也可能需要覆盖
     */
    @Override
    public String getHeader(String name) {
//        String value = super.getHeader(name);
//        if (value == null) {
//            return null;
//        }
//        return cleanXSS(value);
        return super.getHeader(name);
    }
    private String cleanXSS(String valueP) {
        // You'll need to remove the spaces from the html entities below
        String value = valueP.replaceAll("<", "&lt;").replaceAll(">", "&gt;");
        value = value.replaceAll("<", "& lt;").replaceAll(">", "& gt;");
        value = value.replaceAll("\\(", "& #40;").replaceAll("\\)", "& #41;");
        value = value.replaceAll("'", "& #39;");
        value = value.replaceAll("eval\\((.*)\\)", "");
        value = value.replaceAll("[\\\"\\\'][\\s]*javascript:(.*)[\\\"\\\']", "\"\"");
        value = value.replaceAll("script", "");
        value = cleanSqlKeyWords(value);
        return value;
    }
    private String cleanSqlKeyWords(String value) {
        String paramValue = value;
        for (String keyword : notAllowedKeyWords) {
            if (paramValue.length() > keyword.length() + 4
                    && (paramValue.contains(" "+keyword)||paramValue.contains(keyword+" ")||paramValue.contains(" "+keyword+" "))) {
                paramValue = StringUtils.replace(paramValue, keyword, replacedString);
                log.error(this.currentUrl + "已被过滤，因为参数中包含不允许sql的关键词(" + keyword
                        + ")"+";参数："+value+";过滤后的参数："+paramValue);
            }
        }
        return paramValue;
    }
}