代码调整

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

@@ -1,87 +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 com.fasterxml.jackson.annotation.JsonIgnore;
-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_dictionary_info")
-@ApiModel(value="SysDictionaryInfo对象", description="系统字典表")
-public class SysDictionaryInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "分组（值自定义）")
-    @TableField("group_type")
-    private Long groupType;
-
-    @ApiModelProperty(value = "内容")
-    @TableField("name")
-    private String name;
-
-    @ApiModelProperty(value = "值")
-    @TableField("val")
-    private String val;
-
-    @ApiModelProperty(value = "是否启用(0-否 1-是)")
-    @TableField("status")
-    private Long status;
-
-    @ApiModelProperty(value = "返回类型（0: 都返回，1：后台维护返回 2：界面返回）")
-    @TableField("return_type")
-    @JsonIgnore
-    private Integer returnType;
-
-    @ApiModelProperty(value = "排序号")
-    @TableField("order_no")
-    @JsonIgnore
-    private Integer orderNo;
-
-    @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
-    @TableField("is_deleted")
-    @JsonIgnore
-    private String isDeleted;
-
-    @ApiModelProperty(value = "记录创建时间")
-    @TableField("gmt_create")
-    @JsonIgnore
-    private Date gmtCreate;
-
-    @ApiModelProperty(value = "记录修改时间,如果时间是1970年则表示纪录未修改")
-    @TableField("gmt_modified")
-    @JsonIgnore
-    private Date gmtModified;
-
-    @ApiModelProperty(value = "创建人，0表示无创建人值")
-    @TableField("creator")
-    @JsonIgnore
-    private String creator;
-
-    @ApiModelProperty(value = "修改人,如果为0则表示纪录未修改")
-    @TableField("modifier")
-    @JsonIgnore
-    private String modifier;
-
-    @ApiModelProperty(value = "备注")
-    @TableField("remark")
-    private String remark;
-
-
-}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/SysDictionaryInfoFacade.java

@@ -1,14 +0,0 @@
-package com.lantone.dblayermbg.facade;
-
-import com.lantone.dblayermbg.service.impl.SysDictionaryInfoServiceImpl;
-import org.springframework.stereotype.Component;
-
-/**
- * <p>
- * 系统字典表 服务实现类Facade
- * </p>
- */
-@Component
-public class SysDictionaryInfoFacade extends SysDictionaryInfoServiceImpl {
-
-}

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

@@ -1,14 +0,0 @@
-package com.lantone.dblayermbg.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.dblayermbg.entity.SysDictionaryInfo;
-
-/**
- * <p>
- * 系统字典表 Mapper 接口
- * </p>
- */
-public interface SysDictionaryInfoMapper extends BaseMapper<SysDictionaryInfo> {
-
-}
-

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

@@ -1,13 +0,0 @@
-package com.lantone.dblayermbg.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.lantone.dblayermbg.entity.SysDictionaryInfo;
-
-/**
- * <p>
- * 系统字典表 服务类
- * </p>
- */
-public interface SysDictionaryInfoService extends IService<SysDictionaryInfo> {
-
-}

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

@@ -1,17 +0,0 @@
-package com.lantone.dblayermbg.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.lantone.dblayermbg.entity.SysDictionaryInfo;
-import com.lantone.dblayermbg.mapper.SysDictionaryInfoMapper;
-import com.lantone.dblayermbg.service.SysDictionaryInfoService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 系统字典表 服务实现类
- * </p>
- */
-@Service
-public class SysDictionaryInfoServiceImpl extends ServiceImpl<SysDictionaryInfoMapper, SysDictionaryInfo> implements SysDictionaryInfoService {
-
-}

dblayer-mbg/src/main/resources/mapper/SysDictionaryInfoMapper.xml

@@ -1,5 +0,0 @@
-<?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.SysDictionaryInfoMapper">
-
-</mapper>

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

@@ -1,22 +0,0 @@
-<?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.SysDictionaryInfoMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.SysDictionaryInfo">
-        <id column="id" property="id"/>
-        <result column="group_type" property="groupType"/>
-        <result column="name" property="name"/>
-        <result column="val" property="val"/>
-        <result column="status" property="status"/>
-        <result column="return_type" property="returnType"/>
-        <result column="order_no" property="orderNo"/>
-        <result column="is_deleted" property="isDeleted"/>
-        <result column="gmt_create" property="gmtCreate"/>
-        <result column="gmt_modified" property="gmtModified"/>
-        <result column="creator" property="creator"/>
-        <result column="modifier" property="modifier"/>
-        <result column="remark" property="remark"/>
-    </resultMap>
-
-</mapper>

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

@@ -1,20 +0,0 @@
-<?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.RegionDeptMapper">
-
-    <!-- 通用查询映射结果 -->
-    <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"/>
-        <result column="dept_id" property="deptId"/>
-        <result column="order_no" property="orderNo"/>
-        <result column="is_deleted" property="isDeleted"/>
-        <result column="gmt_create" property="gmtCreate"/>
-        <result column="gmt_modified" property="gmtModified"/>
-        <result column="creator" property="creator"/>
-        <result column="modifier" property="modifier"/>
-        <result column="remark" property="remark"/>
-    </resultMap>
-
-</mapper>

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

@@ -1,22 +0,0 @@
-<?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.RegionMapper">
-
-    <!-- 通用查询映射结果 -->
-    <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"/>
-        <result column="name" property="name"/>
-        <result column="spell" property="spell"/>
-        <result column="station" property="station"/>
-        <result column="order_no" property="orderNo"/>
-        <result column="is_deleted" property="isDeleted"/>
-        <result column="gmt_create" property="gmtCreate"/>
-        <result column="gmt_modified" property="gmtModified"/>
-        <result column="creator" property="creator"/>
-        <result column="modifier" property="modifier"/>
-        <result column="remark" property="remark"/>
-    </resultMap>
-
-</mapper>

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

@@ -1,82 +0,0 @@
-package com.lantone.security.facade;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
-import com.lantone.common.exception.ApiException;
-import com.lantone.common.util.StringUtil;
-import com.lantone.common.vo.SaveDictionaryVO;
-import com.lantone.common.vo.ViewDictionaryInfoVO;
-import com.lantone.dblayermbg.entity.SysDictionaryInfo;
-import com.lantone.dblayermbg.service.impl.SysDictionaryInfoServiceImpl;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-
-
-/**
- * <p>
- * 系统字典表 服务实现类Facade
- * </p>
- */
-@Component
-public class DictionaryInfoFacade extends SysDictionaryInfoServiceImpl {
-
-    public Object saveDictionary(SaveDictionaryVO saveDictionaryVO) {
-        Boolean flag = false;
-        //新增-校验重复数据
-        checkDictionary(saveDictionaryVO);
-        SysDictionaryInfo sysDictionaryInfo = new SysDictionaryInfo();
-        BeanUtils.copyProperties(saveDictionaryVO, sysDictionaryInfo);
-        if (null == saveDictionaryVO.getId()) {
-            flag = addDictionary(sysDictionaryInfo);
-        } else if (null != saveDictionaryVO.getId()) {
-            flag = updateDictionary(sysDictionaryInfo);
-        }
-        return flag;
-    }
-
-
-    public IPage<SysDictionaryInfo> getDictionary(ViewDictionaryInfoVO viewDictionaryInfoVO) {
-        IPage<SysDictionaryInfo> pageInfo = new Page();
-        LambdaQueryChainWrapper<SysDictionaryInfo> sysDictionaryInfoLambdaQuery = this.lambdaQuery();
-        if (StringUtil.isNotEmpty(viewDictionaryInfoVO.getName())) {
-            sysDictionaryInfoLambdaQuery.like(SysDictionaryInfo::getName, viewDictionaryInfoVO.getName());
-        }
-        if (null != viewDictionaryInfoVO.getGroupType()) {
-            sysDictionaryInfoLambdaQuery.like(SysDictionaryInfo::getGroupType, viewDictionaryInfoVO.getGroupType());
-        }
-        IPage<SysDictionaryInfo> page = sysDictionaryInfoLambdaQuery.page(pageInfo);
-        return page;
-    }
-
-    public Boolean deletDictionary(ViewDictionaryInfoVO deleteDictionaryInfoVO) {
-        return this.lambdaUpdate().eq(SysDictionaryInfo::getId, deleteDictionaryInfoVO.getId()).remove();
-    }
-
-    public void checkDictionary(SaveDictionaryVO saveDictionaryVO) {
-        if (null == saveDictionaryVO.getId()) {
-            Integer count = this.lambdaQuery()
-                    .eq(SysDictionaryInfo::getName, saveDictionaryVO.getName())
-                    .eq(SysDictionaryInfo::getVal, saveDictionaryVO.getVal())
-                    .count();
-            if (count > 0) {
-                throw new ApiException("当前字典添加重复");
-            }
-        }
-    }
-
-    public Boolean addDictionary(SysDictionaryInfo sysDictionaryInfo) {
-        sysDictionaryInfo.setGmtCreate(new Date());
-        sysDictionaryInfo.setCreator("程瑶-后期改");
-        return this.save(sysDictionaryInfo);
-    }
-
-    public Boolean updateDictionary(SysDictionaryInfo sysDictionaryInfo) {
-        sysDictionaryInfo.setGmtModified(new Date());
-        sysDictionaryInfo.setModifier("程瑶改");
-        return this.updateById(sysDictionaryInfo);
-    }
-}
-

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

@@ -0,0 +1,85 @@
+package com.lantone.security.facade;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
+import com.lantone.common.exception.ApiException;
+import com.lantone.common.util.StringUtil;
+import com.lantone.common.vo.SaveDictionaryVO;
+import com.lantone.common.vo.ViewDictionaryInfoVO;
+import com.lantone.dblayermbg.entity.DictionaryInfo;
+import com.lantone.dblayermbg.facade.DictionaryInfoFacade;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+
+/**
+ * <p>
+ * 系统字典表 服务实现类Facade
+ * </p>
+ */
+@Component
+public class DictionaryInfoManagementFacade{
+    @Autowired
+    private DictionaryInfoFacade dictionaryInfoFacade;
+
+    public Object saveDictionary(SaveDictionaryVO saveDictionaryVO) {
+        Boolean flag = false;
+        //新增-校验重复数据
+        checkDictionary(saveDictionaryVO);
+        DictionaryInfo dictionaryInfo = new DictionaryInfo();
+        BeanUtils.copyProperties(saveDictionaryVO, dictionaryInfo);
+        if (null == saveDictionaryVO.getId()) {
+            flag = addDictionary(dictionaryInfo);
+        } else if (null != saveDictionaryVO.getId()) {
+            flag = updateDictionary(dictionaryInfo);
+        }
+        return flag;
+    }
+
+
+    public IPage<DictionaryInfo> getDictionary(ViewDictionaryInfoVO viewDictionaryInfoVO) {
+        IPage<DictionaryInfo> pageInfo = new Page();
+        LambdaQueryChainWrapper<DictionaryInfo> dictionaryInfoLambdaQuery = dictionaryInfoFacade.lambdaQuery();
+        if (StringUtil.isNotEmpty(viewDictionaryInfoVO.getName())) {
+            dictionaryInfoLambdaQuery.like(DictionaryInfo::getName, viewDictionaryInfoVO.getName());
+        }
+        if (null != viewDictionaryInfoVO.getGroupType()) {
+            dictionaryInfoLambdaQuery.like(DictionaryInfo::getGroupType, viewDictionaryInfoVO.getGroupType());
+        }
+        IPage<DictionaryInfo> page = dictionaryInfoLambdaQuery.page(pageInfo);
+        return page;
+    }
+
+    public Boolean deletDictionary(ViewDictionaryInfoVO deleteDictionaryInfoVO) {
+        return dictionaryInfoFacade.lambdaUpdate().eq(DictionaryInfo::getId, deleteDictionaryInfoVO.getId()).remove();
+    }
+
+    public void checkDictionary(SaveDictionaryVO saveDictionaryVO) {
+        if (null == saveDictionaryVO.getId()) {
+            Integer count = dictionaryInfoFacade.lambdaQuery()
+                    .eq(DictionaryInfo::getName, saveDictionaryVO.getName())
+                    .eq(DictionaryInfo::getVal, saveDictionaryVO.getVal())
+                    .count();
+            if (count > 0) {
+                throw new ApiException("当前字典添加重复");
+            }
+        }
+    }
+
+    public Boolean addDictionary(DictionaryInfo dictionaryInfo) {
+        dictionaryInfo.setGmtCreate(new Date());
+        dictionaryInfo.setCreator("程瑶-后期改");
+        return dictionaryInfoFacade.save(dictionaryInfo);
+    }
+
+    public Boolean updateDictionary(DictionaryInfo dictionaryInfo) {
+        dictionaryInfo.setGmtModified(new Date());
+        dictionaryInfo.setModifier("程瑶改");
+        return dictionaryInfoFacade.updateById(dictionaryInfo);
+    }
+}
+

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

@@ -13,7 +13,7 @@ import com.lantone.common.vo.SaveRegionVO;
 import com.lantone.common.vo.ViewRegionVO;
 import com.lantone.dblayermbg.entity.Region;
 import com.lantone.dblayermbg.entity.RegionDept;
-import com.lantone.dblayermbg.mapper.RegionMapper;
+import com.lantone.dblayermbg.facade.RegionFacade;
 import com.lantone.dblayermbg.service.RegionDeptService;
 import com.lantone.dblayermbg.service.RegionService;
 import org.springframework.beans.BeanUtils;
@@ -32,7 +32,7 @@ import java.util.stream.Collectors;
  * </p>
  */
 @Component
-public class RegionManagementFacade extends ServiceImpl<RegionMapper, Region> implements IService<Region> {
+public class RegionManagementFacade{
     @Autowired
     @Qualifier("regionDeptServiceImpl")
     private RegionDeptService regionDeptService;
@@ -41,6 +41,10 @@ public class RegionManagementFacade extends ServiceImpl<RegionMapper, Region> im
     @Qualifier("regionServiceImpl")
     private RegionService regionService;
 
+    @Autowired
+    private RegionFacade regionFacade;
+
+
     public Object saveRegion(SaveRegionVO saveRegionVo) {
         Boolean flag = false;
         //新增-校验重复数据
@@ -76,7 +80,7 @@ public class RegionManagementFacade extends ServiceImpl<RegionMapper, Region> im
 
 
     public Boolean deleteRegion(ReRegionVO reRegionVO) {
-        this.lambdaUpdate()
+        regionFacade.lambdaUpdate()
                 .eq(Region::getId, reRegionVO.getId())
                 .eq(Region::getHospitalId, reRegionVO.getHospitalId()).remove();
         boolean flag = regionDeptService.lambdaUpdate()
@@ -88,7 +92,7 @@ public class RegionManagementFacade extends ServiceImpl<RegionMapper, Region> im
 
     public void getRegion(SaveRegionVO saveRegionVo) {
         if (null == saveRegionVo.getId()) {
-            List<Long> collects = this.lambdaQuery()
+            List<Long> collects = regionFacade.lambdaQuery()
                     .eq(Region::getName, saveRegionVo.getName())
                     .eq(Region::getHospitalId, saveRegionVo.getHospitalId())
                     .list().stream().map(obj -> obj.getId()).collect(Collectors.toList());
@@ -108,7 +112,7 @@ public class RegionManagementFacade extends ServiceImpl<RegionMapper, Region> im
     public Boolean addRegion(SaveRegionVO saveRegionVo, Region sysRegion, List<RegionDept> sysRegionDepts) {
         sysRegion.setGmtCreate(new Date());
         sysRegion.setCreator("程瑶-后期改");
-        this.save(sysRegion);
+        regionFacade.save(sysRegion);
         if (ListUtil.isNotEmpty(saveRegionVo.getDeptIds())) {
             saveRegionVo.getDeptIds().forEach(obj -> {
                 RegionDept sysRegionDept = new RegionDept();
@@ -127,9 +131,9 @@ public class RegionManagementFacade extends ServiceImpl<RegionMapper, Region> im
     public Boolean updateRegion(SaveRegionVO saveRegionVo, Region sysRegion, List<RegionDept> sysRegionDepts) {
         sysRegion.setGmtModified(new Date());
         sysRegion.setModifier("程瑶改");
-        this.updateById(sysRegion);
+        regionFacade.updateById(sysRegion);
         if (ListUtil.isNotEmpty(saveRegionVo.getDeptIds())) {
-            List<Region> list = this.lambdaQuery().eq(Region::getId, saveRegionVo.getId()).list();
+            List<Region> list = regionFacade.lambdaQuery().eq(Region::getId, saveRegionVo.getId()).list();
             regionDeptService.lambdaUpdate()
                     .eq(RegionDept::getHospitalId, saveRegionVo.getHospitalId())
                     .eq(RegionDept::getRegionId, saveRegionVo.getId()).remove();
@@ -168,7 +172,7 @@ public class RegionManagementFacade extends ServiceImpl<RegionMapper, Region> im
 
         //禁用病区处理
         if (null != reRegionVO.getId() && 1 == reRegionVO.getMark()) {
-            this.lambdaUpdate()
+            regionFacade.lambdaUpdate()
                     .eq(Region::getId, reRegionVO.getId())
                     .eq(Region::getHospitalId, reRegionVO.getHospitalId())
                     .set(Region::getStatus, 0).update();

security-center/src/main/java/com/lantone/security/web/DictionaryManagementController.java

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.lantone.common.api.CommonResult;
 import com.lantone.common.vo.SaveDictionaryVO;
 import com.lantone.common.vo.ViewDictionaryInfoVO;
-import com.lantone.dblayermbg.entity.SysDictionaryInfo;
-import com.lantone.security.facade.DictionaryInfoFacade;
+import com.lantone.dblayermbg.entity.DictionaryInfo;
+import com.lantone.security.facade.DictionaryInfoManagementFacade;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,7 +28,7 @@ import springfox.documentation.annotations.ApiIgnore;
 @RequestMapping("/dictionary/management")
 public class DictionaryManagementController {
     @Autowired
-    private DictionaryInfoFacade dictionaryInfoFacade;
+    private DictionaryInfoManagementFacade dictionaryInfoFacade;
 
     @ApiOperation(value = "新增/修改字典[by:cy]",
             notes = "id:新增操作为null<br>" +
@@ -49,7 +49,7 @@ public class DictionaryManagementController {
                     "groupType:代码类别，<br>")
     @PostMapping("/getDictionary")
     @ApiIgnore
-    public CommonResult<IPage<SysDictionaryInfo>> getDictionary(@RequestBody ViewDictionaryInfoVO viewDictionaryInfoVO) {
+    public CommonResult<IPage<DictionaryInfo>> getDictionary(@RequestBody ViewDictionaryInfoVO viewDictionaryInfoVO) {
         return CommonResult.success(dictionaryInfoFacade.getDictionary(viewDictionaryInfoVO));
     }