代码调整

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/SysRegion.java

@@ -1,94 +0,0 @@
-package com.lantone.dblayermbg.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 病区表
- * </p>
- */
-@Data
-@TableName("sys_region")
-@ApiModel(value="SysRegion对象", description="病区表")
-public class SysRegion implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "医院ID")
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    @ApiModelProperty(value = "医院名称")
-    @TableField("hospital_name")
-    private String hospitalName;
-
-    @ApiModelProperty(value = "联系人")
-    @TableField("liaison")
-    private String liaison;
-
-    @ApiModelProperty(value = "手机号码")
-    @TableField("phone_number")
-    private String phoneNumber;
-
-    @ApiModelProperty(value = "0-否 1-是")
-    @TableField("status")
-    private Integer status;
-
-    @ApiModelProperty(value = "病区编码")
-    @TableField("code")
-    private String code;
-
-    @ApiModelProperty(value = "病区名称")
-    @TableField("name")
-    private String name;
-
-    @ApiModelProperty(value = "首字母拼音")
-    @TableField("spell")
-    private String spell;
-
-    @ApiModelProperty(value = "区域类别")
-    @TableField("station")
-    private String station;
-
-    @ApiModelProperty(value = "排序")
-    @TableField("order_no")
-    private String orderNo;
-
-    @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    @ApiModelProperty(value = "记录创建时间")
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    @ApiModelProperty(value = "记录修改时间,如果时间是1970年则表示纪录未修改")
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    @ApiModelProperty(value = "创建人，0表示无创建人值")
-    @TableField("creator")
-    private String creator;
-
-    @ApiModelProperty(value = "修改人,如果为0则表示纪录未修改")
-    @TableField("modifier")
-    private String modifier;
-
-    @ApiModelProperty(value = "备注")
-    @TableField("remark")
-    private String remark;
-
-
-}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/SysRegionDept.java

@@ -1,71 +0,0 @@
-package com.lantone.dblayermbg.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 病区科室关联表
- * </p>
- */
-@Data
-@TableName("sys_region_dept")
-@ApiModel(value="SysRegionDept对象", description="病区科室关联表")
-public class SysRegionDept implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "编号")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "医院ID")
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    @ApiModelProperty(value = "病区ID")
-    @TableField("region_id")
-    private Long regionId;
-
-    @ApiModelProperty(value = "科室ID")
-    @TableField("dept_id")
-    private Long deptId;
-
-    @ApiModelProperty(value = "排序")
-    @TableField("order_no")
-    private String orderNo;
-
-    @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    @ApiModelProperty(value = "记录创建时间")
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    @ApiModelProperty(value = "记录修改时间,如果时间是1970年则表示纪录未修改")
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    @ApiModelProperty(value = "创建人，0表示无创建人值")
-    @TableField("creator")
-    private String creator;
-
-    @ApiModelProperty(value = "修改人,如果为0则表示纪录未修改")
-    @TableField("modifier")
-    private String modifier;
-
-    @ApiModelProperty(value = "备注")
-    @TableField("remark")
-    private String remark;
-
-
-}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/RegionMapper.java

@@ -6,14 +6,14 @@ import com.lantone.common.dto.ViewRegionDTO;
 import com.lantone.common.vo.ViewRegionVO;
 import com.lantone.dblayermbg.entity.Region;
 import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
 
 /**
  * <p>
  * 表名：sys_region Mapper接口
  * </p>
  */
+@Repository
 public interface RegionMapper extends BaseMapper<Region> {
-
     IPage<ViewRegionDTO> getWard(@Param("viewRegionVO") ViewRegionVO viewRegionVO);
-
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/RegionDeptService.java

@@ -2,12 +2,14 @@ package com.lantone.dblayermbg.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.lantone.dblayermbg.entity.RegionDept;
+import org.springframework.stereotype.Service;
 
 /**
  * <p>
  * 病区与科室关联表 Service类
  * </p>
  */
+@Service
 public interface RegionDeptService extends IService<RegionDept> {
 
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/RegionService.java

@@ -1,13 +1,19 @@
 package com.lantone.dblayermbg.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.common.dto.ViewRegionDTO;
+import com.lantone.common.vo.ViewRegionVO;
 import com.lantone.dblayermbg.entity.Region;
+import org.springframework.stereotype.Service;
+
 
 /**
  * <p>
  * 病区表 Service类
  * </p>
  */
+@Service
 public interface RegionService extends IService<Region> {
-
+    IPage<ViewRegionDTO> getWard(ViewRegionVO viewRegionVO);
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/RegionServiceImpl.java

@@ -1,9 +1,13 @@
 package com.lantone.dblayermbg.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.common.dto.ViewRegionDTO;
+import com.lantone.common.vo.ViewRegionVO;
 import com.lantone.dblayermbg.entity.Region;
 import com.lantone.dblayermbg.mapper.RegionMapper;
 import com.lantone.dblayermbg.service.RegionService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,5 +17,10 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> implements RegionService {
+   @Autowired
+   private RegionMapper regionMapper;
 
+    public IPage<ViewRegionDTO> getWard(ViewRegionVO viewRegionVO){
+        return regionMapper.getWard(viewRegionVO);
+    }
 }

dblayer-mbg/src/main/resources/mapper/base/BaseSysRegionDeptMapper.xml

@@ -1,9 +1,9 @@
 <?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.lantone.dblayermbg.mapper.SysRegionDeptMapper">
+<mapper namespace="com.lantone.dblayermbg.mapper.RegionDeptMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.SysRegionDept">
+    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.RegionDept">
         <id column="id" property="id"/>
         <result column="hospital_id" property="hospitalId"/>
         <result column="region_id" property="regionId"/>

dblayer-mbg/src/main/resources/mapper/base/BaseSysRegionMapper.xml

@@ -1,9 +1,9 @@
 <?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.lantone.dblayermbg.mapper.SysRegionMapper">
+<mapper namespace="com.lantone.dblayermbg.mapper.RegionMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.SysRegion">
+    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.Region">
         <id column="id" property="id"/>
         <result column="hospital_id" property="hospitalId"/>
         <result column="code" property="code"/>

security-center/src/main/java/com/lantone/security/facade/DictionaryInfoFacade.java

@@ -37,8 +37,6 @@ public class DictionaryInfoFacade extends SysDictionaryInfoServiceImpl {
         return flag;
     }
 
-    ;
-
 
     public IPage<SysDictionaryInfo> getDictionary(ViewDictionaryInfoVO viewDictionaryInfoVO) {
         IPage<SysDictionaryInfo> pageInfo = new Page();
@@ -66,7 +64,6 @@ public class DictionaryInfoFacade extends SysDictionaryInfoServiceImpl {
             if (count > 0) {
                 throw new ApiException("当前字典添加重复");
             }
-
         }
     }
 
@@ -81,6 +78,5 @@ public class DictionaryInfoFacade extends SysDictionaryInfoServiceImpl {
         sysDictionaryInfo.setModifier("程瑶改");
         return this.updateById(sysDictionaryInfo);
     }
-
 }
 

security-center/src/main/java/com/lantone/security/facade/RegionManagementFacade.java

@@ -11,8 +11,11 @@ import com.lantone.common.util.StringUtil;
 import com.lantone.common.vo.ReRegionVO;
 import com.lantone.common.vo.SaveRegionVO;
 import com.lantone.common.vo.ViewRegionVO;
-import com.lantone.dblayermbg.entity.SysRegion;
-import com.lantone.dblayermbg.entity.SysRegionDept;
+import com.lantone.dblayermbg.entity.Region;
+import com.lantone.dblayermbg.entity.RegionDept;
+import com.lantone.dblayermbg.mapper.RegionMapper;
+import com.lantone.dblayermbg.service.RegionDeptService;
+import com.lantone.dblayermbg.service.RegionService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -29,33 +32,33 @@ import java.util.stream.Collectors;
  * </p>
  */
 @Component
-public class RegionManagementFacade extends ServiceImpl<SysRegionMapper, SysRegion> implements IService<SysRegion> {
+public class RegionManagementFacade extends ServiceImpl<RegionMapper, Region> implements IService<Region> {
     @Autowired
-    @Qualifier("sysRegionDeptServiceImpl")
-    private SysRegionDeptService sysRegionDeptService;
+    @Qualifier("regionDeptServiceImpl")
+    private RegionDeptService regionDeptService;
 
     @Autowired
-    @Qualifier("sysRegionServiceImpl")
-    private SysRegionService sysRegionService;
+    @Qualifier("regionServiceImpl")
+    private RegionService regionService;
 
     public Object saveRegion(SaveRegionVO saveRegionVo) {
         Boolean flag = false;
         //新增-校验重复数据
-        getSysRegion(saveRegionVo);
-        SysRegion sysRegion = new SysRegion();
+        getRegion(saveRegionVo);
+        Region sysRegion = new Region();
         BeanUtils.copyProperties(saveRegionVo, sysRegion);
-        List<SysRegionDept> sysRegionDepts = new ArrayList<>();
+        List<RegionDept> sysRegionDepts = new ArrayList<>();
         if (null == saveRegionVo.getId()) {
-            flag = addSysRegion(saveRegionVo, sysRegion, sysRegionDepts);
+            flag = addRegion(saveRegionVo, sysRegion, sysRegionDepts);
         } else if (null != saveRegionVo.getId()) {
-            flag = updateSysRegion(saveRegionVo, sysRegion, sysRegionDepts);
+            flag = updateRegion(saveRegionVo, sysRegion, sysRegionDepts);
         }
         return flag;
     }
 
 
     public IPage<ViewRegionDTO> getWard(ViewRegionVO viewRegionVO) {
-        IPage<ViewRegionDTO> page = sysRegionService.getWard(viewRegionVO);
+        IPage<ViewRegionDTO> page = regionService.getWard(viewRegionVO);
         List<ViewRegionDTO> wardList = page.getRecords();
         if (ListUtil.isNotEmpty(wardList) && StringUtil.isNotEmpty(viewRegionVO.getDeptName())) {
             IPage pageOne = new Page();
@@ -74,26 +77,26 @@ public class RegionManagementFacade extends ServiceImpl<SysRegionMapper, SysRegi
 
     public Boolean deleteRegion(ReRegionVO reRegionVO) {
         this.lambdaUpdate()
-                .eq(SysRegion::getId, reRegionVO.getId())
-                .eq(SysRegion::getHospitalId, reRegionVO.getHospitalId()).remove();
-        boolean flag = sysRegionDeptService.lambdaUpdate()
-                .eq(SysRegionDept::getRegionId, reRegionVO.getId())
-                .eq(SysRegionDept::getHospitalId, reRegionVO.getHospitalId()).remove();
+                .eq(Region::getId, reRegionVO.getId())
+                .eq(Region::getHospitalId, reRegionVO.getHospitalId()).remove();
+        boolean flag = regionDeptService.lambdaUpdate()
+                .eq(RegionDept::getRegionId, reRegionVO.getId())
+                .eq(RegionDept::getHospitalId, reRegionVO.getHospitalId()).remove();
         return flag;
     }
 
 
-    public void getSysRegion(SaveRegionVO saveRegionVo) {
+    public void getRegion(SaveRegionVO saveRegionVo) {
         if (null == saveRegionVo.getId()) {
             List<Long> collects = this.lambdaQuery()
-                    .eq(SysRegion::getName, saveRegionVo.getName())
-                    .eq(SysRegion::getHospitalId, saveRegionVo.getHospitalId())
+                    .eq(Region::getName, saveRegionVo.getName())
+                    .eq(Region::getHospitalId, saveRegionVo.getHospitalId())
                     .list().stream().map(obj -> obj.getId()).collect(Collectors.toList());
             if (ListUtil.isNotEmpty(collects) && ListUtil.isNotEmpty(saveRegionVo.getDeptIds())) {
-                Integer count = sysRegionDeptService.lambdaQuery()
-                        .eq(SysRegionDept::getHospitalId, saveRegionVo.getHospitalId())
-                        .in(SysRegionDept::getRegionId, collects)
-                        .in(SysRegionDept::getDeptId, saveRegionVo.getDeptIds()).count();
+                Integer count = regionDeptService.lambdaQuery()
+                        .eq(RegionDept::getHospitalId, saveRegionVo.getHospitalId())
+                        .in(RegionDept::getRegionId, collects)
+                        .in(RegionDept::getDeptId, saveRegionVo.getDeptIds()).count();
                 if (count > 0) {
                     throw new ApiException("当前病区关联科室重复");
                 }
@@ -102,13 +105,13 @@ public class RegionManagementFacade extends ServiceImpl<SysRegionMapper, SysRegi
     }
 
 
-    public Boolean addSysRegion(SaveRegionVO saveRegionVo, SysRegion sysRegion, List<SysRegionDept> sysRegionDepts) {
+    public Boolean addRegion(SaveRegionVO saveRegionVo, Region sysRegion, List<RegionDept> sysRegionDepts) {
         sysRegion.setGmtCreate(new Date());
         sysRegion.setCreator("程瑶-后期改");
         this.save(sysRegion);
         if (ListUtil.isNotEmpty(saveRegionVo.getDeptIds())) {
             saveRegionVo.getDeptIds().forEach(obj -> {
-                SysRegionDept sysRegionDept = new SysRegionDept();
+                RegionDept sysRegionDept = new RegionDept();
                 BeanUtils.copyProperties(saveRegionVo, sysRegionDept);
                 sysRegionDept.setDeptId(obj);
                 sysRegionDept.setRegionId(sysRegion.getId());
@@ -116,22 +119,22 @@ public class RegionManagementFacade extends ServiceImpl<SysRegionMapper, SysRegi
                 sysRegionDept.setCreator("后期修改");
                 sysRegionDepts.add(sysRegionDept);
             });
-            return sysRegionDeptService.saveBatch(sysRegionDepts);
+            return regionDeptService.saveBatch(sysRegionDepts);
         }
         return true;
     }
 
-    public Boolean updateSysRegion(SaveRegionVO saveRegionVo, SysRegion sysRegion, List<SysRegionDept> sysRegionDepts) {
+    public Boolean updateRegion(SaveRegionVO saveRegionVo, Region sysRegion, List<RegionDept> sysRegionDepts) {
         sysRegion.setGmtModified(new Date());
         sysRegion.setModifier("程瑶改");
         this.updateById(sysRegion);
         if (ListUtil.isNotEmpty(saveRegionVo.getDeptIds())) {
-            List<SysRegion> list = this.lambdaQuery().eq(SysRegion::getId, saveRegionVo.getId()).list();
-            sysRegionDeptService.lambdaUpdate()
-                    .eq(SysRegionDept::getHospitalId, saveRegionVo.getHospitalId())
-                    .eq(SysRegionDept::getRegionId, saveRegionVo.getId()).remove();
+            List<Region> list = this.lambdaQuery().eq(Region::getId, saveRegionVo.getId()).list();
+            regionDeptService.lambdaUpdate()
+                    .eq(RegionDept::getHospitalId, saveRegionVo.getHospitalId())
+                    .eq(RegionDept::getRegionId, saveRegionVo.getId()).remove();
             saveRegionVo.getDeptIds().forEach(obj -> {
-                SysRegionDept sysRegionDeptEntry = new SysRegionDept();
+                RegionDept sysRegionDeptEntry = new RegionDept();
                 BeanUtils.copyProperties(saveRegionVo, sysRegionDeptEntry);
                 sysRegionDeptEntry.setId(null);
                 sysRegionDeptEntry.setDeptId(obj);
@@ -144,7 +147,7 @@ public class RegionManagementFacade extends ServiceImpl<SysRegionMapper, SysRegi
                 sysRegionDeptEntry.setModifier("后期修改");
                 sysRegionDepts.add(sysRegionDeptEntry);
             });
-            return sysRegionDeptService.saveBatch(sysRegionDepts);
+            return regionDeptService.saveBatch(sysRegionDepts);
         }
         return true;
     }
@@ -152,9 +155,9 @@ public class RegionManagementFacade extends ServiceImpl<SysRegionMapper, SysRegi
     public Object checkSolveRegion(ReRegionVO reRegionVO) {
         //禁用校验
         if (null != reRegionVO.getId() && 0 == reRegionVO.getMark()) {
-            List<Long> collectList = sysRegionDeptService.lambdaQuery()
-                    .eq(SysRegionDept::getRegionId, reRegionVO.getId())
-                    .eq(SysRegionDept::getHospitalId, reRegionVO.getHospitalId())
+            List<Long> collectList = regionDeptService.lambdaQuery()
+                    .eq(RegionDept::getRegionId, reRegionVO.getId())
+                    .eq(RegionDept::getHospitalId, reRegionVO.getHospitalId())
                     .list().stream().map(obj -> obj.getDeptId()).collect(Collectors.toList());
             if (ListUtil.isNotEmpty(collectList) && collectList.size() > 0) {
                 //当前病区存在与之关联的科室
@@ -166,9 +169,9 @@ public class RegionManagementFacade extends ServiceImpl<SysRegionMapper, SysRegi
         //禁用病区处理
         if (null != reRegionVO.getId() && 1 == reRegionVO.getMark()) {
             this.lambdaUpdate()
-                    .eq(SysRegion::getId, reRegionVO.getId())
-                    .eq(SysRegion::getHospitalId, reRegionVO.getHospitalId())
-                    .set(SysRegion::getStatus, 0).update();
+                    .eq(Region::getId, reRegionVO.getId())
+                    .eq(Region::getHospitalId, reRegionVO.getHospitalId())
+                    .set(Region::getStatus, 0).update();
         }
         return true;
     }