From 4dabf145f35d9cedc37804cee8d36cf437766699 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Wed, 24 Jun 2020 14:10:08 +0800
Subject: [PATCH] 修改数据需求上传的功能，修改医院logo接口，图片上传缩略图的bug
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java | 2 +-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DataNeedController.java | 30 ++++++++++++++++++------------
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html | 4 ++--
kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/CommonConstant.java | 3 ++-
4 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DataNeedController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DataNeedController.java
index ecc3eec..e5a2a3d 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DataNeedController.java
+++ b/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>
@@ -37,7 +39,7 @@
@RestController
@RequestMapping("/dataneed")
@Api(tags = "医生的数据需求")
-public class DataNeedController extends BaseController{
+public class DataNeedController extends BaseController {
@Autowired
private IDataNeedService dataNeedService;
@@ -51,20 +53,22 @@
})
@GetMapping
public PageResult list(@RequestParam Map<String, Object> params) {
- if(params.size()==0){
- params.put("page",1);
- params.put("limit",10);
+ if (params.size() == 0) {
+ params.put("page", 1);
+ params.put("limit", 10);
}
return dataNeedService.findList(params);
}
+
/**
* H端列表 需要医院和科室id
*/
@ApiOperation(value = "H端列表,需要医院和科室id")
@GetMapping("/hlist")
- public ResultBody list(@RequestParam Map<String, Object> params, @LoginUser(isFull = true)SysUser sysUser) {
- return dataNeedService.FindAllByHId(params,sysUser);
+ public ResultBody list(@RequestParam Map<String, Object> params, @LoginUser(isFull = true) SysUser sysUser) {
+ return dataNeedService.FindAllByHId(params, sysUser);
}
+
/**
* 查询
*/
@@ -74,21 +78,23 @@
DataNeed model = dataNeedService.getById(id);
return ResultBody.ok().data(model).msg("查询成功");
}
+
/**
- *更新状态和文件地址
+ * 更新状态和文件地址
*/
@ApiOperation(value = "更新状态和文件地址")
@GetMapping("updateEnabled")
- public ResultBody updateEnabled(@RequestParam Map<String,Object> map) {
+ public ResultBody updateEnabled(@RequestParam Map<String, Object> map) {
return dataNeedService.updateEnabled(map);
}
+
/**
- *更新使用状态
+ * 更新使用状态
*/
@ApiOperation(value = "更新使用状态")
@GetMapping("updateDelete")
- public ResultBody updateDelete(@RequestParam Long id,@LoginUser(isFull = true) SysUser sysUser) {
- return dataNeedService.updateDelete(id,sysUser);
+ public ResultBody updateDelete(@RequestParam Long id, @LoginUser(isFull = true) SysUser sysUser) {
+ return dataNeedService.updateDelete(id, sysUser);
}
/**
@@ -114,7 +120,6 @@
return ResultBody.ok().data(dataNeed).msg("保存成功");
}
}
-
/**
* 删除
*/
@@ -124,6 +129,7 @@
dataNeedService.removeById(id);
return ResultBody.ok().msg("删除成功");
}
+
/**
* 导出excel
*
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java
index faa384a..b8e9934 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java
+++ b/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);
diff --git a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/CommonConstant.java b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/CommonConstant.java
index 565de1a..25ca205 100644
--- a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/CommonConstant.java
+++ b/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
*/
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html
index 8081d87..6813051 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html
+++ b/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');
--
Gitblit v1.8.0