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

app/app-iot-server/src/main/java/com/yihu/ehr/iot/service/common/SystemDictService.java

@@ -57,13 +57,13 @@ public class SystemDictService extends BaseService{
                envelop.setStatus(200);
            }else {
                envelop.setStatus(-1);
                envelop.setErrorMsg(result.getErrorMsg());
                envelop.setMessage(result.getErrorMsg());
            }
            return envelop;
        } catch (Exception e) {
            e.printStackTrace();
            envelop.setStatus(-1);
            envelop.setErrorMsg(ErrorCode.SystemError.toString());
            envelop.setMessage(ErrorCode.SystemError.toString());
            return envelop;
        }
    }

app/app-iot-server/src/main/java/com/yihu/ehr/iot/service/company/CompanyService.java

@@ -70,34 +70,34 @@ public class CompanyService extends BaseService {
        Result login_code = existence("login_code",iotCompany.getAccount());
        if(login_code.isSuccessFlg()){
            envelop.setStatus(-1);
            envelop.setErrorMsg("该账号已存在");
            envelop.setMessage("该账号已存在");
            return envelop;
        }
        //验证身份证
        Result id_card_no = existence("id_card_no",iotCompany.getContactsIdcard());
        if(id_card_no.isSuccessFlg()){
            envelop.setStatus(-1);
            envelop.setErrorMsg("该身份证号已被注册，请确认。");
            envelop.setMessage("该身份证号已被注册，请确认。");
            return envelop;
        }
        //验证邮件
        Result email = existence("email",iotCompany.getContactsEmail());
        if(email.isSuccessFlg()){
            envelop.setStatus(-1);
            envelop.setErrorMsg("该邮箱已存在");
            envelop.setMessage("该邮箱已存在");
            return envelop;
        }
        //验证手机号
        Result telephone = existence("telephone",iotCompany.getContactsMobile());
        if(telephone.isSuccessFlg()){
            envelop.setStatus(-1);
            envelop.setErrorMsg("该手机号码已存在");
            envelop.setMessage("该手机号码已存在");
            return envelop;
        }
        Envelop<UserModel> userModelEnvelop = updateUser(iotCompany);
        if(userModelEnvelop.getStatus()!=200){
            envelop.setStatus(-1);
            envelop.setErrorMsg(userModelEnvelop.getErrorMsg());
            envelop.setMessage(userModelEnvelop.getMessage());
            return envelop;
        }
@@ -117,22 +117,22 @@ public class CompanyService extends BaseService {
    private Envelop<IotCompanyVO> userVerification(IotCompanyVO iotCompany,Envelop<IotCompanyVO> envelop){
        if(StringUtils.isEmpty(iotCompany.getAccount())){
            envelop.setStatus(-1);
            envelop.setErrorMsg("账号不能为空");
            envelop.setMessage("账号不能为空");
            return envelop;
        }
        if(StringUtils.isEmpty(iotCompany.getContactsIdcard())){
            envelop.setStatus(-1);
            envelop.setErrorMsg("身份证号不能为空");
            envelop.setMessage("身份证号不能为空");
            return envelop;
        }
        if(StringUtils.isEmpty(iotCompany.getContactsEmail())){
            envelop.setStatus(-1);
            envelop.setErrorMsg("邮箱不能为空");
            envelop.setMessage("邮箱不能为空");
            return envelop;
        }
        if(StringUtils.isEmpty(iotCompany.getContactsMobile())){
            envelop.setStatus(-1);
            envelop.setErrorMsg("手机号码账号不能为空");
            envelop.setMessage("手机号码账号不能为空");
            return envelop;
        }
@@ -191,13 +191,13 @@ public class CompanyService extends BaseService {
                envelop.setStatus(200);
            }else {
                envelop.setStatus(-1);
                envelop.setErrorMsg(result.getErrorMsg());
                envelop.setMessage(result.getErrorMsg());
            }
            return envelop;
        } catch (Exception e) {
            e.printStackTrace();
            envelop.setStatus(-1);
            envelop.setErrorMsg(ErrorCode.SystemError.toString());
            envelop.setMessage(ErrorCode.SystemError.toString());
            return envelop;
        }
    }
@@ -219,16 +219,16 @@ public class CompanyService extends BaseService {
            ObjectResult result = toModel(response.getBody(),ObjectResult.class);
            if(result.isSuccessFlg()){
                envelop.setStatus(200);
                envelop.setSuccessMsg("修改成功");
                envelop.setMessage("修改成功");
            }else {
                envelop.setStatus(-1);
                envelop.setErrorMsg(result.getErrorMsg());
                envelop.setMessage(result.getErrorMsg());
            }
            return envelop;
        } catch (Exception e) {
            e.printStackTrace();
            envelop.setStatus(-1);
            envelop.setErrorMsg(ErrorCode.SystemError.toString());
            envelop.setMessage(ErrorCode.SystemError.toString());
            return envelop;
        }
    }

app/app-iot-server/src/main/java/com/yihu/ehr/iot/service/product/ProductService.java

@@ -57,13 +57,13 @@ public class ProductService extends BaseService {
                envelop.setStatus(200);
            }else {
                envelop.setStatus(-1);
                envelop.setErrorMsg(result.getErrorMsg());
                envelop.setMessage(result.getErrorMsg());
            }
            return envelop;
        } catch (Exception e) {
            e.printStackTrace();
            envelop.setStatus(-1);
            envelop.setErrorMsg(ErrorCode.SystemError.toString());
            envelop.setMessage(ErrorCode.SystemError.toString());
            return envelop;
        }
    }

app/app-iot-server/src/main/resources/application.yml

@@ -65,7 +65,7 @@ service-gateway:
third:
  wlyy:
    url: http://ehr.yihu.com/wlyy/
    url: http://172.19.103.88:9092/wlyy/
    appid: 915d0345-5b1d-11e6-8344-fa163e8aee61
    appsecret: 915d0345-5b1d-11e6-8344-fa163e8aee57
ehr:
@@ -104,7 +104,7 @@ service-gateway:
  portalOuterUrl: http://27.154.233.186:10280/api/v1.0/portal
third:
  wlyy:
    url: http://ehr.yihu.com/wlyy/
    url: http://172.19.103.88:9092/wlyy/
    appid: 915d0345-5b1d-11e6-8344-fa163e8aee61
    appsecret: 915d0345-5b1d-11e6-8344-fa163e8aee57
ehr:

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

@@ -16,7 +16,10 @@ import java.util.UUID;
public class LatitudeUtils {
    public static final String KEY_1 = "7d9fbeb43e975cd1e9477a7e5d5e192a";
    /**
     * 没有ak有的服务请求获取不到地址
     */
    public static final String ak = "wm9Cih17l010vL91nOfTbu8M";
@@ -30,7 +33,7 @@ public class LatitudeUtils {
        try {
            //将地址转换成utf-8的16进制
            address = URLEncoder.encode(address, "UTF-8");
            URL tirc = new URL("http://api.map.baidu.com/geocoder?address="+ address +"&output=json&key="+ UUID.randomUUID().toString().replace("-",""));
            URL tirc = new URL("http://api.map.baidu.com/geocoder/v2/?address="+ address +"&output=json&key="+ UUID.randomUUID().toString().replace("-","")+"&ak="+ak);
            in = new BufferedReader(new InputStreamReader(tirc.openStream(),"UTF-8"));
@@ -58,7 +61,9 @@ public class LatitudeUtils {
            e.printStackTrace();
        }finally{
            try {
                in.close();
                if(in!=null){
                    in.close();
                }
            } catch (IOException e) {
                e.printStackTrace();
            }

svr/svr-iot/src/main/java/com/yihu/iot/service/device/IotPatientDeviceService.java

@@ -76,6 +76,7 @@ public class IotPatientDeviceService extends BaseJpaService<IotPatientDeviceDO,I
            }
            Map<String, String> json = LatitudeUtils.getGeocoderLatitude(deviceVO.getAddress().replace("G.", "").replace("（糖友网）", "").replace("（高友网）", ""));
            logger.info("地址:," + deviceVO.getAddress());
            if (json == null) {
                if(!StringUtils.isEmpty(deviceVO.getHospitalName())){
                    json = LatitudeUtils.getGeocoderLatitude(deviceVO.getHospitalName().replace("G.", "").replace("（糖友网）", "").replace("（高友网）", ""));