From 0e52b40501310d9339ec816182ae7302a93c1cb2 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期二, 06 八月 2024 20:56:57 +0800 Subject: [PATCH] 新增 ECG模块 --- jh-module-ecg/jh-module-ecg-api/src/main/java/cn/lihu/jh/module/ecg/enums/ErrorCodeConstants.java | 155 -------------------------------------- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java | 2 .gitignore | 1 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java | 8 +- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentService.java | 4 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java | 2 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentSaveReqVO.java | 10 +- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/appointment/AppointmentDO.java | 2 jh-server/pom.xml | 7 + pom.xml | 1 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java | 5 11 files changed, 28 insertions(+), 169 deletions(-) diff --git a/.gitignore b/.gitignore index c41405c..f9b6506 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /jh-framework/jh-common/target /.idea .flattened-pom.xml +/jh-module-ecg/jh-module-ecg-biz/target diff --git a/jh-module-ecg/jh-module-ecg-api/src/main/java/cn/lihu/jh/module/ecg/enums/ErrorCodeConstants.java b/jh-module-ecg/jh-module-ecg-api/src/main/java/cn/lihu/jh/module/ecg/enums/ErrorCodeConstants.java index 28b7bfb..40a118a 100644 --- a/jh-module-ecg/jh-module-ecg-api/src/main/java/cn/lihu/jh/module/ecg/enums/ErrorCodeConstants.java +++ b/jh-module-ecg/jh-module-ecg-api/src/main/java/cn/lihu/jh/module/ecg/enums/ErrorCodeConstants.java @@ -1,4 +1,4 @@ -package cn.lihu.jh.module.system.enums; +package cn.lihu.jh.module.ecg.enums; import cn.lihu.jh.framework.common.exception.ErrorCode; @@ -9,157 +9,6 @@ */ public interface ErrorCodeConstants { - // ========== AUTH 妯″潡 1-002-000-000 ========== - ErrorCode AUTH_LOGIN_BAD_CREDENTIALS = new ErrorCode(1_002_000_000, "鐧诲綍澶辫触锛岃处鍙峰瘑鐮佷笉姝g‘"); - ErrorCode AUTH_LOGIN_USER_DISABLED = new ErrorCode(1_002_000_001, "鐧诲綍澶辫触锛岃处鍙疯绂佺敤"); - ErrorCode AUTH_LOGIN_CAPTCHA_CODE_ERROR = new ErrorCode(1_002_000_004, "楠岃瘉鐮佷笉姝g‘锛屽師鍥狅細{}"); - ErrorCode AUTH_THIRD_LOGIN_NOT_BIND = new ErrorCode(1_002_000_005, "鏈粦瀹氳处鍙凤紝闇�瑕佽繘琛岀粦瀹�"); - ErrorCode AUTH_MOBILE_NOT_EXISTS = new ErrorCode(1_002_000_007, "鎵嬫満鍙蜂笉瀛樺湪"); - - // ========== 鑿滃崟妯″潡 1-002-001-000 ========== - ErrorCode MENU_NAME_DUPLICATE = new ErrorCode(1_002_001_000, "宸茬粡瀛樺湪璇ュ悕瀛楃殑鑿滃崟"); - ErrorCode MENU_PARENT_NOT_EXISTS = new ErrorCode(1_002_001_001, "鐖惰彍鍗曚笉瀛樺湪"); - ErrorCode MENU_PARENT_ERROR = new ErrorCode(1_002_001_002, "涓嶈兘璁剧疆鑷繁涓虹埗鑿滃崟"); - ErrorCode MENU_NOT_EXISTS = new ErrorCode(1_002_001_003, "鑿滃崟涓嶅瓨鍦�"); - ErrorCode MENU_EXISTS_CHILDREN = new ErrorCode(1_002_001_004, "瀛樺湪瀛愯彍鍗曪紝鏃犳硶鍒犻櫎"); - ErrorCode MENU_PARENT_NOT_DIR_OR_MENU = new ErrorCode(1_002_001_005, "鐖惰彍鍗曠殑绫诲瀷蹇呴』鏄洰褰曟垨鑰呰彍鍗�"); - - // ========== 瑙掕壊妯″潡 1-002-002-000 ========== - ErrorCode ROLE_NOT_EXISTS = new ErrorCode(1_002_002_000, "瑙掕壊涓嶅瓨鍦�"); - ErrorCode ROLE_NAME_DUPLICATE = new ErrorCode(1_002_002_001, "宸茬粡瀛樺湪鍚嶄负銆恵}銆戠殑瑙掕壊"); - ErrorCode ROLE_CODE_DUPLICATE = new ErrorCode(1_002_002_002, "宸茬粡瀛樺湪缂栫爜涓恒�恵}銆戠殑瑙掕壊"); - ErrorCode ROLE_CAN_NOT_UPDATE_SYSTEM_TYPE_ROLE = new ErrorCode(1_002_002_003, "涓嶈兘鎿嶄綔绫诲瀷涓虹郴缁熷唴缃殑瑙掕壊"); - ErrorCode ROLE_IS_DISABLE = new ErrorCode(1_002_002_004, "鍚嶅瓧涓恒�恵}銆戠殑瑙掕壊宸茶绂佺敤"); - ErrorCode ROLE_ADMIN_CODE_ERROR = new ErrorCode(1_002_002_005, "缂栫爜銆恵}銆戜笉鑳戒娇鐢�"); - - // ========== 鐢ㄦ埛妯″潡 1-002-003-000 ========== - ErrorCode USER_USERNAME_EXISTS = new ErrorCode(1_002_003_000, "鐢ㄦ埛璐﹀彿宸茬粡瀛樺湪"); - ErrorCode USER_MOBILE_EXISTS = new ErrorCode(1_002_003_001, "鎵嬫満鍙峰凡缁忓瓨鍦�"); - ErrorCode USER_EMAIL_EXISTS = new ErrorCode(1_002_003_002, "閭宸茬粡瀛樺湪"); - ErrorCode USER_NOT_EXISTS = new ErrorCode(1_002_003_003, "鐢ㄦ埛涓嶅瓨鍦�"); - ErrorCode USER_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_002_003_004, "瀵煎叆鐢ㄦ埛鏁版嵁涓嶈兘涓虹┖锛�"); - ErrorCode USER_PASSWORD_FAILED = new ErrorCode(1_002_003_005, "鐢ㄦ埛瀵嗙爜鏍¢獙澶辫触"); - ErrorCode USER_IS_DISABLE = new ErrorCode(1_002_003_006, "鍚嶅瓧涓恒�恵}銆戠殑鐢ㄦ埛宸茶绂佺敤"); - ErrorCode USER_COUNT_MAX = new ErrorCode(1_002_003_008, "鍒涘缓鐢ㄦ埛澶辫触锛屽師鍥狅細瓒呰繃绉熸埛鏈�澶х鎴烽厤棰�({})锛�"); - ErrorCode USER_IMPORT_INIT_PASSWORD = new ErrorCode(1_002_003_009, "鍒濆瀵嗙爜涓嶈兘涓虹┖"); - - // ========== 閮ㄩ棬妯″潡 1-002-004-000 ========== - ErrorCode DEPT_NAME_DUPLICATE = new ErrorCode(1_002_004_000, "宸茬粡瀛樺湪璇ュ悕瀛楃殑閮ㄩ棬"); - ErrorCode DEPT_PARENT_NOT_EXITS = new ErrorCode(1_002_004_001,"鐖剁骇閮ㄩ棬涓嶅瓨鍦�"); - ErrorCode DEPT_NOT_FOUND = new ErrorCode(1_002_004_002, "褰撳墠閮ㄩ棬涓嶅瓨鍦�"); - ErrorCode DEPT_EXITS_CHILDREN = new ErrorCode(1_002_004_003, "瀛樺湪瀛愰儴闂紝鏃犳硶鍒犻櫎"); - ErrorCode DEPT_PARENT_ERROR = new ErrorCode(1_002_004_004, "涓嶈兘璁剧疆鑷繁涓虹埗閮ㄩ棬"); - ErrorCode DEPT_NOT_ENABLE = new ErrorCode(1_002_004_006, "閮ㄩ棬({})涓嶅浜庡紑鍚姸鎬侊紝涓嶅厑璁搁�夋嫨"); - ErrorCode DEPT_PARENT_IS_CHILD = new ErrorCode(1_002_004_007, "涓嶈兘璁剧疆鑷繁鐨勫瓙閮ㄩ棬涓虹埗閮ㄩ棬"); - - // ========== 宀椾綅妯″潡 1-002-005-000 ========== - ErrorCode POST_NOT_FOUND = new ErrorCode(1_002_005_000, "褰撳墠宀椾綅涓嶅瓨鍦�"); - ErrorCode POST_NOT_ENABLE = new ErrorCode(1_002_005_001, "宀椾綅({}) 涓嶅浜庡紑鍚姸鎬侊紝涓嶅厑璁搁�夋嫨"); - ErrorCode POST_NAME_DUPLICATE = new ErrorCode(1_002_005_002, "宸茬粡瀛樺湪璇ュ悕瀛楃殑宀椾綅"); - ErrorCode POST_CODE_DUPLICATE = new ErrorCode(1_002_005_003, "宸茬粡瀛樺湪璇ユ爣璇嗙殑宀椾綅"); - - // ========== 瀛楀吀绫诲瀷 1-002-006-000 ========== - ErrorCode DICT_TYPE_NOT_EXISTS = new ErrorCode(1_002_006_001, "褰撳墠瀛楀吀绫诲瀷涓嶅瓨鍦�"); - ErrorCode DICT_TYPE_NOT_ENABLE = new ErrorCode(1_002_006_002, "瀛楀吀绫诲瀷涓嶅浜庡紑鍚姸鎬侊紝涓嶅厑璁搁�夋嫨"); - ErrorCode DICT_TYPE_NAME_DUPLICATE = new ErrorCode(1_002_006_003, "宸茬粡瀛樺湪璇ュ悕瀛楃殑瀛楀吀绫诲瀷"); - ErrorCode DICT_TYPE_TYPE_DUPLICATE = new ErrorCode(1_002_006_004, "宸茬粡瀛樺湪璇ョ被鍨嬬殑瀛楀吀绫诲瀷"); - ErrorCode DICT_TYPE_HAS_CHILDREN = new ErrorCode(1_002_006_005, "鏃犳硶鍒犻櫎锛岃瀛楀吀绫诲瀷杩樻湁瀛楀吀鏁版嵁"); - - // ========== 瀛楀吀鏁版嵁 1-002-007-000 ========== - ErrorCode DICT_DATA_NOT_EXISTS = new ErrorCode(1_002_007_001, "褰撳墠瀛楀吀鏁版嵁涓嶅瓨鍦�"); - ErrorCode DICT_DATA_NOT_ENABLE = new ErrorCode(1_002_007_002, "瀛楀吀鏁版嵁({})涓嶅浜庡紑鍚姸鎬侊紝涓嶅厑璁搁�夋嫨"); - ErrorCode DICT_DATA_VALUE_DUPLICATE = new ErrorCode(1_002_007_003, "宸茬粡瀛樺湪璇ュ�肩殑瀛楀吀鏁版嵁"); - - // ========== 閫氱煡鍏憡 1-002-008-000 ========== - ErrorCode NOTICE_NOT_FOUND = new ErrorCode(1_002_008_001, "褰撳墠閫氱煡鍏憡涓嶅瓨鍦�"); - - // ========== 鐭俊娓犻亾 1-002-011-000 ========== - ErrorCode SMS_CHANNEL_NOT_EXISTS = new ErrorCode(1_002_011_000, "鐭俊娓犻亾涓嶅瓨鍦�"); - ErrorCode SMS_CHANNEL_DISABLE = new ErrorCode(1_002_011_001, "鐭俊娓犻亾涓嶅浜庡紑鍚姸鎬侊紝涓嶅厑璁搁�夋嫨"); - ErrorCode SMS_CHANNEL_HAS_CHILDREN = new ErrorCode(1_002_011_002, "鏃犳硶鍒犻櫎锛岃鐭俊娓犻亾杩樻湁鐭俊妯℃澘"); - - // ========== 鐭俊妯℃澘 1-002-012-000 ========== - ErrorCode SMS_TEMPLATE_NOT_EXISTS = new ErrorCode(1_002_012_000, "鐭俊妯℃澘涓嶅瓨鍦�"); - ErrorCode SMS_TEMPLATE_CODE_DUPLICATE = new ErrorCode(1_002_012_001, "宸茬粡瀛樺湪缂栫爜涓恒�恵}銆戠殑鐭俊妯℃澘"); - ErrorCode SMS_TEMPLATE_API_ERROR = new ErrorCode(1_002_012_002, "鐭俊 API 妯℃澘璋冪敤澶辫触锛屽師鍥犳槸锛歿}"); - ErrorCode SMS_TEMPLATE_API_AUDIT_CHECKING = new ErrorCode(1_002_012_003, "鐭俊 API 妯$増鏃犳硶浣跨敤锛屽師鍥狅細瀹℃壒涓�"); - ErrorCode SMS_TEMPLATE_API_AUDIT_FAIL = new ErrorCode(1_002_012_004, "鐭俊 API 妯$増鏃犳硶浣跨敤锛屽師鍥狅細瀹℃壒涓嶉�氳繃锛寋}"); - ErrorCode SMS_TEMPLATE_API_NOT_FOUND = new ErrorCode(1_002_012_005, "鐭俊 API 妯$増鏃犳硶浣跨敤锛屽師鍥狅細妯$増涓嶅瓨鍦�"); - - // ========== 鐭俊鍙戦�� 1-002-013-000 ========== - ErrorCode SMS_SEND_MOBILE_NOT_EXISTS = new ErrorCode(1_002_013_000, "鎵嬫満鍙蜂笉瀛樺湪"); - ErrorCode SMS_SEND_MOBILE_TEMPLATE_PARAM_MISS = new ErrorCode(1_002_013_001, "妯℃澘鍙傛暟({})缂哄け"); - ErrorCode SMS_SEND_TEMPLATE_NOT_EXISTS = new ErrorCode(1_002_013_002, "鐭俊妯℃澘涓嶅瓨鍦�"); - - // ========== 鐭俊楠岃瘉鐮� 1-002-014-000 ========== - ErrorCode SMS_CODE_NOT_FOUND = new ErrorCode(1_002_014_000, "楠岃瘉鐮佷笉瀛樺湪"); - ErrorCode SMS_CODE_EXPIRED = new ErrorCode(1_002_014_001, "楠岃瘉鐮佸凡杩囨湡"); - ErrorCode SMS_CODE_USED = new ErrorCode(1_002_014_002, "楠岃瘉鐮佸凡浣跨敤"); - ErrorCode SMS_CODE_EXCEED_SEND_MAXIMUM_QUANTITY_PER_DAY = new ErrorCode(1_002_014_004, "瓒呰繃姣忔棩鐭俊鍙戦�佹暟閲�"); - ErrorCode SMS_CODE_SEND_TOO_FAST = new ErrorCode(1_002_014_005, "鐭俊鍙戦�佽繃浜庨绻�"); - - // ========== 绉熸埛淇℃伅 1-002-015-000 ========== - ErrorCode TENANT_NOT_EXISTS = new ErrorCode(1_002_015_000, "绉熸埛涓嶅瓨鍦�"); - ErrorCode TENANT_DISABLE = new ErrorCode(1_002_015_001, "鍚嶅瓧涓恒�恵}銆戠殑绉熸埛宸茶绂佺敤"); - ErrorCode TENANT_EXPIRE = new ErrorCode(1_002_015_002, "鍚嶅瓧涓恒�恵}銆戠殑绉熸埛宸茶繃鏈�"); - ErrorCode TENANT_CAN_NOT_UPDATE_SYSTEM = new ErrorCode(1_002_015_003, "绯荤粺绉熸埛涓嶈兘杩涜淇敼銆佸垹闄ょ瓑鎿嶄綔锛�"); - ErrorCode TENANT_NAME_DUPLICATE = new ErrorCode(1_002_015_004, "鍚嶅瓧涓恒�恵}銆戠殑绉熸埛宸插瓨鍦�"); - ErrorCode TENANT_WEBSITE_DUPLICATE = new ErrorCode(1_002_015_005, "鍩熷悕涓恒�恵}銆戠殑绉熸埛宸插瓨鍦�"); - - // ========== 绉熸埛濂楅 1-002-016-000 ========== - ErrorCode TENANT_PACKAGE_NOT_EXISTS = new ErrorCode(1_002_016_000, "绉熸埛濂楅涓嶅瓨鍦�"); - ErrorCode TENANT_PACKAGE_USED = new ErrorCode(1_002_016_001, "绉熸埛姝e湪浣跨敤璇ュ椁愶紝璇风粰绉熸埛閲嶆柊璁剧疆濂楅鍚庡啀灏濊瘯鍒犻櫎"); - ErrorCode TENANT_PACKAGE_DISABLE = new ErrorCode(1_002_016_002, "鍚嶅瓧涓恒�恵}銆戠殑绉熸埛濂楅宸茶绂佺敤"); - - // ========== 绀句氦鐢ㄦ埛 1-002-018-000 ========== - ErrorCode SOCIAL_USER_AUTH_FAILURE = new ErrorCode(1_002_018_000, "绀句氦鎺堟潈澶辫触锛屽師鍥犳槸锛歿}"); - ErrorCode SOCIAL_USER_NOT_FOUND = new ErrorCode(1_002_018_001, "绀句氦鎺堟潈澶辫触锛屾壘涓嶅埌瀵瑰簲鐨勭敤鎴�"); - - ErrorCode SOCIAL_CLIENT_WEIXIN_MINI_APP_PHONE_CODE_ERROR = new ErrorCode(1_002_018_200, "鑾峰緱鎵嬫満鍙峰け璐�"); - ErrorCode SOCIAL_CLIENT_WEIXIN_MINI_APP_QRCODE_ERROR = new ErrorCode(1_002_018_201, "鑾峰緱灏忕▼搴忕爜澶辫触"); - ErrorCode SOCIAL_CLIENT_WEIXIN_MINI_APP_SUBSCRIBE_TEMPLATE_ERROR = new ErrorCode(1_002_018_202, "鑾峰緱灏忕▼搴忚闃呮秷鎭ā鐗堝け璐�"); - ErrorCode SOCIAL_CLIENT_WEIXIN_MINI_APP_SUBSCRIBE_MESSAGE_ERROR = new ErrorCode(1_002_018_203, "鍙戦�佸皬绋嬪簭璁㈤槄娑堟伅澶辫触"); - ErrorCode SOCIAL_CLIENT_NOT_EXISTS = new ErrorCode(1_002_018_210, "绀句氦瀹㈡埛绔笉瀛樺湪"); - ErrorCode SOCIAL_CLIENT_UNIQUE = new ErrorCode(1_002_018_211, "绀句氦瀹㈡埛绔凡瀛樺湪閰嶇疆"); - - - // ========== OAuth2 瀹㈡埛绔� 1-002-020-000 ========= - ErrorCode OAUTH2_CLIENT_NOT_EXISTS = new ErrorCode(1_002_020_000, "OAuth2 瀹㈡埛绔笉瀛樺湪"); - ErrorCode OAUTH2_CLIENT_EXISTS = new ErrorCode(1_002_020_001, "OAuth2 瀹㈡埛绔紪鍙峰凡瀛樺湪"); - ErrorCode OAUTH2_CLIENT_DISABLE = new ErrorCode(1_002_020_002, "OAuth2 瀹㈡埛绔凡绂佺敤"); - ErrorCode OAUTH2_CLIENT_AUTHORIZED_GRANT_TYPE_NOT_EXISTS = new ErrorCode(1_002_020_003, "涓嶆敮鎸佽鎺堟潈绫诲瀷"); - ErrorCode OAUTH2_CLIENT_SCOPE_OVER = new ErrorCode(1_002_020_004, "鎺堟潈鑼冨洿杩囧ぇ"); - ErrorCode OAUTH2_CLIENT_REDIRECT_URI_NOT_MATCH = new ErrorCode(1_002_020_005, "鏃犳晥 redirect_uri: {}"); - ErrorCode OAUTH2_CLIENT_CLIENT_SECRET_ERROR = new ErrorCode(1_002_020_006, "鏃犳晥 client_secret: {}"); - - // ========== OAuth2 鎺堟潈 1-002-021-000 ========= - ErrorCode OAUTH2_GRANT_CLIENT_ID_MISMATCH = new ErrorCode(1_002_021_000, "client_id 涓嶅尮閰�"); - ErrorCode OAUTH2_GRANT_REDIRECT_URI_MISMATCH = new ErrorCode(1_002_021_001, "redirect_uri 涓嶅尮閰�"); - ErrorCode OAUTH2_GRANT_STATE_MISMATCH = new ErrorCode(1_002_021_002, "state 涓嶅尮閰�"); - - // ========== OAuth2 鎺堟潈 1-002-022-000 ========= - ErrorCode OAUTH2_CODE_NOT_EXISTS = new ErrorCode(1_002_022_000, "code 涓嶅瓨鍦�"); - ErrorCode OAUTH2_CODE_EXPIRE = new ErrorCode(1_002_022_001, "code 宸茶繃鏈�"); - - // ========== 閭璐﹀彿 1-002-023-000 ========== - ErrorCode MAIL_ACCOUNT_NOT_EXISTS = new ErrorCode(1_002_023_000, "閭璐﹀彿涓嶅瓨鍦�"); - ErrorCode MAIL_ACCOUNT_RELATE_TEMPLATE_EXISTS = new ErrorCode(1_002_023_001, "鏃犳硶鍒犻櫎锛岃閭璐﹀彿杩樻湁閭欢妯℃澘"); - - // ========== 閭欢妯$増 1-002-024-000 ========== - ErrorCode MAIL_TEMPLATE_NOT_EXISTS = new ErrorCode(1_002_024_000, "閭欢妯$増涓嶅瓨鍦�"); - ErrorCode MAIL_TEMPLATE_CODE_EXISTS = new ErrorCode(1_002_024_001, "閭欢妯$増 code({}) 宸插瓨鍦�"); - - // ========== 閭欢鍙戦�� 1-002-025-000 ========== - ErrorCode MAIL_SEND_TEMPLATE_PARAM_MISS = new ErrorCode(1_002_025_000, "妯℃澘鍙傛暟({})缂哄け"); - ErrorCode MAIL_SEND_MAIL_NOT_EXISTS = new ErrorCode(1_002_025_001, "閭涓嶅瓨鍦�"); - - // ========== 绔欏唴淇℃ā鐗� 1-002-026-000 ========== - ErrorCode NOTIFY_TEMPLATE_NOT_EXISTS = new ErrorCode(1_002_026_000, "绔欏唴淇℃ā鐗堜笉瀛樺湪"); - ErrorCode NOTIFY_TEMPLATE_CODE_DUPLICATE = new ErrorCode(1_002_026_001, "宸茬粡瀛樺湪缂栫爜涓恒�恵}銆戠殑绔欏唴淇℃ā鏉�"); - - // ========== 绔欏唴淇℃ā鐗� 1-002-027-000 ========== - - // ========== 绔欏唴淇″彂閫� 1-002-028-000 ========== - ErrorCode NOTIFY_SEND_TEMPLATE_PARAM_MISS = new ErrorCode(1_002_028_000, "妯℃澘鍙傛暟({})缂哄け"); + ErrorCode APPOINTMENT_NOT_EXISTS = new ErrorCode(1_010_000_000, "棰勭害涓嶅瓨鍦�"); } diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java index 3f92d62..16c0648 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java @@ -1,16 +1,12 @@ package cn.lihu.jh.module.ecg.controller.admin.appointment; import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; @@ -29,6 +25,10 @@ import cn.lihu.jh.module.ecg.dal.dataobject.appointment.AppointmentDO; import cn.lihu.jh.module.ecg.service.appointment.AppointmentService; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; + @Tag(name = "绠$悊鍚庡彴 - 棰勭害") @RestController @RequestMapping("/ecg/appointment") diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java index 78f3cf2..599d99f 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java @@ -25,7 +25,7 @@ private Boolean patGender; @Schema(description = "鎮h�呯敓鏃�") - private LocalDate patBirthday; + private LocalDateTime patBirthday; @Schema(description = "鎮h�呮墜鏈�") private String patMobile; diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java index 8b2696e..13eb37d 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java @@ -29,7 +29,7 @@ @Schema(description = "鎮h�呯敓鏃�") @ExcelProperty("鎮h�呯敓鏃�") - private LocalDate patBirthday; + private LocalDateTime patBirthday; @Schema(description = "鎮h�呮墜鏈�") @ExcelProperty("鎮h�呮墜鏈�") diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentSaveReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentSaveReqVO.java index ceaa1f8..dfcea94 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentSaveReqVO.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentSaveReqVO.java @@ -2,14 +2,16 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import jakarta.validation.constraints.*; -import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import java.time.LocalDateTime; @Schema(description = "绠$悊鍚庡彴 - 棰勭害鏂板/淇敼 Request VO") @Data public class AppointmentSaveReqVO { + + private Integer id; @Schema(description = "鎮h�呯紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "29034") @NotEmpty(message = "鎮h�呯紪鍙蜂笉鑳戒负绌�") @@ -24,7 +26,7 @@ private Boolean patGender; @Schema(description = "鎮h�呯敓鏃�") - private LocalDate patBirthday; + private LocalDateTime patBirthday; @Schema(description = "鎮h�呮墜鏈�") private String patMobile; diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/appointment/AppointmentDO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/appointment/AppointmentDO.java index 12846e0..ad3296f 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/appointment/AppointmentDO.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/appointment/AppointmentDO.java @@ -48,7 +48,7 @@ /** * 鎮h�呯敓鏃� */ - private LocalDate patBirthday; + private LocalDateTime patBirthday; /** * 鎮h�呮墜鏈� */ diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentService.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentService.java index b2b19a1..014ccf2 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentService.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentService.java @@ -1,12 +1,12 @@ package cn.lihu.jh.module.ecg.service.appointment; -import java.util.*; -import jakarta.validation.*; import cn.lihu.jh.module.ecg.controller.admin.appointment.vo.*; import cn.lihu.jh.module.ecg.dal.dataobject.appointment.AppointmentDO; import cn.lihu.jh.framework.common.pojo.PageResult; import cn.lihu.jh.framework.common.pojo.PageParam; +import javax.validation.Valid; + /** * 棰勭害 Service 鎺ュ彛 * diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java index cf0654b..69aeaf8 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java @@ -1,11 +1,8 @@ package cn.lihu.jh.module.ecg.service.appointment; import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; -import java.util.*; import cn.lihu.jh.module.ecg.controller.admin.appointment.vo.*; import cn.lihu.jh.module.ecg.dal.dataobject.appointment.AppointmentDO; import cn.lihu.jh.framework.common.pojo.PageResult; @@ -14,6 +11,8 @@ import cn.lihu.jh.module.ecg.dal.mysql.appointment.AppointmentMapper; +import javax.annotation.Resource; + import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*; diff --git a/jh-server/pom.xml b/jh-server/pom.xml index e9884e1..a53c822 100644 --- a/jh-server/pom.xml +++ b/jh-server/pom.xml @@ -32,6 +32,13 @@ <version>${revision}</version> </dependency> + <!-- ECG涓績銆傞粯璁ゆ敞閲婏紝淇濊瘉缂栬瘧閫熷害 --> + <dependency> + <groupId>cn.lihu</groupId> + <artifactId>jh-module-ecg-biz</artifactId> + <version>${revision}</version> + </dependency> + <!-- 浼氬憳涓績銆傞粯璁ゆ敞閲婏紝淇濊瘉缂栬瘧閫熷害 --> <!-- <dependency>--> <!-- <groupId>cn.lihu</groupId>--> diff --git a/pom.xml b/pom.xml index 3fc3e5b..6da604b 100644 --- a/pom.xml +++ b/pom.xml @@ -15,6 +15,7 @@ <!-- 鍚勭 module 鎷撳睍 --> <module>jh-module-system</module> <module>jh-module-infra</module> + <module>jh-module-ecg</module> <!-- <module>jh-module-member</module>--> <!-- <module>jh-module-bpm</module>--> <!-- <module>jh-module-report</module>--> -- Gitblit v1.9.3