From 7f689c3cb57dcbc41ae9bcd16473239fbb9fa376 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 04 七月 2024 16:55:16 +0800
Subject: [PATCH] 更改用户模块接口和部分方法返回值，大屏线程
---
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java | 9 ++
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/controller/SysMenuController.java | 16 +++-
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/impl/SysUserServiceImpl.java | 13 +++-
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/controller/SysRoleController.java | 2
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java | 88 +++++++++++++++++++++++++++++
5 files changed, 116 insertions(+), 12 deletions(-)
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/controller/SysMenuController.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/controller/SysMenuController.java
index 4ca0cb9..b507a45 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/controller/SysMenuController.java
+++ b/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("鎵归噺鍒犻櫎鑿滃崟")
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/controller/SysRoleController.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/controller/SysRoleController.java
index cb6da80..036e737 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/controller/SysRoleController.java
+++ b/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));
}
}
\ No newline at end of file
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
index 2e0f357..6f13e7c 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
+++ b/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("閲嶇疆瀵嗙爜")
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/impl/SysUserServiceImpl.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/impl/SysUserServiceImpl.java
index ac5df96..1e4a478 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/impl/SysUserServiceImpl.java
+++ b/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;
}
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java
new file mode 100644
index 0000000..d5d59a5
--- /dev/null
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java
@@ -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");
+ }
+ }
+ }
+ }
+
+}
\ No newline at end of file
--
Gitblit v1.8.0