Merge branch 'dev' of http://192.168.1.220:10080/jiwei/jw2.0 into dev

Conflicts:
	svr/svr-iot/src/main/resources/application.yml

app/app-iot-server/src/main/java/com/yihu/ehr/iot/constant/ServiceApi.java

@@ -12,6 +12,7 @@ public class ServiceApi {
        public static final String FindCompanyPage = Base +"findCompanyPage";
        public static final String AddCompany = Base +"addCompany";
        public static final String FindCompanyById = Base +"findCompanyById";
        public static final String DelCompanyCert = Base +"delCompanyCert";
        public static final String FindByBusinessLicense = Base +"findByBusinessLicense";
        public static final String UpdCompany = Base +"updCompany";
        public static final String DelCompany = Base +"delCompany";

app/app-iot-server/src/main/java/com/yihu/ehr/iot/controller/company/IotCompanyController.java

@@ -176,4 +176,16 @@ public class IotCompanyController extends BaseController {
        }
    }
    @PostMapping(value = IotRequestMapping.Company.delCompanyCert)
    @ApiOperation(value = "删除企业证书", notes = "删除企业证书")
    public Envelop<IotCompanyCertificateVO> delCompanyCert(@ApiParam(name = "id", value = "id", defaultValue = "")
                                                           @RequestParam(value = "id", required = true)String id) {
        try {
            return companyService.delCompanyCert(id);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
        }
    }
}

app/app-iot-server/src/main/java/com/yihu/ehr/iot/controller/device/IotDeviceOrderController.java

@@ -11,7 +11,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
/**
@@ -24,9 +23,9 @@ public class IotDeviceOrderController extends BaseController {
    @Autowired
    private DeviceOrderService deviceOrderService;
    @PostMapping(value = IotRequestMapping.DeviceOrder.createOrder, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = IotRequestMapping.DeviceOrder.createOrder)
    @ApiOperation(value = "创建设备订单", notes = "创建设备订单")
    public Envelop<IotOrderVO> create(@ApiParam(name = "json_data", value = "", defaultValue = "")
    public Envelop<IotOrderVO> create(@ApiParam(name = "jsonData", value = "", defaultValue = "")
                          @RequestParam String jsonData) {
        try {
            return deviceOrderService.create(jsonData);

app/app-iot-server/src/main/java/com/yihu/ehr/iot/controller/product/IotProductController.java

@@ -1,7 +1,7 @@
package com.yihu.ehr.iot.controller.product;
import com.yihu.ehr.iot.controller.common.BaseController;
import com.yihu.ehr.iot.model.ehr.MRsMetadata;
import com.yihu.ehr.iot.model.ehr.MStdDataSet;
import com.yihu.ehr.iot.service.product.ProductService;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.iot.product.IotMaintenanceUnitVO;
@@ -25,12 +25,10 @@ public class IotProductController extends BaseController {
    @Autowired
    private ProductService productService;
    @GetMapping(value = IotRequestMapping.Product.metadata)
    @GetMapping(value = IotRequestMapping.Product.data_sets)
    @ApiOperation(value = "测量数据", notes = "测量数据")
    public Envelop<MRsMetadata> metadata(@ApiParam(name = "name", value = "名称", defaultValue = "")
    public Envelop<MStdDataSet> data_sets(@ApiParam(name = "name", value = "名称", defaultValue = "")
                                         @RequestParam(value = "name", required = false) String name,
                                         @ApiParam(name = "type", value = "类型", defaultValue = "")
                                         @RequestParam(value = "type", required = false) String type,
                                         @ApiParam(name = "page", value = "第几页", defaultValue = "")
                                         @RequestParam(value = "page", required = false) Integer page,
                                         @ApiParam(name = "size", value = "每页记录数", defaultValue = "")
@@ -42,7 +40,7 @@ public class IotProductController extends BaseController {
            if(size == null){
                size = 10;
            }
            return productService.metadata(page, size, type, name);
            return productService.data_sets(page, size, name);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());

app/app-iot-server/src/main/java/com/yihu/ehr/iot/model/ehr/MRsMetadata.java

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
 * Created by lyr on 2016/5/16.
 * @author yeshijie on 2018/2/28.
 */
@JsonInclude(JsonInclude.Include.ALWAYS)
@ApiModel(description = "ehr数据元")

app/app-iot-server/src/main/java/com/yihu/ehr/iot/model/ehr/MStdDataSet.java

@@ -0,0 +1,143 @@
package com.yihu.ehr.iot.model.ehr;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
 * @author yeshijie on 2018/2/28.
 */
@JsonInclude(JsonInclude.Include.ALWAYS)
@ApiModel(description = "ehr标准数据集")
public class MStdDataSet {
    @ApiModelProperty("ID")
    private Long id;
    @ApiModelProperty("所属的文档ID. 暂时为空")
    private Long documentId;
    @ApiModelProperty("类别/业务领域")
    private Integer catalog;
    @ApiModelProperty("hashCode")
    private Integer hashCode;
    @ApiModelProperty("lang")
    private Integer lang;
    @ApiModelProperty("标准发布者")
    private Integer publisher;
    @ApiModelProperty("multiRecord")
    private Boolean multiRecord;
    @ApiModelProperty("标准参考")
    private String reference;
    @ApiModelProperty("标准规范中的版本")
    private String stdVersion;
    @ApiModelProperty("数据集编码")
    private String code;
    @ApiModelProperty("数据集名称")
    private String name;
    @ApiModelProperty("摘要")
    private String summary;
    @ApiModelProperty("innerVersionId")
    private String innerVersionId;
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    public Long getDocumentId() {
        return documentId;
    }
    public void setDocumentId(Long documentId) {
        this.documentId = documentId;
    }
    public Integer getCatalog() {
        return catalog;
    }
    public void setCatalog(Integer catalog) {
        this.catalog = catalog;
    }
    public Integer getHashCode() {
        return hashCode;
    }
    public void setHashCode(Integer hashCode) {
        this.hashCode = hashCode;
    }
    public Integer getLang() {
        return lang;
    }
    public void setLang(Integer lang) {
        this.lang = lang;
    }
    public Integer getPublisher() {
        return publisher;
    }
    public void setPublisher(Integer publisher) {
        this.publisher = publisher;
    }
    public Boolean getMultiRecord() {
        return multiRecord;
    }
    public void setMultiRecord(Boolean multiRecord) {
        this.multiRecord = multiRecord;
    }
    public String getReference() {
        return reference;
    }
    public void setReference(String reference) {
        this.reference = reference;
    }
    public String getStdVersion() {
        return stdVersion;
    }
    public void setStdVersion(String stdVersion) {
        this.stdVersion = stdVersion;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getSummary() {
        return summary;
    }
    public void setSummary(String summary) {
        this.summary = summary;
    }
    public String getInnerVersionId() {
        return innerVersionId;
    }
    public void setInnerVersionId(String innerVersionId) {
        this.innerVersionId = innerVersionId;
    }
}

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

@@ -246,6 +246,19 @@ public class CompanyService extends BaseService {
        return envelop;
    }
    /**
     * 删除企业证书
     * @param id
     * @return
     */
    public Envelop<IotCompanyCertificateVO> delCompanyCert(String id) throws IOException {
        Map<String, Object> params = new HashMap<>();
        params.put("id", id);
        HttpResponse response = HttpHelper.post(iotUrl + ServiceApi.Company.DelCompanyCert, params);
        Envelop<IotCompanyCertificateVO> envelop = objectMapper.readValue(response.getBody(),Envelop.class);
        return envelop;
    }
    /**
     * 根据营业执照号查找企业
     * @param businessLicense

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

@@ -3,7 +3,7 @@ package com.yihu.ehr.iot.service.product;
import com.yihu.ehr.constants.ErrorCode;
import com.yihu.ehr.iot.constant.ServiceApi;
import com.yihu.ehr.iot.model.ObjectResult;
import com.yihu.ehr.iot.model.ehr.MRsMetadata;
import com.yihu.ehr.iot.model.ehr.MStdDataSet;
import com.yihu.ehr.iot.service.common.BaseService;
import com.yihu.ehr.iot.util.http.HttpHelper;
import com.yihu.ehr.iot.util.http.HttpResponse;
@@ -28,26 +28,25 @@ import java.util.Map;
public class ProductService extends BaseService {
//    @Value("ehr.metadata.domain")
    private String metadataDomain;
    private String version = "5a6feb15fb05";//版本
    private String reference = "000000065a965615966b3a40c86ceba7";//标准来源
    /**
     * 测量数据（ehr资源标准-数据元）
     * 测量数据（ehr标准规范管理-平台标准-标准数据集）
     * @return
     */
    public Envelop<MRsMetadata> metadata(Integer page, Integer size, String type, String name){
        String url = "/resources/metadata";
        Envelop<MRsMetadata> envelop = new Envelop<MRsMetadata>();
    public Envelop<MStdDataSet> data_sets(Integer page, Integer size, String name){
        String url = "/std/data_sets";
        Envelop<MStdDataSet> envelop = new Envelop<MStdDataSet>();
        Map<String, Object> params = new HashMap<>();
        String filters = "valid=1;domain="+metadataDomain+";";
        String filters = "reference="+reference+";";
        if(StringUtils.isNotBlank(name)){
            filters+="name?"+name+";";
        }
        if(StringUtils.isNotBlank(type)){
            filters+="columnType?"+type+";";
        }
        params.put("filters", filters);
        params.put("page", page);
        params.put("size", size);
        params.put("version", version);
        try {
            HttpResponse response = HttpHelper.get(profileInnerUrl + url, params);
            ObjectResult result =  objectMapper.readValue(response.getBody(),ObjectResult.class);

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

@@ -59,7 +59,7 @@ app:
  oauth2InnerUrl: http://172.19.103.73:10260/   # 认证中心，获取token ehr环境
  oauth2OuterUrl: http://27.154.233.186:10260/  # 上饶-授权外网映射
service-gateway:
  iotUrl: http://172.19.103.88:8088/svr-iot/
  iotUrl: http://192.168.131.24:8088/svr-iot/
  profileInnerUrl: http://172.19.103.73:10000/api/v1.0/admin
  profileOuterUrl: http://27.154.233.186:10000/api/v1.0/admin
  portalInnerUrl: http://172.19.103.73:10280/api/v1.0/portal

common/common-entity/src/main/java/com/yihu/jw/iot/device/LocationDataDO.java

@@ -21,6 +21,8 @@ public class LocationDataDO {
    private String categoryCode;//设备类型标识
    private Integer diseaseCondition;//病情：0绿标，1黄标，2红标
    @GeoPointField
    private GeoPoint location;//经纬度
@@ -89,6 +91,13 @@ public class LocationDataDO {
        this.createTime = createTime;
    }
    public Integer getDiseaseCondition() {
        return diseaseCondition;
    }
    public void setDiseaseCondition(Integer diseaseCondition) {
        this.diseaseCondition = diseaseCondition;
    }
    public void setLocation(Double lat, Double lng) {
        GeoPoint geoPoint = new GeoPoint(lat, lng);

common/common-request-mapping/src/main/java/com/yihu/jw/rm/iot/IotRequestMapping.java

@@ -72,6 +72,7 @@ public class IotRequestMapping {
        public static final String findCompanyCertById = "findCompanyCertById";
        public static final String findCompanyCertByCompanyId = "findCompanyCertByCompanyId";
        public static final String addCompanyCert = "addCompanyCert";
        public static final String delCompanyCert = "delCompanyCert";
        public static final String changePassWord = "changePassWord";
        public static final String api_create = "company";
@@ -94,6 +95,7 @@ public class IotRequestMapping {
     */
    public static class Product {
        public static final String findProductPage = "findProductPage";
        public static final String data_sets = "data_sets";
        public static final String metadata = "metadata";
        public static final String findProductPageByCompanyId = "findProductPageByCompanyId";
        public static final String addProduct = "addProduct";

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/iot/device/IotOrderPurchaseVO.java

@@ -13,7 +13,7 @@ import java.io.Serializable;
 * @author yeshijie on 2017/12/1.
 */
@JsonInclude(JsonInclude.Include.ALWAYS)
@ApiModel(value = "设备质检计划表", description = "设备质检计划表")
@ApiModel(value = "采购清单", description = "采购清单")
public class IotOrderPurchaseVO extends BaseVO implements Serializable{
    @ApiModelProperty("订单id")

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/iot/device/IotPatientDeviceVO.java

@@ -37,6 +37,8 @@ public class IotPatientDeviceVO extends BaseVO implements Serializable {
    private String categoryCode;
    @ApiModelProperty("地址")
    private String address;
    @ApiModelProperty("病情：0绿标，1黄标，2红标")
    private Integer diseaseCondition;
    public String getPatient() {
        return patient;
@@ -125,4 +127,12 @@ public class IotPatientDeviceVO extends BaseVO implements Serializable {
    public void setCategoryCode(String categoryCode) {
        this.categoryCode = categoryCode;
    }
    public Integer getDiseaseCondition() {
        return diseaseCondition;
    }
    public void setDiseaseCondition(Integer diseaseCondition) {
        this.diseaseCondition = diseaseCondition;
    }
}

svr/svr-iot/pom.xml

@@ -60,6 +60,7 @@
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
            <!--tomcat 启动时 打开注释 start-->
            <exclusions>
                <exclusion>
                    <groupId>org.springframework.boot</groupId>
@@ -78,15 +79,18 @@
            <artifactId>tomcat-servlet-api</artifactId>
            <version>8.5.28</version>
            <scope>provided</scope>
            <!--tomcat 启动时 打开注释 end-->
        </dependency>
        <!--tomcat 启动时 注释下列配置 start-->
        <!--<dependency>-->
            <!--<groupId>org.springframework.boot</groupId>-->
            <!--<artifactId>spring-boot-starter-tomcat</artifactId>-->
        <!--</dependency>-->
        <!--tomcat 启动时 注释下列配置 end-->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-jpa</artifactId>
        </dependency>
        <!--<dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-tomcat</artifactId>
        </dependency>-->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-jdbc</artifactId>

svr/svr-iot/src/main/java/com/yihu/iot/controller/company/IotCompanyController.java

@@ -212,4 +212,19 @@ public class IotCompanyController extends EnvelopRestController {
        }
    }
    @PostMapping(value = IotRequestMapping.Company.delCompanyCert)
    @ApiOperation(value = "删除企业证书", notes = "删除企业证书")
    public Envelop<IotCompanyCertificateVO> delCompanyCert(@ApiParam(name = "id", value = "id", defaultValue = "")
                                                           @RequestParam(value = "id", required = true)String id) {
        try {
            iotCompanyCertificateService.delCompanyCert(id);
            return Envelop.getSuccess(IotRequestMapping.Common.message_success_create);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
        }
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/controller/device/IotDeviceOrderController.java

@@ -16,7 +16,6 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
@@ -34,9 +33,9 @@ public class IotDeviceOrderController extends EnvelopRestController{
    @Autowired
    private IotCompanyService iotCompanyService;
    @PostMapping(value = IotRequestMapping.DeviceOrder.createOrder, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = IotRequestMapping.DeviceOrder.createOrder)
    @ApiOperation(value = "创建设备订单", notes = "创建设备订单")
    public Envelop<IotOrderVO> create(@ApiParam(name = "json_data", value = "", defaultValue = "")
    public Envelop<IotOrderVO> create(@ApiParam(name = "jsonData", value = "", defaultValue = "")
                          @RequestParam String jsonData) {
        try {
            IotOrderVO iotOrderVO = toEntity(jsonData, IotOrderVO.class);

svr/svr-iot/src/main/java/com/yihu/iot/controller/product/IotProductController.java

@@ -97,7 +97,8 @@ public class IotProductController extends EnvelopRestController {
            if(size == null){
                size = 10;
            }
            String filters = "supplierId="+companyId+";productClassify=1;del=1";
//            String filters = "supplierId="+companyId+";productClassify=1;del=1";
            String filters = "supplierId="+companyId+";del=1";
            String semicolon = ";";
            if(StringUtils.isNotBlank(name)){
                filters += semicolon + "name?"+name;

svr/svr-iot/src/main/java/com/yihu/iot/service/company/IotCompanyCertificateService.java

@@ -74,19 +74,44 @@ public class IotCompanyCertificateService extends BaseJpaService<IotCompanyCerti
    }
    /**
     * 新增
     * 新增/修改
     * @param iotCompanyCertificateDO
     * @return
     */
    public IotCompanyCertificateDO create(IotCompanyCertificateDO iotCompanyCertificateDO) {
        iotCompanyCertificateDO.setSaasId(getCode());
        iotCompanyCertificateDO.setDel(1);
        iotCompanyCertificateDao.save(iotCompanyCertificateDO);
        if(StringUtils.isNotBlank(iotCompanyCertificateDO.getId())){
            //修改
            IotCompanyCertificateDO old = iotCompanyCertificateDao.findById(iotCompanyCertificateDO.getId());
            old.setManufacturerBusinessLicense(iotCompanyCertificateDO.getManufacturerBusinessLicense());
            old.setManufacturerName(iotCompanyCertificateDO.getManufacturerName());
            old.setManufacturerId(iotCompanyCertificateDO.getManufacturerId());
            old.setCompanyName(iotCompanyCertificateDO.getCompanyName());
            old.setCompanyId(iotCompanyCertificateDO.getCompanyId());
            old.setCompanyBusinessLicense(iotCompanyCertificateDO.getCompanyBusinessLicense());
            old.setStartTime(iotCompanyCertificateDO.getStartTime());
            old.setEndTime(iotCompanyCertificateDO.getEndTime());
            old.setCertificateOfAuthorizationImg(iotCompanyCertificateDO.getCertificateOfAuthorizationImg());
            iotCompanyCertificateDao.save(old);
            return old;
        }else {
            //新增
            iotCompanyCertificateDO.setSaasId(getCode());
            iotCompanyCertificateDO.setDel(1);
            iotCompanyCertificateDao.save(iotCompanyCertificateDO);
        }
        return iotCompanyCertificateDO;
    }
    /**
     * 删除
     * @param id
     */
    public void delCompanyCert(String id){
        IotCompanyCertificateDO companyCert = iotCompanyCertificateDao.findById(id);
        companyCert.setDel(0);
        iotCompanyCertificateDao.save(companyCert);
    }
    public List<IotCompanyCertificateVO> convertToModels(List<IotCompanyCertificateDO> iotCompanyCertificateDOList,List<IotCompanyCertificateVO> voList){
        iotCompanyCertificateDOList.forEach(one -> {
            IotCompanyCertificateVO target = new IotCompanyCertificateVO();

svr/svr-iot/src/main/java/com/yihu/iot/service/company/IotCompanyService.java

@@ -327,7 +327,23 @@ public class IotCompanyService extends BaseJpaService<IotCompanyDO,IotCompanyDao
            iotCompanyCertificateChangeRecordDao.save(recordDOList);
        }
        iotCompanyDao.save(iotCompany);
        //修改企业记录
        iotCompanyOld.setName(iotCompany.getName());
        iotCompanyOld.setIsThreeInOne(iotCompany.getIsThreeInOne());
        iotCompanyOld.setBusinessLicense(iotCompany.getBusinessLicense());
        iotCompanyOld.setBusinessStartTime(iotCompany.getBusinessStartTime());
        iotCompanyOld.setBusinessEndTime(iotCompany.getBusinessEndTime());
        iotCompanyOld.setOrganizationAddress(iotCompany.getOrganizationAddress());
        iotCompanyOld.setOfficePhone(iotCompany.getOfficePhone());
        iotCompanyOld.setContactsName(iotCompany.getContactsName());
        iotCompanyOld.setContactsMobile(iotCompany.getContactsMobile());
        iotCompanyOld.setContactsIdcard(iotCompany.getContactsIdcard());
        iotCompanyOld.setContactsEmail(iotCompany.getContactsEmail());
        iotCompanyOld.setBusinessLicenseImg(iotCompany.getBusinessLicenseImg());
        iotCompanyOld.setOrganizationCodeImg(iotCompany.getOrganizationCodeImg());
        iotCompanyOld.setTaxRegistrationImg(iotCompany.getTaxRegistrationImg());
        iotCompanyOld.setContactsIdcardImg(iotCompany.getContactsIdcardImg());
        iotCompanyDao.save(iotCompanyOld);
    }
    /**

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

@@ -61,6 +61,7 @@ public class IotPatientDeviceService extends BaseJpaService<IotPatientDeviceDO,I
            dataDTO.setCategoryCode(deviceVO.getCategoryCode());
            dataDTO.setDeviceSn(deviceVO.getDeviceSn());
            dataDTO.setIdCard(deviceVO.getIdcard());
            dataDTO.setDiseaseCondition(deviceVO.getDiseaseCondition());
            Map<String, String> json = LatitudeUtils.getGeocoderLatitude(deviceVO.getAddress().replace("G.", "").replace("（糖友网）", "").replace("（高友网）", ""));
            if (json == null) {

web-gateway/src/main/java/com/yihu/jw/controller/iot/company/IotCompanyController.java

@@ -136,4 +136,11 @@ public class IotCompanyController extends EnvelopRestController {
        return iotCompanyFeign.addCompanyCert(jsonData);
    }
    @PostMapping(value = IotRequestMapping.Company.delCompanyCert)
    @ApiOperation(value = "删除企业证书", notes = "删除企业证书")
    public Envelop<IotCompanyCertificateVO> delCompanyCert(@ApiParam(name = "id", value = "id", defaultValue = "")
                                                           @RequestParam(value = "id", required = true)String id) {
        return iotCompanyFeign.delCompanyCert(id);
    }
}

web-gateway/src/main/java/com/yihu/jw/controller/iot/device/IotDeviceOrderController.java

@@ -12,7 +12,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
/**
@@ -25,10 +24,10 @@ public class IotDeviceOrderController extends EnvelopRestController{
    @Autowired
    private IotDeviceOrderFeign iotDeviceOrderFeign;
    @PostMapping(value = IotRequestMapping.DeviceOrder.createOrder, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = IotRequestMapping.DeviceOrder.createOrder)
    @ApiOperation(value = "创建设备订单", notes = "创建设备订单")
    public Envelop<IotOrderVO> create(@ApiParam(name = "json_data", value = "", defaultValue = "")
                          @RequestParam String jsonData) {
    public Envelop<IotOrderVO> create(@ApiParam(name = "jsonData", value = "", defaultValue = "")
                          @RequestParam(value = "jsonData", required = true) String jsonData) {
        return iotDeviceOrderFeign.create(jsonData);
    }

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/iot/company/IotCompanyFallbackFactory.java

@@ -106,6 +106,13 @@ public class IotCompanyFallbackFactory implements FallbackFactory<IotCompanyFeig
                return null;
            }
            @Override
            public Envelop<IotCompanyCertificateVO> delCompanyCert(@RequestParam(value = "id", required = true)String id) {
                tracer.getCurrentSpan().logEvent("删除企业证书失败:原因:" + e.getMessage());
                tracer.getCurrentSpan().logEvent("id:" + id);
                return null;
            }
        };
    }

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/iot/device/IotDeviceOrderFallbackFactory.java

@@ -9,7 +9,6 @@ import feign.hystrix.FallbackFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.sleuth.Tracer;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
/**
@@ -26,7 +25,7 @@ public class IotDeviceOrderFallbackFactory implements FallbackFactory<IotDeviceO
        return new IotDeviceOrderFeign() {
            @Override
            public Envelop<IotOrderVO> create(@RequestBody String jsonData) {
            public Envelop<IotOrderVO> create(@RequestParam(value = "jsonData", required = true) String jsonData) {
                tracer.getCurrentSpan().logEvent("创建设备订单失败:原因:" + e.getMessage());
                tracer.getCurrentSpan().logEvent("jsonData:" + jsonData);
                return null;

web-gateway/src/main/java/com/yihu/jw/feign/iot/company/IotCompanyFeign.java

@@ -61,4 +61,6 @@ public interface IotCompanyFeign {
    @PostMapping(value = IotRequestMapping.Company.addCompanyCert)
    public Envelop<IotCompanyCertificateVO> addCompanyCert(@RequestParam(value = "jsonData", required = true)String jsonData);
    @PostMapping(value = IotRequestMapping.Company.delCompanyCert)
    public Envelop<IotCompanyCertificateVO> delCompanyCert(@RequestParam(value = "id", required = true)String id);
}

web-gateway/src/main/java/com/yihu/jw/feign/iot/device/IotDeviceOrderFeign.java

@@ -8,7 +8,6 @@ import com.yihu.jw.restmodel.iot.device.IotOrderPurchaseVO;
import com.yihu.jw.restmodel.iot.device.IotOrderVO;
import com.yihu.jw.rm.iot.IotRequestMapping;
import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
/**
@@ -21,8 +20,8 @@ import org.springframework.web.bind.annotation.*;
@RequestMapping(IotRequestMapping.Common.order)
public interface IotDeviceOrderFeign {
    @PostMapping(value = IotRequestMapping.DeviceOrder.createOrder, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    public Envelop<IotOrderVO> create(@RequestBody String jsonData);
    @PostMapping(value = IotRequestMapping.DeviceOrder.createOrder)
    public Envelop<IotOrderVO> create(@RequestParam(value = "jsonData", required = true) String jsonData);
    @GetMapping(value = IotRequestMapping.DeviceOrder.findById)
    public Envelop<IotDeviceOrderVO> findByCode(@RequestParam(value = "id", required = true) String id);