多余bean删除

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

@@ -1,75 +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_dictionaries")
-@ApiModel(value="Dictionaries对象", description="字典管理表")
-public class Dictionaries implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "字典id")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "代码类别")
-    @TableField("type")
-    private String type;
-
-    @ApiModelProperty(value = "字典编码")
-    @TableField("code")
-    private String code;
-
-    @ApiModelProperty(value = "代码名称")
-    @TableField("name")
-    private String name;
-
-    @ApiModelProperty(value = "字典说明")
-    @TableField("explain")
-    private String explain;
-
-    @ApiModelProperty(value = "状态 0:禁用，1：启用")
-    @TableField("status")
-    private String status;
-
-    @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/Log.java

@@ -1,91 +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_log")
-@ApiModel(value="Log对象", description="系统操作日志表")
-public class Log implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "编号")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "操作内容")
-    @TableField("operationContent")
-    private String operationContent;
-
-    @ApiModelProperty(value = "日志类型(正常、异常)")
-    @TableField("type")
-    private String type;
-
-    @ApiModelProperty(value = "操作ip地址")
-    @TableField("remote_addr")
-    private String remoteAddr;
-
-    @ApiModelProperty(value = "用户代理")
-    @TableField("user_agent")
-    private String userAgent;
-
-    @ApiModelProperty(value = "请求uri")
-    @TableField("request_uri")
-    private String requestUri;
-
-    @ApiModelProperty(value = "http请求方法")
-    @TableField("method")
-    private String method;
-
-    @ApiModelProperty(value = "http请求体")
-    @TableField("params")
-    private String params;
-
-    @ApiModelProperty(value = "异常信息")
-    @TableField("exception")
-    private String exception;
-
-    @ApiModelProperty(value = "操作人")
-    @TableField("operator")
-    private String operator;
-
-    @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/ServiceSet.java

@@ -1,79 +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_service_set")
-@ApiModel(value="ServiceSet对象", description="参数管理表")
-public class ServiceSet implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "编号")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "所属组织id")
-    @TableField("organize_id")
-    private Long organizeId;
-
-    @ApiModelProperty(value = "所属组织")
-    @TableField("organize_name")
-    private String organizeName;
-
-    @ApiModelProperty(value = "参数名")
-    @TableField("param_name")
-    private String paramName;
-
-    @ApiModelProperty(value = "参数值")
-    @TableField("param_value")
-    private String paramValue;
-
-    @ApiModelProperty(value = "参数说明")
-    @TableField("explain")
-    private String explain;
-
-    @ApiModelProperty(value = "参数描述")
-    @TableField("describe")
-    private String describe;
-
-    @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/SysService.java

@@ -1,63 +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_service")
-@ApiModel(value="SysService对象", description="服务表")
-public class SysService implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "编号")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "服务名称")
-    @TableField("name")
-    private String name;
-
-    @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/service/RegionDeptService.java

@@ -2,14 +2,12 @@ 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,19 +1,13 @@
 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,13 +1,9 @@
 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;
 
 /**
@@ -17,10 +13,5 @@ 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/test/java/com/lantone/dblayermbg/CodeAutoGenerator.java

@@ -58,6 +58,12 @@ public class CodeAutoGenerator {
      */
     private static String[] ENTITY_IGNORE_PREFIX = { "sys_" };
 
+    /**
+     * 初次生成：entity.java、mapper.java、mapper.xml、baseMapper.xml、service.java、serviceImpl.java、facade.java
+     * 再次生成：entity.java、baseMapper.xml、service.java、serviceImpl.java
+     *
+     * @param args
+     */
     public static void main(String[] args) {
         GeneratorUtil.create(username, password, url, TABLES, ENTITY_IGNORE_PREFIX);
     }

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

@@ -2,8 +2,6 @@ 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.IService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.lantone.common.dto.ViewRegionDTO;
 import com.lantone.common.exception.ApiException;
 import com.lantone.common.util.ListUtil;
@@ -15,7 +13,6 @@ import com.lantone.dblayermbg.entity.Region;
 import com.lantone.dblayermbg.entity.RegionDept;
 import com.lantone.dblayermbg.facade.RegionFacade;
 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;
@@ -32,19 +29,13 @@ import java.util.stream.Collectors;
  * </p>
  */
 @Component
-public class RegionManagementFacade{
+public class RegionManagementFacade {
     @Autowired
     @Qualifier("regionDeptServiceImpl")
     private RegionDeptService regionDeptService;
-
-    @Autowired
-    @Qualifier("regionServiceImpl")
-    private RegionService regionService;
-
     @Autowired
     private RegionFacade regionFacade;
 
-
     public Object saveRegion(SaveRegionVO saveRegionVo) {
         Boolean flag = false;
         //新增-校验重复数据
@@ -62,7 +53,7 @@ public class RegionManagementFacade{
 
 
     public IPage<ViewRegionDTO> getWard(ViewRegionVO viewRegionVO) {
-        IPage<ViewRegionDTO> page = regionService.getWard(viewRegionVO);
+        IPage<ViewRegionDTO> page = regionFacade.getWard(viewRegionVO);
         List<ViewRegionDTO> wardList = page.getRecords();
         if (ListUtil.isNotEmpty(wardList) && StringUtil.isNotEmpty(viewRegionVO.getDeptName())) {
             IPage pageOne = new Page();
@@ -179,4 +170,4 @@ public class RegionManagementFacade{
         }
         return true;
     }
-}
+}

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

@@ -26,7 +26,7 @@ import springfox.documentation.annotations.ApiIgnore;
  */
 @RestController
 @Api(value = "病区管理API", tags = { "病区管理API" })
-@RequestMapping("/region/management")
+@RequestMapping("/regionManage")
 public class RegionManagementController {
     @Autowired
     private RegionManagementFacade sysRegionFacade;

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

@@ -1,48 +0,0 @@
-//package com.lantone.security.web;
-//
-//import com.diagbot.annotation.SysLogger;
-//import com.diagbot.dto.RespDTO;
-//import com.lantone.security.facade.UserLoginFacade;
-//import com.lantone.security.vo.UserLoginVO;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.web.bind.annotation.PostMapping;
-//import org.springframework.web.bind.annotation.RequestBody;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RestController;
-//
-//
-///**
-// * @Description: 用户账号API
-// * @author: gaodm
-// * @time: 2018/8/2 13:56
-// */
-//@RestController
-//@Api(value = "用户账号API", tags = { "用户账号API" })
-//@RequestMapping("/sys/user")
-//@SuppressWarnings("unchecked")
-//public class UserLoginController {
-//
-//    @Autowired
-//    private TokenFacade tokenFacade;
-//    @Autowired
-//    private UserLoginFacade userFacade;
-//
-//    @ApiOperation(value = "登录获取jwt[by:gaodm]",
-//            notes = "username：用户名,必填<br>" +
-//                    "password：密码, 必填, 默认密码：dc483e80a7a0bd9ef71d8cf973673924<br> ")
-//    @PostMapping("/getJwt")
-//    @SysLogger("getJwt")
-//    public RespDTO<JwtDTO> getJwt(@RequestBody UserLoginVO userLoginVO) {
-//        JwtDTO data = userFacade.getJwt(userLoginVO.getUsername(), userLoginVO.getPassword());
-//        return RespDTO.onSuc(data);
-//    }
-//
-//
-//
-//
-//
-//
-//
-//}