From 5d789ce18769f911bb97d5d3babb32330f2e53ba Mon Sep 17 00:00:00 2001 From: lyd <1419499670@qq.com> Date: Mon, 10 Oct 2022 09:36:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E7=AE=94=E4=B8=8B=E6=96=99=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E3=80=81=E6=89=8B=E6=8C=81=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rest/AuthorizationController.java | 2 +- .../rest/MobileAuthorizationController.java | 89 +++++ .../pdm/ivt/rest/CoolPointIvtController.java | 8 + .../pdm/ivt/service/CoolPointIvtService.java | 8 + .../service/impl/CoolPointIvtServiceImpl.java | 20 ++ .../nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql | 25 ++ .../wms/pdm/ivt/coolpointivt/coolregionio.vue | 242 +++++++++++++ .../views/wms/pdm/ivt/coolpointivt/index.vue | 319 +---------------- .../wms/pdm/ivt/coolpointivt/inventory.vue | 320 ++++++++++++++++++ 9 files changed, 726 insertions(+), 307 deletions(-) create mode 100644 nladmin-system/src/main/java/org/nl/modules/security/rest/MobileAuthorizationController.java create mode 100644 nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/coolregionio.vue create mode 100644 nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/inventory.vue diff --git a/nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java b/nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java index 389c4eb7b..923ab5eb3 100644 --- a/nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java +++ b/nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java @@ -95,7 +95,7 @@ public class AuthorizationController { // 获取权限列表 - 登录查找权限 List permissionList = roleService.getPermissionList(userDto); - // 保存用户信息到session - 登录输入，登出删除 + // 登录输入，登出删除 CurrentUser user = new CurrentUser(); user.setId(userDto.getId()); user.setUsername(userDto.getUsername()); diff --git a/nladmin-system/src/main/java/org/nl/modules/security/rest/MobileAuthorizationController.java b/nladmin-system/src/main/java/org/nl/modules/security/rest/MobileAuthorizationController.java new file mode 100644 index 000000000..b59f5162e --- /dev/null +++ b/nladmin-system/src/main/java/org/nl/modules/security/rest/MobileAuthorizationController.java @@ -0,0 +1,89 @@ +package org.nl.modules.security.rest; + +import cn.dev33.satoken.annotation.SaIgnore; +import cn.dev33.satoken.secure.SaSecureUtil; +import cn.dev33.satoken.stp.SaLoginModel; +import cn.dev33.satoken.stp.StpUtil; +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.common.utils.RedisUtils; +import org.nl.modules.common.utils.dto.CurrentUser; +import org.nl.modules.security.service.dto.AuthUserDto; +import org.nl.modules.system.service.RoleService; +import org.nl.modules.system.service.UserService; +import org.nl.modules.system.service.dto.UserDto; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author: lyd + * @description: 手持登录鉴权 + * @Date: 2022/10/10 + */ +@Slf4j +@RestController +@RequestMapping("/mobile/auth") +@RequiredArgsConstructor +@Api(tags = "手持：系统授权接口") +public class MobileAuthorizationController { + private final RedisUtils redisUtils; + private final UserService userService; + private final RoleService roleService; + + @ApiOperation("登录授权") + @PostMapping(value = "/login") + @SaIgnore + public ResponseEntity login(@Validated @RequestBody AuthUserDto authUser, HttpServletRequest request) throws Exception { + // 密码解密 - 前端的加密规则: encrypt（根据实际更改） + String password = authUser.getPassword(); +// String password = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey, authUser.getPassword()); + // 校验数据库 + // 根据用户名查询，在比对密码 + UserDto userDto = userService.findByName(authUser.getUsername()); // 拿不到已经抛出异常 + if (!userDto.getPassword().equals(SaSecureUtil.md5BySalt(password, "salt"))) { // 这里需要密码加密 + throw new BadRequestException("账号或密码错误"); + } + // 获取权限列表 - 登录查找权限 + List permissionList = roleService.getPermissionList(userDto); + + // 登录输入，登出删除 + CurrentUser user = new CurrentUser(); + user.setId(userDto.getId()); + user.setUsername(userDto.getUsername()); + user.setNickName(userDto.getNickName()); + user.setUser(userDto); + user.setPermissions(permissionList); + + // SaLoginModel 配置登录相关参数 + StpUtil.login(userDto.getId(), new SaLoginModel() + .setDevice("PE") // 此次登录的客户端设备类型, 用于[同端互斥登录]时指定此次登录的设备类型 + .setExtra("loginInfo", user) // Token挂载的扩展参数 （此方法只有在集成jwt插件时才会生效） + ); + + // 返回 token 与 用户信息 + JSONObject jsonObject = new JSONObject(); + jsonObject.put("roles", permissionList); + jsonObject.put("user", userDto); + Map authInfo = new HashMap(2) {{ + put("token", StpUtil.getTokenValue()); + put("user", jsonObject); + }}; + + redisUtils.set("pe-satoken", StpUtil.getTokenValue(), StpUtil.getTokenTimeout()); + + return ResponseEntity.ok(authInfo); + } +} diff --git a/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/CoolPointIvtController.java b/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/CoolPointIvtController.java index abd385d9d..94d5fa0e9 100644 --- a/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/CoolPointIvtController.java +++ b/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/CoolPointIvtController.java @@ -64,4 +64,12 @@ public class CoolPointIvtController { coolpointivtService.deleteAll(ids); return new ResponseEntity<>(HttpStatus.OK); } + + @GetMapping("/coolRegionIOQueryAll") + @Log("冷却区出入表") + @ApiOperation("冷却区出入表") + //@SaCheckPermission("@el.check('stIvtCoolpointivt:list')") + public ResponseEntity coolRegionIOQueryAll(@RequestParam Map whereJson, Pageable page){ + return new ResponseEntity<>(coolpointivtService.coolRegionIOQueryAll(whereJson,page),HttpStatus.OK); + } } diff --git a/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/CoolPointIvtService.java b/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/CoolPointIvtService.java index cbcba5bcf..3dc66f566 100644 --- a/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/CoolPointIvtService.java +++ b/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/CoolPointIvtService.java @@ -61,4 +61,12 @@ public interface CoolPointIvtService { * @param ids / */ void deleteAll(Long[] ids); + + /** + * 冷却区出入分页查询 + * @param whereJson + * @param page + * @return + */ + Map coolRegionIOQueryAll(Map whereJson, Pageable page); } diff --git a/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java b/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java index e3af95b29..ee5d21bac 100644 --- a/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java @@ -140,4 +140,24 @@ public class CoolPointIvtServiceImpl implements CoolPointIvtService { } } + /** + * 冷却区出入分页查询 + * + * @param whereJson + * @param page + * @return + */ + @Override + public Map coolRegionIOQueryAll(Map whereJson, Pageable page) { + HashMap map = new HashMap(); + map.put("flag", "2"); + if (whereJson.get("start_point_code")!=null) + map.put("start_point_code", "%" + whereJson.get("start_point_code") + "%"); + map.put("bill_status", whereJson.get("bill_status")); + map.put("begin_time", whereJson.get("begin_time")); + map.put("end_time", whereJson.get("end_time")); + JSONObject json = WQL.getWO("ST_IVT_COOLPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time desc"); + return json; + } + } diff --git a/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql b/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql index ab24157b3..722c195a8 100644 --- a/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql +++ b/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql @@ -23,6 +23,8 @@ 输入.is_used TYPEAS s_string 输入.begin_time TYPEAS s_string 输入.end_time TYPEAS s_string + 输入.start_point_code TYPEAS s_string + 输入.bill_status TYPEAS s_string [临时表] @@ -83,4 +85,27 @@ ENDOPTION ENDSELECT ENDPAGEQUERY + ENDIF + IF 输入.flag = "2" + PAGEQUERY + SELECT + coolregionio.* + FROM + st_ivt_coolregionio coolregionio + WHERE + 1=1 + OPTION 输入.start_point_code <> "" + start_point_code LIKE 输入.start_point_code + ENDOPTION + OPTION 输入.bill_status <> "" + bill_status = 输入.bill_status + ENDOPTION + OPTION 输入.begin_time <> "" + create_time >= 输入.begin_time + ENDOPTION + OPTION 输入.end_time <> "" + create_time <= 输入.end_time + ENDOPTION + ENDSELECT + ENDPAGEQUERY ENDIF \ No newline at end of file diff --git a/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/coolregionio.vue b/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/coolregionio.vue new file mode 100644 index 000000000..511fd44da --- /dev/null +++ b/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/coolregionio.vue @@ -0,0 +1,242 @@ + + + + + diff --git a/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/index.vue b/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/index.vue index efc14e7a1..1f6b96e5d 100644 --- a/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/index.vue +++ b/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/index.vue @@ -1,317 +1,24 @@ diff --git a/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/inventory.vue b/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/inventory.vue new file mode 100644 index 000000000..a0b6c2645 --- /dev/null +++ b/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/inventory.vue @@ -0,0 +1,320 @@ + + + + +