8-15 工位管理 1.0

src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.IdUtil;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
@@ -14,9 +15,12 @@ import com.glxp.api.dto.DictDto;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.auth.SysWorkplace;
 import com.glxp.api.entity.auth.WarehouseUserEntity;
+import com.glxp.api.entity.basic.BasicCollectPointEntity;
 import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity;
 import com.glxp.api.entity.system.SystemPDFTemplateEntity;
 import com.glxp.api.exception.JsonException;
+import com.glxp.api.req.auth.FilterAuthUserRequest;
+import com.glxp.api.req.auth.FilterInvLinkDataRequest;
 import com.glxp.api.req.auth.SysWorkplaceRequest;
 import com.glxp.api.req.dev.DeviceInfoDetailQuery;
 import com.glxp.api.req.system.PrintLabelRequest;
@@ -64,10 +68,11 @@ public class SysWorkplaceController extends BaseController {
 //                .or()
 //                .like(StrUtil.isNotBlank(request.getKey()),SystemWorkplace::getWorkplaceName,request.getKey())
 //        );
-        Page<SysWorkplaceResponse> page = sysWorkplaceService.filterList(request);
+        List<SysWorkplaceResponse> page = sysWorkplaceService.filterList(request);
-        PageSimpleResponse pageSimpleResponse = new PageSimpleResponse();
+        PageInfo<SysWorkplaceResponse> pageInfo = new PageInfo<>(page);
-        pageSimpleResponse.setList(page.getRecords());
+        PageSimpleResponse<SysWorkplaceResponse> pageSimpleResponse = new PageSimpleResponse<>();
-        pageSimpleResponse.setTotal(page.getTotal());
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(page);
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
@@ -81,8 +86,8 @@ public class SysWorkplaceController extends BaseController {
     @AuthRuleAnnotation("")
     @GetMapping("/udiwms/sysWorkplace/page/filterOptimize")
     public BaseResponse filterOptimize(SysWorkplaceRequest request) {
-        Page<SysWorkplaceResponse> page = sysWorkplaceService.filterList(request);
+        List<SysWorkplaceResponse> page = sysWorkplaceService.filterList(request);
-        List<DictDto> reList = page.getRecords().stream().map(s -> {
+        List<DictDto> reList = page.stream().map(s -> {
             DictDto dictDto = new DictDto(s.getWorkplaceId() + "", s.getWorkplaceName());
             return dictDto;
         }).collect(Collectors.toList());
@@ -209,6 +214,8 @@ public class SysWorkplaceController extends BaseController {
     }
 
 
+
+
     @Resource
     private WarehouseUserService warehouseUserService;
 
@@ -217,16 +224,20 @@ public class SysWorkplaceController extends BaseController {
 
     @PostMapping("/udiwms/sysWorkplace/getUsers")
     public BaseResponse getUser(@RequestBody SysWorkplaceRequest request) {
-        if (request.getInvCode() == null) {
+        if (request.getInvCode() == null){
-
+            //todo 没有搜索仓库 搜索所有用户
         }
         List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.getListByCode(request.getInvCode());
-        List<AuthAdmin> users = new ArrayList<>(warehouseUserEntities.size());
+        List<Long> userIds = warehouseUserEntities.stream()
-        for (WarehouseUserEntity warehouseUserEntity : warehouseUserEntities) {
+                .map(WarehouseUserEntity::getUserid)
-            AuthAdmin user = authAdminService.getById(warehouseUserEntity.getUserid());
+                .collect(Collectors.toList());
-            users.add(user);
+        request.setIds(userIds);
-        }
+        List<AuthAdmin> authAdmins = authAdminService.getUserByIds(request);
-        return ResultVOUtils.success(users);
+        PageInfo<AuthAdmin> pageInfo = new PageInfo<>(authAdmins);
+        PageSimpleResponse<AuthAdmin> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(authAdmins);
+        return ResultVOUtils.success(pageSimpleResponse);
     }
 
 

src/main/java/com/glxp/api/controller/basic/BasicCollectPointCategoryController.java

@@ -17,6 +17,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -63,6 +64,35 @@ public class BasicCollectPointCategoryController extends BaseController {
 
 
 
+    @PostMapping("udiwms/basic/collectPoint/category/updateTree")
+    public BaseResponse updateTree(@RequestBody BasicCollectgoryRequest request) {
+
+        if (StrUtil.isEmpty(request.getName())) {
+            return ResultVOUtils.error(500, "名字不能为空！");
+        }
+
+        Boolean falg = basicCollectPointCategoryService.checkName(request, 2);
+        if (falg == false) {
+            return ResultVOUtils.error(500, "名字重复！");
+        }
+
+        BasicCollectPointCategory basicCollectPointCategory = new BasicCollectPointCategory();
+        basicCollectPointCategory.setId(request.getId());
+        basicCollectPointCategory.setName(request.getName());
+        basicCollectPointCategory.setCode(request.getCode());
+        basicCollectPointCategory.setParentCode(request.getParentCode());
+        basicCollectPointCategory.setRemark(request.getRemark());
+        basicCollectPointCategory.setUpdateTime(new Date());
+        basicCollectPointCategory.setUpdateUser(this.getUserId() + "");
+
+        falg = basicCollectPointCategoryService.updateById(basicCollectPointCategory);
+        if (!falg) {
+            return ResultVOUtils.error(500, "修改失败！");
+        }
+        return ResultVOUtils.success();
+
+    }
+
     @PostMapping("udiwms/basic/collectPoint/category/deleteTree")
     public BaseResponse addTree(@RequestBody BasicCollectPointCategory basicCollectPointCategory) {
         QueryWrapper wrapper = new QueryWrapper();

src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java

@@ -8,6 +8,7 @@ import com.glxp.api.entity.basic.BasicCollectUserEntity;
 import com.glxp.api.req.basic.BasicCollectRequest;
 import com.glxp.api.req.basic.BasicCollectUserRequest;
 import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.basic.SysWorkplaceResponse;
 import com.glxp.api.res.basic.UserWorkResponse;
 import com.glxp.api.service.basic.BasicCollectUserService;
 import lombok.extern.slf4j.Slf4j;
@@ -34,8 +35,12 @@ public class BasicCollectUserController {
 
     @GetMapping("/udiwms/sysWorkplace/getUserBindWork")
     public BaseResponse getUserBindWork(BasicCollectUserRequest request) {
-        List<UserWorkResponse> list = basicCollectUserService.filterList(request);
+        List<UserWorkResponse> page = basicCollectUserService.filterList(request);
-        return ResultVOUtils.success(list);
+        PageInfo<UserWorkResponse> pageInfo = new PageInfo<>(page);
+        PageSimpleResponse<UserWorkResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(page);
+        return ResultVOUtils.success(pageSimpleResponse);
     }
 
     @PostMapping("/udiwms/sysWorkplace/userBindWork")

src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java

@@ -87,4 +87,6 @@ public interface AuthAdminDao extends BaseMapperPlus<AuthAdminDao, AuthAdmin, Au
 
 
     List<AuthAdmin> companyUserList(@Param("param")FilterInvLinkDataRequest filterInvLinkDataRequest);
+
+    List<AuthAdmin> getUserByIds(@Param("userIds")  List<Long> ids,@Param("key") String key);
 }

src/main/java/com/glxp/api/dao/auth/SysWorkplaceDao.java

@@ -8,6 +8,8 @@ import com.glxp.api.req.auth.SysWorkplaceRequest;
 import com.glxp.api.res.basic.SysWorkplaceResponse;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * @author : zhangsan
  * @date : 2024/7/24 10:15
@@ -17,5 +19,5 @@ import org.apache.ibatis.annotations.Param;
 public interface SysWorkplaceDao extends BaseMapper<SysWorkplace> {
     Long selectMaxWorkplaceId();
 
-    Page<SysWorkplaceResponse> filterList(@Param("page") Page pageObject, @Param("request") SysWorkplaceRequest request);
+    List<SysWorkplaceResponse> filterList(@Param("request") SysWorkplaceRequest request);
 }

src/main/java/com/glxp/api/dao/basic/BasicCollectPointCategoryMapper.java

@@ -20,5 +20,7 @@ public interface BasicCollectPointCategoryMapper extends BaseMapper<BasicCollect
 
 
     List<BasicCollectGoryResponse> getTreeList(BasicCollectgoryRequest request);
+
+    List<BasicCollectPointCategory> selectAll();
 }
 

src/main/java/com/glxp/api/req/auth/SysWorkplaceRequest.java

@@ -4,6 +4,8 @@ package com.glxp.api.req.auth;
 import com.glxp.api.util.page.ListPageRequest;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author : zhangsan
  * @date : 2024/7/24 10:21
@@ -16,4 +18,6 @@ public class SysWorkplaceRequest extends ListPageRequest {
 
     //
     private String code;
+
+    private List<Long> ids;
 }

src/main/java/com/glxp/api/service/auth/AuthAdminService.java

@@ -3,10 +3,7 @@ package com.glxp.api.service.auth;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.glxp.api.entity.auth.AuthAdmin;
-import com.glxp.api.req.auth.FilterAuthUserRequest;
+import com.glxp.api.req.auth.*;
-import com.glxp.api.req.auth.FilterInvLinkDataRequest;
-import com.glxp.api.req.auth.FilterNoSelectUserRequest;
-import com.glxp.api.req.auth.UpdateUserRequset;
 
 import java.util.List;
 
@@ -48,4 +45,7 @@ public interface AuthAdminService extends IService<AuthAdmin> {
     void insertUserAuth(Long userId, List<Long> roleIds);
 
     List<AuthAdmin> companyUserList(FilterInvLinkDataRequest filterInvLinkDataRequest);
+
+
+    List<AuthAdmin> getUserByIds(SysWorkplaceRequest request);
 }

src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java

@@ -3,12 +3,16 @@ package com.glxp.api.service.auth;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.auth.SysWorkplaceDao;
 import com.glxp.api.entity.auth.SysWorkplace;
 import com.glxp.api.req.auth.SysWorkplaceRequest;
 import com.glxp.api.res.basic.SysWorkplaceResponse;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  * @author : zhangsan
  * @date : 2024/7/24 10:13
@@ -22,8 +26,14 @@ public class SysWorkplaceService extends ServiceImpl<SysWorkplaceDao, SysWorkpla
         return super.baseMapper.selectMaxWorkplaceId();
     }
 
-    public Page<SysWorkplaceResponse> filterList(SysWorkplaceRequest request) {
+    public List<SysWorkplaceResponse> filterList(SysWorkplaceRequest request) {
-        Page<SysWorkplaceResponse> page = super.baseMapper.filterList(request.getPageObj(), request);
+        if (null == request) {
+            return Collections.emptyList();
+        }
+        if (null != request.getPage() && null != request.getLimit()) {
+            PageHelper.offsetPage((request.getPage() - 1) * request.getLimit(), request.getLimit());
+        }
+        List<SysWorkplaceResponse>page = super.baseMapper.filterList(request);
         return page;
     }
 }

src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java

@@ -188,6 +188,18 @@ public class AuthAdminServiceImpl extends ServiceImpl<AuthAdminDao, AuthAdmin> i
         return authAdminDao.companyUserList(filterInvLinkDataRequest);
     }
 
+    @Override
+    public List<AuthAdmin> getUserByIds(SysWorkplaceRequest request) {
+        if (request == null) {
+            return Collections.emptyList();
+        }
+        if (request.getPage() != null) {
+            int offset = (request.getPage() - 1) * request.getLimit();
+            PageHelper.offsetPage(offset, request.getLimit());
+        }
+        return authAdminDao.getUserByIds(request.getIds(),request.getKey());
+    }
+
 
     public void insertUserRole(Long userId, List<Long> roleIds) {
         if (ArrayUtil.isNotEmpty(roleIds)) {

src/main/java/com/glxp/api/service/basic/BasicCollectPointCategoryService.java

@@ -8,8 +8,10 @@ import com.glxp.api.entity.basic.BasicCollectPointCategory;
 import com.glxp.api.entity.basic.BasicProductCategory;
 import com.glxp.api.req.basic.BasicCollectgoryRequest;
 import com.glxp.api.res.basic.BasicCollectGoryResponse;
+import org.apache.poi.ss.formula.functions.Offset;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
 
@@ -23,6 +25,9 @@ import java.util.List;
 public class BasicCollectPointCategoryService extends ServiceImpl<BasicCollectPointCategoryMapper, BasicCollectPointCategory> {
 
 
+    @Resource
+    BasicCollectPointCategoryMapper basicCollectPointCategoryMapper;
+
     public List<BasicCollectGoryResponse> getTreeList(BasicCollectgoryRequest request) {
         return super.baseMapper.getTreeList(request);
     }
@@ -51,6 +56,17 @@ public class BasicCollectPointCategoryService extends ServiceImpl<BasicCollectPo
     public Boolean saveTree(BasicCollectgoryRequest request) {
 
         boolean falg = true;
+        List<BasicCollectPointCategory> list = basicCollectPointCategoryMapper.selectAll();
+        if (list == null || list.size() == 0){
+            //没有记录
+            BasicCollectPointCategory entity = new BasicCollectPointCategory();
+            entity.setId(IdUtil.getSnowflakeNextId());
+            entity.setName("全部");
+            entity.setCode(request.getParentCode());
+            entity.setCreateTime(new Date());
+            entity.setUpdateTime(new Date());
+            basicCollectPointCategoryMapper.insert(entity);
+        }
         BasicCollectPointCategory basicCollectPointCategory = new BasicCollectPointCategory();
         basicCollectPointCategory.setId(IdUtil.getSnowflakeNextId());
         basicCollectPointCategory.setCreateTime(new Date());

src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml

@@ -213,6 +213,25 @@
         </where>
     </select>
 
+    <select id="getUserByIds" resultType="com.glxp.api.entity.auth.AuthAdmin">
+        select *
+        from auth_user
+        <where>
+            userFlag != 0
+            <if test="key != null and key != ''">
+                AND (auth_user.userName like concat('%', #{key}, '%')
+                or auth_user.employeeName like concat('%', #{key}, '%')
+                )
+            </if>
+            <if test="userIds != null and userIds.size() != 0">
+                and auth_user.id  in
+                <foreach collection="userIds" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
 
     <select id="selectAllocatedList" parameterType="com.glxp.api.req.auth.FilterAuthUserRequest"
             resultType="com.glxp.api.entity.auth.AuthAdmin">

src/main/resources/mybatis/mapper/basic/BasicCollectPointCategoryMapper.xml

@@ -15,4 +15,8 @@
         </where>
         ORDER BY id DESC
     </select>
+    <select id="selectAll" resultType="com.glxp.api.entity.basic.BasicCollectPointCategory">
+        SELECT *
+        FROM basic_collect_point_category
+    </select>
 </mapper>