Browse Source

0609代码

pt
hyy-alt 5 years ago
parent
commit
bc69986a81
  1. 4
      wisdomcar/src/main/java/com/ccsens/wisdomcar/api/OtherRecordsController.java
  2. 2
      wisdomcar/src/main/java/com/ccsens/wisdomcar/api/PatientAndFamilyController.java
  3. 8
      wisdomcar/src/main/java/com/ccsens/wisdomcar/api/WisdomCarController.java
  4. 2
      wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IWisdomCarService.java
  5. 2
      wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java

4
wisdomcar/src/main/java/com/ccsens/wisdomcar/api/OtherRecordsController.java

@ -31,7 +31,7 @@ public class OtherRecordsController {
@Resource @Resource
private IOtherRecordsService iOtherRecordsService; private IOtherRecordsService iOtherRecordsService;
@ApiOperation(value = "上传图片和记录", notes = "") @ApiOperation(value = "上传图片和记录", notes = "1007")
@RequestMapping(value = "/upload", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) @RequestMapping(value = "/upload", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse upload(@ApiParam @Validated @RequestBody QueryDto<OtherRecordsDto.PicturesAndRecords> params){ public JsonResponse upload(@ApiParam @Validated @RequestBody QueryDto<OtherRecordsDto.PicturesAndRecords> params){
log.info("上传图片和记录:{}", params); log.info("上传图片和记录:{}", params);
@ -41,7 +41,7 @@ public class OtherRecordsController {
} }
@ApiOperation(value = "查询上传图片和记录", notes = "") @ApiOperation(value = "查询上传图片和记录", notes = "1007")
@RequestMapping(value = "/queryList", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) @RequestMapping(value = "/queryList", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<List<OtherRecordsVo.TypeAndComment>> queryList(@ApiParam @Validated @RequestBody QueryDto<OtherRecordsDto.QueryId> params){ public JsonResponse<List<OtherRecordsVo.TypeAndComment>> queryList(@ApiParam @Validated @RequestBody QueryDto<OtherRecordsDto.QueryId> params){
log.info("查询上传图片和记录:{}", params); log.info("查询上传图片和记录:{}", params);

2
wisdomcar/src/main/java/com/ccsens/wisdomcar/api/PatientAndFamilyController.java

@ -67,7 +67,7 @@ public class PatientAndFamilyController {
} }
@ApiOperation(value = "查询患者", notes = "") @ApiOperation(value = "查询患者", notes = "1007")
@RequestMapping(value = "/queryPatientInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) @RequestMapping(value = "/queryPatientInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<PatientAndFamilyVo.PatientInfo> queryPatientInfo(@ApiParam @Validated @RequestBody QueryDto<PatientAndFamilyDto.queryPatientInfo> params) { public JsonResponse<PatientAndFamilyVo.PatientInfo> queryPatientInfo(@ApiParam @Validated @RequestBody QueryDto<PatientAndFamilyDto.queryPatientInfo> params) {
log.info("查询患者:{}", params); log.info("查询患者:{}", params);

8
wisdomcar/src/main/java/com/ccsens/wisdomcar/api/WisdomCarController.java

@ -74,7 +74,7 @@ public class WisdomCarController {
}*/ }*/
@ApiOperation(value = "查询绑定平车", notes = "") @ApiOperation(value = "查询绑定平车", notes = "1007")
@RequestMapping(value = "/queryBindingCar", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) @RequestMapping(value = "/queryBindingCar", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<List<WisdomCarVo.BindingCarInfo>> queryBindingCar(@ApiParam @Validated @RequestBody QueryDto<WisdomCarDto.QueryInfo> params) { public JsonResponse<List<WisdomCarVo.BindingCarInfo>> queryBindingCar(@ApiParam @Validated @RequestBody QueryDto<WisdomCarDto.QueryInfo> params) {
log.info("查询绑定平车:{}", params); log.info("查询绑定平车:{}", params);
@ -83,12 +83,12 @@ public class WisdomCarController {
return JsonResponse.newInstance().ok(list); return JsonResponse.newInstance().ok(list);
} }
@MustLogin
@ApiOperation(value = "查询正在运行的平车绑定的患者信息", notes = "") @ApiOperation(value = "查询正在运行的平车绑定的患者信息", notes = "1007")
@RequestMapping(value = "/queryBindingCarRun", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) @RequestMapping(value = "/queryBindingCarRun", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<List<WisdomCarVo.queryBindingCarRun>> queryBindingCarRun(@ApiParam @Validated @RequestBody QueryDto<WisdomCarDto.queryBindingCarRun> params) { public JsonResponse<List<WisdomCarVo.queryBindingCarRun>> queryBindingCarRun(@ApiParam @Validated @RequestBody QueryDto<WisdomCarDto.queryBindingCarRun> params) {
log.info("查询正在运行的平车绑定的患者信息:{}", params); log.info("查询正在运行的平车绑定的患者信息:{}", params);
List<WisdomCarVo.queryBindingCarRun> list = wisdomCarService.queryBindingCarRun(params.getParam()); List<WisdomCarVo.queryBindingCarRun> list = wisdomCarService.queryBindingCarRun(params.getParam(),params.getUserId());
log.info("查询正在运行的平车绑定的患者信息成功"); log.info("查询正在运行的平车绑定的患者信息成功");
return JsonResponse.newInstance().ok(list); return JsonResponse.newInstance().ok(list);
} }

2
wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IWisdomCarService.java

@ -54,5 +54,5 @@ public interface IWisdomCarService {
* @param param 参数 * @param param 参数
* *
*/ */
List<WisdomCarVo.queryBindingCarRun> queryBindingCarRun(WisdomCarDto.queryBindingCarRun param); List<WisdomCarVo.queryBindingCarRun> queryBindingCarRun(WisdomCarDto.queryBindingCarRun param, Long userId);
} }

2
wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java

@ -370,7 +370,7 @@ public class WisdomCarService implements IWisdomCarService {
} }
@Override @Override
public List<WisdomCarVo.queryBindingCarRun> queryBindingCarRun(WisdomCarDto.queryBindingCarRun param) { public List<WisdomCarVo.queryBindingCarRun> queryBindingCarRun(WisdomCarDto.queryBindingCarRun param, Long userId) {
List<WisdomCarVo.queryBindingCarRun> queryBindingCarRunList = patientWisdomCarDao.queryBindingCarIsRun(param.getCarId()); List<WisdomCarVo.queryBindingCarRun> queryBindingCarRunList = patientWisdomCarDao.queryBindingCarIsRun(param.getCarId());
if(CollectionUtil.isEmpty(queryBindingCarRunList)){ if(CollectionUtil.isEmpty(queryBindingCarRunList)){
log.info("未找到对应的平车在运行"); log.info("未找到对应的平车在运行");

Loading…
Cancel
Save