wangfeng 4 лет назад
Родитель
Сommit
3caa9778d8

+ 1 - 1
src/main/java/com/diagbot/dto/SysSetInfoDTO.java

@@ -12,7 +12,7 @@ import java.util.Date;
  */
 @Setter
 @Getter
-public class SysSetInfoDTO {
+public class PlanDetailDTO {
     
     private Long id;
     /**

+ 1 - 2
src/main/java/com/diagbot/dto/SysPlanInfoDTO.java

@@ -3,7 +3,6 @@ package com.diagbot.dto;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -30,5 +29,5 @@ public class SysPlanInfoDTO {
      */
     private String remark;
 
-    private List<SysSetInfoDTO> sysSetInfo;
+    private List<PlanDetailDTO> sysSetInfo;
 }

+ 4 - 4
src/main/java/com/diagbot/facade/SysSetFacade.java

@@ -1,7 +1,7 @@
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.dto.SysSetInfoDTO;
+import com.diagbot.dto.PlanDetailDTO;
 import com.diagbot.entity.PlanDetail;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.SysSetServiceImpl;
@@ -18,17 +18,17 @@ import java.util.List;
  * @date 2020-07-27 19:01
  */
 @Component
-public class SysSetFacade extends SysSetServiceImpl {
+public class PlanDetailFacade extends SysSetServiceImpl {
 
 
-    public List<SysSetInfoDTO> getSysSetInfoData(HospitalSetVO hospitalSetVO) {
+    public List<PlanDetailDTO> getSysSetInfoData(HospitalSetVO hospitalSetVO) {
         QueryWrapper<PlanDetail> sysSetInfo = new QueryWrapper<>();
         sysSetInfo.eq("is_deleted", IsDeleteEnum.N.getKey());
         sysSetInfo.eq("hospital_id", hospitalSetVO.getHospitalId());
         sysSetInfo.eq("plan_id", hospitalSetVO.getPlanId());
         sysSetInfo.eq(StringUtil.isNotBlank(hospitalSetVO.getCode()),"code",hospitalSetVO.getCode());
         List<PlanDetail> sysSetData = list(sysSetInfo);
-        List<SysSetInfoDTO> data = BeanUtil.listCopyTo(sysSetData, SysSetInfoDTO.class);
+        List<PlanDetailDTO> data = BeanUtil.listCopyTo(sysSetData, PlanDetailDTO.class);
         return data;
     }
 }

+ 3 - 3
src/main/java/com/diagbot/facade/SysPlanFacade.java

@@ -2,7 +2,7 @@ package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.SysPlanInfoDTO;
-import com.diagbot.dto.SysSetInfoDTO;
+import com.diagbot.dto.PlanDetailDTO;
 import com.diagbot.entity.Plan;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.StatusEnum;
@@ -25,7 +25,7 @@ import java.util.List;
 public class SysPlanFacade extends SysPlanServiceImpl {
 
     @Autowired
-    SysSetFacade sysSetFacade;
+    PlanDetailFacade sysSetFacade;
 
     public SysPlanInfoDTO getSysPlanInfoData(HospitalPlanVO hospitalPlanVO) {
         //查询该医院有没有相关方案配置, 要是没有取默认的
@@ -57,7 +57,7 @@ public class SysPlanFacade extends SysPlanServiceImpl {
         HospitalSetVO hospitalSetVO = new HospitalSetVO();
         hospitalSetVO.setHospitalId(hospitalId);
         hospitalSetVO.setPlanId(planId);
-        List<SysSetInfoDTO> sysSetInfoData = sysSetFacade.getSysSetInfoData(hospitalSetVO);
+        List<PlanDetailDTO> sysSetInfoData = sysSetFacade.getSysSetInfoData(hospitalSetVO);
         sysPlanInfoDTO.setSysSetInfo(sysSetInfoData);
         return sysPlanInfoDTO;
     }

+ 1 - 1
src/main/java/com/diagbot/mapper/SysSetMapper.java

@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author wangfeng
  * @since 2020-07-27
  */
-public interface SysSetMapper extends BaseMapper<PlanDetail> {
+public interface PlanDetailMapper extends BaseMapper<PlanDetail> {
 
 }

+ 2 - 2
src/main/java/com/diagbot/service/impl/SysSetServiceImpl.java

@@ -1,7 +1,7 @@
 package com.diagbot.service.impl;
 
 import com.diagbot.entity.PlanDetail;
-import com.diagbot.mapper.SysSetMapper;
+import com.diagbot.mapper.PlanDetailMapper;
 import com.diagbot.service.SysSetService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2020-07-27
  */
 @Service
-public class SysSetServiceImpl extends ServiceImpl<SysSetMapper, PlanDetail> implements SysSetService {
+public class SysSetServiceImpl extends ServiceImpl<PlanDetailMapper, PlanDetail> implements SysSetService {
 
 }

+ 9 - 10
src/main/java/com/diagbot/web/SysSetController.java

@@ -3,8 +3,8 @@ package com.diagbot.web;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.annotation.TokenAuth;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.SysSetInfoDTO;
-import com.diagbot.facade.SysSetFacade;
+import com.diagbot.dto.PlanDetailDTO;
+import com.diagbot.facade.PlanDetailFacade;
 import com.diagbot.vo.HospitalSetVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
@@ -28,19 +27,19 @@ import java.util.List;
  * @since 2020-07-27
  */
 @RestController
-@RequestMapping("/sys/sysSet")
+@RequestMapping("/sys/planDetail")
 @Api(value = "配置信息API", tags = { "配置信息API" })
 @SuppressWarnings("unchecked")
-public class SysSetController {
+public class PlanDetailController {
     @Autowired
-    SysSetFacade sysSetFacade;
+    PlanDetailFacade planDetailFacade;
 
     @ApiOperation(value = "根据医院编码获取配置信息[by:wangfeng]", notes = "hospitalId :医院id  必填<br> ")
-    @PostMapping("/getSysSetInfoDatas")
-    @SysLogger("getSysSetInfoDatas")
+    @PostMapping("/getPlanDetailDatas")
+    @SysLogger("getPlanDetailDatas")
     @TokenAuth
-    public RespDTO<List<SysSetInfoDTO>> getSysSetInfoDatas(@Valid @RequestBody HospitalSetVO hospitalSetVO) {
-        List<SysSetInfoDTO> data = sysSetFacade.getSysSetInfoData(hospitalSetVO);
+    public RespDTO<List<PlanDetailDTO>> getSysSetInfoDatas(@Valid @RequestBody HospitalSetVO hospitalSetVO) {
+        List<PlanDetailDTO> data = planDetailFacade.getSysSetInfoData(hospitalSetVO);
         return RespDTO.onSuc(data);
     }
 }

+ 0 - 5
src/main/java/com/diagbot/web/SysPlanController.java

@@ -5,11 +5,8 @@ import com.diagbot.annotation.SysLogger;
 import com.diagbot.annotation.TokenAuth;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.SysPlanInfoDTO;
-import com.diagbot.dto.SysSetInfoDTO;
 import com.diagbot.facade.SysPlanFacade;
-import com.diagbot.facade.SysSetFacade;
 import com.diagbot.vo.HospitalPlanVO;
-import com.diagbot.vo.HospitalSetVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,11 +14,9 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
-import java.util.List;
 
 /**
  * <p>

+ 1 - 1
src/main/resources/mapper/SysSetMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.SysSetMapper">
+<mapper namespace="com.diagbot.mapper.PlanDetailMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.PlanDetail">