Przeglądaj źródła

修改结算单导出逻辑

songyh 3 lat temu
rodzic
commit
d192323b07

+ 5 - 5
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java

@@ -86,7 +86,7 @@ public class ShiroRealm extends AuthorizingRealm {
      * @throws AuthenticationException
      */
     @Override
-    protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken auth) throws AuthenticationException {
+    protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken auth) {
         log.debug("===============Shiro身份认证开始============doGetAuthenticationInfo==========");
         String token = (String) auth.getCredentials();
         if (token == null) {
@@ -103,7 +103,7 @@ public class ShiroRealm extends AuthorizingRealm {
      *
      * @param token
      */
-    public LoginUser checkUserTokenIsEffect(String token) throws AuthenticationException {
+    public LoginUser checkUserTokenIsEffect(String token){
         // 解密获得username,用于和数据库进行对比
         String username = JwtUtil.getUsername(token);
         if (username == null) {
@@ -114,15 +114,15 @@ public class ShiroRealm extends AuthorizingRealm {
         log.debug("———校验token是否有效————checkUserTokenIsEffect——————— "+ token);
         LoginUser loginUser = commonAPI.getUserByName(username);
         if (loginUser == null) {
-            throw new AuthenticationException("用户不存在!");
+            log.info("用户不存在!");
         }
         // 判断用户状态
         if (loginUser.getStatus() != 1) {
-            throw new AuthenticationException("账号已被锁定,请联系管理员!");
+            log.info("账号已被锁定,请联系管理员!");
         }
         // 校验token是否超时失效 & 或者账号密码是否错误
         if (!jwtTokenRefresh(token, username, loginUser.getPassword())) {
-            throw new AuthenticationException("Token失效,请重新登录!");
+            log.info("Token失效,请重新登录!");
         }
 
         return loginUser;

+ 1 - 3
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/controller/SettlementFileController.java

@@ -99,9 +99,7 @@ public class SettlementFileController {
     @PostMapping(value = "/getAccountNumAndImgNum")
     public Result getAccountNumAndImgNum(@RequestBody SettlementFileParamsVo paramsVo) {
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        String userId = "e9ca23d68d884d4ebb19d07889727dae";
-        SysUser user = userService.getById(userId);
-        //SysUser user = userService.getById(loginUser.getId());
+        SysUser user = userService.getById(loginUser.getId());
         return settlementFileInfoService.getAccountNumAndImgNum(paramsVo,user);
     }
     @Autowired

+ 2 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/manage/modules/material/service/impl/MaterialUploadServiceImpl.java

@@ -83,14 +83,14 @@ public class MaterialUploadServiceImpl implements IMaterialUploadService {
             if ("2".equals(mediaId) || "4".equals(mediaId)) {
                 this.kuaiShouUpload(mediaId, materialArray, accountArray, userId, shieldBackwardSwitch);
             } else if ("1".equals(mediaId) || "3".equals(mediaId)) {
-                this.touTiaoUpload(mediaId, materialArray, accountArray, userId);
+                this.touTiaoUpload(materialArray, accountArray, userId);
             }
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
-    private void touTiaoUpload(String mediaId, JSONArray materialArray, JSONArray accountArray, String userId) {
+    private void touTiaoUpload(JSONArray materialArray, JSONArray accountArray, String userId) {
         for (int j = 0; j < materialArray.size(); j++) {
             String materialId = materialArray.getString(j);
             MaterialInfo materialInfo = materialInfoMapper.selectById(materialId);

+ 0 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialUploadController.java

@@ -48,7 +48,6 @@ public class MaterialUploadController {
                 throw new Exception("请选择账号或素材");
             }
             LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-
             new Thread(() -> materialUploadService.uploadAccount(mediaId, materialArray, accountArray, sysUser.getId(), shieldBackwardSwitch)).start();
             returnMap.put("success", true);
             returnMap.put("message", "开始上传文件");