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

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/third/device/PDeviceController.java

@@ -216,4 +216,47 @@ public class PDeviceController extends BaseController {
            return errorResult(e);
        }
    }
    @ApiOperation("获取视频地址信息(录像获取，直播地址另一个接口)")
    @RequestMapping(value = "videoList2", produces = "application/x-www-form-urlencoded;charset=UTF-8", method = {RequestMethod.POST,RequestMethod.GET})
    public String videoUpload(
            @ApiParam(name="patient")
            @RequestParam(value = "patient",required = false)String patient,
            @ApiParam(name="deviceSerial",required = false,value="设备序列号")
            @RequestParam(value = "deviceSerial",required = false) String deviceSerial,
            @ApiParam(name="channelNo",required = false,value="设备通道号，默认为1")
            @RequestParam(value = "channelNo",required = false,defaultValue = "1") Integer channelNo,
            @ApiParam(name="code",required = false,value="ezopen协议地址的设备的视频加密密码")
            @RequestParam(value = "code",required = false) String code,
            @ApiParam(name="expireTime",required = false,value="过期时长，单位秒；针对hls/rtmp设置有效期，相对时间；30秒-7天")
            @RequestParam(value = "expireTime",required = false) Integer expireTime,
            @ApiParam(name="protocol",required = false,value="流播放协议，1-ezopen、2-hls、3-rtmp、4-flv")
            @RequestParam(value = "protocol",required = false,defaultValue = "4") Integer protocol,
            @ApiParam(name="quality",required = false,value="视频清晰度，1-高清（主码流）、2-流畅（子码流）")
            @RequestParam(value = "quality",required = false) Integer quality,
            @ApiParam(name="startTime",required = false,value="ezopen协议地址的本地录像/云存储录像回放开始时间 2019-12-01 00:00:00")
            @RequestParam(value = "startTime",required = false) String startTime,
            @ApiParam(name="stopTime",required = false,value="ezopen协议地址的本地录像/云存储录像回放开始时间,示例：2019-12-01 00:00:00")
            @RequestParam(value = "stopTime",required = false) String stopTime,
            @ApiParam(name="type",required = false,value="ezopen协议地址的类型，1-预览，2-本地录像回放，3-云存储录像回放，非必选，默认为1")
            @RequestParam(value = "type",required = false) String type,
            @ApiParam(name="supportH265",required = false,value="是否要求视频为H265编码格式")
            @RequestParam(value = "supportH265",required = false) Integer supportH265,
            @ApiParam(name="gbchannel",required = false,value="国标设备的通道编号")
            @RequestParam(value = "gbchannel",required = false) String gbchannel,
            HttpServletRequest request
    ){
        try {
            if (StringUtils.isBlank(patient)&&StringUtils.isBlank(deviceSerial)){
                return error(-1,"参数错误");
            }
            JSONObject result = ysDeviceService.videoList2(patient,deviceSerial,channelNo,code,expireTime,protocol,quality,startTime,stopTime,type,supportH265,gbchannel,request);
            if (result.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail){
                return error(200,result.getString(ResponseContant.resultMsg));
            }
            return write(200,"查询成功","data",result.getJSONObject(ResponseContant.resultMsg));
        }catch (Exception e){
            return errorResult(e);
        }
    }
}

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

@@ -61,6 +61,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
@@ -69,6 +70,7 @@ import java.util.*;
 * Created by Bing on 2021/4/12.
 */
@Service
@Transactional(rollbackFor = Exception.class)
public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistanceDO, EmergencyAssistanceDao> {
    @Autowired
    private EmergencyAssistanceDao emergencyAssistanceDao;

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

@@ -456,7 +456,12 @@ public class YsDeviceService {
            tmp.sort(Comparator.comparing(obj -> Long.parseLong(((LinkedHashMap) obj).get("startTime").toString())));
            LinkedHashMap tmpFirst = tmp.getObject(0,LinkedHashMap.class);
            Long startTimeStr1 =  Long.parseLong(tmpFirst.get("startTime").toString()) ;
            long current = System.currentTimeMillis();
            long current = 0;
            if (StringUtils.isNotBlank(startTime)){
                current = DateUtil.strToDate(startTime).getTime();
            }else {
                current = System.currentTimeMillis();
            }
            long toDayZero = current/(1000*3600*24)*(1000*3600*24) - TimeZone.getDefault().getRawOffset();
            if (toDayZero-startTimeStr1>0){//去除开始时间不为当天是时间段
                tmp.remove(0);

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

@@ -66,6 +66,7 @@ import java.util.concurrent.TimeUnit;
 * Created by Bing on 2021/4/6.
 */
@Service
@Transactional(rollbackFor = Exception.class)
public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonitoringOrderDO, SecurityMonitoringOrderDao> {
    @Autowired

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/util/DeviceLostMessageUtil.java

@@ -43,7 +43,7 @@ public class DeviceLostMessageUtil {
                DevicePatientDevice deviceDO = pds.get(0);
                String sql = "SELECT DISTINCT d.id,d.name from base_service_package_sign_record sr,base_service_package_record r,base_team_member m,base_doctor d  " +
                        "               WHERE sr.status=1 and m.team_code = r.team_code and sr.id=r.sign_id and m.doctor_code = d.id " +
                        "               and m.del = '1' and sr.patient = '"+deviceDO.getUser()+"' " ;
                        "               and m.del = '1' and sr.patient = '"+deviceDO.getUser()+"' and d.doctor_level=2 " ;
                List<Map<String,Object>> doctors = jdbcTemplate.queryForList(sql);
                        String deviceName="";
                for (Map<String,Object> docTmp:doctors){