docker/docker-compose.yml
@@ -93,7 +93,7 @@ context: ./ruoyi/modules/system dockerfile: dockerfile ports: - "9201:9201" - "8201:8201" depends_on: - ruoyi-redis - ruoyi-mysql logs/ruoyi-article/error.2024-05-31.log
File was deleted logs/ruoyi-article/error.2024-06-06.log
File was deleted logs/ruoyi-article/error.2024-06-07.log
File was deleted logs/ruoyi-article/error.2024-06-11.log
File was deleted logs/ruoyi-article/error.2024-06-12.log
File was deleted logs/ruoyi-article/error.2024-06-13.log
File was deleted logs/ruoyi-article/error.2024-06-14.log
File was deleted logs/ruoyi-article/error.2024-06-15.log
File was deleted logs/ruoyi-article/error.2024-06-17.log
File was deleted logs/ruoyi-article/error.2024-06-18.log
File was deleted logs/ruoyi-article/error.2024-06-19.log
File was deleted logs/ruoyi-article/error.2024-06-20.log
File was deleted logs/ruoyi-article/error.2024-06-24.log
File was deleted logs/ruoyi-article/error.log
File was deleted logs/ruoyi-article/info.2024-05-31.log
File was deleted logs/ruoyi-article/info.2024-06-03.log
File was deleted logs/ruoyi-article/info.2024-06-04.log
File was deleted logs/ruoyi-article/info.2024-06-06.log
File was deleted logs/ruoyi-article/info.2024-06-07.log
File was deleted logs/ruoyi-article/info.2024-06-11.log
File was deleted logs/ruoyi-article/info.2024-06-12.log
File was deleted logs/ruoyi-article/info.2024-06-13.log
File was deleted logs/ruoyi-article/info.2024-06-14.log
File was deleted logs/ruoyi-article/info.2024-06-15.log
File was deleted logs/ruoyi-article/info.2024-06-17.log
File was deleted logs/ruoyi-article/info.2024-06-18.log
File was deleted logs/ruoyi-article/info.2024-06-19.log
File was deleted logs/ruoyi-article/info.2024-06-20.log
File was deleted logs/ruoyi-article/info.2024-06-21.log
File was deleted logs/ruoyi-article/info.2024-06-24.log
File was deleted logs/ruoyi-article/info.log
File was deleted logs/ruoyi-auction/error.2024-05-29.log
File was deleted logs/ruoyi-auction/error.2024-05-31.log
File was deleted logs/ruoyi-auction/error.2024-06-03.log
File was deleted logs/ruoyi-auction/error.2024-06-04.log
File was deleted logs/ruoyi-auction/error.2024-06-05.log
File was deleted logs/ruoyi-auction/error.2024-06-06.log
File was deleted logs/ruoyi-auction/error.2024-06-07.log
File was deleted logs/ruoyi-auction/error.2024-06-11.log
File was deleted logs/ruoyi-auction/error.2024-06-12.log
File was deleted logs/ruoyi-auction/error.2024-06-13.log
File was deleted logs/ruoyi-auction/error.2024-06-14.log
File was deleted logs/ruoyi-auction/error.2024-06-15.log
File was deleted logs/ruoyi-auction/error.2024-06-17.log
File was deleted logs/ruoyi-auction/error.2024-06-18.log
File was deleted logs/ruoyi-auction/error.2024-06-19.log
File was deleted logs/ruoyi-auction/error.2024-06-20.log
File was deleted logs/ruoyi-auction/error.log
File was deleted logs/ruoyi-auction/info.2024-05-29.log
File was deleted logs/ruoyi-auction/info.2024-05-31.log
File was deleted logs/ruoyi-auction/info.2024-06-03.log
File was deleted logs/ruoyi-auction/info.2024-06-04.log
File was deleted logs/ruoyi-auction/info.2024-06-05.log
File was deleted logs/ruoyi-auction/info.2024-06-06.log
File was deleted logs/ruoyi-auction/info.2024-06-07.log
File was deleted logs/ruoyi-auction/info.2024-06-11.log
File was deleted logs/ruoyi-auction/info.2024-06-12.log
File was deleted logs/ruoyi-auction/info.2024-06-13.log
File was deleted logs/ruoyi-auction/info.2024-06-14.log
File was deleted logs/ruoyi-auction/info.2024-06-15.log
File was deleted logs/ruoyi-auction/info.2024-06-17.log
File was deleted logs/ruoyi-auction/info.2024-06-18.log
File was deleted logs/ruoyi-auction/info.2024-06-19.log
File was deleted logs/ruoyi-auction/info.2024-06-20.log
File was deleted logs/ruoyi-auction/info.2024-06-21.log
File was deleted logs/ruoyi-auction/info.log
File was deleted logs/ruoyi-auth/error.2024-05-21.log
File was deleted logs/ruoyi-auth/error.2024-05-31.log
File was deleted logs/ruoyi-auth/error.2024-06-03.log
File was deleted logs/ruoyi-auth/error.2024-06-05.log
File was deleted logs/ruoyi-auth/error.2024-06-06.log
File was deleted logs/ruoyi-auth/error.2024-06-07.log
File was deleted logs/ruoyi-auth/error.2024-06-11.log
File was deleted logs/ruoyi-auth/error.2024-06-12.log
File was deleted logs/ruoyi-auth/error.2024-06-13.log
File was deleted logs/ruoyi-auth/error.2024-06-14.log
File was deleted logs/ruoyi-auth/error.2024-06-15.log
File was deleted logs/ruoyi-auth/error.2024-06-17.log
File was deleted logs/ruoyi-auth/error.2024-06-18.log
File was deleted logs/ruoyi-auth/error.2024-06-19.log
File was deleted logs/ruoyi-auth/error.2024-06-20.log
File was deleted logs/ruoyi-auth/error.2024-06-21.log
File was deleted logs/ruoyi-auth/error.log
File was deleted logs/ruoyi-auth/info.2024-05-21.log
File was deleted logs/ruoyi-auth/info.2024-05-31.log
File was deleted logs/ruoyi-auth/info.2024-06-03.log
File was deleted logs/ruoyi-auth/info.2024-06-05.log
File was deleted logs/ruoyi-auth/info.2024-06-06.log
File was deleted logs/ruoyi-auth/info.2024-06-07.log
File was deleted logs/ruoyi-auth/info.2024-06-11.log
File was deleted logs/ruoyi-auth/info.2024-06-12.log
File was deleted logs/ruoyi-auth/info.2024-06-13.log
File was deleted logs/ruoyi-auth/info.2024-06-14.log
File was deleted logs/ruoyi-auth/info.2024-06-15.log
File was deleted logs/ruoyi-auth/info.2024-06-17.log
File was deleted logs/ruoyi-auth/info.2024-06-18.log
File was deleted logs/ruoyi-auth/info.2024-06-19.log
File was deleted logs/ruoyi-auth/info.2024-06-20.log
File was deleted logs/ruoyi-auth/info.2024-06-21.log
File was deleted logs/ruoyi-auth/info.log
File was deleted logs/ruoyi-file/error.2024-06-03.log
File was deleted logs/ruoyi-file/error.2024-06-04.log
File was deleted logs/ruoyi-file/error.log
File was deleted logs/ruoyi-file/info.2024-06-03.log
File was deleted logs/ruoyi-file/info.2024-06-04.log
File was deleted logs/ruoyi-file/info.2024-06-05.log
File was deleted logs/ruoyi-file/info.log
File was deleted logs/ruoyi-gateway/error.2024-05-31.log
File was deleted logs/ruoyi-gateway/error.log
File was deleted logs/ruoyi-gateway/info.2024-05-31.log
File was deleted logs/ruoyi-gateway/info.2024-06-24.log
File was deleted logs/ruoyi-gateway/info.log
File was deleted logs/ruoyi-goods/error.2024-05-31.log
File was deleted logs/ruoyi-goods/error.2024-06-03.log
File was deleted logs/ruoyi-goods/error.2024-06-05.log
File was deleted logs/ruoyi-goods/error.2024-06-06.log
File was deleted logs/ruoyi-goods/error.2024-06-07.log
File was deleted logs/ruoyi-goods/error.2024-06-11.log
File was deleted logs/ruoyi-goods/error.2024-06-12.log
File was deleted logs/ruoyi-goods/error.2024-06-13.log
File was deleted logs/ruoyi-goods/error.2024-06-14.log
File was deleted logs/ruoyi-goods/error.2024-06-15.log
File was deleted logs/ruoyi-goods/error.2024-06-17.log
File was deleted logs/ruoyi-goods/error.2024-06-18.log
File was deleted logs/ruoyi-goods/error.2024-06-19.log
File was deleted logs/ruoyi-goods/error.2024-06-20.log
File was deleted logs/ruoyi-goods/error.log
File was deleted logs/ruoyi-goods/info.2024-05-31.log
File was deleted logs/ruoyi-goods/info.2024-06-03.log
File was deleted logs/ruoyi-goods/info.2024-06-05.log
File was deleted logs/ruoyi-goods/info.2024-06-06.log
File was deleted logs/ruoyi-goods/info.2024-06-07.log
File was deleted logs/ruoyi-goods/info.2024-06-11.log
File was deleted logs/ruoyi-goods/info.2024-06-12.log
File was deleted logs/ruoyi-goods/info.2024-06-13.log
File was deleted logs/ruoyi-goods/info.2024-06-14.log
File was deleted logs/ruoyi-goods/info.2024-06-15.log
File was deleted logs/ruoyi-goods/info.2024-06-17.log
File was deleted logs/ruoyi-goods/info.2024-06-18.log
File was deleted logs/ruoyi-goods/info.2024-06-19.log
File was deleted logs/ruoyi-goods/info.2024-06-20.log
File was deleted logs/ruoyi-goods/info.2024-06-21.log
File was deleted logs/ruoyi-goods/info.log
File was deleted logs/ruoyi-member/error.2024-05-31.log
File was deleted logs/ruoyi-member/error.2024-06-03.log
File was deleted logs/ruoyi-member/error.2024-06-04.log
File was deleted logs/ruoyi-member/error.2024-06-05.log
File was deleted logs/ruoyi-member/error.2024-06-06.log
File was deleted logs/ruoyi-member/error.2024-06-07.log
File was deleted logs/ruoyi-member/error.2024-06-11.log
File was deleted logs/ruoyi-member/error.2024-06-12.log
File was deleted logs/ruoyi-member/error.2024-06-13.log
File was deleted logs/ruoyi-member/error.2024-06-14.log
File was deleted logs/ruoyi-member/error.2024-06-15.log
File was deleted logs/ruoyi-member/error.2024-06-17.log
File was deleted logs/ruoyi-member/error.2024-06-18.log
File was deleted logs/ruoyi-member/error.2024-06-19.log
File was deleted logs/ruoyi-member/error.2024-06-20.log
File was deleted logs/ruoyi-member/error.log
File was deleted logs/ruoyi-member/info.2024-05-31.log
File was deleted logs/ruoyi-member/info.2024-06-03.log
File was deleted logs/ruoyi-member/info.2024-06-04.log
File was deleted logs/ruoyi-member/info.2024-06-05.log
File was deleted logs/ruoyi-member/info.2024-06-06.log
File was deleted logs/ruoyi-member/info.2024-06-07.log
File was deleted logs/ruoyi-member/info.2024-06-11.log
File was deleted logs/ruoyi-member/info.2024-06-12.log
File was deleted logs/ruoyi-member/info.2024-06-13.log
File was deleted logs/ruoyi-member/info.2024-06-14.log
File was deleted logs/ruoyi-member/info.2024-06-15.log
File was deleted logs/ruoyi-member/info.2024-06-17.log
File was deleted logs/ruoyi-member/info.2024-06-18.log
File was deleted logs/ruoyi-member/info.2024-06-19.log
File was deleted logs/ruoyi-member/info.2024-06-20.log
File was deleted logs/ruoyi-member/info.log
File was deleted logs/ruoyi-order/error.2024-05-29.log
File was deleted logs/ruoyi-order/error.2024-05-31.log
File was deleted logs/ruoyi-order/error.2024-06-03.log
File was deleted logs/ruoyi-order/error.2024-06-04.log
File was deleted logs/ruoyi-order/error.2024-06-05.log
File was deleted logs/ruoyi-order/error.2024-06-06.log
File was deleted logs/ruoyi-order/error.2024-06-07.log
File was deleted logs/ruoyi-order/error.2024-06-11.log
File was deleted logs/ruoyi-order/error.2024-06-12.log
File was deleted logs/ruoyi-order/error.2024-06-13.log
File was deleted logs/ruoyi-order/error.2024-06-14.log
File was deleted logs/ruoyi-order/error.2024-06-15.log
File was deleted logs/ruoyi-order/error.2024-06-17.log
File was deleted logs/ruoyi-order/error.2024-06-18.log
File was deleted logs/ruoyi-order/error.2024-06-19.log
File was deleted logs/ruoyi-order/error.2024-06-20.log
File was deleted logs/ruoyi-order/error.log
File was deleted logs/ruoyi-order/info.2024-05-29.log
File was deleted logs/ruoyi-order/info.2024-05-31.log
File was deleted logs/ruoyi-order/info.2024-06-03.log
File was deleted logs/ruoyi-order/info.2024-06-04.log
File was deleted logs/ruoyi-order/info.2024-06-05.log
File was deleted logs/ruoyi-order/info.2024-06-06.log
File was deleted logs/ruoyi-order/info.2024-06-07.log
File was deleted logs/ruoyi-order/info.2024-06-11.log
File was deleted logs/ruoyi-order/info.2024-06-12.log
File was deleted logs/ruoyi-order/info.2024-06-13.log
File was deleted logs/ruoyi-order/info.2024-06-14.log
File was deleted logs/ruoyi-order/info.2024-06-15.log
File was deleted logs/ruoyi-order/info.2024-06-17.log
File was deleted logs/ruoyi-order/info.2024-06-18.log
File was deleted logs/ruoyi-order/info.2024-06-19.log
File was deleted logs/ruoyi-order/info.2024-06-20.log
File was deleted logs/ruoyi-order/info.2024-06-21.log
File was deleted logs/ruoyi-order/info.log
File was deleted logs/ruoyi-promotion/error.2024-05-31.log
File was deleted logs/ruoyi-promotion/error.2024-06-03.log
File was deleted logs/ruoyi-promotion/error.2024-06-04.log
File was deleted logs/ruoyi-promotion/error.2024-06-06.log
File was deleted logs/ruoyi-promotion/error.2024-06-07.log
File was deleted logs/ruoyi-promotion/error.2024-06-11.log
File was deleted logs/ruoyi-promotion/error.2024-06-12.log
File was deleted logs/ruoyi-promotion/error.2024-06-13.log
File was deleted logs/ruoyi-promotion/error.2024-06-14.log
File was deleted logs/ruoyi-promotion/error.2024-06-15.log
File was deleted logs/ruoyi-promotion/error.2024-06-17.log
File was deleted logs/ruoyi-promotion/error.2024-06-18.log
File was deleted logs/ruoyi-promotion/error.2024-06-19.log
File was deleted logs/ruoyi-promotion/error.2024-06-20.log
File was deleted logs/ruoyi-promotion/error.log
File was deleted logs/ruoyi-promotion/info.2024-05-31.log
File was deleted logs/ruoyi-promotion/info.2024-06-03.log
File was deleted logs/ruoyi-promotion/info.2024-06-04.log
File was deleted logs/ruoyi-promotion/info.2024-06-05.log
File was deleted logs/ruoyi-promotion/info.2024-06-06.log
File was deleted logs/ruoyi-promotion/info.2024-06-07.log
File was deleted logs/ruoyi-promotion/info.2024-06-11.log
File was deleted logs/ruoyi-promotion/info.2024-06-12.log
File was deleted logs/ruoyi-promotion/info.2024-06-13.log
File was deleted logs/ruoyi-promotion/info.2024-06-14.log
File was deleted logs/ruoyi-promotion/info.2024-06-15.log
File was deleted logs/ruoyi-promotion/info.2024-06-17.log
File was deleted logs/ruoyi-promotion/info.2024-06-18.log
File was deleted logs/ruoyi-promotion/info.2024-06-19.log
File was deleted logs/ruoyi-promotion/info.2024-06-20.log
File was deleted logs/ruoyi-promotion/info.log
File was deleted logs/ruoyi-system/error.2024-06-03.log
File was deleted logs/ruoyi-system/error.2024-06-04.log
File was deleted logs/ruoyi-system/error.2024-06-05.log
File was deleted logs/ruoyi-system/error.2024-06-06.log
File was deleted logs/ruoyi-system/error.2024-06-11.log
File was deleted logs/ruoyi-system/error.2024-06-12.log
File was deleted logs/ruoyi-system/error.2024-06-13.log
File was deleted logs/ruoyi-system/error.2024-06-14.log
File was deleted logs/ruoyi-system/error.2024-06-15.log
File was deleted logs/ruoyi-system/error.2024-06-17.log
File was deleted logs/ruoyi-system/error.2024-06-18.log
File was deleted logs/ruoyi-system/error.2024-06-19.log
File was deleted logs/ruoyi-system/error.2024-06-20.log
File was deleted logs/ruoyi-system/error.2024-06-21.log
File was deleted logs/ruoyi-system/error.2024-06-24.log
File was deleted logs/ruoyi-system/error.log
File was deleted logs/ruoyi-system/info.2024-06-03.log
File was deleted logs/ruoyi-system/info.2024-06-04.log
File was deleted logs/ruoyi-system/info.2024-06-05.log
File was deleted logs/ruoyi-system/info.2024-06-06.log
File was deleted logs/ruoyi-system/info.2024-06-07.log
File was deleted logs/ruoyi-system/info.2024-06-11.log
File was deleted logs/ruoyi-system/info.2024-06-12.log
File was deleted logs/ruoyi-system/info.2024-06-13.log
File was deleted logs/ruoyi-system/info.2024-06-14.log
File was deleted logs/ruoyi-system/info.2024-06-15.log
File was deleted logs/ruoyi-system/info.2024-06-17.log
File was deleted logs/ruoyi-system/info.2024-06-18.log
File was deleted logs/ruoyi-system/info.2024-06-19.log
File was deleted logs/ruoyi-system/info.2024-06-20.log
File was deleted logs/ruoyi-system/info.2024-06-24.log
File was deleted logs/ruoyi-system/info.log
File was deleted logs/ruoyi-visual-monitor/error.2024-06-18.log
File was deleted logs/ruoyi-visual-monitor/error.log
File was deleted logs/ruoyi-visual-monitor/info.2024-06-18.log
File was deleted logs/ruoyi-visual-monitor/info.log
File was deleted ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SeBei.java
New file @@ -0,0 +1,11 @@ package com.ruoyi.system.api.domain; import lombok.Data; @Data public class SeBei { private Long userId; private String Sebei; } ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/ManagementFallbackFactory.java
New file @@ -0,0 +1,14 @@ package com.ruoyi.system.api.factory; import com.ruoyi.system.api.feignClient.LogClient; import com.ruoyi.system.api.feignClient.ManagementClient; import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; @Component public class ManagementFallbackFactory implements FallbackFactory<ManagementClient>{ @Override public ManagementClient create(Throwable cause) { return null; } } ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/ManagementClient.java
New file @@ -0,0 +1,19 @@ package com.ruoyi.system.api.feignClient; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.domain.R; import com.ruoyi.system.api.domain.SeBei; import com.ruoyi.system.api.factory.ManagementFallbackFactory; import com.ruoyi.system.api.factory.SysUserFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; @FeignClient(contextId = "managementClient", value = ServiceNameConstants.MANAGEMENT_SERVICE, fallbackFactory = ManagementFallbackFactory.class) public interface ManagementClient { @PostMapping("/sl-equipment/getequipmente") R<Integer> getequipmente(@RequestBody SeBei seBei); } ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -4,3 +4,5 @@ com.ruoyi.system.api.factory.SysUserFallbackFactory com.ruoyi.system.api.factory.LogFallbackFactory com.ruoyi.system.api.factory.ManagementFallbackFactory
@@ -2,3 +2,5 @@ com.ruoyi.system.api.factory.RemoteLogFallbackFactory com.ruoyi.system.api.factory.RemoteFileFallbackFactory com.ruoyi.system.api.factory.SysUserFallbackFactory com.ruoyi.system.api.factory.LogFallbackFactory
@@ -66,8 +66,10 @@ public R<?> login(@RequestBody LoginBody form) { // 用户登录 LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword()); LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword(),form.getSheBei()); SysUser sysUser1 = userInfo.getSysUser(); HashMap<String, Object> map = new HashMap<>(); map.put("token",tokenService.createToken(userInfo)); List<SysRole> roles = sysUser1.getRoles(); ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java
@@ -2,6 +2,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; /** @@ -9,6 +11,7 @@ * * @author ruoyi */ @Data @ApiModel(value = "登录对象", description = "用户登录对象") public class LoginBody { @@ -26,23 +29,7 @@ @NotBlank(message = "用户密码不能为空") private String password; public String getUsername() { return username; } @ApiModelProperty(value = "设备号", required = true) private String sheBei; public void setUsername(String username) { this.username = username; } public String getPassword() { return password; } public void setPassword(String password) { this.password = password; } } ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
@@ -13,7 +13,9 @@ import com.ruoyi.common.redis.service.RedisService; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.api.RemoteUserService; import com.ruoyi.system.api.domain.SeBei; import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.feignClient.ManagementClient; import com.ruoyi.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -40,13 +42,16 @@ @Autowired private RedisService redisService; @Autowired private ManagementClient managementClient; /** * 登录 */ public LoginUser login(String username, String password) public LoginUser login(String username, String password,String seBei) { // 用户名或密码为空 错误 if (StringUtils.isAnyBlank(username, password)) @@ -101,6 +106,15 @@ recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员"); throw new ServiceException("对不起，您的账号：" + username + " 已停用"); } if (user.getUserType().equals("03")){ SeBei se=new SeBei(); se.setUserId(user.getUserId()); se.setSebei(seBei); Integer getequipmente = managementClient.getequipmente(se).getData(); if (getequipmente==1){ throw new ServiceException("登录失败，登录账号与当前设备不匹配"); } } passwordService.validate(user, password); recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功"); return userInfo; ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlEquipmentController.java
@@ -12,6 +12,7 @@ import com.ruoyi.management.domain.vo.SlEquipmentVO; import com.ruoyi.management.service.InventoriesSuppliesService; import com.ruoyi.management.service.SlEquipmentService; import com.ruoyi.system.api.domain.SeBei; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -64,4 +65,12 @@ } @PostMapping("/getequipmente") public R<Integer> getequipmente(@RequestBody SeBei seBei){ return R.ok(slEquipmentService.getequipmente(seBei)); } } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlEquipmentService.java
@@ -6,6 +6,7 @@ import com.ruoyi.management.domain.dto.SlEquipmentDTO; import com.ruoyi.management.domain.dto.SlEquipmentQuery; import com.ruoyi.management.domain.vo.SlEquipmentVO; import com.ruoyi.system.api.domain.SeBei; import org.springframework.web.bind.annotation.RequestBody; /** @@ -22,4 +23,6 @@ void addSlEquipment(@RequestBody SlEquipmentDTO slEquipmentDTO); SlEquipmentVO getSlEquipmentOne(@RequestBody SlEquipmentDTO slEquipmentDTO); Integer getequipmente(@RequestBody SeBei seBei); } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java
@@ -15,10 +15,14 @@ import com.ruoyi.management.mapper.SlStoreManagementMapper; import com.ruoyi.management.service.SlEquipmentService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.api.domain.SeBei; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; /** * <p> @@ -113,4 +117,52 @@ return slEquipmentVO; } @Override public Integer getequipmente(SeBei seBei) { LambdaQueryWrapper< SlStoreManagement> wrapper= Wrappers.lambdaQuery(); List<Long> arr=new ArrayList<>(); wrapper.eq(SlStoreManagement::getDelFlag,0); wrapper.like(SlStoreManagement::getAdministratorId,seBei.getUserId()); List<SlStoreManagement> page = slStoreManagementMapper.selectList(wrapper); for (SlStoreManagement a:page){ arr.add(a.getId()); } LambdaQueryWrapper< SlStoreManagement> wrapper1= Wrappers.lambdaQuery(); wrapper1.eq(SlStoreManagement::getDelFlag,0); wrapper1.like(SlStoreManagement::getCompetentId,seBei.getUserId()); List<SlStoreManagement> page1 = slStoreManagementMapper.selectList(wrapper1); for (SlStoreManagement a1:page1){ arr.add(a1.getId()); } LambdaQueryWrapper< SlStoreManagement> wrapper2= Wrappers.lambdaQuery(); wrapper2.eq(SlStoreManagement::getDelFlag,0); wrapper2.like(SlStoreManagement::getDirectorId,seBei.getUserId()); List<SlStoreManagement> page2 = slStoreManagementMapper.selectList(wrapper2); for (SlStoreManagement a2:page2){ arr.add(a2.getId()); } Set<Long> set = new HashSet<>(arr); arr.clear(); arr.addAll(set); int i=1; for (Long arr1:arr){ LambdaQueryWrapper< SlEquipment> wrapper3= Wrappers.lambdaQuery(); wrapper3.eq(SlEquipment::getManagementId,arr1); wrapper3.eq(SlEquipment::getEquipmentNum,seBei.getSebei()); wrapper3.eq( SlEquipment::getDelFlag,0); List<SlEquipment> page3 = this.list( wrapper3); if (page3.size()>0){ i=2; break; } } return i; } }
