hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/controller/SysMenuController.java
@@ -29,15 +29,20 @@ @PostMapping("/save") // @PreAuthorize("hasAuthority('sys:menu:save')") public Result save(@Validated @RequestBody SysMenu sysMenu) { return Result.success(sysMenuService.save(sysMenu)); sysMenuService.save(sysMenu); GeneralRequest request=new GeneralRequest(); return Result.success(sysMenuService.getMenuTree(request)); } @ApiOperation("修改菜单信息") @PostMapping("/updateMenu") // @PreAuthorize("hasAuthority('sys:menu:update')") public Result updateMenu(@Validated @RequestBody SysMenu sysMenu) { public Result<List<SysMenu>> updateMenu(@Validated @RequestBody SysMenu sysMenu) { //return Result.success(sysMenu); sysMenuService.updateMenu(sysMenu); return Result.success(sysMenu); GeneralRequest request=new GeneralRequest(); return Result.build(200,"修改成功",sysMenuService.getMenuTree(request)); } @ApiOperation("获取用户有权限的所有菜单") @@ -62,8 +67,9 @@ @ApiOperation("删除菜单") @PostMapping("/deleteMenu") // @PreAuthorize("hasAuthority('sys:menu:delete')") public Result<String> deleteMenu(Long menuId) { return Result.success(sysMenuService.deleteMenu(menuId)); public Result<List<SysMenu>> deleteMenu(Long menuId) { GeneralRequest request=new GeneralRequest(); return Result.build(200, sysMenuService.deleteMenu(menuId),sysMenuService.getMenuTree(request)); } @ApiOperation("批量删除菜单") hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/controller/SysRoleController.java
@@ -57,7 +57,7 @@ // @PreAuthorize("hasAuthority('sys:role:delete')") @Transactional public Result<String> deleteRole(@RequestBody List<Long> ids) { return Result.success(sysRoleService.deleteRole(ids)); return Result.build(200,"删除成功",sysRoleService.deleteRole(ids)); } } hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
@@ -60,8 +60,13 @@ @ApiOperation("更新用户信息") @PostMapping("/updateUser") // @PreAuthorize("hasAuthority('sys:user:update')") public Result<SysUserVO> updateUser(@Validated @RequestBody SysUserVO sysUser) { return Result.success(sysUserService.updateUser(sysUser)); public Result<List<SysUserVO>> updateUser(@Validated @RequestBody SysUserVO sysUser) { //return Result.success(sysUserService.updateUser(sysUser)); sysUserService.updateUser(sysUser); GeneralRequest request=new GeneralRequest(); request.setKey(""); return Result.success(sysUserService.listByUserName(request)); //更改了修改之后返回所有用户列表 } @ApiOperation("重置密码") hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/impl/SysUserServiceImpl.java
@@ -19,6 +19,7 @@ import com.mes.userinfo.entity.SysUserRole; import com.mes.userinfo.entity.vo.SysUserVO; import com.mes.userinfo.mapper.SysUserMapper; import com.mes.userinfo.mapper.SysUserRoleMapper; import com.mes.userinfo.service.SysUserRoleService; import com.mes.userinfo.service.SysUserService; import lombok.extern.slf4j.Slf4j; @@ -71,6 +72,8 @@ @Resource BCryptPasswordEncoder passwordEncoder; @Autowired private SysUserRoleMapper sysUserRoleMapper; @Override public Map<String, String> login(SysUser user) { @@ -125,10 +128,12 @@ this.updateById(sysUser); log.info("删除用户角色信息"); List<Long> roleIds = user.getRoleList().stream().map(SysRole::getId).collect(Collectors.toList()); sysUserRoleService.remove(new LambdaQueryWrapper<SysUserRole>() .eq(SysUserRole::getUserId, sysUser.getId()).in(CollectionUtil.isNotEmpty(roleIds), SysUserRole::getRoleId, roleIds)); log.info("保存用户角色信息"); saveUserRole(user.getRoleList(), sysUser.getId()); // sysUserRoleService.remove(new LambdaQueryWrapper<SysUserRole>() // .eq(SysUserRole::getUserId, sysUser.getId()).in(CollectionUtil.isNotEmpty(roleIds), SysUserRole::getRoleId, roleIds)); SysUserRole sysUserRole = new SysUserRole(sysUser.getId(),roleIds.get(0)); sysUserRoleMapper.updateById(sysUserRole); // log.info("保存用户角色信息"); // saveUserRole(user.getRoleList(), sysUser.getId()); return user; }
New file @@ -0,0 +1,88 @@ package com.mes.job; import cn.hutool.json.JSONObject; import com.mes.order.entity.Orders; import com.mes.order.service.OrdersService; import com.mes.pp.entity.OptimizeProject; import com.mes.pp.entity.request.AwaitingRepair; import com.mes.pp.entity.request.Reportingdamage; import com.mes.pp.service.OptimizeProjectService; import com.mes.pp.service.ReportingWorkService; import com.mes.tools.WebSocketServer; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import java.util.ArrayList; import java.util.List; /** * @author SNG-010 */ @Component @Slf4j public class PlcScreenTask { @Autowired private ReportingWorkService reportingWorkService; @Autowired private OptimizeProjectService optimizeProjectService; @Autowired private OrdersService ordersService; /** * fixedRate : 上一个调用开始后再次调用的延时（不用等待上一次调用完成） * fixedDelay : 上一个调用结束后再次调用的延时 */ @Scheduled(fixedDelay = 2000) public void screenHome(){ JSONObject jsonObject = new JSONObject(); //正在等待进片的玻璃 Reportingdamage reportingdamage = new Reportingdamage(); reportingdamage.setReportingWorkTime("2024-05-11"); //获取切割信息 reportingdamage.setThisProcess("切割"); List<Reportingdamage> cutting = reportingWorkService.selectDamage(reportingdamage); jsonObject.append("cutting", cutting); //获取磨边信息 reportingdamage.setThisProcess("磨边"); List<Reportingdamage> edging = reportingWorkService.selectDamage(reportingdamage); jsonObject.append("edging", edging); //获取钢化信息 reportingdamage.setThisProcess("钢化"); List<Reportingdamage> tempering = reportingWorkService.selectDamage(reportingdamage); jsonObject.append("tempering", tempering); //获取夹胶信息 reportingdamage.setThisProcess("夹胶"); List<Reportingdamage> doubling = reportingWorkService.selectDamage(reportingdamage); jsonObject.append("doubling", doubling); //获取中空信息 reportingdamage.setThisProcess("中空"); List<Reportingdamage> hollow = reportingWorkService.selectDamage(reportingdamage); jsonObject.append("hollow", hollow); //获取包装信息 reportingdamage.setThisProcess("包装"); List<Reportingdamage> packaging = reportingWorkService.selectDamage(reportingdamage); jsonObject.append("packaging", packaging); //获取次破未补信息 List<AwaitingRepair>awaitingRepairs = reportingWorkService.selectAwaitingRepair(); jsonObject.append("awaitingRepairs", awaitingRepairs); //获取正在进行的工程 List<OptimizeProject>optimizeProjects= optimizeProjectService.getDoingTask(); jsonObject.append("DoingTask", optimizeProjects); //获取当前订单 List<Orders>orders=ordersService.selectOrders(); jsonObject.append("orders", orders); ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("screen"); if (sendwServer != null) { for (WebSocketServer webserver : sendwServer) { if (webserver != null) { webserver.sendMessage(jsonObject.toString()); } else { log.info("Home is closed"); } } } } }
