hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeDetailController.java
File was deleted hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java
@@ -34,11 +34,12 @@ private ReportingDamageMapper reportingDamageMapper; @Autowired private AwaitingRepairMapper awaitingRepairMapper; @Override public List<Reportingdamage> selectDamage(Reportingdamage reportingdamage) { QueryWrapper<Reportingdamage>queryWrapper=new QueryWrapper<>(); queryWrapper.select("this_process,sum(completed_quantity)as completedQuantity,sum(breakage_quantity)as breakageQuantity,device_name ") .eq("this_process",reportingdamage.getThisProcess()) queryWrapper.select("this_process,sum(completed_quantity) as completedQuantity,sum(breakage_quantity) as breakageQuantity ") //.eq("this_process", reportingdamage.getThisProcess()) //.eq("device_name",reportingdamage.getDeviceName()) .ge("reporting_work_time",reportingdamage.getReportingWorkTime()) .groupBy("this_process"); hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java
@@ -1,5 +1,4 @@ package com.mes.temperingglass.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.mes.base.entity.BigStorageCageBaseInfo; hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java
File was renamed from hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingAgoService.java @@ -11,7 +11,7 @@ * @author zhoush * @since 2024-04-07 */ public interface TemperingAgoService extends MPJBaseService<TemperingGlassInfo> { public interface TemperingGlassInfoService extends MPJBaseService<TemperingGlassInfo> { List<TemperingGlassInfo> selectWaitingGlass(); @@ -22,4 +22,6 @@ List<TemperingGlassInfo> selectOverGlass(); List<TemperingGlassInfo> selectLayoutId(); List<TemperingGlassInfo> selectTaskType(); } hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
File was renamed from hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingAgoServiceImpl.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.mes.temperingglass.entity.TemperingGlassInfo; import com.mes.temperingglass.mapper.TemperingGlassInfoMapper; import com.mes.temperingglass.service.TemperingAgoService; import com.mes.temperingglass.service.TemperingGlassInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.github.yulichang.base.MPJBaseServiceImpl; @@ -21,7 +21,7 @@ */ @Service @DS("salve_hangzhoumes") public class TemperingAgoServiceImpl extends MPJBaseServiceImpl<TemperingGlassInfoMapper, TemperingGlassInfo> implements TemperingAgoService { public class TemperingGlassInfoServiceImpl extends MPJBaseServiceImpl<TemperingGlassInfoMapper, TemperingGlassInfo> implements TemperingGlassInfoService { @Autowired TemperingGlassInfoMapper temperingMapper; @@ -57,12 +57,16 @@ public List<TemperingGlassInfo> selectOverGlass() { //获取过旋转台最大的钢化版图id QueryWrapper<TemperingGlassInfo> wapper = new QueryWrapper<>(); wapper.select("top 1 *").eq("state", 4) wapper.select("Top 1 *").eq("state", 4) .orderByDesc("tempering_layout_id"); //根据最大的版图id显示钢化后的版图信息 TemperingGlassInfo glassinfo= temperingMapper.selectOne(wapper); if (glassinfo == null) { return null; // 直接返回null，表示没有找到符合条件的记录 } QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>(); wrapper.eq("tempering_layout_id",glassinfo.getTemperingLayoutId()); return temperingMapper.selectList(wrapper); } @@ -74,4 +78,12 @@ .orderByAsc("tempering_layout_id"); return temperingMapper.selectList(wrapper); } @Override public List<TemperingGlassInfo> selectTaskType() { QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>(); wrapper.select("state") .groupBy("state"); return temperingMapper.selectList(wrapper); } } hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/controller/SysRoleController.java
@@ -33,15 +33,19 @@ @ApiOperation("新增角色及角色下的权限信息") @PostMapping("/saveRole") // @PreAuthorize("hasAuthority('sys:role:save')") public Result<SysRole> saveRole(@Validated @RequestBody SysRoleVO sysRoleVO) { return Result.success(sysRoleService.saveRole(sysRoleVO)); public Result<SysRoleVO> saveRole(@Validated @RequestBody SysRoleVO sysRoleVO) { //return Result.success(sysRoleService.saveRole(sysRoleVO)); sysRoleService.saveRole(sysRoleVO); return Result.build(200,"新增成功",sysRoleVO); } @ApiOperation("编辑角色及角色下的权限信息") @PostMapping("/updateRole") // @PreAuthorize("hasAuthority('sys:role:save')") public Result<String> updateRole(@Validated @RequestBody SysRoleVO sysRoleVO) { return Result.success(sysRoleService.updateRole(sysRoleVO)); public Result<SysRoleVO> updateRole(@Validated @RequestBody SysRoleVO sysRoleVO) { // return Result.success(sysRoleService.updateRole(sysRoleVO)); sysRoleService.updateRole(sysRoleVO); return Result.build(200,"新增成功",sysRoleVO); } @ApiOperation("查询角色及角色下的权限信息") hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/service/impl/SysRoleServiceImpl.java
@@ -117,10 +117,21 @@ roleMenu.setMenuId(menu.getId()); return roleMenu; }).collect(Collectors.toList()); // 使用流处理菜单列表，提取 children 的 id，并设置到 SysRoleMenu 中 List<SysRoleMenu> childrenList = menuList.stream() .flatMap(menu -> menu.getChildren().stream()) // 扁平化处理 children 列表 .map(child -> { SysRoleMenu roleMenu = new SysRoleMenu(); roleMenu.setRoleId(roleId); roleMenu.setMenuId(child.getId()); // 设置 child 的 id 到 menuId return roleMenu; }) .collect(Collectors.toList()); log.info("清空角色权限表中该角色信息"); // 先删除原来的记录，再保存新的 sysRoleMenuService.remove(new LambdaQueryWrapper<SysRoleMenu>().eq(SysRoleMenu::getRoleId, roleId)); sysRoleMenuService.saveBatch(roleMenuList); sysRoleMenuService.saveBatch(childrenList); // 删除缓存 sysUserService.clearUserAuthorityInfoByRoleId(roleId); return "success"; hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
@@ -43,7 +43,6 @@ @ApiOperation("退出登录") @PostMapping("/logout") // @PreAuthorize("hasRole('ROLE_admin')") @PreAuthorize("hasAuthority('xt:yh')") public Result<String> logout() { return Result.success(sysUserService.logout()); @@ -61,10 +60,9 @@ @PostMapping("/updateUser") // @PreAuthorize("hasAuthority('sys:user:update')") public Result<List<SysUserVO>> updateUser(@Validated @RequestBody SysUserVO sysUser) { //return Result.success(sysUserService.updateUser(sysUser)); sysUserService.updateUser(sysUser); GeneralRequest request=new GeneralRequest(); request.setKey(""); //request.setKey(""); return Result.success(sysUserService.listByUserName(request)); //更改了修改之后返回所有用户列表 } hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
@@ -43,7 +43,7 @@ * fixedDelay : 上一个调用结束后再次调用的延时 */ @Scheduled(fixedDelay = 300) @Scheduled(fixedDelay = 30000000) public void plcLoadGlassTask() throws InterruptedException { try { //获取联机状态 @@ -87,7 +87,7 @@ } } @Scheduled(fixedDelay = 300) @Scheduled(fixedDelay = 30000000) public void plcLoadGlassReport(){ //获取是否有汇报 String loadStatus = plcParameterObject.getPlcParameter("PlcStatus").getValue(); @@ -144,8 +144,8 @@ public void loadGlassStatus(){ JSONObject jsonObject = new JSONObject(); //正在进行的任务 String inkageStatus =plcParameterObject.getPlcParameter("MesToPlc").getValue(); //String inkageStatus ="1"; //String inkageStatus =plcParameterObject.getPlcParameter("MesToPlc").getValue(); String inkageStatus ="1"; jsonObject.append("InkageStatus", inkageStatus); ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass"); if (sendwServer != null) { hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
@@ -52,7 +52,11 @@ */ UpPattenUsage selectSequence(UpPattenUsage upPattenUsage); /** * 更改上片玻璃状态 * @return UpPattenUsage */ Boolean updateGlassState(UpPattenUsage upPattenUsage); }
@@ -23,6 +23,30 @@ <version>1.0-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>com.mes</groupId> <artifactId>loadGlass</artifactId> <version>1.0-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>com.mes</groupId> <artifactId>cacheGlass</artifactId> <version>1.0-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>com.mes</groupId> <artifactId>cacheVerticalGlass</artifactId> <version>1.0-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>com.mes</groupId> <artifactId>unLoadGlass</artifactId> <version>1.0-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> <properties> hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java
@@ -1,6 +1,6 @@ package com.mes.job; import cn.hutool.json.JSONObject; import com.mes.temperingglass.service.TemperingAgoService; import com.mes.temperingglass.service.TemperingGlassInfoService; import com.mes.temperingglass.entity.TemperingGlassInfo; import com.mes.tools.WebSocketServer; import lombok.extern.slf4j.Slf4j; @@ -19,13 +19,13 @@ public class PlcTemperingGlassTask { @Autowired private TemperingAgoService temperingAgoService; private TemperingGlassInfoService temperingAgoService; /** * fixedRate : 上一个调用开始后再次调用的延时（不用等待上一次调用完成） * fixedDelay : 上一个调用结束后再次调用的延时 */ @Scheduled(fixedDelay = 1000) @Scheduled(fixedDelay = 2000) public void temperingGlassHome(){ JSONObject jsonObject = new JSONObject(); //正在等待进片的玻璃 @@ -46,6 +46,7 @@ jsonObject.append("outGlass", outGlass); //过旋转台钢化后的玻璃 List<TemperingGlassInfo> overGlass = temperingAgoService.selectOverGlass(); jsonObject.append("overGlass", overGlass); ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("temperingGlass"); hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
@@ -1,5 +1,5 @@ package com.mes.temperingglass.controller; import com.mes.temperingglass.service.TemperingAgoService; import com.mes.temperingglass.service.TemperingGlassInfoService; import com.mes.temperingglass.entity.TemperingGlassInfo; import com.mes.utils.Result; import io.swagger.annotations.ApiOperation; @@ -22,7 +22,7 @@ public class TemperingGlassInfoController { @Autowired private TemperingAgoService temperingAgoService; private TemperingGlassInfoService temperingAgoService; @ApiOperation("查询钢化等片中的版图信息,状态为1的为已到,状态为0的为等待中") @GetMapping("/selectWaitingGlass") // 查询钢化等片中的版图信息,状态为1的为已到,状态为0的为等待中
