From 8f5b118f954d1e4fd20c4077639d445b49f6b6ba Mon Sep 17 00:00:00 2001 From: tangw Date: Mon, 10 Nov 2025 17:58:24 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E6=B5=81=E8=BD=AC?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-druid.yml | 6 +- .../controller/dict/HospitalController.java | 107 ++++++++++++ .../transitPF/mapper/SysHospitalMapper.java | 94 +++++++++++ .../com/czlis/transitPF/pojo/SysHospital.java | 39 +++++ .../service/IsysHospitalService.java | 94 +++++++++++ .../service/impl/IsysHospitalServiceImpl.java | 156 ++++++++++++++++++ .../resources/mapper/SysHospitalMapper.xml | 124 ++++++++++++++ 7 files changed, 617 insertions(+), 3 deletions(-) create mode 100644 transitPF/src/main/java/com/czlis/transitPF/controller/dict/HospitalController.java create mode 100644 transitPF/src/main/java/com/czlis/transitPF/mapper/SysHospitalMapper.java create mode 100644 transitPF/src/main/java/com/czlis/transitPF/pojo/SysHospital.java create mode 100644 transitPF/src/main/java/com/czlis/transitPF/service/IsysHospitalService.java create mode 100644 transitPF/src/main/java/com/czlis/transitPF/service/impl/IsysHospitalServiceImpl.java create mode 100644 transitPF/src/main/resources/mapper/SysHospitalMapper.xml diff --git a/lis-system/src/main/resources/application-druid.yml b/lis-system/src/main/resources/application-druid.yml index f50f23c..2a0c57e 100644 --- a/lis-system/src/main/resources/application-druid.yml +++ b/lis-system/src/main/resources/application-druid.yml @@ -6,9 +6,9 @@ spring: druid: # 主库数据源 master: - url: jdbc:sqlserver://47.97.125.165:11433;DatabaseName=lisnet_test - username: lis - password: lisp@ssw0rd + url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=lisnet_ssrmyy + username: sa + password: qwe123!@# # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/transitPF/src/main/java/com/czlis/transitPF/controller/dict/HospitalController.java b/transitPF/src/main/java/com/czlis/transitPF/controller/dict/HospitalController.java new file mode 100644 index 0000000..6fc48fc --- /dev/null +++ b/transitPF/src/main/java/com/czlis/transitPF/controller/dict/HospitalController.java @@ -0,0 +1,107 @@ +package com.czlis.transitPF.controller.dict; + +import com.czlis.common.annotation.Log; +import com.czlis.common.core.controller.BaseController; +import com.czlis.common.core.domain.AjaxResult; +import com.czlis.common.core.page.TableDataInfo; +import com.czlis.common.enums.BusinessType; +import com.czlis.common.utils.poi.ExcelUtil; +import com.czlis.transitPF.pojo.SysHospital; +import com.czlis.transitPF.service.IsysHospitalService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Api(tags = "区域检验中心-医疗机构字典管理") +@RestController +@RequestMapping("/transitdict/hospital") +@Slf4j +public class HospitalController extends BaseController { + @Autowired + private IsysHospitalService sysHospitalService; + /** + * 获取医疗机构列表 + */ + @ApiOperation("获取医疗机构列表") + @GetMapping("/list") + public TableDataInfo list(SysHospital post) { + startPage(); + List list = sysHospitalService.selectHospitalList(post); + return getDataTable(list); + } + @ApiOperation("医疗机构导出") + @Log(title = "医疗机构导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, SysHospital post) { + List list = sysHospitalService.selectHospitalList(post); + ExcelUtil util = new ExcelUtil<>(SysHospital.class); + util.exportExcel(response, list, "医疗机构数据"); + } + + /** + * 根据医疗机构编号获取详细信息 + */ + @ApiOperation("获取详细信息") + @GetMapping(value = "/{hospitalId}") + public AjaxResult getInfo(@PathVariable Long hospitalId) { + return success(sysHospitalService.selectHospitalById(hospitalId)); + } + + /** + * 新增医疗机构 + */ + @ApiOperation("新增医疗机构") + @Log(title = "医疗机构管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated @RequestBody SysHospital post) { + if (!sysHospitalService.checkHospitalNameUnique(post)) { + return error("新增医疗机构'" + post.getHospitalName() + "'失败，医疗机构名称已存在"); + } else if (!sysHospitalService.checkHospitalCodeUnique(post)) { + return error("新增医疗机构'" + post.getHospitalName() + "'失败，医疗机构编码已存在"); + } + post.setCreateBy(getUsername()); + return toAjax(sysHospitalService.insertHospital(post)); + } + + /** + * 修改医疗机构 + */ + @ApiOperation("修改医疗机构") + @Log(title = "医疗机构管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody SysHospital post) { + if (!sysHospitalService.checkHospitalNameUnique(post)) { + return error("修改医疗机构'" + post.getHospitalName() + "'失败，医疗机构名称已存在"); + } else if (!sysHospitalService.checkHospitalCodeUnique(post)) { + return error("修改医疗机构'" + post.getHospitalName() + "'失败，医疗机构编码已存在"); + } + post.setUpdateBy(getUsername()); + return toAjax(sysHospitalService.updateHospital(post)); + } + + /** + * 删除医疗机构 + */ + @ApiOperation("删除医疗机构") + @Log(title = "医疗机构管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{hospitalIds}") + public AjaxResult remove(@PathVariable Long[] postIds) { + return toAjax(sysHospitalService.deleteHospitalByIds(postIds)); + } + + /** + * 获取医疗机构选择框列表 + */ + @ApiOperation("获取医疗机构选择框列表") + @GetMapping("/optionselect") + public AjaxResult optionselect() { + List posts = sysHospitalService.selectHospitalAll(); + return success(posts); + } +} diff --git a/transitPF/src/main/java/com/czlis/transitPF/mapper/SysHospitalMapper.java b/transitPF/src/main/java/com/czlis/transitPF/mapper/SysHospitalMapper.java new file mode 100644 index 0000000..2fcfb4a --- /dev/null +++ b/transitPF/src/main/java/com/czlis/transitPF/mapper/SysHospitalMapper.java @@ -0,0 +1,94 @@ +package com.czlis.transitPF.mapper; + +import com.czlis.transitPF.pojo.SysHospital; + +import java.util.List; + +public interface SysHospitalMapper { + /** + * 查询医疗机构数据集合 + * + * @param hospital 医疗机构信息 + * @return 医疗机构数据集合 + */ + public List selectHospitalList(SysHospital hospital); + + /** + * 查询所有医疗机构 + * + * @return 医疗机构列表 + */ + public List selectHospitalAll(); + + /** + * 通过医疗机构ID查询医疗机构信息 + * + * @param hospitalId 医疗机构ID + * @return 角色对象信息 + */ + public SysHospital selectHospitalById(Long hospitalId); + + /** + * 根据用户ID获取医疗机构选择框列表 + * + * @param userId 用户ID + * @return 选中医疗机构ID列表 + */ + // public List selectHospitalListByUserId(Long userId); + + /** + * 查询用户所属医疗机构组 + * + * @param userName 用户名 + * @return 结果 + */ + // public List selectHospitalsByUserName(String userName); + + /** + * 删除医疗机构信息 + * + * @param hospitalId 医疗机构ID + * @return 结果 + */ + public int deleteHospitalById(Long hospitalId); + + /** + * 批量删除医疗机构信息 + * + * @param hospitalIds 需要删除的医疗机构ID + * @return 结果 + */ + public int deleteHospitalByIds(Long[] hospitalIds); + + /** + * 修改医疗机构信息 + * + * @param hospital 医疗机构信息 + * @return 结果 + */ + public int updateHospital(SysHospital hospital); + + /** + * 新增医疗机构信息 + * + * @param hospital 医疗机构信息 + * @return 结果 + */ + public int insertHospital(SysHospital hospital); + + /** + * 校验医疗机构名称 + * + * @param hospitalName 医疗机构名称 + * @return 结果 + */ + public SysHospital checkHospitalNameUnique(String hospitalName); + + /** + * 校验医疗机构编码 + * + * @param hospitalCode 医疗机构编码 + * @return 结果 + */ + public SysHospital checkHospitalCodeUnique(String hospitalCode); +} diff --git a/transitPF/src/main/java/com/czlis/transitPF/pojo/SysHospital.java b/transitPF/src/main/java/com/czlis/transitPF/pojo/SysHospital.java new file mode 100644 index 0000000..9ac133b --- /dev/null +++ b/transitPF/src/main/java/com/czlis/transitPF/pojo/SysHospital.java @@ -0,0 +1,39 @@ +package com.czlis.transitPF.pojo; + +import com.czlis.common.annotation.Excel; +import com.czlis.common.core.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +@Data +@AllArgsConstructor +@NoArgsConstructor +public class SysHospital extends BaseEntity { + private static final long serialVersionUID = 1L; + /** + * 医疗机构序号 + */ + @Excel(name = "医疗机构序号", cellType = Excel.ColumnType.NUMERIC) + private Long hospitalId; + /** + * 医疗机构编码 + */ + @Excel(name = "医疗机构编码") + private String hospitalCode; + + /** + * 医疗机构名称 + */ + @Excel(name = "医疗机构名称") + private String hospitalName; + /** + * 医疗机构排序 + */ + @Excel(name = "医疗机构令牌") + private Integer hospitalUserinfo; + /** + * 状态（0正常 1停用） + */ + @Excel(name = "状态", readConverterExp = "0=正常,1=停用") + private String status; +} diff --git a/transitPF/src/main/java/com/czlis/transitPF/service/IsysHospitalService.java b/transitPF/src/main/java/com/czlis/transitPF/service/IsysHospitalService.java new file mode 100644 index 0000000..f00e526 --- /dev/null +++ b/transitPF/src/main/java/com/czlis/transitPF/service/IsysHospitalService.java @@ -0,0 +1,94 @@ +package com.czlis.transitPF.service; + +import com.czlis.transitPF.pojo.SysHospital; + +import java.util.List; + +public interface IsysHospitalService { + /** + * 查询医疗机构信息集合 + * + * @param Hospital 医疗机构信息 + * @return 医疗机构列表 + */ + public List selectHospitalList(SysHospital Hospital); + + /** + * 查询所有医疗机构 + * + * @return 医疗机构列表 + */ + public List selectHospitalAll(); + + /** + * 通过医疗机构ID查询医疗机构信息 + * + * @param HospitalId 医疗机构ID + * @return 角色对象信息 + */ + public SysHospital selectHospitalById(Long HospitalId); + + /** + * 根据用户ID获取医疗机构选择框列表 + * + * @param userId 用户ID + * @return 选中医疗机构ID列表 + */ + public List selectHospitalListByUserId(Long userId); + + /** + * 校验医疗机构名称 + * + * @param Hospital 医疗机构信息 + * @return 结果 + */ + public boolean checkHospitalNameUnique(SysHospital Hospital); + + /** + * 校验医疗机构编码 + * + * @param Hospital 医疗机构信息 + * @return 结果 + */ + public boolean checkHospitalCodeUnique(SysHospital Hospital); + + /** + * 通过医疗机构ID查询医疗机构使用数量 + * + * @param HospitalId 医疗机构ID + * @return 结果 + */ + public int countUserHospitalById(Long HospitalId); + + /** + * 删除医疗机构信息 + * + * @param HospitalId 医疗机构ID + * @return 结果 + */ + public int deleteHospitalById(Long HospitalId); + + /** + * 批量删除医疗机构信息 + * + * @param HospitalIds 需要删除的医疗机构ID + * @return 结果 + */ + public int deleteHospitalByIds(Long[] HospitalIds); + + /** + * 新增保存医疗机构信息 + * + * @param Hospital 医疗机构信息 + * @return 结果 + */ + public int insertHospital(SysHospital Hospital); + + /** + * 修改保存医疗机构信息 + * + * @param Hospital 医疗机构信息 + * @return 结果 + */ + public int updateHospital(SysHospital Hospital); +} diff --git a/transitPF/src/main/java/com/czlis/transitPF/service/impl/IsysHospitalServiceImpl.java b/transitPF/src/main/java/com/czlis/transitPF/service/impl/IsysHospitalServiceImpl.java new file mode 100644 index 0000000..64eac0d --- /dev/null +++ b/transitPF/src/main/java/com/czlis/transitPF/service/impl/IsysHospitalServiceImpl.java @@ -0,0 +1,156 @@ +package com.czlis.transitPF.service.impl; + +import com.czlis.common.constant.UserConstants; +import com.czlis.common.exception.ServiceException; +import com.czlis.common.utils.StringUtils; +import com.czlis.transitPF.mapper.SysHospitalMapper; +import com.czlis.transitPF.pojo.SysHospital; +import com.czlis.transitPF.service.IsysHospitalService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@Slf4j +public class IsysHospitalServiceImpl implements IsysHospitalService { + @Autowired + SysHospitalMapper hospitalMapper; + + /** + * 查询医疗机构信息集合 + * + * @param Hospital 医疗机构信息 + * @return 医疗机构信息集合 + */ + @Override + public List selectHospitalList(SysHospital Hospital) { + return hospitalMapper.selectHospitalList(Hospital); + } + + /** + * 查询所有医疗机构 + * + * @return 医疗机构列表 + */ + @Override + public List selectHospitalAll() { + return hospitalMapper.selectHospitalAll(); + } + + /** + * 通过医疗机构ID查询医疗机构信息 + * + * @param HospitalId 医疗机构ID + * @return 角色对象信息 + */ + @Override + public SysHospital selectHospitalById(Long HospitalId) { + return hospitalMapper.selectHospitalById(HospitalId); + } + + /** + * 根据用户ID获取医疗机构选择框列表 + * + * @param userId 用户ID + * @return 选中医疗机构ID列表 + */ + @Override + public List selectHospitalListByUserId(Long userId) { + return null;//hospitalMapper.selectHospitalListByUserId(userId); + } + + /** + * 校验医疗机构名称是否唯一 + * + * @param Hospital 医疗机构信息 + * @return 结果 + */ + @Override + public boolean checkHospitalNameUnique(SysHospital Hospital) { + Long HospitalId = StringUtils.isNull(Hospital.getHospitalId()) ? -1L : Hospital.getHospitalId(); + SysHospital info = hospitalMapper.checkHospitalNameUnique(Hospital.getHospitalName()); + if (StringUtils.isNotNull(info) && info.getHospitalId().longValue() != HospitalId.longValue()) { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 校验医疗机构编码是否唯一 + * + * @param Hospital 医疗机构信息 + * @return 结果 + */ + @Override + public boolean checkHospitalCodeUnique(SysHospital Hospital) { + Long HospitalId = StringUtils.isNull(Hospital.getHospitalId()) ? -1L : Hospital.getHospitalId(); + SysHospital info = hospitalMapper.checkHospitalCodeUnique(Hospital.getHospitalCode()); + if (StringUtils.isNotNull(info) && info.getHospitalId().longValue() != HospitalId.longValue()) { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 通过医疗机构ID查询医疗机构使用数量 + * + * @param HospitalId 医疗机构ID + * @return 结果 + */ + @Override + public int countUserHospitalById(Long HospitalId) { + return 0;//hospitalMapper.countUserHospitalById(HospitalId); + } + + /** + * 删除医疗机构信息 + * + * @param HospitalId 医疗机构ID + * @return 结果 + */ + @Override + public int deleteHospitalById(Long HospitalId) { + return hospitalMapper.deleteHospitalById(HospitalId); + } + + /** + * 批量删除医疗机构信息 + * + * @param HospitalIds 需要删除的医疗机构ID + * @return 结果 + */ + @Override + public int deleteHospitalByIds(Long[] HospitalIds) { + for (Long HospitalId : HospitalIds) { + SysHospital Hospital = selectHospitalById(HospitalId); + if (countUserHospitalById(HospitalId) > 0) { + throw new ServiceException(String.format("%1$s已分配,不能删除", Hospital.getHospitalName())); + } + } + return hospitalMapper.deleteHospitalByIds(HospitalIds); + } + + /** + * 新增保存医疗机构信息 + * + * @param Hospital 医疗机构信息 + * @return 结果 + */ + @Override + public int insertHospital(SysHospital Hospital) { + return hospitalMapper.insertHospital(Hospital); + } + + /** + * 修改保存医疗机构信息 + * + * @param Hospital 医疗机构信息 + * @return 结果 + */ + @Override + public int updateHospital(SysHospital Hospital) { + return hospitalMapper.updateHospital(Hospital); + } +} diff --git a/transitPF/src/main/resources/mapper/SysHospitalMapper.xml b/transitPF/src/main/resources/mapper/SysHospitalMapper.xml new file mode 100644 index 0000000..c055487 --- /dev/null +++ b/transitPF/src/main/resources/mapper/SysHospitalMapper.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + select hospital_id, hospital_code, hospital_name, hospital_userinfo, status, create_by, create_time, remark + from sys_hospital + + + + + + + + + + + + + + + + + + update sys_hospital + + hospital_code = #{hospitalCode}, + hospital_name = #{hospitalName}, + hospital_userinfo = #{hospitalUserinfo}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = getdate() + + where hospital_id = #{hospitalId} + + + + insert into sys_hospital( + hospital_id, + hospital_code, + hospital_name, + hospital_userinfo, + status, + remark, + create_by, + create_time + )values( + #{hospitalId}, + #{hospitalCode}, + #{hospitalName}, + #{hospitalUserinfo}, + #{status}, + #{remark}, + #{createBy}, + getdate() + ) + + + + delete from sys_hospital where hospital_id = #{hospitalId} + + + + delete from sys_hospital where hospital_id in + + #{hospitalId} + + + + + \ No newline at end of file From cbe1338d29849528892ec949754951a1f9f19bf8 Mon Sep 17 00:00:00 2001 From: tangw Date: Mon, 10 Nov 2025 17:59:39 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E6=B5=81=E8=BD=AC?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lis-system/src/main/resources/application-druid.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lis-system/src/main/resources/application-druid.yml b/lis-system/src/main/resources/application-druid.yml index 2a0c57e..50cc3cf 100644 --- a/lis-system/src/main/resources/application-druid.yml +++ b/lis-system/src/main/resources/application-druid.yml @@ -6,9 +6,9 @@ spring: druid: # 主库数据源 master: - url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=lisnet_ssrmyy - username: sa - password: qwe123!@# + url: jdbc:sqlserver://47.97.125.165:1433;DatabaseName=lisnet_test + username: lis + password: lisp@ssw0rd # 从库数据源 slave: # 从数据源开关/默认关闭 From 2d3ac66301dead91b58726c01d53b0a73142e8be Mon Sep 17 00:00:00 2001 From: tangw Date: Mon, 10 Nov 2025 18:06:30 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E6=B5=81=E8=BD=AC?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lis-system/src/main/resources/application-druid.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lis-system/src/main/resources/application-druid.yml b/lis-system/src/main/resources/application-druid.yml index 50cc3cf..f50f23c 100644 --- a/lis-system/src/main/resources/application-druid.yml +++ b/lis-system/src/main/resources/application-druid.yml @@ -6,7 +6,7 @@ spring: druid: # 主库数据源 master: - url: jdbc:sqlserver://47.97.125.165:1433;DatabaseName=lisnet_test + url: jdbc:sqlserver://47.97.125.165:11433;DatabaseName=lisnet_test username: lis password: lisp@ssw0rd # 从库数据源 From 9e600c821a19609d280ad2f58d42707f5b9b0e41 Mon Sep 17 00:00:00 2001 From: tangw Date: Mon, 10 Nov 2025 18:44:22 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E6=B5=81=E8=BD=AC?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/dict/HospitalController.java | 26 +++++----- ...italMapper.java => RegHospitalMapper.java} | 18 +++---- .../{SysHospital.java => RegHospital.java} | 6 +-- ...alService.java => RegHospitalService.java} | 18 +++---- ...eImpl.java => RegHospitalServiceImpl.java} | 30 +++++------ .../resources/mapper/SysHospitalMapper.xml | 50 +++++++------------ 6 files changed, 67 insertions(+), 81 deletions(-) rename transitPF/src/main/java/com/czlis/transitPF/mapper/{SysHospitalMapper.java => RegHospitalMapper.java} (77%) rename transitPF/src/main/java/com/czlis/transitPF/pojo/{SysHospital.java => RegHospital.java} (88%) rename transitPF/src/main/java/com/czlis/transitPF/service/{IsysHospitalService.java => RegHospitalService.java} (77%) rename transitPF/src/main/java/com/czlis/transitPF/service/impl/{IsysHospitalServiceImpl.java => RegHospitalServiceImpl.java} (81%) diff --git a/transitPF/src/main/java/com/czlis/transitPF/controller/dict/HospitalController.java b/transitPF/src/main/java/com/czlis/transitPF/controller/dict/HospitalController.java index 6fc48fc..9e967ba 100644 --- a/transitPF/src/main/java/com/czlis/transitPF/controller/dict/HospitalController.java +++ b/transitPF/src/main/java/com/czlis/transitPF/controller/dict/HospitalController.java @@ -6,8 +6,8 @@ import com.czlis.common.core.domain.AjaxResult; import com.czlis.common.core.page.TableDataInfo; import com.czlis.common.enums.BusinessType; import com.czlis.common.utils.poi.ExcelUtil; -import com.czlis.transitPF.pojo.SysHospital; -import com.czlis.transitPF.service.IsysHospitalService; +import com.czlis.transitPF.pojo.RegHospital; +import com.czlis.transitPF.service.RegHospitalService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -24,23 +24,23 @@ import java.util.List; @Slf4j public class HospitalController extends BaseController { @Autowired - private IsysHospitalService sysHospitalService; + private RegHospitalService sysHospitalService; /** * 获取医疗机构列表 */ @ApiOperation("获取医疗机构列表") @GetMapping("/list") - public TableDataInfo list(SysHospital post) { + public TableDataInfo list(RegHospital post) { startPage(); - List list = sysHospitalService.selectHospitalList(post); + List list = sysHospitalService.selectHospitalList(post); return getDataTable(list); } @ApiOperation("医疗机构导出") @Log(title = "医疗机构导出", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, SysHospital post) { - List list = sysHospitalService.selectHospitalList(post); - ExcelUtil util = new ExcelUtil<>(SysHospital.class); + public void export(HttpServletResponse response, RegHospital post) { + List list = sysHospitalService.selectHospitalList(post); + ExcelUtil util = new ExcelUtil<>(RegHospital.class); util.exportExcel(response, list, "医疗机构数据"); } @@ -59,7 +59,7 @@ public class HospitalController extends BaseController { @ApiOperation("新增医疗机构") @Log(title = "医疗机构管理", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@Validated @RequestBody SysHospital post) { + public AjaxResult add(@Validated @RequestBody RegHospital post) { if (!sysHospitalService.checkHospitalNameUnique(post)) { return error("新增医疗机构'" + post.getHospitalName() + "'失败，医疗机构名称已存在"); } else if (!sysHospitalService.checkHospitalCodeUnique(post)) { @@ -75,7 +75,7 @@ public class HospitalController extends BaseController { @ApiOperation("修改医疗机构") @Log(title = "医疗机构管理", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@Validated @RequestBody SysHospital post) { + public AjaxResult edit(@Validated @RequestBody RegHospital post) { if (!sysHospitalService.checkHospitalNameUnique(post)) { return error("修改医疗机构'" + post.getHospitalName() + "'失败，医疗机构名称已存在"); } else if (!sysHospitalService.checkHospitalCodeUnique(post)) { @@ -91,8 +91,8 @@ public class HospitalController extends BaseController { @ApiOperation("删除医疗机构") @Log(title = "医疗机构管理", businessType = BusinessType.DELETE) @DeleteMapping("/{hospitalIds}") - public AjaxResult remove(@PathVariable Long[] postIds) { - return toAjax(sysHospitalService.deleteHospitalByIds(postIds)); + public AjaxResult remove(@PathVariable Long[] hospitalIds) { + return toAjax(sysHospitalService.deleteHospitalByIds(hospitalIds)); } /** @@ -101,7 +101,7 @@ public class HospitalController extends BaseController { @ApiOperation("获取医疗机构选择框列表") @GetMapping("/optionselect") public AjaxResult optionselect() { - List posts = sysHospitalService.selectHospitalAll(); + List posts = sysHospitalService.selectHospitalAll(); return success(posts); } } diff --git a/transitPF/src/main/java/com/czlis/transitPF/mapper/SysHospitalMapper.java b/transitPF/src/main/java/com/czlis/transitPF/mapper/RegHospitalMapper.java similarity index 77% rename from transitPF/src/main/java/com/czlis/transitPF/mapper/SysHospitalMapper.java rename to transitPF/src/main/java/com/czlis/transitPF/mapper/RegHospitalMapper.java index 2fcfb4a..34607ae 100644 --- a/transitPF/src/main/java/com/czlis/transitPF/mapper/SysHospitalMapper.java +++ b/transitPF/src/main/java/com/czlis/transitPF/mapper/RegHospitalMapper.java @@ -1,24 +1,24 @@ package com.czlis.transitPF.mapper; -import com.czlis.transitPF.pojo.SysHospital; +import com.czlis.transitPF.pojo.RegHospital; import java.util.List; -public interface SysHospitalMapper { +public interface RegHospitalMapper { /** * 查询医疗机构数据集合 * * @param hospital 医疗机构信息 * @return 医疗机构数据集合 */ - public List selectHospitalList(SysHospital hospital); + public List selectHospitalList(RegHospital hospital); /** * 查询所有医疗机构 * * @return 医疗机构列表 */ - public List selectHospitalAll(); + public List selectHospitalAll(); /** * 通过医疗机构ID查询医疗机构信息 @@ -26,7 +26,7 @@ public interface SysHospitalMapper { * @param hospitalId 医疗机构ID * @return 角色对象信息 */ - public SysHospital selectHospitalById(Long hospitalId); + public RegHospital selectHospitalById(Long hospitalId); /** * 根据用户ID获取医疗机构选择框列表 @@ -66,7 +66,7 @@ public interface SysHospitalMapper { * @param hospital 医疗机构信息 * @return 结果 */ - public int updateHospital(SysHospital hospital); + public int updateHospital(RegHospital hospital); /** * 新增医疗机构信息 @@ -74,7 +74,7 @@ public interface SysHospitalMapper { * @param hospital 医疗机构信息 * @return 结果 */ - public int insertHospital(SysHospital hospital); + public int insertHospital(RegHospital hospital); /** * 校验医疗机构名称 @@ -82,7 +82,7 @@ public interface SysHospitalMapper { * @param hospitalName 医疗机构名称 * @return 结果 */ - public SysHospital checkHospitalNameUnique(String hospitalName); + public RegHospital checkHospitalNameUnique(String hospitalName); /** * 校验医疗机构编码 @@ -90,5 +90,5 @@ public interface SysHospitalMapper { * @param hospitalCode 医疗机构编码 * @return 结果 */ - public SysHospital checkHospitalCodeUnique(String hospitalCode); + public RegHospital checkHospitalCodeUnique(String hospitalCode); } diff --git a/transitPF/src/main/java/com/czlis/transitPF/pojo/SysHospital.java b/transitPF/src/main/java/com/czlis/transitPF/pojo/RegHospital.java similarity index 88% rename from transitPF/src/main/java/com/czlis/transitPF/pojo/SysHospital.java rename to transitPF/src/main/java/com/czlis/transitPF/pojo/RegHospital.java index 9ac133b..58fbcd5 100644 --- a/transitPF/src/main/java/com/czlis/transitPF/pojo/SysHospital.java +++ b/transitPF/src/main/java/com/czlis/transitPF/pojo/RegHospital.java @@ -8,7 +8,7 @@ import lombok.NoArgsConstructor; @Data @AllArgsConstructor @NoArgsConstructor -public class SysHospital extends BaseEntity { +public class RegHospital extends BaseEntity { private static final long serialVersionUID = 1L; /** * 医疗机构序号 @@ -29,8 +29,8 @@ public class SysHospital extends BaseEntity { /** * 医疗机构排序 */ - @Excel(name = "医疗机构令牌") - private Integer hospitalUserinfo; + @Excel(name = "接口平台密钥") + private String hospitalUserinfo; /** * 状态（0正常 1停用） */ diff --git a/transitPF/src/main/java/com/czlis/transitPF/service/IsysHospitalService.java b/transitPF/src/main/java/com/czlis/transitPF/service/RegHospitalService.java similarity index 77% rename from transitPF/src/main/java/com/czlis/transitPF/service/IsysHospitalService.java rename to transitPF/src/main/java/com/czlis/transitPF/service/RegHospitalService.java index f00e526..7a9bd28 100644 --- a/transitPF/src/main/java/com/czlis/transitPF/service/IsysHospitalService.java +++ b/transitPF/src/main/java/com/czlis/transitPF/service/RegHospitalService.java @@ -1,24 +1,24 @@ package com.czlis.transitPF.service; -import com.czlis.transitPF.pojo.SysHospital; +import com.czlis.transitPF.pojo.RegHospital; import java.util.List; -public interface IsysHospitalService { +public interface RegHospitalService { /** * 查询医疗机构信息集合 * * @param Hospital 医疗机构信息 * @return 医疗机构列表 */ - public List selectHospitalList(SysHospital Hospital); + public List selectHospitalList(RegHospital Hospital); /** * 查询所有医疗机构 * * @return 医疗机构列表 */ - public List selectHospitalAll(); + public List selectHospitalAll(); /** * 通过医疗机构ID查询医疗机构信息 @@ -26,7 +26,7 @@ public interface IsysHospitalService { * @param HospitalId 医疗机构ID * @return 角色对象信息 */ - public SysHospital selectHospitalById(Long HospitalId); + public RegHospital selectHospitalById(Long HospitalId); /** * 根据用户ID获取医疗机构选择框列表 @@ -42,7 +42,7 @@ public interface IsysHospitalService { * @param Hospital 医疗机构信息 * @return 结果 */ - public boolean checkHospitalNameUnique(SysHospital Hospital); + public boolean checkHospitalNameUnique(RegHospital Hospital); /** * 校验医疗机构编码 @@ -50,7 +50,7 @@ public interface IsysHospitalService { * @param Hospital 医疗机构信息 * @return 结果 */ - public boolean checkHospitalCodeUnique(SysHospital Hospital); + public boolean checkHospitalCodeUnique(RegHospital Hospital); /** * 通过医疗机构ID查询医疗机构使用数量 @@ -82,7 +82,7 @@ public interface IsysHospitalService { * @param Hospital 医疗机构信息 * @return 结果 */ - public int insertHospital(SysHospital Hospital); + public int insertHospital(RegHospital Hospital); /** * 修改保存医疗机构信息 @@ -90,5 +90,5 @@ public interface IsysHospitalService { * @param Hospital 医疗机构信息 * @return 结果 */ - public int updateHospital(SysHospital Hospital); + public int updateHospital(RegHospital Hospital); } diff --git a/transitPF/src/main/java/com/czlis/transitPF/service/impl/IsysHospitalServiceImpl.java b/transitPF/src/main/java/com/czlis/transitPF/service/impl/RegHospitalServiceImpl.java similarity index 81% rename from transitPF/src/main/java/com/czlis/transitPF/service/impl/IsysHospitalServiceImpl.java rename to transitPF/src/main/java/com/czlis/transitPF/service/impl/RegHospitalServiceImpl.java index 64eac0d..a946708 100644 --- a/transitPF/src/main/java/com/czlis/transitPF/service/impl/IsysHospitalServiceImpl.java +++ b/transitPF/src/main/java/com/czlis/transitPF/service/impl/RegHospitalServiceImpl.java @@ -3,9 +3,9 @@ package com.czlis.transitPF.service.impl; import com.czlis.common.constant.UserConstants; import com.czlis.common.exception.ServiceException; import com.czlis.common.utils.StringUtils; -import com.czlis.transitPF.mapper.SysHospitalMapper; -import com.czlis.transitPF.pojo.SysHospital; -import com.czlis.transitPF.service.IsysHospitalService; +import com.czlis.transitPF.mapper.RegHospitalMapper; +import com.czlis.transitPF.pojo.RegHospital; +import com.czlis.transitPF.service.RegHospitalService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -14,9 +14,9 @@ import java.util.List; @Service @Slf4j -public class IsysHospitalServiceImpl implements IsysHospitalService { +public class RegHospitalServiceImpl implements RegHospitalService { @Autowired - SysHospitalMapper hospitalMapper; + RegHospitalMapper hospitalMapper; /** * 查询医疗机构信息集合 @@ -25,7 +25,7 @@ public class IsysHospitalServiceImpl implements IsysHospitalService { * @return 医疗机构信息集合 */ @Override - public List selectHospitalList(SysHospital Hospital) { + public List selectHospitalList(RegHospital Hospital) { return hospitalMapper.selectHospitalList(Hospital); } @@ -35,7 +35,7 @@ public class IsysHospitalServiceImpl implements IsysHospitalService { * @return 医疗机构列表 */ @Override - public List selectHospitalAll() { + public List selectHospitalAll() { return hospitalMapper.selectHospitalAll(); } @@ -46,7 +46,7 @@ public class IsysHospitalServiceImpl implements IsysHospitalService { * @return 角色对象信息 */ @Override - public SysHospital selectHospitalById(Long HospitalId) { + public RegHospital selectHospitalById(Long HospitalId) { return hospitalMapper.selectHospitalById(HospitalId); } @@ -68,9 +68,9 @@ public class IsysHospitalServiceImpl implements IsysHospitalService { * @return 结果 */ @Override - public boolean checkHospitalNameUnique(SysHospital Hospital) { + public boolean checkHospitalNameUnique(RegHospital Hospital) { Long HospitalId = StringUtils.isNull(Hospital.getHospitalId()) ? -1L : Hospital.getHospitalId(); - SysHospital info = hospitalMapper.checkHospitalNameUnique(Hospital.getHospitalName()); + RegHospital info = hospitalMapper.checkHospitalNameUnique(Hospital.getHospitalName()); if (StringUtils.isNotNull(info) && info.getHospitalId().longValue() != HospitalId.longValue()) { return UserConstants.NOT_UNIQUE; } @@ -84,9 +84,9 @@ public class IsysHospitalServiceImpl implements IsysHospitalService { * @return 结果 */ @Override - public boolean checkHospitalCodeUnique(SysHospital Hospital) { + public boolean checkHospitalCodeUnique(RegHospital Hospital) { Long HospitalId = StringUtils.isNull(Hospital.getHospitalId()) ? -1L : Hospital.getHospitalId(); - SysHospital info = hospitalMapper.checkHospitalCodeUnique(Hospital.getHospitalCode()); + RegHospital info = hospitalMapper.checkHospitalCodeUnique(Hospital.getHospitalCode()); if (StringUtils.isNotNull(info) && info.getHospitalId().longValue() != HospitalId.longValue()) { return UserConstants.NOT_UNIQUE; } @@ -124,7 +124,7 @@ public class IsysHospitalServiceImpl implements IsysHospitalService { @Override public int deleteHospitalByIds(Long[] HospitalIds) { for (Long HospitalId : HospitalIds) { - SysHospital Hospital = selectHospitalById(HospitalId); + RegHospital Hospital = selectHospitalById(HospitalId); if (countUserHospitalById(HospitalId) > 0) { throw new ServiceException(String.format("%1$s已分配,不能删除", Hospital.getHospitalName())); } @@ -139,7 +139,7 @@ public class IsysHospitalServiceImpl implements IsysHospitalService { * @return 结果 */ @Override - public int insertHospital(SysHospital Hospital) { + public int insertHospital(RegHospital Hospital) { return hospitalMapper.insertHospital(Hospital); } @@ -150,7 +150,7 @@ public class IsysHospitalServiceImpl implements IsysHospitalService { * @return 结果 */ @Override - public int updateHospital(SysHospital Hospital) { + public int updateHospital(RegHospital Hospital) { return hospitalMapper.updateHospital(Hospital); } } diff --git a/transitPF/src/main/resources/mapper/SysHospitalMapper.xml b/transitPF/src/main/resources/mapper/SysHospitalMapper.xml index c055487..5a19648 100644 --- a/transitPF/src/main/resources/mapper/SysHospitalMapper.xml +++ b/transitPF/src/main/resources/mapper/SysHospitalMapper.xml @@ -2,8 +2,8 @@ - - + + @@ -18,10 +18,10 @@ select hospital_id, hospital_code, hospital_name, hospital_userinfo, status, create_by, create_time, remark - from sys_hospital + from Reg_hospital - @@ -36,45 +36,31 @@ - - where hospital_id = #{hospitalId} - - - select top 1 hospital_id, hospital_code, hospital_name, hospital_userinfo, status, create_by, create_time, remark - from sys_hospital + from Reg_hospital where hospital_name=#{hospitalName} - select top 1 hospital_id, hospital_code, hospital_name, hospital_userinfo, status, create_by, create_time, remark - from sys_hospital + from Reg_hospital where hospital_code=#{hospitalCode} - - update sys_hospital + + update Reg_hospital hospital_code = #{hospitalCode}, hospital_name = #{hospitalName}, @@ -87,8 +73,8 @@ where hospital_id = #{hospitalId} - - insert into sys_hospital( + + insert into Reg_hospital( hospital_id, hospital_code, hospital_name, @@ -109,12 +95,12 @@ ) - - delete from sys_hospital where hospital_id = #{hospitalId} + + delete from Reg_hospital where hospital_id = #{hospitalId} - - delete from sys_hospital where hospital_id in + + delete from Reg_hospital where hospital_id in #{hospitalId}