From 90f2acaa6c61d5a60822d4fee5a44ec3c5404f67 Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Wed, 31 Mar 2021 18:52:02 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ScreeningOrganizationInfoController.java | 61 ++++++++++++++++++------------
1 files changed, 37 insertions(+), 24 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ScreeningOrganizationInfoController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ScreeningOrganizationInfoController.java
index 9169434..b3adf53 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ScreeningOrganizationInfoController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ScreeningOrganizationInfoController.java
@@ -20,6 +20,7 @@
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ClassPathResource;
import org.springframework.validation.BindingResult;
import org.springframework.validation.ObjectError;
import org.springframework.web.bind.annotation.*;
@@ -28,7 +29,10 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -106,15 +110,16 @@
}
return ResultBody.failed().msg(errMsg.toString());
} else {
- if (organizationInfo.getId() == null) {
- //新增机构增加关注二维码
- String url = createQr(String.valueOf(organizationInfo.getId()));
- if (StringUtils.isNotBlank(url)) {
- organizationInfo.setQrCode(url);
- }
- }
boolean v = organizationInfoService.saveOrUpdate(organizationInfo);
if (v) {
+ if (StringUtils.isBlank(organizationInfo.getQrCode())) {
+ //新增机构增加关注二维码
+ String url = createQr(String.valueOf(organizationInfo.getId()));
+ if (StringUtils.isNotBlank(url)) {
+ organizationInfo.setQrCode(url);
+ organizationInfoService.updateById(organizationInfo);
+ }
+ }
return ResultBody.ok().data(organizationInfo).msg("保存成功");
} else {
return ResultBody.failed().msg("保存失败");
@@ -123,15 +128,16 @@
}
private String createQr(String id) {
+ log.info("***************创建筛查机构二维码开始*******************");
String url = "";
- String str = "{\"action_name\": \"QR_LIMIT_STR_SCENE\", \"action_info\": {\"scene\": {\"scene_str\": \"kagscreening_\" " + id + "}}}";
-
+ String str = "{\"action_name\": \"QR_LIMIT_STR_SCENE\", \"action_info\": {\"scene\": {\"scene_str\": \"kagscreening_" + id + "\"}}}";
+ log.info("***************创建筛查机构二维码参数" + str + "*******************");
String token = redisUtils.get("Wechat:Token:KagReceiveToken").toString();
String result = HttpRequest.post("https://api.weixin.qq.com/cgi-bin/qrcode/create?access_token=" + token)
.header("Content-Type", "application/json")
.body(str).execute().body();
-
+ log.info("***************创建筛查机构二维码结果=>" + result);
if (StringUtils.isBlank(result)) {
return url;
}
@@ -219,21 +225,24 @@
List<ScreeningOrganizationExcel> list = ExcelUtil.importExcel(excel, 0, 1, ScreeningOrganizationExcel.class);
rowNum = list.size();
if (rowNum > 0) {
- List<ScreeningOrganizationInfo> users = new ArrayList<>(rowNum);
String[] area = areaCode.split("#");
list.forEach(u -> {
- ScreeningOrganizationInfo user = new ScreeningOrganizationInfo();
- BeanUtil.copyProperties(u, user);
- user.setSourceHospitalName(hospitalName);
- user.setSourceHospitalId(Long.parseLong(hospitalId));
- user.setProvince(area[0]);
- user.setCity(area[1]);
- user.setArea(area[2]);
- user.setAreaCode(areaName);
- users.add(user);
+ ScreeningOrganizationInfo organizationInfo = new ScreeningOrganizationInfo();
+ BeanUtil.copyProperties(u, organizationInfo);
+ organizationInfo.setSourceHospitalName(hospitalName);
+ organizationInfo.setSourceHospitalId(Long.parseLong(hospitalId));
+ organizationInfo.setProvince(area[0]);
+ organizationInfo.setCity(area[1]);
+ organizationInfo.setArea(area[2]);
+ organizationInfo.setAreaCode(areaName);
+ organizationInfoService.saveOrUpdate(organizationInfo);
+ if (StringUtils.isBlank(organizationInfo.getQrCode())) {
+ organizationInfo.setQrCode(createQr(String.valueOf(organizationInfo.getId())));
+ organizationInfoService.updateById(organizationInfo);
+ }
});
- organizationInfoService.saveBatch(users);
+
}
}
} catch (Exception e) {
@@ -249,7 +258,11 @@
@PostMapping("/export")
public void export(HttpServletResponse response) {
try {
- InputStream inStream =this.getClass().getResourceAsStream("/static/pages/template/机构导入模板.xlsx");
+ InputStream inStream = null;
+ ClassPathResource resource = new ClassPathResource(File.separator + "template" + File.separator + "机构导入模板.xlsx");
+ if (resource.exists()) {
+ inStream = resource.getInputStream();
+ }
// 设置输出的格式
response.reset();
response.setContentType("bin");
@@ -274,7 +287,7 @@
@PostMapping("/getOrganizationListByHospitalId")
public ResultBody getOrganizationListByHospitalId(@RequestBody String id) {
List<ScreeningOrganizationInfo> byHospitalId = organizationInfoService.findByHospitalId(Long.valueOf(id));
- if(byHospitalId != null && byHospitalId.size() > 0){
+ if (byHospitalId != null && byHospitalId.size() > 0) {
return ResultBody.ok().data(byHospitalId).msg("查询成功");
}
return ResultBody.failed().msg("查询失败");
--
Gitblit v1.8.0