diff --git a/rc_autoplc_backend/rczn-admin/src/main/java/com/rczn/controller/RoleController.java b/rc_autoplc_backend/rczn-admin/src/main/java/com/rczn/controller/RoleController.java index 24d4d1f..014c66d 100644 --- a/rc_autoplc_backend/rczn-admin/src/main/java/com/rczn/controller/RoleController.java +++ b/rc_autoplc_backend/rczn-admin/src/main/java/com/rczn/controller/RoleController.java @@ -11,6 +11,8 @@ import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 角色管理 CRUD API（MyBatis+PageHelper 实现） */ @@ -47,6 +49,23 @@ public class RoleController { return Result.success(pageBean); } + /** + * 1. 分页查询角色（多条件模糊查询） + */ + @GetMapping("/list") + @Operation(summary = "查询角色列表", description = "支持角色名、角色编码模糊查询") + @Parameters({ + @Parameter(name = "roleName", description = "角色名（模糊查询，可选）", required = false, example = "管理员", in = ParameterIn.QUERY), + @Parameter(name = "roleCode", description = "角色编码（模糊查询，可选）", required = false, example = "ADMIN", in = ParameterIn.QUERY) + }) + public Result getRoleList( + @RequestParam(required = false) String roleName, + @RequestParam(required = false) String roleCode) { + + List list = roleService.selectRoleList( roleName, roleCode); + return Result.success(list); + } + /** * 2. 根据ID查询单个角色 */ diff --git a/rc_autoplc_backend/rczn-admin/src/main/java/com/rczn/controller/UserController.java b/rc_autoplc_backend/rczn-admin/src/main/java/com/rczn/controller/UserController.java index 28f0d3c..b2a6972 100644 --- a/rc_autoplc_backend/rczn-admin/src/main/java/com/rczn/controller/UserController.java +++ b/rc_autoplc_backend/rczn-admin/src/main/java/com/rczn/controller/UserController.java @@ -12,6 +12,8 @@ import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 用户管理 CRUD API（MyBatis+PageHelper 实现） */ @@ -44,6 +46,19 @@ public class UserController { return Result.success(pageBean); } + @GetMapping("/list") + @Operation(summary = "查询用户列表", description = "用户名模糊查询，查询全部") + @Parameters({ + @Parameter(name = "userName", description = "用户名（模糊查询，可选）", required = false, example = "张三", in = ParameterIn.QUERY) + }) + public Result> getUserList( + @RequestParam(required = false) String userName) { + + // 调用 Service 查询列表 + List userList = userService.selectUserList(userName); + return Result.success(userList); + } + /** * 2. 根据ID查询单个用户 */ diff --git a/rc_autoplc_backend/rczn-admin/src/main/java/com/rczn/system/mapper/UserRoleMapper.java b/rc_autoplc_backend/rczn-admin/src/main/java/com/rczn/system/mapper/UserRoleMapper.java index 9634dbd..5d3ae10 100644 --- a/rc_autoplc_backend/rczn-admin/src/main/java/com/rczn/system/mapper/UserRoleMapper.java +++ b/rc_autoplc_backend/rczn-admin/src/main/java/com/rczn/system/mapper/UserRoleMapper.java @@ -31,9 +31,7 @@ public interface UserRoleMapper { // 分页查询所有关联 List selectPage( @Param("userId") Integer userId, - @Param("roleId") Integer roleId, - @Param("start") Integer start, - @Param("pageSize") Integer pageSize + @Param("roleId") Integer roleId ); // 查询分页总数 diff --git a/rc_autoplc_backend/rczn-admin/src/main/java/com/rczn/system/service/RoleService.java b/rc_autoplc_backend/rczn-admin/src/main/java/com/rczn/system/service/RoleService.java index f8b2249..6e6fa29 100644 --- a/rc_autoplc_backend/rczn-admin/src/main/java/com/rczn/system/service/RoleService.java +++ b/rc_autoplc_backend/rczn-admin/src/main/java/com/rczn/system/service/RoleService.java @@ -3,6 +3,8 @@ package com.rczn.system.service; import com.rczn.domain.PageBean; import com.rczn.system.domain.Role; +import java.util.List; + /** * Role 业务逻辑层接口 */ @@ -47,4 +49,12 @@ public interface RoleService { * @return 是否删除成功 */ Boolean deleteById(Long id); + + /** + * 根据角色名或角色编码模糊查询角色列表 + * @param roleName 角色名（可选） + * @param roleCode 角色编码（可选） + * @return 角色列表 + */ + List selectRoleList(String roleName, String roleCode); } \ No newline at end of file diff --git a/rc_autoplc_backend/rczn-admin/src/main/java/com/rczn/system/service/UserService.java b/rc_autoplc_backend/rczn-admin/src/main/java/com/rczn/system/service/UserService.java index 5b745e0..4493171 100644 --- a/rc_autoplc_backend/rczn-admin/src/main/java/com/rczn/system/service/UserService.java +++ b/rc_autoplc_backend/rczn-admin/src/main/java/com/rczn/system/service/UserService.java @@ -3,6 +3,8 @@ package com.rczn.system.service; import com.rczn.domain.PageBean; import com.rczn.system.domain.User; +import java.util.List; + /** * User 业务逻辑层接口 */ @@ -17,6 +19,13 @@ public interface UserService { */ PageBean selectUserPage(Integer pageNum, Integer pageSize, String userName); + /** + * 1. 查询用户列表（支持用户名模糊查询） + * @param userName 用户名（模糊查询，可选） + * @return 结果（listUser） + */ + List selectUserList(String userName); + /** * 2. 根据ID查询单个用户 * @param id 用户ID diff --git a/rc_autoplc_backend/rczn-admin/src/main/java/com/rczn/system/service/impl/RoleServiceImpl.java b/rc_autoplc_backend/rczn-admin/src/main/java/com/rczn/system/service/impl/RoleServiceImpl.java index 84b831d..c3f47c9 100644 --- a/rc_autoplc_backend/rczn-admin/src/main/java/com/rczn/system/service/impl/RoleServiceImpl.java +++ b/rc_autoplc_backend/rczn-admin/src/main/java/com/rczn/system/service/impl/RoleServiceImpl.java @@ -95,4 +95,16 @@ public class RoleServiceImpl implements RoleService { int rows = roleMapper.deleteById(id); return rows > 0; } + + /** + * 根据角色名或角色编码模糊查询角色列表 + * + * @param roleName 角色名（可选） + * @param roleCode 角色编码（可选） + * @return 角色列表 + */ + @Override + public List selectRoleList(String roleName, String roleCode) { + return roleMapper.selectRolePage(roleName, roleCode); + } } \ No newline at end of file diff --git a/rc_autoplc_backend/rczn-admin/src/main/java/com/rczn/system/service/impl/UserRoleServiceImpl.java b/rc_autoplc_backend/rczn-admin/src/main/java/com/rczn/system/service/impl/UserRoleServiceImpl.java index 414dc81..2be0cf1 100644 --- a/rc_autoplc_backend/rczn-admin/src/main/java/com/rczn/system/service/impl/UserRoleServiceImpl.java +++ b/rc_autoplc_backend/rczn-admin/src/main/java/com/rczn/system/service/impl/UserRoleServiceImpl.java @@ -1,6 +1,7 @@ package com.rczn.system.service.impl; import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; import com.rczn.domain.PageBean; import com.rczn.system.domain.Position; import com.rczn.system.domain.UserRole; @@ -72,8 +73,8 @@ public class UserRoleServiceImpl implements UserRoleService { Assert.isTrue(pageNum > 0, "页码必须大于0"); Assert.isTrue(pageSize > 0 && pageSize <= 100000, "每页条数必须在1-10000之间"); - int start = (pageNum - 1) * pageSize; - List items = userRoleMapper.selectPage(userId, roleId, start, pageSize); + PageHelper.startPage(pageNum,pageSize); + List items = userRoleMapper.selectPage(userId, roleId); Page page = (Page) items; PageBean pageBean = new PageBean<>(); diff --git a/rc_autoplc_backend/rczn-admin/src/main/java/com/rczn/system/service/impl/UserServiceImpl.java b/rc_autoplc_backend/rczn-admin/src/main/java/com/rczn/system/service/impl/UserServiceImpl.java index 35db5a3..40d89e7 100644 --- a/rc_autoplc_backend/rczn-admin/src/main/java/com/rczn/system/service/impl/UserServiceImpl.java +++ b/rc_autoplc_backend/rczn-admin/src/main/java/com/rczn/system/service/impl/UserServiceImpl.java @@ -45,6 +45,22 @@ public class UserServiceImpl implements UserService { return pageBean; } + /** + * 1. 查询用户列表（支持用户名模糊查询） + * + * @param userName 用户名（模糊查询，可选） + * @return 结果（listUser） + */ + @Override + public List selectUserList(String userName) { + // 2. 执行查询（MyBatis 会自动添加 LIMIT 分页） + User user = new User(); + user.setUserName(userName); + List userList = userMapper.selectUserPage(user); + + return userList; + } + @Override public User selectById(Long id) { // 查询不到返回 null（后续 Controller 处理） diff --git a/rc_autoplc_backend/rczn-admin/src/main/resources/mapper/RoleMapper.xml b/rc_autoplc_backend/rczn-admin/src/main/resources/mapper/RoleMapper.xml index d2a3128..e1e7648 100644 --- a/rc_autoplc_backend/rczn-admin/src/main/resources/mapper/RoleMapper.xml +++ b/rc_autoplc_backend/rczn-admin/src/main/resources/mapper/RoleMapper.xml @@ -69,10 +69,10 @@ UPDATE sys_role role_name = #{roleName}, - role_code = #{roleCode} - updateId = NULL, - updateTime = now(), - remark = NULL, + role_code = #{roleCode}, + update_id = #{updateId}, + update_time = now(), + remark = #{remark}, WHERE id = #{id} diff --git a/rc_autoplc_backend/rczn-admin/src/main/resources/mapper/UserRoleMapper.xml b/rc_autoplc_backend/rczn-admin/src/main/resources/mapper/UserRoleMapper.xml index 7dd74b9..b53de42 100644 --- a/rc_autoplc_backend/rczn-admin/src/main/resources/mapper/UserRoleMapper.xml +++ b/rc_autoplc_backend/rczn-admin/src/main/resources/mapper/UserRoleMapper.xml @@ -10,9 +10,9 @@ INSERT INTO sys_user_role ( - , create_time, update_time, del_sign + ,remark, create_time, del_sign ) VALUES ( - #{userId}, #{roleId}, NOW(), NOW(), 0 + #{userId}, #{roleId}, #{remark},NOW(), 0 ) @@ -57,7 +57,6 @@ AND user_id = #{userId} AND role_id = #{roleId} ORDER BY id DESC - LIMIT #{start}, #{pageSize} @@ -113,7 +113,7 @@ SELECT , - FROM sys_dev_info + FROM tb_dev_info WHERE del_sign = 0 @@ -141,7 +141,7 @@ diff --git a/rc_autoplc_backend/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/DevParamMapper.xml b/rc_autoplc_backend/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/DevParamMapper.xml new file mode 100644 index 0000000..ad1da52 --- /dev/null +++ b/rc_autoplc_backend/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/DevParamMapper.xml @@ -0,0 +1,67 @@ + + + + + + id, create_id, create_time, update_id, update_time, del_sign, remark + + + + + dev_id, param_name, param_value, `desc` + + + + + INSERT INTO tb_dev_param ( + , + create_id, create_time, update_id, update_time, del_sign + ) VALUES ( + #{devId}, #{paramName}, #{paramValue}, #{desc}, + #{createId}, NOW(), #{updateId}, NOW(), 0 + ) + + + + + UPDATE tb_dev_param + + dev_id = #{devId}, + param_name = #{paramName}, + param_value = #{paramValue}, + `desc` = #{desc}, + update_id = #{updateId}, + update_time = NOW() + + WHERE id = #{id} AND del_sign = 0 + + + + + UPDATE tb_dev_param + SET del_sign = 1, update_time = NOW() + WHERE id = #{id} AND del_sign = 0 + + + + + + + + \ No newline at end of file diff --git a/rc_autoplc_backend/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/FlowInfoMapper.xml b/rc_autoplc_backend/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/FlowInfoMapper.xml new file mode 100644 index 0000000..73a7335 --- /dev/null +++ b/rc_autoplc_backend/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/FlowInfoMapper.xml @@ -0,0 +1,59 @@ + + + + + id, create_id, create_time, update_id, update_time, del_sign, remark + + + + flow_index, flow_name, island_id_list + + + + INSERT INTO tb_flow_info ( + , + create_id, create_time, update_id, update_time, del_sign + ) VALUES ( + #{flowIndex}, #{flowName}, #{islandIdList}, + #{createId}, NOW(), #{updateId}, NOW(), 0 + ) + + + + UPDATE tb_flow_info + + flow_index = #{flowIndex}, + flow_name = #{flowName}, + island_id_list = #{islandIdList}, + update_id = #{updateId}, + update_time = NOW() + + WHERE id = #{id} AND del_sign = 0 + + + + UPDATE tb_flow_info + SET del_sign = 1, update_time = NOW() + WHERE id = #{id} AND del_sign = 0 + + + + + + \ No newline at end of file diff --git a/rc_autoplc_backend/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/GoodsFlowStatusMapper.xml b/rc_autoplc_backend/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/GoodsFlowStatusMapper.xml new file mode 100644 index 0000000..707f6ef --- /dev/null +++ b/rc_autoplc_backend/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/GoodsFlowStatusMapper.xml @@ -0,0 +1,62 @@ + + + + + id, create_id, create_time, update_id, update_time, del_sign, remark + + + + goods_id, flow_id, island_id, flow_sort, status + + + + INSERT INTO tb_goods_flow_status ( + , + create_id, create_time, update_id, update_time, del_sign + ) VALUES ( + #{goodsId}, #{flowId}, #{islandId}, #{flowSort}, #{status}, + #{createId}, NOW(), #{updateId}, NOW(), 0 + ) + + + + UPDATE tb_goods_flow_status + + goods_id = #{goodsId}, + flow_id = #{flowId}, + island_id = #{islandId}, + flow_sort = #{flowSort}, + status = #{status}, + update_id = #{updateId}, + update_time = NOW() + + WHERE id = #{id} AND del_sign = 0 + + + + UPDATE tb_goods_flow_status + SET del_sign = 1, update_time = NOW() + WHERE id = #{id} AND del_sign = 0 + + + + + + \ No newline at end of file diff --git a/rc_autoplc_backend/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/GoodsInfoMapper.xml b/rc_autoplc_backend/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/GoodsInfoMapper.xml new file mode 100644 index 0000000..18eca1b --- /dev/null +++ b/rc_autoplc_backend/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/GoodsInfoMapper.xml @@ -0,0 +1,63 @@ + + + + + id, create_id, create_time, update_id, update_time, del_sign, remark + + + + goods_name, goods_type, income_time, good_from, good_batch, `desc` + + + + INSERT INTO tb_goods_info ( + , + create_id, create_time, update_id, update_time, del_sign + ) VALUES ( + #{goodsName}, #{goodsType}, #{incomeTime}, #{goodFrom}, #{goodBatch}, #{desc}, + #{createId}, NOW(), #{updateId}, NOW(), 0 + ) + + + + UPDATE tb_goods_info + + goods_name = #{goodsName}, + goods_type = #{goodsType}, + income_time = #{incomeTime}, + good_from = #{goodFrom}, + good_batch = #{goodBatch}, + `desc` = #{desc}, + update_id = #{updateId}, + update_time = NOW() + + WHERE id = #{id} AND del_sign = 0 + + + + UPDATE tb_goods_info + SET del_sign = 1, update_time = NOW() + WHERE id = #{id} AND del_sign = 0 + + + + + + \ No newline at end of file diff --git a/rc_autoplc_backend/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/IslandInfoMapper.xml b/rc_autoplc_backend/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/IslandInfoMapper.xml new file mode 100644 index 0000000..851d869 --- /dev/null +++ b/rc_autoplc_backend/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/IslandInfoMapper.xml @@ -0,0 +1,59 @@ + + + + + id, create_id, create_time, update_id, update_time, del_sign, remark + + + + island_name, island_code, island_logo, `desc` + + + + INSERT INTO tb_island_info ( + , + create_id, create_time, update_id, update_time, del_sign + ) VALUES ( + #{islandName}, #{islandCode}, #{islandLogo}, #{desc}, + #{createId}, NOW(), #{updateId}, NOW(), 0 + ) + + + + UPDATE tb_island_info + + island_name = #{islandName}, + island_code = #{islandCode}, + island_logo = #{islandLogo}, + `desc` = #{desc}, + update_id = #{updateId}, + update_time = NOW() + + WHERE id = #{id} AND del_sign = 0 + + + + UPDATE tb_island_info + SET del_sign = 1, update_time = NOW() + WHERE id = #{id} AND del_sign = 0 + + + + + + \ No newline at end of file diff --git a/rc_autoplc_backend/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/IslandParamMapper.xml b/rc_autoplc_backend/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/IslandParamMapper.xml new file mode 100644 index 0000000..e662913 --- /dev/null +++ b/rc_autoplc_backend/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/IslandParamMapper.xml @@ -0,0 +1,131 @@ + + + + + + + id, create_id, create_time, update_id, update_time, del_sign, remark + + + + island_id, step_id, param_name, param_type, param_unit, param_value, form_type + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO tb_island_param ( + , + create_id, create_time, update_id, update_time, del_sign + ) VALUES ( + #{islandId}, #{stepId}, #{paramName}, #{paramType}, #{paramUnit}, #{paramValue}, #{formType}, + #{createId}, NOW(), #{updateId}, NOW(), 0 + ) + + + + + UPDATE tb_island_param + + island_id = #{islandId}, + step_id = #{stepId}, + param_name = #{paramName}, + param_type = #{paramType}, + param_unit = #{paramUnit}, + param_value = #{paramValue}, + form_type = #{formType}, + update_id = #{updateId}, + remark = #{remark}, + update_time = NOW() + + WHERE id = #{id} AND del_sign = 0 + + + + + UPDATE tb_island_param + SET del_sign = 1, update_time = NOW() + WHERE id = #{id} AND del_sign = 0 + + + + + + + + + + + \ No newline at end of file diff --git a/rc_autoplc_backend/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/RecordInfoMapper.xml b/rc_autoplc_backend/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/RecordInfoMapper.xml new file mode 100644 index 0000000..827f0c1 --- /dev/null +++ b/rc_autoplc_backend/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/RecordInfoMapper.xml @@ -0,0 +1,60 @@ + + + + + id, create_id, create_time, update_id, update_time, del_sign, remark + + + + record_name, record_type, record_status, record_content + + + + INSERT INTO tb_record_info ( + , + create_id, create_time, update_id, update_time, del_sign + ) VALUES ( + #{recordName}, #{recordType}, #{recordStatus}, #{recordContent}, + #{createId}, NOW(), #{updateId}, NOW(), 0 + ) + + + + UPDATE tb_record_info + + record_name = #{recordName}, + record_type = #{recordType}, + record_status = #{recordStatus}, + record_content = #{recordContent}, + update_id = #{updateId}, + update_time = NOW() + + WHERE id = #{id} AND del_sign = 0 + + + + UPDATE tb_record_info + SET del_sign = 1, update_time = NOW() + WHERE id = #{id} AND del_sign = 0 + + + + + + \ No newline at end of file diff --git a/rc_autoplc_backend/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/StepInfoMapper.xml b/rc_autoplc_backend/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/StepInfoMapper.xml new file mode 100644 index 0000000..335d349 --- /dev/null +++ b/rc_autoplc_backend/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/StepInfoMapper.xml @@ -0,0 +1,58 @@ + + + + + id, create_id, create_time, update_id, update_time, del_sign, remark + + + + island_id, step_name, step_desc + + + + INSERT INTO tb_step_info ( + , + create_id, create_time, update_id, update_time, del_sign + ) VALUES ( + #{islandId}, #{stepName}, #{stepDesc}, + #{createId}, NOW(), #{updateId}, NOW(), 0 + ) + + + + UPDATE tb_step_info + + island_id = #{islandId}, + step_name = #{stepName}, + step_desc = #{stepDesc}, + update_id = #{updateId}, + update_time = NOW() + + WHERE id = #{id} AND del_sign = 0 + + + + UPDATE tb_step_info + SET del_sign = 1, update_time = NOW() + WHERE id = #{id} AND del_sign = 0 + + + + + + \ No newline at end of file