forked from kidgrow-microservices-platform

克 刘
2021-03-01 183f436c553b641770fdb2352452192c97009a84
Merge remote-tracking branch 'origin/dev' into dev
18 files modified
49 ■■■■■ changed files
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/PartnerDockingInfoServiceImpl.java 10 ●●●●● patch | view | raw | blame | history
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/PartnerDockingInfoController.java 6 ●●●● patch | view | raw | blame | history
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/PayManagerController.java 2 ●●●●● patch | view | raw | blame | history
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java 1 ●●●● patch | view | raw | blame | history
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java 4 ●●●● patch | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/company.html 2 ●●● patch | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html 2 ●●● patch | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html 2 ●●● patch | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html 2 ●●● patch | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/equipmentDocking.html 2 ●●● patch | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html 2 ●●● patch | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_health.html 2 ●●● patch | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_pay.html 2 ●●● patch | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product_form.html 2 ●●● patch | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html 2 ●●● patch | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html 2 ●●● patch | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysOrganization.html 2 ●●● patch | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysdictionaries.html 2 ●●● patch | view | raw | blame | history
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/PartnerDockingInfoServiceImpl.java
@@ -31,6 +31,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.DigestUtils;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.text.SimpleDateFormat;
@@ -129,8 +130,9 @@
        String updateTime = "";
        try {
            // 1、读取基础表结构SQL
            Resource resource = resourceLoader.getResource("classpath:template//imageServer_template.sql");
            Resource resource = resourceLoader.getResource("classpath:template"+ File.separator+"imageServer_template.sql");
            fileImput = resource.getInputStream();  //new FileInputStream("./template/imageServer_template.sql");
            if (fileImput != null) {
            dbSql = FileUtils.readFile(fileImput);
            // 2、读取医院信息表Hospital_Info,插入SQL文中
@@ -382,12 +384,18 @@
            // 8、所有SQL文合并入基本的SQL中
            dbSql += hospitalSQL + departmentSQL + doctorSQL + partnerSQL + serverSQL + serviceSQL;
            }
            else {
                log.error("ImageServerSQL-Template读取错误!");
            }
        } catch (Exception e) {
            e.printStackTrace();
        } finally {
            try {
                if (fileImput != null) {
                fileImput.close();
                }
            } catch (IOException e) {
                e.printStackTrace();
            }
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/PartnerDockingInfoController.java
@@ -155,6 +155,10 @@
    public void downLoadDataBase(@RequestBody PartnerDockingInfo partnerDockingInfo, HttpServletResponse response) {
        String dbSql = partnerDockingInfoService.createSQL(partnerDockingInfo);
        if ((dbSql  == null) ||(dbSql.isEmpty())) {
            log.error("创建私有云数据库脚本出错!");
        } else {
        OutputStream out = null;
        InputStream fileInputStream = null;
        try {
@@ -166,7 +170,6 @@
            response.setContentType("application/x-msdownload");
            response.addHeader("Content-Length", "" + arr.length);
            response.addHeader("Content-Disposition", "attachment; filename=\"" + partnerDockingInfo.getHospitalName()+partnerDockingInfo.getDepartmentName() + ".sql\"");
            out = response.getOutputStream();
@@ -192,3 +195,4 @@
        }
    }
}
}
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/PayManagerController.java
@@ -184,11 +184,13 @@
                    }
                    else if(modelDetail==null)
                    {
                        if(payManager.getEnabled()){
                        Boolean isResult=payManagerService.saveproductOrder(payManager,sysUser);
                        if (!isResult) {
                            return ResultBody.failed().msg("套餐充入失败,支付开通失败!");
                        }
                    }
                    }
                } else {
                    Boolean isResult=payManagerService.saveproductOrder(payManager,sysUser);
                    if (!isResult) {
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java
@@ -378,6 +378,7 @@
            sysUser.setType(UserType.DOCTOR.name());
            sysUser.setTenantId(CommonConstant.H_TENANT);
            sysUser.setCreateTime(new Date());
            sysUser.setDefaultAuth(true);
            SysUser byId = iSysUserService.getById(id);
            if (byId != null) {
                sysUser.setCreateUserId(byId.getId());
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
@@ -798,7 +798,11 @@
            sysUser.setType(UserType.DOCTOR.name());
        }
        sysUser.setHAdminUser(false);
        if(isReg){
        sysUser.setDefaultAuth(false);
        }else{
            sysUser.setDefaultAuth(true);
        }
        sysUser.setOpenId(userRegVo.getOpenId());
        sysUser.setDel(false);
        sysUser.setTenantId(CommonConstant.H_TENANT);
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/company.html
@@ -31,7 +31,7 @@
</script>
<!-- 表单弹窗 -->
<script type="text/html" id="app-model">
    <form id="app-form" lay-filter="app-form" class="layui-form model-form">
    <form id="app-form" lay-filter="app-form" class="layui-form model-form" autocomplete="off" >
        <input name="id" type="hidden"/>
        <div class="layui-form-item">
            <label class="layui-form-label">租户</label>
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html
@@ -36,7 +36,7 @@
<!-- 表单弹窗 -->
<script type="text/html" id="app-model">
    <form id="app-form" lay-filter="app-form" class="layui-form model-form">
    <form id="app-form" lay-filter="app-form" class="layui-form model-form" autocomplete="off">
        <input name="id" type="hidden"/>
        <div class="layui-form-item">
            <label class="layui-form-label">需求类型</label>
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html
@@ -52,7 +52,7 @@
</script>
<!-- 表单弹窗 -->
<script type="text/html" id="app-model">
    <form id="app-form" lay-filter="app-form" class="layui-form model-form">
    <form id="app-form" lay-filter="app-form" class="layui-form model-form" autocomplete="off">
        <input name="id" type="hidden" />
        <div style="display:flex">
            <div class="layui-form-item">
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html
@@ -1,4 +1,4 @@
<form id="app-form-add" lay-filter="app-form-add" class="layui-form model-form">
<form id="app-form-add" lay-filter="app-form-add" autocomplete="off" class="layui-form model-form">
    <input name="id" type="hidden" />
    <div style="display:flex">
        <div class="layui-form-item">
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/equipmentDocking.html
@@ -36,7 +36,7 @@
<!-- 表单弹窗 -->
<script type="text/html" id="app-model">
    <form id="app-form" lay-filter="app-form" class="layui-form model-form">
    <form id="app-form" lay-filter="app-form" class="layui-form model-form" autocomplete="off">
        <input name="id" type="hidden"/>
        <div class="layui-form-item">
            <label class="layui-form-label" style="width: 75px;">所在医院</label>
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html
@@ -1,4 +1,4 @@
<form id="hospital-form" lay-filter="hospital-form" class="layui-form model-form" method="POST">
<form id="hospital-form" lay-filter="hospital-form" autocomplete="off" class="layui-form model-form" method="POST">
    <div class="layui-form-item">
        <div class="layui-row">
            <div class="layui-col-sm7">
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_health.html
@@ -1,4 +1,4 @@
<form id="health-form" lay-filter="health-form" class="layui-form model-form" method="POST">
<form id="health-form" lay-filter="health-form" autocomplete="off" class="layui-form model-form" method="POST">
    <div class="layui-form-item">
        <label class="layui-form-label" style="width: 150px;">服务</label>
        <div class="layui-input-block">
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_pay.html
@@ -1,4 +1,4 @@
<form id="pay-form" lay-filter="pay-form" class="layui-form model-form" method="POST">
<form id="pay-form" lay-filter="pay-form" autocomplete="off" class="layui-form model-form" method="POST">
    <div class="layui-form-item">
        <label class="layui-form-label" style="width: 150px;">医院</label>
        <div class="layui-input-block">
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product_form.html
@@ -1,4 +1,4 @@
<form id="product-form" lay-filter="product-form" class="layui-form model-form" method="POST">
<form id="product-form" lay-filter="product-form" class="layui-form model-form" method="POST" autocomplete="off" >
    <div class="layui-form-item">
        <label class="layui-form-label">产品类型</label>
        <div class="layui-input-block">
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html
@@ -1,4 +1,4 @@
<form id="recharge-form" lay-filter="recharge-form" class="layui-form">
<form id="recharge-form" lay-filter="recharge-form" autocomplete="off" class="layui-form">
    <div style="overflow-y: auto; height:700px;">
        <div class="layui-tab">
            <ul class="layui-tab-title">
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html
@@ -1,4 +1,4 @@
<form id="recharge-form" lay-filter="recharge-form" class="layui-form">
<form id="recharge-form" lay-filter="recharge-form" autocomplete="off" class="layui-form">
    <div style="overflow-y: auto; height:700px;">
        <div class="layui-tab">
            <ul class="layui-tab-title">
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysOrganization.html
@@ -32,7 +32,7 @@
<!-- 表单弹窗 -->
<script type="text/html" id="app-model">
    <form id="app-form" lay-filter="app-form" class="layui-form model-form">
    <form id="app-form" lay-filter="app-form" class="layui-form model-form" autocomplete="off">
        <input name="id" type="hidden"/>
        <div class="layui-form-item">
            <label class="layui-form-label">请选择:</label>
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysdictionaries.html
@@ -31,7 +31,7 @@
<!-- 表单弹窗 -->
<script type="text/html" id="app-model">
    <form id="app-form" lay-filter="app-form" class="layui-form model-form">
    <form id="app-form" lay-filter="app-form" class="layui-form model-form" autocomplete="off">
        <input name="id" type="hidden"/>
        <div class="layui-form-item">
            <label class="layui-form-label">字典类型</label>