diff --git a/grail-doctor-public-common/src/main/java/com/grail/publice/domain/request/RequestDoctor.java b/grail-doctor-public-common/src/main/java/com/grail/publice/domain/request/RequestDoctor.java index 9e7f453..7b3f18c 100644 --- a/grail-doctor-public-common/src/main/java/com/grail/publice/domain/request/RequestDoctor.java +++ b/grail-doctor-public-common/src/main/java/com/grail/publice/domain/request/RequestDoctor.java @@ -21,4 +21,6 @@ public class RequestDoctor { // 升序 和 降序 private Integer key=1; + private Integer doctorId; + } diff --git a/grail-doctor-public-server/pom.xml b/grail-doctor-public-server/pom.xml index 5fa1ca4..233bba0 100644 --- a/grail-doctor-public-server/pom.xml +++ b/grail-doctor-public-server/pom.xml @@ -105,6 +105,7 @@ 1.1.0 + diff --git a/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/controller/CommentController.java b/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/controller/CommentController.java index 836a61e..fbf4e89 100644 --- a/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/controller/CommentController.java +++ b/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/controller/CommentController.java @@ -15,6 +15,8 @@ import java.time.LocalDateTime; import java.util.Date; import java.util.List; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; /** @@ -142,4 +144,5 @@ public class CommentController { } + } diff --git a/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/controller/DoctorController.java b/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/controller/DoctorController.java index ca70418..952a5a3 100644 --- a/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/controller/DoctorController.java +++ b/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/controller/DoctorController.java @@ -6,11 +6,14 @@ import com.grail.doctor.publice.service.DoctorService; import com.grail.publice.domain.Consultation; import com.grail.publice.domain.Disgnosis; import com.grail.publice.domain.Doctor; +import com.grail.publice.domain.Interest; import com.grail.publice.domain.request.RequestDoctor; import com.grail.publice.domain.response.DisgnosisResponse; +import com.grail.publice.domain.response.InterestResponse; import com.grail.publice.domain.response.ResponseDoctor; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; @@ -30,6 +33,8 @@ public class DoctorController { private DoctorService doctorService; @Autowired private HttpServletRequest request; + @Autowired + private RedisTemplate redisTemplate; /** * @Description:查询医生信息，根据用户选择查科室及详细功能进行排序 @@ -43,6 +48,7 @@ public class DoctorController { public Result> doctorList(@RequestBody RequestDoctor requestDoctor){ log.info("功能名称：查询医生信息，根据用户选择查科室及详细功能进行排序，请求URL：【{}】，请求方法：【{}】,请求参数：【{}】",request.getRequestURI(), request.getMethod(),requestDoctor); + String doctorid = redisTemplate.opsForValue().get(requestDoctor.getDoctorId()); Result> result = doctorService.doctorList(requestDoctor); log.info("功能名称：查询医生信息，根据用户选择查科室及详细功能进行排序，请求URL：【{}】，请求方法：【{}】，响应结果：【{}】",request.getRequestURI(), request.getMethod(), JSONObject.toJSONString(result)); @@ -113,4 +119,41 @@ public class DoctorController { request.getMethod(),JSONObject.toJSONString(result)); return result; } + + + /** + * @Description:查看关注详情 + No such property: code for class: Script1 + * @return: com.grail.common.core.domain.Result> + * @Author: YHY + * @Updator: YHY + * @Date 2023/10/31 22:03 + */ + @GetMapping("/interestList") + public Result> interestList(){ + log.info("功能名称：查看关注详情，请求URL:【{}】，请求方法：【{}】",request.getRequestURI(), + request.getMethod()); + Result> result = doctorService.interestList(); + log.info("功能名称：查看关注详情，请求URL：【{}】，请求方法：【{}】，响应结果：【{}】",request.getRequestURI(), + request.getMethod(),JSONObject.toJSONString(result)); + return result; + } + + /** + * @Description:取消关注 + No such property: code for class: Script1 + * @return: com.grail.common.core.domain.Result + * @Author: YHY + * @Updator: YHY + * @Date 2023/10/31 22:28 + */ + @PostMapping("/updateinterest/interestId") + public Result updateinterest(@PathVariable Integer interestId){ + log.info("功能名称：取消关注，请求URL:【{}】，请求方法：【{}】，请求参数：【{}】",request.getRequestURI(), + request.getMethod(),interestId); + Result result = doctorService.updateinterest(interestId); + log.info("功能名称：取消关注，请求URL：【{}】，请求方法：【{}】，响应结果：【{}】",request.getRequestURI(), + request.getMethod(),JSONObject.toJSONString(result)); + return result; + } } diff --git a/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/mapper/DoctorMapper.java b/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/mapper/DoctorMapper.java index e006a19..294adcc 100644 --- a/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/mapper/DoctorMapper.java +++ b/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/mapper/DoctorMapper.java @@ -5,6 +5,7 @@ import com.grail.publice.domain.Disgnosis; import com.grail.publice.domain.Doctor; import com.grail.publice.domain.request.RequestDoctor; import com.grail.publice.domain.response.DisgnosisResponse; +import com.grail.publice.domain.response.InterestResponse; import com.grail.publice.domain.response.ResponseDoctor; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -28,4 +29,8 @@ public interface DoctorMapper { List disgnosisList(); int addDisgnosis(Disgnosis disgnosis); + + List interestList(); + + int updateinterest(@Param("interestId") Integer interestId); } diff --git a/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/service/DoctorService.java b/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/service/DoctorService.java index ceddf3e..db443df 100644 --- a/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/service/DoctorService.java +++ b/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/service/DoctorService.java @@ -5,6 +5,7 @@ import com.grail.publice.domain.Disgnosis; import com.grail.publice.domain.Doctor; import com.grail.publice.domain.request.RequestDoctor; import com.grail.publice.domain.response.DisgnosisResponse; +import com.grail.publice.domain.response.InterestResponse; import com.grail.publice.domain.response.ResponseDoctor; import java.util.List; @@ -25,4 +26,8 @@ public interface DoctorService { Result> disgnosisList(); Result addDisgnosis(Disgnosis disgnosis); + + Result> interestList(); + + Result updateinterest(Integer interestId); } diff --git a/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/service/impl/DoctorServiceimpl.java b/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/service/impl/DoctorServiceimpl.java index 6946353..5d7ec4a 100644 --- a/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/service/impl/DoctorServiceimpl.java +++ b/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/service/impl/DoctorServiceimpl.java @@ -7,6 +7,7 @@ import com.grail.publice.domain.Disgnosis; import com.grail.publice.domain.Doctor; import com.grail.publice.domain.request.RequestDoctor; import com.grail.publice.domain.response.DisgnosisResponse; +import com.grail.publice.domain.response.InterestResponse; import com.grail.publice.domain.response.ResponseDoctor; import org.springframework.amqp.AmqpException; import org.springframework.amqp.core.Message; @@ -59,4 +60,16 @@ public class DoctorServiceimpl implements DoctorService { int i = doctorMapper.addDisgnosis(disgnosis); return i>0?Result.success(200,"诊断证明"):Result.error(500,"系统异常"); } + + @Override + public Result> interestList() { + List list = doctorMapper.interestList(); + return Result.success(list); + } + + @Override + public Result updateinterest(Integer interestId) { + int i = doctorMapper.updateinterest(interestId); + return i>0?Result.success(200,"已取消关注"):Result.error(500,"系统异常，请稍后重试"); + } } diff --git a/grail-doctor-public-server/src/main/resources/mapper/DoctorMapper.xml b/grail-doctor-public-server/src/main/resources/mapper/DoctorMapper.xml index e350987..8e1a7ca 100644 --- a/grail-doctor-public-server/src/main/resources/mapper/DoctorMapper.xml +++ b/grail-doctor-public-server/src/main/resources/mapper/DoctorMapper.xml @@ -35,6 +35,9 @@ user_id=#{userId}, consultation_price=#{consultationPrice} where doctor_id=#{doctorId} + + update t_interest set interest_status = 0 where interes_id=#{interestId} + +