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

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -442,7 +442,9 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                " o.adm_date AS \"admDate\", " +
                " o.con_date AS \"conDate\", " +
                " o.description AS \"description\", " +
                " o.disease_img AS \"diseaseImg\", ";
                " o.disease_img AS \"diseaseImg\"," +
                " o.consumer as \"consumer\"," +
                " o.consumer_name as \"consumerName\", ";
        if ("xm_ykyy_wx".equals(wechatId)) {
            if (flag){
                sql = sql + "date_format(o.create_time ,'%Y-%m-%d %H:%i:%S' ) AS createTime,";
@@ -460,7 +462,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                " FROM " +
                " wlyy_outpatient o " +
                " WHERE " +
                " o.patient =:patient ";
                " o.consumer =:patient ";
        Map<String, Object> params = new HashedMap();
        params.put("patient", patient);
        if (status != null) {
@@ -3681,7 +3683,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        if (StringUtils.isNotEmpty(outpatientId)){
            outpatientDO = outpatientDao.findById(outpatientId);
            doctorDO = baseDoctorDao.findById(outpatientDO.getDoctor());
            patientDO = basePatientDao.findById(outpatientDO.getPatient());
            patientDO = basePatientDao.findById(outpatientDO.getConsumer());
        }
        logger.info("titelType:"+titelType+"&&remindMsg:"+remindMsg+"&&type"+type);
@@ -3693,30 +3695,30 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        if ("doctorRefuseRemind".equalsIgnoreCase(titelType)) {
            if ("9".equals(type)) {
                contentMsg = "医生已取消您的复诊申请，取消原因:"+remindMsg;
                first = outpatientDO.getPatientName() + "，您好！您的图文复诊已取消";
                first = outpatientDO.getConsumerName() + "，您好！您的图文复诊已取消";
            }
            if ("16".equals(type)) {
                contentMsg = "医生已取消您的复诊申请，取消原因:"+remindMsg;
                first = outpatientDO.getPatientName() + "，您好！您的视频复诊已取消";
                first = outpatientDO.getConsumerName() + "，您好！您的视频复诊已取消";
            }
            logger.info("doctorRefuseRemind医生拒诊入参:outpatientId="+outpatientId);
            msgUrl="/ims-wx/index.html#/returnVisit/record?outpatientId="+outpatientId;
        } else if("outPatientTimeOutRemind".equalsIgnoreCase(titelType)) {
            contentMsg = "您邀请的医师暂无应答，您可以选择继续等待或者取消邀请。";
            first = outpatientDO.getPatientName() + "，您好！";
            first = outpatientDO.getConsumerName() + "，您好！";
            logger.info("outPatientTimeOutRemind:outpatientId="+outpatientId+"contentMsg"+contentMsg);
            msgUrl="/ims-wx/index.html#/returnVisit/record?outpatientId="+outpatientId;
        } else if ("payRemind".equalsIgnoreCase(titelType)) {
            if ("9".equals(type)) {
                contentMsg = "请您先完成预交金充值发起在线问诊，点击详情进行预交金充值，如您已完成请忽略本条信息。";//您有一个图文复诊订单待支付，点击完成支付，如您已支付请忽略本条信息
                first = outpatientDO.getPatientName() + "，您好！您有一笔未完成的在线问诊订单，请及时处理。";//您有一个图文复诊订单待支付，请及时支付。
                first = outpatientDO.getConsumerName() + "，您好！您有一笔未完成的在线问诊订单，请及时处理。";//您有一个图文复诊订单待支付，请及时支付。
                msgUrl="/ims-wx/index.html#/returnVisit/record?outpatientId="+outpatientId;
                logger.info("图文复诊订单待支付微信消息模板推送开始");
            } else if ("16".equals(type)) {
                contentMsg = "请您先完成预交金充值发起在线问诊，点击详情进行预交金充值，如您已完成请忽略本条信息。";//您有一个视频复诊订单待支付，点击完成支付，如您已支付请忽略本条信息
                first = outpatientDO.getPatientName() + "，您好！您有一笔未完成的在线问诊订单，请及时处理。";//您有一个视频复诊订单待支付，请及时支付。
                first = outpatientDO.getConsumerName() + "，您好！您有一笔未完成的在线问诊订单，请及时处理。";//您有一个视频复诊订单待支付，请及时支付。
                msgUrl="/ims-wx/index.html#/returnVisit/record?outpatientId="+outpatientId;
                logger.info("视频复诊订单待支付微信消息模板推送开始");
            }
@@ -3733,13 +3735,13 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            }
        } else if ("prescriptionPayRemind".equalsIgnoreCase(titelType)) {
            first = outpatientDO.getPatientName() + "，您好！ 医生已为您开具处方，请及时支付。";
            first = outpatientDO.getConsumerName() + "，您好！ 医生已为您开具处方，请及时支付。";
            contentMsg = "医生已为您开具处方，请及时支付。";
            remark = "点击完成支付，如您已支付请忽略本条信息";
            msgUrl="/ims-wx/index.html#/returnVisit/prescriptionDetail?outpatientId="+outpatientId+"&id="+remindMsg;
            logger.info("处方支付微信消息模板推送开始");
        } else if ("msgRemind".equalsIgnoreCase(titelType)) {
            first = outpatientDO.getPatientName() + "，您好！";
            first = outpatientDO.getConsumerName() + "，您好！";
            contentMsg = "" + remindMsg;
            remark = "请您尽快回复";
        } else if ("outpatientMsgRemind".equalsIgnoreCase(titelType)) {
@@ -3801,14 +3803,14 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        if ("xm_ykyy_wx".equalsIgnoreCase(wxId)) {
            List<BasePatientWechatDo> ps = new ArrayList<BasePatientWechatDo>();
            if (StringUtils.isNotEmpty(outpatientId)){
                ps = basePatientWechatDao.findByWechatIdAndPatientId(wxId, outpatientDO.getPatient());
                ps = basePatientWechatDao.findByWechatIdAndPatientId(wxId, outpatientDO.getConsumer());
            }
            if (consultTeam!=null){
                ps = basePatientWechatDao.findByWechatIdAndPatientId(wxId, consultTeam.getPatient());
            }
            if (ps.isEmpty()) {
                logger.info("该用户" + outpatientDO.getPatientName() + "没有openid,无法推送模版消息，用户ID：" + outpatientDO.getPatient() + "wechatId:" + wxId);
                logger.info("该用户" + outpatientDO.getConsumerName() + "没有openid,无法推送模版消息，用户ID：" + outpatientDO.getPatient() + "wechatId:" + wxId);
                return;
            }
            String scene = "";
@@ -3817,7 +3819,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                scene = "ysqxjz";
                WxTemplateConfigDO config = wxTemplateConfigDao.findByWechatIdAndTemplateNameAndSceneAndStatus(wechatId, "template_doctor_notice", scene, 1);
                BeanUtils.copyProperties(config, newConfig);
                newConfig.setFirst(config.getFirst().replace("key1", outpatientDO.getPatientName()));
                newConfig.setFirst(config.getFirst().replace("key1", outpatientDO.getConsumerName()));
                if ("9".equals(type)) {
                    newConfig.setFirst(newConfig.getFirst().replace("key2", "图文复诊"));
                } else if ("16".equals(type)) {
@@ -3842,7 +3844,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                if (StringUtils.isNotEmpty(outpatientId)){
                    WxTemplateConfigDO config = wxTemplateConfigDao.findByWechatIdAndTemplateNameAndSceneAndStatus(wechatId, "template_pay_notice_jz", scene, 1);
                    BeanUtils.copyProperties(config, newConfig);
                    newConfig.setFirst(config.getFirst().replace("key1", outpatientDO.getPatientName()));
                    newConfig.setFirst(config.getFirst().replace("key1", outpatientDO.getConsumerName()));
                    if ("9".equals(type)) {
                        newConfig.setFirst(newConfig.getFirst().replace("key2", "图文复诊"));
                        newConfig.setKeyword1( "图文复诊支付");
@@ -3880,7 +3882,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                WxTemplateConfigDO config = wxTemplateConfigDao.findByWechatIdAndTemplateNameAndSceneAndStatus(wechatId, "template_prescription_pay_notice", scene, 1);
                BeanUtils.copyProperties(config, newConfig);
                newConfig.setFirst(config.getFirst().replace("key1", outpatientDO.getPatientName()));
                newConfig.setFirst(config.getFirst().replace("key1", outpatientDO.getConsumerName()));
                newConfig.setKeyword1( "处方支付");
                newConfig.setKeyword2(outpatientDO.getHospitalName());
                newConfig.setKeyword3( outpatientDO.getDoctorName());
@@ -3891,7 +3893,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                scene = "zxxxtx";
                WxTemplateConfigDO config = wxTemplateConfigDao.findByWechatIdAndTemplateNameAndSceneAndStatus(wechatId, "template_msg_notice", scene, 1);
                BeanUtils.copyProperties(config, newConfig);
                newConfig.setFirst(config.getFirst().replace("key1", outpatientDO.getPatientName()));
                newConfig.setFirst(config.getFirst().replace("key1", outpatientDO.getConsumerName()));
                newConfig.setKeyword1( remindMsg);
                newConfig.setKeyword2( DateUtil.getStringDate());
                //发起微信消息模板推送
@@ -3946,7 +3948,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    if ("16".equals(type)) {
                        newConfig.setFirst(config.getFirst().replaceFirst("key1", "视频复诊"));
                    }
                    newConfig.setKeyword1( outpatientDO.getPatientName());
                    newConfig.setKeyword1( outpatientDO.getConsumerName());
                    newConfig.setKeyword2( outpatientDO.getDeptName());
                    newConfig.setKeyword3( outpatientDO.getDoctorName());
                    newConfig.setKeyword4(DateUtil.dateToStrLong(outpatientDO.getRegisterDate()));
@@ -4004,7 +4006,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                wxPushLogDO.setOpenid(one.getOpenid());
                wxPushLogDO.setReceiver(outpatientDO.getPatient());
                wxPushLogDO.setWechatId(wechatId);
                wxPushLogDO.setReceiverName(outpatientDO.getPatientName());
                wxPushLogDO.setReceiverName(outpatientDO.getConsumerName());
                wxPushLogDO.setScene(scene);
                wxPushLogDao.save(wxPushLogDO);
            }
@@ -4162,7 +4164,9 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                "patient.photo AS \"photo\"," +
                "outpatient.mobile AS \"mobile\"," +
                "patient.birthday AS \"birthday\"," +
                "room.consult_type AS \"consult_type\",";
                "room.consult_type AS \"consult_type\"," +
                "outpatient.consumer as \"consumer\", " +
                "outpatient.consumer_name as \"consumerName\",";
        if ("xm_ykyy_wx".equals(wechatId)) {
            if(flag){
                sql += "date_format(room.reservation_time ,'yyyy-MM-dd hh24:mi:ss' ) AS \"timedate_format\",";
@@ -5535,7 +5539,9 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                "room.reservation_type AS \"reservation_type\"," +
                "outpatient.disease_img AS \"disease_img\"," +
                "outpatient.description AS \"description\"," +
                "outpatient.origin_con_no AS \"origin_con_no\", " +
                "outpatient.origin_con_no AS \"origin_con_no\"," +
                "outpatient.consumer as \"consumer\"," +
                "outpatient.consumer_name as \"consumer_name\", " +
                "room.reservation_type AS \"reservation_type\" " +
                "FROM " +
                "wlyy_hospital_waiting_room room," +
@@ -7230,7 +7236,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    if (map.get("code").toString().equalsIgnoreCase("1")) {
                        //  * @param applyDepaName @param applyDoctorName
                        WlyyPrescriptionDO prescriptionDO = prescriptionDao.findOne(prescriptionId);
                        String patientCode = prescriptionDO.getPatientCode();
                        String patientCode = outpatientDO.getConsumer();
                        String realerOrder = prescriptionDO.getRealOrder();
                        String recipeTime = DateUtil.dateToStr(prescriptionDO.getCreateTime(), "yyyyMMddHHmmss");

common/common-entity/src/main/java/com/yihu/jw/entity/IntegerIdentityEntity.java

@@ -19,13 +19,13 @@ public abstract class IntegerIdentityEntity implements Serializable {
    @Id
//==========mysql 环境 id策略======================================================
    /*@GeneratedValue(generator = "generator")
    @GeneratedValue(generator = "generator")
    @GenericGenerator(name = "generator", strategy = "identity")
    @Column(name = "id", unique = true, nullable = false)*/
    @Column(name = "id", unique = true, nullable = false)
//==========mysql 环境 id策略 end======================================================
//==========Oracle 环境id策略 =========================================================
   @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="id_generated")
   /*@GeneratedValue(strategy=GenerationType.SEQUENCE, generator="id_generated")*/
//==========Oracle 环境id策略 =========================================================
    public Integer getId() {
        return id;

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyOutpatientDO.java

@@ -252,6 +252,11 @@ public class WlyyOutpatientDO extends UuidIdentityEntity {
     */
    private String consumerName;
    /**
     * 代就诊人手机号
     */
    private String consumerMobile;
    @Column(name = "remind_count")
    public Integer getRemindCount() {
@@ -663,4 +668,13 @@ public class WlyyOutpatientDO extends UuidIdentityEntity {
    public void setConsumerName(String consumerName) {
        this.consumerName = consumerName;
    }
    @Column(name = "consumer_mobile")
    public String getConsumerMobile() {
        return consumerMobile;
    }
    public void setConsumerMobile(String consumerMobile) {
        this.consumerMobile = consumerMobile;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/prescription/WlyyOutpatientVO.java

@@ -226,6 +226,9 @@ public class WlyyOutpatientVO extends UuidIdentityVO {
    @ApiModelProperty(value = "代接诊人名字", example = "代接诊人名字")
    private String consumerName;
    @ApiModelProperty(value = "代接诊人手机号", example = "代接诊人手机号")
    private String consumerMobile;
    public String getAdmNo() {
@@ -522,4 +525,12 @@ public class WlyyOutpatientVO extends UuidIdentityVO {
    public void setConsumerName(String consumerName) {
        this.consumerName = consumerName;
    }
    public String getConsumerMobile() {
        return consumerMobile;
    }
    public void setConsumerMobile(String consumerMobile) {
        this.consumerMobile = consumerMobile;
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/patient/PatientNoLoginEndPoint.java

@@ -14,6 +14,7 @@ import com.yihu.jw.entity.base.wx.WxWechatDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleUserDO;
import com.yihu.jw.entity.hospital.httplog.WlyyHttpLogDO;
import com.yihu.jw.entity.hospital.prescription.WlyyOutpatientDO;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionDO;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionInfoDO;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionLogDO;
@@ -871,6 +872,8 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
                                   List<WlyyPrescriptionDO> wlyyPrescriptionDOS = prescriptionDao.findByRealOrderList(waitPayDetailVO.getRecipeNo());
                                   if (wlyyPrescriptionDOS!=null&&wlyyPrescriptionDOS.size()!=0){
                                       WlyyPrescriptionDO wlyyPrescriptionDO = wlyyPrescriptionDOS.get(0);
                                       WlyyOutpatientDO wlyyOutpatientDO = outpatientDao.findById(wlyyPrescriptionDO.getOutpatientId());
                                       outpatientDao.updateHisStatusById(wlyyPrescriptionDO.getOutpatientId(),1);
                                       logger.info("更新门诊结算状态");
                                   }

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

@@ -53,7 +53,7 @@ public class IotSystemDictController extends EnvelopRestEndpoint {
            return iotSystemDictService.create(dictDO);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("创建失败");
        }
    }
@@ -67,7 +67,7 @@ public class IotSystemDictController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_find,systemDictVOS);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }

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

@@ -67,7 +67,7 @@ public class IotCompanyController extends EnvelopRestEndpoint {
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -98,7 +98,7 @@ public class IotCompanyController extends EnvelopRestEndpoint {
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -114,7 +114,7 @@ public class IotCompanyController extends EnvelopRestEndpoint {
            return iotCompanyService.create(iotCompany);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("创建失败");
        }
    }
@@ -128,7 +128,7 @@ public class IotCompanyController extends EnvelopRestEndpoint {
            return  iotCompanyService.auditCompany(id);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("审核失败");
        }
    }
@@ -141,7 +141,7 @@ public class IotCompanyController extends EnvelopRestEndpoint {
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("审核失败");
        }
    }
@@ -159,7 +159,7 @@ public class IotCompanyController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Company.message_success_enterType,iotCompanyVOList);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -180,7 +180,7 @@ public class IotCompanyController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Company.message_success_find, iotCompanyVOList);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -195,7 +195,7 @@ public class IotCompanyController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Company.message_success_find, vo);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -211,7 +211,7 @@ public class IotCompanyController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Company.message_success_find, vo);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -223,7 +223,7 @@ public class IotCompanyController extends EnvelopRestEndpoint {
            return  iotCompanyService.delCompany(id);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("删除失败");
        }
    }
@@ -240,7 +240,7 @@ public class IotCompanyController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Company.message_success_update);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("修改失败");
        }
    }
@@ -265,7 +265,7 @@ public class IotCompanyController extends EnvelopRestEndpoint {
            return iotCompanyCertificateService.queryPage(page,size,name,companyId);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -285,7 +285,7 @@ public class IotCompanyController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_find, vo);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -300,7 +300,7 @@ public class IotCompanyController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccessList(IotRequestMapping.Common.message_success_find, voList);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -320,7 +320,7 @@ public class IotCompanyController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_create, iotCompanyCertificateService.create(iotCompanyCertificate));
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("创建失败");
        }
    }
@@ -332,7 +332,7 @@ public class IotCompanyController extends EnvelopRestEndpoint {
            return iotCompanyCertificateService.delCompanyCert(id);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("删除失败");
        }
    }
@@ -347,7 +347,7 @@ public class IotCompanyController extends EnvelopRestEndpoint {
            return  iotCompanyService.findCompanyByAccount();
        }catch (Exception e){
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -373,7 +373,7 @@ public class IotCompanyController extends EnvelopRestEndpoint {
            return iotCompanyService.addCompany(iotCompany);
        } catch (IOException e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("新增失败");
        }

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

@@ -62,7 +62,7 @@ public class IotDeviceController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Device.message_success_create);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("创建失败");
        }
    }
@@ -80,7 +80,7 @@ public class IotDeviceController extends EnvelopRestEndpoint {
            }
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -93,7 +93,7 @@ public class IotDeviceController extends EnvelopRestEndpoint {
            return iotDeviceService.updDevice(iotDevice);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
            return Envelop.getError("修改失败");
        }
    }
@@ -109,7 +109,7 @@ public class IotDeviceController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Device.message_success_find, iotDeviceVO);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -124,7 +124,7 @@ public class IotDeviceController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Device.message_success_find, existVO);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -139,7 +139,7 @@ public class IotDeviceController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Device.message_success_find, existVO);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -153,7 +153,7 @@ public class IotDeviceController extends EnvelopRestEndpoint {
            return iotDeviceService.updSim(sim,id);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
            return Envelop.getError("查询失败");
        }
    }
@@ -205,7 +205,7 @@ public class IotDeviceController extends EnvelopRestEndpoint {
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -220,7 +220,7 @@ public class IotDeviceController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Device.message_success_find, existVO);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("导入失败");
        }
    }
@@ -267,7 +267,7 @@ public class IotDeviceController extends EnvelopRestEndpoint {
            return iotDeviceService.queryImportRecordPage(page,size,purcharseId);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -291,7 +291,7 @@ public class IotDeviceController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Device.message_success_find, iotDeviceVO);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }

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

@@ -49,7 +49,7 @@ public class IotDeviceInventoryController extends EnvelopRestEndpoint {
            return deviceInventoryService.getDeviceInventoryList(name, categoryCode, hospitalName, page, pageSize);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -62,7 +62,7 @@ public class IotDeviceInventoryController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Device.message_success_updateInventory, count);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -86,7 +86,7 @@ public class IotDeviceInventoryController extends EnvelopRestEndpoint {
            return deviceInventoryService.getDeviceInventoryLog(name, categoryCode,hospital, productId, type, page, pageSize);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -99,7 +99,7 @@ public class IotDeviceInventoryController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_find, deviceInventoryLogVO);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -110,7 +110,7 @@ public class IotDeviceInventoryController extends EnvelopRestEndpoint {
            return deviceInventoryService.getInventoryWarningHospital();
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -122,7 +122,7 @@ public class IotDeviceInventoryController extends EnvelopRestEndpoint {
            return deviceInventoryService.getInventoryWarningName(hospital);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -143,7 +143,7 @@ public class IotDeviceInventoryController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccessList(IotRequestMapping.Common.message_success_import, correctLs);
        }catch (Exception e){
            e.printStackTrace();
            return MixEnvelop.getError("导入异常,请检查导入文件格式" + e.getMessage());
            return MixEnvelop.getError("导入异常,请检查导入文件格式");
        }
    }

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

@@ -45,7 +45,7 @@ public class IotDeviceOrderController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(deviceOrderDO.getOrderNo());
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("创建失败");
        }
    }
@@ -69,7 +69,7 @@ public class IotDeviceOrderController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.DeviceOrder.message_success_find,deviceOrderVO);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -97,7 +97,7 @@ public class IotDeviceOrderController extends EnvelopRestEndpoint {
            }
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -114,7 +114,7 @@ public class IotDeviceOrderController extends EnvelopRestEndpoint {
            }
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("删除失败");
        }
    }
@@ -131,7 +131,7 @@ public class IotDeviceOrderController extends EnvelopRestEndpoint {
            }
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("删除失败");
        }
    }
@@ -145,7 +145,7 @@ public class IotDeviceOrderController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.DeviceOrder.message_success_find);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("修改失败");
        }
    }
@@ -168,7 +168,7 @@ public class IotDeviceOrderController extends EnvelopRestEndpoint {
            return iotDeviceOrderService.queryPurcharsePage(page,size,orderId,"1");
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -197,7 +197,7 @@ public class IotDeviceOrderController extends EnvelopRestEndpoint {
            return iotDeviceOrderService.queryPurcharsePage(page, size, qualityStatus, orderNo, startTime, endTime);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -215,7 +215,7 @@ public class IotDeviceOrderController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.DeviceOrder.message_success_find,orderPurchaseVO);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -227,7 +227,7 @@ public class IotDeviceOrderController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.DeviceOrder.message_success_find,list);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -251,7 +251,7 @@ public class IotDeviceOrderController extends EnvelopRestEndpoint {
            return iotDeviceOrderService.findAllOrderBySupplierName(page, size,supplierName);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }

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

@@ -42,7 +42,7 @@ public class IotDeviceOverhaulController extends EnvelopRestEndpoint {
            return patientDeviceService.getOverhaulDeviceList(deviceSn, patientName, page, pageSize);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -56,7 +56,7 @@ public class IotDeviceOverhaulController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccessList(IotRequestMapping.Common.message_success_find, list);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -74,7 +74,7 @@ public class IotDeviceOverhaulController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_update, deviceOverhaulDO);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -88,7 +88,7 @@ public class IotDeviceOverhaulController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_delete);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("删除失败");
        }
    }
}

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

@@ -42,7 +42,7 @@ public class IotDeviceQualityController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_create, iotDeviceQualityInspectionPlanService.create(planDO));
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("创建失败");
        }
    }
@@ -57,7 +57,7 @@ public class IotDeviceQualityController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_find, planVO);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -84,7 +84,7 @@ public class IotDeviceQualityController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_find,list);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -114,7 +114,7 @@ public class IotDeviceQualityController extends EnvelopRestEndpoint {
            return iotDeviceQualityInspectionPlanService.queryPage(status, orderNo, startTime, endTime, page, size);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -127,7 +127,7 @@ public class IotDeviceQualityController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_delete);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("删除失败");
        }
    }
@@ -146,7 +146,7 @@ public class IotDeviceQualityController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_find);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -165,7 +165,7 @@ public class IotDeviceQualityController extends EnvelopRestEndpoint {
//            return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_find);
//        } catch (Exception e) {
//            e.printStackTrace();
//            return MixEnvelop.getError(e.getMessage());
//            return MixEnvelop.getError("查询失败");
//        }
//    }
@@ -180,7 +180,7 @@ public class IotDeviceQualityController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_find);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }

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

@@ -50,7 +50,7 @@ public class IotDeviceSimController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.DeviceSim.message_success_add);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("编辑失败");
        }
    }
@@ -64,7 +64,7 @@ public class IotDeviceSimController extends EnvelopRestEndpoint {
            return iotDeviceSimService.addSIM(jsonData);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("添加失败");
        }
    }
@@ -93,7 +93,7 @@ public class IotDeviceSimController extends EnvelopRestEndpoint {
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -114,7 +114,7 @@ public class IotDeviceSimController extends EnvelopRestEndpoint {
            return iotDeviceSimService.findAllSim(page,size);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -134,7 +134,7 @@ public class IotDeviceSimController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.DeviceSim.message_success_remind);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }

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

@@ -37,7 +37,7 @@ public class IotDeviceTransfersController extends EnvelopRestEndpoint {
            return deviceTransfersService.getDeviceTransfersList(name, categoryCode, page, pageSize);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -50,7 +50,7 @@ public class IotDeviceTransfersController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_update, deviceTransfersDO);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("新增失败");
        }
    }
@@ -63,7 +63,7 @@ public class IotDeviceTransfersController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_delete);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("删除失败");
        }
    }
@@ -78,7 +78,7 @@ public class IotDeviceTransfersController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_update, deviceTransfersDO);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("更新失败");
        }
    }
}

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

@@ -47,7 +47,7 @@ public class IotPatientDeviceController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Device.message_success_create);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("绑定失败");
        }
    }
@@ -64,7 +64,7 @@ public class IotPatientDeviceController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Device.message_success_create,patientDeviceVO);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -80,7 +80,7 @@ public class IotPatientDeviceController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Device.message_success_create,iotPatientDeviceVOList);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -98,7 +98,7 @@ public class IotPatientDeviceController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccessList(IotRequestMapping.Device.message_success_create,iotPatientDeviceVOList);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -120,7 +120,7 @@ public class IotPatientDeviceController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Company.message_success_find_functions,iotPatientDeviceVOList);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -138,7 +138,7 @@ public class IotPatientDeviceController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Device.message_success_create,iotPatientDeviceVOList);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -158,7 +158,7 @@ public class IotPatientDeviceController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Device.message_success_create,patientDeviceVO);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -181,7 +181,7 @@ public class IotPatientDeviceController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Device.message_success_create);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("更换失败");
        }
    }
@@ -194,7 +194,7 @@ public class IotPatientDeviceController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Device.message_success_create,list);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -239,7 +239,7 @@ public class IotPatientDeviceController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccessList(IotRequestMapping.Device.message_success_create,list2,iotPatientDeviceService.getESCount(jsonData));
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -253,7 +253,7 @@ public class IotPatientDeviceController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Device.message_success_create, list);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -266,11 +266,11 @@ public class IotPatientDeviceController extends EnvelopRestEndpoint {
            if(bool){
                return MixEnvelop.getSuccess(IotRequestMapping.Device.message_success_create,"device delete success");
            }
            return MixEnvelop.getError("delete fail,not exist");
            return MixEnvelop.getError("操作失败");
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("删除失败");
        }
    }
@@ -283,11 +283,11 @@ public class IotPatientDeviceController extends EnvelopRestEndpoint {
            if(bool){
                return MixEnvelop.getSuccess(IotRequestMapping.Device.message_success_create,"device update success");
            }
            return MixEnvelop.getError("delete fail,not exist");
            return MixEnvelop.getError("操作失败");
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("修改失败");
        }
    }
@@ -302,7 +302,7 @@ public class IotPatientDeviceController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Device.message_success_create);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -318,7 +318,7 @@ public class IotPatientDeviceController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Device.message_success_delete);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -335,7 +335,7 @@ public class IotPatientDeviceController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Device.message_success_update, patientDevice);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("更换失败");
        }
    }
@@ -356,7 +356,7 @@ public class IotPatientDeviceController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccessList(IotRequestMapping.Device.message_success_update, patientDeviceDOList);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("新增失败");
        }
    }
@@ -369,7 +369,7 @@ public class IotPatientDeviceController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Device.message_success_delete);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("删除失败");
        }
    }
@@ -383,7 +383,7 @@ public class IotPatientDeviceController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccessList(IotRequestMapping.Device.message_success_find, list);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -404,7 +404,7 @@ public class IotPatientDeviceController extends EnvelopRestEndpoint {
            return iotPatientDeviceService.getRepairDeviceList(deviceSn, status, manufacturerId, page, pageSize);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -431,7 +431,7 @@ public class IotPatientDeviceController extends EnvelopRestEndpoint {
            return iotPatientDeviceService.getPatientDeviceList(deviceSn, deviceName, categoryCode, patientName,hospitalName, isDel, page, pageSize);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -444,7 +444,7 @@ public class IotPatientDeviceController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Device.message_success_delete);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("删除失败");
        }
    }
}

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

@@ -55,7 +55,7 @@ public class WlyyDeviceController extends BaseController {
            return wlyyDeviceService.searchDeviceList(deviceName, deviceCode, orgName, linkman, page, size);
        }catch (Exception e){
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -66,7 +66,7 @@ public class WlyyDeviceController extends BaseController {
            return  wlyyDeviceService.findById(id);
        }catch (Exception e){
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("查询失败");
        }
    }
@@ -197,7 +197,7 @@ public class WlyyDeviceController extends BaseController {
            return write(200,"解绑成功！");
        }catch (Exception e){
            error(e);
            return write(-1,e.getMessage());
            return write(-1,"操作失败");
        }
    }
}

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

@@ -31,7 +31,7 @@ public class HospitalController extends EnvelopRestEndpoint {
            return hospitalService.create(hospitalDO);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -50,7 +50,7 @@ public class HospitalController extends EnvelopRestEndpoint {
            return hospitalService.getListByName(name, level, page, pageSize);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -64,7 +64,7 @@ public class HospitalController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Company.message_success_delete);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
}

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

@@ -55,7 +55,7 @@ public class IotDeviceDictController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Company.message_success_create, iotDeviceDictService.create(dictDO));
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }

svr/svr-iot/src/main/java/com/yihu/iot/controller/iotMessage/IotMessageController.java

@@ -43,7 +43,7 @@ public class IotMessageController extends EnvelopRestEndpoint {
            return iotMessageService.findAll(page,size);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -56,7 +56,7 @@ public class IotMessageController extends EnvelopRestEndpoint {
            return iotMessageService.markRead(id);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }

svr/svr-iot/src/main/java/com/yihu/iot/controller/label/FigureLabelSearchController.java

@@ -35,7 +35,7 @@ public class FigureLabelSearchController extends EnvelopRestEndpoint {
        try {
            return MixEnvelop.getSuccess(IotRequestMapping.FigureLabelInfo.message_success_find, figureLabelSerachService.getFigureLabelByIdcard(jsonData));
        } catch (Exception e) {
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -46,7 +46,7 @@ public class FigureLabelSearchController extends EnvelopRestEndpoint {
        try {
            return MixEnvelop.getSuccess(IotRequestMapping.FigureLabelInfo.message_success_find, figureLabelSerachService.getFigureLabelByLabel(jsonData));
        } catch (Exception e) {
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }

svr/svr-iot/src/main/java/com/yihu/iot/controller/label/IotDeviceLabelController.java

@@ -36,7 +36,7 @@ public class IotDeviceLabelController extends EnvelopRestEndpoint {
            IotDeviceLabelDO iotDevice = toEntity(jsonData, IotDeviceLabelDO.class);
            return MixEnvelop.getSuccess(IotRequestMapping.DeviceLabel.message_success_create, iotDeviceLabelService.create(iotDevice));
        } catch (Exception e) {
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -49,7 +49,7 @@ public class IotDeviceLabelController extends EnvelopRestEndpoint {
        try {
            return MixEnvelop.getSuccess(IotRequestMapping.DeviceLabel.message_success_find, iotDeviceLabelService.findById(id));
        } catch (Exception e) {
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }

svr/svr-iot/src/main/java/com/yihu/iot/controller/label/IotDeviceLabelInfoController.java

@@ -36,7 +36,7 @@ public class IotDeviceLabelInfoController extends EnvelopRestEndpoint {
            IotDeviceLabelInfoDO iotDeviceLabelInfo = toEntity(jsonData, IotDeviceLabelInfoDO.class);
            return MixEnvelop.getSuccess(IotRequestMapping.DeviceLabelInfo.message_success_create, iotDeviceLabelInfoService.create(iotDeviceLabelInfo));
        } catch (Exception e) {
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -49,7 +49,7 @@ public class IotDeviceLabelInfoController extends EnvelopRestEndpoint {
        try {
            return MixEnvelop.getSuccess(IotRequestMapping.DeviceLabelInfo.message_success_find, iotDeviceLabelInfoService.findById(id));
        } catch (Exception e) {
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }

svr/svr-iot/src/main/java/com/yihu/iot/controller/monitorPlatform/MonitorPlatformController.java

@@ -61,7 +61,7 @@ public class MonitorPlatformController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Device.message_success_create);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -92,7 +92,7 @@ public class MonitorPlatformController extends EnvelopRestEndpoint {
            }
        }catch (Exception e){
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -458,7 +458,7 @@ public class MonitorPlatformController extends EnvelopRestEndpoint {
            return monitorPlatformService.findDeviceLocations(diseaseCondition,page,pageSize,type);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }

svr/svr-iot/src/main/java/com/yihu/iot/controller/platform/IotInterfaceAuditController.java

@@ -42,7 +42,7 @@ public class IotInterfaceAuditController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.InterfaceAudit.message_success_apply_for);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -58,7 +58,7 @@ public class IotInterfaceAuditController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.InterfaceAudit.message_success_find,iotInterfaceAuditVO);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -82,7 +82,7 @@ public class IotInterfaceAuditController extends EnvelopRestEndpoint {
            return iotInterfaceAuditService.findAllApplyFor(page,size);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -107,7 +107,7 @@ public class IotInterfaceAuditController extends EnvelopRestEndpoint {
            return iotInterfaceAuditService.conditionQueryPage(companyName,page,size);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -122,7 +122,7 @@ public class IotInterfaceAuditController extends EnvelopRestEndpoint {
            return iotInterfaceAuditService.auditPass(id);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -137,7 +137,7 @@ public class IotInterfaceAuditController extends EnvelopRestEndpoint {
            return iotInterfaceAuditService.auditNoPass(id,msg);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -162,7 +162,7 @@ public class IotInterfaceAuditController extends EnvelopRestEndpoint {
            return iotInterfaceAuditService.queryCompanyAppPage(page,size);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }

svr/svr-iot/src/main/java/com/yihu/iot/controller/platform/IotInterfaceController.java

@@ -55,7 +55,7 @@ public class IotInterfaceController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Platform.message_success_add);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -69,7 +69,7 @@ public class IotInterfaceController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Platform.message_success_edit);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -84,7 +84,7 @@ public class IotInterfaceController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Platform.message_success_find,iotShareInterfaceDO);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -97,7 +97,7 @@ public class IotInterfaceController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess("获取成功",iotShareInterfaceDO.getDocUrl());
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -120,7 +120,7 @@ public class IotInterfaceController extends EnvelopRestEndpoint {
            return iotShareInterfaceService.findAll(page,size);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -137,7 +137,7 @@ public class IotInterfaceController extends EnvelopRestEndpoint {
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -164,7 +164,7 @@ public class IotInterfaceController extends EnvelopRestEndpoint {
            return iotShareInterfaceService.conditionQueryPage(page,size,type,name);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -188,7 +188,7 @@ public class IotInterfaceController extends EnvelopRestEndpoint {
            return iotShareInterfaceService.findCompanyShareInterface(page,size);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -215,7 +215,7 @@ public class IotInterfaceController extends EnvelopRestEndpoint {
            return iotInterfaceLogService.findAll(page,size,interfaceName);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -240,7 +240,7 @@ public class IotInterfaceController extends EnvelopRestEndpoint {
            return iotInterfaceLogService.dataConsumption(page,size);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -255,7 +255,7 @@ public class IotInterfaceController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Platform.message_success_find, vo);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -272,7 +272,7 @@ public class IotInterfaceController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Platform.message_success_edit);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -286,7 +286,7 @@ public class IotInterfaceController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Platform.message_success_delete);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -302,7 +302,7 @@ public class IotInterfaceController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Platform.message_success_add);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -318,7 +318,7 @@ public class IotInterfaceController extends EnvelopRestEndpoint {
            return iotCompanyAppInterfaceService.delAppInterface(id);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -335,7 +335,7 @@ public class IotInterfaceController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Platform.message_success_find, iotCompanyAppInterfaceService.findAppInterface(appId));
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -363,7 +363,7 @@ public class IotInterfaceController extends EnvelopRestEndpoint {
            return iotInterfaceLogService.findInterfaceLog(page,size,interfaceName,addressIp);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -388,7 +388,7 @@ public class IotInterfaceController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Platform.message_success_find, iotShareInterfaceService.findAllApp(page,size,name));
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -407,7 +407,7 @@ public class IotInterfaceController extends EnvelopRestEndpoint {
            return iotCompanyService.addPlatformApp(iotCompany);
        } catch (IOException e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }

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

@@ -88,7 +88,7 @@ public class IotProductController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccessListWithPage(IotRequestMapping.Company.message_success_find_functions,iotCompanyVOList, page, size,count);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -129,7 +129,7 @@ public class IotProductController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccessListWithPage(IotRequestMapping.Company.message_success_find_functions,iotCompanyVOList, page, size,count);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -143,7 +143,7 @@ public class IotProductController extends EnvelopRestEndpoint {
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -157,7 +157,7 @@ public class IotProductController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_find, vo);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -188,7 +188,7 @@ public class IotProductController extends EnvelopRestEndpoint {
            }
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -201,7 +201,7 @@ public class IotProductController extends EnvelopRestEndpoint {
            return iotProductBaseInfoService.updProduct(iotProductVO);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -216,7 +216,7 @@ public class IotProductController extends EnvelopRestEndpoint {
            return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_update, voList);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }

svr/svr-iot/src/main/java/com/yihu/iot/controller/third/ThirdDataInputController.java

@@ -35,7 +35,7 @@ public class ThirdDataInputController {
        try{
            return MixEnvelop.getSuccess(DataRequestMapping.DataInput.message_success,dataInputService.bindUser(jsonData));
        } catch (ApiException e){
            return MixEnvelop.getError(e.getMessage(), e.getErrorCode());
            return MixEnvelop.getError("操作失败", e.getErrorCode());
        }
    }
@@ -46,11 +46,11 @@ public class ThirdDataInputController {
        try{
            return MixEnvelop.getSuccess("success");
        } catch (ApiException e){
            return MixEnvelop.getError(e.getMessage(), e.getErrorCode());
            return MixEnvelop.getError("操作失败", e.getErrorCode());
        }
    }
    @GetMapping(value = IotRequestMapping.ThirdOpen.searchList)
    @PostMapping(value = IotRequestMapping.ThirdOpen.searchList)
    @ApiOperation(value = "查询数据,分页", notes = "根据条件查询数据,分页")
    @IntefaceLogRequired
    public MixEnvelop searchList(
@@ -79,7 +79,7 @@ public class ThirdDataInputController {
            }
            return dataSearchService.getDataToBean(startTime,endTime,sn,ext_code,idcard,page,size,itemCode);
        } catch (ApiException e){
            return MixEnvelop.getError(e.getMessage(), e.getErrorCode());
            return MixEnvelop.getError("操作失败", e.getErrorCode());
        }
    }
@@ -97,7 +97,7 @@ public class ThirdDataInputController {
                return MixEnvelop.getError(result.getString("msg"));
            }
        } catch (ApiException e) {
            return MixEnvelop.getError(e.getMessage(), e.getErrorCode());
            return MixEnvelop.getError("操作失败", e.getErrorCode());
        }
        return MixEnvelop.getSuccess(DataRequestMapping.DataInput.message_success, result);
    }
@@ -113,7 +113,7 @@ public class ThirdDataInputController {
                return MixEnvelop.getError(result.getString("msg"));
            }
        } catch (ApiException e) {
            return MixEnvelop.getError(e.getMessage(), e.getErrorCode());
            return MixEnvelop.getError("操作失败", e.getErrorCode());
        }
        return MixEnvelop.getSuccess(DataRequestMapping.DataInput.message_success, result.getString("msg"));
    }

svr/svr-iot/src/main/java/com/yihu/iot/controller/workType/IotWorkTypeController.java

@@ -36,7 +36,7 @@ public class IotWorkTypeController extends EnvelopRestEndpoint {
            return iotWorkTypeService.addType(json);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -51,7 +51,7 @@ public class IotWorkTypeController extends EnvelopRestEndpoint {
           return iotWorkTypeService.editType(json);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -66,7 +66,7 @@ public class IotWorkTypeController extends EnvelopRestEndpoint {
            return  iotWorkTypeService.deleteType(id);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -81,7 +81,7 @@ public class IotWorkTypeController extends EnvelopRestEndpoint {
            return  iotWorkTypeService.findType(id);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -103,7 +103,7 @@ public class IotWorkTypeController extends EnvelopRestEndpoint {
            return iotWorkTypeService.findAll(page,size);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -130,7 +130,7 @@ public class IotWorkTypeController extends EnvelopRestEndpoint {
            return iotWorkTypeService.conditionQueryPage(page,size,type,explanation);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }

svr/svr-iot/src/main/java/com/yihu/iot/datainput/controller/DataInputController.java

@@ -31,7 +31,7 @@ public class DataInputController {
        try{
            return MixEnvelop.getSuccess(DataRequestMapping.DataInput.message_success,dataInputService.deleteEsByCondition(jsonData));
        } catch (Exception e){
            return MixEnvelop.getError(e.getMessage());
            return MixEnvelop.getError("操作失败");
        }
    }
@@ -50,7 +50,7 @@ public class DataInputController {
        try{
            return MixEnvelop.getSuccess(DataRequestMapping.DataInput.message_success,dataInputService.bindUser(jsonData));
        } catch (ApiException e){
            return MixEnvelop.getError(e.getMessage(), e.getErrorCode());
            return MixEnvelop.getError("操作失败", e.getErrorCode());
        }
    }
@@ -67,7 +67,7 @@ public class DataInputController {
                return MixEnvelop.getError(result.getString("msg"));
            }
        } catch (ApiException e) {
            return MixEnvelop.getError(e.getMessage(), e.getErrorCode());
            return MixEnvelop.getError("操作失败", e.getErrorCode());
        }
        return MixEnvelop.getSuccess(DataRequestMapping.DataInput.message_success, result);
    }
@@ -83,7 +83,7 @@ public class DataInputController {
                return MixEnvelop.getError(result.getString("msg"));
            }
        } catch (ApiException e) {
            return MixEnvelop.getError(e.getMessage(), e.getErrorCode());
            return MixEnvelop.getError("操作失败", e.getErrorCode());
        }
        return MixEnvelop.getSuccess(DataRequestMapping.DataInput.message_success, result.getString("msg"));
    }

svr/svr-iot/src/main/java/com/yihu/iot/datainput/controller/DataSearchController.java

@@ -33,7 +33,7 @@ public class DataSearchController {
        try{
            return MixEnvelop.getSuccess(DataRequestMapping.DataSearch.search_success,dataSearchService.getDataToBean(jsonData));
        } catch (ApiException e){
            return MixEnvelop.getError(e.getMessage(), e.getErrorCode());
            return MixEnvelop.getError("操作失败", e.getErrorCode());
        }
    }
@@ -46,7 +46,7 @@ public class DataSearchController {
        try{
            return MixEnvelop.getSuccess(DataRequestMapping.DataSearch.search_success,dataSearchService.getDataToBean(jsonData));
        } catch (ApiException e){
            return MixEnvelop.getError(e.getMessage(), e.getErrorCode());
            return MixEnvelop.getError("操作失败", e.getErrorCode());
        }
    }
@@ -58,7 +58,7 @@ public class DataSearchController {
        try{
            return MixEnvelop.getSuccess(DataRequestMapping.DataSearch.search_success, dataSearchService.getDataToBean(jsonData));
        } catch (ApiException e){
            return MixEnvelop.getError(e.getMessage(), e.getErrorCode());
            return MixEnvelop.getError("操作失败", e.getErrorCode());
        }
    }
@@ -72,7 +72,7 @@ public class DataSearchController {
            jsonObject.put("size", 5);
            return MixEnvelop.getSuccess(DataRequestMapping.DataSearch.search_success, dataSearchService.getDataToBean(jsonObject.toJSONString()));
        } catch (ApiException e){
            return MixEnvelop.getError(e.getMessage(), e.getErrorCode());
            return MixEnvelop.getError("操作失败", e.getErrorCode());
        }
    }
@@ -84,7 +84,7 @@ public class DataSearchController {
        try{
            return MixEnvelop.getSuccess(DataRequestMapping.DataSearch.search_success,dataSearchService.getDataToBean(jsonData));
        } catch (ApiException e){
            return MixEnvelop.getError(e.getMessage(), e.getErrorCode());
            return MixEnvelop.getError("操作失败", e.getErrorCode());
        }
    }
@@ -98,7 +98,7 @@ public class DataSearchController {
            jsonObject.put("size",1);
            return MixEnvelop.getSuccess(DataRequestMapping.DataSearch.search_success, dataSearchService.getDataToBean(jsonData));
        } catch (ApiException e) {
            return MixEnvelop.getError(e.getMessage(), e.getErrorCode());
            return MixEnvelop.getError("操作失败", e.getErrorCode());
        }
    }
@@ -110,7 +110,7 @@ public class DataSearchController {
        try{
            return MixEnvelop.getSuccess(DataRequestMapping.DataSearch.search_success,dataSearchService.getDataToBean(jsonData));
        } catch (ApiException e){
            return MixEnvelop.getError(e.getMessage(), e.getErrorCode());
            return MixEnvelop.getError("操作失败", e.getErrorCode());
        }
    }
@@ -126,7 +126,7 @@ public class DataSearchController {
            }
            return MixEnvelop.getSuccess(DataRequestMapping.DataSearch.delete_success,str);
        } catch (ApiException e){
            return MixEnvelop.getError(e.getMessage(), e.getErrorCode());
            return MixEnvelop.getError("操作失败", e.getErrorCode());
        }
    }
@@ -142,7 +142,7 @@ public class DataSearchController {
            }
            return MixEnvelop.getSuccess(DataRequestMapping.DataSearch.update_success,str);
        } catch (ApiException e){
            return MixEnvelop.getError(e.getMessage(), e.getErrorCode());
            return MixEnvelop.getError("操作失败", e.getErrorCode());
        }
    }
@@ -154,7 +154,7 @@ public class DataSearchController {
        try{
            return MixEnvelop.getSuccess(DataRequestMapping.DataSearch.search_success,dataSearchService.getWeRunDataList(jsonData));
        } catch (ApiException e){
            return MixEnvelop.getError(e.getMessage(), e.getErrorCode());
            return MixEnvelop.getError("操作失败", e.getErrorCode());
        }
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/datainput/controller/DataStandardConvertController.java

@@ -28,7 +28,7 @@ public class DataStandardConvertController {
        try{
            return MixEnvelop.getSuccess(DataRequestMapping.DataStandardConvert.message_success_convert,dataStandardConvertService.iconvert(jsonData));
        } catch (ApiException e){
            return MixEnvelop.getError(e.getMessage(), e.getErrorCode());
            return MixEnvelop.getError("操作失败", e.getErrorCode());
        }
    }

svr/svr-iot/src/main/java/com/yihu/iot/util/excel/EntityUtils.java

@@ -16,7 +16,7 @@ public class EntityUtils {
        try {
            entity  = objectMapper.readValue(json,target);
        } catch (Exception e) {
           throw new RuntimeException("Json字符串转换成【"+target.getName()+"】实体类异常：" + e.getMessage());
           throw new RuntimeException("Json字符串转换成【"+target.getName()+"】实体类异常：");
        }
        return entity;
    }