forked from kidgrow-microservices-platform

zhaoxiaohao
2020-04-15 4f118852a78e872f54510d01ff999d77c68ce7ed
修改 医生模板的bug,字典的bug 和需求数据上传图片的bug
6 files modified
223 ■■■■ changed files
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IDataNeedService.java 11 ●●●●● patch | view | raw | blame | history
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/DataNeedServiceImpl.java 21 ●●●●● patch | view | raw | blame | history
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DataNeedController.java 8 ●●●●● patch | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html 136 ●●●●● patch | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctorTemplete.html 4 ●●●● patch | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysdictionaries.html 43 ●●●●● patch | view | raw | blame | history
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IDataNeedService.java
@@ -1,5 +1,6 @@
package com.kidgrow.oprationcenter.service;
import com.kidgrow.common.model.ResultBody;
import com.kidgrow.oprationcenter.model.DataNeed;
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.service.ISuperService;
@@ -32,6 +33,16 @@
    */
    DataNeed findByObject(DataNeed dataNeed);
    /**
     * 导出
     * @param params
     * @return
     */
    List<DataNeedExcel> findListExportByParam(Map<String, Object> params);
    /**
     *更新状态和文件地址
     */
    ResultBody updateEnabled(Map<String, Object> map);
}
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/DataNeedServiceImpl.java
@@ -1,5 +1,6 @@
package com.kidgrow.oprationcenter.service.impl;
import com.kidgrow.common.model.ResultBody;
import com.kidgrow.oprationcenter.vo.DataNeedExcel;
import org.springframework.cglib.beans.BeanCopier;
import org.springframework.stereotype.Service;
@@ -62,4 +63,24 @@
        });
        return voList;
    }
    @Override
    public ResultBody updateEnabled(Map<String, Object> map) {
        Long id = MapUtils.getLong(map, "id");
        if(id==null){
            return ResultBody.failed("请选择一条数据");
        }else {
            DataNeed dataNeed = baseMapper.selectById(id);
            if (dataNeed != null) {
                Boolean enabled = MapUtils.getBoolean(map, "enabled");
                String dataFile = MapUtils.getString(map, "dataFile");
                dataNeed.setDataFile(dataFile);
                dataNeed.setEnabled(enabled);
                baseMapper.updateById(dataNeed);
            }else {
                return ResultBody.failed("查找数据失败");
            }
            return ResultBody.ok();
        }
    }
}
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DataNeedController.java
@@ -65,6 +65,14 @@
        DataNeed model = dataNeedService.getById(id);
        return ResultBody.ok().data(model).msg("查询成功");
    }
    /**
     *更新状态和文件地址
     */
    @ApiOperation(value = "查询")
    @GetMapping("updateEnabled")
    public ResultBody updateEnabled(@RequestParam Map<String,Object> map) {
        return dataNeedService.updateEnabled(map);
    }
    /**
     * 根据DataNeed当做查询条件进行查询
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html
@@ -94,22 +94,23 @@
    </form>
</script>
<!-- <script type="text/html" id="app-upload">
<script type="text/html" id="app-upload">
    <form id="app-form-upload" lay-filter="app-form-upload" class="layui-form model-form">
        <input name="id" id="upload-id"  type="hidden"/>
        <div class="layui-form-item">
            <label class="layui-form-label">上传文件</label>
            <div class="layui-input-block" id="demo">
                <button type="button" class="layui-btn" id="phonto">
                    <i class="layui-icon">&#xe67c;</i>上传文件
                  </button>
                <input name="dataFile" id="dataFile"  type="hidden" class="layui-input" maxlength="20"/>
                <input name="enabled" id="enabled"  type="hidden" value="0" class="layui-input" maxlength="20"/>
            </div>
        </div>
    </form>
    <label class="layui-form-label">上传文件</label>
    <button type="button" class="layui-btn" id="uploads">
        <i class="layui-icon">&#xe67c;</i>上传文件
      </button>
</script> -->
</script>
<!-- <script type="text/javascript" src="../../assets/libs/layui/layui.js"></script> -->
<script>
    layui.use(['form', 'table', 'laydate', 'util', 'upload', 'config', 'admin'], function () {
        var form = layui.form;
@@ -144,11 +145,11 @@
                { field: 'doctorName', width: 180, sort: true, title: '医生姓名' },
                { field: 'doctorTel', width: 200, sort: true, title: '联系电话' },
                { field: 'hospitalName', width: 180, sort: true, title: '所在医院' },
                { field: 'needBegintime', width: 300, sort: true, title: '时间段', templet: "<div>{{layui.util.toDateString(d.needBegintime, 'yyyy年MM月dd日 HH:mm:ss')}}至{{layui.util.toDateString(d.needEndtime, 'yyyy年MM月dd日 HH:mm:ss')}}</div>" },
                { field: 'needBegintime', width: 300, sort: true, title: '时间段', templet: "<div>{{layui.util.toDateString(d.needBegintime, 'yyyy年MM月dd日')}}至{{layui.util.toDateString(d.needEndtime, 'yyyy年MM月dd日')}}</div>" },
                { field: 'needType', width: 250, sort: true, title: '数据类型', templet: function (d) { if (d.needType == 1) { return '筛查' } else { return '就诊' } } },// 0就诊数据 1筛查
                { field: 'needTags', width: 250, align: 'center', toolbar: '#app-table-bar', sort: true, title: '需求标签' },
                { field: 'enabled', width: 250, sort: true, toolbar: '#app-table-bar1', title: '处理状态', },
                { field: 'downTime', width: 250, sort: true, title: '时间', templet: "<div>{{layui.util.toDateString(d.downTime, 'yyyy年MM月dd日 HH:mm:ss')}}</div>" }
                { field: 'downTime', width: 250, sort: true, title: '时间', templet: "<div>{{layui.util.toDateString(d.downTime, 'yyyy年MM月dd日')}}</div>" }
            ]]
        });
@@ -160,54 +161,55 @@
            if (layEvent === 'detail') { // 显示详情
                showEditModel(data);
            } else if (layEvent === 'upload') { // 上传
                // console.log(12312312)
                // var upload = $("#app-upload");
                // console.log(123123123243)
                // console.log(upload)
                // upload.css('display', 'block')
                // layer.alert('');
                // showUpload(data)
                layer.open({
                    type: 1,
                    title:'上传图片',
                    area: ["500px", "360px"],
                   content:'<div style="" id="app-upload" class="text-center"><form id="app-form-upload" lay-filter="app-form-upload" class="layui-form model-form"><input name="id" id="upload-id" type="hidden" /> <div class="layui-form-item"> </div></form><label class="layui-form-label">上传文件</label> <button type="button" class="layui-btn" id="uploads"><i class="layui-icon">&#xe67c;</i>上传文件</button></div>'
                });
                    title: '上传图片',
                    area: ["500px", "150px"],
                    content: $('#app-upload').html(),
                    success: function () {
                        $("#upload-id").val(data.id)
                        var upload = layui.upload;
                        //执行实例
                        upload.render({
                            elem: '#phonto',
                            url: config.base_server + 'api-file/files-anon',
                            accept: 'file',
                            auto: true,
                            headers: { "Authorization": "Bearer " + config.getToken().access_token },
                            before: function (obj) {
                                layer.load(); //上传loading
                            },
                            done: function (data) {
                                layer.closeAll('loading');
                                // $("#dataFile").val(data.url);
                                updateEnabled(data.url, true);
                            },
                            error: function (data) {
                                layer.closeAll('loading');
                            }
                        });
                    }
                });
            }
        });
        //更新上传的状态
        var updateEnabled = function (dataFile, enabled) {
            console.log($("#upload-id").val())
        // var showUpload = function (data) {
        //     layer.open({
        //         type: 1,
        //         title: '上传文件',
        //         area: '450px',
        //         offset: '120px',
        //         content: $('#app-upload').html(),
        //         success: function () {
        //             $('#app-form-upload')[0].reset();
        //             $('#app-form-upload').attr('method', 'POST');
        //             if (data) {
        //                 form.val('#app-form-upload', data);
        //                 $('#app-form-upload').attr('method', 'POST');
        //             }
        //         }
        //     });
        // };
        // // 删除
        // var doDelete = function (obj) {
        //     layer.confirm('确定要删除吗?', function (i) {
        //         layer.close(i);
        //         layer.load(2);
        //         admin.req('api-opration/dataneed/' + obj.data.id, {}, function (data) {
        //             layer.closeAll('loading');
        //             layer.msg('成功', { icon: 1, time: 500 });
        //             obj.del();
        //         }, 'DELETE');
        //     });
        // };
            admin.req('api-opration/dataneed/updateEnabled', {
                id: $("#upload-id").val(),
                enabled: enabled,
                dataFile: dataFile
            }, function (data) {
                layer.closeAll('loading');
                if (data.code == 0) {
                    layer.closeAll();
                    table.reload('app-table', { where: {} });
                } else {
                    layer.msg(data.msg, { icon: 2, time: 500 });
                }
            }, 'GET');
        }
        // 搜索按钮点击事件
        $('#app-btn-search').click(function () {
            var key = $('#app-edit-search').val();
@@ -296,30 +298,6 @@
                }
            });
        };
        //文件上传
        upload.render({
            elem: '#uploads',
            url: config.base_server + 'api-file/files-anon',
            accept: 'file',
            auto: true,
            headers: { "Authorization": "Bearer " + config.getToken().access_token },
            before: function (obj) {
                console.log(2132132132)
                // layer.load(); //上传loading
                //预读本地文件示例,不支持ie8
                // obj.preview(function (index, file, result) {
                //     $(".layui-upload-img").remove();
                //     $('#demo2').append('<img src="' + result + '" width="50px" height="50px" alt="' + file.name + '" class="layui-upload-img">')
                // });
            },
            done: function (data) {
                layer.closeAll('loading');
                console.log(data);
                $("[name=headImgUrl]").val(data.url);
            },
            error: function (data) {
                layer.closeAll('loading');
            }
        });
    });
</script>
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctorTemplete.html
@@ -1,9 +1,9 @@
<div class="layui-card">
    <div class="layui-card-header">
        <h2 class="header-title">业务日志</h2>
        <h2 class="header-title">医生模板</h2>
        <span class="layui-breadcrumb pull-right">
            <a href="#!home_console">首页</a>
            <a><cite>业务日志</cite></a>
            <a><cite>医生模板</cite></a>
        </span>
    </div>
    <div class="layui-card-body">
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysdictionaries.html
@@ -31,18 +31,23 @@
<!-- 表单弹窗 -->
<script type="text/html" id="app-model">
    <style>
        .layui-layer-setwin {
    position: absolute;
    right: 15px;
    *right: 0;
    top: -29px;
    font-size: 0;
    line-height: initial;
}
    </style>
    <form id="app-form" lay-filter="app-form" class="layui-form model-form">
        <input name="id" type="hidden"/>
        <div class="layui-form-item">
            <label class="layui-form-label">字典类型</label>
            <div class="layui-input-block">
                <input name="zidian_or_fenlei" id="fenlei" type="radio" value="1"   lay-filter="resourceType" onchange="ccc" title="分类" class="layui-input" maxlength="20"/>
                <input name="zidian_or_fenlei" id="zidian " type="radio" value="0" checked lay-filter="resourceType"  title="字典" class="layui-input" maxlength="20"/>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">所属类型</label>
            <div class="layui-input-block">
                <select id="role_clients"   name="dictionariesClassId" placeholder="选择一个应用" lay-filter="role_clients">
                    <option value="">-请选择-</option>
                </select>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">字典值</label>
            <div class="layui-input-block">
@@ -60,16 +65,10 @@
            <label class="layui-form-label">字段排序</label>
            <div class="layui-input-block">
                <input name="dictionariesOrder" placeholder="请输入数字"  type="text" class="layui-input" maxlength="20"
                       lay-verify="required" required />
                       lay-verify="required|number" required />
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">字典类型</label>
            <div class="layui-input-block">
                <input name="zidian_or_fenlei" id="fenlei" type="radio" value="1"   lay-filter="resourceType" onchange="ccc" title="分类" class="layui-input" maxlength="20"/>
                <input name="zidian_or_fenlei" id="zidian " type="radio" value="0" checked lay-filter="resourceType"  title="字典" class="layui-input" maxlength="20"/>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">状态</label>
            <div class="layui-input-block">
@@ -77,13 +76,7 @@
                <input name="enabled" id="enabled2" type="radio"  value="0" title="停用" class="layui-input" maxlength="20"/>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">所属类型</label>
            <div class="layui-input-block">
                <select id="role_clients"   name="dictionariesClassId" placeholder="选择一个应用" lay-filter="role_clients">
                    <option value="">-请选择-</option>
                </select>
        </div>
        <div class="layui-form-item model-form-footer zd-btn-class" style="margin-top:30px;">
            <button class="layui-btn layui-btn-primary" ew-event="closeDialog" type="button">取消</button>
            <button class="layui-btn" lay-filter="user-form-submit" lay-submit>保存</button>