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

base/common-cache/pom.xml

@@ -10,8 +10,8 @@
        <relativePath>../../common-lib-parent-pom/pom.xml</relativePath>
    </parent>
    <groupId>common-customCache</groupId>
    <artifactId>common-customCache</artifactId>
    <groupId>common-cache</groupId>
    <artifactId>common-cache</artifactId>
    <version>1.0.0</version>
    <dependencies>

base/common-data-mysql/src/main/java/com/yihu/base/mysql/query/BaseJpaService.java

@@ -25,6 +25,7 @@ import java.text.ParseException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
/**
 * Service基础类。此类基于Spring Data JPA进行封装（Spring Data JPA又是基于JPA封装，EHR平台使用Hibernate作为JPA实现者）。
@@ -53,6 +54,10 @@ public class BaseJpaService<T, R> {
        }
    }
    public String getCode() {
        return UUID.randomUUID().toString().replaceAll("-", "");
    }
    public T save(T entity) {
        return (T) getRepository().save(entity);
    }
@@ -81,11 +86,11 @@ public class BaseJpaService<T, R> {
    }
    public List search(String fields, String filters, String sorts, Integer page, Integer size) throws ParseException {
        if(filters!=null){
            filters = "status<>-1;"+filters;
        }else{
            filters="status<>-1;";
        }
//        if(filters!=null){
//            filters = "status<>-1;"+filters;
//        }else{
//            filters="status<>-1;";
//        }
        URLQueryParser queryParser = createQueryParser(fields, filters, sorts);
        CriteriaQuery query = queryParser.makeCriteriaQuery();
@@ -99,11 +104,11 @@ public class BaseJpaService<T, R> {
                .getResultList();
    }
    public List search(String fields, String filters, String sorts) throws ParseException {
        if(filters!=null){
            filters = "status<>-1;"+filters;
        }else{
            filters="status<>-1;";
        }
//        if(filters!=null){
//            filters = "status<>-1;"+filters;
//        }else{
//            filters="status<>-1;";
//        }
        URLQueryParser queryParser = createQueryParser(fields, filters, sorts);
        CriteriaQuery query = queryParser.makeCriteriaQuery();
@@ -127,11 +132,11 @@ public class BaseJpaService<T, R> {
    }
    public List search(String filters,String sorts) throws ParseException {
        if(filters!=null){
            filters = "status<>-1;"+filters;
        }else{
            filters="status<>-1;";
        }
//        if(filters!=null){
//            filters = "status<>-1;"+filters;
//        }else{
//            filters="status<>-1;";
//        }
        URLQueryParser queryParser = createQueryParser("", filters, sorts);
        CriteriaQuery query = queryParser.makeCriteriaQuery();
@@ -141,11 +146,11 @@ public class BaseJpaService<T, R> {
    }
    public long getCount(String filters) throws ParseException {
        if(filters!=null){
            filters = "status<>-1;"+filters;
        }else{
            filters="status<>-1;";
        }
//        if(filters!=null){
//            filters = "status<>-1;"+filters;
//        }else{
//            filters="status<>-1;";
//        }
        URLQueryParser queryParser = createQueryParser(filters);
        CriteriaQuery query = queryParser.makeCriteriaCountQuery();

common/common-entity/src/main/java/com/yihu/jw/iot/supplier/IotSupplyDeviceDO.java

@@ -24,7 +24,7 @@ public class IotSupplyDeviceDO extends IdEntityWithOperation implements Serializ
    private String deviceModel;//型号
    @Column(name = "devie_type")
    private String deviceType;//设备种类
    private String deviceType;//设备种类 1血压计、2血糖仪
    @Column(name = "is_composite")
    private Integer isComposite;//是否复合型

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

@@ -6,8 +6,24 @@ package com.yihu.jw.rm.iot;
public class IotRequestMapping {
    public static final String api_iot_common = "svr-iot";
    public static final Integer api_iot_fail = -1;
    //协议模块常量
    /**
     * 文件上传模块常量
     */
    public static class FileUpload{
        public static final String api_upload_stream = "uploadStream";//文件流上传
        public static final String api_upload_string = "uploadString";//base64字符串上传
        public static final String message_success_upload = "上传成功";
        public static final String message_fail_upload = "上传失败";
        public static final String message_fail_jsonData_is_null = "jsonData is null";
    }
    /**
     * 供应商模块常量
     */
    public static class DeviceSupplier {
        public static final String api_create = "deviceSupplier";
        public static final String api_delete = "deviceSupplier";
@@ -23,12 +39,204 @@ public class IotRequestMapping {
        public static final String message_success_find_functions = "deviceSupplier find success";
        public static final String message_fail_name_is_null = "name is null";
        public static final String message_fail_price_is_null = "price is null";
        public static final String message_fail_iotDeviceSupplier_is_no_exist = "iotDeviceSupplier is no exist";
        public static final String message_fail_id_no_exist = "id no exist";
        public static final String message_fail_status_is_null = "status is null";
        public static final String message_fail_id_is_null = "id is null";
        public static final String message_fail_id_exist = "id exist";
        public static final String message_fail_saasId_is_null = "saasId is null";
        public static final String message_fail_supplierName_is_null = "供应商名称不能为空";
        public static final String message_fail_organizationCode_is_null = "组织机构代码/统一社会信用代码不能为空";
        public static final String message_fail_contactsName_is_null = "联系人姓名不能为空";
        public static final String message_fail_contactsMobile_is_null = "联系人手机号码不能为空";
        public static final String message_fail_contactsPhone_is_null = "联系人座机不能为空";
        public static final String message_fail_contactsIdcard_is_null = "联系人身份证号不能为空";
        public static final String message_fail_type_is_null = "请选择供应商类型";
        public static final String message_fail_organizationCodeImg_is_null = "请上传组织机构代码证照片";
        public static final String message_fail_contactsIdcardImg_is_null = "请上传联系人身份证照片";
    }
    /**
     * 供应设备常量模块
     */
    public static class SupplyDevice{
        public static final String api_create = "supplyDevice";
        public static final String api_delete = "supplyDevice";
        public static final String api_getById = "getSupplyDeviceById";
        public static final String api_update = "supplyDevice";
        public static final String api_queryPage = "querySupplyDevicePage";
        public static final String api_getList = "getSupplierDeviceList";
        public static final String message_success_update = "supplyDevice update success";
        public static final String message_success_delete = "supplyDevice delete success";
        public static final String message_success_find = "supplyDevice find success";
        public static final String message_success_create = "supplyDevice create success";
        public static final String message_success_find_functions = "supplyDevice find success";
        public static final String message_fail_name_is_null = "name is null";
        public static final String message_fail_iotSupplyDevice_is_no_exist = "iotSupplyDevice is no exist";
        public static final String message_fail_id_no_exist = "id no exist";
        public static final String message_fail_status_is_null = "status is null";
        public static final String message_fail_id_is_null = "id is null";
        public static final String message_fail_id_exist = "id exist";
        public static final String message_fail_saasId_is_null = "saasId is null";
    }
    /**
     * 供应设备数据类型
     */
    public static class SupplyDeviceDataType{
        public static final String api_create = "supplyDeviceDataType";
        public static final String api_delete = "supplyDeviceDataType";
        public static final String api_getById = "getSupplyDeviceDataTypeById";
        public static final String api_update = "supplyDeviceDataType";
        public static final String api_queryPage = "querySupplyDeviceDataTypePage";
        public static final String api_getList = "getSupplyDeviceDataTypeList";
        public static final String message_success_update = "supplyDeviceDataType update success";
        public static final String message_success_delete = "supplyDeviceDataType delete success";
        public static final String message_success_find = "supplyDeviceDataType find success";
        public static final String message_success_create = "supplyDeviceDataType create success";
        public static final String message_success_find_functions = "supplyDeviceDataType find success";
        public static final String message_fail_name_is_null = "name is null";
        public static final String message_fail_iotSupplyDeviceDataType_is_no_exist = "iotSupplyDeviceDataType is no exist";
        public static final String message_fail_id_no_exist = "id no exist";
        public static final String message_fail_status_is_null = "status is null";
        public static final String message_fail_id_is_null = "id is null";
        public static final String message_fail_id_exist = "id exist";
        public static final String message_fail_saasId_is_null = "saasId is null";
    }
    /**
     * 设备字典模块常量
     */
    public static class DeviceDict{
        public static final String api_create = "deviceDict";
        public static final String api_delete = "deviceDict";
        public static final String api_getById = "getDeviceDictById";
        public static final String api_update = "deviceDict";
        public static final String api_queryPage = "queryDeviceDictPage";
        public static final String api_getList = "getDeviceDictList";
        public static final String message_success_update = "deviceDict update success";
        public static final String message_success_delete = "deviceDict delete success";
        public static final String message_success_find = "deviceDict find success";
        public static final String message_success_create = "deviceDict create success";
        public static final String message_success_find_functions = "deviceDict find success";
        public static final String message_fail_name_is_null = "name is null";
        public static final String message_fail_iotDeviceDict_is_no_exist = "iotDeviceDict is no exist";
        public static final String message_fail_id_no_exist = "id no exist";
        public static final String message_fail_status_is_null = "status is null";
        public static final String message_fail_id_is_null = "id is null";
        public static final String message_fail_id_exist = "id exist";
        public static final String message_fail_saasId_is_null = "saasId is null";
    }
    /**
     * 设备模块常量
     */
    public static class Device{
        public static final String api_create = "device";
        public static final String api_delete = "device";
        public static final String api_getById = "getDeviceById";
        public static final String api_update = "device";
        public static final String api_queryPage = "queryDevicePage";
        public static final String api_getList = "getDeviceList";
        public static final String message_success_update = "device update success";
        public static final String message_success_delete = "device delete success";
        public static final String message_success_find = "device find success";
        public static final String message_success_create = "device create success";
        public static final String message_success_find_functions = "device find success";
        public static final String message_fail_name_is_null = "name is null";
        public static final String message_fail_iotDevice_is_no_exist = "iotDevice is no exist";
        public static final String message_fail_id_no_exist = "id no exist";
        public static final String message_fail_status_is_null = "status is null";
        public static final String message_fail_id_is_null = "id is null";
        public static final String message_fail_id_exist = "id exist";
        public static final String message_fail_saasId_is_null = "saasId is null";
    }
    /**
     * 设备订单模块常量
     */
    public static class DeviceOrder{
        public static final String api_create = "deviceOrder";
        public static final String api_delete = "deviceOrder";
        public static final String api_getById = "getDeviceOrderById";
        public static final String api_update = "deviceOrder";
        public static final String api_queryPage = "queryDeviceOrderPage";
        public static final String api_getList = "getDeviceOrderList";
        public static final String message_success_update = "deviceOrder update success";
        public static final String message_success_delete = "deviceOrder delete success";
        public static final String message_success_find = "deviceOrder find success";
        public static final String message_success_create = "deviceOrder create success";
        public static final String message_success_find_functions = "deviceOrder find success";
        public static final String message_fail_name_is_null = "name is null";
        public static final String message_fail_iotDeviceOrder_is_no_exist = "iotDeviceOrder is no exist";
        public static final String message_fail_id_no_exist = "id no exist";
        public static final String message_fail_status_is_null = "status is null";
        public static final String message_fail_id_is_null = "id is null";
        public static final String message_fail_id_exist = "id exist";
        public static final String message_fail_saasId_is_null = "saasId is null";
    }
    /**
     * 订单采购模块常量
     */
    public static class DevicePurchase{
        public static final String api_create = "devicePurchase";
        public static final String api_delete = "devicePurchase";
        public static final String api_getById = "getDevicePurchaseById";
        public static final String api_update = "devicePurchase";
        public static final String api_queryPage = "queryDevicePurchasePage";
        public static final String api_getList = "getDevicePurchaseList";
        public static final String message_success_update = "devicePurchase update success";
        public static final String message_success_delete = "devicePurchase delete success";
        public static final String message_success_find = "devicePurchase find success";
        public static final String message_success_create = "devicePurchase create success";
        public static final String message_success_find_functions = "devicePurchase find success";
        public static final String message_fail_name_is_null = "name is null";
        public static final String message_fail_iotDevicePurchase_is_no_exist = "iotDevicePurchase is no exist";
        public static final String message_fail_id_no_exist = "id no exist";
        public static final String message_fail_status_is_null = "status is null";
        public static final String message_fail_id_is_null = "id is null";
        public static final String message_fail_id_exist = "id exist";
        public static final String message_fail_saasId_is_null = "saasId is null";
    }
    /**
     * 设备质检模块常量
     */
    public static class DeviceQualityInspectionPlan{
        public static final String api_create = "deviceQualityInspectionPlan";
        public static final String api_delete = "deviceQualityInspectionPlan";
        public static final String api_getById = "getDeviceQualityInspectionPlanById";
        public static final String api_update = "deviceQualityInspectionPlan";
        public static final String api_queryPage = "queryDeviceQualityInspectionPlanPage";
        public static final String api_getList = "getDeviceQualityInspectionPlanList";
        public static final String message_success_update = "deviceQualityInspectionPlan update success";
        public static final String message_success_delete = "deviceQualityInspectionPlan delete success";
        public static final String message_success_find = "deviceQualityInspectionPlan find success";
        public static final String message_success_create = "deviceQualityInspectionPlan create success";
        public static final String message_success_find_functions = "deviceQualityInspectionPlan find success";
        public static final String message_fail_name_is_null = "name is null";
        public static final String message_fail_iotDeviceQualityInspectionPlan_is_no_exist = "iotDeviceQualityInspectionPlan is no exist";
        public static final String message_fail_id_no_exist = "id no exist";
        public static final String message_fail_status_is_null = "status is null";
        public static final String message_fail_id_is_null = "id is null";
        public static final String message_fail_id_exist = "id exist";
        public static final String message_fail_saasId_is_null = "saasId is null";
    }
}

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

@@ -0,0 +1,146 @@
package com.yihu.jw.restmodel.iot.device;
import java.io.Serializable;
import java.util.Date;
/**
 * @author yeshijie on 2017/12/1.
 */
public class IotDeviceOrderVO implements Serializable{
    private String saasId;
    private String orderNo;//订单编号
    private String orderStatus;//订单状态
    private Date purchaseTime;//采购时间
    private String orderContractName;//订单合同名称
    private String orderContractUrl;//订单合同链接
    private String purchaseUnitCode;//采购单位编码
    private String purchaseUnitName;//采购单位名称
    private String purchaserName;//采购负责人
    private String purchaserPhone;//采购负责人联系方式
    private String supplierCode;//供应商code
    private String supplierName;//供应商名称
    private String supplierType;//供应商类型
    private String supplierLeader;//供应商负责人
    private String supplierLeaderPhone;//供应商负责人联系方式
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public String getOrderNo() {
        return orderNo;
    }
    public void setOrderNo(String orderNo) {
        this.orderNo = orderNo;
    }
    public String getOrderStatus() {
        return orderStatus;
    }
    public void setOrderStatus(String orderStatus) {
        this.orderStatus = orderStatus;
    }
    public Date getPurchaseTime() {
        return purchaseTime;
    }
    public void setPurchaseTime(Date purchaseTime) {
        this.purchaseTime = purchaseTime;
    }
    public String getOrderContractName() {
        return orderContractName;
    }
    public void setOrderContractName(String orderContractName) {
        this.orderContractName = orderContractName;
    }
    public String getOrderContractUrl() {
        return orderContractUrl;
    }
    public void setOrderContractUrl(String orderContractUrl) {
        this.orderContractUrl = orderContractUrl;
    }
    public String getPurchaseUnitCode() {
        return purchaseUnitCode;
    }
    public void setPurchaseUnitCode(String purchaseUnitCode) {
        this.purchaseUnitCode = purchaseUnitCode;
    }
    public String getPurchaseUnitName() {
        return purchaseUnitName;
    }
    public void setPurchaseUnitName(String purchaseUnitName) {
        this.purchaseUnitName = purchaseUnitName;
    }
    public String getPurchaserName() {
        return purchaserName;
    }
    public void setPurchaserName(String purchaserName) {
        this.purchaserName = purchaserName;
    }
    public String getPurchaserPhone() {
        return purchaserPhone;
    }
    public void setPurchaserPhone(String purchaserPhone) {
        this.purchaserPhone = purchaserPhone;
    }
    public String getSupplierCode() {
        return supplierCode;
    }
    public void setSupplierCode(String supplierCode) {
        this.supplierCode = supplierCode;
    }
    public String getSupplierName() {
        return supplierName;
    }
    public void setSupplierName(String supplierName) {
        this.supplierName = supplierName;
    }
    public String getSupplierType() {
        return supplierType;
    }
    public void setSupplierType(String supplierType) {
        this.supplierType = supplierType;
    }
    public String getSupplierLeader() {
        return supplierLeader;
    }
    public void setSupplierLeader(String supplierLeader) {
        this.supplierLeader = supplierLeader;
    }
    public String getSupplierLeaderPhone() {
        return supplierLeaderPhone;
    }
    public void setSupplierLeaderPhone(String supplierLeaderPhone) {
        this.supplierLeaderPhone = supplierLeaderPhone;
    }
}

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

@@ -0,0 +1,145 @@
package com.yihu.jw.restmodel.iot.device;
import java.io.Serializable;
/**
 * @author yeshijie on 2017/12/1.
 */
public class IotDevicePurchaseVO implements Serializable{
    private String saasId;
    private String orderCode;//订单code
    private String orderNo;//订单编号
    private String supplierCode;//供应商code
    private String supplierName;//供应商名称
    private String deviceName;//采购设备名称
    private String deviceModel;//采购设备型号
    private String deviceType;//设备种类
    private String manufacturerCode;//厂商code
    private String manufacturerName;//厂商名称
    private Long purchaseNum;//采购数量
    private String qualityCycle;//质检周期
    private Long associatedNum;//已关联设备数量
    private Long unassociatedNum;//未关联设备数量
    private Integer del;//删除标志
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public String getOrderCode() {
        return orderCode;
    }
    public void setOrderCode(String orderCode) {
        this.orderCode = orderCode;
    }
    public String getOrderNo() {
        return orderNo;
    }
    public void setOrderNo(String orderNo) {
        this.orderNo = orderNo;
    }
    public String getSupplierCode() {
        return supplierCode;
    }
    public void setSupplierCode(String supplierCode) {
        this.supplierCode = supplierCode;
    }
    public String getSupplierName() {
        return supplierName;
    }
    public void setSupplierName(String supplierName) {
        this.supplierName = supplierName;
    }
    public String getDeviceName() {
        return deviceName;
    }
    public void setDeviceName(String deviceName) {
        this.deviceName = deviceName;
    }
    public String getDeviceModel() {
        return deviceModel;
    }
    public void setDeviceModel(String deviceModel) {
        this.deviceModel = deviceModel;
    }
    public String getDeviceType() {
        return deviceType;
    }
    public void setDeviceType(String deviceType) {
        this.deviceType = deviceType;
    }
    public String getManufacturerCode() {
        return manufacturerCode;
    }
    public void setManufacturerCode(String manufacturerCode) {
        this.manufacturerCode = manufacturerCode;
    }
    public String getManufacturerName() {
        return manufacturerName;
    }
    public void setManufacturerName(String manufacturerName) {
        this.manufacturerName = manufacturerName;
    }
    public Long getPurchaseNum() {
        return purchaseNum;
    }
    public void setPurchaseNum(Long purchaseNum) {
        this.purchaseNum = purchaseNum;
    }
    public String getQualityCycle() {
        return qualityCycle;
    }
    public void setQualityCycle(String qualityCycle) {
        this.qualityCycle = qualityCycle;
    }
    public Long getAssociatedNum() {
        return associatedNum;
    }
    public void setAssociatedNum(Long associatedNum) {
        this.associatedNum = associatedNum;
    }
    public Long getUnassociatedNum() {
        return unassociatedNum;
    }
    public void setUnassociatedNum(Long unassociatedNum) {
        this.unassociatedNum = unassociatedNum;
    }
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
}

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

@@ -0,0 +1,146 @@
package com.yihu.jw.restmodel.iot.device;
import java.io.Serializable;
import java.util.Date;
/**
 * @author yeshijie on 2017/12/1.
 */
public class IotDeviceQualityInspectionPlanVO implements Serializable{
    private String saasId;
    private String purchaseCode;//采购code
    private String orderCode;//订单code
    private String orderNo;//订单编号
    private String deviceCode;//设备code
    private String deviceName;//设备名称
    private String deviceModel;//设备型号
    private String deviceType;//设备种类
    private Long purchaseNum;//采购数量
    private String qualityLeader;//质检负责人
    private String qualityLeaderPhone;//质检负责人联系方式
    private Date planTime;//计划质检时间
    private Date actualTime;//实际质检时间
    private String status;//质检状态(1未检，2已检)
    private Integer del;//删除标志
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public String getPurchaseCode() {
        return purchaseCode;
    }
    public void setPurchaseCode(String purchaseCode) {
        this.purchaseCode = purchaseCode;
    }
    public String getOrderCode() {
        return orderCode;
    }
    public void setOrderCode(String orderCode) {
        this.orderCode = orderCode;
    }
    public String getOrderNo() {
        return orderNo;
    }
    public void setOrderNo(String orderNo) {
        this.orderNo = orderNo;
    }
    public String getDeviceCode() {
        return deviceCode;
    }
    public void setDeviceCode(String deviceCode) {
        this.deviceCode = deviceCode;
    }
    public String getDeviceName() {
        return deviceName;
    }
    public void setDeviceName(String deviceName) {
        this.deviceName = deviceName;
    }
    public String getDeviceModel() {
        return deviceModel;
    }
    public void setDeviceModel(String deviceModel) {
        this.deviceModel = deviceModel;
    }
    public String getDeviceType() {
        return deviceType;
    }
    public void setDeviceType(String deviceType) {
        this.deviceType = deviceType;
    }
    public Long getPurchaseNum() {
        return purchaseNum;
    }
    public void setPurchaseNum(Long purchaseNum) {
        this.purchaseNum = purchaseNum;
    }
    public String getQualityLeader() {
        return qualityLeader;
    }
    public void setQualityLeader(String qualityLeader) {
        this.qualityLeader = qualityLeader;
    }
    public String getQualityLeaderPhone() {
        return qualityLeaderPhone;
    }
    public void setQualityLeaderPhone(String qualityLeaderPhone) {
        this.qualityLeaderPhone = qualityLeaderPhone;
    }
    public Date getPlanTime() {
        return planTime;
    }
    public void setPlanTime(Date planTime) {
        this.planTime = planTime;
    }
    public Date getActualTime() {
        return actualTime;
    }
    public void setActualTime(Date actualTime) {
        this.actualTime = actualTime;
    }
    public String getStatus() {
        return status;
    }
    public void setStatus(String status) {
        this.status = status;
    }
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
}

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

@@ -0,0 +1,191 @@
package com.yihu.jw.restmodel.iot.device;
import java.io.Serializable;
import java.util.Date;
/**
 * @author yeshijie on 2017/12/1.
 */
public class IotDeviceVO implements Serializable {
    private String saasId;
    private String code;
    private String name;//设备名称
    private String deviceModel;//设备型号
    private String deviceSn;//设备sn码
    private Integer isComposite;//是否复合型(1是，0否即设备为单一功能)
    private Integer isPlatform;//是否平台型(1是，0否)
    private String deviceType;//设备种类
    private String deviceSource;//设备来源(1采购订单关联,2居民绑定,3管理员新增)
    private String supplierCode;//供应商code
    private String supplierName;//供应商名称
    private String manufacturerCode;//厂商code
    private String manufacturerName;//厂商名称
    private String orderCode;//订单code
    private String orderNo;//订单编号
    private String status;//设备状态(正常、报废、检修)
    private Date nextQualityTime;//下次质检时间
    private String purchaseCode;//采购code
    private String simNo;//sim卡号
    private Integer del;//删除标志(1有效，0删除)
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    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 getDeviceModel() {
        return deviceModel;
    }
    public void setDeviceModel(String deviceModel) {
        this.deviceModel = deviceModel;
    }
    public String getDeviceSn() {
        return deviceSn;
    }
    public void setDeviceSn(String deviceSn) {
        this.deviceSn = deviceSn;
    }
    public Integer getIsComposite() {
        return isComposite;
    }
    public void setIsComposite(Integer isComposite) {
        this.isComposite = isComposite;
    }
    public Integer getIsPlatform() {
        return isPlatform;
    }
    public void setIsPlatform(Integer isPlatform) {
        this.isPlatform = isPlatform;
    }
    public String getDeviceType() {
        return deviceType;
    }
    public void setDeviceType(String deviceType) {
        this.deviceType = deviceType;
    }
    public String getDeviceSource() {
        return deviceSource;
    }
    public void setDeviceSource(String deviceSource) {
        this.deviceSource = deviceSource;
    }
    public String getSupplierCode() {
        return supplierCode;
    }
    public void setSupplierCode(String supplierCode) {
        this.supplierCode = supplierCode;
    }
    public String getSupplierName() {
        return supplierName;
    }
    public void setSupplierName(String supplierName) {
        this.supplierName = supplierName;
    }
    public String getManufacturerCode() {
        return manufacturerCode;
    }
    public void setManufacturerCode(String manufacturerCode) {
        this.manufacturerCode = manufacturerCode;
    }
    public String getManufacturerName() {
        return manufacturerName;
    }
    public void setManufacturerName(String manufacturerName) {
        this.manufacturerName = manufacturerName;
    }
    public String getOrderCode() {
        return orderCode;
    }
    public void setOrderCode(String orderCode) {
        this.orderCode = orderCode;
    }
    public String getOrderNo() {
        return orderNo;
    }
    public void setOrderNo(String orderNo) {
        this.orderNo = orderNo;
    }
    public String getStatus() {
        return status;
    }
    public void setStatus(String status) {
        this.status = status;
    }
    public Date getNextQualityTime() {
        return nextQualityTime;
    }
    public void setNextQualityTime(Date nextQualityTime) {
        this.nextQualityTime = nextQualityTime;
    }
    public String getPurchaseCode() {
        return purchaseCode;
    }
    public void setPurchaseCode(String purchaseCode) {
        this.purchaseCode = purchaseCode;
    }
    public String getSimNo() {
        return simNo;
    }
    public void setSimNo(String simNo) {
        this.simNo = simNo;
    }
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/iot/dict/IotDeviceDictVO.java

@@ -0,0 +1,66 @@
package com.yihu.jw.restmodel.iot.dict;
import java.io.Serializable;
/**
 * @author yeshijie on 2017/12/1.
 */
public class IotDeviceDictVO implements Serializable {
    private String saasId;
    private String deviceType;//设备种类
    private String name;//设备种类名称
    private String dataType;//测量数据种类
    private String dataTypeName;//测量数据种类名称
    private Integer del;//删除标志
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public String getDeviceType() {
        return deviceType;
    }
    public void setDeviceType(String deviceType) {
        this.deviceType = deviceType;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getDataType() {
        return dataType;
    }
    public void setDataType(String dataType) {
        this.dataType = dataType;
    }
    public String getDataTypeName() {
        return dataTypeName;
    }
    public void setDataTypeName(String dataTypeName) {
        this.dataTypeName = dataTypeName;
    }
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/iot/supplier/IotDeviceSupplierVO.java

@@ -0,0 +1,154 @@
package com.yihu.jw.restmodel.iot.supplier;
import java.io.Serializable;
/**
 * @author yeshijie on 2017/12/1.
 */
public class IotDeviceSupplierVO implements Serializable{
    private String saasId;
    private String supplierName;//供应商名称
    private String organizationCode;//组织机构代码/统一社会信用代码
    private String juridicalPersonName;//法定代表人/负责人姓名
    private String organizationAddress;//机构地址
    private String officePhone;//办公电话
    private String contactsName;//联系人姓名
    private String contactsMobile;//联系人手机号码
    private String contactsPhone;//联系人座机
    private String contactsIdcard;//联系人身份证号
    private String contactsEmail;//联系人邮件
    private String type;//类型 1、供应商，2、厂商
    private String organizationCodeImg;//组织机构代码证照片
    private String contactsIdcardImg;//联系人身份证照片
    private String dataTransmissionMode;//数据传输方式
    private Integer del;//删除标志(1有效，0删除)
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public String getSupplierName() {
        return supplierName;
    }
    public void setSupplierName(String supplierName) {
        this.supplierName = supplierName;
    }
    public String getOrganizationCode() {
        return organizationCode;
    }
    public void setOrganizationCode(String organizationCode) {
        this.organizationCode = organizationCode;
    }
    public String getJuridicalPersonName() {
        return juridicalPersonName;
    }
    public void setJuridicalPersonName(String juridicalPersonName) {
        this.juridicalPersonName = juridicalPersonName;
    }
    public String getOrganizationAddress() {
        return organizationAddress;
    }
    public void setOrganizationAddress(String organizationAddress) {
        this.organizationAddress = organizationAddress;
    }
    public String getOfficePhone() {
        return officePhone;
    }
    public void setOfficePhone(String officePhone) {
        this.officePhone = officePhone;
    }
    public String getContactsName() {
        return contactsName;
    }
    public void setContactsName(String contactsName) {
        this.contactsName = contactsName;
    }
    public String getContactsMobile() {
        return contactsMobile;
    }
    public void setContactsMobile(String contactsMobile) {
        this.contactsMobile = contactsMobile;
    }
    public String getContactsPhone() {
        return contactsPhone;
    }
    public void setContactsPhone(String contactsPhone) {
        this.contactsPhone = contactsPhone;
    }
    public String getContactsIdcard() {
        return contactsIdcard;
    }
    public void setContactsIdcard(String contactsIdcard) {
        this.contactsIdcard = contactsIdcard;
    }
    public String getContactsEmail() {
        return contactsEmail;
    }
    public void setContactsEmail(String contactsEmail) {
        this.contactsEmail = contactsEmail;
    }
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
    public String getOrganizationCodeImg() {
        return organizationCodeImg;
    }
    public void setOrganizationCodeImg(String organizationCodeImg) {
        this.organizationCodeImg = organizationCodeImg;
    }
    public String getContactsIdcardImg() {
        return contactsIdcardImg;
    }
    public void setContactsIdcardImg(String contactsIdcardImg) {
        this.contactsIdcardImg = contactsIdcardImg;
    }
    public String getDataTransmissionMode() {
        return dataTransmissionMode;
    }
    public void setDataTransmissionMode(String dataTransmissionMode) {
        this.dataTransmissionMode = dataTransmissionMode;
    }
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/iot/supplier/IotSupplyDeviceDataTypeVO.java

@@ -0,0 +1,73 @@
package com.yihu.jw.restmodel.iot.supplier;
import java.io.Serializable;
/**
 * @author yeshijie on 2017/12/1.
 */
public class IotSupplyDeviceDataTypeVO implements Serializable {
    private String saasId;
    private String supplierDeviceCode;//供应商设备code',
    private String deviceModel;//设备型号',
    private String deviceType;//设备种类',
    private String dataType;//测量数据种类',
    private String dataTypeName;//测量数据种类名称',
    private Integer del;//
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public String getSupplierDeviceCode() {
        return supplierDeviceCode;
    }
    public void setSupplierDeviceCode(String supplierDeviceCode) {
        this.supplierDeviceCode = supplierDeviceCode;
    }
    public String getDeviceModel() {
        return deviceModel;
    }
    public void setDeviceModel(String deviceModel) {
        this.deviceModel = deviceModel;
    }
    public String getDeviceType() {
        return deviceType;
    }
    public void setDeviceType(String deviceType) {
        this.deviceType = deviceType;
    }
    public String getDataType() {
        return dataType;
    }
    public void setDataType(String dataType) {
        this.dataType = dataType;
    }
    public String getDataTypeName() {
        return dataTypeName;
    }
    public void setDataTypeName(String dataTypeName) {
        this.dataTypeName = dataTypeName;
    }
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/iot/supplier/IotSupplyDeviceVO.java

@@ -0,0 +1,109 @@
package com.yihu.jw.restmodel.iot.supplier;
import java.io.Serializable;
/**
 * @author yeshijie on 2017/12/1.
 */
public class IotSupplyDeviceVO implements Serializable {
    private String saasId;
    private String name;//'设备名称
    private String deviceModel;//型号
    private String deviceType;//设备种类 1血压计、2血糖仪
    private Integer isComposite;//是否复合型
    private Integer isPlatform;//是否平台型
    private String deviceSn;//设备编码
    private String supplierType;//供应商类型
    private String supplierCode;//供应商code
    private String supplierName;//供应商名称
    private Integer del;//删除标志(1有效，0删除)
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getDeviceModel() {
        return deviceModel;
    }
    public void setDeviceModel(String deviceModel) {
        this.deviceModel = deviceModel;
    }
    public String getDeviceType() {
        return deviceType;
    }
    public void setDeviceType(String deviceType) {
        this.deviceType = deviceType;
    }
    public Integer getIsComposite() {
        return isComposite;
    }
    public void setIsComposite(Integer isComposite) {
        this.isComposite = isComposite;
    }
    public Integer getIsPlatform() {
        return isPlatform;
    }
    public void setIsPlatform(Integer isPlatform) {
        this.isPlatform = isPlatform;
    }
    public String getDeviceSn() {
        return deviceSn;
    }
    public void setDeviceSn(String deviceSn) {
        this.deviceSn = deviceSn;
    }
    public String getSupplierType() {
        return supplierType;
    }
    public void setSupplierType(String supplierType) {
        this.supplierType = supplierType;
    }
    public String getSupplierCode() {
        return supplierCode;
    }
    public void setSupplierCode(String supplierCode) {
        this.supplierCode = supplierCode;
    }
    public String getSupplierName() {
        return supplierName;
    }
    public void setSupplierName(String supplierName) {
        this.supplierName = supplierName;
    }
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
}

svr-lib-parent-pom/pom.xml

@@ -517,7 +517,11 @@
            <!--hibernate end-->
            <!--fastdfs start-->
            <dependency>
                <groupId>com.yihu.base</groupId>
                <artifactId>common-data-fastdfs</artifactId>
                <version>${version.myCommon}</version>
            </dependency>
            <dependency>
                <groupId>org.csource</groupId>
                <artifactId>fastdfs_lib</artifactId>

svr/svr-iot/pom.xml

@@ -46,6 +46,10 @@
            <groupId>com.yihu.base</groupId>
            <artifactId>common-log</artifactId>
        </dependency>
        <dependency>
            <groupId>com.yihu.base</groupId>
            <artifactId>common-data-fastdfs</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
@@ -58,10 +62,6 @@
            <groupId>com.yihu.base</groupId>
            <artifactId>common-data-mysql</artifactId>
        </dependency>
        <dependency>
            <groupId>com.yihu.base</groupId>
            <artifactId>common-quartz</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>

svr/svr-iot/src/main/java/com/yihu/iot/IOTApplication.java

@@ -2,6 +2,7 @@ package com.yihu.iot;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
/**
@@ -9,6 +10,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 */
@EnableJpaAuditing
@SpringBootApplication
@ComponentScan(basePackages={"com"})
public class IOTApplication {
    public static void main(String[] args) {

svr/svr-iot/src/main/java/com/yihu/iot/controller/common/FileUploadController.java

@@ -0,0 +1,99 @@
package com.yihu.iot.controller.common;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.yihu.base.fastdfs.FastDFSHelper;
import com.yihu.iot.vo.common.UploadVO;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.rm.iot.IotRequestMapping;
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.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.net.URLDecoder;
import java.util.Base64;
/**
 * @author yeshijie on 2017/12/7.
 */
@RestController
@RequestMapping(IotRequestMapping.api_iot_common)
@Api(value = "文件上传相关操作", description = "文件上传相关操作")
public class FileUploadController extends EnvelopRestController{
    @Autowired
    private FastDFSHelper fastDFSHelper;
    @Value("${fastDFS.fastdfs_file_url}")
    private String fastdfs_file_url;
    @PostMapping(value = IotRequestMapping.FileUpload.api_upload_stream)
    @ApiOperation(value = "文件流上传文件", notes = "文件流上传文件")
    public Envelop uploadStream(@ApiParam(value = "文件", required = true) @RequestParam(value = "file", required = true) MultipartFile file) {
        try {
            // 得到文件的完整名称  xxx.txt
            String fullName = file.getOriginalFilename();
            //得到文件类型
            String fileType = fullName.substring(fullName.lastIndexOf(".") + 1).toLowerCase();
            String fileName = fullName.substring(0, fullName.lastIndexOf("."));
            //上传到fastdfs
            ObjectNode objectNode = fastDFSHelper.upload(file.getInputStream(), fileType, "");
            //解析返回的objectNode
            UploadVO uploadVO = new UploadVO();
            uploadVO.setFileName(fileName);
            uploadVO.setFileType(fileType);
            uploadVO.setFullUri(objectNode.get("fid").toString().replaceAll("\"", ""));
            uploadVO.setFullUrl(fastdfs_file_url + objectNode.get("fid").toString().replaceAll("\"", ""));
            return Envelop.getSuccess(IotRequestMapping.DeviceSupplier.message_success_create, uploadVO);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(IotRequestMapping.FileUpload.message_fail_upload, IotRequestMapping.api_iot_fail);
        }
    }
    @PostMapping(value = IotRequestMapping.FileUpload.api_upload_string)
    @ApiOperation(value = "base64上传图片",notes = "base64上传图片")
    public Envelop uploadImages(@ApiParam(name = "jsonData", value = "头像转化后的输入流") @RequestBody String jsonData) throws Exception {
        try {
            if(jsonData == null){
                return Envelop.getError(IotRequestMapping.FileUpload.message_fail_jsonData_is_null, ExceptionCode.common_error_params_code);
            }
            String date = URLDecoder.decode(jsonData,"UTF-8");
            String[] fileStreams = date.split(",");
            String is = URLDecoder.decode(fileStreams[1],"UTF-8").replace(" ","+");
            byte[] in = Base64.getDecoder().decode(is);
            String pictureName = fileStreams[0].substring(0,fileStreams[0].length()-1);
            String fileExtension = pictureName.substring(pictureName.lastIndexOf(".") + 1).toLowerCase();
            String description = null;
            if ((pictureName != null) && (pictureName.length() > 0)) {
                int dot = pictureName.lastIndexOf('.');
                if ((dot > -1) && (dot < (pictureName.length()))) {
                    description = pictureName.substring(0, dot);
                }
            }
            InputStream inputStream = new ByteArrayInputStream(in);
            ObjectNode objectNode = fastDFSHelper.upload(inputStream, "png", "");
            String groupName = objectNode.get("groupName").toString();
            String remoteFileName = objectNode.get("remoteFileName").toString();
            //解析返回的objectNode
            UploadVO uploadVO = new UploadVO();
            uploadVO.setFileName(remoteFileName);
            uploadVO.setFileType(groupName);
            uploadVO.setFullUri(objectNode.get("fid").toString().replaceAll("\"", ""));
            uploadVO.setFullUrl(fastdfs_file_url + objectNode.get("fid").toString().replaceAll("\"", ""));
            //返回文件路径
            return Envelop.getSuccess(IotRequestMapping.FileUpload.message_success_upload, uploadVO);
        }catch (ApiException e){
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
}

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

@@ -0,0 +1,17 @@
package com.yihu.iot.controller.device;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.rm.iot.IotRequestMapping;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
 * @author yeshijie on 2017/12/8.
 */
@RestController
@RequestMapping(IotRequestMapping.api_iot_common)
@Api(value = "设备管理相关操作", description = "设备管理相关操作")
public class IotDeviceController extends EnvelopRestController{
}

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

@@ -0,0 +1,17 @@
package com.yihu.iot.controller.device;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.rm.iot.IotRequestMapping;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
 * @author yeshijie on 2017/12/8.
 */
@RestController
@RequestMapping(IotRequestMapping.api_iot_common)
@Api(value = "设备订单管理相关操作", description = "设备订单管理相关操作")
public class IotDeviceOrderController extends EnvelopRestController{
}

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

@@ -0,0 +1,17 @@
package com.yihu.iot.controller.device;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.rm.iot.IotRequestMapping;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
 * @author yeshijie on 2017/12/8.
 */
@RestController
@RequestMapping(IotRequestMapping.api_iot_common)
@Api(value = "设备采购管理相关操作", description = "设备采购管理相关操作")
public class IotDevicePurchaseController extends EnvelopRestController{
}

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

@@ -0,0 +1,17 @@
package com.yihu.iot.controller.device;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.rm.iot.IotRequestMapping;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
 * @author yeshijie on 2017/12/8.
 */
@RestController
@RequestMapping(IotRequestMapping.api_iot_common)
@Api(value = "设备质检管理相关操作", description = "设备质检管理相关操作")
public class IotDeviceQualityInspectionPlanController extends EnvelopRestController{
}

svr/svr-iot/src/main/java/com/yihu/iot/controller/dict/IotDeviceDictController.java

@@ -0,0 +1,46 @@
package com.yihu.iot.controller.dict;
import com.yihu.iot.service.dict.IotDeviceDictService;
import com.yihu.jw.iot.dict.IotDeviceDictDO;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.rm.iot.IotRequestMapping;
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.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List;
/**
 * @author yeshijie on 2017/12/8.
 */
@RestController
@RequestMapping(IotRequestMapping.api_iot_common)
@Api(value = "设备字典管理相关操作", description = "设备字典管理相关操作")
public class IotDeviceDictController extends EnvelopRestController{
    @Autowired
    private IotDeviceDictService iotDeviceDictService;
    @GetMapping(value = IotRequestMapping.DeviceDict.api_getList)
    @ApiOperation(value = "获取设备字典列表(不分页)")
    public Envelop getList(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "id,deviceType,name,dataType,dataTypeName")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件",defaultValue = "del=1;deviceType=1")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "+createTime")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        //得到list数据
        List<IotDeviceDictDO> list = iotDeviceDictService.search(fields,filters,sorts);
        //封装返回格式
        List<IotDeviceDictDO> iotDeviceDicts = convertToModels(list, new ArrayList<>(list.size()), IotDeviceDictDO.class, fields);
        return Envelop.getSuccessList(IotRequestMapping.DeviceDict.message_success_find_functions,iotDeviceDicts);
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/controller/supplier/IotDeviceSupplierController.java

@@ -31,8 +31,7 @@ public class IotDeviceSupplierController extends EnvelopRestController {
    @PostMapping(value = IotRequestMapping.DeviceSupplier.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建供应商", notes = "创建供应商")
    public Envelop create(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
    public Envelop create(@ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            IotDeviceSupplierDO iotDeviceSupplier = toEntity(jsonData, IotDeviceSupplierDO.class);
@@ -42,10 +41,33 @@ public class IotDeviceSupplierController extends EnvelopRestController {
        }
    }
    @PutMapping(value = IotRequestMapping.DeviceSupplier.api_update, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "更新供应商", notes = "更新供应商")
    public Envelop update(@ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData){
        try {
            IotDeviceSupplierDO iotDeviceSupplier = toEntity(jsonData, IotDeviceSupplierDO.class);
            return Envelop.getSuccess(IotRequestMapping.DeviceSupplier.message_success_update, iotDeviceSupplierService.update(iotDeviceSupplier));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @DeleteMapping(value = IotRequestMapping.DeviceSupplier.api_delete)
    @ApiOperation(value = "删除供应商", notes = "删除供应商")
    public Envelop delete(@ApiParam(name = "id", value = "id")
                              @RequestParam(value = "id", required = true) String id){
        try {
            iotDeviceSupplierService.deleteById(id);
            return Envelop.getSuccess(IotRequestMapping.DeviceSupplier.message_success_delete, null);
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @GetMapping(value = IotRequestMapping.DeviceSupplier.api_getById)
    @ApiOperation(value = "根据code查找供应商", notes = "根据code查找供应商")
    public Envelop findByCode(
            @ApiParam(name = "id", value = "id")
    public Envelop findByCode(@ApiParam(name = "id", value = "id")
            @RequestParam(value = "id", required = true) String id
    ) {
        try {
@@ -58,16 +80,16 @@ public class IotDeviceSupplierController extends EnvelopRestController {
    @RequestMapping(value = IotRequestMapping.DeviceSupplier.api_queryPage, method = RequestMethod.GET)
    @ApiOperation(value = "分页获取供应商")
    public Envelop queryPage(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "id,code,patientCode,signCode,kpiCode,agreementCode,kpiName")
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段(id,supplierName,type,contactsName,contactsMobile)", defaultValue = "")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "+createTime")
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件(supplierName?中 g1;contactsName?中 g1)")
            @RequestParam(value = "filters", required = false,defaultValue = "") String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "-createTime")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "size", value = "分页大小", defaultValue = "15")
            @RequestParam(value = "size", required = false) int size,
            @RequestParam(value = "size", required = false) Integer size,
            @ApiParam(name = "page", value = "页码", defaultValue = "1")
            @RequestParam(value = "page", required = false) int page,
            @RequestParam(value = "page", required = false) Integer page,
            HttpServletRequest request,
            HttpServletResponse response) throws Exception {
        //得到list数据
@@ -86,11 +108,11 @@ public class IotDeviceSupplierController extends EnvelopRestController {
    @GetMapping(value = IotRequestMapping.DeviceSupplier.api_getList)
    @ApiOperation(value = "获取供应商列表(不分页)")
    public Envelop getList(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "id,code,patientCode,signCode,kpiCode,agreementCode,kpiName")
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段(id,supplierName,type,contactsName,contactsMobile)", defaultValue = "")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "+createTime")
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "-createTime")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        //得到list数据
        List<IotDeviceSupplierDO> list = iotDeviceSupplierService.search(fields,filters,sorts);

svr/svr-iot/src/main/java/com/yihu/iot/controller/supplier/IotSupplyDeviceController.java

@@ -0,0 +1,101 @@
package com.yihu.iot.controller.supplier;
import com.yihu.iot.service.supplier.IotSupplyDeviceService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.iot.supplier.IotSupplyDeviceDO;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.rm.iot.IotRequestMapping;
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.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
/**
 * @author yeshijie on 2017/12/8.
 */
@RestController
@RequestMapping(IotRequestMapping.api_iot_common)
@Api(value = "供应设备-供应设备管理相关操作", description = "供应设备-供应设备管理相关操作")
public class IotSupplyDeviceController extends EnvelopRestController{
    @Autowired
    private IotSupplyDeviceService iotSupplyDeviceService;
    @PostMapping(value = IotRequestMapping.SupplyDevice.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建供应设备", notes = "创建供应设备")
    public Envelop create(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            IotSupplyDeviceDO iotSupplyDevice = toEntity(jsonData, IotSupplyDeviceDO.class);
            return Envelop.getSuccess(IotRequestMapping.SupplyDevice.message_success_create, iotSupplyDeviceService.create(iotSupplyDevice));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @GetMapping(value = IotRequestMapping.SupplyDevice.api_getById)
    @ApiOperation(value = "根据code查找供应设备", notes = "根据code查找供应设备")
    public Envelop findByCode(
            @ApiParam(name = "id", value = "id")
            @RequestParam(value = "id", required = true) String id
    ) {
        try {
            return Envelop.getSuccess(IotRequestMapping.SupplyDevice.message_success_find, iotSupplyDeviceService.findById(id));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @RequestMapping(value = IotRequestMapping.SupplyDevice.api_queryPage, method = RequestMethod.GET)
    @ApiOperation(value = "分页获取供应设备")
    public Envelop queryPage(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "id,supplierName,type,contactsName,contactsMobile")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false,defaultValue = "name?中 g1;deviceModel?中 g1") String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "+createTime")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "size", value = "分页大小", defaultValue = "15")
            @RequestParam(value = "size", required = false) int size,
            @ApiParam(name = "page", value = "页码", defaultValue = "1")
            @RequestParam(value = "page", required = false) int page,
            HttpServletRequest request,
            HttpServletResponse response) throws Exception {
        //得到list数据
        List<IotSupplyDeviceDO> list = iotSupplyDeviceService.search(fields, filters, sorts, page, size);
        //获取总数
        long count=iotSupplyDeviceService.getCount(filters);
        //封装头信息
        pagedResponse(request, response, count, page, size);
        //封装返回格式
        List<IotSupplyDeviceDO> iotSupplyDevices = convertToModels(list, new ArrayList<>(list.size()), IotSupplyDeviceDO.class, fields);
        return Envelop.getSuccessListWithPage(IotRequestMapping.SupplyDevice.message_success_find_functions,iotSupplyDevices, page, size,count);
    }
    @GetMapping(value = IotRequestMapping.SupplyDevice.api_getList)
    @ApiOperation(value = "获取供应设备列表(不分页)")
    public Envelop getList(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "id,supplierName,type,contactsName,contactsMobile")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "+createTime")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        //得到list数据
        List<IotSupplyDeviceDO> list = iotSupplyDeviceService.search(fields,filters,sorts);
        //封装返回格式
        List<IotSupplyDeviceDO> iotSupplyDevices = convertToModels(list, new ArrayList<>(list.size()), IotSupplyDeviceDO.class, fields);
        return Envelop.getSuccessList(IotRequestMapping.SupplyDevice.message_success_find_functions,iotSupplyDevices);
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/controller/supplier/IotSupplyDeviceDataTypeController.java

@@ -0,0 +1,17 @@
package com.yihu.iot.controller.supplier;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.rm.iot.IotRequestMapping;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
 * @author yeshijie on 2017/12/8.
 */
@RestController
@RequestMapping(IotRequestMapping.api_iot_common)
@Api(value = "供应设备数据类型管理相关操作", description = "供应设备数据类型管理相关操作")
public class IotSupplyDeviceDataTypeController extends EnvelopRestController{
}

svr/svr-iot/src/main/java/com/yihu/iot/dao/device/IotDeviceDao.java

@@ -1,7 +1,9 @@
package com.yihu.iot.dao.device;
import com.yihu.jw.iot.device.IotDeviceDO;
import com.yihu.jw.iot.dict.IotDeviceDictDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
@@ -9,4 +11,6 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 */
public interface IotDeviceDao extends PagingAndSortingRepository<IotDeviceDO, Long>, JpaSpecificationExecutor<IotDeviceDO> {
    @Query("from IotDeviceDO w where w.id =?1")
    IotDeviceDO findById(String id);
}

svr/svr-iot/src/main/java/com/yihu/iot/dao/device/IotDeviceOrderDao.java

@@ -1,7 +1,9 @@
package com.yihu.iot.dao.device;
import com.yihu.jw.iot.device.IotDeviceDO;
import com.yihu.jw.iot.device.IotDeviceOrderDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
@@ -9,4 +11,6 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 */
public interface IotDeviceOrderDao extends PagingAndSortingRepository<IotDeviceOrderDO,Long>,JpaSpecificationExecutor<IotDeviceOrderDO> {
    @Query("from IotDeviceOrderDO w where w.id =?1")
    IotDeviceOrderDO findById(String id);
}

svr/svr-iot/src/main/java/com/yihu/iot/dao/device/IotDevicePurchaseDao.java

@@ -1,7 +1,9 @@
package com.yihu.iot.dao.device;
import com.yihu.jw.iot.device.IotDeviceDO;
import com.yihu.jw.iot.device.IotDevicePurchaseDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
@@ -9,4 +11,6 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 */
public interface IotDevicePurchaseDao extends PagingAndSortingRepository<IotDevicePurchaseDO,Long>,JpaSpecificationExecutor<IotDevicePurchaseDO> {
    @Query("from IotDevicePurchaseDO w where w.id =?1")
    IotDevicePurchaseDO findById(String id);
}

svr/svr-iot/src/main/java/com/yihu/iot/dao/device/IotDeviceQualityInspectionPlanDao.java

@@ -1,14 +1,17 @@
package com.yihu.iot.dao.device;
import com.yihu.jw.iot.device.IotDevicePurchaseDO;
import com.yihu.jw.iot.device.IotDeviceQualityInspectionPlanDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * @author yeshijie on 2017/12/1.
 */
public interface IotDeviceQualityInspectionPlanDao extends PagingAndSortingRepository<IotDeviceQualityInspectionPlanDO
        ,Long>,JpaSpecificationExecutor<IotDeviceQualityInspectionPlanDO> {
public interface IotDeviceQualityInspectionPlanDao extends PagingAndSortingRepository<IotDeviceQualityInspectionPlanDO,Long>,
        JpaSpecificationExecutor<IotDeviceQualityInspectionPlanDO> {
    @Query("from IotDeviceQualityInspectionPlanDO w where w.id =?1")
    IotDeviceQualityInspectionPlanDO findById(String id);
}

svr/svr-iot/src/main/java/com/yihu/iot/dao/dict/IotDeviceDictDao.java

@@ -1,7 +1,9 @@
package com.yihu.iot.dao.dict;
import com.yihu.jw.iot.dict.IotDeviceDictDO;
import com.yihu.jw.iot.supplier.IotSupplyDeviceDataTypeDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
@@ -9,4 +11,6 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 */
public interface IotDeviceDictDao extends PagingAndSortingRepository<IotDeviceDictDO,Long>,JpaSpecificationExecutor<IotDeviceDictDO> {
    @Query("from IotDeviceDictDO w where w.id =?1")
    IotDeviceDictDO findById(String id);
}

svr/svr-iot/src/main/java/com/yihu/iot/dao/supplier/IotDeviceSupplierDao.java

@@ -1,16 +1,17 @@
package com.yihu.iot.dao.supplier;
import com.yihu.jw.iot.supplier.IotDeviceSupplierDO;
import com.yihu.jw.wlyy.agreement.WlyyAgreementKpiLogDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * @author yeshijie on 2017/12/5.
 */
public interface IotDeviceSupplierDao extends PagingAndSortingRepository<IotDeviceSupplierDO, Long>, JpaSpecificationExecutor<IotDeviceSupplierDO> {
    @Query("from IotDeviceSupplierDO w where w.id =?1")
    IotDeviceSupplierDO findById(String code);
    IotDeviceSupplierDO findById(String id);
}

svr/svr-iot/src/main/java/com/yihu/iot/dao/supplier/IotSupplyDeviceDao.java

@@ -1,7 +1,9 @@
package com.yihu.iot.dao.supplier;
import com.yihu.jw.iot.supplier.IotDeviceSupplierDO;
import com.yihu.jw.iot.supplier.IotSupplyDeviceDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
@@ -9,5 +11,6 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 */
public interface IotSupplyDeviceDao extends PagingAndSortingRepository<IotSupplyDeviceDO, Long>, JpaSpecificationExecutor<IotSupplyDeviceDO> {
    @Query("from IotSupplyDeviceDO w where w.id =?1")
    IotSupplyDeviceDO findById(String id);
}

svr/svr-iot/src/main/java/com/yihu/iot/dao/supplier/IotSupplyDeviceDataTypeDao.java

@@ -1,7 +1,9 @@
package com.yihu.iot.dao.supplier;
import com.yihu.jw.iot.supplier.IotSupplyDeviceDO;
import com.yihu.jw.iot.supplier.IotSupplyDeviceDataTypeDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
@@ -9,5 +11,6 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 */
public interface IotSupplyDeviceDataTypeDao extends PagingAndSortingRepository<IotSupplyDeviceDataTypeDO, Long>, JpaSpecificationExecutor<IotSupplyDeviceDataTypeDO> {
    @Query("from IotSupplyDeviceDataTypeDO w where w.id =?1")
    IotSupplyDeviceDataTypeDO findById(String id);
}

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

@@ -0,0 +1,21 @@
package com.yihu.iot.service.device;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.iot.dao.device.IotDeviceOrderDao;
import com.yihu.jw.iot.device.IotDeviceOrderDO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
 * @author yeshijie on 2017/12/8.
 */
@Service
public class IotDeviceOrderService extends BaseJpaService<IotDeviceOrderDO,IotDeviceOrderDao> {
    @Autowired
    private IotDeviceOrderDao iotDeviceOrderDao;
    public IotDeviceOrderDO findById(String id) {
        return iotDeviceOrderDao.findById(id);
    }
}

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

@@ -0,0 +1,20 @@
package com.yihu.iot.service.device;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.iot.dao.device.IotDevicePurchaseDao;
import com.yihu.jw.iot.device.IotDevicePurchaseDO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
 * @author yeshijie on 2017/12/8.
 */
@Service
public class IotDevicePurchaseService extends BaseJpaService<IotDevicePurchaseDO,IotDevicePurchaseDao> {
    @Autowired
    private IotDevicePurchaseDao iotDevicePurchaseDao;
    public IotDevicePurchaseDO findById(String id) {
        return iotDevicePurchaseDao.findById(id);
    }
}

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

@@ -0,0 +1,21 @@
package com.yihu.iot.service.device;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.iot.dao.device.IotDeviceQualityInspectionPlanDao;
import com.yihu.jw.iot.device.IotDeviceQualityInspectionPlanDO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
 * @author yeshijie on 2017/12/8.
 */
@Service
public class IotDeviceQualityInspectionPlanService extends BaseJpaService<IotDeviceQualityInspectionPlanDO,IotDeviceQualityInspectionPlanDao> {
    @Autowired
    private IotDeviceQualityInspectionPlanDao iotDeviceQualityInspectionPlanDao;
    public IotDeviceQualityInspectionPlanDO findById(String id) {
        return iotDeviceQualityInspectionPlanDao.findById(id);
    }
}

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

@@ -0,0 +1,21 @@
package com.yihu.iot.service.device;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.iot.dao.device.IotDeviceDao;
import com.yihu.jw.iot.device.IotDeviceDO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
 * @author yeshijie on 2017/12/8.
 */
@Service
public class IotDeviceService extends BaseJpaService<IotDeviceDO,IotDeviceDao> {
    @Autowired
    private IotDeviceDao iotDeviceDao;
    public IotDeviceDO findById(String id) {
        return iotDeviceDao.findById(id);
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/service/dict/IotDeviceDictService.java

@@ -0,0 +1,22 @@
package com.yihu.iot.service.dict;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.iot.dao.dict.IotDeviceDictDao;
import com.yihu.jw.iot.dict.IotDeviceDictDO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
 * @author yeshijie on 2017/12/8.
 */
@Service
public class IotDeviceDictService extends BaseJpaService<IotDeviceDictDO,IotDeviceDictDao>{
    @Autowired
    private IotDeviceDictDao iotDeviceDictDao;
    public IotDeviceDictDO findById(String id) {
        return iotDeviceDictDao.findById(id);
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/service/supplier/IotDeviceSupplierService.java

@@ -10,9 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import javax.persistence.Transient;
import java.util.Date;
/**
 * @author yeshijie on 2017/12/5.
 */
@@ -22,23 +19,122 @@ public class IotDeviceSupplierService extends BaseJpaService<IotDeviceSupplierDO
    @Autowired
    private IotDeviceSupplierDao iotDeviceSupplierDao;
    @Transient
    /**
     * 新增
     * @param iotDeviceSupplier
     * @return
     */
    public IotDeviceSupplierDO create(IotDeviceSupplierDO iotDeviceSupplier) {
        String saasId = iotDeviceSupplier.getSaasId();
        if (StringUtils.isEmpty(saasId)) {
            throw new ApiException(IotRequestMapping.DeviceSupplier.message_fail_saasId_is_null, ExceptionCode.common_error_params_code);
        }
        //Saas saas = saasService.findByCode(saasId);
        //if(saas==null){
        //    throw new ApiException(BaseContants.Saas.message_fail_code_no_exist, ExceptionCode.common_error_params_code);
        //}
        //设置创建时间
        Date date = new Date();
        iotDeviceSupplier.setCreateTime(date);
        if (StringUtils.isEmpty(iotDeviceSupplier.getSupplierName())) {
            throw new ApiException(IotRequestMapping.DeviceSupplier.message_fail_supplierName_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(iotDeviceSupplier.getOrganizationCode())) {
            throw new ApiException(IotRequestMapping.DeviceSupplier.message_fail_organizationCode_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(iotDeviceSupplier.getContactsName())) {
            throw new ApiException(IotRequestMapping.DeviceSupplier.message_fail_contactsName_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(iotDeviceSupplier.getContactsMobile())) {
            throw new ApiException(IotRequestMapping.DeviceSupplier.message_fail_contactsMobile_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(iotDeviceSupplier.getContactsPhone())) {
            throw new ApiException(IotRequestMapping.DeviceSupplier.message_fail_contactsPhone_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(iotDeviceSupplier.getContactsIdcard())) {
            throw new ApiException(IotRequestMapping.DeviceSupplier.message_fail_contactsIdcard_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(iotDeviceSupplier.getType())) {
            throw new ApiException(IotRequestMapping.DeviceSupplier.message_fail_type_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(iotDeviceSupplier.getOrganizationCodeImg())) {
            throw new ApiException(IotRequestMapping.DeviceSupplier.message_fail_organizationCodeImg_is_null, ExceptionCode.common_error_params_code);
        }
        if(StringUtils.isEmpty(iotDeviceSupplier.getContactsIdcardImg())){
            throw new ApiException(IotRequestMapping.DeviceSupplier.message_fail_contactsIdcardImg_is_null,ExceptionCode.common_error_params_code);
        }
        iotDeviceSupplier.setSaasId(getCode());
        iotDeviceSupplier.setDel(1);
        return iotDeviceSupplierDao.save(iotDeviceSupplier);
    }
    /**
     * 修改
     * @param iotDeviceSupplier
     * @return
     */
    public IotDeviceSupplierDO update(IotDeviceSupplierDO iotDeviceSupplier){
        if(StringUtils.isEmpty(iotDeviceSupplier.getId())){
            throw new ApiException(IotRequestMapping.DeviceSupplier.message_fail_id_is_null,ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(iotDeviceSupplier.getSupplierName())) {
            throw new ApiException(IotRequestMapping.DeviceSupplier.message_fail_supplierName_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(iotDeviceSupplier.getOrganizationCode())) {
            throw new ApiException(IotRequestMapping.DeviceSupplier.message_fail_organizationCode_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(iotDeviceSupplier.getContactsName())) {
            throw new ApiException(IotRequestMapping.DeviceSupplier.message_fail_contactsName_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(iotDeviceSupplier.getContactsMobile())) {
            throw new ApiException(IotRequestMapping.DeviceSupplier.message_fail_contactsMobile_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(iotDeviceSupplier.getContactsPhone())) {
            throw new ApiException(IotRequestMapping.DeviceSupplier.message_fail_contactsPhone_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(iotDeviceSupplier.getContactsIdcard())) {
            throw new ApiException(IotRequestMapping.DeviceSupplier.message_fail_contactsIdcard_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(iotDeviceSupplier.getType())) {
            throw new ApiException(IotRequestMapping.DeviceSupplier.message_fail_type_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(iotDeviceSupplier.getOrganizationCodeImg())) {
            throw new ApiException(IotRequestMapping.DeviceSupplier.message_fail_organizationCodeImg_is_null, ExceptionCode.common_error_params_code);
        }
        if(StringUtils.isEmpty(iotDeviceSupplier.getContactsIdcardImg())){
            throw new ApiException(IotRequestMapping.DeviceSupplier.message_fail_contactsIdcardImg_is_null,ExceptionCode.common_error_params_code);
        }
        IotDeviceSupplierDO deviceSupplier = findById(iotDeviceSupplier.getId());
        if(deviceSupplier == null){
            throw new ApiException(IotRequestMapping.DeviceSupplier.message_fail_iotDeviceSupplier_is_no_exist,ExceptionCode.common_error_params_code);
        }
        deviceSupplier.setSupplierName(iotDeviceSupplier.getSupplierName());
        deviceSupplier.setOrganizationCode(iotDeviceSupplier.getOrganizationCode());
        deviceSupplier.setJuridicalPersonName(iotDeviceSupplier.getJuridicalPersonName());
        deviceSupplier.setOrganizationAddress(iotDeviceSupplier.getOrganizationAddress());
        deviceSupplier.setOfficePhone(iotDeviceSupplier.getOfficePhone());
        deviceSupplier.setContactsName(iotDeviceSupplier.getContactsName());
        deviceSupplier.setContactsMobile(iotDeviceSupplier.getContactsMobile());
        deviceSupplier.setContactsPhone(iotDeviceSupplier.getContactsPhone());
        deviceSupplier.setContactsIdcard(iotDeviceSupplier.getContactsIdcard());
        deviceSupplier.setType(iotDeviceSupplier.getType());
        deviceSupplier.setOrganizationCodeImg(iotDeviceSupplier.getOrganizationCodeImg());
        deviceSupplier.setContactsIdcardImg(iotDeviceSupplier.getContactsIdcardImg());
        return iotDeviceSupplierDao.save(deviceSupplier);
    }
    public IotDeviceSupplierDO findById(String id) {
        return iotDeviceSupplierDao.findById(id);
    }
    /**
     * 删除厂商，伪删除
     * @param id
     */
    public void deleteById(String id){
        if(StringUtils.isEmpty(id)){
            throw new ApiException(IotRequestMapping.DeviceSupplier.message_fail_id_is_null,ExceptionCode.common_error_params_code);
        }
        IotDeviceSupplierDO deviceSupplier = findById(id);
        if(deviceSupplier == null){
            throw new ApiException(IotRequestMapping.DeviceSupplier.message_fail_iotDeviceSupplier_is_no_exist,ExceptionCode.common_error_params_code);
        }
        deviceSupplier.setDel(0);
        iotDeviceSupplierDao.save(deviceSupplier);
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/service/supplier/IotSupplyDeviceDataTypeService.java

@@ -0,0 +1,20 @@
package com.yihu.iot.service.supplier;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.iot.dao.supplier.IotSupplyDeviceDataTypeDao;
import com.yihu.jw.iot.supplier.IotSupplyDeviceDataTypeDO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
 * @author yeshijie on 2017/12/8.
 */
@Service
public class IotSupplyDeviceDataTypeService extends BaseJpaService<IotSupplyDeviceDataTypeDO,IotSupplyDeviceDataTypeDao> {
    @Autowired
    private IotSupplyDeviceDataTypeDao iotSupplyDeviceDataTypeDao;
    public IotSupplyDeviceDataTypeDO findById(String id) {
        return iotSupplyDeviceDataTypeDao.findById(id);
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/service/supplier/IotSupplyDeviceService.java

@@ -0,0 +1,32 @@
package com.yihu.iot.service.supplier;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.iot.dao.supplier.IotSupplyDeviceDao;
import com.yihu.jw.iot.supplier.IotSupplyDeviceDO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.persistence.Transient;
/**
 * @author yeshijie on 2017/12/8.
 */
@Service
public class IotSupplyDeviceService extends BaseJpaService<IotSupplyDeviceDO,IotSupplyDeviceDao> {
    @Autowired
    private IotSupplyDeviceDao iotSupplyDeviceDao;
    public IotSupplyDeviceDO findById(String id) {
        return iotSupplyDeviceDao.findById(id);
    }
    @Transient
    public IotSupplyDeviceDO create(IotSupplyDeviceDO iotSupplyDeviceDO) {
        iotSupplyDeviceDO.setSaasId(getCode());
        iotSupplyDeviceDO.setDel(1);
        return iotSupplyDeviceDao.save(iotSupplyDeviceDO);
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/vo/common/UploadVO.java

@@ -0,0 +1,44 @@
package com.yihu.iot.vo.common;
/**
 * @author yeshijie on 2017/12/7.
 */
public class UploadVO {
    private String fileName; //文件名字
    private String fileType; //文件类型
    private String fullUrl; //完整的url http://172.19.103.13/healthArchiveGroup/M00/00/24/rBFuH1XdQC6AP3CDAAzodQCbVVc052.jpg
    private String fullUri; //完整的uri healthArchiveGroup/M00/00/24/rBFuH1XdQC6AP3CDAAzodQCbVVc052.jpg
    public String getFullUrl() {
        return fullUrl;
    }
    public void setFullUrl(String fullUrl) {
        this.fullUrl = fullUrl;
    }
    public String getFullUri() {
        return fullUri;
    }
    public void setFullUri(String fullUri) {
        this.fullUri = fullUri;
    }
    public String getFileName() {
        return fileName;
    }
    public void setFileName(String fileName) {
        this.fileName = fileName;
    }
    public String getFileType() {
        return fileType;
    }
    public void setFileType(String fileType) {
        this.fileType = fileType;
    }
}

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

@@ -1,4 +1,7 @@
##如果有配置服务的话，远程服务器和本地服务器配置不一致的情况下，优先远程的为主  git上 svr-base ->  git application ->本地 appliction ->本地 bootstarp
server:
  port: 10050
spring:
  application:
    name:  svr-iot  ##注册到发现服务的id 如果id一样 eurika会自动做负载
@@ -28,6 +31,20 @@ hibernate:
  ejb:
    naming_strategy: org.hibernate.cfg.ImprovedNamingStrategy
fast-dfs:
  tracker-server: 172.19.103.54:22122 #服务器地址
  connect-timeout: 2 #链接超时时间
  network-timeout: 30
  charset: ISO8859-1 #编码
  http:
    tracker-http-port: 80
    anti-steal-token: no
    secret-key: FastDFS1234567890
  pool: #连接池大小
    init-size: 5
    max-size: 20
    wait-time: 500
---
spring:
  profiles: jwdev
@@ -36,13 +53,16 @@ spring:
    url: jdbc:mysql://172.19.103.77:3306/xmiot?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: root
    password: 123456
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
---
spring:
  profiles: jwtest
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
---
spring:
  profiles: jwprod
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/