forked from kidgrow-microservices-platform

zhaoxiaohao
2020-06-24 4dabf145f35d9cedc37804cee8d36cf437766699
修改数据需求上传的功能,修改医院logo接口,图片上传缩略图的bug
4 files modified
17 ■■■■ changed files
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-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java 2 ●●● patch | view | raw | blame | history
kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/CommonConstant.java 3 ●●●● patch | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html 4 ●●●● patch | view | raw | blame | history
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DataNeedController.java
@@ -18,6 +18,7 @@
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
@@ -27,6 +28,7 @@
/**
 * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
 *
 * @Description: 医生的数据需求
 * @Project: 用户中心
 * @CreateDate: Created in 2020-04-01 09:37:04 <br>
@@ -57,6 +59,7 @@
        }
        return dataNeedService.findList(params);
    }
    /**
     * H端列表  需要医院和科室id
     */
@@ -65,6 +68,7 @@
    public ResultBody list(@RequestParam Map<String, Object> params, @LoginUser(isFull = true)SysUser sysUser) {
        return dataNeedService.FindAllByHId(params,sysUser);
    }
    /**
     * 查询
     */
@@ -74,6 +78,7 @@
        DataNeed model = dataNeedService.getById(id);
        return ResultBody.ok().data(model).msg("查询成功");
    }
    /**
     *更新状态和文件地址
     */
@@ -82,6 +87,7 @@
    public ResultBody updateEnabled(@RequestParam Map<String,Object> map) {
        return dataNeedService.updateEnabled(map);
    }
    /**
     *更新使用状态
     */
@@ -114,7 +120,6 @@
            return ResultBody.ok().data(dataNeed).msg("保存成功");
        }
    }
    /**
     * 删除
     */
@@ -124,6 +129,7 @@
        dataNeedService.removeById(id);
        return ResultBody.ok().msg("删除成功");
    }
    /**
     * 导出excel
     *
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java
@@ -133,7 +133,7 @@
     * 修改医院logo
     */
    @ApiOperation(value = "保存")
    @GetMapping("/updateLogo")
    @PostMapping("/updateLogo")
    public ResultBody updateLogo(@RequestBody Map<String, Object> params)
    {
        return sysHospitalService.updateLogo(params);
kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/CommonConstant.java
@@ -246,7 +246,8 @@
    /**
     * 生成缩略图需要的图片暂存目录
     */
    public static final String TEMP_IMAGE_PATH="D:/resources/images/";
//    public static final String TEMP_IMAGE_PATH="D:/resources/images/";
    public static final String TEMP_IMAGE_PATH="/root/data";
    /**
     * 普通医生角色ID
     */
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html
@@ -27,7 +27,7 @@
</script>
<script type="text/html" id="app-table-bar1">
    {{# if (d.enabled ==0){}}
    {{# if (d.enabled ==0&&d.dataFile==null){}}
    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="upload">待上传数据</a>
    {{#  } else { }}
    <p>已上传</p>
@@ -184,7 +184,7 @@
                            done: function (data) {
                                layer.closeAll('loading');
                                // $("#dataFile").val(data.url);
                                updateEnabled(data.url, true);
                                updateEnabled(data.url, false);
                            },
                            error: function (data) {
                                layer.closeAll('loading');