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

common/common-entity/sql记录

@@ -445,4 +445,7 @@ alter table base_doctor add doctor_level tinyint(4) DEFAULT NULL COMMENT '类型
-- 2021-04-29 wj
alter table base_patient ADD disease varchar(50) ;
alter table patient_medicare_card ADD medicare_number varchar(50) ;
alter table patient_medicare_card ADD medicare_number varchar(50) ;
-- 2021-05-07 ysj
alter table base_patient_family_member add is_contacts tinyint(1) DEFAULT NULL COMMENT '是否是一键联系人';

common/common-entity/src/main/java/com/yihu/jw/entity/base/patient/BasePatientFamilyMemberDO.java

@@ -17,6 +17,7 @@ public class BasePatientFamilyMemberDO extends UuidIdentityEntityWithOperator {
    private String familyMember;//家庭成员code',
    private Integer familyRelation;//家庭关系关系 1配偶 2父亲 3母亲 4公公 5婆婆 6岳父 7岳母 8子女',
    private Integer isAuthorize;//是否授权0:未授权,1:已授权，默认为1',
    private Integer isContacts;//是否是一键联系人 1是
    private Integer del;//删除标志（1正常，0删除）
    @Column(name = "patient")
@@ -63,4 +64,13 @@ public class BasePatientFamilyMemberDO extends UuidIdentityEntityWithOperator {
    public void setDel(Integer del) {
        this.del = del;
    }
    @Column(name = "is_contacts")
    public Integer getIsContacts() {
        return isContacts;
    }
    public void setIsContacts(Integer isContacts) {
        this.isContacts = isContacts;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/care/contacts/BasePatientContactsOrgDO.java

@@ -0,0 +1,40 @@
package com.yihu.jw.entity.care.contacts;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created with IntelliJ IDEA.
 *
 * @Author: yeshijie
 * @Date: 2021/5/7
 * @Description:
 */
@Entity
@Table(name="base_patient_contacts_org")
public class BasePatientContactsOrgDO extends UuidIdentityEntity {
    private String patient;
    private String orgCode;
    @Column(name = "patient")
    public String getPatient() {
        return patient;
    }
    public void setPatient(String patient) {
        this.patient = patient;
    }
    @Column(name = "org_code")
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
}

common/common-util/src/main/java/com/yihu/jw/util/common/LatitudeUtils.java

@@ -87,6 +87,10 @@ public class LatitudeUtils {
     * @return
     */
    public static String getDistance(String lat1Str, String lng1Str, String lat2Str, String lng2Str) {
        if(StringUtils.isEmpty(lat1Str)||StringUtils.isEmpty(lng1Str)
                ||StringUtils.isEmpty(lat2Str)||StringUtils.isEmpty(lng2Str)){
            return "";
        }
        double lat1 = Double.parseDouble(lat1Str);
        double lng1 = Double.parseDouble(lng1Str);
        double lat2 = Double.parseDouble(lat2Str);

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/dao/contacts/BasePatientContactsOrgDao.java

@@ -0,0 +1,21 @@
package com.yihu.jw.care.dao.contacts;
import com.yihu.jw.entity.care.contacts.BasePatientContactsOrgDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created with IntelliJ IDEA.
 *
 * @Author: yeshijie
 * @Date: 2021/5/7
 * @Description:
 */
public interface BasePatientContactsOrgDao extends PagingAndSortingRepository<BasePatientContactsOrgDO,String>,
        JpaSpecificationExecutor<BasePatientContactsOrgDO> {
    BasePatientContactsOrgDO findByPatient(String patient);
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/dao/family/PatientFamilyMemberDao.java

@@ -50,4 +50,12 @@ public interface PatientFamilyMemberDao extends PagingAndSortingRepository<BaseP
    BasePatientFamilyMemberDO findByPatientAndFamilyMember(String patient,String member);
    List<BasePatientFamilyMemberDO> findByFamilyMemberAndIsAuthorize(String familyMember,Integer isAuthorize);
    @Modifying
    @Query("update BasePatientFamilyMemberDO m set m.isContacts = 0 where m.patient=?1 ")
    int updateContactsByPatient(String patient);
    @Modifying
    @Query("update BasePatientFamilyMemberDO m set m.isContacts = 1 where m.id=?1 ")
    int updateContactsById(String id);
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/family/FamilyMemberEndpoint.java

@@ -171,21 +171,21 @@ public class FamilyMemberEndpoint extends EnvelopRestEndpoint {
    /**
     * 家庭成员查询
     * @param patient
     * @param isAgree (任意值已同意（只查询家人关系表），null不同意)
     * @param isContacts (1是一键联系人)
     * @return
     */
    @RequestMapping(value = "/members", method = RequestMethod.GET)
    @ApiOperation(value = "家庭成员查询")
    public ObjEnvelop getPatientFamilyMembers(@RequestParam(required = false) String patient,
                                              @RequestParam(required = false) String isContain,
                                              @RequestParam(required = false) Integer isAgree) {
                                              @RequestParam(required = false) Integer isContacts) {
        try {
            JSONObject data = new JSONObject();
            JSONArray result = new JSONArray();
            if (StringUtils.isNotEmpty(patient)) {
                result = familyMemberService.getPatientMembers(patient, "", isContain,isAgree);
                result = familyMemberService.getPatientMembers(patient, "", isContain,isContacts);
            } else  {
                result = familyMemberService.getPatientFamilyMembers(getUID(), "",null);
                result = familyMemberService.getPatientFamilyMembers(getUID(), "",isContacts);
            }
            data.put("normalmembers",result);//家人关系
@@ -314,12 +314,21 @@ public class FamilyMemberEndpoint extends EnvelopRestEndpoint {
    @RequestMapping(value = "/addMemberByCaptcha", method = RequestMethod.POST)
    @ApiOperation(value = "通过手机验证码新增家庭成员")
    public Envelop addMemberByCaptcha(@RequestParam("member") String member,
    public Envelop addMemberByCaptcha(@RequestParam("idcard") String idcard,
                                      @RequestParam("name") String name,
                                      @RequestParam("mobile") String mobile,
                                      @RequestParam("archiveType") Integer archiveType,
                                     @RequestParam("captcha") String captcha,
                                     @RequestParam("relation") int relation){
        try {
            if (StringUtils.isEmpty(member)) {
                return failed( "添加成员不能为空",-1);
            if (StringUtils.isEmpty(idcard)) {
                return failed( "添加成员身份证不能为空",-1);
            }
            if (StringUtils.isEmpty(name)) {
                return failed( "添加成员姓名不能为空",-1);
            }
            if (StringUtils.isEmpty(mobile)) {
                return failed( "添加成员手机号不能为空",-1);
            }
            if (StringUtils.isEmpty(captcha)) {
                return failed( "验证码不能为空",-1);
@@ -328,7 +337,7 @@ public class FamilyMemberEndpoint extends EnvelopRestEndpoint {
                return failed( "家庭关系无效",-1);
            }
            int result = familyMemberService.addMemberByCaptcha(getUID(),member,captcha,relation);
            int result = familyMemberService.addMemberByCaptcha(getUID(),idcard,name,mobile,archiveType,captcha,relation);
            if(result==0){
                return failed( "不能添加自己",-1);

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/patient/PatientContactsEndpoint.java

@@ -0,0 +1,125 @@
package com.yihu.jw.care.endpoint.patient;
import com.alibaba.fastjson.JSONArray;
import com.yihu.jw.care.service.contacts.ContactsService;
import com.yihu.jw.entity.base.org.BaseOrgDO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
/**
 * Created with IntelliJ IDEA.
 *
 * @Author: yeshijie
 * @Date: 2021/5/7
 * @Description:
 */
@RestController
@RequestMapping("patientContacts" )
@Api(tags = "居民-联系人", description = "居民-联系人")
public class PatientContactsEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private ContactsService contactsService;
    /**
     * 联系人查询
     * @param patient
     * @param isContacts (1是一键联系人)
     * @return
     */
    @RequestMapping(value = "getPatientContacts", method = RequestMethod.GET)
    @ApiOperation(value = "联系人查询")
    public Envelop getPatientContacts(@RequestParam(required = true) String patient,
                                      @RequestParam(required = true) Integer isContacts) {
        try {
            JSONArray result = contactsService.getPatientContacts(patient,isContacts);
            return ObjEnvelop.getSuccess( "查询成功", result);
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError( "查询失败");
        }
    }
    /**
     * 设置一键联系人
     * @param patient
     * @return
     */
    @RequestMapping(value = "setPatientContacts", method = RequestMethod.POST)
    @ApiOperation(value = "设置一键联系人")
    public Envelop setPatientContacts(@RequestParam(required = true) String patient,
                                      @RequestParam(required = true) String fid) {
        try {
            contactsService.setContacts(fid,patient);
            return ObjEnvelop.getSuccess("设置成功");
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError("设置失败");
        }
    }
    /**
     * 查找居民联系服务站
     * @param patient
     * @return
     */
    @RequestMapping(value = "getContactsOrg", method = RequestMethod.GET)
    @ApiOperation(value = "联系人查询")
    public Envelop getContactsOrg(@RequestParam(required = true) String patient) {
        try {
            BaseOrgDO result = contactsService.getContactsOrg(patient);
            return ObjEnvelop.getSuccess( "查询成功", result);
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError( "查询失败");
        }
    }
    /**
     * 设置居民联系服务站
     * @param patient
     * @return
     */
    @RequestMapping(value = "setContactsOrg", method = RequestMethod.POST)
    @ApiOperation(value = "设置居民联系服务站")
    public Envelop setContactsOrg(@RequestParam(required = true) String patient,
                                      @RequestParam(required = true) String orgCode) {
        try {
            contactsService.setContactsOrg(patient,orgCode);
            return ObjEnvelop.getSuccess("设置成功");
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError("设置失败");
        }
    }
    /**
     * 查找居民联系服务站
     * @param patient
     * @return
     */
    @RequestMapping(value = "findSignOrg", method = RequestMethod.GET)
    @ApiOperation(value = "联系人查询")
    public Envelop findSignOrg(@RequestParam(required = true) String patient,
                               @RequestParam(required = true) String lng,
                               @RequestParam(required = true) String lat) {
        try {
            return ObjEnvelop.getSuccess( "查询成功", contactsService.findSignOrg(patient,lng,lat));
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError( "查询失败");
        }
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/contacts/ContactsService.java

@@ -0,0 +1,175 @@
package com.yihu.jw.care.service.contacts;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.care.dao.contacts.BasePatientContactsOrgDao;
import com.yihu.jw.care.dao.device.PatientDeviceDao;
import com.yihu.jw.care.dao.family.PatientFamilyMemberDao;
import com.yihu.jw.care.service.device.PatientDeviceService;
import com.yihu.jw.care.service.family.PatientFamilyMemberService;
import com.yihu.jw.care.service.sign.ServicePackageService;
import com.yihu.jw.entity.base.org.BaseOrgDO;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.base.patient.BasePatientFamilyMemberDO;
import com.yihu.jw.entity.care.contacts.BasePatientContactsOrgDO;
import com.yihu.jw.entity.care.device.DevicePatientDevice;
import com.yihu.jw.org.dao.BaseOrgDao;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.util.common.LatitudeUtils;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
 * Created with IntelliJ IDEA.
 *
 * @Author: yeshijie
 * @Date: 2021/5/7
 * @Description:
 */
@Service
public class ContactsService {
    @Autowired
    private PatientFamilyMemberDao memberDao;
    @Autowired
    private PatientDeviceDao patientDeviceDao;
    @Autowired
    private PatientDeviceService patientDeviceService;
    @Autowired
    private BasePatientDao basePatientDao;
    @Autowired
    private PatientFamilyMemberService patientFamilyMemberService;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Autowired
    private BasePatientContactsOrgDao contactsOrgDao;
    @Autowired
    private BaseOrgDao baseOrgDao;
    @Autowired
    private ServicePackageService servicePackageService;
    /**
     * 查找居民联系服务站
     * @param patient
     */
    public BaseOrgDO getContactsOrg(String patient){
        BasePatientContactsOrgDO contactsOrgDO = contactsOrgDao.findByPatient(patient);
        if(contactsOrgDO == null){
            return null;
        }
        return baseOrgDao.findByCode(contactsOrgDO.getOrgCode());
    }
    /**
     * 设置居民联系服务站
     * @param patient
     */
    public void setContactsOrg(String patient,String orgCode){
        BasePatientContactsOrgDO contactsOrgDO = contactsOrgDao.findByPatient(patient);
        if(contactsOrgDO == null){
            contactsOrgDO = new BasePatientContactsOrgDO();
            contactsOrgDO.setPatient(patient);
        }
        contactsOrgDO.setOrgCode(orgCode);
        contactsOrgDao.save(contactsOrgDO);
    }
    /**
     * 获取居民的联系人
     * @param patient 居民
     * @return
     */
    public JSONArray getPatientContacts(String patient, Integer isContacts) {
        JSONArray resultArray = new JSONArray();
        String sql = "select *,t1.id fid " +
                " from " +
                "    base_patient_family_member t1, " +
                "    base_patient t2 " +
                " where " +
                "    t2.id in (select family_member from base_patient_family_member where patient = ? ) " +
                "    and t1.patient = ? " +
                "    and t1.family_member = t2.id ";
        if(isContacts == 1){
            sql += " and t1.is_contacts = "+ isContacts;
        }
        List<Map<String, Object>> result = jdbcTemplate.queryForList(sql, new Object[]{patient, patient});
        if (result != null && result.size() > 0) {
            for (Map<String, Object> map : result) {
                JSONObject obj = new JSONObject();
                obj.put("id", map.get("id"));
                obj.put("fid", map.get("fid"));
                obj.put("name", map.get("name"));
                obj.put("isContacts", map.get("is_contacts"));
                obj.put("sex", map.get("sex"));
                obj.put("birthday", map.get("birthday"));
                obj.put("idcard", StringUtils.isEmpty(String.valueOf(map.get("idcard"))) ? "" : map.get("idcard").toString());
                obj.put("photo", map.get("photo"));
                obj.put("mobile", map.get("mobile"));
                obj.put("address", StringUtils.isEmpty(String.valueOf(map.get("address"))) ? "" : map.get("address"));
                obj.put("familyRelation", map.get("family_relation"));
                obj.put("familyRelationName", PatientFamilyMemberService.relations.get(map.get("family_relation")));
                resultArray.add(obj);
            }
        }
        return resultArray;
    }
    /**
     * 设置一键联系人
     * @param fid
     * @param patient
     */
    @Transactional(rollbackFor = Exception.class)
    public void setContacts(String fid,String patient){
        BasePatientFamilyMemberDO familyMemberDO = memberDao.findOne(fid);
        BasePatientDO patientDO = basePatientDao.findById(patient);
        //设置爱牵挂智能设备sos号码
        try {
            List<DevicePatientDevice> patientDeviceList = patientDeviceDao.findByPatient(patient);
            for(DevicePatientDevice patientDevice : patientDeviceList){
                if("4".equals(patientDevice.getCategoryCode())||"7".equals(patientDevice.getCategoryCode())){
                    patientDeviceService.updAqgDeviceSosInfo(patientDevice.getDeviceSn(),"1",
                            PatientFamilyMemberService.relations.get(familyMemberDO.getFamilyRelation()),patientDO.getMobile(),"1",null);
                }
            }
        }catch (Exception e){
            e.printStackTrace();
        }
        memberDao.updateContactsByPatient(patient);
        familyMemberDO.setIsContacts(1);
        memberDao.save(familyMemberDO);
    }
    /**
     * 获取居民签约机构
     */
    public List<Map<String,Object>> findSignOrg(String patient,String lng,String lat){
        List<Map<String,Object>> result = new ArrayList<>();
        List<BaseOrgDO> orgDOList = servicePackageService.findSignOrg(patient);
        for (BaseOrgDO orgDO : orgDOList){
            Map<String,Object> map = new HashedMap();
            map.put("distance", LatitudeUtils.getDistance(lat,lng,orgDO.getLatitude(),orgDO.getLongitude()));
            map.put("id",orgDO.getId());
            map.put("code",orgDO.getCode());
            map.put("name",orgDO.getName());
            map.put("photo",orgDO.getPhoto());
            map.put("mobile",orgDO.getMobile());
            map.put("address",orgDO.getAddress());
            result.add(map);
        }
        return result;
    }
}

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

@@ -713,7 +713,7 @@ public class PatientDeviceService extends BaseJpaService<DevicePatientDevice, Pa
    若该设备以前已设置亲情号码2，则以前设置的亲情号码2也会被清空]
    |
     */
    public com.alibaba.fastjson.JSONObject updAqgDeviceSosInfo(String deviceSn,String seqid,String name,String num,String dial_flag,String clear) throws Exception{
    public com.alibaba.fastjson.JSONObject updAqgDeviceSosInfo(String deviceSn,String seqid,String name,String num,String dial_flag,String clear){
        String url = MessageFormat.format(AqgConfig.sos_numbers, deviceSn,seqid);
        MultiValueMap<String, String> param = new LinkedMultiValueMap<>();
        if(StringUtils.isBlank(clear)){

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

@@ -18,11 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.PostConstruct;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -32,7 +28,7 @@ import java.util.regex.Pattern;
@Service
public class PatientFamilyMemberService extends BaseJpaService<BasePatientFamilyMemberDO, PatientFamilyMemberDao> {
    Map<Integer, String> relations = new HashMap<>();
    public static Map<Integer, String> relations = new HashMap<>();
    @Autowired
    private PatientFamilyMemberDao memberDao;
    @Autowired
@@ -43,8 +39,8 @@ public class PatientFamilyMemberService extends BaseJpaService<BasePatientFamily
    private WeiXinAccessTokenUtils weiXinAccessTokenUtils;
    @PostConstruct
    public void init() {
    static {
        relations.put(0, "其他");
        relations.put(1, "父亲");
        relations.put(2, "母亲");
@@ -359,7 +355,7 @@ public class PatientFamilyMemberService extends BaseJpaService<BasePatientFamily
     * @param patient 居民
     * @return
     */
    public JSONArray getPatientFamilyMembers(String patient, String doctorCode, Integer isAgree) {
    public JSONArray getPatientFamilyMembers(String patient, String doctorCode, Integer isContacts) {
        JSONArray resultArray = new JSONArray();
        String sql = "select * " +
                " from " +
@@ -369,7 +365,9 @@ public class PatientFamilyMemberService extends BaseJpaService<BasePatientFamily
                "    t2.id in (select family_member from base_patient_family_member where patient = ? ) " +
                "    and t1.patient = ? " +
                "    and t1.family_member = t2.id ";
        if(isContacts != null){
            sql += " and t1.is_contacts = "+ isContacts;
        }
        List<Map<String, Object>> result = jdbcTemplate.queryForList(sql, new Object[]{patient, patient});
        if (result != null && result.size() > 0) {
@@ -387,6 +385,7 @@ public class PatientFamilyMemberService extends BaseJpaService<BasePatientFamily
                obj.put("id", map.get("id"));
                obj.put("name", map.get("name"));
                obj.put("isContacts", map.get("is_contacts"));
                obj.put("sex", map.get("sex"));
                obj.put("isAuthorize", isAuthorize);//0:未授权,1:已授权
                obj.put("birthday", map.get("birthday"));
@@ -715,31 +714,47 @@ public class PatientFamilyMemberService extends BaseJpaService<BasePatientFamily
    }
    @Transactional
    public int addMemberByCaptcha(String patient, String member, String captcha, int relation) throws Exception {
        if (patient.equals(member)) {
            return 0;
        }
    public int addMemberByCaptcha(String patient, String idcard, String name, String mobile, Integer archiveType, String captcha, int relation) throws Exception {
        BasePatientDO p = patientDao.findById(patient);
        BasePatientDO m = patientDao.findById(member);
        if (p == null) {
            return -1;
        }
        // 添加的成员是否注册判断
        if (m == null) {
            return -2;
        if(idcard.equals(p.getIdcard())){
            return 0;
        }
//        // 验证码验证
        //        // 验证码验证
//        if (StringUtils.isNotEmpty(captcha)) {
//            int checkStatus = smsService.check(m.getMobile(), 10, captcha);
//            int checkStatus = smsService.check(mobile, 10, captcha);
//            if (checkStatus == -2) {
//                return -6;  // 验证码过期
//            } else if (checkStatus == -1) {
//                return -3; // 验证码错误
//            }
//        }
        BasePatientDO m = patientDao.findByIdcard(idcard);
        String member = "";
        // 添加的成员是否注册判断
        if (m == null) {
            //新增账户
            m = new BasePatientDO();
            String salt = UUID.randomUUID().toString().substring(0,5);
            String pw = idcard.substring(idcard.length()-6,idcard.length());
            m.setPassword(com.yihu.utils.security.MD5.md5Hex(pw + "{" + salt + "}"));
            m.setSalt(salt);
            m.setMobile(mobile);
            m.setDel("1");
            m.setEnabled(1);
            m.setLocked(0);
            m.setCreateTime(new Date());
            m.setUpdateTime(new Date());
            m.setName(name);
            m.setIdcard(idcard);
            m.setArchiveType(archiveType);
            patientDao.save(m);
        }
        member = m.getId();
        return addMemberFamily(p, m, patient, member, relation);
    }

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

@@ -226,38 +226,6 @@ public class DeviceController {
        }
    }
    @ApiOperation("柏颐设备sos数据接收")
    @RequestMapping(value = "bySos", produces = "application/x-www-form-urlencoded;charset=UTF-8", method = {RequestMethod.POST,RequestMethod.GET})
    public String bySos(
            @ApiParam(name="imei",required = false,value="15位设备唯一序号",defaultValue = "")
            @RequestParam(value = "imei",required = true) String imei,
            @ApiParam(name="time_begin",required = false,value="发生时间YYYY-MM-DD HH:mm:SS")
            @RequestParam(value = "time_begin",required = false) String time_begin,
            @ApiParam(name="heartrate",required = false,value="心率")
            @RequestParam(value = "heartrate",required = false) int heartrate,
            @ApiParam(name="city",required = false,value="城市")
            @RequestParam(value = "city",required = false) String city,
            @ApiParam(name="address",required = false,value="地址")
            @RequestParam(value = "address",required = false) String address,
            @ApiParam(name="lon",required = false,value="经度")
            @RequestParam(value = "lon",required = false) double lon,
            @ApiParam(name="lat",required = false,value="纬度")
            @RequestParam(value = "lat",required = false) double lat,
            @ApiParam(name="type",required = false,value="类型  0:Gps定位; 1:基站定位")
            @RequestParam(value = "type",required = false) String type,
            HttpServletRequest request) {
        try {
            String paraString = JSON.toJSONString(request.getParameterMap());
            logger.info("请求参数:"+paraString);
            deviceService.bySos(imei,time_begin,heartrate,city,address,lon,lat,type);
            return success();
        } catch (Exception e) {
            e.printStackTrace();
            return error(-1,"Device data incoming failure");
        }
    }
    @ApiOperation("柏颐设备步数接收")
    @RequestMapping(value = "bySteps", produces = "application/x-www-form-urlencoded;charset=UTF-8", method = {RequestMethod.POST,RequestMethod.GET})
    public String bySteps(
@@ -310,57 +278,6 @@ public class DeviceController {
        }
    }
    @ApiOperation("柏颐设备开关机数据接收")
    @RequestMapping(value = "bySwitch", produces = "application/x-www-form-urlencoded;charset=UTF-8", method = {RequestMethod.POST,RequestMethod.GET})
    public String bySwitch(
            @ApiParam(name="imei",required = false,value="15位设备唯一序号",defaultValue = "")
            @RequestParam(value = "imei",required = true) String imei,
            @ApiParam(name="time_begin",required = false,value="发生时间YYYY-MM-DD HH:mm:SS")
            @RequestParam(value = "time_begin",required = false) String time_begin,
            @ApiParam(name="type",required = false,value="开/关机类型  0:开机; 1:关机; 2:电量上报; 3:低电通知")
            @RequestParam(value = "type",required = false) String type,
            @ApiParam(name="remaining_power",required = false,value="剩余电量(%）")
            @RequestParam(value = "remaining_power",required = false) int remaining_power,
            HttpServletRequest request) {
        try {
            String paraString = JSON.toJSONString(request.getParameterMap());
            logger.info("请求参数:"+paraString);
            deviceService.bySwitch(imei,time_begin,type,remaining_power);
            return success();
        } catch (Exception e) {
            e.printStackTrace();
            return error(-1,"Device data incoming failure");
        }
    }
    @ApiOperation("柏颐设备消息通知数据接收")
    @RequestMapping(value = "byPushData", produces = "application/x-www-form-urlencoded;charset=UTF-8", method = {RequestMethod.POST,RequestMethod.GET})
    public String byPushData(
            @ApiParam(name="type",required = false,value="type=1 SOS，type=2 fall，type=3 new 新成员加入 ，type=4 电子围栏触发， type=5 设备低电，type=6 环境音 ",defaultValue = "")
            @RequestParam(value = "type",required = false) int type,
            @ApiParam(name="deviceid",required = false,value="15位设备唯一序号",defaultValue = "")
            @RequestParam(value = "deviceid",required = true) String deviceid,
            @ApiParam(name="communityid",required = false,value="机构ID")
            @RequestParam(value = "communityid",required = false) String communityid,
            @ApiParam(name="url",required = false,value="环境音下载地址 只有环境音（type=6）为必填，其他type都为非必填")
            @RequestParam(value = "url",required = false) String url,
            @ApiParam(name="name",required = false,value="设备名称")
            @RequestParam(value = "name",required = false) String name,
            HttpServletRequest request) {
        try {
            String paraString = JSON.toJSONString(request.getParameterMap());
            logger.info("请求参数:"+paraString);
            deviceService.byPushData(type,deviceid,communityid,url,name);
            return success();
        } catch (Exception e) {
            e.printStackTrace();
            return error(-1,"Device data incoming failure");
        }
    }
    /**
     * 返回接口处理结果

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

@@ -294,29 +294,6 @@ public class DeviceService {
        }
    }
    /**
     * 柏颐sos 接收
     * @param imei  15位设备唯一序号
     * @param time_begin  发生时间YYYY-MM-DD HH:mm:SS
     * @param heartrate   心率
     * @param city  城市
     * @param address  地址
     * @param lon  经度
     * @param lat  纬度
     * @param type  类型   0:Gps定位; 1:基站定位
     */
    @Async
    public void bySos(String imei,String time_begin,int heartrate,String city,String address,double lon,double lat,String type) {
        try {
            if(StringUtils.isNotBlank(imei)){
            }
        } catch (Exception e) {
            e.printStackTrace();
        }
    }
    /**
     * 柏颐步数数据接收
     * @param imei 15位设备唯一序号
@@ -356,42 +333,4 @@ public class DeviceService {
        }
    }
    /**
     * 柏颐开关机数据接收
     * @param imei 15位设备唯一序号
     * @param time_begin 发生时间YYYY-MM-DD HH:mm:SS
     * @param type 开/关机类型  0:开机; 1:关机; 2:电量上报; 3:低电通知
     * @param remaining_power 剩余电量(%）
     */
    @Async
    public void bySwitch(String imei,String time_begin,String type,int remaining_power) {
        try {
            if(StringUtils.isNotBlank(imei)){
            }
        } catch (Exception e) {
            e.printStackTrace();
        }
    }
    /**
     * 柏颐数据消息通知
     * @param type  type=1 SOS，type=2 fall，type=3 new 新成员加入 ，type=4 电子围栏触发， type=5 设备低电，type=6 环境音
     * @param deviceid 15位设备唯一序号
     * @param communityid 机构ID
     * @param url 环境音下载地址 只有环境音（type=6）为必填，其他type都为非必填
     * @param name 设备名称
     */
    @Async
    public void byPushData(int type,String deviceid,String communityid,String url,String name) {
        try {
            if(StringUtils.isNotBlank(deviceid)){
            }
        } catch (Exception e) {
            e.printStackTrace();
        }
    }
}