Merge branch 'dev' of yeshijie/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/assistance/EmergencyAssistanceEndpoint.java

@@ -301,6 +301,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
    @PostMapping("errorWarning")
    @ApiOperation(value = "误报警")
    @ObserverRequired
    public ObjEnvelop errorWarning(@ApiParam(value = "工单id", name = "orderId", required = true)
                                   @RequestParam(value = "orderId") String orderId,
                                   @ApiParam(value = "误报警类型 字典emergency_cancel的code", name = "emergencyCancel", required = true)
@@ -318,6 +319,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
    @PostMapping("doctorSendMessageLog")
    @ApiOperation(value = "助老员紧急预警im发送消息日志")
    @ObserverRequired
    public ObjEnvelop doctorSendMessageLog(
            @ApiParam(name="doctor")@RequestParam(value = "doctor")String doctor,
            @ApiParam(name="type",value = "im会话对应type")@RequestParam(value = "type")String type,

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/consult/DoctorConsultController.java

@@ -32,7 +32,6 @@ public class DoctorConsultController extends EnvelopRestEndpoint {
     */
    @ApiOperation("结束咨询接口")
    @RequestMapping(value = "finish_consult",method = {RequestMethod.GET,RequestMethod.POST})
    @ResponseBody
    @ObserverRequired
    public Envelop finishConsult(@RequestParam(required = false) String consult) {
        try {

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/consult/DoctorConsultEndpoint.java

@@ -1,6 +1,7 @@
package com.yihu.jw.care.endpoint.consult;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.care.aop.ObserverRequired;
import com.yihu.jw.care.service.consult.ConsultService;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
@@ -42,6 +43,7 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
    @PostMapping(value = "finish")
    @ApiOperation(value = "医生结束咨询", notes = "医生结束咨询")
    @ObserverRequired
    public Envelop finish(
            @ApiParam(name = "consult", value = "咨询CODE")
            @RequestParam(value = "consult",required = true) String consult,

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

@@ -2,6 +2,7 @@ package com.yihu.jw.care.endpoint.device;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.care.aop.ObserverRequired;
import com.yihu.jw.care.dao.device.PatientDeviceDao;
import com.yihu.jw.care.endpoint.BaseController;
import com.yihu.jw.care.service.contacts.ContactsService;
@@ -124,6 +125,7 @@ public class DoctorDeviceController extends BaseController {
	@RequestMapping(value ="updatePatientSosContacts",method = RequestMethod.POST)
	@ApiOperation(value = "设置居民紧急联系人")
	@ObserverRequired
	public String updatePatientSosContacts(@ApiParam(name = "patient", value = "patient", defaultValue = "patient")
										   @RequestParam(value = "patient", required = true) String patient,
										   @ApiParam(name="num",value = "成员配置的语音白名单号码 新增时只能传一个，删除时最多两个,用下划线隔开")

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

@@ -1,6 +1,7 @@
package com.yihu.jw.care.endpoint.device;
import com.yihu.jw.care.aop.ObserverRequired;
import com.yihu.jw.care.endpoint.BaseController;
import com.yihu.jw.care.service.device.PatientHealthIndexService;
import com.yihu.jw.entity.care.device.DevicePatientHealthIndex;
@@ -337,6 +338,7 @@ public class DoctorHealthController extends BaseController {
	@RequestMapping(value = "handleHealthIndex",method = RequestMethod.POST)
	@ApiOperation("医生体征干预")
	@ObserverRequired
	public String handleHealthIndex(@ApiParam(name="user")@RequestParam(value = "user")String ids) {
		try {
			healthIndexService.handleHealthIndex(ids);

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/doctor/DoctorBirthdayWishesEndpoint.java

@@ -2,6 +2,7 @@ package com.yihu.jw.care.endpoint.doctor;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.yihu.jw.care.aop.ObserverRequired;
import com.yihu.jw.care.endpoint.BaseController;
import com.yihu.jw.care.service.birthday.BirthdayWishesService;
import com.yihu.jw.care.util.MessageUtil;
@@ -52,6 +53,7 @@ public class DoctorBirthdayWishesEndpoint extends BaseController {
    @RequestMapping(value = "/createTemplate", method = RequestMethod.POST)
    @ApiOperation(value = "创建模板")
    @ObserverRequired
    public String createTemplate(@ApiParam(name = "content", value = "医生新建的祝福语")
                                 @RequestParam(required = false) String content,
                                 @ApiParam(name = "applicableRange", value = "适用人群")
@@ -94,6 +96,7 @@ public class DoctorBirthdayWishesEndpoint extends BaseController {
    @RequestMapping(value = "/deleteTemplateById", method = RequestMethod.POST)
    @ApiOperation(value = "根据模板id删除祝福模板")
    @ObserverRequired
    public String deleteTemplateById(@ApiParam(name = "id", value = "模板id")
                                     @RequestParam(required = true) Long id) {
        try {
@@ -106,6 +109,7 @@ public class DoctorBirthdayWishesEndpoint extends BaseController {
    @RequestMapping(value = "/setDefalutTemplateById", method = RequestMethod.POST)
    @ApiOperation(value = "设置默认模板")
    @ObserverRequired
    public String setDefalutTemplateById(
            @ApiParam(name = "id", value = "模板ID",required = true)
            @RequestParam Long id) {
@@ -171,6 +175,7 @@ public class DoctorBirthdayWishesEndpoint extends BaseController {
    @RequestMapping(value = "/doctorSendBirthdayWishes", method = RequestMethod.POST)
    @ApiOperation(value = "医生发送生日祝福")
    @ObserverRequired
    public String pushBirthdayWishes(@ApiParam(name = "patient", value = "发送人群集合")
                                     @RequestParam(required = true) String patient,
                                     @ApiParam(name = "templateId", value = "生日祝福模板id")

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/doctor/DoctorEndpoint.java

@@ -45,6 +45,7 @@ public class DoctorEndpoint extends EnvelopRestEndpoint {
    @PostMapping(value = "updOnline")
    @ApiOperation(value = "更新在线状态")
    @ObserverRequired
    public Envelop updOnline(@ApiParam(name = "doctorId", value = "医生id", required = true)
                                 @RequestParam(value = "doctorId",required = true) String doctorId,
                             @ApiParam(name = "online", value = "在线状态 1在线 0离线")

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/doctor/DoctorServiceEndPoint.java

@@ -1,5 +1,6 @@
package com.yihu.jw.care.endpoint.doctor;
import com.yihu.jw.care.aop.ObserverRequired;
import com.yihu.jw.doctor.service.BaseDoctorInfoService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
@@ -79,6 +80,7 @@ public class DoctorServiceEndPoint extends EnvelopRestEndpoint {
    @PostMapping(value = BaseHospitalRequestMapping.DoctorSetting.update)
    @ApiOperation(value = "修改医生服务配置")
    @ObserverRequired
    public Envelop update(
            @ApiParam(name = "baseDoctorVo", value = "JSON数据", required = true)
            @RequestParam(value = "baseDoctorVo") String baseDoctorVo)throws Exception{
@@ -97,6 +99,7 @@ public class DoctorServiceEndPoint extends EnvelopRestEndpoint {
    @PostMapping(value = BaseHospitalRequestMapping.DoctorSetting.updateList)
    @ApiOperation(value = "批量修改医生服务配置")
    @ObserverRequired
    public Envelop updateList(
            @ApiParam(name = "baseDoctorVos", value = "JSON数据", required = true)
            @RequestParam(value = "baseDoctorVos") String baseDoctorVos)throws Exception{
@@ -113,6 +116,7 @@ public class DoctorServiceEndPoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseHospitalRequestMapping.DoctorSetting.updateStatus)
    @ApiOperation(value = "修改医生状态")
    @ObserverRequired
    public Envelop updateStatus(
            @ApiParam(name = "doctorId", value = "状态")
            @RequestParam(value = "doctorId", required = true) String doctorId,
@@ -125,6 +129,7 @@ public class DoctorServiceEndPoint extends EnvelopRestEndpoint {
    @PostMapping(value = BaseHospitalRequestMapping.DoctorSetting.updateDoctorPw)
    @ApiOperation(value = "修改医生账号密码")
    @ObserverRequired
    public Envelop updateDoctorPw(@ApiParam(name = "id", value = "医生ID")
                                  @RequestParam(value = "id", required = true)String id,
                                  @ApiParam(name = "pw", value = "密码")

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/doorCoach/DoctorDoorCoachOrderController.java

@@ -3,6 +3,7 @@ package com.yihu.jw.care.endpoint.doorCoach;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.care.aop.ObserverRequired;
import com.yihu.jw.care.endpoint.BaseController;
import com.yihu.jw.care.service.consult.ConsultTeamService;
@@ -50,6 +51,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping(value = "proxyCreate")
    @ApiOperation(value = "创建上门预约咨询--医生代预约")
    @ObserverRequired
    public String create(@ApiParam(name = "jsonData", value = "Json数据", required = true) @RequestParam String jsonData) {
        try{
            JSONObject result = patientDoorCoachOrderService.proxyCreate(jsonData,getUID());
@@ -102,6 +104,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping(value = "sendOrderToDoctor")
    @ApiOperation(value = "调度员给医生派单")
    @ObserverRequired
    public String sendOrderToDoctor(
            @ApiParam(name = "orderId", value = "工单id") @RequestParam(value = "orderId", required = true) String orderId,
            @ApiParam(name = "remark", value = "调度员备注") @RequestParam(value = "remark", required = false) String remark,
@@ -123,6 +126,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping(value = "transferOrder")
    @ApiOperation(value = "医生转派单")
    @ObserverRequired
    public String transferOrder(
            @ApiParam(name = "orderId", value = "工单id") @RequestParam(value = "orderId", required = true) String orderId,
            @ApiParam(name = "remark", value = "当前医生备注") @RequestParam(value = "remark", required = false) String remark,
@@ -144,6 +148,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping("acceptOrder")
    @ApiOperation(value = "接单")
    @ObserverRequired
    public String acceptOrder(
            @ApiParam(value = "工单id", name = "orderId", required = true) @RequestParam(value = "orderId", required = true) String orderId,
            @ApiParam(value = "医生职称code", name = "jobCode", required = false) @RequestParam(value = "jobCode", required = false) String jobCode,
@@ -159,6 +164,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping("refuse")
    @ApiOperation(value = "拒单")
    @ObserverRequired
    public String refuseOrder(
            @ApiParam(value = "工单id", name = "orderId", required = true)
            @RequestParam(value = "orderId", required = true) String orderId,
@@ -174,6 +180,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping(value = "cancelOrder")
    @ApiOperation(value = "取消工单")
    @ObserverRequired
    public String cancelOrder(
            @ApiParam(name = "orderId", value = "工单id") @RequestParam(value = "orderId", required = true) String orderId,
            @ApiParam(name = "type", value = "取消类型：1-调度员主动取消，2-居民取消, 3-医生取消") @RequestParam(value = "type", required = true) int type,
@@ -194,6 +201,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping("signIn")
    @ApiOperation(value = "上门预约签到")
    @ObserverRequired
    public String signIn(
            @ApiParam(value = "工单id", name = "orderId")
            @RequestParam(value = "orderId", required = true) String orderId,
@@ -221,6 +229,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping("updateDoorConclusion")
    @ApiOperation("编辑保存服务工单小结")
    @ObserverRequired
    public String updateDoorConclusion(
            @ApiParam(value = "工单id", name = "orderId",required = true)
            @RequestParam(value = "orderId", required = true) String orderId,
@@ -264,6 +273,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping("saveOrderFinishByDoctor")
    @ApiOperation(value = "确认完成工单")
    @ObserverRequired
    public String saveOrderFinishByDoctor(
            @ApiParam(value = "工单id", name = "orderId")
            @RequestParam(value = "orderId", required = true) String orderId,
@@ -280,6 +290,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping("updateArrivingTime")
    @ApiOperation(value = "修改预计到达时间")
    @ObserverRequired
    public String updateArrivingTime(
            @ApiParam(value = "工单id", name = "orderId")
            @RequestParam(value = "orderId", required = true) String orderId,
@@ -504,6 +515,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping(value = "payOrder")
    @ApiOperation(value = "医生确认付款")
    @ObserverRequired
    public ObjEnvelop payOrder(
            @ApiParam(name = "orderId", value = "工单id") @RequestParam(value = "orderId", required = true) String orderId,
            @ApiParam(name = "payWay", value = "支付方式：1-微信支付，2-线下支付") @RequestParam(value = "payWay", required = false,defaultValue = "2") int payWay) {
@@ -538,6 +550,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping("/initDoorStatus")
    @ApiOperation(value = "初始化医生分派订单开关状态")
    @ObserverRequired
    public String initDoorStatus() {
        try {
            doctorDoorCoachOrderService.initDoorStatus(null);
@@ -564,6 +577,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping("/dispatchOrderSwitch")
    @ApiOperation(value = "分派订单开关修改")
    @ObserverRequired
    public String dispatchOrderSwitch(
            @ApiParam(name = "doctor", value = "医生code")
            @RequestParam(value = "doctor", required = true) String doctor,
@@ -579,6 +593,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping(value = "dispatcherIntoTopic")
    @ApiOperation(value = "调度员进入会话")
    @ObserverRequired
    public ObjEnvelop dispatcherIntoTopic(
            @ApiParam(name = "orderId", value = "工单id", required = true) @RequestParam String orderId,
            @ApiParam(name = "hospitalName", value = "机构名称", required = true) @RequestParam String hospitalName,
@@ -639,6 +654,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping(value = "updateOrderCardInfo")
    @ApiOperation(value = "更新预约简要信息")
    @ObserverRequired
    public String updateOrderCardInfo(
            @ApiParam(name = "jsonData", value = "json数据") @RequestParam(value = "jsonData", required = true) String jsonData) {
        try{

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/exam/DoctorChildrenExaminationEndpoint.java

@@ -1,5 +1,6 @@
package com.yihu.jw.care.endpoint.exam;
import com.yihu.jw.care.aop.ObserverRequired;
import com.yihu.jw.care.service.exam.ChildrenExaminationService;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
@@ -22,6 +23,7 @@ public class DoctorChildrenExaminationEndpoint extends EnvelopRestEndpoint {
    @PostMapping("newRecord")
    @ApiOperation("居民居家自建记录添加")
    @ObserverRequired
    public ObjEnvelop newRecord(@ApiParam(name="patient",value ="儿童id")
                                @RequestParam(value = "patient",required = true)String patient,
                                @ApiParam(name="examTime",value ="体检日期 yyyy-mm-dd")

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/lifeCare/DoctorLifeCareEndpoint.java

@@ -105,6 +105,7 @@ public class DoctorLifeCareEndpoint extends EnvelopRestEndpoint {
    @PostMapping("updateConclusion")
    @ApiOperation("编辑保存服务工单小结")
    @ObserverRequired
    public Envelop updateConclusion(
            @ApiParam(value = "工单id", name = "orderId")
            @RequestParam(value = "orderId", required = true) String orderId,
@@ -144,6 +145,7 @@ public class DoctorLifeCareEndpoint extends EnvelopRestEndpoint {
    @PostMapping(value = "proxyCreate")
    @ApiOperation(value = "创建生活照料--医生代预约")
    @ObserverRequired
    public Envelop proxyCreate(
            @ApiParam(name = "doctor", value = "医生id") @RequestParam(value = "doctor", required = true) String doctor,
            @ApiParam(name = "jsonData", value = "Json数据", required = true) @RequestParam String jsonData) {

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/message/DoctorMessageEndpoint.java

@@ -1,6 +1,7 @@
package com.yihu.jw.care.endpoint.message;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.care.aop.ObserverRequired;
import com.yihu.jw.care.service.message.DoctorMessageService;
import com.yihu.jw.care.service.message.PatientMessageService;
import com.yihu.jw.restmodel.ResponseContant;
@@ -41,6 +42,7 @@ public class DoctorMessageEndpoint extends EnvelopRestEndpoint {
    @PostMapping(value = "newOrgNotice")
    @ApiOperation("创建机构通知消息")
    @ObserverRequired
    public ObjEnvelop newOrgNotice(@ApiParam(name = "jsonDate", value = "消息通知json")
                               @RequestParam(value = "jsonDate", required = false) String jsonDate,
                               @ApiParam(name = "patients", value = "通知居民列表")
@@ -101,6 +103,7 @@ public class DoctorMessageEndpoint extends EnvelopRestEndpoint {
    @PostMapping(value = "/updateMessageRead")
    @ApiOperation("已读消息")
    @ObserverRequired
    public Envelop updateMessageRead(@ApiParam(name = "messageId",required = true)
                                     @RequestParam(value = "messageId")String messageId){
        try {
@@ -114,6 +117,7 @@ public class DoctorMessageEndpoint extends EnvelopRestEndpoint {
    @PostMapping(value = "/delMessageRead")
    @ApiOperation("删除消息")
    @ObserverRequired
    public Envelop delMessageRead(@ApiParam(name = "messageId",required = true)
                                     @RequestParam(value = "messageId")String messageId){
        try {

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/org/OrgEndpoint.java

@@ -23,7 +23,7 @@ public class OrgEndpoint extends EnvelopRestEndpoint {
    @RequestMapping(value = "/findOrgList", method = RequestMethod.GET)
    @ApiOperation(value = "获取机构成员")
    public ListEnvelop findOrgList(@ApiParam(name = "type", value = "机构类型1. 等级医院2. 社区医院3.  养老机构")
    public ListEnvelop findOrgList(@ApiParam(name = "type", value = "机构类型1. 等级医院2. 社区医院3.  养老机构 4.  托育机构")
                                      @RequestParam(value = "type", required = false) String type,
                                      @ApiParam(name = "name", value = "机构名称")
                                      @RequestParam(value = "name", required = false) String name,

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/sign/SignEndpoint.java

@@ -50,6 +50,7 @@ public class SignEndpoint extends EnvelopRestEndpoint {
    @PostMapping(value = "addPatientSignList")
    @ApiOperation(value = "添加签约数据")
    @ObserverRequired
    public Envelop addPatientSignList () throws Exception {
        try{
            servicePackageService.addPatientSignList();

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/patient/CarePatientService.java

@@ -576,10 +576,11 @@ public class CarePatientService extends BaseJpaService<BasePatientDO, BasePatien
     */
    public List<Map<String,Object>> findOld(String name,String residentialArea,String limit,String filter1){
        String sql = "SELECT a.id,a.name,a.photo,a.idcard,CAST(IFNULL(a.birthday,'') AS char ) birthday,a.residential_area residentialArea,a.sex " +
                ", GROUP_CONCAT(DISTINCT d.category_code) deviceFlag,if(openid is null,0,1) onlineWx,IFNULL(a.on_line,0) onlinePad,IFNULL(sign_status,0) signStatus from base_patient a " +
                ", GROUP_CONCAT(DISTINCT d.category_code) deviceFlag,case 1 WHEN openid is not null then 1 WHEN a.on_line = '1' then 1 ELSE 0 end as online,IFNULL(sign_status,0) signStatus from base_patient a " +
                " LEFT JOIN wlyy_patient_device d on d.`user`=a.id  WHERE a.archive_type = 1 and a.del = '1' ";
        //case 1 WHEN openid is not null then 1 WHEN a.on_line = '1' then 1 ELSE 0 end as online
        //if(openid is null,0,1) onlineWx,IFNULL(a.on_line,0) onlinePad
        if(!StringUtil.isBlank(name)){
            sql+= " and name like '%"+name+"%' ";
        }

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

@@ -234,5 +234,36 @@ public class HvDeviceService {
        }
    }
    public static void main(String[] args) {
        String value = "01018B00000000000061444C7F0001921900FFBC00000070000000003839383630343334313832313830313337323531383637303730303336313331313231000000000034363030343534343733303732353100000000002235343030302E313030302E33352E30332E31332E30380000000000001300600001006100010062000000000001000079";
        String byMessageId = value.substring(0,2);//业务类型
        String byFixedSign = value.substring(2,4);
        String byDevType = value.substring(4,6);//设备类型
        String byMax6 = value.substring(6,18);//max地址
        String byTime = value.substring(18,26);//时间 秒
        String byDevTypeEx =value.substring(26,28);
        String wPCI = value.substring(28,32);//16
        String bySnr = value.substring(32,34);
        String byEcl = value.substring(34,36);
        String byRsrp = value.substring(36,40);//16
        String dwUpHeaderLen = value.substring(40,48);//32 上报头长度
        String dwPackageNo = value.substring(48,56);//32 报警时 从1累加
        String byQCCID20 = value.substring(56,96);
        String byIMEI20 = value.substring(96,136);
        String byIMSI20 = value.substring(136,176);
        String byNBModuleVersion24 = value.substring(176,224);
        String dwCID = value.substring(224,232);//32 基站码
        String dwLAC = value.substring(232,240);//32
        System.out.println(byQCCID20);
        System.out.println(byIMEI20);
        System.out.println(byIMSI20);
        System.out.println(byNBModuleVersion24);
        System.out.println(dwCID);
        System.out.println(dwLAC);
        //38 36 37 30 37 30 30 33 36 31 33 31 31 32 31 0000000000
        System.out.println(value.substring(240));
    }
}

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

@@ -152,6 +152,26 @@ public class OnenetService {
        }
    }
    /**
     * 海康设备解析
     */
    public void hkDevice(OnenetDevice onenetDevice,JSONObject jsonObject){
        String value = jsonObject.getString("value");
        String byMessageId = value.substring(0,2);
        String byDevType = value.substring(4,6);
        if("01".equals(byMessageId)){
            //信息上报
            return;
        }
        if("02".equals(byMessageId)){
            //报警
        }
        //其他信息暂时不处理
        // 03消音 04自检 05故障 06信号查询 07注册 08注销 ...
    }
    /**
     * 同步设备
     */