diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/standard/controller/ClassStandardController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/classstandard/controller/ClassStandardController.java similarity index 93% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/standard/controller/ClassStandardController.java rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/classstandard/controller/ClassStandardController.java index b4f6f14..aaa3e22 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/standard/controller/ClassStandardController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/classstandard/controller/ClassStandardController.java @@ -1,12 +1,12 @@ -package org.nl.wms.basedata.master.standard.controller; +package org.nl.wms.basedata.master.classstandard.controller; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.modules.logging.annotation.Log; -import org.nl.wms.basedata.master.standard.service.IClassStandardService; -import org.nl.wms.basedata.master.standard.service.dao.ClassStandard; +import org.nl.wms.basedata.master.classstandard.service.IClassStandardService; +import org.nl.wms.basedata.master.classstandard.service.dao.ClassStandard; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/standard/service/IClassStandardService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/classstandard/service/IClassStandardService.java similarity index 92% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/standard/service/IClassStandardService.java rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/classstandard/service/IClassStandardService.java index 4c23fd8..4170de8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/standard/service/IClassStandardService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/classstandard/service/IClassStandardService.java @@ -1,9 +1,9 @@ -package org.nl.wms.basedata.master.standard.service; +package org.nl.wms.basedata.master.classstandard.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.query.PageQuery; -import org.nl.wms.basedata.master.standard.service.dao.ClassStandard; +import org.nl.wms.basedata.master.classstandard.service.dao.ClassStandard; import java.util.ArrayList; import java.util.List; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/standard/service/dao/ClassStandard.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/classstandard/service/dao/ClassStandard.java similarity index 95% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/standard/service/dao/ClassStandard.java rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/classstandard/service/dao/ClassStandard.java index 132af7b..f0f0ec4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/standard/service/dao/ClassStandard.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/classstandard/service/dao/ClassStandard.java @@ -1,4 +1,4 @@ -package org.nl.wms.basedata.master.standard.service.dao; +package org.nl.wms.basedata.master.classstandard.service.dao; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/standard/service/dao/mapper/ClassStandardMapper.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/classstandard/service/dao/mapper/ClassStandardMapper.java similarity index 64% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/standard/service/dao/mapper/ClassStandardMapper.java rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/classstandard/service/dao/mapper/ClassStandardMapper.java index d9cd834..d67b0c1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/standard/service/dao/mapper/ClassStandardMapper.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/classstandard/service/dao/mapper/ClassStandardMapper.java @@ -1,7 +1,7 @@ -package org.nl.wms.basedata.master.standard.service.dao.mapper; +package org.nl.wms.basedata.master.classstandard.service.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.nl.wms.basedata.master.standard.service.dao.ClassStandard; +import org.nl.wms.basedata.master.classstandard.service.dao.ClassStandard; import java.util.ArrayList; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/standard/service/dao/mapper/ClassStandardMapper.xml b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/classstandard/service/dao/mapper/ClassStandardMapper.xml similarity index 88% rename from lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/standard/service/dao/mapper/ClassStandardMapper.xml rename to lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/classstandard/service/dao/mapper/ClassStandardMapper.xml index b6ce826..e8b6a12 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/standard/service/dao/mapper/ClassStandardMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/classstandard/service/dao/mapper/ClassStandardMapper.xml @@ -1,6 +1,6 @@ - + + SELECT + sys_user.*, + dept.name + FROM + sys_user sys_user + LEFT JOIN sys_user_dept sdept ON sdept.user_id = sys_user.user_id + LEFT JOIN sys_dept dept ON dept.dept_id = sdept.dept_id + WHERE + sys_user.is_used = '1' + + sys_user.username LIKE concat('%',#{blurry},'%') + OR + sys_user.person_name LIKE concat('%',#{blurry},'%') + + ORDER BY username DESC + + diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/areapermissions/service/impl/UserAreaPermissionServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/areapermissions/service/impl/UserAreaPermissionServiceImpl.java new file mode 100644 index 0000000..37df594 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/areapermissions/service/impl/UserAreaPermissionServiceImpl.java @@ -0,0 +1,69 @@ +package org.nl.wms.basedata.st.areapermissions.service.impl; + +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.common.domain.query.PageQuery; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.wms.basedata.st.areapermissions.service.IUserAreaPermissionService; +import org.nl.wms.basedata.st.areapermissions.service.dao.UserAreaPermission; +import org.nl.wms.basedata.st.areapermissions.service.dao.mapper.UserAreaPermissionMapper; +import org.nl.wms.basedata.st.areapermissions.service.vo.UsersVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +/** + * @Author: lyd + * @Date: 2024/10/18 + */ +@Service +public class UserAreaPermissionServiceImpl extends ServiceImpl implements IUserAreaPermissionService { + @Autowired + private UserAreaPermissionMapper userAreaPermissionMapper; + + @Override + public IPage pageQuery(Map whereJson, PageQuery page) { + String blurry = ObjectUtil.isNotEmpty(whereJson.get("blurry")) ? (String) whereJson.get("blurry") : null; + IPage pages = new Page<>(page.getPage() + 1, page.getSize()); + pages = userAreaPermissionMapper.selectPageLeftJoin(pages, blurry); + return pages; + } + + @Override + public List queryUserArea(JSONObject whereJson) { + String userId = whereJson.getString("user_id"); + return this.list(new LambdaQueryWrapper().eq(UserAreaPermission::getUser_id, userId)); + } + + @Override + public void save(JSONObject whereJson) { + JSONObject userInfo = whereJson.getJSONObject("jo"); + JSONArray areas = whereJson.getJSONArray("rows"); + if (ObjectUtil.isEmpty(userInfo)) { + throw new BadRequestException("用户数据不能为空！"); + } + String userId = userInfo.getString("user_id"); + // 先删除 + userAreaPermissionMapper.delete(new LambdaQueryWrapper() + .eq(UserAreaPermission::getUser_id, userId)); + // 后增加 + List list = new LinkedList<>(); + for (int i = 0; i < areas.size(); i++) { + JSONObject jsonObject = areas.getJSONObject(i); + UserAreaPermission userAreaPermission = new UserAreaPermission(); + userAreaPermission.setProduct_area(jsonObject.getString("product_area")); + userAreaPermission.setUser_id(userId); + list.add(userAreaPermission); + } + this.saveBatch(list); + } +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/areapermissions/service/vo/UsersVo.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/areapermissions/service/vo/UsersVo.java new file mode 100644 index 0000000..0767747 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/areapermissions/service/vo/UsersVo.java @@ -0,0 +1,134 @@ +package org.nl.wms.basedata.st.areapermissions.service.vo; + +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + *

+ * 用户表 + *

+ * @author lyd + */ +@Data +public class UsersVo implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 用户标识 + */ + private String user_id; + + /** + * 登录账号 + */ + private String username; + + /** + * 姓名 + */ + private String person_name; + + /** + * 性别 + */ + private String gender; + + /** + * 电话 + */ + private String phone; + + /** + * 电子邮箱 + */ + private String email; + + /** + * 头像地址 + */ + private String avatar_name; + + /** + * 头像真实路径 + */ + private String avatar_path; + + /** + * 密码 + */ + private String password; + + /** + * 是否为admin账号 + */ + private Boolean is_admin; + + /** + * 是否启用 + */ + private Boolean is_used; + + /** + * 密码重置者 + */ + private Long pwd_reset_user_id; + + /** + * 密码重置时间 + */ + private Date pwd_reset_time; + + /** + * 创建人标识 + */ + private String create_id; + + /** + * 创建人 + */ + private String create_name; + + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + private Date create_time; + + /** + * 修改人标识 + */ + private String update_id; + + /** + * 修改人 + */ + private String update_name; + + /** + * 修改时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date update_time; + + /** + * 外部人员标识 + */ + private String extperson_id; + + /** + * 外部用户标识 + */ + private String extuser_id; + + /** + * 部门名称 + */ + private String name; +} + diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/UserAreaController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/UserAreaController.java index 1d939c5..1d01018 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/UserAreaController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/UserAreaController.java @@ -15,7 +15,7 @@ import java.util.Map; @RestController @RequiredArgsConstructor -@RequestMapping("/api/userArea") +@RequestMapping("/api/userArea2") @Slf4j public class UserAreaController { private final UserAreaService userAreaService; diff --git a/lms/nladmin-ui/src/views/wms/basedata/product/userArea/index.vue b/lms/nladmin-ui/src/views/wms/basedata/product/userArea/index.vue index b040a61..0bef5e9 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/product/userArea/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/product/userArea/index.vue @@ -13,9 +13,9 @@ class="filter-item" @keyup.enter.native="crud.toQuery" /> - + - + @@ -34,9 +34,9 @@ @selection-change="crud.selectionChangeHandler" @current-change="handleCurrentChange" > - - - + + + - + @@ -71,11 +71,12 @@ :data="tableData" tooltip-effect="dark" style="width: 100%" - @selection-change="handleSelectionChange"> + @selection-change="handleSelectionChange" + > - + width="55" + /> @@ -104,7 +105,7 @@ export default { cruds() { return CRUD({ title: '角色', - url: 'api/userStor', + url: 'api/userArea', crudMethod: { ...crudUserArea }, optShow: { add: false, reset: false, edit: false, del: false } })