初始化配置

application-facade/src/main/java/com/factory/mapper/benteler/BentelerIniCheckItemMapper.java → application-facade/src/main/java/com/factory/mapper/BentelerIniCheckItemMapper.java

@@ -1,4 +1,4 @@
-package com.factory.mapper.benteler;
+package com.factory.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.factory.base.entity.po.benteler.BentelerIniCheckItem;

application-facade/src/main/java/com/factory/mapper/benteler/BentelerIniCheckResultMapper.java → application-facade/src/main/java/com/factory/mapper/BentelerIniCheckResultMapper.java

@@ -1,4 +1,4 @@
-package com.factory.mapper.benteler;
+package com.factory.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.factory.base.entity.po.benteler.BentelerIniCheckResult;

application-facade/src/main/java/com/factory/mapper/benteler/BentelerIniCheckTypeMapper.java → application-facade/src/main/java/com/factory/mapper/BentelerIniCheckTypeMapper.java

@@ -1,4 +1,4 @@
-package com.factory.mapper.benteler;
+package com.factory.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.factory.base.entity.po.benteler.BentelerIniCheckType;

application-facade/src/main/java/com/factory/mapper/benteler/BentelerIniVersionItemMapper.java → application-facade/src/main/java/com/factory/mapper/BentelerIniVersionItemMapper.java

@@ -1,4 +1,4 @@
-package com.factory.mapper.benteler;
+package com.factory.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.factory.base.entity.po.benteler.BentelerIniVersionItem;

application-facade/src/main/java/com/factory/mapper/benteler/BentelerIniVersionMapper.java → application-facade/src/main/java/com/factory/mapper/BentelerIniVersionMapper.java

@@ -1,4 +1,4 @@
-package com.factory.mapper.benteler;
+package com.factory.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.factory.base.entity.po.benteler.BentelerIniVersion;

application-facade/src/main/java/com/factory/mapper/benteler/BentelerPlanMapper.java → application-facade/src/main/java/com/factory/mapper/BentelerPlanMapper.java

@@ -1,4 +1,4 @@
-package com.factory.mapper.benteler;
+package com.factory.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.factory.base.entity.po.benteler.BentelerPlan;

application-facade/src/main/java/com/factory/service/benteler/BentelerIniCheckItemService.java → application-facade/src/main/java/com/factory/service/BentelerIniCheckItemService.java

@@ -1,4 +1,4 @@
-package com.factory.service.benteler;
+package com.factory.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.factory.base.entity.po.benteler.BentelerIniCheckItem;

application-facade/src/main/java/com/factory/service/benteler/BentelerIniCheckResultService.java → application-facade/src/main/java/com/factory/service/BentelerIniCheckResultService.java

@@ -1,4 +1,4 @@
-package com.factory.service.benteler;
+package com.factory.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.factory.base.entity.po.benteler.BentelerIniCheckResult;

application-facade/src/main/java/com/factory/service/benteler/BentelerIniCheckTypeService.java → application-facade/src/main/java/com/factory/service/BentelerIniCheckTypeService.java

@@ -1,4 +1,4 @@
-package com.factory.service.benteler;
+package com.factory.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.factory.base.entity.po.benteler.BentelerIniCheckType;

application-facade/src/main/java/com/factory/service/benteler/BentelerIniVersionItemService.java → application-facade/src/main/java/com/factory/service/BentelerIniVersionItemService.java

@@ -1,4 +1,4 @@
-package com.factory.service.benteler;
+package com.factory.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.factory.base.entity.po.benteler.BentelerIniVersionItem;

application-facade/src/main/java/com/factory/service/benteler/BentelerIniVersionService.java → application-facade/src/main/java/com/factory/service/BentelerIniVersionService.java

@@ -1,4 +1,4 @@
-package com.factory.service.benteler;
+package com.factory.service;
 
 import com.factory.base.entity.po.benteler.BentelerIniVersion;
 import com.baomidou.mybatisplus.extension.service.IService;

application-facade/src/main/java/com/factory/service/benteler/BentelerPlanService.java → application-facade/src/main/java/com/factory/service/BentelerPlanService.java

@@ -1,4 +1,4 @@
-package com.factory.service.benteler;
+package com.factory.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;

application-facade/src/main/java/com/factory/service/impl/benteler/BentelerIniCheckItemServiceImpl.java → application-facade/src/main/java/com/factory/service/impl/BentelerIniCheckItemServiceImpl.java

@@ -1,8 +1,8 @@
-package com.factory.service.impl.benteler;
+package com.factory.service.impl;
 
 import com.factory.base.entity.po.benteler.BentelerIniCheckItem;
-import com.factory.service.benteler.BentelerIniCheckItemService;
-import com.factory.mapper.benteler.BentelerIniCheckItemMapper;
+import com.factory.service.BentelerIniCheckItemService;
+import com.factory.mapper.BentelerIniCheckItemMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

application-facade/src/main/java/com/factory/service/impl/benteler/BentelerIniCheckResultServiceImpl.java → application-facade/src/main/java/com/factory/service/impl/BentelerIniCheckResultServiceImpl.java

@@ -1,8 +1,8 @@
-package com.factory.service.impl.benteler;
+package com.factory.service.impl;
 
 import com.factory.base.entity.po.benteler.BentelerIniCheckResult;
-import com.factory.service.benteler.BentelerIniCheckResultService;
-import com.factory.mapper.benteler.BentelerIniCheckResultMapper;
+import com.factory.service.BentelerIniCheckResultService;
+import com.factory.mapper.BentelerIniCheckResultMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

application-facade/src/main/java/com/factory/service/impl/benteler/BentelerIniCheckTypeServiceImpl.java → application-facade/src/main/java/com/factory/service/impl/BentelerIniCheckTypeServiceImpl.java

@@ -1,7 +1,7 @@
-package com.factory.service.impl.benteler;
+package com.factory.service.impl;
 
-import com.factory.service.benteler.BentelerIniCheckTypeService;
-import com.factory.mapper.benteler.BentelerIniCheckTypeMapper;
+import com.factory.service.BentelerIniCheckTypeService;
+import com.factory.mapper.BentelerIniCheckTypeMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.factory.base.entity.po.benteler.BentelerIniCheckType;
 import org.springframework.stereotype.Service;

application-facade/src/main/java/com/factory/service/impl/benteler/BentelerIniVersionItemServiceImpl.java → application-facade/src/main/java/com/factory/service/impl/BentelerIniVersionItemServiceImpl.java

@@ -1,7 +1,7 @@
-package com.factory.service.impl.benteler;
+package com.factory.service.impl;
 
-import com.factory.service.benteler.BentelerIniVersionItemService;
-import com.factory.mapper.benteler.BentelerIniVersionItemMapper;
+import com.factory.service.BentelerIniVersionItemService;
+import com.factory.mapper.BentelerIniVersionItemMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.factory.base.entity.po.benteler.BentelerIniVersionItem;
 import org.springframework.stereotype.Service;

application-facade/src/main/java/com/factory/service/impl/benteler/BentelerIniVersionServiceImpl.java → application-facade/src/main/java/com/factory/service/impl/BentelerIniVersionServiceImpl.java

@@ -1,8 +1,8 @@
-package com.factory.service.impl.benteler;
+package com.factory.service.impl;
 
 import com.factory.base.entity.po.benteler.BentelerIniVersion;
-import com.factory.service.benteler.BentelerIniVersionService;
-import com.factory.mapper.benteler.BentelerIniVersionMapper;
+import com.factory.service.BentelerIniVersionService;
+import com.factory.mapper.BentelerIniVersionMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

application-facade/src/main/java/com/factory/service/impl/benteler/BentelerPlanServiceImpl.java → application-facade/src/main/java/com/factory/service/impl/BentelerPlanServiceImpl.java

@@ -1,8 +1,8 @@
-package com.factory.service.impl.benteler;
+package com.factory.service.impl;
 
 import com.factory.base.entity.po.benteler.BentelerPlan;
-import com.factory.service.benteler.BentelerPlanService;
-import com.factory.mapper.benteler.BentelerPlanMapper;
+import com.factory.service.BentelerPlanService;
+import com.factory.mapper.BentelerPlanMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

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

@@ -1,43 +0,0 @@
-package com.factory.service.impl.remote;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.factory.base.entity.constant.SystemConstant;
-import com.factory.base.entity.po.remote.Dept;
-import com.factory.user.mapper.DeptMapper;
-import com.factory.service.remote.DeptService;
-import org.springframework.stereotype.Service;
-
-@Service("WebDeptService")
-public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements DeptService {
-
-    @Override
-    public String getDeptNameById(Long id) {
-        String name = SystemConstant.EMPTY_STRING;
-        if (id == null) {
-            return name;
-        }
-        Dept dept = getById(id);
-        if (dept != null) {
-            name = dept.getName();
-        }
-        return name;
-    }
-
-    @Override
-    public String getDeptNameByCode(Long code) {
-        String name = SystemConstant.EMPTY_STRING;
-        if (code == null) {
-            return name;
-        }
-        Dept dept = getOne(Wrappers.<Dept>lambdaQuery()
-                .eq(Dept::getDeptCode,code),false
-
-        );
-        if (dept != null) {
-            name = dept.getName();
-        }
-        return name;
-    }
-
-}

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

@@ -1,26 +0,0 @@
-package com.factory.service.impl.remote;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.factory.base.entity.constant.SystemConstant;
-import com.factory.base.entity.po.remote.Dict;
-import com.factory.user.mapper.DictMapper;
-import com.factory.service.remote.DictService;
-import org.springframework.stereotype.Service;
-
-@Service("WebDictService")
-public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements DictService {
-
-    @Override
-    public String getNameById(Long id) {
-        String name = SystemConstant.EMPTY_STRING;
-        if (id == null) {
-            return name;
-        }
-        Dict dept = getById(id);
-        if (dept != null) {
-            name = dept.getDictVal();
-        }
-        return name;
-    }
-
-}

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

@@ -1,37 +0,0 @@
-package com.factory.service.impl.remote;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.factory.base.entity.constant.SystemConstant;
-import com.factory.base.entity.po.file.FileInfo;
-import com.factory.user.mapper.FileInfoMapper;
-import com.factory.service.remote.FileInfoService;
-import com.factory.util.assembler.WebFileInfoAssembler;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-
-/**
- * 考虑独立文件服务器 暂时采用多数据源读库 后续按需求修改
- */
-
-@DS("file")
-@Service("WebFileInfoService")
-@Transactional(propagation = Propagation.REQUIRES_NEW)
-public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> implements FileInfoService {
-
-    @Resource
-    private WebFileInfoAssembler webFileInfoAssembler;
-
-    @Override
-    public String getUrlById(Long fileInfoId) {
-        if (fileInfoId == null) {
-            return SystemConstant.EMPTY_STRING;
-        }
-        FileInfo fileInfo = getById(fileInfoId);
-        return webFileInfoAssembler.getUrlByFileInfo(fileInfo);
-    }
-
-}

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

@@ -1,11 +0,0 @@
-package com.factory.service.impl.remote;
-
-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.service.remote.MenuService;
-import org.springframework.stereotype.Service;
-
-@Service("WebMenuService")
-public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements MenuService {
-}

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

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

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

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

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

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

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

@@ -1,190 +0,0 @@
-package com.factory.service.impl.remote;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.factory.base.entity.aggregates.PageBean;
-import com.factory.base.entity.aggregates.ResponseBean;
-import com.factory.base.entity.constant.SystemConstant;
-import com.factory.base.entity.po.remote.Dict;
-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.entity.vo.req.UserInsertReq;
-import com.factory.entity.vo.req.UserLockReq;
-import com.factory.entity.vo.req.UserPageQueryReq;
-import com.factory.entity.vo.res.UserRes;
-import com.factory.service.remote.UserInfoService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Service("WebUserInfoService")
-public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> implements UserInfoService {
-
-    @Resource
-    private UserRoleMapper userRoleMapper;
-    @Resource
-    private RoleMapper roleMapper;
-    @Resource
-    private DictMapper dictMapper;
-
-    @Override
-    public String getNameById(Long id) {
-        String name = SystemConstant.EMPTY_STRING;
-        if (id == null) {
-            return name;
-        }
-        UserInfo userInfo = getById(id);
-        if (userInfo != null) {
-            name = userInfo.getName();
-        }
-        return name;
-    }
-    @Override
-    public List<UserInfo> getListByNameOrNo(String word) {
-        return list(Wrappers.<UserInfo>lambdaQuery().like(UserInfo::getName, word).or().like(UserInfo::getNo, word));
-    }
-
-    @Override
-    public ResponseBean<PageBean<UserRes>> selectUser(UserPageQueryReq userPageQueryReq) {
-        LambdaQueryWrapper<UserInfo> wrapper = new LambdaQueryWrapper<>();
-        wrapper.orderByDesc(UserInfo::getId);
-        if (userPageQueryReq.getName() != null) {
-            wrapper.like(UserInfo::getUsername, userPageQueryReq.getName());
-        }
-        if (userPageQueryReq.getRoleId() != null) {
-            List<UserRole> userRoles = userRoleMapper.selectList(Wrappers.<UserRole>lambdaQuery().eq(UserRole::getRoleId, userPageQueryReq.getRoleId()));
-            if (CollUtil.isNotEmpty(userRoles)) {
-                List<Long> userIds = userRoles.stream().map(UserRole::getUserId).collect(Collectors.toList());
-                wrapper.in(UserInfo::getId, userIds);
-            }
-        }
-        IPage<UserInfo> page = new Page<>(userPageQueryReq.getPage(), userPageQueryReq.getSize());
-        IPage<UserInfo> userInfoPage = baseMapper.selectPage(page, wrapper);
-        List<UserInfo> records = userInfoPage.getRecords();
-        List<UserRes> userResList = records.stream().map(x -> {
-            UserRes userRes = new UserRes();
-            userRes.setId(x.getId());
-            userRes.setUsername(x.getUsername());
-            List<UserRole> userRoles = userRoleMapper.selectList(Wrappers.<UserRole>lambdaQuery().eq(UserRole::getUserId, x.getId()));
-            if (CollUtil.isNotEmpty(userRoles)) {
-                Role role = roleMapper.selectById(userRoles.get(0).getRoleId());
-                userRes.setRoleId(role.getId());
-                userRes.setRoleName(role.getName());
-            }
-            userRes.setShiftId(x.getShiftId());
-            if (x.getShiftId() != null) {
-                Dict dict = dictMapper.selectById(x.getShiftId());
-                if (dict != null) {
-                    userRes.setShiftName(dict.getDictVal());
-                }
-            }
-            String psd = new String(Base64.decode(x.getPassword()));
-            userRes.setPassWord(psd);
-            userRes.setLock(x.isLock());
-            return userRes;
-        }).collect(Collectors.toList());
-        return ResponseBeanBuilder.ok(PageBean.<UserRes>builder().row(userResList).total(userInfoPage.getTotal()).page(userInfoPage.getPages()).build());
-    }
-
-    @Override
-    public ResponseBean<String> insertUser(UserInsertReq userInsertReq) {
-        UserInfo userInfo = new UserInfo();
-        if (userInsertReq.getUsername() != null) {
-            Integer count = baseMapper.selectCount(Wrappers.<UserInfo>lambdaQuery().eq(UserInfo::getUsername, userInsertReq.getUsername()));
-            if (count > 0) {
-                return ResponseBeanBuilder.fail("用户名重复！");
-            }
-        } else {
-            return ResponseBeanBuilder.fail("用户名不能为空");
-        }
-        if (userInsertReq.getPassword() == null) {
-            return ResponseBeanBuilder.fail("密码不能为空");
-        }
-        if (userInsertReq.getRoleId() == 55) {
-            if (userInsertReq.getShiftId()==null){
-            return ResponseBeanBuilder.fail("班次不能为空");
-
-            }
-        }
-        userInfo.setUsername(userInsertReq.getUsername());
-        String psd = Base64.encode(userInsertReq.getPassword().getBytes());
-        userInfo.setPassword(psd);
-        userInfo.setEffectiveTime(LocalDateTime.now());
-        if (userInsertReq.getShiftId() != null) {
-            userInfo.setShiftId(userInsertReq.getShiftId());
-        }
-        int insert = baseMapper.insert(userInfo);
-        if (insert > 0) {
-            if (userInsertReq.getRoleId() != null) {
-                UserRole userRole = new UserRole();
-                userRole.setUserId(userInfo.getId());
-                userRole.setRoleId(userInsertReq.getRoleId());
-                userRoleMapper.insert(userRole);
-            }
-            return ResponseBeanBuilder.ok("新增成功!");
-        }
-        return ResponseBeanBuilder.ok("新增失败!");
-    }
-
-    @Override
-    public ResponseBean<String> updateUser(UserInsertReq userInsertReq) {
-        UserInfo userInfo = new UserInfo();
-        if (userInsertReq.getUsername() != null) {
-            UserInfo userInfos = baseMapper.selectOne(Wrappers.<UserInfo>lambdaQuery().eq(UserInfo::getUsername, userInsertReq.getUsername()));
-            if(BeanUtil.isNotEmpty(userInfos)){
-                if (!userInfos.getId().equals(userInsertReq.getId())) {
-                    return ResponseBeanBuilder.fail("用户名重复！");
-                }
-            }
-        } else {
-            return ResponseBeanBuilder.fail("用户名不能为空");
-        }
-        if (userInsertReq.getPassword() == null) {
-            return ResponseBeanBuilder.fail("密码不能为空");
-        }
-        userInfo.setUsername(userInsertReq.getUsername());
-        String psd = Base64.encode(userInsertReq.getPassword().getBytes());
-        userInfo.setPassword(psd);
-        userInfo.setShiftId(userInsertReq.getShiftId());
-        userInfo.setId(userInsertReq.getId());
-        int up = baseMapper.updateById(userInfo);
-        if (up > 0) {
-            if (userInsertReq.getRoleId() != null) {
-                UserRole userRole = new UserRole();
-                userRole.setRoleId(userInsertReq.getRoleId());
-                userRoleMapper.update(userRole, Wrappers.<UserRole>lambdaQuery().eq(UserRole::getUserId, userInsertReq.getId()));
-            }
-            return ResponseBeanBuilder.ok("修改成功!");
-        }
-        return ResponseBeanBuilder.ok("修改失败!");
-    }
-
-    @Override
-    public ResponseBean<String> userLock(UserLockReq userLockReq) {
-        UserInfo userInfo = new UserInfo();
-        userInfo.setId(userLockReq.getId());
-        userInfo.setLock(userLockReq.isNo());
-        userInfo.setShiftId(userLockReq.getShiftId());
-        boolean b = this.updateById(userInfo);
-        if (b) {
-            return ResponseBeanBuilder.ok("操作成功！");
-        }
-        return ResponseBeanBuilder.fail("操作失败！");
-    }
-
-}

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

@@ -1,35 +0,0 @@
-package com.factory.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.user.mapper.UserRoleMapper;
-import com.factory.service.remote.UserRoleService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Service("WebUserRoleService")
-public class UserRoleServiceImpl extends ServiceImpl<UserRoleMapper, UserRole> implements UserRoleService {
-
-    @Override
-    public boolean userHasRole(Long userId,Long roleId) {
-        return getRoleIdsByUserId(userId).contains(roleId);
-    }
-
-    @Override
-    public List<UserRole> getRolesByUserId(Long userId) {
-        List<UserRole> userRoleList = list(
-                Wrappers.<UserRole>lambdaQuery()
-                        .eq(UserRole::getUserId, userId));
-        return userRoleList;
-    }
-
-    @Override
-    public List<Long> getRoleIdsByUserId(Long userId) {
-        List<UserRole> userRoleList = getRolesByUserId(userId);
-        List<Long> roleIds = userRoleList.stream().map(UserRole::getRoleId).collect(Collectors.toList());
-        return roleIds;
-    }
-}

application-facade/src/main/java/com/factory/service/remote/DeptService.java

@@ -1,11 +0,0 @@
-package com.factory.service.remote;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.factory.base.entity.po.remote.Dept;
-
-public interface DeptService extends IService<Dept> {
-
-     String getDeptNameById(Long id);
-
-     String getDeptNameByCode(Long code);
-}

application-facade/src/main/java/com/factory/service/remote/DictService.java

@@ -1,11 +0,0 @@
-package com.factory.service.remote;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.factory.base.entity.po.remote.Dict;
-
-public interface DictService extends IService<Dict> {
-
-    String getNameById(Long id);
-
-
-}

application-facade/src/main/java/com/factory/service/remote/FileInfoService.java

@@ -1,10 +0,0 @@
-package com.factory.service.remote;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.factory.base.entity.po.file.FileInfo;
-
-public interface FileInfoService extends IService<FileInfo> {
-
-    String getUrlById(Long fileInfoId);
-
-}

application-facade/src/main/java/com/factory/service/remote/MenuService.java

@@ -1,7 +0,0 @@
-package com.factory.service.remote;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.factory.base.entity.po.remote.Menu;
-
-public interface MenuService extends IService<Menu> {
-}

application-facade/src/main/java/com/factory/service/remote/PermissionService.java

@@ -1,8 +0,0 @@
-package com.factory.service.remote;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.factory.base.entity.po.remote.Permission;
-
-public interface PermissionService extends IService<Permission> {
-
-}

application-facade/src/main/java/com/factory/service/remote/RolePermissionService.java

@@ -1,8 +0,0 @@
-package com.factory.service.remote;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.factory.base.entity.po.remote.RolePermission;
-
-public interface RolePermissionService extends IService<RolePermission> {
-
-}

application-facade/src/main/java/com/factory/service/remote/RoleService.java

@@ -1,9 +0,0 @@
-package com.factory.service.remote;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.factory.base.entity.po.remote.Role;
-
-public interface RoleService extends IService<Role> {
-
-
-}

application-facade/src/main/java/com/factory/service/remote/UserInfoService.java

@@ -1,28 +0,0 @@
-package com.factory.service.remote;
-
-import com.factory.entity.vo.req.UserInsertReq;
-import com.factory.entity.vo.req.UserLockReq;
-import com.factory.entity.vo.req.UserPageQueryReq;
-import com.factory.entity.vo.res.UserRes;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.factory.base.entity.aggregates.PageBean;
-import com.factory.base.entity.aggregates.ResponseBean;
-import com.factory.base.entity.po.remote.UserInfo;
-
-import java.util.List;
-
-
-public interface UserInfoService extends IService<UserInfo> {
-
-    String getNameById(Long id);
-
-    List<UserInfo> getListByNameOrNo(String word);
-
-    ResponseBean<PageBean<UserRes>> selectUser(UserPageQueryReq userPageQueryReq);
-
-    ResponseBean<String> insertUser(UserInsertReq userInsertReq);
-
-    ResponseBean<String> updateUser(UserInsertReq userInsertReq);
-
-    ResponseBean<String> userLock(UserLockReq userLockReq);
-}

application-facade/src/main/java/com/factory/service/remote/UserRoleService.java

@@ -1,19 +0,0 @@
-package com.factory.service.remote;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.factory.base.entity.po.remote.UserRole;
-
-import java.util.List;
-
-public interface UserRoleService extends IService<UserRole> {
-
-    boolean userHasRole(Long userId, Long roleId);
-
-    List<UserRole> getRolesByUserId(Long userId);
-
-    List<Long> getRoleIdsByUserId(Long userId);
-
-
-
-
-}

application-facade/src/main/java/com/factory/controller/web/UserController.java → common-user/src/main/java/com/factory/user/controller/UserController.java

@@ -1,12 +1,12 @@
-package com.factory.controller.web;
+package com.factory.user.controller;
 
-import com.factory.service.remote.UserInfoService;
-import com.factory.entity.vo.req.UserInsertReq;
-import com.factory.entity.vo.req.UserLockReq;
-import com.factory.entity.vo.req.UserPageQueryReq;
-import com.factory.entity.vo.res.UserRes;
 import com.factory.base.entity.aggregates.PageBean;
 import com.factory.base.entity.aggregates.ResponseBean;
+import com.factory.user.entity.vo.req.UserInsertReq;
+import com.factory.user.entity.vo.req.UserLockReq;
+import com.factory.user.entity.vo.req.UserPageQueryReq;
+import com.factory.user.entity.vo.res.UserRes;
+import com.factory.user.service.UserInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;