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

business/base-service/src/main/java/com/yihu/jw/file_upload/FileUploadService.java

@@ -151,7 +151,7 @@ public class FileUploadService {
            throw new FastfdsFileURLEmptyException("fastdfs url不可为空!");
        }
        //得到文件类型
        //得到文件类型sentitiveLog.txt
        String fileType = originalFileName.substring(originalFileName.lastIndexOf(".") + 1).toLowerCase();
        String fileName = originalFileName.substring(0, originalFileName.lastIndexOf("."));
        //上传到fastdfs
@@ -165,6 +165,10 @@ public class FileUploadService {
        return uploadVO;
    }
    public static void main(String[] args) {
        String s ="sentitiveLog.txt";
        System.out.println(s.substring(s.lastIndexOf(".") + 1).toLowerCase());
    }
    /**
     * i健康调用文件传输
     * @param multipartFile

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

@@ -2642,7 +2642,7 @@ public class ImService {
			// 设置患者信息
			ct.setPatient(outpatient.getPatient());
			ct.setSymptoms(outpatient.getDescription());
			
			// 设置患者姓名
			ct.setName(p.getName());
			// 设置患者生日
@@ -2659,7 +2659,7 @@ public class ImService {
			// 医生未读数量为1
			ct.setDoctorRead(1);
			ct.setCzrq(outpatient.getAdmDate());
			
			ConsultDo consult = new ConsultDo();
			consult.setId(UUID.randomUUID().toString().replaceAll("-", ""));
			consult.setCzrq(new Date());

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

@@ -57,6 +57,10 @@ public class IotEquipmentDetailDO extends UuidIdentityEntityWithOperator {
     *地址
     */
    private String localAdd;
    /*
     *所属区域code
     */
    private String belongAreCode;
    /*
     *所属区域
     */
@@ -70,6 +74,14 @@ public class IotEquipmentDetailDO extends UuidIdentityEntityWithOperator {
     */
    private String latitude;
    public String getBelongAreCode() {
        return belongAreCode;
    }
    public void setBelongAreCode(String belongAreCode) {
        this.belongAreCode = belongAreCode;
    }
    public String getLongitude() {
        return longitude;
    }

svr/svr-base/src/main/java/com/yihu/jw/base/service/word/BaseSensitiveService.java

@@ -190,7 +190,7 @@ public class BaseSensitiveService extends BaseJpaService<BaseSensitiveDO, BaseSe
        }
        byte[] bytes = text.toString().getBytes();
        InputStream in = new ByteArrayInputStream(bytes);
        UploadVO uploadVO = fileUploadService.uploadStream(in, "sentitiveLog.xls", path);
        UploadVO uploadVO = fileUploadService.uploadStream(in, "sentitiveLog.txt", path);
        return uploadVO.getFullUri();
    }

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

@@ -39,6 +39,7 @@ public class IotEqtDetailService  extends BaseJpaService<IotEquipmentDetailDO, I
            iotEquipmentDetailDO1.setRepresentative(iotEquipmentDetailDO.getRepresentative());
            iotEquipmentDetailDO1.setLatitude(iotEquipmentDetailDO.getLatitude());
            iotEquipmentDetailDO1.setLongitude(iotEquipmentDetailDO.getLongitude());
            iotEquipmentDetailDO1.setBelongAreCode(iotEquipmentDetailDO.getBelongAreCode());
            iotEquipmentDetailDao.save(iotEquipmentDetailDO1);
        }