ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java
@@ -49,4 +49,6 @@ @Excel(name = "电话") private String phone; } ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java
@@ -61,7 +61,7 @@ // 集群模式 // config.useClusterServers().addNodeAddress("192.168.110.188:7004", "192.168.110.188:7001"); // 2.根据 Config 创建出 RedissonClient 示例。 config.useSingleServer().setAddress("redis://192.168.110.235:6379").setPassword("123456"); config.useSingleServer().setAddress("redis://127.0.0.1:6379").setPassword("123456"); return Redisson.create(config); }
@@ -54,13 +54,11 @@ loginUser.setUsername(userName); loginUser.setIpaddr(IpUtils.getIpAddr()); refreshToken(loginUser); // Jwt存储信息 Map<String, Object> claimsMap = new HashMap<String, Object>(); claimsMap.put(SecurityConstants.USER_KEY, token); claimsMap.put(SecurityConstants.DETAILS_USER_ID, userId); claimsMap.put(SecurityConstants.DETAILS_USERNAME, userName); // 接口返回信息 Map<String, Object> rspMap = new HashMap<String, Object>(); rspMap.put("access_token", JwtUtils.createToken(claimsMap)); ruoyi-modules/ruoyi-management/pom.xml
@@ -112,12 +112,6 @@ </exclusion> </exclusions> </dependency> <!-- 分布式事务 --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common-seata</artifactId> </dependency> <!-- mybatis-plus --> <dependency> ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/HomeStatisticsController.java
@@ -25,7 +25,7 @@ private HomeStatisticsService homeStatisticsService; @PostMapping("/getHomeStatistics") @ApiOperation(value = "首页统计接口") public R<HomeStatisticsVO> getHomeStatistics(@RequestBody HomeStatisticsQuery homeStatisticsQuery) { public R<HomeStatisticsVO> getHomeStatistics(HomeStatisticsQuery homeStatisticsQuery) { return R.ok(homeStatisticsService.getHomeStatistics(homeStatisticsQuery)); }
New file @@ -0,0 +1,13 @@ package com.ruoyi.management.domain.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @Data @ApiModel("添加入库批次DTO") public class ADDRKDTO { private List<SlVolumeProductionRkListDTO> slVolumeProductionRkListDTO; } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/HomeStatisticsQuery.java
@@ -27,16 +27,13 @@ @ApiModelProperty("货架id") private Long shelfId; /** 城市code */ @ApiModelProperty("城市code") private String cityCode; /** 所属区县code */ @ApiModelProperty("所属区县code") private String countyCode; /** 所属街道code */ @ApiModelProperty("所属街道code") ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/HomeStatisticsServiceImpl.java
@@ -44,11 +44,11 @@ if(homeStatisticsQuery.getStoreManagementNo()!=null&&homeStatisticsQuery.getStoreManagementNo()!=""){ wrapper.eq(SlStoreManagement::getStoreManagementNo,homeStatisticsQuery.getStoreManagementNo()); } if (homeStatisticsQuery.getStoreManagementGrade()!=0 && homeStatisticsQuery.getStoreManagementGrade()!=null){ if (homeStatisticsQuery.getStoreManagementGrade()!=null && homeStatisticsQuery.getStoreManagementGrade()!=0){ wrapper.eq(SlStoreManagement::getStoreManagementGrade,homeStatisticsQuery.getStoreManagementGrade()); } if (homeStatisticsQuery.getStoreManagementNumber()!=0 && homeStatisticsQuery.getStoreManagementNumber()!=null){ if (homeStatisticsQuery.getStoreManagementNumber()!=null && homeStatisticsQuery.getStoreManagementNumber()!=0 ){ wrapper.eq(SlStoreManagement::getStoreManagementNumber,homeStatisticsQuery.getStoreManagementNumber()); } @@ -120,6 +120,9 @@ repertoryZhai=repertoryZhai+li1.getCkNum(); } } if (li.getRkPice() == null){ li.setRkPice(BigDecimal.ZERO); } d=d+li.getRkPice().multiply(new BigDecimal(li.getRkPice().intValue())).doubleValue(); li.setRepertoryZhai(repertoryZhai); } @@ -155,6 +158,9 @@ // 处理键和值 Long a=0L; for (homeVO vo : value) { if (vo.getGoodsMaterialsNum()== null){ vo.setGoodsMaterialsNum(0L); } a=a+vo.getGoodsMaterialsNum(); } goodsMaterialsNmVO.setGoodsMaterialsNum(a); ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java
@@ -71,8 +71,9 @@ list.setIsConsume(slGoodsMaterials.getIsConsume()); list.setSupplierName(data.getNickName()); SlGoodsShelf slGoodsShelf = slGoodsShelfMapper.selectById(list.getShelfId()); if (slGoodsShelf!=null){ list.setGoodsShelfName(slGoodsShelf.getGoodsShelfName()); } LambdaQueryWrapper<SlGoodsShelf> wrapper5= Wrappers.lambdaQuery(); wrapper5.eq(SlGoodsShelf::getStoreManagementId,byId.getManagementId()); wrapper5.eq(SlGoodsShelf::getStoreManagementNumber,list.getStoreManagementNumber()); ruoyi-modules/ruoyi-system/pom.xml
@@ -96,11 +96,6 @@ <version>1.2.47</version> </dependency> <!-- 分布式事务 --> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common-seata</artifactId> </dependency> </dependencies> <build> ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java
@@ -1,18 +1,15 @@ package com.ruoyi.system.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import java.util.List; import com.ruoyi.common.core.web.page.PageInfo; import com.ruoyi.system.api.domain.SysRole; import com.ruoyi.system.domain.dto.deptQuery; import com.ruoyi.system.service.ISysDeptService; import io.seata.common.util.StringUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -22,7 +19,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.log.annotation.Log; @@ -65,7 +61,7 @@ PageInfo<SysDept> page = deptService.page(pageInfo, new LambdaQueryWrapper<SysDept>().orderByDesc(SysDept::getCreateTime) .like(StringUtils.isNotBlank(dept.getDeptName()), SysDept::getDeptName, .like(StringUtils.hasLength(dept.getDeptName()), SysDept::getDeptName, dept.getDeptName()).eq(SysDept::getDelFlag, "0")); return AjaxResult.success(page); } @@ -73,7 +69,6 @@ /** * 查询部门列表（排除节点） */ /** * 根据部门编号获取详细信息 */ ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
@@ -27,7 +27,6 @@ import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.system.service.ISysUserRoleService; import com.ruoyi.system.service.ISysUserService; import io.seata.common.util.StringUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -41,6 +40,7 @@ import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -100,7 +100,7 @@ PageInfo<SysRole> page = roleService.page(pageInfo, new LambdaQueryWrapper<SysRole>().ne(SysRole::getRoleId, 20) .like(StringUtils.isNotBlank(query.getRoleName()), SysRole::getRoleName, .like(StringUtils.hasLength(query.getRoleName()), SysRole::getRoleName, query.getRoleName()).eq(SysRole::getDelFlag, "0")); return AjaxResult.success(page); }
