简化结构 更新包结构

application-facade/src/main/java/com/factory/web/mapper/remote/DeptMapper.java

@@ -1,10 +0,0 @@
-package com.factory.web.mapper.remote;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.factory.base.entity.po.remote.Dept;
-
-
-public interface DeptMapper extends BaseMapper<Dept> {
-
-}

application-facade/src/main/java/com/factory/web/mapper/remote/DictMapper.java

@@ -1,10 +0,0 @@
-package com.factory.web.mapper.remote;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.factory.base.entity.po.remote.Dict;
-
-
-public interface DictMapper extends BaseMapper<Dict> {
-
-}

application-facade/src/main/java/com/factory/web/mapper/remote/MenuMapper.java

@@ -1,7 +0,0 @@
-package com.factory.web.mapper.remote;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.factory.base.entity.po.remote.Menu;
-
-public interface MenuMapper extends BaseMapper<Menu> {
-}

application-facade/src/main/java/com/factory/web/mapper/remote/ModuleMapper.java

@@ -1,7 +0,0 @@
-package com.factory.web.mapper.remote;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.factory.base.entity.po.remote.Menu;
-
-public interface ModuleMapper extends BaseMapper<Menu> {
-}

application-facade/src/main/java/com/factory/web/mapper/remote/PermissionMapper.java

@@ -1,7 +0,0 @@
-package com.factory.web.mapper.remote;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.factory.base.entity.po.remote.Permission;
-
-public interface PermissionMapper extends BaseMapper<Permission> {
-}

application-facade/src/main/java/com/factory/web/mapper/remote/RoleMapper.java

@@ -1,8 +0,0 @@
-package com.factory.web.mapper.remote;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.factory.base.entity.po.remote.Role;
-
-public interface RoleMapper extends BaseMapper<Role> {
-
-}

application-facade/src/main/java/com/factory/web/mapper/remote/RolePermissionMapper.java

@@ -1,7 +0,0 @@
-package com.factory.web.mapper.remote;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.factory.base.entity.po.remote.RolePermission;
-
-public interface RolePermissionMapper extends BaseMapper<RolePermission> {
-}

application-facade/src/main/java/com/factory/web/mapper/remote/UserInfoMapper.java

@@ -1,10 +0,0 @@
-package com.factory.web.mapper.remote;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.factory.base.entity.po.remote.UserInfo;
-
-public interface UserInfoMapper extends BaseMapper<UserInfo> {
-
-
-
-}

application-facade/src/main/java/com/factory/web/mapper/remote/UserRoleMapper.java

@@ -1,7 +0,0 @@
-package com.factory.web.mapper.remote;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.factory.base.entity.po.remote.UserRole;
-
-public interface UserRoleMapper extends BaseMapper<UserRole> {
-}

application-facade/src/main/java/com/factory/web/mapper/remote/WorkstationMapper.java

@@ -1,11 +0,0 @@
-package com.factory.web.mapper.remote;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.factory.base.entity.po.remote.Workstation;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Component;
-
-@Component
-@Mapper
-public interface WorkstationMapper extends BaseMapper<Workstation> {
-}

application-facade/src/main/java/com/factory/web/mapper/system/FileInfoMapper.java

@@ -1,7 +0,0 @@
-package com.factory.web.mapper.system;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.factory.base.entity.po.file.FileInfo;
-
-public interface FileInfoMapper extends BaseMapper<FileInfo> {
-}

application-facade/src/main/java/com/factory/web/service/impl/remote/DeptServiceImpl.java

@@ -1,14 +1,14 @@
 package com.factory.web.service.impl.remote;
 
-import com.factory.web.service.remote.DeptService;
-import com.factory.web.mapper.remote.DeptMapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.factory.base.entity.constant.res.SystemConstant;
 import com.factory.base.entity.po.remote.Dept;
+import com.factory.user.mapper.DeptMapper;
+import com.factory.web.service.remote.DeptService;
 import org.springframework.stereotype.Service;
 
-@Service
+@Service("WebDeptService")
 public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements DeptService {
 
     @Override

application-facade/src/main/java/com/factory/web/service/impl/remote/DictServiceImpl.java

@@ -3,11 +3,11 @@ package com.factory.web.service.impl.remote;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.factory.base.entity.constant.res.SystemConstant;
 import com.factory.base.entity.po.remote.Dict;
-import com.factory.web.mapper.remote.DictMapper;
+import com.factory.user.mapper.DictMapper;
 import com.factory.web.service.remote.DictService;
 import org.springframework.stereotype.Service;
 
-@Service
+@Service("WebDictService")
 public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements DictService {
 
     @Override

application-facade/src/main/java/com/factory/web/service/impl/remote/FileInfoServiceImpl.java

@@ -1,12 +1,12 @@
 package com.factory.web.service.impl.remote;
 
-import com.factory.web.service.remote.FileInfoService;
-import com.factory.web.mapper.system.FileInfoMapper;
-import com.factory.web.util.assembler.FileInfoAssembler;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.factory.base.entity.constant.res.SystemConstant;
 import com.factory.base.entity.po.file.FileInfo;
+import com.factory.user.mapper.FileInfoMapper;
+import com.factory.web.service.remote.FileInfoService;
+import com.factory.web.util.assembler.WebFileInfoAssembler;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,12 +18,12 @@ import javax.annotation.Resource;
  */
 
 @DS("file")
-@Service
+@Service("WebFileInfoService")
 @Transactional(propagation = Propagation.REQUIRES_NEW)
 public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> implements FileInfoService {
 
     @Resource
-    private FileInfoAssembler fileInfoAssembler;
+    private WebFileInfoAssembler webFileInfoAssembler;
 
     @Override
     public String getUrlById(Long fileInfoId) {
@@ -31,7 +31,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
             return SystemConstant.EMPTY_STRING;
         }
         FileInfo fileInfo = getById(fileInfoId);
-        return fileInfoAssembler.getUrlByFileInfo(fileInfo);
+        return webFileInfoAssembler.getUrlByFileInfo(fileInfo);
     }
 
 }

application-facade/src/main/java/com/factory/web/service/impl/remote/MenuServiceImpl.java

@@ -1,11 +1,11 @@
 package com.factory.web.service.impl.remote;
 
-import com.factory.web.service.remote.MenuService;
-import com.factory.web.mapper.remote.MenuMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.factory.base.entity.po.remote.Menu;
+import com.factory.user.mapper.MenuMapper;
+import com.factory.web.service.remote.MenuService;
 import org.springframework.stereotype.Service;
 
-@Service
+@Service("WebMenuService")
 public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements MenuService {
 }

application-facade/src/main/java/com/factory/web/service/impl/remote/PermissionServiceImpl.java

@@ -2,11 +2,11 @@ package com.factory.web.service.impl.remote;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.factory.base.entity.po.remote.Permission;
-import com.factory.web.mapper.remote.PermissionMapper;
+import com.factory.user.mapper.PermissionMapper;
 import com.factory.web.service.remote.PermissionService;
 import org.springframework.stereotype.Service;
 
-@Service
+@Service("WebPermissionService")
 public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, Permission> implements PermissionService {
 
 }

application-facade/src/main/java/com/factory/web/service/impl/remote/RolePermissionServiceImpl.java

@@ -2,11 +2,11 @@ package com.factory.web.service.impl.remote;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.factory.base.entity.po.remote.RolePermission;
-import com.factory.web.mapper.remote.RolePermissionMapper;
+import com.factory.user.mapper.RolePermissionMapper;
 import com.factory.web.service.remote.RolePermissionService;
 import org.springframework.stereotype.Service;
 
-@Service
+@Service("WebRolePermissionService")
 public class RolePermissionServiceImpl extends ServiceImpl<RolePermissionMapper, RolePermission> implements RolePermissionService {
 
 }

application-facade/src/main/java/com/factory/web/service/impl/remote/RoleServiceImpl.java

@@ -2,11 +2,11 @@ package com.factory.web.service.impl.remote;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.factory.base.entity.po.remote.Role;
-import com.factory.web.mapper.remote.RoleMapper;
+import com.factory.user.mapper.RoleMapper;
 import com.factory.web.service.remote.RoleService;
 import org.springframework.stereotype.Service;
 
-@Service
+@Service("WebRoleService")
 public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements RoleService {
 
 }

application-facade/src/main/java/com/factory/web/service/impl/remote/UserInfoServiceImpl.java

@@ -2,15 +2,6 @@ package com.factory.web.service.impl.remote;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
-import com.factory.web.service.remote.UserInfoService;
-import com.factory.web.mapper.remote.DictMapper;
-import com.factory.web.mapper.remote.RoleMapper;
-import com.factory.web.mapper.remote.UserInfoMapper;
-import com.factory.web.mapper.remote.UserRoleMapper;
-import com.factory.web.entity.vo.req.UserInsertReq;
-import com.factory.web.entity.vo.req.UserLockReq;
-import com.factory.web.entity.vo.req.UserPageQueryReq;
-import com.factory.web.entity.vo.res.UserRes;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -24,7 +15,16 @@ import com.factory.base.entity.po.remote.Role;
 import com.factory.base.entity.po.remote.UserInfo;
 import com.factory.base.entity.po.remote.UserRole;
 import com.factory.base.util.res.ResponseBeanBuilder;
+import com.factory.user.mapper.DictMapper;
+import com.factory.user.mapper.RoleMapper;
+import com.factory.user.mapper.UserInfoMapper;
+import com.factory.user.mapper.UserRoleMapper;
 import com.factory.user.util.Base64;
+import com.factory.web.entity.vo.req.UserInsertReq;
+import com.factory.web.entity.vo.req.UserLockReq;
+import com.factory.web.entity.vo.req.UserPageQueryReq;
+import com.factory.web.entity.vo.res.UserRes;
+import com.factory.web.service.remote.UserInfoService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -32,7 +32,7 @@ import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
-@Service
+@Service("WebUserInfoService")
 public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> implements UserInfoService {
 
     @Resource

application-facade/src/main/java/com/factory/web/service/impl/remote/UserRoleServiceImpl.java

@@ -3,14 +3,14 @@ package com.factory.web.service.impl.remote;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.factory.base.entity.po.remote.UserRole;
-import com.factory.web.mapper.remote.UserRoleMapper;
+import com.factory.user.mapper.UserRoleMapper;
 import com.factory.web.service.remote.UserRoleService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
-@Service
+@Service("WebUserRoleService")
 public class UserRoleServiceImpl extends ServiceImpl<UserRoleMapper, UserRole> implements UserRoleService {
 
     @Override

application-facade/src/main/java/com/factory/web/service/impl/remote/WorkStationServiceImpl.java

@@ -3,12 +3,12 @@ package com.factory.web.service.impl.remote;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.factory.base.entity.constant.res.SystemConstant;
 import com.factory.base.entity.po.remote.Workstation;
-import com.factory.web.mapper.remote.WorkstationMapper;
+import com.factory.user.mapper.WorkstationMapper;
 import com.factory.web.service.remote.WorkStationService;
 import org.springframework.stereotype.Service;
 
 
-@Service
+@Service("WebWorkStationService")
 public class WorkStationServiceImpl extends ServiceImpl<WorkstationMapper, Workstation> implements WorkStationService {
 
     @Override

application-facade/src/main/java/com/factory/web/util/assembler/FileInfoAssembler.java → application-facade/src/main/java/com/factory/web/util/assembler/WebFileInfoAssembler.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 
 @Service
-public class FileInfoAssembler {
+public class WebFileInfoAssembler {
 
     @Resource
     private FileSystemProperties fileSystemProperties;

application-facade/src/main/resources/application.yml

@@ -15,22 +15,16 @@ swagger:
   docket:
     All:
       title: "全部文档"
-      base-package: cn.jiheng.factory
-    upkeep:
-      title: "保养文档"
-      base-package: cn.jiheng.factory.application.web.interfaces.facade.upkeep
-    issue:
-      title: "问题文档"
-      base-package: cn.jiheng.factory.application.web.interfaces.facade.issue
-    common:
-      title: "组件"
-      base-package: cn.jiheng.factory.application.web.interfaces.facade.common
-    check:
-      title: "点检"
-      base-package: cn.jiheng.factory.application.web.interfaces.facade.check
-    zhoudu:
-      title: "舟度计划"
-      base-package: cn.jiheng.factory.application.web.interfaces.facade.andon
+      base-package: com.factory
+    web:
+      title: "web文档"
+      base-package: com.factory.controller.web
+    mobile:
+      title: "mobile文档"
+      base-package: com.factory.web.controller.mobile
+    wx:
+      title: "wx文档"
+      base-package: com.factory.web.controller.wx
   authorization:
     key-name: Authorization
     name: Authorization