From e46076726d29cf217d44ce7168764c110e7ddee7 Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Tue, 11 Feb 2020 14:32:57 +0800 Subject: [PATCH 1/3] springConfig --- .../main/java/com/ccsens/tall/config/SpringConfig.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tall/src/main/java/com/ccsens/tall/config/SpringConfig.java b/tall/src/main/java/com/ccsens/tall/config/SpringConfig.java index bb617059..20059d5d 100644 --- a/tall/src/main/java/com/ccsens/tall/config/SpringConfig.java +++ b/tall/src/main/java/com/ccsens/tall/config/SpringConfig.java @@ -79,7 +79,13 @@ public class SpringConfig implements WebMvcConfigurer { @Override public void addCorsMappings(CorsRegistry registry) { - registry.addMapping("/**").allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS"); +// registry.addMapping("/**").allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS"); + registry.addMapping("/**") + .allowedOrigins("*") + .allowedMethods("GET", "HEAD", "POST", "PUT", "DELETE", "OPTIONS") + .allowCredentials(true) + .maxAge(3600) + .allowedHeaders("*"); } /** From 9656fd542d1586886eccb23211ace132d175f3cb Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Wed, 12 Feb 2020 18:25:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=97=85=E4=BA=BA?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ht/src/main/java/com/ccsens/ht/api/PatientController.java | 7 +++++-- .../main/java/com/ccsens/ht/service/IPatientService.java | 4 ++-- ht/src/main/java/com/ccsens/ht/service/PatientService.java | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ht/src/main/java/com/ccsens/ht/api/PatientController.java b/ht/src/main/java/com/ccsens/ht/api/PatientController.java index c9f720b5..e1437539 100644 --- a/ht/src/main/java/com/ccsens/ht/api/PatientController.java +++ b/ht/src/main/java/com/ccsens/ht/api/PatientController.java @@ -1,6 +1,7 @@ package com.ccsens.ht.api; import cn.hutool.core.util.IdcardUtil; +import com.alibaba.fastjson.JSONObject; import com.ccsens.ht.annotation.DoctorAudit; import com.ccsens.cloudutil.annotation.MustLogin; import com.ccsens.ht.bean.dto.PatientDto; @@ -144,7 +145,9 @@ public class PatientController { @RequestMapping(value="/editPatientOtherMsg", method = RequestMethod.POST) public JsonResponse editPatientOtherMsg(@RequestBody @ApiParam @Valid QueryDto params) { log.info("查询其他信息请求参数：{}", params); - CodeEnum codeEnum = patientService.editPatientOtherMsg(params.getParam(), params.getUserId()); - return JsonResponse.newInstance().ok(codeEnum); + long id = patientService.editPatientOtherMsg(params.getParam(), params.getUserId()); + JSONObject json = new JSONObject(); + json.put("id", id); + return JsonResponse.newInstance().ok(CodeEnum.SUCCESS, json); } } diff --git a/ht/src/main/java/com/ccsens/ht/service/IPatientService.java b/ht/src/main/java/com/ccsens/ht/service/IPatientService.java index 10f193d2..b7c0225a 100644 --- a/ht/src/main/java/com/ccsens/ht/service/IPatientService.java +++ b/ht/src/main/java/com/ccsens/ht/service/IPatientService.java @@ -41,11 +41,11 @@ public interface IPatientService { * 编辑病友其他信息 * @param edit * @param userId - *@return: com.ccsens.ptpro.util.CodeEnum + *@return: *@Author: wuHuiJuan *@date: 2019/11/20 11:33 */ - CodeEnum editPatientOtherMsg(PatientDto.EditOtherMsg edit, Long userId); + long editPatientOtherMsg(PatientDto.EditOtherMsg edit, Long userId); /** * 根据记录人查询病人信息 diff --git a/ht/src/main/java/com/ccsens/ht/service/PatientService.java b/ht/src/main/java/com/ccsens/ht/service/PatientService.java index d1c56b2d..b2218ad4 100644 --- a/ht/src/main/java/com/ccsens/ht/service/PatientService.java +++ b/ht/src/main/java/com/ccsens/ht/service/PatientService.java @@ -220,7 +220,7 @@ public class PatientService implements IPatientService { } @Override - public CodeEnum editPatientOtherMsg(PatientDto.EditOtherMsg edit, Long userId) { + public long editPatientOtherMsg(PatientDto.EditOtherMsg edit, Long userId) { String type = edit.getEditType(); JSONObject json = edit.getModel(); @@ -243,6 +243,7 @@ public class PatientService implements IPatientService { Method method = bean.getClass().getMethod(methodName, modelClass); //方法调用（保存/修改） method.invoke(bean, model); + return json.getLong("id"); } catch (ClassNotFoundException e) { log.error("编辑病人其他信息反射异常",e); throw new BaseException(CodeEnum.PARAM_ERROR); @@ -256,6 +257,5 @@ public class PatientService implements IPatientService { log.error("编辑病人其他信息反射异常",e); throw new BaseException(CodeEnum.PARAM_ERROR); } - return CodeEnum.SUCCESS; } } From c8023eabfe35d18f8b7c8234d1b0e366f63012ca Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Thu, 13 Feb 2020 18:21:55 +0800 Subject: [PATCH 3/3] rec_status=0 --- game/src/main/resources/mapper_dao/GameUserJoinDao.xml | 8 ++++---- .../main/java/com/ccsens/ht/service/PatientService.java | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/game/src/main/resources/mapper_dao/GameUserJoinDao.xml b/game/src/main/resources/mapper_dao/GameUserJoinDao.xml index 462ffb2a..89e5c825 100644 --- a/game/src/main/resources/mapper_dao/GameUserJoinDao.xml +++ b/game/src/main/resources/mapper_dao/GameUserJoinDao.xml @@ -18,7 +18,7 @@ @@ -33,7 +33,7 @@ FROM t_game_user_join WHERE - record_id = #{recordId} + record_id = #{recordId} and rec_status = 0