From fb18cadcdc7923aef8d6eb62d3f35ccbfb4b47fc Mon Sep 17 00:00:00 2001 From: sikadi <13315935+sikadi_love@user.noreply.gitee.com> Date: Sat, 28 Oct 2023 14:07:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- .../interrogation/domain/MedicineDetail.java | 2 +- .../RemoteHealthTypeFallbackFactory.java | 14 ++++----- .../controller/DiseaseDetatilController.java | 10 ++++++ .../controller/MedicineDetailController.java | 30 ++++++++++++++++++ .../mapper/MedicineDetailMapper.java | 2 ++ .../service/MedicineDetailServer.java | 5 +++ .../impl/DiseaseDetatilServerImpl.java | 3 ++ .../impl/MedicineDetailServerImpl.java | 31 +++++++++++++++++++ .../src/main/resources/bootstrap.yml | 2 +- .../mapper/interrogation/HomepageMapper.xml | 2 +- .../interrogation/MedicineDetailMapper.xml | 19 ++++++++++++ 12 files changed, 111 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index a781ee5..14d0a70 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM anolis-registry.cn-zhangjiakou.cr.aliyuncs.com/openanolis/openjdk:17-8.6 # 暴露端口号 -EXPOSE 10002/tcp +EXPOSE 10005/tcp # 挂载目录位置 diff --git a/grail-patient-interrogation-common/src/main/java/com/grail/interrogation/domain/MedicineDetail.java b/grail-patient-interrogation-common/src/main/java/com/grail/interrogation/domain/MedicineDetail.java index abf1a70..49e8d78 100644 --- a/grail-patient-interrogation-common/src/main/java/com/grail/interrogation/domain/MedicineDetail.java +++ b/grail-patient-interrogation-common/src/main/java/com/grail/interrogation/domain/MedicineDetail.java @@ -83,7 +83,7 @@ public class MedicineDetail { private Date updateTime; /** - * 1是发布，2是审核中，3是通过，4审核驳回 + * 1是提交，2是审核中，3是通过，4审核驳回 **/ private Integer status; diff --git a/grail-patient-interrogation-remote/src/main/java/com/grail/interrogation/factory/RemoteHealthTypeFallbackFactory.java b/grail-patient-interrogation-remote/src/main/java/com/grail/interrogation/factory/RemoteHealthTypeFallbackFactory.java index fca4a03..c9b54c8 100644 --- a/grail-patient-interrogation-remote/src/main/java/com/grail/interrogation/factory/RemoteHealthTypeFallbackFactory.java +++ b/grail-patient-interrogation-remote/src/main/java/com/grail/interrogation/factory/RemoteHealthTypeFallbackFactory.java @@ -13,14 +13,14 @@ import org.springframework.cloud.openfeign.FallbackFactory; **/ public class RemoteHealthTypeFallbackFactory implements FallbackFactory { - private static final Logger log = LoggerFactory.getLogger(RemoteHealthTypeService.class); - @Override - public RemoteHealthTypeService create(Throwable cause) { - return new RemoteHealthTypeService() { + private static final Logger log = LoggerFactory.getLogger(RemoteHealthTypeService.class); @Override - public R healthTypeList() { - return R.fail("传输失败"); - } + public RemoteHealthTypeService create(Throwable cause) { + return new RemoteHealthTypeService() { + @Override + public R healthTypeList() { + return R.fail("传输失败"); + } }; } } diff --git a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/controller/DiseaseDetatilController.java b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/controller/DiseaseDetatilController.java index fa58c04..8bd3727 100644 --- a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/controller/DiseaseDetatilController.java +++ b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/controller/DiseaseDetatilController.java @@ -52,6 +52,13 @@ public class DiseaseDetatilController { return i>0?R.ok("添加成功"):R.fail("添加失败"); } + /** + * 查看资讯是的数据; + * @author: ZhuoXin + * @date: 2023/10/27 22:24 + * @param: [] + * @return: com.grail.common.core.domain.R + **/ @GetMapping("/healthType") public R healthType(){ log.info("功能:资讯详情,URI:{},方法:{}",request.getRequestURI(),request.getMethod()); @@ -67,4 +74,7 @@ public class DiseaseDetatilController { + + + } diff --git a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/controller/MedicineDetailController.java b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/controller/MedicineDetailController.java index 1e22f84..7dc81e9 100644 --- a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/controller/MedicineDetailController.java +++ b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/controller/MedicineDetailController.java @@ -1,5 +1,12 @@ package com.grail.interrogation.controller; +import com.grail.common.core.domain.R; +import com.grail.interrogation.domain.MedicineDetail; +import com.grail.interrogation.service.MedicineDetailServer; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -10,8 +17,31 @@ import org.springframework.web.bind.annotation.RestController; **/ @RestController @RequestMapping("/medicineDetail") +@Log4j2 public class MedicineDetailController { + @Autowired + private MedicineDetailServer medicineDetailServer; + + + /** + * 添加药品详情 + * @author: ZhuoXin + * @date: 2023/10/28 14:06 + * @param: [medicineDetail] + * @return: com.grail.common.core.domain.R + **/ + @PostMapping("/medicineDateilAdd") + public R medicineDateilAdd(@RequestBody MedicineDetail medicineDetail){ + log.info("功能:药品添加,URI:{},方法:{},参数:{}"); + + R r = medicineDetailServer.medicineDateilAdd(medicineDetail); + + log.info("功能:药品添加,URI:{},方法:{},响应:{}"); + + return r; + } + } diff --git a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/mapper/MedicineDetailMapper.java b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/mapper/MedicineDetailMapper.java index 2dbecb7..a5adb29 100644 --- a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/mapper/MedicineDetailMapper.java +++ b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/mapper/MedicineDetailMapper.java @@ -15,4 +15,6 @@ import java.util.List; public interface MedicineDetailMapper { List medicineDetailList(@Param("id") Integer id); + int medicineDetailAdd(MedicineDetail medicineDetail); + } diff --git a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/MedicineDetailServer.java b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/MedicineDetailServer.java index e1b130c..c313093 100644 --- a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/MedicineDetailServer.java +++ b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/MedicineDetailServer.java @@ -1,4 +1,9 @@ package com.grail.interrogation.service; +import com.grail.common.core.domain.R; +import com.grail.interrogation.domain.MedicineDetail; + public interface MedicineDetailServer { + R medicineDateilAdd(MedicineDetail medicineDetail); + } diff --git a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/impl/DiseaseDetatilServerImpl.java b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/impl/DiseaseDetatilServerImpl.java index 1b14b26..e1a73b2 100644 --- a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/impl/DiseaseDetatilServerImpl.java +++ b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/impl/DiseaseDetatilServerImpl.java @@ -30,6 +30,9 @@ public class DiseaseDetatilServerImpl implements DiseaseDetatilServer { public int diseaseDetatailAdd(DiseaseDetatil diseaseDetatil) { // 获取id; LoginUser loginUser = SecurityUtils.getLoginUser(); + if(1 == loginUser.getUserid()){ + return -1; + } // 获取创建人的id diseaseDetatil.setCreateId(Math.toIntExact(loginUser.getUserid())); //设置状态为提交 diff --git a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/impl/MedicineDetailServerImpl.java b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/impl/MedicineDetailServerImpl.java index 7972987..c1a98b9 100644 --- a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/impl/MedicineDetailServerImpl.java +++ b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/impl/MedicineDetailServerImpl.java @@ -1,6 +1,12 @@ package com.grail.interrogation.service.impl; +import com.grail.common.core.domain.R; +import com.grail.common.security.utils.SecurityUtils; +import com.grail.interrogation.domain.MedicineDetail; +import com.grail.interrogation.mapper.MedicineDetailMapper; import com.grail.interrogation.service.MedicineDetailServer; +import com.grail.system.api.model.LoginUser; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** @@ -10,4 +16,29 @@ import org.springframework.stereotype.Service; **/ @Service public class MedicineDetailServerImpl implements MedicineDetailServer { + + @Autowired + private MedicineDetailMapper medicineDetailMapper; + + /** + * 添加药品详情 + * @author: ZhuoXin + * @date: 2023/10/28 14:05 + * @param: [medicineDetail] + * @return: com.grail.common.core.domain.R + **/ + @Override + public R medicineDateilAdd(MedicineDetail medicineDetail) { + // 获取到token信息 + LoginUser loginUser = SecurityUtils.getLoginUser(); + Long userid = loginUser.getUserid(); + // 主要还是看权限 + //赋值 + medicineDetail.setCreateId(Math.toIntExact(userid)); + //状态默认为发布 + medicineDetail.setStatus(1); + // 再次进入添加 + int i = medicineDetailMapper.medicineDetailAdd(medicineDetail); + return i>0?R.ok("添加"):R.fail("失败"); + } } diff --git a/grail-patient-interrogation-server/src/main/resources/bootstrap.yml b/grail-patient-interrogation-server/src/main/resources/bootstrap.yml index f5af18f..6e51131 100644 --- a/grail-patient-interrogation-server/src/main/resources/bootstrap.yml +++ b/grail-patient-interrogation-server/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 10002 + port: 10005 # Spring spring: diff --git a/grail-patient-interrogation-server/src/main/resources/mapper/interrogation/HomepageMapper.xml b/grail-patient-interrogation-server/src/main/resources/mapper/interrogation/HomepageMapper.xml index d1134d7..9945495 100644 --- a/grail-patient-interrogation-server/src/main/resources/mapper/interrogation/HomepageMapper.xml +++ b/grail-patient-interrogation-server/src/main/resources/mapper/interrogation/HomepageMapper.xml @@ -10,7 +10,7 @@ select medicine_detail_id,