xinyilu/xinelu-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

根据前端统一请求头中region参数

Browse Source
This commit is contained in:
mengkuiliang 2023-11-09 10:27:18 +08:00
parent 3e28c16035
commit 40900ff82c
7 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xinelu-admin/src/main/java/com/xinelu/web/controller/applet/ResidentServiceApplyController.java
View File

@ -144,15 +144,12 @@ public class ResidentServiceApplyController extends BaseController {
@ApiOperation("服务评价列表")
@GetMapping("/evaluateRecord/{identity}")
public R<List<OrderEvaluateVo>> performanceEvaluateRecord(@PathVariable String identity) {
PatientInfo patientInfo = residentPatientInfoService.getByCardNo(identity);
if (patientInfo != null && !StringUtils.isBlank(patientInfo.getCityCode())) {
String result = (String) httpService.get(SpringUtils.getFdUrl(patientInfo.getCityCode()) + "/performance/recordV2/" + identity, null, String.class);
JSONObject jsonObject = JSONObject.parseObject(result);
if (jsonObject.getInteger("code") == 1) {
if (jsonObject.get("data") != null && jsonObject.getJSONArray("data").size() > 0) {
return R.ok(JSONArray.parseArray(jsonObject.getJSONArray("data").toJSONString()).toJavaList(OrderEvaluateVo.class));
}
public R<List<OrderEvaluateVo>> performanceEvaluateRecord(@PathVariable String identity, @RequestHeader("region") String region) {
String result = (String) httpService.get(SpringUtils.getFdUrl(region) + "/performance/recordV2/" + identity, null, String.class);
JSONObject jsonObject = JSONObject.parseObject(result);
if (jsonObject.getInteger("code") == 1) {
if (jsonObject.get("data") != null && jsonObject.getJSONArray("data").size() > 0) {
return R.ok(JSONArray.parseArray(jsonObject.getJSONArray("data").toJSONString()).toJavaList(OrderEvaluateVo.class));
}
}
return R.ok();

11
xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/chatrecord/ChatRecordController.java
View File

@ -20,13 +20,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
/**
@ -102,13 +96,14 @@ public class ChatRecordController extends BaseController {
@ApiOperation(value = "获取指定类型的消息记录", notes = "1：通知公告 2：健康推送 4：消息通知")
@GetMapping("/getMegList")
public TableDataInfo getMegList(MessageSearchDto messageDto) {
public TableDataInfo getMegList(MessageSearchDto messageDto, @RequestHeader("region") String region) {
if (messageDto.getPatientId() == null) {
throw new ServiceException("居民业务主键不能为空");
}
if (StringUtils.isBlank(messageDto.getMessageCategory())) {
throw new ServiceException("消息类型不能为空");
}
messageDto.setCityCode(region);
startPage();
return getDataTable(chatRecordService.getMegList(messageDto));
}

12
xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/nurseapplogin/NurseAppLoginController.java
View File

@ -9,12 +9,10 @@ import com.xinelu.common.core.domain.AjaxResult;
import com.xinelu.common.core.page.TableDataInfo;
import com.xinelu.common.custominterface.Query;
import com.xinelu.common.exception.ServiceException;
import com.xinelu.common.utils.StringUtils;
import org.springframework.validation.BindingResult;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
@ -91,11 +89,11 @@ public class NurseAppLoginController extends BaseController {
*/
@MobileRequestAuthorization
@GetMapping("/appPersonal")
public AjaxResult nurseAppPersonal(Long patientId) {
public AjaxResult nurseAppPersonal(Long patientId, @RequestHeader("region") String region) {
if (Objects.isNull(patientId)) {
return AjaxResult.error("用户信息不能为空!");
}
return nurseAppLoginService.nurseAppPersonal(patientId);
return nurseAppLoginService.nurseAppPersonal(patientId, region);
}
/**
@ -128,4 +126,4 @@ public class NurseAppLoginController extends BaseController {
}
return nurseAppLoginService.updateAppointmentOrder(appointmentOrderId, cancelAppointmentReason);
}
}
}

2
xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/NurseAppLoginService.java
View File

@ -44,7 +44,7 @@ public interface NurseAppLoginService {
* @param patientId 会员id
* @return 结果
*/
AjaxResult nurseAppPersonal(Long patientId);
AjaxResult nurseAppPersonal(Long patientId, String region);
/**
* App查询预约服务订单

5
xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/impl/NurseAppLoginServiceImpl.java
View File

@ -180,7 +180,7 @@ public class NurseAppLoginServiceImpl implements NurseAppLoginService {
* @return 结果
*/
@Override
public AjaxResult nurseAppPersonal(Long patientId) {
public AjaxResult nurseAppPersonal(Long patientId, String region) {
PatientAndDiseaseVO patientDisease = nurseAppLoginMapper.getPatientDiseaseByPatientId(patientId);
if (Objects.nonNull(patientDisease) && Objects.nonNull(patientDisease.getBirthDate())) {
patientDisease.setAge(AgeUtil.getAgeMonth(String.valueOf(patientDisease.getBirthDate())));
@ -205,6 +205,7 @@ public class NurseAppLoginServiceImpl implements NurseAppLoginService {
} else {
patientDisease.setAreaName("");
}
patientDisease.setCityCode(region);
// 更新签约编号
setSignInfo(patientDisease);
//查询所有商品订单
@ -287,4 +288,4 @@ public class NurseAppLoginServiceImpl implements NurseAppLoginService {
}
return AjaxResult.success();
}
}
}

3
xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/chatrecord/MessageSearchDto.java
View File

@ -63,4 +63,7 @@ public class MessageSearchDto {
@ApiModelProperty(value = "通知适用人群编号集合", hidden = true)
private List<String> crowdNoList;
@ApiModelProperty("城市编码(1：德州 2：东营)")
private String cityCode;
}

2
xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/chatrecord/impl/ChatRecordServiceImpl.java
View File

@ -255,7 +255,7 @@ public class ChatRecordServiceImpl implements IChatRecordService {
return chatRecordMapper.selectMegList(messageDto);
// 健康推送
} else if(messageDto.getMessageCategory().equals("2")) {
String result = (String) httpService.get(SpringUtils.getFdUrl(patientInfo.getCityCode()) + "/resident/signinfo/detail/" + patientInfo.getCardNo(), null, String.class);
String result = (String) httpService.get(SpringUtils.getFdUrl(messageDto.getCityCode()) + "/resident/signinfo/detail/" + patientInfo.getCardNo(), null, String.class);
JSONObject jsonObject = JSONObject.parseObject(result);
if (!"1".equals(jsonObject.get("code"))) {
throw new ServiceException(jsonObject.get("msg").toString());