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

svr/svr-iot/src/main/java/com/yihu/iot/datainput/service/DataInputService.java

@@ -137,6 +137,10 @@ public class DataInputService {
        if(StringUtils.isBlank(deviceSn)){
            throw new ServiceException("设备编码不能为空");
        }
        String hospital = jsonObject.getString("hospital");
        if(StringUtils.isBlank(hospital)){
            throw new ServiceException("医院编码不能为空");
        }
        IotDeviceDO iotDeviceDO = iotDeviceService.findByDeviceSn(deviceSn);
        if(iotDeviceDO==null){
            throw new ServiceException("请先注册设备后在上传");
@@ -144,6 +148,7 @@ public class DataInputService {
        try {
            IotDeviceUploadRecordDO recordDO = new IotDeviceUploadRecordDO();
            recordDO.setDeviceSn(deviceSn);
            recordDO.setHospital(hospital);
            recordDO.setJsonData(json);
            recordDO.setCategoryCode("uploadDeviceInfo");
            recordDO.setStatus(0);

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/service/ActivityService.java

@@ -85,6 +85,11 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
            }
        }
        String des = activityDO.getDescription();
        if(StringUtils.isNotBlank(des)){
            des = des.replaceAll("&lt;", "<").replaceAll("&gt;", ">");
            activityDO.setDescription(des);
        }
        activityDO.setCreateTime(new Date());
        activityDO.setUpdateTime(new Date());
        activityDO.setDelFlag(1);